Merge from release branch.

svn path=/trunk/; revision=26178

53 files changed, 96653 insertions, 101897 deletions

diff --git a/ChangeLog b/ChangeLog
index 8619f14c0d..2a1dc72d51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-03  JP Rosevear  <jpr@novell.com>
+
+	* configure.in: bump version, requirements
+
 2004-06-02  Chris Toshok  <toshok@ximian.com>
 
 	* configure.in (EDS_REQUIRED): bump to 0.0.93.1.
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index abf48025b2..cf2cc952df 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -23,6 +23,13 @@
 	"client_changed signal on the TaskPage.
 	(client_changed_cb): set menu sensibility when the client changes.
 
+2004-06-02  JP Rosevear  <jpr@novell.com>
+	
+	* gui/alarm-notify/alarm-notify.c (process_removal_in_hash): free
+	the correct uri, preventing bad memory corruption
+	(list_changed_cb): track the removals in a list so we don't
+	clobber the hash table data during the foreach loop
+
 2004-06-02  Chris Toshok  <toshok@ximian.com>
 
 	* gui/migration.c (migrate_calendars): remove absolute_uri from
@@ -63,6 +70,7 @@
 	* gui/dialogs/calendar-setup.glade: remove edit dialogs and name
 	the tables.
 
+
 2004-06-01  Rodrigo Moya <rodrigo@novell.com>
 
 	Fixes #59369
diff --git a/calendar/gui/alarm-notify/alarm-notify.c b/calendar/gui/alarm-notify/alarm-notify.c
index 0c3231aaae..19e5daf15f 100644
--- a/calendar/gui/alarm-notify/alarm-notify.c
+++ b/calendar/gui/alarm-notify/alarm-notify.c
@@ -72,6 +72,7 @@ alarm_notify_class_init (AlarmNotifyClass *klass)
 typedef struct {
 	AlarmNotify *an;
 	ESourceList *source_list;
+	GList *removals;
 } ProcessRemovalsData;
 
 static void
@@ -95,16 +96,15 @@ process_removal_in_hash (gpointer key, gpointer value, gpointer data)
 			source_uri = e_source_get_uri (source);
 			if (strcmp (source_uri, uri) == 0)
 				found = TRUE;
-			g_free (uri);
+			g_free (source_uri);
 
 			if (found)
 				return;
 		}
 	}
 
-	/* not found, so remove it */
-	g_message ("Removing %s", uri);
-	alarm_notify_remove_calendar (prd->an, uri);
+	/* not found, so list it for removal */
+	prd->removals = g_list_prepend (prd->removals, uri);
 }
 
 static void
@@ -115,6 +115,7 @@ list_changed_cb (ESourceList *source_list, gpointer data)
 	GSList *groups, *sources, *p, *q;
 	ECalSourceType source_type = E_CAL_SOURCE_TYPE_LAST;
 	ProcessRemovalsData prd;
+	GList *l;
 	int i;
 	
 	priv = an->priv;
@@ -151,10 +152,16 @@ list_changed_cb (ESourceList *source_list, gpointer data)
 	/* process the removals */
 	prd.an = an;
 	prd.source_list = priv->source_lists[source_type];
+	prd.removals = NULL;
 	g_hash_table_foreach (priv->uri_client_hash, (GHFunc) process_removal_in_hash, &prd);
+
+	for (l = prd.removals; l; l = l->next) {
+		g_message ("Removing %s", (char *)l->data);
+		alarm_notify_remove_calendar (an, l->data);
+	}
+	g_list_free (prd.removals);
 }
 
-/* Loads the calendars that the alarm daemon has been told to load in the past */
 static void
 load_calendars (AlarmNotify *an, ECalSourceType source_type)
 {
diff --git a/configure.in b/configure.in
index e36a1ae75d..f814d6299e 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.52)
 
-AC_INIT(evolution, 1.5.8, http://bugzilla.ximian.com/enter_bug.cgi?product=Evolution)
+AC_INIT(evolution, 1.5.9, http://bugzilla.ximian.com/enter_bug.cgi?product=Evolution)
 AC_CONFIG_SRCDIR(README)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 
@@ -1009,9 +1009,9 @@ AC_DEFUN(EVO_SET_COMPILE_FLAGS, [
 
 dnl --- Required version numbers
 
-GAL_REQUIRED=2.1.9
-GTKHTML_REQUIRED=3.1.14
-EDS_REQUIRED=0.0.93.1
+GAL_REQUIRED=2.1.10
+GTKHTML_REQUIRED=3.1.15
+EDS_REQUIRED=0.0.94
 BONOBOUI_REQUIRED=2.4.2
 
 AC_SUBST(GAL_REQUIRED)
diff --git a/po/am.po b/po/am.po
index 7a4b2028b5..4a2a6de6be 100644
--- a/po/am.po
+++ b/po/am.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.0\n"
-"POT-Creation-Date: 2004-05-19 14:00-0400\n"
+"POT-Creation-Date: 2004-06-03 11:14-0400\n"
 "PO-Revision-Date: 2003-02-07 17:46+EDT\n"
 "Last-Translator: Ge'ez Frontier Foundation <locales@geez.org>\n"
 "Language-Team: Amharic <locales@geez.org>\n"
@@ -56,13 +56,13 @@ msgstr " እና "
 msgid "Default Sync Address:"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:1150
 #: addressbook/conduit/address-conduit.c:1151
+#: addressbook/conduit/address-conduit.c:1152
 msgid "Could not load addressbook"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:1219
-#: addressbook/conduit/address-conduit.c:1222
+#: addressbook/conduit/address-conduit.c:1220
+#: addressbook/conduit/address-conduit.c:1223
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
@@ -70,13 +70,13 @@ msgstr ""
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
 msgid "Failed to authenticate.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr ""
@@ -125,52 +125,24 @@ msgstr "ወር"
 msgid "Create a new contacts group"
 msgstr "አዲስ ዶሴ ፍጠር"
 
-#: addressbook/gui/component/addressbook-component.c:182
+#: addressbook/gui/component/addressbook-component.c:184
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:483
-msgid "Failed to connect to LDAP server"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:507
-msgid "Failed to authenticate with LDAP server"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:535
-msgid "Could not perform query on Root DSE"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:840
-msgid "The server responded with no supported search bases"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1245
-msgid "This server does not support LDAPv3 schema information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1266
-msgid "Error retrieving schema information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1274
-msgid "Server did not respond with valid schema information"
-msgstr ""
-
 #: addressbook/gui/component/addressbook-migrate.c:68
-#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1160
 #, fuzzy
 msgid "Migrating..."
 msgstr "በመጫን ላይ..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1201
 #, c-format
 msgid "Migrating `%s':"
 msgstr ""
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:438
+#: addressbook/gui/component/addressbook-migrate.c:464
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
 #: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
@@ -178,30 +150,30 @@ msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:446
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
-#: mail/mail-config.glade.h:106
+#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
+#: mail/mail-config.glade.h:109
 msgid "Personal"
 msgstr "የግል"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:454
+#: addressbook/gui/component/addressbook-migrate.c:480
 msgid "On LDAP Servers"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:582
+#: addressbook/gui/component/addressbook-migrate.c:608
 #, fuzzy
 msgid "LDAP Servers"
 msgstr "_የሰርቨር ስም፦"
 
-#: addressbook/gui/component/addressbook-migrate.c:702
+#: addressbook/gui/component/addressbook-migrate.c:728
 #, fuzzy
 msgid "Autocompletion Settings"
 msgstr "አውቶማቲክ"
 
-#: addressbook/gui/component/addressbook-migrate.c:1076
+#: addressbook/gui/component/addressbook-migrate.c:1104
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -209,60 +181,55 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1090
+#: addressbook/gui/component/addressbook-migrate.c:1118
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1099
+#: addressbook/gui/component/addressbook-migrate.c:1127
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1109
+#: addressbook/gui/component/addressbook-migrate.c:1137
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:674
+#: addressbook/gui/component/addressbook-view.c:675
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:761
+#: addressbook/gui/component/addressbook-view.c:754
 #, fuzzy
 msgid "New Address Book"
 msgstr "አድራሻ"
 
-#: addressbook/gui/component/addressbook-view.c:762
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
+#: addressbook/gui/component/addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "አጥፉ"
 
-#: addressbook/gui/component/addressbook-view.c:763
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-view.c:756
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "ምርጫዎች..."
 
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/addressbook-view.c:1002
+#. Create the contacts group
+#: addressbook/gui/component/addressbook-view.c:995
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
 #: calendar/gui/migration.c:373
 msgid "Contacts"
 msgstr ""
@@ -340,10 +307,6 @@ msgid "Manage your S/MIME certificates here"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-msgid "  S_how Supported Bases "
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -358,388 +321,317 @@ msgstr ""
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1:00"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "_ቦታ"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
 #, fuzzy
 msgid "<b>Display</b>"
 msgstr "<b>ሁኔታ፦</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 #, fuzzy
 msgid "<b>Downloading</b>"
 msgstr "_ቦታ"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:10
 #, fuzzy
 msgid "<b>Searching</b>"
 msgstr "<b>ሁኔታ፦</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
 msgid "<b>Server Information</b>"
 msgstr "የኩነቶች መረጃ"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
 msgid "<b>Type:</b>"
 msgstr "<b>ሁኔታ፦</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:13
 #, fuzzy
 msgid "Add Contacts Group"
 msgstr "ወር"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:14
 #, fuzzy
 msgid "Address Book Properties"
 msgstr "አድራሻ"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
-#: mail/mail-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
+#: mail/mail-config.glade.h:42
 msgid "Always"
 msgstr "ሁል ጊዜ"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:17
 #: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "ቀላል"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
-msgid "Connecting"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 #: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "ዝርዝሮች"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
-msgid "Distinguished _name:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Email address"
 msgstr "ኢሜያል አድራሻ"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-#, fuzzy
-msgid "Email address:"
-msgstr "ኢሜያል አድራሻ"
-
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "Evolution will use this DN to authenticate you with the server"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid ""
-"Evolution will use this email address to authenticate you with the server"
+"Evolution will use this email address to authenticate you with the server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Find Possible Search Bases"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:31
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:24
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
+#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "አጠቃላይ"
 
-#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
-#: mail/mail-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
+#: mail/mail-config.glade.h:102
 msgid "Never"
 msgstr "በፍጹም"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
-msgid "One"
-msgstr "አንድ"
-
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:35
-msgid "S_earch scope: "
-msgstr ""
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Search _base:"
+msgstr "&ፈልግ"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
 msgid "Search base only"
 msgstr "&ፈልግ"
 
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:29
 #, fuzzy
 msgid "Search base:"
 msgstr "&ፈልግ"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Search scope:"
 msgstr "&ፈልግ"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
-msgid "Searching"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:31
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
-"server if\n"
-"your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL or TLS."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a \n"
-"insecure environment. For example, if you and your LDAP server are behind a "
-"firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection "
-"is already\n"
-"secure."
+"you are in a insecure environment. For example, if you and your LDAP server "
+"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
+"because your connection is already secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
-"TLS.  This \n"
-"means that your connection will be insecure, and that you will be vulnerable "
-"to security\n"
-"exploits. "
+"TLS.  This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Sub"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
-"searches will \n"
-"begin. If you leave this blank, the search will begin at the root of the "
-"directory tree."
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
-"the \n"
-"directory tree. A search scope of \"sub\" will include all entries below "
-"your search base.\n"
-"A search scope of \"one\" will only include the entries one level beneath "
-"your base.\n"
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:58
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
-"This is the maximum number of entries to download. Setting this number to "
-"be \n"
+"This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:41
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
-"list.\n"
-"It is for display purposes only. "
+"list. It is for display purposes only. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. "
-"A \n"
-"list of standard ports has been provided. Ask your system administrator\n"
-"what port you should specify."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:67
-msgid "This option controls how long a search will be run."
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:43
 #, fuzzy
 msgid "Timeout:"
 msgstr "ሰዓት"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
-msgid "U_se SSL/TLS:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
-#: mail/mail-config.glade.h:154
+#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
+#: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:47
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "ወር"
 
-#: addressbook/gui/component/ldap-config.glade.h:74
-#: calendar/gui/dialogs/calendar-setup.glade.h:12
-msgid "_Display name:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
 msgid "_Email address:"
 msgstr "ኢሜያል አድራሻ"
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:50
+msgid "_Find Possible Search Bases"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "_Log in:"
+msgstr "ዝምብለህ ይግባ"
+
+#: addressbook/gui/component/ldap-config.glade.h:53
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
 msgid "_Name:"
 msgstr "ስም"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
-msgid "_Port number:"
-msgstr "የ_ፖርት ቍጥር፦"
-
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "_Port:"
 msgstr "ቅድሚያ"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
-msgid "_Search base:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:82
-msgid "_Server name:"
-msgstr "_የሰርቨር ስም፦"
+#: addressbook/gui/component/ldap-config.glade.h:55
+#, fuzzy
+msgid "_Search scope:"
+msgstr "&ፈልግ"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:56
 #, fuzzy
 msgid "_Server:"
 msgstr "_የሰርቨር ስም፦"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
-msgid "_Timeout (minutes):"
-msgstr ""
+#: addressbook/gui/component/ldap-config.glade.h:57
+#, fuzzy
+msgid "_Timeout:"
+msgstr "ሰዓት"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:58
 msgid "_Use secure connection:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:87
-msgid "connecting-tab"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:88
-msgid "general-tab"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:60
 #: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
-#: mail/mail-config.glade.h:182
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "ደቂቃዎች"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
-msgid "searching-tab"
-msgstr ""
-
-#: addressbook/gui/component/select-names/e-select-names.c:497
+#: addressbook/gui/component/select-names/e-select-names.c:503
 #: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid "Select Contacts from Address Book"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
@@ -779,7 +671,7 @@ msgstr ""
 
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:222
+#: addressbook/gui/widgets/e-addressbook-view.c:224
 msgid "Source"
 msgstr "ምንጭ"
 
@@ -858,9 +750,9 @@ msgid "<b>Work</b>"
 msgstr "<b>ሁኔታ፦</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
-#: addressbook/gui/widgets/eab-contact-display.c:342
-#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/widgets/eab-contact-display.c:334
+#: addressbook/gui/widgets/eab-contact-display.c:353
 msgid "AIM"
 msgstr ""
 
@@ -899,15 +791,15 @@ msgid "Company:"
 msgstr "የሼሉን ትእዛዝ"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:271
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
+#: addressbook/gui/contact-editor/e-contact-editor.c:266
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1527
+#: addressbook/gui/contact-editor/e-contact-editor.c:520
 msgid "Contact Editor"
 msgstr ""
 
@@ -930,97 +822,94 @@ msgid "Full _Name..."
 msgstr "ሙሉ ስም... (_N)"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:202
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-msgid "Home"
-msgstr "መጀመሪያ"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #, fuzzy
 msgid "Home Page:"
 msgstr "የቤት ፋክስ"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-#, fuzzy
-msgid "Job title:"
-msgstr "አርእስት"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/e-itip-control.c:936
-msgid "Location:"
-msgstr "ቦታ፦"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 #, fuzzy
 msgid "MSN Messenger"
 msgstr "መልዕክቶች"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 #, fuzzy
 msgid "Mailing Address"
 msgstr "ኢሜያል አድራሻ"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 #, fuzzy
 msgid "Manager:"
 msgstr "መቆጣጠሪያ"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "ቅጽል ስም"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Notes:"
 msgstr "_ማስታወሻዎች፦"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
-#: addressbook/gui/contact-editor/e-contact-editor.c:203
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-msgid "Other"
-msgstr "ሌላ"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#, fuzzy
+msgid "Office:"
+msgstr "ቢሮ"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "PO Box:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 #, fuzzy
 msgid "Personal Information"
 msgstr "የኩነቶች መረጃ"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 #, fuzzy
 msgid "Profession:"
 msgstr "መግለጫ የለም"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#, fuzzy
+msgid "Spouse:"
+msgstr "ምንጭ"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "State/Province:"
 msgstr "_የሰርቨር ስም፦"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#, fuzzy
+msgid "Title:"
+msgstr "አርእስት"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+msgid "Video Chat:"
+msgstr ""
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "Wants to receive HTML mail"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:42
 #, fuzzy
-msgid "Webcam:"
+msgid "Web Log:"
 msgstr "ገጽ"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
-#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
-#: mail/mail-config.glade.h:155
+#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
+#: mail/mail-config.glade.h:157
 msgid "Work"
 msgstr "መሥራት"
 
@@ -1039,41 +928,34 @@ msgid "_File under:"
 msgstr "የፋይል ስም"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 #, fuzzy
 msgid "_Where:"
 msgstr "_የሰርቨር ስም፦"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
-msgid "item7"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
-msgid "item8"
-msgstr ""
-
-#: addressbook/gui/contact-editor/eab-editor.c:316
+#: addressbook/gui/contact-editor/eab-editor.c:315
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/eab-editor.c:319
+#: addressbook/gui/contact-editor/eab-editor.c:318
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:351
-#: addressbook/gui/widgets/eab-contact-display.c:372
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Address"
 msgstr "አድራሻ"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:292
+#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard.c:174
@@ -2057,86 +1939,109 @@ msgstr "ዛምቢያ"
 msgid "Zimbabwe"
 msgstr "ዚምቧቤ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/contact-editor/e-contact-editor.c:179
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:337
+#: addressbook/gui/widgets/eab-contact-display.c:356
 msgid "Jabber"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:347
-#: addressbook/gui/widgets/eab-contact-display.c:366
+#: addressbook/gui/contact-editor/e-contact-editor.c:180
+#: addressbook/gui/widgets/eab-contact-display.c:339
+#: addressbook/gui/widgets/eab-contact-display.c:358
 #, fuzzy
 msgid "Yahoo"
 msgstr "ስልክ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: addressbook/gui/widgets/eab-contact-display.c:338
+#: addressbook/gui/widgets/eab-contact-display.c:357
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:344
-#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#: addressbook/gui/widgets/eab-contact-display.c:355
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/contact-editor/e-contact-editor.c:183
 #, fuzzy
 msgid "GroupWise"
 msgstr "የውይይት መድረክ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+msgid "Home"
+msgstr "መጀመሪያ"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+msgid "Other"
+msgstr "ሌላ"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
 #, fuzzy
 msgid "Source Book"
 msgstr "ምንጭ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:264
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:278
+#: addressbook/gui/contact-editor/e-contact-editor.c:273
 msgid "Is New Contact"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:285
+#: addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Writable Fields"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:299
+#: addressbook/gui/contact-editor/e-contact-editor.c:294
 msgid "Changed"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
-msgid "Category editor not available."
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:2352
 msgid "This contact belongs to these categories:"
 msgstr ""
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#: addressbook/gui/contact-editor/e-contact-editor.c:2429
 msgid "Please select an image for this contact"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#: addressbook/gui/contact-editor/e-contact-editor.c:2433
 #, fuzzy
 msgid "No image"
 msgstr "ኒጀር"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#: addressbook/gui/contact-editor/e-contact-editor.c:2636
 msgid ""
-"The following entries are invalid:\n"
+"The contact data is invalid:\n"
 "\n"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2738
-#, c-format
-msgid "Could not find widget for a field: `%s'"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#, fuzzy
+msgid "Invalid contact."
+msgstr "%d ሴኮንዶች"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+msgid ""
+"The contact cannot be saved to the selected address book. Do you want to "
+"discard changes?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2727
+#: addressbook/gui/contact-editor/e-contact-editor.c:2751
+msgid "_Discard"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+msgid ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:62
@@ -2174,7 +2079,7 @@ msgid "_Edit Full"
 msgstr "አስተካክል"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Full Name:"
 msgstr "ሙሉ ስም"
@@ -2327,30 +2232,30 @@ msgstr "የፋይል ስም"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "contact-list-editor"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:153
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:215
+#: addressbook/gui/widgets/e-addressbook-view.c:217
 #: addressbook/gui/widgets/e-minicard-view.c:460
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
 msgid "Is New List"
 msgstr ""
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:215
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
 msgid "Contact List Editor"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:438
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
 msgid "Save List as VCard"
 msgstr ""
 
@@ -2393,155 +2298,155 @@ msgstr ""
 msgid "Advanced Search"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:129
-#: addressbook/gui/widgets/eab-contact-display.c:192
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:139
-#: addressbook/gui/widgets/eab-contact-display.c:205
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:257
-#: addressbook/gui/widgets/eab-contact-display.c:533
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:525
 #, fuzzy
 msgid "List Members"
 msgstr "የፋይል ስም"
 
-#: addressbook/gui/widgets/eab-contact-display.c:329
-#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/eab-contact-display.c:321
+#: addressbook/gui/widgets/eab-contact-display.c:323
 #, fuzzy
 msgid "E-mail"
 msgstr "ኢሜይል"
 
-#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/eab-contact-display.c:332
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:333
 #, fuzzy
 msgid "Position"
 msgstr "መግለጫ የለም"
 
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:354
 #, fuzzy
 msgid "Groupwise"
 msgstr "የውይይት መድረክ"
 
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:340
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:349
-#: addressbook/gui/widgets/eab-contact-display.c:370
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:362
 #, fuzzy
 msgid "Phone"
 msgstr "የቤት ስልክ"
 
-#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:342
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:354
+#: addressbook/gui/widgets/eab-contact-display.c:346
 #, fuzzy
 msgid "work"
 msgstr "መሥራት"
 
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:359
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:368
-#: addressbook/gui/widgets/eab-contact-display.c:587
+#: addressbook/gui/widgets/eab-contact-display.c:360
+#: addressbook/gui/widgets/eab-contact-display.c:579
 msgid "Blog"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/eab-contact-display.c:363
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:375
+#: addressbook/gui/widgets/eab-contact-display.c:367
 #, fuzzy
 msgid "personal"
 msgstr "የግል"
 
-#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/eab-contact-display.c:374
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "ማስታወሻ"
 
-#: addressbook/gui/widgets/eab-contact-display.c:548
+#: addressbook/gui/widgets/eab-contact-display.c:540
 #, fuzzy
 msgid "Job Title"
 msgstr "አርእስት"
 
-#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/eab-contact-display.c:544
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:774
+#: smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "ኢሜይል"
 
-#: addressbook/gui/widgets/eab-contact-display.c:579
+#: addressbook/gui/widgets/eab-contact-display.c:571
 #, fuzzy
 msgid "Home page"
 msgstr "የቤት ፋክስ"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 msgid "Success"
 msgstr ""
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Backend busy"
 msgstr ""
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Repository offline"
 msgstr ""
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 #, fuzzy
 msgid "Address Book does not exist"
 msgstr "አድራሻ"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "No Self Contact defined"
 msgstr ""
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Permission denied"
 msgstr ""
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:57
 #, fuzzy
 msgid "Contact not found"
 msgstr "አልተገኘም"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Contact ID already exists"
 msgstr ""
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Protocol not supported"
 msgstr ""
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:60
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:233
 #: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
@@ -2554,67 +2459,63 @@ msgid "Cancelled"
 msgstr ""
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:61
 #, fuzzy
 msgid "Could not cancel"
 msgstr "ፋይል sን መክፈት አልቻለም፦ %s፦ %s"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Authentication Failed"
 msgstr ""
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Authentication Required"
 msgstr ""
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:66
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "TLS not Available"
 msgstr ""
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#: addressbook/gui/widgets/eab-gui-util.c:66
 msgid "No such source"
 msgstr ""
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:69
+#: addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Other error"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:90
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:110
+#: addressbook/gui/widgets/eab-gui-util.c:97
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:102
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution you must compile the program from the CVS "
-"sources after retrieving OpenLDAP from the link below."
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:109
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "Unable to open addressbook"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:162
+#: addressbook/gui/widgets/eab-gui-util.c:129
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2622,7 +2523,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:168
+#: addressbook/gui/widgets/eab-gui-util.c:135
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -2630,109 +2531,96 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:174
+#: addressbook/gui/widgets/eab-gui-util.c:141
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:177
+#: addressbook/gui/widgets/eab-gui-util.c:144
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:147
 msgid "This query did not complete successfully."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
-msgid "Do you want to save changes?"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:208
-msgid "_Discard"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:169
 msgid "Error adding list"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:229
-#: addressbook/gui/widgets/eab-gui-util.c:652
+#: addressbook/gui/widgets/eab-gui-util.c:169
+#: addressbook/gui/widgets/eab-gui-util.c:580
 msgid "Error adding contact"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying list"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying contact"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:192
 msgid "Error removing list"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
-#: addressbook/gui/widgets/eab-gui-util.c:610
+#: addressbook/gui/widgets/eab-gui-util.c:192
+#: addressbook/gui/widgets/eab-gui-util.c:538
 msgid "Error removing contact"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:334
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:360
+#: addressbook/gui/widgets/eab-gui-util.c:300
 #, c-format
 msgid ""
 "%s already exists\n"
 "Do you want to overwrite it?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:364
+#: addressbook/gui/widgets/eab-gui-util.c:304
 msgid "Overwrite"
 msgstr "በላዩ ላይ ይጻፍ"
 
-#: addressbook/gui/widgets/eab-gui-util.c:400
-#, c-format
-msgid "Error saving %s: %s"
-msgstr ""
-
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:437
+#: addressbook/gui/widgets/eab-gui-util.c:365
 msgid "card.vcf"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:571
+#: addressbook/gui/widgets/eab-gui-util.c:499
 msgid "list"
 msgstr "ዝርዝር"
 
-#: addressbook/gui/widgets/eab-gui-util.c:706
+#: addressbook/gui/widgets/eab-gui-util.c:634
 msgid "Move contact to"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:708
+#: addressbook/gui/widgets/eab-gui-util.c:636
 msgid "Copy contact to"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:711
+#: addressbook/gui/widgets/eab-gui-util.c:639
 msgid "Move contacts to"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:713
+#: addressbook/gui/widgets/eab-gui-util.c:641
 msgid "Copy contacts to"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:716
+#: addressbook/gui/widgets/eab-gui-util.c:644
 msgid "Select target addressbook."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:939
+#: addressbook/gui/widgets/eab-gui-util.c:867
 msgid "Multiple VCards"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:942
+#: addressbook/gui/widgets/eab-gui-util.c:870
 #, c-format
 msgid "VCard for %s"
 msgstr ""
@@ -2820,7 +2708,7 @@ msgstr[1] "%d ሴኮንዶች"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:229
+#: addressbook/gui/widgets/e-addressbook-view.c:231
 #: addressbook/gui/widgets/e-minicard-view.c:467
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
@@ -2838,143 +2726,135 @@ msgstr "ሞዴል"
 msgid "Error modifying card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:163
 msgid "Name begins with"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:164
 msgid "Email begins with"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:57
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr ""
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-#: calendar/gui/cal-search-bar.c:50
+#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+#: addressbook/gui/widgets/e-addressbook-view.c:172
 msgid "Advanced..."
 msgstr "ጠለቅ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:236
+#: addressbook/gui/widgets/e-addressbook-view.c:238
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:249
+#: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "ዓይነት"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:506
+#: addressbook/gui/widgets/e-addressbook-view.c:508
 #, fuzzy
 msgid "Address Book"
 msgstr "አድራሻ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2076
+#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:2080
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
 msgstr "በሌላ ስም አስቀምጥ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 msgid "New Contact..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "New Contact List..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Go to Folder..."
 msgstr "ወደ ዶሴን ሂዱ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Import..."
 msgstr "ከውጭ አስገባ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1066
 msgid "Search for Contacts..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "አድራሻ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1069
 msgid "Pilot Settings..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
 msgid "Send Message to Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "አትም"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
+#: addressbook/gui/widgets/e-addressbook-view.c:1077
 msgid "Print Envelope"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
+#: addressbook/gui/widgets/e-addressbook-view.c:1081
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "አድራሻ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1080
+#: addressbook/gui/widgets/e-addressbook-view.c:1082
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "አድራሻ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "ቁረጥ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "ቅጂ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1087
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "ለጥፍ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:1092
+#: calendar/gui/e-calendar-view.c:1280
 msgid "Current View"
 msgstr "የአሁኑ ዕይታ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1309
-#, c-format
-msgid ""
-"The addressbook backend for\n"
-"%s\n"
-"has crashed. You will have to restart Evolution in order to use it again"
-msgstr ""
-
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1667
-#: calendar/gui/cal-search-bar.c:362
+#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr ""
 
@@ -3083,7 +2963,7 @@ msgstr "ሬዲዮ"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-list-view.c:234
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr ""
@@ -3219,12 +3099,12 @@ msgstr ""
 msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.c:998
+#: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.c:1064
-#: addressbook/printing/e-contact-print.c:1091
+#: addressbook/printing/e-contact-print.c:1066
+#: addressbook/printing/e-contact-print.c:1093
 msgid "Print contact"
 msgstr ""
 
@@ -3472,15 +3352,20 @@ msgstr ""
 msgid "Impossible internal error."
 msgstr "የውስጥ ብልሽት"
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:629
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
 #, fuzzy
 msgid "Can not open file"
 msgstr "ፋይል sን መክፈት አልቻለም፦ %s፦ %s"
 
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-msgid "Can not load URI"
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "አድራሻ"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+msgid "failed to open book"
 msgstr ""
 
 #: addressbook/tools/evolution-addressbook-import.c:46
@@ -3499,7 +3384,7 @@ msgstr ""
 msgid "Unnamed List"
 msgstr ""
 
-#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 #, fuzzy
 msgid "Enter password"
@@ -3761,10 +3646,10 @@ msgid "Whether to show week numbers in date navigator"
 msgstr ""
 
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:88
-#: calendar/gui/gnome-cal.c:1703
-#: camel/providers/groupwise/camel-gw-listener.c:304
-#: camel/providers/groupwise/camel-gw-listener.c:327
+#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/gnome-cal.c:1705
+#: camel/providers/groupwise/camel-gw-listener.c:311
+#: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
 msgstr "ቀን መቁጠሪያ"
 
@@ -3781,7 +3666,7 @@ msgstr ""
 
 #: calendar/gui/calendar-commands.c:363
 #: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:19 filter/filter.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
 msgid "days"
 msgstr "ቀን"
 
@@ -3934,24 +3819,24 @@ msgstr "የሳመንት ዕይታ"
 msgid "Month View"
 msgstr "የወር ዕይታ"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:54
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:53
 #, fuzzy
 msgid "Location contains"
 msgstr "ቦታ፦"
 
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
 msgid "Unmatched"
 msgstr ""
 
@@ -3972,23 +3857,23 @@ msgstr ""
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:466
+#: calendar/gui/dialogs/alarm-options.c:467
 msgid "Audio Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:475
+#: calendar/gui/dialogs/alarm-options.c:476
 msgid "Message Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:484
+#: calendar/gui/dialogs/alarm-options.c:485
 msgid "Email Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:493
+#: calendar/gui/dialogs/alarm-options.c:494
 msgid "Program Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:510
 msgid "Unknown Alarm Options"
 msgstr ""
 
@@ -4027,7 +3912,7 @@ msgstr "ላክ"
 msgid "With these arguments:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
 msgid "dialog1"
 msgstr ""
 
@@ -4036,7 +3921,7 @@ msgid "extra times every"
 msgstr ""
 
 #: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:20 filter/filter.glade.h:16
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr "ሰዓትን"
 
@@ -4084,7 +3969,7 @@ msgstr ""
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "ማጠቃለያ፦"
 
@@ -4114,7 +3999,6 @@ msgid "hour(s)"
 msgstr "ሰዓት(ኦች)"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:21
 msgid "minute(s)"
 msgstr "ደቂቃ(ዎች)"
 
@@ -4122,26 +4006,26 @@ msgstr "ደቂቃ(ዎች)"
 msgid "start of appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:170
+#: calendar/gui/dialogs/calendar-setup.c:172
 msgid "You must specify a location to get the calendar from."
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:178
+#: calendar/gui/dialogs/calendar-setup.c:180
 #, c-format
 msgid "The source location '%s' is not well-formed."
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:193
+#: calendar/gui/dialogs/calendar-setup.c:195
 #, c-format
 msgid "The source location '%s' is not a webcal source."
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:265
+#: calendar/gui/dialogs/calendar-setup.c:275
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:278
+#: calendar/gui/dialogs/calendar-setup.c:288
 #, c-format
 msgid ""
 "The group '%s' is remote. You must specify a location to get the calendar "
@@ -4163,60 +4047,36 @@ msgstr "አድራሻ"
 msgid "C_olor:"
 msgstr "ቀለሞች (_O)"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-#, fuzzy
-msgid "Calendar Properties"
-msgstr "ቀን መቁጠሪያ"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
 msgid "Pick a color"
 msgstr "ቀለም ምረጡ"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:8
-#, fuzzy
-msgid "Remote"
-msgstr "አስወግድ"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-#, fuzzy
-msgid "Task List Properties"
-msgstr "ምርጫዎች"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
 #, fuzzy
 msgid "_Add Calendar"
 msgstr "ኒው ካሌዶኒያ"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
 #, fuzzy
 msgid "_Add Group"
 msgstr "አዲስ መድረክ"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-msgid "_Refresh Interval:"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
 #, fuzzy
 msgid "_Refresh:"
 msgstr "በድጋሚ ጀምር"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-#, fuzzy
-msgid "_Source URL:"
-msgstr "ምንጭ"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
 #, fuzzy
 msgid "_Type:"
 msgstr "ዓይነት፦"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
 #, fuzzy
 msgid "_URL:"
 msgstr "url"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
 msgid "weeks"
 msgstr "ሳመንታት"
 
@@ -4325,7 +4185,7 @@ msgid "Display"
 msgstr "አሳይ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:76
 msgid "E_nable"
 msgstr "አስቻለ"
 
@@ -4335,7 +4195,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:563
+#: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "ዓርብ"
 
@@ -4349,7 +4209,7 @@ msgstr "ደቂቃዎች"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:559
+#: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "ሰኞ"
 
@@ -4359,7 +4219,7 @@ msgstr "_እሑድ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:564
+#: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "ቅዳሜ"
 
@@ -4373,7 +4233,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "እሑድ"
 
@@ -4387,7 +4247,7 @@ msgstr "_ሐሙስ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:562
+#: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "ሐሙስ"
 
@@ -4401,7 +4261,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:560
+#: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "ማክሰኞ"
 
@@ -4411,7 +4271,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:561
+#: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "ረቡዕ"
 
@@ -4445,7 +4305,7 @@ msgid "_Day begins:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
-#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:43
@@ -4494,76 +4354,46 @@ msgstr ""
 msgid "before every appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:57
-msgid ""
-"The event being deleted is a meeting, would you like to send a cancellation "
-"notice?"
-msgstr ""
-
-#: calendar/gui/dialogs/cancel-comp.c:60
-msgid "Are you sure you want to cancel and delete this meeting?"
-msgstr ""
-
-#: calendar/gui/dialogs/cancel-comp.c:66
-msgid ""
-"The task being deleted is assigned, would you like to send a cancellation "
-"notice?"
-msgstr ""
-
-#: calendar/gui/dialogs/cancel-comp.c:69
-msgid "Are you sure you want to cancel and delete this task?"
-msgstr ""
-
-#: calendar/gui/dialogs/cancel-comp.c:75
-msgid ""
-"The journal entry being deleted is published, would you like to send a "
-"cancellation notice?"
-msgstr ""
-
-#: calendar/gui/dialogs/cancel-comp.c:78
-msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr ""
-
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:68
 msgid "This journal entry has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:75
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:82
+#: calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:92
 msgid "This journal entry has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:99
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
@@ -4601,7 +4431,7 @@ msgid "No summary"
 msgstr ""
 
 #: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
 #: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "በሌላ ስም አስቀምጥ..."
@@ -4655,99 +4485,51 @@ msgstr "ፋይል sን መክፈት አልቻለም፦ %s፦ %s"
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:95
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:98
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:104
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:107
-msgid "Are you sure you want to delete this untitled task?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:113
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:116
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:131
-#, c-format
-msgid "Are you sure you want to delete %d appointment?"
-msgid_plural "Are you sure you want to delete %d appointments?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: calendar/gui/dialogs/delete-comp.c:138
-#, c-format
-msgid "Are you sure you want to delete %d task?"
-msgid_plural "Are you sure you want to delete %d tasks?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: calendar/gui/dialogs/delete-comp.c:145
-#, c-format
-msgid "Are you sure you want to delete %d journal entry?"
-msgid_plural "Are you sure you want to delete %d journal entries?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: calendar/gui/dialogs/delete-error.c:52
+#: calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:55
+#: calendar/gui/dialogs/delete-error.c:57
 msgid "The task could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:58
+#: calendar/gui/dialogs/delete-error.c:60
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:61
+#: calendar/gui/dialogs/delete-error.c:63
 msgid "The item could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:68
+#: calendar/gui/dialogs/delete-error.c:70
 msgid "The event could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:71
+#: calendar/gui/dialogs/delete-error.c:73
 msgid "The task could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:74
+#: calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:77
+#: calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:84
+#: calendar/gui/dialogs/delete-error.c:86
 msgid "The event could not be deleted due to an error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:87
+#: calendar/gui/dialogs/delete-error.c:89
 msgid "The task could not be deleted due to an error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:90
+#: calendar/gui/dialogs/delete-error.c:92
 msgid "The journal entry could not be deleted due to an error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:93
+#: calendar/gui/dialogs/delete-error.c:95
 msgid "The item could not be deleted due to an error"
 msgstr ""
 
@@ -4884,11 +4666,11 @@ msgstr ""
 
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:3
+#: calendar/gui/dialogs/meeting-page.glade.h:4
 #: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
 #: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1559
-#: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:100
+#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
+#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
@@ -4914,8 +4696,8 @@ msgstr ""
 #. FIXME: need to disable for undeletable folders
 #: calendar/gui/dialogs/meeting-page.c:655
 #: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1310 calendar/gui/e-calendar-view.c:1342
-#: mail/em-folder-tree.c:2557 mail/em-folder-view.c:919
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
+#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -4923,7 +4705,7 @@ msgid "_Delete"
 msgstr "አጥፉ"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:240
+#: calendar/gui/e-meeting-list-view.c:218
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr ""
@@ -4959,16 +4741,15 @@ msgid "Member"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
-#: mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-list-view.c:248
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "ሁኔታ"
 
@@ -4976,18 +4757,18 @@ msgstr "ሁኔታ"
 msgid "Add A_ttendee"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr ""
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "Add attendees from addressbook."
+msgstr "አድራሻ"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "_Change Organizer"
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.glade.h:6
-#: calendar/gui/e-meeting-time-sel.c:417
-msgid "_Invite Others..."
+msgid "_Change Organizer"
 msgstr ""
 
 #: calendar/gui/dialogs/new-calendar.glade.h:2
@@ -5147,7 +4928,7 @@ msgid "_No recurrence"
 msgstr ""
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:450
+#: composer/e-msg-composer-attachment-bar.c:453
 msgid "_Remove"
 msgstr "አስወግድ"
 
@@ -5179,53 +4960,21 @@ msgstr "ሳመንት"
 msgid "year(s)"
 msgstr "ዓመት"
 
-#: calendar/gui/dialogs/save-comp.c:53
-msgid ""
-"This event has been changed, but has not been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-
-#: calendar/gui/dialogs/save-comp.c:57
-msgid "_Discard Changes"
-msgstr ""
-
-#: calendar/gui/dialogs/save-comp.c:62
-#, fuzzy
-msgid "Save Event"
-msgstr "የቀን መቁጠሪያ ኩነቶች"
-
-#: calendar/gui/dialogs/select-source-dialog.c:65
+#: calendar/gui/dialogs/select-source-dialog.c:69
 #, fuzzy
 msgid "Select destination"
 msgstr "ፋይል sን መክፈት አልቻለም፦ %s፦ %s"
 
-#: calendar/gui/dialogs/select-source-dialog.c:86
+#: calendar/gui/dialogs/select-source-dialog.c:90
 #, fuzzy
 msgid "_Destination"
 msgstr "አዲስ ዶሴ ፍጠር"
 
-#: calendar/gui/dialogs/select-source-dialog.c:88
+#: calendar/gui/dialogs/select-source-dialog.c:92
 #, fuzzy
 msgid "Task List"
 msgstr "የፋይል ስም"
 
-#: calendar/gui/dialogs/send-comp.c:57
-msgid "The meeting information has been created. Send it?"
-msgstr ""
-
-#: calendar/gui/dialogs/send-comp.c:60
-msgid "The meeting information has changed. Send an updated version?"
-msgstr ""
-
-#: calendar/gui/dialogs/send-comp.c:67
-msgid "The task assignment information has been created. Send it?"
-msgstr ""
-
-#: calendar/gui/dialogs/send-comp.c:71
-msgid "The task information has changed. Send an updated version?"
-msgstr ""
-
 #: calendar/gui/dialogs/task-details-page.c:406
 msgid "Completed date is wrong"
 msgstr ""
@@ -5245,7 +4994,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #: calendar/gui/e-cal-component-preview.c:249
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:960
 msgid "High"
 msgstr "ከፍ ያለ"
 
@@ -5259,14 +5008,14 @@ msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:253
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:958
 msgid "Low"
 msgstr "ዝቅ ያለ"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:251
 #: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:957
+#: mail/message-list.c:959
 msgid "Normal"
 msgstr "የተለመደ"
 
@@ -5326,8 +5075,8 @@ msgstr "ሚስጢራዊ"
 
 #: calendar/gui/dialogs/task-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
+#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "መግለጫ"
 
@@ -5500,7 +5249,7 @@ msgstr "ቀን፦"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:950
+#: calendar/gui/e-itip-control.c:943
 msgid "Status:"
 msgstr "ሁኔታ፦"
 
@@ -5586,12 +5335,12 @@ msgstr ""
 msgid "Deleting selected objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
 msgid "Updating objects"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1370
+#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
 #: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "ክፈት"
@@ -5601,15 +5350,15 @@ msgid "Open _Web Page"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1291 calendar/gui/e-calendar-view.c:1376
-#: mail/em-folder-view.c:896 mail/em-popup.c:690 mail/em-popup.c:806
+#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
+#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "በሌላ ስም አስቀምጥ"
 
 #: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1292
-#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
+#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
@@ -5617,24 +5366,24 @@ msgid "_Print..."
 msgstr "አትም"
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "ቁረጥ"
 
 #: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1338
-#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2550
-#: mail/message-list.c:1644 ui/evolution-addressbook.xml.h:31
+#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
+#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
+#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "ቅጂ"
 
 #: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1273 calendar/gui/e-calendar-view.c:1299
-#: calendar/gui/e-calendar-view.c:1372 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
+#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
@@ -5703,71 +5452,71 @@ msgstr "ማጠቃለያ"
 msgid "Task sort"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
 msgid "New _Appointment..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
+#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
+#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
 msgid "New Meeting"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
 msgid "New Task"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "ዶሴ ምረጡ"
 
-#: calendar/gui/e-calendar-view.c:1280
+#: calendar/gui/e-calendar-view.c:1283
 #, fuzzy
 msgid "_Select Date..."
 msgstr "አጥፉ..."
 
-#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1303
+#: calendar/gui/e-calendar-view.c:1306
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "ወደ ዶሴን ሂዱ..."
 
-#: calendar/gui/e-calendar-view.c:1304
+#: calendar/gui/e-calendar-view.c:1307
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "ወደ ዶሴን ሂዱ..."
 
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1308
 msgid "_Schedule Meeting..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1309
 msgid "_Forward as iCalendar..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1349
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1351
 msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "ምርጫዎች"
 
@@ -5782,9 +5531,9 @@ msgstr ""
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:967 calendar/gui/e-itip-control.c:1169
-#: calendar/gui/e-meeting-list-view.c:144
-#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
 #: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
 #: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
 #: camel/camel-tcp-stream-openssl.c:631
@@ -5810,13 +5559,13 @@ msgid "Assigned"
 msgstr ""
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr "አዎ"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "አይ"
 
@@ -5828,7 +5577,7 @@ msgstr "n"
 msgid "S"
 msgstr "s"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
 msgid "E"
 msgstr "ምሥራቅ"
 
@@ -5894,402 +5643,406 @@ msgstr "%d %b"
 msgid "%02i minute divisions"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:592
+#: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:596
 #, fuzzy, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "በየቀን"
 msgstr[1] "በየቀን"
 
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:601
 #, fuzzy, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "በየሳመንት"
 msgstr[1] "በየሳመንት"
 
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:603
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:618
+#: calendar/gui/e-itip-control.c:611
 msgid " and "
 msgstr " እና "
 
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:618
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:631
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:645
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "በየወር"
 msgstr[1] "በየወር"
 
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:642
 #, fuzzy, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "በየ ዓመት"
 msgstr[1] "በየ ዓመት"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:653
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:669
+#: calendar/gui/e-itip-control.c:662
 msgid ", ending on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:686
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:696
 msgid "<b>Ends:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:716
 msgid "<b>Completed:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:733
+#: calendar/gui/e-itip-control.c:726
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:771 calendar/gui/e-itip-control.c:827
+#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
 msgid "iCalendar Information"
 msgstr ""
 
 #. Title
-#: calendar/gui/e-itip-control.c:788
+#: calendar/gui/e-itip-control.c:781
 msgid "iCalendar Error"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:859 calendar/gui/e-itip-control.c:875
-#: calendar/gui/e-itip-control.c:886 calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
 msgid "An unknown person"
 msgstr ""
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:910
+#: calendar/gui/e-itip-control.c:903
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:925
+#: calendar/gui/e-itip-control.c:918
 msgid "<i>None</i>"
 msgstr "<i>ምንም</i>"
 
-#: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:929
+msgid "Location:"
+msgstr "ቦታ፦"
+
+#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:959 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:963 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.c:1050
-#: calendar/gui/e-itip-control.c:1076 calendar/gui/e-itip-control.c:1089
-#: calendar/gui/e-itip-control.c:1102 calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
 msgid "Choose an action:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1023
+#: calendar/gui/e-itip-control.c:1016
 msgid "Update"
 msgstr "አሻሽል"
 
-#: calendar/gui/e-itip-control.c:1024 calendar/gui/e-itip-control.c:1055
-#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1091
-#: calendar/gui/e-itip-control.c:1104 calendar/gui/e-itip-control.c:1117
-#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
+#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "እሺ"
 
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1044
 msgid "Accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1045
 msgid "Tentatively accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1046
 msgid "Decline"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1070
 msgid "Send Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1090
+#: calendar/gui/e-itip-control.c:1083
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1103
+#: calendar/gui/e-itip-control.c:1096
 msgid "Send Latest Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1116 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "ተወው"
 
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1185
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1193
+#: calendar/gui/e-itip-control.c:1186
 msgid "Meeting Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1191
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1193
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1201
+#: calendar/gui/e-itip-control.c:1194
 msgid "Meeting Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1206
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1203
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1204
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1218
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1226
+#: calendar/gui/e-itip-control.c:1219
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1227
+#: calendar/gui/e-itip-control.c:1220
 msgid "Meeting Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1234 calendar/gui/e-itip-control.c:1302
-#: calendar/gui/e-itip-control.c:1337
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1330
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1228
 msgid "Bad Meeting Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1253
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1254
 msgid "Task Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1259
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1262
 msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1278
+#: calendar/gui/e-itip-control.c:1271
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1272
 msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1286
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1294
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1288
 msgid "Task Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1303
+#: calendar/gui/e-itip-control.c:1296
 msgid "Bad Task Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1315
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1323
+#: calendar/gui/e-itip-control.c:1316
 msgid "Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1321
 msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1325
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1326
 msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1331
 msgid "Bad Free/Busy Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1413
+#: calendar/gui/e-itip-control.c:1406
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1472
+#: calendar/gui/e-itip-control.c:1465
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1503
+#: calendar/gui/e-itip-control.c:1496
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1535
+#: calendar/gui/e-itip-control.c:1528
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1769
+#: calendar/gui/e-itip-control.c:1762
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
+#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1825
+#: calendar/gui/e-itip-control.c:1818
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1837
+#: calendar/gui/e-itip-control.c:1830
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1856
+#: calendar/gui/e-itip-control.c:1849
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1852
 msgid "Object could not be found\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1855
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1865
+#: calendar/gui/e-itip-control.c:1858
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1861
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1892
 msgid "Removal Complete"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
 msgid "Item sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
+#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
 msgid "The item could not be sent!\n"
 msgstr ""
 
@@ -6330,74 +6083,74 @@ msgstr ""
 msgid "date-start"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:62
+#: calendar/gui/e-meeting-list-view.c:59
 msgid "Chair Persons"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:479
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
 msgid "Required Participants"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:64
+#: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:65
+#: calendar/gui/e-meeting-list-view.c:62
 msgid "Resources"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:140 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
 #: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "የውይይት መድረክ"
 
-#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:154 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:127
 #: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
 msgid "Required Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:179 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:177
 #: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
 msgid "Needs Action"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:182 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
 #: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr ""
@@ -6414,20 +6167,25 @@ msgstr ""
 msgid "No Information"
 msgstr ""
 
+#: calendar/gui/e-meeting-time-sel.c:417
+#, fuzzy
+msgid "Add attendees from addressbook"
+msgstr "አድራሻ"
+
 #: calendar/gui/e-meeting-time-sel.c:440
 msgid "_Options"
 msgstr "ምርጫዎች (_O)"
 
 #: calendar/gui/e-meeting-time-sel.c:457
-msgid "Show _Only Working Hours"
+msgid "Show _only working hours"
 msgstr ""
 
 #: calendar/gui/e-meeting-time-sel.c:467
-msgid "Show _Zoomed Out"
+msgid "Show _zoomed out"
 msgstr ""
 
 #: calendar/gui/e-meeting-time-sel.c:482
-msgid "_Update Free/Busy"
+msgid "_Update free/busy"
 msgstr ""
 
 #: calendar/gui/e-meeting-time-sel.c:497
@@ -6443,19 +6201,19 @@ msgid ">_>"
 msgstr ">_>"
 
 #: calendar/gui/e-meeting-time-sel.c:547
-msgid "_All People and Resources"
+msgid "_All people and resources"
 msgstr ""
 
 #: calendar/gui/e-meeting-time-sel.c:556
-msgid "All _People and One Resource"
+msgid "All _people and one resource"
 msgstr ""
 
 #: calendar/gui/e-meeting-time-sel.c:565
-msgid "_Required People"
+msgid "_Required people"
 msgstr ""
 
 #: calendar/gui/e-meeting-time-sel.c:574
-msgid "Required People and _One Resource"
+msgid "Required people and _one resource"
 msgstr ""
 
 #: calendar/gui/e-meeting-time-sel.c:593
@@ -6493,79 +6251,69 @@ msgstr "%d/%m/%Y"
 msgid "Enter the password for %s"
 msgstr "ሚስጢራዊ ቃል አስገቡ"
 
-#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
 #, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-
 #. FIXME Loading should be async
 #. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:686
+#: calendar/gui/e-tasks.c:801
 #, c-format
 msgid "Opening tasks at %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:709
+#: calendar/gui/e-tasks.c:824
 #, c-format
 msgid ""
 "Error opening %s:\n"
 "%s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:730
+#: calendar/gui/e-tasks.c:845
 #, fuzzy
 msgid "Loading tasks"
 msgstr "በመጫን ላይ..."
 
-#: calendar/gui/e-tasks.c:834
+#: calendar/gui/e-tasks.c:949
 msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:857
+#: calendar/gui/e-tasks.c:972
 msgid "Deleting selected objects..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:884
+#: calendar/gui/e-tasks.c:999
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:960
+#: calendar/gui/e-tasks.c:1075
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
-#: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
+#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
+#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
 #: calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:705
 msgid "Tasks"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1876
+#: calendar/gui/gnome-cal.c:1878
 #, c-format
 msgid "Loading appointments at %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1895
+#: calendar/gui/gnome-cal.c:1897
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "በመጫን ላይ..."
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1920
 #, c-format
 msgid "Opening %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2048
-#, c-format
-msgid "The calendar backend for '%s' has crashed."
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:2894
+#: calendar/gui/gnome-cal.c:2906
 #, fuzzy
 msgid "Purging"
 msgstr "አትም"
@@ -6758,7 +6506,7 @@ msgid "On The Web"
 msgstr ""
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 
@@ -6769,7 +6517,7 @@ msgid "Unable to migrate calendar `%s'"
 msgstr "ፋይል sን መክፈት አልቻለም፦ %s፦ %s"
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:869
+#: calendar/gui/migration.c:889
 #, fuzzy, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr ""
@@ -7007,72 +6755,72 @@ msgstr ""
 msgid "Print Setup"
 msgstr "የህትመት ቅንጅት"
 
-#: calendar/gui/tasks-component.c:303
+#: calendar/gui/tasks-component.c:313
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:371
 msgid "New Task List"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:398
+#: calendar/gui/tasks-component.c:408
 #, fuzzy, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d አጠቃላይ"
 msgstr[1] "%d አጠቃላይ"
 
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] "%d ተመርጠዋል"
 msgstr[1] "%d ተመርጠዋል"
 
-#: calendar/gui/tasks-component.c:447
+#: calendar/gui/tasks-component.c:457
 #, fuzzy
 msgid "Failed upgrading tasks."
 msgstr "በመጫን ላይ..."
 
-#: calendar/gui/tasks-component.c:526
+#: calendar/gui/tasks-component.c:749
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:538
+#: calendar/gui/tasks-component.c:761
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:576
+#: calendar/gui/tasks-component.c:799
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:804
+#: calendar/gui/tasks-component.c:1040
 msgid "New task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:805
+#: calendar/gui/tasks-component.c:1041
 #, fuzzy
 msgid "_Task"
 msgstr "የማይፈለግ"
 
-#: calendar/gui/tasks-component.c:806
+#: calendar/gui/tasks-component.c:1042
 msgid "Create a new task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:812
+#: calendar/gui/tasks-component.c:1048
 #, fuzzy
 msgid "New tasks group"
 msgstr "አድራሻ"
 
-#: calendar/gui/tasks-component.c:813
+#: calendar/gui/tasks-component.c:1049
 msgid "_Tasks Group"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:814
+#: calendar/gui/tasks-component.c:1050
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "አዲስ ዶሴ ፍጠር"
@@ -8827,12 +8575,12 @@ msgstr ""
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1259
+#: camel/camel-folder.c:1262
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1299
+#: camel/camel-folder.c:1302
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
@@ -8845,11 +8593,16 @@ msgstr ""
 msgid "Copying messages"
 msgstr ""
 
-#: camel/camel-folder.c:1666
-msgid "Learning junk and/or non junk message(s)"
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "ማስጠንቀቂያ"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
 msgstr ""
 
-#: camel/camel-folder.c:1695
+#: camel/camel-folder.c:1701
 msgid "Filtering new message(s)"
 msgstr ""
 
@@ -8879,15 +8632,15 @@ msgstr ""
 msgid "(match-threads) requires a match type string"
 msgstr ""
 
-#: camel/camel-folder-search.c:785
+#: camel/camel-folder-search.c:784
 msgid "(match-threads) expects an array result"
 msgstr ""
 
-#: camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:790
 msgid "(match-threads) requires the folder set"
 msgstr ""
 
-#: camel/camel-folder-search.c:880
+#: camel/camel-folder-search.c:879
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr ""
@@ -8917,7 +8670,8 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
 #: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:706
+#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr ""
@@ -9274,7 +9028,7 @@ msgstr ""
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1212
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -9644,44 +9398,44 @@ msgstr ""
 msgid "export keys: unimplemented"
 msgstr ""
 
-#: camel/camel-store.c:214
+#: camel/camel-store.c:213
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-store.c:244
+#: camel/camel-store.c:243
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr ""
 "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
 "%s"
 
-#: camel/camel-store.c:295
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-store.c:323
+#: camel/camel-store.c:325
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr ""
 "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
 "%s"
 
-#: camel/camel-store.c:387 camel/camel-vee-store.c:354
+#: camel/camel-store.c:389 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr ""
 
-#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#: camel/camel-store.c:439 camel/camel-vee-store.c:387
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr ""
 
-#: camel/camel-store.c:811
+#: camel/camel-store.c:777
 msgid "Trash"
 msgstr "የማይፈለግ"
 
-#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
-#: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/mail-config.glade.h:95
+#: ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
 msgstr "ጁን"
@@ -9889,12 +9643,12 @@ msgstr ""
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:374
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr ""
 
-#: camel/camel-vee-store.c:398
+#: camel/camel-vee-store.c:395
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr ""
@@ -9936,31 +9690,31 @@ msgstr "አድራሻ"
 msgid "Post Office Agent SOAP Port:"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:80
+#: camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "Novell GroupWise"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:82
+#: camel/providers/groupwise/camel-groupwise-provider.c:85
 msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: camel/providers/groupwise/camel-groupwise-provider.c:100
 #: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
 msgid "Password"
 msgstr "ሚስጢራዊ ቃል"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:99
+#: camel/providers/groupwise/camel-groupwise-provider.c:102
 #: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/groupwise/camel-gw-listener.c:305
-#: camel/providers/groupwise/camel-gw-listener.c:328
+#: camel/providers/groupwise/camel-gw-listener.c:312
+#: camel/providers/groupwise/camel-gw-listener.c:335
 #, fuzzy
 msgid "Checklist"
 msgstr "ዝርዝር"
@@ -10114,13 +9868,13 @@ msgid ""
 msgstr ""
 
 #: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:429
+#: camel/providers/imap/camel-imap-store.c:428
 #, c-format
 msgid "IMAP server %s"
 msgstr ""
 
 #: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:431
+#: camel/providers/imap/camel-imap-store.c:430
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr ""
@@ -10130,7 +9884,7 @@ msgstr ""
 #: camel/providers/imap/camel-imap-store.c:551
 #: camel/providers/imap/camel-imap-store.c:571
 #: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
+#: camel/providers/nntp/camel-nntp-store.c:209
 #: camel/providers/pop3/camel-pop3-store.c:175
 #: camel/providers/smtp/camel-smtp-transport.c:269
 #: camel/providers/smtp/camel-smtp-transport.c:285
@@ -10147,10 +9901,10 @@ msgstr ""
 
 #: camel/providers/imap4/camel-imap4-store.c:222
 #: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:815
+#: camel/providers/imap/camel-imap-store.c:845
 #: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:137
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
 #: camel/providers/pop3/camel-pop3-store.c:192
 msgid "Connection cancelled"
 msgstr ""
@@ -10163,8 +9917,8 @@ msgid ""
 msgstr ""
 
 #: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:649
-#: camel/providers/imap/camel-imap-store.c:680
+#: camel/providers/imap/camel-imap-store.c:679
+#: camel/providers/imap/camel-imap-store.c:710
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
@@ -10173,7 +9927,7 @@ msgstr ""
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1109
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
 msgid "Unknown error"
 msgstr "ያልታወቀ ስህተት"
 
@@ -10201,8 +9955,8 @@ msgstr ""
 "%s"
 
 #: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1857
-#: camel/providers/imap/camel-imap-store.c:2235
+#: camel/providers/imap/camel-imap-store.c:1885
+#: camel/providers/imap/camel-imap-store.c:2263
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -10296,12 +10050,12 @@ msgstr ""
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3168
+#: camel/providers/imap/camel-imap-store.c:3194
 msgid "Operation cancelled"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3171
+#: camel/providers/imap/camel-imap-store.c:3197
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
@@ -10363,13 +10117,6 @@ msgid "Unable to retrieve message: %s"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:219
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -10377,15 +10124,15 @@ msgid ""
 msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-mbox-folder.c:418
+#: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:2019
-#: camel/providers/imap/camel-imap-folder.c:2621
-#: camel/providers/nntp/camel-nntp-folder.c:238
+#: camel/providers/imap/camel-imap-folder.c:2622
+#: camel/providers/nntp/camel-nntp-folder.c:220
 msgid "This message is not currently available"
 msgstr ""
 
@@ -10394,7 +10141,23 @@ msgstr ""
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2659
+#: camel/providers/imap/camel-imap-folder.c:2463
+#, c-format
+msgid "Incomplete server response: no information provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2471
+#, c-format
+msgid "Incomplete server response: no UID provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2484
+#, c-format
+msgid ""
+"Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2660
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -10454,43 +10217,43 @@ msgstr ""
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/imap/camel-imap-store.c:680
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:711
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:818
+#: camel/providers/imap/camel-imap-store.c:848
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "ፋይል sን መክፈት አልቻለም፦ %s፦ %s"
 
-#: camel/providers/imap/camel-imap-store.c:1242
+#: camel/providers/imap/camel-imap-store.c:1272
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1252
+#: camel/providers/imap/camel-imap-store.c:1282
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1305
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1289
+#: camel/providers/imap/camel-imap-store.c:1319
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1318
+#: camel/providers/imap/camel-imap-store.c:1348
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10498,18 +10261,18 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1839
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:1867
+#: camel/providers/imap/camel-imap-store.c:2057
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1915
-#: camel/providers/imap/camel-imap-store.c:2296
+#: camel/providers/imap/camel-imap-store.c:1943
+#: camel/providers/imap/camel-imap-store.c:2324
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1970
+#: camel/providers/imap/camel-imap-store.c:1998
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10519,7 +10282,7 @@ msgstr ""
 "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
 "%s"
 
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:2274
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr ""
@@ -10551,20 +10314,20 @@ msgid "Index message body data"
 msgstr ""
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:388
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:393
-#: camel/providers/local/camel-local-folder.c:396
+#: camel/providers/local/camel-local-folder.c:392
+#: camel/providers/local/camel-local-folder.c:395
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "የፖስታ ሳጥን፦%s (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:400
+#: camel/providers/local/camel-local-folder.c:399
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -10620,7 +10383,7 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:142
 #: camel/providers/local/camel-local-store.c:253
-#: camel/providers/local/camel-mbox-store.c:356
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10695,9 +10458,24 @@ msgstr ""
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr ""
 
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:226
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mbox-folder.c:417
+#: camel/providers/local/camel-mbox-folder.c:436
+#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:475
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-mh-folder.c:221
+#, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+
 #
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/local/camel-maildir-folder.c:236
 msgid "Invalid message contents"
 msgstr ""
 
@@ -10742,9 +10520,9 @@ msgstr ""
 msgid "not a maildir directory"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:341
-#: camel/providers/local/camel-spool-store.c:286
-#: camel/providers/local/camel-spool-store.c:316
+#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-spool-store.c:284
+#: camel/providers/local/camel-spool-store.c:314
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr ""
@@ -10791,25 +10569,18 @@ msgstr ""
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:435
-#: camel/providers/local/camel-mbox-folder.c:466
-#: camel/providers/local/camel-mbox-folder.c:474
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:468
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:475
-msgid "Message construction failed: Corrupt mailbox?"
-msgstr ""
+#: camel/providers/local/camel-mbox-folder.c:476
+#: camel/providers/local/camel-mh-folder.c:222
+#, fuzzy
+msgid "Message construction failed."
+msgstr "መልዕክት"
 
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:362
+#: camel/providers/local/camel-mbox-store.c:361
 msgid "Cannot create a folder by this name."
 msgstr ""
 
@@ -10837,36 +10608,36 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:375
+#: camel/providers/local/camel-mbox-store.c:374
 #, fuzzy, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr ""
 "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:389
+#: camel/providers/local/camel-mbox-store.c:388
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr ""
 "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:391
+#: camel/providers/local/camel-mbox-store.c:390
 msgid "Folder already exists"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:473
+#: camel/providers/local/camel-mbox-store.c:472
 msgid "The new folder name is illegal."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:486
+#: camel/providers/local/camel-mbox-store.c:485
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr ""
 "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:561
+#: camel/providers/local/camel-mbox-store.c:560
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr ""
@@ -11060,7 +10831,7 @@ msgid ""
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:997
+#: camel/providers/nntp/camel-nntp-store.c:1126
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr ""
@@ -11077,18 +10848,10 @@ msgstr ""
 msgid "Server rejected username/password"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:263
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:259
-#: camel/providers/nntp/camel-nntp-folder.c:265
+#: camel/providers/nntp/camel-nntp-folder.c:147
+#: camel/providers/nntp/camel-nntp-folder.c:149
+#: camel/providers/nntp/camel-nntp-folder.c:158
+#: camel/providers/nntp/camel-nntp-folder.c:234
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11097,62 +10860,49 @@ msgstr ""
 msgid "Cannot get message %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:188
-#: camel/providers/nntp/camel-nntp-folder.c:228
-#, c-format
-msgid "Internal error: uid in invalid format: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:201
-#, fuzzy, c-format
-msgid "Could not get article %s from NNTP server"
-msgstr ""
-"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
-"%s"
-
-#: camel/providers/nntp/camel-nntp-folder.c:362
-msgid "Posting not allowed by news server"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:373
-#, c-format
-msgid "Failed to send newsgroups header: %s: message not posted"
+#: camel/providers/nntp/camel-nntp-folder.c:156
+#: camel/providers/nntp/camel-nntp-folder.c:232
+#: camel/providers/nntp/camel-nntp-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+msgid "User cancelled"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:413
-#: camel/providers/nntp/camel-nntp-folder.c:426
+#: camel/providers/nntp/camel-nntp-folder.c:176
+#: camel/providers/nntp/camel-nntp-folder.c:208
 #, c-format
-msgid "Error posting to newsgroup: %s: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:438
-msgid "Error reading response to posted message: message not posted"
+msgid "Internal error: uid in invalid format: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:441
-#, c-format
-msgid "Error posting message: %s: message not posted"
-msgstr ""
+#: camel/providers/nntp/camel-nntp-folder.c:328
+#: camel/providers/nntp/camel-nntp-folder.c:331
+#: camel/providers/nntp/camel-nntp-folder.c:373
+#: camel/providers/nntp/camel-nntp-folder.c:375
+#, fuzzy, c-format
+msgid "Posting failed: %s"
+msgstr "ዶሴን አስወግድ"
 
-#: camel/providers/nntp/camel-nntp-folder.c:457
+#: camel/providers/nntp/camel-nntp-folder.c:393
 msgid "You cannot post NNTP messages while working offline!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:468
+#: camel/providers/nntp/camel-nntp-folder.c:404
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:44
 msgid "Could not get group list from server."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#: camel/providers/nntp/camel-nntp-grouplist.c:97
+#: camel/providers/nntp/camel-nntp-grouplist.c:106
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#: camel/providers/nntp/camel-nntp-grouplist.c:157
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr ""
@@ -11180,27 +10930,29 @@ msgid ""
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:158
+#: camel/providers/nntp/camel-nntp-store.c:118
+#: camel/providers/nntp/camel-nntp-store.c:1233
+#: camel/providers/nntp/camel-nntp-store.c:1331
+#, c-format
+msgid "NNTP Command failed: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:227
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:170
+#: camel/providers/nntp/camel-nntp-store.c:239
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:326
+#: camel/providers/nntp/camel-nntp-store.c:403
 #, c-format
 msgid "USENET News via %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:640
-#, fuzzy
-msgid "Stream error"
-msgstr "የውስጥ ብልሽት"
-
-#: camel/providers/nntp/camel-nntp-store.c:643
+#: camel/providers/nntp/camel-nntp-store.c:777
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -11208,75 +10960,73 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:735
+#: camel/providers/nntp/camel-nntp-store.c:872
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
 "No such newsgroup. The selected item is a probably a parent folder."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:767
+#: camel/providers/nntp/camel-nntp-store.c:904
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
 "newsgroup does not exist!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:792
+#: camel/providers/nntp/camel-nntp-store.c:929
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:800
+#: camel/providers/nntp/camel-nntp-store.c:937
 msgid "You cannot rename a folder in a News store."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:808
+#: camel/providers/nntp/camel-nntp-store.c:945
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:253
-#, fuzzy, c-format
-msgid "Connection error: %s"
-msgstr "ያልታወቀ ስህተት፦ %s"
-
-#: camel/providers/nntp/camel-nntp-summary.c:262
-#, c-format
-msgid "No such folder: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-summary.c:268
-#, c-format
-msgid "Could not get group: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1118
+msgid "Authentication requested but not username provided"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:333
-#, fuzzy
-msgid "Could not get messages: unspecified error"
+#: camel/providers/nntp/camel-nntp-store.c:1146
+#, fuzzy, c-format
+msgid "Cannot authenticate to server: %s"
 msgstr ""
 "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
 "%s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:378
+#: camel/providers/nntp/camel-nntp-store.c:1262
+msgid "Not connected."
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:1311
 #, c-format
-msgid "NNTP Command failed: %s"
+msgid "No such folder: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:438
-#: camel/providers/nntp/camel-nntp-summary.c:543
+#: camel/providers/nntp/camel-nntp-summary.c:218
+#: camel/providers/nntp/camel-nntp-summary.c:314
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:558
+#: camel/providers/nntp/camel-nntp-summary.c:225
+#, c-format
+msgid "Unexpected server response from xover: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-summary.c:328
 #, c-format
-msgid "Unknown server response: %s"
+msgid "Unexpected server response from head: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:605
+#: camel/providers/nntp/camel-nntp-summary.c:368
 msgid "Use cancel"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:607
+#: camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
 msgid "Operation failed: %s"
 msgstr ""
@@ -11324,7 +11074,7 @@ msgstr ""
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107
 msgid "POP"
 msgstr ""
 
@@ -11404,7 +11154,7 @@ msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:132
 msgid "Sendmail"
 msgstr ""
 
@@ -11456,7 +11206,7 @@ msgstr ""
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:119
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11737,19 +11487,19 @@ msgstr ""
 msgid "%.0fG"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
+#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:408
 msgid "attachment"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:454
 msgid "Remove selected items from the attachment list"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:491
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Add attachment..."
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:495
 msgid "Attach a file to the message"
 msgstr ""
 
@@ -11811,7 +11561,7 @@ msgstr "ምስሉን በሌላ ስም አስቀምጥ"
 msgid "Open file"
 msgstr "ፋይል ክፈት"
 
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
 msgid "Autogenerated"
 msgstr ""
 
@@ -11945,17 +11695,17 @@ msgstr ""
 
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
-msgid "You cannot attach the file `${0}' to this message."
+msgid "You cannot attach the file `{0}' to this message."
 msgstr ""
 
 #. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4
-msgid "${1}"
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
 msgstr ""
 
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
 
 #. mail-composer:attach-directory primary
@@ -12047,7 +11797,7 @@ msgstr ""
 
 #. mail-composer:no-build-message secondary
 #: composer/mail-composer-errors.xml.h:34
-msgid "Because \"${0}\", you may need to select different mail options."
+msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
@@ -12056,8 +11806,10 @@ msgid "Could not read signature file \"{0}\"."
 msgstr ""
 
 #. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38
-msgid "Because \"${1}\"."
+#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted primary
@@ -12458,11 +12210,11 @@ msgid "<b>Then</b>"
 msgstr "<b>ሁኔታ፦</b>"
 
 #: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1335
+#: mail/mail-account-gui.c:1347
 msgid "Select Folder"
 msgstr "ዶሴ ምረጡ"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
 msgid "    "
 msgstr ""
 
@@ -12514,7 +12266,7 @@ msgstr ""
 msgid "months"
 msgstr "ወር"
 
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
 msgid "seconds"
 msgstr "ሴኮንዶች"
 
@@ -12546,20 +12298,20 @@ msgstr ""
 msgid "years"
 msgstr "ዓመታት"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:916
-#: mail/mail-config.c:76 mail/mail-config.glade.h:90
+#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
+#: mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "አስፈላጊ"
 
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:919 mail/mail-config.c:79
-#: mail/mail-config.glade.h:145
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: mail/mail-config.glade.h:148
 msgid "To Do"
 msgstr ""
 
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:920 mail/mail-config.c:80
-#: mail/mail-config.glade.h:94
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: mail/mail-config.glade.h:97
 msgid "Later"
 msgstr ""
 
@@ -12614,257 +12366,6 @@ msgstr ""
 msgid "outgoing"
 msgstr ""
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Adjust Score"
-msgstr ""
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Color"
-msgstr ""
-
-#: filter/libfilter-i18n.h:4
-msgid "Assign Score"
-msgstr ""
-
-#: filter/libfilter-i18n.h:5
-msgid "Attachments"
-msgstr ""
-
-#: filter/libfilter-i18n.h:6
-msgid "Beep"
-msgstr ""
-
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr ""
-
-#: filter/libfilter-i18n.h:8
-msgid "Copy to Folder"
-msgstr ""
-
-#: filter/libfilter-i18n.h:9
-msgid "Date received"
-msgstr ""
-
-#: filter/libfilter-i18n.h:10
-msgid "Date sent"
-msgstr ""
-
-#: filter/libfilter-i18n.h:12
-msgid "Deleted"
-msgstr "የጠፋ"
-
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr ""
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr ""
-
-#: filter/libfilter-i18n.h:16
-msgid "does not return"
-msgstr ""
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr ""
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
-msgstr ""
-
-#: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr "ንድፍ"
-
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr ""
-
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr ""
-
-#: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr ""
-
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr ""
-
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "ነው"
-
-#: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr ""
-
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr ""
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr ""
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr ""
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr ""
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "አይደለም"
-
-#: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr ""
-
-#: filter/libfilter-i18n.h:36
-#, fuzzy
-msgid "Junk Test"
-msgstr "ጁን"
-
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
-#: widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "መለያ"
-
-#: filter/libfilter-i18n.h:38
-msgid "Mailing list"
-msgstr ""
-
-#: filter/libfilter-i18n.h:39
-msgid "Message Body"
-msgstr ""
-
-#: filter/libfilter-i18n.h:40
-msgid "Message Header"
-msgstr ""
-
-#: filter/libfilter-i18n.h:41
-#, fuzzy
-msgid "Message is Junk"
-msgstr "መልዕክቶች"
-
-#: filter/libfilter-i18n.h:42
-#, fuzzy
-msgid "Message is not Junk"
-msgstr "መልዕክት"
-
-#: filter/libfilter-i18n.h:43
-msgid "Move to Folder"
-msgstr ""
-
-#: filter/libfilter-i18n.h:44
-#, fuzzy
-msgid "Pipe to Program"
-msgstr "ከፕሮግራሙ ውጣ"
-
-#: filter/libfilter-i18n.h:45
-msgid "Play Sound"
-msgstr "ድምፅ አጫውት"
-
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "አንብብ"
-
-#: filter/libfilter-i18n.h:47
-msgid "Recipients"
-msgstr ""
-
-#: filter/libfilter-i18n.h:48
-msgid "Regex Match"
-msgstr ""
-
-#: filter/libfilter-i18n.h:49
-msgid "Replied to"
-msgstr ""
-
-#: filter/libfilter-i18n.h:50
-msgid "returns"
-msgstr ""
-
-#: filter/libfilter-i18n.h:51
-msgid "returns greater than"
-msgstr ""
-
-#: filter/libfilter-i18n.h:52
-msgid "returns less than"
-msgstr ""
-
-#: filter/libfilter-i18n.h:53
-#, fuzzy
-msgid "Run Program"
-msgstr "ፕሮግራምን አስኪድ፦"
-
-#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "ነጥብ"
-
-#: filter/libfilter-i18n.h:55
-msgid "Sender"
-msgstr ""
-
-#: filter/libfilter-i18n.h:56
-msgid "Set Status"
-msgstr ""
-
-#: filter/libfilter-i18n.h:57
-msgid "Size (kB)"
-msgstr "መጠን kb"
-
-#: filter/libfilter-i18n.h:58
-msgid "sounds like"
-msgstr ""
-
-#: filter/libfilter-i18n.h:59
-msgid "Source Account"
-msgstr ""
-
-#: filter/libfilter-i18n.h:60
-msgid "Specific header"
-msgstr ""
-
-#: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:63
-msgid "Stop Processing"
-msgstr ""
-
-#: filter/libfilter-i18n.h:64 mail/em-format.c:755 mail/em-format-html.c:1519
-#: mail/em-format-quote.c:302 mail/em-mailer-prefs.c:87
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
-#: smime/lib/e-cert.c:1079
-msgid "Subject"
-msgstr "ጉዳዩ"
-
-#: filter/libfilter-i18n.h:65
-msgid "Unset Status"
-msgstr ""
-
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr ""
@@ -12882,6 +12383,11 @@ msgstr ""
 msgid "_Score Rules"
 msgstr "ሲሼልስ"
 
+#: filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "ነጥብ"
+
 #: filter/searchtypes.xml.h:1
 msgid "Body contains"
 msgstr ""
@@ -12961,13 +12467,13 @@ msgstr ""
 msgid "-------- Forwarded Message --------"
 msgstr ""
 
-#: mail/em-composer-utils.c:1499
+#: mail/em-composer-utils.c:1495
 msgid "an unknown sender"
 msgstr ""
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1509
+#: mail/em-composer-utils.c:1505
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr ""
 
@@ -13009,8 +12515,8 @@ msgstr ""
 msgid "Create New Folder"
 msgstr "አዲስ ዶሴ ፍጠር"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
-#: mail/mail-component.c:701
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
+#: mail/mail-component.c:704
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr ""
@@ -13026,108 +12532,109 @@ msgstr "አዲስ ዶሴ ፍጠር"
 msgid "Folder _name:"
 msgstr "የዶሴ ስም፦"
 
-#: mail/em-folder-tree.c:839
+#: mail/em-folder-tree.c:833
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "ዶሴን አስወግድ"
 
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree.c:835
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "ዶሴ"
 
-#: mail/em-folder-tree.c:848 mail/message-list.c:1555
+#: mail/em-folder-tree.c:842 mail/message-list.c:1561
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "መልዕክቶች"
 
-#: mail/em-folder-tree.c:850 mail/message-list.c:1557
+#: mail/em-folder-tree.c:844 mail/message-list.c:1563
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr ""
 
-#: mail/em-folder-tree.c:866
+#: mail/em-folder-tree.c:860
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 
-#: mail/em-folder-tree.c:956 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:957 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2069
-#: mail/em-folder-tree.c:2551 mail/em-folder-view.c:798
-#: mail/message-list.c:1645
+#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
+#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
+#: mail/message-list.c:1651
 #, fuzzy
 msgid "_Move"
 msgstr "መንቀሳቅስ"
 
-#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#: mail/em-folder-tree.c:955 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "ተወው"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
 #: mail/em-folder-view.c:798 mail/em-folder-view.c:812
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "ዶሴ ምረጡ"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
 #, fuzzy
 msgid "C_opy"
 msgstr "ቅጂ"
 
-#: mail/em-folder-tree.c:2096
+#: mail/em-folder-tree.c:2088
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "አዲስ ዶሴ ፍጠር"
 
-#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
+#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
 #, fuzzy
 msgid "Create folder"
 msgstr "አዲስ ዶሴ ፍጠር"
 
-#: mail/em-folder-tree.c:2474
+#: mail/em-folder-tree.c:2463
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr ""
 
-#: mail/em-folder-tree.c:2476
+#: mail/em-folder-tree.c:2465
 #, fuzzy
 msgid "Rename Folder"
 msgstr "ዶሴን እንደገና ሰይም"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "ተመልከት (_V)"
 
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2537
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "በአዲስ መስኮት ውስጥ ክፈት"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2555
+#: mail/em-folder-tree.c:2546
 #, fuzzy
 msgid "_New Folder..."
 msgstr "_አዲስ ዶሴ (_N)"
 
-#: mail/em-folder-tree.c:2558
+#: mail/em-folder-tree.c:2549
 msgid "_Rename"
 msgstr "እንደገና ሰይም"
 
-#: mail/em-folder-tree.c:2561 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "ምርጫዎች"
 
 #: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:889
+#: mail/mail-vfolder.c:888
 msgid "VFolders"
 msgstr ""
 
@@ -13141,19 +12648,19 @@ msgstr ""
 msgid "Inbox"
 msgstr ""
 
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
 msgid "Loading..."
 msgstr "በመጫን ላይ..."
 
 #: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
 #: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
 #: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:551
+#: mail/mail-component.c:554
 msgid "Mail"
 msgstr "ፖስታ"
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr ""
@@ -13166,17 +12673,17 @@ msgstr "አትም"
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:810
+#: mail/em-folder-view.c:901 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr ""
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:811
+#: mail/em-folder-view.c:902 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr ""
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: mail/em-folder-view.c:903 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "ወደፊት፦"
@@ -13229,6 +12736,10 @@ msgstr ""
 msgid "_Copy to Folder..."
 msgstr ""
 
+#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "መለያ"
+
 #: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr ""
@@ -13279,12 +12790,12 @@ msgid "Filter on _Mailing List"
 msgstr ""
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
-#: mail/mail-config.glade.h:66
+#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "የነበረው"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1796
 msgid "Print Message"
 msgstr ""
 
@@ -13324,12 +12835,18 @@ msgstr "Cc"
 msgid "Bcc"
 msgstr "Bcc"
 
+#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
+#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "ጉዳዩ"
+
 #: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
 #: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "ቀን"
 
-#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
+#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
 msgid "Newsgroups"
 msgstr ""
 
@@ -13511,7 +13028,7 @@ msgid ""
 "practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:757
+#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
 msgid "_View Certificate"
 msgstr ""
 
@@ -13569,7 +13086,7 @@ msgstr "በየሳመንት"
 msgid "Once per month"
 msgstr "በየወር"
 
-#: mail/em-migrate.c:1072
+#: mail/em-migrate.c:1168
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13577,92 +13094,92 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1506
+#: mail/em-migrate.c:1602
 #, fuzzy, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr ""
 "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
 "%s"
 
-#: mail/em-migrate.c:1532
+#: mail/em-migrate.c:1628
 #, fuzzy, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "ፋይል sን መክፈት አልቻለም፦ %s፦ %s"
 
-#: mail/em-migrate.c:1715
+#: mail/em-migrate.c:1811
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:1919
+#: mail/em-migrate.c:2015
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:1933
+#: mail/em-migrate.c:2029
 #, fuzzy, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr ""
 "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
 "%s"
 
-#: mail/em-migrate.c:1962
+#: mail/em-migrate.c:2058
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#: mail/em-migrate.c:2413 mail/em-migrate.c:2425
 #, fuzzy, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr ""
 "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
 "%s"
 
-#: mail/em-migrate.c:2480
+#: mail/em-migrate.c:2576
 #, fuzzy, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr ""
 "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
 "%s"
 
-#: mail/em-migrate.c:2498
+#: mail/em-migrate.c:2594
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 msgstr ""
 
-#: mail/em-popup.c:699
+#: mail/em-popup.c:700
 msgid "Save As..."
 msgstr "በሌላ ስም አስቀምጥ..."
 
-#: mail/em-popup.c:717
+#: mail/em-popup.c:718
 #, c-format
 msgid "untitled_image.%s"
 msgstr ""
 
-#: mail/em-popup.c:807
+#: mail/em-popup.c:808
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:809
+#: mail/em-popup.c:810
 msgid "_Reply to sender"
 msgstr ""
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:859
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "በአዲስ መስኮት ውስጥ ክፈት"
 
-#: mail/em-popup.c:859
+#: mail/em-popup.c:860
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "ምስሉን በሌላ ስም አስቀምጥ"
 
-#: mail/em-popup.c:860
+#: mail/em-popup.c:861
 msgid "_Add to Addressbook"
 msgstr ""
 
-#: mail/em-popup.c:966
+#: mail/em-popup.c:967
 #, c-format
 msgid "Open in %s..."
 msgstr ""
@@ -14219,7 +13736,7 @@ msgstr ""
 msgid "Mail Accounts"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
 msgid "Mail Preferences"
 msgstr ""
 
@@ -14232,15 +13749,15 @@ msgid "Evolution is importing your old Elm mail"
 msgstr ""
 
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:226
+#: mail/importers/evolution-mbox-importer.c:221
+#: mail/importers/evolution-outlook-importer.c:255
 #: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr ""
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:222
-#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/evolution-mbox-importer.c:223
+#: mail/importers/evolution-outlook-importer.c:257
 #: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr ""
@@ -14261,23 +13778,25 @@ msgid "Elm"
 msgstr ""
 
 #: mail/importers/evolution-mbox-importer.c:116
+#: mail/importers/evolution-outlook-importer.c:130
 #, fuzzy
 msgid "Destination folder:"
 msgstr "አዲስ ዶሴ ፍጠር"
 
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 #, fuzzy
 msgid "Select folder to import into"
 msgstr "ዶሴ ምረጡ"
 
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:254
 #: mail/importers/mail-importer.c:226
 #, fuzzy, c-format
 msgid "Importing `%s'"
 msgstr "ከውጭ አስገባ"
 
-#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/evolution-outlook-importer.c:301
 #: mail/importers/mail-importer.c:140
 #, fuzzy
 msgid "Importing mailbox"
@@ -14417,15 +13936,15 @@ msgstr ""
 msgid "%s License Agreement"
 msgstr ""
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
 msgid "_Host:"
 msgstr "እንግዳ ተቀባይ"
 
-#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
 msgid "User_name:"
 msgstr "የተጠቃሚ ስም"
 
-#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
 msgid "_Path:"
 msgstr "መተላለፊያ"
 
@@ -14488,36 +14007,36 @@ msgstr "%d አጠቃላይ"
 msgid ", %d unread"
 msgstr ""
 
-#: mail/mail-component.c:653
+#: mail/mail-component.c:656
 #, fuzzy
 msgid "New Mail Message"
 msgstr "%s - መልዕክት"
 
-#: mail/mail-component.c:654
+#: mail/mail-component.c:657
 #, fuzzy
 msgid "_Mail Message"
 msgstr "መልዕክቶች"
 
-#: mail/mail-component.c:655
+#: mail/mail-component.c:658
 msgid "Compose a new mail message"
 msgstr ""
 
-#: mail/mail-component.c:661
+#: mail/mail-component.c:664
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "_አዲስ ዶሴ (_N)"
 
-#: mail/mail-component.c:662
+#: mail/mail-component.c:665
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "ዶሴ (_F)"
 
-#: mail/mail-component.c:663
+#: mail/mail-component.c:666
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "አዲስ ዶሴ ፍጠር"
 
-#: mail/mail-component.c:795
+#: mail/mail-component.c:798
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
@@ -14529,7 +14048,7 @@ msgstr ""
 msgid "Connecting to server..."
 msgstr ""
 
-#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr ""
 
@@ -14541,7 +14060,7 @@ msgid ""
 msgstr ""
 
 #: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid "Receiving Mail"
 msgstr ""
 
@@ -14555,7 +14074,7 @@ msgstr ""
 msgid "Please select among the following options"
 msgstr ""
 
-#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131
 #, fuzzy
 msgid "Sending Mail"
 msgstr "ሴኔጋል"
@@ -14566,7 +14085,7 @@ msgid ""
 "sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37
 msgid "Account Management"
 msgstr ""
 
@@ -14579,233 +14098,237 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:2
 msgid " Ch_eck for Supported Types "
 msgstr ""
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "<b>Preview</b>"
 msgstr "ቅድመ ዕይታ"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr ""
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "<b>S_ignatures</b>"
 msgstr "<b>ሁኔታ፦</b>"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "<b>_Languages</b>"
 msgstr "<b>ሁኔታ፦</b>"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
+msgid "<small>This will make the the filter more reliable, but slower</small>"
+msgstr ""
+
+#: mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Checking for New Mail</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">General</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Security</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:34
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:35
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:36
 msgid "Account Editor"
 msgstr ""
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:38
 msgid "Add Ne_w Signature..."
 msgstr ""
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Add _Script"
 msgstr "ጽሑፍ"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:40
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:44
 msgid "Always _sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Attach original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr ""
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:48
 msgid "Automatically _insert smiley images"
 msgstr ""
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Automatically check for _new mail every"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "Baltic (ISO-8859-13)"
 msgstr "ባልቲክ (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Baltic (ISO-8859-4)"
 msgstr "ባልቲክ iso 8859"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Beep w_hen new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "C_haracter set:"
 msgstr ""
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 msgid "Ch_eck for Supported Types "
 msgstr ""
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 #, fuzzy
-msgid "Check _Incoming Mail"
+msgid "Check _incoming mail for junk"
 msgstr "ሴኔጋል"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 msgid "Color for _misspelled words:"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Colors"
 msgstr "ቀለሞች (_O)"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 msgid "Confirm _when expunging a folder"
 msgstr ""
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14815,365 +14338,361 @@ msgid ""
 "Click \"Apply\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
 msgid "De_fault"
 msgstr "የነበረው (_F)"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 msgid "Default character e_ncoding:"
 msgstr ""
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 #, fuzzy
 msgid "Defaults"
 msgstr "ነባሮች"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 msgid "Do not quote original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "ጨርሷል"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Drafts _Folder:"
 msgstr "_ዶሴ፦"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:77
 msgid "Email Accounts"
 msgstr ""
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Email _Address:"
 msgstr "ኢሜያል አድራሻ"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:79
 msgid "Empty trash folders on e_xit"
 msgstr ""
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
 msgid "Encry_ption certificate:"
 msgstr ""
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:81
 msgid "Evolution Account Assistant"
 msgstr ""
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:82
 msgid "Execute Command..."
 msgstr ""
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:83
 msgid "Fi_xed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 msgid "Font Properties"
 msgstr ""
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 msgid "Format messages in _HTML"
 msgstr ""
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "HTML Mail"
 msgstr "ፖስታ"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Headers"
 msgstr "የገጽ አናት"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr ""
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 msgid "IMAPv4 "
 msgstr ""
 
 #: mail/mail-config.glade.h:91
+msgid "I_nclude remote tests"
+msgstr ""
+
+#: mail/mail-config.glade.h:94
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Kerberos "
 msgstr ""
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Mail Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr ""
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr ""
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Or_ganization:"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "PGP/GPG _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Play sound file when new mail arri_ves"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr ""
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Re_member password"
 msgstr "ይህንን ሚስጢራዊ ቃል አስታውሱ"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr ""
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:120
 msgid "Receiving Options"
 msgstr ""
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
 #, fuzzy
 msgid "Remember _password"
 msgstr "ይህንን ሚስጢራዊ ቃል አስታውሱ"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
 msgid "S_tandard Font:"
 msgstr ""
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 #, fuzzy
 msgid "Security"
 msgstr "_ደህነት"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:126
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:127
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:128
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:129
 #, fuzzy
 msgid "Select..."
 msgstr "አጥፉ..."
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Sent _Messages Folder:"
 msgstr "ዶሴን እንደገና ሰይም"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:134
 msgid "Ser_ver requires authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:135
 msgid "Server _Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:136
 msgid "Si_gning certificate:"
 msgstr ""
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:137
 #, fuzzy
 msgid "Signat_ure:"
 msgstr "ሲንጋፖር"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "Signatures"
 msgstr "ሲንጋፖር"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr ""
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:140
 msgid "Spell Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:141
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:142
 msgid "T_erminal Font:"
 msgstr ""
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "T_ype: "
 msgstr "ዓይነት፦"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:149
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:148
-msgid "Use _Daemon"
-msgstr ""
-
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:152
 msgid "V_ariable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:153
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Forward\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:158
 msgid "_Add Signature"
 msgstr ""
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:159
 msgid "_Always load images from the Internet"
 msgstr ""
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:160
 msgid "_Digitally sign outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:161
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:163
 msgid "_Enable"
 msgstr "አስቻለ"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:165
 msgid "_Forward style:"
 msgstr ""
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:168
 msgid "_Load images if sender is in address book"
 msgstr ""
 
-#: mail/mail-config.glade.h:167
-msgid "_Local Tests Only"
-msgstr ""
-
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_Mark messages as read after"
 msgstr ""
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 msgid "_Never load images from the Internet"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:175
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:176
 msgid "_Reply style:"
 msgstr ""
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:177
 msgid "_Script:"
 msgstr "ጽሑፍ"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:178
 msgid "_Show animated images"
 msgstr ""
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 msgid "_Use Secure Connection (SSL):"
 msgstr ""
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:181
 msgid "color"
 msgstr "ቀለም"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "መግለጫ"
 
@@ -15331,7 +14850,7 @@ msgstr ""
 
 #. mail:camel-exception primary
 #: mail/mail-errors.xml.h:57
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgid "Your message with the subject \"{0}\" was not delivered."
 msgstr ""
 
 #. mail:camel-exception secondary
@@ -15390,11 +14909,6 @@ msgstr ""
 "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
 "%s"
 
-#. mail:no-save-path secondary
-#: mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail:no-create-path primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
@@ -15418,12 +14932,6 @@ msgstr ""
 "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
 "%s"
 
-#. mail:no-create-tmp-path secondary
-#: mail/mail-errors.xml.h:100 mail/mail-errors.xml.h:112
-#: widgets/misc/e-system-errors.xml.h:11 widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail:no-write-path-exists secondary
 #: mail/mail-errors.xml.h:104
 msgid "File exists but cannot overwrite it."
@@ -15687,179 +15195,175 @@ msgstr "በላዩ ላይ ይጻፍ"
 msgid "_Append"
 msgstr "ላክ"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:785
 #, c-format
 msgid "Pinging %s"
 msgstr ""
 
-#: mail/mail-mt.c:897
-msgid "Working"
-msgstr ""
-
-#: mail/mail-ops.c:99
+#: mail/mail-ops.c:98
 msgid "Filtering Folder"
 msgstr ""
 
-#: mail/mail-ops.c:260
+#: mail/mail-ops.c:259
 msgid "Fetching Mail"
 msgstr ""
 
-#: mail/mail-ops.c:543
+#: mail/mail-ops.c:542
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr ""
 
-#: mail/mail-ops.c:568
+#: mail/mail-ops.c:567
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:577
+#: mail/mail-ops.c:576
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr ""
 
-#: mail/mail-ops.c:673
+#: mail/mail-ops.c:672
 #, c-format
 msgid "Sending message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:703
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr ""
 
-#: mail/mail-ops.c:708
+#: mail/mail-ops.c:707
 msgid "Complete."
 msgstr ""
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:804
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:1002
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1116
+#: mail/mail-ops.c:1115
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1159
+#: mail/mail-ops.c:1158
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1230
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1308
 #, c-format
 msgid "Removing folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1403
+#: mail/mail-ops.c:1402
 #, c-format
 msgid "Storing folder '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1468
+#: mail/mail-ops.c:1467
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1469
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1524
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr ""
 
-#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
+#: mail/mail-ops.c:1559 mail/mail-ops.c:1610
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1607
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1609
+#: mail/mail-ops.c:1608
 msgid "Local Folders"
 msgstr ""
 
-#: mail/mail-ops.c:1692
+#: mail/mail-ops.c:1691
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1764
+#: mail/mail-ops.c:1763
 #, fuzzy, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "ምስሉን በሌላ ስም አስቀምጥ"
 msgstr[1] "ምስሉን በሌላ ስም አስቀምጥ"
 
-#: mail/mail-ops.c:1850
+#: mail/mail-ops.c:1849
 #, fuzzy, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "ምስሉን በሌላ ስም አስቀምጥ"
 msgstr[1] "ምስሉን በሌላ ስም አስቀምጥ"
 
-#: mail/mail-ops.c:1900
+#: mail/mail-ops.c:1899
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1928
+#: mail/mail-ops.c:1927
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1999
+#: mail/mail-ops.c:1998
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:2016
+#: mail/mail-ops.c:2015
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2046
+#: mail/mail-ops.c:2045
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Reconnecting to %s"
 msgstr ""
@@ -15925,24 +15429,24 @@ msgstr ""
 msgid "Waiting..."
 msgstr ""
 
-#: mail/mail-session.c:238
+#: mail/mail-session.c:239
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-session.c:271
+#: mail/mail-session.c:272
 #, c-format
 msgid "Enter Password for %s"
 msgstr ""
 
-#: mail/mail-session.c:273
+#: mail/mail-session.c:274
 msgid "Enter Password"
 msgstr "ሚስጢራዊ ቃል አስገቡ"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password"
 msgstr "ይህንን ሚስጢራዊ ቃል አስታውሱ (_R)"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:298
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
@@ -15999,79 +15503,79 @@ msgstr "አዲስ ዶሴ ፍጠር"
 msgid "Updating vFolders for '%s'"
 msgstr "አዲስ ዶሴ ፍጠር"
 
-#: mail/mail-vfolder.c:959
+#: mail/mail-vfolder.c:958
 msgid "vFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:998
+#: mail/mail-vfolder.c:997
 msgid "Edit VFolder"
 msgstr ""
 
-#: mail/mail-vfolder.c:1082
+#: mail/mail-vfolder.c:1081
 msgid "New VFolder"
 msgstr ""
 
-#: mail/message-list.c:946
+#: mail/message-list.c:948
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:947
+#: mail/message-list.c:949
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:948
+#: mail/message-list.c:950
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:949
+#: mail/message-list.c:951
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:950
+#: mail/message-list.c:952
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:954
+#: mail/message-list.c:956
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:955
+#: mail/message-list.c:957
 msgid "Lower"
 msgstr "ዝቅተኛ"
 
-#: mail/message-list.c:959
+#: mail/message-list.c:961
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:960
+#: mail/message-list.c:962
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:1279
+#: mail/message-list.c:1285
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1286
+#: mail/message-list.c:1292
 msgid "Today %l:%M %p"
 msgstr "ዛሬ %l:%M %p"
 
-#: mail/message-list.c:1295
+#: mail/message-list.c:1301
 msgid "Yesterday %l:%M %p"
 msgstr "ትናንት %l:%M %p"
 
-#: mail/message-list.c:1307
+#: mail/message-list.c:1313
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1315
+#: mail/message-list.c:1321
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1317
+#: mail/message-list.c:1323
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3300
+#: mail/message-list.c:3321
 msgid "Generating message list"
 msgstr ""
 
@@ -16127,6 +15631,10 @@ msgstr "ወደፊት"
 msgid "No Response Necessary"
 msgstr ""
 
+#: mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "አንብብ"
+
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr ""
@@ -16227,45 +15735,49 @@ msgid ""
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:10
-msgid "Whether Evolution should start up in offline mode"
+msgid "Toolbar is visible"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:11
-msgid "Whether to skip the development warning dialog"
+msgid "Whether Evolution should start up in offline mode"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Whether the toolbar should be visible."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:14
 #, fuzzy
 msgid "mail"
 msgstr "ኢሜይል"
 
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
-msgstr ""
-
-#: shell/e-shell.c:545 shell/e-shell.c:546
+#: shell/e-shell.c:588 shell/e-shell.c:589
 #, fuzzy, c-format
 msgid "%ld KB"
 msgstr "%d %B"
 
-#: shell/e-shell.c:744
+#: shell/e-shell.c:786
 #, fuzzy
 msgid "Uknown system error."
 msgstr "ያልታወቀ ስህተት"
 
-#: shell/e-shell.c:1101
+#: shell/e-shell.c:1143
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:1103
+#: shell/e-shell.c:1145
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:1105
+#: shell/e-shell.c:1147
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:1107
+#: shell/e-shell.c:1149
 msgid "Generic error"
 msgstr "አጠቃላይ ስህተት"
 
@@ -16313,7 +15825,7 @@ msgstr ""
 msgid "Select importer"
 msgstr ""
 
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1026
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
 #, c-format
 msgid "File %s does not exist"
 msgstr ""
@@ -16339,57 +15851,57 @@ msgid ""
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:549
+#: shell/e-shell-importer.c:570
 msgid "Automatic"
 msgstr "አውቶማቲክ"
 
-#: shell/e-shell-importer.c:598
+#: shell/e-shell-importer.c:626
 #, fuzzy
-msgid "_Filename:"
-msgstr "የፋይል ስም፦"
+msgid "F_ilename:"
+msgstr "የፋይል ስም"
 
-#: shell/e-shell-importer.c:603
+#: shell/e-shell-importer.c:631
 msgid "Select a file"
 msgstr "ፋይል ምረጡ"
 
-#: shell/e-shell-importer.c:613
+#: shell/e-shell-importer.c:642
 #, fuzzy
 msgid "File _type:"
 msgstr "የፋይሉ ዓይነት፦"
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:681
 msgid "Import data and settings from _older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:684
 msgid "Import a _single file"
 msgstr ""
 
-#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:727
+#: shell/e-shell-importer.c:756
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:853 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
 #, c-format
 msgid "From %s:"
 msgstr "ከ %s፦"
 
-#: shell/e-shell-importer.c:1044
+#: shell/e-shell-importer.c:1073
 #, c-format
 msgid "No importer available for file %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:1056
+#: shell/e-shell-importer.c:1085
 msgid "Unable to execute importer"
 msgstr ""
 
-#: shell/e-shell-importer.c:1169
+#: shell/e-shell-importer.c:1199
 #, fuzzy
 msgid "_Import"
 msgstr "ከውጭ አስገባ"
@@ -16435,54 +15947,54 @@ msgstr ""
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: shell/e-shell-window.c:336
+#: shell/e-shell-window.c:337
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-window.c:343
+#: shell/e-shell-window.c:344
 msgid "Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-window.c:349
+#: shell/e-shell-window.c:350
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell-window.c:621
+#: shell/e-shell-window.c:637
 #, c-format
 msgid "Switch to %s"
 msgstr ""
 
-#: shell/e-shell-window-commands.c:64
+#: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: shell/e-shell-window-commands.c:72
+#: shell/e-shell-window-commands.c:74
 #, c-format
 msgid "Error executing %s."
 msgstr ""
 
-#: shell/e-shell-window-commands.c:121
+#: shell/e-shell-window-commands.c:123
 msgid "Bug buddy is not installed."
 msgstr ""
 
-#: shell/e-shell-window-commands.c:129
+#: shell/e-shell-window-commands.c:131
 msgid "Bug buddy could not be run."
 msgstr ""
 
-#: shell/e-shell-window-commands.c:171
+#: shell/e-shell-window-commands.c:323
 #, fuzzy
-msgid "About Evolution"
-msgstr "አውቶማቲክ"
+msgid "Groupware Suite"
+msgstr "የውይይት መድረክ"
 
-#: shell/e-shell-window-commands.c:382
+#: shell/e-shell-window-commands.c:563
 msgid "_Work Online"
 msgstr ""
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr ""
 
-#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr ""
 
@@ -16494,35 +16006,6 @@ msgstr ""
 msgid "New"
 msgstr "አዲስ"
 
-#: shell/evolution-shell-component-utils.c:115
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"ያልታወቀ ስህተት።"
-
-#: shell/evolution-shell-component-utils.c:118
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-
-#: shell/evolution-shell-component-utils.c:125
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-
 #: shell/evolution-test-component.c:140
 #, fuzzy
 msgid "New Test"
@@ -16826,31 +16309,31 @@ msgid ""
 "Click help for details."
 msgstr ""
 
-#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:522
+#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
+#: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
 msgstr ""
 
-#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:604
+#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
+#: smime/gui/certificate-manager.c:638
 msgid "Certificate Name"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
+#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
 #, fuzzy
 msgid "Purposes"
 msgstr "ይሻሻል"
 
-#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:517
+#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:267
+#: smime/gui/certificate-manager.c:271
 msgid "Expires"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:417
+#: smime/gui/certificate-manager.c:446
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "ኢሜያል አድራሻ"
@@ -16891,6 +16374,11 @@ msgid ""
 "  Subject: %s\n"
 msgstr ""
 
+#: smime/gui/e-cert-selector.c:169
+#, fuzzy
+msgid "Select certificate"
+msgstr "ፋይል ምረጡ"
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -16947,7 +16435,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
 msgid "Certificate"
 msgstr ""
 
@@ -16967,20 +16455,23 @@ msgstr ""
 msgid "Contact Certificates"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:21
-#, no-c-format
-msgid "Do you want to trust \"%s\" for the following purposes?"
+#: smime/gui/smime-ui.glade.h:20
+msgid "Do not trust the authenticity of this certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:21
 msgid "Dummy window only"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:22
 #, fuzzy
 msgid "Edit"
 msgstr "አስተካክል"
 
+#: smime/gui/smime-ui.glade.h:23
+msgid "Email Certificate Trust Settings"
+msgstr ""
+
 #: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr ""
@@ -17013,258 +16504,269 @@ msgstr ""
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:37
-msgid "Trust this CA to identify email users."
+msgid "Trust the authenticity of this certificate"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:38
-msgid "Trust this CA to identify software developers."
+msgid "Trust this CA to identify email users."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:39
-msgid "Trust this CA to identify web sites."
+msgid "Trust this CA to identify software developers."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:40
+msgid "Trust this CA to identify web sites."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:41
 #, fuzzy
 msgid "View"
 msgstr "ተመልከት (_V)"
 
-#: smime/gui/smime-ui.glade.h:41
-msgid "View Certificate"
-msgstr ""
-
 #: smime/gui/smime-ui.glade.h:42
-msgid "You have been asked to trust a new Certificate Authority (CA)."
+msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:43
-msgid "You have certificates from these organizations that identify you:"
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:44
-msgid ""
-"You have certificates on file that identify these certificate authorities:"
+msgid "You have certificates on file that identify these people:"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:45
-msgid "You have certificates on file that identify these people:"
+msgid "Your Certificates"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:46
-msgid "Your Certificates"
+msgid "_Edit CA Trust"
 msgstr ""
 
-#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
+#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 #, fuzzy
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
-#: smime/lib/e-cert.c:478
+#. x509 certificate usage types
+#: smime/lib/e-cert.c:424
+#, fuzzy
+msgid "Sign"
+msgstr "ስፔን"
+
+#: smime/lib/e-cert.c:425
+#, fuzzy
+msgid "Encrypt"
+msgstr "መግለጫ"
+
+#: smime/lib/e-cert.c:530
 #, fuzzy
 msgid "Version"
 msgstr "ጥያቄ"
 
-#: smime/lib/e-cert.c:493
+#: smime/lib/e-cert.c:545
 msgid "Version 1"
 msgstr ""
 
-#: smime/lib/e-cert.c:496
+#: smime/lib/e-cert.c:548
 msgid "Version 2"
 msgstr ""
 
-#: smime/lib/e-cert.c:499
+#: smime/lib/e-cert.c:551
 msgid "Version 3"
 msgstr ""
 
-#: smime/lib/e-cert.c:581
+#: smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:584
+#: smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:587
+#: smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:590
+#: smime/lib/e-cert.c:642
 #, fuzzy
 msgid "C"
 msgstr " C"
 
-#: smime/lib/e-cert.c:593
+#: smime/lib/e-cert.c:645
 #, fuzzy
 msgid "CN"
 msgstr "n"
 
-#: smime/lib/e-cert.c:596
+#: smime/lib/e-cert.c:648
 msgid "OU"
 msgstr ""
 
-#: smime/lib/e-cert.c:599
+#: smime/lib/e-cert.c:651
 #, fuzzy
 msgid "O"
 msgstr "እሺ"
 
-#: smime/lib/e-cert.c:602
+#: smime/lib/e-cert.c:654
 msgid "L"
 msgstr ""
 
-#: smime/lib/e-cert.c:605
+#: smime/lib/e-cert.c:657
 #, fuzzy
 msgid "DN"
 msgstr "n"
 
-#: smime/lib/e-cert.c:608
+#: smime/lib/e-cert.c:660
 msgid "DC"
 msgstr ""
 
-#: smime/lib/e-cert.c:611
+#: smime/lib/e-cert.c:663
 #, fuzzy
 msgid "ST"
 msgstr "SMTP"
 
-#: smime/lib/e-cert.c:614
+#: smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:617
+#: smime/lib/e-cert.c:669
 msgid "Certificate Key Usage"
 msgstr ""
 
-#: smime/lib/e-cert.c:620
+#: smime/lib/e-cert.c:672
 msgid "Netscape Certificate Type"
 msgstr ""
 
-#: smime/lib/e-cert.c:623
+#: smime/lib/e-cert.c:675
 msgid "Certificate Authority Key Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:626
+#: smime/lib/e-cert.c:678
 #, fuzzy
 msgid "UID"
 msgstr "ID"
 
-#: smime/lib/e-cert.c:635
+#: smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr ""
 
-#: smime/lib/e-cert.c:686
+#: smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:694
+#: smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
 msgstr ""
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:768
 msgid "Subject Public Key Info"
 msgstr ""
 
-#: smime/lib/e-cert.c:721
+#: smime/lib/e-cert.c:773
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:736
+#: smime/lib/e-cert.c:788
 msgid "Subject's Public Key"
 msgstr ""
 
-#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
+#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
 msgid "Error: Unable to process extension"
 msgstr ""
 
-#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
+#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:782
+#: smime/lib/e-cert.c:834
 msgid "SSL Certificate Authority"
 msgstr ""
 
-#: smime/lib/e-cert.c:786
+#: smime/lib/e-cert.c:838
 msgid "Email Certificate Authority"
 msgstr ""
 
-#: smime/lib/e-cert.c:814
+#: smime/lib/e-cert.c:866
 msgid "Signing"
 msgstr ""
 
-#: smime/lib/e-cert.c:818
+#: smime/lib/e-cert.c:870
 msgid "Non-repudiation"
 msgstr ""
 
-#: smime/lib/e-cert.c:822
+#: smime/lib/e-cert.c:874
 msgid "Key Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:826
+#: smime/lib/e-cert.c:878
 msgid "Data Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:830
+#: smime/lib/e-cert.c:882
 msgid "Key Agreement"
 msgstr ""
 
-#: smime/lib/e-cert.c:834
+#: smime/lib/e-cert.c:886
 msgid "Certificate Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:838
+#: smime/lib/e-cert.c:890
 msgid "CRL Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:938
 #, fuzzy
 msgid "Critical"
 msgstr "ክሮኤሽያ"
 
-#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
+#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
 msgid "Not Critical"
 msgstr ""
 
-#: smime/lib/e-cert.c:912
+#: smime/lib/e-cert.c:964
 msgid "Extensions"
 msgstr ""
 
-#: smime/lib/e-cert.c:983
+#: smime/lib/e-cert.c:1035
 #, fuzzy, c-format
 msgid "%s = %s"
 msgstr "%s በ %s"
 
-#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
 msgid "Certificate Signature Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:1048
+#: smime/lib/e-cert.c:1100
 #, fuzzy
 msgid "Issuer"
 msgstr "አስገባ (_I)"
 
-#: smime/lib/e-cert.c:1102
+#: smime/lib/e-cert.c:1154
 msgid "Issuer Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1121
+#: smime/lib/e-cert.c:1173
 msgid "Subject Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1164
+#: smime/lib/e-cert.c:1216
 msgid "Certificate Signature Value"
 msgstr ""
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
+#: smime/lib/e-cert-db.c:608
 msgid "Certificate already exists"
 msgstr ""
 
@@ -17409,7 +16911,7 @@ msgstr ""
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "ትግባሮች (_A)"
 
@@ -17574,7 +17076,7 @@ msgstr "ዝጋ"
 #: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:3
+#: ui/evolution.xml.h:4
 msgid "Close"
 msgstr "ዝጋ"
 
@@ -17587,7 +17089,7 @@ msgid "Delete this item"
 msgstr ""
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr "ዋናው ቱልባር"
 
@@ -17630,7 +17132,7 @@ msgstr ""
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:44
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "_File"
 msgstr "ፋይል (_F)"
 
@@ -17893,13 +17395,13 @@ msgstr ""
 msgid "_Threaded Message List"
 msgstr ""
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "ይሄንን መስኮት ዝጋ"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "_Close"
 msgstr "ዝጋ (_C)"
 
@@ -18300,7 +17802,7 @@ msgstr ""
 msgid "_Quoted"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
 msgid "_Tools"
 msgstr "መሣሪያዎች (_T)"
 
@@ -18599,108 +18101,120 @@ msgid "_Open Task"
 msgstr "የማይፈለግ"
 
 #: ui/evolution.xml.h:1
-msgid "About Ximian Evolution..."
-msgstr ""
+#, fuzzy
+msgid "About Evolution..."
+msgstr "አውቶማቲክ"
 
 #: ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
 msgstr ""
 
-#: ui/evolution.xml.h:5
+#: ui/evolution.xml.h:3
+msgid "Change the visibility of the toolbar"
+msgstr ""
+
+#: ui/evolution.xml.h:6
 #, fuzzy
 msgid "Create a new window displaying this folder"
 msgstr "አዲስ ዶሴ ፍጠር"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "ውጣ (_X)"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "አድራሻ"
+
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "ከፕሮግራሙ ውጣ"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:10
 msgid "Forget _Passwords"
 msgstr ""
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:11
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:12
 msgid "Import data from other programs"
 msgstr ""
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:14
 #, fuzzy
 msgid "New _Window"
 msgstr "አሁኑኑ"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Pi_lot Settings..."
 msgstr ""
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Send / Receive"
 msgstr "ላክ / ተቀበል"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Send queued items and retrieve new items"
 msgstr ""
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Set up Pilot configuration"
 msgstr ""
 
-#: ui/evolution.xml.h:17
-msgid "Show information about Ximian Evolution"
+#: ui/evolution.xml.h:19
+msgid "Show information about Evolution"
 msgstr ""
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:20
 msgid "Submit Bug Report"
 msgstr "የስሕተቱን ጉዳይ አቅርብ"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:21
 msgid "Submit _Bug Report"
 msgstr "የስሕተቱን ጉዳይ አቅርብ"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Submit a bug report using Bug Buddy"
 msgstr ""
 
-#: ui/evolution.xml.h:21
-msgid "Toggle whether we are working offline."
-msgstr ""
-
 #: ui/evolution.xml.h:23
-msgid "Ximian Evolution _FAQ"
-msgstr ""
+#, fuzzy
+msgid "T_oolbar"
+msgstr "ዋናው ቱልባር"
 
 #: ui/evolution.xml.h:24
-msgid "_About Ximian Evolution..."
+msgid "Toggle whether we are working offline."
 msgstr ""
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "_About Evolution..."
+msgstr "አውቶማቲክ"
+
+#: ui/evolution.xml.h:30
 msgid "_Help"
 msgstr "መረጃ (_H)"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "_Import..."
 msgstr "ከውጭ አስገባ... (_I)"
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "_New"
 msgstr "አዲስ (_N)"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "_Quick Reference"
 msgstr ""
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_Send / Receive"
 msgstr "ላክ / ተቀበል (_S)"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 #, fuzzy
 msgid "_Window"
 msgstr "አሁኑኑ"
@@ -18777,7 +18291,7 @@ msgid "With _Status"
 msgstr "ሁኔታ"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:626
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:635
 msgid "UTC"
 msgstr "UTC"
 
@@ -18932,28 +18446,28 @@ msgstr "ሌላ..."
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
-#: widgets/misc/e-error.c:121
+#: widgets/misc/e-error.c:79 widgets/misc/e-error.c:80
+#: widgets/misc/e-error.c:122
 #, fuzzy
 msgid "Evolution Error"
 msgstr "አድራሻ"
 
-#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
-#: widgets/misc/e-error.c:119
+#: widgets/misc/e-error.c:81 widgets/misc/e-error.c:82
+#: widgets/misc/e-error.c:120
 msgid "Evolution Warning"
 msgstr ""
 
-#: widgets/misc/e-error.c:118
+#: widgets/misc/e-error.c:119
 #, fuzzy
 msgid "Evolution Information"
 msgstr "የኩነቶች መረጃ"
 
-#: widgets/misc/e-error.c:120
+#: widgets/misc/e-error.c:121
 msgid "Evolution Query"
 msgstr ""
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:410
+#: widgets/misc/e-error.c:415
 #, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -19095,17 +18609,129 @@ msgstr "ፋይል sን መክፈት አልቻለም፦ %s፦ %s"
 msgid "Cannot open file \"{0}\"."
 msgstr "ፋይል sን መክፈት አልቻለም፦ %s፦ %s"
 
-#: widgets/misc/e-task-widget.c:211
+#: widgets/misc/e-task-widget.c:212
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: widgets/misc/e-task-widget.c:216
+#: widgets/misc/e-task-widget.c:217
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Email address:"
+#~ msgstr "ኢሜያል አድራሻ"
+
+#~ msgid "One"
+#~ msgstr "አንድ"
+
+#~ msgid "_Port number:"
+#~ msgstr "የ_ፖርት ቍጥር፦"
+
+#~ msgid "_Server name:"
+#~ msgstr "_የሰርቨር ስም፦"
+
+#, fuzzy
+#~ msgid "Job title:"
+#~ msgstr "አርእስት"
+
+#, fuzzy
+#~ msgid "Webcam:"
+#~ msgstr "ገጽ"
+
+#, fuzzy
+#~ msgid "Calendar Properties"
+#~ msgstr "ቀን መቁጠሪያ"
+
+#, fuzzy
+#~ msgid "Remote"
+#~ msgstr "አስወግድ"
+
+#, fuzzy
+#~ msgid "Task List Properties"
+#~ msgstr "ምርጫዎች"
+
+#, fuzzy
+#~ msgid "_Source URL:"
+#~ msgstr "ምንጭ"
+
+#, fuzzy
+#~ msgid "Save Event"
+#~ msgstr "የቀን መቁጠሪያ ኩነቶች"
+
+#, fuzzy
+#~ msgid "Could not get article %s from NNTP server"
+#~ msgstr ""
+#~ "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Stream error"
+#~ msgstr "የውስጥ ብልሽት"
+
+#, fuzzy
+#~ msgid "Connection error: %s"
+#~ msgstr "ያልታወቀ ስህተት፦ %s"
+
+#, fuzzy
+#~ msgid "Could not get messages: unspecified error"
+#~ msgstr ""
+#~ "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+#~ "%s"
+
+#~ msgid "Deleted"
+#~ msgstr "የጠፋ"
+
+#~ msgid "Draft"
+#~ msgstr "ንድፍ"
+
+#~ msgid "is"
+#~ msgstr "ነው"
+
+#~ msgid "is not"
+#~ msgstr "አይደለም"
+
+#, fuzzy
+#~ msgid "Junk Test"
+#~ msgstr "ጁን"
+
+#, fuzzy
+#~ msgid "Message is Junk"
+#~ msgstr "መልዕክቶች"
+
+#, fuzzy
+#~ msgid "Message is not Junk"
+#~ msgstr "መልዕክት"
+
+#, fuzzy
+#~ msgid "Pipe to Program"
+#~ msgstr "ከፕሮግራሙ ውጣ"
+
+#~ msgid "Play Sound"
+#~ msgstr "ድምፅ አጫውት"
+
+#, fuzzy
+#~ msgid "Run Program"
+#~ msgstr "ፕሮግራምን አስኪድ፦"
+
+#~ msgid "Size (kB)"
+#~ msgstr "መጠን kb"
+
+#, fuzzy
+#~ msgid "_Filename:"
+#~ msgstr "የፋይል ስም፦"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "Unknown error."
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "ያልታወቀ ስህተት።"
+
+#, fuzzy
 #~ msgid "Address 2:"
 #~ msgstr "አድራሻ"
 
@@ -19184,9 +18810,6 @@ msgstr ""
 #~ msgid "_Mobile:"
 #~ msgstr "ሞቢል"
 
-#~ msgid "_Office:"
-#~ msgstr "ቢሮ"
-
 #, fuzzy
 #~ msgid "Calendar Creation Assistant"
 #~ msgstr "ቀን መቁጠሪያ"
@@ -19349,10 +18972,6 @@ msgstr ""
 #~ msgid "Search"
 #~ msgstr "&ፈልግ"
 
-#, fuzzy
-#~ msgid "Encryption"
-#~ msgstr "መግለጫ"
-
 #~ msgid "With _Category"
 #~ msgstr "በምድብ ጋር (_C)"
 
diff --git a/po/az.po b/po/az.po
index 33093c324c..dfc8d404c4 100644
--- a/po/az.po
+++ b/po/az.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.HEAD\n"
-"POT-Creation-Date: 2004-05-19 14:00-0400\n"
+"POT-Creation-Date: 2004-06-03 11:14-0400\n"
 "PO-Revision-Date: 2004-01-29 19:19+0200\n"
 "Last-Translator: Mətin Əmirov <metin@karegen.com>\n"
 "Language-Team: Azerbaijani Turkish <gnome@azitt.com>\n"
@@ -62,13 +62,13 @@ msgstr "kartlar"
 msgid "Default Sync Address:"
 msgstr "Ön Qurğulu Sync Ünvanı:"
 
-#: addressbook/conduit/address-conduit.c:1150
 #: addressbook/conduit/address-conduit.c:1151
+#: addressbook/conduit/address-conduit.c:1152
 msgid "Could not load addressbook"
 msgstr "Ünvan kitabçası yüklənə bilmədi"
 
-#: addressbook/conduit/address-conduit.c:1219
-#: addressbook/conduit/address-conduit.c:1222
+#: addressbook/conduit/address-conduit.c:1220
+#: addressbook/conduit/address-conduit.c:1223
 msgid "Could not read pilot's Address application block"
 msgstr "Pilot-un Ünvan tə'minatı bloku oxuna bilmədi"
 
@@ -76,13 +76,13 @@ msgstr "Pilot-un Ünvan tə'minatı bloku oxuna bilmədi"
 msgid "Accessing LDAP Server anonymously"
 msgstr "LDAP vericisinə anonim olaraq yetişmə"
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
 msgid "Failed to authenticate.\n"
 msgstr "Tanıdılma bacarılmadı.\n"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%s %s üçün şifrə daxil edin (istifadəçi %s)"
@@ -126,51 +126,23 @@ msgstr "Ə_laqələr:"
 msgid "Create a new contacts group"
 msgstr "Yeni qısa yol qrupu yarat"
 
-#: addressbook/gui/component/addressbook-component.c:182
+#: addressbook/gui/component/addressbook-component.c:184
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:483
-msgid "Failed to connect to LDAP server"
-msgstr "LDAP vericisinə bağlanma xətası"
-
-#: addressbook/gui/component/addressbook-config.c:507
-msgid "Failed to authenticate with LDAP server"
-msgstr "IMAP vericisinə tanıdılma xətası"
-
-#: addressbook/gui/component/addressbook-config.c:535
-msgid "Could not perform query on Root DSE"
-msgstr "Kök DSE üstündə sorğu həyata keçirilə bilmədi"
-
-#: addressbook/gui/component/addressbook-config.c:840
-msgid "The server responded with no supported search bases"
-msgstr "Bu verici dəstəklənməyən axtarış bazaları ilə cavab verdi"
-
-#: addressbook/gui/component/addressbook-config.c:1245
-msgid "This server does not support LDAPv3 schema information"
-msgstr "Bu verici LDAPv3 sxem mə'lumatını dəstəkləmir"
-
-#: addressbook/gui/component/addressbook-config.c:1266
-msgid "Error retrieving schema information"
-msgstr "Sxem mə'lumatını alma xətası"
-
-#: addressbook/gui/component/addressbook-config.c:1274
-msgid "Server did not respond with valid schema information"
-msgstr "Verici hökmlü sxem mə'lumatı ilə cavab vermədi"
-
 #: addressbook/gui/component/addressbook-migrate.c:68
-#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1160
 msgid "Migrating..."
 msgstr "Daşınır..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1201
 #, c-format
 msgid "Migrating `%s':"
 msgstr "`%s' daşınır:"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:438
+#: addressbook/gui/component/addressbook-migrate.c:464
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
 #: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
@@ -178,28 +150,28 @@ msgid "On This Computer"
 msgstr "Bu Kompüterdə"
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:446
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
-#: mail/mail-config.glade.h:106
+#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
+#: mail/mail-config.glade.h:109
 msgid "Personal"
 msgstr "Şəxsi"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:454
+#: addressbook/gui/component/addressbook-migrate.c:480
 msgid "On LDAP Servers"
 msgstr "LDAP Vericilərində"
 
-#: addressbook/gui/component/addressbook-migrate.c:582
+#: addressbook/gui/component/addressbook-migrate.c:608
 msgid "LDAP Servers"
 msgstr "LDAP Vericiləri"
 
-#: addressbook/gui/component/addressbook-migrate.c:702
+#: addressbook/gui/component/addressbook-migrate.c:728
 msgid "Autocompletion Settings"
 msgstr "Avtomatik Tamamlama Qovluqları"
 
-#: addressbook/gui/component/addressbook-migrate.c:1076
+#: addressbook/gui/component/addressbook-migrate.c:1104
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -211,7 +183,7 @@ msgstr ""
 "\n"
 "Xahiş edirik Evolution qovluqlarınızı daşırkən gözləyin..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1090
+#: addressbook/gui/component/addressbook-migrate.c:1118
 #, fuzzy
 msgid ""
 "The format of mailing list contacts has changed.\n"
@@ -223,7 +195,7 @@ msgstr ""
 "\n"
 "Xahiş edirik Evolution qovluqlarınızı daşırkən gözləyin..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1099
+#: addressbook/gui/component/addressbook-migrate.c:1127
 #, fuzzy
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
@@ -235,7 +207,7 @@ msgstr ""
 "\n"
 "Xahiş edirik Evolution qovluqlarınızı daşırkən gözləyin..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1109
+#: addressbook/gui/component/addressbook-migrate.c:1137
 #, fuzzy
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
@@ -247,39 +219,34 @@ msgstr ""
 "\n"
 "Xahiş edirik Evolution qovluqlarınızı daşırkən gözləyin..."
 
-#: addressbook/gui/component/addressbook-view.c:674
+#: addressbook/gui/component/addressbook-view.c:675
 #, fuzzy, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr "'%s' ünvan kitabçası silinəcəkdir. Davam etmək istəyirsiniz?"
 
-#: addressbook/gui/component/addressbook-view.c:761
+#: addressbook/gui/component/addressbook-view.c:754
 #, fuzzy
 msgid "New Address Book"
 msgstr "Yeni Ünvan Kitabçası"
 
-#: addressbook/gui/component/addressbook-view.c:762
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
+#: addressbook/gui/component/addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Sil"
 
-#: addressbook/gui/component/addressbook-view.c:763
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-view.c:756
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Xassələr..."
 
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/addressbook-view.c:1002
+#. Create the contacts group
+#: addressbook/gui/component/addressbook-view.c:995
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
 #: calendar/gui/migration.c:373
 msgid "Contacts"
 msgstr "Əlaqələr"
@@ -360,10 +327,6 @@ msgid "Manage your S/MIME certificates here"
 msgstr "S/Mime vəsiqələrinizi buradan idarə edin"
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-msgid "  S_how Supported Bases "
-msgstr "  Dəstəklənən Bazaları _Göstər "
-
-#: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -378,392 +341,324 @@ msgstr "  Dəstəklənən Bazaları _Göstər "
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1:00"
-msgstr "1:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
-msgstr "5:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "Tanıtma"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
 #, fuzzy
 msgid "<b>Display</b>"
 msgstr "_Görünüş"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 #, fuzzy
 msgid "<b>Downloading</b>"
 msgstr "<b>Epoçt Göndərilməsi:</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:10
 #, fuzzy
 msgid "<b>Searching</b>"
 msgstr "Axtarılır"
 
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
 msgid "<b>Server Information</b>"
 msgstr "Addım 2: Verici Mə'lumatı"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
 msgid "<b>Type:</b>"
 msgstr "<b>Qalıb:</b> "
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:13
 #, fuzzy
 msgid "Add Contacts Group"
 msgstr "Ə_laqələr:"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:14
 #, fuzzy
 msgid "Address Book Properties"
 msgstr "Ünvan Kitabçası Xassələri"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
-#: mail/mail-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
+#: mail/mail-config.glade.h:42
 msgid "Always"
 msgstr "Həmişə"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr "Anonim olaraq"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:17
 #: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Əsas"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
-msgid "Connecting"
-msgstr "Bağlanır"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 #: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Təfərruatlar"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
-msgid "Distinguished _name:"
-msgstr "Ayırılan _adı:"
-
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:19
 #, fuzzy
 msgid "Distinguished name"
 msgstr "Ayırılan _adı:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:20
 #, fuzzy
 msgid "Download limit:"
 msgstr "_Endirmə məhdudiyyəti:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Email address"
 msgstr "Epoçt ünvanı:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "Email address:"
-msgstr "Epoçt ünvanı:"
-
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "Evolution will use this DN to authenticate you with the server"
-msgstr "Evolution sizi vericiyə tanıtmaq üçün DN istifadə edəcək"
-
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:22
+#, fuzzy
 msgid ""
-"Evolution will use this email address to authenticate you with the server"
+"Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "Evolution sizi vericiyə tanıtmaq üçün bu epoçt ünvanını istifadə edəcək"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:23
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Dəstəklənən Axtarış Bazaları"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:24
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
+#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Ümumi"
 
-#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
-#: mail/mail-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
+#: mail/mail-config.glade.h:102
 msgid "Never"
 msgstr "Qətiyyən"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
-msgid "One"
-msgstr "Bir"
-
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:35
-msgid "S_earch scope: "
-msgstr "Axtarışın əhatə _sahəsi: "
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Search _base:"
+msgstr "_Axtarış bazası:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
 msgid "Search base only"
 msgstr "_Axtarış bazası:"
 
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:29
 #, fuzzy
 msgid "Search base:"
 msgstr "_Axtarış bazası:"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Search scope:"
 msgstr "Axtarışın əhatə _sahəsi: "
 
-#: addressbook/gui/component/ldap-config.glade.h:39
-msgid "Searching"
-msgstr "Axtarılır"
-
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:31
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
-"server if\n"
-"your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL or TLS."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a \n"
-"insecure environment. For example, if you and your LDAP server are behind a "
-"firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection "
-"is already\n"
-"secure."
+"you are in a insecure environment. For example, if you and your LDAP server "
+"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
+"because your connection is already secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
-"TLS.  This \n"
-"means that your connection will be insecure, and that you will be vulnerable "
-"to security\n"
-"exploits. "
+"TLS.  This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Sub"
-msgstr "Alt"
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr "Dəstəklənən Axtarış Bazaları"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
-"searches will \n"
-"begin. If you leave this blank, the search will begin at the root of the "
-"directory tree."
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
-"the \n"
-"directory tree. A search scope of \"sub\" will include all entries below "
-"your search base.\n"
-"A search scope of \"one\" will only include the entries one level beneath "
-"your base.\n"
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:58
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "Bu sizin ldap vericinizin tam adıdır. Məsələn: \"ldap.mycompany.com\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
-"This is the maximum number of entries to download. Setting this number to "
-"be \n"
+"This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:41
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
-"list.\n"
-"It is for display purposes only. "
+"list. It is for display purposes only. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. "
-"A \n"
-"list of standard ports has been provided. Ask your system administrator\n"
-"what port you should specify."
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:67
-msgid "This option controls how long a search will be run."
-msgstr "BU seçim axtarışın nə vaxtla icra ediləcəyini bildirir."
-
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:43
 #, fuzzy
 msgid "Timeout:"
 msgstr "Vaxt formatı:"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
-msgid "U_se SSL/TLS:"
-msgstr "SSL/TLS _işlət:"
-
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr "Ayırılan ad (DN) işlədilir"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr "Epoçt ünvanı işlədilir"
 
-#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
-#: mail/mail-config.glade.h:154
+#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
+#: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr "Mümkünsə Həmişə"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:47
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "Ə_laqələr:"
 
-#: addressbook/gui/component/ldap-config.glade.h:74
-#: calendar/gui/dialogs/calendar-setup.glade.h:12
-msgid "_Display name:"
-msgstr "_Göstərilən ad:"
-
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr "_Endirmə məhdudiyyəti:"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
 msgid "_Email address:"
 msgstr "Epoçt ünvanı:"
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:50
+#, fuzzy
+msgid "_Find Possible Search Bases"
+msgstr "Dəstəklənən Axtarış Bazaları"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Log in method:"
 msgstr "_Giriş yöntəmi:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "_Log in:"
+msgstr "Giriş"
+
+#: addressbook/gui/component/ldap-config.glade.h:53
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
 msgid "_Name:"
 msgstr "_Ad:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
-msgid "_Port number:"
-msgstr "_Qapı nömrəsi:"
-
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "_Port:"
 msgstr "Ü_stünlük:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
-msgid "_Search base:"
-msgstr "_Axtarış bazası:"
-
-#: addressbook/gui/component/ldap-config.glade.h:82
-msgid "_Server name:"
-msgstr "_Verici adı:"
+#: addressbook/gui/component/ldap-config.glade.h:55
+#, fuzzy
+msgid "_Search scope:"
+msgstr "Axtarışın əhatə _sahəsi: "
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:56
 #, fuzzy
 msgid "_Server:"
 msgstr "_Verici:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
-msgid "_Timeout (minutes):"
-msgstr "_Vaxt Dolması (dəqiqə):"
+#: addressbook/gui/component/ldap-config.glade.h:57
+#, fuzzy
+msgid "_Timeout:"
+msgstr "Vaxt formatı:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:58
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "_E'tibarlı bağlantı (SSL) işlət:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "kartlar"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
-msgid "connecting-tab"
-msgstr "bağlanma-səkməsi"
-
-#: addressbook/gui/component/ldap-config.glade.h:88
-msgid "general-tab"
-msgstr "ümumi-səkməsi"
-
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:60
 #: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
-#: mail/mail-config.glade.h:182
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "dəqiqə"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
-msgid "searching-tab"
-msgstr "axtarış-səkməsi"
-
-#: addressbook/gui/component/select-names/e-select-names.c:497
+#: addressbook/gui/component/select-names/e-select-names.c:503
 #: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid "Select Contacts from Address Book"
 msgstr "Əlaqələri Ünvan Kitabçasından Seç"
 
-#: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
@@ -803,7 +698,7 @@ msgstr "Adsız Əlaqə"
 
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:222
+#: addressbook/gui/widgets/e-addressbook-view.c:224
 msgid "Source"
 msgstr "Mənbə"
 
@@ -876,9 +771,9 @@ msgid "<b>Work</b>"
 msgstr "<b>Qalıb:</b> "
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
-#: addressbook/gui/widgets/eab-contact-display.c:342
-#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/widgets/eab-contact-display.c:334
+#: addressbook/gui/widgets/eab-contact-display.c:353
 msgid "AIM"
 msgstr "AIM"
 
@@ -918,15 +813,15 @@ msgid "Company:"
 msgstr "Qabığ Əmri"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:271
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
+#: addressbook/gui/contact-editor/e-contact-editor.c:266
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
 msgstr "Əlaqə"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1527
+#: addressbook/gui/contact-editor/e-contact-editor.c:520
 msgid "Contact Editor"
 msgstr "Əlaqə Editoru"
 
@@ -950,83 +845,80 @@ msgid "Full _Name..."
 msgstr "_Tam Ad..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:202
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-msgid "Home"
-msgstr "Ev"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #, fuzzy
 msgid "Home Page:"
 msgstr "Ev səhifəsi"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-#, fuzzy
-msgid "Job title:"
-msgstr "Məslək _izahı:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/e-itip-control.c:936
-msgid "Location:"
-msgstr "Mövqe:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 #, fuzzy
 msgid "MSN Messenger"
 msgstr "_Məktub İsmarışı"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 #, fuzzy
 msgid "Mailing Address"
 msgstr "E-Poçt Ünvanını Birləşdir"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 #, fuzzy
 msgid "Manager:"
 msgstr "İdarəçi"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "_Ləqəb:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Notes:"
 msgstr "_Qeydlər:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
-#: addressbook/gui/contact-editor/e-contact-editor.c:203
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-msgid "Other"
-msgstr "Başqa"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#, fuzzy
+msgid "Office:"
+msgstr "_İdarə:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "PO Box:"
 msgstr "_Poçt Qutusu:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 #, fuzzy
 msgid "Personal Information"
 msgstr "Arzuya Bağlı Mə'lumatlar"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 #, fuzzy
 msgid "Profession:"
 msgstr "_Məslək:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#, fuzzy
+msgid "Spouse:"
+msgstr "_Yoldaş:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "State/Province:"
 msgstr "_Vilayət"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#, fuzzy
+msgid "Title:"
+msgstr "B_aşlıq:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+msgid "Video Chat:"
+msgstr ""
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:41
 #, fuzzy
 msgid "Wants to receive HTML mail"
@@ -1034,15 +926,15 @@ msgstr "_HTML poçt almaq istəyir"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:42
 #, fuzzy
-msgid "Webcam:"
-msgstr "Veb Səhifəsi:"
+msgid "Web Log:"
+msgstr "_Veb Səhifəsi:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
-#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
-#: mail/mail-config.glade.h:155
+#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
+#: mail/mail-config.glade.h:157
 msgid "Work"
 msgstr "İş"
 
@@ -1062,19 +954,12 @@ msgid "_File under:"
 msgstr "Fayl adı:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 #, fuzzy
 msgid "_Where:"
 msgstr "_Verici:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
-msgid "item7"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
-msgid "item8"
-msgstr ""
-
-#: addressbook/gui/contact-editor/eab-editor.c:316
+#: addressbook/gui/contact-editor/eab-editor.c:315
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -1082,7 +967,7 @@ msgstr ""
 "Bu əlaqələri həqiqətən\n"
 "də silmək istəyirsiniz?"
 
-#: addressbook/gui/contact-editor/eab-editor.c:319
+#: addressbook/gui/contact-editor/eab-editor.c:318
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -1091,16 +976,16 @@ msgstr ""
 "də silmək istəyirsiniz?"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:351
-#: addressbook/gui/widgets/eab-contact-display.c:372
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Address"
 msgstr "Ünvan"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:292
+#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard.c:174
@@ -2078,87 +1963,110 @@ msgstr "Zambiya"
 msgid "Zimbabwe"
 msgstr "Zimbabve"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/contact-editor/e-contact-editor.c:179
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:337
+#: addressbook/gui/widgets/eab-contact-display.c:356
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:347
-#: addressbook/gui/widgets/eab-contact-display.c:366
+#: addressbook/gui/contact-editor/e-contact-editor.c:180
+#: addressbook/gui/widgets/eab-contact-display.c:339
+#: addressbook/gui/widgets/eab-contact-display.c:358
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: addressbook/gui/widgets/eab-contact-display.c:338
+#: addressbook/gui/widgets/eab-contact-display.c:357
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:344
-#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#: addressbook/gui/widgets/eab-contact-display.c:355
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/contact-editor/e-contact-editor.c:183
 #, fuzzy
 msgid "GroupWise"
 msgstr "Qrup"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+msgid "Home"
+msgstr "Ev"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+msgid "Other"
+msgstr "Başqa"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
 msgid "Source Book"
 msgstr "Mənbə Kitab"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:264
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Target Book"
 msgstr "Hədəf Kitab"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:278
+#: addressbook/gui/contact-editor/e-contact-editor.c:273
 msgid "Is New Contact"
 msgstr "Yeni Əlaqə Mi"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:285
+#: addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Writable Fields"
 msgstr "Yazıla Bilən Sahələr"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:299
+#: addressbook/gui/contact-editor/e-contact-editor.c:294
 msgid "Changed"
 msgstr "Dəyişdirilib"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
-msgid "Category editor not available."
-msgstr "Kateqoriya editoru mövcud deyildir."
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:2352
 msgid "This contact belongs to these categories:"
 msgstr "Bu üzv bu kateqoriyalara aitdir:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#: addressbook/gui/contact-editor/e-contact-editor.c:2429
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Xaniş edirik, aşağıdakı seçənəklər arasından seçin"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#: addressbook/gui/contact-editor/e-contact-editor.c:2433
 #, fuzzy
 msgid "No image"
 msgstr "Niger"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#: addressbook/gui/contact-editor/e-contact-editor.c:2636
 #, fuzzy
 msgid ""
-"The following entries are invalid:\n"
+"The contact data is invalid:\n"
 "\n"
-msgstr "Aıağıdakı bağlantılar hazırda fəaldır:"
+msgstr "Təkrar tarixi hökmsüzdür"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2738
-#, c-format
-msgid "Could not find widget for a field: `%s'"
-msgstr "Sahənin pəncərəciyi tapıla bilmir: `%s'"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#, fuzzy
+msgid "Invalid contact."
+msgstr "%d əlaqə"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+msgid ""
+"The contact cannot be saved to the selected address book. Do you want to "
+"discard changes?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2727
+#: addressbook/gui/contact-editor/e-contact-editor.c:2751
+msgid "_Discard"
+msgstr "_Unut"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+msgid ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
+msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:62
 msgid "AOL Instant Messenger"
@@ -2191,7 +2099,7 @@ msgid "_Edit Full"
 msgstr "_Hamısını Düzəlt"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:166
 msgid "_Full Name:"
 msgstr "_Tam Ad:"
 
@@ -2339,30 +2247,30 @@ msgstr "Siyahı _adı:"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "Epoçt ünvanını _yazın ya da əlaqəni aşağıdakı siyahıya daşıyın:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "contact-list-editor"
 msgstr "əlaqə-siyahısı-editoru"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:153
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:215
+#: addressbook/gui/widgets/e-addressbook-view.c:217
 #: addressbook/gui/widgets/e-minicard-view.c:460
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Kitab"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
 msgid "Is New List"
 msgstr "Yeni Siyahı Mı"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:215
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
 msgid "Contact List Editor"
 msgstr "Əlaqə Siyahısı Editoru"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:438
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
 msgid "Save List as VCard"
 msgstr "Siyahını VCard Olaraq Qeyd Et"
 
@@ -2409,125 +2317,125 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Ətraflı Axtarış"
 
-#: addressbook/gui/widgets/eab-contact-display.c:129
-#: addressbook/gui/widgets/eab-contact-display.c:192
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:139
-#: addressbook/gui/widgets/eab-contact-display.c:205
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:257
-#: addressbook/gui/widgets/eab-contact-display.c:533
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:525
 msgid "List Members"
 msgstr "Üzvləri Sırala"
 
-#: addressbook/gui/widgets/eab-contact-display.c:329
-#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/eab-contact-display.c:321
+#: addressbook/gui/widgets/eab-contact-display.c:323
 #, fuzzy
 msgid "E-mail"
 msgstr "Epoçt"
 
-#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/eab-contact-display.c:332
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Quruluş"
 
-#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:333
 #, fuzzy
 msgid "Position"
 msgstr "İzahat"
 
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:354
 #, fuzzy
 msgid "Groupwise"
 msgstr "Qrup"
 
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:340
 #, fuzzy
 msgid "Video Conferencing"
 msgstr "_Video Görüşmə URL-si:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:349
-#: addressbook/gui/widgets/eab-contact-display.c:370
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:362
 #, fuzzy
 msgid "Phone"
 msgstr "Maşın Telefonu"
 
-#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:342
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:354
+#: addressbook/gui/widgets/eab-contact-display.c:346
 #, fuzzy
 msgid "work"
 msgstr "İş"
 
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:359
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:368
-#: addressbook/gui/widgets/eab-contact-display.c:587
+#: addressbook/gui/widgets/eab-contact-display.c:360
+#: addressbook/gui/widgets/eab-contact-display.c:579
 msgid "Blog"
 msgstr "Bloq"
 
-#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/eab-contact-display.c:363
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Əl Telefonu"
 
-#: addressbook/gui/widgets/eab-contact-display.c:375
+#: addressbook/gui/widgets/eab-contact-display.c:367
 #, fuzzy
 msgid "personal"
 msgstr "Şəxsi"
 
-#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/eab-contact-display.c:374
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Qeyd"
 
-#: addressbook/gui/widgets/eab-contact-display.c:548
+#: addressbook/gui/widgets/eab-contact-display.c:540
 msgid "Job Title"
 msgstr "Məslək"
 
-#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/eab-contact-display.c:544
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:774
+#: smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "Epoçt"
 
-#: addressbook/gui/widgets/eab-contact-display.c:579
+#: addressbook/gui/widgets/eab-contact-display.c:571
 msgid "Home page"
 msgstr "Ev səhifəsi"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 msgid "Success"
 msgstr "Müvəffəqiyyət"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Backend busy"
 msgstr ""
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Repository offline"
 msgstr "Nüsxə xətdə deyil"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 #, fuzzy
 msgid "Address Book does not exist"
 msgstr "Ünvan kitabçası mövcud deyil"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 #, fuzzy
 msgid "No Self Contact defined"
 msgstr "Yeni Əlaqə Siyahısı"
@@ -2535,27 +2443,27 @@ msgstr "Yeni Əlaqə Siyahısı"
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Permission denied"
 msgstr "Qadağandır"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Contact not found"
 msgstr "Əlavə tapıla bilmədi"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Contact ID already exists"
 msgstr "Əlaqə ID-si onsuz da mövcuddur"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Protocol not supported"
 msgstr "Protokol dəstəklənmir"
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:60
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:233
 #: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
@@ -2568,39 +2476,39 @@ msgid "Cancelled"
 msgstr "Ləğv Edildi"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:61
 #, fuzzy
 msgid "Could not cancel"
 msgstr "Mənbə açıla bilmədi"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Authentication Failed"
 msgstr "Tanıtma Bacarılmadı"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Authentication Required"
 msgstr "Tanıtma Məcburidir"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:66
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "TLS not Available"
 msgstr "TLS Mövcud Deyil"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#: addressbook/gui/widgets/eab-gui-util.c:66
 #, fuzzy
 msgid "No such source"
 msgstr "Belə ismarış yoxdur"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:69
+#: addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Other error"
 msgstr "Başqa xəta"
 
-#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:90
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
@@ -2608,7 +2516,7 @@ msgstr ""
 "Bu ünvan kitabçası açıla bilmədi. Xahiş edirik, cığırın mövcud olduğunu və "
 "üstündəki səlahiyyətlərinizi yoxlayın."
 
-#: addressbook/gui/widgets/eab-gui-util.c:110
+#: addressbook/gui/widgets/eab-gui-util.c:97
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -2616,17 +2524,18 @@ msgstr ""
 "Bu ünvan kitabçası açıla bilmədi. Ya səhv URI bildirdiniz, ya da LDAP "
 "vericisinə yetişilə bilmir."
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:102
+#, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution you must compile the program from the CVS "
-"sources after retrieving OpenLDAP from the link below."
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
 msgstr ""
 "Evolution proqramının bu buraxılışı LDAP verici dəstəyi ilə dərlənməmişdir. "
 "LDAP dəstəkli Evolution üçün aşağıdakı körpüdən OpenLDAP-ı aldıqdan sonra "
 "CVS mənbələrini yenidən dərləməlisiniz."
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:109
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -2634,11 +2543,7 @@ msgstr ""
 "Bu ünvan kitabçası açıla bilmədi.  Ya səhv URL bildirdiniz, ya da vericiyə "
 "yetişilə bilmir."
 
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "Unable to open addressbook"
-msgstr "Ünvan kitabçası açıla bilmədi"
-
-#: addressbook/gui/widgets/eab-gui-util.c:162
+#: addressbook/gui/widgets/eab-gui-util.c:129
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2646,7 +2551,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:168
+#: addressbook/gui/widgets/eab-gui-util.c:135
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -2654,53 +2559,45 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:174
+#: addressbook/gui/widgets/eab-gui-util.c:141
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "Bu ünvan kitabçasının mühərriki bu sorğunu oxuya bilmədi."
 
-#: addressbook/gui/widgets/eab-gui-util.c:177
+#: addressbook/gui/widgets/eab-gui-util.c:144
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Bu ünvan kitabçasının mühərriki bu sorğunu tətbiq etməyi rədd etdi."
 
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:147
 msgid "This query did not complete successfully."
 msgstr "Bu sorğu müvəffəqiyyətlə nəticələnmədi."
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
-msgid "Do you want to save changes?"
-msgstr "Dəyişiklikləri qeyd etmək istəyirsiniz?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:208
-msgid "_Discard"
-msgstr "_Unut"
-
-#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:169
 msgid "Error adding list"
 msgstr "Siyahıya əlavə etmə xətası"
 
-#: addressbook/gui/widgets/eab-gui-util.c:229
-#: addressbook/gui/widgets/eab-gui-util.c:652
+#: addressbook/gui/widgets/eab-gui-util.c:169
+#: addressbook/gui/widgets/eab-gui-util.c:580
 msgid "Error adding contact"
 msgstr "Əlaqə əlavə etmə xətası"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying list"
 msgstr "Siyahı təkmilləşdirmə xətası"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying contact"
 msgstr "Əlavə təkmilləşdirmə xətası"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:192
 msgid "Error removing list"
 msgstr "Siyahı çıxartma xətası"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
-#: addressbook/gui/widgets/eab-gui-util.c:610
+#: addressbook/gui/widgets/eab-gui-util.c:192
+#: addressbook/gui/widgets/eab-gui-util.c:538
 msgid "Error removing contact"
 msgstr "Əlaqə silmə xətası"
 
-#: addressbook/gui/widgets/eab-gui-util.c:334
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2709,7 +2606,7 @@ msgstr ""
 "%d kart açmaq %d yeni pəncərə də açacaqdır.\n"
 "Həqiqətən də bütün bu kartları görmək istəyirsiniz?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:360
+#: addressbook/gui/widgets/eab-gui-util.c:300
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2718,50 +2615,45 @@ msgstr ""
 "%s onsuz da mövcuddur.\n"
 "Üstünə yazmaq istəyirsiniz?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:364
+#: addressbook/gui/widgets/eab-gui-util.c:304
 msgid "Overwrite"
 msgstr "Üstünə yaz"
 
-#: addressbook/gui/widgets/eab-gui-util.c:400
-#, c-format
-msgid "Error saving %s: %s"
-msgstr "%s qeyd edilirkən xəta yarandı: %s"
-
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:437
+#: addressbook/gui/widgets/eab-gui-util.c:365
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:571
+#: addressbook/gui/widgets/eab-gui-util.c:499
 msgid "list"
 msgstr "siyahı"
 
-#: addressbook/gui/widgets/eab-gui-util.c:706
+#: addressbook/gui/widgets/eab-gui-util.c:634
 msgid "Move contact to"
 msgstr "Əlaqəni daşı"
 
-#: addressbook/gui/widgets/eab-gui-util.c:708
+#: addressbook/gui/widgets/eab-gui-util.c:636
 msgid "Copy contact to"
 msgstr "Əlaqəni köçür"
 
-#: addressbook/gui/widgets/eab-gui-util.c:711
+#: addressbook/gui/widgets/eab-gui-util.c:639
 msgid "Move contacts to"
 msgstr "Əlaqələri daşı"
 
-#: addressbook/gui/widgets/eab-gui-util.c:713
+#: addressbook/gui/widgets/eab-gui-util.c:641
 msgid "Copy contacts to"
 msgstr "Əlaqələri köçür"
 
-#: addressbook/gui/widgets/eab-gui-util.c:716
+#: addressbook/gui/widgets/eab-gui-util.c:644
 #, fuzzy
 msgid "Select target addressbook."
 msgstr "Əlaqələri Ünvan Kitabçasından Seç"
 
-#: addressbook/gui/widgets/eab-gui-util.c:939
+#: addressbook/gui/widgets/eab-gui-util.c:867
 msgid "Multiple VCards"
 msgstr "Çoxlu VCard"
 
-#: addressbook/gui/widgets/eab-gui-util.c:942
+#: addressbook/gui/widgets/eab-gui-util.c:870
 #, c-format
 msgid "VCard for %s"
 msgstr "%s üçün VCard"
@@ -2849,7 +2741,7 @@ msgstr[1] "%d əlaqə"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:229
+#: addressbook/gui/widgets/e-addressbook-view.c:231
 #: addressbook/gui/widgets/e-minicard-view.c:467
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
@@ -2867,143 +2759,135 @@ msgstr "Model"
 msgid "Error modifying card"
 msgstr "Kard təkmilləşdirmə xətası"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:163
 msgid "Name begins with"
 msgstr "Ad bununla başlayır:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:164
 msgid "Email begins with"
 msgstr "Epoçt bununla başlayır:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:57
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Kateqoriya budur:"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-#: calendar/gui/cal-search-bar.c:50
+#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Hər hansı bir sahə bunu daxil edir:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+#: addressbook/gui/widgets/e-addressbook-view.c:172
 msgid "Advanced..."
 msgstr "Ətraflı..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:236
+#: addressbook/gui/widgets/e-addressbook-view.c:238
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:249
+#: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Növ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:506
+#: addressbook/gui/widgets/e-addressbook-view.c:508
 #, fuzzy
 msgid "Address Book"
 msgstr "Ünvan Dəftəri"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2076
+#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:2080
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
 msgstr "VCard olaraq qeyd et"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 msgid "New Contact..."
 msgstr "Yeni Əlaqə..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "New Contact List..."
 msgstr "Yeni Əlaqə Siyahısı..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Go to Folder..."
 msgstr "Qovluğa _Get..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Import..."
 msgstr "_İdxal Et..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1066
 msgid "Search for Contacts..."
 msgstr "Əlaqələri Axtar..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Ü_nvan Kitabçası Mənbələri..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1069
 msgid "Pilot Settings..."
 msgstr "Pilot Qurğuları..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Əlaqəni Ötür"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
 msgid "Send Message to Contact"
 msgstr "Əlaqəyə İsmarış Göndər"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Çap Et"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
+#: addressbook/gui/widgets/e-addressbook-view.c:1077
 msgid "Print Envelope"
 msgstr "Zərfi Çap Et"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
+#: addressbook/gui/widgets/e-addressbook-view.c:1081
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Ünvan kitabçası..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1080
+#: addressbook/gui/widgets/e-addressbook-view.c:1082
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Ünvan kitabçası..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Kəs"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Köçür"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1087
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Yapışdır"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:1092
+#: calendar/gui/e-calendar-view.c:1280
 msgid "Current View"
 msgstr "Hazırkı Görünüş"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1309
-#, c-format
-msgid ""
-"The addressbook backend for\n"
-"%s\n"
-"has crashed. You will have to restart Evolution in order to use it again"
-msgstr ""
-
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1667
-#: calendar/gui/cal-search-bar.c:362
+#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Hər Hansı Kateqoriya"
 
@@ -3109,7 +2993,7 @@ msgstr "Radio"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-list-view.c:234
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Rolu"
@@ -3254,12 +3138,12 @@ msgstr "Evolution vCalendar ixdalçısı"
 msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.c:998
+#: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr "Əlaqələri çap et"
 
-#: addressbook/printing/e-contact-print.c:1064
-#: addressbook/printing/e-contact-print.c:1091
+#: addressbook/printing/e-contact-print.c:1066
+#: addressbook/printing/e-contact-print.c:1093
 msgid "Print contact"
 msgstr "Əlaqəni çap et"
 
@@ -3506,15 +3390,21 @@ msgstr "Normal moddadır, böyüklük seçimi verilməməlidir."
 msgid "Impossible internal error."
 msgstr "Mümkün olmayan daxili xəta."
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:629
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
 msgid "Can not open file"
 msgstr "Fayl açıla bilmir"
 
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-msgid "Can not load URI"
-msgstr "URL açıla bilmir"
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "Ünvan kitabçası yüklənə bilmədi"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Ünvan kitabçası açıla bilmədi"
 
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
@@ -3532,7 +3422,7 @@ msgstr "Fayl adı bildirilməyib."
 msgid "Unnamed List"
 msgstr "Adsız Siyahı"
 
-#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Şifrəni bildir"
@@ -3811,10 +3701,10 @@ msgid "Whether to show week numbers in date navigator"
 msgstr "Tarix səyyahında həftə saylarının göstərilməsi"
 
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:88
-#: calendar/gui/gnome-cal.c:1703
-#: camel/providers/groupwise/camel-gw-listener.c:304
-#: camel/providers/groupwise/camel-gw-listener.c:327
+#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/gnome-cal.c:1705
+#: camel/providers/groupwise/camel-gw-listener.c:311
+#: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
 msgstr "Təqvim"
 
@@ -3833,7 +3723,7 @@ msgstr "Bundan köhnə hadisələri sil"
 
 #: calendar/gui/calendar-commands.c:363
 #: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:19 filter/filter.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
 msgid "days"
 msgstr "gün"
 
@@ -3978,24 +3868,24 @@ msgstr "Həftəlik Nümayiş"
 msgid "Month View"
 msgstr "Aylıq Nümayiş"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "İcmal bunu daxil edir:"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "İzahat bunu daxil edir:"
 
-#: calendar/gui/cal-search-bar.c:54
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Şərh bunu daxil edir:"
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:53
 #, fuzzy
 msgid "Location contains"
 msgstr "İzahat bunu daxil edir:"
 
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
 msgid "Unmatched"
 msgstr "Oxşar Olmayan"
 
@@ -4016,23 +3906,23 @@ msgstr "Təqvimi açmaq üçün səlahiyyət verilmədi"
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/dialogs/alarm-options.c:466
+#: calendar/gui/dialogs/alarm-options.c:467
 msgid "Audio Alarm Options"
 msgstr "Səsli Alarm Seçimləri"
 
-#: calendar/gui/dialogs/alarm-options.c:475
+#: calendar/gui/dialogs/alarm-options.c:476
 msgid "Message Alarm Options"
 msgstr "İsmarış Alarm Seçənəkləri"
 
-#: calendar/gui/dialogs/alarm-options.c:484
+#: calendar/gui/dialogs/alarm-options.c:485
 msgid "Email Alarm Options"
 msgstr "Məktubla Alarm Seçimləri"
 
-#: calendar/gui/dialogs/alarm-options.c:493
+#: calendar/gui/dialogs/alarm-options.c:494
 msgid "Program Alarm Options"
 msgstr "Proqram Alarm Seçənəkləri"
 
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:510
 msgid "Unknown Alarm Options"
 msgstr "Naməlum Alarm Seçənəkləri"
 
@@ -4068,7 +3958,7 @@ msgstr "Alıcı:"
 msgid "With these arguments:"
 msgstr "Bu arqumentlərlə:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
 msgid "dialog1"
 msgstr "dialoq1"
 
@@ -4077,7 +3967,7 @@ msgid "extra times every"
 msgstr "hər əlavə vaxtda"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:20 filter/filter.glade.h:16
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr "saat"
 
@@ -4123,7 +4013,7 @@ msgstr "Epoçt göndər"
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Mündəricat:"
 
@@ -4153,7 +4043,6 @@ msgid "hour(s)"
 msgstr "saat"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:21
 msgid "minute(s)"
 msgstr "dəqiqə"
 
@@ -4161,26 +4050,26 @@ msgstr "dəqiqə"
 msgid "start of appointment"
 msgstr "iclasın başlanğıcı"
 
-#: calendar/gui/dialogs/calendar-setup.c:170
+#: calendar/gui/dialogs/calendar-setup.c:172
 msgid "You must specify a location to get the calendar from."
 msgstr "Təqvimin alınacağı ünvanı bildirməlisiniz."
 
-#: calendar/gui/dialogs/calendar-setup.c:178
+#: calendar/gui/dialogs/calendar-setup.c:180
 #, c-format
 msgid "The source location '%s' is not well-formed."
 msgstr "'%s' mənbə mövqeyi düzgün formlanmayıb."
 
-#: calendar/gui/dialogs/calendar-setup.c:193
+#: calendar/gui/dialogs/calendar-setup.c:195
 #, c-format
 msgid "The source location '%s' is not a webcal source."
 msgstr "'%s' mənbə mövqeyi webcal mənbəsi deyil."
 
-#: calendar/gui/dialogs/calendar-setup.c:265
+#: calendar/gui/dialogs/calendar-setup.c:275
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr "Seçili qrupda onsuzda '%s' adlı mənbə mövcuddur"
 
-#: calendar/gui/dialogs/calendar-setup.c:278
+#: calendar/gui/dialogs/calendar-setup.c:288
 #, c-format
 msgid ""
 "The group '%s' is remote. You must specify a location to get the calendar "
@@ -4202,56 +4091,36 @@ msgstr "Vəzifə Siyahısı Qrupu"
 msgid "C_olor:"
 msgstr "_Rənglər"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "Calendar Properties"
-msgstr "Təqvim Xassələri"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
 msgid "Pick a color"
 msgstr "Rəng seç"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:8
-msgid "Remote"
-msgstr "Uzaq"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "Task List Properties"
-msgstr "Vəzifə Siyahısı Xassələri"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
 #, fuzzy
 msgid "_Add Calendar"
 msgstr "Yeni Təqvim Əlavə Et"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
 #, fuzzy
 msgid "_Add Group"
 msgstr "Qrup Ə_lavə Et..."
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-msgid "_Refresh Interval:"
-msgstr "_Yeniləmə Aralığı:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
 #, fuzzy
 msgid "_Refresh:"
 msgstr "Təzələ"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-msgid "_Source URL:"
-msgstr "_Mənbə URI-si:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
 #, fuzzy
 msgid "_Type:"
 msgstr "Növ:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
 #, fuzzy
 msgid "_URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
 msgid "weeks"
 msgstr "həftə"
 
@@ -4359,7 +4228,7 @@ msgid "Display"
 msgstr "_Görünüş"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:76
 msgid "E_nable"
 msgstr "_Fəallaşdır"
 
@@ -4370,7 +4239,7 @@ msgstr "_Sərbəst/Məşğul Nəşri"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:563
+#: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Cümə"
 
@@ -4384,7 +4253,7 @@ msgstr "Dəqiqə"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:559
+#: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Bazar ertəsi"
 
@@ -4394,7 +4263,7 @@ msgstr "Ba_z"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:564
+#: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Şənbə"
 
@@ -4408,7 +4277,7 @@ msgstr "Vaxt səyyahında həftə _sayını göstər"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Bazar"
 
@@ -4422,7 +4291,7 @@ msgstr "C_ax"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:562
+#: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Cümə Axşamı"
 
@@ -4436,7 +4305,7 @@ msgstr "Vaxt formatı:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:560
+#: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Çərşənbə Axşamı"
 
@@ -4446,7 +4315,7 @@ msgstr "Həftənin _başlanğıcı:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:561
+#: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Çərşənbə"
 
@@ -4479,7 +4348,7 @@ msgid "_Day begins:"
 msgstr "Günün _başlanğıcı:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
-#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:43
@@ -4528,80 +4397,50 @@ msgstr "_Çər"
 msgid "before every appointment"
 msgstr "hər görüşdən əvvəl"
 
-#: calendar/gui/dialogs/cancel-comp.c:57
-msgid ""
-"The event being deleted is a meeting, would you like to send a cancellation "
-"notice?"
-msgstr ""
-
-#: calendar/gui/dialogs/cancel-comp.c:60
-msgid "Are you sure you want to cancel and delete this meeting?"
-msgstr "Bu görüşü həqiqətən də ləğv edib silmək istəyirsiniz?"
-
-#: calendar/gui/dialogs/cancel-comp.c:66
-msgid ""
-"The task being deleted is assigned, would you like to send a cancellation "
-"notice?"
-msgstr ""
-
-#: calendar/gui/dialogs/cancel-comp.c:69
-msgid "Are you sure you want to cancel and delete this task?"
-msgstr "Bu vəzifəni həqiqətən də ləğv edib silmək istəyirsiniz?"
-
-#: calendar/gui/dialogs/cancel-comp.c:75
-msgid ""
-"The journal entry being deleted is published, would you like to send a "
-"cancellation notice?"
-msgstr ""
-
-#: calendar/gui/dialogs/cancel-comp.c:78
-msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr "Bu jurnal girişini həqiqətən də ləğv edib silmək istəyirsiniz?"
-
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Bu hadisə silindi."
 
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "Bu vəzifə silindi."
 
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:68
 msgid "This journal entry has been deleted."
 msgstr "Bu jurnal girişi silindi."
 
-#: calendar/gui/dialogs/changed-comp.c:75
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  Siz dəyişikliklər apardınız. Bu dəyişikliklər nəzərə alınmayaraq "
 "editorbağlansın?"
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Siz dəyişikliklər aparmadınız, editor bağlansın?"
 
-#: calendar/gui/dialogs/changed-comp.c:82
+#: calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "Bu hadisə dəyişdirilib."
 
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "Bu vəzifə dəyişdirilib."
 
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:92
 msgid "This journal entry has been changed."
 msgstr "Bu jurnal girişi dəyişdirilib."
 
-#: calendar/gui/dialogs/changed-comp.c:99
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Siz dəyişikliklər apardınız. Bu dəyişikliklər unudularaq editor "
 "yenilənsin?"
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Siz dəyişikliklər aparmadınız, editor yenilənsin?"
@@ -4639,7 +4478,7 @@ msgid "No summary"
 msgstr "Mündəricat yoxdur"
 
 #: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
 #: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Fərqli qeyd et..."
@@ -4691,99 +4530,51 @@ msgstr "Hədəf açıla bilmədi"
 msgid "Destination is read only"
 msgstr "Hədəf sırf oxunandır"
 
-#: calendar/gui/dialogs/delete-comp.c:95
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "`%s' görüşünü həqiqətən də silmək istəyirsiniz?"
-
-#: calendar/gui/dialogs/delete-comp.c:98
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "Bu adsız görüşü həqiqətən də silmək istəyirsiniz?"
-
-#: calendar/gui/dialogs/delete-comp.c:104
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "`%s' vəzifəsini həqiqətən də silmək istəyirsiniz?"
-
-#: calendar/gui/dialogs/delete-comp.c:107
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "Bu adsız vəzifəsini həqiqətən də silmək istəyirsiniz?"
-
-#: calendar/gui/dialogs/delete-comp.c:113
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "`%s' jurnal girişini həqiqətən də silmək istəyirsiniz?"
-
-#: calendar/gui/dialogs/delete-comp.c:116
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "Bu adsız jurnal girişini həqiqətən də silmək istəyirsiniz?"
-
-#: calendar/gui/dialogs/delete-comp.c:131
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d appointment?"
-msgid_plural "Are you sure you want to delete %d appointments?"
-msgstr[0] "%d görüşü həqiqətən də silmək istəyirsiniz?"
-msgstr[1] "%d görüşü həqiqətən də silmək istəyirsiniz?"
-
-#: calendar/gui/dialogs/delete-comp.c:138
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d task?"
-msgid_plural "Are you sure you want to delete %d tasks?"
-msgstr[0] "%d vəzifəni həqiqətən də silmək istəyirsiniz?"
-msgstr[1] "%d vəzifəni həqiqətən də silmək istəyirsiniz?"
-
-#: calendar/gui/dialogs/delete-comp.c:145
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d journal entry?"
-msgid_plural "Are you sure you want to delete %d journal entries?"
-msgstr[0] "%d jurnal girişini həqiqətən də silmək istəyirsiniz?"
-msgstr[1] "%d jurnal girişini həqiqətən də silmək istəyirsiniz?"
-
-#: calendar/gui/dialogs/delete-error.c:52
+#: calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "Corba xətası olduğuna görə bu hadisə silinə bilmədi"
 
-#: calendar/gui/dialogs/delete-error.c:55
+#: calendar/gui/dialogs/delete-error.c:57
 msgid "The task could not be deleted due to a corba error"
 msgstr "Corba xətası olduğuna görə bu vəzifə silinə bilmədi"
 
-#: calendar/gui/dialogs/delete-error.c:58
+#: calendar/gui/dialogs/delete-error.c:60
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr "Corba xətası olduğuna görə bu jurnal girişi silinə bilmədi"
 
-#: calendar/gui/dialogs/delete-error.c:61
+#: calendar/gui/dialogs/delete-error.c:63
 msgid "The item could not be deleted due to a corba error"
 msgstr "Corba xətası olduğuna görə bu üzv silinə bilmədi"
 
-#: calendar/gui/dialogs/delete-error.c:68
+#: calendar/gui/dialogs/delete-error.c:70
 msgid "The event could not be deleted because permission was denied"
 msgstr "Səlahiyyət olmadığına görə bu hadisə silinə bilmədi"
 
-#: calendar/gui/dialogs/delete-error.c:71
+#: calendar/gui/dialogs/delete-error.c:73
 msgid "The task could not be deleted because permission was denied"
 msgstr "Səlahiyyət olmadığına görə bu vəzifə silinə bilmədi"
 
-#: calendar/gui/dialogs/delete-error.c:74
+#: calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr "Səlahiyyət olmadığına görə bu jurnal girişi silinə bilmədi"
 
-#: calendar/gui/dialogs/delete-error.c:77
+#: calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
 msgstr "Səlahiyyət olmadığına görə bu üzv silinə bilmədi"
 
-#: calendar/gui/dialogs/delete-error.c:84
+#: calendar/gui/dialogs/delete-error.c:86
 msgid "The event could not be deleted due to an error"
 msgstr "Bir xəta olduğuna görə bu hadisə silinə bilmədi"
 
-#: calendar/gui/dialogs/delete-error.c:87
+#: calendar/gui/dialogs/delete-error.c:89
 msgid "The task could not be deleted due to an error"
 msgstr "Bir xəta olduğuna görə bu vəzifə silinə bilmədi"
 
-#: calendar/gui/dialogs/delete-error.c:90
+#: calendar/gui/dialogs/delete-error.c:92
 msgid "The journal entry could not be deleted due to an error"
 msgstr "Bir xəta olduğuna görə bu jurnal girişi silinə bilmədi"
 
-#: calendar/gui/dialogs/delete-error.c:93
+#: calendar/gui/dialogs/delete-error.c:95
 msgid "The item could not be deleted due to an error"
 msgstr "Bir xəta olduğuna görə bu üzv silinə bilmədi"
 
@@ -4917,11 +4708,11 @@ msgstr "_Başlama vaxt:"
 
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:3
+#: calendar/gui/dialogs/meeting-page.glade.h:4
 #: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
 #: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1559
-#: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:100
+#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
+#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
@@ -4947,8 +4738,8 @@ msgstr "_Təmsil Et..."
 #. FIXME: need to disable for undeletable folders
 #: calendar/gui/dialogs/meeting-page.c:655
 #: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1310 calendar/gui/e-calendar-view.c:1342
-#: mail/em-folder-tree.c:2557 mail/em-folder-view.c:919
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
+#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -4956,7 +4747,7 @@ msgid "_Delete"
 msgstr "_Sil"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:240
+#: calendar/gui/e-meeting-list-view.c:218
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "İştirakçı"
@@ -4992,16 +4783,15 @@ msgid "Member"
 msgstr "Üzv"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
-#: mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-list-view.c:248
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Vəziyyət"
 
@@ -5009,20 +4799,20 @@ msgstr "Vəziyyət"
 msgid "Add A_ttendee"
 msgstr "_İştirakçı Əlavə Et"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "Add attendees from addressbook."
+msgstr "Yollayanı Ünvan _Kitabçasına Əlavə Et"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Təşkilatçı:"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
+#: calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "_Change Organizer"
 msgstr "Təşkilatçını _Dəyişdir"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-#: calendar/gui/e-meeting-time-sel.c:417
-msgid "_Invite Others..."
-msgstr "Başqalarını _Dəvət Et..."
-
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
 msgstr "<b>Təqvim seçimləri</b>"
@@ -5175,7 +4965,7 @@ msgid "_No recurrence"
 msgstr "Təkrarlama _yoxudr"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:450
+#: composer/e-msg-composer-attachment-bar.c:453
 msgid "_Remove"
 msgstr "Çı_xart"
 
@@ -5207,54 +4997,20 @@ msgstr "həftə"
 msgid "year(s)"
 msgstr "il"
 
-#: calendar/gui/dialogs/save-comp.c:53
-msgid ""
-"This event has been changed, but has not been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Bu hadisə dəyişdirilib, amma qeyd edilməyib.\n"
-"\n"
-"Dəyişiklikləriniz qeyd edilsin?"
-
-#: calendar/gui/dialogs/save-comp.c:57
-msgid "_Discard Changes"
-msgstr "Dəyişiklikləri _Unut"
-
-#: calendar/gui/dialogs/save-comp.c:62
-msgid "Save Event"
-msgstr "Hadisəni Qeyd Et"
-
-#: calendar/gui/dialogs/select-source-dialog.c:65
+#: calendar/gui/dialogs/select-source-dialog.c:69
 #, fuzzy
 msgid "Select destination"
 msgstr "Hədəf mənbəni seç"
 
-#: calendar/gui/dialogs/select-source-dialog.c:86
+#: calendar/gui/dialogs/select-source-dialog.c:90
 #, fuzzy
 msgid "_Destination"
 msgstr "Hədəf sırf oxunandır"
 
-#: calendar/gui/dialogs/select-source-dialog.c:88
+#: calendar/gui/dialogs/select-source-dialog.c:92
 msgid "Task List"
 msgstr "Vəzifə Siyahısı"
 
-#: calendar/gui/dialogs/send-comp.c:57
-msgid "The meeting information has been created. Send it?"
-msgstr "Görüş mə'lumatı yaradıldı. Göndərilsin?"
-
-#: calendar/gui/dialogs/send-comp.c:60
-msgid "The meeting information has changed. Send an updated version?"
-msgstr "Görüş mə'lumatı dəyişdirildi. Yeni buraxılışı göndərilsin?"
-
-#: calendar/gui/dialogs/send-comp.c:67
-msgid "The task assignment information has been created. Send it?"
-msgstr "Vəzifə tapşırma mə'lumatı yaradıldı. Göndərilsin?"
-
-#: calendar/gui/dialogs/send-comp.c:71
-msgid "The task information has changed. Send an updated version?"
-msgstr "Vəzifə tapşırma mə'lumatı dəyişdirildi. Yeni buraxılışı göndərilsin?"
-
 #: calendar/gui/dialogs/task-details-page.c:406
 msgid "Completed date is wrong"
 msgstr "Bitiş tarixi səhvdir"
@@ -5274,7 +5030,7 @@ msgstr "Bitirilib"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #: calendar/gui/e-cal-component-preview.c:249
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:960
 msgid "High"
 msgstr "Yüksək"
 
@@ -5288,14 +5044,14 @@ msgstr "Fəaliyyətdə"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:253
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:958
 msgid "Low"
 msgstr "Alçaq"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:251
 #: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:957
+#: mail/message-list.c:959
 msgid "Normal"
 msgstr "Normal"
 
@@ -5353,8 +5109,8 @@ msgstr "Gi_zli"
 
 #: calendar/gui/dialogs/task-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
+#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "İzahat:"
 
@@ -5519,7 +5275,7 @@ msgstr "Bitiş Tarixi:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:950
+#: calendar/gui/e-itip-control.c:943
 msgid "Status:"
 msgstr "Vəziyyət:"
 
@@ -5604,12 +5360,12 @@ msgstr "Məşğul"
 msgid "Deleting selected objects"
 msgstr "Seçili üzvlər silinir"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
 msgid "Updating objects"
 msgstr "Üzvlər yenilənir"
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1370
+#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
 #: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Aç"
@@ -5619,15 +5375,15 @@ msgid "Open _Web Page"
 msgstr "_Veb Səhifəsini Aç"
 
 #: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1291 calendar/gui/e-calendar-view.c:1376
-#: mail/em-folder-view.c:896 mail/em-popup.c:690 mail/em-popup.c:806
+#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
+#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "Fərqli _Qeyd Et..."
 
 #: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1292
-#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
+#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
@@ -5635,24 +5391,24 @@ msgid "_Print..."
 msgstr "Ç_ap et..."
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Kə_s"
 
 #: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1338
-#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2550
-#: mail/message-list.c:1644 ui/evolution-addressbook.xml.h:31
+#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
+#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
+#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Köçür"
 
 #: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1273 calendar/gui/e-calendar-view.c:1299
-#: calendar/gui/e-calendar-view.c:1372 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
+#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
@@ -5721,71 +5477,71 @@ msgstr "Mündəricat"
 msgid "Task sort"
 msgstr "Vəzifə nizamlanması"
 
-#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
 msgid "New _Appointment..."
 msgstr "Yeni _Görüş..."
 
-#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
+#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
 msgid "New All Day _Event"
 msgstr "Yeni Bütün Günlük _Hadisə"
 
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
+#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
 msgid "New Meeting"
 msgstr "Yeni Görüş"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
 msgid "New Task"
 msgstr "Yeni Vəzifə"
 
-#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "İl_gəyi Seç"
 
-#: calendar/gui/e-calendar-view.c:1280
+#: calendar/gui/e-calendar-view.c:1283
 #, fuzzy
 msgid "_Select Date..."
 msgstr "Sil..."
 
-#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "Sərbəst/Məşğul Mə'lumatını _Dərc Et"
 
-#: calendar/gui/e-calendar-view.c:1303
+#: calendar/gui/e-calendar-view.c:1306
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Qovluğa _Köçür..."
 
-#: calendar/gui/e-calendar-view.c:1304
+#: calendar/gui/e-calendar-view.c:1307
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "Qovluğa _Daşı..."
 
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1308
 msgid "_Schedule Meeting..."
 msgstr "_Görüş Planlaşdır..."
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1309
 msgid "_Forward as iCalendar..."
 msgstr "iCalendar şəklində ö_tür..."
 
-#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
 msgid "Delete this _Occurrence"
 msgstr "Bu _Vaqiəni Sil"
 
-#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
 msgid "Delete _All Occurrences"
 msgstr "_Bütün Vaqiələri Sil"
 
-#: calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1349
 msgid "Go to _Today"
 msgstr "_Bugünə Get"
 
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1351
 msgid "_Go to Date..."
 msgstr "Tarixə _Get..."
 
-#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "_Qurğular..."
 
@@ -5800,9 +5556,9 @@ msgstr "Başlama Tarixi"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:967 calendar/gui/e-itip-control.c:1169
-#: calendar/gui/e-meeting-list-view.c:144
-#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
 #: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
 #: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
 #: camel/camel-tcp-stream-openssl.c:631
@@ -5828,13 +5584,13 @@ msgid "Assigned"
 msgstr "Vəzifələndirilmiş"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr "Bəli"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "Xeyir"
 
@@ -5846,7 +5602,7 @@ msgstr "N"
 msgid "S"
 msgstr "Baz."
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
 msgid "E"
 msgstr "E"
 
@@ -5918,102 +5674,102 @@ msgstr "%d %b"
 msgid "%02i minute divisions"
 msgstr "%02i dəqiqəlik bölmələr"
 
-#: calendar/gui/e-itip-control.c:592
+#: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
 msgstr "Bəli."
 
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:596
 #, fuzzy, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Hər gün"
 msgstr[1] "Hər gün"
 
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:601
 #, fuzzy, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Hər həftə"
 msgstr[1] "Hər həftə"
 
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:603
 #, fuzzy, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "Həftənin hər müəyyən günündə"
 msgstr[1] "Həftənin hər müəyyən günündə"
 
-#: calendar/gui/e-itip-control.c:618
+#: calendar/gui/e-itip-control.c:611
 msgid " and "
 msgstr " və "
 
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:618
 #, c-format
 msgid "The %s day of "
 msgstr "%s günü"
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:631
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s günü"
 
-#: calendar/gui/e-itip-control.c:645
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "hər ay"
 msgstr[1] "hər ay"
 
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:642
 #, fuzzy, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Hər il"
 msgstr[1] "Hər il"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:653
 #, fuzzy, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] " toplam %d dəfə"
 msgstr[1] " toplam %d dəfə"
 
-#: calendar/gui/e-itip-control.c:669
+#: calendar/gui/e-itip-control.c:662
 msgid ", ending on "
 msgstr ", bitiş tarixi olaraq  "
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:686
 msgid "<b>Starts:</b> "
 msgstr "<b>Başlayır:</b> "
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:696
 msgid "<b>Ends:</b> "
 msgstr "<b>Bitir:</b> "
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:716
 msgid "<b>Completed:</b> "
 msgstr "<b>Başa Çatdı:</b> "
 
-#: calendar/gui/e-itip-control.c:733
+#: calendar/gui/e-itip-control.c:726
 msgid "<b>Due:</b> "
 msgstr "<b>Qalıb:</b> "
 
-#: calendar/gui/e-itip-control.c:771 calendar/gui/e-itip-control.c:827
+#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
 msgid "iCalendar Information"
 msgstr "iCalendar Mə'lumatı"
 
 #. Title
-#: calendar/gui/e-itip-control.c:788
+#: calendar/gui/e-itip-control.c:781
 msgid "iCalendar Error"
 msgstr "iCalendar Xətası"
 
-#: calendar/gui/e-itip-control.c:859 calendar/gui/e-itip-control.c:875
-#: calendar/gui/e-itip-control.c:886 calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
 msgid "An unknown person"
 msgstr "Namə'lum şəxs"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:910
+#: calendar/gui/e-itip-control.c:903
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -6021,302 +5777,306 @@ msgstr ""
 "<br> Xahiş edirik, aşağıdakı mə'lumatı gözdən keçirin və aşağıdakı menyudan "
 "gedişatı seçin."
 
-#: calendar/gui/e-itip-control.c:925
+#: calendar/gui/e-itip-control.c:918
 msgid "<i>None</i>"
 msgstr "<i>Heç biri</i>"
 
-#: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:929
+msgid "Location:"
+msgstr "Mövqe:"
+
+#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Qəbul Edildi"
 
-#: calendar/gui/e-itip-control.c:959 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Əvvəlcədən Qəbul Edildi"
 
-#: calendar/gui/e-itip-control.c:963 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Rədd Edildi"
 
-#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.c:1050
-#: calendar/gui/e-itip-control.c:1076 calendar/gui/e-itip-control.c:1089
-#: calendar/gui/e-itip-control.c:1102 calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
 msgid "Choose an action:"
 msgstr "Gedişatı seçin:"
 
-#: calendar/gui/e-itip-control.c:1023
+#: calendar/gui/e-itip-control.c:1016
 msgid "Update"
 msgstr "Yenilə"
 
-#: calendar/gui/e-itip-control.c:1024 calendar/gui/e-itip-control.c:1055
-#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1091
-#: calendar/gui/e-itip-control.c:1104 calendar/gui/e-itip-control.c:1117
-#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
+#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Oldu"
 
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1044
 msgid "Accept"
 msgstr "Qəbul Et"
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1045
 msgid "Tentatively accept"
 msgstr "Əvvəlcədən qəbul et"
 
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1046
 msgid "Decline"
 msgstr "Rədd Et"
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1070
 msgid "Send Free/Busy Information"
 msgstr "Sərbəst/Məşğul Mə'lumatını Yolla"
 
-#: calendar/gui/e-itip-control.c:1090
+#: calendar/gui/e-itip-control.c:1083
 msgid "Update respondent status"
 msgstr "Cavablayıcı vəziyyətini yenilə"
 
-#: calendar/gui/e-itip-control.c:1103
+#: calendar/gui/e-itip-control.c:1096
 msgid "Send Latest Information"
 msgstr "Ən Son Mə'lumatı Yolla"
 
-#: calendar/gui/e-itip-control.c:1116 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Ləğv Et"
 
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1185
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> görüş mə'lumatını dərc edib."
 
-#: calendar/gui/e-itip-control.c:1193
+#: calendar/gui/e-itip-control.c:1186
 msgid "Meeting Information"
 msgstr "Görüş Mə'lumatı"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1191
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> %s şəxsinin görüşdə olmasını xahiş edir."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1193
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> sizin görüşdə olmağınızı xahiş edir."
 
-#: calendar/gui/e-itip-control.c:1201
+#: calendar/gui/e-itip-control.c:1194
 msgid "Meeting Proposal"
 msgstr "Görüş Məqsədi"
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> mövcud görüşə əlavə etmək istəyir."
 
-#: calendar/gui/e-itip-control.c:1206
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Update"
 msgstr "Görüş Yenilənməsi"
 
-#: calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1203
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> ən son görüş mə'lumatını almaq istəyir."
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1204
 msgid "Meeting Update Request"
 msgstr "Görüş Yenilənmə İstəyi"
 
-#: calendar/gui/e-itip-control.c:1218
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> görüş istəyini cavabladı."
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Reply"
 msgstr "Görüş Cavabı"
 
-#: calendar/gui/e-itip-control.c:1226
+#: calendar/gui/e-itip-control.c:1219
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> görüşü ləğv etdi."
 
-#: calendar/gui/e-itip-control.c:1227
+#: calendar/gui/e-itip-control.c:1220
 msgid "Meeting Cancellation"
 msgstr "Görüş Ləğvi"
 
-#: calendar/gui/e-itip-control.c:1234 calendar/gui/e-itip-control.c:1302
-#: calendar/gui/e-itip-control.c:1337
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1330
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> pozğun ismarış yolladı."
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1228
 msgid "Bad Meeting Message"
 msgstr "Pis Görüş İsmarışı"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1253
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> vəzifə mə'lumatını dərc etdi."
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1254
 msgid "Task Information"
 msgstr "Vəzifə Mə'lumatı"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1259
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> %sdan vəzifəni görməsini istədi."
 
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> sizdən vəzifəni görməyinizi istədi."
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1262
 msgid "Task Proposal"
 msgstr "Vəzifə Təklifi"
 
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> mövcud vəzifəyə qoşulmaq istəyir."
 
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Update"
 msgstr "Vəzifə Yenilənməsi"
 
-#: calendar/gui/e-itip-control.c:1278
+#: calendar/gui/e-itip-control.c:1271
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> ən son vəzifə mə'lumatını almaq istəyir."
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1272
 msgid "Task Update Request"
 msgstr "Vəzifə Yeniləmə İstəyi"
 
-#: calendar/gui/e-itip-control.c:1286
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> vəzifə tapşırığına cavab verdi."
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Reply"
 msgstr "Vəzifə Cavabı"
 
-#: calendar/gui/e-itip-control.c:1294
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> vəzifəni ləğv etdi."
 
-#: calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1288
 msgid "Task Cancellation"
 msgstr "Vəzifə Ləğvi"
 
-#: calendar/gui/e-itip-control.c:1303
+#: calendar/gui/e-itip-control.c:1296
 msgid "Bad Task Message"
 msgstr "Pis Vəzifə İsmarışı"
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1315
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> sərbəst/məşğul mə'lumatını dərc etdi."
 
-#: calendar/gui/e-itip-control.c:1323
+#: calendar/gui/e-itip-control.c:1316
 msgid "Free/Busy Information"
 msgstr "Sərbəst/Məşğul Mə'lumatı"
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> sizin sərbəst/məşğul mə'lumatınızı istəyir."
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1321
 msgid "Free/Busy Request"
 msgstr "Sərbəst/Məşğul İstəyi"
 
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1325
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> sərbəst/məşğul istəyinə cavab verdi."
 
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1326
 msgid "Free/Busy Reply"
 msgstr "Sərbəst/Məşğul Cavabı"
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1331
 msgid "Bad Free/Busy Message"
 msgstr "Pis Sərbəst/Məşğul İsmarışı"
 
-#: calendar/gui/e-itip-control.c:1413
+#: calendar/gui/e-itip-control.c:1406
 msgid "The message does not appear to be properly formed"
 msgstr "Bu ismarış düzgün formlanmayıbdır"
 
-#: calendar/gui/e-itip-control.c:1472
+#: calendar/gui/e-itip-control.c:1465
 msgid "The message contains only unsupported requests."
 msgstr "İsmarış ancaq dəstəklənməyən istəkləri daxil edir."
 
-#: calendar/gui/e-itip-control.c:1503
+#: calendar/gui/e-itip-control.c:1496
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Əlavə hökmlü təqvim ismarışını daxil etmir"
 
-#: calendar/gui/e-itip-control.c:1535
+#: calendar/gui/e-itip-control.c:1528
 msgid "The attachment has no viewable calendar items"
 msgstr "Əlavə göstərilə bilən təqvim üzvlərini daxil etmir"
 
-#: calendar/gui/e-itip-control.c:1769
+#: calendar/gui/e-itip-control.c:1762
 msgid "Update complete\n"
 msgstr "Yeniləmə başa çatdı\n"
 
-#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
+#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "İştirakçı vəziyyəti üzvün artıq mövcud olmadığından ötrü yenilənə bilməz"
 
-#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Cism hökmsüzdür və yenilənə bilməz\n"
 
-#: calendar/gui/e-itip-control.c:1825
+#: calendar/gui/e-itip-control.c:1818
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Cavabı göndərən iştirakçı deyil.  İştirakçı olaraq əlavə edilsin?"
 
-#: calendar/gui/e-itip-control.c:1837
+#: calendar/gui/e-itip-control.c:1830
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "İştirakçı vəziyyəti səhv haldan ötrü yenilənə bilmədi!\n"
 
-#: calendar/gui/e-itip-control.c:1856
+#: calendar/gui/e-itip-control.c:1849
 msgid "There was an error on the CORBA system\n"
 msgstr "CORBA sistemində bir xəta baş verdi\n"
 
-#: calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1852
 msgid "Object could not be found\n"
 msgstr "Cism tapıla bilmədi!\n"
 
-#: calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1855
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Təqvimi yeniləmək üçün düzgün səlahiyyətləriniz yoxdur\n"
 
-#: calendar/gui/e-itip-control.c:1865
+#: calendar/gui/e-itip-control.c:1858
 msgid "Attendee status updated\n"
 msgstr "İştirakçı vəziyyəti yeniləndi\n"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1861
 msgid "Attendee status could not be updated!\n"
 msgstr "İştirakçı vəziyyəti yenilənə bilmədi!\n"
 
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1892
 msgid "Removal Complete"
 msgstr "Çıxartma Başa Çatdı"
 
-#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
 msgid "Item sent!\n"
 msgstr "Üzv göndərildi!\n"
 
-#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
+#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
 msgid "The item could not be sent!\n"
 msgstr "Üzv göndərilə bilmədi!\n"
 
@@ -6357,74 +6117,74 @@ msgstr "bitiş tarixi"
 msgid "date-start"
 msgstr "başlama-tarixi"
 
-#: calendar/gui/e-meeting-list-view.c:62
+#: calendar/gui/e-meeting-list-view.c:59
 msgid "Chair Persons"
 msgstr "İdarəçilər"
 
-#: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:479
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
 msgid "Required Participants"
 msgstr "Məcburi İştirakçılar"
 
-#: calendar/gui/e-meeting-list-view.c:64
+#: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Ehtiyatdakı İştirakçılar"
 
-#: calendar/gui/e-meeting-list-view.c:65
+#: calendar/gui/e-meeting-list-view.c:62
 msgid "Resources"
 msgstr "Mənbələr"
 
-#: calendar/gui/e-meeting-list-view.c:140 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
 #: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr "Şəxsi"
 
-#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "Qrup"
 
-#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr "Mənbə"
 
-#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr "Otaq"
 
-#: calendar/gui/e-meeting-list-view.c:154 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr "Stul"
 
-#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:127
 #: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
 msgid "Required Participant"
 msgstr "Məcburi İştirakçı"
 
-#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr "Ehtiyatdakı İştirakçı"
 
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr "Qeyri-İştirakçı"
 
-#: calendar/gui/e-meeting-list-view.c:179 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:177
 #: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
 msgid "Needs Action"
 msgstr "Hərəkət Lazımdır"
 
-#: calendar/gui/e-meeting-list-view.c:182 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
 #: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "Öncəlikli"
 
-#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr "Temsilli"
@@ -6441,20 +6201,28 @@ msgstr "İş Yerində Deyil"
 msgid "No Information"
 msgstr "Mə'lumat Yoxdur"
 
+#: calendar/gui/e-meeting-time-sel.c:417
+#, fuzzy
+msgid "Add attendees from addressbook"
+msgstr "Yollayanı Ünvan _Kitabçasına Əlavə Et"
+
 #: calendar/gui/e-meeting-time-sel.c:440
 msgid "_Options"
 msgstr "_Seçimlər"
 
 #: calendar/gui/e-meeting-time-sel.c:457
-msgid "Show _Only Working Hours"
+#, fuzzy
+msgid "Show _only working hours"
 msgstr "Ancaq _İş Saatlarını Göstər"
 
 #: calendar/gui/e-meeting-time-sel.c:467
-msgid "Show _Zoomed Out"
+#, fuzzy
+msgid "Show _zoomed out"
 msgstr "_Uzaqlaşdıraraq Göstər"
 
 #: calendar/gui/e-meeting-time-sel.c:482
-msgid "_Update Free/Busy"
+#, fuzzy
+msgid "_Update free/busy"
 msgstr "Sərbəst/Məşğul Mə'lumatını _Yenilə"
 
 #: calendar/gui/e-meeting-time-sel.c:497
@@ -6470,19 +6238,23 @@ msgid ">_>"
 msgstr ">_>"
 
 #: calendar/gui/e-meeting-time-sel.c:547
-msgid "_All People and Resources"
+#, fuzzy
+msgid "_All people and resources"
 msgstr "_Bütün Adamlar və Mənbələr"
 
 #: calendar/gui/e-meeting-time-sel.c:556
-msgid "All _People and One Resource"
+#, fuzzy
+msgid "All _people and one resource"
 msgstr "Bütün _Adamlar və Bir Mənbə"
 
 #: calendar/gui/e-meeting-time-sel.c:565
-msgid "_Required People"
+#, fuzzy
+msgid "_Required people"
 msgstr "_Məcburi Adamlar"
 
 #: calendar/gui/e-meeting-time-sel.c:574
-msgid "Required People and _One Resource"
+#, fuzzy
+msgid "Required people and _one resource"
 msgstr "Məcburi Adamlar və _Bir Mənbə"
 
 #: calendar/gui/e-meeting-time-sel.c:593
@@ -6520,7 +6292,7 @@ msgstr "%m/%d/%Y"
 msgid "Enter the password for %s"
 msgstr "%s üçün şifrəni bildir"
 
-#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6529,22 +6301,14 @@ msgstr ""
 "%s-da xəta:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
-#, fuzzy, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-"%s\n"
-"vəzifə arxa ara üzü\n"
-" iflas etdi."
-
 #. FIXME Loading should be async
 #. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:686
+#: calendar/gui/e-tasks.c:801
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Vəzifələr %s vaxtı açılır"
 
-#: calendar/gui/e-tasks.c:709
+#: calendar/gui/e-tasks.c:824
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6553,55 +6317,47 @@ msgstr ""
 "%s açılırkən xəta:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:730
+#: calendar/gui/e-tasks.c:845
 msgid "Loading tasks"
 msgstr "Vəzifələrin yüklənməsi"
 
-#: calendar/gui/e-tasks.c:834
+#: calendar/gui/e-tasks.c:949
 msgid "Completing tasks..."
 msgstr "Vəzifələr başa çatdırılır..."
 
-#: calendar/gui/e-tasks.c:857
+#: calendar/gui/e-tasks.c:972
 msgid "Deleting selected objects..."
 msgstr "Seçili cismlər silinir..."
 
-#: calendar/gui/e-tasks.c:884
+#: calendar/gui/e-tasks.c:999
 msgid "Expunging"
 msgstr "Geri alma"
 
-#: calendar/gui/e-tasks.c:960
+#: calendar/gui/e-tasks.c:1075
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
-#: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
+#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
+#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
 #: calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:705
 msgid "Tasks"
 msgstr "Vəzifələr"
 
-#: calendar/gui/gnome-cal.c:1876
+#: calendar/gui/gnome-cal.c:1878
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Görüş - %s"
 
-#: calendar/gui/gnome-cal.c:1895
+#: calendar/gui/gnome-cal.c:1897
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Vəzifələrin yüklənməsi"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1920
 #, c-format
 msgid "Opening %s"
 msgstr "%s açılması"
 
-#: calendar/gui/gnome-cal.c:2048
-#, fuzzy, c-format
-msgid "The calendar backend for '%s' has crashed."
-msgstr ""
-"%s\n"
-"təqvim arxa ara üzü\n"
-" iflas etdi."
-
-#: calendar/gui/gnome-cal.c:2894
+#: calendar/gui/gnome-cal.c:2906
 msgid "Purging"
 msgstr "Silmə"
 
@@ -6801,7 +6557,7 @@ msgid "On The Web"
 msgstr "Vebdə"
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 
@@ -6812,7 +6568,7 @@ msgid "Unable to migrate calendar `%s'"
 msgstr "'%s' təqvimi açıla bilmədi."
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:869
+#: calendar/gui/migration.c:889
 #, fuzzy, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Ünvan kitabçası açıla bilmədi"
@@ -7048,72 +6804,72 @@ msgstr "Üzvü Çap Et"
 msgid "Print Setup"
 msgstr "Çap Qurğuları"
 
-#: calendar/gui/tasks-component.c:303
+#: calendar/gui/tasks-component.c:313
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:371
 msgid "New Task List"
 msgstr "Yeni Vəzifə Siyahısı"
 
-#: calendar/gui/tasks-component.c:398
+#: calendar/gui/tasks-component.c:408
 #, fuzzy, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d əlaqə"
 msgstr[1] "%d əlaqə"
 
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] "Silinən"
 msgstr[1] "Silinən"
 
-#: calendar/gui/tasks-component.c:447
+#: calendar/gui/tasks-component.c:457
 #, fuzzy
 msgid "Failed upgrading tasks."
 msgstr "Vəzifələrin yüklənməsi"
 
-#: calendar/gui/tasks-component.c:526
+#: calendar/gui/tasks-component.c:749
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:538
+#: calendar/gui/tasks-component.c:761
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:576
+#: calendar/gui/tasks-component.c:799
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:804
+#: calendar/gui/tasks-component.c:1040
 msgid "New task"
 msgstr "Yeni vəzifə"
 
-#: calendar/gui/tasks-component.c:805
+#: calendar/gui/tasks-component.c:1041
 msgid "_Task"
 msgstr "_Vəzifə"
 
-#: calendar/gui/tasks-component.c:806
+#: calendar/gui/tasks-component.c:1042
 msgid "Create a new task"
 msgstr "Yeni vəzifə yarat"
 
-#: calendar/gui/tasks-component.c:812
+#: calendar/gui/tasks-component.c:1048
 #, fuzzy
 msgid "New tasks group"
 msgstr "Yeni vəzifə"
 
-#: calendar/gui/tasks-component.c:813
+#: calendar/gui/tasks-component.c:1049
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Vəzifə Siyahısı Qrupu"
 
-#: calendar/gui/tasks-component.c:814
+#: calendar/gui/tasks-component.c:1050
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Yeni vəzifə yarat"
@@ -8881,12 +8637,12 @@ msgstr "Filtr axtarışı işə salma xətası: %s: %s"
 msgid "Unsupported operation: append message: for %s"
 msgstr "%s üçün dəstəklənməyən əməliyyat: ismarış əlavə et"
 
-#: camel/camel-folder.c:1259
+#: camel/camel-folder.c:1262
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "%s üçün dəstəklənməyən əməliyyat: ifadəyə görə axtar"
 
-#: camel/camel-folder.c:1299
+#: camel/camel-folder.c:1302
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "%s üçün dəstəklənməyən əməliyyat: uid-ə görə axtar"
@@ -8899,11 +8655,16 @@ msgstr "İsmarışlar daşınır"
 msgid "Copying messages"
 msgstr "İsmarışlar köçürülür"
 
-#: camel/camel-folder.c:1666
-msgid "Learning junk and/or non junk message(s)"
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Xəbərdarlıq"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
 msgstr ""
 
-#: camel/camel-folder.c:1695
+#: camel/camel-folder.c:1701
 msgid "Filtering new message(s)"
 msgstr "Yeni ismarış(lar) süzülür"
 
@@ -8937,15 +8698,15 @@ msgstr ""
 msgid "(match-threads) requires a match type string"
 msgstr ""
 
-#: camel/camel-folder-search.c:785
+#: camel/camel-folder-search.c:784
 msgid "(match-threads) expects an array result"
 msgstr ""
 
-#: camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:790
 msgid "(match-threads) requires the folder set"
 msgstr ""
 
-#: camel/camel-folder-search.c:880
+#: camel/camel-folder-search.c:879
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Namə'lum başlıqda sorğu aparılır: %s"
@@ -8980,7 +8741,8 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
 #: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:706
+#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Ləğv edildi."
@@ -9352,7 +9114,7 @@ msgstr ""
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1212
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Vericidən xətalı tanıtmacavabı alındı."
 
@@ -9733,40 +9495,40 @@ msgstr "Əmr yerinə yetirilməyib"
 msgid "export keys: unimplemented"
 msgstr ""
 
-#: camel/camel-store.c:214
+#: camel/camel-store.c:213
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Qovluq alına bilmir: Mənbədə hökmsüz əməliyyat"
 
-#: camel/camel-store.c:244
+#: camel/camel-store.c:243
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr "Qovluq alına bilmir: %s: %s"
 
-#: camel/camel-store.c:295
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Qovluq yaradıla bilmir: Mənbədə hökmsüz əməliyyat"
 
-#: camel/camel-store.c:323
+#: camel/camel-store.c:325
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Qovluq alına bilmir: %s: %s"
 
-#: camel/camel-store.c:387 camel/camel-vee-store.c:354
+#: camel/camel-store.c:389 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Qovluq silinə bilmir: %s: Səhv əməliyyat"
 
-#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#: camel/camel-store.c:439 camel/camel-vee-store.c:387
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Qovluq yenidən adlandırıla bilmir: %s: Səhv əməliyyat"
 
-#: camel/camel-store.c:811
+#: camel/camel-store.c:777
 msgid "Trash"
 msgstr "Zibil"
 
-#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
-#: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/mail-config.glade.h:95
+#: ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
 msgstr "İyun"
@@ -9998,12 +9760,12 @@ msgstr "%s içində %s bənzəri ismarış yoxdur"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "İsmarışlar Virtual Qovluğa köçürülə ya da daşına bilmir"
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:374
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Qovluq silinə bilmir: %s: Qovluq yoxdur"
 
-#: camel/camel-vee-store.c:398
+#: camel/camel-vee-store.c:395
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Qovluq yenidən adlandırıla bilmir: %s: Qovluq yoxdur"
@@ -10048,31 +9810,31 @@ msgstr "Ünvan Dəftəri"
 msgid "Post Office Agent SOAP Port:"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:80
+#: camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "Novell GroupWise"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:82
+#: camel/providers/groupwise/camel-groupwise-provider.c:85
 msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: camel/providers/groupwise/camel-groupwise-provider.c:100
 #: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
 msgid "Password"
 msgstr "Şifrə"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:99
+#: camel/providers/groupwise/camel-groupwise-provider.c:102
 #: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Bu seçim IMAP vericisinə xam mətn şifrəsi ilə bağlanma imkanı verir."
 
-#: camel/providers/groupwise/camel-gw-listener.c:305
-#: camel/providers/groupwise/camel-gw-listener.c:328
+#: camel/providers/groupwise/camel-gw-listener.c:312
+#: camel/providers/groupwise/camel-gw-listener.c:335
 #, fuzzy
 msgid "Checklist"
 msgstr "siyahı"
@@ -10215,13 +9977,13 @@ msgid ""
 msgstr "Bu seçim IMAP vericisinə xam mətn şifrəsi ilə bağlanma imkanı verir."
 
 #: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:429
+#: camel/providers/imap/camel-imap-store.c:428
 #, c-format
 msgid "IMAP server %s"
 msgstr "%s IMAP vericisi"
 
 #: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:431
+#: camel/providers/imap/camel-imap-store.c:430
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%2$s üstündə %1$s üçün IMAP xidmətləri"
@@ -10231,7 +9993,7 @@ msgstr "%2$s üstündə %1$s üçün IMAP xidmətləri"
 #: camel/providers/imap/camel-imap-store.c:551
 #: camel/providers/imap/camel-imap-store.c:571
 #: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
+#: camel/providers/nntp/camel-nntp-store.c:209
 #: camel/providers/pop3/camel-pop3-store.c:175
 #: camel/providers/smtp/camel-smtp-transport.c:269
 #: camel/providers/smtp/camel-smtp-transport.c:285
@@ -10249,10 +10011,10 @@ msgstr "TLS Mövcud Deyil"
 
 #: camel/providers/imap4/camel-imap4-store.c:222
 #: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:815
+#: camel/providers/imap/camel-imap-store.c:845
 #: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:137
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
 #: camel/providers/pop3/camel-pop3-store.c:192
 msgid "Connection cancelled"
 msgstr "Bağlantı ləğv edildi"
@@ -10265,8 +10027,8 @@ msgid ""
 msgstr "%2$s təhlükəsizlik modunda %1$s IMAP verisicinə bağlana bilmədi"
 
 #: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:649
-#: camel/providers/imap/camel-imap-store.c:680
+#: camel/providers/imap/camel-imap-store.c:679
+#: camel/providers/imap/camel-imap-store.c:710
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "%2$s təhlükəsizlik modunda %1$s IMAP verisicinə bağlana bilmədi"
@@ -10275,7 +10037,7 @@ msgstr "%2$s təhlükəsizlik modunda %1$s IMAP verisicinə bağlana bilmədi"
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1109
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
 msgid "Unknown error"
 msgstr "Naməlum xəta"
 
@@ -10303,8 +10065,8 @@ msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr "Qovluq alına bilmir: %s: %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1857
-#: camel/providers/imap/camel-imap-store.c:2235
+#: camel/providers/imap/camel-imap-store.c:1885
+#: camel/providers/imap/camel-imap-store.c:2263
 #, fuzzy, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -10383,12 +10145,12 @@ msgstr "Verici gözlənilməz şəkildə bağlantını kəsdi: %s"
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3168
+#: camel/providers/imap/camel-imap-store.c:3194
 msgid "Operation cancelled"
 msgstr "Əməliyyat ləğv edildi"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3171
+#: camel/providers/imap/camel-imap-store.c:3197
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Verici gözlənilməz şəkildə bağlantını kəsdi: %s"
@@ -10452,13 +10214,6 @@ msgid "Unable to retrieve message: %s"
 msgstr "İsmarış alına bilmədi: %s."
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:219
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -10468,15 +10223,15 @@ msgstr ""
 "   %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-mbox-folder.c:418
+#: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
 msgstr "Belə ismarış yoxdur"
 
 #: camel/providers/imap/camel-imap-folder.c:2019
-#: camel/providers/imap/camel-imap-folder.c:2621
-#: camel/providers/nntp/camel-nntp-folder.c:238
+#: camel/providers/imap/camel-imap-folder.c:2622
+#: camel/providers/nntp/camel-nntp-folder.c:220
 msgid "This message is not currently available"
 msgstr "Bu ismarış hazırda mövcud deyil"
 
@@ -10485,7 +10240,23 @@ msgstr "Bu ismarış hazırda mövcud deyil"
 msgid "Fetching summary information for new messages"
 msgstr "Yeni ismarışların icmal mə'lumatı alınır"
 
-#: camel/providers/imap/camel-imap-folder.c:2659
+#: camel/providers/imap/camel-imap-folder.c:2463
+#, c-format
+msgid "Incomplete server response: no information provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2471
+#, c-format
+msgid "Incomplete server response: no UID provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2484
+#, c-format
+msgid ""
+"Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2660
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH cavabında ismarış gövdəsi tapıla bilmədi"
 
@@ -10549,43 +10320,43 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "IMAP vericilərində məktubların saxlanması və oxuna bilməsi üçün."
 
-#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/imap/camel-imap-store.c:680
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS uzantısı dəstəklənmir."
 
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:711
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL danışıqları bacarılmadı"
 
-#: camel/providers/imap/camel-imap-store.c:818
+#: camel/providers/imap/camel-imap-store.c:848
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "%s-a bağlana bilmədi (qapı %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:1242
+#: camel/providers/imap/camel-imap-store.c:1272
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "%s IMAP vericisi istənən %s tanıtma növünü dəstəkləmir"
 
-#: camel/providers/imap/camel-imap-store.c:1252
+#: camel/providers/imap/camel-imap-store.c:1282
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "%s tanıtma növü dəstəklənmir"
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1305
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sXahiş edirik, %s@%s üçün IMAP şifrəsini bildirin"
 
-#: camel/providers/imap/camel-imap-store.c:1289
+#: camel/providers/imap/camel-imap-store.c:1319
 msgid "You didn't enter a password."
 msgstr "Şifrənizi bildirmədiniz."
 
-#: camel/providers/imap/camel-imap-store.c:1318
+#: camel/providers/imap/camel-imap-store.c:1348
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10596,18 +10367,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1839
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:1867
+#: camel/providers/imap/camel-imap-store.c:2057
 #, c-format
 msgid "No such folder %s"
 msgstr "%s adında qovluq yoxdur"
 
-#: camel/providers/imap/camel-imap-store.c:1915
-#: camel/providers/imap/camel-imap-store.c:2296
+#: camel/providers/imap/camel-imap-store.c:1943
+#: camel/providers/imap/camel-imap-store.c:2324
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Qonşu qovluq alt qovluqlara malik ola bilməzi"
 
-#: camel/providers/imap/camel-imap-store.c:1970
+#: camel/providers/imap/camel-imap-store.c:1998
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10615,7 +10386,7 @@ msgstr "Qonşu qovluq alt qovluqlara malik ola bilməzi"
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Qovluq alına bilmir: %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:2274
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Namə'lum qonşu qovluq: %s"
@@ -10649,20 +10420,20 @@ msgid "Index message body data"
 msgstr "Əlaqəyə ismarış göndər"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:388
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:393
-#: camel/providers/local/camel-local-folder.c:396
+#: camel/providers/local/camel-local-folder.c:392
+#: camel/providers/local/camel-local-folder.c:395
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "poçt qutusu:%s (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:400
+#: camel/providers/local/camel-local-folder.c:399
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -10718,7 +10489,7 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:142
 #: camel/providers/local/camel-local-store.c:253
-#: camel/providers/local/camel-mbox-store.c:356
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10791,8 +10562,25 @@ msgstr "Maildir imsarış əlavə edilməsi ləğv edildi"
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "İsmarış maildir qovluğuna əlavə edilə bilmir: %s: %s "
 
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:226
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mbox-folder.c:417
+#: camel/providers/local/camel-mbox-folder.c:436
+#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:475
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-mh-folder.c:221
+#, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+"İsmarış alına bilmir: %2$s qovluğundan %1$s\n"
+"   %3$s"
+
+#: camel/providers/local/camel-maildir-folder.c:236
 msgid "Invalid message contents"
 msgstr "Hökmsüz ismarış məzmunu"
 
@@ -10833,9 +10621,9 @@ msgstr "`%s' qovluğu silinə bilmədi: %s"
 msgid "not a maildir directory"
 msgstr "maildir qovluğu deyil"
 
-#: camel/providers/local/camel-maildir-store.c:341
-#: camel/providers/local/camel-spool-store.c:286
-#: camel/providers/local/camel-spool-store.c:316
+#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-spool-store.c:284
+#: camel/providers/local/camel-spool-store.c:314
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "`%s' qovluğu darana bilmədi: %s"
@@ -10882,27 +10670,18 @@ msgstr "Məktub əlavəsi ləğv edildi"
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "İsmarış mbox fayllına əlava edilə bimir: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:435
-#: camel/providers/local/camel-mbox-folder.c:466
-#: camel/providers/local/camel-mbox-folder.c:474
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"İsmarış alına bilmir: %2$s qovluğundan %1$s\n"
-"   %3$s"
-
-#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:468
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Qovluq geri dönülməz şəkildə xəsarət alıb."
 
-#: camel/providers/local/camel-mbox-folder.c:475
-msgid "Message construction failed: Corrupt mailbox?"
+#: camel/providers/local/camel-mbox-folder.c:476
+#: camel/providers/local/camel-mh-folder.c:222
+#, fuzzy
+msgid "Message construction failed."
 msgstr "İsmarış quruluşu bacarılmadı: Məktub qutusu xəsərlidir?"
 
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:362
+#: camel/providers/local/camel-mbox-store.c:361
 #, fuzzy
 msgid "Cannot create a folder by this name."
 msgstr "Bu adda qovluq yaradıla bilmir"
@@ -10933,32 +10712,32 @@ msgstr "`%s' normal fayl deyil."
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "`%s' qovluğu boş deyil. Silinmədi."
 
-#: camel/providers/local/camel-mbox-store.c:375
+#: camel/providers/local/camel-mbox-store.c:374
 #, fuzzy, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "%s qovluğu yaradıla bilmədi: %s"
 
-#: camel/providers/local/camel-mbox-store.c:389
+#: camel/providers/local/camel-mbox-store.c:388
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Qovluq alına bilmir: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:391
+#: camel/providers/local/camel-mbox-store.c:390
 #, fuzzy
 msgid "Folder already exists"
 msgstr "Kard ID onsuz da mövcuddur"
 
-#: camel/providers/local/camel-mbox-store.c:473
+#: camel/providers/local/camel-mbox-store.c:472
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "Bildirilən qovluq adı hökmlü deyildir: %s"
 
-#: camel/providers/local/camel-mbox-store.c:486
+#: camel/providers/local/camel-mbox-store.c:485
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "'%s' yenidən adlandırıla bilmədi: %s"
 
-#: camel/providers/local/camel-mbox-store.c:561
+#: camel/providers/local/camel-mbox-store.c:560
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "%s qovluğu %s adi ilə yenidən adlandırıla bilmədi: %s"
@@ -11151,7 +10930,7 @@ msgstr ""
 "Qovluq xəsarət görmüş ola bilər, nüsxəsi`%s' içində köçürüldü"
 
 #: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:997
+#: camel/providers/nntp/camel-nntp-store.c:1126
 #, fuzzy, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "%sXahiş edirik %s@%s üçün SMTP şifrənizi bildirin"
@@ -11169,18 +10948,10 @@ msgstr "LDAP vericisinə bağlanma xətası"
 msgid "Server rejected username/password"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:263
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr "İstifadəçi ləğv etdi"
-
-#: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:259
-#: camel/providers/nntp/camel-nntp-folder.c:265
+#: camel/providers/nntp/camel-nntp-folder.c:147
+#: camel/providers/nntp/camel-nntp-folder.c:149
+#: camel/providers/nntp/camel-nntp-folder.c:158
+#: camel/providers/nntp/camel-nntp-folder.c:234
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11189,66 +10960,53 @@ msgstr "İstifadəçi ləğv etdi"
 msgid "Cannot get message %s: %s"
 msgstr "%s ismarışı alına bilmir: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:188
-#: camel/providers/nntp/camel-nntp-folder.c:228
+#: camel/providers/nntp/camel-nntp-folder.c:156
+#: camel/providers/nntp/camel-nntp-folder.c:232
+#: camel/providers/nntp/camel-nntp-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+msgid "User cancelled"
+msgstr "İstifadəçi ləğv etdi"
+
+#: camel/providers/nntp/camel-nntp-folder.c:176
+#: camel/providers/nntp/camel-nntp-folder.c:208
 #, c-format
 msgid "Internal error: uid in invalid format: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:201
-#, fuzzy, c-format
-msgid "Could not get article %s from NNTP server"
-msgstr "Qrup alına bilmədi: %s"
-
-#: camel/providers/nntp/camel-nntp-folder.c:362
-msgid "Posting not allowed by news server"
-msgstr ""
-
+#: camel/providers/nntp/camel-nntp-folder.c:328
+#: camel/providers/nntp/camel-nntp-folder.c:331
 #: camel/providers/nntp/camel-nntp-folder.c:373
-#, c-format
-msgid "Failed to send newsgroups header: %s: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:413
-#: camel/providers/nntp/camel-nntp-folder.c:426
-#, c-format
-msgid "Error posting to newsgroup: %s: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:438
-msgid "Error reading response to posted message: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:441
+#: camel/providers/nntp/camel-nntp-folder.c:375
 #, fuzzy, c-format
-msgid "Error posting message: %s: message not posted"
-msgstr ""
-"İsmarışın avtomatik qeyd edilmə xatası: %s:\n"
-" %s"
+msgid "Posting failed: %s"
+msgstr "Əməliyyat bacarılmadı: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:457
+#: camel/providers/nntp/camel-nntp-folder.c:393
 msgid "You cannot post NNTP messages while working offline!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:468
+#: camel/providers/nntp/camel-nntp-folder.c:404
 #, fuzzy
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Müvəqqəti qovluq bağlana bilmədi: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:44
 #, fuzzy
 msgid "Could not get group list from server."
 msgstr "Qrup alına bilmədi: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#: camel/providers/nntp/camel-nntp-grouplist.c:97
+#: camel/providers/nntp/camel-nntp-grouplist.c:106
 #, fuzzy, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr ""
 "Yekun faylı yaradıla bilmir: %s\n"
 " %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#: camel/providers/nntp/camel-nntp-grouplist.c:157
 #, fuzzy, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr ""
@@ -11281,27 +11039,29 @@ msgid ""
 msgstr ""
 "Bu seçim NNTP verisici ilə xam mətn şəklindəki şifrə ilə ünsiyyət quracaqdır."
 
-#: camel/providers/nntp/camel-nntp-store.c:158
+#: camel/providers/nntp/camel-nntp-store.c:118
+#: camel/providers/nntp/camel-nntp-store.c:1233
+#: camel/providers/nntp/camel-nntp-store.c:1331
+#, c-format
+msgid "NNTP Command failed: %s"
+msgstr "NNTP əmri iflas etdi: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:227
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "%s salamı oxuna bilmədi: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:170
+#: camel/providers/nntp/camel-nntp-store.c:239
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "%s NNTP vericisi %d xəta kodunu göndərdi: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:326
+#: camel/providers/nntp/camel-nntp-store.c:403
 #, c-format
 msgid "USENET News via %s"
 msgstr "%s vasitəsilə USENET Xəbərləri"
 
-#: camel/providers/nntp/camel-nntp-store.c:640
-#, fuzzy
-msgid "Stream error"
-msgstr "oxuma xətası"
-
-#: camel/providers/nntp/camel-nntp-store.c:643
+#: camel/providers/nntp/camel-nntp-store.c:777
 #, fuzzy, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -11311,75 +11071,75 @@ msgstr ""
 "İsmarışların mövqeyə qeyd edilmə xətası: %s:\n"
 " %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:735
+#: camel/providers/nntp/camel-nntp-store.c:872
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
 "No such newsgroup. The selected item is a probably a parent folder."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:767
+#: camel/providers/nntp/camel-nntp-store.c:904
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
 "newsgroup does not exist!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:792
+#: camel/providers/nntp/camel-nntp-store.c:929
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:800
+#: camel/providers/nntp/camel-nntp-store.c:937
 #, fuzzy
 msgid "You cannot rename a folder in a News store."
 msgstr "%s qovluğu %s adi ilə yenidən adlandırıla bilmədi: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:808
+#: camel/providers/nntp/camel-nntp-store.c:945
 #, fuzzy
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "Qovluq içindəkilərdən birinə daçına bilməz."
 
-#: camel/providers/nntp/camel-nntp-summary.c:253
-#, fuzzy, c-format
-msgid "Connection error: %s"
-msgstr "Namə'lum xəta: %s"
-
-#: camel/providers/nntp/camel-nntp-summary.c:262
-#, c-format
-msgid "No such folder: %s"
-msgstr "Belə qovluq yoxdur: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1118
+#, fuzzy
+msgid "Authentication requested but not username provided"
+msgstr "Tanıtma lazımdır"
 
-#: camel/providers/nntp/camel-nntp-summary.c:268
-#, c-format
-msgid "Could not get group: %s"
-msgstr "Qrup alına bilmədi: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1146
+#, fuzzy, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr "%s POP vericisinə tanıdıla bilmədi: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:333
+#: camel/providers/nntp/camel-nntp-store.c:1262
 #, fuzzy
-msgid "Could not get messages: unspecified error"
-msgstr "İsmarış göndərilə bilmədi: %s"
+msgid "Not connected."
+msgstr "Əlaqə olmasın"
 
-#: camel/providers/nntp/camel-nntp-summary.c:378
+#: camel/providers/nntp/camel-nntp-store.c:1311
 #, c-format
-msgid "NNTP Command failed: %s"
-msgstr "NNTP əmri iflas etdi: %s"
+msgid "No such folder: %s"
+msgstr "Belə qovluq yoxdur: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:438
-#: camel/providers/nntp/camel-nntp-summary.c:543
+#: camel/providers/nntp/camel-nntp-summary.c:218
+#: camel/providers/nntp/camel-nntp-summary.c:314
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Yeni ismarışlaryoxlanır"
 
-#: camel/providers/nntp/camel-nntp-summary.c:558
-#, c-format
-msgid "Unknown server response: %s"
-msgstr "Naməlum verici cavabı: %s"
+#: camel/providers/nntp/camel-nntp-summary.c:225
+#, fuzzy, c-format
+msgid "Unexpected server response from xover: %s"
+msgstr "IMAP vericisindən gözlənilməz cavab: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:328
+#, fuzzy, c-format
+msgid "Unexpected server response from head: %s"
+msgstr "GnuPG-dən gözlənilməyən cavab alındı: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:605
+#: camel/providers/nntp/camel-nntp-summary.c:368
 msgid "Use cancel"
 msgstr "Ləğv etməni işlət"
 
-#: camel/providers/nntp/camel-nntp-summary.c:607
+#: camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Əməliyyat bacarılmadı: %s"
@@ -11427,7 +11187,7 @@ msgstr "%s gün sonra sil"
 msgid "Disable support for all POP3 extensions"
 msgstr "Bütün POP3 uzantı dəstəklərini qeyri-fəallaşdır"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107
 msgid "POP"
 msgstr "POP"
 
@@ -11516,7 +11276,7 @@ msgid "No such folder `%s'."
 msgstr "`%s' deyə bir qovluq yoxdur."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:132
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -11570,7 +11330,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Sendmail proqramı ilə məktub göndərilməsi"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:119
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11864,19 +11624,19 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
+#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:408
 msgid "attachment"
 msgstr "ilişdirilmiş fayl"
 
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:454
 msgid "Remove selected items from the attachment list"
 msgstr "Seçili üzvləri ilişdirilmiş fayllar siyahısından sil"
 
-#: composer/e-msg-composer-attachment-bar.c:491
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Add attachment..."
 msgstr "İlişdirilmiş fayl əlavə et..."
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:495
 msgid "Attach a file to the message"
 msgstr "İsmarışa bir fayl ilişdir"
 
@@ -11939,7 +11699,7 @@ msgstr "Çoxlu İsmarış"
 msgid "Open file"
 msgstr "Faylı aç"
 
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
 msgid "Autogenerated"
 msgstr "Avtomatik yarat"
 
@@ -12086,17 +11846,17 @@ msgstr "Fayl(lar) ilişdir"
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
+msgid "You cannot attach the file `{0}' to this message."
 msgstr "İsmarışa bir fayl ilişdir"
 
 #. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4
-msgid "${1}"
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
 msgstr ""
 
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
 
 #. mail-composer:attach-directory primary
@@ -12191,7 +11951,7 @@ msgstr "Boru yaradıla bilmədi: %s"
 
 #. mail-composer:no-build-message secondary
 #: composer/mail-composer-errors.xml.h:34
-msgid "Because \"${0}\", you may need to select different mail options."
+msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
@@ -12201,8 +11961,10 @@ msgid "Could not read signature file \"{0}\"."
 msgstr "İmza faylı qeyd edilə bilmir: %s"
 
 #. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38
-msgid "Because \"${1}\"."
+#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted primary
@@ -12621,11 +12383,11 @@ msgid "<b>Then</b>"
 msgstr "<b>Qalıb:</b> "
 
 #: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1335
+#: mail/mail-account-gui.c:1347
 msgid "Select Folder"
 msgstr "Qovluğu Seç"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
 #, fuzzy
 msgid "    "
 msgstr "      "
@@ -12684,7 +12446,7 @@ msgstr "əvvəl"
 msgid "months"
 msgstr "ay"
 
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
 msgid "seconds"
 msgstr "saniyə"
 
@@ -12716,20 +12478,20 @@ msgstr "bütün yerli qovluqlarla"
 msgid "years"
 msgstr "il"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:916
-#: mail/mail-config.c:76 mail/mail-config.glade.h:90
+#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
+#: mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Vacib"
 
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:919 mail/mail-config.c:79
-#: mail/mail-config.glade.h:145
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: mail/mail-config.glade.h:148
 msgid "To Do"
 msgstr "Ediləcəklər"
 
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:920 mail/mail-config.c:80
-#: mail/mail-config.glade.h:94
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: mail/mail-config.glade.h:97
 msgid "Later"
 msgstr "Sonra"
 
@@ -12787,257 +12549,6 @@ msgstr "gələn"
 msgid "outgoing"
 msgstr "gedən"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Adjust Score"
-msgstr "Xalı Sazla"
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Color"
-msgstr "Rəng Ver"
-
-#: filter/libfilter-i18n.h:4
-msgid "Assign Score"
-msgstr "Xal Ver"
-
-#: filter/libfilter-i18n.h:5
-msgid "Attachments"
-msgstr "İlişdirilmiş Fayllar"
-
-#: filter/libfilter-i18n.h:6
-msgid "Beep"
-msgstr "Bip Səsi Çıxart"
-
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "bunu daxil edirsə"
-
-#: filter/libfilter-i18n.h:8
-msgid "Copy to Folder"
-msgstr "Qovluğa Köçür"
-
-#: filter/libfilter-i18n.h:9
-msgid "Date received"
-msgstr "Alınma tarixi"
-
-#: filter/libfilter-i18n.h:10
-msgid "Date sent"
-msgstr "Göndərilmə tarixi"
-
-#: filter/libfilter-i18n.h:12
-msgid "Deleted"
-msgstr "Silinən"
-
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "bunu daxil etmirsə"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "bununla sonlanmırsa"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "mövcud deyilsə"
-
-#: filter/libfilter-i18n.h:16
-msgid "does not return"
-msgstr "cavab göndərmirsə"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "oxşamırsa"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "bununla başlamırsa"
-
-#: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
-msgstr "Mövcud Deyildirsə"
-
-#: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr "Layihə"
-
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "bununla sonlanırsa"
-
-#: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr "Mövcuddursa"
-
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "mövcuddursa"
-
-#: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr "İfadə"
-
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr "Sonrakı"
-
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "bərabərdir"
-
-#: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr "bundan sonra isə"
-
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr "bundan əvvəl isə"
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr "Bayraqlı isə"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "bundan böyükdürsə"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "bundan kiçikdirsə"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "bərabər deyilsə"
-
-#: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr "Bayraqlı deyilsə"
-
-#: filter/libfilter-i18n.h:36
-#, fuzzy
-msgid "Junk Test"
-msgstr "İyun"
-
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
-#: widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Etiket"
-
-#: filter/libfilter-i18n.h:38
-msgid "Mailing list"
-msgstr "Məktublaşma qrupu"
-
-#: filter/libfilter-i18n.h:39
-msgid "Message Body"
-msgstr "İsmarış Məzmunu"
-
-#: filter/libfilter-i18n.h:40
-msgid "Message Header"
-msgstr "İsmarış Başlığı"
-
-#: filter/libfilter-i18n.h:41
-#, fuzzy
-msgid "Message is Junk"
-msgstr "İsmarışlar"
-
-#: filter/libfilter-i18n.h:42
-#, fuzzy
-msgid "Message is not Junk"
-msgstr "_Vacib olaraq işarələ"
-
-#: filter/libfilter-i18n.h:43
-msgid "Move to Folder"
-msgstr "Qovluğa Daşı"
-
-#: filter/libfilter-i18n.h:44
-#, fuzzy
-msgid "Pipe to Program"
-msgstr "Proqramdan çıx"
-
-#: filter/libfilter-i18n.h:45
-msgid "Play Sound"
-msgstr "Səs Çal"
-
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Oxu"
-
-#: filter/libfilter-i18n.h:47
-msgid "Recipients"
-msgstr "Alıcılar"
-
-#: filter/libfilter-i18n.h:48
-msgid "Regex Match"
-msgstr "Qaydalı İfadə Nəticələri"
-
-#: filter/libfilter-i18n.h:49
-msgid "Replied to"
-msgstr "Cavab verilən"
-
-#: filter/libfilter-i18n.h:50
-msgid "returns"
-msgstr "cavab göndərirsə"
-
-#: filter/libfilter-i18n.h:51
-msgid "returns greater than"
-msgstr "bundan böyük cavab göndərirsə"
-
-#: filter/libfilter-i18n.h:52
-msgid "returns less than"
-msgstr "bundan kiçik cavab göndərirsə"
-
-#: filter/libfilter-i18n.h:53
-#, fuzzy
-msgid "Run Program"
-msgstr "Proqramı işə sal: "
-
-#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Xal"
-
-#: filter/libfilter-i18n.h:55
-msgid "Sender"
-msgstr "Göndərən"
-
-#: filter/libfilter-i18n.h:56
-msgid "Set Status"
-msgstr "Vəziyyəti Dəyişdir"
-
-#: filter/libfilter-i18n.h:57
-msgid "Size (kB)"
-msgstr "Böyüklük (kB)"
-
-#: filter/libfilter-i18n.h:58
-msgid "sounds like"
-msgstr "buna oxşayırsa"
-
-#: filter/libfilter-i18n.h:59
-msgid "Source Account"
-msgstr "Mənbə Hesabı"
-
-#: filter/libfilter-i18n.h:60
-msgid "Specific header"
-msgstr "Xüsusi başlıq"
-
-#: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "bununla başlayırsa:"
-
-#: filter/libfilter-i18n.h:63
-msgid "Stop Processing"
-msgstr "Oxumağı Dayandır"
-
-#: filter/libfilter-i18n.h:64 mail/em-format.c:755 mail/em-format-html.c:1519
-#: mail/em-format-quote.c:302 mail/em-mailer-prefs.c:87
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
-#: smime/lib/e-cert.c:1079
-msgid "Subject"
-msgstr "Mövzu"
-
-#: filter/libfilter-i18n.h:65
-msgid "Unset Status"
-msgstr "Vəziyyəti Geri Al"
-
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Qayda Əlavə Et"
@@ -13055,6 +12566,11 @@ msgstr "Qayda adı"
 msgid "_Score Rules"
 msgstr "Xal Qaydaları"
 
+#: filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Xal"
+
 #: filter/searchtypes.xml.h:1
 msgid "Body contains"
 msgstr "Məzmun bunu daxil etsin"
@@ -13136,13 +12652,13 @@ msgstr "İmza(lar)"
 msgid "-------- Forwarded Message --------"
 msgstr "Ötürülmüş İsmarış"
 
-#: mail/em-composer-utils.c:1499
+#: mail/em-composer-utils.c:1495
 msgid "an unknown sender"
 msgstr "namə'lum yollayan"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1509
+#: mail/em-composer-utils.c:1505
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "%a, %Y-%m-%d %H:%M tarixində %%s yazmışdır ki:"
@@ -13185,8 +12701,8 @@ msgstr "<qovluq seçmək üçün buraya tıqlayın>"
 msgid "Create New Folder"
 msgstr "Yeni Qovluq Yarat"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
-#: mail/mail-component.c:701
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
+#: mail/mail-component.c:704
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Qovluğun yaradılacağı yeri bildirin:"
@@ -13201,107 +12717,108 @@ msgstr "Yeni qovluq yarat"
 msgid "Folder _name:"
 msgstr "Qovluq _adı:"
 
-#: mail/em-folder-tree.c:839
+#: mail/em-folder-tree.c:833
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "%s qovluğu çıxardılır"
 
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree.c:835
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "%s qovluğu açılır"
 
-#: mail/em-folder-tree.c:848 mail/message-list.c:1555
+#: mail/em-folder-tree.c:842 mail/message-list.c:1561
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "İsmarışlar %s qovluğuna daşınır"
 
-#: mail/em-folder-tree.c:850 mail/message-list.c:1557
+#: mail/em-folder-tree.c:844 mail/message-list.c:1563
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "İsmarışlar %s qovluğuna köçürülür"
 
-#: mail/em-folder-tree.c:866
+#: mail/em-folder-tree.c:860
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "İsmarışlar Virtual Qovluğa köçürülə ya da daşına bilmir"
 
-#: mail/em-folder-tree.c:956 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "Qovluğa _Köçür"
 
-#: mail/em-folder-tree.c:957 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "Qovluğa _Daşı"
 
-#: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2069
-#: mail/em-folder-tree.c:2551 mail/em-folder-view.c:798
-#: mail/message-list.c:1645
+#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
+#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
+#: mail/message-list.c:1651
 #, fuzzy
 msgid "_Move"
 msgstr "Daşı"
 
-#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#: mail/em-folder-tree.c:955 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "Vəzifəni Ləğv Et"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
 #: mail/em-folder-view.c:798 mail/em-folder-view.c:812
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Qovluq seçin"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
 #, fuzzy
 msgid "C_opy"
 msgstr "Köçür"
 
-#: mail/em-folder-tree.c:2096
+#: mail/em-folder-tree.c:2088
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "%s qovluğu saxlanılır"
 
-#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
+#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
 #, fuzzy
 msgid "Create folder"
 msgstr "Yeni qovluq yarat"
 
-#: mail/em-folder-tree.c:2474
+#: mail/em-folder-tree.c:2463
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "%s qovluğu adını buna dəyişdir:"
 
-#: mail/em-folder-tree.c:2476
+#: mail/em-folder-tree.c:2465
 msgid "Rename Folder"
 msgstr "Qovluğu Yenidən Adlandır"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Görünüş"
 
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2537
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Yeni Pəncərədə Aç"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2555
+#: mail/em-folder-tree.c:2546
 msgid "_New Folder..."
 msgstr "_Yeni Qovluq..."
 
-#: mail/em-folder-tree.c:2558
+#: mail/em-folder-tree.c:2549
 msgid "_Rename"
 msgstr "_Yenidən Adlandır"
 
-#: mail/em-folder-tree.c:2561 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Xassələr..."
 
 #: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:889
+#: mail/mail-vfolder.c:888
 msgid "VFolders"
 msgstr "VQovluqlar"
 
@@ -13315,19 +12832,19 @@ msgstr ""
 msgid "Inbox"
 msgstr "Gələnlər qutusu"
 
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
 msgid "Loading..."
 msgstr "Yüklənir..."
 
 #: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
 #: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
 #: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:551
+#: mail/mail-component.c:554
 msgid "Mail"
 msgstr "Məktub"
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "Yeni İsmarış olaraq _Düzəlt ..."
@@ -13340,17 +12857,17 @@ msgstr "_Çap Et"
 msgid "_Reply to Sender"
 msgstr "Göndərənə _Cavab Yaz"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:810
+#: mail/em-folder-view.c:901 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "_Qrupa Cavab Yaz"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:811
+#: mail/em-folder-view.c:902 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "_Hamısına Cavab Yaz"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: mail/em-folder-view.c:903 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "Ö_tür"
@@ -13405,6 +12922,10 @@ msgstr "Qovluğa _Daşı..."
 msgid "_Copy to Folder..."
 msgstr "Qovluğa _Köçür..."
 
+#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Etiket"
+
 #: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Yollayanı Ünvan _Kitabçasına Əlavə Et"
@@ -13455,12 +12976,12 @@ msgid "Filter on _Mailing List"
 msgstr "_Məktublaşma Qrupuna görə filtrlə"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
-#: mail/mail-config.glade.h:66
+#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Ön qurğulu"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1796
 msgid "Print Message"
 msgstr "İsmarışı Çap Et"
 
@@ -13500,12 +13021,18 @@ msgstr "Cc"
 msgid "Bcc"
 msgstr "Bcc"
 
+#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
+#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Mövzu"
+
 #: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
 #: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Tarix"
 
-#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
+#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
 msgid "Newsgroups"
 msgstr ""
 
@@ -13700,7 +13227,7 @@ msgid ""
 "practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:757
+#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
 #, fuzzy
 msgid "_View Certificate"
 msgstr "_Sertifikat ID-si:"
@@ -13761,7 +13288,7 @@ msgstr "Hər həftə"
 msgid "Once per month"
 msgstr "hər ay"
 
-#: mail/em-migrate.c:1072
+#: mail/em-migrate.c:1168
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13769,92 +13296,92 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1506
+#: mail/em-migrate.c:1602
 #, fuzzy, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Qovluq alına bilmir: %s: %s"
 
-#: mail/em-migrate.c:1532
+#: mail/em-migrate.c:1628
 #, fuzzy, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr ""
 "Fayl izahatçısı köçürülə bilmir: %s\n"
 " %s"
 
-#: mail/em-migrate.c:1715
+#: mail/em-migrate.c:1811
 #, fuzzy, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr ""
 "Yekun faylı yaradıla bilmir: %s\n"
 " %s"
 
-#: mail/em-migrate.c:1919
+#: mail/em-migrate.c:2015
 #, fuzzy, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "%s POP vericisinə tanıdıla bilmədi: %s"
 
-#: mail/em-migrate.c:1933
+#: mail/em-migrate.c:2029
 #, fuzzy, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "'%s'-a boru yaradıla bilmədi:'%s'"
 
-#: mail/em-migrate.c:1962
+#: mail/em-migrate.c:2058
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#: mail/em-migrate.c:2413 mail/em-migrate.c:2425
 #, fuzzy, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "'%s'-a boru yaradıla bilmədi:'%s'"
 
-#: mail/em-migrate.c:2480
+#: mail/em-migrate.c:2576
 #, fuzzy, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr ""
 "Yekun faylı yaradıla bilmir: %s\n"
 " %s"
 
-#: mail/em-migrate.c:2498
+#: mail/em-migrate.c:2594
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 msgstr ""
 
-#: mail/em-popup.c:699
+#: mail/em-popup.c:700
 #, fuzzy
 msgid "Save As..."
 msgstr "_Fərqli Qeyd Et..."
 
-#: mail/em-popup.c:717
+#: mail/em-popup.c:718
 #, fuzzy, c-format
 msgid "untitled_image.%s"
 msgstr "Adsız İsmarış"
 
-#: mail/em-popup.c:807
+#: mail/em-popup.c:808
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:809
+#: mail/em-popup.c:810
 msgid "_Reply to sender"
 msgstr "Göndərənə _cavab yaz"
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:859
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Körpünü Səyyahda Aç"
 
-#: mail/em-popup.c:859
+#: mail/em-popup.c:860
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Qrupa _ismarış göndər..."
 
-#: mail/em-popup.c:860
+#: mail/em-popup.c:861
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Yollayanı Ünvan Kitabçasına Əlavə Et"
 
-#: mail/em-popup.c:966
+#: mail/em-popup.c:967
 #, c-format
 msgid "Open in %s..."
 msgstr "%s ilə aç..."
@@ -14451,7 +13978,7 @@ msgstr "Evolution Poçt xassələri idarəsi"
 msgid "Mail Accounts"
 msgstr "Poçt Hesabları"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
 msgid "Mail Preferences"
 msgstr ""
 
@@ -14465,15 +13992,15 @@ msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution sizin köhnə Elm məktublarınızı idxal edir"
 
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:226
+#: mail/importers/evolution-mbox-importer.c:221
+#: mail/importers/evolution-outlook-importer.c:255
 #: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "İdxal edilir..."
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:222
-#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/evolution-mbox-importer.c:223
+#: mail/importers/evolution-outlook-importer.c:257
 #: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Xahiş edirik gözləyin"
@@ -14496,23 +14023,25 @@ msgid "Elm"
 msgstr "Elm"
 
 #: mail/importers/evolution-mbox-importer.c:116
+#: mail/importers/evolution-outlook-importer.c:130
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Hədəf sırf oxunandır"
 
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 #, fuzzy
 msgid "Select folder to import into"
 msgstr "İdxalçı seçin"
 
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:254
 #: mail/importers/mail-importer.c:226
 #, fuzzy, c-format
 msgid "Importing `%s'"
 msgstr "İdxal edilir"
 
-#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/evolution-outlook-importer.c:301
 #: mail/importers/mail-importer.c:140
 #, fuzzy
 msgid "Importing mailbox"
@@ -14657,15 +14186,15 @@ msgstr ""
 msgid "%s License Agreement"
 msgstr ""
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
 msgid "_Host:"
 msgstr "_Qovşaq:"
 
-#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
 msgid "User_name:"
 msgstr "_İstifadəçi adı:"
 
-#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
 msgid "_Path:"
 msgstr "_Cığır:"
 
@@ -14728,34 +14257,34 @@ msgstr "%d əlaqə"
 msgid ", %d unread"
 msgstr ""
 
-#: mail/mail-component.c:653
+#: mail/mail-component.c:656
 msgid "New Mail Message"
 msgstr "Yeni Məktub İsmarışı"
 
-#: mail/mail-component.c:654
+#: mail/mail-component.c:657
 msgid "_Mail Message"
 msgstr "_Məktub İsmarışı"
 
-#: mail/mail-component.c:655
+#: mail/mail-component.c:658
 msgid "Compose a new mail message"
 msgstr "Yeni məktub ismarışı yaz"
 
-#: mail/mail-component.c:661
+#: mail/mail-component.c:664
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Yeni VQovluq"
 
-#: mail/mail-component.c:662
+#: mail/mail-component.c:665
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Poçt Filtrləri"
 
-#: mail/mail-component.c:663
+#: mail/mail-component.c:666
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Yeni təqvim yarat"
 
-#: mail/mail-component.c:795
+#: mail/mail-component.c:798
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
@@ -14767,7 +14296,7 @@ msgstr "Yoxlama Xidməti"
 msgid "Connecting to server..."
 msgstr "Vericiyə bağlanır..."
 
-#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Şəxsiyyət"
 
@@ -14779,7 +14308,7 @@ msgid ""
 msgstr ""
 
 #: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid "Receiving Mail"
 msgstr "Poçtun Alınması"
 
@@ -14793,7 +14322,7 @@ msgstr ""
 msgid "Please select among the following options"
 msgstr "Xaniş edirik, aşağıdakı seçənəklər arasından seçin"
 
-#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr "Poçtun Göndərilməsi"
 
@@ -14803,7 +14332,7 @@ msgid ""
 "sure, ask your system administrator or Internet Service Provider."
 msgstr "."
 
-#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37
 msgid "Account Management"
 msgstr "Hesab İdarəsi"
 
@@ -14816,251 +14345,255 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:2
 #, fuzzy
 msgid " Ch_eck for Supported Types "
 msgstr " Dəstəklənən növləri _yoxla "
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "<b>Preview</b>"
 msgstr "Nümayiş"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "(Evolution proqramının bu inşasında SSL dəstəyi yoxdur)"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "<b>S_ignatures</b>"
 msgstr "<b>Vəziyyət:</b>"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "<b>_Languages</b>"
 msgstr "<b>Vəziyyət:</b>"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
+msgid "<small>This will make the the filter more reliable, but slower</small>"
+msgstr ""
+
+#: mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "<span weight=\"bold\">Checking for New Mail</span>"
 msgstr "Yeni Məktubların Yoxlanması"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">General</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "Yeni Məktub Bildirişi"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Security</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "Göndərilən və Layihə İsmarışları"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:34
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:35
 #, fuzzy
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr ""
 "Şifrələnmiş məktub göndərildiyi vaxt məktubu _həmişə mənim üçün də şifrələ"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:36
 msgid "Account Editor"
 msgstr "Hesab Editoru"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:38
 #, fuzzy
 msgid "Add Ne_w Signature..."
 msgstr "Yeni imza əlavə et..."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Add _Script"
 msgstr "S_kript Əlavə Et"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:40
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 "Şifrələnmiş məktub göndərildiyi vaxt məktubu həmişə _mənim üçün də şifrələ"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Bu ünvana həmişə məktubun _nüsxəsini (Cc) yolla:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Bu ünvana həmişə məktubun _gizli nüsxəsini (Bcc) yolla:"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Always _sign outgoing messages when using this account"
 msgstr "Bu hesab işlədildiyində bütün məktubları _həmişə imzala"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Şifrələrkən açar dairəmdəki açarlara _həmişə e'tibar et"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Attach original message"
 msgstr "Orijinal ismarışı ilişdir"
 
-#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "İlişdirilmiş fayl"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:48
 #, fuzzy
 msgid "Automatically _insert smiley images"
 msgstr "Emosiya rəsmlərini avtomatik olaraq _daxil et"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Automatically check for _new mail every"
 msgstr "Yeni məktubları _avtomatik olaraq bu aralıqla yoxla:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltik (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltik (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Beep w_hen new mail arrives"
 msgstr "Yeni məktub alındığında _bip səsi çıxart"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "C_haracter set:"
 msgstr "_Hərf dəstəsi:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Ch_eck for Supported Types "
 msgstr " Dəstəklənən növləri _yoxla "
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 #, fuzzy
-msgid "Check _Incoming Mail"
+msgid "Check _incoming mail for junk"
 msgstr "Yeni Məktubların Yoxlanması"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Check spelling while I _type"
 msgstr "Yazdığımda imlanı _yoxla"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 msgid "Color for _misspelled words:"
 msgstr "Səhv imlalı mətnin _rəngi:"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Colors"
 msgstr "_Rənglər"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Confirm _when expunging a folder"
 msgstr "Qovluq həmişəlik silinirkən _təsdiq istə"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -15076,289 +14609,290 @@ msgstr ""
 "\n"
 "Qurğularınızı qeyd etmək üçün \"Tətbiq Et\" düyməsinə basın."
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
 msgid "De_fault"
 msgstr "Ön _qurğulu"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Default character e_ncoding:"
 msgstr "Ön qurğulu hərf _kodlaması:"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 #, fuzzy
 msgid "Defaults"
 msgstr "Ö_n qurğular"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 msgid "Do not quote original message"
 msgstr "Orijinal ismarışı sitatlama"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Görüş istəklərini _imzalama (Outlook ilə uyğunluq üçün)"
 
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Başa çatdı"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Drafts _Folder:"
 msgstr "_Layihələr qovluğu:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:77
 msgid "Email Accounts"
 msgstr "Epoçt Hesabları"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Email _Address:"
 msgstr "_Epoçt ünvanı:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "Empty trash folders on e_xit"
 msgstr "Çıxışda zibil qovluqlarını _boşalt"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "_Sertifikat ID-si:"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:81
 msgid "Evolution Account Assistant"
 msgstr "Evolution Hesab Bələdçisi"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:82
 msgid "Execute Command..."
 msgstr "Əmr İcra Et..."
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Fi_xed-width:"
 msgstr "_Tən-aralıqlı en:"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 msgid "Font Properties"
 msgstr "Yazı Növü Qurğuları"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 msgid "Format messages in _HTML"
 msgstr "İsmarışları _HTML olaraq şəkilləndir"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "HTML Mail"
 msgstr "_HTML Məktub"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Headers"
 msgstr "Başlıq"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr "Sitatları belə _işıqlandır:"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
 #: mail/mail-config.glade.h:91
+#, fuzzy
+msgid "I_nclude remote tests"
+msgstr "Daxil et:"
+
+#: mail/mail-config.glade.h:94
 msgid "Inline"
 msgstr "Daxili"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Mail Configuration"
 msgstr "Poçt Qurğuları"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "Məktub qutusu mövqeyi"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr "İsmarış Tərtib Edicisi"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 "Qeyd: İlk dəfə bağlanana dək sizdən şifrənizi daxil etməniz istənəcəkdir"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Or_ganization:"
 msgstr "_Orqanizasiya:"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _Açar ID-si:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "Play sound file when new mail arri_ves"
 msgstr "Yeni məktub alındığında _səs çal"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Ancaq _Bcc alıcıları bildirlən ismarış yollamağa çalışdığımda bildir"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Qmail maildir "
 msgstr "Qmail poçt qovluğu"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr "Orijinal ismarışı sitatlandır"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr "Sitatlandırılmış"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Re_member password"
 msgstr "Şifrəni yadda saxla"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr "_Cavablama-Ünvanı:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "Poçtun Alınması"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:120
 #, fuzzy
 msgid "Receiving Options"
 msgstr "Alınma _Seçimləri"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
 #, fuzzy
 msgid "Remember _password"
 msgstr "Şifrəni yadda saxla"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
 #, fuzzy
 msgid "S_tandard Font:"
 msgstr "_Standart Yazı Növü:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 #, fuzzy
 msgid "Security"
 msgstr "_Təhlükəsizlik"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font"
 msgstr "HTML tən-aralıqlı yazı növünü seç"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:126
 msgid "Select HTML fixed width font for printing"
 msgstr "Çap üçün HTML tən-aralıqlı yazı növünü seç"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:127
 msgid "Select HTML variable width font"
 msgstr "HTML dəyişən yazı növünü seç"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:128
 msgid "Select HTML variable width font for printing"
 msgstr "Çap üçün HTML dəyişən yazı növünü seç"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:129
 #, fuzzy
 msgid "Select..."
 msgstr "Sil..."
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "Poçtun Göndərilməsi"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Sent _Messages Folder:"
 msgstr "Göndərilən _ismarışlar qovluğu:"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:134
 msgid "Ser_ver requires authentication"
 msgstr "Veri_ci tanıtmanı məcbur qılır"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:135
 msgid "Server _Type: "
 msgstr "Verici _Növü: "
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "_Sertifikat ID-si:"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:137
 #, fuzzy
 msgid "Signat_ure:"
 msgstr "İmza:"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "Signatures"
 msgstr "_İmzalar"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr "Fayl adı _bildir:"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "Spell Checking"
 msgstr "İmla _Yoxlaması"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:141
 msgid "Standard Unix mbox"
 msgstr "Standart UNIX mbox"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "T_erminal Font:"
 msgstr "_Terminal Yazı Növü:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "T_ype: "
 msgstr "Növ:"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:149
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:148
-msgid "Use _Daemon"
-msgstr ""
-
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:152
 msgid "V_ariable-width:"
 msgstr "_Dəyişən-en:"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:153
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -15368,94 +14902,90 @@ msgstr ""
 "\n"
 "Başlamaq üçün \"Sonrakı\" düyməsinə basın."
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:158
 msgid "_Add Signature"
 msgstr "_İmza Əlavə Et"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Always load images from the Internet"
 msgstr "_Netdən rəsmləri həmişə yüklə"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Digitally sign outgoing messages (by default)"
 msgstr "Bu hesab işlədildiyində bütün məktubları _həmişə imzala"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:161
 msgid "_Do not notify me when new mail arrives"
 msgstr "Yeni məktub alındığında bildirmə"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:163
 msgid "_Enable"
 msgstr "_Fəallaşdır"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:165
 msgid "_Forward style:"
 msgstr "Ötürmə _tərzi:"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Load images if sender is in address book"
 msgstr "Yollayan ünvan kitabçasında varsa, rəsmləri _yüklə"
 
-#: mail/mail-config.glade.h:167
-msgid "_Local Tests Only"
-msgstr ""
-
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Make this my default account"
 msgstr "Bu hesabı ön _qurğulu hesabım et"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_Mark messages as read after"
 msgstr "İsmarışları oxunmuş olaraq işarələmə _vaxtı:"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Never load images from the Internet"
 msgstr "Netdən rəsmləri _qətiyyən endirmə"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "HTML məktublarını bu tərz məktub istəməyən əlaqələrə göndərdiyimdə _təsdiq "
 "istə"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:175
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Boş mövzulu məktub göndərdiyimdə təsdiq istə"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:176
 msgid "_Reply style:"
 msgstr "Cavab _tərzi:"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:177
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:178
 msgid "_Show animated images"
 msgstr "Animasiyalı rəsmləri _göstər"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "_Use Secure Connection (SSL):"
 msgstr "_E'tibarlı bağlantı (SSL) işlət:"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "_Use the same fonts as other applications"
 msgstr "_Diqər proqramların işlətdiyi yazı növlərini işlət"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:181
 msgid "color"
 msgstr "rəng"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "izahat"
 
@@ -15629,7 +15159,7 @@ msgstr ""
 
 #. mail:camel-exception primary
 #: mail/mail-errors.xml.h:57
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgid "Your message with the subject \"{0}\" was not delivered."
 msgstr ""
 
 #. mail:camel-exception secondary
@@ -15695,11 +15225,6 @@ msgstr ""
 msgid "Cannot save to directory \"{0}\"."
 msgstr "%s qovluğu yaradıla bilmədi: %s"
 
-#. mail:no-save-path secondary
-#: mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail:no-create-path primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
@@ -15721,12 +15246,6 @@ msgstr "%s qovluğu yaradıla bilmədi: %s"
 msgid "Cannot create temporary save directory."
 msgstr "Müvəqqəti qovluq yaradıla bilmədi: %s"
 
-#. mail:no-create-tmp-path secondary
-#: mail/mail-errors.xml.h:100 mail/mail-errors.xml.h:112
-#: widgets/misc/e-system-errors.xml.h:11 widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail:no-write-path-exists secondary
 #: mail/mail-errors.xml.h:104
 #, fuzzy
@@ -16006,29 +15525,25 @@ msgstr "Üstünə yaz"
 msgid "_Append"
 msgstr "Göndər"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:785
 #, c-format
 msgid "Pinging %s"
 msgstr "%s pinglənir"
 
-#: mail/mail-mt.c:897
-msgid "Working"
-msgstr "İşləyir"
-
-#: mail/mail-ops.c:99
+#: mail/mail-ops.c:98
 msgid "Filtering Folder"
 msgstr "Qovluq Filtrdən Keçirilir"
 
-#: mail/mail-ops.c:260
+#: mail/mail-ops.c:259
 msgid "Fetching Mail"
 msgstr "Poçt Alınır"
 
-#: mail/mail-ops.c:543
+#: mail/mail-ops.c:542
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Göndərmə filtrləri tətbiq edilə bilmədi: %s"
 
-#: mail/mail-ops.c:568
+#: mail/mail-ops.c:567
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -16037,115 +15552,115 @@ msgstr ""
 "%s faylına əlavə edilə bilmədi: %s\n"
 "Onun əvəzinə yerli 'Göndərilənlər' qovluğuna əlavə edilir."
 
-#: mail/mail-ops.c:577
+#: mail/mail-ops.c:576
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr ""
 
-#: mail/mail-ops.c:673
+#: mail/mail-ops.c:672
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%d / %d ismarış göndərilir"
 
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:703
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "%d / %d ismarışında iflas etdi"
 
-#: mail/mail-ops.c:708
+#: mail/mail-ops.c:707
 msgid "Complete."
 msgstr "Başa çatdı."
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:804
 msgid "Saving message to folder"
 msgstr "İsmarışlar qovluğa qeyd edilir"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Moving messages to %s"
 msgstr "İsmarışlar %s qovluğuna daşınır"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Copying messages to %s"
 msgstr "İsmarışlar %s qovluğuna köçürülür"
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:1002
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\"dakı qovluqlar oxunur"
 
-#: mail/mail-ops.c:1116
+#: mail/mail-ops.c:1115
 msgid "Forwarded messages"
 msgstr "Ötürülmüş ismarışlar"
 
-#: mail/mail-ops.c:1159
+#: mail/mail-ops.c:1158
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s qovluğu açılır"
 
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1230
 #, c-format
 msgid "Opening store %s"
 msgstr "%s mənbəsi açılır"
 
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1308
 #, c-format
 msgid "Removing folder %s"
 msgstr "%s qovluğu çıxardılır"
 
-#: mail/mail-ops.c:1403
+#: mail/mail-ops.c:1402
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "%s qovluğu saxlanılır"
 
-#: mail/mail-ops.c:1468
+#: mail/mail-ops.c:1467
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1469
+#: mail/mail-ops.c:1468
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "%s qovluğu saxlanılır"
 
-#: mail/mail-ops.c:1524
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr "Qovluq yenilənir"
 
-#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
+#: mail/mail-ops.c:1559 mail/mail-ops.c:1610
 msgid "Expunging folder"
 msgstr "Qovluq silinir"
 
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1607
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "'%s' içindəki zibil boşaldılır"
 
-#: mail/mail-ops.c:1609
+#: mail/mail-ops.c:1608
 msgid "Local Folders"
 msgstr "Yerli Qovluqlar"
 
-#: mail/mail-ops.c:1692
+#: mail/mail-ops.c:1691
 #, c-format
 msgid "Retrieving message %s"
 msgstr "%s ismarışı alınır"
 
-#: mail/mail-ops.c:1764
+#: mail/mail-ops.c:1763
 #, fuzzy, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "%d ismarış alınır"
 msgstr[1] "%d ismarış alınır"
 
-#: mail/mail-ops.c:1850
+#: mail/mail-ops.c:1849
 #, fuzzy, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "%d ismarış qeyd edilir"
 msgstr[1] "%d ismarış qeyd edilir"
 
-#: mail/mail-ops.c:1900
+#: mail/mail-ops.c:1899
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -16154,7 +15669,7 @@ msgstr ""
 "Yekun faylı yaradıla bilmir: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1928
+#: mail/mail-ops.c:1927
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -16163,11 +15678,11 @@ msgstr ""
 "İsmarışların mövqeyə qeyd edilmə xətası: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1999
+#: mail/mail-ops.c:1998
 msgid "Saving attachment"
 msgstr "İlişdirilmiş fayl qeyd edilir"
 
-#: mail/mail-ops.c:2016
+#: mail/mail-ops.c:2015
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -16176,17 +15691,17 @@ msgstr ""
 "Yekun faylı yaradıla bilmir: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2046
+#: mail/mail-ops.c:2045
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Mə'lumat yazıla bilmədi: %s"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s ilə bağlantı kəsilir"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s ilə bağlantı yenidən qurulur"
@@ -16251,24 +15766,24 @@ msgstr "Yenilənir..."
 msgid "Waiting..."
 msgstr "Gözləyir..."
 
-#: mail/mail-session.c:238
+#: mail/mail-session.c:239
 msgid "User canceled operation."
 msgstr "İstifadəçi əməliyyatı ləğv etdi."
 
-#: mail/mail-session.c:271
+#: mail/mail-session.c:272
 #, c-format
 msgid "Enter Password for %s"
 msgstr "%s üçün şifrəni bildirin"
 
-#: mail/mail-session.c:273
+#: mail/mail-session.c:274
 msgid "Enter Password"
 msgstr "Şifrəni Bildirin"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password"
 msgstr "Bu şifrəni _yadda saxla"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:298
 msgid "_Remember this password for the remainder of this session"
 msgstr "Hazırkı iclas boyunca bu şifrəni _yadda saxla"
 
@@ -16325,79 +15840,79 @@ msgstr "Uri üçün vqovluqlar yenilənir: %s"
 msgid "Updating vFolders for '%s'"
 msgstr "Uri üçün vqovluqlar yenilənir: %s"
 
-#: mail/mail-vfolder.c:959
+#: mail/mail-vfolder.c:958
 msgid "vFolders"
 msgstr "vQovluqlar"
 
-#: mail/mail-vfolder.c:998
+#: mail/mail-vfolder.c:997
 msgid "Edit VFolder"
 msgstr "VQovluğu Dəyişdir"
 
-#: mail/mail-vfolder.c:1082
+#: mail/mail-vfolder.c:1081
 msgid "New VFolder"
 msgstr "Yeni VQovluq"
 
-#: mail/message-list.c:946
+#: mail/message-list.c:948
 msgid "Unseen"
 msgstr "Görülməmiş"
 
-#: mail/message-list.c:947
+#: mail/message-list.c:949
 msgid "Seen"
 msgstr "Görülmüş"
 
-#: mail/message-list.c:948
+#: mail/message-list.c:950
 msgid "Answered"
 msgstr "Cavab verilmiş"
 
-#: mail/message-list.c:949
+#: mail/message-list.c:951
 msgid "Multiple Unseen Messages"
 msgstr "Çoxlu Görülməmiş İsmarış"
 
-#: mail/message-list.c:950
+#: mail/message-list.c:952
 msgid "Multiple Messages"
 msgstr "Çoxlu İsmarış"
 
-#: mail/message-list.c:954
+#: mail/message-list.c:956
 msgid "Lowest"
 msgstr "Ən Alçaq"
 
-#: mail/message-list.c:955
+#: mail/message-list.c:957
 msgid "Lower"
 msgstr "Daha Alçaq"
 
-#: mail/message-list.c:959
+#: mail/message-list.c:961
 msgid "Higher"
 msgstr "Daha Yüksək"
 
-#: mail/message-list.c:960
+#: mail/message-list.c:962
 msgid "Highest"
 msgstr "Ən Yüksək"
 
-#: mail/message-list.c:1279
+#: mail/message-list.c:1285
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1286
+#: mail/message-list.c:1292
 msgid "Today %l:%M %p"
 msgstr "Bugün %l:%M %p"
 
-#: mail/message-list.c:1295
+#: mail/message-list.c:1301
 msgid "Yesterday %l:%M %p"
 msgstr "Dünən: %l:%M %p"
 
-#: mail/message-list.c:1307
+#: mail/message-list.c:1313
 msgid "%a %l:%M %p"
 msgstr "%a %l %M %p"
 
-#: mail/message-list.c:1315
+#: mail/message-list.c:1321
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1317
+#: mail/message-list.c:1323
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3300
+#: mail/message-list.c:3321
 msgid "Generating message list"
 msgstr "İsmarış siyahısı yaradılır"
 
@@ -16453,6 +15968,10 @@ msgstr "Ötür"
 msgid "No Response Necessary"
 msgstr "Cavab Məcburi Deyil"
 
+#: mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Oxu"
+
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Cavab yaz"
@@ -16555,45 +16074,49 @@ msgid ""
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:10
-msgid "Whether Evolution should start up in offline mode"
+msgid "Toolbar is visible"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:11
-msgid "Whether to skip the development warning dialog"
+msgid "Whether Evolution should start up in offline mode"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Whether the toolbar should be visible."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:14
 #, fuzzy
 msgid "mail"
 msgstr "Epoçt"
 
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
-msgstr "İnkişafçılar"
-
-#: shell/e-shell.c:545 shell/e-shell.c:546
+#: shell/e-shell.c:588 shell/e-shell.c:589
 #, fuzzy, c-format
 msgid "%ld KB"
 msgstr "%d %B"
 
-#: shell/e-shell.c:744
+#: shell/e-shell.c:786
 #, fuzzy
 msgid "Uknown system error."
 msgstr "Naməlum xəta"
 
-#: shell/e-shell.c:1101
+#: shell/e-shell.c:1143
 msgid "Invalid arguments"
 msgstr "Hökmsüz arqumentlər"
 
-#: shell/e-shell.c:1103
+#: shell/e-shell.c:1145
 msgid "Cannot register on OAF"
 msgstr "OAF-a qeyd edilə bilmir"
 
-#: shell/e-shell.c:1105
+#: shell/e-shell.c:1147
 msgid "Configuration Database not found"
 msgstr "Quraşdırma Mə'lumat Bazası tapılmadı"
 
-#: shell/e-shell.c:1107
+#: shell/e-shell.c:1149
 msgid "Generic error"
 msgstr "Ümumi xəta"
 
@@ -16649,7 +16172,7 @@ msgstr ""
 msgid "Select importer"
 msgstr "İdxalçı seçin"
 
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1026
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
 #, c-format
 msgid "File %s does not exist"
 msgstr "`%s' faylı mövcud deyil"
@@ -16677,35 +16200,35 @@ msgstr ""
 "%s idxal edilir\n"
 "İdxal edilən üzv 1."
 
-#: shell/e-shell-importer.c:549
+#: shell/e-shell-importer.c:570
 msgid "Automatic"
 msgstr "Avtomatik"
 
-#: shell/e-shell-importer.c:598
+#: shell/e-shell-importer.c:626
 #, fuzzy
-msgid "_Filename:"
+msgid "F_ilename:"
 msgstr "Fayl adı:"
 
-#: shell/e-shell-importer.c:603
+#: shell/e-shell-importer.c:631
 msgid "Select a file"
 msgstr "Fayl seçin"
 
-#: shell/e-shell-importer.c:613
+#: shell/e-shell-importer.c:642
 #, fuzzy
 msgid "File _type:"
 msgstr "Fayl növü:"
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:681
 #, fuzzy
 msgid "Import data and settings from _older programs"
 msgstr "Başqa proqramlardan verilən və qurğuları idxal et"
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:684
 #, fuzzy
 msgid "Import a _single file"
 msgstr "Tək fayl idxal et"
 
-#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -16713,26 +16236,26 @@ msgstr ""
 "Xahiş edirik gözləyin...\n"
 "Mövcud qurğular axtarılır"
 
-#: shell/e-shell-importer.c:727
+#: shell/e-shell-importer.c:756
 msgid "Starting Intelligent Importers"
 msgstr "İnternet İdxalçıları Başladılır"
 
-#: shell/e-shell-importer.c:853 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
 #, c-format
 msgid "From %s:"
 msgstr "Göndərən %s:"
 
-#: shell/e-shell-importer.c:1044
+#: shell/e-shell-importer.c:1073
 #, fuzzy, c-format
 msgid "No importer available for file %s"
 msgstr "`%s' protokolu üçün xidmətçi yoxdur"
 
-#: shell/e-shell-importer.c:1056
+#: shell/e-shell-importer.c:1085
 #, fuzzy
 msgid "Unable to execute importer"
 msgstr "gpg icra edilə bilmədi."
 
-#: shell/e-shell-importer.c:1169
+#: shell/e-shell-importer.c:1199
 #, fuzzy
 msgid "_Import"
 msgstr "İdxal Et"
@@ -16778,59 +16301,59 @@ msgstr "Qovluq adı \"#\" hərfini daxil edə bilməz."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' və '..' saxlanmış qovluq adlarıdır."
 
-#: shell/e-shell-window.c:336
+#: shell/e-shell-window.c:337
 #, fuzzy
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution hazırda xətdədir. Xətdən çıxmaq üçün bu düyməyə basın."
 
-#: shell/e-shell-window.c:343
+#: shell/e-shell-window.c:344
 #, fuzzy
 msgid "Evolution is in the process of going offline."
 msgstr "Ximian Evolution xətdən çıxma fəaliyyətindədir."
 
-#: shell/e-shell-window.c:349
+#: shell/e-shell-window.c:350
 #, fuzzy
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution hazırda xətdə deyil. Xətdə girmək üçün bu düyməyə tıqlayın."
 
-#: shell/e-shell-window.c:621
+#: shell/e-shell-window.c:637
 #, fuzzy, c-format
 msgid "Switch to %s"
 msgstr "%s ünvanına məktub"
 
-#: shell/e-shell-window-commands.c:64
+#: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Sisteminizdə GNOME Pilot vasitələri qurulu deyil."
 
-#: shell/e-shell-window-commands.c:72
+#: shell/e-shell-window-commands.c:74
 #, c-format
 msgid "Error executing %s."
 msgstr "%s icra xətası."
 
-#: shell/e-shell-window-commands.c:121
+#: shell/e-shell-window-commands.c:123
 msgid "Bug buddy is not installed."
 msgstr "Bug buddy qurulu deyil."
 
-#: shell/e-shell-window-commands.c:129
+#: shell/e-shell-window-commands.c:131
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy işə salına bilmədi."
 
-#: shell/e-shell-window-commands.c:171
+#: shell/e-shell-window-commands.c:323
 #, fuzzy
-msgid "About Evolution"
-msgstr "Ximian Evolution Haqqında"
+msgid "Groupware Suite"
+msgstr "Qrup"
 
-#: shell/e-shell-window-commands.c:382
+#: shell/e-shell-window-commands.c:563
 msgid "_Work Online"
 msgstr "Xətdə _İşlə"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "Xətdən Qopuq _İşlə"
 
-#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Xətdən Qopuq İşlə"
 
@@ -16842,43 +16365,6 @@ msgstr "İşarələmə qutusu"
 msgid "New"
 msgstr "Yeni"
 
-#: shell/evolution-shell-component-utils.c:115
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Namə'lum xəta."
-
-#: shell/evolution-shell-component-utils.c:118
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Tərkib hissəsi sistemi xətası:\n"
-"%s"
-
-#: shell/evolution-shell-component-utils.c:125
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Fəallaşdırma sistemi xətası:\n"
-"%s"
-
 #: shell/evolution-test-component.c:140
 #, fuzzy
 msgid "New Test"
@@ -17197,34 +16683,34 @@ msgid ""
 "Click help for details."
 msgstr ""
 
-#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:522
+#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
+#: smime/gui/certificate-manager.c:556
 #, fuzzy
 msgid "Select a cert to import..."
 msgstr "İdxalçı seçin"
 
-#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:604
+#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
+#: smime/gui/certificate-manager.c:638
 #, fuzzy
 msgid "Certificate Name"
 msgstr "_Sertifikat ID-si:"
 
-#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
+#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
 #, fuzzy
 msgid "Purposes"
 msgstr "İrəliləmə"
 
-#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:517
+#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:267
+#: smime/gui/certificate-manager.c:271
 #, fuzzy
 msgid "Expires"
 msgstr "İfadə"
 
-#: smime/gui/certificate-manager.c:417
+#: smime/gui/certificate-manager.c:446
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "E-Poçt Ünvanını Birləşdir"
@@ -17267,6 +16753,11 @@ msgid ""
 "  Subject: %s\n"
 msgstr ""
 
+#: smime/gui/e-cert-selector.c:169
+#, fuzzy
+msgid "Select certificate"
+msgstr "Xüsusi tarixə get"
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -17329,7 +16820,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
 #, fuzzy
 msgid "Certificate"
 msgstr "_Sertifikat ID-si:"
@@ -17354,20 +16845,24 @@ msgstr "Ümumi Ad"
 msgid "Contact Certificates"
 msgstr "_Sertifikat ID-si:"
 
-#: smime/gui/smime-ui.glade.h:21
-#, no-c-format
-msgid "Do you want to trust \"%s\" for the following purposes?"
+#: smime/gui/smime-ui.glade.h:20
+msgid "Do not trust the authenticity of this certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:21
 msgid "Dummy window only"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:22
 #, fuzzy
 msgid "Edit"
 msgstr "_Düzəlt"
 
+#: smime/gui/smime-ui.glade.h:23
+#, fuzzy
+msgid "Email Certificate Trust Settings"
+msgstr "Hökmsüz Sertifikat Təsdiqi (CA)"
+
 #: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr ""
@@ -17404,279 +16899,288 @@ msgstr "Quruluş Bölümü"
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:37
-msgid "Trust this CA to identify email users."
+msgid "Trust the authenticity of this certificate"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:38
-msgid "Trust this CA to identify software developers."
+msgid "Trust this CA to identify email users."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:39
-msgid "Trust this CA to identify web sites."
+msgid "Trust this CA to identify software developers."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:40
-#, fuzzy
-msgid "View"
-msgstr "_Görünüş"
+msgid "Trust this CA to identify web sites."
+msgstr ""
 
 #: smime/gui/smime-ui.glade.h:41
 #, fuzzy
-msgid "View Certificate"
-msgstr "_Sertifikat ID-si:"
+msgid "View"
+msgstr "_Görünüş"
 
 #: smime/gui/smime-ui.glade.h:42
-#, fuzzy
-msgid "You have been asked to trust a new Certificate Authority (CA)."
-msgstr "Hökmsüz Sertifikat Təsdiqi (CA)"
-
-#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:44
+#: smime/gui/smime-ui.glade.h:43
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:45
+#: smime/gui/smime-ui.glade.h:44
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:46
+#: smime/gui/smime-ui.glade.h:45
 #, fuzzy
 msgid "Your Certificates"
 msgstr "_Sertifikat ID-si:"
 
-#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
+#: smime/gui/smime-ui.glade.h:46
+msgid "_Edit CA Trust"
+msgstr ""
+
+#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 #, fuzzy
 msgid "%d/%m/%Y"
 msgstr "%m/%d/%Y"
 
-#: smime/lib/e-cert.c:478
+#. x509 certificate usage types
+#: smime/lib/e-cert.c:424
+#, fuzzy
+msgid "Sign"
+msgstr "Stauning"
+
+#: smime/lib/e-cert.c:425
+#, fuzzy
+msgid "Encrypt"
+msgstr "PGP Şifrələməsi"
+
+#: smime/lib/e-cert.c:530
 #, fuzzy
 msgid "Version"
 msgstr "Vermont"
 
-#: smime/lib/e-cert.c:493
+#: smime/lib/e-cert.c:545
 #, fuzzy
 msgid "Version 1"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:496
+#: smime/lib/e-cert.c:548
 #, fuzzy
 msgid "Version 2"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:499
+#: smime/lib/e-cert.c:551
 #, fuzzy
 msgid "Version 3"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:581
+#: smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:584
+#: smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:587
+#: smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:590
+#: smime/lib/e-cert.c:642
 #, fuzzy
 msgid "C"
 msgstr " C"
 
-#: smime/lib/e-cert.c:593
+#: smime/lib/e-cert.c:645
 #, fuzzy
 msgid "CN"
 msgstr "N"
 
-#: smime/lib/e-cert.c:596
+#: smime/lib/e-cert.c:648
 msgid "OU"
 msgstr ""
 
-#: smime/lib/e-cert.c:599
+#: smime/lib/e-cert.c:651
 #, fuzzy
 msgid "O"
 msgstr "Oldu"
 
-#: smime/lib/e-cert.c:602
+#: smime/lib/e-cert.c:654
 msgid "L"
 msgstr ""
 
-#: smime/lib/e-cert.c:605
+#: smime/lib/e-cert.c:657
 #, fuzzy
 msgid "DN"
 msgstr "N"
 
-#: smime/lib/e-cert.c:608
+#: smime/lib/e-cert.c:660
 msgid "DC"
 msgstr ""
 
-#: smime/lib/e-cert.c:611
+#: smime/lib/e-cert.c:663
 #, fuzzy
 msgid "ST"
 msgstr "SMTP"
 
-#: smime/lib/e-cert.c:614
+#: smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:617
+#: smime/lib/e-cert.c:669
 #, fuzzy
 msgid "Certificate Key Usage"
 msgstr "Sertifikat Ləğv Edildi"
 
-#: smime/lib/e-cert.c:620
+#: smime/lib/e-cert.c:672
 msgid "Netscape Certificate Type"
 msgstr ""
 
-#: smime/lib/e-cert.c:623
+#: smime/lib/e-cert.c:675
 #, fuzzy
 msgid "Certificate Authority Key Identifier"
 msgstr "Sertifikat e'tibarlı deyil"
 
-#: smime/lib/e-cert.c:626
+#: smime/lib/e-cert.c:678
 #, fuzzy
 msgid "UID"
 msgstr "ID"
 
-#: smime/lib/e-cert.c:635
+#: smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr ""
 
-#: smime/lib/e-cert.c:686
+#: smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:694
+#: smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
 msgstr ""
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:768
 msgid "Subject Public Key Info"
 msgstr ""
 
-#: smime/lib/e-cert.c:721
+#: smime/lib/e-cert.c:773
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:736
+#: smime/lib/e-cert.c:788
 #, fuzzy
 msgid "Subject's Public Key"
 msgstr "Mövzu %s-dır"
 
-#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
+#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
 #, fuzzy
 msgid "Error: Unable to process extension"
 msgstr "Növbə qovluğu həll edilə bilmədi"
 
-#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
+#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:782
+#: smime/lib/e-cert.c:834
 #, fuzzy
 msgid "SSL Certificate Authority"
 msgstr "Hökmsüz Sertifikat Təsdiqi (CA)"
 
-#: smime/lib/e-cert.c:786
+#: smime/lib/e-cert.c:838
 #, fuzzy
 msgid "Email Certificate Authority"
 msgstr "Hökmsüz Sertifikat Təsdiqi (CA)"
 
-#: smime/lib/e-cert.c:814
+#: smime/lib/e-cert.c:866
 #, fuzzy
 msgid "Signing"
 msgstr "Stauning"
 
-#: smime/lib/e-cert.c:818
+#: smime/lib/e-cert.c:870
 #, fuzzy
 msgid "Non-repudiation"
 msgstr "Mə'lumat Yoxdur"
 
-#: smime/lib/e-cert.c:822
+#: smime/lib/e-cert.c:874
 msgid "Key Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:826
+#: smime/lib/e-cert.c:878
 #, fuzzy
 msgid "Data Encipherment"
 msgstr "ilişdirilmiş fayl"
 
-#: smime/lib/e-cert.c:830
+#: smime/lib/e-cert.c:882
 msgid "Key Agreement"
 msgstr ""
 
-#: smime/lib/e-cert.c:834
+#: smime/lib/e-cert.c:886
 #, fuzzy
 msgid "Certificate Signer"
 msgstr "Sertifikat imzası xətası"
 
-#: smime/lib/e-cert.c:838
+#: smime/lib/e-cert.c:890
 msgid "CRL Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:938
 #, fuzzy
 msgid "Critical"
 msgstr "Curitiba"
 
-#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
+#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
 #, fuzzy
 msgid "Not Critical"
 msgstr "North Carolina"
 
-#: smime/lib/e-cert.c:912
+#: smime/lib/e-cert.c:964
 #, fuzzy
 msgid "Extensions"
 msgstr "İfadə"
 
-#: smime/lib/e-cert.c:983
+#: smime/lib/e-cert.c:1035
 #, fuzzy, c-format
 msgid "%s = %s"
 msgstr "%s %s"
 
-#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
 #, fuzzy
 msgid "Certificate Signature Algorithm"
 msgstr "Sertifikat imzası xətası"
 
-#: smime/lib/e-cert.c:1048
+#: smime/lib/e-cert.c:1100
 #, fuzzy
 msgid "Issuer"
 msgstr "_Daxil Et"
 
-#: smime/lib/e-cert.c:1102
+#: smime/lib/e-cert.c:1154
 msgid "Issuer Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1121
+#: smime/lib/e-cert.c:1173
 #, fuzzy
 msgid "Subject Unique ID"
 msgstr "Mövzu %s-dır"
 
-#: smime/lib/e-cert.c:1164
+#: smime/lib/e-cert.c:1216
 #, fuzzy
 msgid "Certificate Signature Value"
 msgstr "Sertifikat imzası xətası"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
+#: smime/lib/e-cert-db.c:608
 #, fuzzy
 msgid "Certificate already exists"
 msgstr "Kard ID onsuz da mövcuddur"
@@ -17826,7 +17330,7 @@ msgstr "Hazırkı əlaqəni göstər"
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "_Gedişatlar"
 
@@ -17994,7 +17498,7 @@ msgstr "_Bağla"
 #: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:3
+#: ui/evolution.xml.h:4
 msgid "Close"
 msgstr "Bağla"
 
@@ -18007,7 +17511,7 @@ msgid "Delete this item"
 msgstr "Bu üzvü sil"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr "Ana vasitə çubuğu"
 
@@ -18050,7 +17554,7 @@ msgstr "Bu üzvü diskə qeyd et"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:44
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "_File"
 msgstr "_Fayl"
 
@@ -18311,13 +17815,13 @@ msgstr "Seçimi _Tərs Çevir"
 msgid "_Threaded Message List"
 msgstr "İlgək_lənmiş İsmarış Siyahısı"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Bu pəncərəni bağla"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "_Close"
 msgstr "_Bağla"
 
@@ -18726,7 +18230,7 @@ msgstr "Ə_vvəlki İsmarış"
 msgid "_Quoted"
 msgstr "_Sitatlandırılmış"
 
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
 msgid "_Tools"
 msgstr "_Vasitələr"
 
@@ -19029,108 +18533,122 @@ msgid "_Open Task"
 msgstr "_Vəzifə"
 
 #: ui/evolution.xml.h:1
-msgid "About Ximian Evolution..."
-msgstr "Ximian Evolution Haqqında..."
+#, fuzzy
+msgid "About Evolution..."
+msgstr "Ximian Evolution Haqqında"
 
 #: ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
 msgstr "Evolution qurğularını dəyişdir"
 
-#: ui/evolution.xml.h:5
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the visibility of the toolbar"
+msgstr "Bu qovluğun xassələrini dəyişdir"
+
+#: ui/evolution.xml.h:6
 #, fuzzy
 msgid "Create a new window displaying this folder"
 msgstr "Yeni təqvim yarat"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "Çı_x"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Ximian Evolution _TSS"
+
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Proqramdan çıx"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:10
 msgid "Forget _Passwords"
 msgstr "Ş_ifrələri Unut"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:11
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Yadda saxlanan bütün şifrələri unudaraq onları gələcəkdə yenidən istə"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:12
 msgid "Import data from other programs"
 msgstr "Başqa proqramlardan mə'lumatları idxal et"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:14
 #, fuzzy
 msgid "New _Window"
 msgstr "İndi _Tap"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Pi_lot Settings..."
 msgstr "Pi_lot Qurğuları..."
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Send / Receive"
 msgstr "Göndər / Al"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Send queued items and retrieve new items"
 msgstr "Növbədəki məktubları göndər və yenilərini al"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Set up Pilot configuration"
 msgstr "Pilot qurğularını sazla"
 
-#: ui/evolution.xml.h:17
-msgid "Show information about Ximian Evolution"
+#: ui/evolution.xml.h:19
+#, fuzzy
+msgid "Show information about Evolution"
 msgstr "Ximian Evolution haqqında mə'lumat göstər"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:20
 msgid "Submit Bug Report"
 msgstr "Xəta Raportu Göndər"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:21
 msgid "Submit _Bug Report"
 msgstr "_Xəta Raportu Göndər"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Bug Buddy ilə xəta raportu göndər"
 
-#: ui/evolution.xml.h:21
-msgid "Toggle whether we are working offline."
-msgstr "Xətdən qopuq modda işlədiyimizi bildir."
-
 #: ui/evolution.xml.h:23
-msgid "Ximian Evolution _FAQ"
-msgstr "Ximian Evolution _TSS"
+#, fuzzy
+msgid "T_oolbar"
+msgstr "Ana vasitə çubuğu"
 
 #: ui/evolution.xml.h:24
-msgid "_About Ximian Evolution..."
-msgstr "Ximian Evolution _Haqqında..."
+msgid "Toggle whether we are working offline."
+msgstr "Xətdən qopuq modda işlədiyimizi bildir."
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "_About Evolution..."
+msgstr "Ximian Evolution Haqqında"
+
+#: ui/evolution.xml.h:30
 msgid "_Help"
 msgstr "_Yardım"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "_Import..."
 msgstr "_İdxal Et..."
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "_New"
 msgstr "_Yeni"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "_Quick Reference"
 msgstr ""
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_Send / Receive"
 msgstr "_Göndər / Al"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 #, fuzzy
 msgid "_Window"
 msgstr "İndi _Tap"
@@ -19209,7 +18727,7 @@ msgid "With _Status"
 msgstr "Vəziyyəti Dəyişdir"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:626
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:635
 msgid "UTC"
 msgstr "UTC"
 
@@ -19366,29 +18884,29 @@ msgstr "Başqa..."
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
-#: widgets/misc/e-error.c:121
+#: widgets/misc/e-error.c:79 widgets/misc/e-error.c:80
+#: widgets/misc/e-error.c:122
 msgid "Evolution Error"
 msgstr "Evolution Xətası"
 
-#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
-#: widgets/misc/e-error.c:119
+#: widgets/misc/e-error.c:81 widgets/misc/e-error.c:82
+#: widgets/misc/e-error.c:120
 #, fuzzy
 msgid "Evolution Warning"
 msgstr "Evolution Məktub"
 
-#: widgets/misc/e-error.c:118
+#: widgets/misc/e-error.c:119
 #, fuzzy
 msgid "Evolution Information"
 msgstr "Görüş Mə'lumatı"
 
-#: widgets/misc/e-error.c:120
+#: widgets/misc/e-error.c:121
 #, fuzzy
 msgid "Evolution Query"
 msgstr "Evolution"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:410
+#: widgets/misc/e-error.c:415
 #, fuzzy, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -19542,16 +19060,490 @@ msgstr ""
 "`%s' mövqeyinə qeyd edilə bilmir\n"
 " %s"
 
-#: widgets/misc/e-task-widget.c:211
+#: widgets/misc/e-task-widget.c:212
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: widgets/misc/e-task-widget.c:216
+#: widgets/misc/e-task-widget.c:217
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% başa çatdı)"
 
+#~ msgid "Failed to connect to LDAP server"
+#~ msgstr "LDAP vericisinə bağlanma xətası"
+
+#~ msgid "Failed to authenticate with LDAP server"
+#~ msgstr "IMAP vericisinə tanıdılma xətası"
+
+#~ msgid "Could not perform query on Root DSE"
+#~ msgstr "Kök DSE üstündə sorğu həyata keçirilə bilmədi"
+
+#~ msgid "The server responded with no supported search bases"
+#~ msgstr "Bu verici dəstəklənməyən axtarış bazaları ilə cavab verdi"
+
+#~ msgid "This server does not support LDAPv3 schema information"
+#~ msgstr "Bu verici LDAPv3 sxem mə'lumatını dəstəkləmir"
+
+#~ msgid "Error retrieving schema information"
+#~ msgstr "Sxem mə'lumatını alma xətası"
+
+#~ msgid "Server did not respond with valid schema information"
+#~ msgstr "Verici hökmlü sxem mə'lumatı ilə cavab vermədi"
+
+#~ msgid "  S_how Supported Bases "
+#~ msgstr "  Dəstəklənən Bazaları _Göstər "
+
+#~ msgid "1:00"
+#~ msgstr "1:00"
+
+#~ msgid "5:00"
+#~ msgstr "5:00"
+
+#~ msgid "Connecting"
+#~ msgstr "Bağlanır"
+
+#~ msgid "Distinguished _name:"
+#~ msgstr "Ayırılan _adı:"
+
+#~ msgid "Email address:"
+#~ msgstr "Epoçt ünvanı:"
+
+#~ msgid "Evolution will use this DN to authenticate you with the server"
+#~ msgstr "Evolution sizi vericiyə tanıtmaq üçün DN istifadə edəcək"
+
+#~ msgid "One"
+#~ msgstr "Bir"
+
+#~ msgid "S_earch scope: "
+#~ msgstr "Axtarışın əhatə _sahəsi: "
+
+#~ msgid "Searching"
+#~ msgstr "Axtarılır"
+
+#~ msgid "Sub"
+#~ msgstr "Alt"
+
+#~ msgid "This option controls how long a search will be run."
+#~ msgstr "BU seçim axtarışın nə vaxtla icra ediləcəyini bildirir."
+
+#~ msgid "U_se SSL/TLS:"
+#~ msgstr "SSL/TLS _işlət:"
+
+#~ msgid "_Display name:"
+#~ msgstr "_Göstərilən ad:"
+
+#~ msgid "_Port number:"
+#~ msgstr "_Qapı nömrəsi:"
+
+#~ msgid "_Search base:"
+#~ msgstr "_Axtarış bazası:"
+
+#~ msgid "_Server name:"
+#~ msgstr "_Verici adı:"
+
+#~ msgid "_Timeout (minutes):"
+#~ msgstr "_Vaxt Dolması (dəqiqə):"
+
+#~ msgid "connecting-tab"
+#~ msgstr "bağlanma-səkməsi"
+
+#~ msgid "general-tab"
+#~ msgstr "ümumi-səkməsi"
+
+#~ msgid "searching-tab"
+#~ msgstr "axtarış-səkməsi"
+
+#, fuzzy
+#~ msgid "Job title:"
+#~ msgstr "Məslək _izahı:"
+
+#, fuzzy
+#~ msgid "Webcam:"
+#~ msgstr "Veb Səhifəsi:"
+
+#~ msgid "Category editor not available."
+#~ msgstr "Kateqoriya editoru mövcud deyildir."
+
+#, fuzzy
+#~ msgid ""
+#~ "The following entries are invalid:\n"
+#~ "\n"
+#~ msgstr "Aıağıdakı bağlantılar hazırda fəaldır:"
+
+#~ msgid "Could not find widget for a field: `%s'"
+#~ msgstr "Sahənin pəncərəciyi tapıla bilmir: `%s'"
+
+#~ msgid "Do you want to save changes?"
+#~ msgstr "Dəyişiklikləri qeyd etmək istəyirsiniz?"
+
+#~ msgid "Error saving %s: %s"
+#~ msgstr "%s qeyd edilirkən xəta yarandı: %s"
+
+#~ msgid "Can not load URI"
+#~ msgstr "URL açıla bilmir"
+
+#~ msgid "Calendar Properties"
+#~ msgstr "Təqvim Xassələri"
+
+#~ msgid "Remote"
+#~ msgstr "Uzaq"
+
+#~ msgid "Task List Properties"
+#~ msgstr "Vəzifə Siyahısı Xassələri"
+
+#~ msgid "_Refresh Interval:"
+#~ msgstr "_Yeniləmə Aralığı:"
+
+#~ msgid "_Source URL:"
+#~ msgstr "_Mənbə URI-si:"
+
+#~ msgid "Are you sure you want to cancel and delete this meeting?"
+#~ msgstr "Bu görüşü həqiqətən də ləğv edib silmək istəyirsiniz?"
+
+#~ msgid "Are you sure you want to cancel and delete this task?"
+#~ msgstr "Bu vəzifəni həqiqətən də ləğv edib silmək istəyirsiniz?"
+
+#~ msgid "Are you sure you want to cancel and delete this journal entry?"
+#~ msgstr "Bu jurnal girişini həqiqətən də ləğv edib silmək istəyirsiniz?"
+
+#~ msgid "Are you sure you want to delete the appointment `%s'?"
+#~ msgstr "`%s' görüşünü həqiqətən də silmək istəyirsiniz?"
+
+#~ msgid "Are you sure you want to delete this untitled appointment?"
+#~ msgstr "Bu adsız görüşü həqiqətən də silmək istəyirsiniz?"
+
+#~ msgid "Are you sure you want to delete the task `%s'?"
+#~ msgstr "`%s' vəzifəsini həqiqətən də silmək istəyirsiniz?"
+
+#~ msgid "Are you sure you want to delete this untitled task?"
+#~ msgstr "Bu adsız vəzifəsini həqiqətən də silmək istəyirsiniz?"
+
+#~ msgid "Are you sure you want to delete the journal entry `%s'?"
+#~ msgstr "`%s' jurnal girişini həqiqətən də silmək istəyirsiniz?"
+
+#~ msgid "Are you sure want to delete this untitled journal entry?"
+#~ msgstr "Bu adsız jurnal girişini həqiqətən də silmək istəyirsiniz?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d appointment?"
+#~ msgid_plural "Are you sure you want to delete %d appointments?"
+#~ msgstr[0] "%d görüşü həqiqətən də silmək istəyirsiniz?"
+#~ msgstr[1] "%d görüşü həqiqətən də silmək istəyirsiniz?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d task?"
+#~ msgid_plural "Are you sure you want to delete %d tasks?"
+#~ msgstr[0] "%d vəzifəni həqiqətən də silmək istəyirsiniz?"
+#~ msgstr[1] "%d vəzifəni həqiqətən də silmək istəyirsiniz?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d journal entry?"
+#~ msgid_plural "Are you sure you want to delete %d journal entries?"
+#~ msgstr[0] "%d jurnal girişini həqiqətən də silmək istəyirsiniz?"
+#~ msgstr[1] "%d jurnal girişini həqiqətən də silmək istəyirsiniz?"
+
+#~ msgid "_Invite Others..."
+#~ msgstr "Başqalarını _Dəvət Et..."
+
+#~ msgid ""
+#~ "This event has been changed, but has not been saved.\n"
+#~ "\n"
+#~ "Do you wish to save your changes?"
+#~ msgstr ""
+#~ "Bu hadisə dəyişdirilib, amma qeyd edilməyib.\n"
+#~ "\n"
+#~ "Dəyişiklikləriniz qeyd edilsin?"
+
+#~ msgid "_Discard Changes"
+#~ msgstr "Dəyişiklikləri _Unut"
+
+#~ msgid "Save Event"
+#~ msgstr "Hadisəni Qeyd Et"
+
+#~ msgid "The meeting information has been created. Send it?"
+#~ msgstr "Görüş mə'lumatı yaradıldı. Göndərilsin?"
+
+#~ msgid "The meeting information has changed. Send an updated version?"
+#~ msgstr "Görüş mə'lumatı dəyişdirildi. Yeni buraxılışı göndərilsin?"
+
+#~ msgid "The task assignment information has been created. Send it?"
+#~ msgstr "Vəzifə tapşırma mə'lumatı yaradıldı. Göndərilsin?"
+
+#~ msgid "The task information has changed. Send an updated version?"
+#~ msgstr ""
+#~ "Vəzifə tapşırma mə'lumatı dəyişdirildi. Yeni buraxılışı göndərilsin?"
+
+#, fuzzy
+#~ msgid "The task backend for '%s' has crashed."
+#~ msgstr ""
+#~ "%s\n"
+#~ "vəzifə arxa ara üzü\n"
+#~ " iflas etdi."
+
+#, fuzzy
+#~ msgid "The calendar backend for '%s' has crashed."
+#~ msgstr ""
+#~ "%s\n"
+#~ "təqvim arxa ara üzü\n"
+#~ " iflas etdi."
+
+#, fuzzy
+#~ msgid "Could not get article %s from NNTP server"
+#~ msgstr "Qrup alına bilmədi: %s"
+
+#, fuzzy
+#~ msgid "Error posting message: %s: message not posted"
+#~ msgstr ""
+#~ "İsmarışın avtomatik qeyd edilmə xatası: %s:\n"
+#~ " %s"
+
+#, fuzzy
+#~ msgid "Stream error"
+#~ msgstr "oxuma xətası"
+
+#, fuzzy
+#~ msgid "Connection error: %s"
+#~ msgstr "Namə'lum xəta: %s"
+
+#~ msgid "Could not get group: %s"
+#~ msgstr "Qrup alına bilmədi: %s"
+
+#, fuzzy
+#~ msgid "Could not get messages: unspecified error"
+#~ msgstr "İsmarış göndərilə bilmədi: %s"
+
+#~ msgid "Unknown server response: %s"
+#~ msgstr "Naməlum verici cavabı: %s"
+
+#~ msgid "Adjust Score"
+#~ msgstr "Xalı Sazla"
+
+#~ msgid "Assign Color"
+#~ msgstr "Rəng Ver"
+
+#~ msgid "Assign Score"
+#~ msgstr "Xal Ver"
+
+#~ msgid "Attachments"
+#~ msgstr "İlişdirilmiş Fayllar"
+
+#~ msgid "Beep"
+#~ msgstr "Bip Səsi Çıxart"
+
+#~ msgid "contains"
+#~ msgstr "bunu daxil edirsə"
+
+#~ msgid "Copy to Folder"
+#~ msgstr "Qovluğa Köçür"
+
+#~ msgid "Date received"
+#~ msgstr "Alınma tarixi"
+
+#~ msgid "Date sent"
+#~ msgstr "Göndərilmə tarixi"
+
+#~ msgid "Deleted"
+#~ msgstr "Silinən"
+
+#~ msgid "does not contain"
+#~ msgstr "bunu daxil etmirsə"
+
+#~ msgid "does not end with"
+#~ msgstr "bununla sonlanmırsa"
+
+#~ msgid "does not exist"
+#~ msgstr "mövcud deyilsə"
+
+#~ msgid "does not return"
+#~ msgstr "cavab göndərmirsə"
+
+#~ msgid "does not sound like"
+#~ msgstr "oxşamırsa"
+
+#~ msgid "does not start with"
+#~ msgstr "bununla başlamırsa"
+
+#~ msgid "Do Not Exist"
+#~ msgstr "Mövcud Deyildirsə"
+
+#~ msgid "Draft"
+#~ msgstr "Layihə"
+
+#~ msgid "ends with"
+#~ msgstr "bununla sonlanırsa"
+
+#~ msgid "Exist"
+#~ msgstr "Mövcuddursa"
+
+#~ msgid "exists"
+#~ msgstr "mövcuddursa"
+
+#~ msgid "Expression"
+#~ msgstr "İfadə"
+
+#~ msgid "Follow Up"
+#~ msgstr "Sonrakı"
+
+#~ msgid "is"
+#~ msgstr "bərabərdir"
+
+#~ msgid "is after"
+#~ msgstr "bundan sonra isə"
+
+#~ msgid "is before"
+#~ msgstr "bundan əvvəl isə"
+
+#~ msgid "is Flagged"
+#~ msgstr "Bayraqlı isə"
+
+#~ msgid "is greater than"
+#~ msgstr "bundan böyükdürsə"
+
+#~ msgid "is less than"
+#~ msgstr "bundan kiçikdirsə"
+
+#~ msgid "is not"
+#~ msgstr "bərabər deyilsə"
+
+#~ msgid "is not Flagged"
+#~ msgstr "Bayraqlı deyilsə"
+
+#, fuzzy
+#~ msgid "Junk Test"
+#~ msgstr "İyun"
+
+#~ msgid "Mailing list"
+#~ msgstr "Məktublaşma qrupu"
+
+#~ msgid "Message Body"
+#~ msgstr "İsmarış Məzmunu"
+
+#~ msgid "Message Header"
+#~ msgstr "İsmarış Başlığı"
+
+#, fuzzy
+#~ msgid "Message is Junk"
+#~ msgstr "İsmarışlar"
+
+#, fuzzy
+#~ msgid "Message is not Junk"
+#~ msgstr "_Vacib olaraq işarələ"
+
+#~ msgid "Move to Folder"
+#~ msgstr "Qovluğa Daşı"
+
+#, fuzzy
+#~ msgid "Pipe to Program"
+#~ msgstr "Proqramdan çıx"
+
+#~ msgid "Play Sound"
+#~ msgstr "Səs Çal"
+
+#~ msgid "Recipients"
+#~ msgstr "Alıcılar"
+
+#~ msgid "Regex Match"
+#~ msgstr "Qaydalı İfadə Nəticələri"
+
+#~ msgid "Replied to"
+#~ msgstr "Cavab verilən"
+
+#~ msgid "returns"
+#~ msgstr "cavab göndərirsə"
+
+#~ msgid "returns greater than"
+#~ msgstr "bundan böyük cavab göndərirsə"
+
+#~ msgid "returns less than"
+#~ msgstr "bundan kiçik cavab göndərirsə"
+
+#, fuzzy
+#~ msgid "Run Program"
+#~ msgstr "Proqramı işə sal: "
+
+#~ msgid "Sender"
+#~ msgstr "Göndərən"
+
+#~ msgid "Set Status"
+#~ msgstr "Vəziyyəti Dəyişdir"
+
+#~ msgid "Size (kB)"
+#~ msgstr "Böyüklük (kB)"
+
+#~ msgid "sounds like"
+#~ msgstr "buna oxşayırsa"
+
+#~ msgid "Source Account"
+#~ msgstr "Mənbə Hesabı"
+
+#~ msgid "Specific header"
+#~ msgstr "Xüsusi başlıq"
+
+#~ msgid "starts with"
+#~ msgstr "bununla başlayırsa:"
+
+#~ msgid "Stop Processing"
+#~ msgstr "Oxumağı Dayandır"
+
+#~ msgid "Unset Status"
+#~ msgstr "Vəziyyəti Geri Al"
+
+#~ msgid "Working"
+#~ msgstr "İşləyir"
+
+#~ msgid "Brought to you by"
+#~ msgstr "İnkişafçılar"
+
+#, fuzzy
+#~ msgid "_Filename:"
+#~ msgstr "Fayl adı:"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "Unknown error."
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Namə'lum xəta."
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the component system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Tərkib hissəsi sistemi xətası:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the activation system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Fəallaşdırma sistemi xətası:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "View Certificate"
+#~ msgstr "_Sertifikat ID-si:"
+
+#, fuzzy
+#~ msgid "You have been asked to trust a new Certificate Authority (CA)."
+#~ msgstr "Hökmsüz Sertifikat Təsdiqi (CA)"
+
+#~ msgid "About Ximian Evolution..."
+#~ msgstr "Ximian Evolution Haqqında..."
+
+#~ msgid "_About Ximian Evolution..."
+#~ msgstr "Ximian Evolution _Haqqında..."
+
 #~ msgid "Evolution Addressbook folder viewer"
 #~ msgstr "Evolution Ünvan Kitabçası qovluq nümayişçisi"
 
@@ -19777,9 +19769,6 @@ msgstr "%s (%d%% başa çatdı)"
 #~ msgid "Primary _email:"
 #~ msgstr "İlk _epoçt:"
 
-#~ msgid "S_pouse:"
-#~ msgstr "_Yoldaş:"
-
 #~ msgid "_Business:"
 #~ msgstr "_İş:"
 
@@ -19795,9 +19784,6 @@ msgstr "%s (%d%% başa çatdı)"
 #~ msgid "_Mobile:"
 #~ msgstr "_Mobil:"
 
-#~ msgid "_Office:"
-#~ msgstr "_İdarə:"
-
 #~ msgid "_Public Calendar URL:"
 #~ msgstr "_İctimai Təqvim URL-si:"
 
diff --git a/po/be.po b/po/be.po
index 9ff0b6572c..166c738926 100644
--- a/po/be.po
+++ b/po/be.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.HEAD.be\n"
-"POT-Creation-Date: 2004-05-19 14:00-0400\n"
+"POT-Creation-Date: 2004-06-03 11:14-0400\n"
 "PO-Revision-Date: 2003-05-25 19:42GMT+2\n"
 "Last-Translator: Vital Khilko <dojlid@mova.org>\n"
 "Language-Team: belarusian <i18n@mova.org>\n"
@@ -59,14 +59,14 @@ msgstr "1 картка"
 msgid "Default Sync Address:"
 msgstr "Адрэса дапомнае сынхранізацыі:"
 
-#: addressbook/conduit/address-conduit.c:1150
 #: addressbook/conduit/address-conduit.c:1151
+#: addressbook/conduit/address-conduit.c:1152
 #, fuzzy
 msgid "Could not load addressbook"
 msgstr "Немагчыма загрузіць %s: %s"
 
-#: addressbook/conduit/address-conduit.c:1219
-#: addressbook/conduit/address-conduit.c:1222
+#: addressbook/conduit/address-conduit.c:1220
+#: addressbook/conduit/address-conduit.c:1223
 msgid "Could not read pilot's Address application block"
 msgstr "Немагчыма прачытаць блёк дастасаваньня адрэсаў Пілёта"
 
@@ -74,13 +74,13 @@ msgstr "Немагчыма прачытаць блёк дастасаваньн�
 msgid "Accessing LDAP Server anonymously"
 msgstr "Далучацца да паслужніка LDAP ананімна"
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
 msgid "Failed to authenticate.\n"
 msgstr "Збой аўтарызацыі.\n"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sУвядзіце пароль для %s (карыстальнік %s)"
@@ -126,52 +126,24 @@ msgstr "_Кантакты: "
 msgid "Create a new contacts group"
 msgstr "Стварыць новую групу лычак"
 
-#: addressbook/gui/component/addressbook-component.c:182
+#: addressbook/gui/component/addressbook-component.c:184
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:483
-msgid "Failed to connect to LDAP server"
-msgstr "Збой далучэньня да паслужніка LDAP"
-
-#: addressbook/gui/component/addressbook-config.c:507
-msgid "Failed to authenticate with LDAP server"
-msgstr "Збой аўтарызацыі на паслужніку LDAP"
-
-#: addressbook/gui/component/addressbook-config.c:535
-msgid "Could not perform query on Root DSE"
-msgstr "Немагчыма выканаць запыт да карэннага DSE"
-
-#: addressbook/gui/component/addressbook-config.c:840
-msgid "The server responded with no supported search bases"
-msgstr "Паслужнік адказаў: \"адсутнічаюць базы пошуку\""
-
-#: addressbook/gui/component/addressbook-config.c:1245
-msgid "This server does not support LDAPv3 schema information"
-msgstr "Паслужнік не падтрымлівае звесткі схемы LDAPv3"
-
-#: addressbook/gui/component/addressbook-config.c:1266
-msgid "Error retrieving schema information"
-msgstr "Памылка атрыманьня зьвестак схемы"
-
-#: addressbook/gui/component/addressbook-config.c:1274
-msgid "Server did not respond with valid schema information"
-msgstr "Паслужнік не адказаў з рэчаіснымі зьвесткамі схемы"
-
 #: addressbook/gui/component/addressbook-migrate.c:68
-#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1160
 #, fuzzy
 msgid "Migrating..."
 msgstr "Чаканьне..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1201
 #, fuzzy, c-format
 msgid "Migrating `%s':"
 msgstr "Зандаваньне %s"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:438
+#: addressbook/gui/component/addressbook-migrate.c:464
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
 #: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
@@ -179,31 +151,31 @@ msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:446
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
-#: mail/mail-config.glade.h:106
+#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
+#: mail/mail-config.glade.h:109
 msgid "Personal"
 msgstr "Пэрсанальнае"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:454
+#: addressbook/gui/component/addressbook-migrate.c:480
 #, fuzzy
 msgid "On LDAP Servers"
 msgstr "Паслужнік LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:582
+#: addressbook/gui/component/addressbook-migrate.c:608
 #, fuzzy
 msgid "LDAP Servers"
 msgstr "Паслужнік LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:702
+#: addressbook/gui/component/addressbook-migrate.c:728
 #, fuzzy
 msgid "Autocompletion Settings"
 msgstr "Тэчкі аўтазавяршэньня"
 
-#: addressbook/gui/component/addressbook-migrate.c:1076
+#: addressbook/gui/component/addressbook-migrate.c:1104
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -211,60 +183,55 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1090
+#: addressbook/gui/component/addressbook-migrate.c:1118
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1099
+#: addressbook/gui/component/addressbook-migrate.c:1127
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1109
+#: addressbook/gui/component/addressbook-migrate.c:1137
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:674
+#: addressbook/gui/component/addressbook-view.c:675
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:761
+#: addressbook/gui/component/addressbook-view.c:754
 #, fuzzy
 msgid "New Address Book"
 msgstr "Кніга адрэсаў"
 
-#: addressbook/gui/component/addressbook-view.c:762
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
+#: addressbook/gui/component/addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Выдаліць"
 
-#: addressbook/gui/component/addressbook-view.c:763
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-view.c:756
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Уласьцівасьці..."
 
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/addressbook-view.c:1002
+#. Create the contacts group
+#: addressbook/gui/component/addressbook-view.c:995
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
 #: calendar/gui/migration.c:373
 msgid "Contacts"
 msgstr "Кантакты"
@@ -345,10 +312,6 @@ msgid "Manage your S/MIME certificates here"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-msgid "  S_how Supported Bases "
-msgstr "  _Адлюстраваць базы, якія падтрымліваюцца"
-
-#: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -363,207 +326,173 @@ msgstr "  _Адлюстраваць базы, якія падтрымліваю�
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1:00"
-msgstr "1:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
-msgstr "5:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "Аўтарызацыя"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
 #, fuzzy
 msgid "<b>Display</b>"
 msgstr "<b>Стан:</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 #, fuzzy
 msgid "<b>Downloading</b>"
 msgstr "_Разьмяшчэньне:"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:10
 #, fuzzy
 msgid "<b>Searching</b>"
 msgstr "Пошук"
 
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
 msgid "<b>Server Information</b>"
 msgstr "Крок 1: Зьвесті паслужніка"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
 msgid "<b>Type:</b>"
 msgstr "<b>Умоўлена:</b> "
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:13
 #, fuzzy
 msgid "Add Contacts Group"
 msgstr "_Кантакты: "
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:14
 #, fuzzy
 msgid "Address Book Properties"
 msgstr "Крыніцы кнігаў адрэсаў..."
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
-#: mail/mail-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
+#: mail/mail-config.glade.h:42
 msgid "Always"
 msgstr "Заўсёды"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr "Ананімна"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:17
 #: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Асноўнае"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
-msgid "Connecting"
-msgstr "Далучэньне"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 #: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Дэталі"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
-msgid "Distinguished _name:"
-msgstr "_Удакладнёная назва:"
-
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:19
 #, fuzzy
 msgid "Distinguished name"
 msgstr "_Удакладнёная назва:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:20
 #, fuzzy
 msgid "Download limit:"
 msgstr "Аб_межаваньне загрузкі:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Email address"
 msgstr "Э.пошта:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "Email address:"
-msgstr "Э.пошта:"
-
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "Evolution will use this DN to authenticate you with the server"
-msgstr ""
-"\"Эвалюцыя\" будзе выкарыстоўваць гэтае DN для аўтарызацыі на паслужніку"
-
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:22
+#, fuzzy
 msgid ""
-"Evolution will use this email address to authenticate you with the server"
+"Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "\"Эвалюцыя\" будзе выкарыстоўваць гэтую адрэсу для аўтарызацыі вас на "
 "паслужніку"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:23
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Базы пошуку, якія падтрымліваюцца"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:24
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
+#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Асноўнае"
 
-#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
-#: mail/mail-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
+#: mail/mail-config.glade.h:102
 msgid "Never"
 msgstr "Ніколі"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
-msgid "One"
-msgstr "Адзін"
-
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:35
-msgid "S_earch scope: "
-msgstr "Межы _пошуку:"
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Search _base:"
+msgstr "_База пошуку:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
 msgid "Search base only"
 msgstr "_База пошуку:"
 
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:29
 #, fuzzy
 msgid "Search base:"
 msgstr "_База пошуку:"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Search scope:"
 msgstr "Межы _пошуку:"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
-msgid "Searching"
-msgstr "Пошук"
-
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:31
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
-"server if\n"
-"your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL or TLS."
 msgstr ""
 "Выбярыце гэтую можнасьць калі \"Эвалюцыя\" будзе далучацца да вашага "
 "паслужніка\n"
 "LDAP калі той падтрымлівае SSL ці TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a \n"
-"insecure environment. For example, if you and your LDAP server are behind a "
-"firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection "
-"is already\n"
-"secure."
+"you are in a insecure environment. For example, if you and your LDAP server "
+"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
+"because your connection is already secure."
 msgstr ""
 "Выбар гэтага парамэтра азначае што \"Эвалюцыя\" будзе спрабаваць "
 "выкарыстоўваць толькі SSL/TLS калі\n"
@@ -573,13 +502,12 @@ msgstr ""
 "пакуль вашае злучэньне\n"
 "бясьпечнае."
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:33
+#, fuzzy
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
-"TLS.  This \n"
-"means that your connection will be insecure, and that you will be vulnerable "
-"to security\n"
-"exploits. "
+"TLS.  This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits. "
 msgstr ""
 "Выбар гэтага парамэтра азначае што ваш паслужнік не падтрымлівае альбо SSL  "
 "альбо TLS.\n"
@@ -587,37 +515,32 @@ msgstr ""
 "нетрывалым  да эксплойдаў\n"
 "бясьпекі. "
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Sub"
-msgstr "Пад"
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr "Базы пошуку, якія падтрымліваюцца"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
-"searches will \n"
-"begin. If you leave this blank, the search will begin at the root of the "
-"directory tree."
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
 msgstr ""
 "База пошуку гэта удакладнёная назва (DN) запіса дзе вы мусіце пачынаць \n"
 "ваш пошук. Калі вы пакініце гэтае поле пустым, пошук будзе пачаты з карэня \n"
 "дрэва каталёгаў."
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:37
+#, fuzzy
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
-"the \n"
-"directory tree. A search scope of \"sub\" will include all entries below "
-"your search base.\n"
-"A search scope of \"one\" will only include the entries one level beneath "
-"your base.\n"
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
 msgstr ""
 "Межы пошуку вызначае як глыбока вызьбіраецеся шукаць у дрэве кталёгаў.\n"
 "Межы пошуку пазначаныя як \"пад\" будуць уключаць усе запісы пад базай  "
@@ -626,24 +549,23 @@ msgstr ""
 "узровень\n"
 " за базу пошуку.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:58
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 "Гэта поўная назва вашага паслужніка LDAP. Да прыкладу, \"mova.linux.by\""
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:39
 #, fuzzy
 msgid ""
-"This is the maximum number of entries to download. Setting this number to "
-"be \n"
+"This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr ""
 "Гэта максымальная колькасьць запісаў для загрузкі. Усталяваньне  гэтае \n"
 "лічбы ў вялікае значэньне запаволіць вашую кнігу адрэсаў."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -653,141 +575,120 @@ msgstr ""
 "Усталёўка значэньня у \"Адрэса пошты\"прадастаўляе ананімны доступ да вашага "
 "паслужніка LDAP."
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:41
+#, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
-"list.\n"
-"It is for display purposes only. "
+"list. It is for display purposes only. "
 msgstr ""
 "Гэта назва паслужніка якая будзе адлюстроўвацца ў сьпісе \"Эвалюцыі\".\n"
 "Гэта толькі для адлюстраваньня. "
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:42
+#, fuzzy
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. "
-"A \n"
-"list of standard ports has been provided. Ask your system administrator\n"
-"what port you should specify."
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
 msgstr ""
 "Гэта порт на паслужніку LDAP які выкарыстоўвае \"Эвалюцыя\" для \n"
 "далучэньня. Запытайцеся вашага адміністратара каб даведацца які \n"
 "порт выкарыстоўвае ваш паслужнік."
 
-#: addressbook/gui/component/ldap-config.glade.h:67
-msgid "This option controls how long a search will be run."
-msgstr "Гэтая можнасьць кантралюе працягласьць пошуку."
-
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:43
 #, fuzzy
 msgid "Timeout:"
 msgstr "Фармат часу:"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
-msgid "U_se SSL/TLS:"
-msgstr "Вы_карыстоўваць SSL/TLS:"
-
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr "Выкарыстоўваць удакладнёнаю назву (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr "Выкарыстоўваць паштовую адрэсу"
 
-#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
-#: mail/mail-config.glade.h:154
+#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
+#: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr "Калі магчыма"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:47
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "_Кантакты: "
 
-#: addressbook/gui/component/ldap-config.glade.h:74
-#: calendar/gui/dialogs/calendar-setup.glade.h:12
-msgid "_Display name:"
-msgstr "_Назва для адлюстраваньня:"
-
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr "Аб_межаваньне загрузкі:"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
 msgid "_Email address:"
 msgstr "Э.пошта:"
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:50
+#, fuzzy
+msgid "_Find Possible Search Bases"
+msgstr "Базы пошуку, якія падтрымліваюцца"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Log in method:"
 msgstr "_Мэтад уваходу:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "_Log in:"
+msgstr "Уваход"
+
+#: addressbook/gui/component/ldap-config.glade.h:53
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
 msgid "_Name:"
 msgstr "_Назва:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
-msgid "_Port number:"
-msgstr "_Нумар порта:"
-
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "_Port:"
 msgstr "_Прыярытэт:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
-msgid "_Search base:"
-msgstr "_База пошуку:"
-
-#: addressbook/gui/component/ldap-config.glade.h:82
-msgid "_Server name:"
-msgstr "_Назва паслужніка:"
+#: addressbook/gui/component/ldap-config.glade.h:55
+#, fuzzy
+msgid "_Search scope:"
+msgstr "Межы _пошуку:"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:56
 #, fuzzy
 msgid "_Server:"
 msgstr "Паслужнік:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
-msgid "_Timeout (minutes):"
-msgstr "_Таймаут (хвіліны):"
+#: addressbook/gui/component/ldap-config.glade.h:57
+#, fuzzy
+msgid "_Timeout:"
+msgstr "Фармат часу:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:58
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "_Выкарыстоўваць злучэньне праз SSL:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "карткі"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
-msgid "connecting-tab"
-msgstr "закладка далучэньня"
-
-#: addressbook/gui/component/ldap-config.glade.h:88
-msgid "general-tab"
-msgstr "агульная закладка"
-
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:60
 #: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
-#: mail/mail-config.glade.h:182
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "хвіліны"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
-msgid "searching-tab"
-msgstr "закладка пошуку"
-
-#: addressbook/gui/component/select-names/e-select-names.c:497
+#: addressbook/gui/component/select-names/e-select-names.c:503
 #: addressbook/gui/component/select-names/select-names.glade.h:6
 #, fuzzy
 msgid "Select Contacts from Address Book"
 msgstr "Выбар кантактаў з кнігі адрэсаў"
 
-#: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
@@ -827,7 +728,7 @@ msgstr "Кантакт бяз назвы"
 
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:222
+#: addressbook/gui/widgets/e-addressbook-view.c:224
 msgid "Source"
 msgstr "Крыніца"
 
@@ -906,9 +807,9 @@ msgid "<b>Work</b>"
 msgstr "Працоўны тыдзень"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
-#: addressbook/gui/widgets/eab-contact-display.c:342
-#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/widgets/eab-contact-display.c:334
+#: addressbook/gui/widgets/eab-contact-display.c:353
 msgid "AIM"
 msgstr ""
 
@@ -949,15 +850,15 @@ msgid "Company:"
 msgstr "Прадпрыемства"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:271
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
+#: addressbook/gui/contact-editor/e-contact-editor.c:266
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
 msgstr "Кантакт"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1527
+#: addressbook/gui/contact-editor/e-contact-editor.c:520
 msgid "Contact Editor"
 msgstr "Рэдактар кантактаў"
 
@@ -981,83 +882,80 @@ msgid "Full _Name..."
 msgstr "Поўнае _Імя..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:202
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-msgid "Home"
-msgstr "Хатні"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #, fuzzy
 msgid "Home Page:"
 msgstr "Хатні факс"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-#, fuzzy
-msgid "Job title:"
-msgstr "Паса_да:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/e-itip-control.c:936
-msgid "Location:"
-msgstr "Мейсца:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 #, fuzzy
 msgid "MSN Messenger"
 msgstr "_Паштовае паведамленьне"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 #, fuzzy
 msgid "Mailing Address"
 msgstr "Адрэса пошты:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 #, fuzzy
 msgid "Manager:"
 msgstr "Мэнаджар"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "Мянушка:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Notes:"
 msgstr "_Заўвагі:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
-#: addressbook/gui/contact-editor/e-contact-editor.c:203
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-msgid "Other"
-msgstr "Іншы"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#, fuzzy
+msgid "Office:"
+msgstr "_Офіс:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "PO Box:"
 msgstr "_Паштовая скрыня:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 #, fuzzy
 msgid "Personal Information"
 msgstr "Дадатковая інфармацыя"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 #, fuzzy
 msgid "Profession:"
 msgstr "_Прафэсыя:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#, fuzzy
+msgid "Spouse:"
+msgstr "_Супруг(а):"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "State/Province:"
 msgstr "_Вобласьць/Раён:"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#, fuzzy
+msgid "Title:"
+msgstr "_Пасада:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+msgid "Video Chat:"
+msgstr ""
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:41
 #, fuzzy
 msgid "Wants to receive HTML mail"
@@ -1065,15 +963,15 @@ msgstr "Жадае атрымліваць пошту у HTML"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:42
 #, fuzzy
-msgid "Webcam:"
-msgstr "Старонка"
+msgid "Web Log:"
+msgstr "Адрэса Web-старонкі:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
-#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
-#: mail/mail-config.glade.h:155
+#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
+#: mail/mail-config.glade.h:157
 msgid "Work"
 msgstr "Праца"
 
@@ -1093,19 +991,12 @@ msgid "_File under:"
 msgstr "Назва файла:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 #, fuzzy
 msgid "_Where:"
 msgstr "Паслужнік:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
-msgid "item7"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
-msgid "item8"
-msgstr ""
-
-#: addressbook/gui/contact-editor/eab-editor.c:316
+#: addressbook/gui/contact-editor/eab-editor.c:315
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -1113,7 +1004,7 @@ msgstr ""
 "Вы ўпэўненыя што жадаеце\n"
 "выдаліць гэтыя кантакты?"
 
-#: addressbook/gui/contact-editor/eab-editor.c:319
+#: addressbook/gui/contact-editor/eab-editor.c:318
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -1122,16 +1013,16 @@ msgstr ""
 "выдаліць гэты кантакт?"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:351
-#: addressbook/gui/widgets/eab-contact-display.c:372
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Address"
 msgstr "Адрэса"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:292
+#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard.c:174
@@ -2119,91 +2010,114 @@ msgstr "Замбія"
 msgid "Zimbabwe"
 msgstr "Зімбабве"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/contact-editor/e-contact-editor.c:179
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:337
+#: addressbook/gui/widgets/eab-contact-display.c:356
 #, fuzzy
 msgid "Jabber"
 msgstr "Сьпіс бяз назвы"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:347
-#: addressbook/gui/widgets/eab-contact-display.c:366
+#: addressbook/gui/contact-editor/e-contact-editor.c:180
+#: addressbook/gui/widgets/eab-contact-display.c:339
+#: addressbook/gui/widgets/eab-contact-display.c:358
 #, fuzzy
 msgid "Yahoo"
 msgstr "Ёра"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: addressbook/gui/widgets/eab-contact-display.c:338
+#: addressbook/gui/widgets/eab-contact-display.c:357
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:344
-#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#: addressbook/gui/widgets/eab-contact-display.c:355
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/contact-editor/e-contact-editor.c:183
 #, fuzzy
 msgid "GroupWise"
 msgstr "Група"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+msgid "Home"
+msgstr "Хатні"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+msgid "Other"
+msgstr "Іншы"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
 #, fuzzy
 msgid "Source Book"
 msgstr "Крыніца"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:264
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:278
+#: addressbook/gui/contact-editor/e-contact-editor.c:273
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Новы кантакт"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:285
+#: addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Writable Fields"
 msgstr "Палі у якія можна пісаць"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:299
+#: addressbook/gui/contact-editor/e-contact-editor.c:294
 msgid "Changed"
 msgstr "Зьменена"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
-msgid "Category editor not available."
-msgstr "Адсутнічае катэгорыя рэдактара."
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:2352
 msgid "This contact belongs to these categories:"
 msgstr "Гэты кантакт належыць наступным катэгорыям:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#: addressbook/gui/contact-editor/e-contact-editor.c:2429
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Выбярыце адзін з наступных варыянтаў"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#: addressbook/gui/contact-editor/e-contact-editor.c:2433
 #, fuzzy
 msgid "No image"
 msgstr "Хатні"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#: addressbook/gui/contact-editor/e-contact-editor.c:2636
 #, fuzzy
 msgid ""
-"The following entries are invalid:\n"
+"The contact data is invalid:\n"
 "\n"
-msgstr "Актыўныя у бягучы момант далучэньні:"
+msgstr "Недапушчальная дата вяртаньня"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2738
-#, c-format
-msgid "Could not find widget for a field: `%s'"
-msgstr "Неатрымалася адшукаць віджэт для поля: \"%s\""
+#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#, fuzzy
+msgid "Invalid contact."
+msgstr "Памылковая мэта"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+msgid ""
+"The contact cannot be saved to the selected address book. Do you want to "
+"discard changes?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2727
+#: addressbook/gui/contact-editor/e-contact-editor.c:2751
+msgid "_Discard"
+msgstr "_Адмовіць"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+msgid ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
+msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:62
 #, fuzzy
@@ -2240,7 +2154,7 @@ msgid "_Edit Full"
 msgstr "Рэдагаваньне поўнага імя"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:166
 msgid "_Full Name:"
 msgstr "Поўнае імя:"
 
@@ -2389,30 +2303,30 @@ msgstr "Назва сьпіса:"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "Пазначце э. пошту ці перацягніце кантакт у сьпіс ніжэй:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "contact-list-editor"
 msgstr "рэдактар сьпісу кантактаў"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:153
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:215
+#: addressbook/gui/widgets/e-addressbook-view.c:217
 #: addressbook/gui/widgets/e-minicard-view.c:460
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Кніга"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
 msgid "Is New List"
 msgstr "Гэта новы сьпіс"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:215
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
 msgid "Contact List Editor"
 msgstr "Рэдактар сьпісу кантактаў"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:438
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
 msgid "Save List as VCard"
 msgstr "Захаваць сьпіс як Візытоўку (VCard)"
 
@@ -2459,128 +2373,128 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Адмысловы пошук"
 
-#: addressbook/gui/widgets/eab-contact-display.c:129
-#: addressbook/gui/widgets/eab-contact-display.c:192
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:139
-#: addressbook/gui/widgets/eab-contact-display.c:205
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:257
-#: addressbook/gui/widgets/eab-contact-display.c:533
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:525
 #, fuzzy
 msgid "List Members"
 msgstr "Удзельнікі"
 
-#: addressbook/gui/widgets/eab-contact-display.c:329
-#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/eab-contact-display.c:321
+#: addressbook/gui/widgets/eab-contact-display.c:323
 #, fuzzy
 msgid "E-mail"
 msgstr "Э. пошта"
 
-#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/eab-contact-display.c:332
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Установа"
 
-#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:333
 #, fuzzy
 msgid "Position"
 msgstr "Бостан"
 
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:354
 #, fuzzy
 msgid "Groupwise"
 msgstr "Група"
 
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:340
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:349
-#: addressbook/gui/widgets/eab-contact-display.c:370
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:362
 #, fuzzy
 msgid "Phone"
 msgstr "Тэлефон"
 
-#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:342
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:354
+#: addressbook/gui/widgets/eab-contact-display.c:346
 #, fuzzy
 msgid "work"
 msgstr "Праца"
 
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:359
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:368
-#: addressbook/gui/widgets/eab-contact-display.c:587
+#: addressbook/gui/widgets/eab-contact-display.c:360
+#: addressbook/gui/widgets/eab-contact-display.c:579
 #, fuzzy
 msgid "Blog"
 msgstr "Більбао"
 
-#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/eab-contact-display.c:363
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Мабільны тэлефон"
 
-#: addressbook/gui/widgets/eab-contact-display.c:375
+#: addressbook/gui/widgets/eab-contact-display.c:367
 #, fuzzy
 msgid "personal"
 msgstr "Пэрсанальнае"
 
-#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/eab-contact-display.c:374
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Заўвага"
 
-#: addressbook/gui/widgets/eab-contact-display.c:548
+#: addressbook/gui/widgets/eab-contact-display.c:540
 #, fuzzy
 msgid "Job Title"
 msgstr "Паса_да:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/eab-contact-display.c:544
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:774
+#: smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "Э. пошта"
 
-#: addressbook/gui/widgets/eab-contact-display.c:579
+#: addressbook/gui/widgets/eab-contact-display.c:571
 #, fuzzy
 msgid "Home page"
 msgstr "Хатні факс"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 msgid "Success"
 msgstr "Пасьпяхова"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Backend busy"
 msgstr ""
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Repository offline"
 msgstr "Сховішча знаходзіцца ў адлучаным стане"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 #, fuzzy
 msgid "Address Book does not exist"
 msgstr "Кніга адрэсаў адсутнічае"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 #, fuzzy
 msgid "No Self Contact defined"
 msgstr "Новы сьпіс кантактаў"
@@ -2588,29 +2502,29 @@ msgstr "Новы сьпіс кантактаў"
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Permission denied"
 msgstr "Адмоўлена ў доступе"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:57
 #, fuzzy
 msgid "Contact not found"
 msgstr "Картка ня адшукана"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: addressbook/gui/widgets/eab-gui-util.c:58
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "Ід карткі ужо існуе"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Protocol not supported"
 msgstr "Пратакол не падтрымліваецца"
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:60
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:233
 #: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
@@ -2623,39 +2537,39 @@ msgid "Cancelled"
 msgstr "Адменена"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:61
 #, fuzzy
 msgid "Could not cancel"
 msgstr "Не атрымалася адкрыць падзеленую тэчку: %s"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Authentication Failed"
 msgstr "Збой аўтарызацыі"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Authentication Required"
 msgstr "Патрабуе аўтарызацыю"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:66
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "TLS not Available"
 msgstr "TLS адсутнічае"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#: addressbook/gui/widgets/eab-gui-util.c:66
 #, fuzzy
 msgid "No such source"
 msgstr "Няма гэткага паведамленьня"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:69
+#: addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Other error"
 msgstr "Іншая памылка"
 
-#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:90
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
@@ -2664,7 +2578,7 @@ msgstr ""
 "Неатрымалася адкрыць гэтую кнігу адрэсаў. Праверце, што шлях існуе\n"
 "і што у вас ёсьць неабходныя правы доступа."
 
-#: addressbook/gui/widgets/eab-gui-util.c:110
+#: addressbook/gui/widgets/eab-gui-util.c:97
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -2673,19 +2587,19 @@ msgstr ""
 "Неатрымалася адкрыць гэтую кнігу адрэсаў. Магчыма\n"
 "вы пазначылі нерэчаісны URI, ці паслужнік LDAP не адказвае."
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:102
 #, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution you must compile the program from the CVS "
-"sources after retrieving OpenLDAP from the link below."
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
 msgstr ""
 "Гэтая вэрсыя \"Эвалюцыі\" не мае ўбудаванае падтрымкі LDAP.\n"
 "Калі Вы жадаеце выкарыстоўваць LDAP у \"Эвалюцыі\", мусіце\n"
 "перасабрась праграму з зыходнага тэкста ў CVS пасьля\n"
 "усталёўкі OpenLDAP, які можна атрымаць па спасылцы ніжэй.\n"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:109
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -2694,11 +2608,7 @@ msgstr ""
 "Неатрымалася адкрыць гэтую кнігу адрэсаў. Магчыма\n"
 "вы пазначылі нерэчаісны URI, ці паслужнік не адказвае."
 
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "Unable to open addressbook"
-msgstr "Неатрымалася адкрыць кнігу адрэсаў"
-
-#: addressbook/gui/widgets/eab-gui-util.c:162
+#: addressbook/gui/widgets/eab-gui-util.c:129
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2711,7 +2621,7 @@ msgstr ""
 "ці абмяжуйце памер адказу кнігі адрэсаў у\n"
 "перавагах паслужніка каталёгаў."
 
-#: addressbook/gui/widgets/eab-gui-util.c:168
+#: addressbook/gui/widgets/eab-gui-util.c:135
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -2723,56 +2633,48 @@ msgstr ""
 "пошук ці зьмяніце абмежаваньне часу для гэтае кнігі адрэсаў у\n"
 "перавагах паслужніка каталёгаў."
 
-#: addressbook/gui/widgets/eab-gui-util.c:174
+#: addressbook/gui/widgets/eab-gui-util.c:141
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "Праграма гэтае кнігі адрэсаў ня здолела разабраць запыт."
 
-#: addressbook/gui/widgets/eab-gui-util.c:177
+#: addressbook/gui/widgets/eab-gui-util.c:144
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Праграма гэтае кнігі адрэсаў адмовіла ў запыце."
 
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:147
 msgid "This query did not complete successfully."
 msgstr "Запыт ня быў пасьпяхова выкананы."
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
-msgid "Do you want to save changes?"
-msgstr "Жадаеце захаваць зьмены?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:208
-msgid "_Discard"
-msgstr "_Адмовіць"
-
-#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:169
 msgid "Error adding list"
 msgstr "Памылка пад час даданьня сьпісу"
 
-#: addressbook/gui/widgets/eab-gui-util.c:229
-#: addressbook/gui/widgets/eab-gui-util.c:652
+#: addressbook/gui/widgets/eab-gui-util.c:169
+#: addressbook/gui/widgets/eab-gui-util.c:580
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Памылка пад час даданьня карткі"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying list"
 msgstr "Памылка рэдагаваньня сьпісу"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Памылка пад час зьмены карткі"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:192
 msgid "Error removing list"
 msgstr "Памылка выдаленьня сьпісу"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
-#: addressbook/gui/widgets/eab-gui-util.c:610
+#: addressbook/gui/widgets/eab-gui-util.c:192
+#: addressbook/gui/widgets/eab-gui-util.c:538
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Памылка выдаленьня карткі"
 
-#: addressbook/gui/widgets/eab-gui-util.c:334
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, fuzzy, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2781,7 +2683,7 @@ msgstr ""
 "Адкрыцьцё %d картак прывядзе да адкрыцьця %d новых вокнаў.\n"
 "Вы сапраўды жадаеце адлюстраваць усе гэтыя карткі?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:360
+#: addressbook/gui/widgets/eab-gui-util.c:300
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2790,54 +2692,49 @@ msgstr ""
 "%s ужо існуе\n"
 "Жадаеце перапісаць?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:364
+#: addressbook/gui/widgets/eab-gui-util.c:304
 msgid "Overwrite"
 msgstr "Перапісаць"
 
-#: addressbook/gui/widgets/eab-gui-util.c:400
-#, c-format
-msgid "Error saving %s: %s"
-msgstr "Памылка захаваньня %s: %s"
-
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:437
+#: addressbook/gui/widgets/eab-gui-util.c:365
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:571
+#: addressbook/gui/widgets/eab-gui-util.c:499
 msgid "list"
 msgstr "сьпіс"
 
-#: addressbook/gui/widgets/eab-gui-util.c:706
+#: addressbook/gui/widgets/eab-gui-util.c:634
 #, fuzzy
 msgid "Move contact to"
 msgstr "Перамясьсціць картку ў"
 
-#: addressbook/gui/widgets/eab-gui-util.c:708
+#: addressbook/gui/widgets/eab-gui-util.c:636
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Капіяваць картку ў"
 
-#: addressbook/gui/widgets/eab-gui-util.c:711
+#: addressbook/gui/widgets/eab-gui-util.c:639
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Перамясьсціць карткі ў"
 
-#: addressbook/gui/widgets/eab-gui-util.c:713
+#: addressbook/gui/widgets/eab-gui-util.c:641
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Капіяваць карткі ў"
 
-#: addressbook/gui/widgets/eab-gui-util.c:716
+#: addressbook/gui/widgets/eab-gui-util.c:644
 #, fuzzy
 msgid "Select target addressbook."
 msgstr "Выбар кантактаў з кнігі адрэсаў"
 
-#: addressbook/gui/widgets/eab-gui-util.c:939
+#: addressbook/gui/widgets/eab-gui-util.c:867
 msgid "Multiple VCards"
 msgstr "Шматлікія VCard"
 
-#: addressbook/gui/widgets/eab-gui-util.c:942
+#: addressbook/gui/widgets/eab-gui-util.c:870
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard для %s"
@@ -2928,7 +2825,7 @@ msgstr[1] "Кантакты"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:229
+#: addressbook/gui/widgets/e-addressbook-view.c:231
 #: addressbook/gui/widgets/e-minicard-view.c:467
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
@@ -2946,147 +2843,135 @@ msgstr "Мадэля"
 msgid "Error modifying card"
 msgstr "Памылка пад час зьмены карткі"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:163
 msgid "Name begins with"
 msgstr "Назва пачынаецца з"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:164
 msgid "Email begins with"
 msgstr "Э. пошта пачынаецца з"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:57
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Катэгорыя"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-#: calendar/gui/cal-search-bar.c:50
+#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Любое поле ўтрымлівае"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+#: addressbook/gui/widgets/e-addressbook-view.c:172
 msgid "Advanced..."
 msgstr "Адмысловае..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:236
+#: addressbook/gui/widgets/e-addressbook-view.c:238
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:249
+#: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Тып"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:506
+#: addressbook/gui/widgets/e-addressbook-view.c:508
 #, fuzzy
 msgid "Address Book"
 msgstr "Кніга адрэсаў"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2076
+#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:2080
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
 msgstr "Захаваць як візытоўку (VCard)"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 msgid "New Contact..."
 msgstr "Новы кантакт..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "New Contact List..."
 msgstr "Новы сьпіс кантактаў..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Go to Folder..."
 msgstr "Пераход у тэчку..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Import..."
 msgstr "Імпарт..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1066
 msgid "Search for Contacts..."
 msgstr "Пошук кантактаў..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Крыніцы кнігі адрэсаў..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1069
 msgid "Pilot Settings..."
 msgstr "Усталёўкі \"Пілёта\"..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Пераслаць кантакт"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
 msgid "Send Message to Contact"
 msgstr "Даслаць паведамленьне кантактанае асобе"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Друк"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
+#: addressbook/gui/widgets/e-addressbook-view.c:1077
 msgid "Print Envelope"
 msgstr "Друкаваць паштоўку"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
+#: addressbook/gui/widgets/e-addressbook-view.c:1081
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Кніга адрэсаў..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1080
+#: addressbook/gui/widgets/e-addressbook-view.c:1082
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Кніга адрэсаў..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Выразаць"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Капіяваць"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1087
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Уставіць"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:1092
+#: calendar/gui/e-calendar-view.c:1280
 msgid "Current View"
 msgstr "Бягучы выгляд"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1309
-#, c-format
-msgid ""
-"The addressbook backend for\n"
-"%s\n"
-"has crashed. You will have to restart Evolution in order to use it again"
-msgstr ""
-"Праграма кнігі адрэсаў для\n"
-"%s\n"
-"абрушылася. Вы мусіце перазапусьціць \"Эвалюцыю\" і паспрабаваць выкарыстаць "
-"гэта нанава"
-
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1667
-#: calendar/gui/cal-search-bar.c:362
+#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Любая катэгорыя"
 
@@ -3195,7 +3080,7 @@ msgstr "Радыё"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-list-view.c:234
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Роля"
@@ -3339,13 +3224,13 @@ msgstr "Імпарт візытовак \"Эвалюцыі\"."
 msgid "VCard (.vcf, .gcrd)"
 msgstr "Візытоўка (.vcf, .gcrd)"
 
-#: addressbook/printing/e-contact-print.c:998
+#: addressbook/printing/e-contact-print.c:1000
 #, fuzzy
 msgid "Print contacts"
 msgstr "Друкаваць вылучаныя кантакты"
 
-#: addressbook/printing/e-contact-print.c:1064
-#: addressbook/printing/e-contact-print.c:1091
+#: addressbook/printing/e-contact-print.c:1066
+#: addressbook/printing/e-contact-print.c:1093
 #, fuzzy
 msgid "Print contact"
 msgstr "Друкаваць вылучаныя кантакты"
@@ -3598,17 +3483,22 @@ msgstr ""
 msgid "Impossible internal error."
 msgstr "Нутраная памылка"
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:629
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
 #, fuzzy
 msgid "Can not open file"
 msgstr "Немагчыма адкрыць паведамленьне"
 
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
 #, fuzzy
-msgid "Can not load URI"
-msgstr "Картка ня адшукана"
+msgid "Couldn't get list of addressbooks"
+msgstr "Немагчыма загрузіць %s: %s"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Неатрымалася адкрыць кнігу адрэсаў"
 
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
@@ -3626,7 +3516,7 @@ msgstr "Назва файла не пазначана."
 msgid "Unnamed List"
 msgstr "Сьпіс бяз назвы"
 
-#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 #, fuzzy
 msgid "Enter password"
@@ -3907,10 +3797,10 @@ msgid "Whether to show week numbers in date navigator"
 msgstr "Паказаць нумары тыдняў у навігатары па датах"
 
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:88
-#: calendar/gui/gnome-cal.c:1703
-#: camel/providers/groupwise/camel-gw-listener.c:304
-#: camel/providers/groupwise/camel-gw-listener.c:327
+#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/gnome-cal.c:1705
+#: camel/providers/groupwise/camel-gw-listener.c:311
+#: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
 msgstr "Каляндар"
 
@@ -3933,7 +3823,7 @@ msgstr "вяртае менш за"
 
 #: calendar/gui/calendar-commands.c:363
 #: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:19 filter/filter.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
 msgid "days"
 msgstr "дні"
 
@@ -4086,24 +3976,24 @@ msgstr "Прагляд тыдню"
 msgid "Month View"
 msgstr "Прагляд месяцу"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Агульныя зьвесткі утрымліваюць"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Апісаньне ўтрымлівае"
 
-#: calendar/gui/cal-search-bar.c:54
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Камэнтар утрымлівае"
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:53
 #, fuzzy
 msgid "Location contains"
 msgstr "Апісаньне ўтрымлівае"
 
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
 msgid "Unmatched"
 msgstr "Іншая пошта"
 
@@ -4124,23 +4014,23 @@ msgstr "Адсутнічаюць правы на адкрыцьцё калянд
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:466
+#: calendar/gui/dialogs/alarm-options.c:467
 msgid "Audio Alarm Options"
 msgstr "Парамэтры нагадваньня гукам"
 
-#: calendar/gui/dialogs/alarm-options.c:475
+#: calendar/gui/dialogs/alarm-options.c:476
 msgid "Message Alarm Options"
 msgstr "Парамэтры паведамленьняў нагадваньня"
 
-#: calendar/gui/dialogs/alarm-options.c:484
+#: calendar/gui/dialogs/alarm-options.c:485
 msgid "Email Alarm Options"
 msgstr "Парамэтры нагадваньня праз пошту"
 
-#: calendar/gui/dialogs/alarm-options.c:493
+#: calendar/gui/dialogs/alarm-options.c:494
 msgid "Program Alarm Options"
 msgstr "Парамэтры праграмы нагадваньня"
 
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:510
 msgid "Unknown Alarm Options"
 msgstr "Парамэтры невядомага нагадваньня"
 
@@ -4178,7 +4068,7 @@ msgstr "Даслаць на:"
 msgid "With these arguments:"
 msgstr "З гэткімі аргумэнтамі:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
 msgid "dialog1"
 msgstr "дыялёг1"
 
@@ -4187,7 +4077,7 @@ msgid "extra times every"
 msgstr "дадатковы час кожныя"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:20 filter/filter.glade.h:16
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr "гадзіны"
 
@@ -4234,7 +4124,7 @@ msgstr "Даслаць пошту"
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Агульныя зьвесткі:"
 
@@ -4264,7 +4154,6 @@ msgid "hour(s)"
 msgstr "гадзіна (ы)"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:21
 msgid "minute(s)"
 msgstr "хвіліна(ы)"
 
@@ -4272,27 +4161,27 @@ msgstr "хвіліна(ы)"
 msgid "start of appointment"
 msgstr "пачатак сустрэчы"
 
-#: calendar/gui/dialogs/calendar-setup.c:170
+#: calendar/gui/dialogs/calendar-setup.c:172
 #, fuzzy
 msgid "You must specify a location to get the calendar from."
 msgstr "Вы мусіце пазначыць назву файла."
 
-#: calendar/gui/dialogs/calendar-setup.c:178
+#: calendar/gui/dialogs/calendar-setup.c:180
 #, fuzzy, c-format
 msgid "The source location '%s' is not well-formed."
 msgstr "Мэтад неабходны для загрузкі \"%s\" не падтрымліваецца"
 
-#: calendar/gui/dialogs/calendar-setup.c:193
+#: calendar/gui/dialogs/calendar-setup.c:195
 #, c-format
 msgid "The source location '%s' is not a webcal source."
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:265
+#: calendar/gui/dialogs/calendar-setup.c:275
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:278
+#: calendar/gui/dialogs/calendar-setup.c:288
 #, c-format
 msgid ""
 "The group '%s' is remote. You must specify a location to get the calendar "
@@ -4314,60 +4203,35 @@ msgstr "Зьпіс заданьняў"
 msgid "C_olor:"
 msgstr "Колеры"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-#, fuzzy
-msgid "Calendar Properties"
-msgstr "Памылка iCalendar"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
 msgid "Pick a color"
 msgstr "Выбярыце колер"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:8
-#, fuzzy
-msgid "Remote"
-msgstr "Выдаліць"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-#, fuzzy
-msgid "Task List Properties"
-msgstr "Зьпіс заданьняў"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
 #, fuzzy
 msgid "_Add Calendar"
 msgstr "Новая Калядонія"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
 #, fuzzy
 msgid "_Add Group"
 msgstr "_Дадаць групу..."
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-#, fuzzy
-msgid "_Refresh Interval:"
-msgstr "Абнавіць сьпіс"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
 #, fuzzy
 msgid "_Refresh:"
 msgstr "Абнавіць"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-#, fuzzy
-msgid "_Source URL:"
-msgstr "URI крыніцы POP"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
 #, fuzzy
 msgid "_Type:"
 msgstr "Тып:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
 msgid "_URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
 msgid "weeks"
 msgstr "тыдні"
 
@@ -4477,7 +4341,7 @@ msgid "Display"
 msgstr "_Паказаць"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:76
 msgid "E_nable"
 msgstr "Уключыць"
 
@@ -4488,7 +4352,7 @@ msgstr "Запыт \"Вольны/Заняты\""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:563
+#: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Пятніца"
 
@@ -4502,7 +4366,7 @@ msgstr "Хвіліны"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:559
+#: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Панядзелак"
 
@@ -4512,7 +4376,7 @@ msgstr "Няд"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:564
+#: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Субота"
 
@@ -4526,7 +4390,7 @@ msgstr "Паказаць нумары тыдняў у навігатары па
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Нядзеля"
 
@@ -4540,7 +4404,7 @@ msgstr "Чцв"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:562
+#: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Чацьвер"
 
@@ -4554,7 +4418,7 @@ msgstr "Фармат часу:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:560
+#: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Аўторак"
 
@@ -4564,7 +4428,7 @@ msgstr "Тыдзень пачынаецца з:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:561
+#: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Серада"
 
@@ -4598,7 +4462,7 @@ msgid "_Day begins:"
 msgstr "Дзень пачынаецца:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
-#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:43
@@ -4647,82 +4511,46 @@ msgstr "Срд"
 msgid "before every appointment"
 msgstr "перад кожнай сустрэчай"
 
-#: calendar/gui/dialogs/cancel-comp.c:57
-msgid ""
-"The event being deleted is a meeting, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"Падзея што будзе выдалена гэта сустрэча, ці паведаміць пра яе адмену іншым?"
-
-#: calendar/gui/dialogs/cancel-comp.c:60
-msgid "Are you sure you want to cancel and delete this meeting?"
-msgstr "Вы упэўненыя у тым, што жадаеце адмяніць і выдаліць гэтую сустрэчу?"
-
-#: calendar/gui/dialogs/cancel-comp.c:66
-msgid ""
-"The task being deleted is assigned, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"Заданьне якое будзе выдалена \"прызначана\", ці жадаеце вы даслаць "
-"паведамленьне аб адмене?"
-
-#: calendar/gui/dialogs/cancel-comp.c:69
-msgid "Are you sure you want to cancel and delete this task?"
-msgstr "Вы упэўненыя ў тым, што жадаеце адмяніць і выдаліць гэтае заданьне?"
-
-#: calendar/gui/dialogs/cancel-comp.c:75
-msgid ""
-"The journal entry being deleted is published, would you like to send a "
-"cancellation notice?"
-msgstr ""
-"Запіс часопіса які будзе выдалены апублікаваны, ці жадаеце даслаць "
-"паведамленьне пра адмену?"
-
-#: calendar/gui/dialogs/cancel-comp.c:78
-msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr ""
-"Вы упэўненыя ў тым, што жадаеце адмяніць і выдаліць гэты запіс часопіса?"
-
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Гэтая падзея была выдалена."
 
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "Гэтае заданьне было выдалена."
 
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:68
 msgid "This journal entry has been deleted."
 msgstr "Гэты запіс часопіса быў выдалены."
 
-#: calendar/gui/dialogs/changed-comp.c:75
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s Вы зрабілі зьмены. Забыца на іх і закрыць рэдактар?"
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s Вы анічога не зьмянілі. Зачыніць рэдактар?"
 
-#: calendar/gui/dialogs/changed-comp.c:82
+#: calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "Гэтая падзея была зьменена."
 
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "Гэтае заданьне было зьменана."
 
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:92
 msgid "This journal entry has been changed."
 msgstr "Гэты запіс часопіса быў зьменены."
 
-#: calendar/gui/dialogs/changed-comp.c:99
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  Вы ўнесьлі зьмены. Забыцца на іх і абнавіць рэдактар?"
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Вы ўнесьлі зьмены, абнавіць рэдактар?"
@@ -4760,7 +4588,7 @@ msgid "No summary"
 msgstr "Няма агульных зьвестак"
 
 #: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
 #: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Захаваць як..."
@@ -4815,102 +4643,54 @@ msgstr "Адменена апэрацыі"
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:95
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "Вы упэўненыя што жадаеце выдаліць сустрэчу \"%s\"?"
-
-#: calendar/gui/dialogs/delete-comp.c:98
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "Вы упэўнены што жадаеце выдаліць гэтую сустрэчу бяз назвы?"
-
-#: calendar/gui/dialogs/delete-comp.c:104
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "Вы упэўненыя што жадаеце выдаліць заданьне \"%s\"?"
-
-#: calendar/gui/dialogs/delete-comp.c:107
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "Вы упэўнены што жадаеце выдаліць гэтае заданьне бяз назвы?"
-
-#: calendar/gui/dialogs/delete-comp.c:113
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "Вы упэўненыя што жадаеце выдаліць запіс часопіса \"%s\"?"
-
-#: calendar/gui/dialogs/delete-comp.c:116
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "Вы упэўненыя што жадаеце выдаліць запіс часопіса бяз назвы?"
-
-#: calendar/gui/dialogs/delete-comp.c:131
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d appointment?"
-msgid_plural "Are you sure you want to delete %d appointments?"
-msgstr[0] "Вы упэўненыя што жадаеце выдаліць %d сустрэч?"
-msgstr[1] "Вы упэўненыя што жадаеце выдаліць %d сустрэч?"
-
-#: calendar/gui/dialogs/delete-comp.c:138
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d task?"
-msgid_plural "Are you sure you want to delete %d tasks?"
-msgstr[0] "Вы упэўненыя што жадаеце выдаліць %d заданьняў?"
-msgstr[1] "Вы упэўненыя што жадаеце выдаліць %d заданьняў?"
-
-#: calendar/gui/dialogs/delete-comp.c:145
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d journal entry?"
-msgid_plural "Are you sure you want to delete %d journal entries?"
-msgstr[0] "Вы упэўненыя што жадаеце выдаліць %d запісаў часопіса?"
-msgstr[1] "Вы упэўненыя што жадаеце выдаліць %d запісаў часопіса?"
-
-#: calendar/gui/dialogs/delete-error.c:52
+#: calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "Падзея не можа быць выдалена з-за памылкі corba"
 
-#: calendar/gui/dialogs/delete-error.c:55
+#: calendar/gui/dialogs/delete-error.c:57
 msgid "The task could not be deleted due to a corba error"
 msgstr "Заданьне не можа быць выдалена з-за памылкі corba"
 
-#: calendar/gui/dialogs/delete-error.c:58
+#: calendar/gui/dialogs/delete-error.c:60
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr "Запіс часопіса не можа быць выдалены з-за памылкі corba"
 
-#: calendar/gui/dialogs/delete-error.c:61
+#: calendar/gui/dialogs/delete-error.c:63
 msgid "The item could not be deleted due to a corba error"
 msgstr "Элемэнт не можа быць выдалена з-за памылкі corba"
 
-#: calendar/gui/dialogs/delete-error.c:68
+#: calendar/gui/dialogs/delete-error.c:70
 msgid "The event could not be deleted because permission was denied"
 msgstr "Падзея не можа быць выдалена пакуль доступ забаронены"
 
-#: calendar/gui/dialogs/delete-error.c:71
+#: calendar/gui/dialogs/delete-error.c:73
 msgid "The task could not be deleted because permission was denied"
 msgstr "Заданьне не можа быць выдалена пакуль доступ забаронены"
 
-#: calendar/gui/dialogs/delete-error.c:74
+#: calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr "Запіс часопіса не можа быць выдалены пакуль доступ забаронены"
 
-#: calendar/gui/dialogs/delete-error.c:77
+#: calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
 msgstr "Элемэнт не можа быць выдалена пакуль доступ забаронены"
 
-#: calendar/gui/dialogs/delete-error.c:84
+#: calendar/gui/dialogs/delete-error.c:86
 #, fuzzy
 msgid "The event could not be deleted due to an error"
 msgstr "Падзея не можа быць выдалена з-за памылкі corba"
 
-#: calendar/gui/dialogs/delete-error.c:87
+#: calendar/gui/dialogs/delete-error.c:89
 #, fuzzy
 msgid "The task could not be deleted due to an error"
 msgstr "Заданьне не можа быць выдалена з-за памылкі corba"
 
-#: calendar/gui/dialogs/delete-error.c:90
+#: calendar/gui/dialogs/delete-error.c:92
 #, fuzzy
 msgid "The journal entry could not be deleted due to an error"
 msgstr "Запіс часопіса не можа быць выдалены з-за памылкі corba"
 
-#: calendar/gui/dialogs/delete-error.c:93
+#: calendar/gui/dialogs/delete-error.c:95
 #, fuzzy
 msgid "The item could not be deleted due to an error"
 msgstr "Элемэнт не можа быць выдалена з-за памылкі corba"
@@ -5048,11 +4828,11 @@ msgstr "_Час пачатку:"
 
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:3
+#: calendar/gui/dialogs/meeting-page.glade.h:4
 #: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
 #: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1559
-#: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:100
+#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
+#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
@@ -5078,8 +4858,8 @@ msgstr "_Дэлегаваць у..."
 #. FIXME: need to disable for undeletable folders
 #: calendar/gui/dialogs/meeting-page.c:655
 #: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1310 calendar/gui/e-calendar-view.c:1342
-#: mail/em-folder-tree.c:2557 mail/em-folder-view.c:919
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
+#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -5087,7 +4867,7 @@ msgid "_Delete"
 msgstr "Вы_даліць"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:240
+#: calendar/gui/e-meeting-list-view.c:218
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Удзельнік"
@@ -5123,16 +4903,15 @@ msgid "Member"
 msgstr "Удзельнік"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
-#: mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-list-view.c:248
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Стан"
 
@@ -5141,20 +4920,20 @@ msgstr "Стан"
 msgid "Add A_ttendee"
 msgstr "Удзельнік"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "Add attendees from addressbook."
+msgstr "Дадаць адпраўляльніка ў кнігу адрэсаў"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Арганізатар:"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
+#: calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "_Change Organizer"
 msgstr "_Зьмяніць арганізатара"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-#: calendar/gui/e-meeting-time-sel.c:417
-msgid "_Invite Others..."
-msgstr "_Запрасіць іншых..."
-
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 #, fuzzy
 msgid "<b>Calendar options</b>"
@@ -5317,7 +5096,7 @@ msgid "_No recurrence"
 msgstr "_Бяз вяртаньня"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:450
+#: composer/e-msg-composer-attachment-bar.c:453
 msgid "_Remove"
 msgstr "_Выдаліць"
 
@@ -5349,55 +5128,21 @@ msgstr "тыдзень(і)"
 msgid "year(s)"
 msgstr "год(гады)"
 
-#: calendar/gui/dialogs/save-comp.c:53
-msgid ""
-"This event has been changed, but has not been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Гэтая падзея была зьменена, але не была захавана.\n"
-"\n"
-"Вы жадаеце захаваць зьмены?"
-
-#: calendar/gui/dialogs/save-comp.c:57
-msgid "_Discard Changes"
-msgstr "_Адкінуць зьмены"
-
-#: calendar/gui/dialogs/save-comp.c:62
-msgid "Save Event"
-msgstr "Захаваць падзею"
-
-#: calendar/gui/dialogs/select-source-dialog.c:65
+#: calendar/gui/dialogs/select-source-dialog.c:69
 #, fuzzy
 msgid "Select destination"
 msgstr "Выбярыце мейсца прызначэньня для імпартаваньня гэтых даньняў"
 
-#: calendar/gui/dialogs/select-source-dialog.c:86
+#: calendar/gui/dialogs/select-source-dialog.c:90
 #, fuzzy
 msgid "_Destination"
 msgstr "Выдаліць гэтую тэчку"
 
-#: calendar/gui/dialogs/select-source-dialog.c:88
+#: calendar/gui/dialogs/select-source-dialog.c:92
 #, fuzzy
 msgid "Task List"
 msgstr "Зьпіс заданьняў"
 
-#: calendar/gui/dialogs/send-comp.c:57
-msgid "The meeting information has been created. Send it?"
-msgstr "Зьвесткі па нарадзе створаны. Даслаць?"
-
-#: calendar/gui/dialogs/send-comp.c:60
-msgid "The meeting information has changed. Send an updated version?"
-msgstr "Зьвесткі па нарадзе зьменены. Даслаць і абнавіць вэрсыю?"
-
-#: calendar/gui/dialogs/send-comp.c:67
-msgid "The task assignment information has been created. Send it?"
-msgstr "Зьвесткі па заданьні створаны. Даслаць?"
-
-#: calendar/gui/dialogs/send-comp.c:71
-msgid "The task information has changed. Send an updated version?"
-msgstr "Зьвесткі па заданьні зьменены. Даслаць і абнавіць вэрсыю?"
-
 #: calendar/gui/dialogs/task-details-page.c:406
 msgid "Completed date is wrong"
 msgstr "Дата заканчэньня выкананьня памылковая"
@@ -5417,7 +5162,7 @@ msgstr "Выканана"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #: calendar/gui/e-cal-component-preview.c:249
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:960
 msgid "High"
 msgstr "Высокі"
 
@@ -5431,14 +5176,14 @@ msgstr "Выконваецца"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:253
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:958
 msgid "Low"
 msgstr "Нізкі"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:251
 #: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:957
+#: mail/message-list.c:959
 msgid "Normal"
 msgstr "Нармальны"
 
@@ -5498,8 +5243,8 @@ msgstr "_Сакрэтна"
 
 #: calendar/gui/dialogs/task-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
+#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Апісаньне:"
 
@@ -5675,7 +5420,7 @@ msgstr "_Умоўленая дата:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:950
+#: calendar/gui/e-itip-control.c:943
 msgid "Status:"
 msgstr "Стан:"
 
@@ -5761,12 +5506,12 @@ msgstr "Заняты"
 msgid "Deleting selected objects"
 msgstr "Выдаленьне вылучаных аб'ектаў"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
 msgid "Updating objects"
 msgstr "Абнаўленьне аб'ектаў"
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1370
+#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
 #: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Адкрыць"
@@ -5777,15 +5522,15 @@ msgid "Open _Web Page"
 msgstr "Адкрыць паведамленьне"
 
 #: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1291 calendar/gui/e-calendar-view.c:1376
-#: mail/em-folder-view.c:896 mail/em-popup.c:690 mail/em-popup.c:806
+#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
+#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "Захаваць _як..."
 
 #: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1292
-#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
+#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
@@ -5793,24 +5538,24 @@ msgid "_Print..."
 msgstr "_Друкаваць..."
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Вы_разаць"
 
 #: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1338
-#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2550
-#: mail/message-list.c:1644 ui/evolution-addressbook.xml.h:31
+#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
+#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
+#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Капіяваць"
 
 #: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1273 calendar/gui/e-calendar-view.c:1299
-#: calendar/gui/e-calendar-view.c:1372 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
+#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
@@ -5879,71 +5624,71 @@ msgstr "Агульныя зьвесткі"
 msgid "Task sort"
 msgstr "Сартаваньне заданьняў"
 
-#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
 msgid "New _Appointment..."
 msgstr "Новая _сустрэча..."
 
-#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
+#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
 msgid "New All Day _Event"
 msgstr "Новая падзея на ўвесь дзень"
 
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
+#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
 msgid "New Meeting"
 msgstr "Новая нарада"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
 msgid "New Task"
 msgstr "Новае заданьне"
 
-#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Вылучыць абмеркаваньне тэмы"
 
-#: calendar/gui/e-calendar-view.c:1280
+#: calendar/gui/e-calendar-view.c:1283
 #, fuzzy
 msgid "_Select Date..."
 msgstr "Выдаліць..."
 
-#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Апублікаваць інфармацыю \"Вольны/Заняты\""
 
-#: calendar/gui/e-calendar-view.c:1303
+#: calendar/gui/e-calendar-view.c:1306
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Капіяваць у тэчку..."
 
-#: calendar/gui/e-calendar-view.c:1304
+#: calendar/gui/e-calendar-view.c:1307
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "Перамясьціць у тэчку..."
 
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1308
 msgid "_Schedule Meeting..."
 msgstr "_Заплянаваць нараду..."
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1309
 msgid "_Forward as iCalendar..."
 msgstr "_Перадаслаць як iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
 msgid "Delete this _Occurrence"
 msgstr "Выдаліць гэтую зьяву"
 
-#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
 msgid "Delete _All Occurrences"
 msgstr "Выдаліць _усе зьявы"
 
-#: calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1349
 msgid "Go to _Today"
 msgstr "Перайсьці да _сёньня"
 
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1351
 msgid "_Go to Date..."
 msgstr "Пера_йсьці да даты..."
 
-#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "_Усталёўкі..."
 
@@ -5957,9 +5702,9 @@ msgstr "Дата пачатку"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:967 calendar/gui/e-itip-control.c:1169
-#: calendar/gui/e-meeting-list-view.c:144
-#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
 #: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
 #: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
 #: camel/camel-tcp-stream-openssl.c:631
@@ -5985,13 +5730,13 @@ msgid "Assigned"
 msgstr "Прызначана"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr "Так"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "Не"
 
@@ -6003,7 +5748,7 @@ msgstr "N"
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
 msgid "E"
 msgstr "E"
 
@@ -6075,102 +5820,102 @@ msgstr "%d %b"
 msgid "%02i minute divisions"
 msgstr "дзяленьні %02i хвіліны"
 
-#: calendar/gui/e-itip-control.c:592
+#: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
 msgstr "Так (Комплекснае вяртаньне)"
 
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:596
 #, fuzzy, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Штодзённа"
 msgstr[1] "Штодзённа"
 
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:601
 #, fuzzy, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Штотыдзень"
 msgstr[1] "Штотыдзень"
 
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:603
 #, fuzzy, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "Штотыдзень на "
 msgstr[1] "Штотыдзень на "
 
-#: calendar/gui/e-itip-control.c:618
+#: calendar/gui/e-itip-control.c:611
 msgid " and "
 msgstr " і "
 
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:618
 #, c-format
 msgid "The %s day of "
 msgstr "%s дзень "
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:631
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s"
 
-#: calendar/gui/e-itip-control.c:645
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "штомесяц"
 msgstr[1] "штомесяц"
 
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:642
 #, fuzzy, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Штогод"
 msgstr[1] "Штогод"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:653
 #, fuzzy, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] " агулам з %d часа"
 msgstr[1] " агулам з %d часа"
 
-#: calendar/gui/e-itip-control.c:669
+#: calendar/gui/e-itip-control.c:662
 msgid ", ending on "
 msgstr ", сканчаецца на "
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:686
 msgid "<b>Starts:</b> "
 msgstr "<b>Пачынаецца:</b> "
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:696
 msgid "<b>Ends:</b> "
 msgstr "<b>Сканчаецца:</b> "
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:716
 msgid "<b>Completed:</b> "
 msgstr "<b> Выканана</b> "
 
-#: calendar/gui/e-itip-control.c:733
+#: calendar/gui/e-itip-control.c:726
 msgid "<b>Due:</b> "
 msgstr "<b>Умоўлена:</b> "
 
-#: calendar/gui/e-itip-control.c:771 calendar/gui/e-itip-control.c:827
+#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
 msgid "iCalendar Information"
 msgstr "Зьвесткі iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:788
+#: calendar/gui/e-itip-control.c:781
 msgid "iCalendar Error"
 msgstr "Памылка iCalendar"
 
-#: calendar/gui/e-itip-control.c:859 calendar/gui/e-itip-control.c:875
-#: calendar/gui/e-itip-control.c:886 calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
 msgid "An unknown person"
 msgstr "Невядомая пэрсона"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:910
+#: calendar/gui/e-itip-control.c:903
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -6178,301 +5923,305 @@ msgstr ""
 "<br>Калі ласка, прагледзьце наступную інфармацыю, і выбярыце дзеяньне з мэню "
 "ніжэй."
 
-#: calendar/gui/e-itip-control.c:925
+#: calendar/gui/e-itip-control.c:918
 msgid "<i>None</i>"
 msgstr "<i>Няма</i>"
 
-#: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:929
+msgid "Location:"
+msgstr "Мейсца:"
+
+#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Прынята"
 
-#: calendar/gui/e-itip-control.c:959 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Прынята для спробы"
 
-#: calendar/gui/e-itip-control.c:963 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Адхілена"
 
-#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.c:1050
-#: calendar/gui/e-itip-control.c:1076 calendar/gui/e-itip-control.c:1089
-#: calendar/gui/e-itip-control.c:1102 calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
 msgid "Choose an action:"
 msgstr "Выбраць дзеяньне:"
 
-#: calendar/gui/e-itip-control.c:1023
+#: calendar/gui/e-itip-control.c:1016
 msgid "Update"
 msgstr "Абнавіць"
 
-#: calendar/gui/e-itip-control.c:1024 calendar/gui/e-itip-control.c:1055
-#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1091
-#: calendar/gui/e-itip-control.c:1104 calendar/gui/e-itip-control.c:1117
-#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
+#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Так"
 
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1044
 msgid "Accept"
 msgstr "Прыняць"
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1045
 msgid "Tentatively accept"
 msgstr "Прыняць для спробы"
 
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1046
 msgid "Decline"
 msgstr "Адхіліць"
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1070
 msgid "Send Free/Busy Information"
 msgstr "Даслаць інфармацыю \"Вольны/Заняты\""
 
-#: calendar/gui/e-itip-control.c:1090
+#: calendar/gui/e-itip-control.c:1083
 msgid "Update respondent status"
 msgstr "Абнавіць стан удзельнікаў"
 
-#: calendar/gui/e-itip-control.c:1103
+#: calendar/gui/e-itip-control.c:1096
 msgid "Send Latest Information"
 msgstr "Даслаць апошнюю інфармацыю"
 
-#: calendar/gui/e-itip-control.c:1116 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Адмяніць"
 
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1185
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> разьмясьціў(ла) зьвесткі аб нарадзе."
 
-#: calendar/gui/e-itip-control.c:1193
+#: calendar/gui/e-itip-control.c:1186
 msgid "Meeting Information"
 msgstr "Зьвесткі аб нарадзе"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1191
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> запытваецца прысутнасьці %s на нарадзе."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1193
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> запытваецца вашае прысутнасьці на нарадзе."
 
-#: calendar/gui/e-itip-control.c:1201
+#: calendar/gui/e-itip-control.c:1194
 msgid "Meeting Proposal"
 msgstr "Плян нарады"
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> жадае далучыць да распачатае нарады."
 
-#: calendar/gui/e-itip-control.c:1206
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Update"
 msgstr "Абнаўленьне нарады"
 
-#: calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1203
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> запытвае апошнюю інфармацыю па нарадзе."
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1204
 msgid "Meeting Update Request"
 msgstr "Запыт на абнаўленьне нарады"
 
-#: calendar/gui/e-itip-control.c:1218
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> мае адказ на запыт нарады."
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Reply"
 msgstr "Адказ па нарадзе"
 
-#: calendar/gui/e-itip-control.c:1226
+#: calendar/gui/e-itip-control.c:1219
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> мае адмяніць нараду."
 
-#: calendar/gui/e-itip-control.c:1227
+#: calendar/gui/e-itip-control.c:1220
 msgid "Meeting Cancellation"
 msgstr "Адмена нарады"
 
-#: calendar/gui/e-itip-control.c:1234 calendar/gui/e-itip-control.c:1302
-#: calendar/gui/e-itip-control.c:1337
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1330
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> мае даслаць неінтэлегентнае паведамленьне."
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1228
 msgid "Bad Meeting Message"
 msgstr "Дрэннае паведамленьне нарады"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1253
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> мае апублікаваць зьвесткі аб заданьні."
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1254
 msgid "Task Information"
 msgstr "Інфармацыя аб заданьні"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1259
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> пытаецца %s аб выкананьні заданьня."
 
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> пытаецца вас аб выкананьні заданьня."
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1262
 msgid "Task Proposal"
 msgstr "Плян заданьня"
 
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> жадае дадаць да распачатага заданьня."
 
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Update"
 msgstr "Абнаўленьне заданьня"
 
-#: calendar/gui/e-itip-control.c:1278
+#: calendar/gui/e-itip-control.c:1271
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> жадае атрымаць апошнія зьвесткі па заданьні."
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1272
 msgid "Task Update Request"
 msgstr "Запыт на абнаўленьне заданьня"
 
-#: calendar/gui/e-itip-control.c:1286
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> мае адказ на заданьне."
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Reply"
 msgstr "Адказ на заданьне"
 
-#: calendar/gui/e-itip-control.c:1294
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> мае адмяніць заданьне."
 
-#: calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1288
 msgid "Task Cancellation"
 msgstr "Адмена заданьня"
 
-#: calendar/gui/e-itip-control.c:1303
+#: calendar/gui/e-itip-control.c:1296
 msgid "Bad Task Message"
 msgstr "Дрэннае паведамленьне па заданьні"
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1315
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> мае апублікаваць інфармацыю \"Вольны/Заняты\"."
 
-#: calendar/gui/e-itip-control.c:1323
+#: calendar/gui/e-itip-control.c:1316
 msgid "Free/Busy Information"
 msgstr "Інфармацыя \"Вольны/Заняты\""
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> патрабуе ад вас інфармацыю \"Вольны/Заняты\"."
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1321
 msgid "Free/Busy Request"
 msgstr "Запыт \"Вольны/Заняты\""
 
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1325
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> мае адказаць на запыт аб інфармацыі \"Заняты/Вольны\"."
 
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1326
 msgid "Free/Busy Reply"
 msgstr "Адказ на \"Заняты/Вольны\""
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1331
 msgid "Bad Free/Busy Message"
 msgstr "Дрэннае паведамленьне \"Вольны /Заняты\""
 
-#: calendar/gui/e-itip-control.c:1413
+#: calendar/gui/e-itip-control.c:1406
 msgid "The message does not appear to be properly formed"
 msgstr "Падобна што паведамленьне не было правільна сфармавана"
 
-#: calendar/gui/e-itip-control.c:1472
+#: calendar/gui/e-itip-control.c:1465
 msgid "The message contains only unsupported requests."
 msgstr "Паведамленьне утрымлівае толькі запыты, якія не падтрымліваюцца."
 
-#: calendar/gui/e-itip-control.c:1503
+#: calendar/gui/e-itip-control.c:1496
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Укладаньне ня ўтрымлівае рэчаіснага паведамленьня каляндара"
 
-#: calendar/gui/e-itip-control.c:1535
+#: calendar/gui/e-itip-control.c:1528
 msgid "The attachment has no viewable calendar items"
 msgstr "Укладаньне мае элемэнты каляндара, якія нельга адлюстраваць"
 
-#: calendar/gui/e-itip-control.c:1769
+#: calendar/gui/e-itip-control.c:1762
 msgid "Update complete\n"
 msgstr "Абнаўленьне завершана\n"
 
-#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
+#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Стан удзельніка ня можа быць абноўлены таму, што элемэнт ужо не існуе"
 
-#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Аб'ект нерэчаісны і ня будзе абноўлены\n"
 
-#: calendar/gui/e-itip-control.c:1825
+#: calendar/gui/e-itip-control.c:1818
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Адказ не ад бягучага удзельніка. Дадаць як ад яго?"
 
-#: calendar/gui/e-itip-control.c:1837
+#: calendar/gui/e-itip-control.c:1830
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Стан удзельніка ня можа быць абноўлены, таму што ён нерэчаісны!\n"
 
-#: calendar/gui/e-itip-control.c:1856
+#: calendar/gui/e-itip-control.c:1849
 msgid "There was an error on the CORBA system\n"
 msgstr "Адбылася памылка ў сыстэме CORBA\n"
 
-#: calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1852
 msgid "Object could not be found\n"
 msgstr "Аб'ект адсутнічае\n"
 
-#: calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1855
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Вы ня маеце правільных правоў для абнаўленьня каляндара\n"
 
-#: calendar/gui/e-itip-control.c:1865
+#: calendar/gui/e-itip-control.c:1858
 msgid "Attendee status updated\n"
 msgstr "Стан удзельніка абноўлены\n"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1861
 msgid "Attendee status could not be updated!\n"
 msgstr "Стан удзельніка ня можа быць абноўлены!\n"
 
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1892
 msgid "Removal Complete"
 msgstr "Выдаленьне скончана"
 
-#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
 msgid "Item sent!\n"
 msgstr "Элемэнт дасланы!\n"
 
-#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
+#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
 msgid "The item could not be sent!\n"
 msgstr "Элемэнт ня можа быць дасланы!\n"
 
@@ -6513,74 +6262,74 @@ msgstr "дата-завяршэньня"
 msgid "date-start"
 msgstr "дата-пачатку"
 
-#: calendar/gui/e-meeting-list-view.c:62
+#: calendar/gui/e-meeting-list-view.c:59
 msgid "Chair Persons"
 msgstr "Кіраўнікі"
 
-#: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:479
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
 msgid "Required Participants"
 msgstr "Патрабаваныя ўдзельнікі"
 
-#: calendar/gui/e-meeting-list-view.c:64
+#: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Дадатковыя ўдзельнікі"
 
-#: calendar/gui/e-meeting-list-view.c:65
+#: calendar/gui/e-meeting-list-view.c:62
 msgid "Resources"
 msgstr "Рэсурсы"
 
-#: calendar/gui/e-meeting-list-view.c:140 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
 #: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr "Асабіста"
 
-#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "Група"
 
-#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr "Рэсурс"
 
-#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr "Пакой"
 
-#: calendar/gui/e-meeting-list-view.c:154 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr "Кіраўнік"
 
-#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:127
 #: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
 msgid "Required Participant"
 msgstr "Патрабаваны ўдзельнік"
 
-#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr "Дадатковы удзельнік"
 
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr "Неудзельнічае"
 
-#: calendar/gui/e-meeting-list-view.c:179 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:177
 #: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
 msgid "Needs Action"
 msgstr "Неабходна дзеяньне"
 
-#: calendar/gui/e-meeting-list-view.c:182 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
 #: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "Пробны"
 
-#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr "Дэлегаваны"
@@ -6597,20 +6346,28 @@ msgstr "Пакінуу офіс"
 msgid "No Information"
 msgstr "Зьвесткі адсутнічаюць"
 
+#: calendar/gui/e-meeting-time-sel.c:417
+#, fuzzy
+msgid "Add attendees from addressbook"
+msgstr "Дадаць адпраўляльніка ў кнігу адрэсаў"
+
 #: calendar/gui/e-meeting-time-sel.c:440
 msgid "_Options"
 msgstr "_Парамэтры"
 
 #: calendar/gui/e-meeting-time-sel.c:457
-msgid "Show _Only Working Hours"
+#, fuzzy
+msgid "Show _only working hours"
 msgstr "Адлюстроўваць толькі _працоўныя часы"
 
 #: calendar/gui/e-meeting-time-sel.c:467
-msgid "Show _Zoomed Out"
+#, fuzzy
+msgid "Show _zoomed out"
 msgstr "Паказаць паменшанае"
 
 #: calendar/gui/e-meeting-time-sel.c:482
-msgid "_Update Free/Busy"
+#, fuzzy
+msgid "_Update free/busy"
 msgstr "Аб_навіць \"Вольны/Заняты\""
 
 #: calendar/gui/e-meeting-time-sel.c:497
@@ -6626,19 +6383,23 @@ msgid ">_>"
 msgstr ">_>"
 
 #: calendar/gui/e-meeting-time-sel.c:547
-msgid "_All People and Resources"
+#, fuzzy
+msgid "_All people and resources"
 msgstr "Усе людзі й рэсурсы"
 
 #: calendar/gui/e-meeting-time-sel.c:556
-msgid "All _People and One Resource"
+#, fuzzy
+msgid "All _people and one resource"
 msgstr "Усе людзі й адзін рэсурс"
 
 #: calendar/gui/e-meeting-time-sel.c:565
-msgid "_Required People"
+#, fuzzy
+msgid "_Required people"
 msgstr "Патрабаваныя людзі"
 
 #: calendar/gui/e-meeting-time-sel.c:574
-msgid "Required People and _One Resource"
+#, fuzzy
+msgid "Required people and _one resource"
 msgstr "Патрабаваныя людзі й адзін рэсурс"
 
 #: calendar/gui/e-meeting-time-sel.c:593
@@ -6676,7 +6437,7 @@ msgstr "%d/%m/%Y"
 msgid "Enter the password for %s"
 msgstr "Пазначце пароль для %s"
 
-#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6685,19 +6446,14 @@ msgstr ""
 "Памылка на %s\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-
 #. FIXME Loading should be async
 #. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:686
+#: calendar/gui/e-tasks.c:801
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Адкрыцьцё заданьняў %s"
 
-#: calendar/gui/e-tasks.c:709
+#: calendar/gui/e-tasks.c:824
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6706,53 +6462,48 @@ msgstr ""
 "Памылка на %s\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:730
+#: calendar/gui/e-tasks.c:845
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Загрузка відарысаў"
 
-#: calendar/gui/e-tasks.c:834
+#: calendar/gui/e-tasks.c:949
 msgid "Completing tasks..."
 msgstr "Завяршэньне заданьняў..."
 
-#: calendar/gui/e-tasks.c:857
+#: calendar/gui/e-tasks.c:972
 msgid "Deleting selected objects..."
 msgstr "Выдаленьне вылучаных аб'ектаў..."
 
-#: calendar/gui/e-tasks.c:884
+#: calendar/gui/e-tasks.c:999
 msgid "Expunging"
 msgstr "Выкрэсьленьне"
 
-#: calendar/gui/e-tasks.c:960
+#: calendar/gui/e-tasks.c:1075
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
-#: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
+#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
+#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
 #: calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:705
 msgid "Tasks"
 msgstr "Заданьні"
 
-#: calendar/gui/gnome-cal.c:1876
+#: calendar/gui/gnome-cal.c:1878
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Сустрэчы не заплянаваны."
 
-#: calendar/gui/gnome-cal.c:1895
+#: calendar/gui/gnome-cal.c:1897
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Загрузка відарысаў"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1920
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Адкрыць у %s..."
 
-#: calendar/gui/gnome-cal.c:2048
-#, c-format
-msgid "The calendar backend for '%s' has crashed."
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:2894
+#: calendar/gui/gnome-cal.c:2906
 #, fuzzy
 msgid "Purging"
 msgstr "Турэцкае"
@@ -6947,7 +6698,7 @@ msgid "On The Web"
 msgstr ""
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 
@@ -6958,7 +6709,7 @@ msgid "Unable to migrate calendar `%s'"
 msgstr "Адсутнічаюць правы на адкрыцьцё каляндара"
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:869
+#: calendar/gui/migration.c:889
 #, fuzzy, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Неатрымалася адкрыць кнігу адрэсаў"
@@ -7194,73 +6945,73 @@ msgstr "Друк элемэнта"
 msgid "Print Setup"
 msgstr "Наладка друку"
 
-#: calendar/gui/tasks-component.c:303
+#: calendar/gui/tasks-component.c:313
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:371
 #, fuzzy
 msgid "New Task List"
 msgstr "Зьпіс заданьняў"
 
-#: calendar/gui/tasks-component.c:398
+#: calendar/gui/tasks-component.c:408
 #, fuzzy, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "Заданьні адсутнічаюць"
 msgstr[1] "Заданьні адсутнічаюць"
 
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] "%d выбраныя"
 msgstr[1] "%d выбраныя"
 
-#: calendar/gui/tasks-component.c:447
+#: calendar/gui/tasks-component.c:457
 #, fuzzy
 msgid "Failed upgrading tasks."
 msgstr "Загрузка відарысаў"
 
-#: calendar/gui/tasks-component.c:526
+#: calendar/gui/tasks-component.c:749
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:538
+#: calendar/gui/tasks-component.c:761
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:576
+#: calendar/gui/tasks-component.c:799
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:804
+#: calendar/gui/tasks-component.c:1040
 msgid "New task"
 msgstr "Новае заданьне"
 
-#: calendar/gui/tasks-component.c:805
+#: calendar/gui/tasks-component.c:1041
 msgid "_Task"
 msgstr "_Заданьне"
 
-#: calendar/gui/tasks-component.c:806
+#: calendar/gui/tasks-component.c:1042
 msgid "Create a new task"
 msgstr "Стварыць новае заданьне"
 
-#: calendar/gui/tasks-component.c:812
+#: calendar/gui/tasks-component.c:1048
 #, fuzzy
 msgid "New tasks group"
 msgstr "Новае заданьне"
 
-#: calendar/gui/tasks-component.c:813
+#: calendar/gui/tasks-component.c:1049
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Зьпіс заданьняў"
 
-#: calendar/gui/tasks-component.c:814
+#: calendar/gui/tasks-component.c:1050
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Стварыць новае заданьне"
@@ -9028,12 +8779,12 @@ msgstr "Памылка выкананьня пошуку фільтра: %s: %s"
 msgid "Unsupported operation: append message: for %s"
 msgstr "Апэрацыя, якая не падтрымліваецца: даданьне паведамленьня: для %s"
 
-#: camel/camel-folder.c:1259
+#: camel/camel-folder.c:1262
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Апэрацыя не падтрымліваецца: пошук выраза: для %s"
 
-#: camel/camel-folder.c:1299
+#: camel/camel-folder.c:1302
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
@@ -9047,11 +8798,16 @@ msgstr "Перамяшчэньне паведамленьняў"
 msgid "Copying messages"
 msgstr "Капіяваньне паведамленьняў"
 
-#: camel/camel-folder.c:1666
-msgid "Learning junk and/or non junk message(s)"
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Папярэджаьне"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
 msgstr ""
 
-#: camel/camel-folder.c:1695
+#: camel/camel-folder.c:1701
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "Атрыманьне %d паведамленьняў"
@@ -9086,17 +8842,17 @@ msgstr ""
 msgid "(match-threads) requires a match type string"
 msgstr ""
 
-#: camel/camel-folder-search.c:785
+#: camel/camel-folder-search.c:784
 #, fuzzy
 msgid "(match-threads) expects an array result"
 msgstr "(супадае ўсе) патрабуе адзінага лягічнага выніка"
 
-#: camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:790
 #, fuzzy
 msgid "(match-threads) requires the folder set"
 msgstr "(супадае ўсе) патрабуе адзінага лягічнага выніка"
 
-#: camel/camel-folder-search.c:880
+#: camel/camel-folder-search.c:879
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Завяршэньне запыту на невядомым загалоўке: %s"
@@ -9131,7 +8887,8 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
 #: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:706
+#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Адменена."
@@ -9517,7 +9274,7 @@ msgstr ""
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1212
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Кепскі адказ на аўтарызацыю з паслужніка."
 
@@ -9905,40 +9662,40 @@ msgstr "Каманда не реалізавана"
 msgid "export keys: unimplemented"
 msgstr ""
 
-#: camel/camel-store.c:214
+#: camel/camel-store.c:213
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Неатрымалася атрымаць тэчку: недапушчальная апэрацыя ў гэтым сховішчы"
 
-#: camel/camel-store.c:244
+#: camel/camel-store.c:243
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr "Неатрымалася атрымаць тэчку: %s: %s"
 
-#: camel/camel-store.c:295
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Неатрымалася стварыць тэчку: недапушчальная апэрацыя ў гэтым сховішчы"
 
-#: camel/camel-store.c:323
+#: camel/camel-store.c:325
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Неатрымалася атрымаць тэчку: %s: %s"
 
-#: camel/camel-store.c:387 camel/camel-vee-store.c:354
+#: camel/camel-store.c:389 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Неатрымалася выдаліць тэчку: %s: недапушчальная апэрацыя"
 
-#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#: camel/camel-store.c:439 camel/camel-vee-store.c:387
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Неатрымалася зьмяніць назву тэчкі: %s: недапушчальная апэрацыя"
 
-#: camel/camel-store.c:811
+#: camel/camel-store.c:777
 msgid "Trash"
 msgstr "Сьметніца"
 
-#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
-#: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/mail-config.glade.h:95
+#: ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
 msgstr "Чэрвень"
@@ -10170,12 +9927,12 @@ msgstr "Паведамленьне %s адсутнічае ў %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Немагчыма капіяваць ці перамясьціць паведамленьні у віртуальную тэчку"
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:374
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Неатрымалася выдаліць тэчку: %s: тэчка адсутнічае"
 
-#: camel/camel-vee-store.c:398
+#: camel/camel-vee-store.c:395
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Неатрымалася зьмяніць назву тэчкі: %s: тэчка адсутнічае"
@@ -10223,24 +9980,24 @@ msgstr "Кніга адрэсаў"
 msgid "Post Office Agent SOAP Port:"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:80
+#: camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "Novell GroupWise"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:82
+#: camel/providers/groupwise/camel-groupwise-provider.c:85
 msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: camel/providers/groupwise/camel-groupwise-provider.c:100
 #: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
 msgid "Password"
 msgstr "Пароль"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:99
+#: camel/providers/groupwise/camel-groupwise-provider.c:102
 #: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
@@ -10248,8 +10005,8 @@ msgstr ""
 "Далучэньне да IMAP паслужніка будзе адбывацца з выкарыстаньнем "
 "незашыфраванага пароля."
 
-#: camel/providers/groupwise/camel-gw-listener.c:305
-#: camel/providers/groupwise/camel-gw-listener.c:328
+#: camel/providers/groupwise/camel-gw-listener.c:312
+#: camel/providers/groupwise/camel-gw-listener.c:335
 #, fuzzy
 msgid "Checklist"
 msgstr "Густая дымка"
@@ -10394,13 +10151,13 @@ msgstr ""
 "незашыфраванага пароля."
 
 #: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:429
+#: camel/providers/imap/camel-imap-store.c:428
 #, c-format
 msgid "IMAP server %s"
 msgstr "Паслужнік IMAP %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:431
+#: camel/providers/imap/camel-imap-store.c:430
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "паслуга IMAP для %s на %s"
@@ -10410,7 +10167,7 @@ msgstr "паслуга IMAP для %s на %s"
 #: camel/providers/imap/camel-imap-store.c:551
 #: camel/providers/imap/camel-imap-store.c:571
 #: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
+#: camel/providers/nntp/camel-nntp-store.c:209
 #: camel/providers/pop3/camel-pop3-store.c:175
 #: camel/providers/smtp/camel-smtp-transport.c:269
 #: camel/providers/smtp/camel-smtp-transport.c:285
@@ -10428,10 +10185,10 @@ msgstr "TLS адсутнічае"
 
 #: camel/providers/imap4/camel-imap4-store.c:222
 #: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:815
+#: camel/providers/imap/camel-imap-store.c:845
 #: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:137
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
 #: camel/providers/pop3/camel-pop3-store.c:192
 msgid "Connection cancelled"
 msgstr "Далучэньне адмененае"
@@ -10444,8 +10201,8 @@ msgid ""
 msgstr "Збой далучэньня да паслужніка IMAP %s у рэжыме бясьпекі: %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:649
-#: camel/providers/imap/camel-imap-store.c:680
+#: camel/providers/imap/camel-imap-store.c:679
+#: camel/providers/imap/camel-imap-store.c:710
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Збой далучэньня да паслужніка IMAP %s у рэжыме бясьпекі: %s"
@@ -10454,7 +10211,7 @@ msgstr "Збой далучэньня да паслужніка IMAP %s у рэ�
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1109
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
 msgid "Unknown error"
 msgstr "Невядомая памылка"
 
@@ -10482,8 +10239,8 @@ msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr "Неатрымалася атрымаць тэчку: %s: %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1857
-#: camel/providers/imap/camel-imap-store.c:2235
+#: camel/providers/imap/camel-imap-store.c:1885
+#: camel/providers/imap/camel-imap-store.c:2263
 #, fuzzy, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -10562,12 +10319,12 @@ msgstr "Паслужнік нечакана адключыўся: %s"
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3168
+#: camel/providers/imap/camel-imap-store.c:3194
 msgid "Operation cancelled"
 msgstr "Дзеяньне адмененае"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3171
+#: camel/providers/imap/camel-imap-store.c:3197
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Паслужнік нечакана адключыўся: %s"
@@ -10631,13 +10388,6 @@ msgid "Unable to retrieve message: %s"
 msgstr "Немагчыма арымаць паведамленьне: %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:219
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -10647,15 +10397,15 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-mbox-folder.c:418
+#: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
 msgstr "Няма гэткага паведамленьня"
 
 #: camel/providers/imap/camel-imap-folder.c:2019
-#: camel/providers/imap/camel-imap-folder.c:2621
-#: camel/providers/nntp/camel-nntp-folder.c:238
+#: camel/providers/imap/camel-imap-folder.c:2622
+#: camel/providers/nntp/camel-nntp-folder.c:220
 msgid "This message is not currently available"
 msgstr "Гэтае паведамленьне ў бягучы момант недаступна"
 
@@ -10664,7 +10414,23 @@ msgstr "Гэтае паведамленьне ў бягучы момант не�
 msgid "Fetching summary information for new messages"
 msgstr "Атрыманьне агульнае інфармацыі для новых паведамленьняў"
 
-#: camel/providers/imap/camel-imap-folder.c:2659
+#: camel/providers/imap/camel-imap-folder.c:2463
+#, c-format
+msgid "Incomplete server response: no information provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2471
+#, c-format
+msgid "Incomplete server response: no UID provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2484
+#, c-format
+msgid ""
+"Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2660
 msgid "Could not find message body in FETCH response."
 msgstr "Немагчыма адшукаць цела паведамленьня ў адказе FETCH."
 
@@ -10730,43 +10496,43 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Для чытаньня і захаваньня пошты на паслужніках IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/imap/camel-imap-store.c:680
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "Пашырэньне SSL/TLS не падтрымліваецца."
 
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:711
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "Збой узгадненьня SSL"
 
-#: camel/providers/imap/camel-imap-store.c:818
+#: camel/providers/imap/camel-imap-store.c:848
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Немагчыма далучыцца да %s (порт %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:1242
+#: camel/providers/imap/camel-imap-store.c:1272
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "Паслужнік IMAP %s не падтрымлівае запатрабаваны тып ідэнтыфікацыі %s"
 
-#: camel/providers/imap/camel-imap-store.c:1252
+#: camel/providers/imap/camel-imap-store.c:1282
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Ідэнтыфікацыя тыпа %s не падтрымліваецца"
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1305
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sКалі ласка, увядзіце пароль IMAP для %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1289
+#: camel/providers/imap/camel-imap-store.c:1319
 msgid "You didn't enter a password."
 msgstr "Вы не пазначылі пароль."
 
-#: camel/providers/imap/camel-imap-store.c:1318
+#: camel/providers/imap/camel-imap-store.c:1348
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10777,18 +10543,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1839
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:1867
+#: camel/providers/imap/camel-imap-store.c:2057
 #, c-format
 msgid "No such folder %s"
 msgstr "Тэчка %s адсутнічае "
 
-#: camel/providers/imap/camel-imap-store.c:1915
-#: camel/providers/imap/camel-imap-store.c:2296
+#: camel/providers/imap/camel-imap-store.c:1943
+#: camel/providers/imap/camel-imap-store.c:2324
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Гэтая тэчка ня можа утрымліваць падтэчкі"
 
-#: camel/providers/imap/camel-imap-store.c:1970
+#: camel/providers/imap/camel-imap-store.c:1998
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10796,7 +10562,7 @@ msgstr "Гэтая тэчка ня можа утрымліваць падтэч�
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Неатрымалася атрымаць тэчку: %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:2274
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Невядомая бацькоўская тэчка: %s"
@@ -10830,20 +10596,20 @@ msgid "Index message body data"
 msgstr "Даслаць паведамленьне кантактанае асобе"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:388
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:393
-#: camel/providers/local/camel-local-folder.c:396
+#: camel/providers/local/camel-local-folder.c:392
+#: camel/providers/local/camel-local-folder.c:395
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "паштовая скрыня:%s (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:400
+#: camel/providers/local/camel-local-folder.c:399
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -10899,7 +10665,7 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:142
 #: camel/providers/local/camel-local-store.c:253
-#: camel/providers/local/camel-mbox-store.c:356
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10972,8 +10738,25 @@ msgstr "Даданьне паведамленьня да тэчкі паштов
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Немагчыма дадаць паведамленьне да тэчкі паштовага каталёга: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:226
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mbox-folder.c:417
+#: camel/providers/local/camel-mbox-folder.c:436
+#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:475
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-mh-folder.c:221
+#, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+"Немагчыма атрымаць паведамленьне: %s з тэчкі %s\n"
+"  %s"
+
+#: camel/providers/local/camel-maildir-folder.c:236
 msgid "Invalid message contents"
 msgstr "Нерэчаісны зьмест паведамленьня"
 
@@ -11016,9 +10799,9 @@ msgstr ""
 msgid "not a maildir directory"
 msgstr "не зьяўляецца паштовым каталёгам"
 
-#: camel/providers/local/camel-maildir-store.c:341
-#: camel/providers/local/camel-spool-store.c:286
-#: camel/providers/local/camel-spool-store.c:316
+#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-spool-store.c:284
+#: camel/providers/local/camel-spool-store.c:314
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Немагчыма сканаваць тэчку `%s': %s"
@@ -11065,27 +10848,18 @@ msgstr "Даданьне пошты адменена"
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Немагчыма далучыць паведамленьне да файла mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:435
-#: camel/providers/local/camel-mbox-folder.c:466
-#: camel/providers/local/camel-mbox-folder.c:474
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"Немагчыма атрымаць паведамленьне: %s з тэчкі %s\n"
-"  %s"
-
-#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:468
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Магчыма тэчка сапсавана й ня можа быць адноўлена."
 
-#: camel/providers/local/camel-mbox-folder.c:475
-msgid "Message construction failed: Corrupt mailbox?"
+#: camel/providers/local/camel-mbox-folder.c:476
+#: camel/providers/local/camel-mh-folder.c:222
+#, fuzzy
+msgid "Message construction failed."
 msgstr "Збой у канструкцыі паведамленьня: паштовая скрыня пашкоджана?"
 
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:362
+#: camel/providers/local/camel-mbox-store.c:361
 #, fuzzy
 msgid "Cannot create a folder by this name."
 msgstr "Немагчыма стварыць тэчку з гэткай назвай"
@@ -11116,32 +10890,32 @@ msgstr "%s не зьяўляецца звычайным файлам."
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Тэчка \"%s\" не пустая. Не выдалена."
 
-#: camel/providers/local/camel-mbox-store.c:375
+#: camel/providers/local/camel-mbox-store.c:374
 #, fuzzy, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Немагчыма стварыць каталёг %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:389
+#: camel/providers/local/camel-mbox-store.c:388
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Неатрымалася атрымаць тэчку: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:391
+#: camel/providers/local/camel-mbox-store.c:390
 #, fuzzy
 msgid "Folder already exists"
 msgstr "Ід карткі ужо існуе"
 
-#: camel/providers/local/camel-mbox-store.c:473
+#: camel/providers/local/camel-mbox-store.c:472
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "Пазначаная назва тэчкі недапушчальна: %s"
 
-#: camel/providers/local/camel-mbox-store.c:486
+#: camel/providers/local/camel-mbox-store.c:485
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Немагчыма зьмяніць назву '%s': %s"
 
-#: camel/providers/local/camel-mbox-store.c:561
+#: camel/providers/local/camel-mbox-store.c:560
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Неатрымалася зьмяніць назву тэчкі %s у %s: %s"
@@ -11334,7 +11108,7 @@ msgstr ""
 "Магчыма тэчка пашкоджана, копія захавана у \"%s\""
 
 #: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:997
+#: camel/providers/nntp/camel-nntp-store.c:1126
 #, fuzzy, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "%sКалі ласка, пазначце пароль SMTP для %s@%s"
@@ -11352,18 +11126,10 @@ msgstr "Збой далучэньня да паслужніка LDAP"
 msgid "Server rejected username/password"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:263
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr "Карыстальнік адмяніў"
-
-#: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:259
-#: camel/providers/nntp/camel-nntp-folder.c:265
+#: camel/providers/nntp/camel-nntp-folder.c:147
+#: camel/providers/nntp/camel-nntp-folder.c:149
+#: camel/providers/nntp/camel-nntp-folder.c:158
+#: camel/providers/nntp/camel-nntp-folder.c:234
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11372,66 +11138,53 @@ msgstr "Карыстальнік адмяніў"
 msgid "Cannot get message %s: %s"
 msgstr "Немагчыма атрымаць паведамленьне %s: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:188
-#: camel/providers/nntp/camel-nntp-folder.c:228
+#: camel/providers/nntp/camel-nntp-folder.c:156
+#: camel/providers/nntp/camel-nntp-folder.c:232
+#: camel/providers/nntp/camel-nntp-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+msgid "User cancelled"
+msgstr "Карыстальнік адмяніў"
+
+#: camel/providers/nntp/camel-nntp-folder.c:176
+#: camel/providers/nntp/camel-nntp-folder.c:208
 #, c-format
 msgid "Internal error: uid in invalid format: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:201
-#, fuzzy, c-format
-msgid "Could not get article %s from NNTP server"
-msgstr "Немагчыма атрымаць групу: %s"
-
-#: camel/providers/nntp/camel-nntp-folder.c:362
-msgid "Posting not allowed by news server"
-msgstr ""
-
+#: camel/providers/nntp/camel-nntp-folder.c:328
+#: camel/providers/nntp/camel-nntp-folder.c:331
 #: camel/providers/nntp/camel-nntp-folder.c:373
-#, c-format
-msgid "Failed to send newsgroups header: %s: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:413
-#: camel/providers/nntp/camel-nntp-folder.c:426
-#, c-format
-msgid "Error posting to newsgroup: %s: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:438
-msgid "Error reading response to posted message: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:441
+#: camel/providers/nntp/camel-nntp-folder.c:375
 #, fuzzy, c-format
-msgid "Error posting message: %s: message not posted"
-msgstr ""
-"Памылка аўтазахаваньня паведамленьня: %s\n"
-" %s"
+msgid "Posting failed: %s"
+msgstr "Збой апэрацыі: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:457
+#: camel/providers/nntp/camel-nntp-folder.c:393
 msgid "You cannot post NNTP messages while working offline!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:468
+#: camel/providers/nntp/camel-nntp-folder.c:404
 #, fuzzy
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Немагчыма закрыць часовую тэчку: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:44
 #, fuzzy
 msgid "Could not get group list from server."
 msgstr "Немагчыма атрымаць групу: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#: camel/providers/nntp/camel-nntp-grouplist.c:97
+#: camel/providers/nntp/camel-nntp-grouplist.c:106
 #, fuzzy, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr ""
 "Неатрымалася стварыць файл вываду: %s\n"
 " %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#: camel/providers/nntp/camel-nntp-grouplist.c:157
 #, fuzzy, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr ""
@@ -11464,27 +11217,29 @@ msgstr ""
 "Далучэньне да паслужніка NNTP будзе адбывацца з выкарыстаньнем "
 "незашыфраванага пароля."
 
-#: camel/providers/nntp/camel-nntp-store.c:158
+#: camel/providers/nntp/camel-nntp-store.c:118
+#: camel/providers/nntp/camel-nntp-store.c:1233
+#: camel/providers/nntp/camel-nntp-store.c:1331
+#, c-format
+msgid "NNTP Command failed: %s"
+msgstr "Збой каманды NNTP: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:227
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Неатрымліваецца прачытаць вітаньне з %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:170
+#: camel/providers/nntp/camel-nntp-store.c:239
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "Паслужнік NNTP %s вярнуў код памылкі %d: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:326
+#: camel/providers/nntp/camel-nntp-store.c:403
 #, c-format
 msgid "USENET News via %s"
 msgstr "Навіны USENET праз %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:640
-#, fuzzy
-msgid "Stream error"
-msgstr "памылка разбору"
-
-#: camel/providers/nntp/camel-nntp-store.c:643
+#: camel/providers/nntp/camel-nntp-store.c:777
 #, fuzzy, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -11494,74 +11249,74 @@ msgstr ""
 "Памылка захаваньня паведамленьняў у: %s:\n"
 " %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:735
+#: camel/providers/nntp/camel-nntp-store.c:872
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
 "No such newsgroup. The selected item is a probably a parent folder."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:767
+#: camel/providers/nntp/camel-nntp-store.c:904
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
 "newsgroup does not exist!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:792
+#: camel/providers/nntp/camel-nntp-store.c:929
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:800
+#: camel/providers/nntp/camel-nntp-store.c:937
 #, fuzzy
 msgid "You cannot rename a folder in a News store."
 msgstr "Неатрымалася зьмяніць назву тэчкі %s у %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:808
+#: camel/providers/nntp/camel-nntp-store.c:945
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:253
-#, fuzzy, c-format
-msgid "Connection error: %s"
-msgstr "Невядомая памылка: %s"
-
-#: camel/providers/nntp/camel-nntp-summary.c:262
-#, c-format
-msgid "No such folder: %s"
-msgstr "Не адшукана тэчка: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1118
+#, fuzzy
+msgid "Authentication requested but not username provided"
+msgstr "Аўтарызацыя патрабуецца"
 
-#: camel/providers/nntp/camel-nntp-summary.c:268
-#, c-format
-msgid "Could not get group: %s"
-msgstr "Немагчыма атрымаць групу: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1146
+#, fuzzy, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr "Збой аўтарызацыі на паслужніку POP %s: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:333
+#: camel/providers/nntp/camel-nntp-store.c:1262
 #, fuzzy
-msgid "Could not get messages: unspecified error"
-msgstr "Неатрымалася даслаць паведамленьне: %s"
+msgid "Not connected."
+msgstr "Паказаць кантакты"
 
-#: camel/providers/nntp/camel-nntp-summary.c:378
+#: camel/providers/nntp/camel-nntp-store.c:1311
 #, c-format
-msgid "NNTP Command failed: %s"
-msgstr "Збой каманды NNTP: %s"
+msgid "No such folder: %s"
+msgstr "Не адшукана тэчка: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:438
-#: camel/providers/nntp/camel-nntp-summary.c:543
+#: camel/providers/nntp/camel-nntp-summary.c:218
+#: camel/providers/nntp/camel-nntp-summary.c:314
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Сканаваннье новых паведамленьняў"
 
-#: camel/providers/nntp/camel-nntp-summary.c:558
-#, c-format
-msgid "Unknown server response: %s"
-msgstr "Невядомы адказ паслужніка: %s"
+#: camel/providers/nntp/camel-nntp-summary.c:225
+#, fuzzy, c-format
+msgid "Unexpected server response from xover: %s"
+msgstr "Заўчаснае завяршэньне адказу ад паслужніка IMAP: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:328
+#, fuzzy, c-format
+msgid "Unexpected server response from head: %s"
+msgstr "Нечаканы адказ ад GnuPG: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:605
+#: camel/providers/nntp/camel-nntp-summary.c:368
 msgid "Use cancel"
 msgstr "Адмяніце"
 
-#: camel/providers/nntp/camel-nntp-summary.c:607
+#: camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Збой апэрацыі: %s"
@@ -11609,7 +11364,7 @@ msgstr "Выдаляць праз %s дзён"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107
 msgid "POP"
 msgstr "POP"
 
@@ -11699,7 +11454,7 @@ msgid "No such folder `%s'."
 msgstr "Няма гэткае тэчкі \"%s\""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:132
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -11753,7 +11508,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Дастаўка пошты праз праграму sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:119
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -12051,19 +11806,19 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
+#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:408
 msgid "attachment"
 msgstr "укладаньне"
 
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:454
 msgid "Remove selected items from the attachment list"
 msgstr "Выдаліць выбраныя элемэнты са сьпіса укладаньняў"
 
-#: composer/e-msg-composer-attachment-bar.c:491
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Add attachment..."
 msgstr "Дадаць укладаньне..."
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:495
 msgid "Attach a file to the message"
 msgstr "Укласьці файл у паведамленьне"
 
@@ -12128,7 +11883,7 @@ msgstr "(Паведамленьне бяз назвы)"
 msgid "Open file"
 msgstr "Адкрыцьцё файла"
 
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
 msgid "Autogenerated"
 msgstr "Створана аўтаматычна"
 
@@ -12277,17 +12032,17 @@ msgstr "Укласьці файл(ы)"
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
+msgid "You cannot attach the file `{0}' to this message."
 msgstr "Укласьці файл у паведамленьне"
 
 #. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4
-msgid "${1}"
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
 msgstr ""
 
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
 
 #. mail-composer:attach-directory primary
@@ -12382,7 +12137,7 @@ msgstr "Неатрымалася стварыць канал: %s"
 
 #. mail-composer:no-build-message secondary
 #: composer/mail-composer-errors.xml.h:34
-msgid "Because \"${0}\", you may need to select different mail options."
+msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
@@ -12392,8 +12147,10 @@ msgid "Could not read signature file \"{0}\"."
 msgstr "Неатрымліваецца захаваць файл подпіса: %s"
 
 #. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38
-msgid "Because \"${1}\"."
+#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted primary
@@ -12815,11 +12572,11 @@ msgid "<b>Then</b>"
 msgstr "<b>Умоўлена:</b> "
 
 #: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1335
+#: mail/mail-account-gui.c:1347
 msgid "Select Folder"
 msgstr "Выбраць тэчку"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
 #, fuzzy
 msgid "    "
 msgstr "      "
@@ -12880,7 +12637,7 @@ msgstr "раней"
 msgid "months"
 msgstr "месяцы"
 
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
 msgid "seconds"
 msgstr "сэкундаў"
 
@@ -12912,20 +12669,20 @@ msgstr "з усімі лакальнымі тэчкамі"
 msgid "years"
 msgstr "гады"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:916
-#: mail/mail-config.c:76 mail/mail-config.glade.h:90
+#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
+#: mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Важнае"
 
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:919 mail/mail-config.c:79
-#: mail/mail-config.glade.h:145
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: mail/mail-config.glade.h:148
 msgid "To Do"
 msgstr "Трэба выканаць"
 
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:920 mail/mail-config.c:80
-#: mail/mail-config.glade.h:94
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: mail/mail-config.glade.h:97
 msgid "Later"
 msgstr "Пазьней"
 
@@ -12983,257 +12740,6 @@ msgstr "атрыманае"
 msgid "outgoing"
 msgstr "дасланае"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Adjust Score"
-msgstr "Падправіць лік"
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Color"
-msgstr "Зьвязаць колер"
-
-#: filter/libfilter-i18n.h:4
-msgid "Assign Score"
-msgstr "Прызначыць лік"
-
-#: filter/libfilter-i18n.h:5
-msgid "Attachments"
-msgstr "Укладаньні"
-
-#: filter/libfilter-i18n.h:6
-msgid "Beep"
-msgstr "Сыгнал"
-
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "утрымлівае"
-
-#: filter/libfilter-i18n.h:8
-msgid "Copy to Folder"
-msgstr "Капіяваць у тэчку"
-
-#: filter/libfilter-i18n.h:9
-msgid "Date received"
-msgstr "Дата атрыманьня"
-
-#: filter/libfilter-i18n.h:10
-msgid "Date sent"
-msgstr "Дата адпраўленьня"
-
-#: filter/libfilter-i18n.h:12
-msgid "Deleted"
-msgstr "Выдаленае"
-
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "ня ўтрымлівае"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "не сканчаецца на"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "ня існуе"
-
-#: filter/libfilter-i18n.h:16
-msgid "does not return"
-msgstr "не вяртае"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "не гучыць як"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "не пачынаецца на"
-
-#: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
-msgstr "Неіснуе"
-
-#: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr "Чарнавік"
-
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "сканчаецца на"
-
-#: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr "Існуе"
-
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "існуе"
-
-#: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr "Выраз"
-
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr "Падняцца вышэй"
-
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "гэта"
-
-#: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr "пасьля"
-
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr "перад"
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr "пазначана"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "больш за"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "менш за"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "ня гэта"
-
-#: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr "не пазначана"
-
-#: filter/libfilter-i18n.h:36
-#, fuzzy
-msgid "Junk Test"
-msgstr "Чэрвень"
-
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
-#: widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Адмеціна"
-
-#: filter/libfilter-i18n.h:38
-msgid "Mailing list"
-msgstr "Сьпіс рассылкі"
-
-#: filter/libfilter-i18n.h:39
-msgid "Message Body"
-msgstr "Цела паведамленьня"
-
-#: filter/libfilter-i18n.h:40
-msgid "Message Header"
-msgstr "Загаловак паведамленьня"
-
-#: filter/libfilter-i18n.h:41
-#, fuzzy
-msgid "Message is Junk"
-msgstr "Паведамленьні"
-
-#: filter/libfilter-i18n.h:42
-#, fuzzy
-msgid "Message is not Junk"
-msgstr "Пазначыць як важнае"
-
-#: filter/libfilter-i18n.h:43
-msgid "Move to Folder"
-msgstr "Перамясьціць у тэчку"
-
-#: filter/libfilter-i18n.h:44
-#, fuzzy
-msgid "Pipe to Program"
-msgstr "Выйсьці з праграмы"
-
-#: filter/libfilter-i18n.h:45
-msgid "Play Sound"
-msgstr "Граць гук"
-
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Чытаньне"
-
-#: filter/libfilter-i18n.h:47
-msgid "Recipients"
-msgstr "Атрымоўцы"
-
-#: filter/libfilter-i18n.h:48
-msgid "Regex Match"
-msgstr "Супадзеньне стал.выраза"
-
-#: filter/libfilter-i18n.h:49
-msgid "Replied to"
-msgstr "Адказана на"
-
-#: filter/libfilter-i18n.h:50
-msgid "returns"
-msgstr "вяртае"
-
-#: filter/libfilter-i18n.h:51
-msgid "returns greater than"
-msgstr "вяртае больш за"
-
-#: filter/libfilter-i18n.h:52
-msgid "returns less than"
-msgstr "вяртае менш за"
-
-#: filter/libfilter-i18n.h:53
-#, fuzzy
-msgid "Run Program"
-msgstr "Запусьціць праграму:"
-
-#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Лік"
-
-#: filter/libfilter-i18n.h:55
-msgid "Sender"
-msgstr "Адпраўляльнік"
-
-#: filter/libfilter-i18n.h:56
-msgid "Set Status"
-msgstr "Усталяваць стан"
-
-#: filter/libfilter-i18n.h:57
-msgid "Size (kB)"
-msgstr "Памер (kB)"
-
-#: filter/libfilter-i18n.h:58
-msgid "sounds like"
-msgstr "гукі як"
-
-#: filter/libfilter-i18n.h:59
-msgid "Source Account"
-msgstr "Крыніца рахунка"
-
-#: filter/libfilter-i18n.h:60
-msgid "Specific header"
-msgstr "Спэцыфічны загаловак"
-
-#: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "пачынаецца з"
-
-#: filter/libfilter-i18n.h:63
-msgid "Stop Processing"
-msgstr "Спыніць апрацоўку"
-
-#: filter/libfilter-i18n.h:64 mail/em-format.c:755 mail/em-format-html.c:1519
-#: mail/em-format-quote.c:302 mail/em-mailer-prefs.c:87
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
-#: smime/lib/e-cert.c:1079
-msgid "Subject"
-msgstr "Тэма"
-
-#: filter/libfilter-i18n.h:65
-msgid "Unset Status"
-msgstr "Адмяніць папярэдні стан"
-
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Дадаць правіла"
@@ -13251,6 +12757,11 @@ msgstr "Назва правіла"
 msgid "_Score Rules"
 msgstr "Правіла падліку"
 
+#: filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Лік"
+
 #: filter/searchtypes.xml.h:1
 msgid "Body contains"
 msgstr "Цэла ўтрымлівае"
@@ -13332,13 +12843,13 @@ msgstr "Подпіс(ы)"
 msgid "-------- Forwarded Message --------"
 msgstr "Перадасланае паведамленьне"
 
-#: mail/em-composer-utils.c:1499
+#: mail/em-composer-utils.c:1495
 msgid "an unknown sender"
 msgstr "невядомы адпраўляльнік"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1509
+#: mail/em-composer-utils.c:1505
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "%a, %Y-%m-%d у %H:%M, %%s піша:"
@@ -13381,8 +12892,8 @@ msgstr "<клікніце тутака для выбару тэчкі>"
 msgid "Create New Folder"
 msgstr "Стварыць новую тэчку"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
-#: mail/mail-component.c:701
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
+#: mail/mail-component.c:704
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Пазначце дзе стварыць тэчку:"
@@ -13397,107 +12908,108 @@ msgstr "Стварыць новую тэчку"
 msgid "Folder _name:"
 msgstr "_Назва тэчкі:"
 
-#: mail/em-folder-tree.c:839
+#: mail/em-folder-tree.c:833
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Выдаленьне тэчкі %s"
 
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree.c:835
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Адкрыцьцё тэчкі \"%s\""
 
-#: mail/em-folder-tree.c:848 mail/message-list.c:1555
+#: mail/em-folder-tree.c:842 mail/message-list.c:1561
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Перамяшчэньне паведамленьняў у %s"
 
-#: mail/em-folder-tree.c:850 mail/message-list.c:1557
+#: mail/em-folder-tree.c:844 mail/message-list.c:1563
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Капіяваньне паведамленьняў у %s"
 
-#: mail/em-folder-tree.c:866
+#: mail/em-folder-tree.c:860
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Немагчыма капіяваць ці перамясьціць паведамленьні у віртуальную тэчку"
 
-#: mail/em-folder-tree.c:956 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "Капіяваць у тэчку"
 
-#: mail/em-folder-tree.c:957 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "Перамясьціць у тэчку"
 
-#: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2069
-#: mail/em-folder-tree.c:2551 mail/em-folder-view.c:798
-#: mail/message-list.c:1645
+#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
+#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
+#: mail/message-list.c:1651
 #, fuzzy
 msgid "_Move"
 msgstr "Перамясьціць"
 
-#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#: mail/em-folder-tree.c:955 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "Адмяніць заданьне"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
 #: mail/em-folder-view.c:798 mail/em-folder-view.c:812
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Выбраць тэчку"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
 #, fuzzy
 msgid "C_opy"
 msgstr "Капіяваць"
 
-#: mail/em-folder-tree.c:2096
+#: mail/em-folder-tree.c:2088
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Захаваньне тэчкі \"%s\""
 
-#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
+#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
 #, fuzzy
 msgid "Create folder"
 msgstr "Стварыць новую тэчку"
 
-#: mail/em-folder-tree.c:2474
+#: mail/em-folder-tree.c:2463
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Зьмяніць назву тэчкі \"%s\" на:"
 
-#: mail/em-folder-tree.c:2476
+#: mail/em-folder-tree.c:2465
 msgid "Rename Folder"
 msgstr "Зьмяніць назву тэчкі"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "Выгляд"
 
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2537
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Адкрыць у новым акне"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2555
+#: mail/em-folder-tree.c:2546
 msgid "_New Folder..."
 msgstr "_Новая тэчка..."
 
-#: mail/em-folder-tree.c:2558
+#: mail/em-folder-tree.c:2549
 msgid "_Rename"
 msgstr "Зьмяніць _назву"
 
-#: mail/em-folder-tree.c:2561 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Уласьцівасьці..."
 
 #: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:889
+#: mail/mail-vfolder.c:888
 msgid "VFolders"
 msgstr "Віртуальныя тэчкі"
 
@@ -13511,19 +13023,19 @@ msgstr ""
 msgid "Inbox"
 msgstr "Атрыманае"
 
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
 msgid "Loading..."
 msgstr "Загрузка..."
 
 #: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
 #: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
 #: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:551
+#: mail/mail-component.c:554
 msgid "Mail"
 msgstr "Пошта"
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "Зьмяніць як новае паведамленьне..."
@@ -13536,17 +13048,17 @@ msgstr "_Друк"
 msgid "_Reply to Sender"
 msgstr "Адказаць адпраўляльніку"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:810
+#: mail/em-folder-view.c:901 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Адказаць у сьпіс"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:811
+#: mail/em-folder-view.c:902 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Адказаць усім"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: mail/em-folder-view.c:903 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Перадаслаць"
@@ -13601,6 +13113,10 @@ msgstr "Перамясьціць у тэчку..."
 msgid "_Copy to Folder..."
 msgstr "_Капіяваць у тэчку..."
 
+#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Адмеціна"
+
 #: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Дадаць адпраўляльніка ў кнігу адрэсаў"
@@ -13651,12 +13167,12 @@ msgid "Filter on _Mailing List"
 msgstr "Фільтар па сьпісе рассылкі"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
-#: mail/mail-config.glade.h:66
+#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Дапомна"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1796
 msgid "Print Message"
 msgstr "Друк паведамленьня"
 
@@ -13696,12 +13212,18 @@ msgstr "Копія"
 msgid "Bcc"
 msgstr "Сх.копія"
 
+#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
+#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Тэма"
+
 #: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
 #: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Дата"
 
-#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
+#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
 msgid "Newsgroups"
 msgstr ""
 
@@ -13896,7 +13418,7 @@ msgid ""
 "practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:757
+#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
 #, fuzzy
 msgid "_View Certificate"
 msgstr "_Ід сэртыфіката:"
@@ -13959,7 +13481,7 @@ msgstr "Адзін тыдзень"
 msgid "Once per month"
 msgstr "Адзін меся_ц"
 
-#: mail/em-migrate.c:1072
+#: mail/em-migrate.c:1168
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13967,92 +13489,92 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1506
+#: mail/em-migrate.c:1602
 #, fuzzy, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Неатрымалася атрымаць тэчку: %s: %s"
 
-#: mail/em-migrate.c:1532
+#: mail/em-migrate.c:1628
 #, fuzzy, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr ""
 "Немагчыма скапіяваць дэскрыптар файла: %s\n"
 "%s"
 
-#: mail/em-migrate.c:1715
+#: mail/em-migrate.c:1811
 #, fuzzy, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr ""
 "Неатрымалася стварыць файл вываду: %s\n"
 " %s"
 
-#: mail/em-migrate.c:1919
+#: mail/em-migrate.c:2015
 #, fuzzy, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Збой аўтарызацыі на паслужніку POP %s: %s"
 
-#: mail/em-migrate.c:1933
+#: mail/em-migrate.c:2029
 #, fuzzy, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Збой пад час стварэньня канала да \"%s\": %s"
 
-#: mail/em-migrate.c:1962
+#: mail/em-migrate.c:2058
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#: mail/em-migrate.c:2413 mail/em-migrate.c:2425
 #, fuzzy, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Збой пад час стварэньня канала да \"%s\": %s"
 
-#: mail/em-migrate.c:2480
+#: mail/em-migrate.c:2576
 #, fuzzy, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr ""
 "Неатрымалася стварыць файл вываду: %s\n"
 " %s"
 
-#: mail/em-migrate.c:2498
+#: mail/em-migrate.c:2594
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 msgstr ""
 
-#: mail/em-popup.c:699
+#: mail/em-popup.c:700
 msgid "Save As..."
 msgstr "Захаваць як..."
 
-#: mail/em-popup.c:717
+#: mail/em-popup.c:718
 #, fuzzy, c-format
 msgid "untitled_image.%s"
 msgstr "Паведамленьне бяз назвы"
 
-#: mail/em-popup.c:807
+#: mail/em-popup.c:808
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:809
+#: mail/em-popup.c:810
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "Адказаць адпраўляльніку"
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:859
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Адкрыць спасылку ў аглядальніке"
 
-#: mail/em-popup.c:859
+#: mail/em-popup.c:860
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Даслаць паве_дамленьне ў сьпіс..."
 
-#: mail/em-popup.c:860
+#: mail/em-popup.c:861
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Дадаць адпраўляльніка ў кнігу адрэсаў"
 
-#: mail/em-popup.c:966
+#: mail/em-popup.c:967
 #, c-format
 msgid "Open in %s..."
 msgstr "Адкрыць у %s..."
@@ -14656,7 +14178,7 @@ msgstr "Кіраваньне перавагамі пошты \"Эвалюцыі\
 msgid "Mail Accounts"
 msgstr "Уліковыя запісы пошты"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
 msgid "Mail Preferences"
 msgstr "Перавагі пошты"
 
@@ -14670,15 +14192,15 @@ msgid "Evolution is importing your old Elm mail"
 msgstr "\"Эвалюцыя\" імпартуе вашую старую пошту Elm"
 
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:226
+#: mail/importers/evolution-mbox-importer.c:221
+#: mail/importers/evolution-outlook-importer.c:255
 #: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Імпартаваньне..."
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:222
-#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/evolution-mbox-importer.c:223
+#: mail/importers/evolution-outlook-importer.c:257
 #: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Калі ласка, пачакайце"
@@ -14701,23 +14223,25 @@ msgid "Elm"
 msgstr "Elm"
 
 #: mail/importers/evolution-mbox-importer.c:116
+#: mail/importers/evolution-outlook-importer.c:130
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Выдаліць гэтую тэчку"
 
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 #, fuzzy
 msgid "Select folder to import into"
 msgstr "Выбраць імпарт"
 
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:254
 #: mail/importers/mail-importer.c:226
 #, fuzzy, c-format
 msgid "Importing `%s'"
 msgstr "Імпартаваньне"
 
-#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/evolution-outlook-importer.c:301
 #: mail/importers/mail-importer.c:140
 #, fuzzy
 msgid "Importing mailbox"
@@ -14862,15 +14386,15 @@ msgstr ""
 msgid "%s License Agreement"
 msgstr ""
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
 msgid "_Host:"
 msgstr "_Вузел:"
 
-#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
 msgid "User_name:"
 msgstr "_Імя карыстальніка:"
 
-#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
 msgid "_Path:"
 msgstr "_Шлях:"
 
@@ -14933,34 +14457,34 @@ msgstr "%d агулам"
 msgid ", %d unread"
 msgstr "%d недасланыя"
 
-#: mail/mail-component.c:653
+#: mail/mail-component.c:656
 msgid "New Mail Message"
 msgstr "Новае паштовае паведамленьне"
 
-#: mail/mail-component.c:654
+#: mail/mail-component.c:657
 msgid "_Mail Message"
 msgstr "_Паштовае паведамленьне"
 
-#: mail/mail-component.c:655
+#: mail/mail-component.c:658
 msgid "Compose a new mail message"
 msgstr "Скласьці новае паведамленьне"
 
-#: mail/mail-component.c:661
+#: mail/mail-component.c:664
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Новая віртуальная тэчка"
 
-#: mail/mail-component.c:662
+#: mail/mail-component.c:665
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Фільтары пошты"
 
-#: mail/mail-component.c:663
+#: mail/mail-component.c:666
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Стварыць новую тэчку"
 
-#: mail/mail-component.c:795
+#: mail/mail-component.c:798
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
@@ -14972,7 +14496,7 @@ msgstr "Праверка паслугі"
 msgid "Connecting to server..."
 msgstr "Далучэньне да паслужніка..."
 
-#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "сапраўдны"
 
@@ -14984,7 +14508,7 @@ msgid ""
 msgstr ""
 
 #: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid "Receiving Mail"
 msgstr "Атрыманьне пошты"
 
@@ -15001,7 +14525,7 @@ msgstr ""
 msgid "Please select among the following options"
 msgstr "Выбярыце адзін з наступных варыянтаў"
 
-#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr "Адпраўка пошты"
 
@@ -15013,7 +14537,7 @@ msgstr ""
 "Калі ласка, пазначце інфармацыю аб шляхах адпраўкі пошты. Калі вы няпэўныя, "
 "запытайцеся вашага сыстэмнага адміністратара ці правайдэра паслуг Інтарнэт."
 
-#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37
 msgid "Account Management"
 msgstr "Кіраваньне рахункамі"
 
@@ -15026,251 +14550,255 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:2
 #, fuzzy
 msgid " Ch_eck for Supported Types "
 msgstr " Праверка тыпаў якія падтрымліваюцца "
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "<b>Preview</b>"
 msgstr "Перадпрагляд"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "(SSL не падтрымліваецца ў гэтае зборцы \"Эвалюцыі\")"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "<b>S_ignatures</b>"
 msgstr "<b>Стан:</b>"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "<b>_Languages</b>"
 msgstr "<b>Стан:</b>"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
+msgid "<small>This will make the the filter more reliable, but slower</small>"
+msgstr ""
+
+#: mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "<span weight=\"bold\">Checking for New Mail</span>"
 msgstr "Праверка новае пошты"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">General</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
 #, fuzzy
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "Паведамленьне, якое адлюстроўваецца:"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "Нагаданьне аб пошце"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Security</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "Дасланыя паведамленьні і чарнавікі"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:34
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:35
 #, fuzzy
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "Заўсёды шыфраваць маім ключом пад час адпраўленьня паведамленьня"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:36
 msgid "Account Editor"
 msgstr "Рэдактар уліковых запісаў"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:38
 #, fuzzy
 msgid "Add Ne_w Signature..."
 msgstr "Дадаць новы подпіс..."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Add _Script"
 msgstr "Дадаць _сцэнар"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:40
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "Заўсёды шыфраваць маім ключом пад час адпраўкі шыфраванае пошты"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Заўсёды дасылаць копію (Cc) на:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Заўсёды дасылаць нябачную копію (Bcc) на:"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Always _sign outgoing messages when using this account"
 msgstr ""
 "Заўсёды падпісываць паведамленьні, калі выкарыстоўваецца гэты уліковы запіс"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Заўсёды давяраць ключам у маім зборы ключоў пад час кадаваньня"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Attach original message"
 msgstr "Укласьці арыгінальнае паведамленьне"
 
-#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Укладаньне"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:48
 #, fuzzy
 msgid "Automatically _insert smiley images"
 msgstr "_Аўтаматычна устаўляць відарысы \"усьмешак\""
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Automatically check for _new mail every"
 msgstr "Аўтаматычна правяраць пошту кожныя"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "Baltic (ISO-8859-13)"
 msgstr "Балцкая (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Baltic (ISO-8859-4)"
 msgstr "Балцкая (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Beep w_hen new mail arrives"
 msgstr "_Гукавы сыгнал пад час атрыманьня новае пошты"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "C_haracter set:"
 msgstr "Кадаваньне сымбаляў:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Ch_eck for Supported Types "
 msgstr " Праверка тыпаў якія падтрымліваюцца "
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 #, fuzzy
-msgid "Check _Incoming Mail"
+msgid "Check _incoming mail for junk"
 msgstr "Праверка новае пошты"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Check spelling while I _type"
 msgstr "Правяраць правапіс пад час уводу тэкста"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 msgid "Color for _misspelled words:"
 msgstr "Колер для памылковых словаў:"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Colors"
 msgstr "Колеры"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Confirm _when expunging a folder"
 msgstr "_Запытвацца падцьверджаньня ачысткі тэчкі ад выдаленых паведамленьняў"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -15286,269 +14814,274 @@ msgstr ""
 "\n"
 "Клікніце \"Ужыць\" каб захаваць вашыя усталёўкі."
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
 msgid "De_fault"
 msgstr "_Дапомна"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Default character e_ncoding:"
 msgstr "Дапомнае кадаваньне сымбаляў:"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 #, fuzzy
 msgid "Defaults"
 msgstr "Дапомнае"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 msgid "Do not quote original message"
 msgstr "Не цытавацьь зыходнае паведамленьне"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Не падпісываць запыты на нараду (для сумяшчальнасьці з Outlook)"
 
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Зроблена"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Drafts _Folder:"
 msgstr "Тэчка чарнавіка:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:77
 msgid "Email Accounts"
 msgstr "Уліковыя запісы пошты"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Email _Address:"
 msgstr "Электроная адрэса пошты:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "Empty trash folders on e_xit"
 msgstr "Ачышчаць сьметніцу пад час выхаду"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "_Ід сэртыфіката:"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:81
 msgid "Evolution Account Assistant"
 msgstr "Дапаможнік уліковага запісу \"Эвалюцыі\""
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:82
 msgid "Execute Command..."
 msgstr "Выканаць каманду..."
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Fi_xed-width:"
 msgstr "Фіксаваная шырыня:"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 msgid "Font Properties"
 msgstr "Уласьцівасьці шрыфта"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 msgid "Format messages in _HTML"
 msgstr "Фарматаваць паведамленьні ў HTML"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "HTML Mail"
 msgstr "По_шта у HTML"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Headers"
 msgstr "Загаловак"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr "Вылучаць _цытаваньне:"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
 #: mail/mail-config.glade.h:91
+#, fuzzy
+msgid "I_nclude remote tests"
+msgstr "Уключае:"
+
+#: mail/mail-config.glade.h:94
 msgid "Inline"
 msgstr "убудаваны"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Mail Configuration"
 msgstr "Наладка пошты"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "Разьмяшчэньне паштовае скрыні"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr "Рэдактар паведамленьняў"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Or_ganization:"
 msgstr "Установа:"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "PGP/GPG _Key ID:"
 msgstr "Ід ключа PGP/GPG:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "Play sound file when new mail arri_ves"
 msgstr "Граць файл, калі атрымана новая пошта"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "Папярэджваць пад час адпраўленьня паведамленьняў, у якіх вызначаны толькі "
 "атрымоўцы схаванае копіі."
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Qmail maildir "
 msgstr "Паштовы каталёг Qmail"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr "Цытаваць арыгінальнае паведамленьне"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr "Працытавана"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Re_member password"
 msgstr "Запомніць гэты пароль"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr "Адказаць на:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "Атрыманьне пошты"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:120
 #, fuzzy
 msgid "Receiving Options"
 msgstr "Парамэтры атрыманьня"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
 #, fuzzy
 msgid "Remember _password"
 msgstr "Запомніць гэты пароль"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
 #, fuzzy
 msgid "S_tandard Font:"
 msgstr "Стандартны шрыфт:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 #, fuzzy
 msgid "Security"
 msgstr "Бясьпека"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font"
 msgstr "Выбярыце шрыфт HTML фіксаванае шырыні"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:126
 msgid "Select HTML fixed width font for printing"
 msgstr "Выбярыце шрыфт HTML фіксаванае шырыні для друку"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:127
 msgid "Select HTML variable width font"
 msgstr "Выбярыце шрыфт HTML пераменае шырыні"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:128
 msgid "Select HTML variable width font for printing"
 msgstr "Выбярыце шрыфт HTML пераменае шырыні для друку"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:129
 #, fuzzy
 msgid "Select..."
 msgstr "Выдаліць..."
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "Адпраўка пошты"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Sent _Messages Folder:"
 msgstr "Тэчка дасланых паведамленьняў:"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:134
 msgid "Ser_ver requires authentication"
 msgstr "Паслужнік патрабуе аўтарызацыю"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:135
 msgid "Server _Type: "
 msgstr "Тып паслужніка: "
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Самападпісаны сэртыфікат у ланцужку"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:137
 #, fuzzy
 msgid "Signat_ure:"
 msgstr "Подпіс:"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "Signatures"
 msgstr "_Подпісы"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr "Пазначце назву файла:"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "Spell Checking"
 msgstr "_Праверка правапіса"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:141
 msgid "Standard Unix mbox"
 msgstr "Стандартны файл Unix mbox"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "T_erminal Font:"
 msgstr "Тэрмінальны шрыфт:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "T_ype: "
 msgstr "Тып:"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
@@ -15557,7 +15090,7 @@ msgstr ""
 "Гэтая старонка дазваляе наладзіць паводзіны праверкі правапіса і мову. Сіпіс "
 "моваў адлюстроўвае толькі мовы, слоўнікі якіх усталяваны ў вашае сыстэме."
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:149
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -15565,15 +15098,11 @@ msgstr ""
 "Пазначце назву для гэтага рахунка.\n"
 "Да прыкладу: \"Праца\" ці \"Асабістае\""
 
-#: mail/mail-config.glade.h:148
-msgid "Use _Daemon"
-msgstr ""
-
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:152
 msgid "V_ariable-width:"
 msgstr "Пераменая шырыня:"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:153
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -15583,95 +15112,91 @@ msgstr ""
 "\n"
 "Калі ласка, клікніце \"Наперад\" каб пачаць. "
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:158
 msgid "_Add Signature"
 msgstr "_Дадаць подпіс"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Always load images from the Internet"
 msgstr "Заўсёды загружаць відарысы з сеціва"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Digitally sign outgoing messages (by default)"
 msgstr ""
 "Заўсёды падпісываць паведамленьні, калі выкарыстоўваецца гэты уліковы запіс"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:161
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Не паведамляць пра атрыманьне новай пошты"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:163
 msgid "_Enable"
 msgstr "_Уключыць"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:165
 msgid "_Forward style:"
 msgstr "Стыль перасылкі:"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Load images if sender is in address book"
 msgstr "Загрузіць відарысы, калі адпраўляльнік ёсьць у кнізе адрэсаў"
 
-#: mail/mail-config.glade.h:167
-msgid "_Local Tests Only"
-msgstr ""
-
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Make this my default account"
 msgstr "_Зрабіць дапомным уліковым запісам"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_Mark messages as read after"
 msgstr "Паз_начаць паведамленьні як \"Прачытанае\" праз:"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Never load images from the Internet"
 msgstr "Ніколі не загружаць відарысы з сеціва"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "_Папярэджваць пад час адпраўленьня паведамленьняў у фармаце HTML тым, хто не "
 "жадае гэтага"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:175
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Папярэджваць пад час адпраўкі паведамленьняў з пустой тэмай"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:176
 msgid "_Reply style:"
 msgstr "Стыль _адказа:"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:177
 msgid "_Script:"
 msgstr "_Сцэнар:"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:178
 msgid "_Show animated images"
 msgstr "Паказываць анімаваныя відарысы"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "_Use Secure Connection (SSL):"
 msgstr "_Выкарыстоўваць злучэньне праз SSL:"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "_Use the same fonts as other applications"
 msgstr "Выкарыстоўваць тойжа шрыфт што і аснатнія дастасаваньні"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:181
 msgid "color"
 msgstr "колер"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "апісаньне"
 
@@ -15845,7 +15370,7 @@ msgstr ""
 
 #. mail:camel-exception primary
 #: mail/mail-errors.xml.h:57
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgid "Your message with the subject \"{0}\" was not delivered."
 msgstr ""
 
 #. mail:camel-exception secondary
@@ -15911,11 +15436,6 @@ msgstr ""
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Немагчыма стварыць каталёг %s: %s"
 
-#. mail:no-save-path secondary
-#: mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail:no-create-path primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
@@ -15940,12 +15460,6 @@ msgstr ""
 msgid "Cannot create temporary save directory."
 msgstr "Неатрымалася стварыць часовы каталёг: %s"
 
-#. mail:no-create-tmp-path secondary
-#: mail/mail-errors.xml.h:100 mail/mail-errors.xml.h:112
-#: widgets/misc/e-system-errors.xml.h:11 widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail:no-write-path-exists secondary
 #: mail/mail-errors.xml.h:104
 #, fuzzy
@@ -16223,144 +15737,140 @@ msgstr "Перапісаць"
 msgid "_Append"
 msgstr "Асьпэн"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:785
 #, c-format
 msgid "Pinging %s"
 msgstr "Зандаваньне %s"
 
-#: mail/mail-mt.c:897
-msgid "Working"
-msgstr "Праца"
-
-#: mail/mail-ops.c:99
+#: mail/mail-ops.c:98
 msgid "Filtering Folder"
 msgstr "Фільтраваньне тэчкі"
 
-#: mail/mail-ops.c:260
+#: mail/mail-ops.c:259
 msgid "Fetching Mail"
 msgstr "Атрыманьне пошты"
 
-#: mail/mail-ops.c:543
+#: mail/mail-ops.c:542
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Збой пад час захаваньня пошты ў часовым файле %s: %s"
 
-#: mail/mail-ops.c:568
+#: mail/mail-ops.c:567
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:577
+#: mail/mail-ops.c:576
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Збой пад час захаваньня пошты ў часовым файле %s: %s"
 
-#: mail/mail-ops.c:673
+#: mail/mail-ops.c:672
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Адпраўленьне паведамленьня %d з %d"
 
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:703
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Неатрымалася дэкадаваць паведамленьне."
 
-#: mail/mail-ops.c:708
+#: mail/mail-ops.c:707
 msgid "Complete."
 msgstr "Выканана."
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:804
 msgid "Saving message to folder"
 msgstr "Захаваньне паведамленьня ў тэчцы"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Перамяшчэньне паведамленьняў у %s"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Капіяваньне паведамленьняў у %s"
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:1002
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Сканаваньне тэчак у \"%s\""
 
-#: mail/mail-ops.c:1116
+#: mail/mail-ops.c:1115
 msgid "Forwarded messages"
 msgstr "Перадасланыя паведамленьні"
 
-#: mail/mail-ops.c:1159
+#: mail/mail-ops.c:1158
 #, c-format
 msgid "Opening folder %s"
 msgstr "Адкрыцьцё тэчкі \"%s\""
 
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1230
 #, c-format
 msgid "Opening store %s"
 msgstr "Адкрыцьцё сховішча %s"
 
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1308
 #, c-format
 msgid "Removing folder %s"
 msgstr "Выдаленьне тэчкі %s"
 
-#: mail/mail-ops.c:1403
+#: mail/mail-ops.c:1402
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Захаваньне тэчкі \"%s\""
 
-#: mail/mail-ops.c:1468
+#: mail/mail-ops.c:1467
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1469
+#: mail/mail-ops.c:1468
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Захаваньне тэчкі \"%s\""
 
-#: mail/mail-ops.c:1524
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr "Абнаўленьне тэчкі"
 
-#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
+#: mail/mail-ops.c:1559 mail/mail-ops.c:1610
 msgid "Expunging folder"
 msgstr "Выкрэсьленьне тэчкі"
 
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1607
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Спусташэньне сьметніцы ў \"%s\""
 
-#: mail/mail-ops.c:1609
+#: mail/mail-ops.c:1608
 msgid "Local Folders"
 msgstr "Лакальныя тэчкі"
 
-#: mail/mail-ops.c:1692
+#: mail/mail-ops.c:1691
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Атрыманьне паведамленьня %s"
 
-#: mail/mail-ops.c:1764
+#: mail/mail-ops.c:1763
 #, fuzzy, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Атрыманьне %d паведамленьняў"
 msgstr[1] "Атрыманьне %d паведамленьняў"
 
-#: mail/mail-ops.c:1850
+#: mail/mail-ops.c:1849
 #, fuzzy, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Захаваньне %d паведамленьняў"
 msgstr[1] "Захаваньне %d паведамленьняў"
 
-#: mail/mail-ops.c:1900
+#: mail/mail-ops.c:1899
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -16369,7 +15879,7 @@ msgstr ""
 "Неатрымалася стварыць файл вываду: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1928
+#: mail/mail-ops.c:1927
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -16378,11 +15888,11 @@ msgstr ""
 "Памылка захаваньня паведамленьняў у: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1999
+#: mail/mail-ops.c:1998
 msgid "Saving attachment"
 msgstr "Захаваньне ўкладаньня"
 
-#: mail/mail-ops.c:2016
+#: mail/mail-ops.c:2015
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -16391,17 +15901,17 @@ msgstr ""
 "Неатрымалася стварыць файл вываду: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2046
+#: mail/mail-ops.c:2045
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Немагчыма запісаць даньні: %s"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Адлучэньне ад %s"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Перадалучэньне да %s"
@@ -16466,24 +15976,24 @@ msgstr "Абнаўленьне..."
 msgid "Waiting..."
 msgstr "Чаканьне..."
 
-#: mail/mail-session.c:238
+#: mail/mail-session.c:239
 msgid "User canceled operation."
 msgstr "Апэрацыя адменена карыстальнікам."
 
-#: mail/mail-session.c:271
+#: mail/mail-session.c:272
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Пазначце пароль для %s"
 
-#: mail/mail-session.c:273
+#: mail/mail-session.c:274
 msgid "Enter Password"
 msgstr "Пазначце пароль"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password"
 msgstr "_Запомніць гэты пароль"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:298
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Запомніць гэты пароль да завяршэньня сэанса"
 
@@ -16540,79 +16050,79 @@ msgstr "Абнаўленьне віртуальнае тэчкі на URI: %s"
 msgid "Updating vFolders for '%s'"
 msgstr "Абнаўленьне віртуальнае тэчкі на URI: %s"
 
-#: mail/mail-vfolder.c:959
+#: mail/mail-vfolder.c:958
 msgid "vFolders"
 msgstr "Віртуальныя тэчкі"
 
-#: mail/mail-vfolder.c:998
+#: mail/mail-vfolder.c:997
 msgid "Edit VFolder"
 msgstr "Рэдагаваньне віртуальных тэчак"
 
-#: mail/mail-vfolder.c:1082
+#: mail/mail-vfolder.c:1081
 msgid "New VFolder"
 msgstr "Новая віртуальная тэчка"
 
-#: mail/message-list.c:946
+#: mail/message-list.c:948
 msgid "Unseen"
 msgstr "Нечытанае"
 
-#: mail/message-list.c:947
+#: mail/message-list.c:949
 msgid "Seen"
 msgstr "Прагледзенае"
 
-#: mail/message-list.c:948
+#: mail/message-list.c:950
 msgid "Answered"
 msgstr "Адказанае"
 
-#: mail/message-list.c:949
+#: mail/message-list.c:951
 msgid "Multiple Unseen Messages"
 msgstr "Шматлікія непрагледзеныя паведамленьні"
 
-#: mail/message-list.c:950
+#: mail/message-list.c:952
 msgid "Multiple Messages"
 msgstr "Шматлікія паведамленьні"
 
-#: mail/message-list.c:954
+#: mail/message-list.c:956
 msgid "Lowest"
 msgstr "Ніжэйшы"
 
-#: mail/message-list.c:955
+#: mail/message-list.c:957
 msgid "Lower"
 msgstr "Ніжей"
 
-#: mail/message-list.c:959
+#: mail/message-list.c:961
 msgid "Higher"
 msgstr "Высокі"
 
-#: mail/message-list.c:960
+#: mail/message-list.c:962
 msgid "Highest"
 msgstr "Вышэйшы"
 
-#: mail/message-list.c:1279
+#: mail/message-list.c:1285
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1286
+#: mail/message-list.c:1292
 msgid "Today %l:%M %p"
 msgstr "Сёньня %I:%M %p"
 
-#: mail/message-list.c:1295
+#: mail/message-list.c:1301
 msgid "Yesterday %l:%M %p"
 msgstr "Учора %l:%M %p"
 
-#: mail/message-list.c:1307
+#: mail/message-list.c:1313
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1315
+#: mail/message-list.c:1321
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1317
+#: mail/message-list.c:1323
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3300
+#: mail/message-list.c:3321
 msgid "Generating message list"
 msgstr "Стварэньне сьпісу паведамленьняў"
 
@@ -16668,6 +16178,10 @@ msgstr "Перадаслаць"
 msgid "No Response Necessary"
 msgstr "Можна не адказваць"
 
+#: mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Чытаньне"
+
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Адказаць"
@@ -16770,45 +16284,49 @@ msgid ""
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:10
-msgid "Whether Evolution should start up in offline mode"
+msgid "Toolbar is visible"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:11
-msgid "Whether to skip the development warning dialog"
+msgid "Whether Evolution should start up in offline mode"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Whether the toolbar should be visible."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:14
 #, fuzzy
 msgid "mail"
 msgstr "Э. пошта"
 
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
-msgstr ""
-
-#: shell/e-shell.c:545 shell/e-shell.c:546
+#: shell/e-shell.c:588 shell/e-shell.c:589
 #, fuzzy, c-format
 msgid "%ld KB"
 msgstr "%d %B"
 
-#: shell/e-shell.c:744
+#: shell/e-shell.c:786
 #, fuzzy
 msgid "Uknown system error."
 msgstr "Невядомая памылка"
 
-#: shell/e-shell.c:1101
+#: shell/e-shell.c:1143
 msgid "Invalid arguments"
 msgstr "Недапушчальныя аргумэнты"
 
-#: shell/e-shell.c:1103
+#: shell/e-shell.c:1145
 msgid "Cannot register on OAF"
 msgstr "Неатрымалася зарэгістраваць на OAF"
 
-#: shell/e-shell.c:1105
+#: shell/e-shell.c:1147
 msgid "Configuration Database not found"
 msgstr "Адсутніча канфігурацыя базы даньняў"
 
-#: shell/e-shell.c:1107
+#: shell/e-shell.c:1149
 msgid "Generic error"
 msgstr "Звычайная памылка"
 
@@ -16864,7 +16382,7 @@ msgstr ""
 msgid "Select importer"
 msgstr "Выбраць імпарт"
 
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1026
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
 #, c-format
 msgid "File %s does not exist"
 msgstr "файл \"%s\" не існуе"
@@ -16892,35 +16410,35 @@ msgstr ""
 "Імпартаваньне %s\n"
 "Імпартаваньне 1 элемэнта."
 
-#: shell/e-shell-importer.c:549
+#: shell/e-shell-importer.c:570
 msgid "Automatic"
 msgstr "Аўтаматычна"
 
-#: shell/e-shell-importer.c:598
+#: shell/e-shell-importer.c:626
 #, fuzzy
-msgid "_Filename:"
+msgid "F_ilename:"
 msgstr "Назва файла:"
 
-#: shell/e-shell-importer.c:603
+#: shell/e-shell-importer.c:631
 msgid "Select a file"
 msgstr "Выбярыце файл"
 
-#: shell/e-shell-importer.c:613
+#: shell/e-shell-importer.c:642
 #, fuzzy
 msgid "File _type:"
 msgstr "Тып файла:"
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:681
 #, fuzzy
 msgid "Import data and settings from _older programs"
 msgstr "Імпартаваньне даньняў і усталёвак са старых праграм"
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:684
 #, fuzzy
 msgid "Import a _single file"
 msgstr "Імпартаваньне асобнага файла"
 
-#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -16928,26 +16446,26 @@ msgstr ""
 "Калі ласка пачакайце...\n"
 "Сканаваньне існуючых усталёвак"
 
-#: shell/e-shell-importer.c:727
+#: shell/e-shell-importer.c:756
 msgid "Starting Intelligent Importers"
 msgstr "Запуск інтэлектуальнага імпарту"
 
-#: shell/e-shell-importer.c:853 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
 #, c-format
 msgid "From %s:"
 msgstr "Ад %s:"
 
-#: shell/e-shell-importer.c:1044
+#: shell/e-shell-importer.c:1073
 #, fuzzy, c-format
 msgid "No importer available for file %s"
 msgstr "Правайдэр для пратакола \"%s\" недаступны"
 
-#: shell/e-shell-importer.c:1056
+#: shell/e-shell-importer.c:1085
 #, fuzzy
 msgid "Unable to execute importer"
 msgstr "Збой выкананьня gpg."
 
-#: shell/e-shell-importer.c:1169
+#: shell/e-shell-importer.c:1199
 #, fuzzy
 msgid "_Import"
 msgstr "Імпарт"
@@ -16993,61 +16511,61 @@ msgstr "Назва тэчкі ня мусіць ўтрымліваць сымб�
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' і '..' зарэзэрваваныя назвы тэчак."
 
-#: shell/e-shell-window.c:336
+#: shell/e-shell-window.c:337
 #, fuzzy
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "\"Эвалюцыя\" працуе ў далучаным рэжыме.  Клікніце на гэтую кнопку каб "
 "працаваць у адлучаным рэжыме."
 
-#: shell/e-shell-window.c:343
+#: shell/e-shell-window.c:344
 #, fuzzy
 msgid "Evolution is in the process of going offline."
 msgstr "Эвалюцыя пераходзіць да працы ў адлучаным рэжымн."
 
-#: shell/e-shell-window.c:349
+#: shell/e-shell-window.c:350
 #, fuzzy
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "\"Эвалюцыя\" працуе ў адлучаным рэжыме.  Клікніце на гэтую кнопку каб "
 "працаваць у далучаным рэжыме."
 
-#: shell/e-shell-window.c:621
+#: shell/e-shell-window.c:637
 #, fuzzy, c-format
 msgid "Switch to %s"
 msgstr "Даслаць на %s"
 
-#: shell/e-shell-window-commands.c:64
+#: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Сродкі GNOME для сувязі з \"Пілётам\" не ўсталяваныя на гэтае сыстэме."
 
-#: shell/e-shell-window-commands.c:72
+#: shell/e-shell-window-commands.c:74
 #, c-format
 msgid "Error executing %s."
 msgstr "Памылка выкананьня: %s"
 
-#: shell/e-shell-window-commands.c:121
+#: shell/e-shell-window-commands.c:123
 msgid "Bug buddy is not installed."
 msgstr "\"Bug buddy\" не ўсталяваны."
 
-#: shell/e-shell-window-commands.c:129
+#: shell/e-shell-window-commands.c:131
 msgid "Bug buddy could not be run."
 msgstr "\"Bug buddy\" не запушчаны."
 
-#: shell/e-shell-window-commands.c:171
+#: shell/e-shell-window-commands.c:323
 #, fuzzy
-msgid "About Evolution"
-msgstr "Пра \"Эвалюцыю\" Ximian"
+msgid "Groupware Suite"
+msgstr "Група"
 
-#: shell/e-shell-window-commands.c:382
+#: shell/e-shell-window-commands.c:563
 msgid "_Work Online"
 msgstr "_Далучаны рэжым"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "_Адлучаны рэжым"
 
-#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Працаваць у адлучаным рэжыме"
 
@@ -17059,43 +16577,6 @@ msgstr "Пазначальнік"
 msgid "New"
 msgstr "Стварыць"
 
-#: shell/evolution-shell-component-utils.c:115
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Невядомая памылка."
-
-#: shell/evolution-shell-component-utils.c:118
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Памылка ад актывацыі кампанэнта сыстэмы:\n"
-"%s"
-
-#: shell/evolution-shell-component-utils.c:125
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Памылка ад актывацыі сыстэмы:\n"
-"%s"
-
 #: shell/evolution-test-component.c:140
 #, fuzzy
 msgid "New Test"
@@ -17419,34 +16900,34 @@ msgid ""
 "Click help for details."
 msgstr ""
 
-#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:522
+#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
+#: smime/gui/certificate-manager.c:556
 #, fuzzy
 msgid "Select a cert to import..."
 msgstr "Выбраць імпарт"
 
-#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:604
+#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
+#: smime/gui/certificate-manager.c:638
 #, fuzzy
 msgid "Certificate Name"
 msgstr "_Ід сэртыфіката:"
 
-#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
+#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
 #, fuzzy
 msgid "Purposes"
 msgstr "Выкананьне"
 
-#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:517
+#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:267
+#: smime/gui/certificate-manager.c:271
 #, fuzzy
 msgid "Expires"
 msgstr "Выраз"
 
-#: smime/gui/certificate-manager.c:417
+#: smime/gui/certificate-manager.c:446
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "Адрэса пошты:"
@@ -17489,6 +16970,11 @@ msgid ""
 "  Subject: %s\n"
 msgstr ""
 
+#: smime/gui/e-cert-selector.c:169
+#, fuzzy
+msgid "Select certificate"
+msgstr "Ісьці да пазначанай даты"
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -17549,7 +17035,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
 #, fuzzy
 msgid "Certificate"
 msgstr "_Ід сэртыфіката:"
@@ -17574,20 +17060,24 @@ msgstr "Агульная назва"
 msgid "Contact Certificates"
 msgstr "_Ід сэртыфіката:"
 
-#: smime/gui/smime-ui.glade.h:21
-#, no-c-format
-msgid "Do you want to trust \"%s\" for the following purposes?"
+#: smime/gui/smime-ui.glade.h:20
+msgid "Do not trust the authenticity of this certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:21
 msgid "Dummy window only"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:22
 #, fuzzy
 msgid "Edit"
 msgstr "_Рэдагаваньне"
 
+#: smime/gui/smime-ui.glade.h:23
+#, fuzzy
+msgid "Email Certificate Trust Settings"
+msgstr "Некарэктная аўтарызацыя сэртыфіката (CA)"
+
 #: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr ""
@@ -17624,279 +17114,288 @@ msgstr "Пасада"
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:37
-msgid "Trust this CA to identify email users."
+msgid "Trust the authenticity of this certificate"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:38
-msgid "Trust this CA to identify software developers."
+msgid "Trust this CA to identify email users."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:39
-msgid "Trust this CA to identify web sites."
+msgid "Trust this CA to identify software developers."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:40
-#, fuzzy
-msgid "View"
-msgstr "Выгляд"
+msgid "Trust this CA to identify web sites."
+msgstr ""
 
 #: smime/gui/smime-ui.glade.h:41
 #, fuzzy
-msgid "View Certificate"
-msgstr "_Ід сэртыфіката:"
+msgid "View"
+msgstr "Выгляд"
 
 #: smime/gui/smime-ui.glade.h:42
-#, fuzzy
-msgid "You have been asked to trust a new Certificate Authority (CA)."
-msgstr "Некарэктная аўтарызацыя сэртыфіката (CA)"
-
-#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:44
+#: smime/gui/smime-ui.glade.h:43
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:45
+#: smime/gui/smime-ui.glade.h:44
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:46
+#: smime/gui/smime-ui.glade.h:45
 #, fuzzy
 msgid "Your Certificates"
 msgstr "_Ід сэртыфіката:"
 
-#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
+#: smime/gui/smime-ui.glade.h:46
+msgid "_Edit CA Trust"
+msgstr ""
+
+#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 #, fuzzy
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
-#: smime/lib/e-cert.c:478
+#. x509 certificate usage types
+#: smime/lib/e-cert.c:424
+#, fuzzy
+msgid "Sign"
+msgstr "Запускаецца:"
+
+#: smime/lib/e-cert.c:425
+#, fuzzy
+msgid "Encrypt"
+msgstr "Кадаваньне PGP"
+
+#: smime/lib/e-cert.c:530
 #, fuzzy
 msgid "Version"
 msgstr "месяц"
 
-#: smime/lib/e-cert.c:493
+#: smime/lib/e-cert.c:545
 #, fuzzy
 msgid "Version 1"
 msgstr "месяц"
 
-#: smime/lib/e-cert.c:496
+#: smime/lib/e-cert.c:548
 #, fuzzy
 msgid "Version 2"
 msgstr "месяц"
 
-#: smime/lib/e-cert.c:499
+#: smime/lib/e-cert.c:551
 #, fuzzy
 msgid "Version 3"
 msgstr "месяц"
 
-#: smime/lib/e-cert.c:581
+#: smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:584
+#: smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:587
+#: smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:590
+#: smime/lib/e-cert.c:642
 #, fuzzy
 msgid "C"
 msgstr " °C"
 
-#: smime/lib/e-cert.c:593
+#: smime/lib/e-cert.c:645
 #, fuzzy
 msgid "CN"
 msgstr "N"
 
-#: smime/lib/e-cert.c:596
+#: smime/lib/e-cert.c:648
 msgid "OU"
 msgstr ""
 
-#: smime/lib/e-cert.c:599
+#: smime/lib/e-cert.c:651
 #, fuzzy
 msgid "O"
 msgstr "Так"
 
-#: smime/lib/e-cert.c:602
+#: smime/lib/e-cert.c:654
 msgid "L"
 msgstr ""
 
-#: smime/lib/e-cert.c:605
+#: smime/lib/e-cert.c:657
 #, fuzzy
 msgid "DN"
 msgstr "N"
 
-#: smime/lib/e-cert.c:608
+#: smime/lib/e-cert.c:660
 msgid "DC"
 msgstr ""
 
-#: smime/lib/e-cert.c:611
+#: smime/lib/e-cert.c:663
 #, fuzzy
 msgid "ST"
 msgstr "SMTP"
 
-#: smime/lib/e-cert.c:614
+#: smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:617
+#: smime/lib/e-cert.c:669
 #, fuzzy
 msgid "Certificate Key Usage"
 msgstr "_Ід сэртыфіката:"
 
-#: smime/lib/e-cert.c:620
+#: smime/lib/e-cert.c:672
 #, fuzzy
 msgid "Netscape Certificate Type"
 msgstr "_Ід сэртыфіката:"
 
-#: smime/lib/e-cert.c:623
+#: smime/lib/e-cert.c:675
 #, fuzzy
 msgid "Certificate Authority Key Identifier"
 msgstr "Сэртыфікат ненадзейны"
 
-#: smime/lib/e-cert.c:626
+#: smime/lib/e-cert.c:678
 #, fuzzy
 msgid "UID"
 msgstr "Iд"
 
-#: smime/lib/e-cert.c:635
+#: smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr ""
 
-#: smime/lib/e-cert.c:686
+#: smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:694
+#: smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
 msgstr ""
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:768
 msgid "Subject Public Key Info"
 msgstr ""
 
-#: smime/lib/e-cert.c:721
+#: smime/lib/e-cert.c:773
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:736
+#: smime/lib/e-cert.c:788
 #, fuzzy
 msgid "Subject's Public Key"
 msgstr "Тэма %s"
 
-#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
+#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
 #, fuzzy
 msgid "Error: Unable to process extension"
 msgstr "Неатрымалася апрацаваць тэчку спула"
 
-#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
+#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:782
+#: smime/lib/e-cert.c:834
 #, fuzzy
 msgid "SSL Certificate Authority"
 msgstr "Некарэктная аўтарызацыя сэртыфіката (CA)"
 
-#: smime/lib/e-cert.c:786
+#: smime/lib/e-cert.c:838
 #, fuzzy
 msgid "Email Certificate Authority"
 msgstr "Некарэктная аўтарызацыя сэртыфіката (CA)"
 
-#: smime/lib/e-cert.c:814
+#: smime/lib/e-cert.c:866
 #, fuzzy
 msgid "Signing"
 msgstr "Запускаецца:"
 
-#: smime/lib/e-cert.c:818
+#: smime/lib/e-cert.c:870
 #, fuzzy
 msgid "Non-repudiation"
 msgstr "Зьвесткі адсутнічаюць"
 
-#: smime/lib/e-cert.c:822
+#: smime/lib/e-cert.c:874
 msgid "Key Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:826
+#: smime/lib/e-cert.c:878
 #, fuzzy
 msgid "Data Encipherment"
 msgstr "укладаньне"
 
-#: smime/lib/e-cert.c:830
+#: smime/lib/e-cert.c:882
 msgid "Key Agreement"
 msgstr ""
 
-#: smime/lib/e-cert.c:834
+#: smime/lib/e-cert.c:886
 #, fuzzy
 msgid "Certificate Signer"
 msgstr "_Ід сэртыфіката:"
 
-#: smime/lib/e-cert.c:838
+#: smime/lib/e-cert.c:890
 msgid "CRL Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:938
 #, fuzzy
 msgid "Critical"
 msgstr "Харватыя"
 
-#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
+#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
 msgid "Not Critical"
 msgstr ""
 
-#: smime/lib/e-cert.c:912
+#: smime/lib/e-cert.c:964
 #, fuzzy
 msgid "Extensions"
 msgstr "Выраз"
 
-#: smime/lib/e-cert.c:983
+#: smime/lib/e-cert.c:1035
 #, fuzzy, c-format
 msgid "%s = %s"
 msgstr "%s на %s"
 
-#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
 #, fuzzy
 msgid "Certificate Signature Algorithm"
 msgstr "Подпіс сэртыфіката памылковы"
 
-#: smime/lib/e-cert.c:1048
+#: smime/lib/e-cert.c:1100
 #, fuzzy
 msgid "Issuer"
 msgstr "Уставіць"
 
-#: smime/lib/e-cert.c:1102
+#: smime/lib/e-cert.c:1154
 msgid "Issuer Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1121
+#: smime/lib/e-cert.c:1173
 #, fuzzy
 msgid "Subject Unique ID"
 msgstr "Тэма %s"
 
-#: smime/lib/e-cert.c:1164
+#: smime/lib/e-cert.c:1216
 #, fuzzy
 msgid "Certificate Signature Value"
 msgstr "Подпіс сэртыфіката памылковы"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
+#: smime/lib/e-cert-db.c:608
 #, fuzzy
 msgid "Certificate already exists"
 msgstr "Ід карткі ужо існуе"
@@ -18046,7 +17545,7 @@ msgstr "Прагледзіць бягучы кантакт"
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "_Дзеяньні"
 
@@ -18214,7 +17713,7 @@ msgstr "_Закрыць"
 #: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:3
+#: ui/evolution.xml.h:4
 msgid "Close"
 msgstr "Закрыць"
 
@@ -18227,7 +17726,7 @@ msgid "Delete this item"
 msgstr "Выдаліць гэты элемэнт"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr "Мая панэля інструмэнта"
 
@@ -18271,7 +17770,7 @@ msgstr "Захаваць гэты элемэнт на дыск"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:44
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "_File"
 msgstr "_Файл"
 
@@ -18532,13 +18031,13 @@ msgstr "_Інвертаваць вылучэньне"
 msgid "_Threaded Message List"
 msgstr "Паведамленьні як абмеркаваньне тэмы"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Закрыць гэтае акно"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "_Close"
 msgstr "Закрыць"
 
@@ -18950,7 +18449,7 @@ msgstr "Папярэдняе паведамленьне"
 msgid "_Quoted"
 msgstr "_Цытавана"
 
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
 msgid "_Tools"
 msgstr "Інструмэнты"
 
@@ -19252,108 +18751,122 @@ msgid "_Open Task"
 msgstr "_Заданьне"
 
 #: ui/evolution.xml.h:1
-msgid "About Ximian Evolution..."
-msgstr "Пра \"Эвалюцыю\" Ximian..."
+#, fuzzy
+msgid "About Evolution..."
+msgstr "Пра \"Эвалюцыю\" Ximian"
 
 #: ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
 msgstr "Зьмяніць наладкі \"Эвалюцыі\""
 
-#: ui/evolution.xml.h:5
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the visibility of the toolbar"
+msgstr "Зьмяніць уласьцівасьці гэтае тэчкі"
+
+#: ui/evolution.xml.h:6
 msgid "Create a new window displaying this folder"
 msgstr "Стварыць новае акно для адлюстраваньня гэтае тэчкі"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "Выхад"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Частыя пытаньні"
+
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Выйсьці з праграмы"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:10
 msgid "Forget _Passwords"
 msgstr "Забыцца на _пароль"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:11
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:12
 msgid "Import data from other programs"
 msgstr "Імпартаваць даньні з іншай праграмы"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:14
 #, fuzzy
 msgid "New _Window"
 msgstr "_Шукаць зараз"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Pi_lot Settings..."
 msgstr "Наладкі \"Пілёта\"..."
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Send / Receive"
 msgstr "Даслаць / Атрымаць"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Send queued items and retrieve new items"
 msgstr "Даслаць паведамленьні з чаргі й атрымаць новыя"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Set up Pilot configuration"
 msgstr "Наладзіць \"Пілёт\""
 
-#: ui/evolution.xml.h:17
-msgid "Show information about Ximian Evolution"
+#: ui/evolution.xml.h:19
+#, fuzzy
+msgid "Show information about Evolution"
 msgstr "Паказаць інфармацыю пра \"Эвалюцыю\" Ximian"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:20
 msgid "Submit Bug Report"
 msgstr "Даслаць паведамленьне аб памылках"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:21
 msgid "Submit _Bug Report"
 msgstr "Даслаць паведамленьне аб памылках"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Даслаць паведамленьне аб памылках карыстаючыся \"Bug Buddy\""
 
-#: ui/evolution.xml.h:21
-msgid "Toggle whether we are working offline."
-msgstr "Пераключыць у выпадку працы ў адлучаным рэжыме."
-
 #: ui/evolution.xml.h:23
-msgid "Ximian Evolution _FAQ"
-msgstr "Частыя пытаньні"
+#, fuzzy
+msgid "T_oolbar"
+msgstr "Мая панэля інструмэнта"
 
 #: ui/evolution.xml.h:24
-msgid "_About Ximian Evolution..."
-msgstr "_Пра \"Эвалюцыю\" Ximian"
+msgid "Toggle whether we are working offline."
+msgstr "Пераключыць у выпадку працы ў адлучаным рэжыме."
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "_About Evolution..."
+msgstr "Пра \"Эвалюцыю\" Ximian"
+
+#: ui/evolution.xml.h:30
 msgid "_Help"
 msgstr "_Дапамога"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "_Import..."
 msgstr "_Імпартаваць..."
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "_New"
 msgstr "_Стварыць"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 #, fuzzy
 msgid "_Quick Reference"
 msgstr "Перавагі пошты"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_Send / Receive"
 msgstr "Даслаць / Атрымаць"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 #, fuzzy
 msgid "_Window"
 msgstr "_Шукаць зараз"
@@ -19432,7 +18945,7 @@ msgid "With _Status"
 msgstr "Усталяваць стан"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:626
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:635
 msgid "UTC"
 msgstr "UTC"
 
@@ -19589,29 +19102,29 @@ msgstr "Іншае..."
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
-#: widgets/misc/e-error.c:121
+#: widgets/misc/e-error.c:79 widgets/misc/e-error.c:80
+#: widgets/misc/e-error.c:122
 msgid "Evolution Error"
 msgstr "Памылка \"Эвалюцыі\""
 
-#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
-#: widgets/misc/e-error.c:119
+#: widgets/misc/e-error.c:81 widgets/misc/e-error.c:82
+#: widgets/misc/e-error.c:120
 #, fuzzy
 msgid "Evolution Warning"
 msgstr "Пошта \"Эвалюцыі\""
 
-#: widgets/misc/e-error.c:118
+#: widgets/misc/e-error.c:119
 #, fuzzy
 msgid "Evolution Information"
 msgstr "Зьвесткі аб нарадзе"
 
-#: widgets/misc/e-error.c:120
+#: widgets/misc/e-error.c:121
 #, fuzzy
 msgid "Evolution Query"
 msgstr "Агульныя зьвесткі \"Эвалюцыі\""
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:410
+#: widgets/misc/e-error.c:415
 #, fuzzy, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -19765,16 +19278,511 @@ msgstr ""
 "Немагчыма захаваць у `%s'\n"
 " %s"
 
-#: widgets/misc/e-task-widget.c:211
+#: widgets/misc/e-task-widget.c:212
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: widgets/misc/e-task-widget.c:216
+#: widgets/misc/e-task-widget.c:217
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% завершана)"
 
+#~ msgid "Failed to connect to LDAP server"
+#~ msgstr "Збой далучэньня да паслужніка LDAP"
+
+#~ msgid "Failed to authenticate with LDAP server"
+#~ msgstr "Збой аўтарызацыі на паслужніку LDAP"
+
+#~ msgid "Could not perform query on Root DSE"
+#~ msgstr "Немагчыма выканаць запыт да карэннага DSE"
+
+#~ msgid "The server responded with no supported search bases"
+#~ msgstr "Паслужнік адказаў: \"адсутнічаюць базы пошуку\""
+
+#~ msgid "This server does not support LDAPv3 schema information"
+#~ msgstr "Паслужнік не падтрымлівае звесткі схемы LDAPv3"
+
+#~ msgid "Error retrieving schema information"
+#~ msgstr "Памылка атрыманьня зьвестак схемы"
+
+#~ msgid "Server did not respond with valid schema information"
+#~ msgstr "Паслужнік не адказаў з рэчаіснымі зьвесткамі схемы"
+
+#~ msgid "  S_how Supported Bases "
+#~ msgstr "  _Адлюстраваць базы, якія падтрымліваюцца"
+
+#~ msgid "1:00"
+#~ msgstr "1:00"
+
+#~ msgid "5:00"
+#~ msgstr "5:00"
+
+#~ msgid "Connecting"
+#~ msgstr "Далучэньне"
+
+#~ msgid "Distinguished _name:"
+#~ msgstr "_Удакладнёная назва:"
+
+#~ msgid "Email address:"
+#~ msgstr "Э.пошта:"
+
+#~ msgid "Evolution will use this DN to authenticate you with the server"
+#~ msgstr ""
+#~ "\"Эвалюцыя\" будзе выкарыстоўваць гэтае DN для аўтарызацыі на паслужніку"
+
+#~ msgid "One"
+#~ msgstr "Адзін"
+
+#~ msgid "S_earch scope: "
+#~ msgstr "Межы _пошуку:"
+
+#~ msgid "Searching"
+#~ msgstr "Пошук"
+
+#~ msgid "Sub"
+#~ msgstr "Пад"
+
+#~ msgid "This option controls how long a search will be run."
+#~ msgstr "Гэтая можнасьць кантралюе працягласьць пошуку."
+
+#~ msgid "U_se SSL/TLS:"
+#~ msgstr "Вы_карыстоўваць SSL/TLS:"
+
+#~ msgid "_Display name:"
+#~ msgstr "_Назва для адлюстраваньня:"
+
+#~ msgid "_Port number:"
+#~ msgstr "_Нумар порта:"
+
+#~ msgid "_Search base:"
+#~ msgstr "_База пошуку:"
+
+#~ msgid "_Server name:"
+#~ msgstr "_Назва паслужніка:"
+
+#~ msgid "_Timeout (minutes):"
+#~ msgstr "_Таймаут (хвіліны):"
+
+#~ msgid "connecting-tab"
+#~ msgstr "закладка далучэньня"
+
+#~ msgid "general-tab"
+#~ msgstr "агульная закладка"
+
+#~ msgid "searching-tab"
+#~ msgstr "закладка пошуку"
+
+#, fuzzy
+#~ msgid "Job title:"
+#~ msgstr "Паса_да:"
+
+#, fuzzy
+#~ msgid "Webcam:"
+#~ msgstr "Старонка"
+
+#~ msgid "Category editor not available."
+#~ msgstr "Адсутнічае катэгорыя рэдактара."
+
+#, fuzzy
+#~ msgid ""
+#~ "The following entries are invalid:\n"
+#~ "\n"
+#~ msgstr "Актыўныя у бягучы момант далучэньні:"
+
+#~ msgid "Could not find widget for a field: `%s'"
+#~ msgstr "Неатрымалася адшукаць віджэт для поля: \"%s\""
+
+#~ msgid "Do you want to save changes?"
+#~ msgstr "Жадаеце захаваць зьмены?"
+
+#~ msgid "Error saving %s: %s"
+#~ msgstr "Памылка захаваньня %s: %s"
+
+#~ msgid ""
+#~ "The addressbook backend for\n"
+#~ "%s\n"
+#~ "has crashed. You will have to restart Evolution in order to use it again"
+#~ msgstr ""
+#~ "Праграма кнігі адрэсаў для\n"
+#~ "%s\n"
+#~ "абрушылася. Вы мусіце перазапусьціць \"Эвалюцыю\" і паспрабаваць "
+#~ "выкарыстаць гэта нанава"
+
+#, fuzzy
+#~ msgid "Can not load URI"
+#~ msgstr "Картка ня адшукана"
+
+#, fuzzy
+#~ msgid "Calendar Properties"
+#~ msgstr "Памылка iCalendar"
+
+#, fuzzy
+#~ msgid "Remote"
+#~ msgstr "Выдаліць"
+
+#, fuzzy
+#~ msgid "Task List Properties"
+#~ msgstr "Зьпіс заданьняў"
+
+#, fuzzy
+#~ msgid "_Refresh Interval:"
+#~ msgstr "Абнавіць сьпіс"
+
+#, fuzzy
+#~ msgid "_Source URL:"
+#~ msgstr "URI крыніцы POP"
+
+#~ msgid ""
+#~ "The event being deleted is a meeting, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "Падзея што будзе выдалена гэта сустрэча, ці паведаміць пра яе адмену "
+#~ "іншым?"
+
+#~ msgid "Are you sure you want to cancel and delete this meeting?"
+#~ msgstr "Вы упэўненыя у тым, што жадаеце адмяніць і выдаліць гэтую сустрэчу?"
+
+#~ msgid ""
+#~ "The task being deleted is assigned, would you like to send a cancellation "
+#~ "notice?"
+#~ msgstr ""
+#~ "Заданьне якое будзе выдалена \"прызначана\", ці жадаеце вы даслаць "
+#~ "паведамленьне аб адмене?"
+
+#~ msgid "Are you sure you want to cancel and delete this task?"
+#~ msgstr "Вы упэўненыя ў тым, што жадаеце адмяніць і выдаліць гэтае заданьне?"
+
+#~ msgid ""
+#~ "The journal entry being deleted is published, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "Запіс часопіса які будзе выдалены апублікаваны, ці жадаеце даслаць "
+#~ "паведамленьне пра адмену?"
+
+#~ msgid "Are you sure you want to cancel and delete this journal entry?"
+#~ msgstr ""
+#~ "Вы упэўненыя ў тым, што жадаеце адмяніць і выдаліць гэты запіс часопіса?"
+
+#~ msgid "Are you sure you want to delete the appointment `%s'?"
+#~ msgstr "Вы упэўненыя што жадаеце выдаліць сустрэчу \"%s\"?"
+
+#~ msgid "Are you sure you want to delete this untitled appointment?"
+#~ msgstr "Вы упэўнены што жадаеце выдаліць гэтую сустрэчу бяз назвы?"
+
+#~ msgid "Are you sure you want to delete the task `%s'?"
+#~ msgstr "Вы упэўненыя што жадаеце выдаліць заданьне \"%s\"?"
+
+#~ msgid "Are you sure you want to delete this untitled task?"
+#~ msgstr "Вы упэўнены што жадаеце выдаліць гэтае заданьне бяз назвы?"
+
+#~ msgid "Are you sure you want to delete the journal entry `%s'?"
+#~ msgstr "Вы упэўненыя што жадаеце выдаліць запіс часопіса \"%s\"?"
+
+#~ msgid "Are you sure want to delete this untitled journal entry?"
+#~ msgstr "Вы упэўненыя што жадаеце выдаліць запіс часопіса бяз назвы?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d appointment?"
+#~ msgid_plural "Are you sure you want to delete %d appointments?"
+#~ msgstr[0] "Вы упэўненыя што жадаеце выдаліць %d сустрэч?"
+#~ msgstr[1] "Вы упэўненыя што жадаеце выдаліць %d сустрэч?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d task?"
+#~ msgid_plural "Are you sure you want to delete %d tasks?"
+#~ msgstr[0] "Вы упэўненыя што жадаеце выдаліць %d заданьняў?"
+#~ msgstr[1] "Вы упэўненыя што жадаеце выдаліць %d заданьняў?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d journal entry?"
+#~ msgid_plural "Are you sure you want to delete %d journal entries?"
+#~ msgstr[0] "Вы упэўненыя што жадаеце выдаліць %d запісаў часопіса?"
+#~ msgstr[1] "Вы упэўненыя што жадаеце выдаліць %d запісаў часопіса?"
+
+#~ msgid "_Invite Others..."
+#~ msgstr "_Запрасіць іншых..."
+
+#~ msgid ""
+#~ "This event has been changed, but has not been saved.\n"
+#~ "\n"
+#~ "Do you wish to save your changes?"
+#~ msgstr ""
+#~ "Гэтая падзея была зьменена, але не была захавана.\n"
+#~ "\n"
+#~ "Вы жадаеце захаваць зьмены?"
+
+#~ msgid "_Discard Changes"
+#~ msgstr "_Адкінуць зьмены"
+
+#~ msgid "Save Event"
+#~ msgstr "Захаваць падзею"
+
+#~ msgid "The meeting information has been created. Send it?"
+#~ msgstr "Зьвесткі па нарадзе створаны. Даслаць?"
+
+#~ msgid "The meeting information has changed. Send an updated version?"
+#~ msgstr "Зьвесткі па нарадзе зьменены. Даслаць і абнавіць вэрсыю?"
+
+#~ msgid "The task assignment information has been created. Send it?"
+#~ msgstr "Зьвесткі па заданьні створаны. Даслаць?"
+
+#~ msgid "The task information has changed. Send an updated version?"
+#~ msgstr "Зьвесткі па заданьні зьменены. Даслаць і абнавіць вэрсыю?"
+
+#, fuzzy
+#~ msgid "Could not get article %s from NNTP server"
+#~ msgstr "Немагчыма атрымаць групу: %s"
+
+#, fuzzy
+#~ msgid "Error posting message: %s: message not posted"
+#~ msgstr ""
+#~ "Памылка аўтазахаваньня паведамленьня: %s\n"
+#~ " %s"
+
+#, fuzzy
+#~ msgid "Stream error"
+#~ msgstr "памылка разбору"
+
+#, fuzzy
+#~ msgid "Connection error: %s"
+#~ msgstr "Невядомая памылка: %s"
+
+#~ msgid "Could not get group: %s"
+#~ msgstr "Немагчыма атрымаць групу: %s"
+
+#, fuzzy
+#~ msgid "Could not get messages: unspecified error"
+#~ msgstr "Неатрымалася даслаць паведамленьне: %s"
+
+#~ msgid "Unknown server response: %s"
+#~ msgstr "Невядомы адказ паслужніка: %s"
+
+#~ msgid "Adjust Score"
+#~ msgstr "Падправіць лік"
+
+#~ msgid "Assign Color"
+#~ msgstr "Зьвязаць колер"
+
+#~ msgid "Assign Score"
+#~ msgstr "Прызначыць лік"
+
+#~ msgid "Attachments"
+#~ msgstr "Укладаньні"
+
+#~ msgid "Beep"
+#~ msgstr "Сыгнал"
+
+#~ msgid "contains"
+#~ msgstr "утрымлівае"
+
+#~ msgid "Copy to Folder"
+#~ msgstr "Капіяваць у тэчку"
+
+#~ msgid "Date received"
+#~ msgstr "Дата атрыманьня"
+
+#~ msgid "Date sent"
+#~ msgstr "Дата адпраўленьня"
+
+#~ msgid "Deleted"
+#~ msgstr "Выдаленае"
+
+#~ msgid "does not contain"
+#~ msgstr "ня ўтрымлівае"
+
+#~ msgid "does not end with"
+#~ msgstr "не сканчаецца на"
+
+#~ msgid "does not exist"
+#~ msgstr "ня існуе"
+
+#~ msgid "does not return"
+#~ msgstr "не вяртае"
+
+#~ msgid "does not sound like"
+#~ msgstr "не гучыць як"
+
+#~ msgid "does not start with"
+#~ msgstr "не пачынаецца на"
+
+#~ msgid "Do Not Exist"
+#~ msgstr "Неіснуе"
+
+#~ msgid "Draft"
+#~ msgstr "Чарнавік"
+
+#~ msgid "ends with"
+#~ msgstr "сканчаецца на"
+
+#~ msgid "Exist"
+#~ msgstr "Існуе"
+
+#~ msgid "exists"
+#~ msgstr "існуе"
+
+#~ msgid "Expression"
+#~ msgstr "Выраз"
+
+#~ msgid "Follow Up"
+#~ msgstr "Падняцца вышэй"
+
+#~ msgid "is"
+#~ msgstr "гэта"
+
+#~ msgid "is after"
+#~ msgstr "пасьля"
+
+#~ msgid "is before"
+#~ msgstr "перад"
+
+#~ msgid "is Flagged"
+#~ msgstr "пазначана"
+
+#~ msgid "is greater than"
+#~ msgstr "больш за"
+
+#~ msgid "is less than"
+#~ msgstr "менш за"
+
+#~ msgid "is not"
+#~ msgstr "ня гэта"
+
+#~ msgid "is not Flagged"
+#~ msgstr "не пазначана"
+
+#, fuzzy
+#~ msgid "Junk Test"
+#~ msgstr "Чэрвень"
+
+#~ msgid "Mailing list"
+#~ msgstr "Сьпіс рассылкі"
+
+#~ msgid "Message Body"
+#~ msgstr "Цела паведамленьня"
+
+#~ msgid "Message Header"
+#~ msgstr "Загаловак паведамленьня"
+
+#, fuzzy
+#~ msgid "Message is Junk"
+#~ msgstr "Паведамленьні"
+
+#, fuzzy
+#~ msgid "Message is not Junk"
+#~ msgstr "Пазначыць як важнае"
+
+#~ msgid "Move to Folder"
+#~ msgstr "Перамясьціць у тэчку"
+
+#, fuzzy
+#~ msgid "Pipe to Program"
+#~ msgstr "Выйсьці з праграмы"
+
+#~ msgid "Play Sound"
+#~ msgstr "Граць гук"
+
+#~ msgid "Recipients"
+#~ msgstr "Атрымоўцы"
+
+#~ msgid "Regex Match"
+#~ msgstr "Супадзеньне стал.выраза"
+
+#~ msgid "Replied to"
+#~ msgstr "Адказана на"
+
+#~ msgid "returns"
+#~ msgstr "вяртае"
+
+#~ msgid "returns greater than"
+#~ msgstr "вяртае больш за"
+
+#~ msgid "returns less than"
+#~ msgstr "вяртае менш за"
+
+#, fuzzy
+#~ msgid "Run Program"
+#~ msgstr "Запусьціць праграму:"
+
+#~ msgid "Sender"
+#~ msgstr "Адпраўляльнік"
+
+#~ msgid "Set Status"
+#~ msgstr "Усталяваць стан"
+
+#~ msgid "Size (kB)"
+#~ msgstr "Памер (kB)"
+
+#~ msgid "sounds like"
+#~ msgstr "гукі як"
+
+#~ msgid "Source Account"
+#~ msgstr "Крыніца рахунка"
+
+#~ msgid "Specific header"
+#~ msgstr "Спэцыфічны загаловак"
+
+#~ msgid "starts with"
+#~ msgstr "пачынаецца з"
+
+#~ msgid "Stop Processing"
+#~ msgstr "Спыніць апрацоўку"
+
+#~ msgid "Unset Status"
+#~ msgstr "Адмяніць папярэдні стан"
+
+#~ msgid "Working"
+#~ msgstr "Праца"
+
+#, fuzzy
+#~ msgid "_Filename:"
+#~ msgstr "Назва файла:"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "Unknown error."
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Невядомая памылка."
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the component system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Памылка ад актывацыі кампанэнта сыстэмы:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the activation system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Памылка ад актывацыі сыстэмы:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "View Certificate"
+#~ msgstr "_Ід сэртыфіката:"
+
+#, fuzzy
+#~ msgid "You have been asked to trust a new Certificate Authority (CA)."
+#~ msgstr "Некарэктная аўтарызацыя сэртыфіката (CA)"
+
+#~ msgid "About Ximian Evolution..."
+#~ msgstr "Пра \"Эвалюцыю\" Ximian..."
+
+#~ msgid "_About Ximian Evolution..."
+#~ msgstr "_Пра \"Эвалюцыю\" Ximian"
+
 #~ msgid "Evolution Addressbook folder viewer"
 #~ msgstr "Праглядальнік тэчак кнігі адрэсаў \"Эвалюцыі\""
 
@@ -20079,9 +20087,6 @@ msgstr "%s (%d%% завершана)"
 #~ msgid "Primary _email:"
 #~ msgstr "Першасная Э. пошта:"
 
-#~ msgid "S_pouse:"
-#~ msgstr "_Супруг(а):"
-
 #~ msgid "_Business:"
 #~ msgstr "Працоўны:"
 
@@ -20097,9 +20102,6 @@ msgstr "%s (%d%% завершана)"
 #~ msgid "_Mobile:"
 #~ msgstr "Мабільны:"
 
-#~ msgid "_Office:"
-#~ msgstr "_Офіс:"
-
 #~ msgid "_Public Calendar URL:"
 #~ msgstr "URI публічнага каляндару:"
 
@@ -21508,10 +21510,6 @@ msgstr "%s (%d%% завершана)"
 #~ msgstr "Аб'ект адсутнічае\n"
 
 #, fuzzy
-#~ msgid "Invalid object"
-#~ msgstr "Памылковая мэта"
-
-#, fuzzy
 #~ msgid "URI not loaded"
 #~ msgstr "EBook не загружана\n"
 
@@ -23726,10 +23724,6 @@ msgstr "%s (%d%% завершана)"
 #~ msgstr "Лібанон"
 
 #, fuzzy
-#~ msgid "Lansing"
-#~ msgstr "Папярэджаьне"
-
-#, fuzzy
 #~ msgid "Laredo"
 #~ msgstr "Большы"
 
diff --git a/po/bg.po b/po/bg.po
index 7e85255f81..1149674cbb 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,1709 +8,1241 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 1.1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-09-15 14:36-0400\n"
+"POT-Creation-Date: 2004-06-03 11:14-0400\n"
 "PO-Revision-Date: 2004-03-06 12:49+0200\n"
 "Last-Translator: Vladimir \"Kaladan\" Petkov <vpetkov@i-space.org>\n"
 "Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
-msgid "Evolution LDIF importer"
-msgstr "Интерфейс за вмъкване на LDIF"
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
-msgid "LDAP Data Interchange Format (.ldif)"
-msgstr ""
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
-msgid "Evolution VCard Importer"
-msgstr "Интерфейс за вмъкване на VCard"
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
-msgid "Evolution VCard importer"
-msgstr "Интерфейс за вмъкване на VCard"
-
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
-msgid "VCard (.vcf, .gcrd)"
-msgstr "VCard·(.vcf,·.gcrd) - Визитна карта"
-
-#: addressbook/backend/ebook/e-card-simple.c:60
-#: addressbook/backend/ebook/e-card.c:1306
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
-msgid "File As"
-msgstr "Файл като"
-
-#: addressbook/backend/ebook/e-card-simple.c:61
-#: addressbook/backend/ebook/e-card.c:1320
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-#: my-evolution/e-summary-table.c:59
-msgid "Name"
-msgstr "Име"
-
-#: addressbook/backend/ebook/e-card-simple.c:62
-#: addressbook/backend/ebook/e-card.c:1347
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-msgid "Email"
-msgstr "Електронна поща"
-
-#: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
-msgid "Primary"
-msgstr "Основен"
-
-#: addressbook/backend/ebook/e-card-simple.c:63
-msgid "Prim"
-msgstr "Основен"
-
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/backend/ebook/e-card.c:1409
-#: addressbook/gui/contact-editor/e-contact-editor.c:1737
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
-msgid "Assistant"
-msgstr "Асистент"
-
-#: addressbook/backend/ebook/e-card-simple.c:65
-#: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/e-contact-editor.c:1738
-#: addressbook/gui/contact-editor/e-contact-editor.c:1809
-msgid "Business"
-msgstr "Работа"
-
-#: addressbook/backend/ebook/e-card-simple.c:65
-#: addressbook/backend/ebook/e-card-simple.c:70
-msgid "Bus"
-msgstr "Сл."
-
-#: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
-msgid "Callback"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1743
-msgid "Company"
-msgstr "Компания"
-
-#: addressbook/backend/ebook/e-card-simple.c:67
-msgid "Comp"
-msgstr "Компания"
-
-#: addressbook/backend/ebook/e-card-simple.c:68
-#: addressbook/backend/ebook/e-card-simple.c:71
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
-#: addressbook/gui/contact-editor/e-contact-editor.c:1810
-msgid "Home"
-msgstr "Домашен"
-
-#: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/backend/ebook/e-card.c:1367
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
-msgid "Organization"
-msgstr "Организация"
-
-#: addressbook/backend/ebook/e-card-simple.c:69
-msgid "Org"
-msgstr "Орг"
-
-#: addressbook/backend/ebook/e-card-simple.c:72
-#: addressbook/gui/contact-editor/e-contact-editor.c:1748
-msgid "Mobile"
-msgstr "Мобилен"
-
-#: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
-msgid "Car"
-msgstr "Кола"
-
-#: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/e-contact-editor.c:1740
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
-msgid "Business Fax"
-msgstr "Раб. Факс"
-
-#: addressbook/backend/ebook/e-card-simple.c:74
-msgid "Bus Fax"
-msgstr "Сл. Факс"
-
-#: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1746
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
-msgid "Home Fax"
-msgstr "Домашен Факс"
-
-#: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1739
-msgid "Business 2"
-msgstr "Работа 2"
-
-#: addressbook/backend/ebook/e-card-simple.c:76
-msgid "Bus 2"
-msgstr "Служебен 2"
-
-#: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1745
-msgid "Home 2"
-msgstr "Домашен 2"
-
-#: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1747
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "ISDN"
-msgstr "ISDN"
-
-#: addressbook/backend/ebook/e-card-simple.c:79
-#: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
-#: addressbook/gui/contact-editor/e-contact-editor.c:1811
-msgid "Other"
-msgstr "Друг"
-
-#: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1750
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
-msgid "Other Fax"
-msgstr "Друг Факс"
-
-#: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1751
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
-msgid "Pager"
-msgstr "Пейджър"
-
-#: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
-msgid "Radio"
-msgstr "Радио"
-
-#: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-msgid "Telex"
-msgstr "Телекс"
-
-#: addressbook/backend/ebook/e-card-simple.c:84
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "TTY"
-msgstr "TTY"
-
-#: addressbook/backend/ebook/e-card-simple.c:86
-#: addressbook/gui/component/e-address-popup.c:488
-#: addressbook/gui/contact-editor/e-contact-editor.c:1782
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
-msgid "Email 2"
-msgstr "Ел. Поща 2"
-
-#: addressbook/backend/ebook/e-card-simple.c:87
-#: addressbook/gui/component/e-address-popup.c:498
-#: addressbook/gui/contact-editor/e-contact-editor.c:1783
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
-msgid "Email 3"
-msgstr "Ел. Поща 3"
-
-#: addressbook/backend/ebook/e-card-simple.c:88
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:40
-msgid "Web Site"
-msgstr "Интернет страница"
-
-#: addressbook/backend/ebook/e-card-simple.c:88
-msgid "Url"
-msgstr "URL"
-
-#: addressbook/backend/ebook/e-card-simple.c:89
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Department"
-msgstr "Отдел"
-
-#: addressbook/backend/ebook/e-card-simple.c:89
-msgid "Dep"
-msgstr "Отд"
-
-#: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/backend/ebook/e-card.c:1381
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Office"
-msgstr "Офис"
-
-#: addressbook/backend/ebook/e-card-simple.c:90
-msgid "Off"
-msgstr "Офис"
-
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/backend/ebook/e-card.c:1388
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-msgid "Title"
-msgstr "Титла"
-
-#: addressbook/backend/ebook/e-card-simple.c:92
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Profession"
-msgstr "Професия"
-
-#: addressbook/backend/ebook/e-card-simple.c:92
-msgid "Prof"
-msgstr "Проф"
-
-#: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/backend/ebook/e-card.c:1402
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Manager"
-msgstr "Мениджър"
-
-#: addressbook/backend/ebook/e-card-simple.c:93
-msgid "Man"
-msgstr "Мениджър"
-
-#: addressbook/backend/ebook/e-card-simple.c:94
-msgid "Ass"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/backend/ebook/e-card.c:1416
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Nickname"
-msgstr "Прякор"
-
-#: addressbook/backend/ebook/e-card-simple.c:95
-msgid "Nick"
-msgstr "Прякор"
-
-#: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/backend/ebook/e-card.c:1423
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-msgid "Spouse"
-msgstr "Съпруг(а)"
-
-#: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/backend/ebook/e-card.c:1464
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-msgid "Note"
-msgstr "Бележка"
-
-#: addressbook/backend/ebook/e-card-simple.c:98
-#: addressbook/backend/ebook/e-card.c:1443
-msgid "Calendar URI"
-msgstr "URI за календар"
-
-#: addressbook/backend/ebook/e-card-simple.c:98
-msgid "CALUri"
-msgstr "КалURI"
-
-#: addressbook/backend/ebook/e-card-simple.c:99
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Free-busy URL"
-msgstr "Free-busy адрес"
-
-#: addressbook/backend/ebook/e-card-simple.c:99
-msgid "FBUrl"
-msgstr "FBUrl"
-
-#: addressbook/backend/ebook/e-card-simple.c:100
-msgid "Default server calendar"
-msgstr "Подразбиращ се сървър за календара"
-
-#: addressbook/backend/ebook/e-card-simple.c:100
-msgid "icsCalendar"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card-simple.c:101
-#: addressbook/backend/ebook/e-card.c:1430
-msgid "Anniversary"
-msgstr "Годишнина"
-
-#: addressbook/backend/ebook/e-card-simple.c:101
-msgid "Anniv"
-msgstr "Год"
-
-#: addressbook/backend/ebook/e-card-simple.c:102
-msgid "Birth Date"
-msgstr "Дата на раждане"
-
-#: addressbook/backend/ebook/e-card-simple.c:105
-#: addressbook/backend/ebook/e-card.c:1478
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Категории"
-
-#: addressbook/backend/ebook/e-card-simple.c:106
-msgid "Family Name"
-msgstr "Фамилия"
-
-#: addressbook/backend/ebook/e-card-simple.c:335
-msgid "ECard"
-msgstr "Ел. Карта"
-
-#: addressbook/backend/ebook/e-card-simple.c:842
-#, c-format
-msgid "%x"
-msgstr "%x"
-
-#: addressbook/backend/ebook/e-card-simple.c:912
-#: addressbook/backend/ebook/e-destination.c:709
-msgid "Unnamed List"
-msgstr "Неименуван Списък"
-
-#: addressbook/backend/ebook/e-card.c:1313
-#: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Full Name"
-msgstr "Пълно Име"
-
-#: addressbook/backend/ebook/e-card.c:1326
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-msgid "Address"
-msgstr "Адрес"
-
-#: addressbook/backend/ebook/e-card.c:1333
-msgid "Address Label"
-msgstr "Етикет на Адреса"
-
-#: addressbook/backend/ebook/e-card.c:1340
-msgid "Phone"
-msgstr "Телефон"
-
-#: addressbook/backend/ebook/e-card.c:1354
-msgid "Birth date"
-msgstr "Дата на раждане"
-
-#: addressbook/backend/ebook/e-card.c:1360
-#: calendar/gui/e-calendar-table.etspec.h:19
-msgid "URL"
-msgstr "URL"
-
-#: addressbook/backend/ebook/e-card.c:1374
-msgid "Organizational Unit"
-msgstr "Организационна Единица"
-
-#: addressbook/backend/ebook/e-card.c:1395
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Роля"
-
-#: addressbook/backend/ebook/e-card.c:1436 mail/mail-format.c:966
-msgid "Mailer"
-msgstr "Пощенска програма"
-
-#: addressbook/backend/ebook/e-card.c:1450
-msgid "Free/Busy URL"
-msgstr "Сво_боден/Зает URL"
-
-#: addressbook/backend/ebook/e-card.c:1457
-msgid "ICS Calendar"
-msgstr "ICS Календар"
-
-#: addressbook/backend/ebook/e-card.c:1471
-msgid "Related Contacts"
-msgstr "Подобни Контакти"
-
-#: addressbook/backend/ebook/e-card.c:1485
-msgid "Category List"
-msgstr "Списък на Категориите"
-
-#: addressbook/backend/ebook/e-card.c:1492
-msgid "Wants HTML"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1499
-msgid "Wants HTML set"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1506
-msgid "List"
-msgstr "Списък"
-
-#: addressbook/backend/ebook/e-card.c:1513
-msgid "List Show Addresses"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1520
-msgid "Arbitrary"
-msgstr "Произволен"
-
-#: addressbook/backend/ebook/e-card.c:1527
-msgid "ID"
-msgstr "Идентификационен номер"
-
-#: addressbook/backend/ebook/e-card.c:1534
-msgid "Last Use"
-msgstr "Последно Използван"
-
-#: addressbook/backend/ebook/e-card.c:1545
-msgid "Use Score"
-msgstr ""
-
-#: addressbook/backend/ebook/test-client-list.c:15
-#: addressbook/backend/ebook/test-client.c:33
-#: calendar/gui/alarm-notify/notify-main.c:173
-msgid "Could not initialize Bonobo"
-msgstr "Не мога да инициализирам Bonobo"
-
-#: addressbook/backend/pas/pas-backend-file.c:464
-#: addressbook/backend/pas/pas-backend-ldap.c:3050
-msgid "Searching..."
-msgstr "Търсене..."
-
-#: addressbook/backend/pas/pas-backend-file.c:466
-msgid "Loading..."
-msgstr "Зареждане..."
+"Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:598
-msgid "Using Distinguished Name (DN)"
-msgstr ""
+#: a11y/addressbook/ea-addressbook-view.c:94
+#: a11y/addressbook/ea-addressbook-view.c:103
+#: a11y/addressbook/ea-minicard-view.c:119
+#, fuzzy
+msgid "evolution addressbook"
+msgstr "Адресна книга на Evolution"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:602
-msgid "Using Email Address"
-msgstr "Използва Електронна Поща"
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "Контакти:"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:748
-msgid "Reconnecting to LDAP server..."
-msgstr "Свързва се отново с LDAP сървъра..."
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "Прозорец на Evolution"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1291
-msgid "Adding card to LDAP server..."
-msgstr "Добавям картичка в LDAP сървъра..."
+#: a11y/addressbook/ea-minicard-view.c:101
+#, fuzzy
+msgid "current addressbook folder "
+msgstr "Интерфейс за преглед на папките в Адресната книга"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1402
-msgid "Removing card from LDAP server..."
-msgstr "Премахва картичка от LDAP сървъра..."
+#: a11y/addressbook/ea-minicard-view.c:102
+#, fuzzy
+msgid "have "
+msgstr "Съхранява Като"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1638
-#: addressbook/backend/pas/pas-backend-ldap.c:1641
-msgid "Modifying card from LDAP server..."
-msgstr "Изменя картичка в LDAP сървъра..."
+#: a11y/addressbook/ea-minicard-view.c:102
+#, fuzzy
+msgid "has "
+msgstr "Задачи"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2961
-msgid "Receiving LDAP search results..."
-msgstr "Получава резултатите от търсенето от LDAP сървъра..."
+#: a11y/addressbook/ea-minicard-view.c:104
+#, fuzzy
+msgid " cards"
+msgstr "карти"
 
-#: addressbook/backend/pas/pas-backend-ldap.c:3070
-msgid "Error performing search"
-msgstr "Грешка при търсенето"
+#: a11y/addressbook/ea-minicard-view.c:104
+#, fuzzy
+msgid " card"
+msgstr "1 карта"
 
-#: addressbook/conduit/address-conduit.c:294
+#: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr "Адрес за Синхронизация по Подразбиране:"
 
-#: addressbook/conduit/address-conduit.c:537
-msgid "Cursor could not be loaded\n"
-msgstr "Курсорът не може да бъде зареден\n"
-
-#: addressbook/conduit/address-conduit.c:550
-msgid "EBook not loaded\n"
-msgstr "EBook не е заредена\n"
-
-#: addressbook/conduit/address-conduit.c:1376
-#: calendar/conduits/calendar/calendar-conduit.c:1342
-#: calendar/conduits/todo/todo-conduit.c:884
-msgid "Could not start wombat server"
-msgstr "Wombat сървървърът не може да бъде стартиран"
-
-#: addressbook/conduit/address-conduit.c:1377
-#: calendar/conduits/calendar/calendar-conduit.c:1343
-#: calendar/conduits/todo/todo-conduit.c:885
-msgid "Could not start wombat"
-msgstr "Wombat не може да бъде стартиран"
+#: addressbook/conduit/address-conduit.c:1151
+#: addressbook/conduit/address-conduit.c:1152
+#, fuzzy
+msgid "Could not load addressbook"
+msgstr "Не мога да заредя %s: %s"
 
-#: addressbook/conduit/address-conduit.c:1407
-#: addressbook/conduit/address-conduit.c:1410
+#: addressbook/conduit/address-conduit.c:1220
+#: addressbook/conduit/address-conduit.c:1223
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Configure access to LDAP directory servers here"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Directory Servers"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Evolution Addressbook"
-msgstr "Адресна книга на Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook address pop-up"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook address viewer"
-msgstr "Интерфейс за търсенето по имена в адресната книга на Еволюшън"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook card viewer"
-msgstr "Интерфейс за търсенето по имена в адресната книга на Еволюшън"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook component"
-msgstr "Компонент за Адресната книга на Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook folder viewer"
-msgstr "Интерфейс за преглед на папките в Адресната книга"
-
-#: addressbook/gui/component/addressbook-component.c:76
-#: addressbook/gui/component/addressbook-component.c:625
-#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
-#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr "Контакти"
-
-#: addressbook/gui/component/addressbook-component.c:76
-msgid "Folder containing contact information"
-msgstr "Папка, съдържаща информацията за контакти"
-
-#: addressbook/gui/component/addressbook-component.c:78
-msgid "LDAP Server"
-msgstr "LDAP сървър"
-
-#: addressbook/gui/component/addressbook-component.c:78
-msgid "LDAP server containing contact information"
-msgstr "LDAP сървър съдържащ информация за контакт"
-
-#: addressbook/gui/component/addressbook-component.c:80
-msgid "Public Contacts"
-msgstr "Публични Контакти"
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
+msgid "Failed to authenticate.\n"
+msgstr "Неуспешно удостоверяване на идентичността\n"
 
-#: addressbook/gui/component/addressbook-component.c:80
-msgid "Public folder containing contact information"
-msgstr "Публична папка съдържаща информация за контакти"
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sВъведете парола за·%s·(потребител·%s)"
 
-#: addressbook/gui/component/addressbook-component.c:579
+#: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
 msgstr "Нов Контакт"
 
-#: addressbook/gui/component/addressbook-component.c:579
+#: addressbook/gui/component/addressbook-component.c:94
 msgid "_Contact"
 msgstr "_Контакт"
 
-#: addressbook/gui/component/addressbook-component.c:580
+#: addressbook/gui/component/addressbook-component.c:95
 msgid "Create a new contact"
 msgstr "Създава нов контакт"
 
-#: addressbook/gui/component/addressbook-component.c:583
+#: addressbook/gui/component/addressbook-component.c:101
 msgid "New Contact List"
 msgstr "Нов списък с контакти"
 
-#: addressbook/gui/component/addressbook-component.c:583
+#: addressbook/gui/component/addressbook-component.c:102
 msgid "Contact _List"
 msgstr "Списък с _Контакти"
 
-#: addressbook/gui/component/addressbook-component.c:584
+#: addressbook/gui/component/addressbook-component.c:103
 msgid "Create a new contact list"
 msgstr "Създава нов списък с контакти"
 
-#: addressbook/gui/component/addressbook-config.c:206
-msgid "Failed to connect to LDAP server"
-msgstr "Неуспешен опит за свързване с LDAP сървъра"
+#: addressbook/gui/component/addressbook-component.c:109
+#, fuzzy
+msgid "New Contacts Group"
+msgstr "Нов Контакт"
 
-#: addressbook/gui/component/addressbook-config.c:231
-msgid "Failed to authenticate with LDAP server"
-msgstr "Неуспех в идентифицирането пред LDAP сървъра"
+#: addressbook/gui/component/addressbook-component.c:110
+#, fuzzy
+msgid "_Contacts Group"
+msgstr "_Контакт"
 
-#: addressbook/gui/component/addressbook-config.c:259
-msgid "Could not perform query on Root DSE"
-msgstr ""
+#: addressbook/gui/component/addressbook-component.c:111
+#, fuzzy
+msgid "Create a new contacts group"
+msgstr "Създава нова група препратка"
 
-#: addressbook/gui/component/addressbook-config.c:682
-msgid "The server responded with no supported search bases"
-msgstr "Сървърът отговори с неподдържани основи за търсене"
+#: addressbook/gui/component/addressbook-component.c:184
+msgid "Failed upgrading Addressbook settings or folders."
+msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1193
-msgid "This server does not support LDAPv3 schema information"
-msgstr "Този сървър не поддръжа LDAPv3 информация"
+#: addressbook/gui/component/addressbook-migrate.c:68
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1160
+#, fuzzy
+msgid "Migrating..."
+msgstr "Изчакване ..."
 
-#: addressbook/gui/component/addressbook-config.c:1215
-msgid "Error retrieving schema information"
+#: addressbook/gui/component/addressbook-migrate.c:120
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1201
+#, c-format
+msgid "Migrating `%s':"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1223
-msgid "Server did not respond with valid schema information"
+#. create the local source group
+#: addressbook/gui/component/addressbook-migrate.c:464
+#: calendar/gui/migration.c:446 calendar/gui/migration.c:528
+#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
+#: mail/mail-component.c:245 mail/mail-vfolder.c:218
+msgid "On This Computer"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1637
-msgid "Account Name"
-msgstr "Потребителско име"
+#. Create the default Person addressbook
+#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: calendar/gui/migration.c:454 calendar/gui/migration.c:536
+#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
+#: mail/mail-config.glade.h:109
+msgid "Personal"
+msgstr "Личен"
 
-#: addressbook/gui/component/addressbook-config.c:1639
-msgid "Server Name"
-msgstr "Име на сървъра"
+#. Create the LDAP source group
+#: addressbook/gui/component/addressbook-migrate.c:480
+#, fuzzy
+msgid "On LDAP Servers"
+msgstr "LDAP сървър"
 
-#: addressbook/gui/component/addressbook-config.c:1676
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr ""
+#: addressbook/gui/component/addressbook-migrate.c:608
+#, fuzzy
+msgid "LDAP Servers"
+msgstr "LDAP сървър"
 
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
-msgstr "Други Контакти"
+#: addressbook/gui/component/addressbook-migrate.c:728
+#, fuzzy
+msgid "Autocompletion Settings"
+msgstr "Папки за автоматично завършване"
 
-#: addressbook/gui/component/addressbook.c:502
+#: addressbook/gui/component/addressbook-migrate.c:1104
 msgid ""
-"We were unable to open this addressbook.  Please check that the\n"
-"path exists and that you have permission to access it."
+"The location and hierarchy of the Evolution contact folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Не мога да отворя тази адресна книга. Проверете\n"
-"дали пътя съществува и дали имате права за достъп."
 
-#: addressbook/gui/component/addressbook.c:512
+#: addressbook/gui/component/addressbook-migrate.c:1118
 msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or the LDAP server\n"
-"is unreachable."
+"The format of mailing list contacts has changed.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:517
+#: addressbook/gui/component/addressbook-migrate.c:1127
 msgid ""
-"This version of Evolution does not have LDAP support\n"
-"compiled in to it.  If you want to use LDAP in Evolution\n"
-"you must compile the program from the CVS sources after\n"
-"retrieving OpenLDAP from the link below.\n"
+"The way Evolution stores some phone numbers has changed.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
 msgstr ""
-"В тази версия на Еволюшън не е компилирана поддръжка на\n"
-"LDAP. Ако искате да ползвате LDAP с Еволюшън, компилирайте\n"
-"програмата от CVS след като сте изтеглили и инсталирали \n"
-"OpenLDAP от хипервръзката отдолу.\n"
 
-#: addressbook/gui/component/addressbook.c:527
+#: addressbook/gui/component/addressbook-migrate.c:1137
 msgid ""
-"We were unable to open this addressbook.  This either\n"
-"means you have entered an incorrect URI, or the server\n"
-"is unreachable."
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:547
-msgid "Unable to open addressbook"
-msgstr "Адресната книга не може да бъде отворена"
-
-#: addressbook/gui/component/addressbook.c:607
-msgid "Accessing LDAP Server anonymously"
+"Evolution's Palm Sync changelog and map files have changed.\n"
+"\n"
+"Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:652
-msgid "Failed to authenticate.\n"
-msgstr "Неуспешно удостоверяване на идентичността\n"
-
-#: addressbook/gui/component/addressbook.c:660
-#: addressbook/gui/component/addressbook.c:663
+#: addressbook/gui/component/addressbook-view.c:675
 #, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sВъведете парола за·%s·(потребител·%s)"
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:794
-msgid "Name begins with"
-msgstr "Име започващо с"
+#: addressbook/gui/component/addressbook-view.c:754
+#, fuzzy
+msgid "New Address Book"
+msgstr "Адресна книга"
 
-#: addressbook/gui/component/addressbook.c:795
-msgid "Email begins with"
-msgstr "Електронна поща започваща с"
+#: addressbook/gui/component/addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+#: ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "Изтрива"
 
-#: addressbook/gui/component/addressbook.c:796
-#: calendar/gui/cal-search-bar.c:53
-msgid "Category is"
-msgstr "Категорията е"
+#: addressbook/gui/component/addressbook-view.c:756
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
+msgid "Properties..."
+msgstr "Свойства..."
 
-#. We attach subitems below
-#: addressbook/gui/component/addressbook.c:797
-#: calendar/gui/cal-search-bar.c:49
-msgid "Any field contains"
-msgstr "Кое да е поле съдържа"
+#. Create the contacts group
+#: addressbook/gui/component/addressbook-view.c:995
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: calendar/gui/migration.c:373
+msgid "Contacts"
+msgstr "Контакти"
 
-#: addressbook/gui/component/addressbook.c:798
-msgid "Advanced..."
-msgstr "Напреднали..."
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+msgid "EFolderList xml for the list of completion uris"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:955
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this addressbook."
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+msgid "Position of the vertical pane in main view"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:961
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
 msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"you have configured for this addressbook.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this addressbook."
+"The number of characters that must be typed before evolution will attempt to "
+"autocomplete"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:967
-msgid "The backend for this addressbook was unable to parse this query."
+#: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
+msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:970
-msgid "The backend for this addressbook refused to perform this query."
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:974
-msgid "This query did not complete successfully."
-msgstr "Заявката не завърши успешно."
-
-#. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1059
-#: calendar/gui/cal-search-bar.c:354
-msgid "Any Category"
-msgstr "Всяка категория"
-
-#: addressbook/gui/component/addressbook.c:1145
-msgid "The URI that the Folder Browser will display"
-msgstr ""
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Папки за автоматично завършване"
 
-#.
-#. * This is the code for the UI thingie that lets you manipulate the e-mail
-#. * addresses (and *only* the e-mail addresses) associated with an existing
-#. * card.
-#.
-#: addressbook/gui/component/e-address-popup.c:184
-msgid "(none)"
-msgstr "(няма)"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Контакти"
 
-#: addressbook/gui/component/e-address-popup.c:478
-#: addressbook/gui/contact-editor/e-contact-editor.c:1781
-msgid "Primary Email"
-msgstr "Основна ел. поща"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#, fuzzy
+msgid "Certificates"
+msgstr "_Сертифициран ID:"
 
-#: addressbook/gui/component/e-address-popup.c:614
-msgid "Select an Action"
-msgstr "Избор на действие"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Configure autocomplete here"
+msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:622
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Създава нов контакт \"%s\""
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Адресна книга на Evolution"
 
-#: addressbook/gui/component/e-address-popup.c:638
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Добавя адрес към вече съществуващия контакт \"%s\""
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr ""
 
-#: addressbook/gui/component/e-address-popup.c:917
-msgid "Querying Addressbook..."
-msgstr "Търсене в адресната книга..."
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Интерфейс за търсенето по имена в адресната книга на Еволюшън"
 
-#: addressbook/gui/component/e-address-popup.c:1001
-#: addressbook/gui/component/e-address-widget.c:401
-msgid "Edit Contact Info"
-msgstr "Редактира инфирмацията за контакти"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Интерфейс за търсенето по имена в адресната книга на Еволюшън"
 
-#: addressbook/gui/component/e-address-popup.c:1031
-#: addressbook/gui/component/e-address-widget.c:437
-#: addressbook/gui/component/select-names/e-select-names-popup.c:324
-msgid "Add to Contacts"
-msgstr "Добавя към контактите"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Компонент за Адресната книга на Evolution"
 
-#: addressbook/gui/component/e-address-popup.c:1056
-msgid "Merge E-Mail Address"
-msgstr "Слива адреса на ел. поща"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:378
-msgid "Disable Queries"
-msgstr "Забранява търсенето"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+msgstr ""
 
-#: addressbook/gui/component/e-address-widget.c:378
-msgid "Enable Queries (Dangerous!)"
-msgstr "Разрешава търсенето (Опасно!)"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+msgid "Manage your S/MIME certificates here"
+msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-#: mail/mail-config.glade.h:1
-msgid "\n"
-msgstr "\n"
-
-#: addressbook/gui/component/ldap-config.glade.h:3
-msgid "  S_how Supported Bases "
-msgstr "  П_оказва Поддържаните Основи"
-
-#: addressbook/gui/component/ldap-config.glade.h:4
 #: addressbook/gui/component/select-names/select-names.glade.h:1
-#: addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
 #: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/im.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
 #: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/calendar-setup.glade.h:1
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
+#: calendar/gui/dialogs/new-calendar.glade.h:1
+#: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:6
-#: mail/message-tags.glade.h:1
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:1
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
+#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
 
+#: addressbook/gui/component/ldap-config.glade.h:2
+msgid "1"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:3
+msgid "3268"
+msgstr "3268"
+
+#: addressbook/gui/component/ldap-config.glade.h:4
+msgid "389"
+msgstr "389"
+
 #: addressbook/gui/component/ldap-config.glade.h:5
-msgid "1:00"
-msgstr "1:00"
+msgid "5"
+msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:6
-msgid "2:30"
-msgstr "2:30"
+msgid "636"
+msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:7
-msgid "3268"
-msgstr "3268"
+#, fuzzy
+msgid "<b>Authentication</b>"
+msgstr "Удостоверение"
 
 #: addressbook/gui/component/ldap-config.glade.h:8
-msgid "389"
-msgstr "389"
+#, fuzzy
+msgid "<b>Display</b>"
+msgstr "_Показва"
 
 #: addressbook/gui/component/ldap-config.glade.h:9
-msgid "5:00"
-msgstr "5:00"
+msgid "<b>Downloading</b>"
+msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:10
-msgid "636"
-msgstr "636"
+#, fuzzy
+msgid "<b>Searching</b>"
+msgstr "Търсене"
 
 #: addressbook/gui/component/ldap-config.glade.h:11
-msgid "Add LDAP Server"
-msgstr "Добавя LDAP Сървър"
+#, fuzzy
+msgid "<b>Server Information</b>"
+msgstr "Стъпка я: Информация за сървъра"
 
 #: addressbook/gui/component/ldap-config.glade.h:12
-msgid "Addressbook Sources"
+#, fuzzy
+msgid "<b>Type:</b>"
+msgstr "<b>Завършени:</b>·"
+
+#: addressbook/gui/component/ldap-config.glade.h:13
+#, fuzzy
+msgid "Add Contacts Group"
+msgstr "Добавя към контактите"
+
+#: addressbook/gui/component/ldap-config.glade.h:14
+#, fuzzy
+msgid "Address Book Properties"
 msgstr "Източници на контакти"
 
-#: addressbook/gui/component/ldap-config.glade.h:13 mail/mail-account-gui.c:62
-#: mail/mail-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
+#: mail/mail-config.glade.h:42
 msgid "Always"
 msgstr "Винаги"
 
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr "Анонимно"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
-msgid ""
-"Congratulations, you are finished setting up this LDAP server. You\n"
-"are now ready to access this directory.\n"
-"\n"
-"Please click the \"Finish\" button to save the settings you have entered "
-"here."
-msgstr ""
+#: addressbook/gui/component/ldap-config.glade.h:17
+#: calendar/gui/dialogs/task-editor.c:193
+msgid "Basic"
+msgstr "Основни"
+
+#: addressbook/gui/component/ldap-config.glade.h:18
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
+#: smime/gui/smime-ui.glade.h:19
+msgid "Details"
+msgstr "Детайли"
 
 #: addressbook/gui/component/ldap-config.glade.h:19
-msgid "Connecting"
-msgstr "Свързва"
+msgid "Distinguished name"
+msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:20
-msgid "Distinguished _name:"
-msgstr ""
+#, fuzzy
+msgid "Download limit:"
+msgstr "_Лимит на изтеглянията:"
 
 #: addressbook/gui/component/ldap-config.glade.h:21
-msgid "Edit LDAP Server"
-msgstr "Редактира LDAP Сървър"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
-msgid "Email address:"
+#, fuzzy
+msgid "Email address"
 msgstr "Електронна поща:"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
-msgid "Evolution will use this DN to authenticate you with the server"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:22
+#, fuzzy
 msgid ""
-"Evolution will use this email address to authenticate you with the server"
+"Evolution will use this email address to authenticate you with the server."
 msgstr "Еволюшън ще използва този адрес, за да ви идентифицира пред сървъра"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
-msgid "Finished"
-msgstr "Завършено"
+#: addressbook/gui/component/ldap-config.glade.h:23
+#, fuzzy
+msgid "Find Possible Search Bases"
+msgstr "Поддръжани основи за търсене"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Основен"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "LDAP Configuration Assistant"
-msgstr "Асистент за конфигуриране на LDAP"
-
-#: addressbook/gui/component/ldap-config.glade.h:28 mail/mail-account-gui.c:64
-#: mail/mail-config.glade.h:74
+#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
+#: mail/mail-config.glade.h:102
 msgid "Never"
 msgstr "Никога"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
-msgid ""
-"Now, you must specify how you want to connect to the LDAP server. The SSL "
-"(Secure Sockets Layer)\n"
-"and TLS (Transport Layer Security) protocols are used by some servers to "
-"cryptographically protect\n"
-"your connection. Ask your system administrator if your LDAP server uses "
-"these protocols."
+#: addressbook/gui/component/ldap-config.glade.h:26
+msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:32
-msgid "One"
-msgstr "Едно"
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Search _base:"
+msgstr "База за _Търсене"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
-msgid "S_earch scope: "
-msgstr "Сфера на Т_ърсене:"
+#: addressbook/gui/component/ldap-config.glade.h:28
+#, fuzzy
+msgid "Search base only"
+msgstr "База за _Търсене"
 
-#. No time range is set, so don't start a query
-#: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/calendar-model.c:1983 calendar/gui/e-day-view.c:1714
-#: calendar/gui/e-week-view.c:1345
-msgid "Searching"
-msgstr "Търсене"
+#: addressbook/gui/component/ldap-config.glade.h:29
+#, fuzzy
+msgid "Search base:"
+msgstr "База за _Търсене"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
-msgid "Selected:"
-msgstr "Избрани:"
+#: addressbook/gui/component/ldap-config.glade.h:30
+#, fuzzy
+msgid "Search scope:"
+msgstr "Сфера на Т_ърсене:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:31
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
-"server if\n"
-"your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL or TLS."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a \n"
-"insecure environment. For example, if you and your LDAP server are behind a "
-"firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection "
-"is already\n"
-"secure."
+"you are in a insecure environment. For example, if you and your LDAP server "
+"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
+"because your connection is already secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
-"TLS.  This \n"
-"means that your connection will be insecure, and that you will be vulnerable "
-"to security\n"
-"exploits. "
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:45
-msgid ""
-"Selecting this option will let you change Evolution's default settings for "
-"LDAP\n"
-"searches, and for creating and editing contacts. "
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:47
-msgid ""
-"Specifying a display name is the last required step in configuring an LDAP "
-"server."
+"TLS.  This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:48
-msgid "Step 1: Server Information"
-msgstr "Стъпка я: Информация за сървъра"
-
-#: addressbook/gui/component/ldap-config.glade.h:49
-msgid "Step 2: Connecting to Server"
-msgstr "Стъпка 2: Свръзване със Сървъра"
-
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Step 3: Searching the Directory"
-msgstr "Стъпка 3: Търсене в Директория"
-
-#: addressbook/gui/component/ldap-config.glade.h:51
-msgid "Step 4: Display Name"
-msgstr "Стъпка 4: Изобразява Името"
-
-#: addressbook/gui/component/ldap-config.glade.h:52
-msgid "Sub"
+#: addressbook/gui/component/ldap-config.glade.h:34
+msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr "Поддръжани основи за търсене"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
-msgid ""
-"The first step in configuring an LDAP server is to provide its name, and "
-"your log in\n"
-"information. Please ask your system administrator if you are unsure of this "
-"information."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:56
-msgid ""
-"The options on this page control how many entries should be included in "
-"your\n"
-"searches, and how long a search should take. Ask your system administrator "
-"if you\n"
-"need to change these options."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
-"searches will \n"
-"begin. If you leave this blank, the search will begin at the root of the "
-"directory tree."
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
-"the \n"
-"directory tree. A search scope of \"sub\" will include all entries below "
-"your search base.\n"
-"A search scope of \"one\" will only include the entries one level beneath "
-"your base.\n"
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:65
-msgid ""
-"This assistant will help you to access online directory services\n"
-"using LDAP (Lightweight Directory Access Protocol) servers. \n"
-"\n"
-"Adding a new LDAP server requires some specialized information about the "
-"server. Please contact your system administrator if you need help finding "
-"this information."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
-"This is the maximum number of entries to download. Setting this number to "
-"be \n"
-"too large will slow down your addressbook."
+"This is the maximum number of entries to download. Setting this number to be "
+"too large will slow down your address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:41
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
-"list.\n"
-"It is for display purposes only. "
+"list. It is for display purposes only. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. "
-"A \n"
-"list of standard ports has been provided. Ask your system administrator\n"
-"what port you should specify."
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
-msgid "This option controls how long a search will be run."
-msgstr "Тази опция контролира колко дълго ще продължи търсенето."
-
-#: addressbook/gui/component/ldap-config.glade.h:79
-msgid "U_se SSL/TLS:"
-msgstr "И_зползва SSL/TLS:"
+#: addressbook/gui/component/ldap-config.glade.h:43
+#, fuzzy
+msgid "Timeout:"
+msgstr "Формат на време:"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr "Използва ел. поща"
 
-#: addressbook/gui/component/ldap-config.glade.h:82 mail/mail-account-gui.c:63
-#: mail/mail-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
+#: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:83
-msgid "_Display name:"
-msgstr "_Изобразява име:"
+#: addressbook/gui/component/ldap-config.glade.h:47
+#, fuzzy
+msgid "_Add Contacts Group"
+msgstr "Добавя към контактите"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr "_Лимит на изтеглянията:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
-#: mail/mail-config.glade.h:143 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:31 ui/evolution-composer-entries.xml.h:8
-#: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
-#: ui/evolution-message-composer.xml.h:41
-#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:18
-msgid "_Edit"
-msgstr "_Редактира"
+#: addressbook/gui/component/ldap-config.glade.h:49
+#, fuzzy
+msgid "_Email address:"
+msgstr "Електронна поща:"
+
+#: addressbook/gui/component/ldap-config.glade.h:50
+#, fuzzy
+msgid "_Find Possible Search Bases"
+msgstr "Поддръжани основи за търсене"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Log in method:"
 msgstr "_Метод за идентификация в системата"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
-msgid "_Port number:"
-msgstr "Номер на _Порта"
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "_Log in:"
+msgstr "Идентифициране"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
-msgid "_Search base:"
-msgstr "База за _Търсене"
+#: addressbook/gui/component/ldap-config.glade.h:53
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
+msgid "_Name:"
+msgstr "_Име:"
+
+#: addressbook/gui/component/ldap-config.glade.h:54
+#, fuzzy
+msgid "_Port:"
+msgstr "_Приоритет:"
+
+#: addressbook/gui/component/ldap-config.glade.h:55
+#, fuzzy
+msgid "_Search scope:"
+msgstr "Сфера на Т_ърсене:"
+
+#: addressbook/gui/component/ldap-config.glade.h:56
+#, fuzzy
+msgid "_Server:"
+msgstr "С_ървър"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
-msgid "_Server name:"
-msgstr "Име на сървъра:"
+#: addressbook/gui/component/ldap-config.glade.h:57
+#, fuzzy
+msgid "_Timeout:"
+msgstr "Формат на време:"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
-msgid "_Timeout (minutes):"
-msgstr "_Забавяне (минути):"
+#: addressbook/gui/component/ldap-config.glade.h:58
+#, fuzzy
+msgid "_Use secure connection:"
+msgstr "_Използва сигурни връзки (SSL)"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "карти"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
-msgid "connecting-tab"
-msgstr ""
+#: addressbook/gui/component/ldap-config.glade.h:60
+#: calendar/gui/dialogs/alarm-options.glade.h:14
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: mail/mail-config.glade.h:183
+msgid "minutes"
+msgstr "минути"
 
-#: addressbook/gui/component/ldap-config.glade.h:93
-msgid "general-tab"
-msgstr ""
+#: addressbook/gui/component/select-names/e-select-names.c:503
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+#, fuzzy
+msgid "Select Contacts from Address Book"
+msgstr "Избор на Контакт от Адресната книга"
 
-#: addressbook/gui/component/ldap-config.glade.h:94
-msgid "searching-tab"
-msgstr ""
+#: addressbook/gui/component/select-names/e-select-names.c:702
+#: addressbook/gui/component/select-names/e-select-names-popup.c:215
+#: calendar/gui/dialogs/cal-prefs-dialog.c:724
+msgid "Remove"
+msgstr "Премахва"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr ""
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+msgid "Name"
+msgstr "Име"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:204
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
 msgid "Remove All"
 msgstr "Премахва всички"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:211
-#: addressbook/gui/component/select-names/e-select-names.c:694
-#: composer/e-msg-composer-attachment-bar.c:450
-msgid "Remove"
-msgstr "Премахва"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:218
+#: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Преглед на Списъка с Контактите"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:218
+#: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact Info"
 msgstr "Преглед на Информация за Контакт"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:225
-#: addressbook/gui/component/select-names/e-select-names-popup.c:332
+#: addressbook/gui/component/select-names/e-select-names-popup.c:229
+#: addressbook/gui/component/select-names/e-select-names-popup.c:330
 msgid "Send HTML Mail?"
 msgstr "Изпращане на HTML поща?"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:350
+#: addressbook/gui/component/select-names/e-select-names-popup.c:322
+#: addressbook/gui/widgets/eab-popup-control.c:983
+msgid "Add to Contacts"
+msgstr "Добавя към контактите"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:348
 msgid "Unnamed Contact"
 msgstr "Неименуван Контакт"
 
-#: addressbook/gui/component/select-names/e-select-names-table-model.c:354
+#: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
+#: addressbook/gui/widgets/e-addressbook-view.c:224
 msgid "Source"
 msgstr "Източник"
 
-#: addressbook/gui/component/select-names/e-select-names.c:509
-msgid "Select Contacts from Addressbook"
-msgstr "Избор на Контакт от Адресната книга"
-
-#: addressbook/gui/component/select-names/e-select-names.c:650
-msgid "Find contact in"
-msgstr "Намира контакт в"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr ""
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
-msgid "Find"
-msgstr "Намира"
+#, fuzzy
+msgid "<b>Contacts</b>"
+msgstr "<b>Започва:</b>·"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:3
-msgid "Select Names"
-msgstr "Избор на Имена"
+#, fuzzy
+msgid "<b>Show Contacts</b>"
+msgstr "Показва Контакти"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:4
-msgid "Selected Contacts:"
-msgstr "Избрани Контакти:"
+#, fuzzy
+msgid "Address _Book:"
+msgstr "Адрес _2:"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:5
-msgid "Show Contacts"
-msgstr "Показва Контакти"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid ""
-"Type a name into the entry, or\n"
-"select one from the list below:"
-msgstr ""
-
-#: addressbook/gui/component/select-names/select-names.glade.h:8
-msgid "_Category:"
+#, fuzzy
+msgid "C_ategory:"
 msgstr "К_атегория:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:9
-msgid "_Folder:"
-msgstr "Пап_ка:"
+#: addressbook/gui/component/select-names/select-names.glade.h:7
+#, fuzzy
+msgid "_Find"
+msgstr "Намира"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
-msgid " B_usiness:"
-msgstr "Б_изнес:"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
+#, fuzzy
+msgid "<b>Email</b>"
+msgstr "<b>Завършва:</b>·"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:3
-msgid "A_ddress..."
-msgstr "А_дрес..."
+#, fuzzy
+msgid "<b>Home</b>"
+msgstr "<b>Завършени:</b>·"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:4
-msgid "A_ssistant's name:"
-msgstr "И_ме на асистент:"
+msgid "<b>Instant Messaging</b>"
+msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:5
-msgid "Anni_versary:"
-msgstr "Годишнина:"
+#, fuzzy
+msgid "<b>Job</b>"
+msgstr "<b>Завършва:</b>·"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:6
-msgid "Birthda_y:"
-msgstr "Дата на ра_ждане:"
+msgid "<b>Miscellaneous</b>"
+msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "Business fa_x:"
-msgstr "Бизнес фа_кс:"
+#, fuzzy
+msgid "<b>Other</b>"
+msgstr "<b>Започва:</b>·"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
-msgid "Collaboration"
-msgstr "Сътрудничество"
+#, fuzzy
+msgid "<b>Telephone</b>"
+msgstr ""
+"\n"
+"Телефон:"
 
-#. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:9
-#: addressbook/gui/contact-editor/e-contact-editor.c:1334
-msgid "Contact Editor"
-msgstr "Редактор за Контакти"
+msgid "<b>Web Addresses</b>"
+msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-msgid "D_epartment:"
-msgstr "От_дел:"
+#, fuzzy
+msgid "<b>Work</b>"
+msgstr "<b>Започва:</b>·"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: calendar/gui/dialogs/task-editor.c:199
-msgid "Details"
-msgstr "Детайли"
+#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/widgets/eab-contact-display.c:334
+#: addressbook/gui/widgets/eab-contact-display.c:353
+msgid "AIM"
+msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-msgid "F_ree/Busy URL:"
-msgstr "Сво_боден/Зает URL:"
+#, fuzzy
+msgid "Address:"
+msgstr ""
+"\n"
+"Адрес:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:13
-msgid "File a_s:"
-msgstr "Файл ка_то:"
+#, fuzzy
+msgid "Anniversary:"
+msgstr "Годишнина:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:14
-msgid "Full _Name..."
-msgstr "Пълно _Име..."
+#, fuzzy
+msgid "Assistant:"
+msgstr "Асистент"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#, fuzzy
+msgid "Birthday:"
+msgstr "Дата на ра_ждане:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-msgid ""
-"If this person publishes free/busy or other calendar information on the "
-"Internet, enter the address\n"
-"of that information here."
-msgstr ""
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "Calendar:"
+msgstr "К_алендар:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
+#, fuzzy
+msgid "City:"
+msgstr "Гр_ад:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:18
-msgid "New phone type"
-msgstr "Нов тип телефон"
+#, fuzzy
+msgid "Company:"
+msgstr "Компания"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-msgid "No_tes:"
-msgstr "_Бележки:"
+#: addressbook/gui/contact-editor/e-contact-editor.c:266
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#: addressbook/gui/widgets/e-minicard.c:181
+msgid "Contact"
+msgstr "Контакт"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-msgid "Organi_zation:"
-msgstr "Организа_ция:"
+#: addressbook/gui/contact-editor/e-contact-editor.c:520
+msgid "Contact Editor"
+msgstr "Редактор за Контакти"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:21
-msgid "P_rofession:"
-msgstr "_Професия:"
+#, fuzzy
+msgid "Country:"
+msgstr "Държава:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:22
-msgid "Primary _email:"
-msgstr "Основна _ел. поща"
+#, fuzzy
+msgid "Department:"
+msgstr "От_дел:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:23
-msgid "S_pouse:"
-msgstr "Съпруг:"
+#, fuzzy
+msgid "Free/Busy:"
+msgstr "Сво_боден/Зает URL:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:24
-msgid "Wants to receive _HTML mail"
-msgstr "Желая да получавам _HTML mail"
+msgid "Full _Name..."
+msgstr "Пълно _Име..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-msgid "_Add"
-msgstr "Доб_авя"
+#, fuzzy
+msgid "Home Page:"
+msgstr "Домашен телефон"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-msgid "_Business:"
-msgstr "_Бизнес:"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
+#, fuzzy
+msgid "MSN Messenger"
+msgstr "_Пощенско Съобщение"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:27
-msgid "_Categories..."
-msgstr "_Категории..."
+#, fuzzy
+msgid "Mailing Address"
+msgstr "Адрес на ел. поща"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/dialogs/meeting-page.c:717 calendar/gui/e-calendar-table.c:977
-#: calendar/gui/e-day-view.c:3755 calendar/gui/e-week-view.c:3741
-#: mail/folder-browser.c:1814 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:30 ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-mail-message.xml.h:97 ui/evolution-tasks.xml.h:17
-#: ui/evolution.xml.h:45
-msgid "_Delete"
-msgstr "_Изтрива"
+#, fuzzy
+msgid "Manager:"
+msgstr "Мениджър"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-msgid "_Home:"
-msgstr "_Домашна:"
+#, fuzzy
+msgid "Ni_ckname:"
+msgstr "_Прякор:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
-msgid "_Job title:"
-msgstr "_Титла:"
+#, fuzzy
+msgid "Notes:"
+msgstr "_Бележки:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
-msgid "_Manager's name:"
-msgstr "Име на _Мениджъра:"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:63
+msgid "Novell Groupwise"
+msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:32
-msgid "_Mobile:"
-msgstr "_Мобилен"
+#, fuzzy
+msgid "Office:"
+msgstr "_Офис:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-msgid "_Nickname:"
-msgstr "_Прякор:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
-msgid "_Office:"
-msgstr "_Офис:"
+#, fuzzy
+msgid "PO Box:"
+msgstr "Пощенска Кутия:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:35
-msgid "_Public Calendar URL:"
-msgstr "URL на _Публичен Календар:"
+#, fuzzy
+msgid "Personal Information"
+msgstr "Опционална Информация"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:36
-msgid "_This is the mailing address"
-msgstr ""
+#, fuzzy
+msgid "Profession:"
+msgstr "_Професия:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
-msgid "_Web page address:"
-msgstr "_Интернет страница:"
+#, fuzzy
+msgid "Spouse:"
+msgstr "Съпруг:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#, fuzzy
+msgid "State/Province:"
+msgstr "Щат/Провинция:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#, fuzzy
+msgid "Title:"
+msgstr "_Заглавие:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+msgid "Video Chat:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:41
+#, fuzzy
+msgid "Wants to receive HTML mail"
+msgstr "Желая да получавам _HTML mail"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:42
+msgid "Web Log:"
+msgstr ""
+
+#. red
+#: addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: addressbook/gui/contact-editor/e-contact-editor.c:195
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:244
+#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
+#: mail/mail-config.glade.h:157
+msgid "Work"
+msgstr "Работа"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:44
+#, fuzzy
+msgid "Zip/Postal Code:"
+msgstr ""
+"\n"
+" Пощенски Код: "
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:45
+#, fuzzy
+msgid "_Categories"
+msgstr "Категории"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:46
+#, fuzzy
+msgid "_File under:"
+msgstr "Име на файл:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#, fuzzy
+msgid "_Where:"
+msgstr "_Време"
+
+#: addressbook/gui/contact-editor/eab-editor.c:315
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/eab-editor.c:318
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Сигурни ли сте, че искате\n"
+"да изтриете този контакт?"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Address"
+msgstr "Адрес"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:102
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:103
+#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
-#: addressbook/gui/widgets/e-addressbook-model.c:318
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:396
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:141
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
+#: addressbook/gui/widgets/e-addressbook-model.c:309
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
+#: addressbook/gui/widgets/e-minicard.c:174
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view-widget.c:120
-#: addressbook/gui/widgets/e-minicard-view.c:478
-#: addressbook/gui/widgets/e-minicard.c:183
+#: addressbook/gui/widgets/e-minicard-view.c:474
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 msgid "Editable"
 msgstr "Редактируем"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
-#: my-evolution/Locations.h:2340
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "United States"
 msgstr "САЩ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
 msgid "Afghanistan"
 msgstr "Афганистан"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
-#: my-evolution/Locations.h:42
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
 msgid "Albania"
 msgstr "Албания"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
-#: my-evolution/Locations.h:54
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "Algeria"
 msgstr "Алжир"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "American Samoa"
 msgstr "Американско Самоа"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Andorra"
 msgstr "Андора"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Angola"
 msgstr "Ангола"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Anguilla"
 msgstr "Ангуила"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Antarctica"
 msgstr "Антарктика"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
 msgid "Antigua And Barbuda"
 msgstr "Антигуа и Барбадос"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
-#: my-evolution/Locations.h:120
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Argentina"
 msgstr "Аржентина"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Armenia"
 msgstr "Армения"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
 msgid "Aruba"
 msgstr "Аруба"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
-#: my-evolution/Locations.h:154
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
 msgid "Australia"
 msgstr "Австралия"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
-#: my-evolution/Locations.h:155
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Austria"
 msgstr "Австрия"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
 msgid "Azerbaijan"
 msgstr "Азърбайджан"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
-#: my-evolution/Locations.h:161
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Bahamas"
 msgstr "Бахамски острови"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
-#: my-evolution/Locations.h:164
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Bahrain"
 msgstr "Бахрейн"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Bangladesh"
 msgstr "Бангладеш"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Barbados"
 msgstr "Барбадос"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Belarus"
 msgstr "Беларус"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
-#: my-evolution/Locations.h:216
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Belgium"
 msgstr "Белгия"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
-#: my-evolution/Locations.h:218
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Belize"
 msgstr "Белиз"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Benin"
 msgstr "Бенин"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Bermuda"
 msgstr "Бермудски острови"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Bhutan"
 msgstr "Бутан"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
-#: my-evolution/Locations.h:270
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Bolivia"
 msgstr "Боливия"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Bosnia And Herzegowina"
 msgstr "Босна и Херцеговина"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Botswana"
 msgstr "Ботсвана"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Bouvet Island"
 msgstr "Остров Буве"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
-#: my-evolution/Locations.h:294
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Brazil"
 msgstr "Бразилия"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "British Indian Ocean Territory"
 msgstr "Британска Индоокеанска Територия"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
 msgid "Brunei Darussalam"
 msgstr "Бруней"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
-#: my-evolution/Locations.h:320
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Bulgaria"
 msgstr "България"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Burkina Faso"
 msgstr "Буркина Фасо"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Burundi"
 msgstr "Бурунди"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Cambodia"
 msgstr "Камбоджа"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Cameroon"
 msgstr "Камерун"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
-#: my-evolution/Locations.h:354
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Canada"
 msgstr "Канада"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
 msgid "Cape Verde"
 msgstr "Кабо Верде"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
-#: my-evolution/Locations.h:389
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Cayman Islands"
 msgstr "Кайманови острови"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Central African Republic"
 msgstr "Централна Африканска Република"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Chad"
 msgstr "Чад"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
-#: my-evolution/Locations.h:438
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Chile"
 msgstr "Чили"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "China"
 msgstr "Китай"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
-#: my-evolution/Locations.h:451
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Christmas Island"
 msgstr "Великденски острови"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
 msgid "Cocos (Keeling) Islands"
 msgstr "Кокосови Острови"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
-#: my-evolution/Locations.h:483
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Colombia"
 msgstr "Колумбия"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Comoros"
 msgstr "Комори"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Congo"
 msgstr "Конго"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#, fuzzy
+msgid "Congo, The Democratic Republic Of The"
+msgstr "Корея, Демократична Народна Република"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
 msgid "Cook Islands"
 msgstr "Острови Кук"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
-#: my-evolution/Locations.h:517
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Costa Rica"
 msgstr "Коста Рика"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Cote d'Ivoire"
 msgstr "Бряг на слоновата кост"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
-#: my-evolution/Locations.h:528
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
 msgid "Croatia"
 msgstr "Хърватска"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
-#: my-evolution/Locations.h:532
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
 msgid "Cuba"
 msgstr "Куба"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
-#: my-evolution/Locations.h:545
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
 msgid "Cyprus"
 msgstr "Кипър"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
-#: my-evolution/Locations.h:546
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
 msgid "Czech Republic"
 msgstr "Чехия"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
-#: my-evolution/Locations.h:580
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Denmark"
 msgstr "Дания"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Djibouti"
 msgstr "Джибути"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Dominica"
 msgstr "Доменика"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
-#: my-evolution/Locations.h:608
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Dominican Republic"
 msgstr "Домениканска република"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
-msgid "East Timor"
-msgstr "Източен Тимор"
-
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:198
-#: my-evolution/Locations.h:641
 msgid "Ecuador"
 msgstr "Еквадор"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:199
-#: my-evolution/Locations.h:650
 msgid "Egypt"
 msgstr "Египет"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:200
-#: my-evolution/Locations.h:666
 msgid "El Salvador"
 msgstr "Ел Славадор"
 
@@ -1723,7 +1255,6 @@ msgid "Eritrea"
 msgstr "Еритрея"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:203
-#: my-evolution/Locations.h:684
 msgid "Estonia"
 msgstr "Естония"
 
@@ -1744,12 +1275,10 @@ msgid "Fiji"
 msgstr "Острови Фиджи"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:208
-#: my-evolution/Locations.h:716
 msgid "Finland"
 msgstr "Финландия"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:209
-#: my-evolution/Locations.h:766
 msgid "France"
 msgstr "Франция"
 
@@ -1774,12 +1303,10 @@ msgid "Gambia"
 msgstr "Гамбия"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:215
-#: my-evolution/Locations.h:811
 msgid "Georgia"
 msgstr "Грузия"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:216
-#: my-evolution/Locations.h:812
 msgid "Germany"
 msgstr "Германия"
 
@@ -1788,12 +1315,10 @@ msgid "Ghana"
 msgstr "Гана"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:218
-#: my-evolution/Locations.h:815
 msgid "Gibraltar"
 msgstr "Гибралтар"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:219
-#: my-evolution/Locations.h:846
 msgid "Greece"
 msgstr "Гърция"
 
@@ -1814,745 +1339,776 @@ msgid "Guam"
 msgstr "Гвиам"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:224
-#: my-evolution/Locations.h:867
 msgid "Guatemala"
 msgstr "Гватемала"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:225
+msgid "Guernsey"
+msgstr "Гърнси"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Guinea"
 msgstr "Гвинея"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Guinea-bissau"
 msgstr "Гвинея-бисау"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Guyana"
 msgstr "Гвияна"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
-#: my-evolution/Locations.h:888
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Haiti"
 msgstr "Хаити"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Heard And McDonald Islands"
 msgstr "Острови Хърд и МакДоналд"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Holy See"
 msgstr "Свято море"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
-#: my-evolution/Locations.h:945
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "Honduras"
 msgstr "Хондурас"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
-#: my-evolution/Locations.h:946
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Hong Kong"
 msgstr "Хонг Конг"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
-#: my-evolution/Locations.h:966
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
 msgid "Hungary"
 msgstr "Унгария"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
-#: my-evolution/Locations.h:978
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
 msgid "Iceland"
 msgstr "Ислания"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
-#: my-evolution/Locations.h:991
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "India"
 msgstr "Индия"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
 msgid "Indonesia"
 msgstr "Индонезия"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
-#: my-evolution/Locations.h:1007
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#, fuzzy
+msgid "Iran"
+msgstr "Илан"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#, fuzzy
+msgid "Iraq"
+msgstr "Израел"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
 msgid "Ireland"
 msgstr "Ирландия"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+msgid "Isle of Man"
+msgstr "Айл ъф Ман"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Israel"
 msgstr "Израел"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
-#: my-evolution/Locations.h:1016
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Italy"
 msgstr "Италия"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
-#: my-evolution/Locations.h:1031
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Jamaica"
 msgstr "Ямайка"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
-#: my-evolution/Locations.h:1035
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Japan"
 msgstr "Япония"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
-#: my-evolution/Locations.h:1046
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+msgid "Jersey"
+msgstr "Джърси"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
 msgid "Jordan"
 msgstr "Йордания"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Kazakhstan"
 msgstr "Казахстан"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Kenya"
 msgstr "Кения"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Kiribati"
 msgstr "Кирибати"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#, fuzzy
+msgid "Korea, Democratic People's Republic Of"
+msgstr "Корея, Демократична Народна Република"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Korea, Republic Of"
 msgstr "Корея, Република"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
-#: my-evolution/Locations.h:1146
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
 msgid "Kuwait"
 msgstr "Кувейт"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Kyrgyzstan"
 msgstr "Киргистан"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
 msgid "Laos"
 msgstr "Лаос"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
 msgid "Latvia"
 msgstr "Латвия"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
-#: my-evolution/Locations.h:1197
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Lebanon"
 msgstr "Ливан"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Lesotho"
 msgstr "Лесото"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
-#: my-evolution/Locations.h:1217
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Liberia"
 msgstr "Либерия"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+msgid "Libya"
+msgstr "Либия"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Liechtenstein"
 msgstr "Лихтенщайн"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
-#: my-evolution/Locations.h:1233
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Lithuania"
 msgstr "Литва"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
-#: my-evolution/Locations.h:1267
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Luxembourg"
 msgstr "Люксембург"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
-msgid "Macau"
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#, fuzzy
+msgid "Macao"
 msgstr "Макао"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Macedonia"
 msgstr "Македония"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Madagascar"
 msgstr "Мадагаскар"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Malawi"
 msgstr "Малави"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Malaysia"
 msgstr "Малайзия"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Maldives"
 msgstr "Малдивски острови"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
 msgid "Mali"
 msgstr "Мали"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
-#: my-evolution/Locations.h:1296
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Malta"
 msgstr "Малта"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Marshall Islands"
 msgstr "Маршалски острови"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Martinique"
 msgstr "Мартиника"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Mauritania"
 msgstr "Мавритания"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Mauritius"
 msgstr "Маурици"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Mayotte"
 msgstr "Майоте"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
-#: my-evolution/Locations.h:1385
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mexico"
 msgstr "Мексико"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Micronesia"
 msgstr "Микронезия"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Moldova, Republic Of"
 msgstr "Република Молдова"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Monaco"
 msgstr "Монако"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Mongolia"
 msgstr "Монголия"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
 msgid "Montserrat"
 msgstr "Монтсерат"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
-#: my-evolution/Locations.h:1468
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Morocco"
 msgstr "Мароко"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "Mozambique"
 msgstr "Мозамбик"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
 msgid "Myanmar"
 msgstr "Майнмар"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
 msgid "Namibia"
 msgstr "Намибия"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "Nauru"
 msgstr "Науру"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nepal"
 msgstr "Непал"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
-#: my-evolution/Locations.h:1529
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Netherlands"
 msgstr "Холандия"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
 msgid "Netherlands Antilles"
 msgstr "Холандски Антили"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "New Caledonia"
 msgstr "Нова Каледония"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
-#: my-evolution/Locations.h:1558
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "New Zealand"
 msgstr "Нова Зеландия"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
-#: my-evolution/Locations.h:1560
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "Nicaragua"
 msgstr "Никарагуа"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Niger"
 msgstr "Нигер"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Nigeria"
 msgstr "Нигрия"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Niue"
 msgstr "Ниуе"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
-#: my-evolution/Locations.h:1572
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Norfolk Island"
 msgstr "Норфолк"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Northern Mariana Islands"
 msgstr "Мариански острови"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#: my-evolution/Locations.h:1585
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Norway"
 msgstr "Норвегия"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
-#: my-evolution/Locations.h:1630
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Oman"
 msgstr "Оман"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
-#: my-evolution/Locations.h:1671
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Pakistan"
 msgstr "Пакистан"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Palau"
 msgstr "Палау"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Palestinian Territory"
 msgstr "Палестина"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
-#: my-evolution/Locations.h:1681
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Panama"
 msgstr "Панама"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Papua New Guinea"
 msgstr "Папуа Нова Гвинея"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
-#: my-evolution/Locations.h:1686
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Paraguay"
 msgstr "Парагвай"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
-#: my-evolution/Locations.h:1721
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Peru"
 msgstr "Перу"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Philippines"
 msgstr "Филипини"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Pitcairn"
 msgstr "Питкеърн"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
-#: my-evolution/Locations.h:1762
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Poland"
 msgstr "Полша"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
-#: my-evolution/Locations.h:1789
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Portugal"
 msgstr "Португалия"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
-#: my-evolution/Locations.h:1822
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Puerto Rico"
 msgstr "Пуерто Рико"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
-#: my-evolution/Locations.h:1834
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Qatar"
 msgstr "Катар"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Reunion"
 msgstr "Реюнион"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
-#: my-evolution/Locations.h:1909
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Romania"
 msgstr "Румъния"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Russian Federation"
 msgstr "ОНД"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
 msgid "Rwanda"
 msgstr "Руанда"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Saint Kitts And Nevis"
 msgstr "Сейнт Китс и Невис"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Saint Lucia"
 msgstr "Санта Луция"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Saint Vincent And The Grena-dines"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Samoa"
 msgstr "Самоа"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "San Marino"
 msgstr "Сан Марино"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "Sao Tome And Principe"
 msgstr "Сан Томе и Принципе"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
-#: my-evolution/Locations.h:2032
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Saudi Arabia"
 msgstr "Саудитска Арабия"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Senegal"
 msgstr "Сенегал"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+msgid "Serbia And Montenegro"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
 msgid "Seychelles"
 msgstr "Сейшелски острови"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Sierra Leone"
 msgstr "Сиера Леоне"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
-#: my-evolution/Locations.h:2087
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Singapore"
 msgstr "Сингапур"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
-#: my-evolution/Locations.h:2100
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "Slovakia"
 msgstr "Словакия"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
-#: my-evolution/Locations.h:2101
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "Slovenia"
 msgstr "Словения"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Solomon Islands"
 msgstr "Соломонови острови"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "Somalia"
 msgstr "Сомалия"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
-#: my-evolution/Locations.h:2116
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "South Africa"
 msgstr "Южна Африка"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "South Georgia And The South Sandwich Islands"
 msgstr "Острови Южна Джорджия и Южен Сандвичев"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
-#: my-evolution/Locations.h:2124
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "Spain"
 msgstr "Испания"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Sri Lanka"
 msgstr "Шри Ланка"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
 msgid "St. Helena"
 msgstr "Света Елена"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "St. Pierre And Miquelon"
 msgstr "Свети Пиер и Микелон"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Sudan"
 msgstr "Судан"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
-#: my-evolution/Locations.h:2173
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Suriname"
 msgstr "Суринам"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "Острови Свалбард и Жан Майен"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Swaziland"
 msgstr "Свазиленд"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
-#: my-evolution/Locations.h:2178
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Sweden"
 msgstr "Швеция"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
-#: my-evolution/Locations.h:2180
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Switzerland"
 msgstr "Швейцария"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
-#: my-evolution/Locations.h:2202
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#, fuzzy
+msgid "Syria"
+msgstr "Смирна"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
 msgid "Taiwan"
 msgstr "Тайван"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Tajikistan"
 msgstr "Таджикистан"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tanzania, United Republic Of"
 msgstr "Обединена република Танзания"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Thailand"
 msgstr "Тайланд"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#, fuzzy
+msgid "Timor-Leste"
+msgstr "Триест"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
 msgid "Togo"
 msgstr "Того"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "Tokelau"
 msgstr "Токелао"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Tonga"
 msgstr "Тонга"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "Trinidad And Tobago"
 msgstr "Тринидат и Тобаго"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Tunisia"
 msgstr "Тунис"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
-#: my-evolution/Locations.h:2318
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Turkey"
 msgstr "Турция"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Turkmenistan"
 msgstr "Туркменистан"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
 msgid "Turks And Caicos Islands"
 msgstr "Острови Туркс и Кайкос"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "Tuvalu"
 msgstr "Тувалу"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Uganda"
 msgstr "Уганда"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
-#: my-evolution/Locations.h:2331
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Ukraine"
 msgstr "Украина"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "United Arab Emirates"
 msgstr "Обединени Арабски Емирства"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
-#: my-evolution/Locations.h:2339
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "United Kingdom"
 msgstr "Обединеното кралство"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "United States Minor Outlying Islands"
 msgstr "Малки външни острови на САЩ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
-#: my-evolution/Locations.h:2345
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "Uruguay"
 msgstr "Уругвай"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Uzbekistan"
 msgstr "Узбекистан"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Vanuatu"
 msgstr "Вануату"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
-#: my-evolution/Locations.h:2377
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Venezuela"
 msgstr "Венецуела"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
-#: my-evolution/Locations.h:2389
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Viet Nam"
 msgstr "Виетнам"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:371
 msgid "Virgin Islands, British"
 msgstr "Британски Вирджински острови"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Virgin Islands, U.S."
 msgstr "Американски Вирджински острови"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:373
 msgid "Wallis And Futuna Islands"
 msgstr "Острови Уолис и Футуна"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:364
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:374
 msgid "Western Sahara"
 msgstr "Западна Сахара"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:365
-#: my-evolution/Locations.h:2509
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:375
 msgid "Yemen"
 msgstr "Йемен"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:366
-#: my-evolution/Locations.h:2521
-msgid "Yugoslavia"
-msgstr "Югославия"
-
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:367
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:376
 msgid "Zambia"
 msgstr "Замбия"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:368
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:377
 msgid "Zimbabwe"
 msgstr "Зимбабве"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:156
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:142
-#: addressbook/gui/widgets/e-addressbook-model.c:304
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:382
-#: addressbook/gui/widgets/e-addressbook-view.c:180
-#: addressbook/gui/widgets/e-minicard-view-widget.c:106
-#: addressbook/gui/widgets/e-minicard-view.c:464
-msgid "Book"
-msgstr "Книга"
+#: addressbook/gui/contact-editor/e-contact-editor.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
+#: addressbook/gui/widgets/eab-contact-display.c:337
+#: addressbook/gui/widgets/eab-contact-display.c:356
+msgid "Jabber"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:180
+#: addressbook/gui/widgets/eab-contact-display.c:339
+#: addressbook/gui/widgets/eab-contact-display.c:358
+#, fuzzy
+msgid "Yahoo"
+msgstr "Айдахо"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: addressbook/gui/widgets/eab-contact-display.c:338
+#: addressbook/gui/widgets/eab-contact-display.c:357
+msgid "MSN"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:182
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#: addressbook/gui/widgets/eab-contact-display.c:355
+msgid "ICQ"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:183
+#, fuzzy
+msgid "GroupWise"
+msgstr "Група"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:163
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
-#: addressbook/gui/widgets/e-minicard-widget.c:93
-#: addressbook/gui/widgets/e-minicard.c:190
-msgid "Card"
-msgstr "Картичка"
+#: addressbook/gui/contact-editor/e-contact-editor.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+msgid "Home"
+msgstr "Домашен"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+msgid "Other"
+msgstr "Друг"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:170
-msgid "Is New Card"
-msgstr "Е Нова Картичка"
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#, fuzzy
+msgid "Source Book"
+msgstr "Източник"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
+msgid "Target Book"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:273
+#, fuzzy
+msgid "Is New Contact"
+msgstr "Нов Контакт"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:177
+#: addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Writable Fields"
 msgstr "Полета за писане"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:191
+#: addressbook/gui/contact-editor/e-contact-editor.c:294
 msgid "Changed"
 msgstr "Променени"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:827
-msgid "Category editor not available."
-msgstr "Редактор на категории не е наличен"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:835
+#: addressbook/gui/contact-editor/e-contact-editor.c:2352
 msgid "This contact belongs to these categories:"
 msgstr "Този контакт принадлежи на следните категории:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1009
-msgid "Save Contact as VCard"
-msgstr "Съхранява Контакт като VCard"
+#. Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:2429
+#, fuzzy
+msgid "Please select an image for this contact"
+msgstr "Моля, изберете от следните опции"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1055
+#: addressbook/gui/contact-editor/e-contact-editor.c:2433
+#, fuzzy
+msgid "No image"
+msgstr "Нигер"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2636
 msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
+"The contact data is invalid:\n"
+"\n"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1058
+#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#, fuzzy
+msgid "Invalid contact."
+msgstr "Грешно съдържание на съобщение"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2723
 msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
+"The contact cannot be saved to the selected address book. Do you want to "
+"discard changes?"
 msgstr ""
-"Сигурни ли сте, че искате\n"
-"да изтриете този контакт?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1755
-msgid "TTY/TDD"
-msgstr "TTY/TDD"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2727
+#: addressbook/gui/contact-editor/e-contact-editor.c:2751
+msgid "_Discard"
+msgstr "_Не записва"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2376
-#, c-format
-msgid "Could not find widget for a field: `%s'"
-msgstr "Не мога да намеря графичен обект за поле: `%s'"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+msgid ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+msgid "AOL Instant Messenger"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#, fuzzy
+msgid "Service"
+msgstr "Обслужването е готово"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/e-cal-list-view.etspec.h:2
+#, fuzzy
+msgid "Location"
+msgstr "Местоположение:"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+#, fuzzy
+msgid "Username"
+msgstr "_Преименува"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Бързо добавяне на контакт"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:283
 msgid "_Edit Full"
 msgstr "Пълно _Редактиране"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:319
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
+#: mail/mail-config.glade.h:166
 msgid "_Full Name:"
 msgstr "Пълно _Име:"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:325
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:307
 msgid "E-_mail:"
 msgstr "_Ел. Поща:"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:66
-#, c-format
-msgid "Error saving %s: %s"
-msgstr "Грешка при запис %s:·%s"
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:103
-msgid "card.vcf"
-msgstr "card.vcf"
-
-#: addressbook/gui/contact-editor/e-contact-save-as.c:175
-msgid "list"
-msgstr "списък"
-
-#: addressbook/gui/contact-editor/e-contact-save-as.c:208
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s вече съществува\n"
-"Искате ли да го презапишете?"
-
-#: addressbook/gui/contact-editor/e-contact-save-as.c:212
-msgid "Overwrite"
-msgstr "Презаписва"
-
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Адрес _2:"
@@ -2593,6 +2149,11 @@ msgstr "Д-р"
 msgid "Esq."
 msgstr ""
 
+#: addressbook/gui/contact-editor/fullname.glade.h:4
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+msgid "Full Name"
+msgstr "Пълно Име"
+
 #: addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "I"
 msgstr "1-ви"
@@ -2649,6 +2210,30 @@ msgstr "_Наставка:"
 msgid "_Title:"
 msgstr "_Заглавие:"
 
+#: addressbook/gui/contact-editor/im.glade.h:2
+#, fuzzy
+msgid "Add IM Account"
+msgstr "Пощенски Абонати"
+
+#: addressbook/gui/contact-editor/im.glade.h:3
+#, fuzzy
+msgid "_Account name:"
+msgstr "Потребителско име"
+
+#: addressbook/gui/contact-editor/im.glade.h:4
+#, fuzzy
+msgid "_IM Service:"
+msgstr "Щат/Провинция:"
+
+#: addressbook/gui/contact-editor/im.glade.h:5
+#, fuzzy
+msgid "_Location:"
+msgstr "Местоположение:"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+msgid "\n"
+msgstr "\n"
+
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "Members"
 msgstr "Членове"
@@ -2665,41 +2250,63 @@ msgstr "_Фамилия:"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "contact-list-editor"
 msgstr "Редактор за Контакти"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:156
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
+#: addressbook/gui/widgets/e-addressbook-model.c:295
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
+#: addressbook/gui/widgets/e-addressbook-view.c:217
+#: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
+msgid "Book"
+msgstr "Книга"
+
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
 msgid "Is New List"
 msgstr "Е Нов Списък"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:242
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
 msgid "Contact List Editor"
 msgstr "Редактор за Контакти"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:457
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
 msgid "Save List as VCard"
 msgstr "Съхрани Списък като VCard"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
-msgid "Contact"
-msgstr "Контакт"
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+msgid "Changed Contact:"
+msgstr "Променен Контакт:"
+
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+msgid "Conflicting Contact:"
+msgstr "Конфликтен Контакт:"
 
-#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:1
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
 msgid "Duplicate Contact Detected"
 msgstr "Намерени Дублирани Контакти"
 
-#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:2
+#: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+msgid ""
+"The changed email or name of this contact already\n"
+"exists in this folder.  Would you like to add it anyway?"
+msgstr ""
+"Промененото име или на Ел. поща на този контакт вече\n"
+"съществува в папката. Искате ли да го добавите въпреки това?"
+
+#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
 msgstr "Нов контакт:"
 
-#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:3
+#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:3
 msgid "Original Contact:"
 msgstr "Оригинален Контакт:"
 
-#: addressbook/gui/merging/e-card-duplicate-detected.glade.h:4
+#: addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:4
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder.  Would you like to add it anyway?"
@@ -2707,407 +2314,759 @@ msgstr ""
 "Името или Е-пощенският адрес на този контакт вече съществува\n"
 "в тази папка. Искате ли да я добавите въпреки това?"
 
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:1
-msgid "Changed Contact:"
-msgstr "Променен Контакт:"
-
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:2
-msgid "Conflicting Contact:"
-msgstr "Конфликтен Контакт:"
-
-#: addressbook/gui/merging/e-card-merging-book-commit-duplicate-detected.glade.h:4
-msgid ""
-"The changed email or name of this contact already\n"
-"exists in this folder.  Would you like to add it anyway?"
-msgstr ""
-"Промененото име или на Ел. поща на този контакт вече\n"
-"съществува в папката. Искате ли да го добавите въпреки това?"
-
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:117
-#: widgets/misc/e-filter-bar.c:148
+#: addressbook/gui/search/e-addressbook-search-dialog.c:121
+#: widgets/misc/e-filter-bar.c:156
 msgid "Advanced Search"
 msgstr "Допълнително търсене"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:156
-msgid "No cards"
-msgstr "Няма карти"
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
+msgid "(map)"
+msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-model.c:159
-msgid "1 card"
-msgstr "1 карта"
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
+#, fuzzy
+msgid "map"
+msgstr "Амапала"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:162
-#, c-format
-msgid "%d cards"
-msgstr "%d карти"
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:525
+#, fuzzy
+msgid "List Members"
+msgstr "Членове"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:311
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:389
-#: addressbook/gui/widgets/e-addressbook-view.c:187
-#: addressbook/gui/widgets/e-minicard-view-widget.c:113
-#: addressbook/gui/widgets/e-minicard-view.c:471
-msgid "Query"
-msgstr "Заявка"
+#: addressbook/gui/widgets/eab-contact-display.c:321
+#: addressbook/gui/widgets/eab-contact-display.c:323
+msgid "E-mail"
+msgstr "E-поща"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:457
-msgid "Error getting book view"
+#: addressbook/gui/widgets/eab-contact-display.c:332
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Organization"
+msgstr "Организация"
+
+#: addressbook/gui/widgets/eab-contact-display.c:333
+#, fuzzy
+msgid "Position"
+msgstr "Бостън"
+
+#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:354
+#, fuzzy
+msgid "Groupwise"
+msgstr "Група"
+
+#: addressbook/gui/widgets/eab-contact-display.c:340
+msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:403
-msgid "Model"
-msgstr "Модел"
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:362
+msgid "Phone"
+msgstr "Телефон"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:148
-#: addressbook/gui/widgets/e-addressbook-util.c:105
-#: addressbook/gui/widgets/e-minicard.c:531
-msgid "Error modifying card"
-msgstr "Грешка при модифициране на карта"
+#: addressbook/gui/widgets/eab-contact-display.c:342
+#, fuzzy
+msgid "Fax"
+msgstr "Сл. Факс"
+
+#: addressbook/gui/widgets/eab-contact-display.c:346
+#, fuzzy
+msgid "work"
+msgstr "Работа"
+
+#: addressbook/gui/widgets/eab-contact-display.c:359
+msgid "WWW"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:360
+#: addressbook/gui/widgets/eab-contact-display.c:579
+#, fuzzy
+msgid "Blog"
+msgstr "Болоня"
+
+#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Mobile Phone"
+msgstr "Мобилен Телефон"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
-#: shell/evolution-shell-component.c:1183
+#: addressbook/gui/widgets/eab-contact-display.c:367
+#, fuzzy
+msgid "personal"
+msgstr "Личен"
+
+#: addressbook/gui/widgets/eab-contact-display.c:374
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Note"
+msgstr "Бележка"
+
+#: addressbook/gui/widgets/eab-contact-display.c:540
+#, fuzzy
+msgid "Job Title"
+msgstr "_Титла:"
+
+#: addressbook/gui/widgets/eab-contact-display.c:544
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: smime/lib/e-cert.c:826
+msgid "Email"
+msgstr "Електронна поща"
+
+#: addressbook/gui/widgets/eab-contact-display.c:571
+#, fuzzy
+msgid "Home page"
+msgstr "Домашен Факс"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:48
 msgid "Success"
 msgstr "Успех"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
-#: camel/providers/imap/camel-imap-command.c:306
-#: camel/providers/imap/camel-imap-command.c:403
-#: camel/providers/pop3/camel-pop3-store.c:526
-#: camel/providers/pop3/camel-pop3-store.c:533 shell/e-shell.c:2077
-#: shell/e-storage.c:598 shell/evolution-shell-component.c:1222
-msgid "Unknown error"
-msgstr "Неизвестна грешка"
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:50
+msgid "Backend busy"
+msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Repository offline"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39 shell/e-storage.c:584
-#: shell/evolution-shell-component.c:1213
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:52
+#, fuzzy
+msgid "Address Book does not exist"
+msgstr "Книгата с адреси не съществува"
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:53
+#, fuzzy
+msgid "No Self Contact defined"
+msgstr "Нов списък с контакти"
+
+#. E_BOOK_ERROR_URI_NOT_LOADED
+#. E_BOOK_ERROR_URI_ALREADY_LOADED
+#. E_BOOK_ERROR_PERMISSION_DENIED
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Permission denied"
 msgstr "Отказан достъп"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
-msgid "Card not found"
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:57
+#, fuzzy
+msgid "Contact not found"
 msgstr "Картата не е намерена"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
-msgid "Card ID already exists"
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:58
+#, fuzzy
+msgid "Contact ID already exists"
 msgstr "Карта ID вече съществува"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Protocol not supported"
 msgstr "Протокола на се подържа"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:43
-#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1184
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:60
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:477 calendar/gui/print.c:2307
-#: camel/camel-service.c:747 camel/camel-service.c:788
-#: camel/camel-service.c:878 camel/camel-service.c:921
-#: camel/providers/pop3/camel-pop3-store.c:443
-#: camel/providers/pop3/camel-pop3-store.c:520
+#: calendar/gui/e-cal-component-preview.c:233
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
+#: calendar/gui/e-cal-model-tasks.c:655 calendar/gui/print.c:2349
+#: camel/camel-service.c:728 camel/camel-service.c:766
+#: camel/camel-service.c:850 camel/camel-service.c:890
+#: camel/providers/pop3/camel-pop3-store.c:451
+#: camel/providers/pop3/camel-pop3-store.c:532
 msgid "Cancelled"
 msgstr "Прекратено"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:44
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:61
+#, fuzzy
+msgid "Could not cancel"
+msgstr "Не мога да създам програмен канал: %s"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Authentication Failed"
 msgstr "Идентификацията неуспешна"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:45
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Authentication Required"
 msgstr "Изисква идентификация"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:46
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "TLS not Available"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:47
-msgid "Addressbook does not exist"
-msgstr "Книгата с адреси не съществува"
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:66
+#, fuzzy
+msgid "No such source"
+msgstr "Няма такова съобщение"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:48
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Other error"
 msgstr "Друга грешка"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:75
-msgid "Do you want to save changes?"
-msgstr "Искате ли да съхраните промените?"
+#: addressbook/gui/widgets/eab-gui-util.c:90
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
+msgstr ""
+"Не мога да отворя тази адресна книга. Проверете\n"
+"дали пътя съществува и дали имате права за достъп."
 
-#: addressbook/gui/widgets/e-addressbook-util.c:77
-msgid "_Discard"
-msgstr "_Не записва"
+#: addressbook/gui/widgets/eab-gui-util.c:97
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:102
+#, fuzzy
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  If "
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
+msgstr ""
+"В тази версия на Еволюшън не е компилирана поддръжка на\n"
+"LDAP. Ако искате да ползвате LDAP с Еволюшън, компилирайте\n"
+"програмата от CVS след като сте изтеглили и инсталирали \n"
+"OpenLDAP от хипервръзката отдолу.\n"
+
+#: addressbook/gui/widgets/eab-gui-util.c:109
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+msgstr ""
+"Не мога да отворя тази адресна книга. Проверете\n"
+"дали пътя съществува и дали имате права за достъп."
+
+#: addressbook/gui/widgets/eab-gui-util.c:129
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this addressbook."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:135
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"you have configured for this addressbook.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this addressbook."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:141
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:144
+msgid "The backend for this addressbook refused to perform this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:147
+msgid "This query did not complete successfully."
+msgstr "Заявката не завърши успешно."
 
-#: addressbook/gui/widgets/e-addressbook-util.c:96
+#: addressbook/gui/widgets/eab-gui-util.c:169
 msgid "Error adding list"
 msgstr "Грешка при добавяне на списък"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:96
-#: addressbook/gui/widgets/e-addressbook-util.c:272
-msgid "Error adding card"
+#: addressbook/gui/widgets/eab-gui-util.c:169
+#: addressbook/gui/widgets/eab-gui-util.c:580
+#, fuzzy
+msgid "Error adding contact"
 msgstr "Грешка при добавяне на карта"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:105
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying list"
 msgstr "Грешка при модифициране на списък"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:180
+#, fuzzy
+msgid "Error modifying contact"
+msgstr "Грешка при модифициране на карта"
+
+#: addressbook/gui/widgets/eab-gui-util.c:192
 msgid "Error removing list"
 msgstr "Грешка при изтриване на списък"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:115
-#: addressbook/gui/widgets/e-addressbook-util.c:230
-msgid "Error removing card"
+#: addressbook/gui/widgets/eab-gui-util.c:192
+#: addressbook/gui/widgets/eab-gui-util.c:538
+#, fuzzy
+msgid "Error removing contact"
 msgstr "Грешка при изтриване на карта"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:197
+#: addressbook/gui/widgets/eab-gui-util.c:274
+#, c-format
+msgid ""
+"Opening %d contacts will open %d new windows as well.\n"
+"Do you really want to display all of these contacts?"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:300
 #, c-format
 msgid ""
-"Opening %d cards will open %d new windows as well.\n"
-"Do you really want to display all of these cards?"
+"%s already exists\n"
+"Do you want to overwrite it?"
 msgstr ""
+"%s вече съществува\n"
+"Искате ли да го презапишете?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:304
+msgid "Overwrite"
+msgstr "Презаписва"
+
+#. This is a filename. Translators take note.
+#: addressbook/gui/widgets/eab-gui-util.c:365
+msgid "card.vcf"
+msgstr "card.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:499
+msgid "list"
+msgstr "списък"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:328
-msgid "Move card to"
+#: addressbook/gui/widgets/eab-gui-util.c:634
+#, fuzzy
+msgid "Move contact to"
 msgstr "Премества карта в"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:330
-msgid "Copy card to"
+#: addressbook/gui/widgets/eab-gui-util.c:636
+#, fuzzy
+msgid "Copy contact to"
 msgstr "Копира карта в"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:333
-msgid "Move cards to"
+#: addressbook/gui/widgets/eab-gui-util.c:639
+#, fuzzy
+msgid "Move contacts to"
 msgstr "Премества карти в"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:335
-msgid "Copy cards to"
+#: addressbook/gui/widgets/eab-gui-util.c:641
+#, fuzzy
+msgid "Copy contacts to"
 msgstr "Копира карти в"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:517
+#: addressbook/gui/widgets/eab-gui-util.c:644
+#, fuzzy
+msgid "Select target addressbook."
+msgstr "Избор на Контакт от Адресната книга"
+
+#: addressbook/gui/widgets/eab-gui-util.c:867
 msgid "Multiple VCards"
 msgstr "Множество VCards"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:525
+#: addressbook/gui/widgets/eab-gui-util.c:870
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard за %s"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:194
+#.
+#. * This is the code for the UI thingie that lets you manipulate the e-mail
+#. * addresses (and *only* the e-mail addresses) associated with an existing
+#. * contact.
+#.
+#: addressbook/gui/widgets/eab-popup-control.c:199
+msgid "(none)"
+msgstr "(няма)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:432
+msgid "Primary Email"
+msgstr "Основна ел. поща"
+
+#: addressbook/gui/widgets/eab-popup-control.c:442
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+msgid "Email 2"
+msgstr "Ел. Поща 2"
+
+#: addressbook/gui/widgets/eab-popup-control.c:452
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+msgid "Email 3"
+msgstr "Ел. Поща 3"
+
+#: addressbook/gui/widgets/eab-popup-control.c:568
+msgid "Select an Action"
+msgstr "Избор на действие"
+
+#: addressbook/gui/widgets/eab-popup-control.c:576
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Създава нов контакт \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:592
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Добавя адрес към вече съществуващия контакт \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:870
+#, fuzzy
+msgid "Querying Address Book..."
+msgstr "Търсене в адресната книга..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:953
+msgid "Edit Contact Info"
+msgstr "Редактира инфирмацията за контакти"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1008
+msgid "Merge E-Mail Address"
+msgstr "Слива адреса на ел. поща"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, fuzzy, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "е една друга карта."
+msgstr[1] "е една друга карта."
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+#, fuzzy
+msgid "Show Full VCard"
+msgstr "Показва Пълните Заглавия"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+#, fuzzy
+msgid "Show Compact VCard"
+msgstr "Съхранява Контакт като VCard"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Записва в адресната книга"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:148
+#, fuzzy
+msgid "No contacts"
+msgstr "Показва Контакти"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:151
+#, fuzzy, c-format
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "Намира контакт в"
+msgstr[1] "Намира контакт в"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:302
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
+#: addressbook/gui/widgets/e-addressbook-view.c:231
+#: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
+msgid "Query"
+msgstr "Заявка"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:445
+msgid "Error getting book view"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:399
+msgid "Model"
+msgstr "Модел"
+
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:103
+msgid "Error modifying card"
+msgstr "Грешка при модифициране на карта"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:163
+msgid "Name begins with"
+msgstr "Име започващо с"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:164
+msgid "Email begins with"
+msgstr "Електронна поща започваща с"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: calendar/gui/cal-search-bar.c:54
+msgid "Category is"
+msgstr "Категорията е"
+
+#. We attach subitems below
+#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: calendar/gui/cal-search-bar.c:49
+msgid "Any field contains"
+msgstr "Кое да е поле съдържа"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+#: addressbook/gui/widgets/e-addressbook-view.c:172
+msgid "Advanced..."
+msgstr "Напреднали..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:238
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Тип"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:398
-#: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
-#: mail/importers/pine-importer.c:577
-msgid "Addressbook"
+#: addressbook/gui/widgets/e-addressbook-view.c:508
+#, fuzzy
+msgid "Address Book"
 msgstr "Адресна книга"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:680
-#: addressbook/gui/widgets/e-addressbook-view.c:899
-#: addressbook/gui/widgets/e-addressbook-view.c:1883
+#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:2080
 #: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
+#, fuzzy
+msgid "Save as VCard..."
 msgstr "Съхранява като VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:886
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 msgid "New Contact..."
 msgstr "Нов Контакт..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:887
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "New Contact List..."
 msgstr "Нов Списък с Контакти..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Go to Folder..."
 msgstr "Отива в Папка..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Import..."
 msgstr "Вмъква..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:1066
 msgid "Search for Contacts..."
 msgstr "Търсене за Контакти..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:894
-msgid "Addressbook Sources..."
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#, fuzzy
+msgid "Address Book Sources..."
 msgstr "Източници за Адресни книги..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:896
+#: addressbook/gui/widgets/e-addressbook-view.c:1069
 msgid "Pilot Settings..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:900
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Препраща Контакт"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
 msgid "Send Message to Contact"
 msgstr "Изпраща съобщението на Контакт"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902 calendar/gui/print.c:2439
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
-#: ui/my-evolution.xml.h:1
+#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
+#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Разпечатва"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: addressbook/gui/widgets/e-addressbook-view.c:1077
 msgid "Print Envelope"
 msgstr "Печат на Плик"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:908
-msgid "Copy to folder..."
-msgstr "Копира в папка"
+#: addressbook/gui/widgets/e-addressbook-view.c:1081
+#, fuzzy
+msgid "Copy to Address Book..."
+msgstr "Адресна книга..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:909
-msgid "Move to folder..."
-msgstr "Премества в папка..."
+#: addressbook/gui/widgets/e-addressbook-view.c:1082
+#, fuzzy
+msgid "Move to Address Book..."
+msgstr "Адресна книга..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Изрязва"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:913
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Копира"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:914
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:1087
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Поставя"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:915 filter/libfilter-i18n.h:10
-#: mail/mail-accounts.c:234 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
-#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
-msgid "Delete"
-msgstr "Изтрива"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:919
-#: calendar/gui/e-day-view.c:3715 calendar/gui/e-week-view.c:3706
+#: addressbook/gui/widgets/e-addressbook-view.c:1092
+#: calendar/gui/e-calendar-view.c:1280
 msgid "Current View"
 msgstr "Текущ изглед"
 
-#. Minicard view stuff
-#. Translators: put here a list of labels you want to see on buttons in
-#. addressbook. You may use any character to separate labels but it must
-#. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:953
-msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
-msgstr ",123,а,б,в,г,д,е,ж,з,и,й,к,л,м,н,о,п,р,с,т,у,ф,ь,ц,ч,ш,щ,ъ,ь,ю,я"
-
-#. Translators: put here a list of characters that correspond to buttons
-#. in addressbook. You may use any character to separate labels but it
-#. must also be placed at the begining ot the string.
-#. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:958
-msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
-msgstr ",0,а,б,в,г,д,е,ж,з,и,й,к,л,м,н,о,п,р,с,т,у,ф,ь,ц,ч,ш,щ,ъ,ь,ю,я"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1356
-#, c-format
-msgid ""
-"The addressbook backend for\n"
-"%s\n"
-"has crashed. You will have to restart Evolution in order to use it again"
-msgstr ""
+#. All, unmatched, separator
+#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: calendar/gui/cal-search-bar.c:358
+msgid "Any Category"
+msgstr "Всяка категория"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-msgid "* Click here to add a contact *"
-msgstr "* Натиснете тук за да добавите контакт *"
+msgid "Assistant"
+msgstr "Асистент"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant Phone"
 msgstr "Телефон на Асистент"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
-msgid "Business Address"
-msgstr "Работен адрес"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Business Fax"
+msgstr "Раб. Факс"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Business Phone"
 msgstr "Работен Телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Phone 2"
 msgstr "Работем телефон 2"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Callback Phone"
 msgstr "Телефон за обратно обаждане"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Car Phone"
 msgstr "Телефон в автомобил"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+msgid "Categories"
+msgstr "Категории"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 msgid "Company Phone"
 msgstr "Работен телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-msgid "Home Address"
-msgstr "Домашен Адрес"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Family Name"
+msgstr "Фамилия"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+msgid "File As"
+msgstr "Файл като"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
+#, fuzzy
+msgid "Given Name"
+msgstr "Име на Поле"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Home Fax"
+msgstr "Домашен Факс"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Phone"
 msgstr "Домашен телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone 2"
 msgstr "Домашен телефон 2"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#, fuzzy
+msgid "ISDN Phone"
+msgstr "Телефон"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#, fuzzy
+msgid "Journal"
+msgstr "Йордания"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
+msgid "Manager"
+msgstr "Мениджър"
+
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-msgid "Mobile Phone"
-msgstr "Мобилен Телефон"
+msgid "Nickname"
+msgstr "Прякор"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-msgid "Other Address"
-msgstr "Друг Адрес"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Office"
+msgstr "Офис"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+msgid "Other Fax"
+msgstr "Друг Факс"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
 msgid "Other Phone"
 msgstr "Друг Телефон"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+msgid "Pager"
+msgstr "Пейджър"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
 msgid "Primary Phone"
 msgstr "Основен Телефон"
 
-#: addressbook/gui/widgets/e-minicard-control.c:204
-#, c-format
-msgid "and %d other cards."
-msgstr "и %d други карти."
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+msgid "Radio"
+msgstr "Радио"
 
-#: addressbook/gui/widgets/e-minicard-control.c:206
-msgid "and one other card."
-msgstr "е една друга карта."
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:234
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Роля"
 
-#: addressbook/gui/widgets/e-minicard-control.c:318
-msgid "Save in addressbook"
-msgstr "Записва в адресната книга"
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+msgid "Spouse"
+msgstr "Съпруг(а)"
 
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#, fuzzy
+msgid "TTYTDD"
+msgstr "TTY/TDD"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Telex"
+msgstr "Телекс"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
+msgid "Title"
+msgstr "Титла"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#, fuzzy
+msgid "Unit"
+msgstr "Неименувано"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+msgid "Web Site"
+msgstr "Интернет страница"
+
+#: addressbook/gui/widgets/e-minicard.c:137
 #: addressbook/gui/widgets/e-minicard-label.c:115
-#: addressbook/gui/widgets/e-minicard.c:146
 msgid "Width"
 msgstr "Ширина"
 
+#: addressbook/gui/widgets/e-minicard.c:144
 #: addressbook/gui/widgets/e-minicard-label.c:122
-#: addressbook/gui/widgets/e-minicard.c:153
 msgid "Height"
 msgstr "Височина"
 
+#: addressbook/gui/widgets/e-minicard.c:152
 #: addressbook/gui/widgets/e-minicard-label.c:129
-#: addressbook/gui/widgets/e-minicard.c:161
 msgid "Has Focus"
 msgstr "Има Фокус"
 
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Избрани"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "Има Курсор"
+
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Поле"
@@ -3124,11 +3083,7 @@ msgstr ""
 msgid "Max field name length"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:127
-msgid "Column Width"
-msgstr ""
-
-#: addressbook/gui/widgets/e-minicard-view.c:141
+#: addressbook/gui/widgets/e-minicard-view.c:142
 msgid ""
 "\n"
 "\n"
@@ -3137,24 +3092,20 @@ msgid ""
 "Double-click here to create a new Contact."
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view.c:144
+#: addressbook/gui/widgets/e-minicard-view.c:145
 msgid ""
 "\n"
 "\n"
 "There are no items to show in this view."
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view.c:457
+#: addressbook/gui/widgets/e-minicard-view.c:453
 msgid "Adapter"
 msgstr "Адаптер"
 
-#: addressbook/gui/widgets/e-minicard.c:169
-msgid "Selected"
-msgstr "Избрани"
-
-#: addressbook/gui/widgets/e-minicard.c:176
-msgid "Has Cursor"
-msgstr "Има Курсор"
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr ""
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3164,19 +3115,56 @@ msgstr "Преглед на Карта"
 msgid "GTK Tree View"
 msgstr ""
 
-#: addressbook/printing/e-contact-print-envelope.c:217
-#: addressbook/printing/e-contact-print-envelope.c:238
-msgid "Print envelope"
-msgstr "Отпечатай плик"
+#: addressbook/gui/widgets/test-reflow.c:106
+msgid "Reflow Test"
+msgstr ""
+
+#: addressbook/gui/widgets/test-reflow.c:107
+#: addressbook/printing/test-contact-print-style-editor.c:54
+#: addressbook/printing/test-print.c:53
+#, fuzzy
+msgid "Copyright (C) 2000, Ximian, Inc."
+msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
+
+#: addressbook/gui/widgets/test-reflow.c:109
+msgid "This should test the reflow canvas item"
+msgstr ""
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+msgid "Evolution LDIF importer"
+msgstr "Интерфейс за вмъкване на LDIF"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr ""
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+msgid "Evolution VCard Importer"
+msgstr "Интерфейс за вмъкване на VCard"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+msgid "Evolution VCard importer"
+msgstr "Интерфейс за вмъкване на VCard"
+
+#: addressbook/importers/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+msgid "VCard (.vcf, .gcrd)"
+msgstr "VCard·(.vcf,·.gcrd) - Визитна карта"
+
+#: addressbook/printing/e-contact-print.c:1000
+#, fuzzy
+msgid "Print contacts"
+msgstr "Отпечатва избраните контакти"
 
-#: addressbook/printing/e-contact-print.c:1158
-msgid "Print cards"
-msgstr "Отпечатай карти"
+#: addressbook/printing/e-contact-print.c:1066
+#: addressbook/printing/e-contact-print.c:1093
+#, fuzzy
+msgid "Print contact"
+msgstr "Отпечатва избраните контакти"
 
-#: addressbook/printing/e-contact-print.c:1224
-#: addressbook/printing/e-contact-print.c:1250
-msgid "Print card"
-msgstr "Отпечатай карта"
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Отпечатай плик"
 
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
@@ -3266,7 +3254,7 @@ msgstr "Полета"
 msgid "Number of columns:"
 msgstr "Брой колони:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:79
+#: addressbook/printing/e-contact-print.glade.h:23
 msgid "Options"
 msgstr "Опций"
 
@@ -3275,7 +3263,6 @@ msgid "Orientation"
 msgstr "Ориентация"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1670
 msgid "Page"
 msgstr "Страница"
 
@@ -3347,171 +3334,136 @@ msgstr "Широчина:"
 msgid "_Font..."
 msgstr "_Шрифт..."
 
-#: calendar/cal-util/cal-component.c:1218
-msgid "Untitled appointment"
-msgstr "Неназовани срещи"
-
-#: calendar/cal-util/cal-recur.c:3985 calendar/gui/print.c:477
-msgid "1st"
-msgstr "1ви"
-
-#: calendar/cal-util/cal-recur.c:3986 calendar/gui/print.c:477
-msgid "2nd"
-msgstr "2ри"
-
-#: calendar/cal-util/cal-recur.c:3987 calendar/gui/print.c:477
-msgid "3rd"
-msgstr "3ти"
-
-#: calendar/cal-util/cal-recur.c:3988 calendar/gui/print.c:477
-msgid "4th"
-msgstr "4ти"
-
-#: calendar/cal-util/cal-recur.c:3989 calendar/gui/print.c:477
-msgid "5th"
-msgstr "5ти"
-
-#: calendar/cal-util/cal-recur.c:3990 calendar/gui/print.c:478
-msgid "6th"
-msgstr "6ти"
-
-#: calendar/cal-util/cal-recur.c:3991 calendar/gui/print.c:478
-msgid "7th"
-msgstr "7ми"
-
-#: calendar/cal-util/cal-recur.c:3992 calendar/gui/print.c:478
-msgid "8th"
-msgstr "8ми"
-
-#: calendar/cal-util/cal-recur.c:3993 calendar/gui/print.c:478
-msgid "9th"
-msgstr "9ти"
-
-#: calendar/cal-util/cal-recur.c:3994 calendar/gui/print.c:478
-msgid "10th"
-msgstr "10ти"
-
-#: calendar/cal-util/cal-recur.c:3995 calendar/gui/print.c:479
-msgid "11th"
-msgstr "11ти"
+#: addressbook/printing/test-contact-print-style-editor.c:53
+#, fuzzy
+msgid "Contact Print Style Editor Test"
+msgstr "Редактор за Контакти"
 
-#: calendar/cal-util/cal-recur.c:3996 calendar/gui/print.c:479
-msgid "12th"
-msgstr "12ти"
+#: addressbook/printing/test-contact-print-style-editor.c:56
+msgid "This should test the contact print style editor widget"
+msgstr ""
 
-#: calendar/cal-util/cal-recur.c:3997 calendar/gui/print.c:479
-msgid "13th"
-msgstr "13ти"
+#: addressbook/printing/test-print.c:52
+#, fuzzy
+msgid "Contact Print Test"
+msgstr "Списък с _Контакти"
 
-#: calendar/cal-util/cal-recur.c:3998 calendar/gui/print.c:479
-msgid "14th"
-msgstr "14ти"
+#: addressbook/printing/test-print.c:55
+msgid "This should test the contact print code"
+msgstr ""
 
-#: calendar/cal-util/cal-recur.c:3999 calendar/gui/print.c:479
-msgid "15th"
-msgstr "15ти"
+#: addressbook/tools/evolution-addressbook-export.c:56
+msgid "Specify the output file instead of standard output"
+msgstr ""
 
-#: calendar/cal-util/cal-recur.c:4000 calendar/gui/print.c:480
-msgid "16th"
-msgstr "16ти"
+#: addressbook/tools/evolution-addressbook-export.c:57
+msgid "OUTPUTFILE"
+msgstr ""
 
-#: calendar/cal-util/cal-recur.c:4001 calendar/gui/print.c:480
-msgid "17th"
-msgstr "17ти"
+#: addressbook/tools/evolution-addressbook-export.c:58
+#, fuzzy
+msgid "List local addressbook folders"
+msgstr "с всички локални и активни отдалечени папки"
 
-#: calendar/cal-util/cal-recur.c:4002 calendar/gui/print.c:480
-msgid "18th"
-msgstr "18ти"
+#: addressbook/tools/evolution-addressbook-export.c:60
+msgid "Show cards as vcard or csv file"
+msgstr ""
 
-#: calendar/cal-util/cal-recur.c:4003 calendar/gui/print.c:480
-msgid "19th"
-msgstr "19ти"
+#: addressbook/tools/evolution-addressbook-export.c:60
+#, fuzzy
+msgid "[vcard|csv]"
+msgstr "карти"
 
-#: calendar/cal-util/cal-recur.c:4004 calendar/gui/print.c:480
-msgid "20th"
-msgstr "20ти"
+#: addressbook/tools/evolution-addressbook-export.c:61
+msgid "Export in asynchronous mode "
+msgstr ""
 
-#: calendar/cal-util/cal-recur.c:4005 calendar/gui/print.c:481
-msgid "21st"
-msgstr "21ви"
+#: addressbook/tools/evolution-addressbook-export.c:63
+msgid ""
+"The number of cards in one output file in asychronous mode,default size 100."
+msgstr ""
 
-#: calendar/cal-util/cal-recur.c:4006 calendar/gui/print.c:481
-msgid "22nd"
-msgstr "22ри"
+#: addressbook/tools/evolution-addressbook-export.c:63
+msgid "NUMBER"
+msgstr ""
 
-#: calendar/cal-util/cal-recur.c:4007 calendar/gui/print.c:481
-msgid "23rd"
-msgstr "23ти"
+#: addressbook/tools/evolution-addressbook-export.c:91
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
+msgstr ""
 
-#: calendar/cal-util/cal-recur.c:4008 calendar/gui/print.c:481
-msgid "24th"
-msgstr "24ти"
+#: addressbook/tools/evolution-addressbook-export.c:105
+msgid "Only support csv or vcard format."
+msgstr ""
 
-#: calendar/cal-util/cal-recur.c:4009 calendar/gui/print.c:481
-msgid "25th"
-msgstr "25ти"
+#: addressbook/tools/evolution-addressbook-export.c:114
+msgid "In async mode, output must be file."
+msgstr ""
 
-#: calendar/cal-util/cal-recur.c:4010 calendar/gui/print.c:482
-msgid "26th"
-msgstr "26ти"
+#: addressbook/tools/evolution-addressbook-export.c:122
+msgid "In normal mode, there should not need size option."
+msgstr ""
 
-#: calendar/cal-util/cal-recur.c:4011 calendar/gui/print.c:482
-msgid "27th"
-msgstr "27ми"
+#: addressbook/tools/evolution-addressbook-export.c:153
+#, fuzzy
+msgid "Impossible internal error."
+msgstr "Вътрешна грешка"
 
-#: calendar/cal-util/cal-recur.c:4012 calendar/gui/print.c:482
-msgid "28th"
-msgstr "28ми"
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+#, fuzzy
+msgid "Can not open file"
+msgstr "Не мога да отворя съобщение"
 
-#: calendar/cal-util/cal-recur.c:4013 calendar/gui/print.c:482
-msgid "29th"
-msgstr "29ти"
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "Адресната книга не може да бъде отворена"
 
-#: calendar/cal-util/cal-recur.c:4014 calendar/gui/print.c:482
-msgid "30th"
-msgstr "30ти"
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Адресната книга не може да бъде отворена"
 
-#: calendar/cal-util/cal-recur.c:4015 calendar/gui/print.c:483
-msgid "31st"
-msgstr "31ви"
+#: addressbook/tools/evolution-addressbook-import.c:46
+msgid "Error loading default addressbook."
+msgstr "Грешка при зареждането на адресна книга"
 
-#: calendar/cal-util/cal-util.c:550 calendar/cal-util/cal-util.c:572
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:401 mail/message-list.c:753
-msgid "High"
-msgstr "Високо"
+#: addressbook/tools/evolution-addressbook-import.c:67
+msgid "Input File"
+msgstr "Файл за изход"
 
-#: calendar/cal-util/cal-util.c:552 calendar/cal-util/cal-util.c:574
-#: calendar/gui/calendar-model.c:1709
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:402 mail/message-list.c:752
-msgid "Normal"
-msgstr "Нормално"
+#: addressbook/tools/evolution-addressbook-import.c:82
+msgid "No filename provided."
+msgstr "Няма име на файл"
 
-#: calendar/cal-util/cal-util.c:554 calendar/cal-util/cal-util.c:576
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:403 mail/message-list.c:751
-msgid "Low"
-msgstr "Ниско"
+#: addressbook/util/e-destination.c:577
+msgid "Unnamed List"
+msgstr "Неименуван Списък"
 
-#. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:570
-#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: calendar/gui/e-calendar-table.c:404
-msgid "Undefined"
-msgstr "Недефинирано"
+#: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
+#: smime/gui/component.c:48
+#, fuzzy
+msgid "Enter password"
+msgstr "Въведедете парола"
 
 #: calendar/conduits/calendar/calendar-conduit.c:206
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1289
-#: calendar/conduits/todo/todo-conduit.c:830
-msgid "Error while communicating with calendar server"
-msgstr "Грешка при комуникацията с календарния сървър"
+#: calendar/conduits/calendar/calendar-conduit.c:1313
+#: calendar/conduits/todo/todo-conduit.c:849
+msgid "Could not start wombat server"
+msgstr "Wombat сървървърът не може да бъде стартиран"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1440
-#: calendar/conduits/calendar/calendar-conduit.c:1443
+#: calendar/conduits/calendar/calendar-conduit.c:1314
+#: calendar/conduits/todo/todo-conduit.c:850
+msgid "Could not start wombat"
+msgstr "Wombat не може да бъде стартиран"
+
+#: calendar/conduits/calendar/calendar-conduit.c:1422
+#: calendar/conduits/calendar/calendar-conduit.c:1425
 msgid "Could not read pilot's Calendar application block"
 msgstr "Не мога да прочета календара от pilot"
 
@@ -3519,99 +3471,74 @@ msgstr "Не мога да прочета календара от pilot"
 msgid "Default Priority:"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:954
-#: calendar/conduits/todo/todo-conduit.c:957
+#: calendar/conduits/todo/todo-conduit.c:929
+#: calendar/conduits/todo/todo-conduit.c:932
 msgid "Could not read pilot's ToDo application block"
 msgstr "Не мога да прочета списъкът със задачи от pilot"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Календар и Задачи"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Evolution Calendar and Tasks"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks component"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr ""
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr ""
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 msgid "Starting:"
 msgstr "Стартиращ:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
 msgid "Ending:"
 msgstr "Завършващ:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:227
-msgid "invalid time"
-msgstr "грешно време"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:272
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:259
 msgid "Evolution Alarm"
 msgstr "Аларма на Evolution."
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:366
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:358
 #, c-format
 msgid "Alarm on %s"
 msgstr "Аларма на %s"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: ui/evolution-comp-editor.xml.h:1
-msgid "C_lose"
-msgstr "_Затвори"
+#, fuzzy
+msgid "Snooze _time (minutes):"
+msgstr "Време за забавяне (минути)"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Snoo_ze"
-msgstr "Заба_вяне"
+msgid "_Edit appointment"
+msgstr "_Редактирай среща"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-msgid "Snooze time (minutes)"
-msgstr "Време за забавяне (минути)"
+#, fuzzy
+msgid "_Snooze"
+msgstr "Заба_вяне"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
-msgid "_Edit appointment"
-msgstr "_Редактирай среща"
+#: calendar/gui/alarm-notify/alarm-queue.c:881
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
+msgstr "Отваря"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:883
+msgid "Dismiss"
+msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:770
+#: calendar/gui/alarm-notify/alarm-queue.c:885
+msgid "Dismiss All"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:949
 msgid "No description available."
 msgstr "Няма описание."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:843
-#: calendar/gui/alarm-notify/alarm-queue.c:867 widgets/misc/e-messagebox.c:161
+#: calendar/gui/alarm-notify/alarm-queue.c:969
+#, c-format
+msgid ""
+"Alarm on %s\n"
+"%s\n"
+"Starting at %s\n"
+"Ending at %s"
+msgstr ""
+
+#: calendar/gui/alarm-notify/alarm-queue.c:1069
+#: calendar/gui/alarm-notify/alarm-queue.c:1093
 msgid "Warning"
 msgstr "Внимание"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:847
+#: calendar/gui/alarm-notify/alarm-queue.c:1073
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3622,7 +3549,7 @@ msgstr ""
 "по ел. поща все още, но това напомняне е конфигурирано\n"
 "да изпраща поща."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-queue.c:1099
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3633,258 +3560,318 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:887
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
 msgid "Do not ask me about this program again."
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:176
-msgid "Could not initialize gnome-vfs"
-msgstr "Не мога да инициализирам gnome-vfs"
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:185
+#: calendar/gui/alarm-notify/notify-main.c:139
+msgid "Could not initialize Bonobo"
+msgstr "Не мога да инициализирам Bonobo"
+
+#: calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "Съдържания на Обобщен"
+#: calendar/gui/alarm-notify/util.c:37
+msgid "invalid time"
+msgstr "грешно време"
 
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "Съдържания на описание"
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+msgid "Allocate less space to weekend appointments"
+msgstr ""
 
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "Съдържание на Коментар"
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#, fuzzy
+msgid "Calendars to run alarms for"
+msgstr "iКалендар Грешка"
 
-#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1130
-msgid "Unmatched"
-msgstr "Несъвпадащ"
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#, fuzzy
+msgid "Color of tasks that are due today"
+msgstr "Цвят на задачи за деня"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#, fuzzy
+msgid "Color of tasks that are overdue"
+msgstr "Цвят на задачи за деня"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+msgid "Days that are work days"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+msgid "Default timezone for meetings"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:419
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+msgid "Hour the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+msgid "Hour the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+msgid "Intervals shown in Day and Work Week views"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+msgid "List of urls for free/busy publishing"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+msgid "Minute the workday ends on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+msgid "Minute the workday starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+msgid "Number of units for default reminder"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+msgid "Number of units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+msgid "Position of the horizontal pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+msgid "Position of the horizontal pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+msgid "Position of the vertical pane"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+msgid "Position of the vertical pane in the month view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+msgid "Position of the vertical pane in the task view"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+msgid "Programs that can run as part of alarms"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+msgid "Show where events end in week and month views"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+msgid "Time last alarm ran"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+msgid "Units for determining when to hide tasks"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#, fuzzy
+msgid "Units of default reminder"
+msgstr "Създаване на нова среща с подраз_биращо напомняне"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+msgid "Weekday the week starts on"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+msgid "Whether or not to use the notification tray for display alarms"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#, fuzzy
+msgid "Whether to ask for confirmation on appointment deletion"
+msgstr "_Пита за подтвърждение при изтриване на обекти"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#, fuzzy
+msgid "Whether to ask for confirmation when folder is expunged"
+msgstr "_Пита за подтвърждение при изтриване на обекти"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#, fuzzy
+msgid "Whether to hide completed tasks"
+msgstr "Изтрива завършените задачи"
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+msgid "Whether to set a default reminder for events"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+msgid "Whether to show times in 24h format instead of using am/pm"
+msgstr ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+#, fuzzy
+msgid "Whether to show week numbers in date navigator"
+msgstr "Показвай номерата на седмиците в навигацията за _ден"
+
+#: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
+#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/gnome-cal.c:1705
+#: camel/providers/groupwise/camel-gw-listener.c:311
+#: camel/providers/groupwise/camel-gw-listener.c:334
+msgid "Calendar"
+msgstr "Календар"
+
+#: calendar/gui/calendar-commands.c:352
+msgid ""
+"This operation will permanently erase all events older than the selected "
+"amount of time. If you continue, you will not be able to recover these "
+"events."
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:358
+#, fuzzy
+msgid "Purge events older than"
+msgstr "връща по-малко от"
+
+#: calendar/gui/calendar-commands.c:363
+#: calendar/gui/dialogs/alarm-options.glade.h:10
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
+msgid "days"
+msgstr "дни"
+
+#: calendar/gui/calendar-commands.c:432 calendar/gui/calendar-component.c:504
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:422 calendar/gui/e-day-view-top-item.c:265
-#: calendar/gui/e-day-view.c:1440 calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
+#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:424 calendar/gui/calendar-commands.c:429
-#: calendar/gui/calendar-commands.c:431
+#: calendar/gui/calendar-commands.c:437 calendar/gui/calendar-commands.c:442
+#: calendar/gui/calendar-commands.c:444 calendar/gui/calendar-component.c:509
+#: calendar/gui/calendar-component.c:514 calendar/gui/calendar-component.c:516
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:442 calendar/gui/calendar-commands.c:449
-#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:457
+#: calendar/gui/calendar-commands.c:461 calendar/gui/calendar-commands.c:467
+#: calendar/gui/calendar-commands.c:473 calendar/gui/calendar-commands.c:475
+#: calendar/gui/calendar-component.c:528 calendar/gui/calendar-component.c:535
+#: calendar/gui/calendar-component.c:541 calendar/gui/calendar-component.c:543
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:447
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1509
+#: calendar/gui/calendar-commands.c:465 calendar/gui/calendar-component.c:533
+#: calendar/gui/e-week-view-main-item.c:337 calendar/gui/print.c:1498
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/calendar-commands.c:834
-msgid ""
-"Could not create the calendar view.  Please check your ORBit and OAF setup."
+#: calendar/gui/calendar-component.c:370
+#, c-format
+msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
-"Не мога да създам календарен изглед. Моля проверете настройките на ORBit и "
-"OAF"
 
-#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1543
-#: importers/netscape-importer.c:1873 mail/importers/netscape-importer.c:1843
-#: my-evolution/my-evolution.glade.h:2 shell/e-local-storage.c:177
-#: shell/e-shortcuts.c:1085
-msgid "Calendar"
-msgstr "Календар"
+#: calendar/gui/calendar-component.c:426
+#, fuzzy
+msgid "New Calendar"
+msgstr "Нова Каледония"
 
-#: calendar/gui/calendar-component.c:71
-msgid "Folder containing appointments and events"
-msgstr "Папката съдържа срещи и събития"
+#: calendar/gui/calendar-component.c:623
+#, fuzzy
+msgid "Failed upgrading calendars."
+msgstr "Клендарът се зарежда..."
 
-#: calendar/gui/calendar-component.c:75
-msgid "Public Calendar"
+#: calendar/gui/calendar-component.c:917
+#, c-format
+msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:76
-msgid "Public folder containing appointments and events"
+#: calendar/gui/calendar-component.c:929
+msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:738
-#: calendar/gui/print.c:1789 calendar/gui/tasks-control.c:487
-#: calendar/importers/icalendar-importer.c:644
-#: importers/netscape-importer.c:1875 mail/importers/netscape-importer.c:1845
-#: my-evolution/e-summary-tasks.c:329 my-evolution/e-summary-tasks.c:338
-#: shell/e-local-storage.c:183 shell/e-shortcuts.c:1086
-msgid "Tasks"
-msgstr "Задачи"
-
-#: calendar/gui/calendar-component.c:81
-msgid "Folder containing to-do items"
-msgstr "Папката съдържа задачи за правене"
-
-#: calendar/gui/calendar-component.c:85
-msgid "Public Tasks"
+#: calendar/gui/calendar-component.c:963
+msgid ""
+"Selected calendar is read-only, events cannot be created. Please select a "
+"read-write calendar."
 msgstr ""
 
-#: calendar/gui/calendar-component.c:86
-msgid "Public folder containing to-do items"
-msgstr ""
+#: calendar/gui/calendar-component.c:1071
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Calendars"
+msgstr "Календар"
 
-#: calendar/gui/calendar-component.c:732
+#: calendar/gui/calendar-component.c:1234
 msgid "New appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:732
+#: calendar/gui/calendar-component.c:1235
 msgid "_Appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:733
+#: calendar/gui/calendar-component.c:1236
 msgid "Create a new appointment"
 msgstr "Създава нова поща"
 
-#: calendar/gui/calendar-component.c:737
+#: calendar/gui/calendar-component.c:1242
 msgid "New meeting"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:737
+#: calendar/gui/calendar-component.c:1243
 msgid "M_eeting"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:738
+#: calendar/gui/calendar-component.c:1244
 msgid "Create a new meeting request"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:742
-msgid "New task"
-msgstr ""
-
-#: calendar/gui/calendar-component.c:742
-msgid "_Task"
-msgstr "_Задачи"
-
-#: calendar/gui/calendar-component.c:743
-msgid "Create a new task"
-msgstr "Създава нова задача"
-
-#: calendar/gui/calendar-component.c:747
-msgid "New All Day Appointment"
-msgstr ""
+#: calendar/gui/calendar-component.c:1250
+#, fuzzy
+msgid "New all day appointment"
+msgstr "Нова _Среща"
 
-#: calendar/gui/calendar-component.c:747
+#: calendar/gui/calendar-component.c:1251
 msgid "All _Day Appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:748
+#: calendar/gui/calendar-component.c:1252
 msgid "Create a new all-day appointment"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:405 calendar/gui/calendar-model.c:964
-#: calendar/gui/e-calendar-table.c:380
-msgid "Private"
-msgstr "Частен"
-
-#: calendar/gui/calendar-model.c:408 calendar/gui/calendar-model.c:966
-#: calendar/gui/e-calendar-table.c:381
-msgid "Confidential"
-msgstr "Конфиденциален"
-
-#: calendar/gui/calendar-model.c:411 calendar/gui/e-calendar-table.c:379
-msgid "Public"
-msgstr "Публичен"
-
-#: calendar/gui/calendar-model.c:523
-msgid "N"
-msgstr "С"
-
-#: calendar/gui/calendar-model.c:523
-msgid "S"
-msgstr "Ю"
-
-#: calendar/gui/calendar-model.c:525
-msgid "E"
-msgstr "И"
-
-#: calendar/gui/calendar-model.c:525
-msgid "W"
-msgstr "З"
-
-#: calendar/gui/calendar-model.c:590 calendar/gui/calendar-model.c:1134
-#: calendar/gui/e-calendar-table.c:453
-msgid "Free"
-msgstr "Свободно"
-
-#: calendar/gui/calendar-model.c:592 calendar/gui/e-calendar-table.c:454
-#: calendar/gui/e-meeting-time-sel.c:406
-#: shell/evolution-shell-component.c:1207
-msgid "Busy"
-msgstr "Заето"
-
-#: calendar/gui/calendar-model.c:750 calendar/gui/calendar-model.c:1178
-#: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:474 calendar/gui/print.c:2298
-msgid "Not Started"
-msgstr "Не е Стартиран"
+#: calendar/gui/calendar-component.c:1258
+#, fuzzy
+msgid "New calendar"
+msgstr "Нова Каледония"
 
-#: calendar/gui/calendar-model.c:753 calendar/gui/calendar-model.c:1180
-#: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:475 calendar/gui/print.c:2301
-msgid "In Progress"
-msgstr "В Прогрес"
+#: calendar/gui/calendar-component.c:1259
+#, fuzzy
+msgid "C_alendar"
+msgstr "К_алендар:"
 
-#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1182
-#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-meeting-model.c:294
-#: calendar/gui/e-meeting-model.c:317 calendar/gui/print.c:2304
-msgid "Completed"
-msgstr "Приключено"
+#: calendar/gui/calendar-component.c:1260
+#, fuzzy
+msgid "Create a new calendar"
+msgstr "Създава нова папка"
 
-#: calendar/gui/calendar-model.c:1036
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
+#: calendar/gui/calendar-offline-handler.c:192
+#, c-format
+msgid "backend_go_offline(): %s"
 msgstr ""
-"Географското местонахождение трябва да бъде въведено в следния формат: \n"
-"\n"
-"45.436845,125.862501"
-
-#. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1176 calendar/gui/dialogs/meeting-page.c:330
-#: calendar/gui/dialogs/meeting-page.glade.h:2 composer/e-msg-composer.c:2067
-#: mail/folder-browser.c:1776 mail/mail-account-gui.c:1260
-#: mail/mail-account-gui.c:1692 mail/mail-accounts.c:442
-#: mail/mail-config.glade.h:76
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
-#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:442
-#: widgets/misc/e-dateedit.c:1470 widgets/misc/e-dateedit.c:1585
-msgid "None"
-msgstr "Без"
 
-#: calendar/gui/calendar-model.c:1711
-msgid "Recurring"
-msgstr "Повтарям"
-
-#: calendar/gui/calendar-model.c:1713
-msgid "Assigned"
-msgstr "Назначен"
-
-#: calendar/gui/calendar-model.c:1719 calendar/gui/e-meeting-model.c:266
-#: calendar/gui/e-meeting-model.c:276 calendar/gui/e-meeting-model.c:534
-#: calendar/gui/e-meeting-model.c:787
-msgid "Yes"
-msgstr "Да"
-
-#: calendar/gui/calendar-model.c:1719 calendar/gui/e-meeting-model.c:278
-#: calendar/gui/e-meeting-model.c:788
-msgid "No"
-msgstr "Не"
+#: calendar/gui/calendar-offline-handler.c:215
+#, c-format
+msgid "backend_go_online(): %s"
+msgstr ""
 
 #: calendar/gui/calendar-view-factory.c:118
 msgid "Day View"
@@ -3902,48 +3889,61 @@ msgstr "Изглед за Седмица"
 msgid "Month View"
 msgstr "Изгел за Месец"
 
-#: calendar/gui/comp-editor-factory.c:456
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "Съдържания на Обобщен"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Съдържания на описание"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Съдържание на Коментар"
+
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "Съдържания на описание"
+
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
+msgid "Unmatched"
+msgstr "Несъвпадащ"
+
+#: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr ""
 
-#: calendar/gui/comp-editor-factory.c:467
+#: calendar/gui/comp-editor-factory.c:420
 msgid "Method not supported when opening the calendar"
 msgstr ""
 
-#: calendar/gui/comp-editor-factory.c:473
+#: calendar/gui/comp-editor-factory.c:426
 msgid "Permission denied to open the calendar"
 msgstr ""
 
-#: calendar/gui/control-factory.c:119
+#: calendar/gui/comp-editor-factory.c:474
 #, c-format
-msgid "Could not open the folder in '%s'"
-msgstr ""
-
-#: calendar/gui/control-factory.c:165
-msgid "The URI that the calendar will display"
-msgstr "URI, което ще се показва в календара"
-
-#: calendar/gui/control-factory.c:172
-msgid "The type of view to show"
+msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:466
+#: calendar/gui/dialogs/alarm-options.c:467
 msgid "Audio Alarm Options"
 msgstr "Опции на Звукова Аларма"
 
-#: calendar/gui/dialogs/alarm-options.c:475
+#: calendar/gui/dialogs/alarm-options.c:476
 msgid "Message Alarm Options"
 msgstr "Опции за Получатели на Съобщението"
 
-#: calendar/gui/dialogs/alarm-options.c:484
+#: calendar/gui/dialogs/alarm-options.c:485
 msgid "Email Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:493
+#: calendar/gui/dialogs/alarm-options.c:494
 msgid "Program Alarm Options"
 msgstr "Опции на програма аларма"
 
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:510
 msgid "Unknown Alarm Options"
 msgstr "Неизвестни опции на аларма"
 
@@ -3979,11 +3979,7 @@ msgstr ""
 msgid "With these arguments:"
 msgstr "С тези аргументи:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
-msgid "days"
-msgstr "дни"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:11
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
 msgid "dialog1"
 msgstr ""
 
@@ -3991,83 +3987,199 @@ msgstr ""
 msgid "extra times every"
 msgstr "допълнително време всеки"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter.glade.h:18
+#: calendar/gui/dialogs/alarm-options.glade.h:13
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr "часове"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:19
-msgid "minutes"
-msgstr "минути"
+#: calendar/gui/dialogs/alarm-page.c:802
+msgid "Action/Trigger"
+msgstr ""
 
 #: calendar/gui/dialogs/alarm-page.glade.h:1
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+msgid "A_dd"
+msgstr "Д_обавя"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:2
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
 msgstr "Базов"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:2
+#: calendar/gui/dialogs/alarm-page.glade.h:3
 #: calendar/gui/dialogs/recurrence-page.glade.h:3
 msgid "Date/Time:"
 msgstr "Дата/Време:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:465
-msgid "Display a message"
-msgstr "Показва съобщение"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:461
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Издава зук"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5
+#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:448
+msgid "Pop up an alert"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-page.glade.h:6
 msgid "Reminders"
 msgstr "Напомняне"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:473
+#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Стартирай програма"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:7
-msgid "Send an Email"
-msgstr ""
+#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+msgid "Send an email"
+msgstr "Изпрати ел. писмо"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8
+#: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-cal-component-preview.c:187
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Обобщено:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:9
+#: calendar/gui/dialogs/alarm-page.glade.h:10
 msgid "_Options..."
 msgstr "_Опций..."
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/alarm-page.glade.h:11
 msgid "after"
 msgstr "след"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-page.glade.h:12
 msgid "before"
 msgstr "преди"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-page.glade.h:13
 #: calendar/gui/dialogs/recurrence-page.glade.h:14
 msgid "day(s)"
 msgstr "ден(дни)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
+#: calendar/gui/dialogs/alarm-page.glade.h:14
 msgid "end of appointment"
 msgstr "край на среща"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-page.glade.h:15
 msgid "hour(s)"
 msgstr "час(ове)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15 mail/mail-config.glade.h:173
+#: calendar/gui/dialogs/alarm-page.glade.h:16
 msgid "minute(s)"
 msgstr "минут(а/и)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16
+#: calendar/gui/dialogs/alarm-page.glade.h:17
 msgid "start of appointment"
 msgstr "начало на среща"
 
+#: calendar/gui/dialogs/calendar-setup.c:172
+#, fuzzy
+msgid "You must specify a location to get the calendar from."
+msgstr "Трябва да определите име на файла."
+
+#: calendar/gui/dialogs/calendar-setup.c:180
+#, fuzzy, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "Метода заявен за зареждане на `%s' не се подържа"
+
+#: calendar/gui/dialogs/calendar-setup.c:195
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:275
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:288
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+#, fuzzy
+msgid "Add Calendar"
+msgstr "Календар"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Add Tasks Group"
+msgstr "_Добавя Група..."
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+msgid "C_olor:"
+msgstr "Колорадо"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
+msgid "Pick a color"
+msgstr "Избери цвят"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Календар"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+#, fuzzy
+msgid "_Add Group"
+msgstr "_Добавя Група..."
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+#, fuzzy
+msgid "_Refresh:"
+msgstr "Презарежда"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#, fuzzy
+msgid "_Type:"
+msgstr "Тип:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+msgid "_URL:"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
+msgid "weeks"
+msgstr "седмици"
+
+#. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
+#. has "activatable" set.
+#: calendar/gui/dialogs/cal-prefs-dialog.c:567 mail/em-account-prefs.c:466
+#: mail/em-composer-prefs.c:677 mail/em-composer-prefs.c:905
+msgid "Enabled"
+msgstr "Разрешен"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.c:721
+#, fuzzy
+msgid "Are you sure you want to remove this URL?"
+msgstr "Сигурен ли сте, че искате да изтриете папка \"%s\"?"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.c:729
+#, fuzzy
+msgid "Don't Remove"
+msgstr "Не Изтривай"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.c:778
+#: calendar/gui/dialogs/cal-prefs-dialog.c:811
+#: calendar/gui/dialogs/cal-prefs-dialog.c:844 mail/em-account-prefs.c:288
+#: mail/em-account-prefs.c:329 mail/em-account-prefs.c:372
+#: mail/em-composer-prefs.c:596 mail/em-composer-prefs.c:654
+#: mail/em-composer-prefs.c:684
+msgid "Disable"
+msgstr "Забрани"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.c:778
+#: calendar/gui/dialogs/cal-prefs-dialog.c:811
+#: calendar/gui/dialogs/cal-prefs-dialog.c:846 mail/em-account-prefs.c:288
+#: mail/em-account-prefs.c:329 mail/em-account-prefs.c:374
+#: mail/em-composer-prefs.c:596 mail/em-composer-prefs.c:654
+#: mail/em-composer-prefs.c:684
+msgid "Enable"
+msgstr "Разрешава"
+
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid "05 minutes"
 msgstr "05 минути"
@@ -4088,447 +4200,408 @@ msgstr "30 минути"
 msgid "60 minutes"
 msgstr "60 минути"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:14
-msgid "Alerts"
-msgstr ""
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
+#, fuzzy
+msgid "<b>Alerts</b>"
+msgstr "<b>Започва:</b>·"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#, fuzzy
+msgid "<b>General</b>"
+msgstr "Основен"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#, fuzzy
+msgid "<b>Task List</b>"
+msgstr "Начало на задача: <b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#, fuzzy
+msgid "<b>Time</b>"
+msgstr "<b>Завършени:</b>·"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#, fuzzy
+msgid "<b>Work Week</b>"
+msgstr "Работна Седмица"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Calendar and Tasks Settings"
 msgstr "Настройки на Календар и Задачи"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Color for overdue tasks"
 msgstr "Цвят за просрочени задачи"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "Color for tasks due today"
 msgstr "Цвят на задачи за деня"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Day _ends:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Days"
 msgstr "Дни"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1040
-#: calendar/gui/e-itip-control.c:647
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "Display"
+msgstr "_Показва"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: mail/mail-config.glade.h:76
+msgid "E_nable"
+msgstr "Раз_решен"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#, fuzzy
+msgid "Free/Busy Publishing"
+msgstr "Заявка Свободен/Зает"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.c:1048
+#: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Петък"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Hours"
 msgstr "Часове"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Minutes"
 msgstr "Минути"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1036
-#: calendar/gui/e-itip-control.c:643
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/recurrence-page.c:1044
+#: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Понеделник"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "S_un"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1041
-#: calendar/gui/e-itip-control.c:648
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/recurrence-page.c:1049
+#: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Събота"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Sh_ow a reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Show week _numbers in date navigator"
 msgstr "Показвай номерата на седмиците в навигацията за _ден"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/recurrence-page.c:1042
-#: calendar/gui/e-itip-control.c:642
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/recurrence-page.c:1050
+#: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Неделя"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "T_asks due today:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "T_hu"
 msgstr "_Чет"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-msgid "Task List"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1039
-#: calendar/gui/e-itip-control.c:646
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/recurrence-page.c:1047
+#: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Четвъртък"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "Time"
-msgstr "Време"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Time _zone:"
 msgstr "_Времева Зона: "
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Time format:"
 msgstr "Формат на време:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1037
-#: calendar/gui/e-itip-control.c:644
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/recurrence-page.c:1045
+#: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Вторник"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "W_eek starts:"
 msgstr "Седмицата започва:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1038
-#: calendar/gui/e-itip-control.c:645
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/recurrence-page.c:1046
+#: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Сряда"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:27
-msgid "Work Week"
-msgstr "Работна Седмица"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Work days:"
 msgstr "Работни дни:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_12 hour (AM/PM)"
 msgstr "_12 часа (am/pm)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_24 hour"
 msgstr "_24 часа"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#, fuzzy
+msgid "_Add URL"
+msgstr "Д_обави"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Пита за подтвърждение при изтриване на обекти"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Compress weekends in month view"
 msgstr "Сбива почивните дни в месечен пре_глед"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Day begins:"
 msgstr "_Денят започва:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-msgid "_Display"
-msgstr "_Показва"
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
+#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
+#: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
+#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution-message-composer.xml.h:43
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:22
+msgid "_Edit"
+msgstr "_Редактира"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Fri"
 msgstr "_Пет"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: mail/mail-config.glade.h:147
-msgid "_General"
-msgstr "_Основен"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Hide completed tasks after"
 msgstr "Скрива завършени_те задачи след"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Mon"
 msgstr "По_н"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Overdue tasks:"
 msgstr "_Просрочени задачи:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Sat"
 msgstr "_Съб"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_Show appointment end times in week and month views"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Time divisions:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Tue"
 msgstr "_Вт"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Wed"
 msgstr "_Ср"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "before every appointment"
 msgstr "преди всяка среща"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
-msgid ""
-"The event being deleted is a meeting, would you like to send a cancellation "
-"notice?"
-msgstr ""
-
-#: calendar/gui/dialogs/cancel-comp.c:61
-msgid "Are you sure you want to cancel and delete this meeting?"
-msgstr "Сигурни ли сте, че искате да прекъснете и изтриете тази среща?"
-
-#: calendar/gui/dialogs/cancel-comp.c:67
-msgid ""
-"The task being deleted is assigned, would you like to send a cancellation "
-"notice?"
-msgstr ""
-
-#: calendar/gui/dialogs/cancel-comp.c:70
-msgid "Are you sure you want to cancel and delete this task?"
-msgstr "Сигурни ли сте, че искате да прекъснете и изтриете тази задача?"
-
-#: calendar/gui/dialogs/cancel-comp.c:76
-msgid ""
-"The journal entry being deleted is published, would you like to send a "
-"cancellation notice?"
-msgstr ""
-
-#: calendar/gui/dialogs/cancel-comp.c:79
-msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr ""
-"Сигурни ли сте, че искате да прекъснете и изтриете този запис в дневника?"
-
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Това събитие е било изтрито."
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "Тази задача е била изтрита."
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:68
 msgid "This journal entry has been deleted."
 msgstr "Този запис в дневника е бил изтрит."
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  Вие направихте промени. Да ги збравя ли и да затворя редактора?"
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Вие нямате направени промени, да затворя редактора?"
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "Това събитие е било променено."
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "Тази задача е била променена."
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:92
 msgid "This journal entry has been changed."
 msgstr "Този запис в дневника е бил променен."
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  Вие имате промени. Да ги забравя ли и да обновя редактора?"
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Вие нямате направени промени, да обновя редактора?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:409
-#, c-format
-msgid "Validation error: %s"
-msgstr "Грешка при валидиране: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2216
-msgid " to "
-msgstr " в"
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2220
-msgid " (Completed "
-msgstr " (Приключено "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2222
-msgid "Completed "
-msgstr "Приключено "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2227
-msgid " (Due "
-msgstr " (Дължим"
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2229
-msgid "Due "
-msgstr "Дължим"
-
-#: calendar/gui/dialogs/comp-editor.c:334
-msgid "Could not update invalid object"
-msgstr "Не може да осъвремени невалиден обект"
-
-#: calendar/gui/dialogs/comp-editor.c:337
-msgid "Object not found, not updated"
-msgstr "Обектът не е намерен, няма промяна"
-
-#: calendar/gui/dialogs/comp-editor.c:340
-msgid "You don't have permissions to update this object"
-msgstr "Нямата права да осъвремените този обект"
-
-#: calendar/gui/dialogs/comp-editor.c:343
+#: calendar/gui/dialogs/comp-editor.c:430
 msgid "Could not update object"
 msgstr "Обектът не може да бъде осъвременен"
 
-#: calendar/gui/dialogs/comp-editor.c:793
-#: calendar/gui/dialogs/comp-editor.c:830
+#: calendar/gui/dialogs/comp-editor.c:903
+#: calendar/gui/dialogs/comp-editor.c:940
 msgid "Edit Appointment"
 msgstr "Редактиране на Среща"
 
-#: calendar/gui/dialogs/comp-editor.c:798
-#: calendar/gui/dialogs/comp-editor.c:835
+#: calendar/gui/dialogs/comp-editor.c:908
+#: calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Appointment - %s"
 msgstr "Среща - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:801
-#: calendar/gui/dialogs/comp-editor.c:838
+#: calendar/gui/dialogs/comp-editor.c:911
+#: calendar/gui/dialogs/comp-editor.c:948
 #, c-format
 msgid "Task - %s"
 msgstr "Задача - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:804
-#: calendar/gui/dialogs/comp-editor.c:841
+#: calendar/gui/dialogs/comp-editor.c:914
+#: calendar/gui/dialogs/comp-editor.c:951
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Запис в журнал - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:815
-#: calendar/gui/dialogs/comp-editor.c:851
+#: calendar/gui/dialogs/comp-editor.c:925
+#: calendar/gui/dialogs/comp-editor.c:961
 msgid "No summary"
 msgstr "Няма резюме"
 
-#: calendar/gui/dialogs/comp-editor.c:1281
-#: calendar/gui/e-calendar-table.c:1068 calendar/gui/e-day-view.c:3993
-#: calendar/gui/e-week-view.c:3950 composer/e-msg-composer.c:1171
+#: calendar/gui/dialogs/comp-editor.c:1376
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
+#: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Запазва като..."
 
-#: calendar/gui/dialogs/comp-editor.c:1383
-#: calendar/gui/dialogs/comp-editor.c:1407
-#: calendar/gui/dialogs/comp-editor.c:1433
+#: calendar/gui/dialogs/comp-editor.c:1479
+#: calendar/gui/dialogs/comp-editor.c:1514
+#: calendar/gui/dialogs/comp-editor.c:1540
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1460
-msgid "Unable to obtain current version!"
+#: calendar/gui/dialogs/comp-editor.c:1576
+#, fuzzy
+msgid "Unable to use current version!"
 msgstr "Не мога да получа текущата версия!"
 
-#: calendar/gui/dialogs/delete-comp.c:96
+#: calendar/gui/dialogs/comp-editor-page.c:463
 #, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "Сигурен ли сте, че искате да изтриете срещата %s?"
+msgid "Validation error: %s"
+msgstr "Грешка при валидиране: %s"
 
-#: calendar/gui/dialogs/delete-comp.c:99
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "Сигурен ли сте, че искате да изтриете тази неименувана среща?"
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " в"
 
-#: calendar/gui/dialogs/delete-comp.c:105
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "Сигурен ли сте, че искате да изтриете задача %s?"
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Приключено "
 
-#: calendar/gui/dialogs/delete-comp.c:108
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "Сигурен ли сте, че искате да изтриете тази неименувана задача?"
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Приключено "
 
-#: calendar/gui/dialogs/delete-comp.c:114
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "Сигурен ли сте, че искате да изтриете записа в дневник %s?"
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (Дължим"
 
-#: calendar/gui/dialogs/delete-comp.c:117
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "Сигурен ли сте, че искате да неименуван запис в дневника?"
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Дължим"
 
-#: calendar/gui/dialogs/delete-comp.c:132
-#, c-format
-msgid "Are you sure you want to delete %d appointments?"
-msgstr "Сигурен ли сте, че искате да изтриете среща %d?"
+#: calendar/gui/dialogs/copy-source-dialog.c:57
+#, fuzzy
+msgid "Could not open source"
+msgstr "Обектът не може да бъде осъвременен"
 
-#: calendar/gui/dialogs/delete-comp.c:137
-#, c-format
-msgid "Are you sure you want to delete %d tasks?"
-msgstr "Сигурни ли сте, че искате да изтриете %d задачи?"
+#: calendar/gui/dialogs/copy-source-dialog.c:65
+#, fuzzy
+msgid "Could not open destination"
+msgstr "Не мога да анализирам URL `%s'"
 
-#: calendar/gui/dialogs/delete-comp.c:142
-#, c-format
-msgid "Are you sure you want to delete %d journal entries?"
-msgstr "Сигурни ли сте, че искате да изтриете %d журнални записи?"
+#: calendar/gui/dialogs/copy-source-dialog.c:74
+msgid "Destination is read only"
+msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:50
+#: calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:53
+#: calendar/gui/dialogs/delete-error.c:57
 msgid "The task could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:56
+#: calendar/gui/dialogs/delete-error.c:60
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:59
+#: calendar/gui/dialogs/delete-error.c:63
 msgid "The item could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:66
+#: calendar/gui/dialogs/delete-error.c:70
 msgid "The event could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:69
+#: calendar/gui/dialogs/delete-error.c:73
 msgid "The task could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:72
+#: calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:75
+#: calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:82
-msgid "The event could not be deleted because it was invalid"
+#: calendar/gui/dialogs/delete-error.c:86
+msgid "The event could not be deleted due to an error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:85
-msgid "The task could not be deleted because it was invalid"
+#: calendar/gui/dialogs/delete-error.c:89
+msgid "The task could not be deleted due to an error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:88
-msgid "The journal entry could not be deleted because it was invalid"
-msgstr ""
+#: calendar/gui/dialogs/delete-error.c:92
+#, fuzzy
+msgid "The journal entry could not be deleted due to an error"
+msgstr "Този запис в дневника е бил изтрит."
 
-#: calendar/gui/dialogs/delete-error.c:91
-msgid "The item could not be deleted because it was invalid"
-msgstr ""
+#: calendar/gui/dialogs/delete-error.c:95
+#, fuzzy
+msgid "The item could not be deleted due to an error"
+msgstr "Обекта не може да бъде изпратен!\n"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
 msgid "Addressbook..."
@@ -4542,46 +4615,59 @@ msgstr "Делегира На:"
 msgid "Enter Delegate"
 msgstr "Въвежда Делегат"
 
-#: calendar/gui/dialogs/event-editor.c:199 calendar/gui/print.c:2253
+#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Среща"
 
-#: calendar/gui/dialogs/event-editor.c:206
+#: calendar/gui/dialogs/event-editor.c:208
 msgid "Reminder"
 msgstr "Напомня"
 
-#: calendar/gui/dialogs/event-editor.c:213
+#: calendar/gui/dialogs/event-editor.c:215
 msgid "Recurrence"
 msgstr "Повторение"
 
-#: calendar/gui/dialogs/event-editor.c:220
-#: calendar/gui/dialogs/event-editor.c:292
-#: calendar/gui/dialogs/event-editor.c:436
+#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:439
 msgid "Scheduling"
 msgstr "Разпределение"
 
-#: calendar/gui/dialogs/event-editor.c:227
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:229
+#: calendar/gui/dialogs/event-editor.c:298
+#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Среща"
 
-#: calendar/gui/dialogs/event-page.c:603 calendar/gui/dialogs/task-page.c:509
+#: calendar/gui/dialogs/event-page.c:460
+msgid "Event with no start date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:463
+msgid "Event with no end date"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
 msgid "Start date is wrong"
 msgstr "Началната дата е грешна"
 
-#: calendar/gui/dialogs/event-page.c:613
+#: calendar/gui/dialogs/event-page.c:627
 msgid "End date is wrong"
 msgstr "Крайната дата е грешна"
 
-#: calendar/gui/dialogs/event-page.c:636
+#: calendar/gui/dialogs/event-page.c:650
 msgid "Start time is wrong"
 msgstr "Началния час е грешен"
 
-#: calendar/gui/dialogs/event-page.c:643
+#: calendar/gui/dialogs/event-page.c:657
 msgid "End time is wrong"
 msgstr "Крайния час е грешен"
 
+#: calendar/gui/dialogs/event-page.c:1264
+#, fuzzy, c-format
+msgid "Unable to open the calendar '%s'."
+msgstr "Адресната книга не може да бъде отворена"
+
 #: calendar/gui/dialogs/event-page.glade.h:2
 msgid "A_ll day event"
 msgstr "С_ъбитие за цял ден"
@@ -4595,78 +4681,97 @@ msgstr "_Зает"
 msgid "Ca_tegories..."
 msgstr "Ка_тегории..."
 
-#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/event-page.glade.h:6
 #: calendar/gui/dialogs/task-page.glade.h:3
-#: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Класификация"
 
-#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/event-page.glade.h:7
 msgid "Co_nfidential"
 msgstr "Т_аен"
 
-#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/event-page.glade.h:8
 #: calendar/gui/dialogs/task-page.glade.h:5
 msgid "Date & Time"
 msgstr "Дата и Час"
 
-#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:9
 msgid "F_ree"
 msgstr "_Свободен"
 
-#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/event-page.glade.h:10
 msgid "L_ocation:"
 msgstr "_Местонахождение: "
 
-#: calendar/gui/dialogs/event-page.glade.h:10
-#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/task-page.glade.h:8
 msgid "Pri_vate"
 msgstr "Частен"
 
-#: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/dialogs/task-page.glade.h:9
 msgid "Pu_blic"
 msgstr "Публичен"
 
-#: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/dialogs/event-page.glade.h:13
 msgid "Show Time As"
 msgstr "Показва Времето Като"
 
-#: calendar/gui/dialogs/event-page.glade.h:13
-#: calendar/gui/dialogs/task-page.glade.h:10
+#: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/task-page.glade.h:11
 msgid "Su_mmary:"
 msgstr "Резюме:"
 
-#: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/event-page.glade.h:15
 msgid "_End time:"
 msgstr "Край:"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:16
 msgid "_Start time:"
 msgstr "Начало:"
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#. an empty string is the same as 'None'
+#: calendar/gui/dialogs/meeting-page.c:311
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
+#: filter/filter-rule.c:877 mail/em-account-prefs.c:427
+#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
+#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:192
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
+#: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
+msgid "None"
+msgstr "Без"
+
+#: calendar/gui/dialogs/meeting-page.c:420
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:443
+#: calendar/gui/dialogs/meeting-page.c:426
 msgid "An organizer is required."
 msgstr "Необходим е организатор."
 
-#: calendar/gui/dialogs/meeting-page.c:458
+#: calendar/gui/dialogs/meeting-page.c:441
 msgid "At least one attendee is required."
 msgstr "Необходим е поне един участник."
 
-#: calendar/gui/dialogs/meeting-page.c:629
-msgid "That person is already attending the meeting!"
-msgstr "Това лице вече участва в срещата!"
-
-#: calendar/gui/dialogs/meeting-page.c:713
+#: calendar/gui/dialogs/meeting-page.c:651
 msgid "_Delegate To..."
 msgstr "_Делегира На.."
 
+#. FIXME: need to disable for undeletable folders
+#: calendar/gui/dialogs/meeting-page.c:655
+#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
+#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+msgid "_Delete"
+msgstr "_Изтрива"
+
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
+#: calendar/gui/e-meeting-list-view.c:218
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr ""
@@ -4702,31 +4807,78 @@ msgid "Member"
 msgstr "Член"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1149
+#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
-#: mail/message-list.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:248
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Статус"
 
+#: calendar/gui/dialogs/meeting-page.glade.h:2
+msgid "Add A_ttendee"
+msgstr ""
+
 #: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "Add attendees from addressbook."
+msgstr "Добавя подателя в Адресната книга"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Организатор:"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "_Change Organizer"
 msgstr "_Смяна на организатор"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-meeting-time-sel.c:424
-msgid "_Invite Others..."
-msgstr "_Други Поканени..."
+#: calendar/gui/dialogs/new-calendar.glade.h:2
+#, fuzzy
+msgid "<b>Calendar options</b>"
+msgstr "Календарна информация"
+
+#: calendar/gui/dialogs/new-calendar.glade.h:3
+#, fuzzy
+msgid "Add New Calendar"
+msgstr "Нова Каледония"
+
+#: calendar/gui/dialogs/new-calendar.glade.h:4
+#, fuzzy
+msgid "Calendar Group"
+msgstr "iКалендар Грешка"
+
+#: calendar/gui/dialogs/new-calendar.glade.h:5
+#, fuzzy
+msgid "Calendar Location"
+msgstr "Календарна информация"
+
+#: calendar/gui/dialogs/new-calendar.glade.h:6
+#, fuzzy
+msgid "Calendar Name"
+msgstr "Календар"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:2
+msgid "<b>Task List Options</b>"
+msgstr ""
+
+#: calendar/gui/dialogs/new-task-list.glade.h:3
+#, fuzzy
+msgid "Add New Task List"
+msgstr "Е Нов Списък"
+
+#: calendar/gui/dialogs/new-task-list.glade.h:4
+msgid "Task List Group"
+msgstr ""
+
+#: calendar/gui/dialogs/new-task-list.glade.h:5
+#, fuzzy
+msgid "Task List Name"
+msgstr "_Фамилия:"
 
 #: calendar/gui/dialogs/recur-comp.c:50
 msgid "You are modifying a recurring event, what would you like to modify?"
@@ -4745,65 +4897,70 @@ msgstr ""
 msgid "This Instance Only"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:75
+#: calendar/gui/dialogs/recur-comp.c:76
+msgid "This and Prior Instances"
+msgstr ""
+
+#: calendar/gui/dialogs/recur-comp.c:82
 msgid "This and Future Instances"
 msgstr ""
 
-#: calendar/gui/dialogs/recur-comp.c:77
+#: calendar/gui/dialogs/recur-comp.c:87
 msgid "All Instances"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:535
+#: calendar/gui/dialogs/recurrence-page.c:542
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Тази среща съдържа повторения които Evolution не може да редактира."
 
-#: calendar/gui/dialogs/recurrence-page.c:809
+#: calendar/gui/dialogs/recurrence-page.c:816
 msgid "Recurrence date is invalid"
 msgstr ""
 
-#: calendar/gui/dialogs/recurrence-page.c:919
+#: calendar/gui/dialogs/recurrence-page.c:927
 msgid "on"
 msgstr "на"
 
-#: calendar/gui/dialogs/recurrence-page.c:980
+#: calendar/gui/dialogs/recurrence-page.c:988
 msgid "first"
 msgstr "първи"
 
-#: calendar/gui/dialogs/recurrence-page.c:981
+#: calendar/gui/dialogs/recurrence-page.c:989
 msgid "second"
 msgstr "секунда"
 
-#: calendar/gui/dialogs/recurrence-page.c:982
+#: calendar/gui/dialogs/recurrence-page.c:990
 msgid "third"
 msgstr "трети"
 
-#: calendar/gui/dialogs/recurrence-page.c:983
+#: calendar/gui/dialogs/recurrence-page.c:991
 msgid "fourth"
 msgstr "четвърти"
 
-#: calendar/gui/dialogs/recurrence-page.c:984
+#: calendar/gui/dialogs/recurrence-page.c:992
 msgid "last"
 msgstr "последен"
 
-#: calendar/gui/dialogs/recurrence-page.c:1007
+#: calendar/gui/dialogs/recurrence-page.c:1015
 msgid "Other Date"
 msgstr "Друга Дата"
 
-#: calendar/gui/dialogs/recurrence-page.c:1035
+#: calendar/gui/dialogs/recurrence-page.c:1043
 msgid "day"
 msgstr "ден"
 
-#: calendar/gui/dialogs/recurrence-page.c:1172
+#: calendar/gui/dialogs/recurrence-page.c:1180
 msgid "on the"
 msgstr "на"
 
-#: calendar/gui/dialogs/recurrence-page.c:1357
+#: calendar/gui/dialogs/recurrence-page.c:1366
 msgid "occurrences"
 msgstr "събития"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "A_dd"
-msgstr "Д_обавя"
+#: calendar/gui/dialogs/recurrence-page.c:2336
+#, fuzzy
+msgid "Date/Time"
+msgstr "Дата/Време:"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
@@ -4834,6 +4991,7 @@ msgid "_No recurrence"
 msgstr "_Няма повторение"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
+#: composer/e-msg-composer-attachment-bar.c:453
 msgid "_Remove"
 msgstr "_Премахва"
 
@@ -4865,580 +5023,792 @@ msgstr "седмиц(а/и)"
 msgid "year(s)"
 msgstr "годин(а/и)"
 
-#: calendar/gui/dialogs/save-comp.c:54
-msgid ""
-"This event has been changed, but has not been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1568
-msgid "_Discard Changes"
-msgstr "_Незаписва Промени"
-
-#: calendar/gui/dialogs/save-comp.c:63
-msgid "Save Event"
-msgstr "Запазва Събитие"
-
-#: calendar/gui/dialogs/send-comp.c:58
-msgid "The meeting information has been created. Send it?"
-msgstr ""
+#: calendar/gui/dialogs/select-source-dialog.c:69
+#, fuzzy
+msgid "Select destination"
+msgstr "Избор на действие"
 
-#: calendar/gui/dialogs/send-comp.c:61
-msgid "The meeting information has changed. Send an updated version?"
-msgstr "Информацията за срещата е променена. Да изпратя ли обновената версия?"
+#: calendar/gui/dialogs/select-source-dialog.c:90
+#, fuzzy
+msgid "_Destination"
+msgstr "Дестин"
 
-#: calendar/gui/dialogs/send-comp.c:68
-msgid "The task assignment information has been created. Send it?"
+#: calendar/gui/dialogs/select-source-dialog.c:92
+msgid "Task List"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:72
-msgid "The task information has changed. Send an updated version?"
-msgstr "Информацията за задачата е променена. Да изпратя ли обновената версия?"
-
-#: calendar/gui/dialogs/task-details-page.c:401
+#: calendar/gui/dialogs/task-details-page.c:406
 msgid "Completed date is wrong"
 msgstr "Датата на приключване е грешна"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#: calendar/gui/e-calendar-table.etspec.h:2
-#, no-c-format
-msgid "% Complete"
+#, fuzzy, no-c-format
+msgid "% _Complete"
 msgstr "% Приключено"
 
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-cal-component-preview.c:230
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350
+#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-meeting-store.c:187
+#: calendar/gui/e-meeting-store.c:210 calendar/gui/print.c:2346
+msgid "Completed"
+msgstr "Приключено"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-msgid "Date Completed:"
-msgstr "Дана на Приключване:"
+#: calendar/gui/e-cal-component-preview.c:249
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:960
+msgid "High"
+msgstr "Високо"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-cal-component-preview.c:227
+#: calendar/gui/e-calendar-table.c:448 calendar/gui/e-cal-model-tasks.c:348
+#: calendar/gui/e-cal-model-tasks.c:651 calendar/gui/e-cal-model-tasks.c:726
+#: calendar/gui/print.c:2343
+msgid "In Progress"
+msgstr "В Прогрес"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-cal-component-preview.c:253
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:958
+msgid "Low"
+msgstr "Ниско"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-cal-component-preview.c:251
+#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
+#: mail/message-list.c:959
+msgid "Normal"
+msgstr "Нормално"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-cal-component-preview.c:237
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/e-cal-model-tasks.c:346
+#: calendar/gui/e-cal-model-tasks.c:649 calendar/gui/print.c:2340
+msgid "Not Started"
+msgstr "Не е Стартиран"
+
+#: calendar/gui/dialogs/task-details-page.glade.h:10
 msgid "Progress"
 msgstr "Прогрес"
 
+#: calendar/gui/dialogs/task-details-page.glade.h:11
+#: calendar/gui/e-calendar-table.c:377
+msgid "Undefined"
+msgstr "Недефинирано"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-msgid "URL:"
-msgstr "URL:"
+#, fuzzy
+msgid "_Date completed:"
+msgstr "Дана на Приключване:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:13
 msgid "_Priority:"
 msgstr "_Приоритет:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 msgid "_Status:"
 msgstr "_Статус:"
 
-#: calendar/gui/dialogs/task-editor.c:192
-msgid "Basic"
-msgstr "Основни"
+#: calendar/gui/dialogs/task-details-page.glade.h:15
+#, fuzzy
+msgid "_Web Page:"
+msgstr "_Интернет страница:"
 
-#: calendar/gui/dialogs/task-editor.c:206
-#: calendar/gui/dialogs/task-editor.c:269
-#: calendar/gui/dialogs/task-editor.c:406
+#: calendar/gui/dialogs/task-editor.c:207
+#: calendar/gui/dialogs/task-editor.c:270
+#: calendar/gui/dialogs/task-editor.c:407
 msgid "Assignment"
 msgstr "Задача"
 
-#: calendar/gui/dialogs/task-page.c:482
+#: calendar/gui/dialogs/task-page.c:486
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:542
-msgid "Due date is before start date!"
-msgstr ""
+#: calendar/gui/dialogs/task-page.c:823
+#, fuzzy, c-format
+msgid "Unable to open tasks in '%s'."
+msgstr "Адресната книга не може да бъде отворена"
 
 #: calendar/gui/dialogs/task-page.glade.h:4
 msgid "Con_fidential"
 msgstr "_Конфиденциален"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1077
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:43
+#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/e-cal-component-preview.c:268
+#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Описание:"
 
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "Sta_rt Date:"
+#: calendar/gui/dialogs/task-page.glade.h:7
+#, fuzzy
+msgid "Folder:"
+msgstr "Пап_ка:"
+
+#: calendar/gui/dialogs/task-page.glade.h:10
+#, fuzzy
+msgid "Sta_rt date:"
 msgstr "На_чална Дата:"
 
-#: calendar/gui/dialogs/task-page.glade.h:11
-msgid "_Due Date:"
+#: calendar/gui/dialogs/task-page.glade.h:12
+#, fuzzy
+msgid "_Due date:"
 msgstr "_Крайна Дата"
 
-#: calendar/gui/e-alarm-list.c:397
-#, c-format
-msgid "%d days"
-msgstr "%d дни"
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
+#, fuzzy
+msgid "Authentication Credentials for HTTP Server"
+msgstr "Грешна оторизация отговори сървъра."
 
-#: calendar/gui/e-alarm-list.c:400
-msgid "1 day"
-msgstr "1 ден"
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:3
+msgid "Calendars selected for publishing"
+msgstr ""
 
-#: calendar/gui/e-alarm-list.c:405
-#, c-format
-msgid "%d weeks"
-msgstr "%d седмици"
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:4
+#, fuzzy
+msgid "Daily"
+msgstr "Ден"
 
-#: calendar/gui/e-alarm-list.c:408
-msgid "1 week"
-msgstr "1 седмица"
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:5
+#, fuzzy
+msgid "Free/Busy Editor"
+msgstr "Информация Свободен/Зает"
 
-#: calendar/gui/e-alarm-list.c:413
-#, c-format
-msgid "%d hours"
-msgstr "%d часове"
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:6
+#, fuzzy
+msgid "Free/Busy Publishing Location"
+msgstr "Информация Свободен/Зает"
 
-#: calendar/gui/e-alarm-list.c:416
-msgid "1 hour"
-msgstr "1 час"
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:7
+#, fuzzy
+msgid "Login name:"
+msgstr "_Фамилия:"
 
-#: calendar/gui/e-alarm-list.c:421
-#, c-format
-msgid "%d minutes"
-msgstr "%d минути"
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:8
+#, fuzzy
+msgid "Password:"
+msgstr "Парола"
 
-#: calendar/gui/e-alarm-list.c:424
-msgid "1 minute"
-msgstr "1 минута"
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:9
+msgid "Publishing Frequency"
+msgstr ""
 
-#: calendar/gui/e-alarm-list.c:429
-#, c-format
-msgid "%d seconds"
-msgstr "%d секунди"
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:10
+#, fuzzy
+msgid "Remember password"
+msgstr "Запомни тази парола"
+
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:11
+msgid "URL:"
+msgstr "URL:"
 
-#: calendar/gui/e-alarm-list.c:432
-msgid "1 second"
-msgstr "1 секунда"
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:12
+msgid "User Publishes"
+msgstr ""
 
-#: calendar/gui/e-alarm-list.c:469
-msgid "Send an email"
-msgstr "Изпрати ел. писмо"
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:13
+#, fuzzy
+msgid "Weekly"
+msgstr "Седмица"
+
+#: calendar/gui/e-alarm-list.c:395
+#, fuzzy, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d дни"
+msgstr[1] "%d дни"
 
-#: calendar/gui/e-alarm-list.c:479
+#: calendar/gui/e-alarm-list.c:400
+#, fuzzy, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] "%d седмици"
+msgstr[1] "%d седмици"
+
+#: calendar/gui/e-alarm-list.c:405
+#, fuzzy, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d часове"
+msgstr[1] "%d часове"
+
+#: calendar/gui/e-alarm-list.c:410
+#, fuzzy, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d минути"
+msgstr[1] "%d минути"
+
+#: calendar/gui/e-alarm-list.c:415
+#, fuzzy, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d секунди"
+msgstr[1] "%d секунди"
+
+#: calendar/gui/e-alarm-list.c:462
 msgid "Unknown action to be performed"
 msgstr "Неизвестно действие за изпълнение"
 
-#: calendar/gui/e-alarm-list.c:491
+#: calendar/gui/e-alarm-list.c:474
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s преди започване на среща"
 
-#: calendar/gui/e-alarm-list.c:494
+#: calendar/gui/e-alarm-list.c:477
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s след започване на среща"
 
-#: calendar/gui/e-alarm-list.c:499
+#: calendar/gui/e-alarm-list.c:482
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s от началото на срещата"
 
-#: calendar/gui/e-alarm-list.c:508
+#: calendar/gui/e-alarm-list.c:491
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s преди края на срещата"
 
-#: calendar/gui/e-alarm-list.c:511
+#: calendar/gui/e-alarm-list.c:494
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s след края на срещата"
 
-#: calendar/gui/e-alarm-list.c:516
+#: calendar/gui/e-alarm-list.c:499
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s на края на срещата"
 
-#: calendar/gui/e-alarm-list.c:540
+#: calendar/gui/e-alarm-list.c:521
 #, c-format
 msgid "%s at %s"
 msgstr "%s в %s"
 
-#: calendar/gui/e-alarm-list.c:546
+#: calendar/gui/e-alarm-list.c:527
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s е неизвестен тип за превключване"
 
-#: calendar/gui/e-calendar-table.c:423
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#, fuzzy, c-format
+msgid "Click to open %s"
+msgstr "Натиснете за да добавите задача"
+
+#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
+msgid "Untitled"
+msgstr "Неименувано"
+
+#: calendar/gui/e-cal-component-preview.c:194
+#: calendar/gui/e-cal-component-preview.c:205
+#, fuzzy
+msgid "Start Date:"
+msgstr "На_чална Дата:"
+
+#: calendar/gui/e-cal-component-preview.c:216
+#, fuzzy
+msgid "Due Date:"
+msgstr "_Крайна Дата"
+
+#. write status
+#: calendar/gui/e-cal-component-preview.c:223
+#: calendar/gui/e-itip-control.c:943
+msgid "Status:"
+msgstr "Състояние:"
+
+#: calendar/gui/e-cal-component-preview.c:247
+#, fuzzy
+msgid "Priority:"
+msgstr "_Приоритет:"
+
+#: calendar/gui/e-cal-component-preview.c:300
+#, fuzzy
+msgid "Web Page:"
+msgstr "Страница"
+
+#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
+msgid "Public"
+msgstr "Публичен"
+
+#: calendar/gui/e-calendar-table.c:353 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:330
+msgid "Private"
+msgstr "Частен"
+
+#: calendar/gui/e-calendar-table.c:354 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:332
+msgid "Confidential"
+msgstr "Конфиденциален"
+
+#: calendar/gui/e-calendar-table.c:396
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:424
+#: calendar/gui/e-calendar-table.c:397
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-calendar-table.c:398
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:399
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:400
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:401
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:402
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:403
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:404
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:405
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:406
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:726 calendar/gui/e-day-view.c:2869
-#: calendar/gui/e-week-view.c:2022
+#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
+msgid "Free"
+msgstr "Свободно"
+
+#: calendar/gui/e-calendar-table.c:427 calendar/gui/e-cal-model-calendar.c:166
+#: calendar/gui/e-meeting-time-sel.c:399
+msgid "Busy"
+msgstr "Заето"
+
+#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
 msgid "Deleting selected objects"
 msgstr "Изтрива избраните обекти"
 
-#: calendar/gui/e-calendar-table.c:958 calendar/gui/e-day-view.c:3737
-#: calendar/gui/e-week-view.c:3723 mail/folder-browser.c:1787
-#: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
+msgid "Updating objects"
+msgstr "Обновява обектите"
+
+#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
+#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
+#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Отваря"
 
-#: calendar/gui/e-calendar-table.c:959
-msgid "_Save as..."
-msgstr "_Запазва като..."
+#: calendar/gui/e-calendar-table.c:1023
+#, fuzzy
+msgid "Open _Web Page"
+msgstr "Отваря _Съобщение"
+
+#: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
+#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
+#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
+#: ui/evolution-mail-message.xml.h:128
+msgid "_Save As..."
+msgstr "Запазва като..."
 
-#: calendar/gui/e-calendar-table.c:960 calendar/gui/e-day-view.c:3739
-#: calendar/gui/e-week-view.c:3698 calendar/gui/e-week-view.c:3725
-#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:33
-#: ui/evolution-comp-editor.xml.h:19 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:108 ui/evolution-tasks.xml.h:21
-#: ui/my-evolution.xml.h:6
+#: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
+#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
+#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
+#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
+#: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "_Разпечатва..."
 
-#: calendar/gui/e-calendar-table.c:964 calendar/gui/e-day-view.c:3744
-#: calendar/gui/e-week-view.c:3730 ui/evolution-addressbook.xml.h:1
-#: ui/evolution-calendar.xml.h:1 ui/evolution-tasks.xml.h:1
+#: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
+#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
+#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
+#: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Отрязва"
 
-#: calendar/gui/e-calendar-table.c:965 calendar/gui/e-day-view.c:3745
-#: calendar/gui/e-week-view.c:3731 ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:29 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-list.xml.h:24 ui/evolution-tasks.xml.h:16
+#: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
+#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
+#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
+#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
+#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "Копира"
 
-#: calendar/gui/e-calendar-table.c:966 calendar/gui/e-day-view.c:3710
-#: calendar/gui/e-day-view.c:3746 calendar/gui/e-week-view.c:3702
-#: calendar/gui/e-week-view.c:3732 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:32 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-list.xml.h:29 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
+#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
+#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Поставя"
 
-#: calendar/gui/e-calendar-table.c:970
+#: calendar/gui/e-calendar-table.c:1035
 msgid "_Assign Task"
 msgstr "_ Задава задача"
 
-#: calendar/gui/e-calendar-table.c:971
+#: calendar/gui/e-calendar-table.c:1036
 msgid "_Forward as iCalendar"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:972
+#: calendar/gui/e-calendar-table.c:1037
 msgid "_Mark as Complete"
 msgstr "_Маркира като Приключено"
 
-#: calendar/gui/e-calendar-table.c:973
+#: calendar/gui/e-calendar-table.c:1038
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Маркира Избраните Задачи като Приключени"
 
-#: calendar/gui/e-calendar-table.c:978
+#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1061
 msgid "_Delete Selected Tasks"
 msgstr "_Изтрива Избраните Задачи"
 
-#: calendar/gui/e-calendar-table.c:1269 calendar/gui/e-day-view.c:8022
-#: calendar/gui/e-week-view.c:4447
-msgid "Updating objects"
-msgstr "Обновява обектите"
-
-#: calendar/gui/e-calendar-table.c:1352
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.c:1353
+#: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Click to add a task"
 msgstr "Натиснете за да добавите задача"
 
-#: calendar/gui/e-calendar-table.etspec.h:3
-msgid "Alarms"
-msgstr "Аларми"
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, no-c-format
+msgid "% Complete"
+msgstr "% Приключено"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1156
-#: camel/camel-filter-driver.c:1251 mail/mail-send-recv.c:584
+#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:615
 msgid "Complete"
 msgstr "Завършено"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
-msgid "Completion Date"
+#: calendar/gui/e-calendar-table.etspec.h:5
+#, fuzzy
+msgid "Completion date"
 msgstr "Дата на завършване"
 
-#: calendar/gui/e-calendar-table.etspec.h:9
-msgid "Due Date"
+#: calendar/gui/e-calendar-table.etspec.h:6
+#, fuzzy
+msgid "Due date"
 msgstr "Срок"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-msgid "End Date"
-msgstr "Крайна Дата"
-
-#: calendar/gui/e-calendar-table.etspec.h:11
-msgid "Geographical Position"
-msgstr "Географска Позиция"
-
-#: calendar/gui/e-calendar-table.etspec.h:12
+#: calendar/gui/e-calendar-table.etspec.h:7
 msgid "Priority"
 msgstr "Приоритет"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
-msgid "Start Date"
+#: calendar/gui/e-calendar-table.etspec.h:8
+#, fuzzy
+msgid "Start date"
 msgstr "Начална Дата"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:56 shell/e-shell.c:750
-#: shell/e-shortcuts.c:1082
+#: calendar/gui/e-calendar-table.etspec.h:10
+#: calendar/gui/e-cal-list-view.etspec.h:4 mail/mail-security.glade.h:5
 msgid "Summary"
 msgstr "Резюме"
 
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Task sort"
 msgstr "Сортиране на Задачи"
 
-#. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
-#: e-util/e-time-utils.c:393
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%a %m/%d/%Y %H:%M:%S"
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
+msgid "New _Appointment..."
+msgstr "Нова _Среща..."
 
-#. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
-#: e-util/e-time-utils.c:402
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %m/%d/%Y %I:%M:%S %p"
+#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
+msgid "New All Day _Event"
+msgstr "Всички Нови _Събития за Деня"
 
-#: calendar/gui/e-cell-date-edit-text.c:126
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
+#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
+msgid "New Meeting"
 msgstr ""
-"Датата трябва да е въведена в следния формат: \n"
-"\n"
-"%s"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i минутно разделяне"
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
+msgid "New Task"
+msgstr "Нова Задача"
 
-#. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1423
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1525
-msgid "%A %d %B"
-msgstr "%A %d %B"
+#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
+#, fuzzy
+msgid "Select _Today"
+msgstr "Избира _Нишка"
 
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1456
-#: calendar/gui/e-week-view-main-item.c:339
-msgid "%d %b"
-msgstr "%d %b"
+#: calendar/gui/e-calendar-view.c:1283
+#, fuzzy
+msgid "_Select Date..."
+msgstr "Отиди _на Дата..."
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:638 calendar/gui/e-week-view.c:360
-#: calendar/gui/print.c:809
-msgid "am"
-msgstr "сутрин"
+#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
+msgid "_Publish Free/Busy Information"
+msgstr "_Потребителска Информация"
 
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:641 calendar/gui/e-week-view.c:363
-#: calendar/gui/print.c:811
-msgid "pm"
-msgstr "вечер"
+#: calendar/gui/e-calendar-view.c:1306
+#, fuzzy
+msgid "Cop_y to Calendar..."
+msgstr "Копира в папка"
 
-#: calendar/gui/e-day-view.c:3694
-msgid "New _Appointment"
-msgstr "Нова _Среща"
+#: calendar/gui/e-calendar-view.c:1307
+#, fuzzy
+msgid "Mo_ve to Calendar..."
+msgstr "Премества в Папка"
 
-#: calendar/gui/e-day-view.c:3696 calendar/gui/e-week-view.c:3692
-msgid "New All Day _Event"
-msgstr "Всички Нови _Събития за Деня"
+#: calendar/gui/e-calendar-view.c:1308
+msgid "_Schedule Meeting..."
+msgstr ""
 
-#: calendar/gui/e-day-view.c:3698 calendar/gui/e-week-view.c:3693
-msgid "New Meeting"
+#: calendar/gui/e-calendar-view.c:1309
+msgid "_Forward as iCalendar..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:3700 calendar/gui/e-week-view.c:3694
-msgid "New Task"
-msgstr "Нова Задача"
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
+msgid "Delete this _Occurrence"
+msgstr "Изтрии това С_ъбитие"
 
-#: calendar/gui/e-day-view.c:3705
-msgid "Print..."
-msgstr "Печат..."
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
+msgid "Delete _All Occurrences"
+msgstr "Изтрии Всички _Събития"
 
-#: calendar/gui/e-day-view.c:3717 calendar/gui/e-week-view.c:3708
-#: ui/evolution-calendar.xml.h:13
+#: calendar/gui/e-calendar-view.c:1349
 msgid "Go to _Today"
 msgstr "Отиди на _Днес"
 
-#: calendar/gui/e-day-view.c:3719 calendar/gui/e-week-view.c:3709
+#: calendar/gui/e-calendar-view.c:1351
 msgid "_Go to Date..."
 msgstr "Отиди _на Дата..."
 
-#: calendar/gui/e-day-view.c:3724 calendar/gui/e-week-view.c:3713
-#: ui/evolution-calendar.xml.h:34
-msgid "_Publish Free/Busy Information"
-msgstr "_Потребителска Информация"
-
-#: calendar/gui/e-day-view.c:3729 calendar/gui/e-week-view.c:3717
-#: ui/evolution.xml.h:60
+#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "_Настройки"
 
-#: calendar/gui/e-day-view.c:3738 calendar/gui/e-week-view.c:3724
-#: mail/folder-browser.c:1789 ui/evolution-mail-message.xml.h:112
-msgid "_Save As..."
-msgstr "Запазва като..."
+#: calendar/gui/e-cal-list-view.etspec.h:1
+msgid "End Date"
+msgstr "Крайна Дата"
 
-#: calendar/gui/e-day-view.c:3750 calendar/gui/e-week-view.c:3736
-msgid "_Schedule Meeting..."
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Start Date"
+msgstr "Начална Дата"
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
+#: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1534
+#: camel/providers/imap4/camel-imap4-engine.c:1561
+#: camel/providers/imap4/camel-imap4-engine.c:1591
+#: camel/providers/imap4/camel-imap4-engine.c:1631
+#: camel/providers/imap4/camel-imap4-store.c:1039
+#: camel/providers/imap4/camel-imap4-utils.c:292
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1115
+#: shell/e-component-registry.c:186 shell/e-component-registry.c:190
+#: widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "Неизвестен"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Повтарям"
+
+#: calendar/gui/e-cal-model.c:913
+msgid "Assigned"
+msgstr "Назначен"
+
+#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
+msgid "Yes"
+msgstr "Да"
+
+#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr "Не"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "С"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "Ю"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
+msgid "E"
+msgstr "И"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "З"
+
+#: calendar/gui/e-cal-model-tasks.c:601
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
 msgstr ""
+"Географското местонахождение трябва да бъде въведено в следния формат: \n"
+"\n"
+"45.436845,125.862501"
 
-#: calendar/gui/e-day-view.c:3751 calendar/gui/e-week-view.c:3737
-msgid "_Forward as iCalendar..."
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
+#: e-util/e-time-utils.c:393
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr "%a %m/%d/%Y %H:%M:%S"
+
+#. strftime format of a weekday, a date and a time, 12-hour.
+#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
+#: e-util/e-time-utils.c:402
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %m/%d/%Y %I:%M:%S %p"
+
+#: calendar/gui/e-cell-date-edit-text.c:125
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
 msgstr ""
+"Датата трябва да е въведена в следния формат: \n"
+"\n"
+"%s"
 
-#: calendar/gui/e-day-view.c:3756 calendar/gui/e-week-view.c:3742
-msgid "Make this Occurrence _Movable"
-msgstr "Прави това Събитие Пр_еместваемо"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:592
+#: calendar/gui/print.c:838
+msgid "am"
+msgstr "сутрин"
 
-#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3743
-msgid "Delete this _Occurrence"
-msgstr "Изтрии това С_ъбитие"
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:595
+#: calendar/gui/print.c:840
+msgid "pm"
+msgstr "вечер"
 
-#: calendar/gui/e-day-view.c:3758 calendar/gui/e-week-view.c:3744
-msgid "Delete _All Occurrences"
-msgstr "Изтрии Всички _Събития"
+#. strftime format %A = full weekday name, %d = day of month,
+#. %B = full month name. Don't use any other specifiers.
+#: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
+#: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
+msgid "%A %d %B"
+msgstr "%A %d %B"
+
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. Don't use any other specifiers.
+#: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
+#: calendar/gui/e-week-view-main-item.c:343
+msgid "%d %b"
+msgstr "%d %b"
+
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i минутно разделяне"
 
-#: calendar/gui/e-itip-control.c:676
+#: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
 msgstr "Да"
 
-#: calendar/gui/e-itip-control.c:688
+#: calendar/gui/e-itip-control.c:596
+#, fuzzy, c-format
 msgid "Every day"
-msgstr "Всеки ден"
-
-#: calendar/gui/e-itip-control.c:690
-#, c-format
-msgid "Every %d days"
-msgstr "Всички %d дни"
+msgid_plural "Every %d days"
+msgstr[0] "Всеки ден"
+msgstr[1] "Всеки ден"
 
-#: calendar/gui/e-itip-control.c:696
+#: calendar/gui/e-itip-control.c:601
+#, fuzzy, c-format
 msgid "Every week"
-msgstr "Всяка седмица"
+msgid_plural "Every %d weeks"
+msgstr[0] "Всяка седмица"
+msgstr[1] "Всяка седмица"
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:603
 #, c-format
-msgid "Every %d weeks"
-msgstr "Всички %d седмици"
-
-#: calendar/gui/e-itip-control.c:701
 msgid "Every week on "
-msgstr ""
+msgid_plural "Every %d weeks on "
+msgstr[0] ""
+msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:703
-#, c-format
-msgid "Every %d weeks on "
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:611
 msgid " and "
 msgstr " и "
 
-#: calendar/gui/e-itip-control.c:718
+#: calendar/gui/e-itip-control.c:618
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:731
+#: calendar/gui/e-itip-control.c:631
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:736
+#: calendar/gui/e-itip-control.c:638
+#, fuzzy, c-format
 msgid "every month"
-msgstr "всеки месец"
-
-#: calendar/gui/e-itip-control.c:741
-#, c-format
-msgid "every %d months"
-msgstr "всички %d месеци"
+msgid_plural "every %d months"
+msgstr[0] "всеки месец"
+msgstr[1] "всеки месец"
 
-#: calendar/gui/e-itip-control.c:747
+#: calendar/gui/e-itip-control.c:642
+#, fuzzy, c-format
 msgid "Every year"
-msgstr "Всяка година"
+msgid_plural "Every %d years"
+msgstr[0] "Всяка година"
+msgstr[1] "Всяка година"
 
-#: calendar/gui/e-itip-control.c:749
+#: calendar/gui/e-itip-control.c:653
 #, c-format
-msgid "Every %d years"
-msgstr "Всички %d години"
-
-#: calendar/gui/e-itip-control.c:761
-#, c-format
-msgid " a total of %d times"
-msgstr ""
+msgid "a total of %d time"
+msgid_plural " a total of %d times"
+msgstr[0] ""
+msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:769
+#: calendar/gui/e-itip-control.c:662
 msgid ", ending on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:793
+#: calendar/gui/e-itip-control.c:686
 msgid "<b>Starts:</b> "
 msgstr "<b>Започва:</b>·"
 
-#: calendar/gui/e-itip-control.c:803
+#: calendar/gui/e-itip-control.c:696
 msgid "<b>Ends:</b> "
 msgstr "<b>Завършва:</b>·"
 
-#: calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:716
 msgid "<b>Completed:</b> "
 msgstr "<b>Завършени:</b>·"
 
-#: calendar/gui/e-itip-control.c:833
+#: calendar/gui/e-itip-control.c:726
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:870 calendar/gui/e-itip-control.c:923
+#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
 msgid "iCalendar Information"
 msgstr "iКалендарна информация"
 
 #. Title
-#: calendar/gui/e-itip-control.c:885
+#: calendar/gui/e-itip-control.c:781
 msgid "iCalendar Error"
 msgstr "iКалендар Грешка"
 
-#: calendar/gui/e-itip-control.c:954 calendar/gui/e-itip-control.c:970
-#: calendar/gui/e-itip-control.c:981 calendar/gui/e-itip-control.c:998
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
 msgid "An unknown person"
 msgstr "Неизвестна личност"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:1005
+#: calendar/gui/e-itip-control.c:903
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5446,339 +5816,308 @@ msgstr ""
 "<br> Моля, прегледайте следната информация и тогава изберете действие от "
 "долното меню."
 
-#: calendar/gui/e-itip-control.c:1020
+#: calendar/gui/e-itip-control.c:918
 msgid "<i>None</i>"
 msgstr "<i>Без</i>"
 
-#: calendar/gui/e-itip-control.c:1031
+#: calendar/gui/e-itip-control.c:929
 msgid "Location:"
 msgstr "Местоположение:"
 
-#: calendar/gui/e-itip-control.c:1045
-msgid "Status:"
-msgstr "Състояние:"
-
-#: calendar/gui/e-itip-control.c:1050 calendar/gui/e-meeting-model.c:286
-#: calendar/gui/e-meeting-model.c:309 calendar/gui/e-meeting-model.c:801
-#: calendar/gui/itip-utils.c:419
+#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
+#: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
+#: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Приет"
 
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/itip-utils.c:422
+#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1058 calendar/gui/e-meeting-model.c:288
-#: calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:802
-#: calendar/gui/itip-utils.c:425 calendar/gui/itip-utils.c:451
+#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
+#: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
+#: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Отказан"
 
-#: calendar/gui/e-itip-control.c:1062 calendar/gui/e-itip-control.c:1270
-#: calendar/gui/e-meeting-model.c:222 calendar/gui/e-meeting-model.c:257
-#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:759
-#: calendar/gui/e-meeting-model.c:775 camel/camel-gpg-context.c:1574
-#: camel/camel-gpg-context.c:1625 camel/camel-tcp-stream-openssl.c:634
-#: camel/providers/smtp/camel-smtp-transport.c:173
-#: camel/providers/smtp/camel-smtp-transport.c:228 mail/folder-browser.c:347
-#: mail/mail-display.c:936 widgets/misc/e-charset-picker.c:60
-msgid "Unknown"
-msgstr "Неизвестен"
-
-#: calendar/gui/e-itip-control.c:1117 calendar/gui/e-itip-control.c:1145
-#: calendar/gui/e-itip-control.c:1171 calendar/gui/e-itip-control.c:1184
-#: calendar/gui/e-itip-control.c:1197 calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
 msgid "Choose an action:"
 msgstr "Избера действие:"
 
-#: calendar/gui/e-itip-control.c:1118
+#: calendar/gui/e-itip-control.c:1016
 msgid "Update"
 msgstr "Обновява"
 
-#: calendar/gui/e-itip-control.c:1119 calendar/gui/e-itip-control.c:1150
-#: calendar/gui/e-itip-control.c:1173 calendar/gui/e-itip-control.c:1186
-#: calendar/gui/e-itip-control.c:1199 calendar/gui/e-itip-control.c:1212
-#: shell/e-shell.c:2067 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
+#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Да"
 
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1044
 msgid "Accept"
 msgstr "Приема"
 
-#: calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1045
 msgid "Tentatively accept"
 msgstr "Временно приема"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1046
 msgid "Decline"
 msgstr "Отказва"
 
-#: calendar/gui/e-itip-control.c:1172
+#: calendar/gui/e-itip-control.c:1070
 msgid "Send Free/Busy Information"
 msgstr "Изпраща Информация Свободен/Зает"
 
-#: calendar/gui/e-itip-control.c:1185
+#: calendar/gui/e-itip-control.c:1083
 msgid "Update respondent status"
 msgstr "Обновява статуса на отговарящият"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1096
 msgid "Send Latest Information"
 msgstr "Изпраща Последната Информация"
 
-#: calendar/gui/e-itip-control.c:1211 calendar/gui/itip-utils.c:439
-#: mail/mail-send-recv.c:389 mail/mail-send-recv.c:446
-#: shell/evolution-shell-component.c:1185 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
+#: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
+#: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Прекръсва"
 
-#: calendar/gui/e-itip-control.c:1292
+#: calendar/gui/e-itip-control.c:1185
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> публикува информация за среща."
 
-#: calendar/gui/e-itip-control.c:1293
+#: calendar/gui/e-itip-control.c:1186
 msgid "Meeting Information"
 msgstr "Информация за Среща"
 
-#: calendar/gui/e-itip-control.c:1298
+#: calendar/gui/e-itip-control.c:1191
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1300
+#: calendar/gui/e-itip-control.c:1193
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> изисква вашето присъствие на срещата."
 
-#: calendar/gui/e-itip-control.c:1301
+#: calendar/gui/e-itip-control.c:1194
 msgid "Meeting Proposal"
 msgstr "Предложение на срещата:"
 
-#: calendar/gui/e-itip-control.c:1305
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> желае да бъде добавен на съществуващата среща."
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Update"
 msgstr "Обновява срещата:"
 
-#: calendar/gui/e-itip-control.c:1310
+#: calendar/gui/e-itip-control.c:1203
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> желае да получи последната информация за срещата.."
 
-#: calendar/gui/e-itip-control.c:1311
+#: calendar/gui/e-itip-control.c:1204
 msgid "Meeting Update Request"
 msgstr "Заявка за Обновяване на срещата:"
 
-#: calendar/gui/e-itip-control.c:1318
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> отговори на запитване за срещата."
 
-#: calendar/gui/e-itip-control.c:1319
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Reply"
 msgstr "Отговор на Среща"
 
-#: calendar/gui/e-itip-control.c:1326
+#: calendar/gui/e-itip-control.c:1219
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> прекъсна срещата."
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1220
 msgid "Meeting Cancellation"
 msgstr "Прекъсване на срещата"
 
-#: calendar/gui/e-itip-control.c:1334 calendar/gui/e-itip-control.c:1401
-#: calendar/gui/e-itip-control.c:1436
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1330
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> изпраща неразбираемо съобщение."
 
-#: calendar/gui/e-itip-control.c:1335
+#: calendar/gui/e-itip-control.c:1228
 msgid "Bad Meeting Message"
 msgstr "Лошо Съобщение за Среща"
 
-#: calendar/gui/e-itip-control.c:1359
+#: calendar/gui/e-itip-control.c:1253
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> публикува информация за задачата."
 
-#: calendar/gui/e-itip-control.c:1360
+#: calendar/gui/e-itip-control.c:1254
 msgid "Task Information"
 msgstr "Информация за задача"
 
-#: calendar/gui/e-itip-control.c:1365
+#: calendar/gui/e-itip-control.c:1259
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1367
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> изисква вашето участие в задача.."
 
-#: calendar/gui/e-itip-control.c:1368
+#: calendar/gui/e-itip-control.c:1262
 msgid "Task Proposal"
 msgstr "Предложение за Задача"
 
-#: calendar/gui/e-itip-control.c:1372
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> желае да бъде добавен към съществуваща задача.."
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Update"
 msgstr "Обновяван Задача"
 
-#: calendar/gui/e-itip-control.c:1377
+#: calendar/gui/e-itip-control.c:1271
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> желае да получи последната информация за задача.."
 
-#: calendar/gui/e-itip-control.c:1378
+#: calendar/gui/e-itip-control.c:1272
 msgid "Task Update Request"
 msgstr "Заявка за Обновяване на задача"
 
-#: calendar/gui/e-itip-control.c:1385
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> отговори на включване в задача."
 
-#: calendar/gui/e-itip-control.c:1386
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Reply"
 msgstr "Отговор на Задача"
 
-#: calendar/gui/e-itip-control.c:1393
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> прекъсна задача."
 
-#: calendar/gui/e-itip-control.c:1394
+#: calendar/gui/e-itip-control.c:1288
 msgid "Task Cancellation"
 msgstr "Прекъсване на Задача"
 
-#: calendar/gui/e-itip-control.c:1402
+#: calendar/gui/e-itip-control.c:1296
 msgid "Bad Task Message"
 msgstr "Лошо Съобщение за Задача"
 
-#: calendar/gui/e-itip-control.c:1421
+#: calendar/gui/e-itip-control.c:1315
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> публикува информация свободен/зает."
 
-#: calendar/gui/e-itip-control.c:1422
+#: calendar/gui/e-itip-control.c:1316
 msgid "Free/Busy Information"
 msgstr "Информация Свободен/Зает"
 
-#: calendar/gui/e-itip-control.c:1426
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> изисква от вас информация за свободен/зает."
 
-#: calendar/gui/e-itip-control.c:1427
+#: calendar/gui/e-itip-control.c:1321
 msgid "Free/Busy Request"
 msgstr "Заявка Свободен/Зает"
 
-#: calendar/gui/e-itip-control.c:1431
+#: calendar/gui/e-itip-control.c:1325
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> отговори на заявката свободен/зает."
 
-#: calendar/gui/e-itip-control.c:1432
+#: calendar/gui/e-itip-control.c:1326
 msgid "Free/Busy Reply"
 msgstr "Отговор Свободен/Зает"
 
-#: calendar/gui/e-itip-control.c:1437
+#: calendar/gui/e-itip-control.c:1331
 msgid "Bad Free/Busy Message"
 msgstr "Лошо Свободен/Зает Съобщение"
 
-#: calendar/gui/e-itip-control.c:1513
+#: calendar/gui/e-itip-control.c:1406
 msgid "The message does not appear to be properly formed"
 msgstr "Папката изглежда да е невъстановимо повредена."
 
-#: calendar/gui/e-itip-control.c:1576
+#: calendar/gui/e-itip-control.c:1465
 msgid "The message contains only unsupported requests."
 msgstr "Съобщението съдържа само неподържани заявки."
 
-#: calendar/gui/e-itip-control.c:1607 calendar/gui/e-itip-control.c:1613
+#: calendar/gui/e-itip-control.c:1496
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Прикаченото не съдържа валидно календар съобщение."
 
-#: calendar/gui/e-itip-control.c:1638
+#: calendar/gui/e-itip-control.c:1528
 msgid "The attachment has no viewable calendar items"
 msgstr "Прикаченото няма видими обекти на календар"
 
-#: calendar/gui/e-itip-control.c:1879 calendar/gui/e-itip-control.c:1971
-msgid "Object is invalid and cannot be updated\n"
-msgstr ""
+#: calendar/gui/e-itip-control.c:1762
+msgid "Update complete\n"
+msgstr "Обновяването приключено\n"
 
-#: calendar/gui/e-itip-control.c:1882 calendar/gui/e-itip-control.c:1974
-msgid "There was an error on the CORBA system\n"
+#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
+msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1885 calendar/gui/e-itip-control.c:1977
-msgid "Object could not be found\n"
+#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
+msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1888
-msgid "You do not have the right permissions to update the calendar\n"
+#: calendar/gui/e-itip-control.c:1818
+msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1891
-msgid "Update complete\n"
-msgstr "Обновяването приключено\n"
-
-#: calendar/gui/e-itip-control.c:1894
-msgid "Calendar file could not be updated!\n"
-msgstr "Календарният файл не може да бъде зареден!\n"
-
-#: calendar/gui/e-itip-control.c:1923 calendar/gui/e-itip-control.c:1989
-msgid "Attendee status can not be updated because the item no longer exists"
+#: calendar/gui/e-itip-control.c:1830
+msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1944
-msgid "This response is not from a current attendee.  Add as an attendee?"
+#: calendar/gui/e-itip-control.c:1849
+msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1956
-msgid "Attendee status could not be updated because of an invalid status!\n"
+#: calendar/gui/e-itip-control.c:1852
+msgid "Object could not be found\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1980
+#: calendar/gui/e-itip-control.c:1855
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1983
+#: calendar/gui/e-itip-control.c:1858
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1986
+#: calendar/gui/e-itip-control.c:1861
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:2023
+#: calendar/gui/e-itip-control.c:1892
 msgid "Removal Complete"
 msgstr "Преместването Приключено"
 
-#: calendar/gui/e-itip-control.c:2055 calendar/gui/e-itip-control.c:2105
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
 msgid "Item sent!\n"
 msgstr "Обекта изпратен!\n"
 
-#: calendar/gui/e-itip-control.c:2057 calendar/gui/e-itip-control.c:2109
+#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
 msgid "The item could not be sent!\n"
 msgstr "Обекта не може да бъде изпратен!\n"
 
-#: calendar/gui/e-itip-control.c:2200
-msgid "Select Calendar Folder"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:2206
-msgid "Select Tasks Folder"
-msgstr "Избира Папка със Задачи"
-
 #: calendar/gui/e-itip-control.glade.h:2
 #, no-c-format
 msgid "%P %%"
@@ -5816,185 +6155,182 @@ msgstr "крайна дата"
 msgid "date-start"
 msgstr "начална дата"
 
-#: calendar/gui/e-meeting-model.c:79
+#: calendar/gui/e-meeting-list-view.c:59
 msgid "Chair Persons"
 msgstr "Председателстващ"
 
-#: calendar/gui/e-meeting-model.c:80 calendar/gui/e-meeting-model.c:1639
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
 msgid "Required Participants"
 msgstr "Членове"
 
-#: calendar/gui/e-meeting-model.c:81
+#: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Допълнителни Членове"
 
-#: calendar/gui/e-meeting-model.c:82
+#: calendar/gui/e-meeting-list-view.c:62
 msgid "Resources"
 msgstr "Ресурси"
 
-#: calendar/gui/e-meeting-model.c:197 calendar/gui/e-meeting-model.c:214
-#: calendar/gui/e-meeting-model.c:530 calendar/gui/e-meeting-model.c:755
+#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr "Индивидуално"
 
-#: calendar/gui/e-meeting-model.c:199 calendar/gui/e-meeting-model.c:216
-#: calendar/gui/e-meeting-model.c:756
+#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "Група"
 
-#: calendar/gui/e-meeting-model.c:201 calendar/gui/e-meeting-model.c:218
-#: calendar/gui/e-meeting-model.c:757
+#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr "Ресурс"
 
-#: calendar/gui/e-meeting-model.c:203 calendar/gui/e-meeting-model.c:220
-#: calendar/gui/e-meeting-model.c:758
+#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr "Помещение"
 
-#: calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:249
-#: calendar/gui/e-meeting-model.c:771
+#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr "Председателствуващ"
 
-#: calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
-#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:772
+#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
 msgid "Required Participant"
 msgstr "Заявен Участник"
 
-#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
-#: calendar/gui/e-meeting-model.c:773
+#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr "Допълнителен Участник"
 
-#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
-#: calendar/gui/e-meeting-model.c:774
+#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr "Не Участник"
 
-#: calendar/gui/e-meeting-model.c:284 calendar/gui/e-meeting-model.c:307
-#: calendar/gui/e-meeting-model.c:540 calendar/gui/e-meeting-model.c:800
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
 msgid "Needs Action"
 msgstr "Необходими Действия"
 
-#: calendar/gui/e-meeting-model.c:290 calendar/gui/e-meeting-model.c:313
-#: calendar/gui/e-meeting-model.c:803 calendar/gui/e-meeting-time-sel.c:405
+#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "Пробен"
 
-#: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:315
-#: calendar/gui/e-meeting-model.c:804
+#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr "Делегиран"
 
-#: calendar/gui/e-meeting-model.c:296 calendar/gui/e-meeting-model.c:319
+#: calendar/gui/e-meeting-store.c:189 calendar/gui/e-meeting-store.c:212
 msgid "In Process"
 msgstr "В Прогрес"
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:458
-#: calendar/gui/e-meeting-time-sel.c:2098
-msgid "%A, %B %d, %Y"
-msgstr "%A, %B %d, %Y"
-
-#. This is a strftime() format string %a = abbreviated weekday
-#. name, %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:462
-#: calendar/gui/e-meeting-time-sel.c:2131 e-util/e-time-utils.c:203
-#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
-msgid "%a %m/%d/%Y"
-msgstr "%a %m/%d/%Y"
-
-#. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:466 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1594
-msgid "%m/%d/%Y"
-msgstr "%m/%d/%Y"
-
-#: calendar/gui/e-meeting-time-sel.c:407 designs/OOA/ooa.glade.h:11
+#: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Извън Офиса"
 
-#: calendar/gui/e-meeting-time-sel.c:408
+#: calendar/gui/e-meeting-time-sel.c:401
 msgid "No Information"
 msgstr "Няма Информация"
 
-#: calendar/gui/e-meeting-time-sel.c:447
+#: calendar/gui/e-meeting-time-sel.c:417
+#, fuzzy
+msgid "Add attendees from addressbook"
+msgstr "Добавя подателя в Адресната книга"
+
+#: calendar/gui/e-meeting-time-sel.c:440
 msgid "_Options"
 msgstr "_Опции"
 
-#: calendar/gui/e-meeting-time-sel.c:464
-msgid "Show _Only Working Hours"
+#: calendar/gui/e-meeting-time-sel.c:457
+#, fuzzy
+msgid "Show _only working hours"
 msgstr "Показ_ва само работните часове"
 
-#: calendar/gui/e-meeting-time-sel.c:474
-msgid "Show _Zoomed Out"
+#: calendar/gui/e-meeting-time-sel.c:467
+#, fuzzy
+msgid "Show _zoomed out"
 msgstr "Показва _Намаление"
 
-#: calendar/gui/e-meeting-time-sel.c:489
-msgid "_Update Free/Busy"
+#: calendar/gui/e-meeting-time-sel.c:482
+#, fuzzy
+msgid "_Update free/busy"
 msgstr "_Обновява Свободен/Зает"
 
-#: calendar/gui/e-meeting-time-sel.c:504
+#: calendar/gui/e-meeting-time-sel.c:497
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:522
+#: calendar/gui/e-meeting-time-sel.c:515
 msgid "_Autopick"
 msgstr "_Автоизбиране"
 
-#: calendar/gui/e-meeting-time-sel.c:537
+#: calendar/gui/e-meeting-time-sel.c:530
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:554
-msgid "_All People and Resources"
+#: calendar/gui/e-meeting-time-sel.c:547
+#, fuzzy
+msgid "_All people and resources"
 msgstr "_Всички Хора и Ресурси"
 
-#: calendar/gui/e-meeting-time-sel.c:563
-msgid "All _People and One Resource"
+#: calendar/gui/e-meeting-time-sel.c:556
+#, fuzzy
+msgid "All _people and one resource"
 msgstr "Вси_чки Хора и Един Ресурс"
 
-#: calendar/gui/e-meeting-time-sel.c:572
-msgid "_Required People"
+#: calendar/gui/e-meeting-time-sel.c:565
+#, fuzzy
+msgid "_Required people"
 msgstr "_Заявени Хора"
 
-#: calendar/gui/e-meeting-time-sel.c:581
-msgid "Required People and _One Resource"
+#: calendar/gui/e-meeting-time-sel.c:574
+#, fuzzy
+msgid "Required people and _one resource"
 msgstr "Нужни Хора и _Един Ресурс"
 
-#: calendar/gui/e-meeting-time-sel.c:600
+#: calendar/gui/e-meeting-time-sel.c:593
 msgid "Meeting _start time:"
 msgstr "Начало на срещата:"
 
-#: calendar/gui/e-meeting-time-sel.c:620
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "Meeting _end time:"
 msgstr "Край на срещата:"
 
-#: calendar/gui/e-tasks.c:360 calendar/gui/gnome-cal.c:2196
-#: calendar/gui/gnome-cal.c:2207
-#, c-format
-msgid "Opening tasks at %s"
-msgstr "Отваряне на задачи в %s"
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel.c:2060
+#: calendar/gui/e-meeting-time-sel-item.c:452
+msgid "%A, %B %d, %Y"
+msgstr "%A, %B %d, %Y"
 
-#: calendar/gui/e-tasks.c:389 calendar/gui/tasks-control.c:201
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "Не мога да заредя задачи в `%s'"
+#. This is a strftime() format string %a = abbreviated weekday name,
+#. %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel.c:2093
+#: calendar/gui/e-meeting-time-sel-item.c:456 e-util/e-time-utils.c:203
+#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
+msgid "%a %m/%d/%Y"
+msgstr "%a %m/%d/%Y"
 
-#: calendar/gui/e-tasks.c:404
-#, c-format
-msgid "The method required to load `%s' is not supported"
-msgstr "Метода заявен за зареждане на `%s' не се подържа"
+#. This is a strftime() format string %m = month number,
+#. %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
+msgid "%m/%d/%Y"
+msgstr "%m/%d/%Y"
 
-#: calendar/gui/e-tasks.c:418 calendar/gui/gnome-cal.c:1699
-#, c-format
-msgid "You don't have permission to open the folder in `%s'"
-msgstr ""
+#: calendar/gui/e-pub-utils.c:300
+#, fuzzy, c-format
+msgid "Enter the password for %s"
+msgstr "Въведедете парола за %s"
 
-#: calendar/gui/e-tasks.c:486 calendar/gui/gnome-cal.c:1918
+#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6003,62 +6339,120 @@ msgstr ""
 "Грешка в %s:\n"
 "·%s"
 
-#: calendar/gui/e-tasks.c:557
+#. FIXME Loading should be async
+#. FIXME With no event handling here the status message never actually changes
+#: calendar/gui/e-tasks.c:801
+#, c-format
+msgid "Opening tasks at %s"
+msgstr "Отваряне на задачи в %s"
+
+#: calendar/gui/e-tasks.c:824
+#, fuzzy, c-format
+msgid ""
+"Error opening %s:\n"
+"%s"
+msgstr ""
+"Грешка в %s:\n"
+"·%s"
+
+#: calendar/gui/e-tasks.c:845
+#, fuzzy
+msgid "Loading tasks"
+msgstr "Няма задачи"
+
+#: calendar/gui/e-tasks.c:949
 msgid "Completing tasks..."
 msgstr "Завършение задачи..."
 
-#: calendar/gui/e-tasks.c:580
+#: calendar/gui/e-tasks.c:972
 msgid "Deleting selected objects..."
 msgstr "Изтрива избраните обекти..."
 
-#: calendar/gui/e-tasks.c:675
+#: calendar/gui/e-tasks.c:999
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/e-week-view.c:3691
-msgid "New _Appointment..."
-msgstr "Нова _Среща..."
+#: calendar/gui/e-tasks.c:1075
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
+#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
+#: calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Задачи"
 
-#: calendar/gui/gnome-cal.c:1671
-#, c-format
-msgid "Could not open the folder in `%s'"
-msgstr "Не мога да отворя папка в `%s'"
+#: calendar/gui/gnome-cal.c:1878
+#, fuzzy, c-format
+msgid "Loading appointments at %s"
+msgstr "Среща - %s"
 
-#: calendar/gui/gnome-cal.c:1685
-#, c-format
-msgid "The method required to open `%s' is not supported"
-msgstr "Метода заявен за отваряне на `%s' не се подържа"
+#: calendar/gui/gnome-cal.c:1897
+#, fuzzy, c-format
+msgid "Loading tasks at %s"
+msgstr "Отваряне на задачи в %s"
 
-#: calendar/gui/gnome-cal.c:1746
-#, c-format
-msgid "Adding alarms for %s"
-msgstr "Добавя аларми за %s"
+#: calendar/gui/gnome-cal.c:1920
+#, fuzzy, c-format
+msgid "Opening %s"
+msgstr "Отвори в %s..."
 
-#: calendar/gui/gnome-cal.c:1938
-#, c-format
-msgid ""
-"The calendar backend for\n"
-"%s\n"
-" has crashed. You will have to restart Evolution in order to use it again"
+#: calendar/gui/gnome-cal.c:2906
+#, fuzzy
+msgid "Purging"
+msgstr "Торино"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1947
-#, c-format
-msgid ""
-"The task backend for\n"
-"%s\n"
-" has crashed. You will have to restart Evolution in order to use it again"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2178
-#, c-format
-msgid "Opening calendar at %s"
-msgstr "Отворя календар в %s"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Календар и Задачи"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar and Tasks"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr ""
 
-#: calendar/gui/gnome-cal.c:2218
-msgid "Opening default tasks folder"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
 msgstr ""
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Компонент за Адресната книга на Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Компонент за Адресната книга на Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Календар"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Задачи"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Април"
@@ -6076,212 +6470,447 @@ msgid "February"
 msgstr "Февруари"
 
 #: calendar/gui/goto-dialog.glade.h:5
-msgid "Go To Date"
-msgstr "Отива на Дата"
-
-#: calendar/gui/goto-dialog.glade.h:6
-msgid "Go To Today"
-msgstr "Отива на Днес"
-
-#: calendar/gui/goto-dialog.glade.h:7
 msgid "January"
 msgstr "Януари"
 
-#: calendar/gui/goto-dialog.glade.h:8
+#: calendar/gui/goto-dialog.glade.h:6
 msgid "July"
 msgstr "Юли"
 
-#: calendar/gui/goto-dialog.glade.h:9
+#: calendar/gui/goto-dialog.glade.h:7
 msgid "June"
 msgstr "Юни"
 
-#: calendar/gui/goto-dialog.glade.h:10
+#: calendar/gui/goto-dialog.glade.h:8
 msgid "March"
 msgstr "Март"
 
-#: calendar/gui/goto-dialog.glade.h:11
+#: calendar/gui/goto-dialog.glade.h:9
 msgid "May"
 msgstr "Май"
 
-#: calendar/gui/goto-dialog.glade.h:12
+#: calendar/gui/goto-dialog.glade.h:10
 msgid "November"
 msgstr "Ноември"
 
-#: calendar/gui/goto-dialog.glade.h:13
+#: calendar/gui/goto-dialog.glade.h:11
 msgid "October"
 msgstr "Октомври"
 
-#: calendar/gui/goto-dialog.glade.h:14
+#: calendar/gui/goto-dialog.glade.h:12
+#, fuzzy
+msgid "Select Date"
+msgstr "Избор на Имена"
+
+#: calendar/gui/goto-dialog.glade.h:13
 msgid "September"
 msgstr "Септември"
 
-#: calendar/gui/itip-utils.c:268 calendar/gui/itip-utils.c:316
-#: calendar/gui/itip-utils.c:348
+#: calendar/gui/goto-dialog.glade.h:14
+#, fuzzy
+msgid "_Select Today"
+msgstr "Избира папка"
+
+#: calendar/gui/itip-utils.c:271 calendar/gui/itip-utils.c:319
+#: calendar/gui/itip-utils.c:351
 msgid "An organizer must be set."
 msgstr "Трябва да бъде зададен организатор."
 
-#: calendar/gui/itip-utils.c:303
+#: calendar/gui/itip-utils.c:306
 msgid "At least one attendee is necessary"
 msgstr "Необходим е поне един участник."
 
-#: calendar/gui/itip-utils.c:391 calendar/gui/itip-utils.c:500
+#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
 msgid "Event information"
 msgstr "Информация за събитие"
 
-#: calendar/gui/itip-utils.c:393 calendar/gui/itip-utils.c:502
+#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:505
 msgid "Task information"
 msgstr "Информация за задача"
 
-#: calendar/gui/itip-utils.c:395 calendar/gui/itip-utils.c:504
+#: calendar/gui/itip-utils.c:398 calendar/gui/itip-utils.c:507
 msgid "Journal information"
 msgstr "Информация за дневник"
 
-#: calendar/gui/itip-utils.c:397 calendar/gui/itip-utils.c:522
+#: calendar/gui/itip-utils.c:400 calendar/gui/itip-utils.c:525
 msgid "Free/Busy information"
 msgstr "Информация Свободен/Зает"
 
-#: calendar/gui/itip-utils.c:399
+#: calendar/gui/itip-utils.c:402
 msgid "Calendar information"
 msgstr "Календарна информация"
 
-#: calendar/gui/itip-utils.c:435
+#: calendar/gui/itip-utils.c:438
 msgid "Updated"
 msgstr "Осъвременен"
 
-#: calendar/gui/itip-utils.c:443
+#: calendar/gui/itip-utils.c:446
 msgid "Refresh"
 msgstr "Презарежда"
 
-#: calendar/gui/itip-utils.c:447
+#: calendar/gui/itip-utils.c:450
 msgid "Counter-proposal"
 msgstr ""
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:521
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Информация Свободен/Зает (%s на %s)"
 
-#: calendar/gui/itip-utils.c:528
+#: calendar/gui/itip-utils.c:531
 msgid "iCalendar information"
 msgstr "iКалендарна информация"
 
-#: calendar/gui/itip-utils.c:672
+#: calendar/gui/itip-utils.c:673
 msgid "You must be an attendee of the event."
 msgstr "Вие трябва да сте участни на събирието."
 
-#: calendar/gui/print.c:547
+#: calendar/gui/migration.c:146
+msgid ""
+"The location and hierarchy of the Evolution task folders has changed since "
+"Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: calendar/gui/migration.c:150
+msgid ""
+"The location and hierarchy of the Evolution calendar folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+
+#: calendar/gui/migration.c:376
+msgid "Birthdays & Anniversaries"
+msgstr ""
+
+#. Create the Webcal source group
+#: calendar/gui/migration.c:462 calendar/gui/migration.c:544
+msgid "On The Web"
+msgstr ""
+
+#. FIXME: set proper domain/code
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
+msgid "Unable to migrate old settings from evolution/config.xmldb"
+msgstr ""
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:737
+#, fuzzy, c-format
+msgid "Unable to migrate calendar `%s'"
+msgstr ""
+"Не мога да отрежа файл %s:\n"
+"%s"
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:889
+#, fuzzy, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr "Съобщението %s не може да бъде получено"
+
+#: calendar/gui/print.c:489
+msgid "1st"
+msgstr "1ви"
+
+#: calendar/gui/print.c:489
+msgid "2nd"
+msgstr "2ри"
+
+#: calendar/gui/print.c:489
+msgid "3rd"
+msgstr "3ти"
+
+#: calendar/gui/print.c:489
+msgid "4th"
+msgstr "4ти"
+
+#: calendar/gui/print.c:489
+msgid "5th"
+msgstr "5ти"
+
+#: calendar/gui/print.c:490
+msgid "6th"
+msgstr "6ти"
+
+#: calendar/gui/print.c:490
+msgid "7th"
+msgstr "7ми"
+
+#: calendar/gui/print.c:490
+msgid "8th"
+msgstr "8ми"
+
+#: calendar/gui/print.c:490
+msgid "9th"
+msgstr "9ти"
+
+#: calendar/gui/print.c:490
+msgid "10th"
+msgstr "10ти"
+
+#: calendar/gui/print.c:491
+msgid "11th"
+msgstr "11ти"
+
+#: calendar/gui/print.c:491
+msgid "12th"
+msgstr "12ти"
+
+#: calendar/gui/print.c:491
+msgid "13th"
+msgstr "13ти"
+
+#: calendar/gui/print.c:491
+msgid "14th"
+msgstr "14ти"
+
+#: calendar/gui/print.c:491
+msgid "15th"
+msgstr "15ти"
+
+#: calendar/gui/print.c:492
+msgid "16th"
+msgstr "16ти"
+
+#: calendar/gui/print.c:492
+msgid "17th"
+msgstr "17ти"
+
+#: calendar/gui/print.c:492
+msgid "18th"
+msgstr "18ти"
+
+#: calendar/gui/print.c:492
+msgid "19th"
+msgstr "19ти"
+
+#: calendar/gui/print.c:492
+msgid "20th"
+msgstr "20ти"
+
+#: calendar/gui/print.c:493
+msgid "21st"
+msgstr "21ви"
+
+#: calendar/gui/print.c:493
+msgid "22nd"
+msgstr "22ри"
+
+#: calendar/gui/print.c:493
+msgid "23rd"
+msgstr "23ти"
+
+#: calendar/gui/print.c:493
+msgid "24th"
+msgstr "24ти"
+
+#: calendar/gui/print.c:493
+msgid "25th"
+msgstr "25ти"
+
+#: calendar/gui/print.c:494
+msgid "26th"
+msgstr "26ти"
+
+#: calendar/gui/print.c:494
+msgid "27th"
+msgstr "27ми"
+
+#: calendar/gui/print.c:494
+msgid "28th"
+msgstr "28ми"
+
+#: calendar/gui/print.c:494
+msgid "29th"
+msgstr "29ти"
+
+#: calendar/gui/print.c:494
+msgid "30th"
+msgstr "30ти"
+
+#: calendar/gui/print.c:495
+msgid "31st"
+msgstr "31ви"
+
+#: calendar/gui/print.c:570
 msgid "Su"
 msgstr "Нд"
 
-#: calendar/gui/print.c:547
+#: calendar/gui/print.c:570
 msgid "Mo"
 msgstr "Пн"
 
-#: calendar/gui/print.c:547
+#: calendar/gui/print.c:570
 msgid "Tu"
 msgstr "Вт"
 
-#: calendar/gui/print.c:547
+#: calendar/gui/print.c:570
 msgid "We"
 msgstr "Ср"
 
-#: calendar/gui/print.c:548
+#: calendar/gui/print.c:571
 msgid "Th"
 msgstr "Чт"
 
-#: calendar/gui/print.c:548
+#: calendar/gui/print.c:571
 msgid "Fr"
 msgstr "Пт"
 
-#: calendar/gui/print.c:548
+#: calendar/gui/print.c:571
 msgid "Sa"
 msgstr "Сб"
 
 #. Day
-#: calendar/gui/print.c:1875
+#: calendar/gui/print.c:1914
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Избран ден (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1900 calendar/gui/print.c:1904
+#: calendar/gui/print.c:1939 calendar/gui/print.c:1943
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1901
+#: calendar/gui/print.c:1940
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1905 calendar/gui/print.c:1907
-#: calendar/gui/print.c:1908
+#: calendar/gui/print.c:1944 calendar/gui/print.c:1946
+#: calendar/gui/print.c:1947
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/print.c:1912
+#: calendar/gui/print.c:1951
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Избрана седмица (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1920
+#: calendar/gui/print.c:1959
 msgid "Selected month (%b %Y)"
 msgstr "Избран месец (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1927
+#: calendar/gui/print.c:1966
 msgid "Selected year (%Y)"
 msgstr "Избрана година (%Y)"
 
-#: calendar/gui/print.c:2255
+#: calendar/gui/print.c:2297
 msgid "Task"
 msgstr "Задача"
 
-#: calendar/gui/print.c:2314
+#: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
 msgstr "Статус: %s"
 
-#: calendar/gui/print.c:2331
+#: calendar/gui/print.c:2373
 #, c-format
 msgid "Priority: %s"
 msgstr "Приоритет: %s"
 
-#: calendar/gui/print.c:2343
+#: calendar/gui/print.c:2385
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Приключено в проценти: %i"
 
-#: calendar/gui/print.c:2355
+#: calendar/gui/print.c:2397
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2369
+#: calendar/gui/print.c:2411
 #, c-format
 msgid "Categories: %s"
 msgstr "Категории: %s"
 
-#: calendar/gui/print.c:2380
+#: calendar/gui/print.c:2422
 msgid "Contacts: "
 msgstr "Контакти:"
 
-#: calendar/gui/print.c:2518 calendar/gui/print.c:2604
-#: calendar/gui/tasks-control.c:564 mail/mail-callbacks.c:2948
-#: my-evolution/e-summary.c:649
+#: calendar/gui/print.c:2559 calendar/gui/print.c:2645
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
 msgid "Print Preview"
 msgstr "Печатен Преглед"
 
-#: calendar/gui/print.c:2552
+#: calendar/gui/print.c:2593
 msgid "Print Item"
 msgstr "Печат на Обект"
 
-#: calendar/gui/print.c:2625
+#: calendar/gui/print.c:2759
 msgid "Print Setup"
 msgstr "Печатни Настройки..."
 
-#: calendar/gui/tasks-control.c:152
-msgid "The URI of the tasks folder to display"
-msgstr "URI на папки със  задачи за показване"
+#: calendar/gui/tasks-component.c:313
+#, c-format
+msgid "Task List '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:371
+#, fuzzy
+msgid "New Task List"
+msgstr "Нова Задача"
+
+#: calendar/gui/tasks-component.c:408
+#, fuzzy, c-format
+msgid "%d task"
+msgid_plural "%d tasks"
+msgstr[0] "%d дни"
+msgstr[1] "%d дни"
+
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
+#, fuzzy, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] " %d избрано"
+msgstr[1] " %d избрано"
+
+#: calendar/gui/tasks-component.c:457
+msgid "Failed upgrading tasks."
+msgstr ""
+
+#: calendar/gui/tasks-component.c:749
+#, c-format
+msgid "Unable to open the task list '%s' for creating events and meetings"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:761
+msgid "There is no calendar available for creating tasks"
+msgstr ""
 
-#: calendar/gui/tasks-control.c:448
+#: calendar/gui/tasks-component.c:799
+msgid ""
+"Selected task list is read-only, events cannot be created. Please select a "
+"read-write calendar."
+msgstr ""
+
+#: calendar/gui/tasks-component.c:1040
+msgid "New task"
+msgstr ""
+
+#: calendar/gui/tasks-component.c:1041
+msgid "_Task"
+msgstr "_Задачи"
+
+#: calendar/gui/tasks-component.c:1042
+msgid "Create a new task"
+msgstr "Създава нова задача"
+
+#: calendar/gui/tasks-component.c:1048
+#, fuzzy
+msgid "New tasks group"
+msgstr "Нова Задача"
+
+#: calendar/gui/tasks-component.c:1049
+#, fuzzy
+msgid "_Tasks Group"
+msgstr "_Задачи"
+
+#: calendar/gui/tasks-component.c:1050
+#, fuzzy
+msgid "Create a new tasks group"
+msgstr "Създава нова задача"
+
+#: calendar/gui/tasks-control.c:367
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6289,15 +6918,15 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:451
+#: calendar/gui/tasks-control.c:370
 msgid "Do not ask me again."
 msgstr "Не показвай това съобщение отново."
 
-#: calendar/gui/tasks-control.c:593
+#: calendar/gui/tasks-control.c:428
 msgid "Print Tasks"
 msgstr "Задачи за разпечатване"
 
-#: calendar/gui/weekday-picker.c:268
+#: calendar/gui/weekday-picker.c:326
 msgid "SMTWTFS"
 msgstr "SMTWTFS"
 
@@ -6321,136 +6950,29 @@ msgstr ""
 msgid "vCalendar files (.vcf)"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:403
+#: calendar/importers/icalendar-importer.c:78
+#, fuzzy
+msgid "Appointments and Meetings"
+msgstr "Среща - %s"
+
+#: calendar/importers/icalendar-importer.c:490
 msgid "Reminder!!"
 msgstr "Напомняне!!"
 
-#: calendar/importers/icalendar-importer.c:637
+#: calendar/importers/icalendar-importer.c:698
 msgid "Calendar Events"
 msgstr "Календарни Събития"
 
-#: calendar/importers/icalendar-importer.c:662
+#: calendar/importers/icalendar-importer.c:723
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
 msgstr ""
 
-#: calendar/importers/icalendar-importer.c:669
+#: calendar/importers/icalendar-importer.c:730
 msgid "Gnome Calendar"
 msgstr "GNOME Календар"
 
-#: calendar/pcs/cal-backend-file.c:316
-msgid "Can't save calendar data: Malformed URI."
-msgstr ""
-
-#: calendar/pcs/query.c:289
-msgid "time-now expects 0 arguments"
-msgstr "time-now очаква 0 аргумента"
-
-#: calendar/pcs/query.c:313
-msgid "make-time expects 1 argument"
-msgstr "make-time очаква 1 аргумент"
-
-#: calendar/pcs/query.c:318
-msgid "make-time expects argument 1 to be a string"
-msgstr "make-time очаква аргумент 1 да бъде низ"
-
-#: calendar/pcs/query.c:326
-msgid "make-time argument 1 must be an ISO 8601 date/time string"
-msgstr ""
-
-#: calendar/pcs/query.c:355
-msgid "time-add-day expects 2 arguments"
-msgstr "time-add-day очаква 2 аргумента"
-
-#: calendar/pcs/query.c:360
-msgid "time-add-day expects argument 1 to be a time_t"
-msgstr ""
-
-#: calendar/pcs/query.c:367
-msgid "time-add-day expects argument 2 to be an integer"
-msgstr ""
-
-#: calendar/pcs/query.c:394
-msgid "time-day-begin expects 1 argument"
-msgstr "time-day-begin очаква 1 аргумент"
-
-#: calendar/pcs/query.c:399
-msgid "time-day-begin expects argument 1 to be a time_t"
-msgstr ""
-
-#: calendar/pcs/query.c:426
-msgid "time-day-end expects 1 argument"
-msgstr ""
-
-#: calendar/pcs/query.c:431
-msgid "time-day-end expects argument 1 to be a time_t"
-msgstr ""
-
-#: calendar/pcs/query.c:467
-msgid "get-vtype expects 0 arguments"
-msgstr ""
-
-#: calendar/pcs/query.c:563
-msgid "occur-in-time-range? expects 2 arguments"
-msgstr ""
-
-#: calendar/pcs/query.c:568
-msgid "occur-in-time-range? expects argument 1 to be a time_t"
-msgstr ""
-
-#: calendar/pcs/query.c:575
-msgid "occur-in-time-range? expects argument 2 to be a time_t"
-msgstr ""
-
-#: calendar/pcs/query.c:705
-msgid "contains? expects 2 arguments"
-msgstr ""
-
-#: calendar/pcs/query.c:710
-msgid "contains? expects argument 1 to be a string"
-msgstr ""
-
-#: calendar/pcs/query.c:717
-msgid "contains? expects argument 2 to be a string"
-msgstr ""
-
-#: calendar/pcs/query.c:734
-msgid ""
-"contains? expects argument 1 to be one of \"any\", \"summary\", \"description"
-"\""
-msgstr ""
-
-#: calendar/pcs/query.c:776
-msgid "has-categories? expects at least 1 argument"
-msgstr ""
-
-#: calendar/pcs/query.c:788
-msgid ""
-"has-categories? expects all arguments to be strings or one and only one "
-"argument to be a boolean false (#f)"
-msgstr ""
-
-#: calendar/pcs/query.c:876
-msgid "is-completed? expects 0 arguments"
-msgstr ""
-
-#: calendar/pcs/query.c:921
-msgid "completed-before? expects 1 argument"
-msgstr ""
-
-#: calendar/pcs/query.c:926
-msgid "completed-before? expects argument 1 to be a time_t"
-msgstr ""
-
-#: calendar/pcs/query.c:1229
-msgid "Evaluation of the search expression did not yield a boolean value"
-msgstr ""
-
-#: calendar/pcs/query.c:1483
-msgid "Parse error"
-msgstr ""
-
 #.
 #. * These are the timezone names from the Olson timezone data.
 #. * We only place them here so gettext picks them up for translation.
@@ -7980,27 +8502,27 @@ msgstr ""
 msgid "Pacific/Yap"
 msgstr ""
 
-#: camel/camel-cipher-context.c:178
+#: camel/camel-cipher-context.c:101
 msgid "Signing is not supported by this cipher"
 msgstr "Подпис не се подържа от този шифър"
 
-#: camel/camel-cipher-context.c:218
+#: camel/camel-cipher-context.c:140
 msgid "Verifying is not supported by this cipher"
 msgstr "Верификация не се подържа от този шифър"
 
-#: camel/camel-cipher-context.c:262
+#: camel/camel-cipher-context.c:180
 msgid "Encryption is not supported by this cipher"
 msgstr "Криптиране не се подържа от този шифър"
 
-#: camel/camel-cipher-context.c:304
+#: camel/camel-cipher-context.c:219
 msgid "Decryption is not supported by this cipher"
 msgstr "Декриптиране не се подържа от този шифър"
 
-#: camel/camel-cipher-context.c:342
+#: camel/camel-cipher-context.c:254
 msgid "You may not import keys with this cipher"
 msgstr ""
 
-#: camel/camel-cipher-context.c:374
+#: camel/camel-cipher-context.c:284
 msgid "You may not export keys with this cipher"
 msgstr ""
 
@@ -8008,12 +8530,12 @@ msgstr ""
 msgid "Unable to create cache path"
 msgstr ""
 
-#: camel/camel-data-cache.c:370
+#: camel/camel-data-cache.c:375
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr ""
 
-#: camel/camel-disco-diary.c:185
+#: camel/camel-disco-diary.c:194
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -8021,7 +8543,7 @@ msgid ""
 "reconnect to the network."
 msgstr ""
 
-#: camel/camel-disco-diary.c:248
+#: camel/camel-disco-diary.c:257
 #, c-format
 msgid ""
 "Could not open `%s':\n"
@@ -8032,104 +8554,149 @@ msgstr ""
 "%s\n"
 "Направените промени в тази папка няма да бъдат синхронизирани."
 
-#: camel/camel-disco-diary.c:282
+#: camel/camel-disco-diary.c:293
 msgid "Resynchronizing with server"
 msgstr "Ресинхронизира със сървър"
 
-#: camel/camel-disco-folder.c:278
+#: camel/camel-disco-folder.c:41
+msgid "Copy folder content locally for offline operation"
+msgstr ""
+
+#: camel/camel-disco-folder.c:103
+msgid "Downloading new messages for offline mode"
+msgstr ""
+
+#: camel/camel-disco-folder.c:466
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr ""
 
-#: camel/camel-disco-store.c:367
+#: camel/camel-disco-store.c:404
 msgid "You must be working online to complete this operation"
 msgstr "Вие трябва да сте в 'online' за да завършите тази операция"
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
 #, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
-#: camel/camel-process.c:92
+#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-process.c:90
 #, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:744
+#: camel/camel-filter-driver.c:754
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr ""
 
-#: camel/camel-filter-driver.c:923 camel/camel-filter-driver.c:932
+#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
 msgid "Syncing folders"
 msgstr "Синхронизиране на папки"
 
-#: camel/camel-filter-driver.c:1021 camel/camel-filter-driver.c:1394
+#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Грешка при работа с филтър: %s: %s"
 
-#: camel/camel-filter-driver.c:1030 camel/camel-filter-driver.c:1400
+#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Грешка при изпълнение на филтър: %s: %s"
 
-#: camel/camel-filter-driver.c:1097
+#: camel/camel-filter-driver.c:1108
 msgid "Unable to open spool folder"
 msgstr "Не мога да отворя spool папка"
 
-#: camel/camel-filter-driver.c:1106
+#: camel/camel-filter-driver.c:1117
 msgid "Unable to process spool folder"
 msgstr "Не мога да обработя spool папка"
 
-#: camel/camel-filter-driver.c:1121
+#: camel/camel-filter-driver.c:1132
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Получаване на съобщение номер %d (%d%%)"
 
-#: camel/camel-filter-driver.c:1125
+#: camel/camel-filter-driver.c:1136
 msgid "Cannot open message"
 msgstr "Не мога да отворя съобщение"
 
-#: camel/camel-filter-driver.c:1126 camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
 #, c-format
 msgid "Failed on message %d"
 msgstr "Грешка на съобщение %d"
 
-#: camel/camel-filter-driver.c:1152 camel/camel-filter-driver.c:1246
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
 msgid "Syncing folder"
 msgstr "Синхронизиране на папка"
 
-#: camel/camel-filter-driver.c:1213
+#: camel/camel-filter-driver.c:1224
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Получаване на съобщение номер %d от %d"
 
-#: camel/camel-filter-driver.c:1228
+#: camel/camel-filter-driver.c:1239
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Грешка на съобщение - %d от %d"
 
-#: camel/camel-filter-search.c:134
+#: camel/camel-filter-search.c:136
 msgid "Failed to retrieve message"
 msgstr "Получаването на съобщението е неуспешно"
 
-#: camel/camel-filter-search.c:384
+#: camel/camel-filter-search.c:386
 msgid "Invalid arguments to (system-flag)"
 msgstr ""
 
-#: camel/camel-filter-search.c:399
+#: camel/camel-filter-search.c:401
 msgid "Invalid arguments to (user-tag)"
 msgstr ""
 
-#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Грешка при търсене на филтър: %s: %s"
 
-#: camel/camel-folder-search.c:348
+#: camel/camel-folder.c:653
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "Неподържана операция: добавяне на съобщение за %s"
+
+#: camel/camel-folder.c:1262
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "Неподържана операция: търсене по израз: за %s"
+
+#: camel/camel-folder.c:1302
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr "Неподържана операция: търсене по uids: за %s"
+
+#: camel/camel-folder.c:1416
+msgid "Moving messages"
+msgstr "Премества съобщения"
+
+#: camel/camel-folder.c:1416
+msgid "Copying messages"
+msgstr "Копира съобщения"
+
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Лансинг"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr ""
+
+#: camel/camel-folder.c:1701
+#, fuzzy
+msgid "Filtering new message(s)"
+msgstr "Получавам %d съобщение"
+
+#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -8138,7 +8705,7 @@ msgstr ""
 "немога да анализирам търсеният израз: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:358
+#: camel/camel-folder-search.c:365 camel/camel-folder-search.c:486
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -8147,39 +8714,34 @@ msgstr ""
 "Грешка при изпълнение търсене на израз: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:705
 msgid "(match-all) requires a single bool result"
 msgstr "(съвпадение на всичи) изисква единичен булев резулат"
 
-#: camel/camel-folder-search.c:650
-#, c-format
-msgid "Performing query on unknown header: %s"
+#: camel/camel-folder-search.c:755
+msgid "(match-threads) not allowed inside match-all"
 msgstr ""
 
-#: camel/camel-folder.c:583
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Неподържана операция: добавяне на съобщение за %s"
-
-#: camel/camel-folder.c:1161
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Неподържана операция: търсене по израз: за %s"
+#: camel/camel-folder-search.c:758 camel/camel-folder-search.c:762
+msgid "(match-threads) requires a match type string"
+msgstr ""
 
-#: camel/camel-folder.c:1201
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr "Неподържана операция: търсене по uids: за %s"
+#: camel/camel-folder-search.c:784
+#, fuzzy
+msgid "(match-threads) expects an array result"
+msgstr "(съвпадение на всичи) изисква единичен булев резулат"
 
-#: camel/camel-folder.c:1319
-msgid "Moving messages"
-msgstr "Премества съобщения"
+#: camel/camel-folder-search.c:790
+#, fuzzy
+msgid "(match-threads) requires the folder set"
+msgstr "(съвпадение на всичи) изисква единичен булев резулат"
 
-#: camel/camel-folder.c:1319
-msgid "Copying messages"
-msgstr "Копира съобщения"
+#: camel/camel-folder-search.c:879
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr ""
 
-#: camel/camel-gpg-context.c:762
+#: camel/camel-gpg-context.c:720
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8187,45 +8749,43 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:777
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:802
+#: camel/camel-gpg-context.c:758
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:810
+#: camel/camel-gpg-context.c:772
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 msgstr ""
 
-#: camel/camel-gpg-context.c:821 camel/camel-gpg-context.c:1297
-#: camel/camel-gpg-context.c:1403 camel/camel-gpg-context.c:1473
-#: camel/camel-gpg-context.c:1529 mail/mail-send-recv.c:580
+#: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
+#: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
+#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
+#: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Прекратено."
 
-#: camel/camel-gpg-context.c:839
+#: camel/camel-gpg-context.c:807
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:845
+#: camel/camel-gpg-context.c:813
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:857
-msgid "No data provided"
-msgstr "Няма доставена информация"
-
-#: camel/camel-gpg-context.c:895
+#: camel/camel-gpg-context.c:864
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1172
+#: camel/camel-gpg-context.c:1141
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8233,48 +8793,62 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1177
+#: camel/camel-gpg-context.c:1146
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1288 camel/camel-gpg-context.c:1573
-#: camel/camel-gpg-context.c:1624
+#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
+#, fuzzy, c-format
+msgid "Could not generate signing data: %s"
+msgstr "Не мога да запиша данните: %s"
+
+#: camel/camel-gpg-context.c:1273 camel/camel-gpg-context.c:1702
+#: camel/camel-gpg-context.c:1753
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1318 camel/camel-gpg-context.c:1395
-#: camel/camel-gpg-context.c:1464 camel/camel-gpg-context.c:1494
-#: camel/camel-gpg-context.c:1520 camel/camel-gpg-context.c:1550
-#: camel/camel-gpg-context.c:1595 camel/camel-gpg-context.c:1646
+#: camel/camel-gpg-context.c:1297 camel/camel-gpg-context.c:1430
+#: camel/camel-gpg-context.c:1523 camel/camel-gpg-context.c:1546
+#: camel/camel-gpg-context.c:1630 camel/camel-gpg-context.c:1654
+#: camel/camel-gpg-context.c:1724 camel/camel-gpg-context.c:1775
 msgid "Failed to execute gpg."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1380
-#, c-format
-msgid "Cannot verify message signature: could not create temp file: %s"
+#: camel/camel-gpg-context.c:1316
+msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-lock-client.c:111
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
+#: camel/camel-gpg-context.c:1397 camel/camel-gpg-context.c:1406
+#: camel/camel-smime-context.c:721 camel/camel-smime-context.c:732
+#: camel/camel-smime-context.c:739
+msgid "Cannot verify message signature: Incorrect message format"
 msgstr ""
 
-#: camel/camel-lock-client.c:124
+#: camel/camel-gpg-context.c:1413
 #, c-format
-msgid "Cannot fork locking helper: %s"
+msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 
-#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
-#, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
+#: camel/camel-gpg-context.c:1506
+#, fuzzy, c-format
+msgid "Could not generate encrypting data: %s"
+msgstr "Не мога да запиша данните: %s"
+
+#: camel/camel-gpg-context.c:1564
+#, fuzzy
+msgid "This is a digitally encrypted message part"
+msgstr "Това е част от криптирано съобщение"
+
+#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
+msgid "Encrypted content"
 msgstr ""
 
-#: camel/camel-lock-client.c:215
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Не мога да заключа '%s'"
+#: camel/camel-gpg-context.c:1680
+#, fuzzy
+msgid "Unable to parse message content"
+msgstr "Не мога да получа съобщение от редактора"
 
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
@@ -8298,6 +8872,26 @@ msgstr "Неуспех при получаване на lock използвай�
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Неуспех при получаване на lock използвайки flcntl(2): %s"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr ""
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr ""
+
+#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr ""
+
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Не мога да заключа '%s'"
+
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -8352,54 +8946,59 @@ msgstr "Грешка при писане на поща във временен �
 msgid "Error copying mail temp file: %s"
 msgstr "Грешка при копиране на поща във временен файл: %s"
 
-#: camel/camel-multipart-encrypted.c:259 camel/camel-multipart-encrypted.c:274
+#: camel/camel-multipart-encrypted.c:229 camel/camel-multipart-encrypted.c:244
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:287
+#: camel/camel-multipart-encrypted.c:257
 msgid "Failed to decrypt MIME part: invalid structure"
 msgstr ""
 
-#: camel/camel-multipart-encrypted.c:327
-msgid "Failed to decrypt MIME part: parse error"
+#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724
+msgid "parse error"
 msgstr ""
 
-#: camel/camel-multipart-signed.c:644
-msgid "This is a digitally signed message part"
+#: camel/camel-provider.c:59
+msgid "Virtual folder email provider"
 msgstr ""
 
-#: camel/camel-multipart-signed.c:698
-msgid "parse error"
+#: camel/camel-provider.c:61
+msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: camel/camel-provider.c:132
+#: camel/camel-provider.c:172
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "Не мога да заредя %s: Зареждаемият модул не се подържа от тази система"
 
-#: camel/camel-provider.c:141
+#: camel/camel-provider.c:181
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Не мога да заредя %s: %s"
 
-#: camel/camel-provider.c:149
+#: camel/camel-provider.c:189
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Не мога да заредя %s: Няма инициализиращ код в модула."
 
-#: camel/camel-sasl-anonymous.c:33
+#: camel/camel-provider.c:356 camel/camel-session.c:160
+#, c-format
+msgid "No provider available for protocol `%s'"
+msgstr "Няма наличен доставчик за протокол `%s'"
+
+#: camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "Анонимно"
 
-#: camel/camel-sasl-anonymous.c:35
+#: camel/camel-sasl-anonymous.c:37
 msgid "This option will connect to the server using an anonymous login."
 msgstr "Тази опция щв ви свържа със сървър позволяващ анонимно влизане"
 
-#: camel/camel-sasl-anonymous.c:110 camel/camel-sasl-plain.c:87
+#: camel/camel-sasl-anonymous.c:112 camel/camel-sasl-plain.c:87
 msgid "Authentication failed."
 msgstr "Оторизацията пропадна"
 
-#: camel/camel-sasl-anonymous.c:119
+#: camel/camel-sasl-anonymous.c:121
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
@@ -8408,7 +9007,7 @@ msgstr ""
 "Грешна информация при трасиране на пощенски адрес:\n"
 "%s"
 
-#: camel/camel-sasl-anonymous.c:131
+#: camel/camel-sasl-anonymous.c:133
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -8417,7 +9016,7 @@ msgstr ""
 "Грешна информация при трасиране:\n"
 "%s"
 
-#: camel/camel-sasl-anonymous.c:143
+#: camel/camel-sasl-anonymous.c:145
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -8535,7 +9134,7 @@ msgstr ""
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1052
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Грешна оторизация отговори сървъра."
 
@@ -8591,23 +9190,23 @@ msgstr ""
 msgid "PLAIN"
 msgstr "ОБИКНОВЕН"
 
-#: camel/camel-sasl-popb4smtp.c:34
+#: camel/camel-sasl-popb4smtp.c:36
 msgid "POP before SMTP"
 msgstr "POP преди SMTP"
 
-#: camel/camel-sasl-popb4smtp.c:36
+#: camel/camel-sasl-popb4smtp.c:38
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "Тази опция ще оторизира POP връзка преди SMTP"
 
-#: camel/camel-sasl-popb4smtp.c:107
+#: camel/camel-sasl-popb4smtp.c:103
 msgid "POP Source URI"
 msgstr "POP Източник URI"
 
-#: camel/camel-sasl-popb4smtp.c:111
+#: camel/camel-sasl-popb4smtp.c:106
 msgid "POP Before SMTP auth using an unknown transport"
 msgstr "POP Преди SMTP оторизация използва неизвестен транспорт"
 
-#: camel/camel-sasl-popb4smtp.c:116
+#: camel/camel-sasl-popb4smtp.c:111
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr ""
 
@@ -8616,72 +9215,59 @@ msgstr ""
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Компилирането на регулярен израз пропадна  %s: %s"
 
-#: camel/camel-service.c:284
+#: camel/camel-service.c:275
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "URL '%s' се нуждае от компонент име на потребител"
 
-#: camel/camel-service.c:292
+#: camel/camel-service.c:279
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "URL '%s' се нуждае от компонент хост"
 
-#: camel/camel-service.c:300
+#: camel/camel-service.c:283
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' се нуждае от компонент път"
 
-#: camel/camel-service.c:752
+#: camel/camel-service.c:733
 #, c-format
 msgid "Resolving: %s"
 msgstr "Анализира: %s"
 
-#: camel/camel-service.c:786 camel/camel-service.c:919
+#: camel/camel-service.c:764 camel/camel-service.c:888
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Неуспех при търсене на име %s"
 
-#: camel/camel-service.c:807 camel/camel-service.c:940
+#: camel/camel-service.c:785 camel/camel-service.c:909
 #, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr ""
 
-#: camel/camel-service.c:821
+#: camel/camel-service.c:798
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Търсенето на хост пропадна: %s: хоста не е намерен"
 
-#: camel/camel-service.c:824
+#: camel/camel-service.c:801
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Търсенето на хост пропадна: %s: неизвестна причина"
 
-#: camel/camel-service.c:883
+#: camel/camel-service.c:855
 msgid "Resolving address"
 msgstr "Разглежда адрес"
 
-#: camel/camel-service.c:956
+#: camel/camel-service.c:924
 msgid "Host lookup failed: host not found"
 msgstr ""
 
-#: camel/camel-service.c:959
+#: camel/camel-service.c:927
 msgid "Host lookup failed: unknown reason"
 msgstr ""
 
-#: camel/camel-session.c:75
-msgid "Virtual folder email provider"
-msgstr ""
-
-#: camel/camel-session.c:77
-msgid "For reading mail as a query of another set of folders"
-msgstr ""
-
-#: camel/camel-session.c:355 camel/camel-session.c:405
-#, c-format
-msgid "No provider available for protocol `%s'"
-msgstr "Няма наличен доставчик за протокол `%s'"
-
-#: camel/camel-session.c:528
+#: camel/camel-session.c:282
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8690,168 +9276,396 @@ msgstr ""
 "Не мога да създам директория %s:\n"
 "%s"
 
-#: camel/camel-smime-context.c:171
-#, c-format
-msgid "Please enter your password for %s"
-msgstr "Моля, въведете вашата парола за %s"
+#: camel/camel-smime-context.c:104
+#, fuzzy, c-format
+msgid "Enter security pass-phrase for `%s'"
+msgstr "Моля въведете вашият %s шифър за %s"
 
-#: camel/camel-smime-context.c:201
-msgid "Please indicate the nickname of a certificate to sign with."
+#: camel/camel-smime-context.c:261
+#, fuzzy, c-format
+msgid "Cannot find certificate for '%s'"
+msgstr "Неуспех при намиране на сертификат за \"%s\"."
+
+#: camel/camel-smime-context.c:267
+#, fuzzy
+msgid "Cannot create CMS message"
+msgstr "Не мога да отворя съобщение"
+
+#: camel/camel-smime-context.c:272
+msgid "Cannot create CMS signedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:207
-#, c-format
-msgid "The signature certificate for \"%s\" does not exist."
-msgstr "Сигнатурен сертификат за \"%s\" не съществува."
+#: camel/camel-smime-context.c:278
+#, fuzzy
+msgid "Cannot attach CMS signedData"
+msgstr "Не мога да прикача файл %s: %s"
 
-#: camel/camel-smime-context.c:247
-#, c-format
-msgid "The encryption certificate for \"%s\" does not exist."
+#: camel/camel-smime-context.c:285
+#, fuzzy
+msgid "Cannot attach CMS data"
+msgstr "Не мога да прикача файл %s: %s"
+
+#: camel/camel-smime-context.c:291
+msgid "Cannot create CMS SignerInfo"
+msgstr ""
+
+#: camel/camel-smime-context.c:297
+msgid "Cannot find cert chain"
+msgstr ""
+
+#: camel/camel-smime-context.c:303
+msgid "Cannot add CMS SigningTime"
+msgstr ""
+
+#: camel/camel-smime-context.c:325 camel/camel-smime-context.c:337
+#, fuzzy, c-format
+msgid "Encryption cert for '%s' does not exist"
 msgstr "Криптиран сертификат за \"%s\" не съществува."
 
-#: camel/camel-smime-context.c:417 camel/camel-smime-context.c:428
-#: camel/camel-smime-context.c:534 camel/camel-smime-context.c:544
-#, c-format
-msgid "Failed to find certificate for \"%s\"."
-msgstr "Неуспех при намиране на сертификат за \"%s\"."
+#: camel/camel-smime-context.c:344
+msgid "Cannot add SMIMEEncKeyPrefs attribute"
+msgstr ""
+
+#: camel/camel-smime-context.c:349
+msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
+msgstr ""
+
+#: camel/camel-smime-context.c:354
+msgid "Cannot add encryption certificate"
+msgstr ""
 
-#: camel/camel-smime-context.c:554
-msgid "Failed to find a common bulk algorithm."
+#: camel/camel-smime-context.c:360
+msgid "Cannot add CMS SignerInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:808
-msgid "Failed to decode message."
+#: camel/camel-smime-context.c:430
+#, fuzzy
+msgid "Cannot create encoder context"
+msgstr "Не мога да създам декодиращ контекст за S/MIME"
+
+#: camel/camel-smime-context.c:436
+#, fuzzy
+msgid "Failed to add data to CMS encoder"
+msgstr "Изпращането на потребителското име до сървъра неуспешно"
+
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
+#, fuzzy
+msgid "Failed to encode data"
 msgstr "Неуспех при декодиране на съобщението"
 
-#: camel/camel-smime-context.c:853
-msgid "Failed to verify certificates."
+#: camel/camel-smime-context.c:514
+#, fuzzy
+msgid "Unverified"
+msgstr "Недефинирано"
+
+#: camel/camel-smime-context.c:516
+#, fuzzy
+msgid "Good signature"
+msgstr "Запазва сигнатура"
+
+#: camel/camel-smime-context.c:518
+#, fuzzy
+msgid "Bad signature"
+msgstr "Запазва сигнатура"
+
+#: camel/camel-smime-context.c:520
+msgid "Content tampered with or altered in transit"
+msgstr ""
+
+#: camel/camel-smime-context.c:522
+#, fuzzy
+msgid "Signing certificate not found"
+msgstr "Конфигурационната база данни не е намерена"
+
+#: camel/camel-smime-context.c:524
+msgid "Signing certificate not trusted"
+msgstr ""
+
+#: camel/camel-smime-context.c:526
+msgid "Signature algorithm unknown"
+msgstr ""
+
+#: camel/camel-smime-context.c:528
+msgid "Signature algorithm unsupported"
+msgstr ""
+
+#: camel/camel-smime-context.c:530
+#, fuzzy
+msgid "Malformed signature"
+msgstr "Запазва сигнатура"
+
+#: camel/camel-smime-context.c:532
+#, fuzzy
+msgid "Processing error"
+msgstr "Прекратява Обработката"
+
+#: camel/camel-smime-context.c:569
+msgid "No signedData in signature"
+msgstr ""
+
+#: camel/camel-smime-context.c:576
+msgid "Digests missing from enveloped data"
+msgstr ""
+
+#: camel/camel-smime-context.c:589 camel/camel-smime-context.c:599
+msgid "Cannot calculate digests"
+msgstr ""
+
+#: camel/camel-smime-context.c:604
+#, fuzzy
+msgid "Cannot set message digests"
+msgstr "Не мога да взема съобщението %s:·%s"
+
+#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
+#, fuzzy
+msgid "Certificate import failed"
+msgstr "Оторизацията пропадна"
+
+#: camel/camel-smime-context.c:628
+#, fuzzy
+msgid "Certificate only message, cannot verify certificates"
 msgstr "Неуспех при проверка на сертификати"
 
-#: camel/camel-store.c:215
+#: camel/camel-smime-context.c:631
+msgid "Certificate only message, certificates imported and verified"
+msgstr ""
+
+#: camel/camel-smime-context.c:635
+#, fuzzy
+msgid "Can't find signature digests"
+msgstr "HTML сигнатурен файл"
+
+#: camel/camel-smime-context.c:651
+#, fuzzy, c-format
+msgid "Signer: %s <%s>: %s\n"
+msgstr "Сървър:%s, Тип: %s"
+
+#: camel/camel-smime-context.c:752
+msgid "Decoder failed"
+msgstr ""
+
+#: camel/camel-smime-context.c:804
+#, fuzzy, c-format
+msgid "Can't find certificate for `%s'"
+msgstr "Неуспех при намиране на сертификат за \"%s\"."
+
+#: camel/camel-smime-context.c:811
+msgid "Can't find common bulk encryption algorithm"
+msgstr ""
+
+#. PORT_GetError(); ??
+#: camel/camel-smime-context.c:820
+msgid "Can't allocate slot for encryption bulk key"
+msgstr ""
+
+#: camel/camel-smime-context.c:831
+#, fuzzy
+msgid "Can't create CMS Message"
+msgstr "Създава правило От Съобщение"
+
+#: camel/camel-smime-context.c:837
+msgid "Can't create CMS EnvelopedData"
+msgstr ""
+
+#: camel/camel-smime-context.c:843
+msgid "Can't attach CMS EnvelopedData"
+msgstr ""
+
+#: camel/camel-smime-context.c:849
+msgid "Can't attach CMS data object"
+msgstr ""
+
+#: camel/camel-smime-context.c:858
+msgid "Can't create CMS RecipientInfo"
+msgstr ""
+
+#: camel/camel-smime-context.c:863
+msgid "Can't add CMS RecipientInfo"
+msgstr ""
+
+#: camel/camel-smime-context.c:877
+#, fuzzy
+msgid "Can't create encoder context"
+msgstr "Не мога да създам декодиращ контекст за S/MIME"
+
+#: camel/camel-smime-context.c:888
+#, fuzzy
+msgid "Failed to add data to encoder"
+msgstr "Изпращането на потребителското име до сървъра неуспешно"
+
+#: camel/camel-smime-context.c:974
+#, c-format
+msgid "Decoder failed, error %d"
+msgstr ""
+
+#: camel/camel-smime-context.c:981
+msgid "S/MIME Decrypt: No encrypted content found"
+msgstr ""
+
+#: camel/camel-smime-context.c:1008
+#, fuzzy
+msgid "import keys: unimplemented"
+msgstr "Командата не се използва"
+
+#: camel/camel-smime-context.c:1016
+msgid "export keys: unimplemented"
+msgstr ""
+
+#: camel/camel-store.c:213
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Не мога да взема папката. Грешна операция за това хранилище"
 
-#: camel/camel-store.c:269
+#: camel/camel-store.c:243
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists"
+msgstr "Не мога да преименувам папката %s Няма такава папка"
+
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Не мога да създам папката: Грешна операция за това хранилище"
 
-#: camel/camel-tcp-stream-openssl.c:571
+#: camel/camel-store.c:325
+#, fuzzy, c-format
+msgid "Cannot create folder: %s: folder exists"
+msgstr "Не мога да преименувам папката %s Няма такава папка"
+
+#: camel/camel-store.c:389 camel/camel-vee-store.c:351
+#, c-format
+msgid "Cannot delete folder: %s: Invalid operation"
+msgstr "Не мога да изтрия папка %s: Грешна операция"
+
+#: camel/camel-store.c:439 camel/camel-vee-store.c:387
+#, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "Не мога да преименувам папката %s Грешна операция"
+
+#: camel/camel-store.c:777
+msgid "Trash"
+msgstr "Кошче"
+
+#: camel/camel-store.c:779 mail/mail-config.glade.h:95
+#: ui/evolution-mail-message.xml.h:48
+#, fuzzy
+msgid "Junk"
+msgstr "Юни"
+
+#: camel/camel-tcp-stream-openssl.c:568
 msgid "Unable to get issuer's certificate"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:573
+#: camel/camel-tcp-stream-openssl.c:570
 msgid "Unable to get Certificate Revocation List"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:575
+#: camel/camel-tcp-stream-openssl.c:572
 msgid "Unable to decrypt certificate signature"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:577
+#: camel/camel-tcp-stream-openssl.c:574
 msgid "Unable to decrypt Certificate Revocation List signature"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:579
+#: camel/camel-tcp-stream-openssl.c:576
 msgid "Unable to decode issuer's public key"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:581
+#: camel/camel-tcp-stream-openssl.c:578
 msgid "Certificate signature failure"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:583
+#: camel/camel-tcp-stream-openssl.c:580
 msgid "Certificate Revocation List signature failure"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:585
+#: camel/camel-tcp-stream-openssl.c:582
 msgid "Certificate not yet valid"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:587
+#: camel/camel-tcp-stream-openssl.c:584
 msgid "Certificate has expired"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:589
+#: camel/camel-tcp-stream-openssl.c:586
 msgid "CRL not yet valid"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:591
+#: camel/camel-tcp-stream-openssl.c:588
 msgid "CRL has expired"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:596
+#: camel/camel-tcp-stream-openssl.c:593
 msgid "Error in CRL"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:598
+#: camel/camel-tcp-stream-openssl.c:595
 msgid "Out of memory"
 msgstr "Няма достатъчно памет"
 
-#: camel/camel-tcp-stream-openssl.c:600
+#: camel/camel-tcp-stream-openssl.c:597
 msgid "Zero-depth self-signed certificate"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:602
+#: camel/camel-tcp-stream-openssl.c:599
 msgid "Self-signed certificate in chain"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:604
+#: camel/camel-tcp-stream-openssl.c:601
 msgid "Unable to get issuer's certificate locally"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:606
+#: camel/camel-tcp-stream-openssl.c:603
 msgid "Unable to verify leaf signature"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:608
+#: camel/camel-tcp-stream-openssl.c:605
 msgid "Certificate chain too long"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:610
+#: camel/camel-tcp-stream-openssl.c:607
 msgid "Certificate Revoked"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:612
+#: camel/camel-tcp-stream-openssl.c:609
 msgid "Invalid Certificate Authority (CA)"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:614
+#: camel/camel-tcp-stream-openssl.c:611
 msgid "Path length exceeded"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:616
+#: camel/camel-tcp-stream-openssl.c:613
 msgid "Invalid purpose"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:618
+#: camel/camel-tcp-stream-openssl.c:615
 msgid "Certificate untrusted"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:620
+#: camel/camel-tcp-stream-openssl.c:617
 msgid "Certificate rejected"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:623
+#: camel/camel-tcp-stream-openssl.c:620
 msgid "Subject/Issuer mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:625
+#: camel/camel-tcp-stream-openssl.c:622
 msgid "AKID/SKID mismatch"
 msgstr "AKID/SKID разминаване"
 
-#: camel/camel-tcp-stream-openssl.c:627
+#: camel/camel-tcp-stream-openssl.c:624
 msgid "AKID/Issuer serial mismatch"
 msgstr "AKID/Issuer серийно разминаване"
 
-#: camel/camel-tcp-stream-openssl.c:629
+#: camel/camel-tcp-stream-openssl.c:626
 msgid "Key usage does not support certificate signing"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:632
+#: camel/camel-tcp-stream-openssl.c:629
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:699 camel/camel-tcp-stream-ssl.c:823
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8864,15 +9678,15 @@ msgstr ""
 "Пръстови отпечатъци:·······%s\n"
 "SПодпис:·········%s"
 
-#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "GOOD"
 msgstr "ДОБЪР"
 
-#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "BAD"
 msgstr "ЛОШ"
 
-#: camel/camel-tcp-stream-openssl.c:707
+#: camel/camel-tcp-stream-openssl.c:704
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -8885,7 +9699,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:833
+#: camel/camel-tcp-stream-ssl.c:835
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8895,150 +9709,504 @@ msgid ""
 "Do you wish to accept?"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:877
+#: camel/camel-tcp-stream-ssl.c:879
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:929
+#: camel/camel-tcp-stream-ssl.c:931
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:947
+#: camel/camel-tcp-stream-ssl.c:949
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:964
+#: camel/camel-tcp-stream-ssl.c:966
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-url.c:290 mail/mail-tools.c:143
+#: camel/camel-url.c:290
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Не мога да анализирам URL `%s'"
 
-#: camel/camel-vee-folder.c:618
+#: camel/camel-vee-folder.c:633
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr "Грешка при запазването на·`%s':·%s"
 
-#: camel/camel-vee-folder.c:656
+#: camel/camel-vee-folder.c:675
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Няма такова съобщение: %s в %s"
 
-#: camel/camel-vee-folder.c:819 camel/camel-vee-folder.c:825
+#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 
-#: camel/camel-vee-store.c:261
+#: camel/camel-vee-store.c:374
 #, c-format
-msgid "Cannot delete folder: %s: Invalid operation"
+msgid "Cannot delete folder: %s: No such folder"
+msgstr "Не мога да изтрия папка %s: Няма такава папка"
+
+#: camel/camel-vee-store.c:395
+#, c-format
+msgid "Cannot rename folder: %s: No such folder"
+msgstr "Не мога да преименувам папката %s Няма такава папка"
+
+#: camel/camel-vtrash-folder.c:44
+#, fuzzy
+msgid "Cannot copy messages to the Trash folder"
+msgstr "Вие не може да копирате съобщения от тази папка боклук"
+
+#: camel/camel-vtrash-folder.c:46
+#, fuzzy
+msgid "Cannot copy messages to the Junk folder"
+msgstr "Вие не може да копирате съобщения от тази папка боклук"
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:53
+#: camel/providers/imap4/camel-imap4-provider.c:35
+msgid "Checking for new mail"
+msgstr "Проверка за нова поща"
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:37
+#: camel/providers/imap/camel-imap-provider.c:45
+msgid "Check for new messages in all folders"
+msgstr "Проврка за нови съобщения във всички папки"
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:59
+#, fuzzy
+msgid "Apply filters to new messages in Inbox on this server"
+msgstr "Използва филтри за нови съобщения в INBOX от този сървър"
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:62
+#: camel/providers/imap/camel-imap-provider.c:70
+#, fuzzy
+msgid "Automatically synchronize remote mail locally"
+msgstr "_Автоматична проверка за нова поща всеки"
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:66
+msgid "Address Book And Calendar"
+msgstr ""
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:69
+msgid "Post Office Agent SOAP Port:"
+msgstr ""
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:83
+msgid "Novell GroupWise"
+msgstr ""
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:85
+msgid "For accessing Novell Groupwise servers"
+msgstr ""
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:100
+#: camel/providers/imap4/camel-imap4-provider.c:70
+#: camel/providers/imap/camel-imap-provider.c:93
+#: camel/providers/imapp/camel-imapp-provider.c:65
+#: camel/providers/nntp/camel-nntp-provider.c:71
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
+msgid "Password"
+msgstr "Парола"
+
+#: camel/providers/groupwise/camel-groupwise-provider.c:102
+#: camel/providers/imap/camel-imap-provider.c:95
+#: camel/providers/imapp/camel-imapp-provider.c:67
+msgid "This option will connect to the IMAP server using a plaintext password."
+msgstr "Тази опция ще ви свърже с IMAP сървър използващ нешифрована парола"
+
+#: camel/providers/groupwise/camel-gw-listener.c:312
+#: camel/providers/groupwise/camel-gw-listener.c:335
+#, fuzzy
+msgid "Checklist"
+msgstr "Гъста мъгла"
+
+#: camel/providers/imap4/camel-imap4-command.c:629
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Неочакван отговор от IMAP сървър: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:415
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Не мога да изтрия папка %s: Грешна операция"
+
+#: camel/providers/imap4/camel-imap4-engine.c:421
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Не мога да изтрия папка %s: Грешна операция"
+
+#: camel/providers/imap4/camel-imap4-engine.c:1144
+#: camel/providers/imap4/camel-imap4-engine.c:1533
+#: camel/providers/imap4/camel-imap4-engine.c:1560
+#: camel/providers/imap4/camel-imap4-engine.c:1590
+#: camel/providers/imap4/camel-imap4-engine.c:1630
+#, fuzzy, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr "Сървъра неочаквано се откачи: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:1145
+msgid "Got BYE response"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:335
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "Не мога да синхронизирам spool папката `%s': %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:341
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
 msgstr "Не мога да изтрия папка %s: Грешна операция"
 
-#: camel/camel-vee-store.c:280
+#: camel/providers/imap4/camel-imap4-folder.c:476
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Не мога да получа папка: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:481
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Не мога да преименувам папката %s Грешна операция"
+
+#: camel/providers/imap4/camel-imap4-folder.c:616
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"Не мога да получа съобщение  %s от папка %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:621
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr ""
+"Не мога да получа съобщение  %s от папка %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:746
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Не мога да добавя съобщението в mh папката: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:775
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Не мога да добавя съобщението в mh папката: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:854
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Не мога да получа съобщение  %s от папка %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:858
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Не мога да получа съобщение  %s от папка %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:866
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Не мога да получа съобщение  %s от папка %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:870
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Не мога да получа съобщение  %s от папка %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-provider.c:40
+#: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/nntp/camel-nntp-provider.c:41
+msgid "Folders"
+msgstr "Папки"
+
+#: camel/providers/imap4/camel-imap4-provider.c:42
+#: camel/providers/imap/camel-imap-provider.c:57
+msgid "Show only subscribed folders"
+msgstr "Показва само папките с абонат"
+
+#: camel/providers/imap4/camel-imap4-provider.c:44
+#: camel/providers/imap/camel-imap-provider.c:59
+msgid "Override server-supplied folder namespace"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-provider.c:46
+#: camel/providers/imap/camel-imap-provider.c:61
+msgid "Namespace"
+msgstr "Място за име"
+
+#: camel/providers/imap4/camel-imap4-provider.c:53
+#, fuzzy
+msgid "IMAPv4rev1"
+msgstr "IMAPv4 "
+
+#: camel/providers/imap4/camel-imap4-provider.c:55
+#, fuzzy
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr "За четене и запазване на поща от IMAP сървъри"
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr "Тази опция ще ви свърже с IMAP сървър използващ нешифрована парола"
+
+#: camel/providers/imap4/camel-imap4-store.c:165
+#: camel/providers/imap/camel-imap-store.c:428
 #, c-format
-msgid "Cannot delete folder: %s: No such folder"
-msgstr "Не мога да изтрия папка %s: Няма такава папка"
+msgid "IMAP server %s"
+msgstr "IMAP сървър %s"
 
-#: camel/camel-vee-store.c:293
+#: camel/providers/imap4/camel-imap4-store.c:167
+#: camel/providers/imap/camel-imap-store.c:430
 #, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
+msgid "IMAP service for %s on %s"
+msgstr "IMAP·услуга за·%s·на·%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:208
+#: camel/providers/imap4/camel-imap4-store.c:225
+#: camel/providers/imap/camel-imap-store.c:551
+#: camel/providers/imap/camel-imap-store.c:571
+#: camel/providers/imapp/camel-imapp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:269
+#: camel/providers/smtp/camel-smtp-transport.c:285
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr "Не мога да се свържа към  %s (порт %d): %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:210
+#: camel/providers/imap/camel-imap-store.c:553
+#: camel/providers/pop3/camel-pop3-store.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:271
+msgid "SSL unavailable"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:222
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/imap/camel-imap-store.c:845
+#: camel/providers/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Връзкрата прекратена"
+
+#: camel/providers/imap4/camel-imap4-store.c:261
+#, c-format
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:286
+#: camel/providers/imap/camel-imap-store.c:679
+#: camel/providers/imap/camel-imap-store.c:710
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:287
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/pop3/camel-pop3-store.c:538
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
+msgid "Unknown error"
+msgstr "Неизвестна грешка"
+
+#: camel/providers/imap4/camel-imap4-store.c:373
+#, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:418
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sМоля въведете IMAP паролата за %s@%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:492
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr ""
+"Не мога да се оторизирам пред IMAP сървър.\n"
+"%s\n"
+"\n"
+
+#: camel/providers/imap4/camel-imap4-store.c:723
+#, fuzzy, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr "Не мога да получа папка: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:782
+#: camel/providers/imap/camel-imap-store.c:1885
+#: camel/providers/imap/camel-imap-store.c:2263
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "В името на папката не може да се съдържа символа 'Return"
+
+#: camel/providers/imap4/camel-imap4-store.c:826
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Не мога да преименувам папката %s Грешна операция"
+
+#: camel/providers/imap4/camel-imap4-store.c:831
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
 msgstr "Не мога да преименувам папката %s Грешна операция"
 
-#: camel/camel-vee-store.c:301
+#: camel/providers/imap4/camel-imap4-store.c:859
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Не мога да изтрия папка %s: Няма такава папка"
+
+#: camel/providers/imap4/camel-imap4-store.c:891
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Не мога да изтрия папка %s: Грешна операция"
+
+#: camel/providers/imap4/camel-imap4-store.c:896
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Не мога да изтрия папка %s: Грешна операция"
+
+#: camel/providers/imap4/camel-imap4-store.c:1037
 #, c-format
-msgid "Cannot rename folder: %s: No such folder"
-msgstr "Не мога да преименувам папката %s Няма такава папка"
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1039
+msgid "Bad command"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1100
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Не мога да изтрия папка %s: Грешна операция"
+
+#: camel/providers/imap4/camel-imap4-store.c:1105
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Не мога да изтрия папка %s: Грешна операция"
+
+#: camel/providers/imap4/camel-imap4-store.c:1149
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Не мога да преименувам папката %s Грешна операция"
+
+#: camel/providers/imap4/camel-imap4-store.c:1154
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Не мога да преименувам папката %s Грешна операция"
 
-#: camel/providers/imap/camel-imap-command.c:221
-#: camel/providers/imap/camel-imap-command.c:260
-#: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2644
+#: camel/providers/imap4/camel-imap4-utils.c:85
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Неочакван отговор от IMAP сървър: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:108
+#, fuzzy
+msgid "No data"
+msgstr "Няма задачи"
+
+#: camel/providers/imap4/camel-imap4-utils.c:291
+#, fuzzy, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "Сървъра неочаквано се откачи: %s"
+
+#: camel/providers/imap/camel-imap-command.c:218
+#: camel/providers/imap/camel-imap-command.c:257
+#: camel/providers/imap/camel-imap-command.c:447
+#: camel/providers/imap/camel-imap-store.c:3194
 msgid "Operation cancelled"
 msgstr "Действието прекратено"
 
-#: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2647
+#: camel/providers/imap/camel-imap-command.c:302
+#: camel/providers/imap/camel-imap-store.c:3197
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Сървъра неочаквано се откачи: %s"
 
 #. for imap ALERT codes, account user@host
-#: camel/providers/imap/camel-imap-command.c:323
+#: camel/providers/imap/camel-imap-command.c:320
 #, c-format
 msgid ""
 "Alert from IMAP server %s@%s:\n"
 "%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:392
+#: camel/providers/imap/camel-imap-command.c:389
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Неочакван отговор от IMAP сървър: %s"
 
-#: camel/providers/imap/camel-imap-command.c:402
+#: camel/providers/imap/camel-imap-command.c:399
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP команда пропадна: %s"
 
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:457
 msgid "Server response ended too soon."
 msgstr "Отговора на сървъра завърши твърде бързо"
 
-#: camel/providers/imap/camel-imap-command.c:652
+#: camel/providers/imap/camel-imap-command.c:649
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP сървъра не съдържа %s информация"
 
-#: camel/providers/imap/camel-imap-command.c:688
+#: camel/providers/imap/camel-imap-command.c:685
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Неочакван OK от IMAP сървър: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:222
+#: camel/providers/imap/camel-imap-folder.c:226
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Не мога да създам директория %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:241
+#: camel/providers/imap/camel-imap-folder.c:245
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Не мога да заредя обобщение за %s"
 
-#: camel/providers/imap/camel-imap-folder.c:307
+#: camel/providers/imap/camel-imap-folder.c:330
 msgid "Folder was destroyed and recreated on server."
 msgstr "Папката е била разрушена и пресъздадена на сървъра."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:549
+#: camel/providers/imap/camel-imap-folder.c:573
 msgid "Scanning for changed messages"
 msgstr "Сканирам за променени съобщения"
 
-#: camel/providers/imap/camel-imap-folder.c:1885
+#: camel/providers/imap/camel-imap-folder.c:1940
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Съобщението %s не може да бъде получено"
 
-#: camel/providers/imap/camel-imap-folder.c:1922
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:225
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mbox-folder.c:351
-#: camel/providers/local/camel-mh-folder.c:201
-#: camel/providers/local/camel-mh-folder.c:211
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/imap/camel-imap-folder.c:1977
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -9047,24 +10215,41 @@ msgstr ""
 "Не мога да взема съобщение: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1922
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-mbox-folder.c:351
-#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/imap/camel-imap-folder.c:1977
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-mbox-folder.c:418
+#: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
 msgstr "Няма такова съобщение"
 
-#: camel/providers/imap/camel-imap-folder.c:1945
-#: camel/providers/imap/camel-imap-folder.c:2541
+#: camel/providers/imap/camel-imap-folder.c:2019
+#: camel/providers/imap/camel-imap-folder.c:2622
+#: camel/providers/nntp/camel-nntp-folder.c:220
 msgid "This message is not currently available"
 msgstr "Съобщението не е налично"
 
-#: camel/providers/imap/camel-imap-folder.c:2205
-#: camel/providers/imap/camel-imap-folder.c:2275
+#: camel/providers/imap/camel-imap-folder.c:2285
+#: camel/providers/imap/camel-imap-folder.c:2355
 msgid "Fetching summary information for new messages"
 msgstr "Извличам обобщена информация за нови съобщения"
 
-#: camel/providers/imap/camel-imap-folder.c:2579
+#: camel/providers/imap/camel-imap-folder.c:2463
+#, c-format
+msgid "Incomplete server response: no information provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2471
+#, c-format
+msgid "Incomplete server response: no UID provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2484
+#, c-format
+msgid ""
+"Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2660
 msgid "Could not find message body in FETCH response."
 msgstr "Не мога да намеря тялото на съобщението в FETCH отговора."
 
@@ -9087,112 +10272,85 @@ msgid "Failed to cache %s: %s"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-provider.c:43
-msgid "Checking for new mail"
-msgstr "Проверка за нова поща"
-
-#: camel/providers/imap/camel-imap-provider.c:45
-msgid "Check for new messages in all folders"
-msgstr "Проврка за нови съобщения във всички папки"
+msgid "Checking for New Mail"
+msgstr "Проверка за Нов email"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1178
-msgid "Folders"
-msgstr "Папки"
+#: camel/providers/imap/camel-imap-provider.c:48
+#, fuzzy
+msgid "Connection to Server"
+msgstr "Свързване със сървъра..."
 
 #: camel/providers/imap/camel-imap-provider.c:50
-msgid "Show only subscribed folders"
-msgstr "Показва само папките с абонат"
+#, fuzzy
+msgid "Use custom command to connect to server"
+msgstr "Неуспешен опит за свързване с LDAP сървъра"
 
 #: camel/providers/imap/camel-imap-provider.c:52
-msgid "Override server-supplied folder namespace"
+#, fuzzy
+msgid "Command:"
 msgstr ""
+"\n"
+"Коментар:"
 
-#: camel/providers/imap/camel-imap-provider.c:54
-msgid "Namespace"
-msgstr "Място за име"
-
-#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Използва филтри за нови съобщения в INBOX от този сървър"
 
-#: camel/providers/imap/camel-imap-provider.c:63
+#: camel/providers/imap/camel-imap-provider.c:66
+#, fuzzy
+msgid "Check new messages for Junk contents"
+msgstr "Проврка за нови съобщения във всички папки"
+
+#: camel/providers/imap/camel-imap-provider.c:68
+#, fuzzy
+msgid "Only check for Junk messages in the INBOX folder"
+msgstr "Проврка за нови съобщения във всички папки"
+
+#: camel/providers/imap/camel-imap-provider.c:76
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:78
 msgid "For reading and storing mail on IMAP servers."
 msgstr "За четене и запазване на поща от IMAP сървъри"
 
-#: camel/providers/imap/camel-imap-provider.c:80
-#: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:83
-msgid "Password"
-msgstr "Парола"
-
-#: camel/providers/imap/camel-imap-provider.c:82
-msgid "This option will connect to the IMAP server using a plaintext password."
-msgstr "Тази опция ще ви свърже с IMAP сървър използващ нешифрована парола"
-
-#: camel/providers/imap/camel-imap-store.c:457
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP сървър %s"
-
-#: camel/providers/imap/camel-imap-store.c:459
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "IMAP·услуга за·%s·на·%s"
-
-#: camel/providers/imap/camel-imap-store.c:587
-#: camel/providers/nntp/camel-nntp-store.c:130
-#: camel/providers/nntp/camel-nntp-store.c:148
-#: camel/providers/pop3/camel-pop3-store.c:184
-msgid "Connection cancelled"
-msgstr "Връзкрата прекратена"
-
-#: camel/providers/imap/camel-imap-store.c:590
-#: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/smtp/camel-smtp-transport.c:276
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr "Не мога да се свържа към  %s (порт %d): %s"
-
-#: camel/providers/imap/camel-imap-store.c:649
 #: camel/providers/imap/camel-imap-store.c:680
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:650
-#: camel/providers/pop3/camel-pop3-store.c:220
+#: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "Неподдържано SSL/TLS разширение"
 
-#: camel/providers/imap/camel-imap-store.c:681
-#: camel/providers/pop3/camel-pop3-store.c:261
+#: camel/providers/imap/camel-imap-store.c:711
+#: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "Неуспешни SSL преговори"
 
-#: camel/providers/imap/camel-imap-store.c:1075
+#: camel/providers/imap/camel-imap-store.c:848
+#, fuzzy, c-format
+msgid "Could not connect with command \"%s\": %s"
+msgstr "Не мога да се свържа към сървър %s"
+
+#: camel/providers/imap/camel-imap-store.c:1272
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP сървър %s не подържа заявената оторизация тип %s"
 
-#: camel/providers/imap/camel-imap-store.c:1085
+#: camel/providers/imap/camel-imap-store.c:1282
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Няма подръжка за оторизация тип %s"
 
-#: camel/providers/imap/camel-imap-store.c:1108
+#: camel/providers/imap/camel-imap-store.c:1305
+#: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sМоля въведете IMAP паролата за %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1122
+#: camel/providers/imap/camel-imap-store.c:1319
 msgid "You didn't enter a password."
 msgstr "Вие не сте въвели парола."
 
-#: camel/providers/imap/camel-imap-store.c:1151
+#: camel/providers/imap/camel-imap-store.c:1348
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9203,42 +10361,73 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1498
-#: camel/providers/imap/camel-imap-store.c:1640
+#: camel/providers/imap/camel-imap-store.c:1867
+#: camel/providers/imap/camel-imap-store.c:2057
 #, c-format
 msgid "No such folder %s"
 msgstr "Няма такава папка %s"
 
-#: camel/providers/imap/camel-imap-store.c:1841
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it containes the character \"%c\""
-msgstr ""
+#: camel/providers/imap/camel-imap-store.c:1943
+#: camel/providers/imap/camel-imap-store.c:2324
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr "На бащината папка не е разрешено да има подпапки"
+
+#: camel/providers/imap/camel-imap-store.c:1998
+#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/local/camel-mbox-store.c:212
+#: camel/providers/local/camel-mh-store.c:236
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': folder exists."
+msgstr "Не мога да преименувам папката %s Няма такава папка"
 
-#: camel/providers/imap/camel-imap-store.c:1853
+#: camel/providers/imap/camel-imap-store.c:2274
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1889
-msgid "The parent folder is not allowed to contain subfolders"
-msgstr "На бащината папка не е разрешено да има подпапки"
+#: camel/providers/imapp/camel-imapp-provider.c:39
+#: camel/providers/pop3/camel-pop3-provider.c:38
+msgid "Message storage"
+msgstr "Хранилище на съобщение"
+
+#: camel/providers/imapp/camel-imapp-provider.c:47
+#, fuzzy
+msgid "IMAP+"
+msgstr "IMAP"
+
+#: camel/providers/imapp/camel-imapp-provider.c:49
+msgid ""
+"Experimental IMAP 4(.1) client\n"
+"This is untested and unsupported code, you want to use plain imap instead.\n"
+"\n"
+" !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
+msgstr ""
+
+#: camel/providers/imapp/camel-imapp-store.c:328
+#, fuzzy, c-format
+msgid "Could not connect to POP server on %s"
+msgstr "Не мога да се свържа към сървър %s"
+
+#: camel/providers/local/camel-local-folder.c:179
+#, fuzzy
+msgid "Index message body data"
+msgstr "Изпраща съобщение към контакт"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:354
+#: camel/providers/local/camel-local-folder.c:388
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s·(%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:358
-#: camel/providers/local/camel-local-folder.c:361
+#: camel/providers/local/camel-local-folder.c:392
+#: camel/providers/local/camel-local-folder.c:395
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "пощенска кутия:%s·(%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:365
+#: camel/providers/local/camel-local-folder.c:399
 #, c-format
 msgid "%s (%s)"
 msgstr "%s·(%s)"
@@ -9292,318 +10481,358 @@ msgid ""
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-local-store.c:142
+#: camel/providers/local/camel-local-store.c:253
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:146
+#: camel/providers/local/camel-local-store.c:149
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:155
-#: camel/providers/local/camel-local-store.c:171
-#: camel/providers/local/camel-local-store.c:239
+#: camel/providers/local/camel-local-store.c:158
+#: camel/providers/local/camel-local-store.c:166
+#: camel/providers/local/camel-local-store.c:264
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Не мога да получа папка: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:187
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr "Локални запазвания няма в inbox"
 
-#: camel/providers/local/camel-local-store.c:199
+#: camel/providers/local/camel-local-store.c:224
 #, c-format
 msgid "Local mail file %s"
 msgstr "Локален mail файл %s"
 
-#: camel/providers/local/camel-local-store.c:308 mail/mail-local.c:909
+#: camel/providers/local/camel-local-store.c:333
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Не мога да преименувам папката %s на %s: %s"
 
-#: camel/providers/local/camel-local-store.c:365
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Не мога да преименувам '%s':·%s"
 
-#: camel/providers/local/camel-local-store.c:388
+#: camel/providers/local/camel-local-store.c:423
+#: camel/providers/local/camel-mbox-store.c:284
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Не мога да изтрия файл с обобщение за папка `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:398
+#: camel/providers/local/camel-local-store.c:433
+#: camel/providers/local/camel-mbox-store.c:296
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Не мога да изтрия индексен файл за папка `%s': %s"
 
-#: camel/providers/local/camel-local-summary.c:398
+#: camel/providers/local/camel-local-store.c:456
+#: camel/providers/local/camel-mbox-store.c:320
+#, fuzzy, c-format
+msgid "Could not delete folder meta file `%s': %s"
+msgstr "Не мога да изтрия файл с обобщение за папка `%s': %s"
+
+#: camel/providers/local/camel-local-summary.c:405
 #, c-format
 msgid "Could not save summary: %s: %s"
 msgstr "Не мога да запазя обобщение %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:457
+#: camel/providers/local/camel-local-summary.c:464
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Не мога да добавя съобщение към обобщение: неизвестна причина"
 
-#: camel/providers/local/camel-maildir-folder.c:184
+#: camel/providers/local/camel-maildir-folder.c:183
 msgid "Maildir append message cancelled"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:187
+#: camel/providers/local/camel-maildir-folder.c:186
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Не мога да добавя съобщението в maildir папката: %s: %s"
 
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:226
 #: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mbox-folder.c:417
+#: camel/providers/local/camel-mbox-folder.c:436
+#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:475
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:212
 #: camel/providers/local/camel-mh-folder.c:221
-msgid "Invalid message contents"
-msgstr "Грешно съдържание на съобщение"
-
-#: camel/providers/local/camel-maildir-store.c:106
-#: camel/providers/local/camel-mh-store.c:202
-#: camel/providers/local/camel-spool-store.c:163
 #, c-format
 msgid ""
-"Could not open folder `%s':\n"
-"%s"
+"Cannot get message: %s from folder %s\n"
+"  %s"
 msgstr ""
-"Не мога да отворя папката `%s':\n"
-"%s"
+"Не мога да получа съобщение  %s от папка %s\n"
+"  %s"
 
-#: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:101
-#: camel/providers/local/camel-mh-store.c:209
-#: camel/providers/local/camel-spool-store.c:167
-#, c-format
-msgid "Folder `%s' does not exist."
+#: camel/providers/local/camel-maildir-folder.c:236
+msgid "Invalid message contents"
+msgstr "Грешно съдържание на съобщение"
+
+#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-mbox-store.c:154
+#: camel/providers/local/camel-mh-store.c:204
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': %s"
+msgstr "Не мога да получа папка: %s: %s"
+
+#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-mbox-store.c:162
+#: camel/providers/local/camel-mh-store.c:211
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': folder does not exist."
 msgstr "Папката `%s' не съществува."
 
-#: camel/providers/local/camel-maildir-store.c:117
-#: camel/providers/local/camel-mh-store.c:216
-#: camel/providers/local/camel-spool-store.c:172
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
+#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-mbox-store.c:184
+#: camel/providers/local/camel-mbox-store.c:196
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': %s"
 msgstr ""
 "Не мога да създам папка`%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:132
-#, c-format
-msgid "`%s' is not a maildir directory."
+#: camel/providers/local/camel-maildir-store.c:134
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "`%s' не е maildir директория."
 
-#: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:205
-#: camel/providers/local/camel-mh-store.c:252
+#: camel/providers/local/camel-maildir-store.c:173
+#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Не мога да изтрия папката `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:169
+#: camel/providers/local/camel-maildir-store.c:175
 msgid "not a maildir directory"
 msgstr "не е maildir директория"
 
-#: camel/providers/local/camel-maildir-store.c:335
-#: camel/providers/local/camel-spool-store.c:286
-#: camel/providers/local/camel-spool-store.c:316
+#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-spool-store.c:284
+#: camel/providers/local/camel-spool-store.c:314
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr ""
 "Не мога да сканирам папка`%s':\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-summary.c:417
-#: camel/providers/local/camel-maildir-summary.c:548
+#: camel/providers/local/camel-maildir-summary.c:419
+#: camel/providers/local/camel-maildir-summary.c:550
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Не мога да отворя mailbox: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:541
+#: camel/providers/local/camel-maildir-summary.c:543
 msgid "Checking folder consistency"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-summary.c:644
+#: camel/providers/local/camel-maildir-summary.c:646
 msgid "Checking for new messages"
 msgstr "Проверява за нови съобщения"
 
-#: camel/providers/local/camel-maildir-summary.c:733
-#: camel/providers/local/camel-mbox-summary.c:337
-#: camel/providers/local/camel-mbox-summary.c:510
-#: camel/providers/local/camel-mbox-summary.c:601
+#: camel/providers/local/camel-maildir-summary.c:735
+#: camel/providers/local/camel-mbox-summary.c:369
+#: camel/providers/local/camel-mbox-summary.c:542
+#: camel/providers/local/camel-mbox-summary.c:633
 #: camel/providers/local/camel-spool-summary.c:137
 msgid "Storing folder"
 msgstr "Запазва папка"
 
-#: camel/providers/local/camel-mbox-folder.c:159
-#: camel/providers/local/camel-spool-folder.c:149
+#: camel/providers/local/camel-mbox-folder.c:225
+#: camel/providers/local/camel-spool-folder.c:148
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Не мога да създам заклюване за папката %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:218
+#: camel/providers/local/camel-mbox-folder.c:284
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Не мога да отворя mailbox: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:278
+#: camel/providers/local/camel-mbox-folder.c:344
 msgid "Mail append cancelled"
 msgstr "Действието добавяне на поща е прекъснато"
 
-#: camel/providers/local/camel-mbox-folder.c:281
+#: camel/providers/local/camel-mbox-folder.c:347
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Не мога да добавя съобщението в mbox файла: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:369
-#: camel/providers/local/camel-mbox-folder.c:400
-#: camel/providers/local/camel-mbox-folder.c:408
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"Не мога да получа съобщение  %s от папка %s\n"
-"  %s"
-
-#: camel/providers/local/camel-mbox-folder.c:401
+#: camel/providers/local/camel-mbox-folder.c:468
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Папката изглежда да е невъстановимо повредена."
 
-#: camel/providers/local/camel-mbox-folder.c:409
-msgid "Message construction failed: Corrupt mailbox?"
+#: camel/providers/local/camel-mbox-folder.c:476
+#: camel/providers/local/camel-mh-folder.c:222
+#, fuzzy
+msgid "Message construction failed."
 msgstr "Конструирането на съобщението пропадна: Повреден mailbox?"
 
-#: camel/providers/local/camel-mbox-store.c:94
-#, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
-msgstr ""
-"Не мога да отворя файл `%s':\n"
-"%s"
+#: camel/providers/local/camel-mbox-store.c:176
+#: camel/providers/local/camel-mbox-store.c:361
+#, fuzzy
+msgid "Cannot create a folder by this name."
+msgstr "Не мога да създам папка с това име"
 
-#: camel/providers/local/camel-mbox-store.c:110
+#: camel/providers/local/camel-mbox-store.c:206
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a regular file."
+msgstr "Не мога да прикача файл %s: не е обикновен файл"
+
+#: camel/providers/local/camel-mbox-store.c:236
+#: camel/providers/local/camel-mbox-store.c:247
+#: camel/providers/local/camel-mbox-store.c:270
 #, c-format
 msgid ""
-"Could not create file `%s':\n"
+"Could not delete folder `%s':\n"
 "%s"
 msgstr ""
-"Не мога да създам файл `%s':\n"
+"Не мога да изтрия папката `%s':\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:119
-#: camel/providers/local/camel-mbox-store.c:146
+#: camel/providers/local/camel-mbox-store.c:255
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' не е обикновен файл."
 
-#: camel/providers/local/camel-mbox-store.c:138
-#: camel/providers/local/camel-mbox-store.c:161
-#, c-format
-msgid ""
-"Could not delete folder `%s':\n"
-"%s"
-msgstr ""
-"Не мога да изтрия папката `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:153
+#: camel/providers/local/camel-mbox-store.c:262
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Папката `%s' не е празна. Не е изтрита."
 
-#: camel/providers/local/camel-mbox-summary.c:343
+#: camel/providers/local/camel-mbox-store.c:374
+#, fuzzy, c-format
+msgid "Cannot create directory `%s': %s."
+msgstr "Не мога да създам директория %s: %s"
+
+#: camel/providers/local/camel-mbox-store.c:388
+#, fuzzy, c-format
+msgid "Cannot create folder: %s: %s"
+msgstr "Не мога да получа папка: %s: %s"
+
+#: camel/providers/local/camel-mbox-store.c:390
+#, fuzzy
+msgid "Folder already exists"
+msgstr "Карта ID вече съществува"
+
+#: camel/providers/local/camel-mbox-store.c:472
+#, fuzzy
+msgid "The new folder name is illegal."
+msgstr "Указаното име на папка е невалидно: %s"
+
+#: camel/providers/local/camel-mbox-store.c:485
+#, fuzzy, c-format
+msgid "Could not rename `%s': `%s': %s"
+msgstr "Не мога да преименувам '%s':·%s"
+
+#: camel/providers/local/camel-mbox-store.c:560
+#, fuzzy, c-format
+msgid "Could not rename '%s' to %s: %s"
+msgstr "Не мога да преименувам '%s':·%s"
+
+#: camel/providers/local/camel-mbox-summary.c:375
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Не мога да отворя папката `%s': %s"
 
-#: camel/providers/local/camel-mbox-summary.c:391
+#: camel/providers/local/camel-mbox-summary.c:423
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Фатална грешка в пощата близо до %ld в папка %s"
 
-#: camel/providers/local/camel-mbox-summary.c:447
+#: camel/providers/local/camel-mbox-summary.c:479
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Не мога да проверя папката `%s': %s"
 
-#: camel/providers/local/camel-mbox-summary.c:515
-#: camel/providers/local/camel-mbox-summary.c:606
+#: camel/providers/local/camel-mbox-summary.c:547
+#: camel/providers/local/camel-mbox-summary.c:638
 #: camel/providers/local/camel-spool-summary.c:142
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Не мога да отворя файл `%s': %s"
 
-#: camel/providers/local/camel-mbox-summary.c:527
+#: camel/providers/local/camel-mbox-summary.c:559
 #: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Не мога да отворя временния mailbox: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:702
+#: camel/providers/local/camel-mbox-summary.c:572
+#: camel/providers/local/camel-mbox-summary.c:736
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Не мога да затворя папката източник %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:549
+#: camel/providers/local/camel-mbox-summary.c:581
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Не мога да затворя временната папка: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:560
+#: camel/providers/local/camel-mbox-summary.c:592
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Не мога да преименувам папката: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:644
-#: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:843
-#: camel/providers/local/camel-mbox-summary.c:851
+#: camel/providers/local/camel-mbox-summary.c:676
+#: camel/providers/local/camel-mbox-summary.c:684
+#: camel/providers/local/camel-mbox-summary.c:877
+#: camel/providers/local/camel-mbox-summary.c:885
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Обобщението и папката са объркани дори след синхронизация"
 
-#: camel/providers/local/camel-mbox-summary.c:777
+#: camel/providers/local/camel-mbox-summary.c:811
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Неизвестна грешка: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:812
+#: camel/providers/local/camel-mbox-summary.c:846
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Папката %s не може да бъде запазена"
 
-#: camel/providers/local/camel-mbox-summary.c:906
-#: camel/providers/local/camel-mbox-summary.c:932
+#: camel/providers/local/camel-mbox-summary.c:940
+#: camel/providers/local/camel-mbox-summary.c:966
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Грешка при писане в временния mailbox: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:923
+#: camel/providers/local/camel-mbox-summary.c:957
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Писането във временния mailbox неуспешен: %s: %s"
 
-#: camel/providers/local/camel-mh-folder.c:175
+#: camel/providers/local/camel-mh-folder.c:174
 msgid "MH append message cancelled"
 msgstr "Прекъсна добавяне на MH съобщение"
 
-#: camel/providers/local/camel-mh-folder.c:178
+#: camel/providers/local/camel-mh-folder.c:177
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Не мога да добавя съобщението в mh папката: %s: %s"
 
-#: camel/providers/local/camel-mh-store.c:229
-#, c-format
-msgid "`%s' is not a directory."
-msgstr "`%s' не е директория."
+#: camel/providers/local/camel-mh-store.c:219
+#, fuzzy, c-format
+msgid "Could not create folder `%s': %s"
+msgstr ""
+"Не мога да създам папка`%s':\n"
+"%s"
+
+#: camel/providers/local/camel-mh-store.c:231
+#, fuzzy, c-format
+msgid "Cannot get folder `%s': not a directory."
+msgstr "Не мога да получа папка: %s: %s"
 
 #: camel/providers/local/camel-mh-summary.c:244
 #, c-format
@@ -9625,6 +10854,29 @@ msgstr ""
 msgid "Folder `%s/%s' does not exist."
 msgstr "Папката `%s/%s' не съществува."
 
+#: camel/providers/local/camel-spool-store.c:163
+#, c-format
+msgid ""
+"Could not open folder `%s':\n"
+"%s"
+msgstr ""
+"Не мога да отворя папката `%s':\n"
+"%s"
+
+#: camel/providers/local/camel-spool-store.c:167
+#, c-format
+msgid "Folder `%s' does not exist."
+msgstr "Папката `%s' не съществува."
+
+#: camel/providers/local/camel-spool-store.c:172
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+"Не мога да създам папка`%s':\n"
+"%s"
+
 #: camel/providers/local/camel-spool-store.c:180
 #, c-format
 msgid "`%s' is not a mailbox file."
@@ -9675,66 +10927,212 @@ msgstr ""
 "Не мога да синхронизирам spool папката `%s': %s\n"
 "Папката може би е повредена, копието е запазено в `%s'"
 
-#: camel/providers/nntp/camel-nntp-provider.c:41
+#: camel/providers/nntp/camel-nntp-auth.c:44
+#: camel/providers/nntp/camel-nntp-store.c:1126
+#, c-format
+msgid "Please enter the NNTP password for %s@%s"
+msgstr "Моля въведете NNTP парола за %s@%s"
+
+#: camel/providers/nntp/camel-nntp-auth.c:64
+msgid "Server rejected username"
+msgstr "Сървърът отхвърли потребителското име"
+
+#: camel/providers/nntp/camel-nntp-auth.c:70
+msgid "Failed to send username to server"
+msgstr "Изпращането на потребителското име до сървъра неуспешно"
+
+#: camel/providers/nntp/camel-nntp-auth.c:79
+msgid "Server rejected username/password"
+msgstr "Сървърът отхвърли потребителското име/паролата"
+
+#: camel/providers/nntp/camel-nntp-folder.c:147
+#: camel/providers/nntp/camel-nntp-folder.c:149
+#: camel/providers/nntp/camel-nntp-folder.c:158
+#: camel/providers/nntp/camel-nntp-folder.c:234
+#: camel/providers/pop3/camel-pop3-folder.c:433
+#: camel/providers/pop3/camel-pop3-folder.c:494
+#: camel/providers/pop3/camel-pop3-folder.c:501
+#: camel/providers/pop3/camel-pop3-folder.c:512
+#, c-format
+msgid "Cannot get message %s: %s"
+msgstr "Не мога да взема съобщението %s:·%s"
+
+#: camel/providers/nntp/camel-nntp-folder.c:156
+#: camel/providers/nntp/camel-nntp-folder.c:232
+#: camel/providers/nntp/camel-nntp-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+msgid "User cancelled"
+msgstr "Потребителят е отказан"
+
+#: camel/providers/nntp/camel-nntp-folder.c:176
+#: camel/providers/nntp/camel-nntp-folder.c:208
+#, c-format
+msgid "Internal error: uid in invalid format: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-folder.c:328
+#: camel/providers/nntp/camel-nntp-folder.c:331
+#: camel/providers/nntp/camel-nntp-folder.c:373
+#: camel/providers/nntp/camel-nntp-folder.c:375
+#, fuzzy, c-format
+msgid "Posting failed: %s"
+msgstr "Опреацията %s е неуспешна"
+
+#: camel/providers/nntp/camel-nntp-folder.c:393
+#, fuzzy
+msgid "You cannot post NNTP messages while working offline!"
+msgstr "Вие не може да копирате съобщения от тази папка боклук"
+
+#: camel/providers/nntp/camel-nntp-folder.c:404
+#, fuzzy
+msgid "You cannot copy messages from a NNTP folder!"
+msgstr "Вие не може да копирате съобщения от тази папка боклук"
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:44
+msgid "Could not get group list from server."
+msgstr "Не мога да взема списък на група от сървъра"
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:97
+#: camel/providers/nntp/camel-nntp-grouplist.c:106
+#, c-format
+msgid "Unable to load grouplist file for %s: %s"
+msgstr "Не мога да заредя файла със списък на група за %s: %s"
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:157
+#, c-format
+msgid "Unable to save grouplist file for %s: %s"
+msgstr "Не мога да запазя файл със списък на група за %s: %s"
+
+#: camel/providers/nntp/camel-nntp-provider.c:43
+msgid ""
+"Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-provider.c:45
+msgid "In the subscription dialog, show relative folder names"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-provider.c:52
 msgid "USENET news"
 msgstr "USENET новини"
 
-#: camel/providers/nntp/camel-nntp-provider.c:43
+#: camel/providers/nntp/camel-nntp-provider.c:54
 msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:151
+#: camel/providers/nntp/camel-nntp-provider.c:73
+msgid ""
+"This option will authenticate with the NNTP server using a plaintext "
+"password."
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:118
+#: camel/providers/nntp/camel-nntp-store.c:1233
+#: camel/providers/nntp/camel-nntp-store.c:1331
+#, c-format
+msgid "NNTP Command failed: %s"
+msgstr "NNTP Командата %s е неуспешна"
+
+#: camel/providers/nntp/camel-nntp-store.c:227
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:163
+#: camel/providers/nntp/camel-nntp-store.c:239
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:262
+#: camel/providers/nntp/camel-nntp-store.c:403
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET Новини през %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:269
+#: camel/providers/nntp/camel-nntp-store.c:777
+#, fuzzy, c-format
 msgid ""
-"This option will authenticate with the NNTP server using a plaintext "
-"password."
+"Error retrieving newsgroups:\n"
+"\n"
+"%s"
 msgstr ""
+"Грешка при запазване на съобщения в: %s:\n"
+" %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:234
-#, c-format
-msgid "No such folder: %s"
-msgstr "Папката·%s не съществува"
+#: camel/providers/nntp/camel-nntp-store.c:872
+msgid ""
+"You cannot subscribe to this newsgroup:\n"
+"\n"
+"No such newsgroup. The selected item is a probably a parent folder."
+msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:238
-#, c-format
-msgid "Could not get group: %s"
-msgstr "Групата·%s не може да бъде взета"
+#: camel/providers/nntp/camel-nntp-store.c:904
+msgid ""
+"You cannot unsubscribe to this newsgroup:\n"
+"\n"
+"newsgroup does not exist!"
+msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:344
+#: camel/providers/nntp/camel-nntp-store.c:929
+msgid "You cannot create a folder in a News store: subscribe instead."
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:937
+#, fuzzy
+msgid "You cannot rename a folder in a News store."
+msgstr "Не мога да преименувам папката %s на %s: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:945
+#, fuzzy
+msgid "You cannot remove a folder in a News store: unsubscribe instead."
+msgstr "Не мога да преместя папка в една от нейните подпапки."
+
+#: camel/providers/nntp/camel-nntp-store.c:1118
+#, fuzzy
+msgid "Authentication requested but not username provided"
+msgstr "Изисква Удостоверение"
+
+#: camel/providers/nntp/camel-nntp-store.c:1146
+#, fuzzy, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr ""
+"Не мога да се удостоверя на SMTP сървъра.\n"
+"%s\n"
+"\n"
+
+#: camel/providers/nntp/camel-nntp-store.c:1262
+#, fuzzy
+msgid "Not connected."
+msgstr "Не е намерен"
+
+#: camel/providers/nntp/camel-nntp-store.c:1311
 #, c-format
-msgid "NNTP Command failed: %s"
-msgstr "NNTP Командата %s е неуспешна"
+msgid "No such folder: %s"
+msgstr "Папката·%s не съществува"
 
-#: camel/providers/nntp/camel-nntp-summary.c:404
-#: camel/providers/nntp/camel-nntp-summary.c:505
+#: camel/providers/nntp/camel-nntp-summary.c:218
+#: camel/providers/nntp/camel-nntp-summary.c:314
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s Сканира нови съобщения"
 
-#: camel/providers/nntp/camel-nntp-summary.c:520
-#, c-format
-msgid "Unknown server response: %s"
-msgstr "·Неизвестен отговор на сървъра: %s"
+#: camel/providers/nntp/camel-nntp-summary.c:225
+#, fuzzy, c-format
+msgid "Unexpected server response from xover: %s"
+msgstr "Неочакван отговор от IMAP сървър: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:328
+#, fuzzy, c-format
+msgid "Unexpected server response from head: %s"
+msgstr "Неочакван отговор от IMAP сървър: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:566
+#: camel/providers/nntp/camel-nntp-summary.c:368
 msgid "Use cancel"
 msgstr "Използва отказване"
 
-#: camel/providers/nntp/camel-nntp-summary.c:568
+#: camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Опреацията %s е неуспешна"
@@ -9743,13 +11141,6 @@ msgstr "Опреацията %s е неуспешна"
 msgid "Retrieving POP summary"
 msgstr "Получавам POP обобщение"
 
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:429
-#: camel/providers/pop3/camel-pop3-folder.c:490
-#: camel/providers/pop3/camel-pop3-folder.c:508
-msgid "User cancelled"
-msgstr "Потребителят е отказан"
-
 #: camel/providers/pop3/camel-pop3-folder.c:265
 #, c-format
 msgid "Cannot get POP summary: %s"
@@ -9759,34 +11150,23 @@ msgstr ""
 msgid "Expunging deleted messages"
 msgstr "Остстранява изтритите съобщения"
 
-#: camel/providers/pop3/camel-pop3-folder.c:403
+#: camel/providers/pop3/camel-pop3-folder.c:404
 #, c-format
 msgid "No message with uid %s"
 msgstr "Няма съобщение с uid %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:410
+#: camel/providers/pop3/camel-pop3-folder.c:411
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Получавам POP съобщение %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:432
-#: camel/providers/pop3/camel-pop3-folder.c:493
-#: camel/providers/pop3/camel-pop3-folder.c:500
-#: camel/providers/pop3/camel-pop3-folder.c:511
-#, c-format
-msgid "Cannot get message %s: %s"
-msgstr "Не мога да взема съобщението %s:·%s"
-
-#: camel/providers/pop3/camel-pop3-folder.c:500
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1225
+#: composer/e-msg-composer.c:1246
 msgid "Unknown reason"
 msgstr "Причината е неизвестна"
 
-#: camel/providers/pop3/camel-pop3-provider.c:38
-msgid "Message storage"
-msgstr "Хранилище на съобщение"
-
 #: camel/providers/pop3/camel-pop3-provider.c:40
 msgid "Leave messages on server"
 msgstr "Оставя пощата на сървъра"
@@ -9800,7 +11180,7 @@ msgstr "Изтрива след %s дни"
 msgid "Disable support for all POP3 extensions"
 msgstr "Спира поддръжката за всички POP3 разширения"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:82
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107
 msgid "POP"
 msgstr "POP"
 
@@ -9825,66 +11205,66 @@ msgstr ""
 "Тази опция ще ви свърже с POP сървър използващ криптирана паролапрез APOP "
 "протокол. Товаможе да не работи за всички потребители на POP сървъра."
 
-#: camel/providers/pop3/camel-pop3-store.c:187
+#: camel/providers/pop3/camel-pop3-store.c:195
 #, c-format
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:219
-#: camel/providers/pop3/camel-pop3-store.c:248
-#: camel/providers/pop3/camel-pop3-store.c:260
+#: camel/providers/pop3/camel-pop3-store.c:227
+#: camel/providers/pop3/camel-pop3-store.c:256
+#: camel/providers/pop3/camel-pop3-store.c:268
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:358
+#: camel/providers/pop3/camel-pop3-store.c:366
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:399
-#: camel/providers/pop3/camel-pop3-store.c:509
+#: camel/providers/pop3/camel-pop3-store.c:407
+#: camel/providers/pop3/camel-pop3-store.c:521
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
 "mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:415
+#: camel/providers/pop3/camel-pop3-store.c:423
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:427
+#: camel/providers/pop3/camel-pop3-store.c:435
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:446
+#: camel/providers/pop3/camel-pop3-store.c:454
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:468
-#, c-format
-msgid "%sPlease enter the POP password for %s@%s"
-msgstr ""
+#: camel/providers/pop3/camel-pop3-store.c:480
+#, fuzzy, c-format
+msgid "%sPlease enter the POP password for %s on host %s"
+msgstr "%sМоля въведете IMAP паролата за %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:523
-#: camel/providers/pop3/camel-pop3-store.c:530
+#: camel/providers/pop3/camel-pop3-store.c:535
+#: camel/providers/pop3/camel-pop3-store.c:542
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:629
+#: camel/providers/pop3/camel-pop3-store.c:641
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Няма такава папка `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:132
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9938,118 +11318,119 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Изпращане на поща през програмата sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:99
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122
 msgid "SMTP"
 msgstr "SMTP"
 
 #: camel/providers/smtp/camel-smtp-provider.c:39
-msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
+#, fuzzy
+msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr "За изпращане на поща използваща отдалечен mailhub с SMTP.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:174
 msgid "Syntax error, command unrecognized"
 msgstr "Синтактична грешка, непозната команда"
 
-#: camel/providers/smtp/camel-smtp-transport.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:176
 msgid "Syntax error in parameters or arguments"
 msgstr "Синтактична грешка в параметрите или агрументите"
 
-#: camel/providers/smtp/camel-smtp-transport.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:178
 msgid "Command not implemented"
 msgstr "Командата не се използва"
 
-#: camel/providers/smtp/camel-smtp-transport.c:181
+#: camel/providers/smtp/camel-smtp-transport.c:180
 msgid "Command parameter not implemented"
 msgstr "Параметрите на командата не се използват"
 
-#: camel/providers/smtp/camel-smtp-transport.c:183
+#: camel/providers/smtp/camel-smtp-transport.c:182
 msgid "System status, or system help reply"
 msgstr "Отговор на системен статус или системна помощ"
 
-#: camel/providers/smtp/camel-smtp-transport.c:185
+#: camel/providers/smtp/camel-smtp-transport.c:184
 msgid "Help message"
 msgstr "Помощно съобщение"
 
-#: camel/providers/smtp/camel-smtp-transport.c:187
+#: camel/providers/smtp/camel-smtp-transport.c:186
 msgid "Service ready"
 msgstr "Обслужването е готово"
 
-#: camel/providers/smtp/camel-smtp-transport.c:189
+#: camel/providers/smtp/camel-smtp-transport.c:188
 msgid "Service closing transmission channel"
 msgstr "Обслужването затвори прехвърлящият канал"
 
-#: camel/providers/smtp/camel-smtp-transport.c:191
+#: camel/providers/smtp/camel-smtp-transport.c:190
 msgid "Service not available, closing transmission channel"
 msgstr "Обслужването не е налично, затварям прехвърлящият канал"
 
-#: camel/providers/smtp/camel-smtp-transport.c:193
+#: camel/providers/smtp/camel-smtp-transport.c:192
 msgid "Requested mail action okay, completed"
 msgstr "Заявеното пощенско действие е наред, завърши"
 
-#: camel/providers/smtp/camel-smtp-transport.c:195
+#: camel/providers/smtp/camel-smtp-transport.c:194
 msgid "User not local; will forward to <forward-path>"
 msgstr "Потребителя не е локален: ще го препратя на <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:197
+#: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Заявеното пощенско действие не е получено: mailbox не е наличен"
 
-#: camel/providers/smtp/camel-smtp-transport.c:199
+#: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Заявеното действие не е получено: mailbox не е наличен"
 
-#: camel/providers/smtp/camel-smtp-transport.c:201
+#: camel/providers/smtp/camel-smtp-transport.c:200
 msgid "Requested action aborted: error in processing"
 msgstr "Заявеното действие прекъсна: грешка в обработката"
 
-#: camel/providers/smtp/camel-smtp-transport.c:203
+#: camel/providers/smtp/camel-smtp-transport.c:202
 msgid "User not local; please try <forward-path>"
 msgstr "Потребителя не е локален; моля опитайте <forward-path>"
 
-#: camel/providers/smtp/camel-smtp-transport.c:205
+#: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Заявеното действие не е взето: липса на достатъчно място за запазване"
 
-#: camel/providers/smtp/camel-smtp-transport.c:207
+#: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 "Заявеното пощенско действие е прекъснато: надвишава свободното място за "
 "запазване"
 
-#: camel/providers/smtp/camel-smtp-transport.c:209
+#: camel/providers/smtp/camel-smtp-transport.c:208
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr ""
 "Заявеното пощенско действие не е взето: името на mailbox не е разрешено"
 
-#: camel/providers/smtp/camel-smtp-transport.c:211
+#: camel/providers/smtp/camel-smtp-transport.c:210
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:213
+#: camel/providers/smtp/camel-smtp-transport.c:212
 msgid "Transaction failed"
 msgstr "Неуспешна транзакция"
 
-#: camel/providers/smtp/camel-smtp-transport.c:217
+#: camel/providers/smtp/camel-smtp-transport.c:216
 msgid "A password transition is needed"
 msgstr "Необходима е промяна на паролата"
 
-#: camel/providers/smtp/camel-smtp-transport.c:219
+#: camel/providers/smtp/camel-smtp-transport.c:218
 msgid "Authentication mechanism is too weak"
 msgstr "Механизмът да идентификация е твърде слаб"
 
-#: camel/providers/smtp/camel-smtp-transport.c:221
+#: camel/providers/smtp/camel-smtp-transport.c:220
 msgid "Encryption required for requested authentication mechanism"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:223
+#: camel/providers/smtp/camel-smtp-transport.c:222
 msgid "Temporary authentication failure"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:225
+#: camel/providers/smtp/camel-smtp-transport.c:224
 msgid "Authentication required"
 msgstr "Изисква Удостоверение"
 
-#: camel/providers/smtp/camel-smtp-transport.c:299
+#: camel/providers/smtp/camel-smtp-transport.c:308
 msgid "Welcome response error"
 msgstr ""
 
@@ -10064,13 +11445,14 @@ msgid "server does not appear to support SSL"
 msgstr ""
 
 #: camel/providers/smtp/camel-smtp-transport.c:358
-#, c-format
-msgid "STARTTLS request timed out: %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "STARTTLS command failed: %s"
+msgstr "IMAP команда пропадна: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:373
-msgid "STARTTLS response error"
-msgstr ""
+#, fuzzy
+msgid "STARTTLS command failed"
+msgstr "IMAP команда пропадна: %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
@@ -10078,8 +11460,8 @@ msgid "SMTP server %s does not support requested authentication type %s."
 msgstr ""
 
 #: camel/providers/smtp/camel-smtp-transport.c:514
-#, c-format
-msgid "%sPlease enter the SMTP password for %s@%s"
+#, fuzzy, c-format
+msgid "%sPlease enter the SMTP password for %s on host %s"
 msgstr "%sМоля въведете SMTP паролата за %s@%s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:533
@@ -10104,154 +11486,157 @@ msgid "SMTP mail delivery via %s"
 msgstr "SMTP поща през %s"
 
 #: camel/providers/smtp/camel-smtp-transport.c:686
+#, fuzzy
+msgid "Cannot send message: service not connected."
+msgstr "Не мога да изпратя поща; адеса на изпращача не е указан."
+
+#: camel/providers/smtp/camel-smtp-transport.c:692
 msgid "Cannot send message: sender address not valid."
 msgstr "Не мога да изпратя съобщение: невалиден адрес на изпращача."
 
-#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:637
+#: camel/providers/smtp/camel-smtp-transport.c:696
 msgid "Sending message"
 msgstr "Изпращане на съпбщението"
 
-#: camel/providers/smtp/camel-smtp-transport.c:706
+#: camel/providers/smtp/camel-smtp-transport.c:711
 msgid "Cannot send message: no recipients defined."
 msgstr "Не мога да изпратя съобщение: няма зададен получател"
 
-#: camel/providers/smtp/camel-smtp-transport.c:715
+#: camel/providers/smtp/camel-smtp-transport.c:722
 msgid "Cannot send message: one or more invalid recipients"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:880
+#: camel/providers/smtp/camel-smtp-transport.c:894
 msgid "SMTP Greeting"
 msgstr "SMTP Поздравления"
 
-#: camel/providers/smtp/camel-smtp-transport.c:927
-#, c-format
-msgid "HELO request timed out: %s"
-msgstr ""
+#: camel/providers/smtp/camel-smtp-transport.c:943
+#, fuzzy, c-format
+msgid "HELO command failed: %s"
+msgstr "IMAP команда пропадна: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:949
-msgid "HELO response error"
-msgstr ""
+#: camel/providers/smtp/camel-smtp-transport.c:960
+#, fuzzy
+msgid "HELO command failed"
+msgstr "IMAP команда пропадна: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1015
+#: camel/providers/smtp/camel-smtp-transport.c:1026
 msgid "SMTP Authentication"
 msgstr "SMTP Удостоверение"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1021
+#: camel/providers/smtp/camel-smtp-transport.c:1032
 msgid "Error creating SASL authentication object."
 msgstr "Грешка при създаване на SASL оторизация"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1038
-#: camel/providers/smtp/camel-smtp-transport.c:1050
-#, c-format
-msgid "AUTH request timed out: %s"
-msgstr "AUTH заявка по таймаут: %s"
+#: camel/providers/smtp/camel-smtp-transport.c:1049
+#: camel/providers/smtp/camel-smtp-transport.c:1060
+#, fuzzy, c-format
+msgid "AUTH command failed: %s"
+msgstr "IMAP команда пропадна: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1059
-msgid "AUTH request failed."
-msgstr "AUTH заявката пропадна"
+#: camel/providers/smtp/camel-smtp-transport.c:1066
+#, fuzzy
+msgid "AUTH command failed"
+msgstr "IMAP команда пропадна: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1120
+#: camel/providers/smtp/camel-smtp-transport.c:1128
 msgid "Bad authentication response from server.\n"
 msgstr "Лош отговор за оторизация от сървъра.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1145
-#, c-format
-msgid "MAIL FROM request timed out: %s: mail not sent"
+#: camel/providers/smtp/camel-smtp-transport.c:1153
+#, fuzzy, c-format
+msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr "MAIL FROM от заявката таймаут %s пощата не е изпратена"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1165
-msgid "MAIL FROM response error"
-msgstr ""
+#: camel/providers/smtp/camel-smtp-transport.c:1170
+#, fuzzy
+msgid "MAIL FROM command failed"
+msgstr "IMAP команда пропадна: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1189
-#, c-format
-msgid "RCPT TO request timed out: %s: mail not sent"
-msgstr ""
+#: camel/providers/smtp/camel-smtp-transport.c:1194
+#, fuzzy, c-format
+msgid "RCPT TO command failed: %s: mail not sent"
+msgstr "RCPT TO върна грешка: %s: пощата не е изпратена"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1213
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-transport.c:1250
-#, c-format
-msgid "DATA request timed out: %s: mail not sent"
-msgstr ""
+#: camel/providers/smtp/camel-smtp-transport.c:1252
+#: camel/providers/smtp/camel-smtp-transport.c:1310
+#: camel/providers/smtp/camel-smtp-transport.c:1329
+#, fuzzy, c-format
+msgid "DATA command failed: %s: mail not sent"
+msgstr "DATA върна грешка: %s: пощата не е изпратена"
 
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1270
-msgid "DATA response error"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:1311
-#: camel/providers/smtp/camel-smtp-transport.c:1334
-#, c-format
-msgid "DATA send timed out: message termination: %s: mail not sent"
-msgstr ""
-
-#: camel/providers/smtp/camel-smtp-transport.c:1354
-msgid "DATA termination response error"
-msgstr ""
+#: camel/providers/smtp/camel-smtp-transport.c:1269
+#: camel/providers/smtp/camel-smtp-transport.c:1345
+#, fuzzy
+msgid "DATA command failed"
+msgstr "IMAP команда пропадна: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1377
-#, c-format
-msgid "RSET request timed out: %s"
-msgstr ""
+#: camel/providers/smtp/camel-smtp-transport.c:1368
+#, fuzzy, c-format
+msgid "RSET command failed: %s"
+msgstr "IMAP команда пропадна: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1397
-msgid "RSET response error"
-msgstr ""
+#: camel/providers/smtp/camel-smtp-transport.c:1384
+#, fuzzy
+msgid "RSET command failed"
+msgstr "IMAP команда пропадна: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1420
-#, c-format
-msgid "QUIT request timed out: %s"
-msgstr ""
+#: camel/providers/smtp/camel-smtp-transport.c:1407
+#, fuzzy, c-format
+msgid "QUIT command failed: %s"
+msgstr "IMAP команда пропадна: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1440
-msgid "QUIT response error"
-msgstr ""
+#: camel/providers/smtp/camel-smtp-transport.c:1421
+#, fuzzy
+msgid "QUIT command failed"
+msgstr "IMAP команда пропадна: %s"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:106
 #, c-format
 msgid "%.0fK"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:109
 #, c-format
 msgid "%.0fM"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:112
 #, c-format
 msgid "%.0fG"
 msgstr ""
 
-#. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:313 mail/mail-display.c:226
+#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:408
 msgid "attachment"
 msgstr "прикачен"
 
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:454
 msgid "Remove selected items from the attachment list"
 msgstr "Изтрива избраните обекти от списъка на прикачени"
 
-#: composer/e-msg-composer-attachment-bar.c:481
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Add attachment..."
 msgstr "Добавя Прикачен...."
 
-#: composer/e-msg-composer-attachment-bar.c:482
+#: composer/e-msg-composer-attachment-bar.c:495
 msgid "Attach a file to the message"
 msgstr "Прикрепи файл към съобщението"
 
-#: composer/e-msg-composer-attachment.c:168
-#: composer/e-msg-composer-attachment.c:184
+#: composer/e-msg-composer-attachment.c:169
+#: composer/e-msg-composer-attachment.c:185
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Не мога да прикача файл %s: %s"
 
-#: composer/e-msg-composer-attachment.c:176
+#: composer/e-msg-composer-attachment.c:177
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Не мога да прикача файл %s: не е обикновен файл"
@@ -10269,15 +11654,104 @@ msgid "MIME type:"
 msgstr "MIME тип:"
 
 #: composer/e-msg-composer-attachment.glade.h:6
-#: composer/e-msg-composer-select-file.c:66
+#: composer/e-msg-composer-select-file.c:74
 msgid "Suggest automatic display of attachment"
 msgstr "Предлага автоматично показване на прикачен"
 
-#: composer/e-msg-composer-hdrs.c:290
-msgid "You need to configure an account before you can compose mail."
+#: composer/e-msg-composer.c:704
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr "В_инаги подписва изходящите съобщения когато използва този акаунт"
+
+#: composer/e-msg-composer.c:711
+#, fuzzy
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr "Не мога да криптирам това съобщение: няма прост текст за криптиране"
+
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "Не мога да отворя файл `%s': %s"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Не мога да получа съобщение от редактора"
+
+#: composer/e-msg-composer.c:1561
+msgid "Untitled Message"
+msgstr "Неименувано Съобщение"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Отвори файл"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
+msgid "Autogenerated"
+msgstr ""
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr ""
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] ""
+msgstr[1] ""
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:483
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3113
+#: composer/e-msg-composer.c:3114
+msgid "Compose a message"
+msgstr "Напиши Съобщение"
+
+#: composer/e-msg-composer.c:3147
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate address selector control."
+msgstr ""
+
+#: composer/e-msg-composer.c:3175
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component.\n"
+"Please make sure you have the correct version\n"
+"of gtkhtml and libgtkhtml installed.\n"
+msgstr ""
+
+#: composer/e-msg-composer.c:3279
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
+msgstr ""
+
+#: composer/e-msg-composer.c:4284
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:512
+msgid "Posting destination"
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:513
+#, fuzzy
+msgid "Choose folders to post the message to."
+msgstr "Тази папка не може да съдържа съобщения."
+
+#: composer/e-msg-composer-hdrs.c:547
 msgid "Click here for the address book"
 msgstr "Кликнете тук за адресна книга"
 
@@ -10288,45 +11762,45 @@ msgstr "Кликнете тук за адресна книга"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: composer/e-msg-composer-hdrs.c:514
+#: composer/e-msg-composer-hdrs.c:577
 msgid "Reply-To:"
 msgstr "Отговор-До:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:520
+#: composer/e-msg-composer-hdrs.c:583
 msgid "From:"
 msgstr "От:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:526
+#: composer/e-msg-composer-hdrs.c:589
 msgid "Subject:"
 msgstr "Тема:"
 
-#: composer/e-msg-composer-hdrs.c:535
+#: composer/e-msg-composer-hdrs.c:598
 msgid "To:"
 msgstr "До:"
 
-#: composer/e-msg-composer-hdrs.c:536
+#: composer/e-msg-composer-hdrs.c:599
 msgid "Enter the recipients of the message"
 msgstr "Въведете получател на съобщението"
 
-#: composer/e-msg-composer-hdrs.c:539
+#: composer/e-msg-composer-hdrs.c:602
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:540
+#: composer/e-msg-composer-hdrs.c:603
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Въведете адреса на получателя на карбон копие за това съобщение"
 
-#: composer/e-msg-composer-hdrs.c:543
+#: composer/e-msg-composer-hdrs.c:606
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:544
+#: composer/e-msg-composer-hdrs.c:607
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10337,208 +11811,171 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:551
+#: composer/e-msg-composer-hdrs.c:614
 msgid "Post To:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:553
-msgid "Posting destination"
-msgstr ""
+#: composer/e-msg-composer-hdrs.c:619
+#, fuzzy
+msgid "Click here to select folders to post to"
+msgstr "<натиснете тук за да изберете папка>"
 
-#: composer/e-msg-composer-select-file.c:102
-#: composer/e-msg-composer-select-file.c:119
+#: composer/e-msg-composer-select-file.c:127
 msgid "Attach file(s)"
 msgstr ""
 
-#: composer/e-msg-composer.c:542
-msgid "Could not create a PGP signature context"
-msgstr ""
+#. mail-composer:no-attach primary
+#: composer/mail-composer-errors.xml.h:2
+#, fuzzy
+msgid "You cannot attach the file `{0}' to this message."
+msgstr "Прикрепи файл към съобщението"
 
-#: composer/e-msg-composer.c:821
-#, c-format
-msgid ""
-"Error while reading file %s:\n"
-"%s"
+#. mail-composer:no-attach secondary
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
 msgstr ""
-"Грешка при четеен на файл: %s\n"
-"%s"
-
-#: composer/e-msg-composer.c:1184
-msgid "File exists, overwrite?"
-msgstr "Файла съществува. Да го презапиша?"
-
-#: composer/e-msg-composer.c:1202
-#, c-format
-msgid "Error saving file: %s"
-msgstr "Грешка при съхранението на файл: %s"
-
-#: composer/e-msg-composer.c:1225
-#, c-format
-msgid "Error loading file: %s"
-msgstr "Грешка при зареждането на файл: %s"
-
-#: composer/e-msg-composer.c:1263
-#, c-format
-msgid "Error accessing file: %s"
-msgstr "Грешка при достъп на файл: %s"
 
-#: composer/e-msg-composer.c:1271
-msgid "Unable to retrieve message from editor"
-msgstr "Не мога да получа съобщение от редактора"
-
-#: composer/e-msg-composer.c:1278
-#, c-format
-msgid ""
-"Unable to seek on file: %s\n"
-"%s"
+#. mail-composer:attach-notfile primary
+#: composer/mail-composer-errors.xml.h:6
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
-"Не мога да намеря във файл %s:\n"
-"%s"
 
-#: composer/e-msg-composer.c:1285
-#, c-format
-msgid ""
-"Unable to truncate file: %s\n"
-"%s"
+#. mail-composer:attach-directory primary
+#: composer/mail-composer-errors.xml.h:8
+msgid "Directories can not be attached to Messages."
 msgstr ""
-"Не мога да отрежа файл %s:\n"
-"%s"
 
-#: composer/e-msg-composer.c:1294
-#, c-format
+#. mail-composer:attach-directory secondary
+#: composer/mail-composer-errors.xml.h:10
 msgid ""
-"Unable to copy file descriptor: %s\n"
-"%s"
+"To attach the contents of this directory, either attach the files in this "
+"directory individually, or create an archive of the directory and attach it."
 msgstr ""
 
-#: composer/e-msg-composer.c:1303
-#, c-format
-msgid ""
-"Error autosaving message: %s\n"
-" %s"
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:12
+msgid "Unfinished messages found"
 msgstr ""
-"Грешка при автоматичното запазване на файл: %s\n"
-" %s"
 
-#: composer/e-msg-composer.c:1400
+#. mail-composer:recover-autosave primary
+#: composer/mail-composer-errors.xml.h:14
+#, fuzzy
+msgid "Do you want to recover unfinished messages?"
+msgstr "Искате ли да съхраните промените?"
+
+#. mail-composer:recover-autosave secondary
+#: composer/mail-composer-errors.xml.h:16
 msgid ""
-"Ximian Evolution has found unsaved files from a previous session.\n"
-"Would you like to try to recover them?"
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
 msgstr ""
-"Ximian Evolution намери незапазени файлове от предишната сесия.\n"
-"Искате ли да се опитам да ги възстановя?"
 
-#: composer/e-msg-composer.c:1563
-#, c-format
-msgid ""
-"The message \"%s\" has not been sent.\n"
-"\n"
-"Do you wish to save your changes?"
+#: composer/mail-composer-errors.xml.h:17
+#, fuzzy
+msgid "Don't Recover"
+msgstr "Не Изтривай"
+
+#: composer/mail-composer-errors.xml.h:18
+#, fuzzy
+msgid "Recover"
+msgstr "Премахва"
+
+#. mail-composer:no-autosave primary
+#: composer/mail-composer-errors.xml.h:20
+msgid "Could not save to autosave file \"{0}\"."
 msgstr ""
 
-#: composer/e-msg-composer.c:1572
+#. mail-composer:no-autosave secondary
+#: composer/mail-composer-errors.xml.h:22
+#, fuzzy
+msgid "Error saving to autosave because \"{1}\"."
+msgstr "Грешка при запазване на кратки клавиши."
+
+#. mail-composer:exit-unsaved title
+#: composer/mail-composer-errors.xml.h:24
 msgid "Warning: Modified Message"
 msgstr "Предупреждение: Модифицирано Съобщение"
 
-#: composer/e-msg-composer.c:1604
-msgid "Open file"
-msgstr "Отвори файл"
+#. mail-composer:exit-unsaved primary
+#: composer/mail-composer-errors.xml.h:26
+#, fuzzy
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
+msgstr "Сигурен ли сте, че искате да изтриете тази неименувана среща?"
 
-#: composer/e-msg-composer.c:2028
-msgid "Signature:"
+#. mail-composer:exit-unsaved secondary
+#: composer/mail-composer-errors.xml.h:28
+msgid ""
+"Closing this composer window will discard the message permanently, unless "
+"you choose to save the message in your Drafts folder. This will allow you to "
+"continue the message at a later date."
 msgstr ""
 
-#: composer/e-msg-composer.c:2068 mail/mail-account-gui.c:1261
-msgid "Autogenerated"
-msgstr ""
+#: composer/mail-composer-errors.xml.h:29
+#, fuzzy
+msgid "Discard Changes"
+msgstr "_Незаписва Промени"
 
-#: composer/e-msg-composer.c:2244 composer/e-msg-composer.c:2911
-#: composer/e-msg-composer.c:2912
-msgid "Compose a message"
-msgstr "Напиши Съобщение"
+#: composer/mail-composer-errors.xml.h:30
+#, fuzzy
+msgid "Save Message"
+msgstr "Съобщение на Сървър:"
 
-#: composer/e-msg-composer.c:2943
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
+#. mail-composer:no-build-message primary
+#: composer/mail-composer-errors.xml.h:32
+#, fuzzy
+msgid "Could not create message."
+msgstr "Не мога да получа съобщение: %s"
+
+#. mail-composer:no-build-message secondary
+#: composer/mail-composer-errors.xml.h:34
+msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
-#: composer/e-msg-composer.c:2971
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component.\n"
-"Please make sure you have the correct version\n"
-"of gtkhtml and libgtkhtml installed.\n"
+#. mail-composer:no-sig-file primary
+#: composer/mail-composer-errors.xml.h:36
+#, fuzzy
+msgid "Could not read signature file \"{0}\"."
+msgstr "Не мога да създам сигнатурен контекст за S/MIME"
+
+#. mail-composer:no-sig-file secondary
+#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
 msgstr ""
 
-#: composer/e-msg-composer.c:3038
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
+#. mail-composer:all-accounts-deleted primary
+#: composer/mail-composer-errors.xml.h:40
+msgid "All accounts have been removed."
 msgstr ""
 
-#: composer/e-msg-composer.c:4073
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
+#. mail-composer:all-accounts-deleted secondary
+#: composer/mail-composer-errors.xml.h:42
+msgid "You need to configure an account before you can compose mail."
 msgstr ""
 
 #: data/evolution.desktop.in.in.h:1
-msgid "The Evolution groupware suite"
+#, fuzzy
+msgid "The Ximian Evolution Groupware Suite"
 msgstr ""
+"Благодарности\n"
+"От екипа на Ximian·Evolution\n"
 
 #: data/evolution.desktop.in.in.h:2
-msgid "Ximian Evolution"
+#, fuzzy
+msgid "Ximian Evolution (Unstable)"
 msgstr "Относно Evolution"
 
-#: data/evolution.keys.in.h:1
+#: data/evolution.keys.in.in.h:1
 msgid "address card"
 msgstr "адресна карта"
 
-#: data/evolution.keys.in.h:2
+#: data/evolution.keys.in.in.h:2
 msgid "calendar information"
 msgstr "календарна информация"
 
-#: default_user/searches.xml.h:1
-msgid "Body contains"
-msgstr "Тялото съдържа"
-
-#: default_user/searches.xml.h:2
-msgid "Body does not contain"
-msgstr "Тялото не съдържа"
-
-#: default_user/searches.xml.h:3
-msgid "Body or subject contains"
-msgstr "Тялото или Темата съдържа"
-
-#: default_user/searches.xml.h:4
-msgid "Message contains"
-msgstr "Съобщението съдържа"
-
-#: default_user/searches.xml.h:5
-msgid "Recipients contain"
-msgstr "Получателите съдържат"
-
-#: default_user/searches.xml.h:6
-msgid "Sender contains"
-msgstr "Изпращача съдържа"
-
-#: default_user/searches.xml.h:7
-msgid "Subject contains"
-msgstr "Темата съдържа"
-
-#: default_user/searches.xml.h:8
-msgid "Subject does not contain"
-msgstr "Темата несъдържа"
-
-#: default_user/vfolders.xml.h:1
-msgid "Important mail (local)"
-msgstr ""
-
-#: default_user/vfolders.xml.h:2
-msgid "Unread mail (local)"
-msgstr ""
-
 #: designs/OOA/ooa.glade.h:1
 msgid ""
 "<b>Currently, your status is \"Out of the Office\". </b>\n"
@@ -10631,7 +12068,7 @@ msgid ""
 "do?"
 msgstr ""
 
-#: e-util/e-dialog-utils.c:247
+#: e-util/e-dialog-utils.c:249
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10639,15 +12076,16 @@ msgstr ""
 "Файл със същото име вече съществува.\n"
 "Да го презапиша ли?"
 
-#: e-util/e-dialog-utils.c:249 mail/mail-display.c:199
+#. system:ask-save-file-exists-overwrite title
+#: e-util/e-dialog-utils.c:251 widgets/misc/e-system-errors.xml.h:2
 msgid "Overwrite file?"
 msgstr "Презаписване на файл?"
 
-#: e-util/e-passwords.c:357
+#: e-util/e-passwords.c:358
 msgid "Remember this password"
 msgstr "Запомни тази парола"
 
-#: e-util/e-passwords.c:359
+#: e-util/e-passwords.c:360
 msgid "Remember this password for the remainder of this session"
 msgstr "Запомня тази парола за остатъка от тази сесия"
 
@@ -10730,13 +12168,13 @@ msgstr "%H:%M:%S"
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1404 widgets/misc/e-dateedit.c:1629
+#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1401 widgets/misc/e-dateedit.c:1626
+#: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -10745,83 +12183,65 @@ msgstr "%H:%M"
 msgid "%I %p"
 msgstr "%I %p"
 
-#: filter/filter-datespec.c:65
+#: filter/filter-datespec.c:73
+#, fuzzy, c-format
 msgid "1 second ago"
-msgstr "преди 1 секунда"
-
-#: filter/filter-datespec.c:65
-#, c-format
-msgid "%d seconds ago"
-msgstr "преди %d секунди"
+msgid_plural "%d seconds ago"
+msgstr[0] "преди 1 секунда"
+msgstr[1] "преди 1 секунда"
 
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:74
+#, fuzzy, c-format
 msgid "1 minute ago"
-msgstr "преди 1 минута"
+msgid_plural "%d minutes ago"
+msgstr[0] "преди 1 минута"
+msgstr[1] "преди 1 минута"
 
-#: filter/filter-datespec.c:66
-#, c-format
-msgid "%d minutes ago"
-msgstr "преди %d минути"
-
-#: filter/filter-datespec.c:67
+#: filter/filter-datespec.c:75
+#, fuzzy, c-format
 msgid "1 hour ago"
-msgstr "преди 1 час"
+msgid_plural "%d hours ago"
+msgstr[0] "преди 1 час"
+msgstr[1] "преди 1 час"
 
-#: filter/filter-datespec.c:67
-#, c-format
-msgid "%d hours ago"
-msgstr "преди %d часа"
-
-#: filter/filter-datespec.c:68
+#: filter/filter-datespec.c:76
+#, fuzzy, c-format
 msgid "1 day ago"
-msgstr "преди 1 ден"
-
-#: filter/filter-datespec.c:68
-#, c-format
-msgid "%d days ago"
-msgstr "преди %d·дни"
+msgid_plural "%d days ago"
+msgstr[0] "преди 1 ден"
+msgstr[1] "преди 1 ден"
 
-#: filter/filter-datespec.c:69
+#: filter/filter-datespec.c:77
+#, fuzzy, c-format
 msgid "1 week ago"
-msgstr "преди 1 седмица"
-
-#: filter/filter-datespec.c:69
-#, c-format
-msgid "%d weeks ago"
-msgstr "преди %d седмици"
+msgid_plural "%d weeks ago"
+msgstr[0] "преди 1 седмица"
+msgstr[1] "преди 1 седмица"
 
-#: filter/filter-datespec.c:70
+#: filter/filter-datespec.c:78
+#, fuzzy, c-format
 msgid "1 month ago"
-msgstr "преди 1 месец"
+msgid_plural "%d months ago"
+msgstr[0] "преди 1 месец"
+msgstr[1] "преди 1 месец"
 
-#: filter/filter-datespec.c:70
-#, c-format
-msgid "%d months ago"
-msgstr "преди %d·месеци"
-
-#: filter/filter-datespec.c:71
+#: filter/filter-datespec.c:79
+#, fuzzy, c-format
 msgid "1 year ago"
-msgstr "преди 1 година"
-
-#: filter/filter-datespec.c:71
-#, c-format
-msgid "%d years ago"
-msgstr "преди %d години"
+msgid_plural "%d years ago"
+msgstr[0] "преди 1 година"
+msgstr[1] "преди 1 година"
 
-#: filter/filter-datespec.c:176
-msgid "You must choose a date."
-msgstr "Трябва да изберете дата."
-
-#: filter/filter-datespec.c:275
+#: filter/filter-datespec.c:280
 msgid "<click here to select a date>"
 msgstr "<натиснете тук за да изберете дата>"
 
-#: filter/filter-datespec.c:278 filter/filter-datespec.c:289
+#: filter/filter-datespec.c:283 filter/filter-datespec.c:294
 msgid "now"
 msgstr "сега"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: filter/filter-datespec.c:285
+#: filter/filter-datespec.c:290
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
@@ -10829,1380 +12249,2037 @@ msgstr "%d-%b-%Y"
 msgid "Select a time to compare against"
 msgstr "Изберете време за да го сравните отново"
 
-#: filter/filter-editor.c:114 filter/filter.glade.h:4
-msgid "Filter Rules"
+#: filter/filter-editor.c:147
+#, fuzzy
+msgid "_Filter Rules"
 msgstr "Правила на Филтриране"
 
-#: filter/filter-file.c:166
-msgid "You must specify a file name."
-msgstr "Трябва да определите име на файла."
+#. filter:no-date primary
+#: filter/filter-errors.xml.h:2
+#, fuzzy
+msgid "Missing date."
+msgstr "Обновява срещата:"
 
-#: filter/filter-file.c:184
-#, c-format
-msgid "File '%s' does not exist or is not a regular file."
+#. filter:no-date secondary
+#: filter/filter-errors.xml.h:4
+msgid "You must choose a date."
+msgstr "Трябва да изберете дата."
+
+#. filter:no-file primary
+#: filter/filter-errors.xml.h:6
+msgid "Missing file name."
 msgstr ""
 
-#: filter/filter-file.c:299
-msgid "Choose a file"
-msgstr "Избира файл"
+#. filter:no-file secondary
+#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
+msgid "You must specify a file name."
+msgstr "Трябва да определите име на файла."
 
-#. and now for the action area
-#: filter/filter-filter.c:491
-msgid "Then"
-msgstr "Тогава"
+#. filter:bad-file primary
+#: filter/filter-errors.xml.h:10
+#, fuzzy
+msgid "File \"{0}\" does not exist or is not a regular file."
+msgstr "Spool `%s' не съществува или не е обикновен файл"
+
+#. filter:no-folder primary
+#: filter/filter-errors.xml.h:14
+#, fuzzy
+msgid "Missing folder."
+msgstr "Синхронизиране на папка"
 
-#: filter/filter-folder.c:155
+#. filter:no-folder secondary
+#: filter/filter-errors.xml.h:16
 msgid "You must specify a folder."
 msgstr "Трябва да изберете папка."
 
-#: filter/filter-folder.c:243 filter/vfolder-rule.c:438
-#: mail/mail-account-gui.c:1510 mail/mail-account-gui.c:1524
-msgid "Select Folder"
-msgstr "Избира Папка"
-
-#: filter/filter-input.c:191
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
+#. filter:bad-regexp primary
+#: filter/filter-errors.xml.h:18
+#, fuzzy
+msgid "Bad regular expression \"{0}\"."
 msgstr ""
 "Грешка в регулярен израз '%s':\n"
 "%s"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
-#: mail/mail-config.glade.h:62 shell/e-config-upgrade.c:1454
-msgid "Important"
-msgstr "Важно"
-
-#. red
-#: filter/filter-label.c:122 mail/mail-config.c:66
-#: mail/mail-config.glade.h:129 shell/e-config-upgrade.c:1455
-msgid "Work"
-msgstr "Работа"
-
-#. orange
-#: filter/filter-label.c:123 mail/mail-config.c:67 mail/mail-config.glade.h:84
-#: shell/e-config-upgrade.c:1456
-msgid "Personal"
-msgstr "Личен"
-
-#. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
-msgid "To Do"
-msgstr "Трябва да се Направи"
-
-#. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:66
-#: shell/e-config-upgrade.c:1458
-msgid "Later"
-msgstr "По-късно"
+#. filter:bad-regexp secondary
+#: filter/filter-errors.xml.h:20
+msgid "Could not compile regular expression \"{1}\"."
+msgstr ""
 
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
-msgid "Test"
-msgstr "Тест"
+#. filter:no-name primary
+#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#, fuzzy
+msgid "Missing name."
+msgstr "Задача"
 
-#: filter/filter-rule.c:219
+#. filter:no-name secondary
+#: filter/filter-errors.xml.h:24
 msgid "You must name this filter."
 msgstr "Трябва да има име този филтър."
 
-#: filter/filter-rule.c:751
-msgid "Rule name: "
-msgstr "Име на правило:"
+#. filter:no-name-vfolder secondary
+#: filter/filter-errors.xml.h:28
+#, fuzzy
+msgid "You must name this vFolder."
+msgstr "Тази vпапка трябва да има име."
 
-#: filter/filter-rule.c:755
-msgid "Untitled"
-msgstr "Неименувано"
+#. filter:bad-name-notunique primary
+#: filter/filter-errors.xml.h:30
+msgid "Name \"{0}\" already used."
+msgstr ""
 
-#: filter/filter-rule.c:772
-msgid "If"
-msgstr "Ако"
+#. filter:bad-name-notunique secondary
+#: filter/filter-errors.xml.h:32
+#, fuzzy
+msgid "Please choose another name."
+msgstr "Моля, изберете сървър."
 
-#: filter/filter-rule.c:791
-msgid "Execute actions"
-msgstr "Изпълнява действия"
+#. filter:vfolder-no-source primary
+#: filter/filter-errors.xml.h:34
+#, fuzzy
+msgid "No sources selected."
+msgstr "Не е избран сървър"
 
-#: filter/filter-rule.c:795
-msgid "if all criteria are met"
-msgstr "ако всички критерии са изпълнени"
+#. filter:vfolder-no-source secondary
+#: filter/filter-errors.xml.h:36
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting\n"
+"all local folders, all remote folders, or both."
+msgstr ""
 
-#: filter/filter-rule.c:800
-msgid "if any criteria are met"
-msgstr "ако някой от критериите е изпълнен"
+#: filter/filter-file.c:288
+msgid "Choose a file"
+msgstr "Избира файл"
 
-#: filter/filter-rule.c:895
-msgid "incoming"
-msgstr "входящ"
+#. and now for the action area
+#: filter/filter-filter.c:491
+#, fuzzy
+msgid "<b>Then</b>"
+msgstr "<b>Завършва:</b>·"
 
-#: filter/filter-rule.c:895
-msgid "outgoing"
-msgstr "изходящ"
+#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
+#: mail/mail-account-gui.c:1347
+msgid "Select Folder"
+msgstr "Избира Папка"
 
-#: filter/filter.glade.h:1
-msgid "Compare against"
-msgstr "Сравни срещу"
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
+msgid "    "
+msgstr ""
 
 #: filter/filter.glade.h:2
-msgid "Edit Filters"
-msgstr "Редактира Филтри"
+#, fuzzy
+msgid "<b>_Filter Rules</b>"
+msgstr "Правила на Филтриране"
 
 #: filter/filter.glade.h:3
-msgid "Edit VFolders"
-msgstr "Редактира VFolders"
+#, fuzzy
+msgid "<b>vFolder Sources</b>"
+msgstr "Източници на vПапки"
+
+#: filter/filter.glade.h:4
+msgid "Compare against"
+msgstr "Сравни срещу"
 
 #: filter/filter.glade.h:5
 msgid "Incoming"
 msgstr "Входящи"
 
 #: filter/filter.glade.h:6
-msgid "Outgoing"
-msgstr "Изходящи"
-
-#: filter/filter.glade.h:7
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
 msgstr ""
 
-#: filter/filter.glade.h:9
+#: filter/filter.glade.h:8
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
 msgstr ""
 
-#: filter/filter.glade.h:11
+#: filter/filter.glade.h:10
 msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
 msgstr ""
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
-msgid "Virtual Folders"
-msgstr "Виртуални Папки"
-
-#: filter/filter.glade.h:15
+#: filter/filter.glade.h:13
 msgid "a time relative to the current time"
 msgstr "време относително към текущото"
 
-#: filter/filter.glade.h:16
+#: filter/filter.glade.h:14
 msgid "ago"
 msgstr "преди"
 
-#: filter/filter.glade.h:20
+#: filter/filter.glade.h:18
 msgid "months"
 msgstr "месеци"
 
-#: filter/filter.glade.h:21 mail/mail-config.glade.h:174
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
 msgid "seconds"
 msgstr "секунди"
 
-#: filter/filter.glade.h:22
+#: filter/filter.glade.h:20
 msgid "specific folders only"
 msgstr "задава само папки"
 
-#: filter/filter.glade.h:23
+#: filter/filter.glade.h:21
 msgid "the current time"
 msgstr "текущото време"
 
-#: filter/filter.glade.h:24
+#: filter/filter.glade.h:22
 msgid "the time you specify"
 msgstr "времето определено от вас"
 
-#: filter/filter.glade.h:25
-msgid "vFolder Sources"
-msgstr "Източници на vПапки"
-
-#: filter/filter.glade.h:26
-msgid "weeks"
-msgstr "седмици"
-
-#: filter/filter.glade.h:27
+#: filter/filter.glade.h:24
 msgid "with all active remote folders"
 msgstr "с всички активни отдалечени папки"
 
-#: filter/filter.glade.h:28
+#: filter/filter.glade.h:25
 msgid "with all local and active remote folders"
 msgstr "с всички локални и активни отдалечени папки"
 
-#: filter/filter.glade.h:29
+#: filter/filter.glade.h:26
 msgid "with all local folders"
 msgstr "с всички локални папки"
 
-#: filter/filter.glade.h:30
+#: filter/filter.glade.h:27
 msgid "years"
 msgstr "години"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Adjust Score"
-msgstr ""
+#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
+#: mail/mail-config.glade.h:93
+msgid "Important"
+msgstr "Важно"
+
+#. forest green
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: mail/mail-config.glade.h:148
+msgid "To Do"
+msgstr "Трябва да се Направи"
 
-#: filter/libfilter-i18n.h:3
-msgid "Assign Color"
-msgstr "Назначава Цвят"
+#. blue
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: mail/mail-config.glade.h:97
+msgid "Later"
+msgstr "По-късно"
 
-#: filter/libfilter-i18n.h:4
-msgid "Assign Score"
-msgstr ""
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
+msgstr "Тест"
+
+#: filter/filter-rule.c:790
+#, fuzzy
+msgid "Rule name:"
+msgstr "Име на правило:"
 
-#: filter/libfilter-i18n.h:5
-msgid "Attachments"
-msgstr "Прикрепени файлове"
+#: filter/filter-rule.c:817
+#, fuzzy
+msgid "<b>If</b>"
+msgstr "<b>Завършва:</b>·"
 
-#: filter/libfilter-i18n.h:6
-msgid "Beep"
-msgstr "Издава звук"
+#: filter/filter-rule.c:854
+msgid "if all criteria are met"
+msgstr "ако всички критерии са изпълнени"
 
-#: filter/libfilter-i18n.h:7
-msgid "Copy to Folder"
-msgstr "Копира в Папка"
+#: filter/filter-rule.c:854
+msgid "if any criteria are met"
+msgstr "ако някой от критериите е изпълнен"
 
-#: filter/libfilter-i18n.h:8
-msgid "Date received"
-msgstr "Получено на дата"
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr "Изпълнява действия"
 
-#: filter/libfilter-i18n.h:9
-msgid "Date sent"
-msgstr "Изпратено на дата"
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "All related"
+msgstr "Делегиран"
 
-#: filter/libfilter-i18n.h:11
-msgid "Deleted"
-msgstr "Изтрива"
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies"
+msgstr "Получатели"
 
-#: filter/libfilter-i18n.h:12
-msgid "Do Not Exist"
-msgstr "Не съществува"
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies and parents"
+msgstr "Отговаря на"
 
-#: filter/libfilter-i18n.h:13
-msgid "Draft"
-msgstr "Чернова"
+#: filter/filter-rule.c:879
+#, fuzzy
+msgid "Include threads"
+msgstr "Включва:"
 
-#: filter/libfilter-i18n.h:14
-msgid "Exist"
-msgstr "Съществува"
+#: filter/filter-rule.c:974
+msgid "incoming"
+msgstr "входящ"
 
-#: filter/libfilter-i18n.h:15
-msgid "Expression"
-msgstr "Израз"
+#: filter/filter-rule.c:974
+msgid "outgoing"
+msgstr "изходящ"
+
+#: filter/rule-editor.c:285
+msgid "Add Rule"
+msgstr "Добавя Правило"
+
+#: filter/rule-editor.c:361
+msgid "Edit Rule"
+msgstr "Редактира на Правило"
+
+#: filter/rule-editor.c:685
+msgid "Rule name"
+msgstr "Име на правило"
 
-#: filter/libfilter-i18n.h:16
-msgid "Follow Up"
+#: filter/score-editor.c:110
+#, fuzzy
+msgid "_Score Rules"
+msgstr "Програма"
+
+#: filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1824
-msgid "Label"
-msgstr "Етикет"
+#: filter/searchtypes.xml.h:1
+msgid "Body contains"
+msgstr "Тялото съдържа"
+
+#: filter/searchtypes.xml.h:2
+msgid "Body does not contain"
+msgstr "Тялото не съдържа"
 
-#: filter/libfilter-i18n.h:19
-msgid "Mailing list"
-msgstr "Пощенски списък"
+#: filter/searchtypes.xml.h:3
+msgid "Body or subject contains"
+msgstr "Тялото или Темата съдържа"
 
-#: filter/libfilter-i18n.h:20
-msgid "Message Body"
-msgstr "Тяло на съобщение"
+#: filter/searchtypes.xml.h:4
+msgid "Message contains"
+msgstr "Съобщението съдържа"
 
-#: filter/libfilter-i18n.h:21
-msgid "Message Header"
-msgstr "Заглавие на съобщение"
+#: filter/searchtypes.xml.h:5
+msgid "Recipients contain"
+msgstr "Получателите съдържат"
 
-#: filter/libfilter-i18n.h:22
-msgid "Move to Folder"
-msgstr "Премества в Папка"
+#: filter/searchtypes.xml.h:6
+msgid "Sender contains"
+msgstr "Изпращача съдържа"
+
+#: filter/searchtypes.xml.h:7
+msgid "Subject contains"
+msgstr "Темата съдържа"
+
+#: filter/searchtypes.xml.h:8
+msgid "Subject does not contain"
+msgstr "Темата несъдържа"
+
+#: filter/vfolder-editor.c:108
+#, fuzzy
+msgid "Virtual _Folders"
+msgstr "Виртуални Папки"
+
+#: filter/vfolder-rule.c:493
+msgid "_Add"
+msgstr "Доб_авя"
 
-#: filter/libfilter-i18n.h:23
-msgid "Pipe Message to Shell Command"
+#: filter/vfolder-rule.c:573
+msgid "VFolder source"
+msgstr "Източник на VFolder"
+
+#. translators: default account indicator
+#: mail/em-account-prefs.c:418
+msgid "[Default]"
 msgstr ""
 
-#: filter/libfilter-i18n.h:24
-msgid "Play Sound"
-msgstr "Изпълнява Звук"
+#: mail/em-account-prefs.c:472
+msgid "Account name"
+msgstr ""
 
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:68
-msgid "Read"
-msgstr "Прочита"
+#: mail/em-account-prefs.c:474
+msgid "Protocol"
+msgstr ""
 
-#: filter/libfilter-i18n.h:26
-msgid "Recipients"
-msgstr "Получатели"
+#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
+#: mail/mail-config.c:1045
+msgid "Unnamed"
+msgstr ""
 
-#: filter/libfilter-i18n.h:27
-msgid "Regex Match"
+#: mail/em-composer-prefs.c:909
+msgid "Language(s)"
 msgstr ""
 
-#: filter/libfilter-i18n.h:28
-msgid "Replied to"
-msgstr "Отговаря на"
+#: mail/em-composer-prefs.c:955
+#, fuzzy
+msgid "Add signature script"
+msgstr "Изтрива всички сигнатури"
 
-#: filter/libfilter-i18n.h:29 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
+#: mail/em-composer-prefs.c:975
+msgid "Signature(s)"
+msgstr ""
+
+#: mail/em-composer-utils.c:888
+#, fuzzy
+msgid "-------- Forwarded Message --------"
+msgstr "Препратени съобщения"
+
+#: mail/em-composer-utils.c:1495
+msgid "an unknown sender"
+msgstr "неизвестен изпрашач"
+
+#. translators: attribution string used when quoting messages,
+#. it must contain a single single %%+05d followed by a single '%%s'
+#: mail/em-composer-utils.c:1505
+#, fuzzy
+msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+msgstr "На %a, %Y-%m-%d в %H:%M, %%s записа:"
+
+#: mail/em-folder-browser.c:129
+msgid "Create _Virtual Folder From Search..."
 msgstr ""
 
-#: filter/libfilter-i18n.h:30 mail/mail-callbacks.c:1820
-msgid "Sender"
-msgstr "Изпращач:"
+#: mail/em-folder-properties.c:120
+#, fuzzy
+msgid "Folder properties"
+msgstr "Източници на vПапки"
+
+#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
+#: mail/em-folder-properties.c:126
+msgid "Properties"
+msgstr "Свойства"
 
-#: filter/libfilter-i18n.h:31
-msgid "Set Status"
-msgstr "Задава статус"
+#. TODO: can this be done in a loop?
+#: mail/em-folder-properties.c:135
+#, fuzzy
+msgid "Folder Name"
+msgstr "_Име на папката:"
 
-#: filter/libfilter-i18n.h:32
-msgid "Shell Command"
-msgstr "Shell·команда"
+#: mail/em-folder-properties.c:146
+#, fuzzy
+msgid "Total messages"
+msgstr "Помощно съобщение"
 
-#: filter/libfilter-i18n.h:33
-msgid "Size (kB)"
-msgstr "Размер (кБ)"
+#: mail/em-folder-properties.c:158
+#, fuzzy
+msgid "Unread messages"
+msgstr "Следващо _Непрочетено Писмо"
 
-#: filter/libfilter-i18n.h:34
-msgid "Source Account"
+#: mail/em-folder-selection-button.c:120
+msgid "<click here to select a folder>"
+msgstr "<натиснете тук за да изберете папка>"
+
+#: mail/em-folder-selector.c:166
+msgid "Create New Folder"
+msgstr "Създава Нова Папка"
+
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
+#: mail/mail-component.c:704
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+msgid "Specify where to create the folder:"
+msgstr "Укажете каде да бъде създадена папката:"
+
+#: mail/em-folder-selector.c:299
+#, fuzzy
+msgid "Create"
+msgstr "Крествю"
+
+#: mail/em-folder-selector.c:303
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+msgid "Folder _name:"
+msgstr "Име_на_папка:"
+
+#: mail/em-folder-tree.c:833
+#, fuzzy, c-format
+msgid "Moving folder %s"
+msgstr "Изтривам папка %s"
+
+#: mail/em-folder-tree.c:835
+#, fuzzy, c-format
+msgid "Copying folder %s"
+msgstr "Отваряне на папка %s"
+
+#: mail/em-folder-tree.c:842 mail/message-list.c:1561
+#, fuzzy, c-format
+msgid "Moving messages into folder %s"
+msgstr "Премести съобщени в %s"
+
+#: mail/em-folder-tree.c:844 mail/message-list.c:1563
+#, fuzzy, c-format
+msgid "Copying messages into folder %s"
+msgstr "Копиране на съобщението в %s"
+
+#: mail/em-folder-tree.c:860
+#, fuzzy
+msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
+"Не мога да декриптирам това съобщение: няма шифрован текст за декриптиране"
 
-#: filter/libfilter-i18n.h:35
-msgid "Specific header"
-msgstr "Специфично заглавие"
+#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
+msgid "_Copy to Folder"
+msgstr "_Копира в Папка"
 
-#: filter/libfilter-i18n.h:37
-msgid "Stop Processing"
-msgstr "Прекратява Обработката"
+#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
+msgid "_Move to Folder"
+msgstr "Премества в _Папка"
 
-#: filter/libfilter-i18n.h:38 mail/mail-format.c:937
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
-msgid "Subject"
-msgstr "Тема"
+#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
+#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
+#: mail/message-list.c:1651
+#, fuzzy
+msgid "_Move"
+msgstr "Премества"
+
+#: mail/em-folder-tree.c:955 mail/message-list.c:1653
+#, fuzzy
+msgid "Cancel _Drag"
+msgstr "Прекъсва Задача"
 
-#: filter/libfilter-i18n.h:39
-msgid "Unset Status"
+#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
+#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
+#: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
+msgid "Select folder"
+msgstr "Избира папка"
+
+#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
+#, fuzzy
+msgid "C_opy"
+msgstr "Копира"
+
+#: mail/em-folder-tree.c:2088
+#, fuzzy, c-format
+msgid "Creating folder `%s'"
+msgstr "Запазване на папка %s"
+
+#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
+#, fuzzy
+msgid "Create folder"
+msgstr "Създава нова папка"
+
+#: mail/em-folder-tree.c:2463
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "Преименува папката \"%s\" на:"
+
+#: mail/em-folder-tree.c:2465
+msgid "Rename Folder"
+msgstr "Преименува Папка"
+
+#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
+#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
+msgid "_View"
+msgstr "_Изглед"
+
+#: mail/em-folder-tree.c:2537
+#, fuzzy
+msgid "Open in _New Window"
+msgstr "Отваря в Нов Прозорец"
+
+#. FIXME: need to disable for nochildren folders
+#: mail/em-folder-tree.c:2546
+msgid "_New Folder..."
+msgstr "_Нова Папка..."
+
+#: mail/em-folder-tree.c:2549
+msgid "_Rename"
+msgstr "_Преименува"
+
+#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
+msgid "_Properties..."
+msgstr "Настройки..."
+
+#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
+#: mail/mail-vfolder.c:888
+msgid "VFolders"
+msgstr "VFolders"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+msgid "UNMATCHED"
 msgstr ""
 
-#: filter/libfilter-i18n.h:40
-msgid "contains"
-msgstr "съдържа"
+#. Inbox is always first
+#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
+msgid "Inbox"
+msgstr "Пощенска кутия"
+
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
+msgid "Loading..."
+msgstr "Зареждане..."
 
-#: filter/libfilter-i18n.h:41
-msgid "does not contain"
-msgstr "не съдържа"
+#: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
+#: mail/mail-component.c:554
+msgid "Mail"
+msgstr "Поща"
 
-#: filter/libfilter-i18n.h:42
-msgid "does not end with"
-msgstr "не завършва с"
+#. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
+#: mail/em-folder-view.c:895 mail/em-popup.c:690
+#: ui/evolution-mail-message.xml.h:113
+msgid "_Edit as New Message..."
+msgstr "Редактира като ново съобщение..."
 
-#: filter/libfilter-i18n.h:43
-msgid "does not exist"
-msgstr "не съществува"
+#: mail/em-folder-view.c:897
+msgid "_Print"
+msgstr "_Разпечатва"
+
+#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
+msgid "_Reply to Sender"
+msgstr "Отговаря на подателя"
 
-#: filter/libfilter-i18n.h:44
-msgid "does not return"
-msgstr "не връща"
+#: mail/em-folder-view.c:901 mail/em-popup.c:811
+#: ui/evolution-mail-message.xml.h:88
+msgid "Reply to _List"
+msgstr "Отговаря на списъка"
 
-#: filter/libfilter-i18n.h:45
-msgid "does not sound like"
-msgstr "не звучи като"
+#: mail/em-folder-view.c:902 mail/em-popup.c:812
+#: ui/evolution-mail-message.xml.h:87
+msgid "Reply to _All"
+msgstr "Отговаря на всички"
 
-#: filter/libfilter-i18n.h:46
-msgid "does not start with"
-msgstr "не започва с"
+#: mail/em-folder-view.c:903 mail/em-popup.c:814
+#: ui/evolution-mail-message.xml.h:114
+msgid "_Forward"
+msgstr "_Препраща"
 
-#: filter/libfilter-i18n.h:47
-msgid "ends with"
-msgstr "завършва с"
+#: mail/em-folder-view.c:906
+msgid "Follo_w Up..."
+msgstr ""
 
-#: filter/libfilter-i18n.h:48
-msgid "exists"
-msgstr "съществува"
+#: mail/em-folder-view.c:907
+msgid "Fla_g Completed"
+msgstr ""
 
-#: filter/libfilter-i18n.h:49
-msgid "is Flagged"
+#: mail/em-folder-view.c:908
+msgid "Cl_ear Flag"
 msgstr ""
 
-#: filter/libfilter-i18n.h:50
-msgid "is after"
-msgstr "е след"
+#: mail/em-folder-view.c:911 ui/evolution-mail-message.xml.h:50
+msgid "Mar_k as Read"
+msgstr "Отбелязва като прочетено"
+
+#: mail/em-folder-view.c:912
+msgid "Mark as _Unread"
+msgstr "Отбелязва като непрочетено"
+
+#: mail/em-folder-view.c:913
+msgid "Mark as _Important"
+msgstr "Отбелязва като В_ажно"
 
-#: filter/libfilter-i18n.h:51
-msgid "is before"
-msgstr "е преди"
+#: mail/em-folder-view.c:914
+msgid "_Mark as Unimportant"
+msgstr "Отбелязва като Неважно"
 
-#: filter/libfilter-i18n.h:52
-msgid "is greater than"
-msgstr "е по-голямо от"
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
+#, fuzzy
+msgid "Mark as _Junk"
+msgstr "Отбелязва като непрочетено"
 
-#: filter/libfilter-i18n.h:53
-msgid "is less than"
-msgstr "е по малко от"
+#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
+#, fuzzy
+msgid "Mark as _Not Junk"
+msgstr "Отбелязва като В_ажно"
 
-#: filter/libfilter-i18n.h:54
-msgid "is not Flagged"
+#: mail/em-folder-view.c:920
+msgid "U_ndelete"
 msgstr ""
 
-#: filter/libfilter-i18n.h:55
-msgid "is not"
-msgstr "не е"
+#: mail/em-folder-view.c:923
+msgid "Mo_ve to Folder..."
+msgstr "Премества в Папка"
 
-#: filter/libfilter-i18n.h:56
-msgid "is"
-msgstr "е"
+#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
+msgid "_Copy to Folder..."
+msgstr "_Копира в Папка..."
 
-#: filter/libfilter-i18n.h:57
-msgid "returns greater than"
-msgstr "връща по-голямо от"
+#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Етикет"
 
-#: filter/libfilter-i18n.h:58
-msgid "returns less than"
-msgstr "връща по-малко от"
+#: mail/em-folder-view.c:932
+msgid "Add Sender to Address_book"
+msgstr "Добавя Изпращача в Адресната _книга"
 
-#: filter/libfilter-i18n.h:59
-msgid "returns"
-msgstr "връща"
+#: mail/em-folder-view.c:935
+msgid "Appl_y Filters"
+msgstr "Прил_ага Филтри"
 
-#: filter/libfilter-i18n.h:60
-msgid "sounds like"
-msgstr "звучи като"
+#: mail/em-folder-view.c:936
+#, fuzzy
+msgid "F_ilter Junk"
+msgstr "Правила на Филтриране"
 
-#: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "започва с"
+#: mail/em-folder-view.c:939
+msgid "Crea_te Rule From Message"
+msgstr "Създава правило От Съобщение"
+
+#: mail/em-folder-view.c:940
+msgid "VFolder on _Subject"
+msgstr "VFolder върху _Тема"
+
+#: mail/em-folder-view.c:941
+msgid "VFolder on Se_nder"
+msgstr "_vПапка на Изпращач"
+
+#: mail/em-folder-view.c:942
+msgid "VFolder on _Recipients"
+msgstr "v_Папка на Получатели"
+
+#: mail/em-folder-view.c:943
+msgid "VFolder on Mailing _List"
+msgstr "Филтър върху _Mailing List"
+
+#: mail/em-folder-view.c:947
+msgid "Filter on Sub_ject"
+msgstr "Филтър върху Т_ема"
+
+#: mail/em-folder-view.c:948
+msgid "Filter on Sen_der"
+msgstr "Филтър върху Из_пращач"
+
+#: mail/em-folder-view.c:949
+msgid "Filter on Re_cipients"
+msgstr "Филтър върху По_лучатели"
 
-#: filter/rule-context.c:664 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:917
+#: mail/em-folder-view.c:950
+msgid "Filter on _Mailing List"
+msgstr "Филтър върху Mailing _List"
+
+#. default charset used in mail view
+#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/mail-config.glade.h:68
+msgid "Default"
+msgstr "По подразбиране"
+
+#: mail/em-folder-view.c:1796
+msgid "Print Message"
+msgstr "Отпечатай Съобщението"
+
+#: mail/em-folder-view.c:2076
+#, fuzzy
+msgid "_Copy Link Location"
+msgstr "Копира местоположениет на указател"
+
+#: mail/em-folder-view.c:2341
+#, fuzzy, c-format
+msgid "Click to mail %s"
+msgstr "Натиснете за да добавите задача"
+
+#: mail/em-format.c:750 mail/em-format-html.c:1413 mail/em-format-quote.c:192
+#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
+msgid "From"
+msgstr "От"
+
+#: mail/em-format.c:751 mail/em-format-html.c:1413 mail/em-format-quote.c:192
+#: mail/em-mailer-prefs.c:83
+msgid "Reply-To"
+msgstr "Отговор-До"
+
+#: mail/em-format.c:752 mail/em-format-html.c:1413 mail/em-format-quote.c:192
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "До"
+
+#: mail/em-format.c:753 mail/em-format-html.c:1413 mail/em-format-quote.c:192
+#: mail/em-mailer-prefs.c:85
+msgid "Cc"
+msgstr "Cc"
+
+#: mail/em-format.c:754 mail/em-format-html.c:1413 mail/em-format-quote.c:192
+#: mail/em-mailer-prefs.c:86
+msgid "Bcc"
+msgstr "Bcc"
+
+#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
+#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Тема"
+
+#: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
+#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Дата"
+
+#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
+msgstr ""
+
+#: mail/em-format.c:993
 #, c-format
-msgid "Rule name '%s' is not unique, choose another."
+msgid "%s attachment"
+msgstr "%s прикачен"
+
+#: mail/em-format.c:1024 mail/em-format.c:1143
+#, fuzzy
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Не мога да анализирам MIME съобщение. Показвам го в изходен код."
+
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: filter/rule-editor.c:170
-msgid "Rules"
-msgstr "Правила"
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Не мога да анализирам MIME съобщение. Показвам го в изходен код."
 
-#: filter/rule-editor.c:291
-msgid "Add Rule"
-msgstr "Добавя Правило"
+#: mail/em-format.c:1298
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "Неподържана схема"
 
-#: filter/rule-editor.c:373
-msgid "Edit Rule"
-msgstr "Редактира на Правило"
+#: mail/em-format.c:1306
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Грешка при модифициране на списък"
 
-#: filter/rule-editor.c:691
-msgid "Rule name"
-msgstr "Име на правило"
+#: mail/em-format.c:1306
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "Неизвестна грешка: %s"
+
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, fuzzy, c-format
+msgid "Retrieving `%s'"
+msgstr "Получавам съобщение %s"
+
+#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
+#, fuzzy
+msgid "Unsigned"
+msgstr "Назначен"
+
+#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
+#, fuzzy
+msgid "Valid signature"
+msgstr "Запазва сигнатура"
+
+#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
+#, fuzzy
+msgid "Invalid signature"
+msgstr "Запазва сигнатура"
 
-#: filter/score-editor.c:114
-msgid "Score Rules"
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
 msgstr ""
 
-#: filter/vfolder-rule.c:209
-msgid "You must name this vfolder."
-msgstr "Тази vпапка трябва да има име."
+#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
+#, fuzzy
+msgid "Unencrypted"
+msgstr "Прекъснат"
 
-#: filter/vfolder-rule.c:223
-msgid "You need to to specify at least one folder as a source."
-msgstr "Необходимо е да зададете поне една папка като източник"
+#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
+msgid "Encrypted, weak"
+msgstr ""
 
-#: filter/vfolder-rule.c:531
-msgid "VFolder source"
-msgstr "Източник на VFolder"
+#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
+#, fuzzy
+msgid "Encrypted"
+msgstr "PGP криптиране"
 
-#: importers/elm-importer.c:95 mail/importers/elm-importer.c:105
-msgid "Evolution is importing your old Elm mail"
-msgstr "Evolution внася вашите стари Elm пощи"
+#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
+msgid "Encrypted, strong"
+msgstr ""
 
-#: importers/elm-importer.c:96 importers/netscape-importer.c:1228
-#: importers/pine-importer.c:101 mail/importers/elm-importer.c:106
-#: mail/importers/netscape-importer.c:1238 mail/importers/pine-importer.c:115
-msgid "Importing..."
-msgstr "Внася..."
+#: mail/em-format-html.c:820
+msgid "Malformed external-body part."
+msgstr ""
 
-#: importers/elm-importer.c:98 importers/netscape-importer.c:1230
-#: importers/pine-importer.c:103 mail/importers/elm-importer.c:108
-#: mail/importers/netscape-importer.c:1240 mail/importers/pine-importer.c:117
-msgid "Please wait"
-msgstr "Моля изчакайте"
+#: mail/em-format-html.c:850
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Указател към FTP сайт (%s)"
 
-#: importers/elm-importer.c:169 importers/netscape-importer.c:1808
-#: importers/pine-importer.c:365 mail/importers/elm-importer.c:157
-#: mail/importers/netscape-importer.c:1759 mail/importers/pine-importer.c:288
+#: mail/em-format-html.c:861
 #, c-format
-msgid "Importing %s as %s"
-msgstr "Внася %s като %s"
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Указател към локален файл (%s) валиден на сайта \"%s\""
 
-#: importers/elm-importer.c:375 importers/netscape-importer.c:1917
-#: importers/pine-importer.c:471 mail/importers/elm-importer.c:392
-#: mail/importers/netscape-importer.c:1887 mail/importers/pine-importer.c:425
+#: mail/em-format-html.c:863
 #, c-format
-msgid "Scanning %s"
-msgstr "Сканира на \"%s\""
+msgid "Pointer to local file (%s)"
+msgstr "Указател към локален файл (%s)"
 
-#: importers/elm-importer.c:525 importers/netscape-importer.c:2128
-#: importers/pine-importer.c:637 mail/component-factory.c:117
-#: mail/folder-browser-ui.c:360 mail/importers/elm-importer.c:526
-#: mail/importers/netscape-importer.c:2085 mail/importers/pine-importer.c:572
-#: my-evolution/my-evolution.glade.h:4
-msgid "Mail"
-msgstr "Поща"
+#: mail/em-format-html.c:884
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Указател към отдалечени данни (%s)"
+
+#: mail/em-format-html.c:895
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Указател към неизвестни външни данни (\"%s\" type)"
+
+#: mail/em-format-html.c:1137
+#, fuzzy
+msgid "Formatting message"
+msgstr "Премества съобщения"
+
+#. pseudo-header
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:930
+msgid "Mailer"
+msgstr "Пощенска програма"
+
+#. translators: strftime format for local time equivalent in Date header display, with day
+#: mail/em-format-html.c:1550
+msgid "<I> (%a, %R %Z)</I>"
+msgstr ""
 
-#: importers/elm-importer.c:545 mail/importers/elm-importer.c:547
+#. translators: strftime format for local time equivalent in Date header display, without day
+#: mail/em-format-html.c:1553
+msgid "<I> (%R %Z)</I>"
+msgstr ""
+
+#. message-search popup match count string
+#: mail/em-format-html-display.c:410
+#, fuzzy, c-format
+msgid "Matches: %d"
+msgstr "Съвпадения:"
+
+#: mail/em-format-html-display.c:644
 msgid ""
-"Evolution has found Elm mail files\n"
-"Would you like to import them into Evolution?"
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
 msgstr ""
-"Evolution намери пощенски файлове на Elm\n"
-"Искате ли да ги импортирате в Evolution?"
 
-#: importers/elm-importer.c:574 mail/importers/elm-importer.c:568
-msgid "Elm"
-msgstr "Elm"
+#: mail/em-format-html-display.c:645
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
+msgstr ""
 
-#: importers/evolution-gnomecard-importer.c:246
+#: mail/em-format-html-display.c:646
 msgid ""
-"Evolution has found GnomeCard files.\n"
-"Would you like them to be imported into Evolution?"
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
 msgstr ""
-"Evolution намери файлове на GnomeCard.\n"
-"Искате ли те да бъдат импортиране в Evolution?"
 
-#: importers/netscape-importer.c:70 mail/importers/netscape-importer.c:75
-#, c-format
-msgid "Priority Filter \"%s\""
+#: mail/em-format-html-display.c:647
+msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: importers/netscape-importer.c:653 mail/importers/netscape-importer.c:663
+#: mail/em-format-html-display.c:647
 msgid ""
-"Some of your Netscape email filters are based on\n"
-"email priorities, which are not used in Evolution.\n"
-"Instead, Evolution provides scores in the range of\n"
-"-3 to 3 that can be assigned to emails and filtered\n"
-"accordingly.\n"
-"\n"
-"As a workaround, a set of filters called \"Priority Filter\"\n"
-"was added that converts Netscape's email priorities into\n"
-"Evolution's scores, and the affected filters use scores instead\n"
-"of priorities. Check the imported filters to make sure\n"
-"everything still works as intended."
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
 msgstr ""
 
-#: importers/netscape-importer.c:677 mail/importers/netscape-importer.c:687
+#: mail/em-format-html-display.c:653
 msgid ""
-"Some of your Netscape email filters use\n"
-"the \"Ignore Thread\" or \"Watch Thread\"\n"
-"feature, which is not supported in Evolution.\n"
-"These filters will be dropped."
+"This message is not encrypted.  Its content may be viewed in transit across "
+"The Internet."
 msgstr ""
 
-#: importers/netscape-importer.c:694 mail/importers/netscape-importer.c:704
+#: mail/em-format-html-display.c:654
 msgid ""
-"Some of your Netscape email filters test the\n"
-"body of emails for (in)equality to a given string,\n"
-"which is not supported in Evolution. Those filters\n"
-"were modified to test whether that string is or is not\n"
-"contained in the message body."
+"This message is encrypted, but with a weak encryption algorithm.  It would "
+"be difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
 msgstr ""
 
-#: importers/netscape-importer.c:1227 mail/importers/netscape-importer.c:1237
-msgid "Evolution is importing your old Netscape data"
-msgstr "Evolution внася вашите стари дани от Netscape"
+#: mail/em-format-html-display.c:655
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
 
-#. Fill in the new fields
-#: importers/netscape-importer.c:1872 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1116 shell/e-local-storage.c:184
-msgid "Trash"
-msgstr "Кошче"
+#: mail/em-format-html-display.c:656
+msgid ""
+"This message is encrypted, with a strong encryption algorithm.  It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
 
-#: importers/netscape-importer.c:2028 mail/importers/netscape-importer.c:1995
-msgid "Scanning mail filters"
-msgstr "Сканира пощенските филтри"
+#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
+#, fuzzy
+msgid "_View Certificate"
+msgstr "_Сертифициран ID:"
 
-#: importers/netscape-importer.c:2038 importers/pine-importer.c:570
-#: mail/importers/netscape-importer.c:2006 mail/importers/pine-importer.c:520
-msgid "Scanning directory"
-msgstr "Сканира директория"
+#: mail/em-format-html-display.c:772
+#, fuzzy
+msgid "This certificate is not viewable"
+msgstr "Съобщението не е налично"
 
-#: importers/netscape-importer.c:2047 mail/importers/netscape-importer.c:2015
-#: shell/e-shell-startup-wizard.c:556
-msgid "Starting import"
-msgstr "Стартира внасяне"
+#: mail/em-format-html-display.c:1007
+msgid "Completed on %B %d, %Y, %l:%M %p"
+msgstr ""
 
-#: importers/netscape-importer.c:2133 mail/importers/netscape-importer.c:2090
-msgid "Settings"
-msgstr "Настройки"
+#: mail/em-format-html-display.c:1015
+msgid "Overdue:"
+msgstr ""
 
-#: importers/netscape-importer.c:2138 mail/importers/netscape-importer.c:2095
-msgid "Mail Filters"
-msgstr "Пощенски Филтри"
+#: mail/em-format-html-display.c:1018
+msgid "by %B %d, %Y, %l:%M %p"
+msgstr ""
 
-#: importers/netscape-importer.c:2161 mail/importers/netscape-importer.c:2119
-msgid ""
-"Evolution has found Netscape mail files.\n"
-"Would you like them to be imported into Evolution?"
+#: mail/em-format-html-display.c:1088
+#, fuzzy
+msgid "_View Inline"
+msgstr "_Вътрешен"
+
+#: mail/em-format-html-display.c:1089
+#, fuzzy
+msgid "_Hide"
+msgstr "Скрий"
+
+#: mail/em-format-html-print.c:126
+#, c-format
+msgid "Page %d of %d"
 msgstr ""
-"Evolution намери пощенски файлове на Netscape.\n"
-"Искате ли те да бъдат внесени в Evolution?"
 
-#: importers/pine-importer.c:100 mail/importers/pine-importer.c:114
-msgid "Evolution is importing your old Pine data"
-msgstr "Evolution внася вашите стари Pine данни"
+#: mail/em-junk-filter.c:86
+msgid "Spamassassin (built-in)"
+msgstr ""
 
-#: importers/pine-importer.c:663 mail/importers/pine-importer.c:599
+#: mail/em-mailer-prefs.c:100
+#, fuzzy
+msgid "Every time"
+msgstr "Всяка година"
+
+#: mail/em-mailer-prefs.c:101
+#, fuzzy
+msgid "Once per day"
+msgstr "_Един Ден"
+
+#: mail/em-mailer-prefs.c:102
+#, fuzzy
+msgid "Once per week"
+msgstr "_Една седмица"
+
+#: mail/em-mailer-prefs.c:103
+#, fuzzy
+msgid "Once per month"
+msgstr "Един месец"
+
+#: mail/em-migrate.c:1168
 msgid ""
-"Evolution has found Pine mail files.\n"
-"Would you like to import them into Evolution?"
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Evolution намери пощенски файлове на Pine.\n"
-"Искате ли те да бъдат внесени в Evolution?"
 
-#: importers/pine-importer.c:691 mail/importers/pine-importer.c:618
-msgid "Pine"
-msgstr "Pine"
+#: mail/em-migrate.c:1602
+#, fuzzy, c-format
+msgid "Unable to create new folder `%s': %s"
+msgstr "Не мога да отворя или създам .newsrc файл за %s: %s"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Настройки наинтерфейса за писане на писма"
+#: mail/em-migrate.c:1628
+#, fuzzy, c-format
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr "Не мога да преименувам папката %s на %s: %s"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+#: mail/em-migrate.c:1811
+#, fuzzy, c-format
+msgid "Unable to scan for existing mailboxes at `%s': %s"
+msgstr "Не мога да запазя файл със списък на група за %s: %s"
+
+#: mail/em-migrate.c:2015
+#, fuzzy, c-format
+msgid "Unable to open old POP keep-on-server data `%s': %s"
+msgstr "Не мога да отворя или създам .newsrc файл за %s: %s"
+
+#: mail/em-migrate.c:2029
+#, fuzzy, c-format
+msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
+msgstr "Не мога да създам временна директория: %s"
+
+#: mail/em-migrate.c:2058
+#, c-format
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr ""
+
+#: mail/em-migrate.c:2413 mail/em-migrate.c:2425
+#, fuzzy, c-format
+msgid "Failed to create local mail storage `%s': %s"
+msgstr "Неуспех при кеширане на съобщение %s: %s"
+
+#: mail/em-migrate.c:2576
+#, fuzzy, c-format
+msgid "Unable to create local mail folders at `%s': %s"
+msgstr ""
+"Не мога да създам изходен файл: %s\n"
+" %s"
+
+#: mail/em-migrate.c:2594
 msgid ""
-"Configure mail preferences, including security and message display, here"
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
+#: mail/em-popup.c:700
+msgid "Save As..."
+msgstr "Съхрани Като..."
+
+#: mail/em-popup.c:718
+#, fuzzy, c-format
+msgid "untitled_image.%s"
+msgstr "Неименувано Съобщение"
+
+#: mail/em-popup.c:808
+msgid "Set as _Background"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
+#: mail/em-popup.c:810
+#, fuzzy
+msgid "_Reply to sender"
+msgstr "Отговаря на подателя"
+
+#: mail/em-popup.c:859
+#, fuzzy
+msgid "_Open Link in Browser"
+msgstr "_Отвори Указател в Браузер"
+
+#: mail/em-popup.c:860
+#, fuzzy
+msgid "Se_nd message to..."
+msgstr "Изпраща с_ъобщението към списък..."
+
+#: mail/em-popup.c:861
+#, fuzzy
+msgid "_Add to Addressbook"
+msgstr "Добави адресна книга"
+
+#: mail/em-popup.c:967
+#, c-format
+msgid "Open in %s..."
+msgstr "Отвори в %s..."
+
+#: mail/em-subscribe-editor.c:606
+msgid "This store does not support subscriptions, or they are not enabled."
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Поща Evolution"
+#: mail/em-subscribe-editor.c:635
+#, fuzzy
+msgid "Subscribed"
+msgstr "Абонира"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
+#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2
+msgid "Folder"
+msgstr "Папка"
+
+#. FIXME: This is just to get the shadow, is there a better way?
+#: mail/em-subscribe-editor.c:852
+msgid "Please select a server."
+msgstr "Моля, изберете сървър."
+
+#: mail/em-subscribe-editor.c:873
+msgid "No server has been selected"
+msgstr "Не е избран сървър"
+
+#: mail/em-utils.c:102
+msgid "Don't show this message again."
+msgstr "Не показвай това съобщение отново."
+
+#: mail/em-utils.c:292
+msgid "Filters"
+msgstr "Филтри"
+
+#: mail/em-utils.c:406
+#, fuzzy
+msgid "message"
+msgstr "Съобщение"
+
+#: mail/em-utils.c:509
+#, fuzzy
+msgid "Save Message..."
+msgstr "Съхрани Съобщението Като..."
+
+#: mail/em-utils.c:558
+#, fuzzy
+msgid "Add address"
+msgstr "Адрес"
+
+#. Drop filename for messages from a mailbox
+#: mail/em-utils.c:1016
+#, fuzzy, c-format
+msgid "Messages from %s"
+msgstr "Mail от %s"
+
+#: mail/evolution-mail.schemas.in.in.h:1
+#, fuzzy
+msgid "Automatic link recognition"
+msgstr "_Автоматична проверка за нов email"
+
+#: mail/evolution-mail.schemas.in.in.h:2
+#, fuzzy
+msgid "Automatic smiley recognition"
+msgstr "_Автоматична проверка за нов email"
+
+#: mail/evolution-mail.schemas.in.in.h:3
+msgid "Check incoming mail being junk"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
+#: mail/evolution-mail.schemas.in.in.h:4
+msgid "Citation highlight color"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
+#: mail/evolution-mail.schemas.in.in.h:5
+msgid "Citation highlight color."
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
+#: mail/evolution-mail.schemas.in.in.h:6
+msgid "Composer Window default height"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail configuration interface"
+#: mail/evolution-mail.schemas.in.in.h:7
+msgid "Composer Window default width"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail folder viewer"
+#: mail/evolution-mail.schemas.in.in.h:8
+msgid "Default charset in which to compose messages"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12
-msgid "Evolution Mail preferences control"
+#: mail/evolution-mail.schemas.in.in.h:9
+msgid "Default charset in which to compose messages."
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "Пощенски Абонати"
+#: mail/evolution-mail.schemas.in.in.h:10
+#, fuzzy
+msgid "Default charset in which to display messages"
+msgstr "Търсене на текст в тялото на показваното съобщение"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:69
-msgid "Mail Preferences"
-msgstr "Пощенски Настройки"
+#: mail/evolution-mail.schemas.in.in.h:11
+#, fuzzy
+msgid "Default charset in which to display messages."
+msgstr "Търсене на текст в тялото на показваното съобщение"
 
-#: mail/component-factory.c:117
-msgid "Folder containing mail"
-msgstr "Папка съдържаща поща"
+#: mail/evolution-mail.schemas.in.in.h:12
+#, fuzzy
+msgid "Default forward style"
+msgstr "Подразбираш се стил на Препращане:"
 
-#: mail/component-factory.c:118
-msgid "Public Mail"
-msgstr "Публична Поща"
+#: mail/evolution-mail.schemas.in.in.h:13
+msgid "Default height of the Composer Window"
+msgstr ""
 
-#: mail/component-factory.c:118
-msgid "Public folder containing mail"
+#: mail/evolution-mail.schemas.in.in.h:14
+msgid "Default height of the Message Window"
 msgstr ""
 
-#: mail/component-factory.c:119
-msgid "Virtual Trash"
-msgstr "Виртуално Кошче"
+#: mail/evolution-mail.schemas.in.in.h:15
+msgid "Default height of the Subscribe dialog"
+msgstr ""
 
-#: mail/component-factory.c:119
-msgid "Virtual Trash folder"
-msgstr "Папка на Виртуално Кошче"
+#: mail/evolution-mail.schemas.in.in.h:16
+#, fuzzy
+msgid "Default reply style"
+msgstr "Подразбираш се стил на Препращане:"
 
-#: mail/component-factory.c:147
-msgid "This folder cannot contain messages."
-msgstr "Тази папка не може да съдържа съобщения."
+#: mail/evolution-mail.schemas.in.in.h:17
+msgid "Default width of the Composer Window"
+msgstr ""
 
-#: mail/component-factory.c:441
-msgid "Properties..."
-msgstr "Свойства..."
+#: mail/evolution-mail.schemas.in.in.h:18
+msgid "Default width of the Message Window"
+msgstr ""
 
-#: mail/component-factory.c:441
-msgid "Change this folder's properties"
-msgstr "Промяна настройките на тази папка"
+#: mail/evolution-mail.schemas.in.in.h:19
+msgid "Default width of the Subscribe dialog"
+msgstr ""
 
-#: mail/component-factory.c:823
-msgid ""
-"Some of your mail settings seem corrupt, please check that everything is in "
-"order."
+#: mail/evolution-mail.schemas.in.in.h:20
+msgid "Draw spelling error indicators on words as you type."
 msgstr ""
-"Някой от вашите настройки за пощата изглеждат повредени, моля проверете дали"
-"всичко е наред."
 
-#: mail/component-factory.c:1004
-msgid "You have not set a mail transport method"
-msgstr "Не се указали метода на изпращане на поща"
+#: mail/evolution-mail.schemas.in.in.h:21
+#, fuzzy
+msgid "Empty Trash folders on exit"
+msgstr "Папката не е празна"
 
-#: mail/component-factory.c:1027
-msgid "You have unsent messages, do you wish to quit anyway?"
+#: mail/evolution-mail.schemas.in.in.h:22
+#, fuzzy
+msgid "Empty all Trash folders when exiting Evolution."
+msgstr "Внася VCard файлове в Еволюшън."
+
+#: mail/evolution-mail.schemas.in.in.h:23
+msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 
-#: mail/component-factory.c:1067
-msgid "New Mail Message"
-msgstr "Ново _Писмо"
+#: mail/evolution-mail.schemas.in.in.h:24
+msgid "Enable/disable caret mode"
+msgstr ""
 
-#: mail/component-factory.c:1067
-msgid "_Mail Message"
-msgstr "_Пощенско Съобщение"
+#: mail/evolution-mail.schemas.in.in.h:25
+#, fuzzy
+msgid "Height of the message-list pane"
+msgstr "Изпрати съобщението по-късно"
 
-#: mail/component-factory.c:1068
-msgid "Compose a new mail message"
-msgstr "Създава ново писмо"
+#: mail/evolution-mail.schemas.in.in.h:26
+msgid "Height of the message-list pane."
+msgstr ""
 
-#: mail/component-factory.c:1076
-msgid "New Message Post"
+#: mail/evolution-mail.schemas.in.in.h:27
+msgid ""
+"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
+"any mime-types appearing in this list which map to a bonobo-component viewer "
+"in GNOME's mime-type database may be used for displaying content."
 msgstr ""
 
-#: mail/component-factory.c:1076
-msgid "_Post Message"
+#: mail/evolution-mail.schemas.in.in.h:28
+msgid "Last time empty trash was run"
 msgstr ""
 
-#: mail/component-factory.c:1077
-msgid "Post a new mail message"
+#: mail/evolution-mail.schemas.in.in.h:29
+msgid "List of Labels and their associated colors"
 msgstr ""
 
-#: mail/component-factory.c:1369
-msgid "Connecting..."
-msgstr "Свързва"
+#: mail/evolution-mail.schemas.in.in.h:30
+msgid "List of accepted licenses"
+msgstr ""
 
-#: mail/component-factory.c:1380
-msgid "Cannot register storage with shell"
-msgstr "Не мога да регистрирам хранилището със shell"
+#: mail/evolution-mail.schemas.in.in.h:31
+#, fuzzy
+msgid "List of accounts"
+msgstr "Пощенски Абонати"
 
-#: mail/folder-browser-ui.c:486
-#, c-format
-msgid "Properties for \"%s\""
-msgstr "Свойства за \"%s\""
+#: mail/evolution-mail.schemas.in.in.h:32
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr ""
 
-#: mail/folder-browser-ui.c:488
-msgid "Properties"
-msgstr "Свойства"
+#: mail/evolution-mail.schemas.in.in.h:33
+msgid "List of custom headers and whether they are enabled."
+msgstr ""
 
-#: mail/folder-browser.c:329 mail/mail-display.c:397 mail/mail-display.c:925
-#, c-format
-msgid "Could not create temporary directory: %s"
-msgstr "Не мога да създам временна директория: %s"
+#: mail/evolution-mail.schemas.in.in.h:34
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:color where color uses the HTML hex encoding."
+msgstr ""
 
-#: mail/folder-browser.c:804
-#, c-format
-msgid "%d new"
-msgstr "%d нов"
+#: mail/evolution-mail.schemas.in.in.h:35
+msgid "List of mime types to check for bonobo component viewers"
+msgstr ""
 
-#: mail/folder-browser.c:807 mail/folder-browser.c:815
-#: mail/folder-browser.c:818
-msgid ", "
-msgstr ", "
+#: mail/evolution-mail.schemas.in.in.h:36
+msgid "List of protocol names whose license has been accepted."
+msgstr ""
 
-#: mail/folder-browser.c:809
-#, c-format
-msgid "%d hidden"
-msgstr "%d скрит"
+#: mail/evolution-mail.schemas.in.in.h:37
+msgid "Load images for HTML messages over http"
+msgstr ""
 
-#: mail/folder-browser.c:811
-#, c-format
-msgid "%d visible"
-msgstr "%d видим"
+#: mail/evolution-mail.schemas.in.in.h:38
+msgid ""
+"Load images for HTML messages over http(s). Possible values are: 0 - Never "
+"load images off the net 1 - Load images if sender is in the addressbook 2 - "
+"Always load images off the net"
+msgstr ""
 
-#: mail/folder-browser.c:816
-#, c-format
-msgid "%d selected"
-msgstr " %d избрано"
+#: mail/evolution-mail.schemas.in.in.h:39
+#, fuzzy
+msgid "Log filter actions"
+msgstr "Де_йствия за филтриране на журнал за:"
 
-#: mail/folder-browser.c:821
-#, c-format
-msgid "%d unsent"
-msgstr " %d неизпратено"
+#: mail/evolution-mail.schemas.in.in.h:40
+#, fuzzy
+msgid "Log filter actions to the specified log file."
+msgstr "Де_йствия за филтриране на журнал за:"
 
-#: mail/folder-browser.c:823
-#, c-format
-msgid "%d sent"
-msgstr " %d изпратено"
+#: mail/evolution-mail.schemas.in.in.h:41
+#, fuzzy
+msgid "Logfile to log filter actions"
+msgstr "Де_йствия за филтриране на журнал за:"
 
-#: mail/folder-browser.c:825
-#, c-format
-msgid "%d total"
-msgstr "%d общо"
+#: mail/evolution-mail.schemas.in.in.h:42
+#, fuzzy
+msgid "Logfile to log filter actions."
+msgstr "Де_йствия за филтриране на журнал за:"
 
-#: mail/folder-browser.c:1206
-msgid "Create _Virtual Folder From Search..."
+#: mail/evolution-mail.schemas.in.in.h:43
+msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/folder-browser.c:1760
-msgid "VFolder on _Subject"
-msgstr "VFolder върху _Тема"
+#: mail/evolution-mail.schemas.in.in.h:44
+msgid "Mark as Seen after specified timeout."
+msgstr ""
 
-#: mail/folder-browser.c:1761
-msgid "VFolder on Se_nder"
-msgstr "_vПапка на Изпращач"
+#: mail/evolution-mail.schemas.in.in.h:45
+msgid "Mark citations in the message \"Preview\""
+msgstr ""
 
-#: mail/folder-browser.c:1762
-msgid "VFolder on _Recipients"
-msgstr "v_Папка на Получатели"
+#: mail/evolution-mail.schemas.in.in.h:46
+msgid "Mark citations in the message \"Preview\"."
+msgstr ""
 
-#: mail/folder-browser.c:1763
-msgid "VFolder on Mailing _List"
-msgstr "Филтър върху _Mailing List"
+#: mail/evolution-mail.schemas.in.in.h:47
+msgid "Message Window default height"
+msgstr ""
 
-#: mail/folder-browser.c:1767
-msgid "Filter on Sub_ject"
-msgstr "Филтър върху Т_ема"
+#: mail/evolution-mail.schemas.in.in.h:48
+msgid "Message Window default width"
+msgstr ""
 
-#: mail/folder-browser.c:1768
-msgid "Filter on Sen_der"
-msgstr "Филтър върху Из_пращач"
+#: mail/evolution-mail.schemas.in.in.h:49
+msgid "Message-display style (normal, full headers, source)"
+msgstr ""
 
-#: mail/folder-browser.c:1769
-msgid "Filter on Re_cipients"
-msgstr "Филтър върху По_лучатели"
+#: mail/evolution-mail.schemas.in.in.h:50
+msgid "Minimum days between emptying the trash on exit"
+msgstr ""
 
-#: mail/folder-browser.c:1770 mail/folder-browser.c:2094
-msgid "Filter on _Mailing List"
-msgstr "Филтър върху Mailing _List"
+#: mail/evolution-mail.schemas.in.in.h:51
+msgid "Minimum time between emptying the trash on exit, in days."
+msgstr ""
 
-#: mail/folder-browser.c:1788
-msgid "_Edit as New Message..."
-msgstr "Редактира като ново съобщение..."
+#: mail/evolution-mail.schemas.in.in.h:52
+msgid "New Mail Notify sound file"
+msgstr ""
 
-#: mail/folder-browser.c:1790
-msgid "_Print"
-msgstr "_Разпечатва"
+#: mail/evolution-mail.schemas.in.in.h:53
+msgid "New Mail Notify type"
+msgstr ""
 
-#: mail/folder-browser.c:1794 ui/evolution-mail-message.xml.h:110
-msgid "_Reply to Sender"
-msgstr "Отговаря на подателя"
+#: mail/evolution-mail.schemas.in.in.h:54
+msgid "Prompt on empty subject"
+msgstr ""
 
-#: mail/folder-browser.c:1795 ui/evolution-mail-message.xml.h:75
-msgid "Reply to _List"
-msgstr "Отговаря на списъка"
+#: mail/evolution-mail.schemas.in.in.h:55
+msgid "Prompt the user when he or she tries to expunge a folder."
+msgstr ""
 
-#: mail/folder-browser.c:1796 ui/evolution-mail-message.xml.h:74
-msgid "Reply to _All"
-msgstr "Отговаря на всички"
+#: mail/evolution-mail.schemas.in.in.h:56
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
+msgstr ""
 
-#: mail/folder-browser.c:1797
-msgid "_Forward"
-msgstr "_Препраща"
+#: mail/evolution-mail.schemas.in.in.h:57
+msgid "Prompt when user expunges"
+msgstr ""
 
-#: mail/folder-browser.c:1801
-msgid "Follo_w Up..."
+#: mail/evolution-mail.schemas.in.in.h:58
+msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/folder-browser.c:1802
-msgid "Fla_g Completed"
+#: mail/evolution-mail.schemas.in.in.h:59
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
 msgstr ""
 
-#: mail/folder-browser.c:1803
-msgid "Cl_ear Flag"
+#: mail/evolution-mail.schemas.in.in.h:60
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 
-#. separator here?
-#: mail/folder-browser.c:1807 ui/evolution-mail-message.xml.h:43
-msgid "Mar_k as Read"
-msgstr "Отбелязва като прочетено"
+#: mail/evolution-mail.schemas.in.in.h:61
+msgid "Prompt when user tries to send unwanted HTML"
+msgstr ""
 
-#: mail/folder-browser.c:1808
-msgid "Mark as _Unread"
-msgstr "Отбелязва като непрочетено"
+#: mail/evolution-mail.schemas.in.in.h:62
+msgid "Recognize links in text and replace them."
+msgstr ""
 
-#: mail/folder-browser.c:1809
-msgid "Mark as _Important"
-msgstr "Отбелязва като В_ажно"
+#: mail/evolution-mail.schemas.in.in.h:63
+msgid "Recognize smileys in text and replace them with images."
+msgstr ""
 
-#: mail/folder-browser.c:1810
-msgid "_Mark as Unimportant"
-msgstr "Отбелязва като Неважно"
+#: mail/evolution-mail.schemas.in.in.h:64
+msgid "Run junk test on incoming mail"
+msgstr ""
 
-#: mail/folder-browser.c:1815
-msgid "U_ndelete"
+#: mail/evolution-mail.schemas.in.in.h:65
+#, fuzzy
+msgid "Send HTML mail by default"
+msgstr "_Изпрати mail в HTML формат по подразбиране."
+
+#: mail/evolution-mail.schemas.in.in.h:66
+#, fuzzy
+msgid "Send HTML mail by default."
+msgstr "_Изпрати mail в HTML формат по подразбиране."
+
+#: mail/evolution-mail.schemas.in.in.h:67
+#, fuzzy
+msgid "Show Animations"
+msgstr "_Показва анимирани изображения"
+
+#: mail/evolution-mail.schemas.in.in.h:68
+#, fuzzy
+msgid "Show animated images as animations."
+msgstr "_Показва анимирани изображения"
+
+#: mail/evolution-mail.schemas.in.in.h:69
+msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 
-#: mail/folder-browser.c:1819
-msgid "Mo_ve to Folder..."
-msgstr "Премества в Папка"
+#: mail/evolution-mail.schemas.in.in.h:70
+#, fuzzy
+msgid "Show deleted messages in the message-list"
+msgstr "Показва съобщение в нормален стил"
 
-#: mail/folder-browser.c:1820 ui/evolution-addressbook.xml.h:31
-msgid "_Copy to Folder..."
-msgstr "_Копира в Папка..."
+#: mail/evolution-mail.schemas.in.in.h:71
+#, fuzzy
+msgid "Show the \"Preview\" pane"
+msgstr "_Предварителен преглед на Pane"
 
-#: mail/folder-browser.c:1828
-msgid "Add Sender to Address_book"
-msgstr "Добавя Изпращача в Адресната _книга"
+#: mail/evolution-mail.schemas.in.in.h:72
+msgid "Show the \"Preview\" pane."
+msgstr ""
 
-#: mail/folder-browser.c:1832
-msgid "Appl_y Filters"
-msgstr "Прил_ага Филтри"
+#: mail/evolution-mail.schemas.in.in.h:73
+#, fuzzy
+msgid "Sound file to play when new mail arrives."
+msgstr "_Свири музикален файл при пристигане на ново писмо"
 
-#: mail/folder-browser.c:1836
-msgid "Crea_te Rule From Message"
-msgstr "Създава правило От Съобщение"
+#: mail/evolution-mail.schemas.in.in.h:74
+msgid "Specifies the type of New Mail Notification the user wishes to use."
+msgstr ""
 
-#: mail/folder-browser.c:2095
-msgid "VFolder on M_ailing List"
+#: mail/evolution-mail.schemas.in.in.h:75
+msgid "Spell check inline"
 msgstr ""
 
-#: mail/folder-browser.c:2097
-#, c-format
-msgid "Filter on _Mailing List (%s)"
+#: mail/evolution-mail.schemas.in.in.h:76
+msgid "Subscribe dialog default height"
 msgstr ""
 
-#: mail/folder-browser.c:2098
-#, c-format
-msgid "VFolder on M_ailing List (%s)"
+#: mail/evolution-mail.schemas.in.in.h:77
+msgid "Subscribe dialog default width"
 msgstr ""
 
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
-msgid "Default"
-msgstr "По подразбиране"
+#: mail/evolution-mail.schemas.in.in.h:78
+#, fuzzy
+msgid "Terminal font"
+msgstr "_Терминален Шрифт"
 
-#: mail/folder-info.c:70
-msgid "Getting Folder Information"
-msgstr "Получавам информация за папка"
+#: mail/evolution-mail.schemas.in.in.h:79
+msgid "The last time empty trash was run, in days since the epoch."
+msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Elm importer"
+#: mail/evolution-mail.schemas.in.in.h:80
+msgid "The terminal font for mail display"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
-msgid "Evolution mbox importer"
+#: mail/evolution-mail.schemas.in.in.h:81
+msgid "The variable width font for mail display"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
-msgid "MBox (mbox)"
+#: mail/evolution-mail.schemas.in.in.h:82
+msgid ""
+"This key should contain a list of XML structures specifying custom headers, "
+"and whether they are to be displayed. The format of the XML structure is &lt;"
+"header enabled&gt; - set enabled if the header is to be displayed in the "
+"mail view."
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Netscape Mail importer"
+#: mail/evolution-mail.schemas.in.in.h:83
+#, fuzzy
+msgid "Thread the message list."
+msgstr "_Дървовиден списък на съобщенията"
+
+#: mail/evolution-mail.schemas.in.in.h:84
+#, fuzzy
+msgid "Thread the message-list"
+msgstr "_Дървовиден списък на съобщенията"
+
+#: mail/evolution-mail.schemas.in.in.h:85
+msgid "Thread the message-list based on Subject"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
-msgid "Evolution Outlook Express 4 importer"
+#: mail/evolution-mail.schemas.in.in.h:86
+msgid "Timeout for marking message as Seen"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
-msgid "Outlook Express 4 (.mbx)"
+#: mail/evolution-mail.schemas.in.in.h:87
+msgid "Timeout for marking message as Seen."
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.server.in.in.h:1
-msgid "Evolution Pine importer"
+#: mail/evolution-mail.schemas.in.in.h:88
+msgid "UID string of the default account."
 msgstr ""
 
-#: mail/local-config.glade.h:1
-msgid "Current store format:"
-msgstr "Текущ формат за съхранение:"
+#: mail/evolution-mail.schemas.in.in.h:89
+msgid "Use Spamasssassin daemon and client"
+msgstr ""
 
-#: mail/local-config.glade.h:2
-msgid "Index body contents"
+#: mail/evolution-mail.schemas.in.in.h:90
+msgid "Use Spamasssassin daemon and client (spamc/spamd)"
 msgstr ""
 
-#: mail/local-config.glade.h:3
-msgid "New store format:"
-msgstr "Нов формат за съхранение:"
+#: mail/evolution-mail.schemas.in.in.h:91
+msgid "Use custom fonts"
+msgstr ""
 
-#: mail/local-config.glade.h:4
-msgid ""
-"Note: When converting between mailbox formats, a failure\n"
-"(such as lack of disk space) may not be automatically\n"
-"recoverable.  Please use this feature with care."
+#: mail/evolution-mail.schemas.in.in.h:92
+msgid "Use custom fonts for displaying mail"
 msgstr ""
-"Внимание - не е сигурно, че проблем (като свършване на дисковото "
-"пространство)\n"
-"възникнал по време на преобразуване между различните формати на пощенски "
-"кутии,\n"
-"ще може автоматично да се оправи. Използвайте внимателно тази възможност."
 
-#: mail/local-config.glade.h:7
-msgid "maildir"
-msgstr "maildir"
+#: mail/evolution-mail.schemas.in.in.h:93
+msgid "Use only local spam tests."
+msgstr ""
 
-#: mail/local-config.glade.h:8
-msgid "mbox"
-msgstr "mbox"
+#: mail/evolution-mail.schemas.in.in.h:94
+msgid "Use only the local spam tests (no DNS)."
+msgstr ""
 
-#: mail/local-config.glade.h:9
-msgid "mh"
-msgstr "mh"
+#: mail/evolution-mail.schemas.in.in.h:95
+#, fuzzy
+msgid "Variable width font"
+msgstr "Променливо"
 
-#: mail/mail-account-editor.c:102
-msgid "You have not filled in all of the required information."
-msgstr "Вие не сте попълнили всичи полета за необходимата информация."
+#: mail/evolution-mail.schemas.in.in.h:96
+msgid "View/Bcc menu item is checked"
+msgstr ""
 
-#. give our dialog an OK button and title
-#: mail/mail-account-editor.c:146
-msgid "Evolution Account Editor"
-msgstr "Редактор на Акаунти в Evolution"
+#: mail/evolution-mail.schemas.in.in.h:97
+msgid "View/Bcc menu item is checked."
+msgstr ""
 
-#: mail/mail-account-gui.c:752 mail/mail-config.glade.h:149
-msgid "_Host:"
-msgstr "_Хост:"
+#: mail/evolution-mail.schemas.in.in.h:98
+msgid "View/Cc menu item is checked"
+msgstr ""
 
-#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:123
-msgid "User_name:"
+#: mail/evolution-mail.schemas.in.in.h:99
+msgid "View/Cc menu item is checked."
 msgstr ""
 
-#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:156
-msgid "_Path:"
-msgstr "_Път:"
+#: mail/evolution-mail.schemas.in.in.h:100
+msgid "View/From menu item is checked"
+msgstr ""
 
-#: mail/mail-account-gui.c:1886
-msgid "You may not create two accounts with the same name."
-msgstr "Вие не може да имате две сигнатури с едно име."
+#: mail/evolution-mail.schemas.in.in.h:101
+msgid "View/From menu item is checked."
+msgstr ""
 
-#: mail/mail-accounts.c:231
-msgid "Are you sure you want to delete this account?"
-msgstr "Сигурен ли сте, че искате да изтриете този акаунт?"
+#: mail/evolution-mail.schemas.in.in.h:102
+msgid "View/PostTo menu item is checked"
+msgstr ""
 
-#: mail/mail-accounts.c:239
-msgid "Don't delete"
-msgstr "Не изтривай"
+#: mail/evolution-mail.schemas.in.in.h:103
+msgid "View/PostTo menu item is checked."
+msgstr ""
 
-#: mail/mail-accounts.c:312 mail/mail-accounts.c:351 mail/mail-accounts.c:391
-#: mail/mail-composer-prefs.c:675 mail/mail-composer-prefs.c:693
-#: mail/mail-composer-prefs.c:717
-msgid "Disable"
-msgstr "Забрани"
+#: mail/evolution-mail.schemas.in.in.h:104
+msgid "View/ReplyTo menu item is checked"
+msgstr ""
 
-#: mail/mail-accounts.c:312 mail/mail-accounts.c:351 mail/mail-accounts.c:393
-#: mail/mail-composer-prefs.c:675 mail/mail-composer-prefs.c:693
-#: mail/mail-composer-prefs.c:717
-msgid "Enable"
-msgstr "Разрешава"
+#: mail/evolution-mail.schemas.in.in.h:105
+msgid "View/ReplyTo menu item is checked."
+msgstr ""
 
-#. translators: default account indicator
-#: mail/mail-accounts.c:433
-msgid "[Default]"
+#: mail/evolution-mail.schemas.in.in.h:106
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
 msgstr ""
 
-#. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
-#. has "activatable" set.
-#: mail/mail-accounts.c:481 mail/mail-accounts.etspec.h:2
-#: mail/mail-composer-prefs.c:708 mail/mail-composer-prefs.c:854
-msgid "Enabled"
-msgstr "Разрешен"
+#: mail/evolution-mail.schemas.in.in.h:107
+msgid "port for starting user runned spamd"
+msgstr ""
 
-#: mail/mail-accounts.c:487 mail/mail-accounts.etspec.h:1
-msgid "Account name"
+#: mail/evolution-mail.schemas.in.in.h:108
+#, fuzzy
+msgid "spamd port"
+msgstr "Вмъква"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
 msgstr ""
 
-#: mail/mail-accounts.c:489 mail/mail-accounts.etspec.h:3
-msgid "Protocol"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "Настройки наинтерфейса за писане на писма"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
 msgstr ""
 
-#: mail/mail-autofilter.c:74
-#, c-format
-msgid "Mail to %s"
-msgstr "Mail до %s"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
 
-#: mail/mail-autofilter.c:238
-#, c-format
-msgid "Subject is %s"
-msgstr "Темата е %s"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr ""
 
-#: mail/mail-autofilter.c:254
-#, c-format
-msgid "Mail from %s"
-msgstr "Mail от %s"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Поща Evolution"
 
-#: mail/mail-autofilter.c:271
-#, c-format
-msgid "%s mailing list"
-msgstr "%s пощенски списък"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr ""
 
-#: mail/mail-autofilter.c:323
-msgid "Add Filter Rule"
-msgstr "Добавя правило за Филтър"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr ""
 
-#: mail/mail-autofilter.c:372
-msgid "The following filter rule(s):\n"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
 msgstr ""
 
-#: mail/mail-autofilter.c:378
-#, c-format
-msgid ""
-"Used the removed folder:\n"
-"    '%s'\n"
-"And have been updated."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
 msgstr ""
 
-#. Add the "Don't show this message again." checkbox
-#: mail/mail-callbacks.c:101 widgets/misc/e-messagebox.c:226
-msgid "Don't show this message again."
-msgstr "Не показвай това съобщение отново."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr ""
 
-#: mail/mail-callbacks.c:190
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Пощенски Абонати"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
+msgid "Mail Preferences"
+msgstr "Пощенски Настройки"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+msgid "_Mail"
+msgstr "_Поща"
+
+#: mail/importers/elm-importer.c:88
+msgid "Evolution is importing your old Elm mail"
+msgstr "Evolution внася вашите стари Elm пощи"
+
+#: mail/importers/elm-importer.c:89
+#: mail/importers/evolution-mbox-importer.c:221
+#: mail/importers/evolution-outlook-importer.c:255
+#: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
+msgid "Importing..."
+msgstr "Внася..."
+
+#: mail/importers/elm-importer.c:91
+#: mail/importers/evolution-mbox-importer.c:223
+#: mail/importers/evolution-outlook-importer.c:257
+#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
+msgid "Please wait"
+msgstr "Моля изчакайте"
+
+#: mail/importers/elm-importer.c:244
+#, fuzzy
+msgid "Importing Elm data"
+msgstr "Импортира Файлове"
+
+#: mail/importers/elm-importer.c:436
 msgid ""
-"You have not configured the mail client.\n"
-"You need to do this before you can send,\n"
-"receive or compose mail.\n"
-"Would you like to configure it now?"
+"Evolution has found Elm mail files\n"
+"Would you like to import them into Evolution?"
 msgstr ""
-"Не сте конфигурирали Вашият mail клиент.\n"
-"Трябва да го направите за да може да изпращате,\n"
-"получавате или пишете поща.\n"
-"Искате ли да го конфигурурате сега?"
+"Evolution намери пощенски файлове на Elm\n"
+"Искате ли да ги импортирате в Evolution?"
 
-#: mail/mail-callbacks.c:212
-msgid ""
-"You need to configure an account\n"
-"before you can compose mail."
+#: mail/importers/elm-importer.c:444
+msgid "Elm"
+msgstr "Elm"
+
+#: mail/importers/evolution-mbox-importer.c:116
+#: mail/importers/evolution-outlook-importer.c:130
+#, fuzzy
+msgid "Destination folder:"
+msgstr "Изтрива тази папка"
+
+#: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
+#, fuzzy
+msgid "Select folder to import into"
+msgstr "Избира папка"
+
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:254
+#: mail/importers/mail-importer.c:226
+#, fuzzy, c-format
+msgid "Importing `%s'"
+msgstr "Импортира"
+
+#: mail/importers/evolution-outlook-importer.c:301
+#: mail/importers/mail-importer.c:140
+#, fuzzy
+msgid "Importing mailbox"
+msgstr "Импортира Файлове"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
 msgstr ""
 
-#: mail/mail-callbacks.c:226
-msgid ""
-"You need to configure an identity\n"
-"before you can compose mail."
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
 msgstr ""
-"Необходимо е да конфигурирате потребител\n"
-"преди да създадете поща."
 
-#: mail/mail-callbacks.c:233
-msgid ""
-"You need to configure a mail transport\n"
-"before you can compose mail."
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
 msgstr ""
-"Необходимо е да конфигурирате транспорт на поща\n"
-"преди да създадете поща."
 
-#. FIXME: this wording sucks
-#: mail/mail-callbacks.c:255
-msgid ""
-"You are sending an HTML-formatted message. Please make sure that\n"
-"the following recipients are willing and able to receive HTML mail:\n"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
 msgstr ""
 
-#: mail/mail-callbacks.c:267
-msgid "Send anyway?"
-msgstr "Изпрати въпреки това?"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr ""
 
-#: mail/mail-callbacks.c:288
-msgid ""
-"This message has no subject.\n"
-"Really send?"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
 msgstr ""
-"Съобщението няма Тема.\n"
-"Найстина ли да го изпратя?"
 
-#: mail/mail-callbacks.c:314
-msgid ""
-"Since the contact list you are sending to is configured to hide the list's "
-"addresses, this message will contain only Bcc recipients."
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
 msgstr ""
 
-#: mail/mail-callbacks.c:318
-msgid "This message contains only Bcc recipients."
-msgstr "Това съобщение съдържа само Bcc получател."
+#: mail/importers/mail-importer.c:360
+#, c-format
+msgid "Scanning %s"
+msgstr "Сканира на \"%s\""
 
-#: mail/mail-callbacks.c:323
-msgid ""
-"It is possible that the mail server may reveal the recipients by adding an "
-"Apparently-To header.\n"
-"Send anyway?"
+#: mail/importers/netscape-importer.c:73
+#, c-format
+msgid "Priority Filter \"%s\""
 msgstr ""
 
-#: mail/mail-callbacks.c:472
-msgid "You must specify recipients in order to send this message."
-msgstr "Трябва да укажете получател(и) за да може да изпратите съобщението."
+#: mail/importers/netscape-importer.c:662
+msgid ""
+"Some of your Netscape email filters are based on\n"
+"email priorities, which are not used in Evolution.\n"
+"Instead, Evolution provides scores in the range of\n"
+"-3 to 3 that can be assigned to emails and filtered\n"
+"accordingly.\n"
+"\n"
+"As a workaround, a set of filters called \"Priority Filter\"\n"
+"was added that converts Netscape's email priorities into\n"
+"Evolution's scores, and the affected filters use scores instead\n"
+"of priorities. Check the imported filters to make sure\n"
+"everything still works as intended."
+msgstr ""
 
-#: mail/mail-callbacks.c:724
+#: mail/importers/netscape-importer.c:686
 msgid ""
-"Unable to open the drafts folder for this account.\n"
-"Would you like to use the default drafts folder?"
+"Some of your Netscape email filters use\n"
+"the \"Ignore Thread\" or \"Watch Thread\"\n"
+"feature, which is not supported in Evolution.\n"
+"These filters will be dropped."
 msgstr ""
-"Не мога да отворя папката чернова за този акаунт.\n"
-"Искате ли да използвате подразбираща се?"
 
-#: mail/mail-callbacks.c:1189
-msgid "an unknown sender"
-msgstr "неизвестен изпрашач"
+#: mail/importers/netscape-importer.c:703
+msgid ""
+"Some of your Netscape email filters test the\n"
+"body of emails for (in)equality to a given string,\n"
+"which is not supported in Evolution. Those filters\n"
+"were modified to test whether that string is or is not\n"
+"contained in the message body."
+msgstr ""
 
-#: mail/mail-callbacks.c:1193
-msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
-msgstr "На %a, %Y-%m-%d в %H:%M, %%s записа:"
+#: mail/importers/netscape-importer.c:1250
+msgid "Evolution is importing your old Netscape data"
+msgstr "Evolution внася вашите стари дани от Netscape"
 
-#: mail/mail-callbacks.c:1700 mail/message-browser.c:132
-msgid "Move message(s) to"
-msgstr "Премести съобщени(ето/ята) в"
+#: mail/importers/netscape-importer.c:1707
+#, fuzzy
+msgid "Importing Netscape data"
+msgstr "Evolution внася вашите стари дани от Netscape"
 
-#: mail/mail-callbacks.c:1702 mail/message-browser.c:134
-msgid "Copy message(s) to"
-msgstr "Копирай съобщени(ето/ята) в"
+#: mail/importers/netscape-importer.c:1907
+msgid "Settings"
+msgstr "Настройки"
 
-#: mail/mail-callbacks.c:2344
-#, c-format
-msgid "Are you sure you want to edit all %d messages?"
-msgstr "Сигурен ли сте, че искате да редактирате всички %d съобщения?"
+#: mail/importers/netscape-importer.c:1912
+msgid "Mail Filters"
+msgstr "Пощенски Филтри"
 
-#: mail/mail-callbacks.c:2360
+#: mail/importers/netscape-importer.c:1933
 msgid ""
-"You may only edit messages saved\n"
-"in the Drafts folder."
+"Evolution has found Netscape mail files.\n"
+"Would you like them to be imported into Evolution?"
 msgstr ""
-"Можете да редактирате само съобщения записани\n"
-"в папката Drafts."
+"Evolution намери пощенски файлове на Netscape.\n"
+"Искате ли те да бъдат внесени в Evolution?"
 
-#: mail/mail-callbacks.c:2393
+#: mail/importers/pine-importer.c:116
+msgid "Evolution is importing your old Pine data"
+msgstr "Evolution внася вашите стари Pine данни"
+
+#: mail/importers/pine-importer.c:314
+#, fuzzy
+msgid "Importing Pine data"
+msgstr "Импортира Файлове"
+
+#: mail/importers/pine-importer.c:479
+msgid "Addressbook"
+msgstr "Адресна книга"
+
+#: mail/importers/pine-importer.c:498
 msgid ""
-"You may only resend messages\n"
-"in the Sent folder."
+"Evolution has found Pine mail files.\n"
+"Would you like to import them into Evolution?"
 msgstr ""
-"Можете да изпращате отново само съобщения записани\n"
-"в папката Sent."
+"Evolution намери пощенски файлове на Pine.\n"
+"Искате ли те да бъдат внесени в Evolution?"
 
-#: mail/mail-callbacks.c:2403
-#, c-format
-msgid "Are you sure you want to resend all %d messages?"
-msgstr "Сигурен ли сте, че искате да препратите всичките %d съобщения?"
+#: mail/importers/pine-importer.c:506
+msgid "Pine"
+msgstr "Pine"
 
-#: mail/mail-callbacks.c:2424
-msgid "No Message Selected"
-msgstr "Няма Избрано Съобщение"
+#. give our dialog an OK button and title
+#: mail/mail-account-editor.c:155
+msgid "Evolution Account Editor"
+msgstr "Редактор на Акаунти в Evolution"
 
-#: mail/mail-callbacks.c:2465
+#: mail/mail-account-gui.c:246
 #, c-format
 msgid ""
-"Cannot save to `%s'\n"
-" %s"
+"\n"
+"Please read carefully the license agreement\n"
+"for %s displayed below\n"
+"and tick the check box for accepting it\n"
 msgstr ""
 
-#: mail/mail-callbacks.c:2470
+#: mail/mail-account-gui.c:252
 #, c-format
-msgid ""
-"`%s' already exists.\n"
-"Overwrite it?"
+msgid "%s License Agreement"
 msgstr ""
 
-#: mail/mail-callbacks.c:2511
-msgid "Save Message As..."
-msgstr "Съхрани Съобщението Като..."
-
-#: mail/mail-callbacks.c:2513
-msgid "Save Messages As..."
-msgstr "Съхрани Съобщението Като..."
+#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
+msgid "_Host:"
+msgstr "_Хост:"
 
-#: mail/mail-callbacks.c:2686
-msgid ""
-"This operation will permanently erase all messages marked as\n"
-"deleted. If you continue, you will not be able to recover these messages.\n"
-"\n"
-"Really erase these messages?"
+#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
+msgid "User_name:"
 msgstr ""
 
-#: mail/mail-callbacks.c:2781
+#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
+msgid "_Path:"
+msgstr "_Път:"
+
+#: mail/mail-autofilter.c:74
 #, c-format
-msgid ""
-"Error loading filter information:\n"
-"%s"
-msgstr ""
-"Грешка при зареждане информацията за финтъра:\n"
-"%s"
+msgid "Mail to %s"
+msgstr "Mail до %s"
 
-#: mail/mail-callbacks.c:2789
-msgid "Filters"
-msgstr "Филтри"
+#: mail/mail-autofilter.c:238
+#, c-format
+msgid "Subject is %s"
+msgstr "Темата е %s"
 
-#: mail/mail-callbacks.c:2830
+#: mail/mail-autofilter.c:254
 #, c-format
-msgid "Page %d of %d"
-msgstr ""
+msgid "Mail from %s"
+msgstr "Mail от %s"
 
-#: mail/mail-callbacks.c:2886
-msgid "Print Message"
-msgstr "Отпечатай Съобщението"
+#: mail/mail-autofilter.c:271
+#, c-format
+msgid "%s mailing list"
+msgstr "%s пощенски списък"
+
+#: mail/mail-autofilter.c:326
+msgid "Add Filter Rule"
+msgstr "Добавя правило за Филтър"
 
-#: mail/mail-callbacks.c:2954
-msgid "Printing of message failed"
-msgstr "Отпечатването неуспешно"
+#: mail/mail-component.c:461
+#, fuzzy, c-format
+msgid "%d deleted"
+msgstr " %d избрано"
+
+#: mail/mail-component.c:463
+#, fuzzy, c-format
+msgid "%d junk"
+msgstr " %d неизпратено"
+
+#: mail/mail-component.c:486
+#, fuzzy, c-format
+msgid "%d drafts"
+msgstr "%d дни"
 
-#: mail/mail-callbacks.c:3149
+#: mail/mail-component.c:488
 #, c-format
-msgid "Are you sure you want to open all %d messages in separate windows?"
-msgstr ""
-"Сигурен ли сте, че искате да отворите всички %d съобщения в отделни прозорци?"
+msgid "%d sent"
+msgstr " %d изпратено"
 
-#: mail/mail-composer-prefs.c:226 mail/mail-composer-prefs.c:349
-#: mail/mail-config.c:1376
-msgid "Unnamed"
-msgstr ""
+#: mail/mail-component.c:490
+#, c-format
+msgid "%d unsent"
+msgstr " %d неизпратено"
 
-#: mail/mail-composer-prefs.c:334
-msgid "You must specify a valid script name."
-msgstr ""
+#: mail/mail-component.c:494
+#, c-format
+msgid "%d total"
+msgstr "%d общо"
 
-#: mail/mail-composer-prefs.c:392 mail/mail-composer-prefs.c:454
-msgid "[script]"
-msgstr ""
+#: mail/mail-component.c:496
+#, fuzzy, c-format
+msgid ", %d unread"
+msgstr " %d неизпратено"
 
-#: mail/mail-composer-prefs.c:858
-msgid "Language(s)"
-msgstr ""
+#: mail/mail-component.c:656
+msgid "New Mail Message"
+msgstr "Ново _Писмо"
 
-#: mail/mail-composer-prefs.c:900
-msgid "Add script signature"
-msgstr ""
+#: mail/mail-component.c:657
+msgid "_Mail Message"
+msgstr "_Пощенско Съобщение"
 
-#: mail/mail-composer-prefs.c:920
-msgid "Signature(s)"
+#: mail/mail-component.c:658
+msgid "Compose a new mail message"
+msgstr "Създава ново писмо"
+
+#: mail/mail-component.c:664
+#, fuzzy
+msgid "New Mail Folder"
+msgstr "Нов VFolder"
+
+#: mail/mail-component.c:665
+#, fuzzy
+msgid "Mail _Folder"
+msgstr "Пощенски Филтри"
+
+#: mail/mail-component.c:666
+#, fuzzy
+msgid "Create a new mail folder"
+msgstr "Създава нова папка"
+
+#: mail/mail-component.c:798
+msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
-#: mail/mail-config-druid.c:380 mail/mail-config.glade.h:61
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "Проверява Обслужване"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "Свързване със сървъра..."
+
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Потребител"
 
-#: mail/mail-config-druid.c:382
+#: mail/mail-config-druid.c:364
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
 "information in email you send."
 msgstr ""
 
-#: mail/mail-config-druid.c:388 mail/mail-config-druid.c:395
+#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
+#: mail/mail-config.glade.h:119
 msgid "Receiving Mail"
 msgstr ""
 
-#: mail/mail-config-druid.c:390
+#: mail/mail-config-druid.c:372
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
 "not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:397
+#: mail/mail-config-druid.c:379
 msgid "Please select among the following options"
 msgstr "Моля, изберете от следните опции"
 
-#: mail/mail-config-druid.c:400
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr ""
 
-#: mail/mail-config-druid.c:402
+#: mail/mail-config-druid.c:384
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:407 mail/mail-config.glade.h:10
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37
 msgid "Account Management"
 msgstr "Мениджър на Акаунт"
 
-#: mail/mail-config-druid.c:409
+#: mail/mail-config-druid.c:391
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming mail server and outgoing mail transport method which you provided "
@@ -12211,946 +14288,1286 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: mail/mail-config.c:1080
-msgid "Checking Service"
-msgstr "Проверява Обслужване"
-
-#: mail/mail-config.c:1158 mail/mail-config.c:1162
-msgid "Connecting to server..."
-msgstr "Свързване със сървъра..."
-
-#: mail/mail-config.glade.h:3
-msgid " _Check for supported types "
+#: mail/mail-config.glade.h:2
+#, fuzzy
+msgid " Ch_eck for Supported Types "
 msgstr " _Проверка за подържани типове"
 
 #: mail/mail-config.glade.h:4
-msgid "(SSL is not supported in this build of Evolution)"
-msgstr ""
+#, fuzzy
+msgid "<b>Preview</b>"
+msgstr "Преглед"
 
 #: mail/mail-config.glade.h:5
-msgid "(SSL is not supported in this build of evolution)"
+#, fuzzy
+msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "(SSL не се подържа в тази версия на evolution)"
 
+#: mail/mail-config.glade.h:6
+#, fuzzy
+msgid "<b>S_ignatures</b>"
+msgstr "_Подписи"
+
 #: mail/mail-config.glade.h:7
-msgid "A_lways encrypt to myself when sending encrypted mail"
-msgstr "_Винаги се самокриптира при изпращане на криптирана поща"
+#, fuzzy
+msgid "<b>_Languages</b>"
+msgstr "Език"
 
 #: mail/mail-config.glade.h:8
-msgid "Account Editor"
+msgid "<small>This will make the the filter more reliable, but slower</small>"
 msgstr ""
 
 #: mail/mail-config.glade.h:9
-msgid "Account Information"
-msgstr "Account Информация"
+msgid "<span weight=\"bold\">Account Information</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:10
+msgid "<span weight=\"bold\">Alerts</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:11
-msgid "Add Sc_ript"
+msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:12
-msgid "Add new signature..."
+msgid "<span weight=\"bold\">Authentication</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:13
-msgid "Al_ways encrypt to myself when sending encrypted mail"
+#, fuzzy
+msgid "<span weight=\"bold\">Checking for New Mail</span>"
+msgstr "Проверка за Нов email"
+
+#: mail/mail-config.glade.h:14
+msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:15
-msgid "Alwa_ys sign outgoing messages when using this account"
+msgid "<span weight=\"bold\">Configuration</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:16
+msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:17
-msgid "Always _blind carbon-copy (Bcc) to:"
+msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:18
-msgid "Always _carbon-copy (Cc) to:"
+msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:19
-msgid "Always _trust keys in my keyring when encrypting"
+msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:20
-msgid "Attach original message"
+msgid "<span weight=\"bold\">General</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
-msgid "Attachment"
-msgstr "Прикачен"
+#: mail/mail-config.glade.h:21
+msgid "<span weight=\"bold\">Labels and Colors</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:22
-msgid "Authentication"
-msgstr "Удостоверение"
+msgid "<span weight=\"bold\">Loading Images</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:23
-msgid "Baltic (ISO-8859-13)"
+msgid "<span weight=\"bold\">Message Display</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:24
-msgid "Baltic (ISO-8859-4)"
+msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:25
-msgid "C_haracter set:"
+msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:26
-msgid "C_olors"
+msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:27
-msgid "Check spelling while I _type"
+msgid "<span weight=\"bold\">Options</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:28
-msgid "Checking for New Mail"
-msgstr "Проверка за Нов email"
+msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:29
-msgid "Color for _misspelled words:"
+msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:30
-msgid "Composing Messages"
+msgid "<span weight=\"bold\">Required Information</span>"
 msgstr ""
 
 #: mail/mail-config.glade.h:31
-msgid "Configuration"
-msgstr "Конфигурация"
+msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
+msgstr ""
 
 #: mail/mail-config.glade.h:32
-msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email \n"
-"using Evolution. \n"
-"\n"
-"Click \"Apply\" to save your settings."
+msgid "<span weight=\"bold\">Security</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:33
+#, fuzzy
+msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
+msgstr "Изпрати и Чернова Съобщение"
+
+#: mail/mail-config.glade.h:34
+msgid "<span weight=\"bold\">Server Configuration</span>"
+msgstr ""
+
+#: mail/mail-config.glade.h:35
+#, fuzzy
+msgid "A_lso encrypt to self when sending encrypted mail"
+msgstr "_Винаги се самокриптира при изпращане на криптирана поща"
+
+#: mail/mail-config.glade.h:36
+msgid "Account Editor"
 msgstr ""
 
 #: mail/mail-config.glade.h:38
-msgid "De_fault"
-msgstr "По Подразбиране"
+#, fuzzy
+msgid "Add Ne_w Signature..."
+msgstr "Запазва сигнатура"
+
+#: mail/mail-config.glade.h:39
+#, fuzzy
+msgid "Add _Script"
+msgstr "_Скрипт:"
 
 #: mail/mail-config.glade.h:40
-msgid "Default Behavior"
+msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
 #: mail/mail-config.glade.h:41
-msgid "Default character _encoding:"
+msgid "Alway_s carbon-copy (cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:42
-msgid "Deleting Mail"
+#: mail/mail-config.glade.h:43
+msgid "Always _blind carbon-copy (bcc) to:"
 msgstr ""
 
 #: mail/mail-config.glade.h:44
-msgid "Digital IDs..."
-msgstr "Цифров IDs..."
+#, fuzzy
+msgid "Always _sign outgoing messages when using this account"
+msgstr "В_инаги подписва изходящите съобщения когато използва този акаунт"
 
 #: mail/mail-config.glade.h:45
-msgid "Do not quote original message"
+msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
 #: mail/mail-config.glade.h:46
-msgid "Don't sign _meeting requests (for Outlook compatibility)"
+msgid "Attach original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:47 shell/glade/evolution-startup-wizard.glade.h:1
-msgid "Done"
-msgstr "Приключено"
+#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1
+msgid "Attachment"
+msgstr "Прикачен"
 
 #: mail/mail-config.glade.h:48
-msgid "Drafts _folder:"
-msgstr ""
+#, fuzzy
+msgid "Automatically _insert smiley images"
+msgstr "_Автоматично вмъква емотикони"
 
 #: mail/mail-config.glade.h:49
-msgid "E_nable"
-msgstr "Раз_решен"
+#, fuzzy
+msgid "Automatically check for _new mail every"
+msgstr "_Автоматична проверка за нова поща всеки"
 
 #: mail/mail-config.glade.h:50
-msgid "Email Accounts"
+msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
 #: mail/mail-config.glade.h:51
-msgid "Email _address:"
+msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
 #: mail/mail-config.glade.h:52
-msgid "Empty _trash folders on exit"
-msgstr ""
+#, fuzzy
+msgid "Beep w_hen new mail arrives"
+msgstr "_Издава звук при всяко ново писмо"
 
 #: mail/mail-config.glade.h:53
-msgid "Evolution Account Assistant"
-msgstr "Помощник на Evolution за Акаунти"
+msgid "C_haracter set:"
+msgstr ""
 
 #: mail/mail-config.glade.h:54
-msgid "Execute Command..."
-msgstr ""
+#, fuzzy
+msgid "Ch_eck for Supported Types "
+msgstr " _Проверка за подържани типове"
 
 #: mail/mail-config.glade.h:55
-msgid "Fi_xed -width:"
+msgid "Check _incoming mail for junk"
 msgstr ""
 
 #: mail/mail-config.glade.h:56
-msgid "Font Properties"
+msgid "Check spelling while I _type"
 msgstr ""
 
 #: mail/mail-config.glade.h:57
-msgid "Format messages in _HTML"
+msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
 #: mail/mail-config.glade.h:58
-msgid "Get Digital ID..."
-msgstr "Получава Цифров ID..."
+msgid "Color for _misspelled words:"
+msgstr ""
 
 #: mail/mail-config.glade.h:59
-msgid "Highlight _quotations with"
-msgstr ""
+#, fuzzy
+msgid "Colors"
+msgstr "Комори"
 
 #: mail/mail-config.glade.h:60
-msgid "IMAPv4 "
-msgstr "IMAPv4 "
-
-#: mail/mail-config.glade.h:63
-msgid "Inline"
-msgstr ""
-
-#: mail/mail-config.glade.h:64
-msgid "Kerberos "
-msgstr "Kerberos "
+#, fuzzy
+msgid "Confirm _when expunging a folder"
+msgstr "_Изисква потвърждение при изчистването на всяка папка"
 
-#: mail/mail-config.glade.h:65
-msgid "Labels and Colors"
+#: mail/mail-config.glade.h:61
+msgid ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email \n"
+"using Evolution. \n"
+"\n"
+"Click \"Apply\" to save your settings."
 msgstr ""
 
 #: mail/mail-config.glade.h:67
-msgid "Loading Images"
-msgstr ""
+msgid "De_fault"
+msgstr "По Подразбиране"
 
-#: mail/mail-config.glade.h:68
-msgid "Mail Configuration"
-msgstr "Mail Конфигурация"
+#: mail/mail-config.glade.h:69
+#, fuzzy
+msgid "Default character e_ncoding:"
+msgstr "Кодировка"
 
 #: mail/mail-config.glade.h:70
-msgid "Mailbox location"
-msgstr "Местоположение на Пощенската кутия"
-
-#: mail/mail-config.glade.h:71
-msgid "Message Composer"
-msgstr ""
+#, fuzzy
+msgid "Defaults"
+msgstr "_Стандартни"
 
 #: mail/mail-config.glade.h:72
-msgid "Message Display"
+msgid "Do not quote original message"
 msgstr ""
 
 #: mail/mail-config.glade.h:73
-msgid "Message Fonts"
+msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
+#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
+msgid "Done"
+msgstr "Приключено"
+
 #: mail/mail-config.glade.h:75
-msgid "New Mail Notification"
-msgstr ""
+#, fuzzy
+msgid "Drafts _Folder:"
+msgstr "Пап_ка:"
 
 #: mail/mail-config.glade.h:77
-msgid ""
-"Note: you will not be prompted for a password until you connect for the "
-"first time"
+msgid "Email Accounts"
 msgstr ""
 
 #: mail/mail-config.glade.h:78
-msgid "Optional Information"
-msgstr "Опционална Информация"
+#, fuzzy
+msgid "Email _Address:"
+msgstr "Адрес на ел. поща"
 
-#: mail/mail-config.glade.h:80
-msgid "Or_ganization:"
+#: mail/mail-config.glade.h:79
+msgid "Empty trash folders on e_xit"
 msgstr ""
 
+#: mail/mail-config.glade.h:80
+#, fuzzy
+msgid "Encry_ption certificate:"
+msgstr "_Сертифициран ID:"
+
 #: mail/mail-config.glade.h:81
-msgid "PGP/GPG _Key ID:"
+msgid "Evolution Account Assistant"
+msgstr "Помощник на Evolution за Акаунти"
+
+#: mail/mail-config.glade.h:82
+msgid "Execute Command..."
 msgstr ""
 
-#: mail/mail-config.glade.h:85
-msgid "Pick a color"
-msgstr "Избери цвят"
+#: mail/mail-config.glade.h:83
+#, fuzzy
+msgid "Fi_xed-width:"
+msgstr "Променливо"
 
-#: mail/mail-config.glade.h:86
-msgid "Pr_ompt when sending messages with only Bcc recipients defined"
+#: mail/mail-config.glade.h:84
+msgid "Font Properties"
 msgstr ""
 
-#: mail/mail-config.glade.h:87
-msgid "Pretty Good Privacy (PGP/GPG)"
+#: mail/mail-config.glade.h:85
+msgid "Format messages in _HTML"
 msgstr ""
 
+#: mail/mail-config.glade.h:87
+#, fuzzy
+msgid "HTML Mail"
+msgstr "_HTML поща"
+
 #: mail/mail-config.glade.h:88
-msgid "Printed Fonts"
-msgstr ""
+#, fuzzy
+msgid "Headers"
+msgstr "Начало"
 
 #: mail/mail-config.glade.h:89
-msgid "Qmail maildir "
-msgstr "Пощенска директория Qmail"
+msgid "Highlight _quotations with"
+msgstr ""
 
 #: mail/mail-config.glade.h:90
-msgid "Quote original message"
-msgstr ""
+msgid "IMAPv4 "
+msgstr "IMAPv4 "
 
 #: mail/mail-config.glade.h:91
-msgid "Quoted"
+msgid "I_nclude remote tests"
 msgstr ""
 
-#: mail/mail-config.glade.h:92
-msgid "Re_member this password"
-msgstr "Запомни тази парол_а"
+#: mail/mail-config.glade.h:94
+msgid "Inline"
+msgstr ""
 
-#: mail/mail-config.glade.h:93
-msgid "Re_ply-To:"
+#: mail/mail-config.glade.h:96
+msgid "Kerberos "
+msgstr "Kerberos "
+
+#: mail/mail-config.glade.h:98
+msgid "Mail Configuration"
+msgstr "Mail Конфигурация"
+
+#: mail/mail-config.glade.h:100
+msgid "Mailbox location"
+msgstr "Местоположение на Пощенската кутия"
+
+#: mail/mail-config.glade.h:101
+msgid "Message Composer"
 msgstr ""
 
-#: mail/mail-config.glade.h:94
-msgid "Receiving Email"
-msgstr "Получаване на Пощата"
+#: mail/mail-config.glade.h:104
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
+msgstr ""
 
-#: mail/mail-config.glade.h:95
-msgid "Receiving _Options"
+#: mail/mail-config.glade.h:105
+msgid "Or_ganization:"
 msgstr ""
 
-#: mail/mail-config.glade.h:96
-msgid "Remember this _password"
+#: mail/mail-config.glade.h:106
+msgid "PGP/GPG _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:97
-msgid "Required Information"
-msgstr "изискана Информация"
+#: mail/mail-config.glade.h:111
+#, fuzzy
+msgid "Play sound file when new mail arri_ves"
+msgstr "_Свири музикален файл при пристигане на ново писмо"
 
-#: mail/mail-config.glade.h:98
-msgid "Restore Defaults"
+#: mail/mail-config.glade.h:112
+msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:100
-msgid "S_ecurity"
+#: mail/mail-config.glade.h:113
+msgid "Qmail maildir "
+msgstr "Пощенска директория Qmail"
+
+#: mail/mail-config.glade.h:114
+msgid "Quote original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:101
-msgid "Secure MIME (S/MIME)"
+#: mail/mail-config.glade.h:115
+msgid "Quoted"
 msgstr ""
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:116
+#, fuzzy
+msgid "Re_member password"
+msgstr "Запомни тази парол_а"
+
+#: mail/mail-config.glade.h:117
+msgid "Re_ply-To:"
+msgstr ""
+
+#: mail/mail-config.glade.h:118
+msgid "Receiving Email"
+msgstr "Получаване на Пощата"
+
+#: mail/mail-config.glade.h:120
+#, fuzzy
+msgid "Receiving Options"
+msgstr "Получаване на Пощата"
+
+#: mail/mail-config.glade.h:121
+#, fuzzy
+msgid "Remember _password"
+msgstr "Запомни тази парола"
+
+#: mail/mail-config.glade.h:123
+#, fuzzy
+msgid "S_tandard Font:"
+msgstr "_Стандартен Шрифт"
+
+#: mail/mail-config.glade.h:124
+#, fuzzy
+msgid "Security"
+msgstr "_Сигурност"
+
+#: mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:126
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:127
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:128
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:106
+#: mail/mail-config.glade.h:129
+#, fuzzy
+msgid "Select..."
+msgstr "Избери всичко"
+
+#: mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "Изпращане на Email"
 
-#: mail/mail-config.glade.h:108
-msgid "Sent _messages folder:"
+#: mail/mail-config.glade.h:133
+#, fuzzy
+msgid "Sent _Messages Folder:"
 msgstr "Изпати _папка със съобщения:"
 
-#: mail/mail-config.glade.h:109
-msgid "Sent and Draft Messages"
-msgstr "Изпрати и Чернова Съобщение"
-
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:134
 msgid "Ser_ver requires authentication"
 msgstr "Сървърът изисква ото_ризация"
 
-#: mail/mail-config.glade.h:111
-msgid "Server Configuration"
-msgstr "Сървър Конфигурация"
-
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:135
 msgid "Server _Type: "
 msgstr "Тип С_ървър:"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:136
+#, fuzzy
+msgid "Si_gning certificate:"
+msgstr "_Сертифициран ID:"
+
+#: mail/mail-config.glade.h:137
+#, fuzzy
+msgid "Signat_ure:"
+msgstr "_Подписи"
+
+#: mail/mail-config.glade.h:138
+#, fuzzy
+msgid "Signatures"
+msgstr "_Подписи"
+
+#: mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr ""
 
-#: mail/mail-config.glade.h:114
-msgid "Spell _Checking"
+#: mail/mail-config.glade.h:140
+msgid "Spell Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:141
 msgid "Standard Unix mbox"
 msgstr "Стандартен Unix mbox"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:142
+#, fuzzy
+msgid "T_erminal Font:"
+msgstr "_Терминален Шрифт"
+
+#: mail/mail-config.glade.h:143
+#, fuzzy
+msgid "T_ype: "
+msgstr "Тип:"
+
+#: mail/mail-config.glade.h:144
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:119
+#: mail/mail-config.glade.h:147
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:149
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:152
 msgid "V_ariable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:153
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Forward\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:158
 msgid "_Add Signature"
 msgstr "_Добавя Подпис"
 
-#: mail/mail-config.glade.h:131
-msgid "_Always load images off the net"
+#: mail/mail-config.glade.h:159
+#, fuzzy
+msgid "_Always load images from the Internet"
 msgstr "_Винаги отказва да зарежда картинки от мрежата"
 
-#: mail/mail-config.glade.h:132
-msgid "_Always sign outgoing messages when using this account"
+#: mail/mail-config.glade.h:160
+#, fuzzy
+msgid "_Digitally sign outgoing messages (by default)"
 msgstr "В_инаги подписва изходящите съобщения когато използва този акаунт"
 
-#: mail/mail-config.glade.h:133
-msgid "_Authentication Type: "
-msgstr "Тип на Идентифика_ция:"
-
-#: mail/mail-config.glade.h:134
-msgid "_Authentication type: "
-msgstr "_Тип Идентификация:·"
-
-#: mail/mail-config.glade.h:135
-msgid "_Automatically check for new mail every"
-msgstr "_Автоматична проверка за нова поща всеки"
-
-#: mail/mail-config.glade.h:136
-msgid "_Automatically insert smiley images"
-msgstr "_Автоматично вмъква емотикони"
-
-#: mail/mail-config.glade.h:137
-msgid "_Beep when new mail arrives"
-msgstr "_Издава звук при всяко ново писмо"
-
-#: mail/mail-config.glade.h:138
-msgid "_Certificate ID:"
-msgstr "_Сертифициран ID:"
-
-#: mail/mail-config.glade.h:139
-msgid "_Confirm when expunging a folder"
-msgstr "_Изисква потвърждение при изчистването на всяка папка"
-
-#: mail/mail-config.glade.h:140
-msgid "_Default signature:"
-msgstr "_Стандартен подпис"
-
-#: mail/mail-config.glade.h:141
-msgid "_Defaults"
-msgstr "_Стандартни"
-
-#: mail/mail-config.glade.h:142
+#: mail/mail-config.glade.h:161
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Не ме изветявай, когато пристигнат нови писма"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:163
 msgid "_Enable"
 msgstr "_Разрешава"
 
-#: mail/mail-config.glade.h:145
+#: mail/mail-config.glade.h:164
+msgid "_Encrypt outgoing messages (by default)"
+msgstr ""
+
+#: mail/mail-config.glade.h:165
 msgid "_Forward style:"
 msgstr "_Препраща стил:"
 
-#: mail/mail-config.glade.h:146
-msgid "_Full name:"
-msgstr "_Пълно име:"
-
-#: mail/mail-config.glade.h:148
-msgid "_HTML Mail"
-msgstr "_HTML поща"
-
-#: mail/mail-config.glade.h:150
-msgid "_Identity"
-msgstr "_Идентифицира"
-
-#: mail/mail-config.glade.h:151
-msgid "_Load images if sender is in addressbook"
+#: mail/mail-config.glade.h:168
+#, fuzzy
+msgid "_Load images if sender is in address book"
 msgstr "_Зарежда картинки ако изпращача е в адресната книга"
 
-#: mail/mail-config.glade.h:152
+#: mail/mail-config.glade.h:169
 msgid "_Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:153
+#: mail/mail-config.glade.h:170
 msgid "_Mark messages as read after"
 msgstr ""
 
-#: mail/mail-config.glade.h:154 my-evolution/e-summary-preferences.c:575
-msgid "_Name:"
-msgstr "_Име:"
-
-#: mail/mail-config.glade.h:155
-msgid "_Never load images off the net"
+#: mail/mail-config.glade.h:172
+#, fuzzy
+msgid "_Never load images from the Internet"
 msgstr "_Никога не зарежда картинки от мрежата"
 
-#: mail/mail-config.glade.h:157
-msgid "_Play sound file when new mail arrives"
-msgstr "_Свири музикален файл при пристигане на ново писмо"
-
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:175
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
-#: mail/mail-config.glade.h:160
-msgid "_Receiving Mail"
-msgstr "_Получава Поща"
-
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:176
 msgid "_Reply style:"
 msgstr "_Стил на отговор:"
 
-#: mail/mail-config.glade.h:162
-msgid "_Restore defaults"
-msgstr "_Възстановява стандарните настройки"
-
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:177
 msgid "_Script:"
 msgstr "_Скрипт:"
 
-#: mail/mail-config.glade.h:164
-msgid "_Sending Mail"
-msgstr "_Изпраща поща"
-
-#: mail/mail-config.glade.h:165
+#: mail/mail-config.glade.h:178
 msgid "_Show animated images"
 msgstr "_Показва анимирани изображения"
 
-#: mail/mail-config.glade.h:166
-msgid "_Signatures"
-msgstr "_Подписи"
-
-#: mail/mail-config.glade.h:167
-msgid "_Standard Font:"
-msgstr "_Стандартен Шрифт"
-
-#: mail/mail-config.glade.h:168
-msgid "_Terminal Font:"
-msgstr "_Терминален Шрифт"
-
-#: mail/mail-config.glade.h:169
-msgid "_Use secure connection (SSL):"
+#: mail/mail-config.glade.h:179
+#, fuzzy
+msgid "_Use Secure Connection (SSL):"
 msgstr "_Използва сигурни връзки (SSL)"
 
-#: mail/mail-config.glade.h:170
+#: mail/mail-config.glade.h:180
 msgid "_Use the same fonts as other applications"
 msgstr "_Използва същите шрифтове като останалите програми"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:181
 msgid "color"
 msgstr ""
 
-#: mail/mail-config.glade.h:172
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "описание"
 
-#: mail/mail-crypto.c:84
-msgid "Could not create a S/MIME signature context."
-msgstr "Не мога да създам сигнатурен контекст за S/MIME"
+#. mail:camel-service-auth-invalid primary
+#: mail/mail-errors.xml.h:2
+#, fuzzy
+msgid "Invalid authentication"
+msgstr "Удостоверение"
 
-#: mail/mail-crypto.c:116
-msgid "Could not create a S/MIME certsonly context."
+#. mail:camel-service-auth-invalid secondary
+#: mail/mail-errors.xml.h:4
+msgid ""
+"This server does not support this type of authentication and may not support "
+"authentication at all."
 msgstr ""
 
-#: mail/mail-crypto.c:148
-msgid "Could not create a S/MIME encryption context."
-msgstr "Не мога да създам S/MIME криптиращ контекст."
+#. mail:camel-service-auth-failed primary
+#: mail/mail-errors.xml.h:6
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+msgstr ""
 
-#: mail/mail-crypto.c:180
-msgid "Could not create a S/MIME envelope context."
+#. mail:camel-service-auth-failed secondary
+#: mail/mail-errors.xml.h:8
+msgid ""
+"Check to make sure your password is spelled correctly.  Remember that many "
+"passwords are case sensitive; your caps lock might be on."
 msgstr ""
 
-#: mail/mail-crypto.c:211
-msgid "Could not create a S/MIME decode context."
-msgstr "Не мога да създам декодиращ контекст за S/MIME"
+#. mail:ask-send-html primary
+#: mail/mail-errors.xml.h:10
+#, fuzzy
+msgid "Are you sure you want to send a message in HTML format?"
+msgstr "Сигурен ли сте, че искате да препратите всичките %d съобщения?"
 
-#: mail/mail-display.c:196
-#, c-format
+#. mail:ask-send-html secondary
+#: mail/mail-errors.xml.h:12
 msgid ""
-"File `%s' already exists.\n"
-"Overwrite it?"
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}\n"
+"Send anyway?"
 msgstr ""
 
-#: mail/mail-display.c:339
-msgid "Save Attachment"
-msgstr "Запазва Прикачен"
+#: mail/mail-errors.xml.h:15 mail/mail-errors.xml.h:20
+#: mail/mail-errors.xml.h:27 mail/mail-errors.xml.h:32
+#, fuzzy
+msgid "_Send"
+msgstr "Изпраща"
 
-#: mail/mail-display.c:412
-#, c-format
-msgid "Could not create temporary file '%s': %s"
+#. mail:ask-send-no-subject primary
+#: mail/mail-errors.xml.h:17
+#, fuzzy
+msgid "Are you sure you want to send a message without a subject?"
+msgstr "Сигурен ли сте, че искате да препратите всичките %d съобщения?"
+
+#. mail:ask-send-no-subject secondary
+#: mail/mail-errors.xml.h:19
+msgid ""
+"Adding a meaningful Subject line to your messages will give your recipients "
+"an idea of what your mail is about."
 msgstr ""
 
-#: mail/mail-display.c:484
-msgid "Save Attachment..."
+#. mail:ask-send-only-bcc-contact primary
+#: mail/mail-errors.xml.h:22 mail/mail-errors.xml.h:29
+#, fuzzy
+msgid "Are you sure you want to send a message with only BCC recipients?"
+msgstr "Сигурен ли сте, че искате да препратите всичките %d съобщения?"
+
+#. mail:ask-send-only-bcc-contact secondary
+#: mail/mail-errors.xml.h:24
+msgid ""
+"The contact list you are sending to is configured to hide list recipients.\n"
+"\n"
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients in "
+"your message. To avoid this, you should add at least one To: or CC: "
+"recipient. "
 msgstr ""
 
-#: mail/mail-display.c:485
-msgid "View Inline"
+#. mail:ask-send-only-bcc secondary
+#: mail/mail-errors.xml.h:31
+msgid ""
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients to "
+"your message anyway. To avoid this, you should add at least one To: or CC: "
+"recipient."
 msgstr ""
 
-#: mail/mail-display.c:486
-#, c-format
-msgid "Open in %s..."
-msgstr "Отвори в %s..."
+#. mail:send-no-recipients primary
+#: mail/mail-errors.xml.h:34
+msgid ""
+"This message cannot be sent because you have not specified any Recipients"
+msgstr ""
 
-#: mail/mail-display.c:546
-#, c-format
-msgid "View Inline (via %s)"
+#. mail:send-no-recipients secondary
+#: mail/mail-errors.xml.h:36
+msgid ""
+"Please enter a valid email address in the To: field. You can search for "
+"email addresses by clicking on the To: button next to the entry box."
 msgstr ""
 
-#: mail/mail-display.c:550
-msgid "Hide"
-msgstr "Скрий"
+#. mail:ask-default-drafts primary
+#: mail/mail-errors.xml.h:38
+msgid "Use default drafts folder?"
+msgstr ""
+
+#. mail:ask-default-drafts secondary
+#: mail/mail-errors.xml.h:40
+#, fuzzy
+msgid ""
+"Unable to open the drafts folder for this account.  Use the system drafts "
+"folder instead?"
+msgstr ""
+"Не мога да отворя папката чернова за този акаунт.\n"
+"Искате ли да използвате подразбираща се?"
 
-#: mail/mail-display.c:570
-msgid "External Viewer"
-msgstr "Външен Viewer"
+#: mail/mail-errors.xml.h:41
+#, fuzzy
+msgid "Use _Default"
+msgstr "_Стандартни"
+
+#. mail:ask-expunge primary
+#: mail/mail-errors.xml.h:43
+#, fuzzy
+msgid ""
+"Are you sure you want to permanently remove all the deleted message in "
+"folder \"{0}\"?"
+msgstr "Сигурен ли сте, че искате да изтриете папка \"%s\"?"
 
-#: mail/mail-display.c:1356
-msgid "Downloading images"
+#. mail:ask-expunge secondary
+#: mail/mail-errors.xml.h:45 mail/mail-errors.xml.h:50
+msgid "If you continue, you will not be able to recover these messages."
 msgstr ""
 
-#: mail/mail-display.c:1533
-msgid "Loading message content"
-msgstr "Зареждам съсдържанието на съобщението"
+#: mail/mail-errors.xml.h:46
+msgid "_Expunge"
+msgstr "_Задрасква"
 
-#: mail/mail-display.c:1875
-msgid "Overdue:"
+#. mail:ask-empty-trash primary
+#: mail/mail-errors.xml.h:48
+#, fuzzy
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr "Изтрива за постоянно всички съобщения от тези папки"
+
+#: mail/mail-errors.xml.h:51
+#, fuzzy
+msgid "_Empty Trash"
+msgstr "Изпразва _Кошчето"
+
+#. mail:exit-unsaved primary
+#: mail/mail-errors.xml.h:53
+msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/mail-display.c:1879
-msgid "by %B %d, %Y, %l:%M %p"
+#. mail:exit-unsaved secondary
+#: mail/mail-errors.xml.h:55
+msgid ""
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
 msgstr ""
 
-#: mail/mail-display.c:2236
-msgid "Open Link in Browser"
-msgstr "_Отвори Указател в Браузер"
+#. mail:camel-exception primary
+#: mail/mail-errors.xml.h:57
+msgid "Your message with the subject \"{0}\" was not delivered."
+msgstr ""
 
-#: mail/mail-display.c:2237
-msgid "Copy Link Location"
-msgstr "Копира местоположениет на указател"
+#. mail:camel-exception secondary
+#: mail/mail-errors.xml.h:59
+msgid ""
+"The message was sent via the \"sendmail\" external application.  Sendmail "
+"reports the following error: status 67: mail not sent.\n"
+"The message is stored in the Outbox folder.  Check the message for errors "
+"and resend."
+msgstr ""
 
-#: mail/mail-display.c:2239
-msgid "Save Link as (FIXME)"
-msgstr "Запазва указателя като (FIXME)"
+#. mail:async-error primary
+#: mail/mail-errors.xml.h:62
+#, fuzzy
+msgid "Error while {0}."
+msgstr ""
+"Грешка при '%s':\n"
+"%s"
 
-#: mail/mail-display.c:2241
-msgid "Save Image as..."
-msgstr "Съхрани картинка като..."
+#. mail:async-error secondary
+#: mail/mail-errors.xml.h:64
+msgid "{1}."
+msgstr ""
 
-#: mail/mail-folder-cache.c:745
-#, c-format
-msgid "Pinging %s"
+#. mail:async-error-nodescribe primary
+#: mail/mail-errors.xml.h:66
+#, fuzzy
+msgid "Error while performing operation."
 msgstr ""
+"Грешка при извършване на операция:\n"
+"%s"
 
-#: mail/mail-format.c:668
-#, c-format
-msgid "%s attachment"
-msgstr "%s прикачен"
+#. mail:async-error-nodescribe secondary
+#: mail/mail-errors.xml.h:68
+msgid "{0}."
+msgstr ""
 
-#: mail/mail-format.c:710 mail/mail-format.c:1528 mail/mail-format.c:1597
-#: mail/mail-format.c:1717 mail/mail-format.c:1841 mail/mail-format.c:1866
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Не мога да анализирам MIME съобщение. Показвам го в изходен код."
+#. mail:session-message-info secondary
+#: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
+#: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
+#: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
+#: mail/mail-errors.xml.h:84 mail/mail-errors.xml.h:88
+msgid "{0}"
+msgstr ""
 
-#: mail/mail-format.c:788 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Дата"
+#. mail:ask-session-password primary
+#: mail/mail-errors.xml.h:82
+#, fuzzy
+msgid "Enter password."
+msgstr "Въведедете парола"
 
-#: mail/mail-format.c:874
-msgid "Bad Address"
-msgstr "Грешен Адрес"
+#. mail:filter-load-error primary
+#: mail/mail-errors.xml.h:86
+#, fuzzy
+msgid "Error loading filter definitions."
+msgstr ""
+"Грешка при зареждане информацията за финтъра:\n"
+"%s"
 
-#: mail/mail-format.c:915 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:301
-msgid "From"
-msgstr "От"
+#. mail:no-save-path primary
+#: mail/mail-errors.xml.h:90
+#, fuzzy
+msgid "Cannot save to directory \"{0}\"."
+msgstr ""
+"Не мога да създам директория\n"
+"%s\n"
+"Грешка: %s"
 
-#: mail/mail-format.c:919
-msgid "Reply-To"
-msgstr "Отговор-До"
+#. mail:no-create-path primary
+#: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
+#: mail/mail-errors.xml.h:106
+msgid "Cannot save to file \"{0}\"."
+msgstr ""
 
-#: mail/mail-format.c:924 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "До"
+#. mail:no-create-path secondary
+#: mail/mail-errors.xml.h:96
+#, fuzzy
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr ""
+"Не мога да създам директория\n"
+"%s\n"
+"Грешка: %s"
 
-#: mail/mail-format.c:929
-msgid "Cc"
-msgstr "Cc"
+#. mail:no-create-tmp-path primary
+#: mail/mail-errors.xml.h:98
+#, fuzzy
+msgid "Cannot create temporary save directory."
+msgstr "Не мога да създам временна директория: %s"
 
-#: mail/mail-format.c:934
-msgid "Bcc"
-msgstr "Bcc"
+#. mail:no-write-path-exists secondary
+#: mail/mail-errors.xml.h:104
+#, fuzzy
+msgid "File exists but cannot overwrite it."
+msgstr "Файла съществува. Да го презапиша?"
+
+#. mail:no-write-path-notfile secondary
+#: mail/mail-errors.xml.h:108
+#, fuzzy
+msgid "File exists but is not a regular file."
+msgstr "`%s' не е обикновен файл."
 
-#: mail/mail-format.c:1640
+#. mail:no-delete-folder primary
+#: mail/mail-errors.xml.h:110
+#, fuzzy
+msgid "Cannot delete folder \"{0}\"."
+msgstr ""
+"Не мога да изтрия папката:\n"
+"%s"
+
+#. mail:no-delete-spethal-folder primary
+#: mail/mail-errors.xml.h:114
+#, fuzzy
+msgid "Cannot delete system folder \"{0}\"."
+msgstr ""
+"Не мога да изтрия папката:\n"
+"%s"
+
+#. mail:no-delete-spethal-folder secondary
+#: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
 msgid ""
-"This message is digitally signed. Click the lock icon for more information."
+"System folders are required for Ximian Evolution to function correctly and "
+"cannot be renamed, moved, or deleted."
 msgstr ""
-"Това съобщение е цифрово подписано. Кликнете на иконата за заключване за "
-"повече информация."
 
-#: mail/mail-format.c:1668
-msgid "Could not create a PGP verfication context"
+#. mail:no-rename-spethal-folder primary
+#: mail/mail-errors.xml.h:118
+#, fuzzy
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "Не мога да преименувам папката %s Няма такава папка"
+
+#. mail:ask-delete-folder title
+#: mail/mail-errors.xml.h:122
+#, fuzzy
+msgid "Delete \"{0}\"?"
+msgstr "Изтрива \"%s\""
+
+#. mail:ask-delete-folder primary
+#: mail/mail-errors.xml.h:124
+#, fuzzy
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr "На бащината папка не е разрешено да има подпапки"
+
+#. mail:ask-delete-folder secondary
+#: mail/mail-errors.xml.h:126
+msgid ""
+"If you delete the folder, all of its contents and its subfolders contents "
+"will be deleted permanently."
 msgstr ""
 
-#: mail/mail-format.c:1676
-msgid "This message is digitally signed and has been found to be authentic."
+#. mail:no-rename-folder-exists primary
+#: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
+msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr ""
 
-#: mail/mail-format.c:1683
-msgid "This message is digitally signed but can not be proven to be authentic."
+#. mail:no-rename-folder-exists secondary
+#: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
+#, fuzzy
+msgid "A folder named \"{1}\" already exists. Please use a different name."
+msgstr "Папка с име \"%s вече същесъвува. Моля, изберете различно име."
+
+#. mail:no-rename-folder secondary
+#: mail/mail-errors.xml.h:134
+msgid "Because \"{2}\"."
 msgstr ""
 
-#: mail/mail-format.c:1947
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Указател към FTP сайт (%s)"
+#. mail:no-move-folder-nostore primary
+#: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
+#, fuzzy
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "Папката %s не може да бъде преместена"
 
-#: mail/mail-format.c:1958
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Указател към локален файл (%s) валиден на сайта \"%s\""
+#. mail:no-move-folder-nostore secondary
+#: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
+#, fuzzy
+msgid "Cannot open source \"{2}\"."
+msgstr "Не мога да отворя съобщение"
 
-#: mail/mail-format.c:1961
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Указател към локален файл (%s)"
+#. mail:no-move-folder-to-nostore secondary
+#: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
+#, fuzzy
+msgid "Cannot open target \"{2}\"."
+msgstr "Не мога да отворя съобщение"
 
-#: mail/mail-format.c:1988
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Указател към отдалечени данни (%s)"
+#. mail:no-copy-folder-nostore primary
+#: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
+#, fuzzy
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgstr "Папката %s не може да бъде копирана"
 
-#: mail/mail-format.c:1994
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Указател към неизвестни външни данни (\"%s\" type)"
+#. mail:no-create-folder-nostore primary
+#: mail/mail-errors.xml.h:152
+#, fuzzy
+msgid "Cannot create folder \"{0}\"."
+msgstr ""
+"Не мога да преименувам папката:\n"
+"%s"
 
-#: mail/mail-format.c:1996
-msgid "Malformed external-body part."
+#. mail:no-create-folder-nostore secondary
+#: mail/mail-errors.xml.h:154
+#, fuzzy
+msgid "Cannot open source \"{1}\""
+msgstr "Не мога да отворя съобщение"
+
+#. mail:account-incomplete primary
+#: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
+msgid "Cannot save changes to account."
 msgstr ""
 
-#: mail/mail-local.c:541 mail/mail-local.c:543
-#, c-format
-msgid "Local folders/%s"
+#. mail:account-incomplete secondary
+#: mail/mail-errors.xml.h:158
+msgid "You have not filled in all of the required information."
+msgstr "Вие не сте попълнили всичи полета за необходимата информация."
+
+#. mail:account-notunique secondary
+#: mail/mail-errors.xml.h:162
+msgid "You may not create two accounts with the same name."
+msgstr "Вие не може да имате две сигнатури с едно име."
+
+#. mail:ask-delete-account title
+#: mail/mail-errors.xml.h:164
+#, fuzzy
+msgid "Delete account?"
+msgstr "Действително ли да изтрия акаунта?"
+
+#. mail:ask-delete-account primary
+#: mail/mail-errors.xml.h:166
+msgid "Are you sure you want to delete this account?"
+msgstr "Сигурен ли сте, че искате да изтриете този акаунт?"
+
+#. mail:ask-delete-account secondary
+#: mail/mail-errors.xml.h:168
+msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 
-#: mail/mail-local.c:671
-msgid "Reconfiguring folder"
-msgstr "Реконфигуриране на папка"
+#: mail/mail-errors.xml.h:169
+msgid "Don't delete"
+msgstr "Не изтривай"
 
-#: mail/mail-local.c:752
-#, c-format
-msgid ""
-"Cannot save folder metainfo; you may find you can't\n"
-"open this folder anymore: %s: %s"
+#. mail:no-save-signature primary
+#: mail/mail-errors.xml.h:171
+#, fuzzy
+msgid "Could not save signature file."
+msgstr "Не мога да създам сигнатурен контекст за S/MIME"
+
+#. mail:no-save-signature secondary
+#: mail/mail-errors.xml.h:173
+msgid "Because \"{0}\"."
 msgstr ""
 
-#: mail/mail-local.c:808
-#, c-format
-msgid "Cannot save folder metainfo to %s: %s"
-msgstr "Не мога да запзя мета информация в папка %s: %s"
+#. mail:signature-notscript primary
+#: mail/mail-errors.xml.h:175
+#, fuzzy
+msgid "Cannot set signature script \"{0}\"."
+msgstr "Изтрива всички сигнатури"
 
-#: mail/mail-local.c:860
-#, c-format
-msgid "Cannot delete folder metadata %s: %s"
+#. mail:signature-notscript secondary
+#: mail/mail-errors.xml.h:177
+msgid "The script file must exist and be executable."
 msgstr ""
 
-#: mail/mail-local.c:1323
-#, c-format
-msgid "Changing folder \"%s\" to \"%s\" format"
-msgstr "Променям папка \"%s\" в \"%s\" формат"
+#. mail:ask-signature-changed title
+#: mail/mail-errors.xml.h:179
+#, fuzzy
+msgid "Discard changed?"
+msgstr "_Незаписва Промени"
+
+#. mail:ask-signature-changed primary
+#: mail/mail-errors.xml.h:181
+#, fuzzy
+msgid "Do you wish to save your changes?"
+msgstr "Искате ли да съхраните промените?"
+
+#. mail:ask-signature-changed secondary
+#: mail/mail-errors.xml.h:183
+#, fuzzy
+msgid "This signature has been changed, but has not been saved."
+msgstr ""
+"Тази сигнатура е била променена, но не е запазена.\n"
+"\n"
+"Искате ли да запазите промените?"
 
-#: mail/mail-local.c:1348
+#: mail/mail-errors.xml.h:184
+msgid "_Discard changes"
+msgstr ""
+
+#. mail:vfolder-notexist primary
+#: mail/mail-errors.xml.h:186
+#, fuzzy
+msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+msgstr "Опит за редактиране на vпапка '%s' която не съществува."
+
+#. mail:vfolder-notexist secondary
+#: mail/mail-errors.xml.h:188
 msgid ""
-"If you can no longer open this mailbox, then\n"
-"you may need to repair it manually."
+"This folder may have been added implictly, go to the virtual folder editor "
+"to add it explictly, if required."
 msgstr ""
-"Ако не може повече да отваряте този mailbox,\n"
-"необходимо е да го поправите ръчно."
 
-#: mail/mail-local.c:1448
-#, c-format
-msgid "Reconfigure /%s"
-msgstr "Реконфигурира /%s"
+#. mail:vfolder-notunique primary
+#: mail/mail-errors.xml.h:190
+msgid "Cannot add vFolder \"{0}\"."
+msgstr ""
 
-#: mail/mail-local.c:1512
-msgid "You cannot change the format of a non-local folder."
-msgstr "Вие не може да промените формата на нелокална папка."
+#. mail:vfolder-updated primary
+#: mail/mail-errors.xml.h:194
+msgid "vFolders automatically updated."
+msgstr ""
 
-#: mail/mail-mt.c:257
-#, c-format
+#. mail:vfolder-updated secondary
+#: mail/mail-errors.xml.h:196
 msgid ""
-"Error while '%s':\n"
-"%s"
+"The following vFolder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
-"Грешка при '%s':\n"
-"%s"
 
-#: mail/mail-mt.c:260
-#, c-format
+#. mail:filter-updated primary
+#: mail/mail-errors.xml.h:202
+msgid "Mail filters automatically updated."
+msgstr ""
+
+#. mail:filter-updated secondary
+#: mail/mail-errors.xml.h:204
 msgid ""
-"Error while performing operation:\n"
-"%s"
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
-"Грешка при извършване на операция:\n"
-"%s"
 
-#: mail/mail-mt.c:904
-msgid "Working"
-msgstr "Работи"
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:210
+msgid "Problem migrating old mail folder \"{0}\"."
+msgstr ""
+
+#. mail:ask-migrate-existing secondary
+#: mail/mail-errors.xml.h:212
+msgid ""
+"A non-empty folder at \"{1}\" already exists.\n"
+"\n"
+"You can choose to ignore this folder, overwrite or append its contents, or "
+"quit.\n"
+msgstr ""
 
-#: mail/mail-ops.c:86
+#: mail/mail-errors.xml.h:216
+msgid "Ignore"
+msgstr ""
+
+#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#, fuzzy
+msgid "_Overwrite"
+msgstr "Презаписва"
+
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "_Append"
+msgstr "Аспен"
+
+#: mail/mail-folder-cache.c:785
+#, c-format
+msgid "Pinging %s"
+msgstr ""
+
+#: mail/mail-ops.c:98
 msgid "Filtering Folder"
 msgstr "Филтър върху папка"
 
-#: mail/mail-ops.c:264
+#: mail/mail-ops.c:259
 msgid "Fetching Mail"
 msgstr "Получаване на Пощата"
 
-#: mail/mail-ops.c:563
+#: mail/mail-ops.c:542
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr ""
 
-#: mail/mail-ops.c:584
+#: mail/mail-ops.c:567
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:593
+#: mail/mail-ops.c:576
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr ""
 
-#: mail/mail-ops.c:635
-#, c-format
-msgid "Sending \"%s\""
-msgstr "Изпращане на \"%s\""
-
-#: mail/mail-ops.c:753
+#: mail/mail-ops.c:672
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Изпращане на съпбщение %d от %d"
 
-#: mail/mail-ops.c:772
-#, c-format
-msgid "Failed on message %d of %d"
-msgstr "Грешка на съобщение %d от %d"
+#: mail/mail-ops.c:703
+#, fuzzy, c-format
+msgid "Failed to send %d of %d messages"
+msgstr "Неуспех при декодиране на съобщението"
 
-#: mail/mail-ops.c:774
+#: mail/mail-ops.c:707
 msgid "Complete."
 msgstr "Приключено."
 
-#: mail/mail-ops.c:868
+#: mail/mail-ops.c:804
 msgid "Saving message to folder"
 msgstr "Запазва съобщението в папка"
 
-#: mail/mail-ops.c:949
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Премести съобщени в %s"
 
-#: mail/mail-ops.c:949
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Копиране на съобщението в %s"
 
-#: mail/mail-ops.c:1066
+#: mail/mail-ops.c:1002
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Сканиране на папки в \"%s\""
 
-#: mail/mail-ops.c:1254
+#: mail/mail-ops.c:1115
 msgid "Forwarded messages"
 msgstr "Препратени съобщения"
 
-#: mail/mail-ops.c:1297
+#: mail/mail-ops.c:1158
 #, c-format
 msgid "Opening folder %s"
 msgstr "Отваряне на папка %s"
 
-#: mail/mail-ops.c:1369
+#: mail/mail-ops.c:1230
 #, c-format
 msgid "Opening store %s"
 msgstr "Отваря хранилище %s"
 
-#: mail/mail-ops.c:1447
+#: mail/mail-ops.c:1308
 #, c-format
 msgid "Removing folder %s"
 msgstr "Изтривам папка %s"
 
-#: mail/mail-ops.c:1541
+#: mail/mail-ops.c:1402
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Запазване на папка %s"
 
-#: mail/mail-ops.c:1592
+#: mail/mail-ops.c:1467
+#, c-format
+msgid "Expunging and storing account '%s'"
+msgstr ""
+
+#: mail/mail-ops.c:1468
+#, fuzzy, c-format
+msgid "Storing account '%s'"
+msgstr "Запазване на папка %s"
+
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr "Освежаване на папка"
 
-#: mail/mail-ops.c:1628 mail/mail-ops.c:1679
+#: mail/mail-ops.c:1559 mail/mail-ops.c:1610
 msgid "Expunging folder"
 msgstr "Изтриване на папка"
 
-#: mail/mail-ops.c:1676
+#: mail/mail-ops.c:1607
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1677 my-evolution/e-summary-mail.c:483
-#: shell/e-local-storage.c:1151
+#: mail/mail-ops.c:1608
 msgid "Local Folders"
 msgstr "Локални Папки"
 
-#: mail/mail-ops.c:1752
+#: mail/mail-ops.c:1691
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Получавам съобщение %s"
 
-#: mail/mail-ops.c:1824
-#, c-format
-msgid "Retrieving %d message(s)"
-msgstr "Получавам %d съобщение"
+#: mail/mail-ops.c:1763
+#, fuzzy, c-format
+msgid "Retrieving %d message"
+msgid_plural "Retrieving %d messages"
+msgstr[0] "Получавам %d съобщение"
+msgstr[1] "Получавам %d съобщение"
 
-#: mail/mail-ops.c:1910
-#, c-format
-msgid "Saving %d messsage(s)"
-msgstr "Съхраняване на %d съобщения"
+#: mail/mail-ops.c:1849
+#, fuzzy, c-format
+msgid "Saving %d message"
+msgid_plural "Saving %d messsages"
+msgstr[0] "Съхраняване на %d съобщения"
+msgstr[1] "Съхраняване на %d съобщения"
 
-#: mail/mail-ops.c:1958
+#: mail/mail-ops.c:1899
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13159,7 +15576,7 @@ msgstr ""
 "Не мога да създам изходен файл: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1986
+#: mail/mail-ops.c:1927
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13168,11 +15585,11 @@ msgstr ""
 "Грешка при запазване на съобщения в: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2060
+#: mail/mail-ops.c:1998
 msgid "Saving attachment"
 msgstr "Запазвам прикачено"
 
-#: mail/mail-ops.c:2077
+#: mail/mail-ops.c:2015
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13181,144 +15598,124 @@ msgstr ""
 "Не мога да създам изходен файл: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2107
+#: mail/mail-ops.c:2045
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Не мога да запиша данните: %s"
 
-#: mail/mail-ops.c:2255
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Разкачване от %s"
 
-#: mail/mail-ops.c:2255
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Отново връзка с %s"
 
-#: mail/mail-search.c:154
-msgid "(Untitled Message)"
-msgstr "(Неименувано Съобщение)"
-
-#: mail/mail-search.c:236
-msgid "Untitled Message"
-msgstr "Неименувано Съобщение"
-
-#: mail/mail-search.c:238
-msgid "Empty Message"
-msgstr "Празно Съобщение"
-
-#: mail/mail-search.c:287
-msgid "Find in Message"
-msgstr "Търси в съобщението"
-
-#: mail/mail-search.c:320
+#: mail/mail-search.glade.h:2
 msgid "Case Sensitive"
 msgstr "Със значение на малки/големи букви"
 
-#: mail/mail-search.c:322
-msgid "Search Forward"
-msgstr "Търси нататък"
+#: mail/mail-search.glade.h:3
+msgid "Find in Message"
+msgstr "Търси в съобщението"
 
-#: mail/mail-search.c:342
+#: mail/mail-search.glade.h:4
 msgid "Find:"
 msgstr "Намери:"
 
-#: mail/mail-search.c:346
-msgid "Matches:"
-msgstr "Съвпадения:"
+#: mail/mail-security.glade.h:1
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr ""
 
-#: mail/mail-send-recv.c:147
+#: mail/mail-security.glade.h:2
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr ""
+
+#: mail/mail-security.glade.h:4
+#, fuzzy
+msgid "Security Information"
+msgstr "Източник на Информация"
+
+#: mail/mail-send-recv.c:157
 msgid "Cancelling..."
 msgstr "Прекратяване..."
 
-#: mail/mail-send-recv.c:255
+#: mail/mail-send-recv.c:264
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Сървър:%s, Тип: %s"
 
-#: mail/mail-send-recv.c:257
+#: mail/mail-send-recv.c:266
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Път: %s, Тип: %s"
 
-#: mail/mail-send-recv.c:259
+#: mail/mail-send-recv.c:268
 #, c-format
 msgid "Type: %s"
 msgstr "Тип: %s"
 
-#: mail/mail-send-recv.c:308
+#: mail/mail-send-recv.c:320
 msgid "Send & Receive Mail"
 msgstr "Изпращане и Получаване на поща"
 
-#: mail/mail-send-recv.c:309
+#: mail/mail-send-recv.c:323
 msgid "Cancel _All"
 msgstr ""
 
-#: mail/mail-send-recv.c:391
+#: mail/mail-send-recv.c:412
 msgid "Updating..."
 msgstr "Обновяване ..."
 
-#: mail/mail-send-recv.c:391 mail/mail-send-recv.c:448
+#: mail/mail-send-recv.c:412 mail/mail-send-recv.c:466
 msgid "Waiting..."
 msgstr "Изчакване ..."
 
-#: mail/mail-session.c:226
+#: mail/mail-session.c:239
 msgid "User canceled operation."
 msgstr "Потребителя прекрати операцията."
 
-#: mail/mail-session.c:259
+#: mail/mail-session.c:272
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Въведедете парола за %s"
 
-#: mail/mail-session.c:261
+#: mail/mail-session.c:274
 msgid "Enter Password"
 msgstr "Въведедете парола"
 
-#: mail/mail-session.c:284
+#: mail/mail-session.c:297
 msgid "_Remember this password"
 msgstr "_Запомни тази парола"
 
-#: mail/mail-session.c:285
+#: mail/mail-session.c:298
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
-#: mail/mail-signature-editor.c:80
-#, c-format
-msgid "Could not save signature file: %s"
-msgstr ""
-
-#: mail/mail-signature-editor.c:226
-msgid ""
-"This signature has been changed, but hasn't been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Тази сигнатура е била променена, но не е запазена.\n"
-"\n"
-"Искате ли да запазите промените?"
-
-#: mail/mail-signature-editor.c:229
-msgid "_Discard changes"
-msgstr ""
-
-#: mail/mail-signature-editor.c:233
-msgid "Save signature"
-msgstr "Запазва сигнатура"
-
-#: mail/mail-signature-editor.c:382
+#: mail/mail-signature-editor.c:371
 msgid "Edit signature"
 msgstr ""
 
-#: mail/mail-signature-editor.c:422
+#: mail/mail-signature-editor.c:411
 msgid "Enter a name for this signature."
 msgstr ""
 
-#: mail/mail-signature-editor.c:425
+#: mail/mail-signature-editor.c:414
 msgid "Name:"
 msgstr "Име:"
 
+#: mail/mail-tools.c:114
+#, fuzzy, c-format
+msgid "Could not create spool directory `%s': %s"
+msgstr "Не мога да създам директория %s: %s"
+
+#: mail/mail-tools.c:141
+#, c-format
+msgid "Trying to movemail a non-mbox source `%s'"
+msgstr ""
+
 #: mail/mail-tools.c:276
 #, c-format
 msgid "Forwarded message - %s"
@@ -13328,120 +15725,99 @@ msgstr "Препратено съобщение - %s"
 msgid "Forwarded message"
 msgstr "Препратени съобщения"
 
-#: mail/mail-tools.c:459 mail/mail-tools.c:466
-msgid "Forwarded Message"
-msgstr "Препратени съобщения"
+#: mail/mail-tools.c:319
+#, fuzzy, c-format
+msgid "Invalid folder: `%s'"
+msgstr "Отваряне на папка %s"
 
-#: mail/mail-vfolder.c:92
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Настройка на vпапка %s"
 
-#: mail/mail-vfolder.c:210
-#, c-format
-msgid "Updating vfolders for uri: %s"
+#: mail/mail-vfolder.c:235
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s:%s'"
 msgstr "Обновяване на vпапки за uri: %s"
 
-#: mail/mail-vfolder.c:468
-#, c-format
-msgid ""
-"The following vFolder(s):\n"
-"%sUsed the removed folder:\n"
-"    '%s'\n"
-"And have been updated."
-msgstr ""
-
-#: mail/mail-vfolder.c:777
-msgid "VFolders"
-msgstr "VFolders"
+#: mail/mail-vfolder.c:242
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s'"
+msgstr "Обновяване на vпапки за uri: %s"
 
-#: mail/mail-vfolder.c:835
+#: mail/mail-vfolder.c:958
 msgid "vFolders"
 msgstr "vПапки"
 
-#: mail/mail-vfolder.c:874
+#: mail/mail-vfolder.c:997
 msgid "Edit VFolder"
 msgstr "Редактирай VПапки"
 
-#: mail/mail-vfolder.c:894
-#, c-format
-msgid "Trying to edit a vfolder '%s' which doesn't exist."
-msgstr "Опит за редактиране на vпапка '%s' която не съществува."
-
-#: mail/mail-vfolder.c:966
+#: mail/mail-vfolder.c:1081
 msgid "New VFolder"
 msgstr "Нов VFolder"
 
-#: mail/message-browser.c:233
-msgid "(No subject)"
-msgstr "(Няма тема)"
-
-#: mail/message-browser.c:235
-#, c-format
-msgid "%s - Message"
-msgstr "%s - съобщение"
-
-#: mail/message-list.c:741
+#: mail/message-list.c:948
 msgid "Unseen"
 msgstr "Непрегледано"
 
-#: mail/message-list.c:742
+#: mail/message-list.c:949
 msgid "Seen"
 msgstr "Прегледано"
 
-#: mail/message-list.c:743
+#: mail/message-list.c:950
 msgid "Answered"
 msgstr "Отговорено"
 
-#: mail/message-list.c:744
+#: mail/message-list.c:951
 msgid "Multiple Unseen Messages"
 msgstr "Множество Невидяни Съобщения"
 
-#: mail/message-list.c:745
+#: mail/message-list.c:952
 msgid "Multiple Messages"
 msgstr "Множество Съобщения"
 
-#: mail/message-list.c:749
+#: mail/message-list.c:956
 msgid "Lowest"
 msgstr "Най долу"
 
-#: mail/message-list.c:750
+#: mail/message-list.c:957
 msgid "Lower"
 msgstr "Ниско"
 
-#: mail/message-list.c:754
+#: mail/message-list.c:961
 msgid "Higher"
 msgstr "По Горе"
 
-#: mail/message-list.c:755
+#: mail/message-list.c:962
 msgid "Highest"
 msgstr "Най Горе"
 
-#: mail/message-list.c:1072
+#: mail/message-list.c:1285
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1079
+#: mail/message-list.c:1292
 msgid "Today %l:%M %p"
 msgstr "Днес %l:%M %p"
 
-#: mail/message-list.c:1088
+#: mail/message-list.c:1301
 msgid "Yesterday %l:%M %p"
 msgstr "Вчера %l:%M %p"
 
-#: mail/message-list.c:1100
+#: mail/message-list.c:1313
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1108
+#: mail/message-list.c:1321
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1110
+#: mail/message-list.c:1323
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:2649
+#: mail/message-list.c:3321
 msgid "Generating message list"
 msgstr "Генерирам списък на съобщенията"
 
@@ -13473,43 +15849,47 @@ msgstr "Получено"
 msgid "Size"
 msgstr "Размер"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:73
 msgid "Call"
 msgstr ""
 
-#: mail/message-tag-followup.c:63
+#: mail/message-tag-followup.c:74
 msgid "Do Not Forward"
 msgstr ""
 
-#: mail/message-tag-followup.c:64
+#: mail/message-tag-followup.c:75
 msgid "Follow-Up"
 msgstr ""
 
-#: mail/message-tag-followup.c:65
+#: mail/message-tag-followup.c:76
 msgid "For Your Information"
 msgstr ""
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:77 ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Препрати"
 
-#: mail/message-tag-followup.c:67
+#: mail/message-tag-followup.c:78
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:72
+#: mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Прочита"
+
+#: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Отговори"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:73
+#: mail/message-tag-followup.c:81 ui/evolution-mail-message.xml.h:86
 msgid "Reply to All"
 msgstr "Отговори на Всички"
 
-#: mail/message-tag-followup.c:71
+#: mail/message-tag-followup.c:82
 msgid "Review"
 msgstr ""
 
-#: mail/message-tag-followup.c:281 mail/message-tags.glade.h:3
+#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr ""
 
@@ -13524,46 +15904,14 @@ msgid ""
 msgstr ""
 
 #: mail/message-tags.glade.h:6
-msgid "_Due by:"
-msgstr ""
+#, fuzzy
+msgid "_Due By:"
+msgstr "_Крайна Дата"
 
 #: mail/message-tags.glade.h:7
 msgid "_Flag:"
 msgstr "_Флаг:"
 
-#: mail/subscribe-dialog.c:230
-#, c-format
-msgid "Scanning folders under %s on \"%s\""
-msgstr "Сканиране на папки под %s на \"%s\""
-
-#: mail/subscribe-dialog.c:232
-#, c-format
-msgid "Scanning root-level folders on \"%s\""
-msgstr "Сканиране на папки в основно ниво на \"%s\""
-
-#: mail/subscribe-dialog.c:329
-#, c-format
-msgid "Subscribing to folder \"%s\""
-msgstr "Абонамент за папка \"%s\""
-
-#: mail/subscribe-dialog.c:331
-#, c-format
-msgid "Unsubscribing to folder \"%s\""
-msgstr "Отписване от папка \"%s\""
-
-#: mail/subscribe-dialog.c:1270 mail/subscribe-dialog.etspec.h:1
-#: shell/e-storage-set-view.etspec.h:2
-msgid "Folder"
-msgstr "Папка"
-
-#: mail/subscribe-dialog.c:1499
-msgid "No server has been selected"
-msgstr "Не е избран сървър"
-
-#: mail/subscribe-dialog.c:1598
-msgid "Please select a server."
-msgstr "Моля, изберете сървър."
-
 #: mail/subscribe-dialog.glade.h:1
 msgid "Folder Subscriptions"
 msgstr ""
@@ -13577,14089 +15925,9761 @@ msgid "S_erver:"
 msgstr "С_ървър"
 
 #: mail/subscribe-dialog.glade.h:4
-msgid "Scanning folders ..."
-msgstr ""
-
-#: mail/subscribe-dialog.glade.h:5
 msgid "_Subscribe"
 msgstr "Абонирай се"
 
-#: mail/subscribe-dialog.glade.h:6
+#: mail/subscribe-dialog.glade.h:5
 msgid "_Unsubscribe"
 msgstr "О_тпиши се"
 
-#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:1
-msgid "Configure the appearance of the Evolution Summary here"
-msgstr ""
-
-#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:2
-msgid "Evolution Summary"
-msgstr ""
+#: shell/apps_evolution_shell.schemas.in.in.h:1
+#, fuzzy
+msgid "480"
+msgstr "80%"
 
-#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:3
-msgid "Evolution Summary component"
-msgstr ""
+#: shell/apps_evolution_shell.schemas.in.in.h:2
+#, fuzzy
+msgid "Default width of the folder bar pane"
+msgstr "Превключва показването на панела с папките"
 
-#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:4
-msgid "Evolution Summary configuration control"
+#: shell/apps_evolution_shell.schemas.in.in.h:3
+msgid "Default window height"
 msgstr ""
 
-#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:5
-msgid "Summary Preferences"
+#: shell/apps_evolution_shell.schemas.in.in.h:4
+msgid "Default window width"
 msgstr ""
 
-#: my-evolution/Locations.h:1
-msgid "Aarhus"
-msgstr "Аархус"
-
-#: my-evolution/Locations.h:2
-msgid "Abakan"
-msgstr "Абакан"
-
-#: my-evolution/Locations.h:3
-msgid "Abbotsford"
-msgstr "Абътсфорд"
-
-#: my-evolution/Locations.h:4
-msgid "Aberdeen"
-msgstr "Абърдиин"
-
-#: my-evolution/Locations.h:5
-msgid "Abha"
-msgstr "Абха"
-
-#: my-evolution/Locations.h:6
-msgid "Abilene"
-msgstr "Абилейн"
-
-#: my-evolution/Locations.h:7
-msgid "Abingdon"
-msgstr "Абиджан"
-
-#: my-evolution/Locations.h:8
-msgid "Abu Dhabi"
-msgstr "Абу Даби"
-
-#: my-evolution/Locations.h:9
-msgid "Abu Dhabi - Bateen"
-msgstr "Абу Даби - Батийн"
-
-#: my-evolution/Locations.h:10
-msgid "Acajutla"
-msgstr "Акаютла"
-
-#: my-evolution/Locations.h:11
-msgid "Acapulco"
-msgstr "Акапулко"
-
-#: my-evolution/Locations.h:12
-msgid "Acarigua"
-msgstr "Акаригуа"
-
-#: my-evolution/Locations.h:13
-msgid "Adak"
-msgstr "Адак"
-
-#: my-evolution/Locations.h:14
-msgid "Adana"
-msgstr "Адана"
-
-#: my-evolution/Locations.h:15
-msgid "Adana/Incirlik"
-msgstr "Адана/Инчирлик"
-
-#: my-evolution/Locations.h:16
-msgid "Adelaide"
-msgstr "Аделаида"
-
-#: my-evolution/Locations.h:17
-msgid "Aden"
-msgstr "Аден"
-
-#: my-evolution/Locations.h:18
-msgid "Adrar"
-msgstr "Адрар"
-
-#: my-evolution/Locations.h:19
-msgid "Aeroparque"
-msgstr "Аеропарк"
-
-#: my-evolution/Locations.h:20
-msgid "Aeropuerto del Norte"
-msgstr "Аеропуерто дел Норте"
-
-#: my-evolution/Locations.h:21
-msgid "Afonsos"
-msgstr "Афонсон"
-
-#: my-evolution/Locations.h:22
-msgid "Africa"
-msgstr "Африка"
-
-#: my-evolution/Locations.h:23
-msgid "Afyon"
-msgstr "Афйон"
-
-#: my-evolution/Locations.h:24
-msgid "Agen"
-msgstr "Аген"
-
-#: my-evolution/Locations.h:25
-msgid "Aguascaliantes"
-msgstr "Агуаскалиантeс"
-
-#: my-evolution/Locations.h:26
-msgid "Ahmadabad"
-msgstr "Ахмадабад"
-
-#: my-evolution/Locations.h:27
-msgid "Ahwaz"
-msgstr "Ахмаз"
-
-#: my-evolution/Locations.h:28
-msgid "Ainsworth"
-msgstr "Ейнсъурт"
-
-#: my-evolution/Locations.h:29
-msgid "Air Force"
-msgstr "Еър Форс"
-
-#: my-evolution/Locations.h:30
-msgid "Ajaccio/Campo dell'Oro"
-msgstr "Ажакио/Кампо дел Оро"
-
-#: my-evolution/Locations.h:31
-msgid "Akeno Ab"
-msgstr "Акено Аб"
-
-#: my-evolution/Locations.h:32
-msgid "Akita Airport"
-msgstr "Акита Летище"
-
-#: my-evolution/Locations.h:33
-msgid "Akron"
-msgstr "Акрон"
-
-#: my-evolution/Locations.h:34
-msgid "Akrotiri"
-msgstr "Акротири"
-
-#: my-evolution/Locations.h:35
-msgid "Alabama"
-msgstr "Алабама"
-
-#: my-evolution/Locations.h:36
-msgid "Al Ahsa"
-msgstr "Ал Ахса"
-
-#: my-evolution/Locations.h:37
-msgid "Al Ain"
-msgstr "Ал Аин"
-
-#: my-evolution/Locations.h:38
-msgid "Alamogordo"
-msgstr "Аламогордо"
-
-#: my-evolution/Locations.h:39
-msgid "Alamosa"
-msgstr "Аламоса"
-
-#: my-evolution/Locations.h:40
-msgid "Alaska"
-msgstr "Аляска"
-
-#: my-evolution/Locations.h:41
-msgid "Al Baha"
-msgstr "Ал Баха"
-
-#: my-evolution/Locations.h:43
-msgid "Albany"
-msgstr "Олбъни"
-
-#: my-evolution/Locations.h:44
-msgid "Albenga"
-msgstr "Албенга"
-
-#: my-evolution/Locations.h:45
-msgid "Alberta"
-msgstr "Алберта"
-
-#: my-evolution/Locations.h:46
-msgid "Alborg"
-msgstr "Алборг"
-
-#: my-evolution/Locations.h:47
-msgid "Albuquerque"
-msgstr "Албакърк"
-
-#: my-evolution/Locations.h:48
-msgid "Alderney"
-msgstr "Олдърни"
-
-#: my-evolution/Locations.h:49
-msgid "Alesund"
-msgstr "Алесунд"
-
-#: my-evolution/Locations.h:50
-msgid "Alexandria"
-msgstr "Александрия"
-
-#: my-evolution/Locations.h:51
-msgid "Alexandria-Esler"
-msgstr "Александрия-Еслер"
-
-#: my-evolution/Locations.h:52
-msgid "Alexandria/Nouzha"
-msgstr "Александрия/Нуза"
-
-#: my-evolution/Locations.h:53
-msgid "Alexandroupolis"
-msgstr "Александрополис"
-
-#: my-evolution/Locations.h:55
-msgid "Alghero"
-msgstr "Алгеро"
-
-#: my-evolution/Locations.h:56
-msgid "Algona"
-msgstr "Алгона"
-
-#: my-evolution/Locations.h:57
-msgid "Alicante"
-msgstr "Аликанте"
-
-#: my-evolution/Locations.h:58
-msgid "Alice"
-msgstr "Алис"
-
-#: my-evolution/Locations.h:59
-msgid "Alice Springs"
-msgstr "Алис Спрингс"
-
-#: my-evolution/Locations.h:60
-msgid "Al-Jouf"
-msgstr "Ал-Джуф"
-
-#: my-evolution/Locations.h:61
-msgid "Allentown"
-msgstr "Алентаун"
-
-#: my-evolution/Locations.h:62
-msgid "Alliance"
-msgstr "Алайънс"
-
-#: my-evolution/Locations.h:63
-msgid "Alma"
-msgstr "Алма"
-
-#: my-evolution/Locations.h:64
-msgid "Almeria"
-msgstr "Алмериа"
-
-#: my-evolution/Locations.h:65
-msgid "Alpena"
-msgstr "Алпена"
-
-#: my-evolution/Locations.h:66
-msgid "Al Qaysumah"
-msgstr "Ал Казума"
-
-#: my-evolution/Locations.h:67
-msgid "Alta"
-msgstr "Алта"
-
-#: my-evolution/Locations.h:68
-msgid "Altamira"
-msgstr "Алтамира"
-
-#: my-evolution/Locations.h:69
-msgid "Alton"
-msgstr "Алтон"
-
-#: my-evolution/Locations.h:70
-msgid "Altoona"
-msgstr "Алтуна"
-
-#: my-evolution/Locations.h:71
-msgid "Alturas"
-msgstr "Алтурас"
-
-#: my-evolution/Locations.h:72
-msgid "Altus"
-msgstr "Алтус"
-
-#: my-evolution/Locations.h:73
-msgid "Amami Airport"
-msgstr "Летище Амами"
-
-#: my-evolution/Locations.h:74
-msgid "Amapala"
-msgstr "Амапала"
-
-#: my-evolution/Locations.h:75
-msgid "Amarillo"
-msgstr "Амарило"
-
-#: my-evolution/Locations.h:76
-msgid "Amasya"
-msgstr "Амася"
-
-#: my-evolution/Locations.h:77
-msgid "Ambler"
-msgstr "Амбер"
-
-#: my-evolution/Locations.h:78
-msgid "Amelia"
-msgstr "Амелия"
-
-#: my-evolution/Locations.h:79
-msgid "Amendola"
-msgstr "Амендола"
-
-#: my-evolution/Locations.h:80
-msgid "Ames"
-msgstr "Амес"
-
-#: my-evolution/Locations.h:81
-msgid "Amritsar"
-msgstr "Амристар"
-
-#: my-evolution/Locations.h:82
-msgid "Amsterdam"
-msgstr "Амстердам"
-
-#: my-evolution/Locations.h:83
-msgid "Anadyr"
-msgstr "Анадир"
-
-#: my-evolution/Locations.h:84
-msgid "Anaktuvuk"
-msgstr "Анактувик"
-
-#: my-evolution/Locations.h:85
-msgid "Anapa"
-msgstr "Анапа"
-
-#: my-evolution/Locations.h:86
-msgid "Anchorage"
-msgstr "Анкоридж"
-
-#: my-evolution/Locations.h:87
-msgid "Anchorage - Elmendorf AFB"
-msgstr "Анкоридж - Елмендорф ВВБ"
-
-#: my-evolution/Locations.h:88
-msgid "Ancona"
-msgstr "Анкона"
-
-#: my-evolution/Locations.h:89
-msgid "Andahuayla"
-msgstr "Андауаля"
-
-#: my-evolution/Locations.h:90
-msgid "Anderson"
-msgstr "Андерсън"
-
-#: my-evolution/Locations.h:91
-msgid "Andoya"
-msgstr "Андоя"
-
-#: my-evolution/Locations.h:92
-msgid "Andravida"
-msgstr "Андравида"
-
-#: my-evolution/Locations.h:93
-msgid "Andrews AFB"
-msgstr "Андрюс ВВБ"
-
-#: my-evolution/Locations.h:94
-msgid "Angleton"
-msgstr "Ейнджълтън"
-
-#: my-evolution/Locations.h:95
-msgid "Aniak"
-msgstr "Аниак"
-
-#: my-evolution/Locations.h:96
-msgid "Ankara/Esenboga"
-msgstr "Анкара/Есенбога"
-
-#: my-evolution/Locations.h:97
-msgid "Ankara/Etimesgut"
-msgstr "Анкара/Етимесгут"
-
-#: my-evolution/Locations.h:98
-msgid "Annaba"
-msgstr "Анаба"
-
-#: my-evolution/Locations.h:99
-msgid "Ann Arbor"
-msgstr "Ан Арбър"
-
-#: my-evolution/Locations.h:100
-msgid "Annette"
-msgstr "Анет"
-
-#: my-evolution/Locations.h:101
-msgid "Anniston"
-msgstr "Анистън"
-
-#: my-evolution/Locations.h:102
-msgid "Antalya"
-msgstr "Анталиа"
-
-#: my-evolution/Locations.h:103
-msgid "Antartica"
-msgstr "Антарктика"
-
-#: my-evolution/Locations.h:104
-msgid "Antigo"
-msgstr "Антиго"
+#: shell/apps_evolution_shell.schemas.in.in.h:5
+#, fuzzy
+msgid "Evolution configuration version"
+msgstr "Фабрика за контрол на задачи в Evolution"
 
-#: my-evolution/Locations.h:105
-msgid "Antigua"
-msgstr "Антигуа"
+#: shell/apps_evolution_shell.schemas.in.in.h:6
+msgid "ID or alias of the component to be shown by default at start-up."
+msgstr ""
 
-#: my-evolution/Locations.h:106
-msgid "Antigua and Barbuda"
-msgstr "Антигуа и Барбадоса"
+#: shell/apps_evolution_shell.schemas.in.in.h:7
+msgid ""
+"If set to true, Evolution will start up in offline mode instead of online "
+"mode."
+msgstr ""
 
-#: my-evolution/Locations.h:107
-msgid "Antofagasta"
-msgstr "Антофагаста"
+#: shell/apps_evolution_shell.schemas.in.in.h:8
+msgid ""
+"If set to true, the warning dialog in development versions of Evolution is "
+"not displayed."
+msgstr ""
 
-#: my-evolution/Locations.h:108
-msgid "Antwerpen/Deurne"
-msgstr "Антверпен"
+#: shell/apps_evolution_shell.schemas.in.in.h:9
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
 
-#: my-evolution/Locations.h:109
-msgid "Aomori Airport"
-msgstr "Летище Аомори"
+#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid "Toolbar is visible"
+msgstr ""
 
-#: my-evolution/Locations.h:110
-msgid "Apalachicola"
-msgstr "Апалачикола"
+#: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid "Whether Evolution should start up in offline mode"
+msgstr ""
 
-#: my-evolution/Locations.h:111
-msgid "Appleton"
-msgstr "Епълтън"
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Whether the toolbar should be visible."
+msgstr ""
 
-#: my-evolution/Locations.h:112
-msgid "Aquadilla"
-msgstr "Акуадиля"
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+msgid "Whether to skip the development warning dialog"
+msgstr ""
 
-#: my-evolution/Locations.h:113
-msgid "Aracaju"
-msgstr "Аракаю"
+#: shell/apps_evolution_shell.schemas.in.in.h:14
+#, fuzzy
+msgid "mail"
+msgstr "Електронна поща"
 
-#: my-evolution/Locations.h:114
-msgid "Arad"
-msgstr "Арад"
+#: shell/e-shell.c:588 shell/e-shell.c:589
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d %B"
 
-#: my-evolution/Locations.h:115
-msgid "Arar"
-msgstr "Арар"
+#: shell/e-shell.c:786
+#, fuzzy
+msgid "Uknown system error."
+msgstr "Неизвестна грешка"
 
-#: my-evolution/Locations.h:116
-msgid "Araxos"
-msgstr "Араксос"
+#: shell/e-shell.c:1143
+msgid "Invalid arguments"
+msgstr "Грешни аргументи"
 
-#: my-evolution/Locations.h:117
-msgid "Arcata"
-msgstr "Арката"
+#: shell/e-shell.c:1145
+msgid "Cannot register on OAF"
+msgstr "Не мога да регистрирам в OAF"
 
-#: my-evolution/Locations.h:118
-msgid "Ardmore"
-msgstr "Ардмор"
+#: shell/e-shell.c:1147
+msgid "Configuration Database not found"
+msgstr "Конфигурационната база данни не е намерена"
 
-#: my-evolution/Locations.h:119
-msgid "Arequipa"
-msgstr "Арекипа"
+#: shell/e-shell.c:1149
+msgid "Generic error"
+msgstr "Грешка"
 
-#: my-evolution/Locations.h:121
-msgid "Arica"
-msgstr "Арика"
+#: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
+msgid "(Untitled)"
+msgstr "(Неименуван)"
 
-#: my-evolution/Locations.h:122
-msgid "Arizona"
-msgstr "Аризона"
+#: shell/e-shell-importer.c:146
+msgid "Choose the type of importer to run:"
+msgstr "Изберете типа на импортера за изпълнение:"
 
-#: my-evolution/Locations.h:123
-msgid "Arkansas"
-msgstr "Арканзас"
+#: shell/e-shell-importer.c:149
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
+"\n"
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
+msgstr ""
+"Изберете файла, който искате да импортирате в Evolution, и изберете типа му "
+"от списъка.\n"
+"\n"
+"Вие може да изберете \"Автоматично\" ако не знаете и Evolution ще се опита "
+"да го определи."
 
-#: my-evolution/Locations.h:124
-msgid "Arkhangelsk"
-msgstr "Архангелск"
+#: shell/e-shell-importer.c:155
+#, fuzzy
+msgid "Choose the destination for this import"
+msgstr "Прекъсва срещата за този пункт"
 
-#: my-evolution/Locations.h:125
-msgid "Arlington"
-msgstr "Арлинтън"
+#: shell/e-shell-importer.c:158 shell/e-shell-startup-wizard.c:748
+msgid "Please select the information that you would like to import:"
+msgstr "Моля, изберете информацията, която искате да импортирате:"
 
-#: my-evolution/Locations.h:126
-msgid "Artigas"
-msgstr "Артигас"
+#: shell/e-shell-importer.c:161
+msgid ""
+"Evolution checked for settings to import from the following\n"
+"applications: Pine, Netscape, Elm, iCalendar. No settings\n"
+"that could be imported where found. If you would like to\n"
+"try again, please click the \"Back\" button.\n"
+msgstr ""
 
-#: my-evolution/Locations.h:127
-msgid "Asahikawa Ab"
-msgstr "Асахикава ВБ"
+#: shell/e-shell-importer.c:229 shell/e-shell-importer.c:260
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item %d."
+msgstr ""
+"Импортирам %s\n"
+"Импортирам обект %d."
 
-#: my-evolution/Locations.h:128
-msgid "Asahikawa Airport"
-msgstr "Летище Асахикава"
+#: shell/e-shell-importer.c:333
+msgid "Select importer"
+msgstr "Избира импортер"
 
-#: my-evolution/Locations.h:129
-msgid "Ashburnam"
-msgstr "Ашбърнам"
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
+#, c-format
+msgid "File %s does not exist"
+msgstr "Файлът `%s' не съществува."
 
-#: my-evolution/Locations.h:130
-msgid "Asheville"
-msgstr "Ашвил"
+#: shell/e-shell-importer.c:459
+msgid "Importing"
+msgstr "Импортира"
 
-#: my-evolution/Locations.h:131
-msgid "Ashfield"
-msgstr "Ашфилд"
+#: shell/e-shell-importer.c:467
+#, fuzzy, c-format
+msgid "Importing %s.\n"
+msgstr "Импортира"
 
-#: my-evolution/Locations.h:132
-msgid "Ashiya Ab"
-msgstr "Ашя ВБ"
+#: shell/e-shell-importer.c:477 shell/e-shell-importer.c:478
+#, c-format
+msgid "Error loading %s"
+msgstr "Грешка при зареждането на %s"
 
-#: my-evolution/Locations.h:133
-msgid "Ashland"
-msgstr "Ашланд"
+#: shell/e-shell-importer.c:495
+#, c-format
+msgid ""
+"Importing %s\n"
+"Importing item 1."
+msgstr ""
+"Импортирам %s\n"
+"Импортирам обект 1."
 
-#: my-evolution/Locations.h:134
-msgid "Asia"
-msgstr "Азия"
+#: shell/e-shell-importer.c:570
+msgid "Automatic"
+msgstr "Автоматично"
 
-#: my-evolution/Locations.h:135
-msgid "Aspen"
-msgstr "Аспен"
+#: shell/e-shell-importer.c:626
+#, fuzzy
+msgid "F_ilename:"
+msgstr "Име на файл:"
 
-#: my-evolution/Locations.h:136
-msgid "Asswan"
-msgstr "Асуан"
+#: shell/e-shell-importer.c:631
+msgid "Select a file"
+msgstr "Избира файл"
 
-#: my-evolution/Locations.h:137
-msgid "Astoria"
-msgstr "Астория"
+#: shell/e-shell-importer.c:642
+#, fuzzy
+msgid "File _type:"
+msgstr "Тип на файл:"
 
-#: my-evolution/Locations.h:138
-msgid "Astrakhan"
-msgstr "Астрахан"
+#: shell/e-shell-importer.c:681
+#, fuzzy
+msgid "Import data and settings from _older programs"
+msgstr "Импорт на данни и настройки от стари програми"
 
-#: my-evolution/Locations.h:139
-msgid "Asturias"
-msgstr "Астурия"
+#: shell/e-shell-importer.c:684
+#, fuzzy
+msgid "Import a _single file"
+msgstr "Импорт на единичен файл"
 
-#: my-evolution/Locations.h:140
-msgid "Asuncion"
-msgstr "Асонсион"
+#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
+msgid ""
+"Please wait...\n"
+"Scanning for existing setups"
+msgstr ""
+"Моля, изчакайте...\n"
+"Сканирам за съществуващи настройки"
 
-#: my-evolution/Locations.h:141
-msgid "Athens"
-msgstr "Атина"
+#: shell/e-shell-importer.c:756
+msgid "Starting Intelligent Importers"
+msgstr "Стартира Интелигентно Импортиране"
 
-#: my-evolution/Locations.h:142
-msgid "Athinai"
-msgstr "Атина"
+#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
+#, c-format
+msgid "From %s:"
+msgstr "От %s:"
 
-#: my-evolution/Locations.h:143
-msgid "Atlanta"
-msgstr "Атланта"
+#: shell/e-shell-importer.c:1073
+#, fuzzy, c-format
+msgid "No importer available for file %s"
+msgstr "Няма наличен доставчик за протокол `%s'"
 
-#: my-evolution/Locations.h:144
-msgid "Atlantic"
-msgstr "Атлантик"
+#: shell/e-shell-importer.c:1085
+#, fuzzy
+msgid "Unable to execute importer"
+msgstr "Избира импортер"
 
-#: my-evolution/Locations.h:145
-msgid "Atlantic City"
-msgstr "Атлантик Сити"
+#: shell/e-shell-importer.c:1199
+#, fuzzy
+msgid "_Import"
+msgstr "Вмъква"
 
-#: my-evolution/Locations.h:146
-msgid "Atsugi US NAS"
-msgstr "ВМ База Ацуги на САЩ"
+#: shell/e-shell-offline-handler.c:594
+msgid "Closing connections..."
+msgstr "Затварям връзката..."
 
-#: my-evolution/Locations.h:147
-msgid "Auburn"
-msgstr "Обърн"
+#: shell/e-shell-settings-dialog.c:326
+msgid "Evolution Settings"
+msgstr "Настройки на Evolution"
 
-#: my-evolution/Locations.h:148
-msgid "Auckland"
-msgstr "Оклънд"
+#: shell/e-shell-startup-wizard.c:575
+msgid "Starting import"
+msgstr "Стартира внасяне"
 
-#: my-evolution/Locations.h:149
-msgid "Augsburg"
-msgstr "Аугсбург"
+#: shell/e-shell-startup-wizard.c:795
+msgid ""
+"If you quit the Evolution Setup Assistant now, all of the information that "
+"you have entered will be forgotten. You will need to run this assistant "
+"again before using Evolution.\n"
+"\n"
+"Do you want to quit using the Assistant now?"
+msgstr ""
 
-#: my-evolution/Locations.h:150
-msgid "Augusta"
-msgstr "Аугуста"
+#: shell/e-shell-utils.c:116
+msgid "No folder name specified."
+msgstr "Папката няма име."
 
-#: my-evolution/Locations.h:151
-msgid "Aurora"
-msgstr "Аврора"
+#: shell/e-shell-utils.c:123
+msgid "Folder name cannot contain the Return character."
+msgstr "В името на папката не може да се съдържа символа 'Return'"
 
-#: my-evolution/Locations.h:152
-msgid "Austin"
-msgstr "Остин"
+#: shell/e-shell-utils.c:129
+msgid "Folder name cannot contain the character \"/\"."
+msgstr "В името на папката не може да се съдържа символа 'Return"
 
-#: my-evolution/Locations.h:153
-msgid "Australasia"
-msgstr "Австралазия"
+#: shell/e-shell-utils.c:135
+msgid "Folder name cannot contain the character \"#\"."
+msgstr ""
 
-#: my-evolution/Locations.h:156
-msgid "Avalon"
-msgstr "Авалон"
+#: shell/e-shell-utils.c:141
+msgid "'.' and '..' are reserved folder names."
+msgstr "'.' и '..' са запазени имена на папка."
 
-#: my-evolution/Locations.h:157
-msgid "Aviano"
-msgstr "Авиано"
+#: shell/e-shell-window.c:337
+#, fuzzy
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Ximian· Evolution в момента е 'online'.  Натиснете този бутон за да го "
+"превключите в режим 'offline'."
 
-#: my-evolution/Locations.h:158
-msgid "Ayacucho"
-msgstr "Аякучо"
+#: shell/e-shell-window.c:344
+#, fuzzy
+msgid "Evolution is in the process of going offline."
+msgstr "Ximian Evolution е в процес на преминаване на режим 'offline'."
 
-#: my-evolution/Locations.h:159
-msgid "Bage"
-msgstr "Бейдж"
+#: shell/e-shell-window.c:350
+#, fuzzy
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"Evolution  в момента е 'offline.'  Натиснете този бутон за да го превключите "
+"в 'online' режим."
 
-#: my-evolution/Locations.h:160
-msgid "Bagotville"
-msgstr "Баготвил"
+#: shell/e-shell-window.c:637
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "Mail до %s"
 
-#: my-evolution/Locations.h:162
-msgid "Bahia Blanca"
-msgstr "Бая Бланка"
+#: shell/e-shell-window-commands.c:66
+msgid "The GNOME Pilot tools do not appear to be installed on this system."
+msgstr "Инструмента GNOME Pilot изглежда не е инсталиран на тази система"
 
-#: my-evolution/Locations.h:163
-msgid "Bahias de Huatulco"
-msgstr "Бая де Хатулко"
+#: shell/e-shell-window-commands.c:74
+#, c-format
+msgid "Error executing %s."
+msgstr "Грешка при изпълнение на %s"
 
-#: my-evolution/Locations.h:165
-msgid "Baker City"
-msgstr "Бейкър сити"
+#: shell/e-shell-window-commands.c:123
+msgid "Bug buddy is not installed."
+msgstr "Bug·buddy не е инсталиран."
 
-#: my-evolution/Locations.h:166
-msgid "Bakersfield"
-msgstr "Бейкърсфилд"
+#: shell/e-shell-window-commands.c:131
+msgid "Bug buddy could not be run."
+msgstr "Bug buddy не може да бъде стартиран."
 
-#: my-evolution/Locations.h:167
-msgid "Bale-Mulhouse"
-msgstr "Бал-Мюлуз"
+#: shell/e-shell-window-commands.c:323
+msgid "Groupware Suite"
+msgstr ""
 
-#: my-evolution/Locations.h:168
-msgid "Balikesir"
-msgstr "Баликезир"
+#: shell/e-shell-window-commands.c:563
+msgid "_Work Online"
+msgstr "Работа в 'O_nline режим' "
 
-#: my-evolution/Locations.h:169
-msgid "Balikesir/Bandirma"
-msgstr "Баликезир/Бандирма"
+#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
+msgid "_Work Offline"
+msgstr "Работа в '_Offline режим'"
 
-#: my-evolution/Locations.h:170
-msgid "Ball Mountain"
-msgstr "Бол Маунтин"
+#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
+msgid "Work Offline"
+msgstr "Работа в 'Offline режим'"
 
-#: my-evolution/Locations.h:171
-msgid "Baltimore"
-msgstr "Балтимор"
+#: shell/e-storage-set-view.etspec.h:1
+msgid "Checkbox"
+msgstr ""
 
-#: my-evolution/Locations.h:172
-msgid "Baltimore-Glen Burnie"
-msgstr "Балтимор-Глен Бърни"
+#: shell/e-user-creatable-items-handler.c:691
+msgid "New"
+msgstr "Нов"
 
-#: my-evolution/Locations.h:173
-msgid "Banak"
-msgstr "Банак"
+#: shell/evolution-test-component.c:140
+#, fuzzy
+msgid "New Test"
+msgstr "Нова Задача"
 
-#: my-evolution/Locations.h:174
-msgid "Bandarabbass"
-msgstr "Бандарабас"
+#: shell/evolution-test-component.c:141
+#, fuzzy
+msgid "_Test"
+msgstr "Тест"
 
-#: my-evolution/Locations.h:175
-msgid "Bangor"
-msgstr "Бангор"
+#: shell/evolution-test-component.c:142
+#, fuzzy
+msgid "Create a new test item"
+msgstr "Създава нова задача"
 
-#: my-evolution/Locations.h:176
-msgid "Baracoa"
-msgstr "Баракао"
+#: shell/glade/e-active-connection-dialog.glade.h:1
+#, fuzzy
+msgid "<b>Active Connections</b>"
+msgstr "Активни Връзки"
 
-#: my-evolution/Locations.h:177
-msgid "Barbers Point"
-msgstr "Барбърс Поинт"
+#: shell/glade/e-active-connection-dialog.glade.h:2
+msgid "Active Connections"
+msgstr "Активни Връзки"
 
-#: my-evolution/Locations.h:178
-msgid "Barcelona"
-msgstr "Барселона"
+#: shell/glade/e-active-connection-dialog.glade.h:3
+msgid "Click OK to close these connections and go offline"
+msgstr "Натиснете OK за да затворите връзките и да преминете в 'offline'"
 
-#: my-evolution/Locations.h:179
-msgid "Bardufoss"
-msgstr "Бардуфос"
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+msgid "C_alendar:"
+msgstr "К_алендар:"
 
-#: my-evolution/Locations.h:180
-msgid "Bar Harbor"
-msgstr "Бар Харбър"
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+msgid "_Contacts:"
+msgstr "_Контакт"
 
-#: my-evolution/Locations.h:181
-msgid "Bari"
-msgstr "Бари"
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+msgid "_Mail:"
+msgstr "_Поща"
 
-#: my-evolution/Locations.h:182
-msgid "Bariloche"
-msgstr "Барилоче"
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+msgid "_Tasks:"
+msgstr "_Задачи"
 
-#: my-evolution/Locations.h:183
-msgid "Barinas"
-msgstr "Баринас"
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+msgid "Folder _type:"
+msgstr "Тип_папка:"
 
-#: my-evolution/Locations.h:184
-msgid "Barking Sand"
-msgstr "Баркинг Санд"
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Open Other User's Folder"
+msgstr "Отваря Папката на Друг Потребител"
 
-#: my-evolution/Locations.h:185
-msgid "Barksdale"
-msgstr "Барксдейл"
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "_Account:"
+msgstr "_Акаунт:"
 
-#: my-evolution/Locations.h:186
-msgid "Barnaul"
-msgstr "Барнаул"
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+msgid "_Folder Name:"
+msgstr "_Име на папката:"
 
-#: my-evolution/Locations.h:187
-msgid "Barquisimeto"
-msgstr "Баркисимето"
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+msgid "_User:"
+msgstr "_Потребител"
 
-#: my-evolution/Locations.h:188
-msgid "Barranquilla/Ernestocortissoz"
-msgstr "Баранкила/Енрестокортизос"
+#: shell/glade/evolution-startup-wizard.glade.h:2
+msgid "Evolution Setup Assistant"
+msgstr "Асистент за Настройка на Evolution"
 
-#: my-evolution/Locations.h:189
-msgid "Barrow"
-msgstr "Бароу"
+#: shell/glade/evolution-startup-wizard.glade.h:3
+msgid "Importing Files"
+msgstr "Импортира Файлове"
 
-#: my-evolution/Locations.h:190
-msgid "Barter Island"
-msgstr "Остров Бартър"
+#: shell/glade/evolution-startup-wizard.glade.h:4
+msgid "Timezone "
+msgstr "Времева Зона: "
 
-#: my-evolution/Locations.h:191
-msgid "Bartlesville"
-msgstr "Бартълсвил"
+#: shell/glade/evolution-startup-wizard.glade.h:5
+msgid "Welcome"
+msgstr "Добре Дошли"
 
-#: my-evolution/Locations.h:192
-msgid "Bartow"
-msgstr "Бартоу"
+#: shell/glade/evolution-startup-wizard.glade.h:6
+msgid ""
+"Welcome to Evolution. The next few screens will allow\n"
+"Evolution to connect to your email accounts, and to import\n"
+"files from other applications. \n"
+"\n"
+"Please click the \"Forward\" button to continue. "
+msgstr ""
 
-#: my-evolution/Locations.h:193
-msgid "Bastia"
-msgstr "Бастия"
+#: shell/glade/evolution-startup-wizard.glade.h:11
+msgid ""
+"You have successfully entered all of the information\n"
+"needed to set up Evolution. \n"
+"\n"
+"Click the \"Apply\" button to save your settings. "
+msgstr ""
 
-#: my-evolution/Locations.h:194
-msgid "Batesville"
-msgstr "Бейтсвил"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Обвивка на Evolution"
 
-#: my-evolution/Locations.h:195
-msgid "Batman"
-msgstr "Батман"
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Test"
+msgstr "Evolution"
 
-#: my-evolution/Locations.h:196
-msgid "Baton Rouge"
-msgstr "Батън Руж"
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Test component"
+msgstr "Компонент за Адресната книга на Evolution"
 
-#: my-evolution/Locations.h:197
-msgid "Battle Creek"
-msgstr "Батъл Крийк"
+#: shell/importer/import.glade.h:1
+msgid "Click \"Import\" to begin importing the file into Evolution. "
+msgstr "Натиснете \"Импорт\" за да започне импортирането на файла в Evolution."
 
-#: my-evolution/Locations.h:198
-msgid "Battle Mountain"
-msgstr "Батъл Маунтин"
+#: shell/importer/import.glade.h:2
+msgid "Evolution Import Assistant"
+msgstr "Помощ за Импортиране на Evolution"
 
-#: my-evolution/Locations.h:199
-msgid "Bauru"
-msgstr "Бауру"
+#: shell/importer/import.glade.h:3
+#, fuzzy
+msgid "Import File"
+msgstr "Импортира Файлове"
 
-#: my-evolution/Locations.h:200
-msgid "Bayamo"
-msgstr "Баямо"
+#: shell/importer/import.glade.h:4
+#, fuzzy
+msgid "Import Location"
+msgstr ""
+"\n"
+"Географско местонахождение: "
 
-#: my-evolution/Locations.h:201
-msgid "Bayreuth"
-msgstr "Бейрот"
+#: shell/importer/import.glade.h:5
+#, fuzzy
+msgid "Importer Type"
+msgstr "Импортери"
 
-#: my-evolution/Locations.h:202
-msgid "Beatrice"
-msgstr "Беатрис"
+#: shell/importer/import.glade.h:6
+#, fuzzy
+msgid "Select Importers"
+msgstr "Избира импортер"
 
-#: my-evolution/Locations.h:203
-msgid "Beaufort"
-msgstr "Бофорт"
+#: shell/importer/import.glade.h:7
+#, fuzzy
+msgid "Select a File"
+msgstr "Избира файл"
 
-#: my-evolution/Locations.h:204
-msgid "Beaumont"
-msgstr "Бомонт"
+#: shell/importer/import.glade.h:8
+msgid ""
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of\n"
+"importing external files into Evolution."
+msgstr ""
+"Добре дошли в помощника за импортиране на Evolution.\n"
+"С него ще бъдете подпомогнати в процеса на импортиране\n"
+"на външни файлове в Evolution."
 
-#: my-evolution/Locations.h:205
-msgid "Beaumont-Port Arthur"
-msgstr "Бомонт-Порт Артър"
+#: shell/importer/intelligent.c:193
+msgid "Importers"
+msgstr "Импортери"
 
-#: my-evolution/Locations.h:206
-msgid "Beauvais-Tille"
-msgstr "Буво-Тил"
+#: shell/importer/intelligent.c:195 smime/gui/smime-ui.glade.h:28
+msgid "Import"
+msgstr "Вмъква"
 
-#: my-evolution/Locations.h:207
-msgid "Beauvechain"
-msgstr "Бовешан"
+#: shell/importer/intelligent.c:199
+msgid "Don't import"
+msgstr "Не импортирай"
 
-#: my-evolution/Locations.h:208
-msgid "Beckley"
-msgstr "Бекли"
+#: shell/importer/intelligent.c:203
+msgid "Don't ask me again"
+msgstr "Не ме питай отново"
 
-#: my-evolution/Locations.h:209
-msgid "Bedford"
-msgstr "Бедфорт"
+#: shell/importer/intelligent.c:211
+msgid "Evolution can import data from the following files:"
+msgstr "Evolution не може да импортира данни от следните файлове:"
 
-#: my-evolution/Locations.h:210
-msgid "Beijing"
-msgstr "Пекин"
+#. Preview/Alpha/Beta version warning message
+#: shell/main.c:231
+#, no-c-format
+msgid ""
+"Hi.  Thanks for taking the time to download this preview release\n"
+"of the Evolution groupware suite.\n"
+"\n"
+"This version of Evolution is not yet complete. It is getting close,\n"
+"but some features are either unfinished or do not work properly.\n"
+"\n"
+"If you want a stable version of Evolution, we urge you to uninstall\n"
+"this version, and install version %s instead.\n"
+"\n"
+"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
+"This product comes with no warranty and is not intended for\n"
+"individuals prone to violent fits of anger.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we\n"
+"eagerly await your contributions!\n"
+msgstr ""
 
-#: my-evolution/Locations.h:211
-msgid "Beirut"
-msgstr "Бейрут"
+#: shell/main.c:255
+#, fuzzy
+msgid ""
+"Thanks\n"
+"The Evolution Team\n"
+msgstr ""
+"Благодарности\n"
+"От екипа на Ximian·Evolution\n"
 
-#: my-evolution/Locations.h:212
-msgid "Beja"
-msgstr "Бея"
+#: shell/main.c:262
+msgid "Don't tell me again"
+msgstr "Не ми казвай отново"
 
-#: my-evolution/Locations.h:213
-msgid "Belem"
-msgstr "Белем"
+#: shell/main.c:496
+msgid "Start Evolution activating the specified component"
+msgstr ""
 
-#: my-evolution/Locations.h:214
-msgid "Belfast/Aldergrove"
-msgstr "Белфаст/Елдъргроув"
+#: shell/main.c:498
+msgid "Start in offline mode"
+msgstr "Стартира в \"offline\" режим"
 
-#: my-evolution/Locations.h:215
-msgid "Belfast/Harbour"
-msgstr "Белфаст/Харбър"
+#: shell/main.c:500
+msgid "Start in online mode"
+msgstr "Стартира в \"online\" режим"
 
-#: my-evolution/Locations.h:217
-msgid "Belgorod"
-msgstr "Белгород"
+#: shell/main.c:503
+msgid "Forcibly shut down all evolution components"
+msgstr ""
 
-#: my-evolution/Locations.h:219
-msgid "Belleville"
-msgstr "Белвил"
+#: shell/main.c:507
+msgid "Forcibly re-migrate from Evolution 1.4"
+msgstr ""
 
-#: my-evolution/Locations.h:220
-msgid "Bellingham"
-msgstr "Белингам"
+#: shell/main.c:510
+msgid "Send the debugging output of all components to a file."
+msgstr "Изпраща изхода от дебъга на всички компоненти във файл."
 
-#: my-evolution/Locations.h:221
-msgid "Belmar-Farmingdale"
-msgstr "Белмар-Фармингдейл"
+#: shell/main.c:534
+msgid "Evolution"
+msgstr "Evolution"
 
-#: my-evolution/Locations.h:222
-msgid "Belo Horizonte"
-msgstr "Бело Оризонте"
+#: shell/main.c:538
+#, c-format
+msgid ""
+"%s: --online and --offline cannot be used together.\n"
+"  Use %s --help for more information.\n"
+msgstr ""
 
-#: my-evolution/Locations.h:223
-msgid "Belo Horizonte Apt"
-msgstr "Бело Оризонте Апт"
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+msgid "Insufficient disk space for upgrade."
+msgstr ""
 
-#: my-evolution/Locations.h:224
-msgid "Bemidji"
-msgstr "Бемиджи"
+#. shell:upgrade-nospace secondary
+#: shell/shell-errors.xml.h:4
+msgid ""
+"Upgrading your data and settings will require upto {0} of disk space, but "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"can continue."
+msgstr ""
 
-#: my-evolution/Locations.h:225
-msgid "Benbecula"
-msgstr "Бенбакула"
+#. shell:upgrade-failed primary
+#: shell/shell-errors.xml.h:8
+msgid ""
+"Upgrade from previous version failed:\n"
+"{0}"
+msgstr ""
 
-#: my-evolution/Locations.h:226
-msgid "Benina"
-msgstr "Бенина"
+#. shell:upgrade-failed secondary
+#: shell/shell-errors.xml.h:11
+msgid ""
+"{1}\n"
+"\n"
+"If you choose to continue, you may not have access to some of your old "
+"data.\n"
+msgstr ""
 
-#: my-evolution/Locations.h:227
-msgid "Benton Harbor"
-msgstr "Бентън Харбър"
+#: shell/shell-errors.xml.h:15
+#, fuzzy
+msgid "Continue"
+msgstr "Константин"
 
-#: my-evolution/Locations.h:228
-msgid "Bentonville"
-msgstr "Бентонвил"
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "Относно Evolution"
 
-#: my-evolution/Locations.h:229
-msgid "Beograd"
-msgstr "Белград"
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+msgstr "Помощник на Evolution за Акаунти"
 
-#: my-evolution/Locations.h:230
-msgid "Bergamo"
-msgstr "Бергамо"
+#. shell:noshell secondary
+#: shell/shell-errors.xml.h:21
+msgid ""
+"Your system configuration does not match your Evolution configuration.\n"
+"\n"
+"Click help for details"
+msgstr ""
 
-#: my-evolution/Locations.h:231
-msgid "Bergen"
-msgstr "Берген"
+#. shell:noshell-reason secondary
+#: shell/shell-errors.xml.h:29
+msgid ""
+"Your system configuration does not match your Evolution configuration:\n"
+"\n"
+"{0}\n"
+"\n"
+"Click help for details."
+msgstr ""
 
-#: my-evolution/Locations.h:232
-msgid "Bergstrom AFB"
-msgstr "ВВБ Бергстрьом"
+#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
+#: smime/gui/certificate-manager.c:556
+#, fuzzy
+msgid "Select a cert to import..."
+msgstr "Избира импортер"
 
-#: my-evolution/Locations.h:233
-msgid "Berlevag"
-msgstr "Берлеваг"
+#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
+#: smime/gui/certificate-manager.c:638
+#, fuzzy
+msgid "Certificate Name"
+msgstr "_Сертифициран ID:"
 
-#: my-evolution/Locations.h:234
-msgid "Berlin"
-msgstr "Берлин"
+#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
+#, fuzzy
+msgid "Purposes"
+msgstr "Прогрес"
 
-#: my-evolution/Locations.h:235
-msgid "Berlin-Tegel"
-msgstr "Берлин-Тегел"
+#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:569
+msgid "Serial Number"
+msgstr ""
 
-#: my-evolution/Locations.h:236
-msgid "Berlin-Tempelhof"
-msgstr "Берлин-Темпелхов"
+#: smime/gui/certificate-manager.c:271
+#, fuzzy
+msgid "Expires"
+msgstr "Израз"
 
-#: my-evolution/Locations.h:237
-msgid "Bern"
-msgstr "Берн"
+#: smime/gui/certificate-manager.c:446
+#, fuzzy
+msgid "E-Mail Address"
+msgstr "Адрес на ел. поща"
 
-#: my-evolution/Locations.h:238
-msgid "Bethel"
-msgstr "Бетел"
+#: smime/gui/certificate-viewer.c:334
+#, fuzzy, c-format
+msgid "Certificate Viewer: %s"
+msgstr "_Сертифициран ID:"
 
-#: my-evolution/Locations.h:239
-msgid "Bethlehem Airport"
-msgstr "Летище Бетълхем"
+#: smime/gui/component.c:45
+#, fuzzy, c-format
+msgid "Enter the password for `%s'"
+msgstr "Въведедете парола за %s"
 
-#: my-evolution/Locations.h:240
-msgid "Bettles"
-msgstr "Бетълс"
+#. we're setting the password initially
+#: smime/gui/component.c:68
+#, fuzzy
+msgid "Enter new password for certificate database"
+msgstr "%sВъведете парола за·%s·(потребител·%s)"
 
-#: my-evolution/Locations.h:241
-msgid "Beverly"
-msgstr "Бевърли"
+#: smime/gui/component.c:70
+#, fuzzy
+msgid "Enter new password"
+msgstr "Въведедете парола"
 
-#: my-evolution/Locations.h:242
-msgid "Biarritz-Bayonne"
-msgstr "Биариц-Бейон"
+#. FIXME: add serial no, validity date, uses
+#: smime/gui/e-cert-selector.c:121
+#, c-format
+msgid ""
+"Issued to:\n"
+"  Subject: %s\n"
+msgstr ""
 
-#: my-evolution/Locations.h:243
-msgid "Bicycle Lake"
-msgstr "Байсикъл Лейк"
+#: smime/gui/e-cert-selector.c:122
+#, c-format
+msgid ""
+"Issued by:\n"
+"  Subject: %s\n"
+msgstr ""
 
-#: my-evolution/Locations.h:244
-msgid "Biggin Hill"
-msgstr "Бигин Хил"
+#: smime/gui/e-cert-selector.c:169
+#, fuzzy
+msgid "Select certificate"
+msgstr "Избира файл"
 
-#: my-evolution/Locations.h:245
-msgid "Big Piney"
-msgstr "Биг Пини"
+#: smime/gui/smime-ui.glade.h:1
+msgid "<Not Part of Certificate>"
+msgstr ""
 
-#: my-evolution/Locations.h:246
-msgid "Big River Lake"
-msgstr "Биг Ривър Лейк"
+#: smime/gui/smime-ui.glade.h:2
+msgid "<b>Certificate Fields</b>"
+msgstr ""
 
-#: my-evolution/Locations.h:247
-msgid "Bilbao"
-msgstr "Билбао"
+#: smime/gui/smime-ui.glade.h:3
+msgid "<b>Certificate Hierarchy</b>"
+msgstr ""
 
-#: my-evolution/Locations.h:248
-msgid "Billings"
-msgstr "Билингс"
+#: smime/gui/smime-ui.glade.h:4
+msgid "<b>Field Value</b>"
+msgstr ""
 
-#: my-evolution/Locations.h:249
-msgid "Billund"
-msgstr "Билунд"
+#: smime/gui/smime-ui.glade.h:5
+msgid "<b>Fingerprints</b>"
+msgstr ""
 
-#: my-evolution/Locations.h:250
-msgid "Binghamton"
-msgstr "Бингамтън"
+#: smime/gui/smime-ui.glade.h:6
+msgid "<b>Issued By</b>"
+msgstr ""
 
-#: my-evolution/Locations.h:251
-msgid "Birmingham"
-msgstr "Бирмингам"
+#: smime/gui/smime-ui.glade.h:7
+msgid "<b>Issued To</b>"
+msgstr ""
 
-#: my-evolution/Locations.h:252
-msgid "Bisha"
-msgstr "Биша"
+#: smime/gui/smime-ui.glade.h:8
+msgid "<b>This certificate has been verified for the following uses:</b>"
+msgstr ""
 
-#: my-evolution/Locations.h:253
-msgid "Bishop"
-msgstr "Бишоп"
+#: smime/gui/smime-ui.glade.h:9
+#, fuzzy
+msgid "<b>Validity</b>"
+msgstr "<b>Започва:</b>·"
 
-#: my-evolution/Locations.h:254
-msgid "Bismark"
-msgstr "Бисмарк"
+#: smime/gui/smime-ui.glade.h:10
+#, fuzzy
+msgid "Authorities"
+msgstr "Автоматично"
 
-#: my-evolution/Locations.h:255
-msgid "Blackpool"
+#: smime/gui/smime-ui.glade.h:11
+#, fuzzy
+msgid "Backup"
 msgstr "Блякпул"
 
-#: my-evolution/Locations.h:256
-msgid "Blagoveschensk"
-msgstr "Благовещенск"
-
-#: my-evolution/Locations.h:257
-msgid "Blanding"
-msgstr "Бландинг"
-
-#: my-evolution/Locations.h:258
-msgid "Block Island"
-msgstr "Блок Айлънд"
-
-#: my-evolution/Locations.h:259
-msgid "Bloemfontein J. B. M. Hertzog "
-msgstr "Блумфонтейн Дж. Б.М. Херцог"
-
-#: my-evolution/Locations.h:260
-msgid "Bloomington"
-msgstr "Блумингтън"
-
-#: my-evolution/Locations.h:261
-msgid "Blue Canyon"
-msgstr "Блу Кениън"
-
-#: my-evolution/Locations.h:262
-msgid "Bluefield"
-msgstr "Блуфилд"
-
-#: my-evolution/Locations.h:263
-msgid "Bluefields"
-msgstr "Блуфилдс"
-
-#: my-evolution/Locations.h:264
-msgid "Blythe"
-msgstr "Блаит"
-
-#: my-evolution/Locations.h:265
-msgid "Boa Vista"
-msgstr "Боависта"
-
-#: my-evolution/Locations.h:266
-msgid "Bocas del Toro"
-msgstr "Бока дел Торо"
-
-#: my-evolution/Locations.h:267
-msgid "Bodo"
-msgstr "Бодо"
-
-#: my-evolution/Locations.h:268
-msgid "Bogota/Eldorado"
-msgstr "Богота"
-
-#: my-evolution/Locations.h:269
-msgid "Boise"
-msgstr "Боа"
-
-#: my-evolution/Locations.h:271
-msgid "Bologna"
-msgstr "Болоня"
-
-#: my-evolution/Locations.h:272
-msgid "Bolzano"
-msgstr "Болзано"
-
-#: my-evolution/Locations.h:273
-msgid "Bombay/Santacruz"
-msgstr "Бомбай"
-
-#: my-evolution/Locations.h:274
-msgid "Boone"
-msgstr "Буун"
-
-#: my-evolution/Locations.h:275
-msgid "Bordeaux"
-msgstr "Бордо"
-
-#: my-evolution/Locations.h:276
-msgid "Borger"
-msgstr "Боргер"
-
-#: my-evolution/Locations.h:277
-msgid "Bornholm"
-msgstr "Борнхолм"
-
-#: my-evolution/Locations.h:278
-msgid "Boscombe Down"
-msgstr "Боскомб Даун"
-
-#: my-evolution/Locations.h:279
-msgid "Bosnia-Herzegovina"
-msgstr "Босна-Херцеговина"
-
-#: my-evolution/Locations.h:280
-msgid "Boston"
-msgstr "Бостън"
-
-#: my-evolution/Locations.h:281
-msgid "Boulmer"
-msgstr "Боулмър"
-
-#: my-evolution/Locations.h:282
-msgid "Bourges"
-msgstr "Бургес"
-
-#: my-evolution/Locations.h:283
-msgid "Bournemouth"
-msgstr "Бърнемот"
-
-#: my-evolution/Locations.h:284
-msgid "Bowling Green"
-msgstr "Боулинг Грийн"
-
-#: my-evolution/Locations.h:285
-msgid "Bozeman"
-msgstr "Боземан"
-
-#: my-evolution/Locations.h:286
-msgid "Bradford"
-msgstr "Брадфорт"
-
-#: my-evolution/Locations.h:287
-msgid "Bradshaw Field"
-msgstr "Брадшоу фийлд"
-
-#: my-evolution/Locations.h:288
-msgid "Brainerd"
-msgstr "Брейнърд"
-
-#: my-evolution/Locations.h:289
-msgid "Brasilia"
-msgstr "Бразилия"
-
-#: my-evolution/Locations.h:290
-msgid "Brasschaat"
-msgstr "Брашат"
-
-#: my-evolution/Locations.h:291
-msgid "Bratislava"
-msgstr "Братислава"
-
-#: my-evolution/Locations.h:292
-msgid "Bratsk"
-msgstr "Братск"
-
-#: my-evolution/Locations.h:293
-msgid "Braunschweig"
-msgstr "Брауншвайг"
-
-#: my-evolution/Locations.h:295
-msgid "Bremen"
-msgstr "Бремен"
-
-#: my-evolution/Locations.h:296
-msgid "Bremerton"
-msgstr "Бремертън"
-
-#: my-evolution/Locations.h:297
-msgid "Brest"
-msgstr "Брест"
-
-#: my-evolution/Locations.h:298
-msgid "Bridgeport"
-msgstr "Бриджпорт"
-
-#: my-evolution/Locations.h:299
-msgid "Brindisi"
-msgstr "Бриндизи"
-
-#: my-evolution/Locations.h:300
-msgid "Brisbane"
-msgstr "Брисбейн"
-
-#: my-evolution/Locations.h:301
-msgid "Bristol"
-msgstr "Бристол"
-
-#: my-evolution/Locations.h:302
-msgid "British Columbia"
-msgstr "Британска Колумбия"
-
-#: my-evolution/Locations.h:303
-msgid "Brno"
-msgstr "Бърно"
-
-#: my-evolution/Locations.h:304
-msgid "Broadus"
-msgstr "Бродъс"
-
-#: my-evolution/Locations.h:305
-msgid "Broken Bow"
-msgstr "Броукън Боу"
-
-#: my-evolution/Locations.h:306
-msgid "Bronnoysund"
-msgstr "Бронойсунд"
-
-#: my-evolution/Locations.h:307
-msgid "Brookings"
-msgstr "Брукингс"
-
-#: my-evolution/Locations.h:308
-msgid "Brooksville"
-msgstr "Бруксвил"
-
-#: my-evolution/Locations.h:309
-msgid "Broome"
-msgstr "Бруме"
-
-#: my-evolution/Locations.h:310
-msgid "Brownsville"
-msgstr "Бронсвил"
-
-#: my-evolution/Locations.h:311
-msgid "Brunswick"
-msgstr "Брунсуик"
-
-#: my-evolution/Locations.h:312
-msgid "Brussels-National Airport"
-msgstr "Брюксел Национално летище"
-
-#: my-evolution/Locations.h:313
-msgid "Bryansk"
-msgstr "Брянск"
-
-#: my-evolution/Locations.h:314
-msgid "Bryce Canyon"
-msgstr "Брайс Кениън"
-
-#: my-evolution/Locations.h:315
-msgid "Bucaramanga/Palonegro"
-msgstr "Букараманга/Палонегро"
-
-#: my-evolution/Locations.h:316
-msgid "Bucuresti"
-msgstr "Букурещ"
-
-#: my-evolution/Locations.h:317
-msgid "Bucuresti-Otopeni"
-msgstr "Букурещ-Отопени"
-
-#: my-evolution/Locations.h:318
-msgid "Budapest"
-msgstr "Будапеща"
-
-#: my-evolution/Locations.h:319
-msgid "Buffalo"
-msgstr "Буфало"
-
-#: my-evolution/Locations.h:321
-msgid "Bullfrog"
-msgstr "Булфрог"
-
-#: my-evolution/Locations.h:322
-msgid "Burbank"
-msgstr "Бурбанк"
-
-#: my-evolution/Locations.h:323
-msgid "Burgas"
-msgstr "Бургас"
-
-#: my-evolution/Locations.h:324
-msgid "Burley"
-msgstr "Бурлей"
-
-#: my-evolution/Locations.h:325
-msgid "Burlington"
-msgstr "Бърлингтън"
-
-#: my-evolution/Locations.h:326
-msgid "Burnet"
-msgstr "Бурнет"
-
-#: my-evolution/Locations.h:327
-msgid "Burns"
-msgstr "Бърнс"
-
-#: my-evolution/Locations.h:328
-msgid "Bursa"
-msgstr "Бурса"
-
-#: my-evolution/Locations.h:329
-msgid "Burwell"
-msgstr "Бъруел"
-
-#: my-evolution/Locations.h:330
-msgid "Butte"
-msgstr "Бът"
-
-#: my-evolution/Locations.h:331
-msgid "Caen-Carpiquet"
-msgstr "Каен-Карпик"
-
-#: my-evolution/Locations.h:332
-msgid "Cagliari"
-msgstr "Каляри"
-
-#: my-evolution/Locations.h:333
-msgid "Cairns"
-msgstr "Кеърнс"
-
-#: my-evolution/Locations.h:334
-msgid "Cairo"
-msgstr "Кайро"
-
-#: my-evolution/Locations.h:335
-msgid "Calabozo"
-msgstr "Калабозо"
-
-#: my-evolution/Locations.h:336
-msgid "Calcutta/Dum Dum"
-msgstr "Калкута"
-
-#: my-evolution/Locations.h:337
-msgid "Caldwell"
-msgstr "Колдуел"
-
-#: my-evolution/Locations.h:338
-msgid "Calgary"
-msgstr "Калгари"
-
-#: my-evolution/Locations.h:339
-msgid "Cali/Alfonso Bonillaaragon"
-msgstr "Кали/Алфонсо Бониларгон"
-
-#: my-evolution/Locations.h:340
-msgid "Caliente"
-msgstr "Калиенте"
-
-#: my-evolution/Locations.h:341
-msgid "California"
-msgstr "Калифорния"
-
-#: my-evolution/Locations.h:342
-msgid "Calvi-Ste-Catherine"
-msgstr "Калви-Катерин"
-
-#: my-evolution/Locations.h:343
-msgid "Camaguey"
-msgstr "Камагуа"
-
-#: my-evolution/Locations.h:344
-msgid "Camarillo"
-msgstr "Камарило"
-
-#: my-evolution/Locations.h:345
-msgid "Cambridge"
-msgstr "Кембридж"
-
-#: my-evolution/Locations.h:346
-msgid "Cameron"
-msgstr "Камерун"
-
-#: my-evolution/Locations.h:347
-msgid "Camiri"
-msgstr "Камири"
-
-#: my-evolution/Locations.h:348
-msgid "Campeche"
-msgstr "Кампече"
-
-#: my-evolution/Locations.h:349
-msgid "Campinas"
-msgstr "Кампинас"
-
-#: my-evolution/Locations.h:350
-msgid "Campo"
-msgstr "Кампо"
-
-#: my-evolution/Locations.h:351
-msgid "Campo Grande"
-msgstr "Кампо Гранде"
-
-#: my-evolution/Locations.h:352
-msgid "Camp Stanley/H-207"
-msgstr "Кемп Стенли/H-207"
-
-#: my-evolution/Locations.h:353
-msgid "Canaan"
-msgstr "Канан"
-
-#: my-evolution/Locations.h:355
-msgid "Canarias/Fuerteventura"
-msgstr "Канрски/Фуертевентура"
-
-#: my-evolution/Locations.h:356
-msgid "Canarias/Gran Canaria"
-msgstr "Канарски/Гранд Канари"
-
-#: my-evolution/Locations.h:357
-msgid "Canarias/Hierro"
-msgstr "Канари/Хиеро"
-
-#: my-evolution/Locations.h:358
-msgid "Canarias/Lanzarote"
-msgstr "Канари/Ланзароте"
-
-#: my-evolution/Locations.h:359
-msgid "Canarias/La Palma"
-msgstr "Канари/Ла Палма"
-
-#: my-evolution/Locations.h:360
-msgid "Canarias/Tenerife Norte"
-msgstr "Канари/Тенариф Норте"
-
-#: my-evolution/Locations.h:361
-msgid "Canarias/Tenerife Sur"
-msgstr "Канари/Тенерифе Сур"
-
-#: my-evolution/Locations.h:362
-msgid "Canberra"
-msgstr "Канбера"
-
-#: my-evolution/Locations.h:363
-msgid "Cancun"
-msgstr "Канкун"
-
-#: my-evolution/Locations.h:364
-msgid "Cannes-Mandelieu"
-msgstr "Кан-Мандельо"
-
-#: my-evolution/Locations.h:365
-msgid "Cantwell"
-msgstr "Кантуел"
-
-#: my-evolution/Locations.h:366
-msgid "Cape Girardeau"
-msgstr "Кейп Жирардо"
-
-#: my-evolution/Locations.h:367
-msgid "Cape Hatteras"
-msgstr "Кейп Хатерас"
-
-#: my-evolution/Locations.h:368
-msgid "Cape Lisburne"
-msgstr "Кейп Лисбърн"
-
-#: my-evolution/Locations.h:369
-msgid "Cape Newenham"
-msgstr "Кейп Нюенхам"
-
-#: my-evolution/Locations.h:370
-msgid "Cape Romanzoff"
-msgstr "Кейп Романцов"
-
-#: my-evolution/Locations.h:371
-msgid "Cape Town D. F. Malan "
-msgstr "Кейп Таун Д.Ф. Малан"
-
-#: my-evolution/Locations.h:372
-msgid "Capitan Corbeta"
-msgstr "Капитан Корбета"
-
-#: my-evolution/Locations.h:373
-msgid "Capo Mele"
-msgstr "Капо Меле"
-
-#: my-evolution/Locations.h:374
-msgid "Caracas La Carlota"
-msgstr "Каракас Ла Карлота"
-
-#: my-evolution/Locations.h:375
-msgid "Caracas Maiquetia"
-msgstr "Каракас Маикетя"
-
-#: my-evolution/Locations.h:376
-msgid "Caravelas"
-msgstr "Каравелас"
-
-#: my-evolution/Locations.h:377
-msgid "Carbondale"
-msgstr "Карбъндейл"
-
-#: my-evolution/Locations.h:378
-msgid "Cardiff"
-msgstr "Кардиф"
-
-#: my-evolution/Locations.h:379
-msgid "Caribou"
-msgstr "Карибу"
-
-#: my-evolution/Locations.h:380
-msgid "Carlisle"
-msgstr "Карлайл"
-
-#: my-evolution/Locations.h:381
-msgid "Carlsbad"
-msgstr "Карсбад"
-
-#: my-evolution/Locations.h:382
-msgid "Carroll"
-msgstr "Карол"
-
-#: my-evolution/Locations.h:383
-msgid "Cartagena/Rafael Nunez"
-msgstr "Картаген/Рафаел Нунез"
-
-#: my-evolution/Locations.h:384
-msgid "Casa Granda"
-msgstr "Каса Гранда"
-
-#: my-evolution/Locations.h:385
-msgid "Cascade"
-msgstr "Каскейд"
-
-#: my-evolution/Locations.h:386
-msgid "Casper"
-msgstr "Каспер"
-
-#: my-evolution/Locations.h:387
-msgid "Catacamas"
-msgstr "Катакамас"
-
-#: my-evolution/Locations.h:388
-msgid "Catania"
-msgstr "Катаниа"
-
-#: my-evolution/Locations.h:390
-msgid "Cayo Largo del Sur"
-msgstr "Кайо Ларго дел Сур"
-
-#: my-evolution/Locations.h:391
-msgid "Cazaux"
-msgstr "Казо"
-
-#: my-evolution/Locations.h:392
-msgid "Cecil NAS"
-msgstr "ВМБ Сесил"
-
-#: my-evolution/Locations.h:393
-msgid "Cedar City"
-msgstr "Сидър Сити"
-
-#: my-evolution/Locations.h:394
-msgid "Cedar Rapids"
-msgstr "Сидър Рапидс"
-
-#: my-evolution/Locations.h:395
-msgid "Central and South America"
-msgstr "Центална и Южна Америка"
-
-#: my-evolution/Locations.h:396
-msgid "Cervia"
-msgstr "Сервиа"
-
-#: my-evolution/Locations.h:397
-msgid "Chacarita"
-msgstr "Чакарита"
-
-#: my-evolution/Locations.h:398
-msgid "Chadron"
-msgstr "Шадрон"
-
-#: my-evolution/Locations.h:399
-msgid "Challis"
-msgstr "Чалис"
-
-#: my-evolution/Locations.h:400
-msgid "Chamberlain"
-msgstr "Чембърлейн"
-
-#: my-evolution/Locations.h:401
-msgid "Chambery"
-msgstr "Чамбери"
-
-#: my-evolution/Locations.h:402
-msgid "Champaign"
-msgstr "Шампейн"
-
-#: my-evolution/Locations.h:403
-msgid "Chandalar Lake"
-msgstr "Чандлар Лейк"
-
-#: my-evolution/Locations.h:404
-msgid "Chandler"
-msgstr "Чандлър"
-
-#: my-evolution/Locations.h:405
-msgid "Chania"
-msgstr "Чаниа"
-
-#: my-evolution/Locations.h:406
-msgid "Chanute"
-msgstr "Шанут"
-
-#: my-evolution/Locations.h:407
-msgid "Chariton"
-msgstr "Чаритън"
-
-#: my-evolution/Locations.h:408
-msgid "Charleroi-Brussels South"
-msgstr "Шарлероа-Брюксел Юг"
-
-#: my-evolution/Locations.h:409
-msgid "Charles City"
-msgstr "Шарл Сити"
-
-#: my-evolution/Locations.h:410
-msgid "Charleston"
-msgstr "Чарлстън"
-
-#: my-evolution/Locations.h:411
-msgid "Charlotte"
-msgstr "Шарлът"
-
-#: my-evolution/Locations.h:412
-msgid "Charlottesville"
-msgstr "Шарлътсвил"
-
-#: my-evolution/Locations.h:413
-msgid "Chatham"
-msgstr "Чатъм"
-
-#: my-evolution/Locations.h:414
-msgid "Chattanooga"
-msgstr "Чатануга"
-
-#: my-evolution/Locations.h:415
-msgid "Cheboksary"
-msgstr "Чебоксари"
-
-#: my-evolution/Locations.h:416
-msgid "Cheju"
-msgstr "Чежу"
-
-#: my-evolution/Locations.h:417
-msgid "Chelyabinsk"
-msgstr "Челябинск"
-
-#: my-evolution/Locations.h:418
-msgid "Chengdu"
-msgstr "Ченду"
-
-#: my-evolution/Locations.h:419
-msgid "Cherbourg"
-msgstr "Шербург"
-
-#: my-evolution/Locations.h:420
-msgid "Cherry Point"
-msgstr "Чери Поинт"
-
-#: my-evolution/Locations.h:421
-msgid "Chetumal"
-msgstr "Шетумал"
-
-#: my-evolution/Locations.h:422
-msgid "Cheyenne"
-msgstr "Чейен"
-
-#: my-evolution/Locations.h:423
-msgid "Chiang Kai Shek"
-msgstr "Чанг Каи Шек"
-
-#: my-evolution/Locations.h:424
-msgid "Chia Tung"
-msgstr "Чиа Тунг"
-
-#: my-evolution/Locations.h:425
-msgid "Chiayi"
-msgstr "Чиаюи"
-
-#: my-evolution/Locations.h:426
-msgid "Chicago-DuPage"
-msgstr "Чикаго-ДюПейдж"
-
-#: my-evolution/Locations.h:427
-msgid "Chicago-Lakefront"
-msgstr "Чикаго=Лейкфронт"
-
-#: my-evolution/Locations.h:428
-msgid "Chicago-Midway"
-msgstr "Чикаго-Мидуей"
-
-#: my-evolution/Locations.h:429
-msgid "Chicago-O'Hare"
-msgstr "Чикаго-О'Хеър"
-
-#: my-evolution/Locations.h:430
-msgid "Chichijima"
-msgstr "Чичиджима"
-
-#: my-evolution/Locations.h:431
-msgid "Chiclayo"
-msgstr "Чиклиайо"
-
-#: my-evolution/Locations.h:432
-msgid "Chico"
-msgstr "Чико"
-
-#: my-evolution/Locations.h:433
-msgid "Chicopee Falls"
-msgstr "Чикъпи Фолс"
-
-#: my-evolution/Locations.h:434
-msgid "Chievres"
-msgstr "Шевре"
-
-#: my-evolution/Locations.h:435
-msgid "Chihhang"
-msgstr "Чихан"
-
-#: my-evolution/Locations.h:436
-msgid "Chihuahua"
-msgstr "Чихуахуа"
-
-#: my-evolution/Locations.h:437
-msgid "Childress"
-msgstr "Чилдрес"
-
-#: my-evolution/Locations.h:439
-msgid "China Lake"
-msgstr "Чайна Лейк"
-
-#: my-evolution/Locations.h:440
-msgid "Chinandega"
-msgstr "Чинандега"
-
-#: my-evolution/Locations.h:441
-msgid "Chinmem/Shatou"
-msgstr "Чинмем/Шату"
-
-#: my-evolution/Locations.h:442
-msgid "Chino"
-msgstr "Чино"
-
-#: my-evolution/Locations.h:443
-msgid "Chippewa County"
-msgstr "Чипеуа Каунти"
-
-#: my-evolution/Locations.h:444
-msgid "Chita"
-msgstr "Чита"
-
-#: my-evolution/Locations.h:445
-msgid "Chitose Ab"
-msgstr "ВБ Читоуз"
-
-#: my-evolution/Locations.h:446
-msgid "Chitose ASDF"
-msgstr "Читоуз ВСБ"
-
-#: my-evolution/Locations.h:447
-msgid "Chofu Airport"
-msgstr "Летище Чофу"
-
-#: my-evolution/Locations.h:448
-msgid "Choluteca"
-msgstr "Чолутека"
-
-#: my-evolution/Locations.h:449
-msgid "Chongju Ab"
-msgstr "ВБ Чонгджи"
-
-#: my-evolution/Locations.h:450
-msgid "Christchurch"
-msgstr "Крайстчърч"
-
-#: my-evolution/Locations.h:452
-msgid "Chulitna"
-msgstr "Чулитна"
-
-#: my-evolution/Locations.h:453
-msgid "Churchill"
-msgstr "Чърчил"
-
-#: my-evolution/Locations.h:454
-msgid "Churchill Falls"
-msgstr "Чърчил Фолс"
-
-#: my-evolution/Locations.h:455
-msgid "Cincinnati"
-msgstr "Синсинати"
-
-#: my-evolution/Locations.h:456
-msgid "Circle City"
-msgstr "Съркъл Сити"
-
-#: my-evolution/Locations.h:457
-msgid "Ciudad Bolivar"
-msgstr "Сюдад Боливар"
-
-#: my-evolution/Locations.h:458
-msgid "Ciudad del Carmen"
-msgstr "Сюдад дел Кармен"
-
-#: my-evolution/Locations.h:459
-msgid "Ciudad Juarez"
-msgstr "Сюдад Хуарез"
-
-#: my-evolution/Locations.h:460
-msgid "Ciudad Obregon"
-msgstr "Сюдад Обрегон"
-
-#: my-evolution/Locations.h:461
-msgid "Ciudad Victoria"
-msgstr "Сюдад Викториа"
-
-#: my-evolution/Locations.h:462
-msgid "Clarinda"
-msgstr "Кларинда"
-
-#: my-evolution/Locations.h:463
-msgid "Clarion"
-msgstr "Кларион"
-
-#: my-evolution/Locations.h:464
-msgid "Clarksburg"
-msgstr "Кларксбърг"
-
-#: my-evolution/Locations.h:465
-msgid "Clayton"
-msgstr "Клейтън"
+#: smime/gui/smime-ui.glade.h:12
+#, fuzzy
+msgid "Backup All"
+msgstr "Блякпул"
 
-#: my-evolution/Locations.h:466
-msgid "Clayton Lake"
-msgstr "Клейтън Лейк"
+#: smime/gui/smime-ui.glade.h:13
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
 
-#: my-evolution/Locations.h:467
-msgid "Clermont-Ferrand"
-msgstr "Клермон Феранд"
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
+#, fuzzy
+msgid "Certificate"
+msgstr "_Сертифициран ID:"
 
-#: my-evolution/Locations.h:468
-msgid "Cleveland"
-msgstr "Кливлънд"
+#: smime/gui/smime-ui.glade.h:15
+msgid "Certificate Authority Trust"
+msgstr ""
 
-#: my-evolution/Locations.h:469
-msgid "Cleveland/Cuyahoga"
-msgstr "Кливлънд/Каяхога"
+#: smime/gui/smime-ui.glade.h:16
+#, fuzzy
+msgid "Certificate details"
+msgstr "_Сертифициран ID:"
 
-#: my-evolution/Locations.h:470
-msgid "Cleveland-Lakefront"
-msgstr "Кливлънд-Лейкфронт"
+#: smime/gui/smime-ui.glade.h:17
+#, fuzzy
+msgid "Common Name (CN)"
+msgstr "Общо име"
 
-#: my-evolution/Locations.h:471
-msgid "Clinton"
-msgstr "Клинън"
+#: smime/gui/smime-ui.glade.h:18
+#, fuzzy
+msgid "Contact Certificates"
+msgstr "_Сертифициран ID:"
 
-#: my-evolution/Locations.h:472
-msgid "Clovis-Cannon AFB"
-msgstr "ВВБ Кловис-Кенън"
+#: smime/gui/smime-ui.glade.h:20
+msgid "Do not trust the authenticity of this certificate"
+msgstr ""
 
-#: my-evolution/Locations.h:473
-msgid "Cobija"
-msgstr "Кобия"
+#: smime/gui/smime-ui.glade.h:21
+msgid "Dummy window only"
+msgstr ""
 
-#: my-evolution/Locations.h:474
-msgid "Cochabamba"
-msgstr "Кочабамба"
+#: smime/gui/smime-ui.glade.h:22
+#, fuzzy
+msgid "Edit"
+msgstr "_Редактира"
 
-#: my-evolution/Locations.h:475
-msgid "Cocoa Beach"
-msgstr "Кокоа Бийч"
+#: smime/gui/smime-ui.glade.h:23
+msgid "Email Certificate Trust Settings"
+msgstr ""
 
-#: my-evolution/Locations.h:476
-msgid "Cocos Island"
-msgstr "Кокосов остров"
+#: smime/gui/smime-ui.glade.h:24
+msgid "Email Recipient Certificate"
+msgstr ""
 
-#: my-evolution/Locations.h:477
-msgid "Cody"
-msgstr "Коуди"
+#: smime/gui/smime-ui.glade.h:25
+#, fuzzy
+msgid "Email Signer Certificate"
+msgstr "Неуспех при проверка на сертификати"
 
-#: my-evolution/Locations.h:478
-msgid "Coeur d'Alene"
-msgstr "Кор д'Ален"
+#: smime/gui/smime-ui.glade.h:26
+#, fuzzy
+msgid "Expires On"
+msgstr "Израз"
 
-#: my-evolution/Locations.h:479
-msgid "Cold Bay"
-msgstr "Колд Бей"
+#: smime/gui/smime-ui.glade.h:29
+msgid "Issued On"
+msgstr ""
 
-#: my-evolution/Locations.h:480
-msgid "Colima"
-msgstr "Колима"
+#: smime/gui/smime-ui.glade.h:30
+msgid "MD5 Fingerprint"
+msgstr ""
 
-#: my-evolution/Locations.h:481
-msgid "College Station"
-msgstr "Колидж Стейшън"
+#: smime/gui/smime-ui.glade.h:31
+#, fuzzy
+msgid "Organization (O)"
+msgstr "Организация"
 
-#: my-evolution/Locations.h:482
-msgid "Colmar-Meyenheim"
-msgstr "Колмар-Майнхайм"
+#: smime/gui/smime-ui.glade.h:32
+#, fuzzy
+msgid "Organizational Unit (OU)"
+msgstr "Организационна Единица"
 
-#: my-evolution/Locations.h:484
-msgid "Colonia"
-msgstr "Колония"
+#: smime/gui/smime-ui.glade.h:33
+msgid "SHA1 Fingerprint"
+msgstr ""
 
-#: my-evolution/Locations.h:485
-msgid "Colorado"
-msgstr "Колорадо"
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
+msgid "SSL Client Certificate"
+msgstr ""
 
-#: my-evolution/Locations.h:486
-msgid "Colorado Springs"
-msgstr "Колорадо Спрингс"
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
+msgid "SSL Server Certificate"
+msgstr ""
 
-#: my-evolution/Locations.h:487
-msgid "Columbia"
-msgstr "Колумбия"
+#: smime/gui/smime-ui.glade.h:37
+msgid "Trust the authenticity of this certificate"
+msgstr ""
 
-#: my-evolution/Locations.h:488
-msgid "Columbia-McEntire"
-msgstr "Колумбия-Макинтайър"
+#: smime/gui/smime-ui.glade.h:38
+msgid "Trust this CA to identify email users."
+msgstr ""
 
-#: my-evolution/Locations.h:489
-msgid "Columbus"
-msgstr "Кълъмбъс"
+#: smime/gui/smime-ui.glade.h:39
+msgid "Trust this CA to identify software developers."
+msgstr ""
 
-#: my-evolution/Locations.h:490
-msgid "Columbus-Fort Benning"
-msgstr "Кълъмбъс-Форт Бенинг"
+#: smime/gui/smime-ui.glade.h:40
+msgid "Trust this CA to identify web sites."
+msgstr ""
 
-#: my-evolution/Locations.h:491
-msgid "Columbus-Gahanna"
-msgstr "Кълъмбъс-Гахана"
+#: smime/gui/smime-ui.glade.h:41
+#, fuzzy
+msgid "View"
+msgstr "_Изглед"
 
-#: my-evolution/Locations.h:492
-msgid "Columbus-OSU"
-msgstr "Кълъмбъс-OSU"
+#: smime/gui/smime-ui.glade.h:42
+msgid "You have certificates from these organizations that identify you:"
+msgstr ""
 
-#: my-evolution/Locations.h:493
-msgid "Columbus-W Point-Starkville"
-msgstr "Кълъмбъс-У Поинт-Старквил"
+#: smime/gui/smime-ui.glade.h:43
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
+msgstr ""
 
-#: my-evolution/Locations.h:494
-msgid "Colville"
-msgstr "Колвил"
+#: smime/gui/smime-ui.glade.h:44
+msgid "You have certificates on file that identify these people:"
+msgstr ""
 
-#: my-evolution/Locations.h:495
-msgid "Comodoro Rivadavia"
-msgstr "Комодоро Ривадавиа"
+#: smime/gui/smime-ui.glade.h:45
+#, fuzzy
+msgid "Your Certificates"
+msgstr "_Сертифициран ID:"
 
-#: my-evolution/Locations.h:496
-msgid "Comox"
-msgstr "Комокс"
+#: smime/gui/smime-ui.glade.h:46
+msgid "_Edit CA Trust"
+msgstr ""
 
-#: my-evolution/Locations.h:497
-msgid "Conceicao Do Araguaia"
-msgstr "Консейсао До Арагуая"
+#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
+#, fuzzy
+msgid "%d/%m/%Y"
+msgstr "%m/%d/%Y"
 
-#: my-evolution/Locations.h:498
-msgid "Concepcion"
-msgstr "Концепсион"
+#. x509 certificate usage types
+#: smime/lib/e-cert.c:424
+#, fuzzy
+msgid "Sign"
+msgstr "PGP подпис"
 
-#: my-evolution/Locations.h:499
-msgid "Concord"
-msgstr "Конкорд"
+#: smime/lib/e-cert.c:425
+#, fuzzy
+msgid "Encrypt"
+msgstr "PGP криптиране"
 
-#: my-evolution/Locations.h:500
-msgid "Concordia"
-msgstr "Конкордия"
+#: smime/lib/e-cert.c:530
+#, fuzzy
+msgid "Version"
+msgstr "Върмонт"
 
-#: my-evolution/Locations.h:501
-msgid "Connaught"
-msgstr "Конот"
+#: smime/lib/e-cert.c:545
+#, fuzzy
+msgid "Version 1"
+msgstr "Върмонт"
 
-#: my-evolution/Locations.h:502
-msgid "Connecticut"
-msgstr "Кънектикът"
+#: smime/lib/e-cert.c:548
+#, fuzzy
+msgid "Version 2"
+msgstr "Върмонт"
 
-#: my-evolution/Locations.h:503
-msgid "Conroe"
-msgstr "Конроу"
+#: smime/lib/e-cert.c:551
+#, fuzzy
+msgid "Version 3"
+msgstr "Върмонт"
 
-#: my-evolution/Locations.h:504
-msgid "Constantine"
-msgstr "Константин"
+#: smime/lib/e-cert.c:633
+msgid "PKCS #1 MD2 With RSA Encryption"
+msgstr ""
 
-#: my-evolution/Locations.h:505
-msgid "Copper Harbor"
-msgstr "Копър Харбър"
+#: smime/lib/e-cert.c:636
+msgid "PKCS #1 MD5 With RSA Encryption"
+msgstr ""
 
-#: my-evolution/Locations.h:506
-msgid "Cordoba"
-msgstr "Кордоба"
+#: smime/lib/e-cert.c:639
+msgid "PKCS #1 SHA-1 With RSA Encryption"
+msgstr ""
 
-#: my-evolution/Locations.h:507
-msgid "Cordova"
-msgstr "Кордова"
+#: smime/lib/e-cert.c:642
+#, fuzzy
+msgid "C"
+msgstr " C"
 
-#: my-evolution/Locations.h:508
-msgid "Cork"
-msgstr "Корк"
+#: smime/lib/e-cert.c:645
+#, fuzzy
+msgid "CN"
+msgstr "С"
 
-#: my-evolution/Locations.h:509
-msgid "Coro"
-msgstr "Коро"
+#: smime/lib/e-cert.c:648
+msgid "OU"
+msgstr ""
 
-#: my-evolution/Locations.h:510
-msgid "Corona"
-msgstr "Корона"
+#: smime/lib/e-cert.c:651
+#, fuzzy
+msgid "O"
+msgstr "Да"
 
-#: my-evolution/Locations.h:511
-msgid "Corpus Christi"
-msgstr "Корпус Кристи"
+#: smime/lib/e-cert.c:654
+msgid "L"
+msgstr ""
 
-#: my-evolution/Locations.h:512
-msgid "Corpus Christi NAS"
-msgstr "ВВБ Корпус Кристи"
+#: smime/lib/e-cert.c:657
+#, fuzzy
+msgid "DN"
+msgstr "С"
 
-#: my-evolution/Locations.h:513
-msgid "Corrientes"
-msgstr "Кориентес"
+#: smime/lib/e-cert.c:660
+msgid "DC"
+msgstr ""
 
-#: my-evolution/Locations.h:514
-msgid "Corsicana"
-msgstr "Корсикана"
+#: smime/lib/e-cert.c:663
+#, fuzzy
+msgid "ST"
+msgstr "SMTP"
 
-#: my-evolution/Locations.h:515
-msgid "Cortez"
-msgstr "Кортез"
+#: smime/lib/e-cert.c:666
+msgid "PKCS #1 RSA Encryption"
+msgstr ""
 
-#: my-evolution/Locations.h:516
-msgid "Corumba"
-msgstr "Корумба"
+#: smime/lib/e-cert.c:669
+#, fuzzy
+msgid "Certificate Key Usage"
+msgstr "_Сертифициран ID:"
 
-#: my-evolution/Locations.h:518
-msgid "Cotulla"
-msgstr "Котула"
+#: smime/lib/e-cert.c:672
+msgid "Netscape Certificate Type"
+msgstr ""
 
-#: my-evolution/Locations.h:519
-msgid "Council Bluffs"
-msgstr "Каунсил Блъфс"
+#: smime/lib/e-cert.c:675
+msgid "Certificate Authority Key Identifier"
+msgstr ""
 
-#: my-evolution/Locations.h:520
-msgid "Coventry"
-msgstr "Ковънтри"
+#: smime/lib/e-cert.c:678
+#, fuzzy
+msgid "UID"
+msgstr "Идентификационен номер"
 
-#: my-evolution/Locations.h:521
-msgid "Covington"
-msgstr "Ковингтън"
+#: smime/lib/e-cert.c:687
+#, c-format
+msgid "Object Identifier (%s)"
+msgstr ""
 
-#: my-evolution/Locations.h:522
-msgid "Cozumel"
-msgstr "Козумел"
+#: smime/lib/e-cert.c:738
+msgid "Algorithm Identifier"
+msgstr ""
 
-#: my-evolution/Locations.h:523
-msgid "Craig"
-msgstr "Крейг"
+#: smime/lib/e-cert.c:746
+msgid "Algorithm Parameters"
+msgstr ""
 
-#: my-evolution/Locations.h:524
-msgid "Cranfield"
-msgstr "Кранфилд"
+#: smime/lib/e-cert.c:768
+#, fuzzy
+msgid "Subject Public Key Info"
+msgstr ""
+"\n"
+"Публичен Ключ: "
 
-#: my-evolution/Locations.h:525
-msgid "Crescent City"
-msgstr "Кресцент Сити"
+#: smime/lib/e-cert.c:773
+msgid "Subject Public Key Algorithm"
+msgstr ""
 
-#: my-evolution/Locations.h:526
-msgid "Creston"
-msgstr "Крестън"
+#: smime/lib/e-cert.c:788
+#, fuzzy
+msgid "Subject's Public Key"
+msgstr "Темата е %s"
 
-#: my-evolution/Locations.h:527
-msgid "Crestview"
-msgstr "Крествю"
+#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
+#, fuzzy
+msgid "Error: Unable to process extension"
+msgstr "Не мога да обработя spool папка"
 
-#: my-evolution/Locations.h:529
-msgid "Cross City"
-msgstr "Крос Сити"
+#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
+msgid "Object Signer"
+msgstr ""
 
-#: my-evolution/Locations.h:530
-msgid "Crossville"
-msgstr "Кросвил"
+#: smime/lib/e-cert.c:834
+msgid "SSL Certificate Authority"
+msgstr ""
 
-#: my-evolution/Locations.h:531
-msgid "Crotone"
-msgstr "Кротон"
+#: smime/lib/e-cert.c:838
+msgid "Email Certificate Authority"
+msgstr ""
 
-#: my-evolution/Locations.h:533
-msgid "Cuba Awrs"
-msgstr "Кюба Орс"
+#: smime/lib/e-cert.c:866
+#, fuzzy
+msgid "Signing"
+msgstr "входящ"
 
-#: my-evolution/Locations.h:534
-msgid "Cuernavaca"
-msgstr "Куернавака"
+#: smime/lib/e-cert.c:870
+#, fuzzy
+msgid "Non-repudiation"
+msgstr "Няма Информация"
 
-#: my-evolution/Locations.h:535
-msgid "Cuiaba"
-msgstr "Куияба"
+#: smime/lib/e-cert.c:874
+msgid "Key Encipherment"
+msgstr ""
 
-#: my-evolution/Locations.h:536
-msgid "Culdrose"
-msgstr "Кълдроуз"
+#: smime/lib/e-cert.c:878
+#, fuzzy
+msgid "Data Encipherment"
+msgstr "прикачен"
 
-#: my-evolution/Locations.h:537
-msgid "Culiacan"
-msgstr "Кулякан"
+#: smime/lib/e-cert.c:882
+msgid "Key Agreement"
+msgstr ""
 
-#: my-evolution/Locations.h:538
-msgid "Cumana"
-msgstr "Кумана"
+#: smime/lib/e-cert.c:886
+#, fuzzy
+msgid "Certificate Signer"
+msgstr "_Сертифициран ID:"
 
-#: my-evolution/Locations.h:539
-msgid "Cumberland"
-msgstr "Къмбърленд"
+#: smime/lib/e-cert.c:890
+msgid "CRL Signer"
+msgstr ""
 
-#: my-evolution/Locations.h:540
-msgid "Curitiba"
+#: smime/lib/e-cert.c:938
+#, fuzzy
+msgid "Critical"
 msgstr "Куритиба"
 
-#: my-evolution/Locations.h:541
-msgid "Curitiba Apt"
-msgstr "Куритиба Апт"
-
-#: my-evolution/Locations.h:542
-msgid "Custer"
-msgstr "Къстър"
-
-#: my-evolution/Locations.h:543
-msgid "Cut Bank"
-msgstr "Кът Банк"
-
-#: my-evolution/Locations.h:544
-msgid "Cuzco"
-msgstr "Куско"
-
-#: my-evolution/Locations.h:547
-msgid "Dagali"
-msgstr "Дагалия"
-
-#: my-evolution/Locations.h:548
-msgid "Daggett"
-msgstr "Дагет"
-
-#: my-evolution/Locations.h:549
-msgid "Dalhart"
-msgstr "Долхарт"
-
-#: my-evolution/Locations.h:550
-msgid "Dalian"
-msgstr "Далиан"
-
-#: my-evolution/Locations.h:551
-msgid "Dallas-Addison"
-msgstr "Далас-Адисън"
-
-#: my-evolution/Locations.h:552
-msgid "Dallas-Fort Worth"
-msgstr "Далас-Форт Уърт"
-
-#: my-evolution/Locations.h:553
-msgid "Dallas-Love Field"
-msgstr "Далас-Лав Фийлд"
-
-#: my-evolution/Locations.h:554
-msgid "Dallas-Redbird"
-msgstr "Далас-Редбърд"
-
-#: my-evolution/Locations.h:555
-msgid "Da Nang"
-msgstr "Да Нанг"
-
-#: my-evolution/Locations.h:556
-msgid "Danbury"
-msgstr "Данбъри"
-
-#: my-evolution/Locations.h:557
-msgid "Danville"
-msgstr "Данвил"
-
-#: my-evolution/Locations.h:558
-msgid "Dar-El-Beida"
-msgstr "Дар-Ел-Бейда"
-
-#: my-evolution/Locations.h:559
-msgid "Davenport"
-msgstr "Дейвънпорт"
-
-#: my-evolution/Locations.h:560
-msgid "David"
-msgstr "Давид"
-
-#: my-evolution/Locations.h:561
-msgid "Dawadmi"
-msgstr "Давадми"
-
-#: my-evolution/Locations.h:562
-msgid "Dayton"
-msgstr "Дайтон"
-
-#: my-evolution/Locations.h:563
-msgid "Daytona Beach"
-msgstr "Дейтона Бийч"
-
-#: my-evolution/Locations.h:564
-msgid "Dayton-Fairborn"
-msgstr "Дейтън-Феърборн"
-
-#: my-evolution/Locations.h:565
-msgid "Dayton-South Airport"
-msgstr "Дейтън-Саут Еърпорт"
-
-#: my-evolution/Locations.h:566
-msgid "Dead Horse"
-msgstr "Дед Хорс"
-
-#: my-evolution/Locations.h:567
-msgid "Deauville-Saint-Gatien"
-msgstr "Довил-Сейнт-Гатиен"
-
-#: my-evolution/Locations.h:568
-msgid "Decatur"
-msgstr "Дикатър"
-
-#: my-evolution/Locations.h:569
-msgid "Decimomannu"
-msgstr "Декимоману"
-
-#: my-evolution/Locations.h:570
-msgid "Decorah"
-msgstr "Декора"
-
-#: my-evolution/Locations.h:571
-msgid "Deelen"
-msgstr "Диилън"
-
-#: my-evolution/Locations.h:572
-msgid "Dekalb/Peachtree"
-msgstr "Декалб/Пийчтрии"
-
-#: my-evolution/Locations.h:573
-msgid "Delaware"
-msgstr "Делауер"
-
-#: my-evolution/Locations.h:574
-msgid "Del Bajio"
-msgstr "Дел Бажио"
-
-#: my-evolution/Locations.h:575
-msgid "Del Rio"
-msgstr "Дел Рио"
-
-#: my-evolution/Locations.h:576
-msgid "Delta"
-msgstr "Делта"
-
-#: my-evolution/Locations.h:577
-msgid "Deming"
-msgstr "Деминг"
-
-#: my-evolution/Locations.h:578
-msgid "Den Helder/De Kooy"
-msgstr "Ден Хелдер/Де Кой"
-
-#: my-evolution/Locations.h:579
-msgid "Denison"
-msgstr "Денисон"
-
-#: my-evolution/Locations.h:581
-msgid "Denton"
-msgstr "Дентън"
-
-#: my-evolution/Locations.h:582
-msgid "Denver"
-msgstr "Денвър"
-
-#: my-evolution/Locations.h:583
-msgid "Denver-Aurora"
-msgstr "Денвър-Аурора"
-
-#: my-evolution/Locations.h:584
-msgid "Denver-Broomfield"
-msgstr "Денвър-Брумфилд"
-
-#: my-evolution/Locations.h:585
-msgid "Denver-Cherry Knolls"
-msgstr "Денвър-Чери Нолс"
-
-#: my-evolution/Locations.h:586
-msgid "Desert Rock"
-msgstr "Дезърт Рок"
-
-#: my-evolution/Locations.h:587
-msgid "Des Moines"
-msgstr "ДеМойн"
-
-#: my-evolution/Locations.h:588
-msgid "Destin"
-msgstr "Дестин"
-
-#: my-evolution/Locations.h:589
-msgid "Detroit"
-msgstr "Детройт"
-
-#: my-evolution/Locations.h:590
-msgid "Detroit Lakes"
-msgstr "Детройт Езерата"
-
-#: my-evolution/Locations.h:591
-msgid "Detroit-Taylor"
-msgstr "Детроит-Тейлър"
-
-#: my-evolution/Locations.h:592
-msgid "Detroit/Ypsilanti"
-msgstr "Детройт-Ипсиланти"
-
-#: my-evolution/Locations.h:593
-msgid "Devils Lake"
-msgstr "Девълс Лейк"
-
-#: my-evolution/Locations.h:594
-msgid "Devils Lake (2)"
-msgstr "Девълс Лейк (2)"
-
-#: my-evolution/Locations.h:595
-msgid "Dhahran"
-msgstr "Дахран"
-
-#: my-evolution/Locations.h:596
-msgid "Dickinson"
-msgstr "Дикинсън"
-
-#: my-evolution/Locations.h:597
-msgid "Dijon"
-msgstr "Дижон"
-
-#: my-evolution/Locations.h:598
-msgid "Dillingham"
-msgstr "Дилингам"
-
-#: my-evolution/Locations.h:599
-msgid "Dillon"
-msgstr "Дилон"
-
-#: my-evolution/Locations.h:600
-msgid "Dinard"
-msgstr "Динард"
-
-#: my-evolution/Locations.h:601
-msgid "District of Columbia"
-msgstr "Окръг Колумбия"
-
-#: my-evolution/Locations.h:602
-msgid "Diyarbakir"
-msgstr "Диарбекир"
-
-#: my-evolution/Locations.h:603
-msgid "Dnipropetrovsk"
-msgstr "Днепропетровск"
-
-#: my-evolution/Locations.h:604
-msgid "Dobbiaco"
-msgstr "Добиачо"
-
-#: my-evolution/Locations.h:605
-msgid "Dodge City"
-msgstr "Додж Сити"
-
-#: my-evolution/Locations.h:606
-msgid "Doha"
-msgstr "Доха"
-
-#: my-evolution/Locations.h:607
-msgid "Dole"
-msgstr "Доул"
-
-#: my-evolution/Locations.h:609
-msgid "Donetsk"
-msgstr "Донецк"
-
-#: my-evolution/Locations.h:610
-msgid "Dongsha"
-msgstr "Донгша"
-
-#: my-evolution/Locations.h:611
-msgid "Dongshi"
-msgstr "Донгши"
-
-#: my-evolution/Locations.h:612
-msgid "Don Torcuato"
-msgstr "Дон Торкуато"
-
-#: my-evolution/Locations.h:613
-msgid "Dortmund-Wickede"
-msgstr "Дортмунд-Викеде"
-
-#: my-evolution/Locations.h:614
-msgid "Dothan"
-msgstr "Дотан"
-
-#: my-evolution/Locations.h:615
-msgid "Douglas"
-msgstr "Дъглас"
-
-#: my-evolution/Locations.h:616
-msgid "Dover"
-msgstr "Довър"
-
-#: my-evolution/Locations.h:617
-msgid "Dresden-Klotzsche"
-msgstr "Дрезден"
-
-#: my-evolution/Locations.h:618
-msgid "Drummond"
-msgstr "Дръмънд"
-
-#: my-evolution/Locations.h:619
-msgid "Dubai"
-msgstr "Дубай"
-
-#: my-evolution/Locations.h:620
-msgid "Dubbo"
-msgstr "Дубо"
-
-#: my-evolution/Locations.h:621
-msgid "Dublin"
-msgstr "Дъблин"
-
-#: my-evolution/Locations.h:622
-msgid "Du Bois"
-msgstr "ДюБоа"
-
-#: my-evolution/Locations.h:623
-msgid "Dubrovnik"
-msgstr "Добровник"
-
-#: my-evolution/Locations.h:624
-msgid "Dubuque"
-msgstr "Дюбюк"
-
-#: my-evolution/Locations.h:625
-msgid "Dugway"
-msgstr "Дъгуей"
-
-#: my-evolution/Locations.h:626
-msgid "Duluth"
-msgstr "Дълът"
-
-#: my-evolution/Locations.h:627
-msgid "Dundee"
-msgstr "Дънди"
-
-#: my-evolution/Locations.h:628
-msgid "Durango"
-msgstr "Дуранго"
-
-#: my-evolution/Locations.h:629
-msgid "Durango Awrs"
-msgstr "Дуранго Орс"
-
-#: my-evolution/Locations.h:630
-msgid "Durazno"
-msgstr "Дуразно"
-
-#: my-evolution/Locations.h:631
-msgid "Durban Louis Botha "
-msgstr "Дърбан Луи Бота"
-
-#: my-evolution/Locations.h:632
-msgid "Dusseldorf"
-msgstr "Дюселдорф"
-
-#: my-evolution/Locations.h:633
-msgid "Dutch Harbor"
-msgstr "Дъч Харбър"
-
-#: my-evolution/Locations.h:634
-msgid "Dyersburg"
-msgstr "Дайърсбърг"
-
-#: my-evolution/Locations.h:635
-msgid "Eagle"
-msgstr "Иигъл"
-
-#: my-evolution/Locations.h:636
-msgid "Eagle Range"
-msgstr "Иигъл Рейндж"
-
-#: my-evolution/Locations.h:637
-msgid "East London"
-msgstr "Източен Лондон"
-
-#: my-evolution/Locations.h:638
-msgid "East Midlands"
-msgstr "Ийст Мидлендс"
-
-#: my-evolution/Locations.h:639
-msgid "East St Louis"
-msgstr "Иист Сейнт Луис"
-
-#: my-evolution/Locations.h:640
-msgid "Eau Claire"
-msgstr "О Клер"
-
-#: my-evolution/Locations.h:642
-msgid "Edinburgh"
-msgstr "Единбург"
-
-#: my-evolution/Locations.h:643
-msgid "Edmonton"
-msgstr "Едмънтън"
-
-#: my-evolution/Locations.h:644
-msgid "Edmonton/Villeneuve"
-msgstr "Едмънтън/Вилньов"
-
-#: my-evolution/Locations.h:645
-msgid "Eduardo Gomes International"
-msgstr "Едуардо Гомес Интернешънъл"
-
-#: my-evolution/Locations.h:646
-msgid "Edwards AFB"
-msgstr "ВВБ Едуардс"
-
-#: my-evolution/Locations.h:647
-msgid "Egilsstadir"
-msgstr "Егилстадир"
-
-#: my-evolution/Locations.h:648
-msgid "Eglin"
-msgstr "Еглин"
-
-#: my-evolution/Locations.h:649
-msgid "Eglington/Londonderry"
-msgstr "Еглингтън/Ландъндери"
-
-#: my-evolution/Locations.h:651
-msgid "Eindhoven"
-msgstr "Айтховен"
-
-#: my-evolution/Locations.h:652
-msgid "Ekofisk"
-msgstr "Екофиск"
-
-#: my-evolution/Locations.h:653
-msgid "Elazig"
-msgstr "Елазиг"
-
-#: my-evolution/Locations.h:654
-msgid "El Centro"
-msgstr "Ел Центро"
-
-#: my-evolution/Locations.h:655
-msgid "El Dorado"
-msgstr "Елдорадо"
-
-#: my-evolution/Locations.h:656
-msgid "Elefsis"
-msgstr "Елефсис"
-
-#: my-evolution/Locations.h:657
-msgid "Elfin Cove"
-msgstr "Елфин Коув"
-
-#: my-evolution/Locations.h:658
-msgid "Elizabeth City"
-msgstr "Елизабет Сити"
-
-#: my-evolution/Locations.h:659
-msgid "Elk City"
-msgstr "Елк Сити"
-
-#: my-evolution/Locations.h:660
-msgid "Elkhart"
-msgstr "Елкхарт"
-
-#: my-evolution/Locations.h:661
-msgid "Elkins"
-msgstr "Елкинс"
-
-#: my-evolution/Locations.h:662
-msgid "Elko"
-msgstr "Елко"
-
-#: my-evolution/Locations.h:663
-msgid "Elmira"
-msgstr "Елмайра"
-
-#: my-evolution/Locations.h:664
-msgid "El Monte"
-msgstr "Ел Монте"
-
-#: my-evolution/Locations.h:665
-msgid "El Paso"
-msgstr "Ел Масо"
-
-#: my-evolution/Locations.h:667
-msgid "El Salvador Int."
-msgstr "Ел Салвадор"
-
-#: my-evolution/Locations.h:668
-msgid "Elsenborn"
-msgstr "Елсенборн"
-
-#: my-evolution/Locations.h:669
-msgid "Ely"
-msgstr "Ели"
-
-#: my-evolution/Locations.h:670
-msgid "Emmonak"
-msgstr "Емонак"
-
-#: my-evolution/Locations.h:671
-msgid "Emporia"
-msgstr "Емпориа"
-
-#: my-evolution/Locations.h:672
-msgid "Enid"
-msgstr "Енид"
-
-#: my-evolution/Locations.h:673
-msgid "Enid/Woodring"
-msgstr "Енид/Удринг"
-
-#: my-evolution/Locations.h:674
-msgid "Enosburg Falls"
-msgstr "Еносбърг Фалс"
-
-#: my-evolution/Locations.h:675
-msgid "Ephrata"
-msgstr "Ефрат"
-
-#: my-evolution/Locations.h:676
-msgid "Ercan"
-msgstr "Еркан"
-
-#: my-evolution/Locations.h:677
-msgid "Erie"
-msgstr "Ери"
-
-#: my-evolution/Locations.h:678
-msgid "Erzurum"
-msgstr "Ерзум"
-
-#: my-evolution/Locations.h:679
-msgid "Esbjerg"
-msgstr "Есбйерг"
-
-#: my-evolution/Locations.h:680
-msgid "Escanaba"
-msgstr "Асканаба"
-
-#: my-evolution/Locations.h:681
-msgid "Esfahan"
-msgstr "Есфахан"
-
-#: my-evolution/Locations.h:682
-msgid "Eskisehir"
-msgstr "Ескисехир"
-
-#: my-evolution/Locations.h:683
-msgid "Estherville"
-msgstr "Естервил"
-
-#: my-evolution/Locations.h:685
-msgid "Eugene"
-msgstr "Юджиин"
-
-#: my-evolution/Locations.h:686
-msgid "Eureka"
-msgstr "Еурека"
-
-#: my-evolution/Locations.h:687
-msgid "Europe"
-msgstr "Европа"
-
-#: my-evolution/Locations.h:688
-msgid "Evanston"
-msgstr "Ивънстън"
-
-#: my-evolution/Locations.h:689
-msgid "Evansville"
-msgstr "Еванвил"
-
-#: my-evolution/Locations.h:690
-msgid "Everett"
-msgstr "Еверет"
-
-#: my-evolution/Locations.h:691
-msgid "Evergreen"
-msgstr "Евъргриин"
-
-#: my-evolution/Locations.h:692
-msgid "Evreux-Fauville"
-msgstr "Евро-Фовил"
-
-#: my-evolution/Locations.h:693
-msgid "Exeter"
-msgstr "Екситър"
-
-#: my-evolution/Locations.h:694
-msgid "Ezeiza"
-msgstr "Езейза"
-
-#: my-evolution/Locations.h:695
-msgid "Fagernes"
-msgstr "Фагернес"
-
-#: my-evolution/Locations.h:696
-msgid "Fairbanks"
-msgstr "Феърбанкс"
-
-#: my-evolution/Locations.h:697
-msgid "Fairchild"
-msgstr "Феърчайлд"
-
-#: my-evolution/Locations.h:698
-msgid "Fairfield"
-msgstr "Феърфийлд"
-
-#: my-evolution/Locations.h:699
-msgid "Fairmont"
-msgstr "Феърмаунт"
-
-#: my-evolution/Locations.h:700
-msgid "Fallon"
-msgstr "Фалон"
-
-#: my-evolution/Locations.h:701
-msgid "Falls City"
-msgstr "Фолс Сити"
-
-#: my-evolution/Locations.h:702
-msgid "Falmouth-Otis AFB"
-msgstr "ВВБ Фолмаут-Отис"
-
-#: my-evolution/Locations.h:703
-msgid "Farbanks/Eielson AFB"
-msgstr "ВВБ Фарбанкс/Айелсън"
-
-#: my-evolution/Locations.h:704
-msgid "Fargo"
-msgstr "Фарго"
-
-#: my-evolution/Locations.h:705
-msgid "Farmingdale"
-msgstr "Фармингдейл"
-
-#: my-evolution/Locations.h:706
-msgid "Farmington"
-msgstr "Фармингтън"
-
-#: my-evolution/Locations.h:707
-msgid "Farmville"
-msgstr "Фармвил"
-
-#: my-evolution/Locations.h:708
-msgid "Faro"
-msgstr "Фаро"
-
-#: my-evolution/Locations.h:709
-msgid "Fayetteville"
-msgstr "Файетвил"
-
-#: my-evolution/Locations.h:710
-msgid "Feng Nin"
-msgstr "Фенг Нин"
-
-#: my-evolution/Locations.h:711
-msgid "Fergus Falls"
-msgstr "Фъргъс Фолс"
-
-#: my-evolution/Locations.h:712
-msgid "Fernando De Noronha"
-msgstr "Фернандо де Нороня"
-
-#: my-evolution/Locations.h:713
-msgid "Ferrara"
-msgstr "Ферара"
-
-#: my-evolution/Locations.h:714
-msgid "Figari"
-msgstr "Фигари"
-
-#: my-evolution/Locations.h:715
-msgid "Findlay"
-msgstr "Финдли"
-
-#: my-evolution/Locations.h:717
-msgid "Firenze"
-msgstr "Фирензе"
-
-#: my-evolution/Locations.h:718
-msgid "Fitchburg"
-msgstr "Фитчбърг"
-
-#: my-evolution/Locations.h:719
-msgid "Flagstaff"
-msgstr "Флагстаф"
-
-#: my-evolution/Locations.h:720
-msgid "Flint"
-msgstr "Флинт"
-
-#: my-evolution/Locations.h:721
-msgid "Flippin"
-msgstr "Флипин"
-
-#: my-evolution/Locations.h:722
-msgid "Florence"
-msgstr "Флоренция"
-
-#: my-evolution/Locations.h:723
-msgid "Florennes"
-msgstr "Флоренес"
-
-#: my-evolution/Locations.h:724
-msgid "Flores"
-msgstr "Флорес"
-
-#: my-evolution/Locations.h:725
-msgid "Florianopolis"
-msgstr "Флорианополис"
-
-#: my-evolution/Locations.h:726
-msgid "Florida"
-msgstr "Флорида"
-
-#: my-evolution/Locations.h:727
-msgid "Floro"
-msgstr "Флоро"
-
-#: my-evolution/Locations.h:728
-msgid "Fond Du Lac"
-msgstr "Фон дьо Лак"
-
-#: my-evolution/Locations.h:729
-msgid "Forde/Bringeland"
-msgstr "Форде/Бринджланд"
-
-#: my-evolution/Locations.h:730
-msgid "Forli"
-msgstr "Форли"
-
-#: my-evolution/Locations.h:731
-msgid "Formosa"
-msgstr "Формоса"
-
-#: my-evolution/Locations.h:732
-msgid "Fortaleza"
-msgstr "Форталеза"
-
-#: my-evolution/Locations.h:733
-msgid "Fort Belvoir"
-msgstr "Форт Белвоар"
-
-#: my-evolution/Locations.h:734
-msgid "Fort Benning"
-msgstr "Форт Бенинг"
-
-#: my-evolution/Locations.h:735
-msgid "Fort Bragg"
-msgstr "Форт Браг"
-
-#: my-evolution/Locations.h:736
-msgid "Fort Campbell"
-msgstr "Форт Камбел"
-
-#: my-evolution/Locations.h:737
-msgid "Fort Carson"
-msgstr "Форт Карсон"
-
-#: my-evolution/Locations.h:738
-msgid "Fort Collins"
-msgstr "Форт Колинс"
-
-#: my-evolution/Locations.h:739
-msgid "Fort Collins/Lovel"
-msgstr "Форт Колинс/Лавъл"
-
-#: my-evolution/Locations.h:740
-msgid "Fort Dodge"
-msgstr "Форт Додж"
-
-#: my-evolution/Locations.h:741
-msgid "Fort Drum"
-msgstr "Форт Друм"
-
-#: my-evolution/Locations.h:742
-msgid "Fort Eustis"
-msgstr "Форт Ейстис"
-
-#: my-evolution/Locations.h:743
-msgid "Fort Greely/Allen AAF"
-msgstr "Форт Грийли/летище Алън"
-
-#: my-evolution/Locations.h:744
-msgid "Fort Huachuca"
-msgstr "Форт Хуачука"
-
-#: my-evolution/Locations.h:745
-msgid "Fort Knox"
-msgstr "Форт Кнох"
-
-#: my-evolution/Locations.h:746
-msgid "Fort Lauderdale"
-msgstr "Форт Лодърдейл"
-
-#: my-evolution/Locations.h:747
-msgid "Fort Lauderdale (International)"
-msgstr "Форт Лодърдейл (Интернешънъл)"
+#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
+#, fuzzy
+msgid "Not Critical"
+msgstr "Северна Каролина"
 
-#: my-evolution/Locations.h:748
-msgid "Fort Leonard"
-msgstr "Форт Леонард"
+#: smime/lib/e-cert.c:964
+#, fuzzy
+msgid "Extensions"
+msgstr "Израз"
 
-#: my-evolution/Locations.h:749
-msgid "Fort Lewis"
-msgstr "Форт Левис"
+#: smime/lib/e-cert.c:1035
+#, fuzzy, c-format
+msgid "%s = %s"
+msgstr "%s в %s"
 
-#: my-evolution/Locations.h:750
-msgid "Fort Madison"
-msgstr "Форт Медисон"
+#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
+msgid "Certificate Signature Algorithm"
+msgstr ""
 
-#: my-evolution/Locations.h:751
-msgid "Fort Meade"
-msgstr "Форт Миид"
+#: smime/lib/e-cert.c:1100
+#, fuzzy
+msgid "Issuer"
+msgstr "_Вмъква"
 
-#: my-evolution/Locations.h:752
-msgid "Fort Myers (Page Field)"
-msgstr "Форт Майерс (Пейдж Фийлд)"
+#: smime/lib/e-cert.c:1154
+msgid "Issuer Unique ID"
+msgstr ""
 
-#: my-evolution/Locations.h:753
-msgid "Fort Myers (Southwest Florida International)"
-msgstr "Форт Майерс (Саутуест Флорида Интернешънъл)"
+#: smime/lib/e-cert.c:1173
+#, fuzzy
+msgid "Subject Unique ID"
+msgstr "Темата е %s"
 
-#: my-evolution/Locations.h:754
-msgid "Fort Polk-Leesville"
-msgstr "Форт Полк-Лиисвил"
+#: smime/lib/e-cert.c:1216
+msgid "Certificate Signature Value"
+msgstr ""
 
-#: my-evolution/Locations.h:755
-msgid "Fort Riley"
-msgstr "Форт Райли"
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:608
+#, fuzzy
+msgid "Certificate already exists"
+msgstr "Карта ID вече съществува"
 
-#: my-evolution/Locations.h:756
-msgid "Fort Sill"
-msgstr "Форт Сил"
+#: smime/lib/e-pkcs12.c:266
+msgid "PKCS12 File Password"
+msgstr ""
 
-#: my-evolution/Locations.h:757
-msgid "Fort Smith"
-msgstr "Форт Смит"
+#: smime/lib/e-pkcs12.c:266
+#, fuzzy
+msgid "Enter password for PKCS12 file:"
+msgstr "Въведедете парола за %s"
 
-#: my-evolution/Locations.h:758
-msgid "Fort Stewart"
-msgstr "Форт Стюарт"
+#: smime/lib/e-pkcs12.c:365
+#, fuzzy
+msgid "Imported Certificate"
+msgstr "_Сертифициран ID:"
 
-#: my-evolution/Locations.h:759
-msgid "Fort Stockton"
-msgstr "Форт Стоктън"
+#: tools/evolution-launch-composer.c:324
+msgid "An attachment to add."
+msgstr ""
 
-#: my-evolution/Locations.h:760
-msgid "Fort Wayne"
-msgstr "Форт Уейн"
+#: tools/evolution-launch-composer.c:325
+msgid "Content type of the attachment."
+msgstr ""
 
-#: my-evolution/Locations.h:761
-msgid "Fort Worth-Alliance"
-msgstr "Форт Уърт-Алайънс"
+#: tools/evolution-launch-composer.c:326
+msgid "The filename to display in the mail."
+msgstr ""
 
-#: my-evolution/Locations.h:762
-msgid "Fort Worth-Meacham"
-msgstr "Форт Уърт-Мийчъм"
+#: tools/evolution-launch-composer.c:327
+msgid "Description of the attachment."
+msgstr ""
 
-#: my-evolution/Locations.h:763
-msgid "Fort Worth NAS"
-msgstr "Форт Уърт ВМЛ"
+#: tools/evolution-launch-composer.c:328
+msgid "Mark attachment to be shown inline by default."
+msgstr ""
 
-#: my-evolution/Locations.h:764
-msgid "Fourchon"
-msgstr "Форшон"
+#: tools/evolution-launch-composer.c:329
+msgid "Default subject for the message."
+msgstr ""
 
-#: my-evolution/Locations.h:765
-msgid "Foz Do Iguacu"
-msgstr "Фоз До Игуасу"
+#. This most likely means that KILL_PROCESS_CMD wasn't
+#. * found, so just bail completely.
+#.
+#: tools/killev.c:61
+#, c-format
+msgid "Could not execute '%s': %s\n"
+msgstr ""
 
-#: my-evolution/Locations.h:767
-msgid "Frankfort"
-msgstr "Франфутр"
+#: tools/killev.c:76
+#, c-format
+msgid "Shutting down %s (%s)\n"
+msgstr "Спира %s·(%s)\n"
 
-#: my-evolution/Locations.h:768
-msgid "Frankfurt/Main"
-msgstr "Франфутр/Майн"
+#: ui/evolution-addressbook.xml.h:3
+msgid "Copy Contact(s) to Another Folder..."
+msgstr "Копира кантакт(и) в Друга Папка..."
 
-#: my-evolution/Locations.h:769
-msgid "Franklin"
-msgstr "Франклин"
+#: ui/evolution-addressbook.xml.h:4 ui/evolution-calendar.xml.h:2
+msgid "Copy the selection"
+msgstr "Копира избраното"
 
-#: my-evolution/Locations.h:770
-msgid "Fredericton"
-msgstr "Фредериктън"
+#: ui/evolution-addressbook.xml.h:5
+msgid "Copy to Folder..."
+msgstr "Копира в Папка..."
 
-#: my-evolution/Locations.h:771
-msgid "Freeport"
-msgstr "Фрийпорт"
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
+msgid "Cut the selection"
+msgstr "Изрязва избраното"
 
-#: my-evolution/Locations.h:772
-msgid "Frenchville"
-msgstr "Френчвил"
+#: ui/evolution-addressbook.xml.h:9
+msgid "Delete selected contacts"
+msgstr "Изтрива избраните контакти"
 
-#: my-evolution/Locations.h:773
-msgid "Fresno"
-msgstr "Фресно"
+#: ui/evolution-addressbook.xml.h:11
+msgid "Move Contact(s) to Another Folder..."
+msgstr "Премества Контакт(и) в Друга Папка..."
 
-#: my-evolution/Locations.h:774
-msgid "Fresno-Chandler"
-msgstr "Фресно-Чандлър"
+#: ui/evolution-addressbook.xml.h:12
+msgid "Move to Folder..."
+msgstr "Премества в Папка..."
 
-#: my-evolution/Locations.h:775
-msgid "Friday Harbor"
-msgstr "Фрайдей Харбър"
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:16
+msgid "Paste the clipboard"
+msgstr "Поставя съдържанието на буфера за обмен"
 
-#: my-evolution/Locations.h:776
-msgid "Friedrichshafen"
-msgstr "Фридрихсхафен"
+#: ui/evolution-addressbook.xml.h:15
+msgid "Previews the contacts to be printed"
+msgstr "Преглед на контактите за печат"
 
-#: my-evolution/Locations.h:777
-msgid "Frigg"
-msgstr "Фриг"
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:81
+#: ui/evolution-tasks.xml.h:15
+msgid "Print Pre_view"
+msgstr "Печатен Преглед"
 
-#: my-evolution/Locations.h:778
-msgid "Frontone"
-msgstr "Фронтон"
+#: ui/evolution-addressbook.xml.h:18
+msgid "Print selected contacts"
+msgstr "Отпечатва избраните контакти"
 
-#: my-evolution/Locations.h:779
-msgid "Frosinone"
-msgstr "Фросинон"
+#: ui/evolution-addressbook.xml.h:20
+msgid "Save selected contacts as a VCard."
+msgstr "Запазва избраните контакти като VCard."
 
-#: my-evolution/Locations.h:780
-msgid "Fryeburg"
-msgstr "Фрайбург"
+#: ui/evolution-addressbook.xml.h:21
+msgid "Select All"
+msgstr "Избира всичко"
 
-#: my-evolution/Locations.h:781
-msgid "Fujairah"
-msgstr "Фуджайра"
+#: ui/evolution-addressbook.xml.h:22
+msgid "Select all contacts"
+msgstr "Избира всички контакти"
 
-#: my-evolution/Locations.h:782
-msgid "Fuji Ab"
-msgstr "ВБ Фуджи"
+#: ui/evolution-addressbook.xml.h:23
+#, fuzzy
+msgid "Send a message to the selected contacts."
+msgstr "Изпраща съобщение до избрани контакти"
 
-#: my-evolution/Locations.h:783
-msgid "Fukue Airport"
-msgstr "Летище Фукуе"
+#: ui/evolution-addressbook.xml.h:24
+msgid "Send message to contact"
+msgstr "Изпраща съобщение към контакт"
 
-#: my-evolution/Locations.h:784
-msgid "Fukui Airport"
-msgstr "Летище Фукуи"
+#: ui/evolution-addressbook.xml.h:25
+msgid "Send selected contacts to another person."
+msgstr "Изпраща избраният контакт на друг."
 
-#: my-evolution/Locations.h:785
-msgid "Fukuoka Airport"
-msgstr "Летище Фукуока"
+#: ui/evolution-addressbook.xml.h:26
+#, fuzzy
+msgid "Show contact preview window"
+msgstr "Показва предишен прозорец на съобщение "
 
-#: my-evolution/Locations.h:786
-msgid "Fullerton"
-msgstr "Фулъртън"
+#: ui/evolution-addressbook.xml.h:27
+msgid "Stop"
+msgstr "Спира"
 
-#: my-evolution/Locations.h:787
-msgid "Funchal"
-msgstr "Фуншал"
+#: ui/evolution-addressbook.xml.h:28
+msgid "Stop Loading"
+msgstr "Спира Зареждането"
 
-#: my-evolution/Locations.h:788
-msgid "FYR Macedonia"
-msgstr "Македония"
+#: ui/evolution-addressbook.xml.h:29
+msgid "View the current contact"
+msgstr "Преглежда текущия контакт"
 
-#: my-evolution/Locations.h:789
-msgid "Gadsden"
-msgstr "Гадсден"
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:38
+#: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-contact-list-editor.xml.h:11
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
+msgid "_Actions"
+msgstr "_Действия"
 
-#: my-evolution/Locations.h:790
-msgid "Gage"
-msgstr "Гейдж"
+#: ui/evolution-addressbook.xml.h:35 ui/evolution-contact-editor.xml.h:16
+msgid "_Forward Contact..."
+msgstr "_Напред в Контакти..."
 
-#: my-evolution/Locations.h:791
-msgid "Gainesville"
-msgstr "Гейнсвил"
+#: ui/evolution-addressbook.xml.h:36
+msgid "_Move to Folder..."
+msgstr "Премества в Папка..."
 
-#: my-evolution/Locations.h:792
-msgid "Galax-Hillsville"
-msgstr "Галакс-Хилсвил"
+#: ui/evolution-addressbook.xml.h:39 ui/evolution-mail-global.xml.h:17
+msgid "_Preview Pane"
+msgstr "_Предварителен преглед на Pane"
 
-#: my-evolution/Locations.h:793
-msgid "Galbraith Lake"
-msgstr "Голбрайт Лейк"
+#: ui/evolution-addressbook.xml.h:41
+#, fuzzy
+msgid "_Save as VCard..."
+msgstr "_Запазва като VCard"
 
-#: my-evolution/Locations.h:794
-msgid "Galeao"
-msgstr "Галеао"
+#: ui/evolution-addressbook.xml.h:42
+msgid "_Select All"
+msgstr "_Избира Всичко"
 
-#: my-evolution/Locations.h:795
-msgid "Galena"
-msgstr "Галена"
+#: ui/evolution-addressbook.xml.h:43
+msgid "_Send Message to Contact..."
+msgstr "_Изпраща Съобщение до Контакт"
 
-#: my-evolution/Locations.h:796
-msgid "Galesburg"
-msgstr "Гейлсбърг"
+#: ui/evolution-calendar.xml.h:4
+msgid "Day"
+msgstr "Ден"
 
-#: my-evolution/Locations.h:797
-msgid "Gallup"
-msgstr "Галъп"
+#: ui/evolution-calendar.xml.h:6
+msgid "Delete All Occurrences"
+msgstr ""
 
-#: my-evolution/Locations.h:798
-msgid "Galveston"
-msgstr "Галвъстън"
+#: ui/evolution-calendar.xml.h:7
+msgid "Delete the appointment"
+msgstr "Изтрива срещата"
 
-#: my-evolution/Locations.h:799
-msgid "Gambell"
-msgstr "Гамбел"
+#: ui/evolution-calendar.xml.h:8
+msgid "Delete this Occurrence"
+msgstr ""
 
-#: my-evolution/Locations.h:800
-msgid "Gander"
-msgstr "Гандер"
+#: ui/evolution-calendar.xml.h:9
+msgid "Delete this occurrence"
+msgstr ""
 
-#: my-evolution/Locations.h:801
-msgid "Garden City"
-msgstr "Гардън Сити"
+#: ui/evolution-calendar.xml.h:10
+msgid "Go To"
+msgstr "Отива"
 
-#: my-evolution/Locations.h:802
-msgid "Gary"
-msgstr "Гари"
+#: ui/evolution-calendar.xml.h:11
+msgid "Go back"
+msgstr "Отива назад"
 
-#: my-evolution/Locations.h:803
-msgid "Gassim"
-msgstr "Гасим"
+#: ui/evolution-calendar.xml.h:12
+msgid "Go forward"
+msgstr "Отива напред"
 
-#: my-evolution/Locations.h:804
-msgid "Gatineau"
-msgstr "Гатино"
+#: ui/evolution-calendar.xml.h:13
+msgid "List"
+msgstr "Списък"
 
-#: my-evolution/Locations.h:805
-msgid "Gaziantep"
-msgstr "Газиантеп"
+#: ui/evolution-calendar.xml.h:14
+msgid "Month"
+msgstr "Месец"
 
-#: my-evolution/Locations.h:806
-msgid "Gdansk"
-msgstr "Гданск"
+#: ui/evolution-calendar.xml.h:15 ui/evolution-mail-message.xml.h:65
+msgid "Next"
+msgstr "Следващ"
 
-#: my-evolution/Locations.h:807
-msgid "Geneve"
-msgstr "Женева"
+#: ui/evolution-calendar.xml.h:17
+msgid "Previews the calendar to be printed"
+msgstr "Преглед на календар за печат"
 
-#: my-evolution/Locations.h:808
-msgid "Genova"
-msgstr "Геноа"
+#: ui/evolution-calendar.xml.h:18 ui/evolution-mail-message.xml.h:79
+msgid "Previous"
+msgstr "Предишен"
 
-#: my-evolution/Locations.h:809
-msgid "George Airport"
-msgstr "Летище Джордж"
+#: ui/evolution-calendar.xml.h:21
+msgid "Print this calendar"
+msgstr "Отпечатва този календар"
 
-#: my-evolution/Locations.h:810
-msgid "Georgetown"
-msgstr "Джоржтаун"
+#: ui/evolution-calendar.xml.h:22
+msgid "Publish Free/Busy information for this calendar"
+msgstr "Публична Свободна/Заета информация за този календар"
 
-#: my-evolution/Locations.h:813
-msgid "Ghardaia"
-msgstr "Гардайа"
+#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:17
+#, fuzzy
+msgid "Purg_e"
+msgstr "Бургес"
 
-#: my-evolution/Locations.h:814
-msgid "Ghedi"
-msgstr "Геди"
+#: ui/evolution-calendar.xml.h:24
+#, fuzzy
+msgid "Purge old appointments and meetings"
+msgstr "Папката съдържа срещи и събития"
 
-#: my-evolution/Locations.h:816
-msgid "Gifu Ab"
-msgstr "ВБ Гифу"
+#: ui/evolution-calendar.xml.h:25
+#, fuzzy
+msgid "Select _Date"
+msgstr "Избор на Имена"
 
-#: my-evolution/Locations.h:817
-msgid "Gila Bend"
-msgstr "Джайла Бенд"
+#: ui/evolution-calendar.xml.h:27
+#, fuzzy
+msgid "Select a specific date"
+msgstr "Отива на определена дата"
 
-#: my-evolution/Locations.h:818
-msgid "Gillette"
-msgstr "Джилет"
+#: ui/evolution-calendar.xml.h:28
+#, fuzzy
+msgid "Select today"
+msgstr "Избира папка"
 
-#: my-evolution/Locations.h:819
-msgid "Gilze-Rijen"
-msgstr "Гилзе-Риен"
+#: ui/evolution-calendar.xml.h:29
+#, fuzzy
+msgid "Show as list"
+msgstr "Показва Детайли"
 
-#: my-evolution/Locations.h:820
-msgid "Gioia del Colle"
-msgstr "Джоя дел Коле"
+#: ui/evolution-calendar.xml.h:30
+msgid "Show one day"
+msgstr "Показва един ден"
 
-#: my-evolution/Locations.h:821
-msgid "Girona"
-msgstr "Жирона"
+#: ui/evolution-calendar.xml.h:31
+msgid "Show one month"
+msgstr "Показва един месец"
 
-#: my-evolution/Locations.h:822
-msgid "Gizan"
-msgstr "Гизан"
+#: ui/evolution-calendar.xml.h:32
+msgid "Show one week"
+msgstr "Показва една седмица"
 
-#: my-evolution/Locations.h:823
-msgid "Glasgow"
-msgstr "Глазгоу"
+#: ui/evolution-calendar.xml.h:33
+msgid "Show the working week"
+msgstr "Показва работната седмица"
 
-#: my-evolution/Locations.h:824
-msgid "Glendive"
-msgstr "Гленвил"
+#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:249
+#: widgets/misc/e-dateedit.c:435
+msgid "Today"
+msgstr "Днес"
 
-#: my-evolution/Locations.h:825
-msgid "Glens Falls"
-msgstr "Глен Фолс"
+#: ui/evolution-calendar.xml.h:35
+#, fuzzy
+msgid "View the current appointment"
+msgstr "Преглежда текущия контакт"
 
-#: my-evolution/Locations.h:826
-msgid "Goiania"
-msgstr "Гояня"
+#: ui/evolution-calendar.xml.h:36
+msgid "Week"
+msgstr "Седмица"
 
-#: my-evolution/Locations.h:827
-msgid "Goldsboro"
-msgstr "Голсбъро"
+#: ui/evolution-calendar.xml.h:37
+msgid "Work Week"
+msgstr "Работна Седмица"
 
-#: my-evolution/Locations.h:828
-msgid "Goodland"
-msgstr "Гудленд"
+#: ui/evolution-calendar.xml.h:42
+#, fuzzy
+msgid "_Open Appointment"
+msgstr "Нова _Среща"
 
-#: my-evolution/Locations.h:829
-msgid "Goose Bay"
-msgstr "Гуус Бей"
+#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
+#: ui/evolution-signature-editor.xml.h:1
+msgid "C_lose"
+msgstr "_Затвори"
 
-#: my-evolution/Locations.h:830
-msgid "Goteborg (Landvetter)"
-msgstr "Гьотеборг (Ландветер)"
+#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2
+#: ui/evolution-mail-messagedisplay.xml.h:1
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
+#: ui/evolution.xml.h:4
+msgid "Close"
+msgstr "Затваря"
 
-#: my-evolution/Locations.h:831
-msgid "Goteborg (Save)"
-msgstr "Гьотеборг (Сев)"
+#: ui/evolution-comp-editor.xml.h:3
+msgid "Close this item"
+msgstr "Затваря тази точка"
 
-#: my-evolution/Locations.h:832
-msgid "Granada"
-msgstr "Гранада"
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:4
+msgid "Delete this item"
+msgstr "Изтрива тази точка"
 
-#: my-evolution/Locations.h:833
-msgid "Grand Canyon"
-msgstr "Гран Каньон"
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
+msgid "Main toolbar"
+msgstr "Главна лента с инструменти"
 
-#: my-evolution/Locations.h:834
-msgid "Grand Cayman"
-msgstr "Гранд Кайман"
+#: ui/evolution-comp-editor.xml.h:7
+msgid "Preview the printed item"
+msgstr "Преглед на точката за печат"
 
-#: my-evolution/Locations.h:835
-msgid "Grand Forks"
-msgstr "Гранд Форкс"
+#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:7
+msgid "Print this item"
+msgstr "Печат на тази точка"
 
-#: my-evolution/Locations.h:836
-msgid "Grand Island"
-msgstr "Гранд Айлънд"
+#: ui/evolution-comp-editor.xml.h:11 ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:18
+msgid "Save _As..."
+msgstr "Съхранява К_ато..."
 
-#: my-evolution/Locations.h:837
-msgid "Grand Isle"
-msgstr "Гранд Айл"
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:6
+#: ui/evolution-signature-editor.xml.h:7
+msgid "Save and Close"
+msgstr "Запазва и Затваря"
 
-#: my-evolution/Locations.h:838
-msgid "Grand Junction"
-msgstr "Гранд Джънкшън"
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-contact-list-editor.xml.h:7
+#: ui/evolution-signature-editor.xml.h:8
+msgid "Save and _Close"
+msgstr "Запазва и _Затваря"
 
-#: my-evolution/Locations.h:839
-msgid "Grand Marais"
-msgstr "Гранд Мер"
+#: ui/evolution-comp-editor.xml.h:14
+msgid "Save the item and close the dialog box"
+msgstr "Запазва точката и затваря диалога"
 
-#: my-evolution/Locations.h:840
-msgid "Grand Rapids"
-msgstr "Гранд Рапидс"
+#: ui/evolution-comp-editor.xml.h:15
+msgid "Save this item to disk"
+msgstr "Запазва тази точка на диска"
 
-#: my-evolution/Locations.h:841
-msgid "Grandview"
-msgstr "Грандвю"
+#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-list-editor.xml.h:13
+#: ui/evolution-mail-messagedisplay.xml.h:7
+#: ui/evolution-message-composer.xml.h:44
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:29
+msgid "_File"
+msgstr "_Файл"
 
-#: my-evolution/Locations.h:842
-msgid "Grangeville"
-msgstr "Грейнджвил"
+#: ui/evolution-composer-entries.xml.h:1
+msgid "Copy selected text to the clipboard"
+msgstr "Копира избрания текст в буферът за обмен"
 
-#: my-evolution/Locations.h:843
-msgid "Grants"
-msgstr "Грантс"
+#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-message.xml.h:21
+msgid "Cu_t"
+msgstr "_Отрежи"
 
-#: my-evolution/Locations.h:844
-msgid "Graz"
-msgstr "Грац"
+#: ui/evolution-composer-entries.xml.h:3
+msgid "Cut selected text to the clipboard"
+msgstr "Поставя съобщението в буфера за обмен"
 
-#: my-evolution/Locations.h:845
-msgid "Great Falls"
-msgstr "Грейт Фолс"
+#: ui/evolution-composer-entries.xml.h:4
+msgid "Paste text from the clipboard"
+msgstr "Постявя текст от буферът за обмен"
 
-#: my-evolution/Locations.h:847
-msgid "Greeley"
-msgstr "Грийли"
+#: ui/evolution-composer-entries.xml.h:5 ui/evolution-mail-list.xml.h:13
+#: ui/evolution-subscribe.xml.h:6
+msgid "Select _All"
+msgstr "Избери _Всичко"
 
-#: my-evolution/Locations.h:848
-msgid "Green Bay"
-msgstr "Грийн Бей"
+#: ui/evolution-composer-entries.xml.h:6
+msgid "Select all text"
+msgstr "Маркира Целия Текст"
 
-#: my-evolution/Locations.h:849
-msgid "Green River"
-msgstr "Грийн Ривър"
+#: ui/evolution-contact-editor.xml.h:6
+msgid "Print En_velope..."
+msgstr "Печат на П_лик..."
 
-#: my-evolution/Locations.h:850
-msgid "Greensboro"
-msgstr "Грийнсборо"
+#: ui/evolution-contact-editor.xml.h:11
+msgid "Save the contact and close the dialog box"
+msgstr "Запазва контакта и затваря диалога"
 
-#: my-evolution/Locations.h:851
-msgid "Greenville"
-msgstr "Грийнвил"
+#: ui/evolution-contact-editor.xml.h:12
+msgid "Send _Message to Contact..."
+msgstr "Изпраща Съобщението на Контакт.."
 
-#: my-evolution/Locations.h:852
-msgid "Greenville-Spartanburg"
-msgstr "Грийнвил-Спартанбърг"
+#: ui/evolution-contact-editor.xml.h:18
+#: ui/evolution-contact-list-editor.xml.h:14
+#: ui/evolution-message-composer.xml.h:50
+#: ui/evolution-signature-editor.xml.h:15
+msgid "_Save"
+msgstr "_Запазва"
 
-#: my-evolution/Locations.h:853
-msgid "Greenwood"
-msgstr "Гриийнуд"
+#: ui/evolution-contact-list-editor.xml.h:4
+msgid "Delete this list"
+msgstr "Изтрива този списък"
 
-#: my-evolution/Locations.h:854
-msgid "Grenoble-Saint-Geoirs"
-msgstr "Гренобъл-Сен-Жо"
+#: ui/evolution-contact-list-editor.xml.h:8
+msgid "Save the list and close the dialog box"
+msgstr "Запазва списъка и затваря диалога"
 
-#: my-evolution/Locations.h:855
-msgid "Griffiss AFB"
-msgstr "ВВБ Грифис"
+#: ui/evolution-contact-list-editor.xml.h:9
+msgid "Se_nd list to other..."
+msgstr "Изпраща спис_ък на друг..."
 
-#: my-evolution/Locations.h:856
-msgid "Groningen"
-msgstr "Грьонинген"
+#: ui/evolution-contact-list-editor.xml.h:10
+msgid "Send _message to list..."
+msgstr "Изпраща с_ъобщението към списък..."
 
-#: my-evolution/Locations.h:857
-msgid "Grosseto"
-msgstr "Гросето"
+#: ui/evolution-contact-list-editor.xml.h:12
+#, fuzzy
+msgid "_Delete..."
+msgstr "Изтрива..."
 
-#: my-evolution/Locations.h:858
-msgid "Groton"
-msgstr "Гротън"
+#: ui/evolution-event-editor.xml.h:1
+msgid "Cancel Mee_ting"
+msgstr "Прекратява _Среща"
 
-#: my-evolution/Locations.h:859
-msgid "Guadalajara"
-msgstr "Гуадалахара"
+#: ui/evolution-event-editor.xml.h:2
+msgid "Cancel the meeting for this item"
+msgstr "Прекъсва срещата за този пункт"
 
-#: my-evolution/Locations.h:860
-msgid "Guadalupe Pass"
-msgstr "Гуаделупе Пас"
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
+msgid "Forward as i_Calendar"
+msgstr "Препраща като _iКалендар"
 
-#: my-evolution/Locations.h:861
-msgid "Guanare"
-msgstr "Гуанаре"
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:6
+msgid "Forward this item via email"
+msgstr "Препраща това съобщение чрез ел. поща"
 
-#: my-evolution/Locations.h:862
-msgid "Guangzhou"
-msgstr "Гуангжоу"
+#: ui/evolution-event-editor.xml.h:7
+msgid "Obtain the latest meeting information"
+msgstr "Получава последната информация за среща"
 
-#: my-evolution/Locations.h:863
-msgid "Guantanamo"
-msgstr "Гуантанамо"
+#: ui/evolution-event-editor.xml.h:8
+msgid "Re_fresh Meeting"
+msgstr "Освежав_а Среща"
 
-#: my-evolution/Locations.h:864
-msgid "Guarany"
-msgstr "Гуарани"
+#: ui/evolution-event-editor.xml.h:9
+msgid "Schedule _Meeting"
+msgstr "План на _Среща"
 
-#: my-evolution/Locations.h:865
-msgid "Guaratingueta"
-msgstr "Гуарантигета"
+#: ui/evolution-event-editor.xml.h:10
+msgid "Schedule a meeting for this item"
+msgstr "Разпределя срещи за тази задача"
 
-#: my-evolution/Locations.h:866
-msgid "Guarulhos"
-msgstr "Гуарюлос"
+#: ui/evolution-executive-summary.xml.h:1
+msgid "Customize My Evolution"
+msgstr ""
 
-#: my-evolution/Locations.h:868
-msgid "Guayaquil/Simon Bolivar"
-msgstr "Гуаякул/Симон Боливар"
+#: ui/evolution-mail-global.xml.h:2
+msgid "Cancel the current mail operation"
+msgstr "Прекъсва текущата пощенска операция"
 
-#: my-evolution/Locations.h:869
-msgid "Guaymas"
-msgstr "Гуаяамас"
+#: ui/evolution-mail-global.xml.h:3
+msgid "Compose _New Message"
+msgstr "Пише Ново _Съобщение"
 
-#: my-evolution/Locations.h:870
-msgid "Guernsey"
-msgstr "Гърнси"
+#: ui/evolution-mail-global.xml.h:4
+msgid "Create or edit rules for filtering new mail"
+msgstr "Създава или редактира правила за филтриране на нова поща"
 
-#: my-evolution/Locations.h:871
-msgid "Guidonia"
-msgstr "Гуидоня"
+#: ui/evolution-mail-global.xml.h:5
+msgid "Create or edit virtual folder definitions"
+msgstr "Създава или редактира дефиниции на виртуална папка"
 
-#: my-evolution/Locations.h:872
-msgid "Gulfport"
-msgstr "Гълфпорт"
+#: ui/evolution-mail-global.xml.h:6
+msgid "Empty _Trash"
+msgstr "Изпразва _Кошчето"
 
-#: my-evolution/Locations.h:873
-msgid "Gulkana"
-msgstr "Гулкана"
+#: ui/evolution-mail-global.xml.h:7
+msgid "Open a window for composing a mail message"
+msgstr "Отваря прозорец за създаване на пощеснко съобщение"
 
-#: my-evolution/Locations.h:874
-msgid "Gullfax C"
-msgstr "Гълфакс Ц"
+#: ui/evolution-mail-global.xml.h:8
+msgid "Permanently remove all deleted messages from all folders"
+msgstr "Изтрива за постоянно всички съобщения от тези папки"
 
-#: my-evolution/Locations.h:875
-msgid "Gunnison"
-msgstr "Гънисън"
+#: ui/evolution-mail-global.xml.h:9
+#, fuzzy
+msgid "Post Ne_w Message"
+msgstr "Изпраща Ново Съобщение"
 
-#: my-evolution/Locations.h:876
-msgid "Gunnison (2)"
-msgstr "Гънисън (2)"
+#: ui/evolution-mail-global.xml.h:10
+msgid "Post a message to a Public folder"
+msgstr ""
 
-#: my-evolution/Locations.h:877
-msgid "Guriat"
-msgstr "Гуриат"
+#: ui/evolution-mail-global.xml.h:11
+msgid "S_ubscribe to Folders..."
+msgstr "_Абонира се за Папки"
 
-#: my-evolution/Locations.h:878
-msgid "Gustavus"
-msgstr "Густавус"
+#: ui/evolution-mail-global.xml.h:12
+msgid "Show message preview window"
+msgstr "Показва предишен прозорец на съобщение "
 
-#: my-evolution/Locations.h:879
-msgid "Guymon"
-msgstr "Гимон"
+#: ui/evolution-mail-global.xml.h:13
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr "Абониране и отабониране за папки на отдалечени сървъри"
 
-#: my-evolution/Locations.h:880
-msgid "Habana"
-msgstr "Хавана"
+#: ui/evolution-mail-global.xml.h:14
+msgid "Virtual Folder _Editor..."
+msgstr "Редактор за Виртуални Папки"
 
-#: my-evolution/Locations.h:881
-msgid "Hachijojima Airport"
-msgstr "Летище Хачижожима"
+#: ui/evolution-mail-global.xml.h:16
+msgid "_Filters..."
+msgstr "_Филтри..."
 
-#: my-evolution/Locations.h:882
-msgid "Hachinohe Ab"
-msgstr "ВБ Хачинохе"
+#: ui/evolution-mail-list.xml.h:1
+msgid "Change the properties of this folder"
+msgstr "Промяна настройките за тази папка"
 
-#: my-evolution/Locations.h:883
-msgid "Hafr Al-Batin"
-msgstr "Хафр Ал-Батин"
+#: ui/evolution-mail-list.xml.h:2 ui/evolution-mail-message.xml.h:10
+msgid "Copy selected message(s) to the clipboard"
+msgstr "Копира избраните писма в буфера за обмен"
 
-#: my-evolution/Locations.h:884
-msgid "Hagerstown"
-msgstr "Хагерстаун"
+#: ui/evolution-mail-list.xml.h:3 ui/evolution-mail-message.xml.h:22
+msgid "Cut selected message(s) to the clipboard"
+msgstr "Изрязва избраните писма в буферът за обмен"
 
-#. HAIL
-#: my-evolution/Locations.h:885 my-evolution/metar.c:218
-msgid "Hail"
-msgstr "Град"
+#: ui/evolution-mail-list.xml.h:4
+#, fuzzy
+msgid "E_xpunge"
+msgstr "_Задрасква"
 
-#: my-evolution/Locations.h:886
-msgid "Hailey-Sun Valley"
-msgstr "Хейли-Сън Вали"
+#: ui/evolution-mail-list.xml.h:5
+msgid "Hide S_elected Messages"
+msgstr "Скрива Избраните Съобщения"
 
-#: my-evolution/Locations.h:887
-msgid "Haines"
-msgstr "Хейнс"
+#: ui/evolution-mail-list.xml.h:6
+msgid "Hide _Deleted Messages"
+msgstr "Скрива Изтритите Съобщения"
 
-#: my-evolution/Locations.h:889
-msgid "Hakodate Airport"
-msgstr "Летище Хакодате"
+#: ui/evolution-mail-list.xml.h:7
+msgid "Hide _Read Messages"
+msgstr "Скрива _Прочетените Съобщения"
 
-#: my-evolution/Locations.h:890
-msgid "Halifax"
-msgstr "Халифакс"
+#: ui/evolution-mail-list.xml.h:8
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr "Скрива изтритите съобщения вместо да ги показва като зачертани"
 
-#: my-evolution/Locations.h:891
-msgid "Hamamatsu Ab"
-msgstr "Хамаматсу"
+#: ui/evolution-mail-list.xml.h:9
+msgid "Mark All as _Read"
+msgstr "Отбелязва Всички като _Прочетени"
 
-#: my-evolution/Locations.h:892
-msgid "Hamburg"
-msgstr "Хамбург"
+#: ui/evolution-mail-list.xml.h:10
+msgid "Mark all visible messages as read"
+msgstr "Маркира всички видими съобщенията като прочетени"
 
-#: my-evolution/Locations.h:893
-msgid "Hamburg-Finkenwerder"
-msgstr "Хамбург-Финкенвердер"
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:74
+msgid "Paste message(s) from the clipboard"
+msgstr "Постява съобщенията от бъфърът за обмен"
 
-#: my-evolution/Locations.h:894
-msgid "Hamilton"
-msgstr "Хамилтън"
+#: ui/evolution-mail-list.xml.h:12
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "Изтрива за постоянно всички съобщения от тази папка"
 
-#: my-evolution/Locations.h:895
-msgid "Hammerfest"
-msgstr "Хамърфест"
+#: ui/evolution-mail-list.xml.h:14
+msgid "Select _Thread"
+msgstr "Избира _Нишка"
 
-#: my-evolution/Locations.h:896
-msgid "Hampton"
-msgstr "Хамптън"
+#: ui/evolution-mail-list.xml.h:15
+msgid "Select all and only the messages that are not currently selected"
+msgstr "Избира всички и само съобщенията които не са били избрано в момента"
 
-#: my-evolution/Locations.h:897
-msgid "Hanamaki Airport"
-msgstr "Летище Ханамаки"
+#: ui/evolution-mail-list.xml.h:16
+msgid "Select all messages in the same thread as the selected message"
+msgstr "Избира всички съобщения в някоя нишка като избрано съобщение"
 
-#: my-evolution/Locations.h:898
-msgid "Hancock"
-msgstr "Ханкок"
+#: ui/evolution-mail-list.xml.h:17
+msgid "Select all visible messages"
+msgstr "Избира всички видими съобщения"
 
-#: my-evolution/Locations.h:899
-msgid "Hangzhou"
-msgstr "Ханджоу"
+#: ui/evolution-mail-list.xml.h:18
+msgid "Sh_ow Hidden Messages"
+msgstr "Пока_зва Скрити Съобщения"
 
-#: my-evolution/Locations.h:900
-msgid "Hanksville"
-msgstr "Ханксвил"
+#: ui/evolution-mail-list.xml.h:19
+msgid "Show messages that have been temporarily hidden"
+msgstr "Показва съобщения, които са били временно скрити"
 
-#: my-evolution/Locations.h:901
-msgid "Hannover"
-msgstr "Хановер"
+#: ui/evolution-mail-list.xml.h:20
+msgid "Temporarily hide all messages that have already been read"
+msgstr "Временно скрива всички съобщения, които са били прочетени"
 
-#: my-evolution/Locations.h:902
-msgid "Ha Noi"
-msgstr "Ханой"
+#: ui/evolution-mail-list.xml.h:21
+msgid "Temporarily hide the selected messages"
+msgstr "Временно скрива избраните съобщения"
 
-#: my-evolution/Locations.h:903
-msgid "Harbor Beach"
-msgstr "Харбър Бийч"
+#: ui/evolution-mail-list.xml.h:22
+msgid "Threaded Message list"
+msgstr ""
 
-#: my-evolution/Locations.h:904
-msgid "Harlingen"
-msgstr "Харлинген"
+#: ui/evolution-mail-list.xml.h:25
+msgid "_Folder"
+msgstr "_Папка"
 
-#: my-evolution/Locations.h:905
-msgid "Harlowton"
-msgstr "Харлоутън"
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-subscribe.xml.h:12
+msgid "_Invert Selection"
+msgstr "_Обърнат Избор"
 
-#: my-evolution/Locations.h:906
-msgid "Harrisburg"
-msgstr "Харисбърг"
+#: ui/evolution-mail-list.xml.h:28
+msgid "_Threaded Message List"
+msgstr "_Дървовиден списък на съобщенията"
 
-#: my-evolution/Locations.h:907
-msgid "Harrison"
-msgstr "Харисон"
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Затваря този прозорец"
 
-#: my-evolution/Locations.h:908
-msgid "Harstad/Narvik/Evenes"
-msgstr "Харстад/Нарвик/Ивънес"
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:28
+msgid "_Close"
+msgstr "Затваря"
 
-#: my-evolution/Locations.h:909
-msgid "Hartford"
-msgstr "Хартфорд"
+#: ui/evolution-mail-message.xml.h:1
+#, fuzzy
+msgid "A_dd Sender to Address Book"
+msgstr "Д_обавя Подателя в Адресната книга"
 
-#: my-evolution/Locations.h:910
-msgid "Hassi-Messaoud"
-msgstr "Хаси-Месод"
+#: ui/evolution-mail-message.xml.h:2
+msgid "A_pply Filters"
+msgstr "П_рилага Филтри"
 
-#: my-evolution/Locations.h:911
-msgid "Hastings"
-msgstr "Хастингс"
+#: ui/evolution-mail-message.xml.h:3
+#, fuzzy
+msgid "Add Sender to Address Book"
+msgstr "Добавя подателя в Адресната книга"
 
-#: my-evolution/Locations.h:912
-msgid "Haugesund"
-msgstr "Хагесунд"
+#: ui/evolution-mail-message.xml.h:4
+msgid "Apply filter rules to the selected messages"
+msgstr "Използва филтър с правила за избраните съобщения"
 
-#: my-evolution/Locations.h:913
-msgid "Havre"
-msgstr "Хавър"
+#: ui/evolution-mail-message.xml.h:5
+#, fuzzy
+msgid "Caret _Mode"
+msgstr "Телефон в автомобил"
 
-#: my-evolution/Locations.h:914
-msgid "Hawaii"
-msgstr "Хавай"
+#: ui/evolution-mail-message.xml.h:6
+msgid "Compose a reply to all of the recipients of the selected message"
+msgstr "Отговаря на всички получатели на избраното съобщение"
 
-#: my-evolution/Locations.h:915
-msgid "Hawthorne"
-msgstr "Хоторн"
+#: ui/evolution-mail-message.xml.h:7
+msgid "Compose a reply to the mailing list of the selected message"
+msgstr "Създава отговор на пощенски списък на избраното съобщение"
 
-#: my-evolution/Locations.h:916
-msgid "Hayden"
-msgstr "Хайдън"
+#: ui/evolution-mail-message.xml.h:8
+msgid "Compose a reply to the sender of the selected message"
+msgstr "Създава отговор на изпращача на избраното съобщение"
 
-#: my-evolution/Locations.h:917
-msgid "Hayes River"
-msgstr "Хайес Ривър"
+#: ui/evolution-mail-message.xml.h:11
+msgid "Copy selected messages to another folder"
+msgstr "Копира избраното съобщение в друга папка"
 
-#: my-evolution/Locations.h:918
-msgid "Hays"
-msgstr "Хейс"
+#: ui/evolution-mail-message.xml.h:12
+msgid "Create _Virtual Folder From Message"
+msgstr "Създава Виртуална _Папка От Съобщение"
 
-#: my-evolution/Locations.h:919
-msgid "Hayward"
-msgstr "Хейуърд"
+#: ui/evolution-mail-message.xml.h:13
+msgid "Create a rule to filter messages from this sender"
+msgstr "Създава правила за филтриране на съобщения за този изпращач"
 
-#: my-evolution/Locations.h:920
-msgid "Healy River"
-msgstr "Хийли Ривър"
+#: ui/evolution-mail-message.xml.h:14
+msgid "Create a rule to filter messages to these recipients"
+msgstr "Създава правила за филтриране на съобщения за тези получатели"
 
-#: my-evolution/Locations.h:921
-msgid "Helena"
-msgstr "Хелена"
+#: ui/evolution-mail-message.xml.h:15
+msgid "Create a rule to filter messages to this mailing list"
+msgstr "Създава правила за филтриране на съобщения за този пощенски списък"
 
-#: my-evolution/Locations.h:922
-msgid "Helsinki"
-msgstr "Хелзинки"
+#: ui/evolution-mail-message.xml.h:16
+msgid "Create a rule to filter messages with this subject"
+msgstr "Създава правила за филтриране на съобщения с тази тема"
 
-#: my-evolution/Locations.h:923
-msgid "Henderson"
-msgstr "Хендерсон"
+#: ui/evolution-mail-message.xml.h:17
+msgid "Create a virtual folder for these recipients"
+msgstr "Създава виртуална папка за тези получатели"
 
-#: my-evolution/Locations.h:924
-msgid "Hengchun"
-msgstr "Хенгчун"
+#: ui/evolution-mail-message.xml.h:18
+msgid "Create a virtual folder for this mailing list"
+msgstr "Създава виртуална папка за този пощенски списък"
 
-#: my-evolution/Locations.h:925
-msgid "Hermosillo"
-msgstr "Хермосило"
+#: ui/evolution-mail-message.xml.h:19
+msgid "Create a virtual folder for this sender"
+msgstr "Създава виртуална папка за този изпращач"
 
-#: my-evolution/Locations.h:926
-msgid "Hibbing"
-msgstr "Хибинг"
+#: ui/evolution-mail-message.xml.h:20
+msgid "Create a virtual folder for this subject"
+msgstr "Създава виртуална папка за този обект"
 
-#: my-evolution/Locations.h:927
-msgid "Hickory"
-msgstr "Хикъри"
+#: ui/evolution-mail-message.xml.h:23
+msgid "Decrease the text size"
+msgstr "Намалява размера на текст"
 
-#: my-evolution/Locations.h:928
-msgid "Hill City"
-msgstr "Хил Сити"
+#: ui/evolution-mail-message.xml.h:25
+msgid "Display the next important message"
+msgstr "Показва следващото важно съобщение"
 
-#: my-evolution/Locations.h:929
-msgid "Hillsboro"
-msgstr "Хилсбъро"
+#: ui/evolution-mail-message.xml.h:26
+msgid "Display the next message"
+msgstr "Показва следващото съобщение"
 
-#: my-evolution/Locations.h:930
-msgid "Hilo"
-msgstr "Хило"
+#: ui/evolution-mail-message.xml.h:27
+msgid "Display the next unread message"
+msgstr "Показва следващото непрочетено съобщение"
 
-#: my-evolution/Locations.h:931
-msgid "Hinesville"
-msgstr "Хайнсвил"
+#: ui/evolution-mail-message.xml.h:28
+msgid "Display the next unread thread"
+msgstr "Показва следващата непрочетена нишка"
 
-#: my-evolution/Locations.h:932
-msgid "Hiroshima Airport"
-msgstr "Летище Хирошима"
+#: ui/evolution-mail-message.xml.h:29
+msgid "Display the previous important message"
+msgstr "Показва предишното важно съобщение"
 
-#: my-evolution/Locations.h:933
-msgid "Hobart"
-msgstr "Хобарт"
+#: ui/evolution-mail-message.xml.h:30
+msgid "Display the previous message"
+msgstr "Показва предишното съобщение"
 
-#: my-evolution/Locations.h:934
-msgid "Hobbs"
-msgstr "Хобс"
+#: ui/evolution-mail-message.xml.h:31
+msgid "Display the previous unread message"
+msgstr "Показва предишно непрочетено съобщение"
 
-#: my-evolution/Locations.h:935
-msgid "Ho Chi Minh"
-msgstr "Хошимин"
+#: ui/evolution-mail-message.xml.h:32
+#, fuzzy
+msgid "F_orward As..."
+msgstr "П_репраща"
 
-#: my-evolution/Locations.h:936
-msgid "Hodeidah"
-msgstr "Ходейда"
+#: ui/evolution-mail-message.xml.h:33
+#, fuzzy
+msgid "Filter _Junk"
+msgstr "Правила на Филтриране"
 
-#: my-evolution/Locations.h:937
-msgid "Hof"
-msgstr "Хоф"
+#: ui/evolution-mail-message.xml.h:34
+msgid "Filter on Mailing _List..."
+msgstr "Филтър върху Пощенски _Списък.."
 
-#: my-evolution/Locations.h:938
-msgid "Hoffman"
-msgstr "Хофман"
+#: ui/evolution-mail-message.xml.h:35
+msgid "Filter on Se_nder..."
+msgstr "Филтър върху _Изпращач..."
 
-#: my-evolution/Locations.h:939
-msgid "Hofu Ab"
-msgstr "ВБ Хофу"
+#: ui/evolution-mail-message.xml.h:36
+msgid "Filter on _Recipients..."
+msgstr "Филтър върху П_олучатели..."
 
-#: my-evolution/Locations.h:940
-msgid "Hohenems"
-msgstr "Хохенемс"
+#: ui/evolution-mail-message.xml.h:37
+msgid "Filter on _Subject..."
+msgstr "Филтър върху _Тема.."
 
-#: my-evolution/Locations.h:941
-msgid "Holguin"
-msgstr "Холген"
+#: ui/evolution-mail-message.xml.h:38
+#, fuzzy
+msgid "Filter the selected messages for junk status"
+msgstr "Маркира избраните съобщения за изтриване"
 
-#: my-evolution/Locations.h:942
-msgid "Homer"
-msgstr "Хомър"
+#: ui/evolution-mail-message.xml.h:39
+msgid "Flag selected message(s) for follow-up"
+msgstr ""
 
-#: my-evolution/Locations.h:943
-msgid "Homestead AFB"
-msgstr "ВВБ Хоумстед"
+#: ui/evolution-mail-message.xml.h:40
+msgid "Follow _Up..."
+msgstr ""
 
-#: my-evolution/Locations.h:944
-msgid "Hondo"
-msgstr "Хондо"
+#: ui/evolution-mail-message.xml.h:41
+msgid "Force images in HTML mail to be loaded"
+msgstr "Принуждава изображенията в HTML поща да бъдат заредени"
 
-#: my-evolution/Locations.h:947
-msgid "Honningsvag"
-msgstr "Хьонингсваг"
+#: ui/evolution-mail-message.xml.h:43
+msgid "Forward the selected message in the body of a new message"
+msgstr "Препраща избраното съобщение в тялото като ново съобщение"
 
-#: my-evolution/Locations.h:948
-msgid "Honolulu"
-msgstr "Хонолулу"
+#: ui/evolution-mail-message.xml.h:44
+msgid "Forward the selected message quoted like a reply"
+msgstr "Препраща избраното съобщение цитирано като отговор"
 
-#: my-evolution/Locations.h:949
-msgid "Hoonah"
-msgstr "Хуна"
+#: ui/evolution-mail-message.xml.h:45
+msgid "Forward the selected message to someone"
+msgstr "Препраща избраното съобщение за някой"
 
-#: my-evolution/Locations.h:950
-msgid "Hoquiam"
-msgstr "Хокам"
+#: ui/evolution-mail-message.xml.h:46
+msgid "Forward the selected message to someone as an attachment"
+msgstr "Препраща избраното съобщение за някой като прикачено"
 
-#: my-evolution/Locations.h:951
-msgid "Hot Springs"
-msgstr "Хот Спрингс"
+#: ui/evolution-mail-message.xml.h:47
+msgid "Increase the text size"
+msgstr "Увеличава размера на текст"
 
-#: my-evolution/Locations.h:952
-msgid "Houghton Lake"
-msgstr "Хютън Лейк"
+#: ui/evolution-mail-message.xml.h:49
+msgid "Load _Images"
+msgstr "Зарежда _Изображения"
 
-#: my-evolution/Locations.h:953
-msgid "Houlton"
-msgstr "Холтън"
+#: ui/evolution-mail-message.xml.h:51
+msgid "Mark as I_mportant"
+msgstr "Маркира като Важно"
 
-#: my-evolution/Locations.h:954
-msgid "Houma"
-msgstr "Хума"
+#: ui/evolution-mail-message.xml.h:52
+msgid "Mark as U_nread"
+msgstr "Отбелязва: непрочетено"
 
-#: my-evolution/Locations.h:955
-msgid "Houston-Bush"
-msgstr "Хюстън-Буш"
+#: ui/evolution-mail-message.xml.h:53
+msgid "Mark as Unimp_ortant"
+msgstr "Маркирай като Не_важни"
 
-#: my-evolution/Locations.h:956
-msgid "Houston-Clover"
-msgstr "Хюстън-Кловър"
+#: ui/evolution-mail-message.xml.h:56
+msgid "Mark the selected message(s) as having been read"
+msgstr ""
 
-#: my-evolution/Locations.h:957
-msgid "Houston-Ellington Field"
-msgstr "Хюстън-Елингтън Фийлд"
+#: ui/evolution-mail-message.xml.h:57
+msgid "Mark the selected message(s) as important"
+msgstr ""
 
-#: my-evolution/Locations.h:958
-msgid "Houston-Hobby"
-msgstr "Хюстън-Хоби"
+#: ui/evolution-mail-message.xml.h:58
+#, fuzzy
+msgid "Mark the selected message(s) as junk"
+msgstr "Маркира избраните съобщения за изтриване"
 
-#: my-evolution/Locations.h:959
-msgid "Houston-Hooks"
-msgstr "Хюстън-Хукс"
+#: ui/evolution-mail-message.xml.h:59
+#, fuzzy
+msgid "Mark the selected message(s) as not being junk"
+msgstr "Маркира избраните съобщения за изтриване"
 
-#: my-evolution/Locations.h:960
-msgid "Howard AFB"
-msgstr "ВВБ Хауърд"
+#: ui/evolution-mail-message.xml.h:60
+msgid "Mark the selected message(s) as not having been read"
+msgstr ""
 
-#: my-evolution/Locations.h:961
-msgid "Hsinchu"
-msgstr "Хсинчу"
+#: ui/evolution-mail-message.xml.h:61
+msgid "Mark the selected message(s) as unimportant"
+msgstr ""
 
-#: my-evolution/Locations.h:962
-msgid "Huanuco"
-msgstr "Хуануко"
+#: ui/evolution-mail-message.xml.h:62
+msgid "Mark the selected messages for deletion"
+msgstr "Маркира избраните съобщения за изтриване"
 
-#: my-evolution/Locations.h:963
-msgid "Huehuetenango"
-msgstr "Хуехуетенанго"
+#: ui/evolution-mail-message.xml.h:63
+msgid "Move"
+msgstr "Премества"
 
-#: my-evolution/Locations.h:964
-msgid "Hulien"
-msgstr "Хулиен"
+#: ui/evolution-mail-message.xml.h:64
+msgid "Move selected message(s) to another folder"
+msgstr "Премества избраните съобщения с друга папка"
 
-#: my-evolution/Locations.h:965
-msgid "Humberside"
-msgstr "Хъмбърсайд"
+#: ui/evolution-mail-message.xml.h:66
+msgid "Next _Important Message"
+msgstr "Следващо _Важно съобщение"
 
-#: my-evolution/Locations.h:967
-msgid "Huntington"
-msgstr "Хънгтингтън"
+#: ui/evolution-mail-message.xml.h:67
+msgid "Next _Thread"
+msgstr "Следваща _Нишка"
 
-#: my-evolution/Locations.h:968
-msgid "Huntsville"
-msgstr "Хънтсвил"
+#: ui/evolution-mail-message.xml.h:68
+msgid "Next _Unread Message"
+msgstr "Следващо _Непрочетено Писмо"
 
-#: my-evolution/Locations.h:969
-msgid "Hurlburt"
-msgstr "Хърлбърт"
+#: ui/evolution-mail-message.xml.h:69
+#, fuzzy
+msgid "Not Junk"
+msgstr "Не е намерен"
 
-#: my-evolution/Locations.h:970
-msgid "Huron"
-msgstr "Хюрон"
+#: ui/evolution-mail-message.xml.h:70
+msgid "Open the selected message in a new window"
+msgstr "Отваря избраните съобщения в нов прозорец"
 
-#: my-evolution/Locations.h:971
-msgid "Hutchinson"
-msgstr "Хътчисън"
+#: ui/evolution-mail-message.xml.h:71
+#, fuzzy
+msgid "Open the selected message in the composer for editing"
+msgstr "Отваря избраното съобщение в редактора за препращане"
 
-#: my-evolution/Locations.h:972
-msgid "Hyakuri Ab"
-msgstr "ВБ Хаякири"
+#: ui/evolution-mail-message.xml.h:72
+msgid "Original Si_ze"
+msgstr "Оригинален Раз_мер"
 
-#: my-evolution/Locations.h:973
-msgid "Hyannis"
-msgstr "Хаянис"
+#: ui/evolution-mail-message.xml.h:73
+msgid "P_revious Unread Message"
+msgstr "П_редишно Непрочетено Съобщение"
 
-#: my-evolution/Locations.h:974
-msgid "Hyderabad"
-msgstr "Хидерабад"
+#: ui/evolution-mail-message.xml.h:75
+#, fuzzy
+msgid "Post a Repl_y"
+msgstr "Изпраща Отговор"
 
-#: my-evolution/Locations.h:975
-msgid "Hyeres-Le Palyvestre"
-msgstr "Хиерес-Ле Паливестре"
+#: ui/evolution-mail-message.xml.h:76
+msgid "Post a reply to a message in a Public folder"
+msgstr ""
 
-#: my-evolution/Locations.h:976
-msgid "Iasi"
-msgstr "Иаси"
+#: ui/evolution-mail-message.xml.h:77
+msgid "Pr_evious Important Message"
+msgstr "Пре_дишно Важно Съобщение"
 
-#: my-evolution/Locations.h:977
-msgid "Ibiza"
-msgstr "Ибиза"
+#: ui/evolution-mail-message.xml.h:78
+msgid "Preview the message to be printed"
+msgstr "Преглед на съобщението за печат"
 
-#: my-evolution/Locations.h:979
-msgid "Ichikawa"
-msgstr "Ичикава"
+#: ui/evolution-mail-message.xml.h:82
+msgid "Print this message"
+msgstr "Отпечатва това Съобщение"
 
-#: my-evolution/Locations.h:980
-msgid "Idaho"
-msgstr "Айдахо"
+#: ui/evolution-mail-message.xml.h:83
+msgid "Re_direct"
+msgstr "Пре_насочва"
 
-#: my-evolution/Locations.h:981
-msgid "Idaho Falls"
-msgstr "Айдахо фолс"
+#: ui/evolution-mail-message.xml.h:84
+msgid "Redirect (bounce) the selected message to someone"
+msgstr "Пренасочва избраното съобщение до някой друг"
 
-#: my-evolution/Locations.h:982
-msgid "Iguazu"
-msgstr "Игуазу"
+#: ui/evolution-mail-message.xml.h:89
+msgid "Reset the text to its original size"
+msgstr "Възстановява текста в неговият оригинален размер"
 
-#: my-evolution/Locations.h:983
-msgid "Iki Airport"
-msgstr "Летище Ики"
+#: ui/evolution-mail-message.xml.h:90
+msgid "S_earch in Message..."
+msgstr "Т_ърси в Съобщение"
 
-#: my-evolution/Locations.h:984
-msgid "Ilan"
-msgstr "Илан"
+#: ui/evolution-mail-message.xml.h:91
+msgid "S_maller"
+msgstr "По-_малък"
 
-#: my-evolution/Locations.h:985
-msgid "Iliamna"
-msgstr "Илиамна"
+#: ui/evolution-mail-message.xml.h:92
+msgid "Save the message as a text file"
+msgstr "Съхранява съобщението като текстови файл"
 
-#: my-evolution/Locations.h:986
-msgid "Illinois"
-msgstr "Илинойс"
+#: ui/evolution-mail-message.xml.h:93
+msgid "Search for text in the body of the displayed message"
+msgstr "Търсене на текст в тялото на показваното съобщение"
 
-#: my-evolution/Locations.h:987
-msgid "Imperial"
-msgstr "Импириъл"
+#: ui/evolution-mail-message.xml.h:94
+msgid "Set up the page settings for your current printer"
+msgstr ""
 
-#: my-evolution/Locations.h:988
-msgid "Imperial (2)"
-msgstr "Импириъл (2)"
+#: ui/evolution-mail-message.xml.h:95
+msgid "Show Email _Source"
+msgstr "Показва Източника на Ел. Поща"
 
-#: my-evolution/Locations.h:989
-msgid "Imperial Beach"
-msgstr "Импириъл Бийч"
+#: ui/evolution-mail-message.xml.h:96
+msgid "Show Full _Headers"
+msgstr "Показва Пълните Заглавия"
 
-#: my-evolution/Locations.h:990
-msgid "In Amenas"
-msgstr "Ин Аменас"
+#: ui/evolution-mail-message.xml.h:97
+#, fuzzy
+msgid "Show a blinking cursor in the body of displayed messages"
+msgstr "Търсене на текст в тялото на показваното съобщение"
 
-#: my-evolution/Locations.h:992
-msgid "Indiana"
-msgstr "Индиана"
+#: ui/evolution-mail-message.xml.h:98
+msgid "Show message in the normal style"
+msgstr "Показва съобщение в нормален стил"
 
-#: my-evolution/Locations.h:993
-msgid "Indianapolis"
-msgstr "Индианаполис"
+#: ui/evolution-mail-message.xml.h:99
+msgid "Show message with all email headers"
+msgstr "Показва съобщение с всички Пощенски заглавия"
 
-#: my-evolution/Locations.h:994
-msgid "Indian Springs"
-msgstr "Индиан Спрингс"
+#: ui/evolution-mail-message.xml.h:100
+msgid "Show the raw email source of the message"
+msgstr "Показва необработено съобщението на Ел. поща"
 
-#: my-evolution/Locations.h:995
-msgid "Innsbruck"
-msgstr "Инсбрук"
+#: ui/evolution-mail-message.xml.h:101
+msgid "Text Si_ze"
+msgstr "Раз_мер на Текста"
 
-#: my-evolution/Locations.h:996
-msgid "International Falls"
-msgstr "Интернешънъл Фолс"
+#: ui/evolution-mail-message.xml.h:102
+msgid "Un-delete the selected messages"
+msgstr "Не изтрива избраните съобщения"
 
-#: my-evolution/Locations.h:997
-msgid "Intracoastal"
-msgstr "Интракоустъл"
+#: ui/evolution-mail-message.xml.h:103
+msgid "VFolder on Mailing _List..."
+msgstr "VFolder върху Пощенски списък..."
 
-#: my-evolution/Locations.h:998
-msgid "Inverness"
-msgstr "Инвърнес"
+#: ui/evolution-mail-message.xml.h:104
+msgid "VFolder on Se_nder..."
+msgstr "VFolder върху _Изпращач"
 
-#: my-evolution/Locations.h:999
-msgid "Inyokern"
-msgstr "Инйокерн"
+#: ui/evolution-mail-message.xml.h:105
+msgid "VFolder on _Recipients..."
+msgstr "VFolder върху _Получатели"
 
-#: my-evolution/Locations.h:1000
-msgid "Iowa"
-msgstr "Айова"
+#: ui/evolution-mail-message.xml.h:106
+msgid "VFolder on _Subject..."
+msgstr "VFolder върху _Тема"
 
-#: my-evolution/Locations.h:1001
-msgid "Iowa City"
-msgstr "Айова Сити"
+#: ui/evolution-mail-message.xml.h:108
+msgid "_Attached"
+msgstr "_Прикрепя файл"
 
-#: my-evolution/Locations.h:1002
-msgid "Iqaluit"
-msgstr "Икалуит"
+#: ui/evolution-mail-message.xml.h:111
+msgid "_Create Filter From Message"
+msgstr "_Създава Правило От Съобщението"
 
-#: my-evolution/Locations.h:1003
-msgid "Iquique/Diego Arac"
-msgstr "Икике/Диего Арак"
+#: ui/evolution-mail-message.xml.h:115
+msgid "_Go To"
+msgstr "_Отива До"
 
-#: my-evolution/Locations.h:1004
-msgid "Iquitos"
-msgstr "Икитос"
+#: ui/evolution-mail-message.xml.h:116
+msgid "_Inline"
+msgstr "_Вътрешен"
 
-#: my-evolution/Locations.h:1005
-msgid "Iraklion"
-msgstr "Ираклион"
+#: ui/evolution-mail-message.xml.h:117
+msgid "_Larger"
+msgstr "_По-голям"
 
-#: my-evolution/Locations.h:1006
-msgid "Iran, Islamic Republic of"
-msgstr "Иран, Ислямска Република"
+#: ui/evolution-mail-message.xml.h:118
+msgid "_Message Display"
+msgstr "Показване на _Съобщение"
 
-#: my-evolution/Locations.h:1008
-msgid "Iron Mountain"
-msgstr "Айрън Маунтин"
+#: ui/evolution-mail-message.xml.h:120
+msgid "_Next Message"
+msgstr "_Следващо съобщение"
 
-#: my-evolution/Locations.h:1009
-msgid "Ironwood"
-msgstr "Аърън Уд"
+#: ui/evolution-mail-message.xml.h:121
+msgid "_Normal Display"
+msgstr "_Нормално Показване"
 
-#: my-evolution/Locations.h:1010
-msgid "Iruma Ab"
-msgstr "ВБ Ирума"
+#: ui/evolution-mail-message.xml.h:122
+msgid "_Open Message"
+msgstr "Отваря _Съобщение"
 
-#: my-evolution/Locations.h:1011
-msgid "Islamabad"
-msgstr "Исламабад"
+#: ui/evolution-mail-message.xml.h:124
+msgid "_Previous Message"
+msgstr "_Предишно Съобщение"
 
-#: my-evolution/Locations.h:1012
-msgid "Isle of Man"
-msgstr "Айл ъф Ман"
+#: ui/evolution-mail-message.xml.h:126
+msgid "_Quoted"
+msgstr "_Цитат"
 
-#: my-evolution/Locations.h:1013
-msgid "Islip"
-msgstr "Ислип"
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
+msgid "_Tools"
+msgstr "Инс_трументи"
 
-#: my-evolution/Locations.h:1014
-msgid "Istanbul"
-msgstr "Истанбул"
+#: ui/evolution-mail-message.xml.h:130
+msgid "_Undelete"
+msgstr "Възстановява изтрито"
 
-#: my-evolution/Locations.h:1015
-msgid "Itaituba"
-msgstr "Итаитуба"
+#: ui/evolution-message-composer.xml.h:1
+msgid "Attach"
+msgstr "Прикрепя"
 
-#: my-evolution/Locations.h:1017
-msgid "Ithaca"
-msgstr "Итака"
+#: ui/evolution-message-composer.xml.h:2
+msgid "Attach a file"
+msgstr "Прикрепя файл"
 
-#: my-evolution/Locations.h:1018
-msgid "Ivano-Frankivsk"
-msgstr "Ивано-Франкивск"
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:3
+msgid "Close the current file"
+msgstr "Затваря текущия файл"
 
-#: my-evolution/Locations.h:1019
-msgid "Iwakuni MCAS"
-msgstr "MCAS Ивакуни"
+#: ui/evolution-message-composer.xml.h:5
+msgid "Delete all but signature"
+msgstr "Изтрива всички подписи"
 
-#: my-evolution/Locations.h:1020
-msgid "Iwojima"
-msgstr "Иводжима"
+#: ui/evolution-message-composer.xml.h:6
+msgid "Encrypt this message with PGP"
+msgstr "Криптира това съобщение с PGP"
 
-#: my-evolution/Locations.h:1021
-msgid "Ixtapa"
-msgstr "Икстапа"
+#: ui/evolution-message-composer.xml.h:7
+msgid "Encrypt this message with your S/MIME Encryption Cetificate"
+msgstr "Криптира това съобщение с вашият S/MIME сертификат за криптиране"
 
-#: my-evolution/Locations.h:1022
-msgid "Izmir/Adnan Menderes"
-msgstr "Измир/Аднан Мендерес"
+#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:4
+msgid "For_mat"
+msgstr "_Формат"
 
-#: my-evolution/Locations.h:1023
-msgid "Izmir/Cigli"
-msgstr "Измир/Чигли"
+#: ui/evolution-message-composer.xml.h:9
+msgid "HT_ML"
+msgstr "HT_ML"
 
-#: my-evolution/Locations.h:1024
-msgid "Izmit"
-msgstr "Измит"
+#: ui/evolution-message-composer.xml.h:11
+msgid "Open a file"
+msgstr "Отваря файл"
 
-#: my-evolution/Locations.h:1025
-msgid "Izumo Airport"
-msgstr "Летище Изумо"
+#: ui/evolution-message-composer.xml.h:12
+msgid "PGP Encrypt"
+msgstr "PGP криптиране"
 
-#: my-evolution/Locations.h:1026
-msgid "Jackson"
-msgstr "Джаксън"
+#: ui/evolution-message-composer.xml.h:13
+msgid "PGP Sign"
+msgstr "PGP подпис"
 
-#: my-evolution/Locations.h:1027
-msgid "Jacksonville"
-msgstr "Джаксънвил"
+#: ui/evolution-message-composer.xml.h:14
+msgid "S/MIME Encrypt"
+msgstr "S/MIME криптиране"
 
-#: my-evolution/Locations.h:1028
-msgid "Jacksonville-Craig Airport"
-msgstr "Джаксънвил-Летище Крейг"
+#: ui/evolution-message-composer.xml.h:15
+msgid "S/MIME Sign"
+msgstr "S/MIME Подпис"
 
-#: my-evolution/Locations.h:1029
-msgid "Jacksonville NAS"
-msgstr "ВВЛ Джаксънвил"
+#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:6
+msgid "Save"
+msgstr "Съхранява"
 
-#: my-evolution/Locations.h:1030
-msgid "Jaffrey"
-msgstr "Джафри"
+#: ui/evolution-message-composer.xml.h:17
+msgid "Save As"
+msgstr "Съхранява Като"
 
-#: my-evolution/Locations.h:1032
-msgid "Jamestown"
-msgstr "Джеймстаун"
+#: ui/evolution-message-composer.xml.h:19
+msgid "Save _Draft"
+msgstr "Запазва _Чернова"
 
-#: my-evolution/Locations.h:1033
-msgid "Janesville"
-msgstr "Джейнсвил"
+#: ui/evolution-message-composer.xml.h:20
+msgid "Save in folder..."
+msgstr "Съхранява в папка..."
 
-#: my-evolution/Locations.h:1034
-msgid "Jan Smuts"
-msgstr "Ян Смутс"
+#: ui/evolution-message-composer.xml.h:21
+#: ui/evolution-signature-editor.xml.h:9
+msgid "Save the current file"
+msgstr "Съхранява текущия файл"
 
-#: my-evolution/Locations.h:1036
-msgid "Jeddah King Abdul Aziz International Airport"
-msgstr "Международно Летище Джеда крал Абдул Азиз"
+#: ui/evolution-message-composer.xml.h:22
+msgid "Save the current file with a different name"
+msgstr "Съхранява текущият файл с различно име"
 
-#: my-evolution/Locations.h:1037
-msgid "Jefferson City"
-msgstr "Джеферсън сити"
+#: ui/evolution-message-composer.xml.h:23
+msgid "Save the message in a specified folder"
+msgstr "Съхранява съобщението в определа папка"
 
-#: my-evolution/Locations.h:1038
-msgid "Jerez"
-msgstr "Херес"
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "Изпраща"
 
-#: my-evolution/Locations.h:1039
-msgid "Jersey"
-msgstr "Джърси"
+#: ui/evolution-message-composer.xml.h:25
+#: ui/evolution-signature-editor.xml.h:11
+msgid "Send the mail in HTML format"
+msgstr "Изпраша ел. писмо в HTML формат"
 
-#: my-evolution/Locations.h:1040
-msgid "Jinotega"
-msgstr "Инотега"
+#: ui/evolution-message-composer.xml.h:26
+msgid "Send this message"
+msgstr "Изпраща това писмо"
 
-#: my-evolution/Locations.h:1041
-msgid "Johan A. Pengel"
-msgstr "Йохан А. Пенгел"
+#: ui/evolution-message-composer.xml.h:27
+msgid "Show / hide attachments"
+msgstr "Показва / скрива прикачени"
 
-#: my-evolution/Locations.h:1042
-msgid "Johnstown"
-msgstr "Джонстаун"
+#: ui/evolution-message-composer.xml.h:28
+msgid "Show _attachments"
+msgstr "Показва _прикачени"
 
-#: my-evolution/Locations.h:1043
-msgid "Jonesboro"
-msgstr "Джоунсбъро"
+#: ui/evolution-message-composer.xml.h:29
+msgid "Show attachments"
+msgstr "Показва прикачени"
 
-#: my-evolution/Locations.h:1044
-msgid "Jonkoping"
-msgstr "Йонкьопинг"
+#: ui/evolution-message-composer.xml.h:30
+msgid "Sign this message with your PGP key"
+msgstr "Подписва съобщението с вашият PGP ключ"
 
-#: my-evolution/Locations.h:1045
-msgid "Joplin"
-msgstr "Джаплън"
+#: ui/evolution-message-composer.xml.h:31
+msgid "Sign this message with your S/MIME Signature Certificate"
+msgstr "Подписва съобщението с вашият S/MIME Сертификат"
 
-#: my-evolution/Locations.h:1047
-msgid "Juanjui"
-msgstr "Джуанджу"
+#: ui/evolution-message-composer.xml.h:32
+msgid "Toggles whether the BCC field is displayed"
+msgstr "Превключва дали полето BCC ще бъде показвано"
 
-#: my-evolution/Locations.h:1048
-msgid "Juan Santamaria"
-msgstr "Хуан Сантамариа"
+#: ui/evolution-message-composer.xml.h:33
+msgid "Toggles whether the CC field is displayed"
+msgstr "Превключва дали полето CC ще бъде показвано"
 
-#: my-evolution/Locations.h:1049
-msgid "Juigalpa"
-msgstr "Хуигалпа"
+#: ui/evolution-message-composer.xml.h:34
+msgid "Toggles whether the From chooser is displayed"
+msgstr "Превключва дали полето за избор на 'От' ще бъде показвано"
 
-#: my-evolution/Locations.h:1050
-msgid "Jujuy"
-msgstr "Джуджуи"
+#: ui/evolution-message-composer.xml.h:35
+#, fuzzy
+msgid "Toggles whether the Post-To field is displayed"
+msgstr "Превключва дали полето Отговор-На ще бъде показвано"
 
-#: my-evolution/Locations.h:1051
-msgid "Juliaca"
-msgstr "Джулиака"
+#: ui/evolution-message-composer.xml.h:36
+msgid "Toggles whether the Reply-To field is displayed"
+msgstr "Превключва дали полето Отговор-На ще бъде показвано"
 
-#: my-evolution/Locations.h:1052
-msgid "Junction"
-msgstr "Джънкшън"
+#: ui/evolution-message-composer.xml.h:37
+#, fuzzy
+msgid "Toggles whether the To field is displayed"
+msgstr "Превключва дали полето CC ще бъде показвано"
 
-#: my-evolution/Locations.h:1053
-msgid "Juneau"
-msgstr "Жуно"
+#: ui/evolution-message-composer.xml.h:38
+msgid "_Attachment..."
+msgstr "_Прикачен..."
 
-#: my-evolution/Locations.h:1054
-msgid "Kadena Ab"
-msgstr "Кадена"
+#: ui/evolution-message-composer.xml.h:39
+msgid "_Bcc Field"
+msgstr "_Bcc Поле"
 
-#: my-evolution/Locations.h:1055
-msgid "Kagoshima Airport"
-msgstr "Летище Кагошима"
+#: ui/evolution-message-composer.xml.h:40
+msgid "_Cc Field"
+msgstr "_Cc Поле"
 
-#: my-evolution/Locations.h:1056
-msgid "Kahului"
-msgstr "Каулуи"
+#: ui/evolution-message-composer.xml.h:42
+msgid "_Delete all"
+msgstr "Изтрива _всичко"
 
-#: my-evolution/Locations.h:1057
-msgid "Kailua-Kona"
-msgstr "Каилуа-Кона"
+#: ui/evolution-message-composer.xml.h:45
+msgid "_From Field"
+msgstr "_От Поле"
 
-#: my-evolution/Locations.h:1058
-msgid "Kake"
-msgstr "Каке"
+#: ui/evolution-message-composer.xml.h:46
+#: ui/evolution-signature-editor.xml.h:14
+msgid "_Insert"
+msgstr "_Вмъква"
 
-#: my-evolution/Locations.h:1059
-msgid "Kalamata"
-msgstr "Каламата"
+#: ui/evolution-message-composer.xml.h:47
+msgid "_Open..."
+msgstr "_Отваря..."
 
-#: my-evolution/Locations.h:1060
-msgid "Kalamazoo"
-msgstr "Каламазо"
+#: ui/evolution-message-composer.xml.h:48
+#, fuzzy
+msgid "_Post-To Field"
+msgstr "Отговор-До Поле"
 
-#: my-evolution/Locations.h:1061
-msgid "Kalispell"
-msgstr "Калиспел"
+#: ui/evolution-message-composer.xml.h:49
+msgid "_Reply-To Field"
+msgstr "Отговор-До Поле"
 
-#: my-evolution/Locations.h:1062
-msgid "Kamigoto"
-msgstr "Камигото"
+#: ui/evolution-message-composer.xml.h:51
+msgid "_Security"
+msgstr "_Сигурност"
 
-#: my-evolution/Locations.h:1063
-msgid "Kaneohe"
-msgstr "Канеое"
+#: ui/evolution-message-composer.xml.h:52
+#, fuzzy
+msgid "_To Field"
+msgstr "_От Поле"
 
-#: my-evolution/Locations.h:1064
-msgid "Kangshan"
-msgstr "Кангшан"
+#: ui/evolution-signature-editor.xml.h:5
+msgid "H_TML"
+msgstr "H_TML"
 
-#: my-evolution/Locations.h:1065
-msgid "Kanoya Ab"
-msgstr "ВБ Каноя"
+#: ui/evolution-signature-editor.xml.h:10
+msgid "Save the current file and close the window"
+msgstr "Запазва текущия файл и затваря прозореца"
 
-#: my-evolution/Locations.h:1066
-msgid "Kansai International Airport"
-msgstr "Канзас международно летище"
+#: ui/evolution-subscribe.xml.h:1
+msgid "Add folder to your list of subscribed folders"
+msgstr "Добавя папка към вашият списък от папки за абонамент"
 
-#: my-evolution/Locations.h:1067
-msgid "Kansas"
-msgstr "Канзас"
+#: ui/evolution-subscribe.xml.h:2
+msgid "F_older"
+msgstr "Папка"
 
-#: my-evolution/Locations.h:1068
-msgid "Kansas City"
-msgstr "Канзас Сити"
+#: ui/evolution-subscribe.xml.h:3
+msgid "Refresh List"
+msgstr "Освежава Списък"
 
-#: my-evolution/Locations.h:1069
-msgid "Kansas City-Gladstone"
-msgstr "Канзас Сити-Гладстън"
+#: ui/evolution-subscribe.xml.h:4
+msgid "Refresh List of Folders"
+msgstr "Освежава Списъка от Папки"
 
-#: my-evolution/Locations.h:1070
-msgid "Kaohsiung"
-msgstr "Каошиунг"
+#: ui/evolution-subscribe.xml.h:5
+msgid "Remove folder from your list of subscribed folders"
+msgstr "Изтрива папка от вашият списък на абонаментни папки"
 
-#: my-evolution/Locations.h:1071
-msgid "Karachi"
-msgstr "Карачи"
+#: ui/evolution-subscribe.xml.h:7
+msgid "Subscribe"
+msgstr "Абонира"
 
-#: my-evolution/Locations.h:1072
-msgid "Karup"
-msgstr "Каръп"
+#: ui/evolution-subscribe.xml.h:8
+msgid "Unsubscribe"
+msgstr "Отписва"
 
-#: my-evolution/Locations.h:1073
-msgid "Kassel-Calden"
-msgstr "Касел-Калдън"
+#: ui/evolution-task-editor.xml.h:1
+msgid "Assign Task"
+msgstr "Присвояване на Задача"
 
-#: my-evolution/Locations.h:1074
-msgid "Kasumigaura Ab"
-msgstr "ВБ Касумигуара"
+#: ui/evolution-task-editor.xml.h:2
+msgid "Assign this task to others"
+msgstr "Поставя тази задача на други"
 
-#: my-evolution/Locations.h:1075
-msgid "Kasuminome Ab"
-msgstr "ВБ Касуминоме"
+#: ui/evolution-task-editor.xml.h:3
+msgid "Cancel Task"
+msgstr "Прекъсва Задача"
 
-#: my-evolution/Locations.h:1076
-msgid "Katowice"
-msgstr "Катовице"
+#: ui/evolution-task-editor.xml.h:4
+msgid "Cancel this task"
+msgstr "Прекратява тази задача"
 
-#: my-evolution/Locations.h:1077
-msgid "Kavala"
-msgstr "Кавала"
+#: ui/evolution-task-editor.xml.h:7
+msgid "Obtain the latest task information"
+msgstr "Получава информация за последната задача"
 
-#: my-evolution/Locations.h:1078
-msgid "Kayseri"
-msgstr "Кайзери"
+#: ui/evolution-task-editor.xml.h:8
+msgid "Re_fresh Task"
+msgstr "Ос_вежава задача"
 
-#: my-evolution/Locations.h:1079
-msgid "Kazan"
-msgstr "Казан"
+#: ui/evolution-tasks.xml.h:3
+msgid "Copy selected task"
+msgstr "Копира избраната задача"
 
-#: my-evolution/Locations.h:1080
-msgid "Kearney"
-msgstr "Кърни"
+#: ui/evolution-tasks.xml.h:5
+msgid "Cut selected task"
+msgstr "Отрязва избраната задача"
 
-#: my-evolution/Locations.h:1081
-msgid "Keene"
-msgstr "Кийн"
+#: ui/evolution-tasks.xml.h:7
+msgid "Delete completed tasks"
+msgstr "Изтрива завършените задачи"
 
-#: my-evolution/Locations.h:1082
-msgid "Kefallinia"
-msgstr "Кафелиния"
+#: ui/evolution-tasks.xml.h:8
+msgid "Delete selected tasks"
+msgstr "Изтрива избраните задачи"
 
-#: my-evolution/Locations.h:1083
-msgid "Keflavik"
-msgstr "Кефлавик"
+#: ui/evolution-tasks.xml.h:9
+msgid "Mar_k as Complete"
+msgstr "От_белязва като Завършени"
 
-#: my-evolution/Locations.h:1084
-msgid "Kenai"
-msgstr "Кенай"
+#: ui/evolution-tasks.xml.h:10
+msgid "Mark selected tasks as complete"
+msgstr "Отбелязва избраните задачи като завършение"
 
-#: my-evolution/Locations.h:1085
-msgid "Kenosha"
-msgstr "Кеноша"
+#: ui/evolution-tasks.xml.h:12
+msgid "Paste task from the clipboard"
+msgstr "Поставя задача от буфера за обмен"
 
-#: my-evolution/Locations.h:1086
-msgid "Kentucky"
+#: ui/evolution-tasks.xml.h:13
+msgid "Previews the list of tasks to be printed"
 msgstr ""
 
-#: my-evolution/Locations.h:1087
-msgid "Keokuk"
-msgstr "Кеокук"
-
-#: my-evolution/Locations.h:1088
-msgid "Kerkira"
-msgstr "Керкира"
-
-#: my-evolution/Locations.h:1089
-msgid "Kerman"
-msgstr "Керман"
-
-#: my-evolution/Locations.h:1090
-msgid "Ketchikan"
-msgstr "Кечикан"
-
-#: my-evolution/Locations.h:1091
-msgid "Key West"
-msgstr "Кий Уест"
-
-#: my-evolution/Locations.h:1092
-msgid "Key West NAS"
-msgstr "ВВЛ Кий Уест"
-
-#: my-evolution/Locations.h:1093
-msgid "Khabarovsk"
-msgstr "Хабаровск"
-
-#: my-evolution/Locations.h:1094
-msgid "Khamis Mushait"
-msgstr "Хамис Мусхит"
-
-#: my-evolution/Locations.h:1095
-msgid "Kharkiv"
-msgstr "Харков"
-
-#: my-evolution/Locations.h:1096
-msgid "Kikai Island"
-msgstr "Остров Кикаи"
-
-#: my-evolution/Locations.h:1097
-msgid "Killeen"
-msgstr "Килийн"
-
-#: my-evolution/Locations.h:1098
-msgid "Killeen-Ft Hood"
-msgstr "Килийн-Фт. Худ"
-
-#: my-evolution/Locations.h:1099
-msgid "Killeen-Gray AAF"
-msgstr "Килийн-ВВБ Грей"
-
-#: my-evolution/Locations.h:1100
-msgid "King Khaled International Airport"
-msgstr "Международно летище крал Кхалед"
-
-#: my-evolution/Locations.h:1101
-msgid "Kingman"
-msgstr "Кингман"
-
-#: my-evolution/Locations.h:1102
-msgid "King Salmon"
-msgstr "Кинг Салмън"
-
-#: my-evolution/Locations.h:1103
-msgid "Kingston"
-msgstr "Кингстон"
-
-#: my-evolution/Locations.h:1104
-msgid "Kingsville"
-msgstr "Кингсвил"
-
-#: my-evolution/Locations.h:1105
-msgid "Kinloss"
-msgstr "Кинлос"
-
-#: my-evolution/Locations.h:1106
-msgid "Kinston"
-msgstr "Кинстон"
-
-#: my-evolution/Locations.h:1107
-msgid "Kirkenes"
-msgstr "Къркнес"
-
-#: my-evolution/Locations.h:1108
-msgid "Kirksville"
-msgstr "Кърксвил"
-
-#: my-evolution/Locations.h:1109
-msgid "Kiruna"
-msgstr "Кируна"
-
-#: my-evolution/Locations.h:1110
-msgid "Kisarazu Ab"
-msgstr "ВБ Кисаразу"
-
-#: my-evolution/Locations.h:1111
-msgid "Kishineu"
-msgstr "Кишинев"
-
-#: my-evolution/Locations.h:1112
-msgid "Kitakyushu Airport"
-msgstr "Летище Китакюшу"
-
-#: my-evolution/Locations.h:1113
-msgid "Klagenfurt"
-msgstr "Клагенфурт"
-
-#: my-evolution/Locations.h:1114
-msgid "Klamath Falls"
-msgstr "Кламат Фолс"
-
-#: my-evolution/Locations.h:1115
-msgid "Klawock"
-msgstr "Клоуок"
-
-#: my-evolution/Locations.h:1116
-msgid "Kleine Brogel"
-msgstr "Клайне Брьогел"
-
-#: my-evolution/Locations.h:1117
-msgid "Kliningrad"
-msgstr "Калининград"
-
-#: my-evolution/Locations.h:1118
-msgid "Knoxville"
-msgstr "Ноксвил"
-
-#: my-evolution/Locations.h:1119
-msgid "Knoxville-Downtown"
-msgstr "Ноксвил-Даунтаун"
-
-#: my-evolution/Locations.h:1120
-msgid "Kobenhavn/Kastrup"
-msgstr "Копенхаген/Кструп"
-
-#: my-evolution/Locations.h:1121
-msgid "Kobenhavn/Roskilde"
-msgstr "Копенхаген/Роксилде"
-
-#: my-evolution/Locations.h:1122
-msgid "Kochi Airport"
-msgstr "Летище Кочи"
-
-#: my-evolution/Locations.h:1123
-msgid "Kodiak"
-msgstr "Кодиак"
-
-#: my-evolution/Locations.h:1124
-msgid "Kogalniceanu"
-msgstr "Когалницеану"
-
-#: my-evolution/Locations.h:1125
-msgid "Kogalym"
-msgstr "Когалум"
-
-#: my-evolution/Locations.h:1126
-msgid "Koksijde"
-msgstr "Коксилде"
-
-#: my-evolution/Locations.h:1127
-msgid "Kolding/Vandrup"
-msgstr "Кьолдинг/Вандруп"
-
-#: my-evolution/Locations.h:1128
-msgid "Koln/Bonn"
-msgstr "Кьолн/Бон"
-
-#: my-evolution/Locations.h:1129
-msgid "Komatsu Ab"
-msgstr "ВБ Коматсу"
-
-#: my-evolution/Locations.h:1130
-msgid "Komatsujima Ab"
-msgstr "ВБ Коматсуджима"
-
-#: my-evolution/Locations.h:1131
-msgid "Konya"
-msgstr "Коня"
-
-#: my-evolution/Locations.h:1132
-msgid "Korea, Democratic People's Republic of"
-msgstr "Корея, Демократична Народна Република"
-
-#: my-evolution/Locations.h:1133
-msgid "Korea, Republic of"
-msgstr "Корея, Република"
-
-#: my-evolution/Locations.h:1134
-msgid "Kos"
-msgstr "Кос"
-
-#: my-evolution/Locations.h:1135
-msgid "Kotzebue"
-msgstr "Кецебу"
-
-#: my-evolution/Locations.h:1136
-msgid "Kozani"
-msgstr "Козани"
-
-#: my-evolution/Locations.h:1137
-msgid "Krakow"
-msgstr "Краков"
-
-#: my-evolution/Locations.h:1138
-msgid "Krasnodar"
-msgstr "Краснодар"
-
-#: my-evolution/Locations.h:1139
-msgid "Krasnoyarsk"
-msgstr "Красноярск"
-
-#: my-evolution/Locations.h:1140
-msgid "Kristiansand/Kjevik"
-msgstr "Кристиансунд/Кйевик"
-
-#: my-evolution/Locations.h:1141
-msgid "Kristiansund/Kvernberget"
-msgstr "Кристиансунд/Квернбергет"
-
-#: my-evolution/Locations.h:1142
-msgid "Kryviy Rig/Lozovatka"
-msgstr "Кривий Рог/Лозоватка"
-
-#: my-evolution/Locations.h:1143
-msgid "Kumamoto Airport"
-msgstr "Летище Кимамото"
-
-#: my-evolution/Locations.h:1144
-msgid "Kunming"
-msgstr "Кунминг"
-
-#: my-evolution/Locations.h:1145
-msgid "Kushiro Airport"
-msgstr "Летище Куширо"
-
-#: my-evolution/Locations.h:1147
-msgid "Kyiv/Boryspil"
-msgstr "Киев/Бориспил"
-
-#: my-evolution/Locations.h:1148
-msgid "Kyiv/Zhulyany"
-msgstr "Киев/Жуляни"
-
-#: my-evolution/Locations.h:1149
-msgid "La Ceiba"
-msgstr ""
+#: ui/evolution-tasks.xml.h:16
+msgid "Print the list of tasks"
+msgstr "Разпечатва списъкът от задачи"
 
-#: my-evolution/Locations.h:1150
-msgid "Laconia"
-msgstr "Лакония"
+#: ui/evolution-tasks.xml.h:18
+#, fuzzy
+msgid "View the selected task"
+msgstr "Изтрива избраните задачи"
 
-#: my-evolution/Locations.h:1151
-msgid "La Coruna"
-msgstr "Ла Коруна"
+#: ui/evolution-tasks.xml.h:23
+#, fuzzy
+msgid "_Open Task"
+msgstr "Нова Задача"
 
-#: my-evolution/Locations.h:1152
-msgid "La Crosse"
-msgstr ""
+#: ui/evolution.xml.h:1
+#, fuzzy
+msgid "About Evolution..."
+msgstr "Относно Ximian Evolution..."
 
-#: my-evolution/Locations.h:1153
-msgid "La Esperanza"
-msgstr "Ла Есперанца"
+#: ui/evolution.xml.h:2
+msgid "Change Evolution's settings"
+msgstr "Промена настройките на Evolution"
 
-#: my-evolution/Locations.h:1154
-msgid "Lafayette"
-msgstr ""
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the visibility of the toolbar"
+msgstr "Промяна настройките за тази папка"
 
-#: my-evolution/Locations.h:1155
-msgid "La Grande"
-msgstr ""
+#: ui/evolution.xml.h:6
+msgid "Create a new window displaying this folder"
+msgstr "Създава нов прозорец изобразяващ тази папка"
 
-#: my-evolution/Locations.h:1156
-msgid "Lahaina"
-msgstr ""
+#: ui/evolution.xml.h:7
+msgid "E_xit"
+msgstr "Изход"
 
-#: my-evolution/Locations.h:1157
-msgid "Lahore"
-msgstr "Лахор"
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "_Често Задавани Въпроси"
 
-#: my-evolution/Locations.h:1158
-msgid "Lajes"
-msgstr ""
+#: ui/evolution.xml.h:9
+msgid "Exit the program"
+msgstr "Напуска програмата"
 
-#: my-evolution/Locations.h:1159
-msgid "La Junta"
-msgstr ""
+#: ui/evolution.xml.h:10
+msgid "Forget _Passwords"
+msgstr "Забравя _Пароли"
 
-#: my-evolution/Locations.h:1160
-msgid "Lake Charles"
+#: ui/evolution.xml.h:11
+msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
+"Забравя запомнената парола, така че вие ще бъдете запитан за нея отново"
 
-#: my-evolution/Locations.h:1161
-msgid "Lake Hood"
-msgstr ""
+#: ui/evolution.xml.h:12
+msgid "Import data from other programs"
+msgstr "Внася данни от други програми"
 
-#: my-evolution/Locations.h:1162
-msgid "Lakehurst"
-msgstr ""
+#: ui/evolution.xml.h:14
+#, fuzzy
+msgid "New _Window"
+msgstr "_Отваря в Нов Прозорец"
 
-#: my-evolution/Locations.h:1163
-msgid "Lakeland"
-msgstr ""
+#: ui/evolution.xml.h:15
+msgid "Pi_lot Settings..."
+msgstr "Настройки на Pilot"
 
-#: my-evolution/Locations.h:1164
-msgid "Lake Tahoe"
-msgstr ""
+#: ui/evolution.xml.h:16
+msgid "Send / Receive"
+msgstr "Изпращане / Получаване"
 
-#: my-evolution/Locations.h:1165
-msgid "Lakeview"
+#: ui/evolution.xml.h:17
+msgid "Send queued items and retrieve new items"
 msgstr ""
 
-#: my-evolution/Locations.h:1166
-msgid "Lamar"
-msgstr "Ламар"
-
-#: my-evolution/Locations.h:1167
-msgid "La Mesa"
-msgstr "Ла Меса"
-
-#: my-evolution/Locations.h:1168
-msgid "Lamezia"
-msgstr "Ламезия"
-
-#: my-evolution/Locations.h:1169
-msgid "Lamoni"
-msgstr "Ламони"
-
-#: my-evolution/Locations.h:1170
-msgid "Lampedusa"
-msgstr "Лампедуса"
-
-#: my-evolution/Locations.h:1171
-msgid "Lanai"
-msgstr "Ланай"
-
-#: my-evolution/Locations.h:1172
-msgid "Lancaster"
-msgstr "Ланкастър"
-
-#: my-evolution/Locations.h:1173
-msgid "Lander"
-msgstr "Ландер"
-
-#: my-evolution/Locations.h:1174
-msgid "Langebaanweg"
+#: ui/evolution.xml.h:18
+msgid "Set up Pilot configuration"
 msgstr ""
 
-#: my-evolution/Locations.h:1175
-msgid "Langley AFB"
-msgstr "Лангли"
-
-#: my-evolution/Locations.h:1176
-msgid "Lannion"
-msgstr "Ланион"
-
-#: my-evolution/Locations.h:1177
-msgid "Lansing"
-msgstr "Лансинг"
+#: ui/evolution.xml.h:19
+#, fuzzy
+msgid "Show information about Evolution"
+msgstr "Показва информация за Ximian Evolution"
 
-#: my-evolution/Locations.h:1178
-msgid "Lanzhou"
-msgstr ""
+#: ui/evolution.xml.h:20
+msgid "Submit Bug Report"
+msgstr "Изпраща доклад за грешка"
 
-#: my-evolution/Locations.h:1179
-msgid "La Paz"
-msgstr "Ла Пас"
+#: ui/evolution.xml.h:21
+msgid "Submit _Bug Report"
+msgstr "Изпраща доклад за грешка"
 
-#: my-evolution/Locations.h:1180
-msgid "La Paz/Alto"
-msgstr ""
+#: ui/evolution.xml.h:22
+msgid "Submit a bug report using Bug Buddy"
+msgstr "Изпраща доклад за грешка чрез Бъг Бъди"
 
-#: my-evolution/Locations.h:1181
-msgid "Laramie"
-msgstr ""
+#: ui/evolution.xml.h:23
+#, fuzzy
+msgid "T_oolbar"
+msgstr "Главна лента с инструменти"
 
-#: my-evolution/Locations.h:1182
-msgid "Laredo"
-msgstr "Ларедо"
+#: ui/evolution.xml.h:24
+msgid "Toggle whether we are working offline."
+msgstr "Превключва работа оф/он-лайн"
 
-#: my-evolution/Locations.h:1183
-msgid "Larnaka"
-msgstr "Ларнака"
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "_About Evolution..."
+msgstr "Относно Ximian Evolution..."
 
-#: my-evolution/Locations.h:1184
-msgid "La Romana"
-msgstr ""
+#: ui/evolution.xml.h:30
+msgid "_Help"
+msgstr "_Помощ"
 
-#: my-evolution/Locations.h:1185
-msgid "Las Americas"
-msgstr ""
+#: ui/evolution.xml.h:31
+msgid "_Import..."
+msgstr "_Внася..."
 
-#: my-evolution/Locations.h:1186
-msgid "Las Tunas"
-msgstr ""
+#: ui/evolution.xml.h:32
+msgid "_New"
+msgstr "Нов"
 
-#: my-evolution/Locations.h:1187
-msgid "Las Vegas"
-msgstr "Лас Вегас"
+#: ui/evolution.xml.h:33
+#, fuzzy
+msgid "_Quick Reference"
+msgstr "Пощенски Настройки"
 
-#: my-evolution/Locations.h:1188
-msgid "Latina"
-msgstr ""
+#: ui/evolution.xml.h:34
+msgid "_Send / Receive"
+msgstr "Изпращане / Получаване"
 
-#: my-evolution/Locations.h:1189
-msgid "Latrobe"
-msgstr ""
+#: ui/evolution.xml.h:38
+#, fuzzy
+msgid "_Window"
+msgstr "_Намира Сега"
 
-#: my-evolution/Locations.h:1190
-msgid "Laughlin"
-msgstr ""
+#: views/addressbook/galview.xml.h:1
+msgid "By _Company"
+msgstr "По _Компания"
 
-#: my-evolution/Locations.h:1191
-msgid "Laurel"
-msgstr "Лаурел"
+#: views/addressbook/galview.xml.h:2
+msgid "_Address Cards"
+msgstr "_Адресни Карти"
 
-#: my-evolution/Locations.h:1192
-msgid "La Verne"
-msgstr "Ла Верне"
+#: views/addressbook/galview.xml.h:3
+msgid "_Phone List"
+msgstr "_Телефонен списък"
 
-#: my-evolution/Locations.h:1193
-msgid "Lawrence"
-msgstr ""
+#: views/calendar/galview.xml.h:1
+msgid "W_eek View"
+msgstr "С_едмичен Преглед"
 
-#: my-evolution/Locations.h:1194
-msgid "Lawton"
-msgstr ""
+#: views/calendar/galview.xml.h:2
+msgid "_Day View"
+msgstr "_Дневен Изглед"
 
-#: my-evolution/Locations.h:1195
-msgid "Leadville"
-msgstr ""
+#: views/calendar/galview.xml.h:3
+#, fuzzy
+msgid "_List View"
+msgstr "_Месечен преглед"
 
-#: my-evolution/Locations.h:1196
-msgid "Learmouth"
-msgstr ""
+#: views/calendar/galview.xml.h:4
+msgid "_Month View"
+msgstr "_Месечен преглед"
 
-#: my-evolution/Locations.h:1198
-msgid "Lecce"
+#: views/calendar/galview.xml.h:5
+msgid "_Work Week View"
 msgstr ""
 
-#: my-evolution/Locations.h:1199
-msgid "Leeds and Bradford"
-msgstr ""
+#: views/mail/galview.xml.h:1
+#, fuzzy
+msgid "As _Sent Folder"
+msgstr "Избира Папка"
 
-#: my-evolution/Locations.h:1200
-msgid "Leesburg"
-msgstr ""
+#: views/mail/galview.xml.h:2
+#, fuzzy
+msgid "By S_tatus"
+msgstr "По Статус"
 
-#: my-evolution/Locations.h:1201
-msgid "Leeuwarden"
-msgstr ""
+#: views/mail/galview.xml.h:3
+#, fuzzy
+msgid "By Se_nder"
+msgstr "По Изпращач"
 
-#: my-evolution/Locations.h:1202
-msgid "Le Havre-Octeville"
-msgstr ""
+#: views/mail/galview.xml.h:4
+#, fuzzy
+msgid "By Su_bject"
+msgstr "По Тема"
 
-#: my-evolution/Locations.h:1203
-msgid "Leipzig-Schkeuditz"
+#: views/mail/galview.xml.h:5
+msgid "By _Follow Up Flag"
 msgstr ""
 
-#: my-evolution/Locations.h:1204
-msgid "Leknes"
-msgstr ""
+#: views/mail/galview.xml.h:6
+#, fuzzy
+msgid "_Messages"
+msgstr "Съобщения"
 
-#: my-evolution/Locations.h:1205
-msgid "Le Mans"
-msgstr "Ле Ман"
+#: views/tasks/galview.xml.h:1
+#, fuzzy
+msgid "With _Due Date"
+msgstr "_Крайна Дата"
 
-#: my-evolution/Locations.h:1206
-msgid "Le Marine"
-msgstr ""
+#: views/tasks/galview.xml.h:2
+#, fuzzy
+msgid "With _Status"
+msgstr "Задава статус"
 
-#: my-evolution/Locations.h:1207
-msgid "Lemmon"
-msgstr ""
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:197
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:635
+msgid "UTC"
+msgstr "UTC"
 
-#: my-evolution/Locations.h:1208
-msgid "Lemoore"
-msgstr ""
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Time Zones</b>"
+msgstr "Времева Зона: "
 
-#: my-evolution/Locations.h:1209
-msgid "Leticia/Vasquez Cobo"
-msgstr ""
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+#, fuzzy
+msgid "<b>_Selection</b>"
+msgstr "_Маркировка:"
 
-#: my-evolution/Locations.h:1210
-msgid "Le Touquet"
-msgstr ""
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+msgid "Select a Time Zone"
+msgstr "Избор на Времева Зона"
 
-#: my-evolution/Locations.h:1211
-msgid "Leuchars"
+#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+"Use the right mouse button to zoom out."
 msgstr ""
 
-#: my-evolution/Locations.h:1212
-msgid "Lewisburg"
-msgstr ""
+#: widgets/menus/gal-view-menus.c:292
+msgid "_Current View"
+msgstr "_Текущ Преглед"
 
-#: my-evolution/Locations.h:1213
-msgid "Lewiston"
+#. bonobo displays this string so it must be in locale
+#: widgets/menus/gal-view-menus.c:351
+msgid "Custom View"
 msgstr ""
 
-#: my-evolution/Locations.h:1214
-msgid "Lewistown"
+#: widgets/menus/gal-view-menus.c:360
+msgid "Save Custom View..."
 msgstr ""
 
-#: my-evolution/Locations.h:1215
-msgid "Lexington"
+#: widgets/menus/gal-view-menus.c:373
+msgid "Define Views..."
 msgstr ""
 
-#: my-evolution/Locations.h:1216
-msgid "Liberal"
-msgstr ""
+#. Translators: These are the first characters of each day of the
+#. week, 'M' for 'Monday', 'T' for Tuesday etc.
+#: widgets/misc/e-calendar-item.c:423
+msgid "MTWTFSS"
+msgstr "MTWTFSS"
 
-#: my-evolution/Locations.h:1218
-msgid "Libya"
-msgstr "Либия"
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1128
+msgid "%B %Y"
+msgstr "%B %Y"
 
-#: my-evolution/Locations.h:1219
-msgid "Lichtenburg"
-msgstr "Лихтенбург"
+#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:429
+msgid "Now"
+msgstr "Сега"
 
-#: my-evolution/Locations.h:1220
-msgid "Lidgerwood"
-msgstr ""
+#: widgets/misc/e-cell-date-edit.c:805
+#, c-format
+msgid "The time must be in the format: %s"
+msgstr "Датата трябва да е въведена в следния формат: %s"
 
-#: my-evolution/Locations.h:1221
-msgid "Liege"
-msgstr ""
+#: widgets/misc/e-cell-percent.c:77
+msgid "The percent value must be between 0 and 100, inclusive"
+msgstr "Стойността на процентите трябва да е между 0 и 100, включително"
 
-#: my-evolution/Locations.h:1222
-msgid "Lihue"
-msgstr ""
+#: widgets/misc/e-charset-picker.c:63
+msgid "Baltic"
+msgstr "Балтиски"
 
-#: my-evolution/Locations.h:1223
-msgid "Lille-Lesquin"
-msgstr ""
+#: widgets/misc/e-charset-picker.c:64
+msgid "Central European"
+msgstr "Центална Европа"
 
-#: my-evolution/Locations.h:1224
-msgid "Lima-Callao"
-msgstr ""
+#: widgets/misc/e-charset-picker.c:65
+msgid "Chinese"
+msgstr "Китайски"
 
-#: my-evolution/Locations.h:1225
-msgid "Limnos"
-msgstr ""
+#: widgets/misc/e-charset-picker.c:66
+msgid "Cyrillic"
+msgstr "Кирилица"
 
-#: my-evolution/Locations.h:1226
-msgid "Limoges"
-msgstr ""
+#: widgets/misc/e-charset-picker.c:67
+msgid "Greek"
+msgstr "Гръцки"
 
-#: my-evolution/Locations.h:1227
-msgid "Limon"
+#: widgets/misc/e-charset-picker.c:68
+msgid "Hebrew"
 msgstr ""
 
-#: my-evolution/Locations.h:1228
-msgid "Lincoln"
-msgstr "Линкълн"
-
-#: my-evolution/Locations.h:1229
-msgid "Linz"
-msgstr "Линц"
-
-#: my-evolution/Locations.h:1230
-msgid "Lisboa"
-msgstr "Лисабон"
-
-#: my-evolution/Locations.h:1231
-msgid "Lista"
-msgstr "Листа"
-
-#: my-evolution/Locations.h:1232
-msgid "Litchfield"
-msgstr ""
+#: widgets/misc/e-charset-picker.c:69
+msgid "Japanese"
+msgstr "Японски"
 
-#: my-evolution/Locations.h:1234
-msgid "Little Rock"
-msgstr ""
+#: widgets/misc/e-charset-picker.c:70
+msgid "Korean"
+msgstr "Корейски"
 
-#: my-evolution/Locations.h:1235
-msgid "Little Rock AFB"
-msgstr ""
+#: widgets/misc/e-charset-picker.c:71
+msgid "Turkish"
+msgstr "Турски"
 
-#: my-evolution/Locations.h:1236
-msgid "Livermore"
-msgstr "Ливърмор"
+#: widgets/misc/e-charset-picker.c:72
+msgid "Unicode"
+msgstr "Уникод"
 
-#: my-evolution/Locations.h:1237
-msgid "Liverpool"
-msgstr "Ливърпул"
+#: widgets/misc/e-charset-picker.c:73
+msgid "Western European"
+msgstr "Западна Европа"
 
-#: my-evolution/Locations.h:1238
-msgid "Livingston"
-msgstr "Ливингстон"
+#: widgets/misc/e-charset-picker.c:74
+#, fuzzy
+msgid "Western European, New"
+msgstr "Западна Европа"
 
-#: my-evolution/Locations.h:1239
-msgid "Ljubljana"
-msgstr "Любляна"
+#: widgets/misc/e-charset-picker.c:91 widgets/misc/e-charset-picker.c:92
+#: widgets/misc/e-charset-picker.c:93
+msgid "Traditional"
+msgstr "Традиционен"
 
-#: my-evolution/Locations.h:1240
-msgid "Logan"
-msgstr ""
+#: widgets/misc/e-charset-picker.c:94 widgets/misc/e-charset-picker.c:95
+#: widgets/misc/e-charset-picker.c:96 widgets/misc/e-charset-picker.c:97
+msgid "Simplified"
+msgstr "Опростен"
 
-#: my-evolution/Locations.h:1241
-msgid "Lolland Falster"
-msgstr ""
+#: widgets/misc/e-charset-picker.c:100
+msgid "Ukrainian"
+msgstr "Украинска"
 
-#: my-evolution/Locations.h:1242
-msgid "Lompoc"
-msgstr ""
+#: widgets/misc/e-charset-picker.c:103
+msgid "Visual"
+msgstr "Визуален"
 
-#: my-evolution/Locations.h:1243
-msgid "London"
-msgstr "Лондон"
+#: widgets/misc/e-charset-picker.c:171
+#, c-format
+msgid "Unknown character set: %s"
+msgstr "Неизвестна кодова таблица: %s"
 
-#: my-evolution/Locations.h:1244
-msgid "London/City"
-msgstr "Лондон/град"
+#: widgets/misc/e-charset-picker.c:216 widgets/misc/e-charset-picker.c:479
+msgid "Character Encoding"
+msgstr "Кодировка"
 
-#: my-evolution/Locations.h:1245
-msgid "London/Gatwick"
-msgstr "Лондон/Гейтвик"
+#: widgets/misc/e-charset-picker.c:231
+msgid "Enter the character set to use"
+msgstr "Въведете кодова таблица за използване"
 
-#: my-evolution/Locations.h:1246
-msgid "London/Heathrow"
-msgstr "Лондон/Хитроу"
+#: widgets/misc/e-charset-picker.c:338
+msgid "Other..."
+msgstr "Друго..."
 
-#: my-evolution/Locations.h:1247
-msgid "London/Stansted"
-msgstr ""
+#: widgets/misc/e-clipped-label.c:111
+msgid "..."
+msgstr "..."
 
-#: my-evolution/Locations.h:1248
-msgid "Londrina"
-msgstr ""
+#: widgets/misc/e-error.c:79 widgets/misc/e-error.c:80
+#: widgets/misc/e-error.c:122
+msgid "Evolution Error"
+msgstr "Грешка в Evolution"
 
-#: my-evolution/Locations.h:1249
-msgid "Lone Rock"
-msgstr ""
+#: widgets/misc/e-error.c:81 widgets/misc/e-error.c:82
+#: widgets/misc/e-error.c:120
+#, fuzzy
+msgid "Evolution Warning"
+msgstr "Поща Evolution"
 
-#: my-evolution/Locations.h:1250
-msgid "Long Beach"
-msgstr ""
+#: widgets/misc/e-error.c:119
+#, fuzzy
+msgid "Evolution Information"
+msgstr "Опционална Информация"
 
-#: my-evolution/Locations.h:1251
-msgid "Longview"
-msgstr ""
+#: widgets/misc/e-error.c:121
+#, fuzzy
+msgid "Evolution Query"
+msgstr "Evolution"
 
-#: my-evolution/Locations.h:1252
-msgid "Lorient-Lann-Bihoue"
+#. setup a dummy error
+#: widgets/misc/e-error.c:415
+#, c-format
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
 msgstr ""
 
-#: my-evolution/Locations.h:1253
-msgid "Los Alamos"
-msgstr "Лос Аламос"
-
-#: my-evolution/Locations.h:1254
-msgid "Los Angeles"
-msgstr "Лос Анжелес"
-
-#: my-evolution/Locations.h:1255
-msgid "Los Mochis"
-msgstr ""
+#: widgets/misc/e-expander.c:181
+#, fuzzy
+msgid "Expanded"
+msgstr "_Задрасква"
 
-#: my-evolution/Locations.h:1256
-msgid "Lossiemouth"
+#: widgets/misc/e-expander.c:182
+msgid "Whether or not the expander is expanded"
 msgstr ""
 
-#: my-evolution/Locations.h:1257
-msgid "Louisville"
-msgstr "Луисвил"
-
-#: my-evolution/Locations.h:1258
-msgid "Louisville-Standiford Field"
+#: widgets/misc/e-expander.c:190
+msgid "Text of the expander's label"
 msgstr ""
 
-#: my-evolution/Locations.h:1259
-msgid "Lousiana"
-msgstr "Луизиана"
+#: widgets/misc/e-expander.c:197
+#, fuzzy
+msgid "Use underline"
+msgstr "Недефинирано"
 
-#: my-evolution/Locations.h:1260
-msgid "Lovelock"
+#: widgets/misc/e-expander.c:198
+msgid ""
+"If set, an underline in the text indicates the next character should be used "
+"for the mnemonic accelerator key"
 msgstr ""
 
-#: my-evolution/Locations.h:1261
-msgid "Lubbock"
-msgstr ""
+#: widgets/misc/e-expander.c:205
+#, fuzzy
+msgid "Spacing"
+msgstr "Испания"
 
-#: my-evolution/Locations.h:1262
-msgid "Lubeck-Blankensee"
+#: widgets/misc/e-expander.c:206
+msgid "Space to put between the label and the child"
 msgstr ""
 
-#: my-evolution/Locations.h:1263
-msgid "Lufkin"
+#: widgets/misc/e-expander.c:215
+msgid "Label widget"
 msgstr ""
 
-#: my-evolution/Locations.h:1264
-msgid "Lugano"
-msgstr "Лугано"
-
-#: my-evolution/Locations.h:1265
-msgid "Luqa"
+#: widgets/misc/e-expander.c:216
+msgid "A widget to display in place of the usual expander label"
 msgstr ""
 
-#: my-evolution/Locations.h:1266
-msgid "Luton"
+#: widgets/misc/e-expander.c:222
+msgid "Expander Size"
 msgstr ""
 
-#: my-evolution/Locations.h:1268
-msgid "Luxeuil"
+#: widgets/misc/e-expander.c:223
+msgid "Size of the expander arrow"
 msgstr ""
 
-#: my-evolution/Locations.h:1269
-msgid "Luxor"
-msgstr "Лухор"
+#: widgets/misc/e-expander.c:231
+#, fuzzy
+msgid "Indicator Spacing"
+msgstr "Индиан Спрингс"
 
-#: my-evolution/Locations.h:1270
-msgid "Lviv"
+#: widgets/misc/e-expander.c:232
+msgid "Spacing around expander arrow"
 msgstr ""
 
-#: my-evolution/Locations.h:1271
-msgid "Lynchburg"
-msgstr ""
+#: widgets/misc/e-filter-bar.c:195
+#, fuzzy
+msgid "_Searches"
+msgstr "Търсене"
 
-#: my-evolution/Locations.h:1272
-msgid "Lyneham"
-msgstr "Линехам"
+#: widgets/misc/e-filter-bar.c:197
+msgid "Search Editor"
+msgstr "Редактор за Търсене"
 
-#: my-evolution/Locations.h:1273
-msgid "Lyon-Bron"
-msgstr ""
+#. FIXME: get the toplevel window...
+#: widgets/misc/e-filter-bar.c:220
+msgid "Save Search"
+msgstr "Запази Търсене"
 
-#: my-evolution/Locations.h:1274
-msgid "Lyon-Satolas"
-msgstr ""
+#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
+msgid "_Save Search..."
+msgstr "_Запазва Търсенето..."
 
-#: my-evolution/Locations.h:1275
-msgid "Maastricht"
-msgstr "Маастрих"
+#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
+msgid "_Edit Saved Searches..."
+msgstr "_Редактира Запазени Търсения"
 
-#: my-evolution/Locations.h:1276
-msgid "Macae"
-msgstr ""
+#: widgets/misc/e-filter-bar.h:94 widgets/misc/e-filter-bar.h:101
+msgid "_Advanced..."
+msgstr "_Напреднали..."
 
-#: my-evolution/Locations.h:1277
-msgid "Macapa"
-msgstr "Макапа"
+#: widgets/misc/e-image-chooser.c:172
+#, fuzzy
+msgid "Choose Image"
+msgstr "Избира файл"
 
-#: my-evolution/Locations.h:1278
-msgid "Maceio"
-msgstr ""
+#: widgets/misc/e-search-bar.c:540
+msgid "_Search"
+msgstr "Търсене"
 
-#: my-evolution/Locations.h:1279
-msgid "Macon"
-msgstr "Макон"
+#: widgets/misc/e-search-bar.c:546
+msgid "_Find Now"
+msgstr "_Намира Сега"
 
-#: my-evolution/Locations.h:1280
-msgid "Madinah"
-msgstr "Мадина"
+#: widgets/misc/e-search-bar.c:547 widgets/misc/e-search-bar.c:929
+msgid "_Clear"
+msgstr "_Изчиства"
 
-#: my-evolution/Locations.h:1281
-msgid "Madison"
+#: widgets/misc/e-search-bar.c:837
+msgid "Item ID"
 msgstr ""
 
-#: my-evolution/Locations.h:1282
-msgid "Madras/Minambakkam"
+#: widgets/misc/e-search-bar.c:844
+msgid "Subitem ID"
 msgstr ""
 
-#: my-evolution/Locations.h:1283
-msgid "Madrid (Barajas)"
-msgstr "Мадрид (Барайас)"
-
-#: my-evolution/Locations.h:1284
-msgid "Madrid (Cuatro Vientos)"
-msgstr "Мадрид"
-
-#: my-evolution/Locations.h:1285
-msgid "Magadan"
-msgstr "Магадан"
+#: widgets/misc/e-search-bar.c:851
+msgid "Text"
+msgstr "Текст"
 
-#: my-evolution/Locations.h:1286
-msgid "Magdalena"
-msgstr "Магдалена"
+#: widgets/misc/e-search-bar.c:931
+#, fuzzy
+msgid "Find _Now"
+msgstr "Намери Сега"
 
-#: my-evolution/Locations.h:1287
-msgid "Maine"
+#. system:ask-save-file-exists-overwrite primary
+#: widgets/misc/e-system-errors.xml.h:4
+msgid "File exists \"{0}\"."
 msgstr ""
 
-#: my-evolution/Locations.h:1288
-msgid "Makhachkala"
-msgstr "Махачкала"
-
-#: my-evolution/Locations.h:1289
-msgid "Makkah"
+#. system:ask-save-file-exists-overwrite secondary
+#: widgets/misc/e-system-errors.xml.h:6
+#, fuzzy
+msgid "Do you wish to overwrite it?"
 msgstr ""
+"%s вече съществува\n"
+"Искате ли да го презапишете?"
 
-#: my-evolution/Locations.h:1290
-msgid "Makung"
-msgstr ""
+#. system:no-save-file primary
+#: widgets/misc/e-system-errors.xml.h:9
+#, fuzzy
+msgid "Cannot save file \"{0}\"."
+msgstr "Папката %s не може да бъде преместена"
 
-#: my-evolution/Locations.h:1291
-msgid "Malad City"
-msgstr ""
+#. system:no-load-file primary
+#: widgets/misc/e-system-errors.xml.h:13
+#, fuzzy
+msgid "Cannot open file \"{0}\"."
+msgstr "Папката %s не може да бъде копирана"
 
-#: my-evolution/Locations.h:1292
-msgid "Malaga"
-msgstr "Малага"
+#: widgets/misc/e-task-widget.c:212
+#, c-format
+msgid "%s (...)"
+msgstr "%s (...)"
 
-#: my-evolution/Locations.h:1293
-msgid "Malatya"
-msgstr ""
+#: widgets/misc/e-task-widget.c:217
+#, c-format
+msgid "%s (%d%% complete)"
+msgstr "%s (%d%% приключено)"
 
-#: my-evolution/Locations.h:1294
-msgid "Maldonado/Punta Est"
-msgstr ""
+#~ msgid "Primary"
+#~ msgstr "Основен"
 
-#: my-evolution/Locations.h:1295
-msgid "Malmo/Sturup"
-msgstr ""
+#~ msgid "Prim"
+#~ msgstr "Основен"
 
-#: my-evolution/Locations.h:1297
-msgid "Mammoth Lakes"
-msgstr ""
+#~ msgid "Business"
+#~ msgstr "Работа"
 
-#: my-evolution/Locations.h:1298
-msgid "Managua"
-msgstr "Манагуа"
+#~ msgid "Bus"
+#~ msgstr "Сл."
 
-#: my-evolution/Locations.h:1299
-msgid "Manassas"
-msgstr ""
+#~ msgid "Comp"
+#~ msgstr "Компания"
 
-#: my-evolution/Locations.h:1300
-msgid "Manaus"
-msgstr "Манаус"
+#~ msgid "Org"
+#~ msgstr "Орг"
 
-#: my-evolution/Locations.h:1301
-msgid "Manchester"
-msgstr "Манчестер"
+#~ msgid "Mobile"
+#~ msgstr "Мобилен"
 
-#: my-evolution/Locations.h:1302
-msgid "Mangilsan Ab"
-msgstr ""
+#~ msgid "Car"
+#~ msgstr "Кола"
 
-#: my-evolution/Locations.h:1303
-msgid "Manhattan"
-msgstr "Манхатан"
+#~ msgid "Business 2"
+#~ msgstr "Работа 2"
 
-#: my-evolution/Locations.h:1304
-msgid "Manisa"
-msgstr "Маниса"
+#~ msgid "Bus 2"
+#~ msgstr "Служебен 2"
 
-#: my-evolution/Locations.h:1305
-msgid "Manistee"
-msgstr ""
+#~ msgid "Home 2"
+#~ msgstr "Домашен 2"
 
-#: my-evolution/Locations.h:1306
-msgid "Manitoba"
-msgstr ""
+#~ msgid "ISDN"
+#~ msgstr "ISDN"
 
-#: my-evolution/Locations.h:1307
-msgid "Manitowoc"
-msgstr ""
+#~ msgid "TTY"
+#~ msgstr "TTY"
 
-#: my-evolution/Locations.h:1308
-msgid "Mankato"
-msgstr ""
+#~ msgid "Url"
+#~ msgstr "URL"
 
-#: my-evolution/Locations.h:1309
-msgid "Mansfield"
-msgstr ""
+#~ msgid "Department"
+#~ msgstr "Отдел"
 
-#: my-evolution/Locations.h:1310
-msgid "Manta"
-msgstr "Манта"
+#~ msgid "Dep"
+#~ msgstr "Отд"
 
-#: my-evolution/Locations.h:1311
-msgid "Manzanillo"
-msgstr ""
+#~ msgid "Off"
+#~ msgstr "Офис"
 
-#: my-evolution/Locations.h:1312
-msgid "Maraba"
-msgstr "Мараба"
+#~ msgid "Profession"
+#~ msgstr "Професия"
 
-#: my-evolution/Locations.h:1313
-msgid "Maracaibo-La Chinita"
-msgstr ""
+#~ msgid "Prof"
+#~ msgstr "Проф"
 
-#: my-evolution/Locations.h:1314
-msgid "Maracay-B.A.Sucre"
-msgstr ""
+#~ msgid "Man"
+#~ msgstr "Мениджър"
 
-#: my-evolution/Locations.h:1315
-msgid "Marathon"
-msgstr "Маратон"
+#~ msgid "Nick"
+#~ msgstr "Прякор"
 
-#: my-evolution/Locations.h:1316
-msgid "Mar Del Plata"
-msgstr "Мар Делплата"
+#~ msgid "Calendar URI"
+#~ msgstr "URI за календар"
 
-#: my-evolution/Locations.h:1317
-msgid "Margarita"
-msgstr "Маргарита"
+#~ msgid "CALUri"
+#~ msgstr "КалURI"
 
-#: my-evolution/Locations.h:1318
-msgid "Marianna"
-msgstr "Мариана"
+#~ msgid "Free-busy URL"
+#~ msgstr "Free-busy адрес"
 
-#: my-evolution/Locations.h:1319
-msgid "Marib"
-msgstr "Мариб"
+#~ msgid "FBUrl"
+#~ msgstr "FBUrl"
 
-#: my-evolution/Locations.h:1320
-msgid "Maribor"
-msgstr "Марибор"
+#~ msgid "Default server calendar"
+#~ msgstr "Подразбиращ се сървър за календара"
 
-#: my-evolution/Locations.h:1321
-msgid "Marietta"
-msgstr "Марита"
+#~ msgid "Anniversary"
+#~ msgstr "Годишнина"
 
-#: my-evolution/Locations.h:1322
-msgid "Marino di Ravenna"
-msgstr ""
+#~ msgid "Anniv"
+#~ msgstr "Год"
 
-#: my-evolution/Locations.h:1323
-msgid "Marion"
-msgstr "Марион"
+#~ msgid "Birth Date"
+#~ msgstr "Дата на раждане"
 
-#: my-evolution/Locations.h:1324
-msgid "Marion-Wytheville"
-msgstr ""
+#~ msgid "ECard"
+#~ msgstr "Ел. Карта"
 
-#: my-evolution/Locations.h:1325
-msgid "Marseille-Provence"
-msgstr ""
+#~ msgid "%x"
+#~ msgstr "%x"
 
-#: my-evolution/Locations.h:1326
-msgid "Marseilles"
-msgstr ""
+#~ msgid "Address Label"
+#~ msgstr "Етикет на Адреса"
 
-#: my-evolution/Locations.h:1327
-msgid "Marshall"
-msgstr ""
+#~ msgid "Birth date"
+#~ msgstr "Дата на раждане"
 
-#: my-evolution/Locations.h:1328
-msgid "Marshalltown"
-msgstr ""
+#~ msgid "URL"
+#~ msgstr "URL"
 
-#: my-evolution/Locations.h:1329
-msgid "Marshfield"
-msgstr ""
+#~ msgid "Free/Busy URL"
+#~ msgstr "Сво_боден/Зает URL"
 
-#: my-evolution/Locations.h:1330
-msgid "Marte"
-msgstr "Марте"
+#~ msgid "ICS Calendar"
+#~ msgstr "ICS Календар"
 
-#: my-evolution/Locations.h:1331
-msgid "Marthas Vineyard"
-msgstr ""
+#~ msgid "Related Contacts"
+#~ msgstr "Подобни Контакти"
 
-#: my-evolution/Locations.h:1332
-msgid "Martinsburg"
-msgstr "Мартинсбург"
+#~ msgid "Category List"
+#~ msgstr "Списък на Категориите"
 
-#: my-evolution/Locations.h:1333
-msgid "Martinsville"
-msgstr "Мартнсвил"
+#~ msgid "Arbitrary"
+#~ msgstr "Произволен"
 
-#: my-evolution/Locations.h:1334
-msgid "Maryland"
-msgstr "Мериленд"
+#~ msgid "Last Use"
+#~ msgstr "Последно Използван"
 
-#: my-evolution/Locations.h:1335
-msgid "Marysville"
-msgstr ""
+#~ msgid "Searching..."
+#~ msgstr "Търсене..."
 
-#: my-evolution/Locations.h:1336
-msgid "Marysville-Beale AFB"
-msgstr ""
+#~ msgid "Using Email Address"
+#~ msgstr "Използва Електронна Поща"
 
-#: my-evolution/Locations.h:1337
-msgid "Mashhad"
-msgstr "Машхад"
+#~ msgid "Reconnecting to LDAP server..."
+#~ msgstr "Свързва се отново с LDAP сървъра..."
 
-#: my-evolution/Locations.h:1338
-msgid "Masirah"
-msgstr "Масира"
+#~ msgid "Adding card to LDAP server..."
+#~ msgstr "Добавям картичка в LDAP сървъра..."
 
-#: my-evolution/Locations.h:1339
-msgid "Mason City"
-msgstr ""
+#~ msgid "Removing card from LDAP server..."
+#~ msgstr "Премахва картичка от LDAP сървъра..."
 
-#: my-evolution/Locations.h:1340
-msgid "Massachusetts"
-msgstr ""
+#~ msgid "Modifying card from LDAP server..."
+#~ msgstr "Изменя картичка в LDAP сървъра..."
 
-#: my-evolution/Locations.h:1341
-msgid "Massena"
-msgstr "Масена"
+#~ msgid "Receiving LDAP search results..."
+#~ msgstr "Получава резултатите от търсенето от LDAP сървъра..."
 
-#: my-evolution/Locations.h:1342
-msgid "Matamoros"
-msgstr "Матаморос"
+#~ msgid "Error performing search"
+#~ msgstr "Грешка при търсенето"
 
-#: my-evolution/Locations.h:1343
-msgid "Matsumoto Airport"
-msgstr ""
+#~ msgid "Cursor could not be loaded\n"
+#~ msgstr "Курсорът не може да бъде зареден\n"
 
-#: my-evolution/Locations.h:1344
-msgid "Matsushima Ab"
-msgstr "Матсушима"
+#~ msgid "EBook not loaded\n"
+#~ msgstr "EBook не е заредена\n"
 
-#: my-evolution/Locations.h:1345
-msgid "Matsuyama Airport"
-msgstr "Летище Матсушима"
+#~ msgid "Folder containing contact information"
+#~ msgstr "Папка, съдържаща информацията за контакти"
 
-#: my-evolution/Locations.h:1346
-msgid "Mattoon"
-msgstr ""
+#~ msgid "LDAP server containing contact information"
+#~ msgstr "LDAP сървър съдържащ информация за контакт"
 
-#: my-evolution/Locations.h:1347
-msgid "Mayaguez"
-msgstr ""
+#~ msgid "Public Contacts"
+#~ msgstr "Публични Контакти"
 
-#: my-evolution/Locations.h:1348
-msgid "Mayport"
-msgstr ""
+#~ msgid "Public folder containing contact information"
+#~ msgstr "Публична папка съдържаща информация за контакти"
 
-#: my-evolution/Locations.h:1349
-msgid "Mazatlan"
-msgstr ""
+#~ msgid "Failed to authenticate with LDAP server"
+#~ msgstr "Неуспех в идентифицирането пред LDAP сървъра"
 
-#: my-evolution/Locations.h:1350
-msgid "Mazu"
-msgstr ""
+#~ msgid "The server responded with no supported search bases"
+#~ msgstr "Сървърът отговори с неподдържани основи за търсене"
 
-#: my-evolution/Locations.h:1351
-msgid "McAlester"
-msgstr ""
+#~ msgid "This server does not support LDAPv3 schema information"
+#~ msgstr "Този сървър не поддръжа LDAPv3 информация"
 
-#: my-evolution/Locations.h:1352
-msgid "McAllen"
-msgstr ""
+#~ msgid "Server Name"
+#~ msgstr "Име на сървъра"
 
-#: my-evolution/Locations.h:1353
-msgid "McCall"
-msgstr ""
+#~ msgid "Other Contacts"
+#~ msgstr "Други Контакти"
 
-#: my-evolution/Locations.h:1354
-msgid "McCarthy"
-msgstr ""
+#~ msgid "Disable Queries"
+#~ msgstr "Забранява търсенето"
 
-#: my-evolution/Locations.h:1355
-msgid "McClellan"
-msgstr ""
+#~ msgid "Enable Queries (Dangerous!)"
+#~ msgstr "Разрешава търсенето (Опасно!)"
 
-#: my-evolution/Locations.h:1356
-msgid "McComb"
-msgstr ""
+#~ msgid "  S_how Supported Bases "
+#~ msgstr "  П_оказва Поддържаните Основи"
 
-#: my-evolution/Locations.h:1357
-msgid "McCook"
-msgstr ""
+#~ msgid "1:00"
+#~ msgstr "1:00"
 
-#: my-evolution/Locations.h:1358
-msgid "McGrath"
-msgstr ""
+#~ msgid "2:30"
+#~ msgstr "2:30"
 
-#: my-evolution/Locations.h:1359
-msgid "Mc Gregor"
-msgstr ""
+#~ msgid "5:00"
+#~ msgstr "5:00"
 
-#: my-evolution/Locations.h:1360
-msgid "Meacham"
-msgstr ""
+#~ msgid "Add LDAP Server"
+#~ msgstr "Добавя LDAP Сървър"
 
-#: my-evolution/Locations.h:1361
-msgid "Medford"
-msgstr ""
+#~ msgid "Connecting"
+#~ msgstr "Свързва"
 
-#: my-evolution/Locations.h:1362
-msgid "Medicine Lodge"
-msgstr ""
+#~ msgid "Edit LDAP Server"
+#~ msgstr "Редактира LDAP Сървър"
 
-#: my-evolution/Locations.h:1363
-msgid "Mehamn"
-msgstr ""
+#~ msgid "Finished"
+#~ msgstr "Завършено"
 
-#: my-evolution/Locations.h:1364
-msgid "Mekoryuk"
-msgstr ""
+#~ msgid "LDAP Configuration Assistant"
+#~ msgstr "Асистент за конфигуриране на LDAP"
 
-#: my-evolution/Locations.h:1365
-msgid "Melbourne"
-msgstr "Мелбърн"
+#~ msgid "One"
+#~ msgstr "Едно"
 
-#: my-evolution/Locations.h:1366
-msgid "Melfa"
-msgstr "Мелфа"
+#~ msgid "Selected:"
+#~ msgstr "Избрани:"
 
-#: my-evolution/Locations.h:1367
-msgid "Melilla"
-msgstr "Мелила"
+#~ msgid "Step 2: Connecting to Server"
+#~ msgstr "Стъпка 2: Свръзване със Сървъра"
 
-#: my-evolution/Locations.h:1368
-msgid "Memambetsu Airport"
-msgstr ""
+#~ msgid "Step 3: Searching the Directory"
+#~ msgstr "Стъпка 3: Търсене в Директория"
 
-#: my-evolution/Locations.h:1369
-msgid "Memphis"
-msgstr "Мемфис"
+#~ msgid "Step 4: Display Name"
+#~ msgstr "Стъпка 4: Изобразява Името"
 
-#: my-evolution/Locations.h:1370
-msgid "Memphis-NAS"
-msgstr "Мемфис-NAS"
+#~ msgid "This option controls how long a search will be run."
+#~ msgstr "Тази опция контролира колко дълго ще продължи търсенето."
 
-#: my-evolution/Locations.h:1371
-msgid "Mendoza"
-msgstr "Мендоса"
+#~ msgid "U_se SSL/TLS:"
+#~ msgstr "И_зползва SSL/TLS:"
 
-#: my-evolution/Locations.h:1372
-msgid "Mene Grande"
-msgstr ""
+#~ msgid "_Display name:"
+#~ msgstr "_Изобразява име:"
 
-#: my-evolution/Locations.h:1373
-msgid "Menominee"
-msgstr ""
+#~ msgid "_Port number:"
+#~ msgstr "Номер на _Порта"
 
-#: my-evolution/Locations.h:1374
-msgid "Menorca"
-msgstr ""
+#~ msgid "_Server name:"
+#~ msgstr "Име на сървъра:"
 
-#: my-evolution/Locations.h:1375
-msgid "Merced"
-msgstr ""
+#~ msgid "_Timeout (minutes):"
+#~ msgstr "_Забавяне (минути):"
 
-#: my-evolution/Locations.h:1376
-msgid "Merida"
-msgstr "Мерида"
+#~ msgid "Selected Contacts:"
+#~ msgstr "Избрани Контакти:"
 
-#: my-evolution/Locations.h:1377
-msgid "Meridian"
-msgstr "Меридиан"
+#~ msgid " B_usiness:"
+#~ msgstr "Б_изнес:"
 
-#: my-evolution/Locations.h:1378
-msgid "Meridian-Lauderdale"
-msgstr ""
+#~ msgid "A_ddress..."
+#~ msgstr "А_дрес..."
 
-#: my-evolution/Locations.h:1379
-msgid "Merril Field"
-msgstr ""
+#~ msgid "A_ssistant's name:"
+#~ msgstr "И_ме на асистент:"
 
-#: my-evolution/Locations.h:1380
-msgid "Mersa Matruh"
-msgstr ""
+#~ msgid "Business fa_x:"
+#~ msgstr "Бизнес фа_кс:"
 
-#: my-evolution/Locations.h:1381
-msgid "Mesa-Falcon Field"
-msgstr ""
+#~ msgid "Collaboration"
+#~ msgstr "Сътрудничество"
 
-#: my-evolution/Locations.h:1382
-msgid "Metabaru Ab"
-msgstr ""
+#~ msgid "File a_s:"
+#~ msgstr "Файл ка_то:"
 
-#: my-evolution/Locations.h:1383
-msgid "Metz-Frescaty"
-msgstr ""
+#~ msgid "New phone type"
+#~ msgstr "Нов тип телефон"
 
-#: my-evolution/Locations.h:1384
-msgid "Mexicali"
-msgstr ""
-
-#: my-evolution/Locations.h:1386
-msgid "Miami"
-msgstr "Маями"
-
-#: my-evolution/Locations.h:1387
-msgid "Miami-Kendall"
-msgstr ""
-
-#: my-evolution/Locations.h:1388
-msgid "Miami-Opa Locka"
-msgstr ""
+#~ msgid "Organi_zation:"
+#~ msgstr "Организа_ция:"
 
-#: my-evolution/Locations.h:1389
-msgid "Michigan"
-msgstr "Мичиган"
+#~ msgid "Primary _email:"
+#~ msgstr "Основна _ел. поща"
 
-#: my-evolution/Locations.h:1390
-msgid "Middle East"
-msgstr "Среден Изток"
+#~ msgid "_Business:"
+#~ msgstr "_Бизнес:"
 
-#: my-evolution/Locations.h:1391
-msgid "Middleton Island"
-msgstr ""
+#~ msgid "_Categories..."
+#~ msgstr "_Категории..."
 
-#: my-evolution/Locations.h:1392
-msgid "Middletown"
-msgstr ""
+#~ msgid "_Home:"
+#~ msgstr "_Домашна:"
 
-#: my-evolution/Locations.h:1393
-msgid "Midland"
-msgstr ""
+#~ msgid "_Manager's name:"
+#~ msgstr "Име на _Мениджъра:"
 
-#: my-evolution/Locations.h:1394
-msgid "Miho Ab"
-msgstr ""
+#~ msgid "_Mobile:"
+#~ msgstr "_Мобилен"
 
-#: my-evolution/Locations.h:1395
-msgid "Milano/Linate"
-msgstr "Милано/Линате"
+#~ msgid "_Public Calendar URL:"
+#~ msgstr "URL на _Публичен Календар:"
 
-#: my-evolution/Locations.h:1396
-msgid "Milano/Malpensa"
-msgstr "Милано/Малпенса"
+#~ msgid "East Timor"
+#~ msgstr "Източен Тимор"
 
-#: my-evolution/Locations.h:1397
-msgid "Miles City"
-msgstr ""
+#~ msgid "Yugoslavia"
+#~ msgstr "Югославия"
 
-#: my-evolution/Locations.h:1398
-msgid "Milford"
-msgstr "Милфорд"
+#~ msgid "Card"
+#~ msgstr "Картичка"
 
-#: my-evolution/Locations.h:1399
-msgid "Millinocket"
-msgstr ""
+#~ msgid "Is New Card"
+#~ msgstr "Е Нова Картичка"
 
-#: my-evolution/Locations.h:1400
-msgid "Millville"
-msgstr "Милвил"
+#~ msgid "Category editor not available."
+#~ msgstr "Редактор на категории не е наличен"
 
-#: my-evolution/Locations.h:1401
-msgid "Milton"
-msgstr "Милтон"
+#~ msgid "Could not find widget for a field: `%s'"
+#~ msgstr "Не мога да намеря графичен обект за поле: `%s'"
 
-#: my-evolution/Locations.h:1402
-msgid "Milwaukee"
-msgstr ""
+#~ msgid "Error saving %s: %s"
+#~ msgstr "Грешка при запис %s:·%s"
 
-#: my-evolution/Locations.h:1403
-msgid "Milwaukee-Timmerman"
-msgstr ""
+#~ msgid "No cards"
+#~ msgstr "Няма карти"
 
-#: my-evolution/Locations.h:1404
-msgid "Minamitorishima"
-msgstr ""
+#~ msgid "%d cards"
+#~ msgstr "%d карти"
 
-#: my-evolution/Locations.h:1405
-msgid "Minatitlan"
-msgstr ""
+#~ msgid "Move to folder..."
+#~ msgstr "Премества в папка..."
 
-#: my-evolution/Locations.h:1406
-msgid "Minchumina"
-msgstr ""
+#~ msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
+#~ msgstr ",123,а,б,в,г,д,е,ж,з,и,й,к,л,м,н,о,п,р,с,т,у,ф,ь,ц,ч,ш,щ,ъ,ь,ю,я"
 
-#: my-evolution/Locations.h:1407
-msgid "Mineralnye Vody"
-msgstr "Минералние Води"
+#~ msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
+#~ msgstr ",0,а,б,в,г,д,е,ж,з,и,й,к,л,м,н,о,п,р,с,т,у,ф,ь,ц,ч,ш,щ,ъ,ь,ю,я"
 
-#: my-evolution/Locations.h:1408
-msgid "Mineral Wells"
-msgstr ""
+#~ msgid "* Click here to add a contact *"
+#~ msgstr "* Натиснете тук за да добавите контакт *"
 
-#: my-evolution/Locations.h:1409
-msgid "Minneapolis"
-msgstr "Минеаполис"
+#~ msgid "Business Address"
+#~ msgstr "Работен адрес"
 
-#: my-evolution/Locations.h:1410
-msgid "Minneapolis [2]"
-msgstr "Минеаполис [2]"
+#~ msgid "Home Address"
+#~ msgstr "Домашен Адрес"
 
-#: my-evolution/Locations.h:1411
-msgid "Minneapolis [3]"
-msgstr "Минеаполис [3]"
+#~ msgid "Other Address"
+#~ msgstr "Друг Адрес"
 
-#: my-evolution/Locations.h:1412
-msgid "Minnesota"
-msgstr "Минесота"
+#~ msgid "and %d other cards."
+#~ msgstr "и %d други карти."
 
-#: my-evolution/Locations.h:1413
-msgid "Minocqua"
-msgstr ""
+#~ msgid "Print cards"
+#~ msgstr "Отпечатай карти"
 
-#: my-evolution/Locations.h:1414
-msgid "Minot"
-msgstr "Минот"
+#~ msgid "Print card"
+#~ msgstr "Отпечатай карта"
 
-#: my-evolution/Locations.h:1415
-msgid "Minot AFB"
-msgstr ""
+#~ msgid "Untitled appointment"
+#~ msgstr "Неназовани срещи"
 
-#: my-evolution/Locations.h:1416
-msgid "Misawa Ab"
-msgstr ""
+#~ msgid "Error while communicating with calendar server"
+#~ msgstr "Грешка при комуникацията с календарния сървър"
 
-#: my-evolution/Locations.h:1417
-msgid "Mississippi"
-msgstr ""
+#~ msgid "Could not initialize gnome-vfs"
+#~ msgstr "Не мога да инициализирам gnome-vfs"
 
-#: my-evolution/Locations.h:1418
-msgid "Missoula"
-msgstr ""
+#~ msgid ""
+#~ "Could not create the calendar view.  Please check your ORBit and OAF "
+#~ "setup."
+#~ msgstr ""
+#~ "Не мога да създам календарен изглед. Моля проверете настройките на ORBit "
+#~ "и OAF"
 
-#: my-evolution/Locations.h:1419
-msgid "Missouri"
-msgstr "Мисури"
+#~ msgid "Folder containing to-do items"
+#~ msgstr "Папката съдържа задачи за правене"
 
-#: my-evolution/Locations.h:1420
-msgid "Mitchell"
-msgstr "Мичел"
+#~ msgid "The URI that the calendar will display"
+#~ msgstr "URI, което ще се показва в календара"
 
-#: my-evolution/Locations.h:1421
-msgid "Mitilini"
-msgstr "Митилини"
+#~ msgid "Display a message"
+#~ msgstr "Показва съобщение"
 
-#: my-evolution/Locations.h:1422
-msgid "Miyakejima Airport"
-msgstr ""
+#~ msgid "Time"
+#~ msgstr "Време"
 
-#: my-evolution/Locations.h:1423
-msgid "Miyazaki Airport"
-msgstr ""
+#~ msgid "_General"
+#~ msgstr "_Основен"
 
-#: my-evolution/Locations.h:1424
-msgid "Moa"
-msgstr "Моа"
+#~ msgid "Are you sure you want to cancel and delete this meeting?"
+#~ msgstr "Сигурни ли сте, че искате да прекъснете и изтриете тази среща?"
 
-#: my-evolution/Locations.h:1425
-msgid "Mobile Downtown"
-msgstr ""
+#~ msgid "Are you sure you want to cancel and delete this task?"
+#~ msgstr "Сигурни ли сте, че искате да прекъснете и изтриете тази задача?"
 
-#: my-evolution/Locations.h:1426
-msgid "Mobile Regional Airport"
-msgstr ""
+#~ msgid "Are you sure you want to cancel and delete this journal entry?"
+#~ msgstr ""
+#~ "Сигурни ли сте, че искате да прекъснете и изтриете този запис в дневника?"
 
-#: my-evolution/Locations.h:1427
-msgid "Mobridge"
-msgstr ""
+#~ msgid "Could not update invalid object"
+#~ msgstr "Не може да осъвремени невалиден обект"
 
-#: my-evolution/Locations.h:1428
-msgid "Modesto"
-msgstr "Модесто"
+#~ msgid "Object not found, not updated"
+#~ msgstr "Обектът не е намерен, няма промяна"
 
-#: my-evolution/Locations.h:1429
-msgid "Mo I Rana"
-msgstr ""
+#~ msgid "You don't have permissions to update this object"
+#~ msgstr "Нямата права да осъвремените този обект"
 
-#: my-evolution/Locations.h:1430
-msgid "Mojave"
-msgstr ""
+#~ msgid "Are you sure you want to delete the appointment `%s'?"
+#~ msgstr "Сигурен ли сте, че искате да изтриете срещата %s?"
 
-#: my-evolution/Locations.h:1431
-msgid "Molde"
-msgstr "Молде"
+#~ msgid "Are you sure you want to delete the task `%s'?"
+#~ msgstr "Сигурен ли сте, че искате да изтриете задача %s?"
 
-#: my-evolution/Locations.h:1432
-msgid "Moldova"
-msgstr "Молдова"
+#~ msgid "Are you sure you want to delete this untitled task?"
+#~ msgstr "Сигурен ли сте, че искате да изтриете тази неименувана задача?"
 
-#: my-evolution/Locations.h:1433
-msgid "Moline-Quad Cities"
-msgstr ""
+#~ msgid "Are you sure you want to delete the journal entry `%s'?"
+#~ msgstr "Сигурен ли сте, че искате да изтриете записа в дневник %s?"
 
-#: my-evolution/Locations.h:1434
-msgid "Molokai"
-msgstr ""
+#~ msgid "Are you sure want to delete this untitled journal entry?"
+#~ msgstr "Сигурен ли сте, че искате да неименуван запис в дневника?"
 
-#: my-evolution/Locations.h:1435
-msgid "Mombetsu Airport"
-msgstr ""
+#~ msgid "Are you sure you want to delete %d appointments?"
+#~ msgstr "Сигурен ли сте, че искате да изтриете среща %d?"
 
-#: my-evolution/Locations.h:1436
-msgid "Monchengladbach"
-msgstr ""
+#~ msgid "Are you sure you want to delete %d tasks?"
+#~ msgstr "Сигурни ли сте, че искате да изтриете %d задачи?"
 
-#: my-evolution/Locations.h:1437
-msgid "Monclova"
-msgstr "Монклова"
+#~ msgid "Are you sure you want to delete %d journal entries?"
+#~ msgstr "Сигурни ли сте, че искате да изтриете %d журнални записи?"
 
-#: my-evolution/Locations.h:1438
-msgid "Moncton"
-msgstr ""
+#~ msgid "That person is already attending the meeting!"
+#~ msgstr "Това лице вече участва в срещата!"
 
-#: my-evolution/Locations.h:1439
-msgid "Monida"
-msgstr "Монида"
+#~ msgid "_Invite Others..."
+#~ msgstr "_Други Поканени..."
 
-#: my-evolution/Locations.h:1440
-msgid "Monpellier-Mediterrannee"
-msgstr ""
+#~ msgid "Save Event"
+#~ msgstr "Запазва Събитие"
 
-#: my-evolution/Locations.h:1441
-msgid "Monroe"
-msgstr "Монро"
+#~ msgid "The meeting information has changed. Send an updated version?"
+#~ msgstr ""
+#~ "Информацията за срещата е променена. Да изпратя ли обновената версия?"
 
-#: my-evolution/Locations.h:1442
-msgid "Montague"
-msgstr ""
+#~ msgid "The task information has changed. Send an updated version?"
+#~ msgstr ""
+#~ "Информацията за задачата е променена. Да изпратя ли обновената версия?"
 
-#: my-evolution/Locations.h:1443
-msgid "Montana"
-msgstr "Монтана"
+#~ msgid "1 day"
+#~ msgstr "1 ден"
 
-#: my-evolution/Locations.h:1444
-msgid "Mont-de-Marsan"
-msgstr ""
+#~ msgid "1 week"
+#~ msgstr "1 седмица"
 
-#: my-evolution/Locations.h:1445
-msgid "Monte Argentario"
-msgstr ""
+#~ msgid "1 hour"
+#~ msgstr "1 час"
 
-#: my-evolution/Locations.h:1446
-msgid "Monte Bisbino"
-msgstr ""
+#~ msgid "1 minute"
+#~ msgstr "1 минута"
 
-#: my-evolution/Locations.h:1447
-msgid "Monte Calamita"
-msgstr "Монте Каламита"
+#~ msgid "1 second"
+#~ msgstr "1 секунда"
 
-#: my-evolution/Locations.h:1448
-msgid "Monte Cimone"
-msgstr "Монте Симоне"
+#~ msgid "_Save as..."
+#~ msgstr "_Запазва като..."
 
-#: my-evolution/Locations.h:1449
-msgid "Montego Bay"
-msgstr ""
+#~ msgid "Alarms"
+#~ msgstr "Аларми"
 
-#: my-evolution/Locations.h:1450
-msgid "Monte Malanotte"
-msgstr "Монте Маланоте"
+#~ msgid "Geographical Position"
+#~ msgstr "Географска Позиция"
 
-#: my-evolution/Locations.h:1451
-msgid "Monterey"
-msgstr "Монтерей"
+#~ msgid "Print..."
+#~ msgstr "Печат..."
 
-#: my-evolution/Locations.h:1452
-msgid "Monterrey"
-msgstr "Монтерей"
+#~ msgid "Make this Occurrence _Movable"
+#~ msgstr "Прави това Събитие Пр_еместваемо"
 
-#: my-evolution/Locations.h:1453
-msgid "Monte Scuro"
-msgstr ""
+#~ msgid "Every %d days"
+#~ msgstr "Всички %d дни"
 
-#: my-evolution/Locations.h:1454
-msgid "Monte Terminillo"
-msgstr ""
+#~ msgid "Every %d weeks"
+#~ msgstr "Всички %d седмици"
 
-#: my-evolution/Locations.h:1455
-msgid "Montevideo/Carrasco"
-msgstr "Монтевидео/Караско"
+#~ msgid "every %d months"
+#~ msgstr "всички %d месеци"
 
-#: my-evolution/Locations.h:1456
-msgid "Montgomery"
-msgstr "Монгомери"
+#~ msgid "Every %d years"
+#~ msgstr "Всички %d години"
 
-#: my-evolution/Locations.h:1457
-msgid "Montgomery-Maxwell AFB"
-msgstr ""
+#~ msgid "Calendar file could not be updated!\n"
+#~ msgstr "Календарният файл не може да бъде зареден!\n"
 
-#: my-evolution/Locations.h:1458
-msgid "Monticello"
-msgstr ""
+#~ msgid "Select Tasks Folder"
+#~ msgstr "Избира Папка със Задачи"
 
-#: my-evolution/Locations.h:1459
-msgid "Montpelier"
-msgstr "Монтпелие"
+#~ msgid "Could not load the tasks in `%s'"
+#~ msgstr "Не мога да заредя задачи в `%s'"
 
-#: my-evolution/Locations.h:1460
-msgid "Montreal Dorval"
-msgstr ""
+#~ msgid "Could not open the folder in `%s'"
+#~ msgstr "Не мога да отворя папка в `%s'"
 
-#: my-evolution/Locations.h:1461
-msgid "Montreal Mirabel"
-msgstr "Монреал Марибел"
+#~ msgid "The method required to open `%s' is not supported"
+#~ msgstr "Метода заявен за отваряне на `%s' не се подържа"
 
-#: my-evolution/Locations.h:1462
-msgid "Montreal Saint-Hubert"
-msgstr ""
+#~ msgid "Adding alarms for %s"
+#~ msgstr "Добавя аларми за %s"
 
-#: my-evolution/Locations.h:1463
-msgid "Montrose"
-msgstr ""
+#~ msgid "Opening calendar at %s"
+#~ msgstr "Отворя календар в %s"
 
-#: my-evolution/Locations.h:1464
-msgid "Montrose (2)"
-msgstr ""
+#~ msgid "Go To Date"
+#~ msgstr "Отива на Дата"
 
-#: my-evolution/Locations.h:1465
-msgid "Morelia"
-msgstr "Морелия"
+#~ msgid "Go To Today"
+#~ msgstr "Отива на Днес"
 
-#: my-evolution/Locations.h:1466
-msgid "Morgantown"
-msgstr ""
+#~ msgid "The URI of the tasks folder to display"
+#~ msgstr "URI на папки със  задачи за показване"
 
-#: my-evolution/Locations.h:1467
-msgid "Moriarty"
-msgstr "Мориарти"
+#~ msgid "time-now expects 0 arguments"
+#~ msgstr "time-now очаква 0 аргумента"
 
-#: my-evolution/Locations.h:1469
-msgid "Morristown"
-msgstr "Мористон"
+#~ msgid "make-time expects 1 argument"
+#~ msgstr "make-time очаква 1 аргумент"
 
-#: my-evolution/Locations.h:1470
-msgid "Moscow Domodedovo"
-msgstr "Москва Домодедово"
+#~ msgid "make-time expects argument 1 to be a string"
+#~ msgstr "make-time очаква аргумент 1 да бъде низ"
 
-#: my-evolution/Locations.h:1471
-msgid "Moscow Sheremetyevo"
-msgstr "Москва Шереметиево"
+#~ msgid "time-add-day expects 2 arguments"
+#~ msgstr "time-add-day очаква 2 аргумента"
 
-#: my-evolution/Locations.h:1472
-msgid "Moses Lake"
-msgstr ""
+#~ msgid "time-day-begin expects 1 argument"
+#~ msgstr "time-day-begin очаква 1 аргумент"
 
-#: my-evolution/Locations.h:1473
-msgid "Mosinee"
-msgstr ""
+#~ msgid "No data provided"
+#~ msgstr "Няма доставена информация"
 
-#: my-evolution/Locations.h:1474
-msgid "Mosjoen"
-msgstr ""
+#~ msgid "Please enter your password for %s"
+#~ msgstr "Моля, въведете вашата парола за %s"
 
-#: my-evolution/Locations.h:1475
-msgid "Moultrie"
-msgstr ""
+#~ msgid "The signature certificate for \"%s\" does not exist."
+#~ msgstr "Сигнатурен сертификат за \"%s\" не съществува."
 
-#: my-evolution/Locations.h:1476
-msgid "Mountain Home"
-msgstr ""
+#~ msgid ""
+#~ "Could not open file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Не мога да отворя файл `%s':\n"
+#~ "%s"
 
-#: my-evolution/Locations.h:1477
-msgid "Mountain View"
-msgstr ""
+#~ msgid ""
+#~ "Could not create file `%s':\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Не мога да създам файл `%s':\n"
+#~ "%s"
 
-#: my-evolution/Locations.h:1478
-msgid "Mount Clemens"
-msgstr ""
+#~ msgid "`%s' is not a directory."
+#~ msgstr "`%s' не е директория."
 
-#: my-evolution/Locations.h:1479
-msgid "Mount Holly"
-msgstr ""
+#~ msgid "Could not get group: %s"
+#~ msgstr "Групата·%s не може да бъде взета"
 
-#: my-evolution/Locations.h:1480
-msgid "Mount Shasta"
-msgstr ""
+#~ msgid "Unknown server response: %s"
+#~ msgstr "·Неизвестен отговор на сървъра: %s"
 
-#: my-evolution/Locations.h:1481
-msgid "Mount Vernon"
-msgstr ""
+#~ msgid "AUTH request timed out: %s"
+#~ msgstr "AUTH заявка по таймаут: %s"
 
-#: my-evolution/Locations.h:1482
-msgid "Mount Wilson"
-msgstr ""
+#~ msgid "AUTH request failed."
+#~ msgstr "AUTH заявката пропадна"
 
-#: my-evolution/Locations.h:1483
-msgid "Mt Washington"
-msgstr ""
+#~ msgid ""
+#~ "Error while reading file %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Грешка при четеен на файл: %s\n"
+#~ "%s"
 
-#: my-evolution/Locations.h:1484
-msgid "Mugla/Dalaman"
-msgstr ""
+#~ msgid "Error saving file: %s"
+#~ msgstr "Грешка при съхранението на файл: %s"
 
-#: my-evolution/Locations.h:1485
-msgid "Muir"
-msgstr ""
+#~ msgid "Error loading file: %s"
+#~ msgstr "Грешка при зареждането на файл: %s"
 
-#: my-evolution/Locations.h:1486
-msgid "Mullan"
-msgstr ""
+#~ msgid "Error accessing file: %s"
+#~ msgstr "Грешка при достъп на файл: %s"
 
-#: my-evolution/Locations.h:1487
-msgid "Mullen"
-msgstr ""
+#~ msgid ""
+#~ "Unable to seek on file: %s\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Не мога да намеря във файл %s:\n"
+#~ "%s"
 
-#: my-evolution/Locations.h:1488
-msgid "Munchen"
-msgstr "Мюнхен"
+#~ msgid ""
+#~ "Error autosaving message: %s\n"
+#~ " %s"
+#~ msgstr ""
+#~ "Грешка при автоматичното запазване на файл: %s\n"
+#~ " %s"
 
-#: my-evolution/Locations.h:1489
-msgid "Muncie"
-msgstr ""
+#~ msgid ""
+#~ "Ximian Evolution has found unsaved files from a previous session.\n"
+#~ "Would you like to try to recover them?"
+#~ msgstr ""
+#~ "Ximian Evolution намери незапазени файлове от предишната сесия.\n"
+#~ "Искате ли да се опитам да ги възстановя?"
 
-#: my-evolution/Locations.h:1490
-msgid "Munster/Osnabruck"
-msgstr ""
+#~ msgid "%d seconds ago"
+#~ msgstr "преди %d секунди"
 
-#: my-evolution/Locations.h:1491
-msgid "Murcia"
-msgstr ""
+#~ msgid "%d minutes ago"
+#~ msgstr "преди %d минути"
 
-#: my-evolution/Locations.h:1492
-msgid "Murmansk"
-msgstr "Мурманск"
+#~ msgid "%d hours ago"
+#~ msgstr "преди %d часа"
 
-#: my-evolution/Locations.h:1493
-msgid "Mus"
-msgstr ""
+#~ msgid "%d days ago"
+#~ msgstr "преди %d·дни"
 
-#: my-evolution/Locations.h:1494
-msgid "Muscatine"
-msgstr ""
+#~ msgid "%d weeks ago"
+#~ msgstr "преди %d седмици"
 
-#: my-evolution/Locations.h:1495
-msgid "Muscle Shoals"
-msgstr ""
+#~ msgid "%d months ago"
+#~ msgstr "преди %d·месеци"
 
-#: my-evolution/Locations.h:1496
-msgid "Muskegon"
-msgstr ""
+#~ msgid "%d years ago"
+#~ msgstr "преди %d години"
 
-#: my-evolution/Locations.h:1497
-msgid "Mykonos"
-msgstr ""
+#~ msgid "Then"
+#~ msgstr "Тогава"
 
-#: my-evolution/Locations.h:1498
-msgid "Myrtle Beach"
-msgstr ""
+#~ msgid "If"
+#~ msgstr "Ако"
 
-#: my-evolution/Locations.h:1499
-msgid "Nabesna/Devil Mt."
-msgstr ""
+#~ msgid "Edit Filters"
+#~ msgstr "Редактира Филтри"
 
-#: my-evolution/Locations.h:1500
-msgid "Nacogdoches"
-msgstr ""
+#~ msgid "Edit VFolders"
+#~ msgstr "Редактира VFolders"
 
-#: my-evolution/Locations.h:1501
-msgid "Nagasaki Airport"
-msgstr "Нагасаки летище"
+#~ msgid "Outgoing"
+#~ msgstr "Изходящи"
 
-#: my-evolution/Locations.h:1502
-msgid "Nagoya Airport"
-msgstr "Нагоя летище"
+#~ msgid "Assign Color"
+#~ msgstr "Назначава Цвят"
 
-#: my-evolution/Locations.h:1503
-msgid "Nagpur Sonegaon"
-msgstr ""
+#~ msgid "Attachments"
+#~ msgstr "Прикрепени файлове"
 
-#: my-evolution/Locations.h:1504
-msgid "Naha Airport"
-msgstr ""
+#~ msgid "Beep"
+#~ msgstr "Издава звук"
 
-#: my-evolution/Locations.h:1505
-msgid "Najran"
-msgstr ""
+#~ msgid "Copy to Folder"
+#~ msgstr "Копира в Папка"
 
-#: my-evolution/Locations.h:1506
-msgid "Nakashibetsu Airport"
-msgstr ""
+#~ msgid "Date received"
+#~ msgstr "Получено на дата"
 
-#: my-evolution/Locations.h:1507
-msgid "Nalchik"
-msgstr ""
+#~ msgid "Date sent"
+#~ msgstr "Изпратено на дата"
 
-#: my-evolution/Locations.h:1508
-msgid "Namsos"
-msgstr ""
+#~ msgid "Deleted"
+#~ msgstr "Изтрива"
 
-#: my-evolution/Locations.h:1509
-msgid "Nancy-Essey"
-msgstr ""
+#~ msgid "Do Not Exist"
+#~ msgstr "Не съществува"
 
-#: my-evolution/Locations.h:1510
-msgid "Nancy-Ochey"
-msgstr ""
+#~ msgid "Draft"
+#~ msgstr "Чернова"
 
-#: my-evolution/Locations.h:1511
-msgid "Nankishirahama Airport"
-msgstr ""
+#~ msgid "Exist"
+#~ msgstr "Съществува"
 
-#: my-evolution/Locations.h:1512
-msgid "Nanning"
-msgstr ""
+#~ msgid "Mailing list"
+#~ msgstr "Пощенски списък"
 
-#: my-evolution/Locations.h:1513
-msgid "Nantes Adlantique"
-msgstr ""
+#~ msgid "Message Body"
+#~ msgstr "Тяло на съобщение"
 
-#: my-evolution/Locations.h:1514
-msgid "Nantucket"
-msgstr ""
+#~ msgid "Message Header"
+#~ msgstr "Заглавие на съобщение"
 
-#: my-evolution/Locations.h:1515
-msgid "Napa"
-msgstr "Напа"
+#~ msgid "Move to Folder"
+#~ msgstr "Премества в Папка"
 
-#: my-evolution/Locations.h:1516
-msgid "Naples"
-msgstr ""
+#~ msgid "Play Sound"
+#~ msgstr "Изпълнява Звук"
 
-#: my-evolution/Locations.h:1517
-msgid "Napoli"
-msgstr "Наполи"
+#~ msgid "Sender"
+#~ msgstr "Изпращач:"
 
-#: my-evolution/Locations.h:1518
-msgid "Narvik"
-msgstr "Нарвик"
+#~ msgid "Shell Command"
+#~ msgstr "Shell·команда"
 
-#: my-evolution/Locations.h:1519
-msgid "Nasa Shuttle"
-msgstr ""
+#~ msgid "Size (kB)"
+#~ msgstr "Размер (кБ)"
 
-#: my-evolution/Locations.h:1520
-msgid "Nashua"
-msgstr "Нашуа"
+#~ msgid "Specific header"
+#~ msgstr "Специфично заглавие"
 
-#: my-evolution/Locations.h:1521
-msgid "Nashville"
-msgstr "Нешвил"
+#~ msgid "contains"
+#~ msgstr "съдържа"
 
-#: my-evolution/Locations.h:1522
-msgid "Nassau"
-msgstr "Насау"
+#~ msgid "does not contain"
+#~ msgstr "не съдържа"
 
-#: my-evolution/Locations.h:1523
-msgid "Natal"
-msgstr "Натал"
+#~ msgid "does not end with"
+#~ msgstr "не завършва с"
 
-#: my-evolution/Locations.h:1524
-msgid "Natchez"
-msgstr ""
+#~ msgid "does not exist"
+#~ msgstr "не съществува"
 
-#: my-evolution/Locations.h:1525
-msgid "Nawabshah"
-msgstr ""
+#~ msgid "does not return"
+#~ msgstr "не връща"
 
-#: my-evolution/Locations.h:1526
-msgid "Nebraska"
-msgstr "Небраска"
+#~ msgid "does not sound like"
+#~ msgstr "не звучи като"
 
-#: my-evolution/Locations.h:1527
-msgid "Needles"
-msgstr ""
+#~ msgid "does not start with"
+#~ msgstr "не започва с"
 
-#: my-evolution/Locations.h:1528
-msgid "Nenana"
-msgstr ""
+#~ msgid "ends with"
+#~ msgstr "завършва с"
 
-#: my-evolution/Locations.h:1530
-msgid "Neuquen"
-msgstr ""
+#~ msgid "exists"
+#~ msgstr "съществува"
 
-#: my-evolution/Locations.h:1531
-msgid "Nevada"
-msgstr "Невада"
+#~ msgid "is after"
+#~ msgstr "е след"
 
-#: my-evolution/Locations.h:1532
-msgid "Newark"
-msgstr ""
+#~ msgid "is before"
+#~ msgstr "е преди"
 
-#: my-evolution/Locations.h:1533
-msgid "New Bedford"
-msgstr ""
+#~ msgid "is greater than"
+#~ msgstr "е по-голямо от"
 
-#: my-evolution/Locations.h:1534
-msgid "New Bern"
-msgstr ""
+#~ msgid "is less than"
+#~ msgstr "е по малко от"
 
-#: my-evolution/Locations.h:1535
-msgid "New Braunfels"
-msgstr ""
+#~ msgid "is not"
+#~ msgstr "не е"
 
-#: my-evolution/Locations.h:1536
-msgid "New Brunswick"
-msgstr ""
+#~ msgid "is"
+#~ msgstr "е"
 
-#: my-evolution/Locations.h:1537
-msgid "Newburgh"
-msgstr ""
+#~ msgid "returns greater than"
+#~ msgstr "връща по-голямо от"
 
-#: my-evolution/Locations.h:1538
-msgid "Newcastle"
-msgstr ""
+#~ msgid "returns"
+#~ msgstr "връща"
 
-#: my-evolution/Locations.h:1539
-msgid "New Delhi/Palam"
-msgstr ""
+#~ msgid "sounds like"
+#~ msgstr "звучи като"
 
-#: my-evolution/Locations.h:1540
-msgid "Newfoundland"
-msgstr "Невфаунленд"
+#~ msgid "starts with"
+#~ msgstr "започва с"
 
-#: my-evolution/Locations.h:1541
-msgid "New Hampshire"
-msgstr "Ню Хемшир"
+#~ msgid "Rules"
+#~ msgstr "Правила"
 
-#: my-evolution/Locations.h:1542
-msgid "New Haven"
-msgstr ""
+#~ msgid "You need to to specify at least one folder as a source."
+#~ msgstr "Необходимо е да зададете поне една папка като източник"
 
-#: my-evolution/Locations.h:1543
-msgid "New Iberia"
-msgstr ""
+#~ msgid "Importing %s as %s"
+#~ msgstr "Внася %s като %s"
 
-#: my-evolution/Locations.h:1544
-msgid "New Jersey"
-msgstr "Ню Джърси"
+#~ msgid ""
+#~ "Evolution has found GnomeCard files.\n"
+#~ "Would you like them to be imported into Evolution?"
+#~ msgstr ""
+#~ "Evolution намери файлове на GnomeCard.\n"
+#~ "Искате ли те да бъдат импортиране в Evolution?"
 
-#: my-evolution/Locations.h:1545
-msgid "New Mexico"
-msgstr "Ню Мексико"
+#~ msgid "Scanning mail filters"
+#~ msgstr "Сканира пощенските филтри"
 
-#: my-evolution/Locations.h:1546
-msgid "New Orleans"
-msgstr "Ню Орлеанс"
+#~ msgid "Scanning directory"
+#~ msgstr "Сканира директория"
 
-#: my-evolution/Locations.h:1547
-msgid "New Orleans-Lakefront"
-msgstr ""
+#~ msgid "Folder containing mail"
+#~ msgstr "Папка съдържаща поща"
 
-#: my-evolution/Locations.h:1548
-msgid "New Orleans NAS"
-msgstr "Ню Орлеанс NAS"
+#~ msgid "Public Mail"
+#~ msgstr "Публична Поща"
 
-#: my-evolution/Locations.h:1549
-msgid "Newport"
-msgstr "Нюпорт"
+#~ msgid "Virtual Trash"
+#~ msgstr "Виртуално Кошче"
 
-#: my-evolution/Locations.h:1550
-msgid "Newport News"
-msgstr ""
+#~ msgid "Virtual Trash folder"
+#~ msgstr "Папка на Виртуално Кошче"
 
-#: my-evolution/Locations.h:1551
-msgid "New Port Richey"
-msgstr ""
+#~ msgid "Change this folder's properties"
+#~ msgstr "Промяна настройките на тази папка"
 
-#: my-evolution/Locations.h:1552
-msgid "New River"
-msgstr ""
+#~ msgid ""
+#~ "Some of your mail settings seem corrupt, please check that everything is "
+#~ "in order."
+#~ msgstr ""
+#~ "Някой от вашите настройки за пощата изглеждат повредени, моля проверете "
+#~ "даливсичко е наред."
 
-#: my-evolution/Locations.h:1553
-msgid "New Tokyo International Airport"
-msgstr ""
+#~ msgid "You have not set a mail transport method"
+#~ msgstr "Не се указали метода на изпращане на поща"
 
-#: my-evolution/Locations.h:1554
-msgid "Newton"
-msgstr ""
+#~ msgid "Connecting..."
+#~ msgstr "Свързва"
 
-#: my-evolution/Locations.h:1555
-msgid "New York"
-msgstr "Ню Йорк"
+#~ msgid "Cannot register storage with shell"
+#~ msgstr "Не мога да регистрирам хранилището със shell"
 
-#: my-evolution/Locations.h:1556
-msgid "New York-JFK Arpt"
-msgstr "Ню Йорк - Летище Кенеди"
+#~ msgid "Properties for \"%s\""
+#~ msgstr "Свойства за \"%s\""
 
-#: my-evolution/Locations.h:1557
-msgid "New York-La Guardia"
-msgstr ""
+#~ msgid "%d new"
+#~ msgstr "%d нов"
 
-#: my-evolution/Locations.h:1559
-msgid "Niagara Falls"
-msgstr "Ниагара водопад"
+#~ msgid ", "
+#~ msgstr ", "
 
-#: my-evolution/Locations.h:1561
-msgid "Nice-Cote d'Azur"
-msgstr ""
+#~ msgid "%d hidden"
+#~ msgstr "%d скрит"
 
-#: my-evolution/Locations.h:1562
-msgid "Niigata Airport"
-msgstr ""
+#~ msgid "%d visible"
+#~ msgstr "%d видим"
 
-#: my-evolution/Locations.h:1563
-msgid "Nimes-Garons"
-msgstr ""
+#~ msgid "Getting Folder Information"
+#~ msgstr "Получавам информация за папка"
 
-#: my-evolution/Locations.h:1564
-msgid "Nipawin"
-msgstr ""
+#~ msgid "Current store format:"
+#~ msgstr "Текущ формат за съхранение:"
 
-#: my-evolution/Locations.h:1565
-msgid "Nis"
-msgstr "Нис"
+#~ msgid "New store format:"
+#~ msgstr "Нов формат за съхранение:"
 
-#: my-evolution/Locations.h:1566
-msgid "Nizhny Novgorod"
-msgstr ""
+#~ msgid ""
+#~ "Note: When converting between mailbox formats, a failure\n"
+#~ "(such as lack of disk space) may not be automatically\n"
+#~ "recoverable.  Please use this feature with care."
+#~ msgstr ""
+#~ "Внимание - не е сигурно, че проблем (като свършване на дисковото "
+#~ "пространство)\n"
+#~ "възникнал по време на преобразуване между различните формати на пощенски "
+#~ "кутии,\n"
+#~ "ще може автоматично да се оправи. Използвайте внимателно тази възможност."
 
-#: my-evolution/Locations.h:1567
-msgid "N Las Vegas"
-msgstr ""
+#~ msgid "maildir"
+#~ msgstr "maildir"
 
-#: my-evolution/Locations.h:1568
-msgid "N Myrtle Beach"
-msgstr ""
+#~ msgid "mbox"
+#~ msgstr "mbox"
 
-#: my-evolution/Locations.h:1569
-msgid "Nogales"
-msgstr ""
+#~ msgid "mh"
+#~ msgstr "mh"
 
-#: my-evolution/Locations.h:1570
-msgid "Nome"
-msgstr ""
+#~ msgid ""
+#~ "You have not configured the mail client.\n"
+#~ "You need to do this before you can send,\n"
+#~ "receive or compose mail.\n"
+#~ "Would you like to configure it now?"
+#~ msgstr ""
+#~ "Не сте конфигурирали Вашият mail клиент.\n"
+#~ "Трябва да го направите за да може да изпращате,\n"
+#~ "получавате или пишете поща.\n"
+#~ "Искате ли да го конфигурурате сега?"
 
-#: my-evolution/Locations.h:1571
-msgid "Norfolk"
-msgstr "Норфолк"
+#~ msgid ""
+#~ "You need to configure an identity\n"
+#~ "before you can compose mail."
+#~ msgstr ""
+#~ "Необходимо е да конфигурирате потребител\n"
+#~ "преди да създадете поща."
 
-#: my-evolution/Locations.h:1573
-msgid "Norfolk NAS"
-msgstr "Норфолк"
+#~ msgid ""
+#~ "You need to configure a mail transport\n"
+#~ "before you can compose mail."
+#~ msgstr ""
+#~ "Необходимо е да конфигурирате транспорт на поща\n"
+#~ "преди да създадете поща."
 
-#: my-evolution/Locations.h:1574
-msgid "Norrkoping"
-msgstr ""
+#~ msgid "Send anyway?"
+#~ msgstr "Изпрати въпреки това?"
 
-#: my-evolution/Locations.h:1575
-msgid "North Adams"
-msgstr ""
+#~ msgid ""
+#~ "This message has no subject.\n"
+#~ "Really send?"
+#~ msgstr ""
+#~ "Съобщението няма Тема.\n"
+#~ "Найстина ли да го изпратя?"
 
-#: my-evolution/Locations.h:1576
-msgid "North Bend"
-msgstr ""
+#~ msgid "This message contains only Bcc recipients."
+#~ msgstr "Това съобщение съдържа само Bcc получател."
 
-#: my-evolution/Locations.h:1577
-msgid "North Carolina"
-msgstr "Северна Каролина"
+#~ msgid "You must specify recipients in order to send this message."
+#~ msgstr "Трябва да укажете получател(и) за да може да изпратите съобщението."
 
-#: my-evolution/Locations.h:1578
-msgid "North Conway"
-msgstr ""
+#~ msgid "Move message(s) to"
+#~ msgstr "Премести съобщени(ето/ята) в"
 
-#: my-evolution/Locations.h:1579
-msgid "North Dakota"
-msgstr "Северна Дакота"
+#~ msgid "Copy message(s) to"
+#~ msgstr "Копирай съобщени(ето/ята) в"
 
-#: my-evolution/Locations.h:1580
-msgid "Northeast Philadelphia"
-msgstr ""
+#~ msgid "Are you sure you want to edit all %d messages?"
+#~ msgstr "Сигурен ли сте, че искате да редактирате всички %d съобщения?"
 
-#: my-evolution/Locations.h:1581
-msgid "North Kingstown"
-msgstr ""
+#~ msgid ""
+#~ "You may only edit messages saved\n"
+#~ "in the Drafts folder."
+#~ msgstr ""
+#~ "Можете да редактирате само съобщения записани\n"
+#~ "в папката Drafts."
 
-#: my-evolution/Locations.h:1582
-msgid "North Platte"
-msgstr ""
+#~ msgid ""
+#~ "You may only resend messages\n"
+#~ "in the Sent folder."
+#~ msgstr ""
+#~ "Можете да изпращате отново само съобщения записани\n"
+#~ "в папката Sent."
 
-#: my-evolution/Locations.h:1583
-msgid "Northway"
-msgstr ""
+#~ msgid "No Message Selected"
+#~ msgstr "Няма Избрано Съобщение"
 
-#: my-evolution/Locations.h:1584
-msgid "Northwest Territories"
-msgstr ""
+#~ msgid "Save Messages As..."
+#~ msgstr "Съхрани Съобщението Като..."
 
-#: my-evolution/Locations.h:1586
-msgid "Norwich"
-msgstr "Норич"
+#~ msgid "Printing of message failed"
+#~ msgstr "Отпечатването неуспешно"
 
-#: my-evolution/Locations.h:1587
-msgid "Norwood"
-msgstr ""
+#~ msgid "Are you sure you want to open all %d messages in separate windows?"
+#~ msgstr ""
+#~ "Сигурен ли сте, че искате да отворите всички %d съобщения в отделни "
+#~ "прозорци?"
 
-#: my-evolution/Locations.h:1588
-msgid "Notodden"
-msgstr ""
+#~ msgid "Account Information"
+#~ msgstr "Account Информация"
 
-#: my-evolution/Locations.h:1589
-msgid "Novara/Cameri"
-msgstr ""
+#~ msgid "Configuration"
+#~ msgstr "Конфигурация"
 
-#: my-evolution/Locations.h:1590
-msgid "Nova Scotia"
-msgstr "Нова Скотия"
+#~ msgid "Digital IDs..."
+#~ msgstr "Цифров IDs..."
 
-#: my-evolution/Locations.h:1591
-msgid "Novosibirsk"
-msgstr "Новосибирск"
+#~ msgid "Get Digital ID..."
+#~ msgstr "Получава Цифров ID..."
 
-#: my-evolution/Locations.h:1592
-msgid "Nueva Gerona"
-msgstr ""
+#~ msgid "Required Information"
+#~ msgstr "изискана Информация"
 
-#: my-evolution/Locations.h:1593
-msgid "Nueva Ocotepeque"
-msgstr ""
+#~ msgid "Server Configuration"
+#~ msgstr "Сървър Конфигурация"
 
-#: my-evolution/Locations.h:1594
-msgid "Nuevo Laredo"
-msgstr ""
+#~ msgid "_Authentication Type: "
+#~ msgstr "Тип на Идентифика_ция:"
 
-#: my-evolution/Locations.h:1595
-msgid "Nurnberg"
-msgstr "Нюрнберг"
+#~ msgid "_Authentication type: "
+#~ msgstr "_Тип Идентификация:·"
 
-#: my-evolution/Locations.h:1596
-msgid "Nyutabaru Ab"
-msgstr ""
+#~ msgid "_Default signature:"
+#~ msgstr "_Стандартен подпис"
 
-#: my-evolution/Locations.h:1597
-msgid "Oahu"
-msgstr ""
+#~ msgid "_Full name:"
+#~ msgstr "_Пълно име:"
 
-#: my-evolution/Locations.h:1598
-msgid "Oak Harbor"
-msgstr ""
+#~ msgid "_Identity"
+#~ msgstr "_Идентифицира"
 
-#: my-evolution/Locations.h:1599
-msgid "Oakland"
-msgstr "Окланд"
+#~ msgid "_Receiving Mail"
+#~ msgstr "_Получава Поща"
 
-#: my-evolution/Locations.h:1600
-msgid "Oaxaca"
-msgstr ""
+#~ msgid "_Restore defaults"
+#~ msgstr "_Възстановява стандарните настройки"
 
-#: my-evolution/Locations.h:1601
-msgid "Oberpfaffenhofen"
-msgstr ""
+#~ msgid "_Sending Mail"
+#~ msgstr "_Изпраща поща"
 
-#: my-evolution/Locations.h:1602
-msgid "Obihiro Airport"
-msgstr ""
+#~ msgid "Could not create a S/MIME encryption context."
+#~ msgstr "Не мога да създам S/MIME криптиращ контекст."
 
-#: my-evolution/Locations.h:1603
-msgid "Ocala"
-msgstr ""
+#~ msgid "Save Attachment"
+#~ msgstr "Запазва Прикачен"
 
-#: my-evolution/Locations.h:1604
-msgid "Oceanside"
-msgstr ""
+#~ msgid "External Viewer"
+#~ msgstr "Външен Viewer"
 
-#: my-evolution/Locations.h:1605
-msgid "Odense"
-msgstr "Оденсе"
+#~ msgid "Loading message content"
+#~ msgstr "Зареждам съсдържанието на съобщението"
 
-#: my-evolution/Locations.h:1606
-msgid "Odesa"
-msgstr ""
+#~ msgid "Save Link as (FIXME)"
+#~ msgstr "Запазва указателя като (FIXME)"
 
-#: my-evolution/Locations.h:1607
-msgid "Oelwen"
-msgstr ""
+#~ msgid "Save Image as..."
+#~ msgstr "Съхрани картинка като..."
 
-#: my-evolution/Locations.h:1608
-msgid "Ogden"
-msgstr ""
+#~ msgid "Bad Address"
+#~ msgstr "Грешен Адрес"
 
-#: my-evolution/Locations.h:1609
-msgid "Ogden-Hill AFB"
-msgstr ""
+#~ msgid ""
+#~ "This message is digitally signed. Click the lock icon for more "
+#~ "information."
+#~ msgstr ""
+#~ "Това съобщение е цифрово подписано. Кликнете на иконата за заключване за "
+#~ "повече информация."
 
-#: my-evolution/Locations.h:1610
-msgid "Ogdensburg"
-msgstr ""
+#~ msgid "Reconfiguring folder"
+#~ msgstr "Реконфигуриране на папка"
 
-#: my-evolution/Locations.h:1611
-msgid "Ohio"
-msgstr "Охайо"
+#~ msgid "Cannot save folder metainfo to %s: %s"
+#~ msgstr "Не мога да запзя мета информация в папка %s: %s"
 
-#: my-evolution/Locations.h:1612
-msgid "Ohrid"
-msgstr "Охрид"
+#~ msgid "Changing folder \"%s\" to \"%s\" format"
+#~ msgstr "Променям папка \"%s\" в \"%s\" формат"
 
-#: my-evolution/Locations.h:1613
-msgid "Oita Airport"
-msgstr ""
+#~ msgid ""
+#~ "If you can no longer open this mailbox, then\n"
+#~ "you may need to repair it manually."
+#~ msgstr ""
+#~ "Ако не може повече да отваряте този mailbox,\n"
+#~ "необходимо е да го поправите ръчно."
 
-#: my-evolution/Locations.h:1614
-msgid "Ojika Island"
-msgstr ""
+#~ msgid "Reconfigure /%s"
+#~ msgstr "Реконфигурира /%s"
 
-#: my-evolution/Locations.h:1615
-msgid "Okayama Airport"
-msgstr "Летище Окайама"
+#~ msgid "You cannot change the format of a non-local folder."
+#~ msgstr "Вие не може да промените формата на нелокална папка."
 
-#: my-evolution/Locations.h:1616
-msgid "Oki Airport"
-msgstr "Летище Оки"
+#~ msgid "Working"
+#~ msgstr "Работи"
 
-#: my-evolution/Locations.h:1617
-msgid "Okinoerabu"
-msgstr ""
+#~ msgid "Sending \"%s\""
+#~ msgstr "Изпращане на \"%s\""
 
-#: my-evolution/Locations.h:1618
-msgid "Oklahoma"
-msgstr "Оклахома"
+#~ msgid "Failed on message %d of %d"
+#~ msgstr "Грешка на съобщение %d от %d"
 
-#: my-evolution/Locations.h:1619
-msgid "Oklahoma City"
-msgstr "Оклахома Сити"
+#~ msgid "(Untitled Message)"
+#~ msgstr "(Неименувано Съобщение)"
 
-#: my-evolution/Locations.h:1620
-msgid "Oklahoma City-Bethany"
-msgstr ""
+#~ msgid "Empty Message"
+#~ msgstr "Празно Съобщение"
 
-#: my-evolution/Locations.h:1621
-msgid "Oklahoma City-Midwest City"
-msgstr ""
+#~ msgid "Search Forward"
+#~ msgstr "Търси нататък"
 
-#: my-evolution/Locations.h:1622
-msgid "Okushiri Island"
-msgstr ""
+#~ msgid "(No subject)"
+#~ msgstr "(Няма тема)"
 
-#: my-evolution/Locations.h:1623
-msgid "Olathe"
-msgstr "Олате"
+#~ msgid "%s - Message"
+#~ msgstr "%s - съобщение"
 
-#: my-evolution/Locations.h:1624
-msgid "Olathe/Ind."
-msgstr ""
+#~ msgid "Scanning folders under %s on \"%s\""
+#~ msgstr "Сканиране на папки под %s на \"%s\""
 
-#: my-evolution/Locations.h:1625
-msgid "Olbia"
-msgstr ""
+#~ msgid "Scanning root-level folders on \"%s\""
+#~ msgstr "Сканиране на папки в основно ниво на \"%s\""
 
-#: my-evolution/Locations.h:1626
-msgid "Olympia"
-msgstr "Олимпия"
+#~ msgid "Subscribing to folder \"%s\""
+#~ msgstr "Абонамент за папка \"%s\""
 
-#: my-evolution/Locations.h:1627
-msgid "Omaha"
-msgstr "Омаха"
+#~ msgid "Unsubscribing to folder \"%s\""
+#~ msgstr "Отписване от папка \"%s\""
 
-#: my-evolution/Locations.h:1628
-msgid "Omaha-Bellevue"
-msgstr ""
+#~ msgid "Aarhus"
+#~ msgstr "Аархус"
 
-#: my-evolution/Locations.h:1629
-msgid "Omak"
-msgstr "Омак"
+#~ msgid "Abakan"
+#~ msgstr "Абакан"
 
-#: my-evolution/Locations.h:1631
-msgid "Ominato Ab"
-msgstr ""
+#~ msgid "Abbotsford"
+#~ msgstr "Абътсфорд"
 
-#: my-evolution/Locations.h:1632
-msgid "Omsk"
-msgstr "Омск"
+#~ msgid "Aberdeen"
+#~ msgstr "Абърдиин"
 
-#: my-evolution/Locations.h:1633
-msgid "O'Neill"
-msgstr ""
+#~ msgid "Abha"
+#~ msgstr "Абха"
 
-#: my-evolution/Locations.h:1634
-msgid "Ontario"
-msgstr "Онтарио"
+#~ msgid "Abilene"
+#~ msgstr "Абилейн"
 
-#: my-evolution/Locations.h:1635
-msgid "Oostende"
-msgstr ""
+#~ msgid "Abingdon"
+#~ msgstr "Абиджан"
 
-#: my-evolution/Locations.h:1636
-msgid "Oran"
-msgstr "Оран"
+#~ msgid "Abu Dhabi"
+#~ msgstr "Абу Даби"
 
-#: my-evolution/Locations.h:1637
-msgid "Oran/Es Senia"
-msgstr ""
+#~ msgid "Abu Dhabi - Bateen"
+#~ msgstr "Абу Даби - Батийн"
 
-#: my-evolution/Locations.h:1638
-msgid "Orange"
-msgstr ""
+#~ msgid "Acajutla"
+#~ msgstr "Акаютла"
 
-#: my-evolution/Locations.h:1639
-msgid "Orange City"
-msgstr ""
+#~ msgid "Acapulco"
+#~ msgstr "Акапулко"
 
-#: my-evolution/Locations.h:1640
-msgid "Ord-Sharp"
-msgstr ""
+#~ msgid "Acarigua"
+#~ msgstr "Акаригуа"
 
-#: my-evolution/Locations.h:1641
-msgid "Oregon"
-msgstr "Орегон"
+#~ msgid "Adak"
+#~ msgstr "Адак"
 
-#: my-evolution/Locations.h:1642
-msgid "Orenburg"
-msgstr "Оренбург"
+#~ msgid "Adana"
+#~ msgstr "Адана"
 
-#: my-evolution/Locations.h:1643
-msgid "Orland"
-msgstr "Орланд"
+#~ msgid "Adana/Incirlik"
+#~ msgstr "Адана/Инчирлик"
 
-#: my-evolution/Locations.h:1644
-msgid "Orlando"
-msgstr "Орландо"
+#~ msgid "Adelaide"
+#~ msgstr "Аделаида"
 
-#: my-evolution/Locations.h:1645
-msgid "Orlando (Orlando International)"
-msgstr ""
+#~ msgid "Aden"
+#~ msgstr "Аден"
 
-#: my-evolution/Locations.h:1646
-msgid "Orsta-Volda"
-msgstr ""
+#~ msgid "Adrar"
+#~ msgstr "Адрар"
 
-#: my-evolution/Locations.h:1647
-msgid "Oruro"
-msgstr ""
+#~ msgid "Aeroparque"
+#~ msgstr "Аеропарк"
 
-#: my-evolution/Locations.h:1648
-msgid "Osaka International Airport"
-msgstr "Осака"
+#~ msgid "Aeropuerto del Norte"
+#~ msgstr "Аеропуерто дел Норте"
 
-#: my-evolution/Locations.h:1649
-msgid "Osan Ab"
-msgstr ""
+#~ msgid "Afonsos"
+#~ msgstr "Афонсон"
 
-#: my-evolution/Locations.h:1650
-msgid "Oscoda"
-msgstr ""
+#~ msgid "Africa"
+#~ msgstr "Африка"
 
-#: my-evolution/Locations.h:1651
-msgid "Oseberg A"
-msgstr ""
+#~ msgid "Afyon"
+#~ msgstr "Афйон"
 
-#: my-evolution/Locations.h:1652
-msgid "Oshima Airport"
-msgstr ""
+#~ msgid "Agen"
+#~ msgstr "Аген"
 
-#: my-evolution/Locations.h:1653
-msgid "Oshkosh"
-msgstr ""
+#~ msgid "Aguascaliantes"
+#~ msgstr "Агуаскалиантeс"
 
-#: my-evolution/Locations.h:1654
-msgid "Oslo/Gardenmoen"
-msgstr "Осло"
+#~ msgid "Ahmadabad"
+#~ msgstr "Ахмадабад"
 
-#: my-evolution/Locations.h:1655
-msgid "Ostrava"
-msgstr "Острава"
+#~ msgid "Ahwaz"
+#~ msgstr "Ахмаз"
 
-#: my-evolution/Locations.h:1656
-msgid "Ottawa"
-msgstr "Отава"
+#~ msgid "Ainsworth"
+#~ msgstr "Ейнсъурт"
 
-#: my-evolution/Locations.h:1657
-msgid "Ottumwa"
-msgstr ""
+#~ msgid "Air Force"
+#~ msgstr "Еър Форс"
 
-#: my-evolution/Locations.h:1658
-msgid "Owensboro"
-msgstr ""
+#~ msgid "Ajaccio/Campo dell'Oro"
+#~ msgstr "Ажакио/Кампо дел Оро"
 
-#: my-evolution/Locations.h:1659
-msgid "Owyhee"
-msgstr ""
+#~ msgid "Akeno Ab"
+#~ msgstr "Акено Аб"
 
-#: my-evolution/Locations.h:1660
-msgid "Oxford"
-msgstr "Оксфорд"
+#~ msgid "Akita Airport"
+#~ msgstr "Акита Летище"
 
-#: my-evolution/Locations.h:1661
-msgid "Oxnard"
-msgstr ""
+#~ msgid "Akron"
+#~ msgstr "Акрон"
 
-#: my-evolution/Locations.h:1662
-msgid "Ozark"
-msgstr ""
+#~ msgid "Akrotiri"
+#~ msgstr "Акротири"
 
-#: my-evolution/Locations.h:1663
-msgid "Ozuki Ab"
-msgstr ""
+#~ msgid "Alabama"
+#~ msgstr "Алабама"
 
-#: my-evolution/Locations.h:1664
-msgid "Paderborn-Haxterberg"
-msgstr ""
+#~ msgid "Al Ahsa"
+#~ msgstr "Ал Ахса"
 
-#: my-evolution/Locations.h:1665
-msgid "Padova"
-msgstr "Падова"
+#~ msgid "Al Ain"
+#~ msgstr "Ал Аин"
 
-#: my-evolution/Locations.h:1666
-msgid "Paducah"
-msgstr ""
+#~ msgid "Alamogordo"
+#~ msgstr "Аламогордо"
 
-#: my-evolution/Locations.h:1667
-msgid "Paekado"
-msgstr ""
+#~ msgid "Alamosa"
+#~ msgstr "Аламоса"
 
-#: my-evolution/Locations.h:1668
-msgid "Paengnyongdo Ab"
-msgstr ""
+#~ msgid "Alaska"
+#~ msgstr "Аляска"
 
-#: my-evolution/Locations.h:1669
-msgid "Paganella"
-msgstr ""
+#~ msgid "Al Baha"
+#~ msgstr "Ал Баха"
 
-#: my-evolution/Locations.h:1672
-msgid "Pa Kuei/Bakuai"
-msgstr ""
+#~ msgid "Albany"
+#~ msgstr "Олбъни"
 
-#: my-evolution/Locations.h:1673
-msgid "Palacios"
-msgstr ""
+#~ msgid "Albenga"
+#~ msgstr "Албенга"
 
-#: my-evolution/Locations.h:1674
-msgid "Palermo"
-msgstr "Палермо"
+#~ msgid "Alberta"
+#~ msgstr "Алберта"
 
-#: my-evolution/Locations.h:1675
-msgid "Palma de Mallorca"
-msgstr "Палма де Майорка"
+#~ msgid "Alborg"
+#~ msgstr "Алборг"
 
-#: my-evolution/Locations.h:1676
-msgid "Palmdale"
-msgstr "Палмдале"
+#~ msgid "Albuquerque"
+#~ msgstr "Албакърк"
 
-#: my-evolution/Locations.h:1677
-msgid "Palmer"
-msgstr "Палмер"
+#~ msgid "Alderney"
+#~ msgstr "Олдърни"
 
-#: my-evolution/Locations.h:1678
-msgid "Palm Springs"
-msgstr "Палм Спингс"
+#~ msgid "Alesund"
+#~ msgstr "Алесунд"
 
-#: my-evolution/Locations.h:1679
-msgid "Palo Alto"
-msgstr ""
+#~ msgid "Alexandria"
+#~ msgstr "Александрия"
 
-#: my-evolution/Locations.h:1680
-msgid "Pamplona"
-msgstr ""
+#~ msgid "Alexandria-Esler"
+#~ msgstr "Александрия-Еслер"
 
-#: my-evolution/Locations.h:1682
-msgid "Panama City"
-msgstr "Панама Сити"
+#~ msgid "Alexandria/Nouzha"
+#~ msgstr "Александрия/Нуза"
 
-#: my-evolution/Locations.h:1683
-msgid "Pantelleria"
-msgstr ""
+#~ msgid "Alexandroupolis"
+#~ msgstr "Александрополис"
 
-#: my-evolution/Locations.h:1684
-msgid "Papa"
-msgstr "Папа"
+#~ msgid "Alghero"
+#~ msgstr "Алгеро"
 
-#: my-evolution/Locations.h:1685
-msgid "Paphos"
-msgstr ""
+#~ msgid "Algona"
+#~ msgstr "Алгона"
 
-#: my-evolution/Locations.h:1687
-msgid "Paris"
-msgstr "Париж"
+#~ msgid "Alicante"
+#~ msgstr "Аликанте"
 
-#: my-evolution/Locations.h:1688
-msgid "Paris/Charles De Gaulle"
-msgstr "Париж/Шарк де Гол"
+#~ msgid "Alice"
+#~ msgstr "Алис"
 
-#: my-evolution/Locations.h:1689
-msgid "Paris/Le Bourget"
-msgstr "Париж/Ле Бурже"
+#~ msgid "Alice Springs"
+#~ msgstr "Алис Спрингс"
 
-#: my-evolution/Locations.h:1690
-msgid "Paris/Orly"
-msgstr "Париж/Орли"
+#~ msgid "Al-Jouf"
+#~ msgstr "Ал-Джуф"
 
-#: my-evolution/Locations.h:1691
-msgid "Parkersburg"
-msgstr ""
+#~ msgid "Allentown"
+#~ msgstr "Алентаун"
 
-#: my-evolution/Locations.h:1692
-msgid "Pasco"
-msgstr "Паско"
+#~ msgid "Alliance"
+#~ msgstr "Алайънс"
 
-#: my-evolution/Locations.h:1693
-msgid "Paso De Los Libres"
-msgstr ""
+#~ msgid "Alma"
+#~ msgstr "Алма"
 
-#: my-evolution/Locations.h:1694
-msgid "Paso Robles"
-msgstr ""
+#~ msgid "Almeria"
+#~ msgstr "Алмериа"
 
-#: my-evolution/Locations.h:1695
-msgid "Passo dei Giovi"
-msgstr ""
+#~ msgid "Alpena"
+#~ msgstr "Алпена"
 
-#: my-evolution/Locations.h:1696
-msgid "Passo della Cisa"
-msgstr ""
+#~ msgid "Al Qaysumah"
+#~ msgstr "Ал Казума"
 
-#: my-evolution/Locations.h:1697
-msgid "Passo Resia"
-msgstr ""
+#~ msgid "Alta"
+#~ msgstr "Алта"
 
-#: my-evolution/Locations.h:1698
-msgid "Passo Rolle"
-msgstr ""
+#~ msgid "Altamira"
+#~ msgstr "Алтамира"
 
-#: my-evolution/Locations.h:1699
-msgid "Patna"
-msgstr "Патна"
+#~ msgid "Alton"
+#~ msgstr "Алтон"
 
-#: my-evolution/Locations.h:1700
-msgid "Patterson"
-msgstr "Патерсон"
+#~ msgid "Altoona"
+#~ msgstr "Алтуна"
 
-#: my-evolution/Locations.h:1701
-msgid "Patuxent River"
-msgstr ""
+#~ msgid "Alturas"
+#~ msgstr "Алтурас"
 
-#: my-evolution/Locations.h:1702
-msgid "Pau/Pyrenees"
-msgstr ""
+#~ msgid "Altus"
+#~ msgstr "Алтус"
 
-#: my-evolution/Locations.h:1703
-msgid "Paxson"
-msgstr "Паксон"
+#~ msgid "Amami Airport"
+#~ msgstr "Летище Амами"
 
-#: my-evolution/Locations.h:1704
-msgid "Paysandu"
-msgstr ""
+#~ msgid "Amarillo"
+#~ msgstr "Амарило"
 
-#: my-evolution/Locations.h:1705
-msgid "Payson"
-msgstr ""
+#~ msgid "Amasya"
+#~ msgstr "Амася"
 
-#: my-evolution/Locations.h:1706
-msgid "Pellston"
-msgstr ""
+#~ msgid "Ambler"
+#~ msgstr "Амбер"
 
-#: my-evolution/Locations.h:1707
-msgid "Pelotas"
-msgstr "Пелотас"
+#~ msgid "Amelia"
+#~ msgstr "Амелия"
 
-#: my-evolution/Locations.h:1708
-msgid "Pendleton"
-msgstr ""
+#~ msgid "Amendola"
+#~ msgstr "Амендола"
 
-#: my-evolution/Locations.h:1709
-msgid "Pennsylvania"
-msgstr "Пенсилвания"
+#~ msgid "Ames"
+#~ msgstr "Амес"
 
-#: my-evolution/Locations.h:1710
-msgid "Penn Yan"
-msgstr ""
+#~ msgid "Amritsar"
+#~ msgstr "Амристар"
 
-#: my-evolution/Locations.h:1711
-msgid "Pensacola"
-msgstr "Пенсакола"
+#~ msgid "Amsterdam"
+#~ msgstr "Амстердам"
 
-#: my-evolution/Locations.h:1712
-msgid "Pensacola NAS"
-msgstr "Пенсакола"
+#~ msgid "Anadyr"
+#~ msgstr "Анадир"
 
-#: my-evolution/Locations.h:1713
-msgid "People's Republic of China"
-msgstr ""
+#~ msgid "Anaktuvuk"
+#~ msgstr "Анактувик"
 
-#: my-evolution/Locations.h:1714
-msgid "Peoria"
-msgstr "Пеория"
+#~ msgid "Anapa"
+#~ msgstr "Анапа"
 
-#: my-evolution/Locations.h:1715
-msgid "Pequot Lakes"
-msgstr ""
+#~ msgid "Anchorage"
+#~ msgstr "Анкоридж"
 
-#: my-evolution/Locations.h:1716
-msgid "Pereira/Matecana"
-msgstr ""
+#~ msgid "Anchorage - Elmendorf AFB"
+#~ msgstr "Анкоридж - Елмендорф ВВБ"
 
-#: my-evolution/Locations.h:1717
-msgid "Perm"
-msgstr "Перм"
+#~ msgid "Ancona"
+#~ msgstr "Анкона"
 
-#: my-evolution/Locations.h:1718
-msgid "Perpignan-Rivesaltes"
-msgstr ""
+#~ msgid "Andahuayla"
+#~ msgstr "Андауаля"
 
-#: my-evolution/Locations.h:1719
-msgid "Perry-Foley"
-msgstr ""
+#~ msgid "Anderson"
+#~ msgstr "Андерсън"
 
-#: my-evolution/Locations.h:1720
-msgid "Perth"
-msgstr "Перт"
+#~ msgid "Andoya"
+#~ msgstr "Андоя"
 
-#: my-evolution/Locations.h:1722
-msgid "Perugia"
-msgstr "Перуджа"
+#~ msgid "Andravida"
+#~ msgstr "Андравида"
 
-#: my-evolution/Locations.h:1723
-msgid "Pescara"
-msgstr "Пескара"
+#~ msgid "Andrews AFB"
+#~ msgstr "Андрюс ВВБ"
 
-#: my-evolution/Locations.h:1724
-msgid "Petersburg"
-msgstr "Петерсбург"
+#~ msgid "Angleton"
+#~ msgstr "Ейнджълтън"
 
-#: my-evolution/Locations.h:1725
-msgid "Petropavlovsk-Kamchatsky"
-msgstr "Петропавловск-Камчатка"
+#~ msgid "Aniak"
+#~ msgstr "Аниак"
 
-#: my-evolution/Locations.h:1726
-msgid "Petrozavodsk"
-msgstr "Петрозаводск"
+#~ msgid "Ankara/Esenboga"
+#~ msgstr "Анкара/Есенбога"
 
-#: my-evolution/Locations.h:1727
-msgid "Philadelphia"
-msgstr "Филаделфия"
+#~ msgid "Ankara/Etimesgut"
+#~ msgstr "Анкара/Етимесгут"
 
-#: my-evolution/Locations.h:1728
-msgid "Philip"
-msgstr "Филип"
+#~ msgid "Annaba"
+#~ msgstr "Анаба"
 
-#: my-evolution/Locations.h:1729
-msgid "Philipsburg"
-msgstr "Филипсбург"
+#~ msgid "Ann Arbor"
+#~ msgstr "Ан Арбър"
 
-#: my-evolution/Locations.h:1730
-msgid "Phillips"
-msgstr "Филипс"
+#~ msgid "Annette"
+#~ msgstr "Анет"
 
-#: my-evolution/Locations.h:1731
-msgid "Phoenix"
-msgstr "Феникс"
+#~ msgid "Anniston"
+#~ msgstr "Анистън"
 
-#: my-evolution/Locations.h:1732
-msgid "Phoenix-Deer Valley"
-msgstr ""
+#~ msgid "Antalya"
+#~ msgstr "Анталиа"
 
-#: my-evolution/Locations.h:1733
-msgid "Phoenix-Goodyear"
-msgstr ""
+#~ msgid "Antartica"
+#~ msgstr "Антарктика"
 
-#: my-evolution/Locations.h:1734
-msgid "Phoenix-Luke AFB"
-msgstr ""
+#~ msgid "Antigo"
+#~ msgstr "Антиго"
 
-#: my-evolution/Locations.h:1735
-msgid "Piacenza"
-msgstr "Пиаченса"
+#~ msgid "Antigua"
+#~ msgstr "Антигуа"
 
-#: my-evolution/Locations.h:1736
-msgid "Pian Rosa"
-msgstr ""
+#~ msgid "Antigua and Barbuda"
+#~ msgstr "Антигуа и Барбадоса"
 
-#: my-evolution/Locations.h:1737
-msgid "Piedras Negras"
-msgstr ""
+#~ msgid "Antofagasta"
+#~ msgstr "Антофагаста"
 
-#: my-evolution/Locations.h:1738
-msgid "Pierre"
-msgstr "Пиере"
+#~ msgid "Antwerpen/Deurne"
+#~ msgstr "Антверпен"
 
-#: my-evolution/Locations.h:1739
-msgid "Pietersburg"
-msgstr ""
+#~ msgid "Aomori Airport"
+#~ msgstr "Летище Аомори"
 
-#: my-evolution/Locations.h:1740
-msgid "Pikeville"
-msgstr ""
+#~ msgid "Apalachicola"
+#~ msgstr "Апалачикола"
 
-#: my-evolution/Locations.h:1741
-msgid "Pine Bluff"
-msgstr ""
+#~ msgid "Appleton"
+#~ msgstr "Епълтън"
 
-#: my-evolution/Locations.h:1742
-msgid "Pingtung North"
-msgstr ""
+#~ msgid "Aquadilla"
+#~ msgstr "Акуадиля"
 
-#: my-evolution/Locations.h:1743
-msgid "Pingtung South"
-msgstr ""
+#~ msgid "Aracaju"
+#~ msgstr "Аракаю"
 
-#: my-evolution/Locations.h:1744
-msgid "Pirassununga"
-msgstr ""
+#~ msgid "Arad"
+#~ msgstr "Арад"
 
-#: my-evolution/Locations.h:1745
-msgid "Pisa"
-msgstr ""
+#~ msgid "Arar"
+#~ msgstr "Арар"
 
-#: my-evolution/Locations.h:1746
-msgid "Pisco"
-msgstr "Писко"
+#~ msgid "Araxos"
+#~ msgstr "Араксос"
 
-#: my-evolution/Locations.h:1747
-msgid "Pittsburgh"
-msgstr "Питсбърг"
+#~ msgid "Arcata"
+#~ msgstr "Арката"
 
-#: my-evolution/Locations.h:1748
-msgid "Pittsburgh-West Mifflin"
-msgstr ""
+#~ msgid "Ardmore"
+#~ msgstr "Ардмор"
 
-#: my-evolution/Locations.h:1749
-msgid "Plattsburg"
-msgstr "Платсбург"
+#~ msgid "Arequipa"
+#~ msgstr "Арекипа"
 
-#: my-evolution/Locations.h:1750
-msgid "Plovdiv"
-msgstr "Пловдив"
+#~ msgid "Arica"
+#~ msgstr "Арика"
 
-#: my-evolution/Locations.h:1751
-msgid "Plymouth"
-msgstr "Плимут"
+#~ msgid "Arizona"
+#~ msgstr "Аризона"
 
-#: my-evolution/Locations.h:1752
-msgid "Pocatello"
-msgstr "Покатело"
+#~ msgid "Arkansas"
+#~ msgstr "Арканзас"
 
-#: my-evolution/Locations.h:1753
-msgid "Pocos De Caldas"
-msgstr ""
+#~ msgid "Arkhangelsk"
+#~ msgstr "Архангелск"
 
-#: my-evolution/Locations.h:1754
-msgid "Podgorica"
-msgstr "Подгорица"
+#~ msgid "Arlington"
+#~ msgstr "Арлинтън"
 
-#: my-evolution/Locations.h:1755
-msgid "Podgorica Titograd"
-msgstr ""
+#~ msgid "Artigas"
+#~ msgstr "Артигас"
 
-#: my-evolution/Locations.h:1756
-msgid "Pohang Ab"
-msgstr ""
+#~ msgid "Asahikawa Ab"
+#~ msgstr "Асахикава ВБ"
 
-#: my-evolution/Locations.h:1757
-msgid "Point Hope"
-msgstr ""
+#~ msgid "Asahikawa Airport"
+#~ msgstr "Летище Асахикава"
 
-#: my-evolution/Locations.h:1758
-msgid "Point Lay"
-msgstr ""
+#~ msgid "Ashburnam"
+#~ msgstr "Ашбърнам"
 
-#: my-evolution/Locations.h:1759
-msgid "Point Mugu"
-msgstr ""
+#~ msgid "Asheville"
+#~ msgstr "Ашвил"
 
-#: my-evolution/Locations.h:1760
-msgid "Point Piedras Blanca"
-msgstr ""
+#~ msgid "Ashfield"
+#~ msgstr "Ашфилд"
 
-#: my-evolution/Locations.h:1761
-msgid "Poitiers"
-msgstr ""
+#~ msgid "Ashiya Ab"
+#~ msgstr "Ашя ВБ"
 
-#: my-evolution/Locations.h:1763
-msgid "Pompano Beach"
-msgstr ""
+#~ msgid "Ashland"
+#~ msgstr "Ашланд"
 
-#: my-evolution/Locations.h:1764
-msgid "Ponca City"
-msgstr ""
+#~ msgid "Asia"
+#~ msgstr "Азия"
 
-#: my-evolution/Locations.h:1765
-msgid "Ponce"
-msgstr "Понце"
+#~ msgid "Asswan"
+#~ msgstr "Асуан"
 
-#: my-evolution/Locations.h:1766
-msgid "Ponta Pora"
-msgstr ""
+#~ msgid "Astoria"
+#~ msgstr "Астория"
 
-#: my-evolution/Locations.h:1767
-msgid "Pontiac"
-msgstr "Понтиак"
+#~ msgid "Astrakhan"
+#~ msgstr "Астрахан"
 
-#: my-evolution/Locations.h:1768
-msgid "Pope AFB"
-msgstr ""
+#~ msgid "Asturias"
+#~ msgstr "Астурия"
 
-#: my-evolution/Locations.h:1769
-msgid "Poplar Bluff"
-msgstr ""
+#~ msgid "Asuncion"
+#~ msgstr "Асонсион"
 
-#: my-evolution/Locations.h:1770
-msgid "Poprad"
-msgstr "Попрад"
+#~ msgid "Athens"
+#~ msgstr "Атина"
 
-#: my-evolution/Locations.h:1771
-msgid "Port Alexander"
-msgstr ""
+#~ msgid "Athinai"
+#~ msgstr "Атина"
 
-#: my-evolution/Locations.h:1772
-msgid "Port Alsworth"
-msgstr ""
+#~ msgid "Atlanta"
+#~ msgstr "Атланта"
 
-#: my-evolution/Locations.h:1773
-msgid "Port Angeles"
-msgstr ""
+#~ msgid "Atlantic"
+#~ msgstr "Атлантик"
 
-#: my-evolution/Locations.h:1774
-msgid "Port-Au-Prince"
-msgstr "Порт-о-Пренс"
+#~ msgid "Atlantic City"
+#~ msgstr "Атлантик Сити"
 
-#: my-evolution/Locations.h:1775
-msgid "Port Elizabeth"
-msgstr "Порт Елизабет"
+#~ msgid "Atsugi US NAS"
+#~ msgstr "ВМ База Ацуги на САЩ"
 
-#: my-evolution/Locations.h:1776
-msgid "Porterville"
-msgstr "Портервил"
+#~ msgid "Auburn"
+#~ msgstr "Обърн"
 
-#: my-evolution/Locations.h:1777
-msgid "Port Hardy"
-msgstr ""
+#~ msgid "Auckland"
+#~ msgstr "Оклънд"
 
-#: my-evolution/Locations.h:1778
-msgid "Port Hedland"
-msgstr ""
+#~ msgid "Augsburg"
+#~ msgstr "Аугсбург"
 
-#: my-evolution/Locations.h:1779
-msgid "Port Heiden"
-msgstr ""
+#~ msgid "Augusta"
+#~ msgstr "Аугуста"
 
-#: my-evolution/Locations.h:1780
-msgid "Portland"
-msgstr "Портланд"
+#~ msgid "Aurora"
+#~ msgstr "Аврора"
 
-#: my-evolution/Locations.h:1781
-msgid "Porto"
-msgstr "Порто"
+#~ msgid "Austin"
+#~ msgstr "Остин"
 
-#: my-evolution/Locations.h:1782
-msgid "Porto Alegre"
-msgstr "Порто Алегре"
+#~ msgid "Australasia"
+#~ msgstr "Австралазия"
 
-#: my-evolution/Locations.h:1783
-msgid "Porto Alegre Apt"
-msgstr ""
+#~ msgid "Avalon"
+#~ msgstr "Авалон"
 
-#: my-evolution/Locations.h:1784
-msgid "Portoroz"
-msgstr "Портороз"
+#~ msgid "Aviano"
+#~ msgstr "Авиано"
 
-#: my-evolution/Locations.h:1785
-msgid "Porto Santo"
-msgstr "Порто Санто"
+#~ msgid "Ayacucho"
+#~ msgstr "Аякучо"
 
-#: my-evolution/Locations.h:1786
-msgid "Porto Velho"
-msgstr ""
+#~ msgid "Bage"
+#~ msgstr "Бейдж"
 
-#: my-evolution/Locations.h:1787
-msgid "Port Said"
-msgstr "Пор Саид"
+#~ msgid "Bagotville"
+#~ msgstr "Баготвил"
 
-#: my-evolution/Locations.h:1788
-msgid "Portsmouth"
-msgstr "Портсмут"
+#~ msgid "Bahia Blanca"
+#~ msgstr "Бая Бланка"
 
-#: my-evolution/Locations.h:1790
-msgid "Posadas"
-msgstr "Посадас"
+#~ msgid "Bahias de Huatulco"
+#~ msgstr "Бая де Хатулко"
 
-#: my-evolution/Locations.h:1791
-msgid "Potosi"
-msgstr "Потоси"
+#~ msgid "Baker City"
+#~ msgstr "Бейкър сити"
 
-#: my-evolution/Locations.h:1792
-msgid "Poughkeepsie"
-msgstr ""
+#~ msgid "Bakersfield"
+#~ msgstr "Бейкърсфилд"
 
-#: my-evolution/Locations.h:1793
-msgid "Pownal"
-msgstr ""
+#~ msgid "Bale-Mulhouse"
+#~ msgstr "Бал-Мюлуз"
 
-#: my-evolution/Locations.h:1794
-msgid "Poza Rica"
-msgstr ""
+#~ msgid "Balikesir"
+#~ msgstr "Баликезир"
 
-#: my-evolution/Locations.h:1795
-msgid "Poznan"
-msgstr "Познан"
+#~ msgid "Balikesir/Bandirma"
+#~ msgstr "Баликезир/Бандирма"
 
-#: my-evolution/Locations.h:1796
-msgid "Praha"
-msgstr "Прага"
+#~ msgid "Ball Mountain"
+#~ msgstr "Бол Маунтин"
 
-#: my-evolution/Locations.h:1797
-msgid "Pratica di Mare"
-msgstr ""
+#~ msgid "Baltimore"
+#~ msgstr "Балтимор"
 
-#: my-evolution/Locations.h:1798
-msgid "Prescott"
-msgstr "Прескот"
+#~ msgid "Baltimore-Glen Burnie"
+#~ msgstr "Балтимор-Глен Бърни"
 
-#: my-evolution/Locations.h:1799
-msgid "Presidente Prudente"
-msgstr ""
+#~ msgid "Banak"
+#~ msgstr "Банак"
 
-#: my-evolution/Locations.h:1800
-msgid "Presque Isle"
-msgstr ""
+#~ msgid "Bandarabbass"
+#~ msgstr "Бандарабас"
 
-#: my-evolution/Locations.h:1801
-msgid "Prestwick"
-msgstr ""
+#~ msgid "Bangor"
+#~ msgstr "Бангор"
 
-#: my-evolution/Locations.h:1802
-msgid "Pretoria"
-msgstr "Претория"
+#~ msgid "Baracoa"
+#~ msgstr "Баракао"
 
-#: my-evolution/Locations.h:1803
-msgid "Preveza"
-msgstr "Превеза"
+#~ msgid "Barbers Point"
+#~ msgstr "Барбърс Поинт"
 
-#: my-evolution/Locations.h:1804
-msgid "Price-Carbon"
-msgstr ""
+#~ msgid "Barcelona"
+#~ msgstr "Барселона"
 
-#: my-evolution/Locations.h:1805
-msgid "Pristina"
-msgstr "Пристина"
+#~ msgid "Bardufoss"
+#~ msgstr "Бардуфос"
 
-#: my-evolution/Locations.h:1806
-msgid "Providence"
-msgstr "Провиденс"
+#~ msgid "Bar Harbor"
+#~ msgstr "Бар Харбър"
 
-#: my-evolution/Locations.h:1807
-msgid "Provincetown"
-msgstr ""
+#~ msgid "Bari"
+#~ msgstr "Бари"
 
-#: my-evolution/Locations.h:1808
-msgid "Provo"
-msgstr "Прово"
+#~ msgid "Bariloche"
+#~ msgstr "Барилоче"
 
-#: my-evolution/Locations.h:1809
-msgid "Pskov"
-msgstr "Псков"
+#~ msgid "Barinas"
+#~ msgstr "Баринас"
 
-#: my-evolution/Locations.h:1810
-msgid "Pucallpa"
-msgstr ""
+#~ msgid "Barking Sand"
+#~ msgstr "Баркинг Санд"
 
-#: my-evolution/Locations.h:1811
-msgid "Pudahuel"
-msgstr ""
+#~ msgid "Barksdale"
+#~ msgstr "Барксдейл"
 
-#: my-evolution/Locations.h:1812
-msgid "Puebla"
-msgstr "Пуебла"
+#~ msgid "Barnaul"
+#~ msgstr "Барнаул"
 
-#: my-evolution/Locations.h:1813
-msgid "Pueblo"
-msgstr "Пуебло"
+#~ msgid "Barquisimeto"
+#~ msgstr "Баркисимето"
 
-#: my-evolution/Locations.h:1814
-msgid "Puerto Barrios"
-msgstr ""
+#~ msgid "Barranquilla/Ernestocortissoz"
+#~ msgstr "Баранкила/Енрестокортизос"
 
-#: my-evolution/Locations.h:1815
-msgid "Puerto Cabezas"
-msgstr ""
+#~ msgid "Barrow"
+#~ msgstr "Бароу"
 
-#: my-evolution/Locations.h:1816
-msgid "Puerto Escondido"
-msgstr ""
+#~ msgid "Barter Island"
+#~ msgstr "Остров Бартър"
 
-#: my-evolution/Locations.h:1817
-msgid "Puerto Lempira"
-msgstr ""
+#~ msgid "Bartlesville"
+#~ msgstr "Бартълсвил"
 
-#: my-evolution/Locations.h:1818
-msgid "Puerto Limon"
-msgstr ""
+#~ msgid "Bartow"
+#~ msgstr "Бартоу"
 
-#: my-evolution/Locations.h:1819
-msgid "Puerto Maldonado"
-msgstr ""
+#~ msgid "Bastia"
+#~ msgstr "Бастия"
 
-#: my-evolution/Locations.h:1820
-msgid "Puerto Montt"
-msgstr ""
+#~ msgid "Batesville"
+#~ msgstr "Бейтсвил"
 
-#: my-evolution/Locations.h:1821
-msgid "Puerto Plata"
-msgstr "Пуерто Плата"
+#~ msgid "Batman"
+#~ msgstr "Батман"
 
-#: my-evolution/Locations.h:1823
-msgid "Puerto Suarez"
-msgstr ""
+#~ msgid "Baton Rouge"
+#~ msgstr "Батън Руж"
 
-#: my-evolution/Locations.h:1824
-msgid "Puerto Vallarta"
-msgstr "Пуерто Валарта"
+#~ msgid "Battle Creek"
+#~ msgstr "Батъл Крийк"
 
-#: my-evolution/Locations.h:1825
-msgid "Pula"
-msgstr "Пула"
+#~ msgid "Battle Mountain"
+#~ msgstr "Батъл Маунтин"
 
-#: my-evolution/Locations.h:1826
-msgid "Pullman"
-msgstr ""
+#~ msgid "Bauru"
+#~ msgstr "Бауру"
 
-#: my-evolution/Locations.h:1827
-msgid "Punta Arenas"
-msgstr "Пунта Аренас"
+#~ msgid "Bayamo"
+#~ msgstr "Баямо"
 
-#: my-evolution/Locations.h:1828
-msgid "Punta Cana"
-msgstr "Пунта Сана"
+#~ msgid "Bayreuth"
+#~ msgstr "Бейрот"
 
-#: my-evolution/Locations.h:1829
-msgid "Punta Gorda"
-msgstr "Пунта Горда"
+#~ msgid "Beatrice"
+#~ msgstr "Беатрис"
 
-#: my-evolution/Locations.h:1830
-msgid "Puntilla Lake"
-msgstr ""
+#~ msgid "Beaufort"
+#~ msgstr "Бофорт"
 
-#: my-evolution/Locations.h:1831
-msgid "Pusan/Kimhae"
-msgstr ""
+#~ msgid "Beaumont"
+#~ msgstr "Бомонт"
 
-#: my-evolution/Locations.h:1832
-msgid "Pyongtaek Ab"
-msgstr ""
+#~ msgid "Beaumont-Port Arthur"
+#~ msgstr "Бомонт-Порт Артър"
 
-#: my-evolution/Locations.h:1833
-msgid "Pyongyang"
-msgstr ""
+#~ msgid "Beauvais-Tille"
+#~ msgstr "Буво-Тил"
 
-#: my-evolution/Locations.h:1835
-msgid "Quantico"
-msgstr ""
+#~ msgid "Beauvechain"
+#~ msgstr "Бовешан"
 
-#: my-evolution/Locations.h:1836
-msgid "Quebec"
-msgstr "Квебек"
+#~ msgid "Beckley"
+#~ msgstr "Бекли"
 
-#: my-evolution/Locations.h:1837
-msgid "Quebec City"
-msgstr "Квебек град"
+#~ msgid "Bedford"
+#~ msgstr "Бедфорт"
 
-#: my-evolution/Locations.h:1838
-msgid "Queretaro"
-msgstr ""
+#~ msgid "Beijing"
+#~ msgstr "Пекин"
 
-#: my-evolution/Locations.h:1839
-msgid "Quillayute"
-msgstr ""
+#~ msgid "Beirut"
+#~ msgstr "Бейрут"
 
-#: my-evolution/Locations.h:1840
-msgid "Quimper"
-msgstr ""
+#~ msgid "Beja"
+#~ msgstr "Бея"
 
-#: my-evolution/Locations.h:1841
-msgid "Quincy"
-msgstr ""
+#~ msgid "Belem"
+#~ msgstr "Белем"
 
-#: my-evolution/Locations.h:1842
-msgid "Quito/Mariscal Sucre"
-msgstr ""
+#~ msgid "Belfast/Aldergrove"
+#~ msgstr "Белфаст/Елдъргроув"
 
-#: my-evolution/Locations.h:1843
-msgid "Rabat"
-msgstr "Рабат"
+#~ msgid "Belfast/Harbour"
+#~ msgstr "Белфаст/Харбър"
 
-#: my-evolution/Locations.h:1844
-msgid "Raduzhny"
-msgstr ""
+#~ msgid "Belgorod"
+#~ msgstr "Белгород"
 
-#: my-evolution/Locations.h:1845
-msgid "Rafha"
-msgstr ""
+#~ msgid "Belleville"
+#~ msgstr "Белвил"
 
-#: my-evolution/Locations.h:1846
-msgid "Raleigh-Durham"
-msgstr ""
+#~ msgid "Bellingham"
+#~ msgstr "Белингам"
 
-#: my-evolution/Locations.h:1847
-msgid "Randolph AFB"
-msgstr ""
+#~ msgid "Belmar-Farmingdale"
+#~ msgstr "Белмар-Фармингдейл"
 
-#: my-evolution/Locations.h:1848
-msgid "Rapid City"
-msgstr ""
+#~ msgid "Belo Horizonte"
+#~ msgstr "Бело Оризонте"
 
-#: my-evolution/Locations.h:1849
-msgid "Rapid City-Ellsworth AFB"
-msgstr ""
+#~ msgid "Belo Horizonte Apt"
+#~ msgstr "Бело Оризонте Апт"
 
-#: my-evolution/Locations.h:1850
-msgid "Ras Al Khaimah"
-msgstr ""
+#~ msgid "Bemidji"
+#~ msgstr "Бемиджи"
 
-#: my-evolution/Locations.h:1851
-msgid "Rawlins"
-msgstr ""
+#~ msgid "Benbecula"
+#~ msgstr "Бенбакула"
 
-#: my-evolution/Locations.h:1852
-msgid "Reading"
-msgstr ""
+#~ msgid "Benina"
+#~ msgstr "Бенина"
 
-#: my-evolution/Locations.h:1853
-msgid "Rebun Island"
-msgstr ""
+#~ msgid "Benton Harbor"
+#~ msgstr "Бентън Харбър"
 
-#: my-evolution/Locations.h:1854
-msgid "Recife"
-msgstr "Ресифе"
+#~ msgid "Bentonville"
+#~ msgstr "Бентонвил"
 
-#: my-evolution/Locations.h:1855
-msgid "Red Bluff"
-msgstr ""
+#~ msgid "Beograd"
+#~ msgstr "Белград"
 
-#: my-evolution/Locations.h:1856
-msgid "Redding"
-msgstr "Рединг"
+#~ msgid "Bergamo"
+#~ msgstr "Бергамо"
 
-#: my-evolution/Locations.h:1857
-msgid "Redig"
-msgstr "Редиг"
+#~ msgid "Bergen"
+#~ msgstr "Берген"
 
-#: my-evolution/Locations.h:1858
-msgid "Redmond"
-msgstr "Редмон"
+#~ msgid "Bergstrom AFB"
+#~ msgstr "ВВБ Бергстрьом"
 
-#: my-evolution/Locations.h:1859
-msgid "Red Oak"
-msgstr ""
+#~ msgid "Berlevag"
+#~ msgstr "Берлеваг"
 
-#: my-evolution/Locations.h:1860
-msgid "Redwood Falls"
-msgstr ""
+#~ msgid "Berlin"
+#~ msgstr "Берлин"
 
-#: my-evolution/Locations.h:1861
-msgid "Reggio Calabria"
-msgstr "Реджио Калабриа"
+#~ msgid "Berlin-Tegel"
+#~ msgstr "Берлин-Тегел"
 
-#: my-evolution/Locations.h:1862
-msgid "Regina"
-msgstr "Режина"
+#~ msgid "Berlin-Tempelhof"
+#~ msgstr "Берлин-Темпелхов"
 
-#: my-evolution/Locations.h:1863
-msgid "Reims-Champagne"
-msgstr ""
+#~ msgid "Bern"
+#~ msgstr "Берн"
 
-#: my-evolution/Locations.h:1864
-msgid "Rennes"
-msgstr "Ренес"
+#~ msgid "Bethel"
+#~ msgstr "Бетел"
 
-#: my-evolution/Locations.h:1865
-msgid "Reno"
-msgstr "Рено"
+#~ msgid "Bethlehem Airport"
+#~ msgstr "Летище Бетълхем"
 
-#: my-evolution/Locations.h:1866
-msgid "Renton"
-msgstr "Рентон"
+#~ msgid "Bettles"
+#~ msgstr "Бетълс"
 
-#: my-evolution/Locations.h:1867
-msgid "Resistencia"
-msgstr ""
+#~ msgid "Beverly"
+#~ msgstr "Бевърли"
 
-#: my-evolution/Locations.h:1868
-msgid "Reus"
-msgstr ""
+#~ msgid "Biarritz-Bayonne"
+#~ msgstr "Биариц-Бейон"
 
-#: my-evolution/Locations.h:1869
-msgid "Reyes"
-msgstr ""
+#~ msgid "Bicycle Lake"
+#~ msgstr "Байсикъл Лейк"
 
-#: my-evolution/Locations.h:1870
-msgid "Reykjavik"
-msgstr "Рейкявик"
+#~ msgid "Biggin Hill"
+#~ msgstr "Бигин Хил"
 
-#: my-evolution/Locations.h:1871
-msgid "Reynosa"
-msgstr ""
+#~ msgid "Big Piney"
+#~ msgstr "Биг Пини"
 
-#: my-evolution/Locations.h:1872
-msgid "Rhinelander"
-msgstr ""
+#~ msgid "Big River Lake"
+#~ msgstr "Биг Ривър Лейк"
 
-#: my-evolution/Locations.h:1873
-msgid "Rhode Island"
-msgstr ""
+#~ msgid "Bilbao"
+#~ msgstr "Билбао"
 
-#: my-evolution/Locations.h:1874
-msgid "Riberalta"
-msgstr ""
+#~ msgid "Billings"
+#~ msgstr "Билингс"
 
-#: my-evolution/Locations.h:1875
-msgid "Richmond"
-msgstr "Ричмонд"
+#~ msgid "Billund"
+#~ msgstr "Билунд"
 
-#: my-evolution/Locations.h:1876
-msgid "Rickenbacker"
-msgstr ""
+#~ msgid "Binghamton"
+#~ msgstr "Бингамтън"
 
-#: my-evolution/Locations.h:1877
-msgid "Rieti"
-msgstr ""
+#~ msgid "Birmingham"
+#~ msgstr "Бирмингам"
 
-#: my-evolution/Locations.h:1878
-msgid "Rifle"
-msgstr ""
+#~ msgid "Bisha"
+#~ msgstr "Биша"
 
-#: my-evolution/Locations.h:1879
-msgid "Rijeka"
-msgstr "Риека"
+#~ msgid "Bishop"
+#~ msgstr "Бишоп"
 
-#: my-evolution/Locations.h:1880
-msgid "Rimini"
-msgstr "Римини"
+#~ msgid "Bismark"
+#~ msgstr "Бисмарк"
 
-#: my-evolution/Locations.h:1881
-msgid "Rio De Janeiro"
-msgstr ""
+#~ msgid "Blagoveschensk"
+#~ msgstr "Благовещенск"
 
-#: my-evolution/Locations.h:1882
-msgid "Rio Gallegos"
-msgstr ""
+#~ msgid "Blanding"
+#~ msgstr "Бландинг"
 
-#: my-evolution/Locations.h:1883
-msgid "Rio Grande"
-msgstr "Рио Гранде"
+#~ msgid "Block Island"
+#~ msgstr "Блок Айлънд"
 
-#: my-evolution/Locations.h:1884
-msgid "Rioja"
-msgstr ""
+#~ msgid "Bloemfontein J. B. M. Hertzog "
+#~ msgstr "Блумфонтейн Дж. Б.М. Херцог"
 
-#: my-evolution/Locations.h:1885
-msgid "Rio / Jacarepagua"
-msgstr ""
+#~ msgid "Bloomington"
+#~ msgstr "Блумингтън"
 
-#: my-evolution/Locations.h:1886
-msgid "Rionegro/J.M.Cordova"
-msgstr ""
+#~ msgid "Blue Canyon"
+#~ msgstr "Блу Кениън"
 
-#: my-evolution/Locations.h:1887
-msgid "Rishiri Island"
-msgstr ""
+#~ msgid "Bluefield"
+#~ msgstr "Блуфилд"
 
-#: my-evolution/Locations.h:1888
-msgid "Rivas"
-msgstr "Ривас"
+#~ msgid "Bluefields"
+#~ msgstr "Блуфилдс"
 
-#: my-evolution/Locations.h:1889
-msgid "Rivera"
-msgstr "Ривера"
+#~ msgid "Blythe"
+#~ msgstr "Блаит"
 
-#: my-evolution/Locations.h:1890
-msgid "Riverside"
-msgstr ""
+#~ msgid "Boa Vista"
+#~ msgstr "Боависта"
 
-#: my-evolution/Locations.h:1891
-msgid "Riverside/March AFB"
-msgstr ""
+#~ msgid "Bocas del Toro"
+#~ msgstr "Бока дел Торо"
 
-#: my-evolution/Locations.h:1892
-msgid "Riverton"
-msgstr "Реивертон"
+#~ msgid "Bodo"
+#~ msgstr "Бодо"
 
-#: my-evolution/Locations.h:1893
-msgid "Rivne"
-msgstr ""
+#~ msgid "Bogota/Eldorado"
+#~ msgstr "Богота"
 
-#: my-evolution/Locations.h:1894
-msgid "Rivolto"
-msgstr "Риволто"
+#~ msgid "Boise"
+#~ msgstr "Боа"
 
-#: my-evolution/Locations.h:1895
-msgid "Riyadh"
-msgstr "Риад"
+#~ msgid "Bolzano"
+#~ msgstr "Болзано"
 
-#: my-evolution/Locations.h:1896
-msgid "Roanoke"
-msgstr ""
+#~ msgid "Bombay/Santacruz"
+#~ msgstr "Бомбай"
 
-#: my-evolution/Locations.h:1897
-msgid "Roatan"
-msgstr "Роатан"
+#~ msgid "Boone"
+#~ msgstr "Буун"
 
-#: my-evolution/Locations.h:1898
-msgid "Robore"
-msgstr ""
+#~ msgid "Bordeaux"
+#~ msgstr "Бордо"
 
-#: my-evolution/Locations.h:1899
-msgid "Rochester"
-msgstr "Рочестер"
+#~ msgid "Borger"
+#~ msgstr "Боргер"
 
-#: my-evolution/Locations.h:1900
-msgid "Rockford"
-msgstr "Рокфорд"
+#~ msgid "Bornholm"
+#~ msgstr "Борнхолм"
 
-#: my-evolution/Locations.h:1901
-msgid "Rockland"
-msgstr ""
+#~ msgid "Boscombe Down"
+#~ msgstr "Боскомб Даун"
 
-#: my-evolution/Locations.h:1902
-msgid "Rockport"
-msgstr ""
+#~ msgid "Bosnia-Herzegovina"
+#~ msgstr "Босна-Херцеговина"
 
-#: my-evolution/Locations.h:1903
-msgid "Rock Springs"
-msgstr ""
+#~ msgid "Boulmer"
+#~ msgstr "Боулмър"
 
-#: my-evolution/Locations.h:1904
-msgid "Rocky Mount"
-msgstr ""
+#~ msgid "Bournemouth"
+#~ msgstr "Бърнемот"
 
-#: my-evolution/Locations.h:1905
-msgid "Rodos"
-msgstr "Родос"
+#~ msgid "Bowling Green"
+#~ msgstr "Боулинг Грийн"
 
-#: my-evolution/Locations.h:1906
-msgid "Rogers"
-msgstr "Роджерс"
+#~ msgid "Bozeman"
+#~ msgstr "Боземан"
 
-#: my-evolution/Locations.h:1907
-msgid "Roma/Ciampino"
-msgstr "Рим/Чаимпино"
+#~ msgid "Bradford"
+#~ msgstr "Брадфорт"
 
-#: my-evolution/Locations.h:1908
-msgid "Roma/Fiumicino"
-msgstr "Рим/Фюмичино"
+#~ msgid "Bradshaw Field"
+#~ msgstr "Брадшоу фийлд"
 
-#: my-evolution/Locations.h:1910
-msgid "Roma/Urbe"
-msgstr "Рим/Урбе"
+#~ msgid "Brainerd"
+#~ msgstr "Брейнърд"
 
-#: my-evolution/Locations.h:1911
-msgid "Rome-Russell"
-msgstr ""
+#~ msgid "Brasilia"
+#~ msgstr "Бразилия"
 
-#: my-evolution/Locations.h:1912
-msgid "Ronchi de' Legionari"
-msgstr ""
+#~ msgid "Brasschaat"
+#~ msgstr "Брашат"
 
-#: my-evolution/Locations.h:1913
-msgid "Ronneby"
-msgstr "Ронеби"
+#~ msgid "Bratislava"
+#~ msgstr "Братислава"
 
-#: my-evolution/Locations.h:1914
-msgid "Roosevelt"
-msgstr ""
+#~ msgid "Bratsk"
+#~ msgstr "Братск"
 
-#: my-evolution/Locations.h:1915
-msgid "Roros"
-msgstr "Ророс"
+#~ msgid "Braunschweig"
+#~ msgstr "Брауншвайг"
 
-#: my-evolution/Locations.h:1916
-msgid "Rorvik/Ryum"
-msgstr ""
+#~ msgid "Bremen"
+#~ msgstr "Бремен"
 
-#: my-evolution/Locations.h:1917
-msgid "Rosario"
-msgstr "Росарио"
+#~ msgid "Bremerton"
+#~ msgstr "Бремертън"
 
-#: my-evolution/Locations.h:1918
-msgid "Roseburg"
-msgstr "Росебург"
+#~ msgid "Brest"
+#~ msgstr "Брест"
 
-#: my-evolution/Locations.h:1919
-msgid "Roseglen"
-msgstr "Росеглен"
+#~ msgid "Bridgeport"
+#~ msgstr "Бриджпорт"
 
-#: my-evolution/Locations.h:1920
-msgid "Rost"
-msgstr "Рост"
+#~ msgid "Brindisi"
+#~ msgstr "Бриндизи"
 
-#: my-evolution/Locations.h:1921
-msgid "Rostov-Na-Donu"
-msgstr "Ростов на Дон"
+#~ msgid "Brisbane"
+#~ msgstr "Брисбейн"
 
-#: my-evolution/Locations.h:1922
-msgid "Roswell"
-msgstr "Росвел"
+#~ msgid "Bristol"
+#~ msgstr "Бристол"
 
-#: my-evolution/Locations.h:1923
-msgid "Rotterdam"
-msgstr "Ротердам"
+#~ msgid "British Columbia"
+#~ msgstr "Британска Колумбия"
 
-#: my-evolution/Locations.h:1924
-msgid "Rouen-Valle de Seine"
-msgstr ""
+#~ msgid "Brno"
+#~ msgstr "Бърно"
 
-#: my-evolution/Locations.h:1925
-msgid "Ruidoso-Sierra Blanca"
-msgstr ""
+#~ msgid "Broadus"
+#~ msgstr "Бродъс"
 
-#: my-evolution/Locations.h:1926
-msgid "Rurrenabaque"
-msgstr ""
+#~ msgid "Broken Bow"
+#~ msgstr "Броукън Боу"
 
-#: my-evolution/Locations.h:1927
-msgid "Russell"
-msgstr "Русел"
+#~ msgid "Bronnoysund"
+#~ msgstr "Бронойсунд"
 
-#: my-evolution/Locations.h:1928
-msgid "Russia"
-msgstr "Русия"
+#~ msgid "Brookings"
+#~ msgstr "Брукингс"
 
-#: my-evolution/Locations.h:1929
-msgid "Rutland"
-msgstr ""
+#~ msgid "Brooksville"
+#~ msgstr "Бруксвил"
 
-#: my-evolution/Locations.h:1930
-msgid "Rygge"
-msgstr ""
+#~ msgid "Broome"
+#~ msgstr "Бруме"
 
-#: my-evolution/Locations.h:1931
-msgid "Rzeszow"
-msgstr ""
+#~ msgid "Brownsville"
+#~ msgstr "Бронсвил"
 
-#: my-evolution/Locations.h:1932
-msgid "Saarbrucken"
-msgstr "Саарбрюкен"
+#~ msgid "Brunswick"
+#~ msgstr "Брунсуик"
 
-#: my-evolution/Locations.h:1933
-msgid "Sabine Pass"
-msgstr ""
+#~ msgid "Brussels-National Airport"
+#~ msgstr "Брюксел Национално летище"
 
-#: my-evolution/Locations.h:1934
-msgid "Sacramento"
-msgstr "Сакременто"
+#~ msgid "Bryansk"
+#~ msgstr "Брянск"
 
-#: my-evolution/Locations.h:1935
-msgid "Sacramento-Woodland"
-msgstr ""
+#~ msgid "Bryce Canyon"
+#~ msgstr "Брайс Кениън"
 
-#: my-evolution/Locations.h:1936
-msgid "Safford-Municipal Airport"
-msgstr ""
+#~ msgid "Bucaramanga/Palonegro"
+#~ msgstr "Букараманга/Палонегро"
 
-#: my-evolution/Locations.h:1937
-msgid "Saginaw"
-msgstr ""
+#~ msgid "Bucuresti"
+#~ msgstr "Букурещ"
 
-#: my-evolution/Locations.h:1938
-msgid "Saint Anthony"
-msgstr ""
+#~ msgid "Bucuresti-Otopeni"
+#~ msgstr "Букурещ-Отопени"
 
-#: my-evolution/Locations.h:1939
-msgid "Saint-Brieuc-Armor"
-msgstr ""
+#~ msgid "Budapest"
+#~ msgstr "Будапеща"
 
-#: my-evolution/Locations.h:1940
-msgid "Saint-Dizier-Robinson"
-msgstr ""
+#~ msgid "Buffalo"
+#~ msgstr "Буфало"
 
-#: my-evolution/Locations.h:1941
-msgid "Saint-Etienne-Boutheon"
-msgstr ""
+#~ msgid "Bullfrog"
+#~ msgstr "Булфрог"
 
-#: my-evolution/Locations.h:1942
-msgid "Saint Mary's"
-msgstr ""
+#~ msgid "Burbank"
+#~ msgstr "Бурбанк"
 
-#: my-evolution/Locations.h:1943
-msgid "Saint Mawgan"
-msgstr ""
+#~ msgid "Burgas"
+#~ msgstr "Бургас"
 
-#: my-evolution/Locations.h:1944
-msgid "Saint-Nazaire-Montoir"
-msgstr ""
+#~ msgid "Burley"
+#~ msgstr "Бурлей"
 
-#: my-evolution/Locations.h:1945
-msgid "Saint Paul"
-msgstr ""
+#~ msgid "Burlington"
+#~ msgstr "Бърлингтън"
 
-#: my-evolution/Locations.h:1946
-msgid "Saiq"
-msgstr ""
+#~ msgid "Burnet"
+#~ msgstr "Бурнет"
 
-#: my-evolution/Locations.h:1947
-msgid "Salalah"
-msgstr ""
+#~ msgid "Burns"
+#~ msgstr "Бърнс"
 
-#: my-evolution/Locations.h:1948
-msgid "Salem"
-msgstr "Салем"
+#~ msgid "Bursa"
+#~ msgstr "Бурса"
 
-#: my-evolution/Locations.h:1949
-msgid "Salida"
-msgstr "Салида"
+#~ msgid "Burwell"
+#~ msgstr "Бъруел"
 
-#: my-evolution/Locations.h:1950
-msgid "Salida-Harriet"
-msgstr ""
+#~ msgid "Butte"
+#~ msgstr "Бът"
 
-#: my-evolution/Locations.h:1951
-msgid "Salina"
-msgstr "Салина"
+#~ msgid "Caen-Carpiquet"
+#~ msgstr "Каен-Карпик"
 
-#: my-evolution/Locations.h:1952
-msgid "Salinas"
-msgstr "Салинас"
+#~ msgid "Cagliari"
+#~ msgstr "Каляри"
 
-#: my-evolution/Locations.h:1953
-msgid "Salisbury"
-msgstr ""
+#~ msgid "Cairns"
+#~ msgstr "Кеърнс"
 
-#: my-evolution/Locations.h:1954
-msgid "Salmon"
-msgstr "Салмон"
+#~ msgid "Cairo"
+#~ msgstr "Кайро"
 
-#: my-evolution/Locations.h:1955
-msgid "Salmon (2)"
-msgstr "Салмон (2)"
+#~ msgid "Calabozo"
+#~ msgstr "Калабозо"
 
-#: my-evolution/Locations.h:1956
-msgid "Salta"
-msgstr "Салта"
+#~ msgid "Calcutta/Dum Dum"
+#~ msgstr "Калкута"
 
-#: my-evolution/Locations.h:1957
-msgid "Saltillo"
-msgstr ""
+#~ msgid "Caldwell"
+#~ msgstr "Колдуел"
 
-#: my-evolution/Locations.h:1958
-msgid "Salt Lake City"
-msgstr "Солт Лейк Сити"
+#~ msgid "Calgary"
+#~ msgstr "Калгари"
 
-#: my-evolution/Locations.h:1959
-msgid "Salto"
-msgstr "Салто"
+#~ msgid "Cali/Alfonso Bonillaaragon"
+#~ msgstr "Кали/Алфонсо Бониларгон"
 
-#: my-evolution/Locations.h:1960
-msgid "Salt point"
-msgstr ""
+#~ msgid "Caliente"
+#~ msgstr "Калиенте"
 
-#: my-evolution/Locations.h:1961
-msgid "Salvador"
-msgstr "Славадор"
+#~ msgid "California"
+#~ msgstr "Калифорния"
 
-#: my-evolution/Locations.h:1962
-msgid "Salzburg"
-msgstr "Залцбург"
+#~ msgid "Calvi-Ste-Catherine"
+#~ msgstr "Калви-Катерин"
 
-#: my-evolution/Locations.h:1963
-msgid "Samara"
-msgstr "Самара"
+#~ msgid "Camaguey"
+#~ msgstr "Камагуа"
 
-#: my-evolution/Locations.h:1964
-msgid "Samos"
-msgstr "Самос"
+#~ msgid "Camarillo"
+#~ msgstr "Камарило"
 
-#: my-evolution/Locations.h:1965
-msgid "Samsun"
-msgstr "Самсун"
+#~ msgid "Cambridge"
+#~ msgstr "Кембридж"
 
-#: my-evolution/Locations.h:1966
-msgid "Sana'A"
-msgstr ""
+#~ msgid "Cameron"
+#~ msgstr "Камерун"
 
-#: my-evolution/Locations.h:1967
-msgid "San Andres Isla/Sesquicentenario"
-msgstr ""
+#~ msgid "Camiri"
+#~ msgstr "Камири"
 
-#: my-evolution/Locations.h:1968
-msgid "San Angelo"
-msgstr "Сан Анжело"
+#~ msgid "Campeche"
+#~ msgstr "Кампече"
 
-#: my-evolution/Locations.h:1969
-msgid "San Antonio"
-msgstr "Сан Антонио"
+#~ msgid "Campinas"
+#~ msgstr "Кампинас"
 
-#: my-evolution/Locations.h:1970
-msgid "San Antonio Del Tachira"
-msgstr ""
+#~ msgid "Campo"
+#~ msgstr "Кампо"
 
-#: my-evolution/Locations.h:1971
-msgid "San Antonio-Kelly AFB"
-msgstr ""
+#~ msgid "Campo Grande"
+#~ msgstr "Кампо Гранде"
 
-#: my-evolution/Locations.h:1972
-msgid "San Antonio-Stinson"
-msgstr ""
+#~ msgid "Camp Stanley/H-207"
+#~ msgstr "Кемп Стенли/H-207"
 
-#: my-evolution/Locations.h:1973
-msgid "San Carlos"
-msgstr "Сан Карлос"
+#~ msgid "Canaan"
+#~ msgstr "Канан"
 
-#: my-evolution/Locations.h:1974
-msgid "Sandane"
-msgstr ""
+#~ msgid "Canarias/Fuerteventura"
+#~ msgstr "Канрски/Фуертевентура"
 
-#: my-evolution/Locations.h:1975
-msgid "Sandberg"
-msgstr "Санберг"
+#~ msgid "Canarias/Gran Canaria"
+#~ msgstr "Канарски/Гранд Канари"
 
-#: my-evolution/Locations.h:1976
-msgid "Sanderson"
-msgstr "Сандерсон"
+#~ msgid "Canarias/Hierro"
+#~ msgstr "Канари/Хиеро"
 
-#: my-evolution/Locations.h:1977
-msgid "San Diego"
-msgstr "Сан Диего"
+#~ msgid "Canarias/Lanzarote"
+#~ msgstr "Канари/Ланзароте"
 
-#: my-evolution/Locations.h:1978
-msgid "San Diego-Brown"
-msgstr ""
+#~ msgid "Canarias/La Palma"
+#~ msgstr "Канари/Ла Палма"
 
-#: my-evolution/Locations.h:1979
-msgid "San Diego-Miramar"
-msgstr "Сан Диего - Мирамар"
+#~ msgid "Canarias/Tenerife Norte"
+#~ msgstr "Канари/Тенариф Норте"
 
-#: my-evolution/Locations.h:1980
-msgid "San Diego-Montgomery"
-msgstr "Сан Диего - Монгомери"
+#~ msgid "Canarias/Tenerife Sur"
+#~ msgstr "Канари/Тенерифе Сур"
 
-#: my-evolution/Locations.h:1981
-msgid "San Diego-North Island"
-msgstr ""
+#~ msgid "Canberra"
+#~ msgstr "Канбера"
 
-#: my-evolution/Locations.h:1982
-msgid "San Diego-Santee"
-msgstr ""
+#~ msgid "Cancun"
+#~ msgstr "Канкун"
 
-#: my-evolution/Locations.h:1983
-msgid "Sandnessjoen/Stokka"
-msgstr ""
+#~ msgid "Cannes-Mandelieu"
+#~ msgstr "Кан-Мандельо"
 
-#: my-evolution/Locations.h:1984
-msgid "Sand Point"
-msgstr ""
+#~ msgid "Cantwell"
+#~ msgstr "Кантуел"
 
-#: my-evolution/Locations.h:1985
-msgid "San Fernando De Apure"
-msgstr ""
+#~ msgid "Cape Girardeau"
+#~ msgstr "Кейп Жирардо"
 
-#: my-evolution/Locations.h:1986
-msgid "Sanford"
-msgstr "Санфорд"
+#~ msgid "Cape Hatteras"
+#~ msgstr "Кейп Хатерас"
 
-#: my-evolution/Locations.h:1987
-msgid "San Francisco"
-msgstr "Сан Франциско"
+#~ msgid "Cape Lisburne"
+#~ msgstr "Кейп Лисбърн"
 
-#: my-evolution/Locations.h:1988
-msgid "Sangju"
-msgstr ""
+#~ msgid "Cape Newenham"
+#~ msgstr "Кейп Нюенхам"
 
-#: my-evolution/Locations.h:1989
-msgid "San Ignacio De Velasco"
-msgstr ""
+#~ msgid "Cape Romanzoff"
+#~ msgstr "Кейп Романцов"
 
-#: my-evolution/Locations.h:1990
-msgid "San Joaquin"
-msgstr ""
+#~ msgid "Cape Town D. F. Malan "
+#~ msgstr "Кейп Таун Д.Ф. Малан"
 
-#: my-evolution/Locations.h:1991
-msgid "San Jose"
-msgstr ""
+#~ msgid "Capitan Corbeta"
+#~ msgstr "Капитан Корбета"
 
-#: my-evolution/Locations.h:1992
-msgid "San Jose De Chiquitos"
-msgstr ""
+#~ msgid "Capo Mele"
+#~ msgstr "Капо Меле"
 
-#: my-evolution/Locations.h:1993
-msgid "San Jose del Cabo"
-msgstr ""
+#~ msgid "Caracas La Carlota"
+#~ msgstr "Каракас Ла Карлота"
 
-#: my-evolution/Locations.h:1994
-msgid "San Jose-Santa Clara"
-msgstr ""
+#~ msgid "Caracas Maiquetia"
+#~ msgstr "Каракас Маикетя"
 
-#: my-evolution/Locations.h:1995
-msgid "San Juan"
-msgstr ""
+#~ msgid "Caravelas"
+#~ msgstr "Каравелас"
 
-#: my-evolution/Locations.h:1996
-msgid "Sankt-Peterburg"
-msgstr "Санк-Петербург"
+#~ msgid "Carbondale"
+#~ msgstr "Карбъндейл"
 
-#: my-evolution/Locations.h:1997
-msgid "Sanliurfa"
-msgstr ""
+#~ msgid "Cardiff"
+#~ msgstr "Кардиф"
 
-#: my-evolution/Locations.h:1998
-msgid "San Luis Obispo"
-msgstr ""
+#~ msgid "Caribou"
+#~ msgstr "Карибу"
 
-#: my-evolution/Locations.h:1999
-msgid "San Luis Potosi"
-msgstr ""
+#~ msgid "Carlisle"
+#~ msgstr "Карлайл"
 
-#: my-evolution/Locations.h:2000
-msgid "San Miguel"
-msgstr "Сан Мигел"
+#~ msgid "Carlsbad"
+#~ msgstr "Карсбад"
 
-#: my-evolution/Locations.h:2001
-msgid "San Nicholas Island"
-msgstr ""
+#~ msgid "Carroll"
+#~ msgstr "Карол"
 
-#: my-evolution/Locations.h:2002
-msgid "San Salvador"
-msgstr "Сан Славадор"
+#~ msgid "Cartagena/Rafael Nunez"
+#~ msgstr "Картаген/Рафаел Нунез"
 
-#: my-evolution/Locations.h:2003
-msgid "San Sebastian"
-msgstr "Сан Себастиян"
+#~ msgid "Casa Granda"
+#~ msgstr "Каса Гранда"
 
-#: my-evolution/Locations.h:2004
-msgid "Santa Ana"
-msgstr "Санта Ана"
+#~ msgid "Cascade"
+#~ msgstr "Каскейд"
 
-#: my-evolution/Locations.h:2005
-msgid "Santa Barbara"
-msgstr "Санта Барбара"
+#~ msgid "Casper"
+#~ msgstr "Каспер"
 
-#: my-evolution/Locations.h:2006
-msgid "Santa Cruz"
-msgstr "Санта Круз"
+#~ msgid "Catacamas"
+#~ msgstr "Катакамас"
 
-#: my-evolution/Locations.h:2007
-msgid "Santa Fe"
-msgstr "Санта Фе"
+#~ msgid "Catania"
+#~ msgstr "Катаниа"
 
-#: my-evolution/Locations.h:2008
-msgid "Santa Maria"
-msgstr "Санта Мария"
+#~ msgid "Cayo Largo del Sur"
+#~ msgstr "Кайо Ларго дел Сур"
 
-#: my-evolution/Locations.h:2009
-msgid "Santa Marta/Simon Bolivar"
-msgstr ""
+#~ msgid "Cazaux"
+#~ msgstr "Казо"
 
-#: my-evolution/Locations.h:2010
-msgid "Santa Monica"
-msgstr "Санат Моника"
+#~ msgid "Cecil NAS"
+#~ msgstr "ВМБ Сесил"
 
-#: my-evolution/Locations.h:2011
-msgid "Santander"
-msgstr "Сантандер"
+#~ msgid "Cedar City"
+#~ msgstr "Сидър Сити"
 
-#: my-evolution/Locations.h:2012
-msgid "Santarem"
-msgstr "Сантарем"
+#~ msgid "Cedar Rapids"
+#~ msgstr "Сидър Рапидс"
 
-#: my-evolution/Locations.h:2013
-msgid "Santa Rosa"
-msgstr "Санта Роса"
+#~ msgid "Central and South America"
+#~ msgstr "Центална и Южна Америка"
 
-#: my-evolution/Locations.h:2014
-msgid "Santa Rosa de Copan"
-msgstr ""
+#~ msgid "Cervia"
+#~ msgstr "Сервиа"
 
-#: my-evolution/Locations.h:2015
-msgid "Santiago"
-msgstr "Сантяго"
+#~ msgid "Chacarita"
+#~ msgstr "Чакарита"
 
-#: my-evolution/Locations.h:2016
-msgid "Santiago de Cuba"
-msgstr "Сантяго де Куба"
+#~ msgid "Chadron"
+#~ msgstr "Шадрон"
 
-#: my-evolution/Locations.h:2017
-msgid "Santiago Del Estero"
-msgstr ""
+#~ msgid "Challis"
+#~ msgstr "Чалис"
 
-#: my-evolution/Locations.h:2018
-msgid "Santorini"
-msgstr "Санторини"
+#~ msgid "Chamberlain"
+#~ msgstr "Чембърлейн"
 
-#: my-evolution/Locations.h:2019
-msgid "Santos"
-msgstr "Сантос"
+#~ msgid "Chambery"
+#~ msgstr "Чамбери"
 
-#: my-evolution/Locations.h:2020
-msgid "Sao Jose Dos Campo"
-msgstr ""
+#~ msgid "Champaign"
+#~ msgstr "Шампейн"
 
-#: my-evolution/Locations.h:2021
-msgid "Sao Luiz"
-msgstr ""
+#~ msgid "Chandalar Lake"
+#~ msgstr "Чандлар Лейк"
 
-#: my-evolution/Locations.h:2022
-msgid "Sao Paulo"
-msgstr "Сао Паоло"
+#~ msgid "Chandler"
+#~ msgstr "Чандлър"
 
-#: my-evolution/Locations.h:2023
-msgid "Sapporo Ab"
-msgstr ""
+#~ msgid "Chania"
+#~ msgstr "Чаниа"
 
-#: my-evolution/Locations.h:2024
-msgid "Sarajevo"
-msgstr "Сараево"
+#~ msgid "Chanute"
+#~ msgstr "Шанут"
 
-#: my-evolution/Locations.h:2025
-msgid "Saranac Lake"
-msgstr ""
+#~ msgid "Chariton"
+#~ msgstr "Чаритън"
 
-#: my-evolution/Locations.h:2026
-msgid "Sarasota"
-msgstr "Сарасота"
+#~ msgid "Charleroi-Brussels South"
+#~ msgstr "Шарлероа-Брюксел Юг"
 
-#: my-evolution/Locations.h:2027
-msgid "Saratov"
-msgstr "Саратов"
+#~ msgid "Charles City"
+#~ msgstr "Шарл Сити"
 
-#: my-evolution/Locations.h:2028
-msgid "Sarzana"
-msgstr ""
+#~ msgid "Charleston"
+#~ msgstr "Чарлстън"
 
-#: my-evolution/Locations.h:2029
-msgid "Saskatchewan"
-msgstr ""
+#~ msgid "Charlotte"
+#~ msgstr "Шарлът"
 
-#: my-evolution/Locations.h:2030
-msgid "Saskatoon"
-msgstr ""
+#~ msgid "Charlottesville"
+#~ msgstr "Шарлътсвил"
 
-#: my-evolution/Locations.h:2031
-msgid "Sauce Viejo"
-msgstr ""
+#~ msgid "Chatham"
+#~ msgstr "Чатъм"
 
-#: my-evolution/Locations.h:2033
-msgid "Sault Ste Marie"
-msgstr ""
+#~ msgid "Chattanooga"
+#~ msgstr "Чатануга"
 
-#: my-evolution/Locations.h:2034
-msgid "Savannah"
-msgstr ""
+#~ msgid "Cheboksary"
+#~ msgstr "Чебоксари"
 
-#: my-evolution/Locations.h:2035
-msgid "Savannah-Hunter AAF"
-msgstr ""
+#~ msgid "Cheju"
+#~ msgstr "Чежу"
 
-#: my-evolution/Locations.h:2036
-msgid "Sawyer AFB"
-msgstr ""
+#~ msgid "Chelyabinsk"
+#~ msgstr "Челябинск"
 
-#: my-evolution/Locations.h:2037
-msgid "Sayun"
-msgstr ""
+#~ msgid "Chengdu"
+#~ msgstr "Ченду"
 
-#: my-evolution/Locations.h:2038
-msgid "Scatsta"
-msgstr ""
+#~ msgid "Cherbourg"
+#~ msgstr "Шербург"
 
-#: my-evolution/Locations.h:2039
-msgid "Schaffen"
-msgstr ""
+#~ msgid "Cherry Point"
+#~ msgstr "Чери Поинт"
 
-#: my-evolution/Locations.h:2040
-msgid "Schenectady"
-msgstr ""
+#~ msgid "Chetumal"
+#~ msgstr "Шетумал"
 
-#: my-evolution/Locations.h:2041
-msgid "Scilly Isles"
-msgstr ""
+#~ msgid "Cheyenne"
+#~ msgstr "Чейен"
 
-#: my-evolution/Locations.h:2042
-msgid "Scottsbluff"
-msgstr ""
+#~ msgid "Chiang Kai Shek"
+#~ msgstr "Чанг Каи Шек"
 
-#: my-evolution/Locations.h:2043
-msgid "Scottsdale"
-msgstr ""
+#~ msgid "Chia Tung"
+#~ msgstr "Чиа Тунг"
 
-#: my-evolution/Locations.h:2044
-msgid "Scranton"
-msgstr ""
+#~ msgid "Chiayi"
+#~ msgstr "Чиаюи"
 
-#: my-evolution/Locations.h:2045
-msgid "Seattle"
-msgstr "Сиатъл"
+#~ msgid "Chicago-DuPage"
+#~ msgstr "Чикаго-ДюПейдж"
 
-#: my-evolution/Locations.h:2046
-msgid "Seattle-Boeing"
-msgstr ""
+#~ msgid "Chicago-Lakefront"
+#~ msgstr "Чикаго=Лейкфронт"
 
-#: my-evolution/Locations.h:2047
-msgid "Sedalia"
-msgstr "Седалия"
+#~ msgid "Chicago-Midway"
+#~ msgstr "Чикаго-Мидуей"
 
-#: my-evolution/Locations.h:2048
-msgid "Seeb"
-msgstr ""
+#~ msgid "Chicago-O'Hare"
+#~ msgstr "Чикаго-О'Хеър"
 
-#: my-evolution/Locations.h:2049
-msgid "Selanik"
-msgstr "Селаник"
+#~ msgid "Chichijima"
+#~ msgstr "Чичиджима"
 
-#: my-evolution/Locations.h:2050
-msgid "Sendai Airport"
-msgstr ""
+#~ msgid "Chiclayo"
+#~ msgstr "Чиклиайо"
 
-#: my-evolution/Locations.h:2051
-msgid "Seoul E Ab"
-msgstr ""
+#~ msgid "Chico"
+#~ msgstr "Чико"
 
-#: my-evolution/Locations.h:2052
-msgid "Seoul/Kimp'O International Airport"
-msgstr "Международно летище Сеул"
+#~ msgid "Chicopee Falls"
+#~ msgstr "Чикъпи Фолс"
 
-#: my-evolution/Locations.h:2053
-msgid "Seoul/Yongdungp'O Rokaf Wc"
-msgstr ""
+#~ msgid "Chievres"
+#~ msgstr "Шевре"
 
-#: my-evolution/Locations.h:2054
-msgid "Sept-Iles"
-msgstr ""
+#~ msgid "Chihhang"
+#~ msgstr "Чихан"
 
-#: my-evolution/Locations.h:2055
-msgid "Seul Choix Pt"
-msgstr ""
+#~ msgid "Chihuahua"
+#~ msgstr "Чихуахуа"
 
-#: my-evolution/Locations.h:2056
-msgid "Sevilla"
-msgstr "Севилия"
+#~ msgid "Childress"
+#~ msgstr "Чилдрес"
 
-#: my-evolution/Locations.h:2057
-msgid "Seward"
-msgstr ""
+#~ msgid "China Lake"
+#~ msgstr "Чайна Лейк"
 
-#: my-evolution/Locations.h:2058
-msgid "Sexton Summit"
-msgstr ""
+#~ msgid "Chinandega"
+#~ msgstr "Чинандега"
 
-#: my-evolution/Locations.h:2059
-msgid "Shanghai"
-msgstr "Шанхай"
+#~ msgid "Chinmem/Shatou"
+#~ msgstr "Чинмем/Шату"
 
-#: my-evolution/Locations.h:2060
-msgid "Shannon"
-msgstr "Шанон"
+#~ msgid "Chino"
+#~ msgstr "Чино"
 
-#: my-evolution/Locations.h:2061
-msgid "Sharjah"
-msgstr ""
+#~ msgid "Chippewa County"
+#~ msgstr "Чипеуа Каунти"
 
-#: my-evolution/Locations.h:2062
-msgid "Sharm El Sheikhintl"
-msgstr ""
+#~ msgid "Chita"
+#~ msgstr "Чита"
 
-#: my-evolution/Locations.h:2063
-msgid "Sharurah"
-msgstr ""
+#~ msgid "Chitose Ab"
+#~ msgstr "ВБ Читоуз"
 
-#: my-evolution/Locations.h:2064
-msgid "Shawbury"
-msgstr ""
+#~ msgid "Chitose ASDF"
+#~ msgstr "Читоуз ВСБ"
 
-#: my-evolution/Locations.h:2065
-msgid "Shearwater"
-msgstr ""
+#~ msgid "Chofu Airport"
+#~ msgstr "Летище Чофу"
 
-#: my-evolution/Locations.h:2066
-msgid "Sheboygan"
-msgstr ""
+#~ msgid "Choluteca"
+#~ msgstr "Чолутека"
 
-#: my-evolution/Locations.h:2067
-msgid "Sheldon"
-msgstr ""
+#~ msgid "Chongju Ab"
+#~ msgstr "ВБ Чонгджи"
 
-#: my-evolution/Locations.h:2068
-msgid "Shelter Cove"
-msgstr ""
+#~ msgid "Christchurch"
+#~ msgstr "Крайстчърч"
 
-#: my-evolution/Locations.h:2069
-msgid "Shelton"
-msgstr "Шелтън"
+#~ msgid "Chulitna"
+#~ msgstr "Чулитна"
 
-#: my-evolution/Locations.h:2070
-msgid "Shenandoah"
-msgstr ""
+#~ msgid "Churchill"
+#~ msgstr "Чърчил"
 
-#: my-evolution/Locations.h:2071
-msgid "Sheridan"
-msgstr "Шеридан"
+#~ msgid "Churchill Falls"
+#~ msgstr "Чърчил Фолс"
 
-#: my-evolution/Locations.h:2072
-msgid "Sherman-Denison"
-msgstr ""
+#~ msgid "Cincinnati"
+#~ msgstr "Синсинати"
 
-#: my-evolution/Locations.h:2073
-msgid "Shimofusa Ab"
-msgstr ""
+#~ msgid "Circle City"
+#~ msgstr "Съркъл Сити"
 
-#: my-evolution/Locations.h:2074
-msgid "Shingle Point"
-msgstr ""
+#~ msgid "Ciudad Bolivar"
+#~ msgstr "Сюдад Боливар"
 
-#: my-evolution/Locations.h:2075
-msgid "Shiraz"
-msgstr "Шираз"
+#~ msgid "Ciudad del Carmen"
+#~ msgstr "Сюдад дел Кармен"
 
-#: my-evolution/Locations.h:2076
-msgid "Shishmaref"
-msgstr ""
+#~ msgid "Ciudad Juarez"
+#~ msgstr "Сюдад Хуарез"
 
-#: my-evolution/Locations.h:2077
-msgid "Shizuhama Ab"
-msgstr ""
+#~ msgid "Ciudad Obregon"
+#~ msgstr "Сюдад Обрегон"
 
-#: my-evolution/Locations.h:2078
-msgid "Shoreham"
-msgstr "Шорехам"
+#~ msgid "Ciudad Victoria"
+#~ msgstr "Сюдад Викториа"
 
-#: my-evolution/Locations.h:2079
-msgid "Show Low"
-msgstr "Покажи Долу"
+#~ msgid "Clarinda"
+#~ msgstr "Кларинда"
 
-#: my-evolution/Locations.h:2080
-msgid "Shreveport Downtown"
-msgstr ""
+#~ msgid "Clarion"
+#~ msgstr "Кларион"
 
-#: my-evolution/Locations.h:2081
-msgid "Shreveport Regional"
-msgstr ""
+#~ msgid "Clarksburg"
+#~ msgstr "Кларксбърг"
 
-#: my-evolution/Locations.h:2082
-msgid "Sidney"
-msgstr "Сидней"
+#~ msgid "Clayton"
+#~ msgstr "Клейтън"
 
-#: my-evolution/Locations.h:2083
-msgid "Sigonella"
-msgstr "Сигонела"
+#~ msgid "Clayton Lake"
+#~ msgstr "Клейтън Лейк"
 
-#: my-evolution/Locations.h:2084
-msgid "Siloam Springs"
-msgstr ""
+#~ msgid "Clermont-Ferrand"
+#~ msgstr "Клермон Феранд"
 
-#: my-evolution/Locations.h:2085
-msgid "Silver City"
-msgstr ""
+#~ msgid "Cleveland"
+#~ msgstr "Кливлънд"
 
-#: my-evolution/Locations.h:2086
-msgid "Sindal"
-msgstr "Синдал"
+#~ msgid "Cleveland/Cuyahoga"
+#~ msgstr "Кливлънд/Каяхога"
 
-#: my-evolution/Locations.h:2088
-msgid "Sioux City"
-msgstr ""
+#~ msgid "Cleveland-Lakefront"
+#~ msgstr "Кливлънд-Лейкфронт"
 
-#: my-evolution/Locations.h:2089
-msgid "Sioux Falls"
-msgstr ""
+#~ msgid "Clinton"
+#~ msgstr "Клинън"
 
-#: my-evolution/Locations.h:2090
-msgid "Sitka"
-msgstr "Ситка"
+#~ msgid "Clovis-Cannon AFB"
+#~ msgstr "ВВБ Кловис-Кенън"
 
-#: my-evolution/Locations.h:2091
-msgid "Sivas"
-msgstr "Сивас"
+#~ msgid "Cobija"
+#~ msgstr "Кобия"
 
-#: my-evolution/Locations.h:2092
-msgid "Sivrihisar"
-msgstr ""
+#~ msgid "Cochabamba"
+#~ msgstr "Кочабамба"
 
-#: my-evolution/Locations.h:2093
-msgid "Skagway"
-msgstr ""
+#~ msgid "Cocoa Beach"
+#~ msgstr "Кокоа Бийч"
 
-#: my-evolution/Locations.h:2094
-msgid "Skiathos"
-msgstr ""
+#~ msgid "Cocos Island"
+#~ msgstr "Кокосов остров"
 
-#: my-evolution/Locations.h:2095
-msgid "Skien/Geiteryggen"
-msgstr ""
+#~ msgid "Cody"
+#~ msgstr "Коуди"
 
-#: my-evolution/Locations.h:2096
-msgid "Skive"
-msgstr ""
+#~ msgid "Coeur d'Alene"
+#~ msgstr "Кор д'Ален"
 
-#: my-evolution/Locations.h:2097
-msgid "Skopje"
-msgstr "Скопие"
+#~ msgid "Cold Bay"
+#~ msgstr "Колд Бей"
 
-#: my-evolution/Locations.h:2098
-msgid "Skwentna"
-msgstr ""
+#~ msgid "Colima"
+#~ msgstr "Колима"
 
-#: my-evolution/Locations.h:2099
-msgid "Slana"
-msgstr ""
+#~ msgid "College Station"
+#~ msgstr "Колидж Стейшън"
 
-#: my-evolution/Locations.h:2102
-msgid "Smithers"
-msgstr ""
+#~ msgid "Colmar-Meyenheim"
+#~ msgstr "Колмар-Майнхайм"
 
-#: my-evolution/Locations.h:2103
-msgid "Smyrna"
-msgstr "Смирна"
+#~ msgid "Colonia"
+#~ msgstr "Колония"
 
-#: my-evolution/Locations.h:2104
-msgid "Snowshoe Lake"
-msgstr ""
+#~ msgid "Colorado Springs"
+#~ msgstr "Колорадо Спрингс"
 
-#: my-evolution/Locations.h:2105
-msgid "Sochi"
-msgstr "Сочи"
+#~ msgid "Columbia"
+#~ msgstr "Колумбия"
 
-#: my-evolution/Locations.h:2106
-msgid "Socorro"
-msgstr "Сокоро"
+#~ msgid "Columbia-McEntire"
+#~ msgstr "Колумбия-Макинтайър"
 
-#: my-evolution/Locations.h:2107
-msgid "Socotra"
-msgstr "Сокотра"
+#~ msgid "Columbus"
+#~ msgstr "Кълъмбъс"
 
-#: my-evolution/Locations.h:2108
-msgid "Soda Springs"
-msgstr ""
+#~ msgid "Columbus-Fort Benning"
+#~ msgstr "Кълъмбъс-Форт Бенинг"
 
-#: my-evolution/Locations.h:2109
-msgid "Sofia"
-msgstr "София"
+#~ msgid "Columbus-Gahanna"
+#~ msgstr "Кълъмбъс-Гахана"
 
-#: my-evolution/Locations.h:2110
-msgid "Sogndal"
-msgstr ""
+#~ msgid "Columbus-OSU"
+#~ msgstr "Кълъмбъс-OSU"
 
-#: my-evolution/Locations.h:2111
-msgid "Soldotna"
-msgstr ""
+#~ msgid "Columbus-W Point-Starkville"
+#~ msgstr "Кълъмбъс-У Поинт-Старквил"
 
-#: my-evolution/Locations.h:2112
-msgid "Somerset"
-msgstr ""
+#~ msgid "Colville"
+#~ msgstr "Колвил"
 
-#: my-evolution/Locations.h:2113
-msgid "Sonderborg"
-msgstr ""
+#~ msgid "Comodoro Rivadavia"
+#~ msgstr "Комодоро Ривадавиа"
 
-#: my-evolution/Locations.h:2114
-msgid "Songmu Ab"
-msgstr ""
+#~ msgid "Comox"
+#~ msgstr "Комокс"
 
-#: my-evolution/Locations.h:2115
-msgid "Sorkjosen"
-msgstr ""
+#~ msgid "Conceicao Do Araguaia"
+#~ msgstr "Консейсао До Арагуая"
 
-#: my-evolution/Locations.h:2117
-msgid "Southampton"
-msgstr ""
+#~ msgid "Concepcion"
+#~ msgstr "Концепсион"
 
-#: my-evolution/Locations.h:2118
-msgid "South Bend"
-msgstr ""
+#~ msgid "Concord"
+#~ msgstr "Конкорд"
 
-#: my-evolution/Locations.h:2119
-msgid "South Carolina"
-msgstr "Южна Каролина"
+#~ msgid "Concordia"
+#~ msgstr "Конкордия"
 
-#: my-evolution/Locations.h:2120
-msgid "South Dakota"
-msgstr "Южна Дакота"
+#~ msgid "Connaught"
+#~ msgstr "Конот"
 
-#: my-evolution/Locations.h:2121
-msgid "Southend"
-msgstr ""
+#~ msgid "Connecticut"
+#~ msgstr "Кънектикът"
 
-#: my-evolution/Locations.h:2122
-msgid "South Marsh Island"
-msgstr ""
+#~ msgid "Conroe"
+#~ msgstr "Конроу"
 
-#: my-evolution/Locations.h:2123
-msgid "South Timbalier"
-msgstr ""
+#~ msgid "Copper Harbor"
+#~ msgstr "Копър Харбър"
 
-#: my-evolution/Locations.h:2125
-msgid "Sparrevohn"
-msgstr ""
+#~ msgid "Cordoba"
+#~ msgstr "Кордоба"
 
-#: my-evolution/Locations.h:2126
-msgid "Spencer"
-msgstr "Спенсър"
+#~ msgid "Cordova"
+#~ msgstr "Кордова"
 
-#: my-evolution/Locations.h:2127
-msgid "Spickard"
-msgstr ""
+#~ msgid "Cork"
+#~ msgstr "Корк"
 
-#: my-evolution/Locations.h:2128
-msgid "Split"
-msgstr "Сполит"
+#~ msgid "Coro"
+#~ msgstr "Коро"
 
-#: my-evolution/Locations.h:2129
-msgid "Spokane"
-msgstr ""
+#~ msgid "Corona"
+#~ msgstr "Корона"
 
-#: my-evolution/Locations.h:2130
-msgid "Spokane-Parkwater"
-msgstr ""
+#~ msgid "Corpus Christi"
+#~ msgstr "Корпус Кристи"
 
-#: my-evolution/Locations.h:2131
-msgid "Springbok"
-msgstr ""
+#~ msgid "Corpus Christi NAS"
+#~ msgstr "ВВБ Корпус Кристи"
 
-#: my-evolution/Locations.h:2132
-msgid "Springfield"
-msgstr "Спрингфийлд"
+#~ msgid "Corrientes"
+#~ msgstr "Кориентес"
 
-#: my-evolution/Locations.h:2133
-msgid "Stampede Pass"
-msgstr ""
+#~ msgid "Corsicana"
+#~ msgstr "Корсикана"
 
-#: my-evolution/Locations.h:2134
-msgid "State College"
-msgstr ""
+#~ msgid "Cortez"
+#~ msgstr "Кортез"
 
-#: my-evolution/Locations.h:2135
-msgid "Stauning"
-msgstr ""
+#~ msgid "Corumba"
+#~ msgstr "Корумба"
 
-#: my-evolution/Locations.h:2136
-msgid "Staunton"
-msgstr ""
+#~ msgid "Cotulla"
+#~ msgstr "Котула"
 
-#: my-evolution/Locations.h:2137
-msgid "Stavanger/Sola"
-msgstr "Ставангер/Сола"
+#~ msgid "Council Bluffs"
+#~ msgstr "Каунсил Блъфс"
 
-#: my-evolution/Locations.h:2138
-msgid "Staverton"
-msgstr ""
+#~ msgid "Coventry"
+#~ msgstr "Ковънтри"
 
-#: my-evolution/Locations.h:2139
-msgid "Stavropol"
-msgstr "Ставропол"
+#~ msgid "Covington"
+#~ msgstr "Ковингтън"
 
-#: my-evolution/Locations.h:2140
-msgid "St Cloud"
-msgstr ""
+#~ msgid "Cozumel"
+#~ msgstr "Козумел"
 
-#: my-evolution/Locations.h:2141
-msgid "Steamboat Springs"
-msgstr ""
+#~ msgid "Craig"
+#~ msgstr "Крейг"
 
-#: my-evolution/Locations.h:2142
-msgid "Stephenville"
-msgstr ""
+#~ msgid "Cranfield"
+#~ msgstr "Кранфилд"
 
-#: my-evolution/Locations.h:2143
-msgid "St. George"
-msgstr ""
+#~ msgid "Crescent City"
+#~ msgstr "Кресцент Сити"
 
-#: my-evolution/Locations.h:2144
-msgid "Stillwater"
-msgstr ""
+#~ msgid "Creston"
+#~ msgstr "Крестън"
 
-#: my-evolution/Locations.h:2145
-msgid "St. John's"
-msgstr ""
+#~ msgid "Cross City"
+#~ msgstr "Крос Сити"
 
-#: my-evolution/Locations.h:2146
-msgid "St Johnsbury"
-msgstr ""
+#~ msgid "Crossville"
+#~ msgstr "Кросвил"
 
-#: my-evolution/Locations.h:2147
-msgid "St Joseph"
-msgstr ""
+#~ msgid "Crotone"
+#~ msgstr "Кротон"
 
-#: my-evolution/Locations.h:2148
-msgid "St Louis"
-msgstr ""
+#~ msgid "Cuba Awrs"
+#~ msgstr "Кюба Орс"
 
-#: my-evolution/Locations.h:2149
-msgid "St Louis-Spirit"
-msgstr ""
+#~ msgid "Cuernavaca"
+#~ msgstr "Куернавака"
 
-#: my-evolution/Locations.h:2150
-msgid "Stockholm (Arlanda)"
-msgstr "Стокхолм (Арланда)"
+#~ msgid "Cuiaba"
+#~ msgstr "Куияба"
 
-#: my-evolution/Locations.h:2151
-msgid "Stockholm (Bromma)"
-msgstr "Стокхолм (Брома)"
+#~ msgid "Culdrose"
+#~ msgstr "Кълдроуз"
 
-#: my-evolution/Locations.h:2152
-msgid "Stockton"
-msgstr "Стоктън"
+#~ msgid "Culiacan"
+#~ msgstr "Кулякан"
 
-#: my-evolution/Locations.h:2153
-msgid "Stokmarknes/Skagen"
-msgstr ""
+#~ msgid "Cumana"
+#~ msgstr "Кумана"
 
-#: my-evolution/Locations.h:2154
-msgid "Stord/Sorstokken"
-msgstr ""
+#~ msgid "Cumberland"
+#~ msgstr "Къмбърленд"
 
-#: my-evolution/Locations.h:2155
-msgid "Storm Lake"
-msgstr ""
+#~ msgid "Curitiba Apt"
+#~ msgstr "Куритиба Апт"
 
-#: my-evolution/Locations.h:2156
-msgid "Stornoway"
-msgstr ""
+#~ msgid "Custer"
+#~ msgstr "Къстър"
 
-#: my-evolution/Locations.h:2157
-msgid "St Paul"
-msgstr "Сант Паул"
+#~ msgid "Cut Bank"
+#~ msgstr "Кът Банк"
 
-#: my-evolution/Locations.h:2158
-msgid "St Petersburg"
-msgstr "Сант Петербург"
+#~ msgid "Cuzco"
+#~ msgstr "Куско"
 
-#: my-evolution/Locations.h:2159
-msgid "St Petersburg / Clearwater"
-msgstr ""
+#~ msgid "Dagali"
+#~ msgstr "Дагалия"
 
-#: my-evolution/Locations.h:2160
-msgid "Strasbourg"
-msgstr "Страсбург"
+#~ msgid "Daggett"
+#~ msgstr "Дагет"
 
-#: my-evolution/Locations.h:2161
-msgid "Strevell"
-msgstr "Стревел"
+#~ msgid "Dalhart"
+#~ msgstr "Долхарт"
 
-#: my-evolution/Locations.h:2162
-msgid "St Simon's Island"
-msgstr ""
+#~ msgid "Dalian"
+#~ msgstr "Далиан"
 
-#: my-evolution/Locations.h:2163
-msgid "Stumpy Point"
-msgstr ""
+#~ msgid "Dallas-Addison"
+#~ msgstr "Далас-Адисън"
 
-#: my-evolution/Locations.h:2164
-msgid "Sturgeon Bay"
-msgstr ""
+#~ msgid "Dallas-Fort Worth"
+#~ msgstr "Далас-Форт Уърт"
 
-#: my-evolution/Locations.h:2165
-msgid "Stuttgart"
-msgstr "Щутгард"
+#~ msgid "Dallas-Love Field"
+#~ msgstr "Далас-Лав Фийлд"
 
-#: my-evolution/Locations.h:2166
-msgid "Sucre"
-msgstr ""
+#~ msgid "Dallas-Redbird"
+#~ msgstr "Далас-Редбърд"
 
-#: my-evolution/Locations.h:2167
-msgid "Sumburgh"
-msgstr ""
+#~ msgid "Da Nang"
+#~ msgstr "Да Нанг"
 
-#: my-evolution/Locations.h:2168
-msgid "Sumter"
-msgstr ""
+#~ msgid "Danbury"
+#~ msgstr "Данбъри"
 
-#: my-evolution/Locations.h:2169
-msgid "Sumter (2)"
-msgstr ""
+#~ msgid "Danville"
+#~ msgstr "Данвил"
 
-#: my-evolution/Locations.h:2170
-msgid "Sundsvall-Harnosand"
-msgstr ""
+#~ msgid "Dar-El-Beida"
+#~ msgstr "Дар-Ел-Бейда"
 
-#: my-evolution/Locations.h:2171
-msgid "Sungshan/Taipei"
-msgstr ""
+#~ msgid "Davenport"
+#~ msgstr "Дейвънпорт"
 
-#: my-evolution/Locations.h:2172
-msgid "Superior"
-msgstr ""
+#~ msgid "David"
+#~ msgstr "Давид"
 
-#: my-evolution/Locations.h:2174
-msgid "Sutton"
-msgstr ""
+#~ msgid "Dawadmi"
+#~ msgstr "Давадми"
 
-#: my-evolution/Locations.h:2175
-msgid "Suwon Ab"
-msgstr ""
+#~ msgid "Dayton"
+#~ msgstr "Дайтон"
 
-#: my-evolution/Locations.h:2176
-msgid "Svalbard"
-msgstr ""
+#~ msgid "Daytona Beach"
+#~ msgstr "Дейтона Бийч"
 
-#: my-evolution/Locations.h:2177
-msgid "Svolvaer/Helle"
-msgstr ""
+#~ msgid "Dayton-Fairborn"
+#~ msgstr "Дейтън-Феърборн"
 
-#: my-evolution/Locations.h:2179
-msgid "Swift Current"
-msgstr ""
+#~ msgid "Dayton-South Airport"
+#~ msgstr "Дейтън-Саут Еърпорт"
 
-#: my-evolution/Locations.h:2181
-msgid "Sydney"
-msgstr "Сидней"
+#~ msgid "Dead Horse"
+#~ msgstr "Дед Хорс"
 
-#: my-evolution/Locations.h:2182
-msgid "Syktyvkar"
-msgstr "Сиктивкар"
+#~ msgid "Deauville-Saint-Gatien"
+#~ msgstr "Довил-Сейнт-Гатиен"
 
-#: my-evolution/Locations.h:2183
-msgid "Sympheropol"
-msgstr ""
+#~ msgid "Decatur"
+#~ msgstr "Дикатър"
 
-#: my-evolution/Locations.h:2184
-msgid "Syracuse"
-msgstr "Сиракуза"
+#~ msgid "Decimomannu"
+#~ msgstr "Декимоману"
 
-#: my-evolution/Locations.h:2185
-msgid "Szczecin"
-msgstr ""
+#~ msgid "Decorah"
+#~ msgstr "Декора"
 
-#: my-evolution/Locations.h:2186
-msgid "Szombathely"
-msgstr ""
+#~ msgid "Deelen"
+#~ msgstr "Диилън"
 
-#: my-evolution/Locations.h:2187
-msgid "Tabatinga"
-msgstr "Табатинга"
+#~ msgid "Dekalb/Peachtree"
+#~ msgstr "Декалб/Пийчтрии"
 
-#: my-evolution/Locations.h:2188
-msgid "Tabriz"
-msgstr "Табриз"
+#~ msgid "Delaware"
+#~ msgstr "Делауер"
 
-#: my-evolution/Locations.h:2189
-msgid "Tabuk"
-msgstr "Табук"
+#~ msgid "Del Bajio"
+#~ msgstr "Дел Бажио"
 
-#: my-evolution/Locations.h:2190
-msgid "Tachikawa Ab"
-msgstr "Ташикава"
+#~ msgid "Del Rio"
+#~ msgstr "Дел Рио"
 
-#: my-evolution/Locations.h:2191
-msgid "Tacna"
-msgstr ""
+#~ msgid "Delta"
+#~ msgstr "Делта"
 
-#: my-evolution/Locations.h:2192
-msgid "Tacoma"
-msgstr "Такома"
+#~ msgid "Deming"
+#~ msgstr "Деминг"
 
-#: my-evolution/Locations.h:2193
-msgid "Tacoma-Lakewood"
-msgstr ""
+#~ msgid "Den Helder/De Kooy"
+#~ msgstr "Ден Хелдер/Де Кой"
 
-#: my-evolution/Locations.h:2194
-msgid "Tacuarembo"
-msgstr ""
+#~ msgid "Denison"
+#~ msgstr "Денисон"
 
-#: my-evolution/Locations.h:2195
-msgid "Taegu"
-msgstr ""
+#~ msgid "Denton"
+#~ msgstr "Дентън"
 
-#: my-evolution/Locations.h:2196
-msgid "Taegu Ab"
-msgstr ""
+#~ msgid "Denver"
+#~ msgstr "Денвър"
 
-#: my-evolution/Locations.h:2197
-msgid "Taejon"
-msgstr ""
+#~ msgid "Denver-Aurora"
+#~ msgstr "Денвър-Аурора"
 
-#: my-evolution/Locations.h:2198
-msgid "Tahoe Valley"
-msgstr ""
+#~ msgid "Denver-Broomfield"
+#~ msgstr "Денвър-Брумфилд"
 
-#: my-evolution/Locations.h:2199
-msgid "Taichung"
-msgstr ""
+#~ msgid "Denver-Cherry Knolls"
+#~ msgstr "Денвър-Чери Нолс"
 
-#: my-evolution/Locations.h:2200
-msgid "Taif"
-msgstr "Тайф"
+#~ msgid "Desert Rock"
+#~ msgstr "Дезърт Рок"
 
-#: my-evolution/Locations.h:2201
-msgid "Tainan"
-msgstr "Тайнан"
+#~ msgid "Des Moines"
+#~ msgstr "ДеМойн"
 
-#: my-evolution/Locations.h:2203
-msgid "Taiyuan"
-msgstr ""
+#~ msgid "Detroit"
+#~ msgstr "Детройт"
 
-#: my-evolution/Locations.h:2204
-msgid "Taiz"
-msgstr ""
+#~ msgid "Detroit Lakes"
+#~ msgstr "Детройт Езерата"
 
-#: my-evolution/Locations.h:2205
-msgid "Tajima"
-msgstr ""
+#~ msgid "Detroit-Taylor"
+#~ msgstr "Детроит-Тейлър"
 
-#: my-evolution/Locations.h:2206
-msgid "Takamatsu Airport"
-msgstr "Летище Такаматсу"
+#~ msgid "Detroit/Ypsilanti"
+#~ msgstr "Детройт-Ипсиланти"
 
-#: my-evolution/Locations.h:2207
-msgid "Talara"
-msgstr "Талара"
+#~ msgid "Devils Lake"
+#~ msgstr "Девълс Лейк"
 
-#: my-evolution/Locations.h:2208
-msgid "Talkeetna"
-msgstr ""
+#~ msgid "Devils Lake (2)"
+#~ msgstr "Девълс Лейк (2)"
 
-#: my-evolution/Locations.h:2209
-msgid "Tallahassee"
-msgstr ""
+#~ msgid "Dhahran"
+#~ msgstr "Дахран"
 
-#: my-evolution/Locations.h:2210
-msgid "Tallinn"
-msgstr ""
+#~ msgid "Dickinson"
+#~ msgstr "Дикинсън"
 
-#: my-evolution/Locations.h:2211
-msgid "Tamanrasset"
-msgstr ""
+#~ msgid "Dijon"
+#~ msgstr "Дижон"
 
-#: my-evolution/Locations.h:2212
-msgid "Tamanrasset/Aguenna"
-msgstr ""
+#~ msgid "Dillingham"
+#~ msgstr "Дилингам"
 
-#: my-evolution/Locations.h:2213
-msgid "Tampa"
-msgstr "Тампа"
+#~ msgid "Dillon"
+#~ msgstr "Дилон"
 
-#: my-evolution/Locations.h:2214
-msgid "Tampa-Macdill AFB"
-msgstr ""
+#~ msgid "Dinard"
+#~ msgstr "Динард"
 
-#: my-evolution/Locations.h:2215
-msgid "Tampere"
-msgstr "Тампере"
+#~ msgid "District of Columbia"
+#~ msgstr "Окръг Колумбия"
 
-#: my-evolution/Locations.h:2216
-msgid "Tampico"
-msgstr "Тампико"
+#~ msgid "Diyarbakir"
+#~ msgstr "Диарбекир"
 
-#: my-evolution/Locations.h:2217
-msgid "Tanana"
-msgstr "Танана"
+#~ msgid "Dnipropetrovsk"
+#~ msgstr "Днепропетровск"
 
-#: my-evolution/Locations.h:2218
-msgid "Tanegashima Airport"
-msgstr ""
+#~ msgid "Dobbiaco"
+#~ msgstr "Добиачо"
 
-#: my-evolution/Locations.h:2219
-msgid "Taos"
-msgstr "Таос"
+#~ msgid "Dodge City"
+#~ msgstr "Додж Сити"
 
-#: my-evolution/Locations.h:2220
-msgid "Taoyuan"
-msgstr ""
+#~ msgid "Doha"
+#~ msgstr "Доха"
 
-#: my-evolution/Locations.h:2221
-msgid "Tapachula"
-msgstr "Тапачула"
+#~ msgid "Dole"
+#~ msgstr "Доул"
 
-#: my-evolution/Locations.h:2222
-msgid "Taranto"
-msgstr "Таранто"
+#~ msgid "Donetsk"
+#~ msgstr "Донецк"
 
-#: my-evolution/Locations.h:2223
-msgid "Tarbes"
-msgstr "Тарбес"
+#~ msgid "Dongsha"
+#~ msgstr "Донгша"
 
-#: my-evolution/Locations.h:2224
-msgid "Tarija"
-msgstr ""
+#~ msgid "Dongshi"
+#~ msgstr "Донгши"
 
-#: my-evolution/Locations.h:2225
-msgid "Tarvisio"
-msgstr "Тарвизио"
+#~ msgid "Don Torcuato"
+#~ msgstr "Дон Торкуато"
 
-#: my-evolution/Locations.h:2226
-msgid "Tatalina"
-msgstr "Таталина"
+#~ msgid "Dortmund-Wickede"
+#~ msgstr "Дортмунд-Викеде"
 
-#: my-evolution/Locations.h:2227
-msgid "Tateyama Ab"
-msgstr ""
+#~ msgid "Dothan"
+#~ msgstr "Дотан"
 
-#: my-evolution/Locations.h:2228
-msgid "Taunton"
-msgstr ""
+#~ msgid "Douglas"
+#~ msgstr "Дъглас"
 
-#: my-evolution/Locations.h:2229
-msgid "Tebessa"
-msgstr "Тебеса"
+#~ msgid "Dover"
+#~ msgstr "Довър"
 
-#: my-evolution/Locations.h:2230
-msgid "Tees-Side"
-msgstr ""
+#~ msgid "Dresden-Klotzsche"
+#~ msgstr "Дрезден"
 
-#: my-evolution/Locations.h:2231
-msgid "Tegucigalpa"
-msgstr "Тегосигалпа"
+#~ msgid "Drummond"
+#~ msgstr "Дръмънд"
 
-#: my-evolution/Locations.h:2232
-msgid "Tehran-Mehrabad"
-msgstr ""
+#~ msgid "Dubai"
+#~ msgstr "Дубай"
 
-#: my-evolution/Locations.h:2233
-msgid "Tela"
-msgstr "Тела"
+#~ msgid "Dubbo"
+#~ msgstr "Дубо"
 
-#: my-evolution/Locations.h:2234
-msgid "Temple"
-msgstr "Темпле"
+#~ msgid "Dublin"
+#~ msgstr "Дъблин"
 
-#: my-evolution/Locations.h:2235
-msgid "Tennessee"
-msgstr "Тенеси"
+#~ msgid "Du Bois"
+#~ msgstr "ДюБоа"
 
-#: my-evolution/Locations.h:2236
-msgid "Tepic"
-msgstr "Тепик"
+#~ msgid "Dubrovnik"
+#~ msgstr "Добровник"
 
-#: my-evolution/Locations.h:2237
-msgid "Teresina"
-msgstr "Тересина"
+#~ msgid "Dubuque"
+#~ msgstr "Дюбюк"
 
-#: my-evolution/Locations.h:2238
-msgid "Terre Haute"
-msgstr ""
+#~ msgid "Dugway"
+#~ msgstr "Дъгуей"
 
-#: my-evolution/Locations.h:2239
-msgid "Terrell"
-msgstr "Терел"
+#~ msgid "Duluth"
+#~ msgstr "Дълът"
 
-#: my-evolution/Locations.h:2240
-msgid "Teterboro"
-msgstr "Тетерборо"
+#~ msgid "Dundee"
+#~ msgstr "Дънди"
 
-#: my-evolution/Locations.h:2241
-msgid "Texarkana"
-msgstr "Техеркана"
+#~ msgid "Durango"
+#~ msgstr "Дуранго"
 
-#: my-evolution/Locations.h:2242
-msgid "Texas"
-msgstr "Тексас"
+#~ msgid "Durango Awrs"
+#~ msgstr "Дуранго Орс"
 
-#: my-evolution/Locations.h:2243
-msgid "The Dalles"
-msgstr ""
+#~ msgid "Durazno"
+#~ msgstr "Дуразно"
 
-#: my-evolution/Locations.h:2244
-msgid "Thessaloniki"
-msgstr "Солун"
+#~ msgid "Durban Louis Botha "
+#~ msgstr "Дърбан Луи Бота"
 
-#: my-evolution/Locations.h:2245
-msgid "Thief River Falls"
-msgstr ""
+#~ msgid "Dusseldorf"
+#~ msgstr "Дюселдорф"
 
-#: my-evolution/Locations.h:2246
-msgid "Thiruvananthapuram"
-msgstr ""
+#~ msgid "Dutch Harbor"
+#~ msgstr "Дъч Харбър"
 
-#: my-evolution/Locations.h:2247
-msgid "Thisted"
-msgstr ""
+#~ msgid "Dyersburg"
+#~ msgstr "Дайърсбърг"
 
-#: my-evolution/Locations.h:2248
-msgid "Thompson Falls"
-msgstr ""
+#~ msgid "Eagle"
+#~ msgstr "Иигъл"
 
-#: my-evolution/Locations.h:2249
-msgid "Thumrait"
-msgstr ""
+#~ msgid "Eagle Range"
+#~ msgstr "Иигъл Рейндж"
 
-#: my-evolution/Locations.h:2250
-msgid "Tianjin"
-msgstr ""
+#~ msgid "East London"
+#~ msgstr "Източен Лондон"
 
-#: my-evolution/Locations.h:2251
-msgid "Tijuana"
-msgstr "Тиоана"
+#~ msgid "East Midlands"
+#~ msgstr "Ийст Мидлендс"
 
-#: my-evolution/Locations.h:2252
-msgid "Timisoara"
-msgstr "Тимишоара"
+#~ msgid "East St Louis"
+#~ msgstr "Иист Сейнт Луис"
 
-#: my-evolution/Locations.h:2253
-msgid "Tin City"
-msgstr ""
+#~ msgid "Eau Claire"
+#~ msgstr "О Клер"
 
-#: my-evolution/Locations.h:2254
-msgid "Tirana"
-msgstr "Тирана"
+#~ msgid "Edinburgh"
+#~ msgstr "Единбург"
 
-#: my-evolution/Locations.h:2255
-msgid "Tiree"
-msgstr ""
+#~ msgid "Edmonton"
+#~ msgstr "Едмънтън"
 
-#: my-evolution/Locations.h:2256
-msgid "Tirgu Mures"
-msgstr ""
+#~ msgid "Edmonton/Villeneuve"
+#~ msgstr "Едмънтън/Вилньов"
 
-#: my-evolution/Locations.h:2257
-msgid "Tiruchchirapalli"
-msgstr ""
+#~ msgid "Eduardo Gomes International"
+#~ msgstr "Едуардо Гомес Интернешънъл"
 
-#: my-evolution/Locations.h:2258
-msgid "Titusville"
-msgstr ""
+#~ msgid "Edwards AFB"
+#~ msgstr "ВВБ Едуардс"
 
-#: my-evolution/Locations.h:2259
-msgid "Tivat"
-msgstr "Тиват"
+#~ msgid "Egilsstadir"
+#~ msgstr "Егилстадир"
 
-#: my-evolution/Locations.h:2260
-msgid "Tlemcen Zenata"
-msgstr ""
+#~ msgid "Eglin"
+#~ msgstr "Еглин"
 
-#: my-evolution/Locations.h:2261
-msgid "Tobias Bolanos"
-msgstr ""
+#~ msgid "Eglington/Londonderry"
+#~ msgstr "Еглингтън/Ландъндери"
 
-#: my-evolution/Locations.h:2262
-msgid "Tocumen"
-msgstr ""
+#~ msgid "Eindhoven"
+#~ msgstr "Айтховен"
 
-#: my-evolution/Locations.h:2263
-msgid "Togiak Village"
-msgstr ""
+#~ msgid "Ekofisk"
+#~ msgstr "Екофиск"
 
-#: my-evolution/Locations.h:2264
-msgid "Tokachi GSDF"
-msgstr ""
+#~ msgid "Elazig"
+#~ msgstr "Елазиг"
 
-#: my-evolution/Locations.h:2265
-msgid "Tokunoshima Island"
-msgstr ""
+#~ msgid "El Centro"
+#~ msgstr "Ел Центро"
 
-#: my-evolution/Locations.h:2266
-msgid "Tokushima Ab"
-msgstr " "
+#~ msgid "El Dorado"
+#~ msgstr "Елдорадо"
 
-#: my-evolution/Locations.h:2267
-msgid "Tokyo Heliport"
-msgstr "Токио Летище за хеликоптери"
+#~ msgid "Elefsis"
+#~ msgstr "Елефсис"
 
-#: my-evolution/Locations.h:2268
-msgid "Tokyo International Airport"
-msgstr "Токио Международно Летище"
+#~ msgid "Elfin Cove"
+#~ msgstr "Елфин Коув"
 
-#: my-evolution/Locations.h:2269
-msgid "Tokyo New International Airport"
-msgstr "Токио Ново Международно Летище"
+#~ msgid "Elizabeth City"
+#~ msgstr "Елизабет Сити"
 
-#: my-evolution/Locations.h:2270
-msgid "Toledo"
-msgstr "Толедо"
+#~ msgid "Elk City"
+#~ msgstr "Елк Сити"
 
-#: my-evolution/Locations.h:2271
-msgid "Toluca"
-msgstr "Толука"
+#~ msgid "Elkhart"
+#~ msgstr "Елкхарт"
 
-#: my-evolution/Locations.h:2272
-msgid "Tonopah"
-msgstr ""
+#~ msgid "Elkins"
+#~ msgstr "Елкинс"
 
-#: my-evolution/Locations.h:2273
-msgid "Topeka"
-msgstr "Топека"
+#~ msgid "Elko"
+#~ msgstr "Елко"
 
-#: my-evolution/Locations.h:2274
-msgid "Topeka-Forbes Field"
-msgstr ""
+#~ msgid "Elmira"
+#~ msgstr "Елмайра"
 
-#: my-evolution/Locations.h:2275
-msgid "Torino/Bric Della Croce"
-msgstr "Торино"
+#~ msgid "El Monte"
+#~ msgstr "Ел Монте"
 
-#: my-evolution/Locations.h:2276
-msgid "Torino/Caselle"
-msgstr "Торино/Каселе"
+#~ msgid "El Paso"
+#~ msgstr "Ел Масо"
 
-#: my-evolution/Locations.h:2277
-msgid "Toronto"
-msgstr "Торонто"
+#~ msgid "El Salvador Int."
+#~ msgstr "Ел Салвадор"
 
-#: my-evolution/Locations.h:2278
-msgid "Torp"
-msgstr "Торп"
+#~ msgid "Elsenborn"
+#~ msgstr "Елсенборн"
 
-#: my-evolution/Locations.h:2279
-msgid "Torrance"
-msgstr "Торансе"
+#~ msgid "Ely"
+#~ msgstr "Ели"
 
-#: my-evolution/Locations.h:2280
-msgid "Torreon"
-msgstr "Тореон"
+#~ msgid "Emmonak"
+#~ msgstr "Емонак"
 
-#: my-evolution/Locations.h:2281
-msgid "Tottori Airport"
-msgstr "Летище Тотори"
+#~ msgid "Emporia"
+#~ msgstr "Емпориа"
 
-#: my-evolution/Locations.h:2282
-msgid "Toulouse"
-msgstr "Тулуза"
+#~ msgid "Enid"
+#~ msgstr "Енид"
 
-#: my-evolution/Locations.h:2283
-msgid "Toul-Rosieres"
-msgstr ""
+#~ msgid "Enid/Woodring"
+#~ msgstr "Енид/Удринг"
 
-#: my-evolution/Locations.h:2284
-msgid "Tours-St-Symphorien"
-msgstr ""
+#~ msgid "Enosburg Falls"
+#~ msgstr "Еносбърг Фалс"
 
-#: my-evolution/Locations.h:2285
-msgid "Toussus-Le Noble"
-msgstr ""
+#~ msgid "Ephrata"
+#~ msgstr "Ефрат"
 
-#: my-evolution/Locations.h:2286
-msgid "Townsville"
-msgstr ""
+#~ msgid "Ercan"
+#~ msgstr "Еркан"
 
-#: my-evolution/Locations.h:2287
-msgid "Toyama Airport"
-msgstr ""
+#~ msgid "Erie"
+#~ msgstr "Ери"
 
-#: my-evolution/Locations.h:2288
-msgid "Trabzon"
-msgstr "Трабзон"
+#~ msgid "Erzurum"
+#~ msgstr "Ерзум"
 
-#: my-evolution/Locations.h:2289
-msgid "Trapani"
-msgstr "Трапани"
+#~ msgid "Esbjerg"
+#~ msgstr "Есбйерг"
 
-#: my-evolution/Locations.h:2290
-msgid "Traverse City"
-msgstr ""
+#~ msgid "Escanaba"
+#~ msgstr "Асканаба"
 
-#: my-evolution/Locations.h:2291
-msgid "Trelew"
-msgstr ""
+#~ msgid "Esfahan"
+#~ msgstr "Есфахан"
 
-#: my-evolution/Locations.h:2292
-msgid "Trenton"
-msgstr ""
+#~ msgid "Eskisehir"
+#~ msgstr "Ескисехир"
 
-#: my-evolution/Locations.h:2293
-msgid "Trevico"
-msgstr ""
+#~ msgid "Estherville"
+#~ msgstr "Естервил"
 
-#: my-evolution/Locations.h:2294
-msgid "Treviso/Istrana"
-msgstr ""
+#~ msgid "Eugene"
+#~ msgstr "Юджиин"
 
-#: my-evolution/Locations.h:2295
-msgid "Treviso/S.Angelo"
-msgstr ""
+#~ msgid "Eureka"
+#~ msgstr "Еурека"
 
-#: my-evolution/Locations.h:2296
-msgid "Trieste"
-msgstr "Триест"
+#~ msgid "Europe"
+#~ msgstr "Европа"
 
-#: my-evolution/Locations.h:2297
-msgid "Trinidad"
-msgstr "Тринидат"
+#~ msgid "Evanston"
+#~ msgstr "Ивънстън"
 
-#: my-evolution/Locations.h:2298
-msgid "Tripoli"
-msgstr "Триполи"
+#~ msgid "Evansville"
+#~ msgstr "Еванвил"
 
-#: my-evolution/Locations.h:2299
-msgid "Tromso/Langnes"
-msgstr ""
+#~ msgid "Everett"
+#~ msgstr "Еверет"
 
-#: my-evolution/Locations.h:2300
-msgid "Trondheim/Vaernes"
-msgstr ""
+#~ msgid "Evergreen"
+#~ msgstr "Евъргриин"
 
-#: my-evolution/Locations.h:2301
-msgid "Troutdale"
-msgstr ""
+#~ msgid "Evreux-Fauville"
+#~ msgstr "Евро-Фовил"
 
-#: my-evolution/Locations.h:2302
-msgid "Troyes/Barberey"
-msgstr ""
+#~ msgid "Exeter"
+#~ msgstr "Екситър"
 
-#: my-evolution/Locations.h:2303
-msgid "Truckee"
-msgstr ""
+#~ msgid "Ezeiza"
+#~ msgstr "Езейза"
 
-#: my-evolution/Locations.h:2304
-msgid "Truth or Consequences"
-msgstr ""
+#~ msgid "Fagernes"
+#~ msgstr "Фагернес"
 
-#: my-evolution/Locations.h:2305
-msgid "Tsuiki Ab"
-msgstr ""
+#~ msgid "Fairbanks"
+#~ msgstr "Феърбанкс"
 
-#: my-evolution/Locations.h:2306
-msgid "Tsushima Airport"
-msgstr "Летище Цушима"
+#~ msgid "Fairchild"
+#~ msgstr "Феърчайлд"
 
-#: my-evolution/Locations.h:2307
-msgid "Tucson"
-msgstr "Тускон"
+#~ msgid "Fairfield"
+#~ msgstr "Феърфийлд"
 
-#: my-evolution/Locations.h:2308
-msgid "Tucson-Davis AFB"
-msgstr ""
+#~ msgid "Fairmont"
+#~ msgstr "Феърмаунт"
 
-#: my-evolution/Locations.h:2309
-msgid "Tucuman"
-msgstr ""
+#~ msgid "Fallon"
+#~ msgstr "Фалон"
 
-#: my-evolution/Locations.h:2310
-msgid "Tucumcari"
-msgstr ""
+#~ msgid "Falls City"
+#~ msgstr "Фолс Сити"
 
-#: my-evolution/Locations.h:2311
-msgid "Tucurui"
-msgstr ""
+#~ msgid "Falmouth-Otis AFB"
+#~ msgstr "ВВБ Фолмаут-Отис"
 
-#: my-evolution/Locations.h:2312
-msgid "Tulancingo"
-msgstr ""
+#~ msgid "Farbanks/Eielson AFB"
+#~ msgstr "ВВБ Фарбанкс/Айелсън"
 
-#: my-evolution/Locations.h:2313
-msgid "Tulcea"
-msgstr ""
+#~ msgid "Fargo"
+#~ msgstr "Фарго"
 
-#: my-evolution/Locations.h:2314
-msgid "Tulsa"
-msgstr "Тулса"
+#~ msgid "Farmingdale"
+#~ msgstr "Фармингдейл"
 
-#: my-evolution/Locations.h:2315
-msgid "Tupelo"
-msgstr "Тупело"
+#~ msgid "Farmington"
+#~ msgstr "Фармингтън"
 
-#: my-evolution/Locations.h:2316
-msgid "Turaif"
-msgstr ""
+#~ msgid "Farmville"
+#~ msgstr "Фармвил"
 
-#: my-evolution/Locations.h:2317
-msgid "Turin"
-msgstr "Торино"
+#~ msgid "Faro"
+#~ msgstr "Фаро"
 
-#: my-evolution/Locations.h:2319
-msgid "Turku"
-msgstr "Турку"
+#~ msgid "Fayetteville"
+#~ msgstr "Файетвил"
 
-#: my-evolution/Locations.h:2320
-msgid "Tuscaloosa"
-msgstr ""
+#~ msgid "Feng Nin"
+#~ msgstr "Фенг Нин"
 
-#: my-evolution/Locations.h:2321
-msgid "Tuxtla Gutierrez"
-msgstr ""
+#~ msgid "Fergus Falls"
+#~ msgstr "Фъргъс Фолс"
 
-#: my-evolution/Locations.h:2322
-msgid "Twenthe"
-msgstr ""
+#~ msgid "Fernando De Noronha"
+#~ msgstr "Фернандо де Нороня"
 
-#: my-evolution/Locations.h:2323
-msgid "Twentynine Palms"
-msgstr ""
+#~ msgid "Ferrara"
+#~ msgstr "Ферара"
 
-#: my-evolution/Locations.h:2324
-msgid "Twin Falls"
-msgstr ""
+#~ msgid "Figari"
+#~ msgstr "Фигари"
 
-#: my-evolution/Locations.h:2325
-msgid "Tyler"
-msgstr ""
+#~ msgid "Findlay"
+#~ msgstr "Финдли"
 
-#: my-evolution/Locations.h:2326
-msgid "Tyndall AFB"
-msgstr ""
+#~ msgid "Firenze"
+#~ msgstr "Фирензе"
 
-#: my-evolution/Locations.h:2327
-msgid "Tyumen"
-msgstr "Тюмен"
+#~ msgid "Fitchburg"
+#~ msgstr "Фитчбърг"
 
-#: my-evolution/Locations.h:2328
-msgid "Uberaba"
-msgstr ""
+#~ msgid "Flagstaff"
+#~ msgstr "Флагстаф"
 
-#: my-evolution/Locations.h:2329
-msgid "Ufa"
-msgstr "Уфа"
+#~ msgid "Flint"
+#~ msgstr "Флинт"
 
-#: my-evolution/Locations.h:2330
-msgid "Ukiah"
-msgstr ""
+#~ msgid "Flippin"
+#~ msgstr "Флипин"
 
-#: my-evolution/Locations.h:2332
-msgid "Ulan-Ude"
-msgstr ""
+#~ msgid "Florence"
+#~ msgstr "Флоренция"
 
-#: my-evolution/Locations.h:2333
-msgid "Ulsan"
-msgstr "Улсан"
+#~ msgid "Florennes"
+#~ msgstr "Флоренес"
 
-#: my-evolution/Locations.h:2334
-msgid "Ulyanovsk"
-msgstr "Уляновск"
+#~ msgid "Flores"
+#~ msgstr "Флорес"
 
-#: my-evolution/Locations.h:2335
-msgid "Umea"
-msgstr ""
+#~ msgid "Florianopolis"
+#~ msgstr "Флорианополис"
 
-#: my-evolution/Locations.h:2336
-msgid "Umiat"
-msgstr ""
+#~ msgid "Florida"
+#~ msgstr "Флорида"
 
-#: my-evolution/Locations.h:2337
-msgid "Unalakleet"
-msgstr ""
+#~ msgid "Floro"
+#~ msgstr "Флоро"
 
-#: my-evolution/Locations.h:2338
-msgid "United Arab Emirates "
-msgstr "Обединени Арабски Емирства"
+#~ msgid "Fond Du Lac"
+#~ msgstr "Фон дьо Лак"
 
-#: my-evolution/Locations.h:2341
-msgid "Unst"
-msgstr ""
+#~ msgid "Forde/Bringeland"
+#~ msgstr "Форде/Бринджланд"
 
-#: my-evolution/Locations.h:2342
-msgid "Upington"
-msgstr ""
+#~ msgid "Forli"
+#~ msgstr "Форли"
 
-#: my-evolution/Locations.h:2343
-msgid "Uruapan"
-msgstr ""
+#~ msgid "Formosa"
+#~ msgstr "Формоса"
 
-#: my-evolution/Locations.h:2344
-msgid "Uruguaiana"
-msgstr ""
+#~ msgid "Fortaleza"
+#~ msgstr "Форталеза"
 
-#: my-evolution/Locations.h:2346
-msgid "Urumqi"
-msgstr ""
+#~ msgid "Fort Belvoir"
+#~ msgstr "Форт Белвоар"
 
-#: my-evolution/Locations.h:2347
-msgid "Utah"
-msgstr "Юта"
+#~ msgid "Fort Benning"
+#~ msgstr "Форт Бенинг"
 
-#: my-evolution/Locations.h:2348
-msgid "Utica"
-msgstr ""
+#~ msgid "Fort Bragg"
+#~ msgstr "Форт Браг"
 
-#: my-evolution/Locations.h:2349
-msgid "Utrecht/Soesterberg"
-msgstr ""
+#~ msgid "Fort Campbell"
+#~ msgstr "Форт Камбел"
 
-#: my-evolution/Locations.h:2350
-msgid "Utsunomiya Ab"
-msgstr ""
+#~ msgid "Fort Carson"
+#~ msgstr "Форт Карсон"
 
-#: my-evolution/Locations.h:2351
-msgid "Uzhgorod"
-msgstr ""
+#~ msgid "Fort Collins"
+#~ msgstr "Форт Колинс"
 
-#: my-evolution/Locations.h:2352
-msgid "Vadso"
-msgstr "Вадсо"
+#~ msgid "Fort Collins/Lovel"
+#~ msgstr "Форт Колинс/Лавъл"
 
-#: my-evolution/Locations.h:2353
-msgid "Vaerlose"
-msgstr ""
+#~ msgid "Fort Dodge"
+#~ msgstr "Форт Додж"
 
-#: my-evolution/Locations.h:2354
-msgid "Vagar"
-msgstr "Вагар"
+#~ msgid "Fort Drum"
+#~ msgstr "Форт Друм"
 
-#: my-evolution/Locations.h:2355
-msgid "Valdez 2"
-msgstr "Валдез 2"
+#~ msgid "Fort Eustis"
+#~ msgstr "Форт Ейстис"
 
-#: my-evolution/Locations.h:2356
-msgid "Valdosta"
-msgstr "Валдоста"
+#~ msgid "Fort Greely/Allen AAF"
+#~ msgstr "Форт Грийли/летище Алън"
 
-#: my-evolution/Locations.h:2357
-msgid "Valdosta-Moody AFB"
-msgstr ""
+#~ msgid "Fort Huachuca"
+#~ msgstr "Форт Хуачука"
 
-#: my-evolution/Locations.h:2358
-msgid "Valencia"
-msgstr "Валенсия"
+#~ msgid "Fort Knox"
+#~ msgstr "Форт Кнох"
 
-#: my-evolution/Locations.h:2359
-msgid "Valentine"
-msgstr "Валентин"
+#~ msgid "Fort Lauderdale"
+#~ msgstr "Форт Лодърдейл"
 
-#: my-evolution/Locations.h:2360
-msgid "Valera*"
-msgstr ""
+#~ msgid "Fort Lauderdale (International)"
+#~ msgstr "Форт Лодърдейл (Интернешънъл)"
 
-#: my-evolution/Locations.h:2361
-msgid "Valkenburg"
-msgstr ""
+#~ msgid "Fort Leonard"
+#~ msgstr "Форт Леонард"
 
-#: my-evolution/Locations.h:2362
-msgid "Valley"
-msgstr ""
+#~ msgid "Fort Lewis"
+#~ msgstr "Форт Левис"
 
-#: my-evolution/Locations.h:2363
-msgid "Valparaiso"
-msgstr "Валпарайсо"
+#~ msgid "Fort Madison"
+#~ msgstr "Форт Медисон"
 
-#: my-evolution/Locations.h:2364
-msgid "Valparaiso-Eglin AFB"
-msgstr ""
+#~ msgid "Fort Meade"
+#~ msgstr "Форт Миид"
 
-#: my-evolution/Locations.h:2365
-msgid "Van"
-msgstr "Ван"
+#~ msgid "Fort Myers (Page Field)"
+#~ msgstr "Форт Майерс (Пейдж Фийлд)"
 
-#: my-evolution/Locations.h:2366
-msgid "Vancouver"
-msgstr "Ванкувър"
+#~ msgid "Fort Myers (Southwest Florida International)"
+#~ msgstr "Форт Майерс (Саутуест Флорида Интернешънъл)"
 
-#: my-evolution/Locations.h:2367
-msgid "Vandel"
-msgstr "Вандел"
+#~ msgid "Fort Polk-Leesville"
+#~ msgstr "Форт Полк-Лиисвил"
 
-#: my-evolution/Locations.h:2368
-msgid "Vandenberg AFB"
-msgstr ""
+#~ msgid "Fort Riley"
+#~ msgstr "Форт Райли"
 
-#: my-evolution/Locations.h:2369
-msgid "Vandenberg Range"
-msgstr ""
+#~ msgid "Fort Sill"
+#~ msgstr "Форт Сил"
 
-#: my-evolution/Locations.h:2370
-msgid "Van Nuys"
-msgstr ""
+#~ msgid "Fort Smith"
+#~ msgstr "Форт Смит"
 
-#: my-evolution/Locations.h:2371
-msgid "Varadero"
-msgstr "Варадеро"
+#~ msgid "Fort Stewart"
+#~ msgstr "Форт Стюарт"
 
-#: my-evolution/Locations.h:2372
-msgid "Varanasi/Babatpur"
-msgstr ""
+#~ msgid "Fort Stockton"
+#~ msgstr "Форт Стоктън"
 
-#: my-evolution/Locations.h:2373
-msgid "Varna"
-msgstr "Варна"
+#~ msgid "Fort Wayne"
+#~ msgstr "Форт Уейн"
 
-#: my-evolution/Locations.h:2374
-msgid "Vasteras"
-msgstr ""
+#~ msgid "Fort Worth-Alliance"
+#~ msgstr "Форт Уърт-Алайънс"
 
-#: my-evolution/Locations.h:2375
-msgid "Vaxjo"
-msgstr ""
+#~ msgid "Fort Worth-Meacham"
+#~ msgstr "Форт Уърт-Мийчъм"
 
-#: my-evolution/Locations.h:2376
-msgid "Venezia"
-msgstr "Венециа"
+#~ msgid "Fort Worth NAS"
+#~ msgstr "Форт Уърт ВМЛ"
 
-#: my-evolution/Locations.h:2378
-msgid "Venice"
-msgstr "Венеция"
+#~ msgid "Fourchon"
+#~ msgstr "Форшон"
 
-#: my-evolution/Locations.h:2379
-msgid "Veracruz"
-msgstr "Веракруз"
+#~ msgid "Foz Do Iguacu"
+#~ msgstr "Фоз До Игуасу"
 
-#: my-evolution/Locations.h:2380
-msgid "Vermillion"
-msgstr ""
+#~ msgid "Frankfort"
+#~ msgstr "Франфутр"
 
-#: my-evolution/Locations.h:2381
-msgid "Vermont"
-msgstr "Върмонт"
+#~ msgid "Frankfurt/Main"
+#~ msgstr "Франфутр/Майн"
 
-#: my-evolution/Locations.h:2382
-msgid "Vernal"
-msgstr "Вернал"
+#~ msgid "Franklin"
+#~ msgstr "Франклин"
 
-#: my-evolution/Locations.h:2383
-msgid "Vero Beach"
-msgstr ""
+#~ msgid "Fredericton"
+#~ msgstr "Фредериктън"
 
-#: my-evolution/Locations.h:2384
-msgid "Vicenza"
-msgstr "Висенца"
+#~ msgid "Freeport"
+#~ msgstr "Фрийпорт"
 
-#: my-evolution/Locations.h:2385
-msgid "Vichy-Charmeil"
-msgstr ""
+#~ msgid "Frenchville"
+#~ msgstr "Френчвил"
 
-#: my-evolution/Locations.h:2386
-msgid "Vichy-Rolla"
-msgstr ""
+#~ msgid "Fresno"
+#~ msgstr "Фресно"
 
-#: my-evolution/Locations.h:2387
-msgid "Vicksburg"
-msgstr "Вискбург"
+#~ msgid "Fresno-Chandler"
+#~ msgstr "Фресно-Чандлър"
 
-#: my-evolution/Locations.h:2388
-msgid "Victoria"
-msgstr "Виктория"
+#~ msgid "Friday Harbor"
+#~ msgstr "Фрайдей Харбър"
 
-#: my-evolution/Locations.h:2390
-msgid "Vigo"
-msgstr "Виго"
+#~ msgid "Friedrichshafen"
+#~ msgstr "Фридрихсхафен"
 
-#: my-evolution/Locations.h:2391
-msgid "Vilhena"
-msgstr ""
+#~ msgid "Frigg"
+#~ msgstr "Фриг"
 
-#: my-evolution/Locations.h:2392
-msgid "Villacoublay"
-msgstr ""
+#~ msgid "Frontone"
+#~ msgstr "Фронтон"
 
-#: my-evolution/Locations.h:2393
-msgid "Villafranca"
-msgstr ""
+#~ msgid "Frosinone"
+#~ msgstr "Фросинон"
 
-#: my-evolution/Locations.h:2394
-msgid "Villahermosa"
-msgstr ""
+#~ msgid "Fryeburg"
+#~ msgstr "Фрайбург"
 
-#: my-evolution/Locations.h:2395
-msgid "Villamontes"
-msgstr ""
+#~ msgid "Fujairah"
+#~ msgstr "Фуджайра"
 
-#: my-evolution/Locations.h:2396
-msgid "Villa Reynolds"
-msgstr ""
+#~ msgid "Fuji Ab"
+#~ msgstr "ВБ Фуджи"
 
-#: my-evolution/Locations.h:2397
-msgid "Vilnius"
-msgstr "Вилнюс"
+#~ msgid "Fukue Airport"
+#~ msgstr "Летище Фукуе"
 
-#: my-evolution/Locations.h:2398
-msgid "Virginia"
-msgstr "Виржиния"
+#~ msgid "Fukui Airport"
+#~ msgstr "Летище Фукуи"
 
-#: my-evolution/Locations.h:2399
-msgid "Virginia Beach"
-msgstr "Виржиния Крайбрежие"
+#~ msgid "Fukuoka Airport"
+#~ msgstr "Летище Фукуока"
 
-#: my-evolution/Locations.h:2400
-msgid "Virginia Tech Airport"
-msgstr ""
+#~ msgid "Fullerton"
+#~ msgstr "Фулъртън"
 
-#: my-evolution/Locations.h:2401
-msgid "Viru-Viru"
-msgstr ""
+#~ msgid "Funchal"
+#~ msgstr "Фуншал"
 
-#: my-evolution/Locations.h:2402
-msgid "Visalia"
-msgstr ""
+#~ msgid "FYR Macedonia"
+#~ msgstr "Македония"
 
-#: my-evolution/Locations.h:2403
-msgid "Visby"
-msgstr ""
+#~ msgid "Gadsden"
+#~ msgstr "Гадсден"
 
-#: my-evolution/Locations.h:2404
-msgid "Viterbo"
-msgstr ""
+#~ msgid "Gage"
+#~ msgstr "Гейдж"
 
-#: my-evolution/Locations.h:2405
-msgid "Vitoria"
-msgstr "Витория"
+#~ msgid "Gainesville"
+#~ msgstr "Гейнсвил"
 
-#: my-evolution/Locations.h:2406
-msgid "Vladikavkaz"
-msgstr "Владивокавказ"
+#~ msgid "Galax-Hillsville"
+#~ msgstr "Галакс-Хилсвил"
 
-#: my-evolution/Locations.h:2407
-msgid "Vladivostok"
-msgstr "Владивосток"
+#~ msgid "Galbraith Lake"
+#~ msgstr "Голбрайт Лейк"
 
-#: my-evolution/Locations.h:2408
-msgid "Vlieland"
-msgstr ""
+#~ msgid "Galeao"
+#~ msgstr "Галеао"
 
-#: my-evolution/Locations.h:2409
-msgid "Vojens/Skrydstrup"
-msgstr ""
+#~ msgid "Galena"
+#~ msgstr "Галена"
 
-#: my-evolution/Locations.h:2410
-msgid "Volgograd"
-msgstr "Волгоград"
+#~ msgid "Galesburg"
+#~ msgstr "Гейлсбърг"
 
-#: my-evolution/Locations.h:2411
-msgid "Volkel"
-msgstr "Волкел"
+#~ msgid "Gallup"
+#~ msgstr "Галъп"
 
-#: my-evolution/Locations.h:2412
-msgid "Volk Field"
-msgstr ""
+#~ msgid "Galveston"
+#~ msgstr "Галвъстън"
 
-#: my-evolution/Locations.h:2413
-msgid "Voronezh"
-msgstr "Воронеж"
+#~ msgid "Gambell"
+#~ msgstr "Гамбел"
 
-#: my-evolution/Locations.h:2414
-msgid "Voslau"
-msgstr ""
+#~ msgid "Gander"
+#~ msgstr "Гандер"
 
-#: my-evolution/Locations.h:2415
-msgid "Waco"
-msgstr ""
+#~ msgid "Garden City"
+#~ msgstr "Гардън Сити"
 
-#: my-evolution/Locations.h:2416
-msgid "Wadi Al Dawasser Airport"
-msgstr ""
+#~ msgid "Gary"
+#~ msgstr "Гари"
 
-#: my-evolution/Locations.h:2417
-msgid "Wainwright"
-msgstr ""
+#~ msgid "Gassim"
+#~ msgstr "Гасим"
 
-#: my-evolution/Locations.h:2418
-msgid "Wakefield"
-msgstr ""
+#~ msgid "Gatineau"
+#~ msgstr "Гатино"
 
-#: my-evolution/Locations.h:2419
-msgid "Wakkanai Airport"
-msgstr ""
+#~ msgid "Gaziantep"
+#~ msgstr "Газиантеп"
 
-#: my-evolution/Locations.h:2420
-msgid "Walla Walla"
-msgstr ""
+#~ msgid "Gdansk"
+#~ msgstr "Гданск"
 
-#: my-evolution/Locations.h:2421
-msgid "Wallops Island"
-msgstr ""
+#~ msgid "Geneve"
+#~ msgstr "Женева"
 
-#: my-evolution/Locations.h:2422
-msgid "Walnut Ridge"
-msgstr ""
+#~ msgid "Genova"
+#~ msgstr "Геноа"
 
-#: my-evolution/Locations.h:2423
-msgid "Warner Robins"
-msgstr ""
+#~ msgid "George Airport"
+#~ msgstr "Летище Джордж"
 
-#: my-evolution/Locations.h:2424
-msgid "Warroad"
-msgstr ""
+#~ msgid "Georgetown"
+#~ msgstr "Джоржтаун"
 
-#: my-evolution/Locations.h:2425
-msgid "Warszawa"
-msgstr "Варшава"
+#~ msgid "Ghardaia"
+#~ msgstr "Гардайа"
 
-#: my-evolution/Locations.h:2426
-msgid "Washington"
-msgstr "Вашингтон"
+#~ msgid "Ghedi"
+#~ msgstr "Геди"
 
-#: my-evolution/Locations.h:2427
-msgid "Washington/Dulles"
-msgstr ""
+#~ msgid "Gifu Ab"
+#~ msgstr "ВБ Гифу"
 
-#: my-evolution/Locations.h:2428
-msgid "Waterbury"
-msgstr ""
+#~ msgid "Gila Bend"
+#~ msgstr "Джайла Бенд"
 
-#: my-evolution/Locations.h:2429
-msgid "Waterloo"
-msgstr "Ватерло"
+#~ msgid "Gillette"
+#~ msgstr "Джилет"
 
-#: my-evolution/Locations.h:2430
-msgid "Watertown"
-msgstr ""
+#~ msgid "Gilze-Rijen"
+#~ msgstr "Гилзе-Риен"
 
-#: my-evolution/Locations.h:2431
-msgid "Waterville"
-msgstr ""
+#~ msgid "Gioia del Colle"
+#~ msgstr "Джоя дел Коле"
 
-#: my-evolution/Locations.h:2432
-msgid "Waukesha"
-msgstr ""
+#~ msgid "Girona"
+#~ msgstr "Жирона"
 
-#: my-evolution/Locations.h:2433
-msgid "Wausau"
-msgstr ""
+#~ msgid "Gizan"
+#~ msgstr "Гизан"
 
-#: my-evolution/Locations.h:2434
-msgid "Waycross"
-msgstr ""
+#~ msgid "Glasgow"
+#~ msgstr "Глазгоу"
 
-#: my-evolution/Locations.h:2435
-msgid "Waynesboro"
-msgstr ""
+#~ msgid "Glendive"
+#~ msgstr "Гленвил"
 
-#: my-evolution/Locations.h:2436
-msgid "Webster City"
-msgstr ""
+#~ msgid "Glens Falls"
+#~ msgstr "Глен Фолс"
 
-#: my-evolution/Locations.h:2437
-msgid "Wejh"
-msgstr ""
+#~ msgid "Goiania"
+#~ msgstr "Гояня"
 
-#: my-evolution/Locations.h:2438
-msgid "Wellington"
-msgstr "Уелингтън"
+#~ msgid "Goldsboro"
+#~ msgstr "Голсбъро"
 
-#: my-evolution/Locations.h:2439
-msgid "Wenatchee"
-msgstr ""
+#~ msgid "Goodland"
+#~ msgstr "Гудленд"
 
-#: my-evolution/Locations.h:2440
-msgid "Wendover"
-msgstr ""
+#~ msgid "Goose Bay"
+#~ msgstr "Гуус Бей"
 
-#: my-evolution/Locations.h:2441
-msgid "West Atlanta"
-msgstr "Западна Атланта"
+#~ msgid "Goteborg (Landvetter)"
+#~ msgstr "Гьотеборг (Ландветер)"
 
-#: my-evolution/Locations.h:2442
-msgid "West Burke"
-msgstr ""
+#~ msgid "Goteborg (Save)"
+#~ msgstr "Гьотеборг (Сев)"
 
-#: my-evolution/Locations.h:2443
-msgid "Westerland"
-msgstr ""
+#~ msgid "Granada"
+#~ msgstr "Гранада"
 
-#: my-evolution/Locations.h:2444
-msgid "Westfield"
-msgstr ""
+#~ msgid "Grand Canyon"
+#~ msgstr "Гран Каньон"
 
-#: my-evolution/Locations.h:2445
-msgid "Westhampton"
-msgstr ""
+#~ msgid "Grand Cayman"
+#~ msgstr "Гранд Кайман"
 
-#: my-evolution/Locations.h:2446
-msgid "West Palm Beach"
-msgstr "Западен Палм Биич"
+#~ msgid "Grand Forks"
+#~ msgstr "Гранд Форкс"
 
-#: my-evolution/Locations.h:2447
-msgid "West Virginia"
-msgstr "Западна Виржиния"
+#~ msgid "Grand Island"
+#~ msgstr "Гранд Айлънд"
 
-#: my-evolution/Locations.h:2448
-msgid "West Yellowstone"
-msgstr ""
+#~ msgid "Grand Isle"
+#~ msgstr "Гранд Айл"
 
-#: my-evolution/Locations.h:2449
-msgid "West Yellowstone (2)"
-msgstr ""
+#~ msgid "Grand Junction"
+#~ msgstr "Гранд Джънкшън"
 
-#: my-evolution/Locations.h:2450
-msgid "Wheeling"
-msgstr ""
+#~ msgid "Grand Marais"
+#~ msgstr "Гранд Мер"
 
-#: my-evolution/Locations.h:2451
-msgid "Whidbey Island"
-msgstr ""
+#~ msgid "Grand Rapids"
+#~ msgstr "Гранд Рапидс"
 
-#: my-evolution/Locations.h:2452
-msgid "Whitefield"
-msgstr ""
+#~ msgid "Grandview"
+#~ msgstr "Грандвю"
 
-#: my-evolution/Locations.h:2453
-msgid "White Plains"
-msgstr ""
+#~ msgid "Grangeville"
+#~ msgstr "Грейнджвил"
 
-#: my-evolution/Locations.h:2454
-msgid "White Sulphur"
-msgstr ""
+#~ msgid "Grants"
+#~ msgstr "Грантс"
 
-#: my-evolution/Locations.h:2455
-msgid "Whittier"
-msgstr ""
+#~ msgid "Graz"
+#~ msgstr "Грац"
 
-#: my-evolution/Locations.h:2456
-msgid "Wichita"
-msgstr ""
+#~ msgid "Great Falls"
+#~ msgstr "Грейт Фолс"
 
-#: my-evolution/Locations.h:2457
-msgid "Wichita Falls"
-msgstr ""
+#~ msgid "Greeley"
+#~ msgstr "Грийли"
 
-#: my-evolution/Locations.h:2458
-msgid "Wichita-Jabara"
-msgstr ""
+#~ msgid "Green Bay"
+#~ msgstr "Грийн Бей"
 
-#: my-evolution/Locations.h:2459
-msgid "Wichita-McConnell AFB"
-msgstr ""
+#~ msgid "Green River"
+#~ msgstr "Грийн Ривър"
 
-#: my-evolution/Locations.h:2460
-msgid "Wick"
-msgstr ""
+#~ msgid "Greensboro"
+#~ msgstr "Грийнсборо"
 
-#: my-evolution/Locations.h:2461
-msgid "Wien"
-msgstr "Виена"
+#~ msgid "Greenville"
+#~ msgstr "Грийнвил"
 
-#: my-evolution/Locations.h:2462
-msgid "Wildwood"
-msgstr ""
+#~ msgid "Greenville-Spartanburg"
+#~ msgstr "Грийнвил-Спартанбърг"
 
-#: my-evolution/Locations.h:2463
-msgid "Wilkes - Barre"
-msgstr ""
+#~ msgid "Greenwood"
+#~ msgstr "Гриийнуд"
 
-#: my-evolution/Locations.h:2464
-msgid "Williams Field"
-msgstr ""
+#~ msgid "Grenoble-Saint-Geoirs"
+#~ msgstr "Гренобъл-Сен-Жо"
 
-#: my-evolution/Locations.h:2465
-msgid "Williamsport"
-msgstr ""
+#~ msgid "Griffiss AFB"
+#~ msgstr "ВВБ Грифис"
 
-#: my-evolution/Locations.h:2466
-msgid "Williston"
-msgstr "Уилстон"
+#~ msgid "Groningen"
+#~ msgstr "Грьонинген"
 
-#: my-evolution/Locations.h:2467
-msgid "Willoughby"
-msgstr ""
+#~ msgid "Grosseto"
+#~ msgstr "Гросето"
 
-#: my-evolution/Locations.h:2468
-msgid "Willow Airport"
-msgstr ""
+#~ msgid "Groton"
+#~ msgstr "Гротън"
 
-#: my-evolution/Locations.h:2469
-msgid "Wilmington"
-msgstr ""
+#~ msgid "Guadalajara"
+#~ msgstr "Гуадалахара"
 
-#: my-evolution/Locations.h:2470
-msgid "Winchester"
-msgstr "Уинчестер"
+#~ msgid "Guadalupe Pass"
+#~ msgstr "Гуаделупе Пас"
 
-#: my-evolution/Locations.h:2471
-msgid "Windsor"
-msgstr "Уиндздор"
+#~ msgid "Guanare"
+#~ msgstr "Гуанаре"
 
-#: my-evolution/Locations.h:2472
-msgid "Windsor Locks"
-msgstr ""
+#~ msgid "Guangzhou"
+#~ msgstr "Гуангжоу"
 
-#: my-evolution/Locations.h:2473
-msgid "Wink"
-msgstr ""
+#~ msgid "Guantanamo"
+#~ msgstr "Гуантанамо"
 
-#: my-evolution/Locations.h:2474
-msgid "Winnemucca"
-msgstr ""
+#~ msgid "Guarany"
+#~ msgstr "Гуарани"
 
-#: my-evolution/Locations.h:2475
-msgid "Winnipeg"
-msgstr "Уинипег"
+#~ msgid "Guaratingueta"
+#~ msgstr "Гуарантигета"
 
-#: my-evolution/Locations.h:2476
-msgid "Winslow"
-msgstr ""
+#~ msgid "Guarulhos"
+#~ msgstr "Гуарюлос"
 
-#: my-evolution/Locations.h:2477
-msgid "Winston-Salem"
-msgstr ""
+#~ msgid "Guayaquil/Simon Bolivar"
+#~ msgstr "Гуаякул/Симон Боливар"
 
-#: my-evolution/Locations.h:2478
-msgid "Winter Haven"
-msgstr ""
+#~ msgid "Guaymas"
+#~ msgstr "Гуаяамас"
 
-#: my-evolution/Locations.h:2479
-msgid "Winter Park"
-msgstr ""
+#~ msgid "Guidonia"
+#~ msgstr "Гуидоня"
 
-#: my-evolution/Locations.h:2480
-msgid "Wiscasset"
-msgstr ""
+#~ msgid "Gulfport"
+#~ msgstr "Гълфпорт"
 
-#: my-evolution/Locations.h:2481
-msgid "Wisconsin"
-msgstr "Уинсконсин"
+#~ msgid "Gulkana"
+#~ msgstr "Гулкана"
 
-#: my-evolution/Locations.h:2482
-msgid "Wisconsin Rapids"
-msgstr ""
+#~ msgid "Gullfax C"
+#~ msgstr "Гълфакс Ц"
 
-#: my-evolution/Locations.h:2483
-msgid "Wise"
-msgstr ""
+#~ msgid "Gunnison"
+#~ msgstr "Гънисън"
 
-#: my-evolution/Locations.h:2484
-msgid "Woensdrecht"
-msgstr ""
+#~ msgid "Gunnison (2)"
+#~ msgstr "Гънисън (2)"
 
-#: my-evolution/Locations.h:2485
-msgid "Wolf Point"
-msgstr ""
+#~ msgid "Guriat"
+#~ msgstr "Гуриат"
 
-#: my-evolution/Locations.h:2486
-msgid "Woong Cheon"
-msgstr ""
+#~ msgid "Gustavus"
+#~ msgstr "Густавус"
 
-#: my-evolution/Locations.h:2487
-msgid "Wooster"
-msgstr ""
+#~ msgid "Guymon"
+#~ msgstr "Гимон"
 
-#: my-evolution/Locations.h:2488
-msgid "Worcester"
-msgstr ""
+#~ msgid "Habana"
+#~ msgstr "Хавана"
 
-#: my-evolution/Locations.h:2489
-msgid "Worland"
-msgstr ""
+#~ msgid "Hachijojima Airport"
+#~ msgstr "Летище Хачижожима"
 
-#: my-evolution/Locations.h:2490
-msgid "Worthington"
-msgstr ""
+#~ msgid "Hachinohe Ab"
+#~ msgstr "ВБ Хачинохе"
 
-#: my-evolution/Locations.h:2491
-msgid "Wrangell"
-msgstr "Врангел"
+#~ msgid "Hafr Al-Batin"
+#~ msgstr "Хафр Ал-Батин"
 
-#: my-evolution/Locations.h:2492
-msgid "Wrightstown / Mcguire AFB"
-msgstr ""
+#~ msgid "Hagerstown"
+#~ msgstr "Хагерстаун"
 
-#: my-evolution/Locations.h:2493
-msgid "Wuchia Observatory"
-msgstr ""
+#~ msgid "Hail"
+#~ msgstr "Град"
 
-#: my-evolution/Locations.h:2494
-msgid "Wyoming"
-msgstr "Юоминг"
+#~ msgid "Hailey-Sun Valley"
+#~ msgstr "Хейли-Сън Вали"
 
-#: my-evolution/Locations.h:2495
-msgid "Xiamen"
-msgstr ""
+#~ msgid "Haines"
+#~ msgstr "Хейнс"
 
-#: my-evolution/Locations.h:2496
-msgid "Yacuiba"
-msgstr ""
+#~ msgid "Hakodate Airport"
+#~ msgstr "Летище Хакодате"
 
-#: my-evolution/Locations.h:2497
-msgid "Yakima"
-msgstr "Якима"
+#~ msgid "Halifax"
+#~ msgstr "Халифакс"
 
-#: my-evolution/Locations.h:2498
-msgid "Yakushima"
-msgstr "Юкошима"
+#~ msgid "Hamamatsu Ab"
+#~ msgstr "Хамаматсу"
 
-#: my-evolution/Locations.h:2499
-msgid "Yakutat"
-msgstr "Якута"
+#~ msgid "Hamburg"
+#~ msgstr "Хамбург"
 
-#: my-evolution/Locations.h:2500
-msgid "Yakutsk"
-msgstr "Якутск"
+#~ msgid "Hamburg-Finkenwerder"
+#~ msgstr "Хамбург-Финкенвердер"
 
-#: my-evolution/Locations.h:2501
-msgid "Yamagata Airport"
-msgstr "Летище Ямагута"
+#~ msgid "Hamilton"
+#~ msgstr "Хамилтън"
 
-#: my-evolution/Locations.h:2502
-msgid "Yamaguchi Ube Airport"
-msgstr ""
+#~ msgid "Hammerfest"
+#~ msgstr "Хамърфест"
 
-#: my-evolution/Locations.h:2503
-msgid "Yankton"
-msgstr ""
+#~ msgid "Hampton"
+#~ msgstr "Хамптън"
 
-#: my-evolution/Locations.h:2504
-msgid "Yao Airport"
-msgstr ""
+#~ msgid "Hanamaki Airport"
+#~ msgstr "Летище Ханамаки"
 
-#: my-evolution/Locations.h:2505
-msgid "Yechon Ab"
-msgstr ""
+#~ msgid "Hancock"
+#~ msgstr "Ханкок"
 
-#: my-evolution/Locations.h:2506
-msgid "Yekaterinburg"
-msgstr "Екатеринбург"
+#~ msgid "Hangzhou"
+#~ msgstr "Ханджоу"
 
-#: my-evolution/Locations.h:2507
-msgid "Yellowknife"
-msgstr ""
+#~ msgid "Hanksville"
+#~ msgstr "Ханксвил"
 
-#: my-evolution/Locations.h:2508
-msgid "Yellowstone"
-msgstr "Йелоустон"
+#~ msgid "Hannover"
+#~ msgstr "Хановер"
 
-#: my-evolution/Locations.h:2510
-msgid "Yenbo"
-msgstr ""
+#~ msgid "Ha Noi"
+#~ msgstr "Ханой"
 
-#: my-evolution/Locations.h:2511
-msgid "Yeoju Range"
-msgstr ""
+#~ msgid "Harbor Beach"
+#~ msgstr "Харбър Бийч"
 
-#: my-evolution/Locations.h:2512
-msgid "Yeonpyeungdo"
-msgstr ""
+#~ msgid "Harlingen"
+#~ msgstr "Харлинген"
 
-#: my-evolution/Locations.h:2513
-msgid "Yeovilton"
-msgstr ""
+#~ msgid "Harlowton"
+#~ msgstr "Харлоутън"
 
-#: my-evolution/Locations.h:2514
-msgid "Yokosuka Fwf"
-msgstr ""
+#~ msgid "Harrisburg"
+#~ msgstr "Харисбърг"
 
-#: my-evolution/Locations.h:2515
-msgid "Yokota Ab"
-msgstr ""
+#~ msgid "Harrison"
+#~ msgstr "Харисон"
 
-#: my-evolution/Locations.h:2516
-msgid "Yongsan/H-208 Hp"
-msgstr ""
+#~ msgid "Harstad/Narvik/Evenes"
+#~ msgstr "Харстад/Нарвик/Ивънес"
 
-#: my-evolution/Locations.h:2517
-msgid "Yoro"
-msgstr ""
+#~ msgid "Hartford"
+#~ msgstr "Хартфорд"
 
-#: my-evolution/Locations.h:2518
-msgid "Yosu"
-msgstr ""
+#~ msgid "Hassi-Messaoud"
+#~ msgstr "Хаси-Месод"
 
-#: my-evolution/Locations.h:2519
-msgid "Youngstown"
-msgstr ""
+#~ msgid "Hastings"
+#~ msgstr "Хастингс"
 
-#: my-evolution/Locations.h:2520
-msgid "Ypsilanti"
-msgstr "Упсиланти"
+#~ msgid "Haugesund"
+#~ msgstr "Хагесунд"
 
-#: my-evolution/Locations.h:2522
-msgid "Yukon"
-msgstr "Юкон"
+#~ msgid "Havre"
+#~ msgstr "Хавър"
 
-#: my-evolution/Locations.h:2523
-msgid "Yuma MCAS"
-msgstr ""
+#~ msgid "Hawaii"
+#~ msgstr "Хавай"
 
-#: my-evolution/Locations.h:2524
-msgid "Yurimaguas"
-msgstr ""
+#~ msgid "Hawthorne"
+#~ msgstr "Хоторн"
 
-#: my-evolution/Locations.h:2525
-msgid "Yuzhno-Sakhalinsk"
-msgstr ""
+#~ msgid "Hayden"
+#~ msgstr "Хайдън"
 
-#: my-evolution/Locations.h:2526
-msgid "Zacatecas"
-msgstr ""
+#~ msgid "Hayes River"
+#~ msgstr "Хайес Ривър"
 
-#: my-evolution/Locations.h:2527
-msgid "Zadar"
-msgstr "Задар"
+#~ msgid "Hays"
+#~ msgstr "Хейс"
 
-#: my-evolution/Locations.h:2528
-msgid "Zagreb"
-msgstr "Загреб"
+#~ msgid "Hayward"
+#~ msgstr "Хейуърд"
 
-#: my-evolution/Locations.h:2529
-msgid "Zakinthos"
-msgstr "Закинтош"
+#~ msgid "Healy River"
+#~ msgstr "Хийли Ривър"
 
-#: my-evolution/Locations.h:2530
-msgid "Zama Airfield"
-msgstr ""
+#~ msgid "Helena"
+#~ msgstr "Хелена"
 
-#: my-evolution/Locations.h:2531
-msgid "Zanesville"
-msgstr "Занесвил"
+#~ msgid "Helsinki"
+#~ msgstr "Хелзинки"
 
-#: my-evolution/Locations.h:2532
-msgid "Zaragoza"
-msgstr "Сарагоса"
+#~ msgid "Henderson"
+#~ msgstr "Хендерсон"
 
-#: my-evolution/Locations.h:2533
-msgid "Zell Am See"
-msgstr ""
+#~ msgid "Hengchun"
+#~ msgstr "Хенгчун"
 
-#: my-evolution/Locations.h:2534
-msgid "Zuni Pueblo"
-msgstr "Зуни Пуебло"
+#~ msgid "Hermosillo"
+#~ msgstr "Хермосило"
 
-#: my-evolution/Locations.h:2535
-msgid "Zurich"
-msgstr "Цюрих"
+#~ msgid "Hibbing"
+#~ msgstr "Хибинг"
 
-#: my-evolution/component-factory.c:56
-msgid "Folder containing the Evolution Summary"
-msgstr "Папката съдържа Обобщение на Evolution"
+#~ msgid "Hickory"
+#~ msgstr "Хикъри"
 
-#: my-evolution/e-summary-calendar.c:381
-msgid "Appointments"
-msgstr "Срещите"
+#~ msgid "Hill City"
+#~ msgstr "Хил Сити"
 
-#: my-evolution/e-summary-calendar.c:389
-msgid "No appointments."
-msgstr ""
+#~ msgid "Hillsboro"
+#~ msgstr "Хилсбъро"
 
-#: my-evolution/e-summary-calendar.c:406
-msgid "%k:%M %d %B"
-msgstr "%k:%M %d %B"
+#~ msgid "Hilo"
+#~ msgstr "Хило"
 
-#: my-evolution/e-summary-calendar.c:408
-msgid "%l:%M%p %d %B"
-msgstr ""
+#~ msgid "Hinesville"
+#~ msgstr "Хайнсвил"
 
-#: my-evolution/e-summary-calendar.c:426
-msgid "No description"
-msgstr "Няма Описание"
+#~ msgid "Hiroshima Airport"
+#~ msgstr "Летище Хирошима"
 
-#: my-evolution/e-summary-mail.c:189
-msgid "Mail summary"
-msgstr "Обобщение на Поща"
+#~ msgid "Hobart"
+#~ msgstr "Хобарт"
 
-#: my-evolution/e-summary-preferences.c:355
-msgid "Dictionary.com Word of the Day"
-msgstr "Dictionary.com Дума за Деня"
+#~ msgid "Hobbs"
+#~ msgstr "Хобс"
 
-#: my-evolution/e-summary-preferences.c:373
-msgid "Quotes of the Day"
-msgstr "Цитат на деня"
+#~ msgid "Ho Chi Minh"
+#~ msgstr "Хошимин"
 
-#: my-evolution/e-summary-preferences.c:565
-msgid "New News Feed"
-msgstr ""
+#~ msgid "Hodeidah"
+#~ msgstr "Ходейда"
 
-#: my-evolution/e-summary-preferences.c:581
-msgid "_URL:"
-msgstr ""
+#~ msgid "Hof"
+#~ msgstr "Хоф"
 
-#: my-evolution/e-summary-rdf.c:315
-msgid "Error downloading RDF"
-msgstr "Грешка при зареждането на RDF"
+#~ msgid "Hoffman"
+#~ msgstr "Хофман"
 
-#: my-evolution/e-summary-rdf.c:453
-msgid "News Feed"
-msgstr "Новини"
+#~ msgid "Hofu Ab"
+#~ msgstr "ВБ Хофу"
 
-#: my-evolution/e-summary-shown.c:496
-msgid "All"
-msgstr ""
+#~ msgid "Hohenems"
+#~ msgstr "Хохенемс"
 
-#: my-evolution/e-summary-shown.c:521 my-evolution/e-summary-table.c:58
-msgid "Shown"
-msgstr ""
+#~ msgid "Holguin"
+#~ msgstr "Холген"
 
-#: my-evolution/e-summary-tasks.c:330
-msgid "No tasks"
-msgstr "Няма задачи"
+#~ msgid "Homer"
+#~ msgstr "Хомър"
 
-#: my-evolution/e-summary-tasks.c:364
-msgid "blue"
-msgstr ""
+#~ msgid "Homestead AFB"
+#~ msgstr "ВВБ Хоумстед"
 
-#: my-evolution/e-summary-tasks.c:364
-msgid "(No Description)"
-msgstr "(Без описание)"
+#~ msgid "Hondo"
+#~ msgstr "Хондо"
 
-#: my-evolution/e-summary-weather.c:73
-msgid "My Weather"
-msgstr "Моето Време"
+#~ msgid "Honningsvag"
+#~ msgstr "Хьонингсваг"
 
-#: my-evolution/e-summary-weather.c:262
-msgid "There was an error downloading data for"
-msgstr "Имаше грешка по време на изтеглянето на информация за"
+#~ msgid "Honolulu"
+#~ msgstr "Хонолулу"
 
-#: my-evolution/e-summary-weather.c:479 my-evolution/my-evolution.glade.h:16
-msgid "Weather"
-msgstr "Време"
+#~ msgid "Hoonah"
+#~ msgstr "Хуна"
 
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
-#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:583
-msgid "KBOS"
-msgstr "KBOS"
+#~ msgid "Hoquiam"
+#~ msgstr "Хокам"
 
-#: my-evolution/e-summary.c:204
-msgid "%A, %B %e %Y"
-msgstr "%A, %B %e %Y"
+#~ msgid "Hot Springs"
+#~ msgstr "Хот Спрингс"
 
-#: my-evolution/e-summary.c:533
-msgid "Please wait..."
-msgstr "Моля почакайте..."
+#~ msgid "Houghton Lake"
+#~ msgstr "Хютън Лейк"
 
-#: my-evolution/e-summary.c:622 ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr "Печат на Обобщение"
+#~ msgid "Houlton"
+#~ msgstr "Холтън"
 
-#: my-evolution/e-summary.c:655
-msgid "Printing of Summary failed"
-msgstr "Неуспешно печатане на Обобщено"
+#~ msgid "Houma"
+#~ msgstr "Хума"
 
-#: my-evolution/metar.c:30
-msgid " F"
-msgstr " F"
+#~ msgid "Houston-Bush"
+#~ msgstr "Хюстън-Буш"
 
-#: my-evolution/metar.c:30
-msgid " C"
-msgstr " C"
+#~ msgid "Houston-Clover"
+#~ msgstr "Хюстън-Кловър"
 
-#: my-evolution/metar.c:34
-msgid "knots"
-msgstr "възела"
+#~ msgid "Houston-Ellington Field"
+#~ msgstr "Хюстън-Елингтън Фийлд"
 
-#: my-evolution/metar.c:34
-msgid "kph"
-msgstr "км./ч."
+#~ msgid "Houston-Hobby"
+#~ msgstr "Хюстън-Хоби"
 
-#: my-evolution/metar.c:39
-msgid "inHg"
-msgstr "инча ж.ст."
+#~ msgid "Houston-Hooks"
+#~ msgstr "Хюстън-Хукс"
 
-#: my-evolution/metar.c:39
-msgid "mmHg"
-msgstr "mmHg"
+#~ msgid "Howard AFB"
+#~ msgstr "ВВБ Хауърд"
 
-#: my-evolution/metar.c:42
-msgid "miles"
-msgstr "мили"
+#~ msgid "Hsinchu"
+#~ msgstr "Хсинчу"
 
-#: my-evolution/metar.c:42
-msgid "kilometers"
-msgstr "километри"
+#~ msgid "Huanuco"
+#~ msgstr "Хуануко"
 
-#: my-evolution/metar.c:45
-msgid "Clear sky"
-msgstr "Ясно небе"
+#~ msgid "Huehuetenango"
+#~ msgstr "Хуехуетенанго"
 
-#: my-evolution/metar.c:46
-msgid "Broken clouds"
-msgstr "Разкъсани облаци"
+#~ msgid "Hulien"
+#~ msgstr "Хулиен"
 
-#: my-evolution/metar.c:47
-msgid "Scattered clouds"
-msgstr "Разкъсана облачност"
+#~ msgid "Humberside"
+#~ msgstr "Хъмбърсайд"
 
-#: my-evolution/metar.c:48
-msgid "Few clouds"
-msgstr "Малко облаци"
+#~ msgid "Huntington"
+#~ msgstr "Хънгтингтън"
 
-#: my-evolution/metar.c:49
-msgid "Overcast"
-msgstr "Облачно"
+#~ msgid "Huntsville"
+#~ msgstr "Хънтсвил"
 
-#: my-evolution/metar.c:57 my-evolution/metar.c:75 my-evolution/metar.c:486
-msgid "Invalid"
-msgstr "Неправилен"
+#~ msgid "Hurlburt"
+#~ msgstr "Хърлбърт"
 
-#: my-evolution/metar.c:64
-msgid "Variable"
-msgstr "Променливо"
+#~ msgid "Huron"
+#~ msgstr "Хюрон"
 
-#: my-evolution/metar.c:65
-msgid "North"
-msgstr "север"
+#~ msgid "Hutchinson"
+#~ msgstr "Хътчисън"
 
-#: my-evolution/metar.c:65
-msgid "North - NorthEast"
-msgstr "север-североизток"
+#~ msgid "Hyakuri Ab"
+#~ msgstr "ВБ Хаякири"
 
-#: my-evolution/metar.c:65
-msgid "Northeast"
-msgstr "североизток"
+#~ msgid "Hyannis"
+#~ msgstr "Хаянис"
 
-#: my-evolution/metar.c:65
-msgid "East - NorthEast"
-msgstr "изток-североизток"
+#~ msgid "Hyderabad"
+#~ msgstr "Хидерабад"
 
-#: my-evolution/metar.c:66
-msgid "East"
-msgstr "Изток"
+#~ msgid "Hyeres-Le Palyvestre"
+#~ msgstr "Хиерес-Ле Паливестре"
 
-#: my-evolution/metar.c:66
-msgid "East - Southeast"
-msgstr "изток-югоизток"
+#~ msgid "Iasi"
+#~ msgstr "Иаси"
 
-#: my-evolution/metar.c:66
-msgid "Southeast"
-msgstr "югоизток"
+#~ msgid "Ibiza"
+#~ msgstr "Ибиза"
 
-#: my-evolution/metar.c:66
-msgid "South - Southeast"
-msgstr "юг-югоизток"
+#~ msgid "Ichikawa"
+#~ msgstr "Ичикава"
 
-#: my-evolution/metar.c:67
-msgid "South"
-msgstr "юг"
+#~ msgid "Idaho Falls"
+#~ msgstr "Айдахо фолс"
 
-#: my-evolution/metar.c:67
-msgid "South - Southwest"
-msgstr "юг-югозапад"
+#~ msgid "Iguazu"
+#~ msgstr "Игуазу"
 
-#: my-evolution/metar.c:67
-msgid "Southwest"
-msgstr "югозапад"
+#~ msgid "Iki Airport"
+#~ msgstr "Летище Ики"
 
-#: my-evolution/metar.c:67
-msgid "West - Southwest"
-msgstr "запад-югозапад"
+#~ msgid "Iliamna"
+#~ msgstr "Илиамна"
 
-#: my-evolution/metar.c:68
-msgid "West"
-msgstr "Запад"
+#~ msgid "Illinois"
+#~ msgstr "Илинойс"
 
-#: my-evolution/metar.c:68
-msgid "West - Northwest"
-msgstr "запад-северозапад"
+#~ msgid "Imperial"
+#~ msgstr "Импириъл"
 
-#: my-evolution/metar.c:68
-msgid "Northwest"
-msgstr "северозапад"
+#~ msgid "Imperial (2)"
+#~ msgstr "Импириъл (2)"
 
-#: my-evolution/metar.c:68
-msgid "North - Northwest"
-msgstr "север-северозапад"
+#~ msgid "Imperial Beach"
+#~ msgstr "Импириъл Бийч"
 
-#. DRIZZLE
-#: my-evolution/metar.c:128
-msgid "Drizzle"
-msgstr "Ръмене"
+#~ msgid "In Amenas"
+#~ msgstr "Ин Аменас"
 
-#: my-evolution/metar.c:129
-msgid "Drizzle in the vicinity"
-msgstr "Ръмене в околността"
+#~ msgid "Indiana"
+#~ msgstr "Индиана"
 
-#: my-evolution/metar.c:130
-msgid "Light drizzle"
-msgstr "Леко ръмене"
+#~ msgid "Indianapolis"
+#~ msgstr "Индианаполис"
 
-#: my-evolution/metar.c:131
-msgid "Moderate drizzle"
-msgstr "Умерено преваляване"
+#~ msgid "Innsbruck"
+#~ msgstr "Инсбрук"
 
-#: my-evolution/metar.c:132
-msgid "Heavy drizzle"
-msgstr "Силно ръмене"
+#~ msgid "International Falls"
+#~ msgstr "Интернешънъл Фолс"
 
-#: my-evolution/metar.c:133
-msgid "Shallow drizzle"
-msgstr "Незначително ръмене"
+#~ msgid "Intracoastal"
+#~ msgstr "Интракоустъл"
 
-#: my-evolution/metar.c:134
-msgid "Patches of drizzle"
-msgstr ""
+#~ msgid "Inverness"
+#~ msgstr "Инвърнес"
 
-#: my-evolution/metar.c:135
-msgid "Partial drizzle"
-msgstr "Частично ръмене"
+#~ msgid "Inyokern"
+#~ msgstr "Инйокерн"
 
-#: my-evolution/metar.c:136 my-evolution/metar.c:151
-msgid "Thunderstorm"
-msgstr "Гръмотевична буря"
+#~ msgid "Iowa"
+#~ msgstr "Айова"
 
-#: my-evolution/metar.c:137
-msgid "Windy drizzle"
-msgstr "Ветровито със ситен дъжд"
+#~ msgid "Iowa City"
+#~ msgstr "Айова Сити"
 
-#: my-evolution/metar.c:138
-msgid "Showers"
-msgstr "Преваляване"
+#~ msgid "Iqaluit"
+#~ msgstr "Икалуит"
 
-#: my-evolution/metar.c:139
-msgid "Drifting drizzle"
-msgstr ""
+#~ msgid "Iquique/Diego Arac"
+#~ msgstr "Икике/Диего Арак"
 
-#: my-evolution/metar.c:140
-msgid "Freezing drizzle"
-msgstr ""
+#~ msgid "Iquitos"
+#~ msgstr "Икитос"
 
-#. RAIN
-#: my-evolution/metar.c:143
-msgid "Rain"
-msgstr "Дъжд"
+#~ msgid "Iraklion"
+#~ msgstr "Ираклион"
 
-#: my-evolution/metar.c:144
-msgid "Rain in the vicinity"
-msgstr "Дъжд в околноста"
+#~ msgid "Iran, Islamic Republic of"
+#~ msgstr "Иран, Ислямска Република"
 
-#: my-evolution/metar.c:145
-msgid "Light rain"
-msgstr "Лек дъжд"
+#~ msgid "Iron Mountain"
+#~ msgstr "Айрън Маунтин"
 
-#: my-evolution/metar.c:146
-msgid "Moderate rain"
-msgstr "Умерен дъжд"
+#~ msgid "Ironwood"
+#~ msgstr "Аърън Уд"
 
-#: my-evolution/metar.c:147
-msgid "Heavy rain"
-msgstr "Силен дъжд"
+#~ msgid "Iruma Ab"
+#~ msgstr "ВБ Ирума"
 
-#: my-evolution/metar.c:148
-msgid "Shallow rain"
-msgstr "Слаб дъжд"
+#~ msgid "Islamabad"
+#~ msgstr "Исламабад"
 
-#: my-evolution/metar.c:149
-msgid "Patches of rain"
-msgstr ""
+#~ msgid "Islip"
+#~ msgstr "Ислип"
 
-#: my-evolution/metar.c:150
-msgid "Partial rainfall"
-msgstr "Частично преваляване"
+#~ msgid "Istanbul"
+#~ msgstr "Истанбул"
 
-#: my-evolution/metar.c:152
-msgid "Blowing rainfall"
-msgstr "Преваляване с вятър"
+#~ msgid "Itaituba"
+#~ msgstr "Итаитуба"
 
-#: my-evolution/metar.c:153
-msgid "Rain showers"
-msgstr "Преваляване от дъжд"
+#~ msgid "Ithaca"
+#~ msgstr "Итака"
 
-#: my-evolution/metar.c:154
-msgid "Drifting rain"
-msgstr ""
+#~ msgid "Ivano-Frankivsk"
+#~ msgstr "Ивано-Франкивск"
 
-#: my-evolution/metar.c:155
-msgid "Freezing rain"
-msgstr "Леден Дъжд"
+#~ msgid "Iwakuni MCAS"
+#~ msgstr "MCAS Ивакуни"
 
-#. SNOW
-#: my-evolution/metar.c:158
-msgid "Snow"
-msgstr "Сняг"
+#~ msgid "Iwojima"
+#~ msgstr "Иводжима"
 
-#: my-evolution/metar.c:159
-msgid "Snow in the vicinity"
-msgstr "Сняг в околноста"
+#~ msgid "Ixtapa"
+#~ msgstr "Икстапа"
 
-#: my-evolution/metar.c:160
-msgid "Light snow"
-msgstr "Слаб сняг"
+#~ msgid "Izmir/Adnan Menderes"
+#~ msgstr "Измир/Аднан Мендерес"
 
-#: my-evolution/metar.c:161
-msgid "Moderate snow"
-msgstr "Умерен сняг"
+#~ msgid "Izmir/Cigli"
+#~ msgstr "Измир/Чигли"
 
-#: my-evolution/metar.c:162
-msgid "Heavy snow"
-msgstr "Силен сняг"
+#~ msgid "Izmit"
+#~ msgstr "Измит"
 
-#: my-evolution/metar.c:163
-msgid "Shallow snow"
-msgstr "Незначителен сняг"
+#~ msgid "Izumo Airport"
+#~ msgstr "Летище Изумо"
 
-#: my-evolution/metar.c:164
-msgid "Patches of snow"
-msgstr ""
+#~ msgid "Jackson"
+#~ msgstr "Джаксън"
 
-#: my-evolution/metar.c:165
-msgid "Partial snowfall"
-msgstr ""
+#~ msgid "Jacksonville"
+#~ msgstr "Джаксънвил"
 
-#: my-evolution/metar.c:166 my-evolution/metar.c:181
-msgid "Snowstorm"
-msgstr "Снежна буря"
+#~ msgid "Jacksonville-Craig Airport"
+#~ msgstr "Джаксънвил-Летище Крейг"
 
-#: my-evolution/metar.c:167
-msgid "Blowing snowfall"
-msgstr ""
+#~ msgid "Jacksonville NAS"
+#~ msgstr "ВВЛ Джаксънвил"
 
-#: my-evolution/metar.c:168
-msgid "Snow showers"
-msgstr ""
+#~ msgid "Jaffrey"
+#~ msgstr "Джафри"
 
-#: my-evolution/metar.c:169
-msgid "Drifting snow"
-msgstr ""
+#~ msgid "Jamestown"
+#~ msgstr "Джеймстаун"
 
-#: my-evolution/metar.c:170
-msgid "Freezing snow"
-msgstr ""
+#~ msgid "Janesville"
+#~ msgstr "Джейнсвил"
 
-#. SNOW_GRAINS
-#: my-evolution/metar.c:173
-msgid "Snow grains"
-msgstr ""
+#~ msgid "Jan Smuts"
+#~ msgstr "Ян Смутс"
 
-#: my-evolution/metar.c:174
-msgid "Snow grains in the vicinity"
-msgstr ""
+#~ msgid "Jeddah King Abdul Aziz International Airport"
+#~ msgstr "Международно Летище Джеда крал Абдул Азиз"
 
-#: my-evolution/metar.c:175
-msgid "Light snow grains"
-msgstr ""
+#~ msgid "Jefferson City"
+#~ msgstr "Джеферсън сити"
 
-#: my-evolution/metar.c:176
-msgid "Moderate snow grains"
-msgstr ""
+#~ msgid "Jerez"
+#~ msgstr "Херес"
 
-#: my-evolution/metar.c:177
-msgid "Heavy snow grains"
-msgstr ""
+#~ msgid "Jinotega"
+#~ msgstr "Инотега"
 
-#: my-evolution/metar.c:178
-msgid "Shallow snow grains"
-msgstr ""
+#~ msgid "Johan A. Pengel"
+#~ msgstr "Йохан А. Пенгел"
 
-#: my-evolution/metar.c:179
-msgid "Patches of snow grains"
-msgstr ""
+#~ msgid "Johnstown"
+#~ msgstr "Джонстаун"
 
-#: my-evolution/metar.c:180
-msgid "Partial snow grains"
-msgstr ""
+#~ msgid "Jonesboro"
+#~ msgstr "Джоунсбъро"
 
-#: my-evolution/metar.c:182
-msgid "Blowing snow grains"
-msgstr ""
+#~ msgid "Jonkoping"
+#~ msgstr "Йонкьопинг"
 
-#: my-evolution/metar.c:183
-msgid "Snow grain showers"
-msgstr ""
+#~ msgid "Joplin"
+#~ msgstr "Джаплън"
 
-#: my-evolution/metar.c:184
-msgid "Drifting snow grains"
-msgstr ""
+#~ msgid "Juanjui"
+#~ msgstr "Джуанджу"
 
-#: my-evolution/metar.c:185
-msgid "Freezing snow grains"
-msgstr ""
+#~ msgid "Juan Santamaria"
+#~ msgstr "Хуан Сантамариа"
 
-#. ICE_CRYSTALS
-#: my-evolution/metar.c:188
-msgid "Ice crystals"
-msgstr ""
+#~ msgid "Juigalpa"
+#~ msgstr "Хуигалпа"
 
-#: my-evolution/metar.c:189
-msgid "Ice crystals in the vicinity"
-msgstr ""
+#~ msgid "Jujuy"
+#~ msgstr "Джуджуи"
 
-#: my-evolution/metar.c:190
-msgid "Few ice crystals"
-msgstr ""
+#~ msgid "Juliaca"
+#~ msgstr "Джулиака"
 
-#: my-evolution/metar.c:191
-msgid "Moderate ice crystals"
-msgstr ""
+#~ msgid "Junction"
+#~ msgstr "Джънкшън"
 
-#: my-evolution/metar.c:192
-msgid "Heavy ice crystals"
-msgstr ""
+#~ msgid "Juneau"
+#~ msgstr "Жуно"
 
-#: my-evolution/metar.c:194
-msgid "Patches of ice crystals"
-msgstr ""
+#~ msgid "Kadena Ab"
+#~ msgstr "Кадена"
 
-#: my-evolution/metar.c:195
-msgid "Partial ice crystals"
-msgstr ""
+#~ msgid "Kagoshima Airport"
+#~ msgstr "Летище Кагошима"
 
-#: my-evolution/metar.c:196
-msgid "Ice crystal storm"
-msgstr ""
+#~ msgid "Kahului"
+#~ msgstr "Каулуи"
 
-#: my-evolution/metar.c:197
-msgid "Blowing ice crystals"
-msgstr ""
+#~ msgid "Kailua-Kona"
+#~ msgstr "Каилуа-Кона"
 
-#: my-evolution/metar.c:198
-msgid "Showers of ice crystals"
-msgstr ""
+#~ msgid "Kake"
+#~ msgstr "Каке"
 
-#: my-evolution/metar.c:199
-msgid "Drifting ice crystals"
-msgstr ""
+#~ msgid "Kalamata"
+#~ msgstr "Каламата"
 
-#: my-evolution/metar.c:200
-msgid "Freezing ice crystals"
-msgstr ""
+#~ msgid "Kalamazoo"
+#~ msgstr "Каламазо"
 
-#. ICE_PELLETS
-#: my-evolution/metar.c:203
-msgid "Ice pellets"
-msgstr ""
+#~ msgid "Kalispell"
+#~ msgstr "Калиспел"
 
-#: my-evolution/metar.c:204
-msgid "Ice pellets in the vicinity"
-msgstr ""
+#~ msgid "Kamigoto"
+#~ msgstr "Камигото"
 
-#: my-evolution/metar.c:205
-msgid "Few ice pellets"
-msgstr ""
+#~ msgid "Kaneohe"
+#~ msgstr "Канеое"
 
-#: my-evolution/metar.c:206
-msgid "Moderate ice pellets"
-msgstr ""
+#~ msgid "Kangshan"
+#~ msgstr "Кангшан"
 
-#: my-evolution/metar.c:207
-msgid "Heavy ice pellets"
-msgstr ""
+#~ msgid "Kanoya Ab"
+#~ msgstr "ВБ Каноя"
 
-#: my-evolution/metar.c:208
-msgid "Shallow ice pellets"
-msgstr ""
+#~ msgid "Kansai International Airport"
+#~ msgstr "Канзас международно летище"
 
-#: my-evolution/metar.c:209
-msgid "Patches of ice pellets"
-msgstr ""
+#~ msgid "Kansas"
+#~ msgstr "Канзас"
 
-#: my-evolution/metar.c:210
-msgid "Partial ice pellets"
-msgstr ""
+#~ msgid "Kansas City"
+#~ msgstr "Канзас Сити"
 
-#: my-evolution/metar.c:211
-msgid "Ice pellet storm"
-msgstr ""
+#~ msgid "Kansas City-Gladstone"
+#~ msgstr "Канзас Сити-Гладстън"
 
-#: my-evolution/metar.c:212
-msgid "Blowing ice pellets"
-msgstr ""
+#~ msgid "Kaohsiung"
+#~ msgstr "Каошиунг"
 
-#: my-evolution/metar.c:213
-msgid "Showers of ice pellets"
-msgstr ""
+#~ msgid "Karachi"
+#~ msgstr "Карачи"
 
-#: my-evolution/metar.c:214
-msgid "Drifting ice pellets"
-msgstr ""
+#~ msgid "Karup"
+#~ msgstr "Каръп"
 
-#: my-evolution/metar.c:215
-msgid "Freezing ice pellets"
-msgstr ""
+#~ msgid "Kassel-Calden"
+#~ msgstr "Касел-Калдън"
 
-#: my-evolution/metar.c:219
-msgid "Hail in the vicinity"
-msgstr ""
+#~ msgid "Kasumigaura Ab"
+#~ msgstr "ВБ Касумигуара"
 
-#: my-evolution/metar.c:220 my-evolution/metar.c:235
-msgid "Light hail"
-msgstr "Лек град"
+#~ msgid "Kasuminome Ab"
+#~ msgstr "ВБ Касуминоме"
 
-#: my-evolution/metar.c:221
-msgid "Moderate hail"
-msgstr "Умерен град"
+#~ msgid "Katowice"
+#~ msgstr "Катовице"
 
-#: my-evolution/metar.c:222
-msgid "Heavy hail"
-msgstr "Силен град"
+#~ msgid "Kavala"
+#~ msgstr "Кавала"
 
-#: my-evolution/metar.c:223
-msgid "Shallow hail"
-msgstr ""
+#~ msgid "Kayseri"
+#~ msgstr "Кайзери"
 
-#: my-evolution/metar.c:224
-msgid "Patches of hail"
-msgstr ""
+#~ msgid "Kazan"
+#~ msgstr "Казан"
 
-#: my-evolution/metar.c:225
-msgid "Partial hail"
-msgstr ""
+#~ msgid "Kearney"
+#~ msgstr "Кърни"
 
-#: my-evolution/metar.c:226
-msgid "Hailstorm"
-msgstr "Буря с градушка"
+#~ msgid "Keene"
+#~ msgstr "Кийн"
 
-#: my-evolution/metar.c:227
-msgid "Blowing hail"
-msgstr ""
+#~ msgid "Kefallinia"
+#~ msgstr "Кафелиния"
 
-#: my-evolution/metar.c:228
-msgid "Hail showers"
-msgstr ""
+#~ msgid "Keflavik"
+#~ msgstr "Кефлавик"
 
-#: my-evolution/metar.c:229
-msgid "Drifting hail"
-msgstr ""
+#~ msgid "Kenai"
+#~ msgstr "Кенай"
 
-#: my-evolution/metar.c:230
-msgid "Freezing hail"
-msgstr ""
+#~ msgid "Kenosha"
+#~ msgstr "Кеноша"
 
-#. SMALL_HAIL
-#: my-evolution/metar.c:233
-msgid "Small hail"
-msgstr ""
+#~ msgid "Keokuk"
+#~ msgstr "Кеокук"
 
-#: my-evolution/metar.c:234
-msgid "Small hail in the vicinity"
-msgstr ""
+#~ msgid "Kerkira"
+#~ msgstr "Керкира"
 
-#: my-evolution/metar.c:236
-msgid "Moderate small hail"
-msgstr ""
+#~ msgid "Kerman"
+#~ msgstr "Керман"
 
-#: my-evolution/metar.c:237
-msgid "Heavy small hail"
-msgstr ""
+#~ msgid "Ketchikan"
+#~ msgstr "Кечикан"
 
-#: my-evolution/metar.c:238
-msgid "Shallow small hail"
-msgstr ""
+#~ msgid "Key West"
+#~ msgstr "Кий Уест"
 
-#: my-evolution/metar.c:239
-msgid "Patches of small hail"
-msgstr ""
+#~ msgid "Key West NAS"
+#~ msgstr "ВВЛ Кий Уест"
 
-#: my-evolution/metar.c:240
-msgid "Partial small hail"
-msgstr ""
+#~ msgid "Khabarovsk"
+#~ msgstr "Хабаровск"
 
-#: my-evolution/metar.c:241
-msgid "Small hailstorm"
-msgstr ""
+#~ msgid "Khamis Mushait"
+#~ msgstr "Хамис Мусхит"
 
-#: my-evolution/metar.c:242
-msgid "Blowing small hail"
-msgstr ""
+#~ msgid "Kharkiv"
+#~ msgstr "Харков"
 
-#: my-evolution/metar.c:243
-msgid "Showers of small hail"
-msgstr ""
+#~ msgid "Kikai Island"
+#~ msgstr "Остров Кикаи"
 
-#: my-evolution/metar.c:244
-msgid "Drifting small hail"
-msgstr ""
+#~ msgid "Killeen"
+#~ msgstr "Килийн"
 
-#: my-evolution/metar.c:245
-msgid "Freezing small hail"
-msgstr ""
+#~ msgid "Killeen-Ft Hood"
+#~ msgstr "Килийн-Фт. Худ"
 
-#. PRECIPITATION
-#: my-evolution/metar.c:248
-msgid "Unknown precipitation"
-msgstr ""
+#~ msgid "Killeen-Gray AAF"
+#~ msgstr "Килийн-ВВБ Грей"
 
-#: my-evolution/metar.c:249
-msgid "Precipitation in the vicinity"
-msgstr ""
+#~ msgid "King Khaled International Airport"
+#~ msgstr "Международно летище крал Кхалед"
 
-#: my-evolution/metar.c:250
-msgid "Light precipitation"
-msgstr ""
+#~ msgid "Kingman"
+#~ msgstr "Кингман"
 
-#: my-evolution/metar.c:251
-msgid "Moderate precipitation"
-msgstr ""
+#~ msgid "King Salmon"
+#~ msgstr "Кинг Салмън"
 
-#: my-evolution/metar.c:252
-msgid "Heavy precipitation"
-msgstr ""
+#~ msgid "Kingston"
+#~ msgstr "Кингстон"
 
-#: my-evolution/metar.c:253
-msgid "Shallow precipitation"
-msgstr ""
+#~ msgid "Kingsville"
+#~ msgstr "Кингсвил"
 
-#: my-evolution/metar.c:254
-msgid "Patches of precipitation"
-msgstr ""
+#~ msgid "Kinloss"
+#~ msgstr "Кинлос"
 
-#: my-evolution/metar.c:255
-msgid "Partial precipitation"
-msgstr ""
+#~ msgid "Kinston"
+#~ msgstr "Кинстон"
 
-#: my-evolution/metar.c:256
-msgid "Unknown thunderstorm"
-msgstr ""
+#~ msgid "Kirkenes"
+#~ msgstr "Къркнес"
 
-#: my-evolution/metar.c:257
-msgid "Blowing precipitation"
-msgstr ""
+#~ msgid "Kirksville"
+#~ msgstr "Кърксвил"
 
-#: my-evolution/metar.c:258
-msgid "Showers, type unknown"
-msgstr ""
+#~ msgid "Kiruna"
+#~ msgstr "Кируна"
 
-#: my-evolution/metar.c:259
-msgid "Drifting precipitation"
-msgstr ""
+#~ msgid "Kisarazu Ab"
+#~ msgstr "ВБ Кисаразу"
 
-#: my-evolution/metar.c:260
-msgid "Freezing precipitation"
-msgstr ""
+#~ msgid "Kishineu"
+#~ msgstr "Кишинев"
 
-#. MIST
-#: my-evolution/metar.c:263
-msgid "Mist"
-msgstr "Мъгла"
+#~ msgid "Kitakyushu Airport"
+#~ msgstr "Летище Китакюшу"
 
-#: my-evolution/metar.c:264
-msgid "Mist in the vicinity"
-msgstr ""
+#~ msgid "Klagenfurt"
+#~ msgstr "Клагенфурт"
 
-#: my-evolution/metar.c:265
-msgid "Light mist"
-msgstr "Лека мъгла"
+#~ msgid "Klamath Falls"
+#~ msgstr "Кламат Фолс"
 
-#: my-evolution/metar.c:266
-msgid "Moderate mist"
-msgstr "Умерена мъгла"
+#~ msgid "Klawock"
+#~ msgstr "Клоуок"
 
-#: my-evolution/metar.c:267
-msgid "Thick mist"
-msgstr "Гъста мъгла"
+#~ msgid "Kleine Brogel"
+#~ msgstr "Клайне Брьогел"
 
-#: my-evolution/metar.c:268
-msgid "Shallow mist"
-msgstr ""
+#~ msgid "Kliningrad"
+#~ msgstr "Калининград"
 
-#: my-evolution/metar.c:269
-msgid "Patches of mist"
-msgstr ""
+#~ msgid "Knoxville"
+#~ msgstr "Ноксвил"
 
-#: my-evolution/metar.c:270
-msgid "Partial mist"
-msgstr ""
+#~ msgid "Knoxville-Downtown"
+#~ msgstr "Ноксвил-Даунтаун"
 
-#: my-evolution/metar.c:272
-msgid "Mist with wind"
-msgstr "Мъгла с вятър"
+#~ msgid "Kobenhavn/Kastrup"
+#~ msgstr "Копенхаген/Кструп"
 
-#: my-evolution/metar.c:274
-msgid "Drifting mist"
-msgstr ""
+#~ msgid "Kobenhavn/Roskilde"
+#~ msgstr "Копенхаген/Роксилде"
 
-#: my-evolution/metar.c:275
-msgid "Freezing mist"
-msgstr ""
+#~ msgid "Kochi Airport"
+#~ msgstr "Летище Кочи"
 
-#. FOG
-#: my-evolution/metar.c:278
-msgid "Fog"
-msgstr "Мъгла"
+#~ msgid "Kodiak"
+#~ msgstr "Кодиак"
 
-#: my-evolution/metar.c:279
-msgid "Fog in the vicinity"
-msgstr ""
+#~ msgid "Kogalniceanu"
+#~ msgstr "Когалницеану"
 
-#: my-evolution/metar.c:280
-msgid "Light fog"
-msgstr "Лека мъгла"
+#~ msgid "Kogalym"
+#~ msgstr "Когалум"
 
-#: my-evolution/metar.c:281
-msgid "Moderate fog"
-msgstr "Средна мъгла"
+#~ msgid "Koksijde"
+#~ msgstr "Коксилде"
 
-#: my-evolution/metar.c:282
-msgid "Thick fog"
-msgstr "Гъста мъгла"
+#~ msgid "Kolding/Vandrup"
+#~ msgstr "Кьолдинг/Вандруп"
 
-#: my-evolution/metar.c:283
-msgid "Shallow fog"
-msgstr ""
+#~ msgid "Koln/Bonn"
+#~ msgstr "Кьолн/Бон"
 
-#: my-evolution/metar.c:284
-msgid "Patches of fog"
-msgstr ""
+#~ msgid "Komatsu Ab"
+#~ msgstr "ВБ Коматсу"
 
-#: my-evolution/metar.c:285
-msgid "Partial fog"
-msgstr "Частична мъгла"
+#~ msgid "Komatsujima Ab"
+#~ msgstr "ВБ Коматсуджима"
 
-#: my-evolution/metar.c:287
-msgid "Fog with wind"
-msgstr "Мъгла с вятър"
+#~ msgid "Konya"
+#~ msgstr "Коня"
 
-#: my-evolution/metar.c:289
-msgid "Drifting fog"
-msgstr ""
+#~ msgid "Korea, Republic of"
+#~ msgstr "Корея, Република"
 
-#: my-evolution/metar.c:290
-msgid "Freezing fog"
-msgstr ""
+#~ msgid "Kos"
+#~ msgstr "Кос"
 
-#. SMOKE
-#: my-evolution/metar.c:293
-msgid "Smoke"
-msgstr "Смог"
+#~ msgid "Kotzebue"
+#~ msgstr "Кецебу"
 
-#: my-evolution/metar.c:294
-msgid "Smoke in the vicinity"
-msgstr ""
+#~ msgid "Kozani"
+#~ msgstr "Козани"
 
-#: my-evolution/metar.c:295
-msgid "Thin smoke"
-msgstr "Лек смог"
+#~ msgid "Krakow"
+#~ msgstr "Краков"
 
-#: my-evolution/metar.c:296
-msgid "Moderate smoke"
-msgstr "Умерен смок"
+#~ msgid "Krasnodar"
+#~ msgstr "Краснодар"
 
-#: my-evolution/metar.c:297
-msgid "Thick smoke"
-msgstr "Гъст дим"
+#~ msgid "Krasnoyarsk"
+#~ msgstr "Красноярск"
 
-#: my-evolution/metar.c:298
-msgid "Shallow smoke"
-msgstr ""
+#~ msgid "Kristiansand/Kjevik"
+#~ msgstr "Кристиансунд/Кйевик"
 
-#: my-evolution/metar.c:299
-msgid "Patches of smoke"
-msgstr ""
+#~ msgid "Kristiansund/Kvernberget"
+#~ msgstr "Кристиансунд/Квернбергет"
 
-#: my-evolution/metar.c:300
-msgid "Partial smoke"
-msgstr ""
+#~ msgid "Kryviy Rig/Lozovatka"
+#~ msgstr "Кривий Рог/Лозоватка"
 
-#: my-evolution/metar.c:301
-msgid "Thunderous smoke"
-msgstr ""
+#~ msgid "Kumamoto Airport"
+#~ msgstr "Летище Кимамото"
 
-#: my-evolution/metar.c:302
-msgid "Smoke with wind"
-msgstr "Пушек с вятър"
+#~ msgid "Kunming"
+#~ msgstr "Кунминг"
 
-#: my-evolution/metar.c:304
-msgid "Drifting smoke"
-msgstr ""
+#~ msgid "Kushiro Airport"
+#~ msgstr "Летище Куширо"
 
-#. VOLCANIC_ASH
-#: my-evolution/metar.c:308
-msgid "Volcanic ash"
-msgstr "Волканична пепел"
+#~ msgid "Kyiv/Boryspil"
+#~ msgstr "Киев/Бориспил"
 
-#: my-evolution/metar.c:309
-msgid "Volcanic ash in the vicinity"
-msgstr "Волканичен прах във височина"
+#~ msgid "Kyiv/Zhulyany"
+#~ msgstr "Киев/Жуляни"
 
-#: my-evolution/metar.c:311
-msgid "Moderate volcanic ash"
-msgstr "Средна волканична пепел"
+#~ msgid "Laconia"
+#~ msgstr "Лакония"
 
-#: my-evolution/metar.c:312
-msgid "Thick volcanic ash"
-msgstr "Гъст вулканичен прах"
+#~ msgid "La Coruna"
+#~ msgstr "Ла Коруна"
 
-#: my-evolution/metar.c:313
-msgid "Shallow volcanic ash"
-msgstr ""
+#~ msgid "La Esperanza"
+#~ msgstr "Ла Есперанца"
 
-#: my-evolution/metar.c:314
-msgid "Patches of volcanic ash"
-msgstr ""
+#~ msgid "Lahore"
+#~ msgstr "Лахор"
 
-#: my-evolution/metar.c:315
-msgid "Partial volcanic ash"
-msgstr ""
+#~ msgid "Lamar"
+#~ msgstr "Ламар"
 
-#: my-evolution/metar.c:316
-msgid "Thunderous volcanic ash"
-msgstr ""
+#~ msgid "La Mesa"
+#~ msgstr "Ла Меса"
 
-#: my-evolution/metar.c:317
-msgid "Blowing volcanic ash"
-msgstr ""
+#~ msgid "Lamezia"
+#~ msgstr "Ламезия"
 
-#: my-evolution/metar.c:318
-msgid "Showers of volcanic ash"
-msgstr ""
+#~ msgid "Lamoni"
+#~ msgstr "Ламони"
 
-#: my-evolution/metar.c:319
-msgid "Drifting volcanic ash"
-msgstr ""
+#~ msgid "Lampedusa"
+#~ msgstr "Лампедуса"
 
-#: my-evolution/metar.c:320
-msgid "Freezing volcanic ash"
-msgstr ""
+#~ msgid "Lanai"
+#~ msgstr "Ланай"
 
-#. SAND
-#: my-evolution/metar.c:323
-msgid "Sand"
-msgstr "Пясък"
+#~ msgid "Lancaster"
+#~ msgstr "Ланкастър"
 
-#: my-evolution/metar.c:324
-msgid "Sand in the vicinity"
-msgstr ""
+#~ msgid "Lander"
+#~ msgstr "Ландер"
 
-#: my-evolution/metar.c:325
-msgid "Light sand"
-msgstr "Лек пясък"
+#~ msgid "Langley AFB"
+#~ msgstr "Лангли"
 
-#: my-evolution/metar.c:326
-msgid "Moderate sand"
-msgstr "Умерен пясък"
+#~ msgid "Lannion"
+#~ msgstr "Ланион"
 
-#: my-evolution/metar.c:327
-msgid "Heavy sand"
-msgstr ""
+#~ msgid "La Paz"
+#~ msgstr "Ла Пас"
 
-#: my-evolution/metar.c:329
-msgid "Patches of sand"
-msgstr ""
+#~ msgid "Laredo"
+#~ msgstr "Ларедо"
 
-#: my-evolution/metar.c:330
-msgid "Partial sand"
-msgstr ""
+#~ msgid "Larnaka"
+#~ msgstr "Ларнака"
 
-#: my-evolution/metar.c:332
-msgid "Blowing sand"
-msgstr ""
+#~ msgid "Las Vegas"
+#~ msgstr "Лас Вегас"
 
-#: my-evolution/metar.c:334
-msgid "Drifting sand"
-msgstr ""
+#~ msgid "Laurel"
+#~ msgstr "Лаурел"
 
-#. HAZE
-#: my-evolution/metar.c:338
-msgid "Haze"
-msgstr "Мъгла"
+#~ msgid "La Verne"
+#~ msgstr "Ла Верне"
 
-#: my-evolution/metar.c:339
-msgid "Haze in the vicinity"
-msgstr ""
+#~ msgid "Le Mans"
+#~ msgstr "Ле Ман"
 
-#: my-evolution/metar.c:340
-msgid "Light haze"
-msgstr "Лека мъгла"
+#~ msgid "Lichtenburg"
+#~ msgstr "Лихтенбург"
 
-#: my-evolution/metar.c:341
-msgid "Moderate haze"
-msgstr "Средна мъгла"
+#~ msgid "Lincoln"
+#~ msgstr "Линкълн"
 
-#: my-evolution/metar.c:342
-msgid "Thick haze"
-msgstr "Гъста мъгла"
+#~ msgid "Linz"
+#~ msgstr "Линц"
 
-#: my-evolution/metar.c:343
-msgid "Shallow haze"
-msgstr "Незначителна мъгла"
+#~ msgid "Lisboa"
+#~ msgstr "Лисабон"
 
-#: my-evolution/metar.c:344
-msgid "Patches of haze"
-msgstr ""
+#~ msgid "Lista"
+#~ msgstr "Листа"
 
-#: my-evolution/metar.c:345
-msgid "Partial haze"
-msgstr ""
+#~ msgid "Livermore"
+#~ msgstr "Ливърмор"
 
-#: my-evolution/metar.c:347
-msgid "Haze with wind"
-msgstr ""
+#~ msgid "Liverpool"
+#~ msgstr "Ливърпул"
 
-#: my-evolution/metar.c:349
-msgid "Drifting haze"
-msgstr ""
+#~ msgid "Livingston"
+#~ msgstr "Ливингстон"
 
-#: my-evolution/metar.c:350
-msgid "Freezing haze"
-msgstr ""
+#~ msgid "Ljubljana"
+#~ msgstr "Любляна"
 
-#. SPRAY
-#: my-evolution/metar.c:353
-msgid "Spray"
-msgstr "Пръскане"
+#~ msgid "London"
+#~ msgstr "Лондон"
 
-#: my-evolution/metar.c:354
-msgid "Spray in the vicinity"
-msgstr ""
+#~ msgid "London/City"
+#~ msgstr "Лондон/град"
 
-#: my-evolution/metar.c:355
-msgid "Light spray"
-msgstr "Леко пръскане"
+#~ msgid "London/Gatwick"
+#~ msgstr "Лондон/Гейтвик"
 
-#: my-evolution/metar.c:356
-msgid "Moderate spray"
-msgstr "Умерено пръскане"
+#~ msgid "London/Heathrow"
+#~ msgstr "Лондон/Хитроу"
 
-#: my-evolution/metar.c:357
-msgid "Heavy spray"
-msgstr ""
+#~ msgid "Los Alamos"
+#~ msgstr "Лос Аламос"
 
-#: my-evolution/metar.c:358
-msgid "Shallow spray"
-msgstr ""
+#~ msgid "Los Angeles"
+#~ msgstr "Лос Анжелес"
 
-#: my-evolution/metar.c:359
-msgid "Patches of spray"
-msgstr ""
+#~ msgid "Louisville"
+#~ msgstr "Луисвил"
 
-#: my-evolution/metar.c:360
-msgid "Partial spray"
-msgstr ""
+#~ msgid "Lousiana"
+#~ msgstr "Луизиана"
 
-#: my-evolution/metar.c:362
-msgid "Blowing spray"
-msgstr ""
+#~ msgid "Lugano"
+#~ msgstr "Лугано"
 
-#: my-evolution/metar.c:364
-msgid "Drifting spray"
-msgstr ""
+#~ msgid "Luxor"
+#~ msgstr "Лухор"
 
-#: my-evolution/metar.c:365
-msgid "Freezing spray"
-msgstr ""
+#~ msgid "Lyneham"
+#~ msgstr "Линехам"
 
-#. DUST
-#: my-evolution/metar.c:368
-msgid "Dust"
-msgstr "Прах"
+#~ msgid "Maastricht"
+#~ msgstr "Маастрих"
 
-#: my-evolution/metar.c:369
-msgid "Dust in the vicinity"
-msgstr "Прах във височина"
+#~ msgid "Macapa"
+#~ msgstr "Макапа"
 
-#: my-evolution/metar.c:370
-msgid "Light dust"
-msgstr "Лек прах"
+#~ msgid "Macon"
+#~ msgstr "Макон"
 
-#: my-evolution/metar.c:371
-msgid "Moderate dust"
-msgstr "Умерен прах"
+#~ msgid "Madinah"
+#~ msgstr "Мадина"
 
-#: my-evolution/metar.c:372
-msgid "Heavy dust"
-msgstr "Силно запашен"
+#~ msgid "Madrid (Barajas)"
+#~ msgstr "Мадрид (Барайас)"
 
-#: my-evolution/metar.c:374
-msgid "Patches of dust"
-msgstr ""
+#~ msgid "Madrid (Cuatro Vientos)"
+#~ msgstr "Мадрид"
 
-#: my-evolution/metar.c:375
-msgid "Partial dust"
-msgstr ""
+#~ msgid "Magadan"
+#~ msgstr "Магадан"
 
-#: my-evolution/metar.c:377
-msgid "Blowing dust"
-msgstr ""
+#~ msgid "Magdalena"
+#~ msgstr "Магдалена"
 
-#: my-evolution/metar.c:379
-msgid "Drifting dust"
-msgstr ""
+#~ msgid "Makhachkala"
+#~ msgstr "Махачкала"
 
-#. SQUALL
-#: my-evolution/metar.c:383
-msgid "Squall"
-msgstr ""
+#~ msgid "Malaga"
+#~ msgstr "Малага"
 
-#: my-evolution/metar.c:384
-msgid "Squall in the vicinity"
-msgstr ""
+#~ msgid "Managua"
+#~ msgstr "Манагуа"
 
-#: my-evolution/metar.c:385
-msgid "Light squall"
-msgstr "Лека буря"
+#~ msgid "Manaus"
+#~ msgstr "Манаус"
 
-#: my-evolution/metar.c:386
-msgid "Moderate squall"
-msgstr ""
+#~ msgid "Manchester"
+#~ msgstr "Манчестер"
 
-#: my-evolution/metar.c:387
-msgid "Heavy squall"
-msgstr ""
+#~ msgid "Manhattan"
+#~ msgstr "Манхатан"
 
-#: my-evolution/metar.c:390
-msgid "Partial squall"
-msgstr ""
+#~ msgid "Manisa"
+#~ msgstr "Маниса"
 
-#: my-evolution/metar.c:391
-msgid "Thunderous squall"
-msgstr ""
+#~ msgid "Manta"
+#~ msgstr "Манта"
 
-#: my-evolution/metar.c:392
-msgid "Blowing squall"
-msgstr ""
+#~ msgid "Maraba"
+#~ msgstr "Мараба"
 
-#: my-evolution/metar.c:394
-msgid "Drifting squall"
-msgstr ""
+#~ msgid "Marathon"
+#~ msgstr "Маратон"
 
-#: my-evolution/metar.c:395
-msgid "Freezing squall"
-msgstr ""
+#~ msgid "Mar Del Plata"
+#~ msgstr "Мар Делплата"
 
-#. SANDSTORM
-#: my-evolution/metar.c:398
-msgid "Sandstorm"
-msgstr ""
+#~ msgid "Margarita"
+#~ msgstr "Маргарита"
 
-#: my-evolution/metar.c:399
-msgid "Sandstorm in the vicinity"
-msgstr ""
+#~ msgid "Marianna"
+#~ msgstr "Мариана"
 
-#: my-evolution/metar.c:400
-msgid "Light standstorm"
-msgstr ""
+#~ msgid "Marib"
+#~ msgstr "Мариб"
 
-#: my-evolution/metar.c:401
-msgid "Moderate sandstorm"
-msgstr ""
+#~ msgid "Maribor"
+#~ msgstr "Марибор"
 
-#: my-evolution/metar.c:402
-msgid "Heavy sandstorm"
-msgstr ""
+#~ msgid "Marietta"
+#~ msgstr "Марита"
 
-#: my-evolution/metar.c:403
-msgid "Shallow sandstorm"
-msgstr ""
+#~ msgid "Marion"
+#~ msgstr "Марион"
 
-#: my-evolution/metar.c:405
-msgid "Partial sandstorm"
-msgstr ""
+#~ msgid "Marte"
+#~ msgstr "Марте"
 
-#: my-evolution/metar.c:406
-msgid "Thunderous sandstorm"
-msgstr ""
+#~ msgid "Martinsburg"
+#~ msgstr "Мартинсбург"
 
-#: my-evolution/metar.c:407
-msgid "Blowing sandstorm"
-msgstr ""
+#~ msgid "Martinsville"
+#~ msgstr "Мартнсвил"
 
-#: my-evolution/metar.c:409
-msgid "Drifting sandstorm"
-msgstr ""
+#~ msgid "Maryland"
+#~ msgstr "Мериленд"
 
-#: my-evolution/metar.c:410
-msgid "Freezing sandstorm"
-msgstr ""
+#~ msgid "Mashhad"
+#~ msgstr "Машхад"
 
-#. DUSTSTORM
-#: my-evolution/metar.c:413
-msgid "Duststorm"
-msgstr "Пясъчна буря"
+#~ msgid "Masirah"
+#~ msgstr "Масира"
 
-#: my-evolution/metar.c:414
-msgid "Duststorm in the vicinity"
-msgstr "Пясъчна буря в околноста"
+#~ msgid "Massena"
+#~ msgstr "Масена"
 
-#: my-evolution/metar.c:415
-msgid "Light duststorm"
-msgstr "Лека Пясъчна буря"
+#~ msgid "Matamoros"
+#~ msgstr "Матаморос"
 
-#: my-evolution/metar.c:416
-msgid "Moderate duststorm"
-msgstr "Умерена Пясъчна буря"
+#~ msgid "Matsushima Ab"
+#~ msgstr "Матсушима"
 
-#: my-evolution/metar.c:417
-msgid "Heavy duststorm"
-msgstr "Силна Пясъчна буря"
+#~ msgid "Matsuyama Airport"
+#~ msgstr "Летище Матсушима"
 
-#: my-evolution/metar.c:418
-msgid "Shallow duststorm"
-msgstr ""
+#~ msgid "Melbourne"
+#~ msgstr "Мелбърн"
 
-#: my-evolution/metar.c:420
-msgid "Partial duststorm"
-msgstr ""
+#~ msgid "Melfa"
+#~ msgstr "Мелфа"
 
-#: my-evolution/metar.c:421
-msgid "Thunderous duststorm"
-msgstr ""
+#~ msgid "Melilla"
+#~ msgstr "Мелила"
 
-#: my-evolution/metar.c:422
-msgid "Blowing duststorm"
-msgstr ""
+#~ msgid "Memphis"
+#~ msgstr "Мемфис"
 
-#: my-evolution/metar.c:424
-msgid "Drifting duststorm"
-msgstr ""
+#~ msgid "Memphis-NAS"
+#~ msgstr "Мемфис-NAS"
 
-#: my-evolution/metar.c:425
-msgid "Freezing duststorm"
-msgstr ""
+#~ msgid "Mendoza"
+#~ msgstr "Мендоса"
 
-#. FUNNEL_CLOUD
-#: my-evolution/metar.c:428
-msgid "Funnel cloud"
-msgstr ""
+#~ msgid "Merida"
+#~ msgstr "Мерида"
 
-#: my-evolution/metar.c:429
-msgid "Funnel cloud in the vicinity"
-msgstr ""
+#~ msgid "Meridian"
+#~ msgstr "Меридиан"
 
-#: my-evolution/metar.c:430
-msgid "Light funnel cloud"
-msgstr ""
+#~ msgid "Miami"
+#~ msgstr "Маями"
 
-#: my-evolution/metar.c:431
-msgid "Moderate funnel cloud"
-msgstr ""
+#~ msgid "Michigan"
+#~ msgstr "Мичиган"
 
-#: my-evolution/metar.c:432
-msgid "Thick funnel cloud"
-msgstr ""
+#~ msgid "Middle East"
+#~ msgstr "Среден Изток"
 
-#: my-evolution/metar.c:433
-msgid "Shallow funnel cloud"
-msgstr ""
+#~ msgid "Milano/Linate"
+#~ msgstr "Милано/Линате"
 
-#: my-evolution/metar.c:434
-msgid "Patches of funnel clouds"
-msgstr ""
+#~ msgid "Milano/Malpensa"
+#~ msgstr "Милано/Малпенса"
 
-#: my-evolution/metar.c:435
-msgid "Partial funnel clouds"
-msgstr ""
+#~ msgid "Milford"
+#~ msgstr "Милфорд"
 
-#: my-evolution/metar.c:437
-msgid "Funnel cloud w/ wind"
-msgstr ""
+#~ msgid "Millville"
+#~ msgstr "Милвил"
 
-#: my-evolution/metar.c:439
-msgid "Drifting funnel cloud"
-msgstr ""
+#~ msgid "Milton"
+#~ msgstr "Милтон"
 
-#. TORNADO
-#: my-evolution/metar.c:443 my-evolution/metar.c:452
-msgid "Tornado"
-msgstr "Торнадо"
+#~ msgid "Mineralnye Vody"
+#~ msgstr "Минералние Води"
 
-#: my-evolution/metar.c:444
-msgid "Tornado in the vicinity"
-msgstr "Торнадо в околноста"
+#~ msgid "Minneapolis"
+#~ msgstr "Минеаполис"
 
-#: my-evolution/metar.c:446
-msgid "Moderate tornado"
-msgstr "Умерено торнадо"
+#~ msgid "Minneapolis [2]"
+#~ msgstr "Минеаполис [2]"
 
-#: my-evolution/metar.c:447
-msgid "Raging tornado"
-msgstr ""
+#~ msgid "Minneapolis [3]"
+#~ msgstr "Минеаполис [3]"
 
-#: my-evolution/metar.c:450
-msgid "Partial tornado"
-msgstr ""
+#~ msgid "Minnesota"
+#~ msgstr "Минесота"
 
-#: my-evolution/metar.c:451
-msgid "Thunderous tornado"
-msgstr ""
+#~ msgid "Minot"
+#~ msgstr "Минот"
 
-#: my-evolution/metar.c:454
-msgid "Drifting tornado"
-msgstr ""
+#~ msgid "Missouri"
+#~ msgstr "Мисури"
 
-#: my-evolution/metar.c:455
-msgid "Freezing tornado"
-msgstr ""
+#~ msgid "Mitchell"
+#~ msgstr "Мичел"
 
-#. DUST_WHIRLS
-#: my-evolution/metar.c:458
-msgid "Dust whirls"
-msgstr ""
+#~ msgid "Mitilini"
+#~ msgstr "Митилини"
 
-#: my-evolution/metar.c:459
-msgid "Dust whirls in the vicinity"
-msgstr ""
+#~ msgid "Moa"
+#~ msgstr "Моа"
 
-#: my-evolution/metar.c:460
-msgid "Light dust whirls"
-msgstr ""
+#~ msgid "Modesto"
+#~ msgstr "Модесто"
 
-#: my-evolution/metar.c:461
-msgid "Moderate dust whirls"
-msgstr ""
+#~ msgid "Molde"
+#~ msgstr "Молде"
 
-#: my-evolution/metar.c:462
-msgid "Heavy dust whirls"
-msgstr ""
+#~ msgid "Moldova"
+#~ msgstr "Молдова"
 
-#: my-evolution/metar.c:463
-msgid "Shallow dust whirls"
-msgstr ""
+#~ msgid "Monclova"
+#~ msgstr "Монклова"
 
-#: my-evolution/metar.c:464
-msgid "Patches of dust whirls"
-msgstr ""
+#~ msgid "Monida"
+#~ msgstr "Монида"
 
-#: my-evolution/metar.c:465
-msgid "Partial dust whirls"
-msgstr ""
+#~ msgid "Monroe"
+#~ msgstr "Монро"
 
-#: my-evolution/metar.c:467
-msgid "Blowing dust whirls"
-msgstr ""
+#~ msgid "Montana"
+#~ msgstr "Монтана"
 
-#: my-evolution/metar.c:469
-msgid "Drifting dust whirls"
-msgstr ""
+#~ msgid "Monte Calamita"
+#~ msgstr "Монте Каламита"
 
-#: my-evolution/my-evolution.glade.h:1
-msgid "C_elsius"
-msgstr "Целзий"
+#~ msgid "Monte Cimone"
+#~ msgstr "Монте Симоне"
 
-#: my-evolution/my-evolution.glade.h:3
-msgid "How many days should the calendar display at once?"
-msgstr "Колко дни да показва календара едновременно?"
+#~ msgid "Monte Malanotte"
+#~ msgstr "Монте Маланоте"
 
-#: my-evolution/my-evolution.glade.h:5
-msgid "News Feed Settings"
-msgstr "Настройки за Източник на Новини"
+#~ msgid "Monterey"
+#~ msgstr "Монтерей"
 
-#: my-evolution/my-evolution.glade.h:6
-msgid "News Feeds"
-msgstr "Абонаменти за Новини"
+#~ msgid "Monterrey"
+#~ msgstr "Монтерей"
 
-#: my-evolution/my-evolution.glade.h:7
-msgid "One mont_h"
-msgstr "Един месец"
+#~ msgid "Montevideo/Carrasco"
+#~ msgstr "Монтевидео/Караско"
 
-#: my-evolution/my-evolution.glade.h:8
-msgid "One w_eek"
-msgstr "_Една седмица"
+#~ msgid "Montgomery"
+#~ msgstr "Монгомери"
 
-#: my-evolution/my-evolution.glade.h:9
-msgid "R_efresh time (seconds):"
-msgstr "Време за о_бновяване (секунди):"
+#~ msgid "Montpelier"
+#~ msgstr "Монтпелие"
 
-#: my-evolution/my-evolution.glade.h:10
-msgid "Refresh _time (seconds):"
-msgstr "Време за обно_вяване (секунди):"
+#~ msgid "Montreal Mirabel"
+#~ msgstr "Монреал Марибел"
 
-#: my-evolution/my-evolution.glade.h:11
-msgid "Schedule"
-msgstr "Програма"
+#~ msgid "Morelia"
+#~ msgstr "Морелия"
 
-#: my-evolution/my-evolution.glade.h:12
-msgid "Show _all tasks"
-msgstr "Покажи всички задачите"
+#~ msgid "Moriarty"
+#~ msgstr "Мориарти"
 
-#: my-evolution/my-evolution.glade.h:13
-msgid "Show _today's tasks"
-msgstr "Покажи днешните задачи"
+#~ msgid "Morristown"
+#~ msgstr "Мористон"
 
-#: my-evolution/my-evolution.glade.h:14
-msgid "Show temperatures in:"
-msgstr "Покажи температурите в:"
+#~ msgid "Moscow Domodedovo"
+#~ msgstr "Москва Домодедово"
 
-#: my-evolution/my-evolution.glade.h:15
-msgid "Tasks "
-msgstr "Задачи"
+#~ msgid "Moscow Sheremetyevo"
+#~ msgstr "Москва Шереметиево"
 
-#: my-evolution/my-evolution.glade.h:17
-msgid "Weather Settings"
-msgstr "Настройки за Прогноза за Времето"
+#~ msgid "Munchen"
+#~ msgstr "Мюнхен"
 
-#: my-evolution/my-evolution.glade.h:18
-msgid "_Delete Feed"
-msgstr "_Изтрива Абонамент"
+#~ msgid "Murmansk"
+#~ msgstr "Мурманск"
 
-#: my-evolution/my-evolution.glade.h:19
-msgid "_Fahrenheit"
-msgstr "_Фаренхайт"
+#~ msgid "Nagasaki Airport"
+#~ msgstr "Нагасаки летище"
 
-#: my-evolution/my-evolution.glade.h:20
-msgid "_Five days"
-msgstr "_Пет дена"
+#~ msgid "Nagoya Airport"
+#~ msgstr "Нагоя летище"
 
-#: my-evolution/my-evolution.glade.h:21
-msgid "_Max number of items shown:"
-msgstr "_Максимален брой видими записи:"
+#~ msgid "Napa"
+#~ msgstr "Напа"
 
-#: my-evolution/my-evolution.glade.h:22
-msgid "_New Feed"
-msgstr "_Следващ Абонамент"
+#~ msgid "Napoli"
+#~ msgstr "Наполи"
 
-#: my-evolution/my-evolution.glade.h:23
-msgid "_One day"
-msgstr "_Един Ден"
+#~ msgid "Narvik"
+#~ msgstr "Нарвик"
 
-#: my-evolution/my-evolution.glade.h:24
-msgid "_Show full path for folders"
-msgstr "_Показва пълния път до папките"
+#~ msgid "Nashua"
+#~ msgstr "Нашуа"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr ""
+#~ msgid "Nashville"
+#~ msgstr "Нешвил"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-msgid "Evolution Shell"
-msgstr "Обвивка на Evolution"
+#~ msgid "Nassau"
+#~ msgstr "Насау"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-msgid "Evolution folder settings configuration control"
-msgstr ""
+#~ msgid "Natal"
+#~ msgstr "Натал"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-msgid "Folder Settings"
-msgstr "Настройка на Папките"
+#~ msgid "Nebraska"
+#~ msgstr "Небраска"
 
-#: shell/e-activity-handler.c:164
-msgid "Show Details"
-msgstr "Показва Детайли"
+#~ msgid "Nevada"
+#~ msgstr "Невада"
 
-#: shell/e-activity-handler.c:166
-msgid "Cancel Operation"
-msgstr "Отказва действието"
+#~ msgid "Newfoundland"
+#~ msgstr "Невфаунленд"
 
-#: shell/e-folder-dnd-bridge.c:55
-#, c-format
-msgid ""
-"Cannot transfer folder:\n"
-"%s"
-msgstr ""
-"Не мога да прехвърля папка:\n"
-"%s"
+#~ msgid "New Hampshire"
+#~ msgstr "Ню Хемшир"
 
-#: shell/e-folder-list.c:122 shell/evolution-folder-selector-button.c:128
-#, c-format
-msgid "\"%s\" in \"%s\""
-msgstr "\"%s\"·в·\"%s\""
+#~ msgid "New Jersey"
+#~ msgstr "Ню Джърси"
 
-#: shell/e-folder-list.c:338
-msgid "Add a Folder"
-msgstr "Добавя Папка"
+#~ msgid "New Mexico"
+#~ msgstr "Ню Мексико"
 
-#: shell/e-local-storage.c:179
-msgid "Drafts"
-msgstr "Чернови"
+#~ msgid "New Orleans"
+#~ msgstr "Ню Орлеанс"
 
-#: shell/e-local-storage.c:180 shell/e-shell-view.c:481
-#: shell/e-shortcuts.c:1084
-msgid "Inbox"
-msgstr "Пощенска кутия"
+#~ msgid "New Orleans NAS"
+#~ msgstr "Ню Орлеанс NAS"
 
-#: shell/e-local-storage.c:181
-msgid "Outbox"
-msgstr "Outbox"
+#~ msgid "Newport"
+#~ msgstr "Нюпорт"
 
-#: shell/e-local-storage.c:182
-msgid "Sent"
-msgstr "Изпрати"
+#~ msgid "New York"
+#~ msgstr "Ню Йорк"
 
-#: shell/e-setup.c:146
-msgid "Could not update files correctly"
-msgstr "Не мога да обновя правилно файловете"
+#~ msgid "New York-JFK Arpt"
+#~ msgstr "Ню Йорк - Летище Кенеди"
 
-#: shell/e-setup.c:167
-#, c-format
-msgid ""
-"Cannot create the directory\n"
-"%s\n"
-"Error: %s"
-msgstr ""
-"Не мога да създам директория\n"
-"%s\n"
-"Грешка: %s"
+#~ msgid "Niagara Falls"
+#~ msgstr "Ниагара водопад"
 
-#: shell/e-setup.c:178
-#, c-format
-msgid ""
-"An error occurred in copying files into\n"
-"`%s'."
-msgstr ""
-"Възникна грешка при копирането на файлове в\n"
-"`%s'."
+#~ msgid "Nis"
+#~ msgstr "Нис"
 
-#: shell/e-setup.c:244
-#, c-format
-msgid ""
-"The file `%s' is not a directory.\n"
-"Please move it in order to allow installation\n"
-"of the Evolution user files."
-msgstr ""
-"Файлът `%s' не е директория.\n"
-"Преместето го, за да могат файловете на\n"
-"Еволюшън да се инсталират."
+#~ msgid "Norfolk"
+#~ msgstr "Норфолк"
 
-#: shell/e-setup.c:253
-#, c-format
-msgid ""
-"The directory `%s' exists but is not the\n"
-"Evolution directory.  Please move it in order\n"
-"to allow installation of the Evolution user files."
-msgstr ""
-"Директорията `%s' съществува но тя не е\n"
-"директория на Evolution.  Моля преместете я\n"
-"за да позволите на Evolution да инсталира файловете."
+#~ msgid "Norfolk NAS"
+#~ msgstr "Норфолк"
 
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
-msgstr "Създадена за Вас от"
+#~ msgid "North Dakota"
+#~ msgstr "Северна Дакота"
 
-#: shell/e-shell-config-autocompletion.c:110
-msgid "Extra Completion folders"
-msgstr ""
+#~ msgid "Norwich"
+#~ msgstr "Норич"
 
-#: shell/e-shell-config-default-folders.c:149
-msgid "Select Default Folder"
-msgstr "Избита стандартна папка"
+#~ msgid "Nova Scotia"
+#~ msgstr "Нова Скотия"
 
-#: shell/e-shell-config-folder-settings.c:70
-msgid "Default Folders"
-msgstr "Стандартни Папки"
+#~ msgid "Novosibirsk"
+#~ msgstr "Новосибирск"
 
-#: shell/e-shell-config-folder-settings.c:73
-msgid "Offline Folders"
-msgstr ""
+#~ msgid "Nurnberg"
+#~ msgstr "Нюрнберг"
 
-#: shell/e-shell-config-folder-settings.c:76
-msgid "Autocompletion Folders"
-msgstr "Папки за автоматично завършване"
+#~ msgid "Oakland"
+#~ msgstr "Окланд"
 
-#: shell/e-shell-folder-commands.c:140
-#, c-format
-msgid "Cannot copy folder: %s"
-msgstr "Папката %s не може да бъде копирана"
+#~ msgid "Odense"
+#~ msgstr "Оденсе"
 
-#: shell/e-shell-folder-commands.c:142
-#, c-format
-msgid "Cannot move folder: %s"
-msgstr "Папката %s не може да бъде преместена"
+#~ msgid "Ohio"
+#~ msgstr "Охайо"
 
-#: shell/e-shell-folder-commands.c:188
-msgid "Cannot move a folder over itself."
-msgstr "Не мога да преместя папка въру себе си."
+#~ msgid "Ohrid"
+#~ msgstr "Охрид"
 
-#: shell/e-shell-folder-commands.c:190
-msgid "Cannot copy a folder over itself."
-msgstr "Не мога да копирам директорията върху себе си."
+#~ msgid "Okayama Airport"
+#~ msgstr "Летище Окайама"
 
-#: shell/e-shell-folder-commands.c:204
-msgid "Cannot move a folder into one of its descendants."
-msgstr "Не мога да преместя папка в една от нейните подпапки."
+#~ msgid "Oki Airport"
+#~ msgstr "Летище Оки"
 
-#: shell/e-shell-folder-commands.c:319
-#, c-format
-msgid "Specify a folder to copy folder \"%s\" into:"
-msgstr "Задайте папка за копиране на папка \"%s\":"
+#~ msgid "Oklahoma"
+#~ msgstr "Оклахома"
 
-#: shell/e-shell-folder-commands.c:323
-msgid "Copy Folder"
-msgstr "Копира Папка"
+#~ msgid "Oklahoma City"
+#~ msgstr "Оклахома Сити"
 
-#: shell/e-shell-folder-commands.c:363
-#, c-format
-msgid "Specify a folder to move folder \"%s\" into:"
-msgstr "Задайте папка за да преместите в нея \"%s\":"
+#~ msgid "Olathe"
+#~ msgstr "Олате"
 
-#: shell/e-shell-folder-commands.c:367
-msgid "Move Folder"
-msgstr "Премества Папка"
+#~ msgid "Olympia"
+#~ msgstr "Олимпия"
 
-#: shell/e-shell-folder-commands.c:391
-#, c-format
-msgid ""
-"Cannot delete folder:\n"
-"%s"
-msgstr ""
-"Не мога да изтрия папката:\n"
-"%s"
+#~ msgid "Omaha"
+#~ msgstr "Омаха"
 
-#: shell/e-shell-folder-commands.c:405
-#, c-format
-msgid "Really delete folder \"%s\"?"
-msgstr "Наистина ли искате да изтрия папка \"%s\"?"
+#~ msgid "Omak"
+#~ msgstr "Омак"
 
-#: shell/e-shell-folder-commands.c:416
-#, c-format
-msgid "Delete \"%s\""
-msgstr "Изтрива \"%s\""
+#~ msgid "Omsk"
+#~ msgstr "Омск"
 
-#: shell/e-shell-folder-commands.c:489
-#, c-format
-msgid ""
-"Cannot rename folder:\n"
-"%s"
-msgstr ""
-"Не мога да преименувам папката:\n"
-"%s"
+#~ msgid "Ontario"
+#~ msgstr "Онтарио"
 
-#: shell/e-shell-folder-commands.c:534
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "Преименува папката \"%s\" на:"
+#~ msgid "Oran"
+#~ msgstr "Оран"
 
-#: shell/e-shell-folder-commands.c:541
-msgid "Rename Folder"
-msgstr "Преименува Папка"
+#~ msgid "Oregon"
+#~ msgstr "Орегон"
 
-#: shell/e-shell-folder-commands.c:547
-#: shell/e-shell-folder-creation-dialog.c:180
-#, c-format
-msgid "The specified folder name is not valid: %s"
-msgstr "Указаното име на папка е невалидно: %s"
+#~ msgid "Orenburg"
+#~ msgstr "Оренбург"
 
-#: shell/e-shell-folder-commands.c:554
-#, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr "Папка с име \"%s вече същесъвува. Моля, изберете различно име."
+#~ msgid "Orland"
+#~ msgstr "Орланд"
 
-#: shell/e-shell-folder-commands.c:584
-msgid "Selected folder does not belong to another user"
-msgstr "Избраната папка не принадлежи на друг потребител"
+#~ msgid "Orlando"
+#~ msgstr "Орландо"
 
-#: shell/e-shell-folder-commands.c:587
-#, c-format
-msgid ""
-"Cannot remove folder:\n"
-"%s"
-msgstr ""
-"Не мога да премахна папката:\n"
-"%s"
+#~ msgid "Osaka International Airport"
+#~ msgstr "Осака"
 
-#: shell/e-shell-folder-creation-dialog.c:137
-#, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
-msgstr ""
-"Не мога да създам указаната папка:\n"
-"%s"
+#~ msgid "Oslo/Gardenmoen"
+#~ msgstr "Осло"
 
-#: shell/e-shell-folder-creation-dialog.c:318
-msgid "Create New Folder"
-msgstr "Създава Нова Папка"
+#~ msgid "Ostrava"
+#~ msgstr "Острава"
 
-#: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
-msgid "(Untitled)"
-msgstr "(Неименуван)"
+#~ msgid "Ottawa"
+#~ msgstr "Отава"
 
-#: shell/e-shell-importer.c:139
-msgid "Choose the type of importer to run:"
-msgstr "Изберете типа на импортера за изпълнение:"
+#~ msgid "Oxford"
+#~ msgstr "Оксфорд"
 
-#: shell/e-shell-importer.c:142
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list.\n"
-"\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt "
-"to work it out."
-msgstr ""
-"Изберете файла, който искате да импортирате в Evolution, и изберете типа му "
-"от списъка.\n"
-"\n"
-"Вие може да изберете \"Автоматично\" ако не знаете и Evolution ще се опита "
-"да го определи."
+#~ msgid "Padova"
+#~ msgstr "Падова"
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
-msgid "Please select the information that you would like to import:"
-msgstr "Моля, изберете информацията, която искате да импортирате:"
+#~ msgid "Palermo"
+#~ msgstr "Палермо"
 
-#: shell/e-shell-importer.c:151
-msgid ""
-"Evolution checked for settings to import from the following\n"
-"applications: Pine, Netscape, Elm, iCalendar. No settings\n"
-"that could be imported where found. If you would like to\n"
-"try again, please click the \"Back\" button.\n"
-msgstr ""
+#~ msgid "Palma de Mallorca"
+#~ msgstr "Палма де Майорка"
 
-#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item %d."
-msgstr ""
-"Импортирам %s\n"
-"Импортирам обект %d."
+#~ msgid "Palmdale"
+#~ msgstr "Палмдале"
 
-#: shell/e-shell-importer.c:323
-msgid "Select importer"
-msgstr "Избира импортер"
+#~ msgid "Palmer"
+#~ msgstr "Палмер"
 
-#: shell/e-shell-importer.c:464
-#, c-format
-msgid "File %s does not exist"
-msgstr "Файлът `%s' не съществува."
+#~ msgid "Palm Springs"
+#~ msgstr "Палм Спингс"
 
-#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
-#: shell/e-shell-importer.c:524
-msgid "Evolution Error"
-msgstr "Грешка в Evolution"
+#~ msgid "Panama City"
+#~ msgstr "Панама Сити"
 
-#: shell/e-shell-importer.c:481
-#, c-format
-msgid ""
-"There is no importer that is able to handle\n"
-"%s"
-msgstr ""
-"Няма импортер, който да подържа\n"
-"%s"
+#~ msgid "Papa"
+#~ msgstr "Папа"
 
-#: shell/e-shell-importer.c:490
-msgid "Importing"
-msgstr "Импортира"
+#~ msgid "Paris"
+#~ msgstr "Париж"
 
-#: shell/e-shell-importer.c:497
-#, c-format
-msgid ""
-"Importing %s.\n"
-"Starting %s"
-msgstr ""
-"Импортирам %s.\n"
-"Стартирам %s"
+#~ msgid "Paris/Charles De Gaulle"
+#~ msgstr "Париж/Шарк де Гол"
 
-#: shell/e-shell-importer.c:509
-#, c-format
-msgid "Error starting %s"
-msgstr "Грешка при стартиране на %s"
+#~ msgid "Paris/Le Bourget"
+#~ msgstr "Париж/Ле Бурже"
 
-#: shell/e-shell-importer.c:523
-#, c-format
-msgid "Error loading %s"
-msgstr "Грешка при зареждането на %s"
+#~ msgid "Paris/Orly"
+#~ msgstr "Париж/Орли"
 
-#: shell/e-shell-importer.c:540
-#, c-format
-msgid ""
-"Importing %s\n"
-"Importing item 1."
-msgstr ""
-"Импортирам %s\n"
-"Импортирам обект 1."
+#~ msgid "Pasco"
+#~ msgstr "Паско"
 
-#: shell/e-shell-importer.c:594
-msgid "Automatic"
-msgstr "Автоматично"
+#~ msgid "Patna"
+#~ msgstr "Патна"
 
-#: shell/e-shell-importer.c:643
-msgid "Filename:"
-msgstr "Име на файл:"
+#~ msgid "Patterson"
+#~ msgstr "Патерсон"
 
-#: shell/e-shell-importer.c:648
-msgid "Select a file"
-msgstr "Избира файл"
+#~ msgid "Paxson"
+#~ msgstr "Паксон"
 
-#: shell/e-shell-importer.c:657
-msgid "File type:"
-msgstr "Тип на файл:"
+#~ msgid "Pelotas"
+#~ msgstr "Пелотас"
 
-#: shell/e-shell-importer.c:682
-msgid "Import data and settings from older programs"
-msgstr "Импорт на данни и настройки от стари програми"
+#~ msgid "Pennsylvania"
+#~ msgstr "Пенсилвания"
 
-#: shell/e-shell-importer.c:686
-msgid "Import a single file"
-msgstr "Импорт на единичен файл"
+#~ msgid "Pensacola"
+#~ msgstr "Пенсакола"
 
-#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
-msgid ""
-"Please wait...\n"
-"Scanning for existing setups"
-msgstr ""
-"Моля, изчакайте...\n"
-"Сканирам за съществуващи настройки"
+#~ msgid "Pensacola NAS"
+#~ msgstr "Пенсакола"
 
-#: shell/e-shell-importer.c:758
-msgid "Starting Intelligent Importers"
-msgstr "Стартира Интелигентно Импортиране"
+#~ msgid "Peoria"
+#~ msgstr "Пеория"
 
-#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
-#, c-format
-msgid "From %s:"
-msgstr "От %s:"
+#~ msgid "Perm"
+#~ msgstr "Перм"
 
-#: shell/e-shell-importer.c:1061
-msgid "Select folder"
-msgstr "Избира папка"
+#~ msgid "Perth"
+#~ msgstr "Перт"
 
-#: shell/e-shell-importer.c:1062
-msgid "Select a destination folder for importing this data"
-msgstr "Избор на отдалечена папка за импортиране на тези данни"
+#~ msgid "Perugia"
+#~ msgstr "Перуджа"
 
-#: shell/e-shell-importer.c:1192 shell/importer/intelligent.c:191
-msgid "Import"
-msgstr "Вмъква"
+#~ msgid "Pescara"
+#~ msgstr "Пескара"
 
-#: shell/e-shell-offline-handler.c:592
-msgid "Closing connections..."
-msgstr "Затварям връзката..."
+#~ msgid "Petersburg"
+#~ msgstr "Петерсбург"
 
-#: shell/e-shell-offline-sync.c:163
-#, c-format
-msgid ""
-"Error synchronizing \"%s\":\n"
-"%s"
-msgstr ""
-"Грешка в синхронизиране·\"%s\":\n"
-"%s"
+#~ msgid "Petropavlovsk-Kamchatsky"
+#~ msgstr "Петропавловск-Камчатка"
 
-#: shell/e-shell-offline-sync.c:232
-msgid "Syncing Folder"
-msgstr "Папка на синронизация"
+#~ msgid "Petrozavodsk"
+#~ msgstr "Петрозаводск"
 
-#. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:311
-#, c-format
-msgid "Synchronizing \"%s\" (%d of %d) ..."
-msgstr "Синхронизира \"%s\"·(%d·of·%d)·..."
+#~ msgid "Philadelphia"
+#~ msgstr "Филаделфия"
 
-#: shell/e-shell-settings-dialog.c:346
-msgid "Evolution Settings"
-msgstr "Настройки на Evolution"
+#~ msgid "Philip"
+#~ msgstr "Филип"
 
-#. It would be nice to insensitivize the OK button appropriately
-#. instead of doing this, but unfortunately we can't do this for the
-#. Bonobo control.
-#: shell/e-shell-shared-folder-picker-dialog.c:281
-msgid "Please select a user."
-msgstr "Моля, изберете потребител."
+#~ msgid "Philipsburg"
+#~ msgstr "Филипсбург"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:387
-msgid "Opening Folder"
-msgstr "Отваря Папка"
+#~ msgid "Phillips"
+#~ msgstr "Филипс"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:393
-#, c-format
-msgid "Opening Folder \"%s\""
-msgstr "Отваря Папката \"%s\""
+#~ msgid "Phoenix"
+#~ msgstr "Феникс"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:398
-#, c-format
-msgid "in \"%s\" ..."
-msgstr "в \"%s\"·..."
+#~ msgid "Piacenza"
+#~ msgstr "Пиаченса"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:482
-#, c-format
-msgid "Could not open shared folder: %s."
-msgstr "Споделената папка %s не може да бъде отворена."
+#~ msgid "Pierre"
+#~ msgstr "Пиере"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:535
-msgid "Cannot find the specified shared folder."
-msgstr "Посочената споделена папка не може да бъде намерена."
+#~ msgid "Pisco"
+#~ msgstr "Писко"
 
-#: shell/e-shell-user-creatable-items-handler.c:587
-#: shell/e-shell-user-creatable-items-handler.c:643
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "Нов"
+#~ msgid "Pittsburgh"
+#~ msgstr "Питсбърг"
 
-#: shell/e-shell-utils.c:116
-msgid "No folder name specified."
-msgstr "Папката няма име."
+#~ msgid "Plattsburg"
+#~ msgstr "Платсбург"
 
-#: shell/e-shell-utils.c:123
-msgid "Folder name cannot contain the Return character."
-msgstr "В името на папката не може да се съдържа символа 'Return'"
+#~ msgid "Plovdiv"
+#~ msgstr "Пловдив"
 
-#: shell/e-shell-utils.c:129
-msgid "Folder name cannot contain the character \"/\"."
-msgstr "В името на папката не може да се съдържа символа 'Return"
+#~ msgid "Plymouth"
+#~ msgstr "Плимут"
 
-#: shell/e-shell-utils.c:135
-msgid "Folder name cannot contain the character \"#\"."
-msgstr ""
+#~ msgid "Pocatello"
+#~ msgstr "Покатело"
 
-#: shell/e-shell-utils.c:141
-msgid "'.' and '..' are reserved folder names."
-msgstr "'.' и '..' са запазени имена на папка."
+#~ msgid "Podgorica"
+#~ msgstr "Подгорица"
 
-#: shell/e-shell-view-menu.c:89
-msgid "The GNOME Pilot tools do not appear to be installed on this system."
-msgstr "Инструмента GNOME Pilot изглежда не е инсталиран на тази система"
+#~ msgid "Ponce"
+#~ msgstr "Понце"
 
-#: shell/e-shell-view-menu.c:97
-#, c-format
-msgid "Error executing %s."
-msgstr "Грешка при изпълнение на %s"
+#~ msgid "Pontiac"
+#~ msgstr "Понтиак"
 
-#: shell/e-shell-view-menu.c:193
-msgid "Bug buddy is not installed."
-msgstr "Bug·buddy не е инсталиран."
+#~ msgid "Poprad"
+#~ msgstr "Попрад"
 
-#: shell/e-shell-view-menu.c:201
-msgid "Bug buddy could not be run."
-msgstr "Bug buddy не може да бъде стартиран."
+#~ msgid "Port-Au-Prince"
+#~ msgstr "Порт-о-Пренс"
 
-#: shell/e-shell-view-menu.c:247
-msgid "About Ximian Evolution"
-msgstr "Относно Evolution"
+#~ msgid "Port Elizabeth"
+#~ msgstr "Порт Елизабет"
 
-#: shell/e-shell-view-menu.c:502
-msgid "Go to folder..."
-msgstr "Отива в папка..."
+#~ msgid "Porterville"
+#~ msgstr "Портервил"
 
-#: shell/e-shell-view-menu.c:503
-msgid "Select the folder that you want to open"
-msgstr "Избор на папка, която искате да отворите"
+#~ msgid "Portland"
+#~ msgstr "Портланд"
 
-#: shell/e-shell-view-menu.c:617
-msgid "Create New Shortcut"
-msgstr "Създава Нов Кратък Клавиш"
+#~ msgid "Porto"
+#~ msgstr "Порто"
 
-#: shell/e-shell-view-menu.c:618
-msgid "Select the folder you want the shortcut to point to:"
-msgstr "Изберете папката на която искате да сочи препратката:"
+#~ msgid "Porto Alegre"
+#~ msgstr "Порто Алегре"
 
-#: shell/e-shell-view-menu.c:769
-msgid "_Work Online"
-msgstr "Работа в 'O_nline режим' "
+#~ msgid "Portoroz"
+#~ msgstr "Портороз"
 
-#: shell/e-shell-view-menu.c:782 ui/evolution.xml.h:65
-msgid "_Work Offline"
-msgstr "Работа в '_Offline режим'"
+#~ msgid "Porto Santo"
+#~ msgstr "Порто Санто"
 
-#: shell/e-shell-view-menu.c:795 ui/evolution.xml.h:39
-msgid "Work Offline"
-msgstr "Работа в 'Offline режим'"
+#~ msgid "Port Said"
+#~ msgstr "Пор Саид"
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr "(Няма показана папка)"
+#~ msgid "Portsmouth"
+#~ msgstr "Портсмут"
 
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
+#~ msgid "Posadas"
+#~ msgstr "Посадас"
 
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr "(Няма)"
+#~ msgid "Potosi"
+#~ msgstr "Потоси"
 
-#: shell/e-shell-view.c:2083
-msgid ""
-"Ximian Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"Ximian· Evolution в момента е 'online'.  Натиснете този бутон за да го превключите в режим 'offline'."
+#~ msgid "Poznan"
+#~ msgstr "Познан"
 
-#: shell/e-shell-view.c:2090
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Ximian Evolution е в процес на преминаване на режим 'offline'."
+#~ msgid "Praha"
+#~ msgstr "Прага"
 
-#: shell/e-shell-view.c:2096
-msgid ""
-"Ximian Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"Evolution  в момента е 'offline.'  Натиснете този бутон за да го "
-"превключите в 'online' режим."
+#~ msgid "Prescott"
+#~ msgstr "Прескот"
 
-#: shell/e-shell.c:175
-#, c-format
-msgid ""
-"Cannot activate component %s :\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
+#~ msgid "Pretoria"
+#~ msgstr "Претория"
 
-#: shell/e-shell.c:741
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Не мога да настроя локалното хранилище -- %s"
+#~ msgid "Preveza"
+#~ msgstr "Превеза"
 
-#: shell/e-shell.c:1804
-#, c-format
-msgid ""
-"The Evolution component that handles folders of type \"%s\"\n"
-"has unexpectedly quit. You will need to quit Evolution and restart\n"
-"in order to access that data again."
-msgstr ""
-"Компонент на Evolution който поддържа папки от тип \"%s\"\n"
-"неочаквано завърши. Необходимо е да излезете от Evolution и да "
-"престартирате\n"
-"за да получите достъп до данните отново."
+#~ msgid "Pristina"
+#~ msgstr "Пристина"
 
-#: shell/e-shell.c:2069
-msgid "Invalid arguments"
-msgstr "Грешни аргументи"
+#~ msgid "Providence"
+#~ msgstr "Провиденс"
 
-#: shell/e-shell.c:2071
-msgid "Cannot register on OAF"
-msgstr "Не мога да регистрирам в OAF"
+#~ msgid "Provo"
+#~ msgstr "Прово"
 
-#: shell/e-shell.c:2073
-msgid "Configuration Database not found"
-msgstr "Конфигурационната база данни не е намерена"
+#~ msgid "Pskov"
+#~ msgstr "Псков"
 
-#: shell/e-shell.c:2075 shell/e-storage.c:568
-msgid "Generic error"
-msgstr "Грешка"
+#~ msgid "Puebla"
+#~ msgstr "Пуебла"
 
-#: shell/e-shortcuts-view.c:80
-msgid "Create New Shortcut Group"
-msgstr "Създава Нова Група за Кратки Клавиши"
+#~ msgid "Pueblo"
+#~ msgstr "Пуебло"
 
-#: shell/e-shortcuts-view.c:81
-msgid "Group name:"
-msgstr "Име на група:"
+#~ msgid "Puerto Plata"
+#~ msgstr "Пуерто Плата"
 
-#: shell/e-shortcuts-view.c:179
-#, c-format
-msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
-msgstr ""
+#~ msgid "Puerto Vallarta"
+#~ msgstr "Пуерто Валарта"
 
-#: shell/e-shortcuts-view.c:222
-msgid "Rename Shortcut Group"
-msgstr "Преименува Група Препратка"
+#~ msgid "Pula"
+#~ msgstr "Пула"
 
-#: shell/e-shortcuts-view.c:223
-msgid "Rename selected shortcut group to:"
-msgstr "Преименува избраната група препратка на:"
+#~ msgid "Punta Arenas"
+#~ msgstr "Пунта Аренас"
 
-#: shell/e-shortcuts-view.c:255
-msgid "_Small Icons"
-msgstr "_Малки Икони"
+#~ msgid "Punta Cana"
+#~ msgstr "Пунта Сана"
 
-#: shell/e-shortcuts-view.c:256
-msgid "Show the shortcuts as small icons"
-msgstr "Показва препратки като малки икони"
+#~ msgid "Punta Gorda"
+#~ msgstr "Пунта Горда"
 
-#: shell/e-shortcuts-view.c:258
-msgid "_Large Icons"
-msgstr "Го_леми Икони"
+#~ msgid "Quebec"
+#~ msgstr "Квебек"
 
-#: shell/e-shortcuts-view.c:259
-msgid "Show the shortcuts as large icons"
-msgstr "Показва препратки като големи икони"
+#~ msgid "Quebec City"
+#~ msgstr "Квебек град"
 
-#: shell/e-shortcuts-view.c:270
-msgid "_Add Group..."
-msgstr "_Добавя Група..."
+#~ msgid "Rabat"
+#~ msgstr "Рабат"
 
-#: shell/e-shortcuts-view.c:271
-msgid "Create a new shortcut group"
-msgstr "Създава нова група препратка"
+#~ msgid "Recife"
+#~ msgstr "Ресифе"
 
-#: shell/e-shortcuts-view.c:273
-msgid "_Remove this Group..."
-msgstr "П_ремахва тази Група..."
+#~ msgid "Redding"
+#~ msgstr "Рединг"
 
-#: shell/e-shortcuts-view.c:274
-msgid "Remove this shortcut group"
-msgstr "Премахва тази група препратка"
+#~ msgid "Redig"
+#~ msgstr "Редиг"
 
-#: shell/e-shortcuts-view.c:276
-msgid "Re_name this Group..."
-msgstr "П_реименува тази Група..."
+#~ msgid "Redmond"
+#~ msgstr "Редмон"
 
-#: shell/e-shortcuts-view.c:277
-msgid "Rename this shortcut group"
-msgstr "Преименува тази група препратка"
+#~ msgid "Reggio Calabria"
+#~ msgstr "Реджио Калабриа"
 
-#: shell/e-shortcuts-view.c:282
-msgid "_Hide the Shortcut Bar"
-msgstr "С_крива лентата с препратки"
+#~ msgid "Regina"
+#~ msgstr "Режина"
 
-#: shell/e-shortcuts-view.c:283
-msgid "Hide the shortcut bar"
-msgstr "Скрива лентата с препратки"
+#~ msgid "Rennes"
+#~ msgstr "Ренес"
 
-#: shell/e-shortcuts-view.c:288
-msgid "Create _Default Shortcuts"
-msgstr "Създава _Стандартни Бързи Клавиши"
+#~ msgid "Reno"
+#~ msgstr "Рено"
 
-#: shell/e-shortcuts-view.c:289
-msgid "Create Default Shortcuts"
-msgstr "Създава нова препратка"
+#~ msgid "Renton"
+#~ msgstr "Рентон"
 
-#: shell/e-shortcuts-view.c:408
-msgid "Rename Shortcut"
-msgstr "Преименува Кратък Клавиш"
+#~ msgid "Reykjavik"
+#~ msgstr "Рейкявик"
 
-#: shell/e-shortcuts-view.c:409
-msgid "Rename selected shortcut to:"
-msgstr "Преименува избраната препратка на:"
+#~ msgid "Richmond"
+#~ msgstr "Ричмонд"
 
-#: shell/e-shortcuts-view.c:422
-msgid "Open the folder linked to this shortcut"
-msgstr "Отваря папката свързана с тази препратка"
+#~ msgid "Rijeka"
+#~ msgstr "Риека"
 
-#: shell/e-shortcuts-view.c:424 ui/evolution.xml.h:23
-msgid "Open in New _Window"
-msgstr "_Отваря в Нов Прозорец"
+#~ msgid "Rimini"
+#~ msgstr "Римини"
 
-#: shell/e-shortcuts-view.c:424
-msgid "Open the folder linked to this shortcut in a new window"
-msgstr "Отваря папка свързана с тази препратка в нов прозорец"
+#~ msgid "Rio Grande"
+#~ msgstr "Рио Гранде"
 
-#: shell/e-shortcuts-view.c:427
-msgid "_Rename"
-msgstr "_Преименува"
+#~ msgid "Rivas"
+#~ msgstr "Ривас"
 
-#: shell/e-shortcuts-view.c:427
-msgid "Rename this shortcut"
-msgstr "Преименува тази препратка"
+#~ msgid "Rivera"
+#~ msgstr "Ривера"
 
-#: shell/e-shortcuts-view.c:429
-msgid "Re_move"
-msgstr "Пр_емахва"
+#~ msgid "Riverton"
+#~ msgstr "Реивертон"
 
-#: shell/e-shortcuts-view.c:429
-msgid "Remove this shortcut from the shortcut bar"
-msgstr "Изтрива тази препратка от лентата с Кратки Клавиши"
+#~ msgid "Rivolto"
+#~ msgstr "Риволто"
 
-#: shell/e-shortcuts.c:649
-msgid "Error saving shortcuts."
-msgstr "Грешка при запазване на кратки клавиши."
+#~ msgid "Riyadh"
+#~ msgstr "Риад"
 
-#: shell/e-shortcuts.c:1096
-msgid "Shortcuts"
-msgstr "Кратки Клавиши"
+#~ msgid "Roatan"
+#~ msgstr "Роатан"
 
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr ""
+#~ msgid "Rochester"
+#~ msgstr "Рочестер"
 
-#: shell/e-storage.c:566
-msgid "No error"
-msgstr "Няма грешка"
+#~ msgid "Rockford"
+#~ msgstr "Рокфорд"
 
-#: shell/e-storage.c:570
-msgid "A folder with the same name already exists"
-msgstr "Папка със същото име вече съществува"
+#~ msgid "Rodos"
+#~ msgstr "Родос"
 
-#: shell/e-storage.c:572
-msgid "The specified folder type is not valid"
-msgstr "Типа на зададената папка не е валиден"
+#~ msgid "Rogers"
+#~ msgstr "Роджерс"
 
-#: shell/e-storage.c:574
-msgid "I/O error"
-msgstr "Входно/Изходна Грешка"
+#~ msgid "Roma/Ciampino"
+#~ msgstr "Рим/Чаимпино"
 
-#: shell/e-storage.c:576
-msgid "Not enough space to create the folder"
-msgstr "Няма достатъчно пространство за създаването на папка"
+#~ msgid "Roma/Fiumicino"
+#~ msgstr "Рим/Фюмичино"
 
-#: shell/e-storage.c:578
-msgid "The folder is not empty"
-msgstr "Папката не е празна"
+#~ msgid "Roma/Urbe"
+#~ msgstr "Рим/Урбе"
 
-#: shell/e-storage.c:580
-msgid "The specified folder was not found"
-msgstr "Посочената папка не е намерена"
+#~ msgid "Ronneby"
+#~ msgstr "Ронеби"
 
-#: shell/e-storage.c:582
-msgid "Function not implemented in this storage"
-msgstr "Функцията не се използва в това хранилище"
+#~ msgid "Roros"
+#~ msgstr "Ророс"
 
-#: shell/e-storage.c:586
-msgid "Operation not supported"
-msgstr "Операцията не се подържа"
+#~ msgid "Rosario"
+#~ msgstr "Росарио"
 
-#: shell/e-storage.c:588
-msgid "The specified type is not supported in this storage"
-msgstr "Зададеният тип не се поддържа в това хранилище"
+#~ msgid "Roseburg"
+#~ msgstr "Росебург"
 
-#: shell/e-storage.c:590
-msgid "The specified folder cannot be modified or removed"
-msgstr "Посочената папка не може да бъде модифицирана или изтрита"
+#~ msgid "Roseglen"
+#~ msgstr "Росеглен"
 
-#: shell/e-storage.c:592
-msgid "Cannot make a folder a child of one of its descendants"
-msgstr ""
+#~ msgid "Rost"
+#~ msgstr "Рост"
 
-#: shell/e-storage.c:594
-msgid "Cannot create a folder with that name"
-msgstr "Не мога да създам папка с това име"
+#~ msgid "Rostov-Na-Donu"
+#~ msgstr "Ростов на Дон"
 
-#: shell/e-storage.c:596
-msgid "This operation cannot be performed in off-line mode"
-msgstr ""
+#~ msgid "Roswell"
+#~ msgstr "Росвел"
 
-#: shell/e-task-widget.c:211
-#, c-format
-msgid "%s (...)"
-msgstr "%s (...)"
+#~ msgid "Rotterdam"
+#~ msgstr "Ротердам"
 
-#: shell/e-task-widget.c:216
-#, c-format
-msgid "%s (%d%% complete)"
-msgstr "%s (%d%% приключено)"
+#~ msgid "Russell"
+#~ msgstr "Русел"
 
-#: shell/evolution-folder-selector-button.c:100
-msgid "<click here to select a folder>"
-msgstr "<натиснете тук за да изберете папка>"
+#~ msgid "Russia"
+#~ msgstr "Русия"
 
-#: shell/evolution-shell-component-utils.c:124
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Неизвестна грешка."
+#~ msgid "Saarbrucken"
+#~ msgstr "Саарбрюкен"
 
-#: shell/evolution-shell-component-utils.c:127
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Грешката от компонент на системата е:\n"
-"%s"
+#~ msgid "Sacramento"
+#~ msgstr "Сакременто"
 
-#: shell/evolution-shell-component-utils.c:134
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Грешката от активиране на системата е:\n"
-"%s"
+#~ msgid "Salem"
+#~ msgstr "Салем"
 
-#: shell/evolution-shell-component.c:1187
-msgid "CORBA error"
-msgstr "Грешка в CORBA"
+#~ msgid "Salida"
+#~ msgstr "Салида"
 
-#: shell/evolution-shell-component.c:1189
-msgid "Interrupted"
-msgstr "Прекъснат"
+#~ msgid "Salina"
+#~ msgstr "Салина"
 
-#: shell/evolution-shell-component.c:1191
-msgid "Invalid argument"
-msgstr "Грешен аргумент"
+#~ msgid "Salinas"
+#~ msgstr "Салинас"
 
-#: shell/evolution-shell-component.c:1193
-msgid "Already has an owner"
-msgstr "Вече има собственик"
+#~ msgid "Salmon"
+#~ msgstr "Салмон"
 
-#: shell/evolution-shell-component.c:1195
-msgid "No owner"
-msgstr "Няма соственик"
+#~ msgid "Salmon (2)"
+#~ msgstr "Салмон (2)"
 
-#: shell/evolution-shell-component.c:1197
-msgid "Not found"
-msgstr "Не е намерен"
+#~ msgid "Salta"
+#~ msgstr "Салта"
 
-#: shell/evolution-shell-component.c:1199
-msgid "Unsupported type"
-msgstr "Неподържан тип"
+#~ msgid "Salt Lake City"
+#~ msgstr "Солт Лейк Сити"
 
-#: shell/evolution-shell-component.c:1201
-msgid "Unsupported schema"
-msgstr "Неподържана схема"
+#~ msgid "Salto"
+#~ msgstr "Салто"
 
-#: shell/evolution-shell-component.c:1203
-msgid "Unsupported operation"
-msgstr "Неподържана операция"
+#~ msgid "Salvador"
+#~ msgstr "Славадор"
 
-#: shell/evolution-shell-component.c:1205
-msgid "Internal error"
-msgstr "Вътрешна грешка"
+#~ msgid "Salzburg"
+#~ msgstr "Залцбург"
 
-#: shell/evolution-shell-component.c:1209
-msgid "Exists"
-msgstr "Съществуват"
+#~ msgid "Samara"
+#~ msgstr "Самара"
 
-#: shell/evolution-shell-component.c:1211
-msgid "Invalid URI"
-msgstr "Грешен URI"
+#~ msgid "Samos"
+#~ msgstr "Самос"
 
-#: shell/evolution-shell-component.c:1215
-msgid "Has subfolders"
-msgstr "Има подпапки"
+#~ msgid "Samsun"
+#~ msgstr "Самсун"
 
-#: shell/evolution-shell-component.c:1217
-msgid "No space left"
-msgstr "Няма място"
+#~ msgid "San Angelo"
+#~ msgstr "Сан Анжело"
 
-#: shell/evolution-shell-component.c:1219
-msgid "Old owner has died"
-msgstr "Старият собственик е умрял"
+#~ msgid "San Antonio"
+#~ msgstr "Сан Антонио"
 
-#: shell/evolution-test-component.c:63
-msgid "Test type"
-msgstr ""
+#~ msgid "San Carlos"
+#~ msgstr "Сан Карлос"
 
-#: shell/evolution-test-component.c:703
-msgid "Evolution Test Component"
-msgstr ""
+#~ msgid "Sandberg"
+#~ msgstr "Санберг"
 
-#: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "Active Connections"
-msgstr "Активни Връзки"
+#~ msgid "Sanderson"
+#~ msgstr "Сандерсон"
 
-#: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Click OK to close these connections and go offline"
-msgstr "Натиснете OK за да затворите връзките и да преминете в 'offline'"
+#~ msgid "San Diego"
+#~ msgstr "Сан Диего"
 
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "The following connections are currently active:"
-msgstr "Следните връзки са в момента активни:"
+#~ msgid "San Diego-Miramar"
+#~ msgstr "Сан Диего - Мирамар"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:1
-msgid "C_alendar:"
-msgstr "К_алендар:"
+#~ msgid "San Diego-Montgomery"
+#~ msgstr "Сан Диего - Монгомери"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:2
-msgid "_Contacts:"
-msgstr "_Контакт"
+#~ msgid "Sanford"
+#~ msgstr "Санфорд"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:3
-msgid "_Mail:"
-msgstr "_Поща"
+#~ msgid "San Francisco"
+#~ msgstr "Сан Франциско"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:4
-msgid "_Tasks:"
-msgstr "_Задачи"
+#~ msgid "Sankt-Peterburg"
+#~ msgstr "Санк-Петербург"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
-msgid "Folder _name:"
-msgstr "Име_на_папка:"
+#~ msgid "San Miguel"
+#~ msgstr "Сан Мигел"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Folder _type:"
-msgstr "Тип_папка:"
+#~ msgid "San Salvador"
+#~ msgstr "Сан Славадор"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
-msgid "Specify where to create the folder:"
-msgstr "Укажете каде да бъде създадена папката:"
+#~ msgid "San Sebastian"
+#~ msgstr "Сан Себастиян"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
-msgid "Open Other User's Folder"
-msgstr "Отваря Папката на Друг Потребител"
+#~ msgid "Santa Ana"
+#~ msgstr "Санта Ана"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
-msgid "_Account:"
-msgstr "_Акаунт:"
+#~ msgid "Santa Barbara"
+#~ msgstr "Санта Барбара"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
-msgid "_Folder Name:"
-msgstr "_Име на папката:"
+#~ msgid "Santa Cruz"
+#~ msgstr "Санта Круз"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
-msgid "_User:"
-msgstr "_Потребител"
+#~ msgid "Santa Fe"
+#~ msgstr "Санта Фе"
 
-#: shell/glade/evolution-startup-wizard.glade.h:2
-msgid "Evolution Setup Assistant"
-msgstr "Асистент за Настройка на Evolution"
+#~ msgid "Santa Maria"
+#~ msgstr "Санта Мария"
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
-msgid "Importing Files"
-msgstr "Импортира Файлове"
+#~ msgid "Santa Monica"
+#~ msgstr "Санат Моника"
 
-#: shell/glade/evolution-startup-wizard.glade.h:4
-msgid "Timezone "
-msgstr "Времева Зона: "
+#~ msgid "Santander"
+#~ msgstr "Сантандер"
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
-msgid "Welcome"
-msgstr "Добре Дошли"
+#~ msgid "Santarem"
+#~ msgstr "Сантарем"
 
-#: shell/glade/evolution-startup-wizard.glade.h:6
-msgid ""
-"Welcome to Evolution. The next few screens will allow\n"
-"Evolution to connect to your email accounts, and to import\n"
-"files from other applications. \n"
-"\n"
-"Please click the \"Forward\" button to continue. "
-msgstr ""
+#~ msgid "Santa Rosa"
+#~ msgstr "Санта Роса"
 
-#: shell/glade/evolution-startup-wizard.glade.h:11
-msgid ""
-"You have successfully entered all of the information\n"
-"needed to set up Evolution. \n"
-"\n"
-"Click the \"Apply\" button to save your settings. "
-msgstr ""
+#~ msgid "Santiago"
+#~ msgstr "Сантяго"
 
-#: shell/importer/import.glade.h:1
-msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr ""
-"Натиснете \"Импорт\" за да започне импортирането на файла в Evolution."
+#~ msgid "Santiago de Cuba"
+#~ msgstr "Сантяго де Куба"
 
-#: shell/importer/import.glade.h:2
-msgid "Evolution Import Assistant"
-msgstr "Помощ за Импортиране на Evolution"
+#~ msgid "Santorini"
+#~ msgstr "Санторини"
 
-#: shell/importer/import.glade.h:3
-msgid "Import File (step 3 of 3)"
-msgstr "Импорт на Файл (стъпка 3 от 3)"
+#~ msgid "Santos"
+#~ msgstr "Сантос"
 
-#: shell/importer/import.glade.h:4
-msgid "Importer Type (step 1 of 3)"
-msgstr "Тип на Импортер (стъпка 1 от 3)"
+#~ msgid "Sao Paulo"
+#~ msgstr "Сао Паоло"
 
-#: shell/importer/import.glade.h:5
-msgid "Select Importers (step 2 of 3)"
-msgstr "Избери Импортер (стъпка 2 от 3)"
+#~ msgid "Sarajevo"
+#~ msgstr "Сараево"
 
-#: shell/importer/import.glade.h:6
-msgid "Select a File (step 2 of 3)"
-msgstr "Избери Файл (стъпка 2 от 3)"
+#~ msgid "Sarasota"
+#~ msgstr "Сарасота"
 
-#: shell/importer/import.glade.h:7
-msgid ""
-"Welcome to the Evolution Import Assistant.\n"
-"With this assistant you will be guided through the process of\n"
-"importing external files into Evolution."
-msgstr ""
-"Добре дошли в помощника за импортиране на Evolution.\n"
-"С него ще бъдете подпомогнати в процеса на импортиране\n"
-"на външни файлове в Evolution."
+#~ msgid "Saratov"
+#~ msgstr "Саратов"
 
-#: shell/importer/intelligent.c:189
-msgid "Importers"
-msgstr "Импортери"
+#~ msgid "Seattle"
+#~ msgstr "Сиатъл"
 
-#: shell/importer/intelligent.c:195
-msgid "Don't import"
-msgstr "Не импортирай"
+#~ msgid "Sedalia"
+#~ msgstr "Седалия"
 
-#: shell/importer/intelligent.c:199
-msgid "Don't ask me again"
-msgstr "Не ме питай отново"
+#~ msgid "Selanik"
+#~ msgstr "Селаник"
 
-#: shell/importer/intelligent.c:207
-msgid "Evolution can import data from the following files:"
-msgstr "Evolution не може да импортира данни от следните файлове:"
+#~ msgid "Seoul/Kimp'O International Airport"
+#~ msgstr "Международно летище Сеул"
 
-#: shell/main.c:112 shell/main.c:574
-msgid "Evolution"
-msgstr "Evolution"
+#~ msgid "Sevilla"
+#~ msgstr "Севилия"
 
-#: shell/main.c:118
-msgid "Evolution is now exiting ..."
-msgstr "Evolution излиза..."
+#~ msgid "Shanghai"
+#~ msgstr "Шанхай"
 
-#. Preview/Alpha/Beta version warning message
-#: shell/main.c:274
-#, no-c-format
-msgid ""
-"Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
-"\n"
-"This version of Ximian Evolution is not yet complete. It is getting close,\n"
-"but some features are either unfinished or do not work properly.\n"
-"\n"
-"If you want a stable version of Evolution, we urge you to uninstall\n"
-"this version, and install version %s instead.\n"
-"\n"
-"If you find bugs, please report them to us at bugzilla.ximian.com.\n"
-"This product comes with no warranty and is not intended for\n"
-"individuals prone to violent fits of anger.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we\n"
-"eagerly await your contributions!\n"
-msgstr ""
+#~ msgid "Shannon"
+#~ msgstr "Шанон"
 
-#: shell/main.c:298
-msgid ""
-"Thanks\n"
-"The Ximian Evolution Team\n"
-msgstr ""
-"Благодарности\n"
-"От екипа на Ximian·Evolution\n"
+#~ msgid "Shelton"
+#~ msgstr "Шелтън"
 
-#: shell/main.c:306
-msgid "Don't tell me again"
-msgstr "Не ми казвай отново"
+#~ msgid "Sheridan"
+#~ msgstr "Шеридан"
 
-#: shell/main.c:401
-msgid "Cannot access the Ximian Evolution shell."
-msgstr "Нямам достъп до обвивката на Ximian Evolution."
+#~ msgid "Shiraz"
+#~ msgstr "Шираз"
 
-#: shell/main.c:410
-#, c-format
-msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr "Не мога да инициализирам обвивката на Ximian Evolution: %s"
+#~ msgid "Shoreham"
+#~ msgstr "Шорехам"
 
-#: shell/main.c:542
-msgid "Disable splash screen"
-msgstr "Забранява 'splash' екран"
+#~ msgid "Show Low"
+#~ msgstr "Покажи Долу"
 
-#: shell/main.c:544
-msgid "Start in offline mode"
-msgstr "Стартира в \"offline\" режим"
+#~ msgid "Sidney"
+#~ msgstr "Сидней"
 
-#: shell/main.c:546
-msgid "Start in online mode"
-msgstr "Стартира в \"online\" режим"
+#~ msgid "Sigonella"
+#~ msgstr "Сигонела"
 
-#: shell/main.c:549
-msgid "Forcibly shut down all evolution components"
-msgstr ""
+#~ msgid "Sindal"
+#~ msgstr "Синдал"
 
-#: shell/main.c:552
-msgid "Send the debugging output of all components to a file."
-msgstr "Изпраща изхода от дебъга на всички компоненти във файл."
+#~ msgid "Sitka"
+#~ msgstr "Ситка"
 
-#: shell/main.c:578
-#, c-format
-msgid ""
-"%s: --online and --offline cannot be used together.\n"
-"  Use %s --help for more information.\n"
-msgstr ""
+#~ msgid "Sivas"
+#~ msgstr "Сивас"
 
-#: tools/evolution-addressbook-abuse.c:81
-#: tools/evolution-addressbook-import.c:46
-msgid "Error loading default addressbook."
-msgstr "Грешка при зареждането на адресна книга"
+#~ msgid "Skopje"
+#~ msgstr "Скопие"
 
-#: tools/evolution-addressbook-abuse.c:112
-#: tools/evolution-addressbook-import.c:67
-msgid "Input File"
-msgstr "Файл за изход"
+#~ msgid "Sochi"
+#~ msgstr "Сочи"
 
-#: tools/evolution-addressbook-import.c:82
-msgid "No filename provided."
-msgstr "Няма име на файл"
+#~ msgid "Socorro"
+#~ msgstr "Сокоро"
 
-#: tools/evolution-launch-composer.c:324
-msgid "An attachment to add."
-msgstr ""
+#~ msgid "Socotra"
+#~ msgstr "Сокотра"
 
-#: tools/evolution-launch-composer.c:325
-msgid "Content type of the attachment."
-msgstr ""
+#~ msgid "Sofia"
+#~ msgstr "София"
 
-#: tools/evolution-launch-composer.c:326
-msgid "The filename to display in the mail."
-msgstr ""
+#~ msgid "South Carolina"
+#~ msgstr "Южна Каролина"
 
-#: tools/evolution-launch-composer.c:327
-msgid "Description of the attachment."
-msgstr ""
+#~ msgid "South Dakota"
+#~ msgstr "Южна Дакота"
 
-#: tools/evolution-launch-composer.c:328
-msgid "Mark attachment to be shown inline by default."
-msgstr ""
+#~ msgid "Spencer"
+#~ msgstr "Спенсър"
 
-#: tools/evolution-launch-composer.c:329
-msgid "Default subject for the message."
-msgstr ""
+#~ msgid "Split"
+#~ msgstr "Сполит"
 
-#. This most likely means that KILL_PROCESS_CMD wasn't
-#. * found, so just bail completely.
-#.
-#: tools/killev.c:63
-#, c-format
-msgid "Could not execute '%s': %s\n"
-msgstr ""
+#~ msgid "Springfield"
+#~ msgstr "Спрингфийлд"
 
-#: tools/killev.c:78
-#, c-format
-msgid "Shutting down %s (%s)\n"
-msgstr "Спира %s·(%s)\n"
+#~ msgid "Stavanger/Sola"
+#~ msgstr "Ставангер/Сола"
 
-#: ui/evolution-addressbook.xml.h:3
-msgid "Copy Contact(s) to Another Folder..."
-msgstr "Копира кантакт(и) в Друга Папка..."
+#~ msgid "Stavropol"
+#~ msgstr "Ставропол"
 
-#: ui/evolution-addressbook.xml.h:4 ui/evolution-calendar.xml.h:2
-msgid "Copy the selection"
-msgstr "Копира избраното"
+#~ msgid "Stockholm (Arlanda)"
+#~ msgstr "Стокхолм (Арланда)"
 
-#: ui/evolution-addressbook.xml.h:5
-msgid "Copy to Folder..."
-msgstr "Копира в Папка..."
+#~ msgid "Stockholm (Bromma)"
+#~ msgstr "Стокхолм (Брома)"
 
-#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
-msgid "Cut the selection"
-msgstr "Изрязва избраното"
+#~ msgid "Stockton"
+#~ msgstr "Стоктън"
 
-#: ui/evolution-addressbook.xml.h:9
-msgid "Delete selected contacts"
-msgstr "Изтрива избраните контакти"
+#~ msgid "St Paul"
+#~ msgstr "Сант Паул"
 
-#: ui/evolution-addressbook.xml.h:11
-msgid "Move Contact(s) to Another Folder..."
-msgstr "Премества Контакт(и) в Друга Папка..."
+#~ msgid "St Petersburg"
+#~ msgstr "Сант Петербург"
 
-#: ui/evolution-addressbook.xml.h:12
-msgid "Move to Folder..."
-msgstr "Премества в Папка..."
+#~ msgid "Strasbourg"
+#~ msgstr "Страсбург"
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:17
-msgid "Paste the clipboard"
-msgstr "Поставя съдържанието на буфера за обмен"
+#~ msgid "Strevell"
+#~ msgstr "Стревел"
 
-#: ui/evolution-addressbook.xml.h:15
-msgid "Previews the contacts to be printed"
-msgstr "Преглед на контактите за печат"
+#~ msgid "Stuttgart"
+#~ msgstr "Щутгард"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:19
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
-#: ui/evolution-tasks.xml.h:13
-msgid "Print Pre_view"
-msgstr "Печатен Преглед"
+#~ msgid "Sydney"
+#~ msgstr "Сидней"
 
-#: ui/evolution-addressbook.xml.h:18
-msgid "Print selected contacts"
-msgstr "Отпечатва избраните контакти"
+#~ msgid "Syktyvkar"
+#~ msgstr "Сиктивкар"
 
-#: ui/evolution-addressbook.xml.h:20
-msgid "Save selected contacts as a VCard."
-msgstr "Запазва избраните контакти като VCard."
+#~ msgid "Syracuse"
+#~ msgstr "Сиракуза"
 
-#: ui/evolution-addressbook.xml.h:21
-msgid "Select All"
-msgstr "Избира всичко"
+#~ msgid "Tabatinga"
+#~ msgstr "Табатинга"
 
-#: ui/evolution-addressbook.xml.h:22
-msgid "Select all contacts"
-msgstr "Избира всички контакти"
+#~ msgid "Tabriz"
+#~ msgstr "Табриз"
 
-#: ui/evolution-addressbook.xml.h:23
-msgid "Send a mess to the selected contacts."
-msgstr "Изпраща съобщение до избрани контакти"
+#~ msgid "Tabuk"
+#~ msgstr "Табук"
 
-#: ui/evolution-addressbook.xml.h:24
-msgid "Send message to contact"
-msgstr "Изпраща съобщение към контакт"
+#~ msgid "Tachikawa Ab"
+#~ msgstr "Ташикава"
 
-#: ui/evolution-addressbook.xml.h:25
-msgid "Send selected contacts to another person."
-msgstr "Изпраща избраният контакт на друг."
+#~ msgid "Tacoma"
+#~ msgstr "Такома"
 
-#: ui/evolution-addressbook.xml.h:26
-msgid "Stop"
-msgstr "Спира"
+#~ msgid "Taif"
+#~ msgstr "Тайф"
 
-#: ui/evolution-addressbook.xml.h:27
-msgid "Stop Loading"
-msgstr "Спира Зареждането"
+#~ msgid "Tainan"
+#~ msgstr "Тайнан"
 
-#: ui/evolution-addressbook.xml.h:28
-msgid "View the current contact"
-msgstr "Преглежда текущия контакт"
+#~ msgid "Takamatsu Airport"
+#~ msgstr "Летище Такаматсу"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:28
-#: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:11
-#: ui/evolution-contact-list-editor.xml.h:10
-#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:15 ui/evolution.xml.h:42
-msgid "_Actions"
-msgstr "_Действия"
+#~ msgid "Talara"
+#~ msgstr "Талара"
 
-#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
-msgid "_Forward Contact..."
-msgstr "_Напред в Контакти..."
+#~ msgid "Tampa"
+#~ msgstr "Тампа"
 
-#: ui/evolution-addressbook.xml.h:35
-msgid "_Move to Folder..."
-msgstr "Премества в Папка..."
+#~ msgid "Tampere"
+#~ msgstr "Тампере"
 
-#: ui/evolution-addressbook.xml.h:39
-msgid "_Save as VCard"
-msgstr "_Запазва като VCard"
+#~ msgid "Tampico"
+#~ msgstr "Тампико"
 
-#: ui/evolution-addressbook.xml.h:40
-msgid "_Search for Contacts"
-msgstr "Тър_сене за Контакти"
+#~ msgid "Tanana"
+#~ msgstr "Танана"
 
-#: ui/evolution-addressbook.xml.h:41
-msgid "_Select All"
-msgstr "_Избира Всичко"
+#~ msgid "Taos"
+#~ msgstr "Таос"
 
-#: ui/evolution-addressbook.xml.h:42
-msgid "_Send Message to Contact..."
-msgstr "_Изпраща Съобщение до Контакт"
+#~ msgid "Tapachula"
+#~ msgstr "Тапачула"
 
-#: ui/evolution-calendar.xml.h:4
-msgid "Day"
-msgstr "Ден"
+#~ msgid "Taranto"
+#~ msgstr "Таранто"
 
-#: ui/evolution-calendar.xml.h:5
-msgid "Delete All Occurrences"
-msgstr ""
+#~ msgid "Tarbes"
+#~ msgstr "Тарбес"
 
-#: ui/evolution-calendar.xml.h:6
-msgid "Delete the appointment"
-msgstr "Изтрива срещата"
+#~ msgid "Tarvisio"
+#~ msgstr "Тарвизио"
 
-#: ui/evolution-calendar.xml.h:7
-msgid "Delete this Occurrence"
-msgstr ""
+#~ msgid "Tatalina"
+#~ msgstr "Таталина"
 
-#: ui/evolution-calendar.xml.h:8
-msgid "Delete this occurrence"
-msgstr ""
+#~ msgid "Tebessa"
+#~ msgstr "Тебеса"
 
-#: ui/evolution-calendar.xml.h:9
-msgid "Go To"
-msgstr "Отива"
+#~ msgid "Tegucigalpa"
+#~ msgstr "Тегосигалпа"
 
-#: ui/evolution-calendar.xml.h:10
-msgid "Go back"
-msgstr "Отива назад"
+#~ msgid "Tela"
+#~ msgstr "Тела"
 
-#: ui/evolution-calendar.xml.h:11
-msgid "Go forward"
-msgstr "Отива напред"
+#~ msgid "Temple"
+#~ msgstr "Темпле"
 
-#: ui/evolution-calendar.xml.h:12
-msgid "Go to _Date"
-msgstr "Отиаи на Дата"
+#~ msgid "Tennessee"
+#~ msgstr "Тенеси"
 
-#: ui/evolution-calendar.xml.h:14
-msgid "Go to a specific date"
-msgstr "Отива на определена дата"
+#~ msgid "Tepic"
+#~ msgstr "Тепик"
 
-#: ui/evolution-calendar.xml.h:15
-msgid "Go to today"
-msgstr "Отиви на днес"
+#~ msgid "Teresina"
+#~ msgstr "Тересина"
 
-#: ui/evolution-calendar.xml.h:16
-msgid "Month"
-msgstr "Месец"
+#~ msgid "Terrell"
+#~ msgstr "Терел"
 
-#: ui/evolution-calendar.xml.h:18
-msgid "Previews the calendar to be printed"
-msgstr "Преглед на календар за печат"
+#~ msgid "Teterboro"
+#~ msgstr "Тетерборо"
 
-#: ui/evolution-calendar.xml.h:20
-msgid "Print this calendar"
-msgstr "Отпечатва този календар"
+#~ msgid "Texarkana"
+#~ msgstr "Техеркана"
 
-#: ui/evolution-calendar.xml.h:21
-msgid "Publish Free/Busy information for this calendar"
-msgstr "Публична Свободна/Заета информация за този календар"
+#~ msgid "Texas"
+#~ msgstr "Тексас"
 
-#: ui/evolution-calendar.xml.h:22
-msgid "Show one day"
-msgstr "Показва един ден"
+#~ msgid "Thessaloniki"
+#~ msgstr "Солун"
 
-#: ui/evolution-calendar.xml.h:23
-msgid "Show one month"
-msgstr "Показва един месец"
+#~ msgid "Tijuana"
+#~ msgstr "Тиоана"
 
-#: ui/evolution-calendar.xml.h:24
-msgid "Show one week"
-msgstr "Показва една седмица"
+#~ msgid "Timisoara"
+#~ msgstr "Тимишоара"
 
-#: ui/evolution-calendar.xml.h:25
-msgid "Show the working week"
-msgstr "Показва работната седмица"
+#~ msgid "Tirana"
+#~ msgstr "Тирана"
 
-#: ui/evolution-calendar.xml.h:26
-msgid "Week"
-msgstr "Седмица"
+#~ msgid "Tivat"
+#~ msgstr "Тиват"
 
-#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
-#: ui/evolution-contact-list-editor.xml.h:1
-#: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
-#: ui/evolution.xml.h:5
-msgid "Close"
-msgstr "Затваря"
+#~ msgid "Tokushima Ab"
+#~ msgstr " "
 
-#: ui/evolution-comp-editor.xml.h:3
-msgid "Close this item"
-msgstr "Затваря тази точка"
+#~ msgid "Tokyo Heliport"
+#~ msgstr "Токио Летище за хеликоптери"
 
-#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
-msgid "Delete this item"
-msgstr "Изтрива тази точка"
+#~ msgid "Tokyo International Airport"
+#~ msgstr "Токио Международно Летище"
 
-#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:18
-msgid "Main toolbar"
-msgstr "Главна лента с инструменти"
+#~ msgid "Tokyo New International Airport"
+#~ msgstr "Токио Ново Международно Летище"
 
-#: ui/evolution-comp-editor.xml.h:7
-msgid "Preview the printed item"
-msgstr "Преглед на точката за печат"
+#~ msgid "Toledo"
+#~ msgstr "Толедо"
 
-#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:6
-msgid "Print this item"
-msgstr "Печат на тази точка"
+#~ msgid "Toluca"
+#~ msgstr "Толука"
 
-#: ui/evolution-comp-editor.xml.h:11 ui/evolution-contact-editor.xml.h:7
-#: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:18
-msgid "Save _As..."
-msgstr "Съхранява К_ато..."
+#~ msgid "Topeka"
+#~ msgstr "Топека"
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:6
-#: ui/evolution-signature-editor.xml.h:6
-msgid "Save and Close"
-msgstr "Запазва и Затваря"
+#~ msgid "Torino/Bric Della Croce"
+#~ msgstr "Торино"
 
-#: ui/evolution-comp-editor.xml.h:13
-msgid "Save and _Close"
-msgstr "Запазва и _Затваря"
+#~ msgid "Torino/Caselle"
+#~ msgstr "Торино/Каселе"
 
-#: ui/evolution-comp-editor.xml.h:14
-msgid "Save the item and close the dialog box"
-msgstr "Запазва точката и затваря диалога"
+#~ msgid "Toronto"
+#~ msgstr "Торонто"
 
-#: ui/evolution-comp-editor.xml.h:15
-msgid "Save this item to disk"
-msgstr "Запазва тази точка на диска"
+#~ msgid "Torp"
+#~ msgstr "Торп"
 
-#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
-#: ui/evolution-contact-list-editor.xml.h:11
-#: ui/evolution-mail-messagedisplay.xml.h:7
-#: ui/evolution-message-composer.xml.h:42
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:46
-msgid "_File"
-msgstr "_Файл"
+#~ msgid "Torrance"
+#~ msgstr "Торансе"
 
-#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:15
-#: ui/evolution-contact-list-editor.xml.h:12
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:14
-msgid "_Save"
-msgstr "_Запазва"
+#~ msgid "Torreon"
+#~ msgstr "Тореон"
 
-#: ui/evolution-composer-entries.xml.h:1
-msgid "Copy selected text to the clipboard"
-msgstr "Копира избрания текст в буферът за обмен"
+#~ msgid "Tottori Airport"
+#~ msgstr "Летище Тотори"
 
-#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-list.xml.h:3
-msgid "Cu_t"
-msgstr "_Отрежи"
+#~ msgid "Toulouse"
+#~ msgstr "Тулуза"
 
-#: ui/evolution-composer-entries.xml.h:3
-msgid "Cut selected text to the clipboard"
-msgstr "Поставя съобщението в буфера за обмен"
+#~ msgid "Trabzon"
+#~ msgstr "Трабзон"
 
-#: ui/evolution-composer-entries.xml.h:4
-msgid "Paste text from the clipboard"
-msgstr "Постявя текст от буферът за обмен"
+#~ msgid "Trapani"
+#~ msgstr "Трапани"
 
-#: ui/evolution-composer-entries.xml.h:5 ui/evolution-mail-list.xml.h:13
-#: ui/evolution-subscribe.xml.h:6
-msgid "Select _All"
-msgstr "Избери _Всичко"
+#~ msgid "Trinidad"
+#~ msgstr "Тринидат"
 
-#: ui/evolution-composer-entries.xml.h:6
-msgid "Select all text"
-msgstr "Маркира Целия Текст"
+#~ msgid "Tripoli"
+#~ msgstr "Триполи"
 
-#: ui/evolution-contact-editor.xml.h:5
-msgid "Print En_velope..."
-msgstr "Печат на П_лик..."
+#~ msgid "Tsushima Airport"
+#~ msgstr "Летище Цушима"
 
-#: ui/evolution-contact-editor.xml.h:9
-msgid "Save the contact and close the dialog box"
-msgstr "Запазва контакта и затваря диалога"
+#~ msgid "Tucson"
+#~ msgstr "Тускон"
 
-#: ui/evolution-contact-editor.xml.h:10
-msgid "Send _Message to Contact..."
-msgstr "Изпраща Съобщението на Контакт.."
+#~ msgid "Tulsa"
+#~ msgstr "Тулса"
 
-#: ui/evolution-contact-list-editor.xml.h:3
-msgid "Delete this list"
-msgstr "Изтрива този списък"
+#~ msgid "Tupelo"
+#~ msgstr "Тупело"
 
-#: ui/evolution-contact-list-editor.xml.h:4
-msgid "Delete..."
-msgstr "Изтрива..."
+#~ msgid "Turku"
+#~ msgstr "Турку"
 
-#: ui/evolution-contact-list-editor.xml.h:7
-msgid "Save the list and close the dialog box"
-msgstr "Запазва списъка и затваря диалога"
+#~ msgid "Tyumen"
+#~ msgstr "Тюмен"
 
-#: ui/evolution-contact-list-editor.xml.h:8
-msgid "Se_nd list to other..."
-msgstr "Изпраща спис_ък на друг..."
+#~ msgid "Ufa"
+#~ msgstr "Уфа"
 
-#: ui/evolution-contact-list-editor.xml.h:9
-msgid "Send _message to list..."
-msgstr "Изпраща с_ъобщението към списък..."
+#~ msgid "Ulsan"
+#~ msgstr "Улсан"
 
-#: ui/evolution-event-editor.xml.h:1
-msgid "Cancel Mee_ting"
-msgstr "Прекратява _Среща"
+#~ msgid "Ulyanovsk"
+#~ msgstr "Уляновск"
 
-#: ui/evolution-event-editor.xml.h:2
-msgid "Cancel the meeting for this item"
-msgstr "Прекъсва срещата за този пункт"
+#~ msgid "United Arab Emirates "
+#~ msgstr "Обединени Арабски Емирства"
 
-#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
-msgid "Forward as i_Calendar"
-msgstr "Препраща като _iКалендар"
+#~ msgid "Utah"
+#~ msgstr "Юта"
 
-#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:6
-msgid "Forward this item via email"
-msgstr "Препраща това съобщение чрез ел. поща"
+#~ msgid "Vadso"
+#~ msgstr "Вадсо"
 
-#: ui/evolution-event-editor.xml.h:7
-msgid "Obtain the latest meeting information"
-msgstr "Получава последната информация за среща"
+#~ msgid "Vagar"
+#~ msgstr "Вагар"
 
-#: ui/evolution-event-editor.xml.h:8
-msgid "Re_fresh Meeting"
-msgstr "Освежав_а Среща"
+#~ msgid "Valdez 2"
+#~ msgstr "Валдез 2"
 
-#: ui/evolution-event-editor.xml.h:9
-msgid "Schedule _Meeting"
-msgstr "План на _Среща"
+#~ msgid "Valdosta"
+#~ msgstr "Валдоста"
 
-#: ui/evolution-event-editor.xml.h:10
-msgid "Schedule a meeting for this item"
-msgstr "Разпределя срещи за тази задача"
+#~ msgid "Valencia"
+#~ msgstr "Валенсия"
 
-#: ui/evolution-executive-summary.xml.h:1
-msgid "Customize My Evolution"
-msgstr ""
+#~ msgid "Valentine"
+#~ msgstr "Валентин"
 
-#: ui/evolution-mail-global.xml.h:2
-msgid "Cancel the current mail operation"
-msgstr "Прекъсва текущата пощенска операция"
+#~ msgid "Valparaiso"
+#~ msgstr "Валпарайсо"
 
-#: ui/evolution-mail-global.xml.h:3
-msgid "Compose _New Message"
-msgstr "Пише Ново _Съобщение"
+#~ msgid "Van"
+#~ msgstr "Ван"
 
-#: ui/evolution-mail-global.xml.h:4
-msgid "Create or edit rules for filtering new mail"
-msgstr "Създава или редактира правила за филтриране на нова поща"
+#~ msgid "Vancouver"
+#~ msgstr "Ванкувър"
 
-#: ui/evolution-mail-global.xml.h:5
-msgid "Create or edit virtual folder definitions"
-msgstr "Създава или редактира дефиниции на виртуална папка"
+#~ msgid "Vandel"
+#~ msgstr "Вандел"
 
-#: ui/evolution-mail-global.xml.h:6
-msgid "Empty _Trash"
-msgstr "Изпразва _Кошчето"
+#~ msgid "Varadero"
+#~ msgstr "Варадеро"
 
-#: ui/evolution-mail-global.xml.h:7
-msgid "Forget _Passwords"
-msgstr "Забравя _Пароли"
+#~ msgid "Varna"
+#~ msgstr "Варна"
 
-#: ui/evolution-mail-global.xml.h:8
-msgid "Forget remembered passwords so you will be prompted for them again"
-msgstr ""
-"Забравя запомнената парола, така че вие ще бъдете запитан за нея отново"
+#~ msgid "Venezia"
+#~ msgstr "Венециа"
 
-#: ui/evolution-mail-global.xml.h:9
-msgid "Open a window for composing a mail message"
-msgstr "Отваря прозорец за създаване на пощеснко съобщение"
+#~ msgid "Venice"
+#~ msgstr "Венеция"
 
-#: ui/evolution-mail-global.xml.h:10
-msgid "Permanently remove all deleted messages from all folders"
-msgstr "Изтрива за постоянно всички съобщения от тези папки"
+#~ msgid "Veracruz"
+#~ msgstr "Веракруз"
 
-#: ui/evolution-mail-global.xml.h:11
-msgid "Post New Message"
-msgstr "Изпраща Ново Съобщение"
+#~ msgid "Vernal"
+#~ msgstr "Вернал"
 
-#: ui/evolution-mail-global.xml.h:12
-msgid "Post a message to a Public folder"
-msgstr ""
+#~ msgid "Vicenza"
+#~ msgstr "Висенца"
 
-#: ui/evolution-mail-global.xml.h:13
-msgid "S_ubscribe to Folders..."
-msgstr "_Абонира се за Папки"
+#~ msgid "Vicksburg"
+#~ msgstr "Вискбург"
 
-#: ui/evolution-mail-global.xml.h:14
-msgid "Show message preview window"
-msgstr "Показва предишен прозорец на съобщение "
+#~ msgid "Victoria"
+#~ msgstr "Виктория"
 
-#: ui/evolution-mail-global.xml.h:15
-msgid "Subscribe or unsubscribe to folders on remote servers"
-msgstr "Абониране и отабониране за папки на отдалечени сървъри"
+#~ msgid "Vigo"
+#~ msgstr "Виго"
 
-#: ui/evolution-mail-global.xml.h:16
-msgid "Virtual Folder _Editor..."
-msgstr "Редактор за Виртуални Папки"
+#~ msgid "Vilnius"
+#~ msgstr "Вилнюс"
 
-#: ui/evolution-mail-global.xml.h:18
-msgid "_Filters..."
-msgstr "_Филтри..."
+#~ msgid "Virginia"
+#~ msgstr "Виржиния"
 
-#: ui/evolution-mail-global.xml.h:19
-msgid "_Preview Pane"
-msgstr "_Предварителен преглед на Pane"
+#~ msgid "Virginia Beach"
+#~ msgstr "Виржиния Крайбрежие"
 
-#: ui/evolution-mail-list.xml.h:1
-msgid "Change the properties of this folder"
-msgstr "Промяна настройките за тази папка"
+#~ msgid "Vitoria"
+#~ msgstr "Витория"
 
-#: ui/evolution-mail-list.xml.h:2
-msgid "Copy selected message(s) to the clipboard"
-msgstr "Копира избраните писма в буфера за обмен"
+#~ msgid "Vladikavkaz"
+#~ msgstr "Владивокавказ"
 
-#: ui/evolution-mail-list.xml.h:4
-msgid "Cut selected message(s) to the clipboard"
-msgstr "Изрязва избраните писма в буферът за обмен"
+#~ msgid "Vladivostok"
+#~ msgstr "Владивосток"
 
-#: ui/evolution-mail-list.xml.h:5
-msgid "Hide S_elected Messages"
-msgstr "Скрива Избраните Съобщения"
+#~ msgid "Volgograd"
+#~ msgstr "Волгоград"
 
-#: ui/evolution-mail-list.xml.h:6
-msgid "Hide _Deleted Messages"
-msgstr "Скрива Изтритите Съобщения"
+#~ msgid "Volkel"
+#~ msgstr "Волкел"
 
-#: ui/evolution-mail-list.xml.h:7
-msgid "Hide _Read Messages"
-msgstr "Скрива _Прочетените Съобщения"
+#~ msgid "Voronezh"
+#~ msgstr "Воронеж"
 
-#: ui/evolution-mail-list.xml.h:8
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
-msgstr "Скрива изтритите съобщения вместо да ги показва като зачертани"
+#~ msgid "Warszawa"
+#~ msgstr "Варшава"
 
-#: ui/evolution-mail-list.xml.h:9
-msgid "Mark All as _Read"
-msgstr "Отбелязва Всички като _Прочетени"
+#~ msgid "Washington"
+#~ msgstr "Вашингтон"
 
-#: ui/evolution-mail-list.xml.h:10
-msgid "Mark all visible messages as read"
-msgstr "Маркира всички видими съобщенията като прочетени"
+#~ msgid "Waterloo"
+#~ msgstr "Ватерло"
 
-#: ui/evolution-mail-list.xml.h:11
-msgid "Paste message(s) from the clipboard"
-msgstr "Постява съобщенията от бъфърът за обмен"
+#~ msgid "Wellington"
+#~ msgstr "Уелингтън"
 
-#: ui/evolution-mail-list.xml.h:12
-msgid "Permanently remove all deleted messages from this folder"
-msgstr "Изтрива за постоянно всички съобщения от тази папка"
+#~ msgid "West Atlanta"
+#~ msgstr "Западна Атланта"
 
-#: ui/evolution-mail-list.xml.h:14
-msgid "Select _Thread"
-msgstr "Избира _Нишка"
+#~ msgid "West Palm Beach"
+#~ msgstr "Западен Палм Биич"
 
-#: ui/evolution-mail-list.xml.h:15
-msgid "Select all and only the messages that are not currently selected"
-msgstr "Избира всички и само съобщенията които не са били избрано в момента"
+#~ msgid "West Virginia"
+#~ msgstr "Западна Виржиния"
 
-#: ui/evolution-mail-list.xml.h:16
-msgid "Select all messages in the same thread as the selected message"
-msgstr "Избира всички съобщения в някоя нишка като избрано съобщение"
+#~ msgid "Wien"
+#~ msgstr "Виена"
 
-#: ui/evolution-mail-list.xml.h:17
-msgid "Select all visible messages"
-msgstr "Избира всички видими съобщения"
+#~ msgid "Williston"
+#~ msgstr "Уилстон"
 
-#: ui/evolution-mail-list.xml.h:18
-msgid "Sh_ow Hidden Messages"
-msgstr "Пока_зва Скрити Съобщения"
+#~ msgid "Winchester"
+#~ msgstr "Уинчестер"
 
-#: ui/evolution-mail-list.xml.h:19
-msgid "Show messages that have been temporarily hidden"
-msgstr "Показва съобщения, които са били временно скрити"
+#~ msgid "Windsor"
+#~ msgstr "Уиндздор"
 
-#: ui/evolution-mail-list.xml.h:20
-msgid "Temporarily hide all messages that have already been read"
-msgstr "Временно скрива всички съобщения, които са били прочетени"
+#~ msgid "Winnipeg"
+#~ msgstr "Уинипег"
 
-#: ui/evolution-mail-list.xml.h:21
-msgid "Temporarily hide the selected messages"
-msgstr "Временно скрива избраните съобщения"
+#~ msgid "Wisconsin"
+#~ msgstr "Уинсконсин"
 
-#: ui/evolution-mail-list.xml.h:22
-msgid "Threaded Message list"
-msgstr ""
+#~ msgid "Wrangell"
+#~ msgstr "Врангел"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:19
-msgid "_Expunge"
-msgstr "_Задрасква"
+#~ msgid "Wyoming"
+#~ msgstr "Юоминг"
 
-#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
-msgid "_Folder"
-msgstr "_Папка"
+#~ msgid "Yakima"
+#~ msgstr "Якима"
 
-#: ui/evolution-mail-list.xml.h:28 ui/evolution-subscribe.xml.h:12
-msgid "_Invert Selection"
-msgstr "_Обърнат Избор"
+#~ msgid "Yakushima"
+#~ msgstr "Юкошима"
 
-#: ui/evolution-mail-list.xml.h:30
-msgid "_Properties..."
-msgstr "Настройки..."
+#~ msgid "Yakutat"
+#~ msgstr "Якута"
 
-#: ui/evolution-mail-list.xml.h:31
-msgid "_Threaded Message List"
-msgstr "_Дървовиден списък на съобщенията"
+#~ msgid "Yakutsk"
+#~ msgstr "Якутск"
 
-#: ui/evolution-mail-message.xml.h:1
-msgid "A_dd Sender to Addressbook"
-msgstr "Д_обавя Подателя в Адресната книга"
+#~ msgid "Yamagata Airport"
+#~ msgstr "Летище Ямагута"
 
-#: ui/evolution-mail-message.xml.h:2
-msgid "A_pply Filters"
-msgstr "П_рилага Филтри"
+#~ msgid "Yekaterinburg"
+#~ msgstr "Екатеринбург"
 
-#: ui/evolution-mail-message.xml.h:3
-msgid "Add Sender to Addressbook"
-msgstr "Добавя подателя в Адресната книга"
+#~ msgid "Yellowstone"
+#~ msgstr "Йелоустон"
 
-#: ui/evolution-mail-message.xml.h:4
-msgid "Apply filter rules to the selected messages"
-msgstr "Използва филтър с правила за избраните съобщения"
+#~ msgid "Ypsilanti"
+#~ msgstr "Упсиланти"
 
-#: ui/evolution-mail-message.xml.h:5
-msgid "Compose a reply to all of the recipients of the selected message"
-msgstr "Отговаря на всички получатели на избраното съобщение"
+#~ msgid "Yukon"
+#~ msgstr "Юкон"
 
-#: ui/evolution-mail-message.xml.h:6
-msgid "Compose a reply to the mailing list of the selected message"
-msgstr "Създава отговор на пощенски списък на избраното съобщение"
+#~ msgid "Zadar"
+#~ msgstr "Задар"
 
-#: ui/evolution-mail-message.xml.h:7
-msgid "Compose a reply to the sender of the selected message"
-msgstr "Създава отговор на изпращача на избраното съобщение"
+#~ msgid "Zagreb"
+#~ msgstr "Загреб"
 
-#: ui/evolution-mail-message.xml.h:9
-msgid "Copy selected messages to another folder"
-msgstr "Копира избраното съобщение в друга папка"
+#~ msgid "Zakinthos"
+#~ msgstr "Закинтош"
 
-#: ui/evolution-mail-message.xml.h:10
-msgid "Create _Virtual Folder From Message"
-msgstr "Създава Виртуална _Папка От Съобщение"
+#~ msgid "Zanesville"
+#~ msgstr "Занесвил"
 
-#: ui/evolution-mail-message.xml.h:11
-msgid "Create a rule to filter messages from this sender"
-msgstr "Създава правила за филтриране на съобщения за този изпращач"
+#~ msgid "Zaragoza"
+#~ msgstr "Сарагоса"
 
-#: ui/evolution-mail-message.xml.h:12
-msgid "Create a rule to filter messages to these recipients"
-msgstr "Създава правила за филтриране на съобщения за тези получатели"
+#~ msgid "Zuni Pueblo"
+#~ msgstr "Зуни Пуебло"
 
-#: ui/evolution-mail-message.xml.h:13
-msgid "Create a rule to filter messages to this mailing list"
-msgstr "Създава правила за филтриране на съобщения за този пощенски списък"
+#~ msgid "Zurich"
+#~ msgstr "Цюрих"
 
-#: ui/evolution-mail-message.xml.h:14
-msgid "Create a rule to filter messages with this subject"
-msgstr "Създава правила за филтриране на съобщения с тази тема"
+#~ msgid "Folder containing the Evolution Summary"
+#~ msgstr "Папката съдържа Обобщение на Evolution"
 
-#: ui/evolution-mail-message.xml.h:15
-msgid "Create a virtual folder for these recipients"
-msgstr "Създава виртуална папка за тези получатели"
+#~ msgid "Appointments"
+#~ msgstr "Срещите"
 
-#: ui/evolution-mail-message.xml.h:16
-msgid "Create a virtual folder for this mailing list"
-msgstr "Създава виртуална папка за този пощенски списък"
+#~ msgid "%k:%M %d %B"
+#~ msgstr "%k:%M %d %B"
 
-#: ui/evolution-mail-message.xml.h:17
-msgid "Create a virtual folder for this sender"
-msgstr "Създава виртуална папка за този изпращач"
+#~ msgid "No description"
+#~ msgstr "Няма Описание"
 
-#: ui/evolution-mail-message.xml.h:18
-msgid "Create a virtual folder for this subject"
-msgstr "Създава виртуална папка за този обект"
+#~ msgid "Mail summary"
+#~ msgstr "Обобщение на Поща"
 
-#: ui/evolution-mail-message.xml.h:19
-msgid "Decrease the text size"
-msgstr "Намалява размера на текст"
+#~ msgid "Dictionary.com Word of the Day"
+#~ msgstr "Dictionary.com Дума за Деня"
 
-#: ui/evolution-mail-message.xml.h:21
-msgid "Display the next important message"
-msgstr "Показва следващото важно съобщение"
+#~ msgid "Quotes of the Day"
+#~ msgstr "Цитат на деня"
 
-#: ui/evolution-mail-message.xml.h:22
-msgid "Display the next message"
-msgstr "Показва следващото съобщение"
+#~ msgid "Error downloading RDF"
+#~ msgstr "Грешка при зареждането на RDF"
 
-#: ui/evolution-mail-message.xml.h:23
-msgid "Display the next unread message"
-msgstr "Показва следващото непрочетено съобщение"
+#~ msgid "News Feed"
+#~ msgstr "Новини"
 
-#: ui/evolution-mail-message.xml.h:24
-msgid "Display the next unread thread"
-msgstr "Показва следващата непрочетена нишка"
+#~ msgid "(No Description)"
+#~ msgstr "(Без описание)"
 
-#: ui/evolution-mail-message.xml.h:25
-msgid "Display the previous important message"
-msgstr "Показва предишното важно съобщение"
+#~ msgid "My Weather"
+#~ msgstr "Моето Време"
 
-#: ui/evolution-mail-message.xml.h:26
-msgid "Display the previous message"
-msgstr "Показва предишното съобщение"
+#~ msgid "There was an error downloading data for"
+#~ msgstr "Имаше грешка по време на изтеглянето на информация за"
 
-#: ui/evolution-mail-message.xml.h:27
-msgid "Display the previous unread message"
-msgstr "Показва предишно непрочетено съобщение"
+#~ msgid "Weather"
+#~ msgstr "Време"
 
-#: ui/evolution-mail-message.xml.h:28
-msgid "F_orward"
-msgstr "П_репраща"
+#~ msgid "KBOS"
+#~ msgstr "KBOS"
 
-#: ui/evolution-mail-message.xml.h:29
-msgid "Filter on Mailing _List..."
-msgstr "Филтър върху Пощенски _Списък.."
+#~ msgid "%A, %B %e %Y"
+#~ msgstr "%A, %B %e %Y"
 
-#: ui/evolution-mail-message.xml.h:30
-msgid "Filter on Se_nder..."
-msgstr "Филтър върху _Изпращач..."
+#~ msgid "Please wait..."
+#~ msgstr "Моля почакайте..."
 
-#: ui/evolution-mail-message.xml.h:31
-msgid "Filter on _Recipients..."
-msgstr "Филтър върху П_олучатели..."
+#~ msgid "Print Summary"
+#~ msgstr "Печат на Обобщение"
 
-#: ui/evolution-mail-message.xml.h:32
-msgid "Filter on _Subject..."
-msgstr "Филтър върху _Тема.."
+#~ msgid "Printing of Summary failed"
+#~ msgstr "Неуспешно печатане на Обобщено"
 
-#: ui/evolution-mail-message.xml.h:33
-msgid "Flag selected message(s) for follow-up"
-msgstr ""
+#~ msgid " F"
+#~ msgstr " F"
 
-#: ui/evolution-mail-message.xml.h:34
-msgid "Follow _Up..."
-msgstr ""
+#~ msgid "knots"
+#~ msgstr "възела"
 
-#: ui/evolution-mail-message.xml.h:35
-msgid "Force images in HTML mail to be loaded"
-msgstr "Принуждава изображенията в HTML поща да бъдат заредени"
+#~ msgid "kph"
+#~ msgstr "км./ч."
 
-#: ui/evolution-mail-message.xml.h:37
-msgid "Forward the selected message in the body of a new message"
-msgstr "Препраща избраното съобщение в тялото като ново съобщение"
+#~ msgid "inHg"
+#~ msgstr "инча ж.ст."
 
-#: ui/evolution-mail-message.xml.h:38
-msgid "Forward the selected message quoted like a reply"
-msgstr "Препраща избраното съобщение цитирано като отговор"
+#~ msgid "mmHg"
+#~ msgstr "mmHg"
 
-#: ui/evolution-mail-message.xml.h:39
-msgid "Forward the selected message to someone"
-msgstr "Препраща избраното съобщение за някой"
+#~ msgid "miles"
+#~ msgstr "мили"
 
-#: ui/evolution-mail-message.xml.h:40
-msgid "Forward the selected message to someone as an attachment"
-msgstr "Препраща избраното съобщение за някой като прикачено"
+#~ msgid "kilometers"
+#~ msgstr "километри"
 
-#: ui/evolution-mail-message.xml.h:41
-msgid "Increase the text size"
-msgstr "Увеличава размера на текст"
+#~ msgid "Clear sky"
+#~ msgstr "Ясно небе"
 
-#: ui/evolution-mail-message.xml.h:42
-msgid "Load _Images"
-msgstr "Зарежда _Изображения"
+#~ msgid "Broken clouds"
+#~ msgstr "Разкъсани облаци"
 
-#: ui/evolution-mail-message.xml.h:44
-msgid "Mark as I_mportant"
-msgstr "Маркира като Важно"
+#~ msgid "Scattered clouds"
+#~ msgstr "Разкъсана облачност"
 
-#: ui/evolution-mail-message.xml.h:45
-msgid "Mark as U_nread"
-msgstr "Отбелязва: непрочетено"
+#~ msgid "Few clouds"
+#~ msgstr "Малко облаци"
 
-#: ui/evolution-mail-message.xml.h:46
-msgid "Mark as Unimp_ortant"
-msgstr "Маркирай като Не_важни"
+#~ msgid "Overcast"
+#~ msgstr "Облачно"
 
-#: ui/evolution-mail-message.xml.h:47
-msgid "Mark the selected message(s) as having been read"
-msgstr ""
+#~ msgid "Invalid"
+#~ msgstr "Неправилен"
 
-#: ui/evolution-mail-message.xml.h:48
-msgid "Mark the selected message(s) as important"
-msgstr ""
+#~ msgid "Variable"
+#~ msgstr "Променливо"
 
-#: ui/evolution-mail-message.xml.h:49
-msgid "Mark the selected message(s) as not having been read"
-msgstr ""
+#~ msgid "North"
+#~ msgstr "север"
 
-#: ui/evolution-mail-message.xml.h:50
-msgid "Mark the selected message(s) as unimportant"
-msgstr ""
+#~ msgid "North - NorthEast"
+#~ msgstr "север-североизток"
 
-#: ui/evolution-mail-message.xml.h:51
-msgid "Mark the selected messages for deletion"
-msgstr "Маркира избраните съобщения за изтриване"
+#~ msgid "Northeast"
+#~ msgstr "североизток"
 
-#: ui/evolution-mail-message.xml.h:52
-msgid "Move"
-msgstr "Премества"
+#~ msgid "East - NorthEast"
+#~ msgstr "изток-североизток"
 
-#: ui/evolution-mail-message.xml.h:53
-msgid "Move selected message(s) to another folder"
-msgstr "Премества избраните съобщения с друга папка"
+#~ msgid "East"
+#~ msgstr "Изток"
 
-#: ui/evolution-mail-message.xml.h:54
-msgid "Next"
-msgstr "Следващ"
+#~ msgid "East - Southeast"
+#~ msgstr "изток-югоизток"
 
-#: ui/evolution-mail-message.xml.h:55
-msgid "Next _Important Message"
-msgstr "Следващо _Важно съобщение"
+#~ msgid "Southeast"
+#~ msgstr "югоизток"
 
-#: ui/evolution-mail-message.xml.h:56
-msgid "Next _Thread"
-msgstr "Следваща _Нишка"
+#~ msgid "South - Southeast"
+#~ msgstr "юг-югоизток"
 
-#: ui/evolution-mail-message.xml.h:57
-msgid "Next _Unread Message"
-msgstr "Следващо _Непрочетено Писмо"
+#~ msgid "South"
+#~ msgstr "юг"
 
-#: ui/evolution-mail-message.xml.h:58
-msgid "Open the selected message in a new window"
-msgstr "Отваря избраните съобщения в нов прозорец"
+#~ msgid "South - Southwest"
+#~ msgstr "юг-югозапад"
 
-#: ui/evolution-mail-message.xml.h:59
-msgid "Open the selected message in the composer to re-send it"
-msgstr "Отваря избраното съобщение в редактора за препращане"
+#~ msgid "Southwest"
+#~ msgstr "югозапад"
 
-#: ui/evolution-mail-message.xml.h:60
-msgid "Original Si_ze"
-msgstr "Оригинален Раз_мер"
+#~ msgid "West - Southwest"
+#~ msgstr "запад-югозапад"
 
-#: ui/evolution-mail-message.xml.h:61
-msgid "P_revious Unread Message"
-msgstr "П_редишно Непрочетено Съобщение"
+#~ msgid "West"
+#~ msgstr "Запад"
 
-#: ui/evolution-mail-message.xml.h:62
-msgid "Post a Reply"
-msgstr "Изпраща Отговор"
+#~ msgid "West - Northwest"
+#~ msgstr "запад-северозапад"
 
-#: ui/evolution-mail-message.xml.h:63
-msgid "Post a reply to a message in a Public folder"
-msgstr ""
+#~ msgid "Northwest"
+#~ msgstr "северозапад"
 
-#: ui/evolution-mail-message.xml.h:64
-msgid "Pr_evious Important Message"
-msgstr "Пре_дишно Важно Съобщение"
+#~ msgid "North - Northwest"
+#~ msgstr "север-северозапад"
 
-#: ui/evolution-mail-message.xml.h:65
-msgid "Preview the message to be printed"
-msgstr "Преглед на съобщението за печат"
+#~ msgid "Drizzle"
+#~ msgstr "Ръмене"
 
-#: ui/evolution-mail-message.xml.h:66
-msgid "Previous"
-msgstr "Предишен"
+#~ msgid "Drizzle in the vicinity"
+#~ msgstr "Ръмене в околността"
 
-#: ui/evolution-mail-message.xml.h:69
-msgid "Print this message"
-msgstr "Отпечатва това Съобщение"
+#~ msgid "Light drizzle"
+#~ msgstr "Леко ръмене"
 
-#: ui/evolution-mail-message.xml.h:70
-msgid "Re_direct"
-msgstr "Пре_насочва"
+#~ msgid "Moderate drizzle"
+#~ msgstr "Умерено преваляване"
 
-#: ui/evolution-mail-message.xml.h:71
-msgid "Redirect (bounce) the selected message to someone"
-msgstr "Пренасочва избраното съобщение до някой друг"
+#~ msgid "Heavy drizzle"
+#~ msgstr "Силно ръмене"
 
-#: ui/evolution-mail-message.xml.h:76
-msgid "Reset the text to its original size"
-msgstr "Възстановява текста в неговият оригинален размер"
+#~ msgid "Shallow drizzle"
+#~ msgstr "Незначително ръмене"
 
-#: ui/evolution-mail-message.xml.h:77
-msgid "S_earch in Message..."
-msgstr "Т_ърси в Съобщение"
+#~ msgid "Partial drizzle"
+#~ msgstr "Частично ръмене"
 
-#: ui/evolution-mail-message.xml.h:78
-msgid "S_maller"
-msgstr "По-_малък"
+#~ msgid "Thunderstorm"
+#~ msgstr "Гръмотевична буря"
 
-#: ui/evolution-mail-message.xml.h:79
-msgid "Save the message as a text file"
-msgstr "Съхранява съобщението като текстови файл"
+#~ msgid "Windy drizzle"
+#~ msgstr "Ветровито със ситен дъжд"
 
-#: ui/evolution-mail-message.xml.h:80
-msgid "Search for text in the body of the displayed message"
-msgstr "Търсене на текст в тялото на показваното съобщение"
+#~ msgid "Showers"
+#~ msgstr "Преваляване"
 
-#: ui/evolution-mail-message.xml.h:81
-msgid "Set up the page settings for your current printer"
-msgstr ""
+#~ msgid "Rain"
+#~ msgstr "Дъжд"
 
-#: ui/evolution-mail-message.xml.h:82
-msgid "Show Email _Source"
-msgstr "Показва Източника на Ел. Поща"
+#~ msgid "Rain in the vicinity"
+#~ msgstr "Дъжд в околноста"
 
-#: ui/evolution-mail-message.xml.h:83
-msgid "Show Full _Headers"
-msgstr "Показва Пълните Заглавия"
+#~ msgid "Light rain"
+#~ msgstr "Лек дъжд"
 
-#: ui/evolution-mail-message.xml.h:84
-msgid "Show message in the normal style"
-msgstr "Показва съобщение в нормален стил"
+#~ msgid "Moderate rain"
+#~ msgstr "Умерен дъжд"
 
-#: ui/evolution-mail-message.xml.h:85
-msgid "Show message with all email headers"
-msgstr "Показва съобщение с всички Пощенски заглавия"
+#~ msgid "Heavy rain"
+#~ msgstr "Силен дъжд"
 
-#: ui/evolution-mail-message.xml.h:86
-msgid "Show the raw email source of the message"
-msgstr "Показва необработено съобщението на Ел. поща"
+#~ msgid "Shallow rain"
+#~ msgstr "Слаб дъжд"
 
-#: ui/evolution-mail-message.xml.h:87
-msgid "Text Si_ze"
-msgstr "Раз_мер на Текста"
+#~ msgid "Partial rainfall"
+#~ msgstr "Частично преваляване"
 
-#: ui/evolution-mail-message.xml.h:88
-msgid "Un-delete the selected messages"
-msgstr "Не изтрива избраните съобщения"
+#~ msgid "Blowing rainfall"
+#~ msgstr "Преваляване с вятър"
 
-#: ui/evolution-mail-message.xml.h:89
-msgid "VFolder on Mailing _List..."
-msgstr "VFolder върху Пощенски списък..."
+#~ msgid "Rain showers"
+#~ msgstr "Преваляване от дъжд"
 
-#: ui/evolution-mail-message.xml.h:90
-msgid "VFolder on Se_nder..."
-msgstr "VFolder върху _Изпращач"
+#~ msgid "Freezing rain"
+#~ msgstr "Леден Дъжд"
 
-#: ui/evolution-mail-message.xml.h:91
-msgid "VFolder on _Recipients..."
-msgstr "VFolder върху _Получатели"
+#~ msgid "Snow"
+#~ msgstr "Сняг"
 
-#: ui/evolution-mail-message.xml.h:92
-msgid "VFolder on _Subject..."
-msgstr "VFolder върху _Тема"
+#~ msgid "Snow in the vicinity"
+#~ msgstr "Сняг в околноста"
 
-#: ui/evolution-mail-message.xml.h:94
-msgid "_Attached"
-msgstr "_Прикрепя файл"
+#~ msgid "Light snow"
+#~ msgstr "Слаб сняг"
 
-#: ui/evolution-mail-message.xml.h:95
-msgid "_Copy to Folder"
-msgstr "_Копира в Папка"
+#~ msgid "Moderate snow"
+#~ msgstr "Умерен сняг"
 
-#: ui/evolution-mail-message.xml.h:96
-msgid "_Create Filter From Message"
-msgstr "_Създава Правило От Съобщението"
+#~ msgid "Heavy snow"
+#~ msgstr "Силен сняг"
 
-#: ui/evolution-mail-message.xml.h:98
-msgid "_Forward Message"
-msgstr "П_репратени съобщения"
+#~ msgid "Shallow snow"
+#~ msgstr "Незначителен сняг"
 
-#: ui/evolution-mail-message.xml.h:99
-msgid "_Go To"
-msgstr "_Отива До"
+#~ msgid "Snowstorm"
+#~ msgstr "Снежна буря"
 
-#: ui/evolution-mail-message.xml.h:100
-msgid "_Inline"
-msgstr "_Вътрешен"
+#~ msgid "Light hail"
+#~ msgstr "Лек град"
 
-#: ui/evolution-mail-message.xml.h:101
-msgid "_Larger"
-msgstr "_По-голям"
+#~ msgid "Moderate hail"
+#~ msgstr "Умерен град"
 
-#: ui/evolution-mail-message.xml.h:102
-msgid "_Message Display"
-msgstr "Показване на _Съобщение"
+#~ msgid "Heavy hail"
+#~ msgstr "Силен град"
 
-#: ui/evolution-mail-message.xml.h:103
-msgid "_Move to Folder"
-msgstr "Премества в _Папка"
+#~ msgid "Hailstorm"
+#~ msgstr "Буря с градушка"
 
-#: ui/evolution-mail-message.xml.h:104
-msgid "_Next Message"
-msgstr "_Следващо съобщение"
+#~ msgid "Mist"
+#~ msgstr "Мъгла"
 
-#: ui/evolution-mail-message.xml.h:105
-msgid "_Normal Display"
-msgstr "_Нормално Показване"
+#~ msgid "Light mist"
+#~ msgstr "Лека мъгла"
 
-#: ui/evolution-mail-message.xml.h:106
-msgid "_Open Message"
-msgstr "Отваря _Съобщение"
+#~ msgid "Moderate mist"
+#~ msgstr "Умерена мъгла"
 
-#: ui/evolution-mail-message.xml.h:107
-msgid "_Previous Message"
-msgstr "_Предишно Съобщение"
+#~ msgid "Mist with wind"
+#~ msgstr "Мъгла с вятър"
 
-#: ui/evolution-mail-message.xml.h:109
-msgid "_Quoted"
-msgstr "_Цитат"
+#~ msgid "Fog"
+#~ msgstr "Мъгла"
 
-#: ui/evolution-mail-message.xml.h:111
-msgid "_Resend..."
-msgstr "_Изпраща отново"
+#~ msgid "Light fog"
+#~ msgstr "Лека мъгла"
 
-#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:63
-msgid "_Tools"
-msgstr "Инс_трументи"
+#~ msgid "Moderate fog"
+#~ msgstr "Средна мъгла"
 
-#: ui/evolution-mail-message.xml.h:114
-msgid "_Undelete"
-msgstr "Възстановява изтрито"
+#~ msgid "Thick fog"
+#~ msgstr "Гъста мъгла"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
-msgid "Close this window"
-msgstr "Затваря този прозорец"
+#~ msgid "Partial fog"
+#~ msgstr "Частична мъгла"
 
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39
-#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:43
-msgid "_Close"
-msgstr "Затваря"
+#~ msgid "Fog with wind"
+#~ msgstr "Мъгла с вятър"
 
-#: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
-msgid "_View"
-msgstr "_Изглед"
+#~ msgid "Smoke"
+#~ msgstr "Смог"
 
-#: ui/evolution-message-composer.xml.h:1
-msgid "Attach"
-msgstr "Прикрепя"
+#~ msgid "Thin smoke"
+#~ msgstr "Лек смог"
 
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Прикрепя файл"
+#~ msgid "Moderate smoke"
+#~ msgstr "Умерен смок"
 
-#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
-msgid "Close the current file"
-msgstr "Затваря текущия файл"
+#~ msgid "Thick smoke"
+#~ msgstr "Гъст дим"
 
-#: ui/evolution-message-composer.xml.h:5
-msgid "Delete all but signature"
-msgstr "Изтрива всички подписи"
+#~ msgid "Smoke with wind"
+#~ msgstr "Пушек с вятър"
 
-#: ui/evolution-message-composer.xml.h:6
-msgid "Encrypt this message with PGP"
-msgstr "Криптира това съобщение с PGP"
+#~ msgid "Volcanic ash"
+#~ msgstr "Волканична пепел"
 
-#: ui/evolution-message-composer.xml.h:7
-msgid "Encrypt this message with your S/MIME Encryption Cetificate"
-msgstr "Криптира това съобщение с вашият S/MIME сертификат за криптиране"
+#~ msgid "Volcanic ash in the vicinity"
+#~ msgstr "Волканичен прах във височина"
 
-#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:3
-msgid "For_mat"
-msgstr "_Формат"
+#~ msgid "Moderate volcanic ash"
+#~ msgstr "Средна волканична пепел"
 
-#: ui/evolution-message-composer.xml.h:9
-msgid "HT_ML"
-msgstr "HT_ML"
+#~ msgid "Thick volcanic ash"
+#~ msgstr "Гъст вулканичен прах"
 
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "Отваря"
+#~ msgid "Sand"
+#~ msgstr "Пясък"
 
-#: ui/evolution-message-composer.xml.h:11
-msgid "Open a file"
-msgstr "Отваря файл"
+#~ msgid "Light sand"
+#~ msgstr "Лек пясък"
 
-#: ui/evolution-message-composer.xml.h:12
-msgid "PGP Encrypt"
-msgstr "PGP криптиране"
+#~ msgid "Moderate sand"
+#~ msgstr "Умерен пясък"
 
-#: ui/evolution-message-composer.xml.h:13
-msgid "PGP Sign"
-msgstr "PGP подпис"
+#~ msgid "Haze"
+#~ msgstr "Мъгла"
 
-#: ui/evolution-message-composer.xml.h:14
-msgid "S/MIME Encrypt"
-msgstr "S/MIME криптиране"
+#~ msgid "Light haze"
+#~ msgstr "Лека мъгла"
 
-#: ui/evolution-message-composer.xml.h:15
-msgid "S/MIME Sign"
-msgstr "S/MIME Подпис"
+#~ msgid "Moderate haze"
+#~ msgstr "Средна мъгла"
 
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:5
-msgid "Save"
-msgstr "Съхранява"
+#~ msgid "Thick haze"
+#~ msgstr "Гъста мъгла"
 
-#: ui/evolution-message-composer.xml.h:17
-msgid "Save As"
-msgstr "Съхранява Като"
+#~ msgid "Shallow haze"
+#~ msgstr "Незначителна мъгла"
 
-#: ui/evolution-message-composer.xml.h:19
-msgid "Save _Draft"
-msgstr "Запазва _Чернова"
+#~ msgid "Spray"
+#~ msgstr "Пръскане"
 
-#: ui/evolution-message-composer.xml.h:20
-msgid "Save in folder..."
-msgstr "Съхранява в папка..."
+#~ msgid "Light spray"
+#~ msgstr "Леко пръскане"
 
-#: ui/evolution-message-composer.xml.h:21
-#: ui/evolution-signature-editor.xml.h:7
-msgid "Save the current file"
-msgstr "Съхранява текущия файл"
+#~ msgid "Moderate spray"
+#~ msgstr "Умерено пръскане"
 
-#: ui/evolution-message-composer.xml.h:22
-msgid "Save the current file with a different name"
-msgstr "Съхранява текущият файл с различно име"
+#~ msgid "Dust"
+#~ msgstr "Прах"
 
-#: ui/evolution-message-composer.xml.h:23
-msgid "Save the message in a specified folder"
-msgstr "Съхранява съобщението в определа папка"
+#~ msgid "Dust in the vicinity"
+#~ msgstr "Прах във височина"
 
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send"
-msgstr "Изпраща"
+#~ msgid "Light dust"
+#~ msgstr "Лек прах"
 
-#: ui/evolution-message-composer.xml.h:25
-#: ui/evolution-signature-editor.xml.h:9
-msgid "Send the mail in HTML format"
-msgstr "Изпраша ел. писмо в HTML формат"
+#~ msgid "Moderate dust"
+#~ msgstr "Умерен прах"
 
-#: ui/evolution-message-composer.xml.h:26
-msgid "Send this message"
-msgstr "Изпраща това писмо"
+#~ msgid "Heavy dust"
+#~ msgstr "Силно запашен"
 
-#: ui/evolution-message-composer.xml.h:27
-msgid "Show / hide attachments"
-msgstr "Показва / скрива прикачени"
+#~ msgid "Light squall"
+#~ msgstr "Лека буря"
 
-#: ui/evolution-message-composer.xml.h:28
-msgid "Show _attachments"
-msgstr "Показва _прикачени"
+#~ msgid "Duststorm"
+#~ msgstr "Пясъчна буря"
 
-#: ui/evolution-message-composer.xml.h:29
-msgid "Show attachments"
-msgstr "Показва прикачени"
+#~ msgid "Duststorm in the vicinity"
+#~ msgstr "Пясъчна буря в околноста"
 
-#: ui/evolution-message-composer.xml.h:30
-msgid "Sign this message with your PGP key"
-msgstr "Подписва съобщението с вашият PGP ключ"
+#~ msgid "Light duststorm"
+#~ msgstr "Лека Пясъчна буря"
 
-#: ui/evolution-message-composer.xml.h:31
-msgid "Sign this message with your S/MIME Signature Certificate"
-msgstr "Подписва съобщението с вашият S/MIME Сертификат"
+#~ msgid "Moderate duststorm"
+#~ msgstr "Умерена Пясъчна буря"
 
-#: ui/evolution-message-composer.xml.h:32
-msgid "Toggles whether the BCC field is displayed"
-msgstr "Превключва дали полето BCC ще бъде показвано"
+#~ msgid "Heavy duststorm"
+#~ msgstr "Силна Пясъчна буря"
 
-#: ui/evolution-message-composer.xml.h:33
-msgid "Toggles whether the CC field is displayed"
-msgstr "Превключва дали полето CC ще бъде показвано"
+#~ msgid "Tornado"
+#~ msgstr "Торнадо"
 
-#: ui/evolution-message-composer.xml.h:34
-msgid "Toggles whether the From chooser is displayed"
-msgstr "Превключва дали полето за избор на 'От' ще бъде показвано"
+#~ msgid "Tornado in the vicinity"
+#~ msgstr "Торнадо в околноста"
 
-#: ui/evolution-message-composer.xml.h:35
-msgid "Toggles whether the Reply-To field is displayed"
-msgstr "Превключва дали полето Отговор-На ще бъде показвано"
+#~ msgid "Moderate tornado"
+#~ msgstr "Умерено торнадо"
 
-#: ui/evolution-message-composer.xml.h:36
-msgid "_Attachment..."
-msgstr "_Прикачен..."
+#~ msgid "C_elsius"
+#~ msgstr "Целзий"
 
-#: ui/evolution-message-composer.xml.h:37
-msgid "_Bcc Field"
-msgstr "_Bcc Поле"
+#~ msgid "How many days should the calendar display at once?"
+#~ msgstr "Колко дни да показва календара едновременно?"
 
-#: ui/evolution-message-composer.xml.h:38
-msgid "_Cc Field"
-msgstr "_Cc Поле"
+#~ msgid "News Feed Settings"
+#~ msgstr "Настройки за Източник на Новини"
 
-#: ui/evolution-message-composer.xml.h:40
-msgid "_Delete all"
-msgstr "Изтрива _всичко"
+#~ msgid "News Feeds"
+#~ msgstr "Абонаменти за Новини"
 
-#: ui/evolution-message-composer.xml.h:43
-msgid "_From Field"
-msgstr "_От Поле"
+#~ msgid "R_efresh time (seconds):"
+#~ msgstr "Време за о_бновяване (секунди):"
 
-#: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-signature-editor.xml.h:13
-msgid "_Insert"
-msgstr "_Вмъква"
+#~ msgid "Refresh _time (seconds):"
+#~ msgstr "Време за обно_вяване (секунди):"
 
-#: ui/evolution-message-composer.xml.h:45
-msgid "_Open..."
-msgstr "_Отваря..."
+#~ msgid "Show _all tasks"
+#~ msgstr "Покажи всички задачите"
 
-#: ui/evolution-message-composer.xml.h:46
-msgid "_Reply-To Field"
-msgstr "Отговор-До Поле"
+#~ msgid "Show _today's tasks"
+#~ msgstr "Покажи днешните задачи"
 
-#: ui/evolution-message-composer.xml.h:48
-msgid "_Security"
-msgstr "_Сигурност"
+#~ msgid "Show temperatures in:"
+#~ msgstr "Покажи температурите в:"
 
-#: ui/evolution-signature-editor.xml.h:4
-msgid "H_TML"
-msgstr "H_TML"
+#~ msgid "Weather Settings"
+#~ msgstr "Настройки за Прогноза за Времето"
 
-#: ui/evolution-signature-editor.xml.h:8
-msgid "Save the current file and close the window"
-msgstr "Запазва текущия файл и затваря прозореца"
+#~ msgid "_Delete Feed"
+#~ msgstr "_Изтрива Абонамент"
 
-#: ui/evolution-subscribe.xml.h:1
-msgid "Add folder to your list of subscribed folders"
-msgstr "Добавя папка към вашият списък от папки за абонамент"
+#~ msgid "_Fahrenheit"
+#~ msgstr "_Фаренхайт"
 
-#: ui/evolution-subscribe.xml.h:2
-msgid "F_older"
-msgstr "Папка"
+#~ msgid "_Five days"
+#~ msgstr "_Пет дена"
 
-#: ui/evolution-subscribe.xml.h:3
-msgid "Refresh List"
-msgstr "Освежава Списък"
+#~ msgid "_Max number of items shown:"
+#~ msgstr "_Максимален брой видими записи:"
 
-#: ui/evolution-subscribe.xml.h:4
-msgid "Refresh List of Folders"
-msgstr "Освежава Списъка от Папки"
+#~ msgid "_New Feed"
+#~ msgstr "_Следващ Абонамент"
 
-#: ui/evolution-subscribe.xml.h:5
-msgid "Remove folder from your list of subscribed folders"
-msgstr "Изтрива папка от вашият списък на абонаментни папки"
+#~ msgid "_Show full path for folders"
+#~ msgstr "_Показва пълния път до папките"
 
-#: ui/evolution-subscribe.xml.h:7
-msgid "Subscribe"
-msgstr "Абонира"
+#~ msgid "Folder Settings"
+#~ msgstr "Настройка на Папките"
 
-#: ui/evolution-subscribe.xml.h:8
-msgid "Unsubscribe"
-msgstr "Отписва"
+#~ msgid "Cancel Operation"
+#~ msgstr "Отказва действието"
 
-#: ui/evolution-task-editor.xml.h:1
-msgid "Assign Task"
-msgstr "Присвояване на Задача"
+#~ msgid ""
+#~ "Cannot transfer folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Не мога да прехвърля папка:\n"
+#~ "%s"
 
-#: ui/evolution-task-editor.xml.h:2
-msgid "Assign this task to others"
-msgstr "Поставя тази задача на други"
+#~ msgid "\"%s\" in \"%s\""
+#~ msgstr "\"%s\"·в·\"%s\""
 
-#: ui/evolution-task-editor.xml.h:3
-msgid "Cancel Task"
-msgstr "Прекъсва Задача"
+#~ msgid "Add a Folder"
+#~ msgstr "Добавя Папка"
 
-#: ui/evolution-task-editor.xml.h:4
-msgid "Cancel this task"
-msgstr "Прекратява тази задача"
+#~ msgid "Drafts"
+#~ msgstr "Чернови"
 
-#: ui/evolution-task-editor.xml.h:7
-msgid "Obtain the latest task information"
-msgstr "Получава информация за последната задача"
+#~ msgid "Outbox"
+#~ msgstr "Outbox"
 
-#: ui/evolution-task-editor.xml.h:8
-msgid "Re_fresh Task"
-msgstr "Ос_вежава задача"
+#~ msgid "Sent"
+#~ msgstr "Изпрати"
 
-#: ui/evolution-tasks.xml.h:3
-msgid "Copy selected task"
-msgstr "Копира избраната задача"
+#~ msgid "Could not update files correctly"
+#~ msgstr "Не мога да обновя правилно файловете"
 
-#: ui/evolution-tasks.xml.h:5
-msgid "Cut selected task"
-msgstr "Отрязва избраната задача"
+#~ msgid ""
+#~ "An error occurred in copying files into\n"
+#~ "`%s'."
+#~ msgstr ""
+#~ "Възникна грешка при копирането на файлове в\n"
+#~ "`%s'."
 
-#: ui/evolution-tasks.xml.h:6
-msgid "Delete completed tasks"
-msgstr "Изтрива завършените задачи"
+#~ msgid ""
+#~ "The file `%s' is not a directory.\n"
+#~ "Please move it in order to allow installation\n"
+#~ "of the Evolution user files."
+#~ msgstr ""
+#~ "Файлът `%s' не е директория.\n"
+#~ "Преместето го, за да могат файловете на\n"
+#~ "Еволюшън да се инсталират."
 
-#: ui/evolution-tasks.xml.h:7
-msgid "Delete selected tasks"
-msgstr "Изтрива избраните задачи"
+#~ msgid ""
+#~ "The directory `%s' exists but is not the\n"
+#~ "Evolution directory.  Please move it in order\n"
+#~ "to allow installation of the Evolution user files."
+#~ msgstr ""
+#~ "Директорията `%s' съществува но тя не е\n"
+#~ "директория на Evolution.  Моля преместете я\n"
+#~ "за да позволите на Evolution да инсталира файловете."
 
-#: ui/evolution-tasks.xml.h:8
-msgid "Mar_k as Complete"
-msgstr "От_белязва като Завършени"
+#~ msgid "Brought to you by"
+#~ msgstr "Създадена за Вас от"
 
-#: ui/evolution-tasks.xml.h:9
-msgid "Mark selected tasks as complete"
-msgstr "Отбелязва избраните задачи като завършение"
+#~ msgid "Select Default Folder"
+#~ msgstr "Избита стандартна папка"
 
-#: ui/evolution-tasks.xml.h:11
-msgid "Paste task from the clipboard"
-msgstr "Поставя задача от буфера за обмен"
+#~ msgid "Default Folders"
+#~ msgstr "Стандартни Папки"
 
-#: ui/evolution-tasks.xml.h:12
-msgid "Previews the list of tasks to be printed"
-msgstr ""
+#~ msgid "Cannot move a folder over itself."
+#~ msgstr "Не мога да преместя папка въру себе си."
 
-#: ui/evolution-tasks.xml.h:14
-msgid "Print the list of tasks"
-msgstr "Разпечатва списъкът от задачи"
+#~ msgid "Cannot copy a folder over itself."
+#~ msgstr "Не мога да копирам директорията върху себе си."
 
-#: ui/evolution.xml.h:1
-msgid "About Ximian Evolution..."
-msgstr "Относно Ximian Evolution..."
+#~ msgid "Specify a folder to copy folder \"%s\" into:"
+#~ msgstr "Задайте папка за копиране на папка \"%s\":"
 
-#: ui/evolution.xml.h:2
-msgid "Add to _Shortcut Bar"
-msgstr "Добавя към панела с Кратките Клавиши"
+#~ msgid "Copy Folder"
+#~ msgstr "Копира Папка"
 
-#: ui/evolution.xml.h:3
-msgid "Change Evolution's settings"
-msgstr "Промена настройките на Evolution"
+#~ msgid "Specify a folder to move folder \"%s\" into:"
+#~ msgstr "Задайте папка за да преместите в нея \"%s\":"
 
-#: ui/evolution.xml.h:4
-msgid "Change the name of this folder"
-msgstr "Промени името на тази папка"
+#~ msgid "Move Folder"
+#~ msgstr "Премества Папка"
 
-#: ui/evolution.xml.h:7
-msgid "Copy this folder"
-msgstr "Копира тази папка"
+#~ msgid "Really delete folder \"%s\"?"
+#~ msgstr "Наистина ли искате да изтрия папка \"%s\"?"
 
-#: ui/evolution.xml.h:8
-msgid "Create a link to this folder in the shortcut bar"
-msgstr "Създава връзка към тази папка в панела на ускорителите"
+#~ msgid "Selected folder does not belong to another user"
+#~ msgstr "Избраната папка не принадлежи на друг потребител"
 
-#: ui/evolution.xml.h:9
-msgid "Create a new folder"
-msgstr "Създава нова папка"
+#~ msgid ""
+#~ "Cannot remove folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Не мога да премахна папката:\n"
+#~ "%s"
 
-#: ui/evolution.xml.h:10
-msgid "Create a new shortcut"
-msgstr "Създава нова препратка"
+#~ msgid ""
+#~ "Cannot create the specified folder:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Не мога да създам указаната папка:\n"
+#~ "%s"
 
-#: ui/evolution.xml.h:11
-msgid "Create a new window displaying this folder"
-msgstr "Създава нов прозорец изобразяващ тази папка"
+#~ msgid ""
+#~ "There is no importer that is able to handle\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Няма импортер, който да подържа\n"
+#~ "%s"
 
-#: ui/evolution.xml.h:12
-msgid "Delete this folder"
-msgstr "Изтрива тази папка"
+#~ msgid ""
+#~ "Importing %s.\n"
+#~ "Starting %s"
+#~ msgstr ""
+#~ "Импортирам %s.\n"
+#~ "Стартирам %s"
 
-#: ui/evolution.xml.h:13
-msgid "Display a different folder"
-msgstr "Показва друга папка"
+#~ msgid "Error starting %s"
+#~ msgstr "Грешка при стартиране на %s"
 
-#: ui/evolution.xml.h:14
-msgid "E_xit"
-msgstr "Изход"
+#~ msgid "Select a destination folder for importing this data"
+#~ msgstr "Избор на отдалечена папка за импортиране на тези данни"
 
-#: ui/evolution.xml.h:15
-msgid "Evolution _Window"
-msgstr "Прозорец на Evolution"
+#~ msgid ""
+#~ "Error synchronizing \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Грешка в синхронизиране·\"%s\":\n"
+#~ "%s"
 
-#: ui/evolution.xml.h:16
-msgid "Exit the program"
-msgstr "Напуска програмата"
+#~ msgid "Syncing Folder"
+#~ msgstr "Папка на синронизация"
 
-#: ui/evolution.xml.h:17
-msgid "Import data from other programs"
-msgstr "Внася данни от други програми"
+#~ msgid "Synchronizing \"%s\" (%d of %d) ..."
+#~ msgstr "Синхронизира \"%s\"·(%d·of·%d)·..."
 
-#: ui/evolution.xml.h:19
-msgid "Move this folder to another place"
-msgstr "Премества тази папка другаде"
+#~ msgid "Please select a user."
+#~ msgstr "Моля, изберете потребител."
 
-#: ui/evolution.xml.h:20
-msgid "Open Other _User's Folder..."
-msgstr "Отваря друга Потребителска Папка"
+#~ msgid "Opening Folder"
+#~ msgstr "Отваря Папка"
 
-#: ui/evolution.xml.h:21
-msgid "Open a folder belonging to some other user on the server"
-msgstr ""
+#~ msgid "Opening Folder \"%s\""
+#~ msgstr "Отваря Папката \"%s\""
 
-#: ui/evolution.xml.h:22
-msgid "Open in New Window"
-msgstr "Отваря в Нов Прозорец"
+#~ msgid "in \"%s\" ..."
+#~ msgstr "в \"%s\"·..."
 
-#: ui/evolution.xml.h:24
-msgid "Open this folder in an other window"
-msgstr "Отваря тази папка в друг прозорец"
+#~ msgid "Could not open shared folder: %s."
+#~ msgstr "Споделената папка %s не може да бъде отворена."
 
-#: ui/evolution.xml.h:25
-msgid "Pi_lot Settings..."
-msgstr "Настройки на Pilot"
+#~ msgid "Cannot find the specified shared folder."
+#~ msgstr "Посочената споделена папка не може да бъде намерена."
 
-#: ui/evolution.xml.h:26
-msgid "Remove a folder added with \"Open Other User's Folder\""
-msgstr "Премахва папка добавена с \"Отваря друга Потребителска Папка\""
+#~ msgid "Go to folder..."
+#~ msgstr "Отива в папка..."
 
-#: ui/evolution.xml.h:27
-msgid "Send / Receive"
-msgstr "Изпращане / Получаване"
+#~ msgid "Select the folder that you want to open"
+#~ msgstr "Избор на папка, която искате да отворите"
 
-#: ui/evolution.xml.h:28
-msgid "Send queued items and retrieve new items"
-msgstr ""
+#~ msgid "Create New Shortcut"
+#~ msgstr "Създава Нов Кратък Клавиш"
 
-#: ui/evolution.xml.h:29
-msgid "Set up Pilot configuration"
-msgstr ""
+#~ msgid "Select the folder you want the shortcut to point to:"
+#~ msgstr "Изберете папката на която искате да сочи препратката:"
 
-#: ui/evolution.xml.h:30
-msgid "Show information about Ximian Evolution"
-msgstr "Показва информация за Ximian Evolution"
+#~ msgid "(No folder displayed)"
+#~ msgstr "(Няма показана папка)"
 
-#: ui/evolution.xml.h:31
-msgid "Submit Bug Report"
-msgstr "Изпраща доклад за грешка"
+#~ msgid "%s (%d)"
+#~ msgstr "%s (%d)"
 
-#: ui/evolution.xml.h:32
-msgid "Submit _Bug Report"
-msgstr "Изпраща доклад за грешка"
+#~ msgid "(None)"
+#~ msgstr "(Няма)"
 
-#: ui/evolution.xml.h:33
-msgid "Submit a bug report using Bug Buddy"
-msgstr "Изпраща доклад за грешка чрез Бъг Бъди"
+#~ msgid "Cannot set up local storage -- %s"
+#~ msgstr "Не мога да настроя локалното хранилище -- %s"
 
-#: ui/evolution.xml.h:34
-msgid "Toggle"
-msgstr "Превключва"
+#~ msgid ""
+#~ "The Evolution component that handles folders of type \"%s\"\n"
+#~ "has unexpectedly quit. You will need to quit Evolution and restart\n"
+#~ "in order to access that data again."
+#~ msgstr ""
+#~ "Компонент на Evolution който поддържа папки от тип \"%s\"\n"
+#~ "неочаквано завърши. Необходимо е да излезете от Evolution и да "
+#~ "престартирате\n"
+#~ "за да получите достъп до данните отново."
 
-#: ui/evolution.xml.h:35
-msgid "Toggle whether to show the folder bar"
-msgstr "Превключва показването на панела с папките"
+#~ msgid "Create New Shortcut Group"
+#~ msgstr "Създава Нова Група за Кратки Клавиши"
 
-#: ui/evolution.xml.h:36
-msgid "Toggle whether to show the shortcut bar"
-msgstr "Превключва показването на панела с ускорителите"
+#~ msgid "Group name:"
+#~ msgstr "Име на група:"
 
-#: ui/evolution.xml.h:37
-msgid "Toggle whether we are working offline."
-msgstr "Превключва работа оф/он-лайн"
+#~ msgid "Rename Shortcut Group"
+#~ msgstr "Преименува Група Препратка"
 
-#: ui/evolution.xml.h:38
-msgid "View the selected folder"
-msgstr "Показва избраната папка"
+#~ msgid "Rename selected shortcut group to:"
+#~ msgstr "Преименува избраната група препратка на:"
 
-#: ui/evolution.xml.h:40
-msgid "Ximian Evolution _FAQ"
-msgstr "_Често Задавани Въпроси"
+#~ msgid "_Small Icons"
+#~ msgstr "_Малки Икони"
 
-#: ui/evolution.xml.h:41
-msgid "_About Ximian Evolution..."
-msgstr "Относно Ximian Evolution..."
+#~ msgid "Show the shortcuts as small icons"
+#~ msgstr "Показва препратки като малки икони"
 
-#: ui/evolution.xml.h:44
-msgid "_Copy..."
-msgstr "_Копира..."
+#~ msgid "_Large Icons"
+#~ msgstr "Го_леми Икони"
 
-#: ui/evolution.xml.h:48
-msgid "_Folder Bar"
-msgstr "Панел с папки"
+#~ msgid "Show the shortcuts as large icons"
+#~ msgstr "Показва препратки като големи икони"
 
-#: ui/evolution.xml.h:49
-msgid "_Folder..."
-msgstr "_Папка..."
+#~ msgid "_Remove this Group..."
+#~ msgstr "П_ремахва тази Група..."
 
-#: ui/evolution.xml.h:50
-msgid "_Go to Folder..."
-msgstr "Отива в Папка..."
+#~ msgid "Remove this shortcut group"
+#~ msgstr "Премахва тази група препратка"
 
-#: ui/evolution.xml.h:51
-msgid "_Help"
-msgstr "_Помощ"
+#~ msgid "Re_name this Group..."
+#~ msgstr "П_реименува тази Група..."
 
-#: ui/evolution.xml.h:52
-msgid "_Import..."
-msgstr "_Внася..."
+#~ msgid "Rename this shortcut group"
+#~ msgstr "Преименува тази група препратка"
 
-#: ui/evolution.xml.h:53
-msgid "_Move..."
-msgstr "Премества..."
+#~ msgid "_Hide the Shortcut Bar"
+#~ msgstr "С_крива лентата с препратки"
 
-#: ui/evolution.xml.h:54
-msgid "_New"
-msgstr "Нов"
+#~ msgid "Hide the shortcut bar"
+#~ msgstr "Скрива лентата с препратки"
 
-#: ui/evolution.xml.h:55
-msgid "_New Folder"
-msgstr "Нова папка"
+#~ msgid "Create _Default Shortcuts"
+#~ msgstr "Създава _Стандартни Бързи Клавиши"
 
-#: ui/evolution.xml.h:56
-msgid "_New Folder..."
-msgstr "_Нова Папка..."
+#~ msgid "Create Default Shortcuts"
+#~ msgstr "Създава нова препратка"
 
-#: ui/evolution.xml.h:57
-msgid "_Remove Other User's Folder"
-msgstr "_Премахва Другите Потребителски Папки"
+#~ msgid "Rename Shortcut"
+#~ msgstr "Преименува Кратък Клавиш"
 
-#: ui/evolution.xml.h:58
-msgid "_Rename..."
-msgstr "Преименувай..."
+#~ msgid "Rename selected shortcut to:"
+#~ msgstr "Преименува избраната препратка на:"
 
-#: ui/evolution.xml.h:59
-msgid "_Send / Receive"
-msgstr "Изпращане / Получаване"
+#~ msgid "Open the folder linked to this shortcut"
+#~ msgstr "Отваря папката свързана с тази препратка"
 
-#: ui/evolution.xml.h:61
-msgid "_Shortcut Bar"
-msgstr "Панел с Бързи Клавиши"
+#~ msgid "Open the folder linked to this shortcut in a new window"
+#~ msgstr "Отваря папка свързана с тази препратка в нов прозорец"
 
-#: ui/evolution.xml.h:62
-msgid "_Shortcut..."
-msgstr "_Кратък клавиш..."
+#~ msgid "Rename this shortcut"
+#~ msgstr "Преименува тази препратка"
 
-#: ui/my-evolution.xml.h:3
-msgid "Print summary"
-msgstr "Печат на Резюмето"
+#~ msgid "Re_move"
+#~ msgstr "Пр_емахва"
 
-#: ui/my-evolution.xml.h:4
-msgid "Reload"
-msgstr "Презарежда"
+#~ msgid "Remove this shortcut from the shortcut bar"
+#~ msgstr "Изтрива тази препратка от лентата с Кратки Клавиши"
 
-#: ui/my-evolution.xml.h:5
-msgid "Reload the view"
-msgstr "Презарежда Прегледа"
+#~ msgid "Shortcuts"
+#~ msgstr "Кратки Клавиши"
 
-#: views/addressbook/galview.xml.h:1
-msgid "By _Company"
-msgstr "По _Компания"
+#~ msgid "No error"
+#~ msgstr "Няма грешка"
 
-#: views/addressbook/galview.xml.h:2
-msgid "_Address Cards"
-msgstr "_Адресни Карти"
+#~ msgid "A folder with the same name already exists"
+#~ msgstr "Папка със същото име вече съществува"
 
-#: views/addressbook/galview.xml.h:3
-msgid "_Phone List"
-msgstr "_Телефонен списък"
+#~ msgid "The specified folder type is not valid"
+#~ msgstr "Типа на зададената папка не е валиден"
 
-#: views/calendar/galview.xml.h:1
-msgid "W_eek View"
-msgstr "С_едмичен Преглед"
+#~ msgid "I/O error"
+#~ msgstr "Входно/Изходна Грешка"
 
-#: views/calendar/galview.xml.h:2
-msgid "_Day View"
-msgstr "_Дневен Изглед"
+#~ msgid "Not enough space to create the folder"
+#~ msgstr "Няма достатъчно пространство за създаването на папка"
 
-#: views/calendar/galview.xml.h:3
-msgid "_Month View"
-msgstr "_Месечен преглед"
+#~ msgid "The folder is not empty"
+#~ msgstr "Папката не е празна"
 
-#: views/calendar/galview.xml.h:4
-msgid "_Work Week View"
-msgstr ""
+#~ msgid "The specified folder was not found"
+#~ msgstr "Посочената папка не е намерена"
 
-#: views/mail/galview.xml.h:1
-msgid "As Sent Folder"
-msgstr ""
+#~ msgid "Function not implemented in this storage"
+#~ msgstr "Функцията не се използва в това хранилище"
 
-#: views/mail/galview.xml.h:2
-msgid "By Follow Up Flag"
-msgstr ""
+#~ msgid "Operation not supported"
+#~ msgstr "Операцията не се подържа"
 
-#: views/mail/galview.xml.h:3
-msgid "By Sender"
-msgstr "По Изпращач"
+#~ msgid "The specified type is not supported in this storage"
+#~ msgstr "Зададеният тип не се поддържа в това хранилище"
 
-#: views/mail/galview.xml.h:4
-msgid "By Status"
-msgstr "По Статус"
+#~ msgid "The specified folder cannot be modified or removed"
+#~ msgstr "Посочената папка не може да бъде модифицирана или изтрита"
 
-#: views/mail/galview.xml.h:5
-msgid "By Subject"
-msgstr "По Тема"
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "Unknown error."
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Неизвестна грешка."
 
-#: views/mail/galview.xml.h:6
-msgid "Messages"
-msgstr "Съобщения"
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the component system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Грешката от компонент на системата е:\n"
+#~ "%s"
 
-#: views/tasks/galview.xml.h:1
-msgid "With _Category"
-msgstr "С _Категория"
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the activation system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Грешката от активиране на системата е:\n"
+#~ "%s"
 
-#: views/tasks/galview.xml.h:2
-msgid "_Tasks"
-msgstr "_Задачи"
+#~ msgid "CORBA error"
+#~ msgstr "Грешка в CORBA"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:646
-msgid "UTC"
-msgstr "UTC"
+#~ msgid "Invalid argument"
+#~ msgstr "Грешен аргумент"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
-msgid "Select a Time Zone"
-msgstr "Избор на Времева Зона"
+#~ msgid "Already has an owner"
+#~ msgstr "Вече има собственик"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
-msgid "Time Zones"
-msgstr "Времева Зона: "
+#~ msgid "No owner"
+#~ msgstr "Няма соственик"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
-msgid ""
-"Use the left mouse button to zoom in on an area of the map and select a time "
-"zone.\n"
-"Use the right mouse button to zoom out."
-msgstr ""
+#~ msgid "Unsupported type"
+#~ msgstr "Неподържан тип"
 
-#: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
-msgid "_Selection:"
-msgstr "_Маркировка:"
+#~ msgid "Unsupported operation"
+#~ msgstr "Неподържана операция"
 
-#: widgets/menus/gal-view-menus.c:290
-msgid "_Current View"
-msgstr "_Текущ Преглед"
+#~ msgid "Exists"
+#~ msgstr "Съществуват"
 
-#. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:349
-msgid "Custom View"
-msgstr ""
+#~ msgid "Invalid URI"
+#~ msgstr "Грешен URI"
 
-#: widgets/menus/gal-view-menus.c:358
-msgid "Save Custom View..."
-msgstr ""
+#~ msgid "Has subfolders"
+#~ msgstr "Има подпапки"
 
-#: widgets/menus/gal-view-menus.c:371
-msgid "Define Views..."
-msgstr ""
+#~ msgid "No space left"
+#~ msgstr "Няма място"
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:427
-msgid "MTWTFSS"
-msgstr "MTWTFSS"
+#~ msgid "Old owner has died"
+#~ msgstr "Старият собственик е умрял"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1127
-msgid "%B %Y"
-msgstr "%B %Y"
+#~ msgid "The following connections are currently active:"
+#~ msgstr "Следните връзки са в момента активни:"
 
-#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:428
-msgid "Now"
-msgstr "Сега"
+#~ msgid "Import File (step 3 of 3)"
+#~ msgstr "Импорт на Файл (стъпка 3 от 3)"
 
-#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:434
-msgid "Today"
-msgstr "Днес"
+#~ msgid "Importer Type (step 1 of 3)"
+#~ msgstr "Тип на Импортер (стъпка 1 от 3)"
 
-#: widgets/misc/e-cell-date-edit.c:805
-#, c-format
-msgid "The time must be in the format: %s"
-msgstr "Датата трябва да е въведена в следния формат: %s"
+#~ msgid "Select Importers (step 2 of 3)"
+#~ msgstr "Избери Импортер (стъпка 2 от 3)"
 
-#: widgets/misc/e-cell-percent.c:77
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr "Стойността на процентите трябва да е между 0 и 100, включително"
+#~ msgid "Select a File (step 2 of 3)"
+#~ msgstr "Избери Файл (стъпка 2 от 3)"
 
-#: widgets/misc/e-charset-picker.c:61
-msgid "Baltic"
-msgstr "Балтиски"
+#~ msgid "Evolution is now exiting ..."
+#~ msgstr "Evolution излиза..."
 
-#: widgets/misc/e-charset-picker.c:62
-msgid "Central European"
-msgstr "Центална Европа"
+#~ msgid "Cannot access the Ximian Evolution shell."
+#~ msgstr "Нямам достъп до обвивката на Ximian Evolution."
 
-#: widgets/misc/e-charset-picker.c:63
-msgid "Chinese"
-msgstr "Китайски"
+#~ msgid "Cannot initialize the Ximian Evolution shell: %s"
+#~ msgstr "Не мога да инициализирам обвивката на Ximian Evolution: %s"
 
-#: widgets/misc/e-charset-picker.c:64
-msgid "Cyrillic"
-msgstr "Кирилица"
+#~ msgid "Disable splash screen"
+#~ msgstr "Забранява 'splash' екран"
 
-#: widgets/misc/e-charset-picker.c:65
-msgid "Greek"
-msgstr "Гръцки"
+#~ msgid "_Search for Contacts"
+#~ msgstr "Тър_сене за Контакти"
 
-#: widgets/misc/e-charset-picker.c:66
-msgid "Hebrew"
-msgstr ""
+#~ msgid "Go to _Date"
+#~ msgstr "Отиаи на Дата"
 
-#: widgets/misc/e-charset-picker.c:67
-msgid "Japanese"
-msgstr "Японски"
+#~ msgid "Go to today"
+#~ msgstr "Отиви на днес"
 
-#: widgets/misc/e-charset-picker.c:68
-msgid "Korean"
-msgstr "Корейски"
+#~ msgid "_Forward Message"
+#~ msgstr "П_репратени съобщения"
 
-#: widgets/misc/e-charset-picker.c:69
-msgid "Turkish"
-msgstr "Турски"
+#~ msgid "_Resend..."
+#~ msgstr "_Изпраща отново"
 
-#: widgets/misc/e-charset-picker.c:70
-msgid "Unicode"
-msgstr "Уникод"
+#~ msgid "Add to _Shortcut Bar"
+#~ msgstr "Добавя към панела с Кратките Клавиши"
 
-#: widgets/misc/e-charset-picker.c:71
-msgid "Western European"
-msgstr "Западна Европа"
+#~ msgid "Change the name of this folder"
+#~ msgstr "Промени името на тази папка"
 
-#: widgets/misc/e-charset-picker.c:88 widgets/misc/e-charset-picker.c:89
-#: widgets/misc/e-charset-picker.c:90
-msgid "Traditional"
-msgstr "Традиционен"
+#~ msgid "Copy this folder"
+#~ msgstr "Копира тази папка"
 
-#: widgets/misc/e-charset-picker.c:91 widgets/misc/e-charset-picker.c:92
-#: widgets/misc/e-charset-picker.c:93 widgets/misc/e-charset-picker.c:94
-msgid "Simplified"
-msgstr "Опростен"
+#~ msgid "Create a link to this folder in the shortcut bar"
+#~ msgstr "Създава връзка към тази папка в панела на ускорителите"
 
-#: widgets/misc/e-charset-picker.c:97
-msgid "Ukrainian"
-msgstr "Украинска"
+#~ msgid "Create a new shortcut"
+#~ msgstr "Създава нова препратка"
 
-#: widgets/misc/e-charset-picker.c:100
-msgid "Visual"
-msgstr "Визуален"
+#~ msgid "Display a different folder"
+#~ msgstr "Показва друга папка"
 
-#: widgets/misc/e-charset-picker.c:168
-#, c-format
-msgid "Unknown character set: %s"
-msgstr "Неизвестна кодова таблица: %s"
+#~ msgid "Move this folder to another place"
+#~ msgstr "Премества тази папка другаде"
 
-#: widgets/misc/e-charset-picker.c:213 widgets/misc/e-charset-picker.c:442
-msgid "Character Encoding"
-msgstr "Кодировка"
+#~ msgid "Open Other _User's Folder..."
+#~ msgstr "Отваря друга Потребителска Папка"
 
-#: widgets/misc/e-charset-picker.c:222
-msgid "Enter the character set to use"
-msgstr "Въведете кодова таблица за използване"
+#~ msgid "Open this folder in an other window"
+#~ msgstr "Отваря тази папка в друг прозорец"
 
-#: widgets/misc/e-charset-picker.c:318
-msgid "Other..."
-msgstr "Друго..."
+#~ msgid "Remove a folder added with \"Open Other User's Folder\""
+#~ msgstr "Премахва папка добавена с \"Отваря друга Потребителска Папка\""
 
-#: widgets/misc/e-clipped-label.c:111
-msgid "..."
-msgstr "..."
+#~ msgid "Toggle"
+#~ msgstr "Превключва"
 
-#: widgets/misc/e-filter-bar.c:185
-msgid "Search Editor"
-msgstr "Редактор за Търсене"
+#~ msgid "Toggle whether to show the shortcut bar"
+#~ msgstr "Превключва показването на панела с ускорителите"
 
-#. FIXME: get the toplevel window...
-#: widgets/misc/e-filter-bar.c:206
-msgid "Save Search"
-msgstr "Запази Търсене"
+#~ msgid "View the selected folder"
+#~ msgstr "Показва избраната папка"
 
-#: widgets/misc/e-filter-bar.h:91 widgets/misc/e-filter-bar.h:98
-msgid "_Save Search..."
-msgstr "_Запазва Търсенето..."
+#~ msgid "_Copy..."
+#~ msgstr "_Копира..."
 
-#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
-msgid "_Edit Saved Searches..."
-msgstr "_Редактира Запазени Търсения"
+#~ msgid "_Folder Bar"
+#~ msgstr "Панел с папки"
 
-#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
-msgid "_Advanced..."
-msgstr "_Напреднали..."
+#~ msgid "_Folder..."
+#~ msgstr "_Папка..."
 
-#: widgets/misc/e-messagebox.c:154
-msgid "Information"
-msgstr "Информация"
+#~ msgid "_Go to Folder..."
+#~ msgstr "Отива в Папка..."
 
-#: widgets/misc/e-messagebox.c:168
-msgid "Error"
-msgstr "Грешка"
+#~ msgid "_Move..."
+#~ msgstr "Премества..."
 
-#: widgets/misc/e-messagebox.c:175
-msgid "Question"
-msgstr "Въпрос"
+#~ msgid "_New Folder"
+#~ msgstr "Нова папка"
 
-#: widgets/misc/e-messagebox.c:182
-msgid "Message"
-msgstr "Съобщение"
+#~ msgid "_Remove Other User's Folder"
+#~ msgstr "_Премахва Другите Потребителски Папки"
 
-#: widgets/misc/e-search-bar.c:531
-msgid "_Search"
-msgstr "Търсене"
+#~ msgid "_Rename..."
+#~ msgstr "Преименувай..."
 
-#: widgets/misc/e-search-bar.c:537
-msgid "_Find Now"
-msgstr "_Намира Сега"
+#~ msgid "_Shortcut Bar"
+#~ msgstr "Панел с Бързи Клавиши"
 
-#: widgets/misc/e-search-bar.c:538
-msgid "_Clear"
-msgstr "_Изчиства"
+#~ msgid "_Shortcut..."
+#~ msgstr "_Кратък клавиш..."
 
-#: widgets/misc/e-search-bar.c:836
-msgid "Item ID"
-msgstr ""
+#~ msgid "Print summary"
+#~ msgstr "Печат на Резюмето"
 
-#: widgets/misc/e-search-bar.c:843
-msgid "Subitem ID"
-msgstr ""
+#~ msgid "Reload"
+#~ msgstr "Презарежда"
 
-#: widgets/misc/e-search-bar.c:850
-msgid "Text"
-msgstr "Текст"
+#~ msgid "Reload the view"
+#~ msgstr "Презарежда Прегледа"
 
-#: widgets/misc/e-search-bar.c:928
-msgid "Clear"
-msgstr "Изчисти"
+#~ msgid "With _Category"
+#~ msgstr "С _Категория"
 
-#: widgets/misc/e-search-bar.c:930
-msgid "Find Now"
-msgstr "Намери Сега"
+#~ msgid "Information"
+#~ msgstr "Информация"
 
-#: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:1
-msgid "Evolution Addressbook local/LDAP backend"
-msgstr ""
+#~ msgid "Error"
+#~ msgstr "Грешка"
 
-#: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:2
-#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:2
-msgid "Evolution Calendar local file backend"
-msgstr ""
+#~ msgid "Question"
+#~ msgstr "Въпрос"
 
-#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:1
-msgid "Evolution Addressbook local file backend"
-msgstr ""
+#~ msgid "Clear"
+#~ msgstr "Изчисти"
 
 #~ msgid "However, the message was successfully sent."
 #~ msgstr "Обаче, съобщението беше изпратено успешно."
 
-#~ msgid "Save As..."
-#~ msgstr "Съхрани Като..."
-
 #~ msgid "Search"
 #~ msgstr "Търсене"
 
 #~ msgid "De_lete"
 #~ msgstr "Изтрий"
 
-#~ msgid "Email Address:"
-#~ msgstr "Адрес на ел. поща"
-
-#~ msgid "E-mail"
-#~ msgstr "E-поща"
-
 #~ msgid "Check Full Name"
 #~ msgstr "Маркира Пълно Име"
 
@@ -27674,18 +25694,10 @@ msgstr ""
 #~ msgstr "Фабрика за композитора на Evolution "
 
 #, fuzzy
-#~ msgid "Evolution Mail font configuration control"
-#~ msgstr "Фабрика за контрол на задачи в Evolution"
-
-#, fuzzy
 #~ msgid "Font Preferences"
 #~ msgstr "_Няма повторение"
 
 #, fuzzy
-#~ msgid "Automatically _detect links"
-#~ msgstr "_Автоматична проверка за нов email"
-
-#, fuzzy
 #~ msgid "Emacs"
 #~ msgstr "Изток"
 
@@ -27714,12 +25726,6 @@ msgstr ""
 #~ msgid "Delete news feed"
 #~ msgstr "Всички източници на новини:"
 
-#~ msgid "_Mail"
-#~ msgstr "_Поща"
-
-#~ msgid "_Weather"
-#~ msgstr "_Време"
-
 #~ msgid "Check Address"
 #~ msgstr "Провери адрес"
 
@@ -27761,9 +25767,6 @@ msgstr ""
 #~ msgid "Factory to import VCard files into Evolution."
 #~ msgstr "Фабрика, от която да се внесат VCard файлове в Еволюшън."
 
-#~ msgid "Imports VCard files into Evolution."
-#~ msgstr "Внася VCard файлове в Еволюшън."
-
 #~ msgid "A Bonobo control for an address popup."
 #~ msgstr "Контрол на Bonobo за адресно появяване."
 
@@ -27786,10 +25789,6 @@ msgstr ""
 #~ msgstr "Фабрика за композитора на Evolution "
 
 #, fuzzy
-#~ msgid "380"
-#~ msgstr "80%"
-
-#, fuzzy
 #~ msgid "<- _Remove"
 #~ msgstr "Махни"
 
@@ -27810,14 +25809,6 @@ msgstr ""
 #~ msgstr "Полета"
 
 #, fuzzy
-#~ msgid "Select"
-#~ msgstr "Избери всичко"
-
-#, fuzzy
-#~ msgid "_Add ->"
-#~ msgstr "Д_обави"
-
-#, fuzzy
 #~ msgid "_Add Mapping"
 #~ msgstr "Добавя действие"
 
@@ -28053,9 +26044,6 @@ msgstr ""
 #~ msgid "Imports Outlook Express 4 files into Evolution"
 #~ msgstr "Импортирани Outlook Express 4 файлове в Evolution"
 
-#~ msgid "Really delete account?"
-#~ msgstr "Действително ли да изтрия акаунта?"
-
 #, fuzzy
 #~ msgid "Go to next folder with unread messages?"
 #~ msgstr "Показва следващото непрочетено съобщение"
@@ -28063,17 +26051,9 @@ msgstr ""
 #~ msgid "US-Letter"
 #~ msgstr "US-Писмо"
 
-#, fuzzy
-#~ msgid "Add Signature"
-#~ msgstr "Запазва сигнатура"
-
 #~ msgid "Account %d"
 #~ msgstr "Акаунт %d"
 
-#, fuzzy
-#~ msgid "_Variable-width:"
-#~ msgstr "Променливо"
-
 #~ msgid "All folders"
 #~ msgstr "Всички папки"
 
@@ -28165,9 +26145,6 @@ msgstr ""
 #~ msgid "Bug buddy was not found in your $PATH."
 #~ msgstr "Bug buddy не беше открит в $PATH."
 
-#~ msgid "Don't remove"
-#~ msgstr "Не Изтривай"
-
 #~ msgid "Host"
 #~ msgstr "Хост"
 
@@ -28245,10 +26222,6 @@ msgstr ""
 #~ msgid "Scanning for new messages"
 #~ msgstr "Сканирам за нови съобщения"
 
-#, fuzzy
-#~ msgid "The folder %s no longer exists"
-#~ msgstr "Папката не е празна"
-
 #~ msgid "1 byte"
 #~ msgstr "1 байт"
 
@@ -28282,10 +26255,6 @@ msgstr ""
 #~ msgstr "Грешка в търсене на израз."
 
 #, fuzzy
-#~ msgid "Could not parse query string"
-#~ msgstr "Не мога да анализирам URL `%s'"
-
-#, fuzzy
 #~ msgid "Email is"
 #~ msgstr "Ел. Поща 2"
 
@@ -28303,19 +26272,12 @@ msgstr ""
 #~ msgid "Signature hint"
 #~ msgstr "Запазва сигнатура"
 
-#, fuzzy
-#~ msgid "Hide signature hint"
-#~ msgstr "HTML сигнатурен файл"
-
 #~ msgid "Restarting search."
 #~ msgstr "Отново почвам търсенето."
 
 #~ msgid "Meeting begins: <b>"
 #~ msgstr "Начало на среща: <b>"
 
-#~ msgid "Task begins: <b>"
-#~ msgstr "Начало на задача: <b>"
-
 #~ msgid "Free/Busy info begins: <b>"
 #~ msgstr "Начало на информация Свободен/Зает: <b>"
 
@@ -28397,9 +26359,6 @@ msgstr ""
 #~ msgid "News Servers"
 #~ msgstr "Новини"
 
-#~ msgid "Source Information"
-#~ msgstr "Източник на Информация"
-
 #~ msgid "newswindow1"
 #~ msgstr "прозорец за новини 1"
 
@@ -28438,9 +26397,6 @@ msgstr ""
 #~ msgid "Send _later"
 #~ msgstr "Изпрати по-късно"
 
-#~ msgid "Send the message later"
-#~ msgstr "Изпрати съобщението по-късно"
-
 #~ msgid "_Pilot Settings..."
 #~ msgstr "Настройки за Pilot..."
 
@@ -28463,9 +26419,6 @@ msgstr ""
 #~ msgid "_Other Organizer"
 #~ msgstr "Др_уг Организатор"
 
-#~ msgid "Please enter your %s passphrase for %s"
-#~ msgstr "Моля въведете вашият %s шифър за %s"
-
 #~ msgid "Please enter your %s passphrase"
 #~ msgstr "Моля въведете вашият шифър %s"
 
@@ -28488,9 +26441,6 @@ msgstr ""
 #~ "Не мога да проверя това съобщение: не мога да създам програмен канал за "
 #~ "GPG/PGP: %s"
 
-#~ msgid "Cannot encrypt this message: no plaintext to encrypt"
-#~ msgstr "Не мога да криптирам това съобщение: няма прост текст за криптиране"
-
 #~ msgid "Cannot encrypt this message: no password provided"
 #~ msgstr "Не мога да криптирам това съобщение: няма парола"
 
@@ -28499,10 +26449,6 @@ msgstr ""
 #~ "Не мога да криптирам това съобщение: не мога да създам програмен канал за "
 #~ "GPG/PGP: %s"
 
-#~ msgid "Cannot decrypt this message: no ciphertext to decrypt"
-#~ msgstr ""
-#~ "Не мога да декриптирам това съобщение: няма шифрован текст за декриптиране"
-
 #~ msgid "Cannot decrypt this message: no password provided"
 #~ msgstr "Не мога да декриптирам това съобщение: няма парола"
 
@@ -28520,9 +26466,6 @@ msgstr ""
 #~ msgid "No such message: %s"
 #~ msgstr "Няма такова съобщение: %s"
 
-#~ msgid "You cannot copy messages from this trash folder."
-#~ msgstr "Вие не може да копирате съобщения от тази папка боклук"
-
 #~ msgid "Cannot append message to spool file: %s: %s"
 #~ msgstr "Не мога да добавя съобщението в spool файла: %s: %s"
 
@@ -28530,10 +26473,6 @@ msgstr ""
 #~ msgstr "Не мога да регистрирам: %s: %s"
 
 #, fuzzy
-#~ msgid "Store `%s' does not exist or is not a directory"
-#~ msgstr "Spool `%s' не съществува или не е обикновен файл"
-
-#, fuzzy
 #~ msgid "Mail tree %s"
 #~ msgstr "Mail до %s"
 
@@ -28574,18 +26513,10 @@ msgstr ""
 #~ msgid "Hulu"
 #~ msgstr "Хонолулу"
 
-#, fuzzy
-#~ msgid "Select a signature script"
-#~ msgstr "Изтрива всички сигнатури"
-
 #~ msgid "_HTML Signature:"
 #~ msgstr "_HTML сигнатура:"
 
 #, fuzzy
-#~ msgid "_Language:"
-#~ msgstr "Език"
-
-#, fuzzy
 #~ msgid "_Random"
 #~ msgstr "Радио"
 
@@ -28612,9 +26543,6 @@ msgstr ""
 #~ msgid "<- Remove"
 #~ msgstr "Махни"
 
-#~ msgid "Are you sure you want to remove the \"%s\" folder?"
-#~ msgstr "Сигурен ли сте, че искате да изтриете папка \"%s\"?"
-
 #~ msgid "%s: Inbox"
 #~ msgstr "%s: Inbox"
 
@@ -28679,13 +26607,6 @@ msgstr ""
 
 #~ msgid ""
 #~ "\n"
-#~ "Address:"
-#~ msgstr ""
-#~ "\n"
-#~ "Адрес:"
-
-#~ msgid ""
-#~ "\n"
 #~ "  Postal Box:  "
 #~ msgstr ""
 #~ "\n"
@@ -28721,13 +26642,6 @@ msgstr ""
 
 #~ msgid ""
 #~ "\n"
-#~ "  Postal Code: "
-#~ msgstr ""
-#~ "\n"
-#~ " Пощенски Код: "
-
-#~ msgid ""
-#~ "\n"
 #~ "  Country:     "
 #~ msgstr ""
 #~ "\n"
@@ -28742,13 +26656,6 @@ msgstr ""
 
 #~ msgid ""
 #~ "\n"
-#~ "Telephone:"
-#~ msgstr ""
-#~ "\n"
-#~ "Телефон:"
-
-#~ msgid ""
-#~ "\n"
 #~ "E-mail:\n"
 #~ msgstr ""
 #~ "\n"
@@ -28763,13 +26670,6 @@ msgstr ""
 
 #~ msgid ""
 #~ "\n"
-#~ "Geo Location: "
-#~ msgstr ""
-#~ "\n"
-#~ "Географско местонахождение: "
-
-#~ msgid ""
-#~ "\n"
 #~ "Business Role: "
 #~ msgstr ""
 #~ "\n"
@@ -28826,25 +26726,11 @@ msgstr ""
 
 #~ msgid ""
 #~ "\n"
-#~ "Comment: "
-#~ msgstr ""
-#~ "\n"
-#~ "Коментар:"
-
-#~ msgid ""
-#~ "\n"
 #~ "Unique String: "
 #~ msgstr ""
 #~ "\n"
 #~ "Уникален Низ: "
 
-#~ msgid ""
-#~ "\n"
-#~ "Public Key: "
-#~ msgstr ""
-#~ "\n"
-#~ "Публичен Ключ: "
-
 #~ msgid "Waiting for connection to LDAP server..."
 #~ msgstr "Чакам за връзка с LDAP сървъра..."
 
@@ -28854,9 +26740,6 @@ msgstr ""
 #~ msgid "New Contact _List"
 #~ msgstr "Нов списък с контакти"
 
-#~ msgid "Add Addressbook"
-#~ msgstr "Добави адресна книга"
-
 #~ msgid "Advanced"
 #~ msgstr "Допълнителни"
 
@@ -28921,9 +26804,6 @@ msgstr ""
 #~ msgid "New _Task"
 #~ msgstr "Нова _Задача"
 
-#~ msgid "Create new appointments with a default _reminder"
-#~ msgstr "Създаване на нова среща с подраз_биращо напомняне"
-
 #~ msgid "First day of wee_k:"
 #~ msgstr "Първи ден от сед_мицата:"
 
@@ -28939,9 +26819,6 @@ msgstr ""
 #~ msgid "Invalid type in body-contains, expecting string"
 #~ msgstr "Грешно съдържание в тялото, очакваше се низ"
 
-#~ msgid "This is an encrypted message part"
-#~ msgstr "Това е част от криптирано съобщение"
-
 #~ msgid ""
 #~ "EMail: %s\n"
 #~ "Common Name: %s\n"
@@ -28959,45 +26836,18 @@ msgstr ""
 #~ "Област: %s\n"
 #~ "Държава: %s"
 
-#~ msgid "Please enter the NNTP password for %s@%s"
-#~ msgstr "Моля въведете NNTP парола за %s@%s"
-
-#~ msgid "Server rejected username"
-#~ msgstr "Сървърът отхвърли потребителското име"
-
-#~ msgid "Failed to send username to server"
-#~ msgstr "Изпращането на потребителското име до сървъра неуспешно"
-
-#~ msgid "Server rejected username/password"
-#~ msgstr "Сървърът отхвърли потребителското име/паролата"
-
 #~ msgid "Message %s not found."
 #~ msgstr "Съобщението %s не е намерено."
 
-#~ msgid "Could not get group list from server."
-#~ msgstr "Не мога да взема списък на група от сървъра"
-
-#~ msgid "Unable to load grouplist file for %s: %s"
-#~ msgstr "Не мога да заредя файла със списък на група за %s: %s"
-
-#~ msgid "Unable to save grouplist file for %s: %s"
-#~ msgstr "Не мога да запазя файл със списък на група за %s: %s"
-
 #~ msgid "Could not open directory for news server: %s"
 #~ msgstr "Не мога да отворя директория за сървър с новини %s"
 
-#~ msgid "Unable to open or create .newsrc file for %s: %s"
-#~ msgstr "Не мога да отворя или създам .newsrc файл за %s: %s"
-
 #~ msgid "Could not check POP server for new messages: %s"
 #~ msgstr "Не мога да проверя POP сървъра за нови съобщения %s"
 
 #~ msgid "Could not open folder: message listing was incomplete."
 #~ msgstr "Не мога да отворя папка: списъка със съобщения не е пълен"
 
-#~ msgid "Could not fetch message: %s"
-#~ msgstr "Не мога да получа съобщение: %s"
-
 #~ msgid "Could not retrieve message from POP server %s: %s"
 #~ msgstr "Не мога да получа съобщение от POP сървър %s: %s"
 
@@ -29006,24 +26856,12 @@ msgstr ""
 #~ "it."
 #~ msgstr "Това ще ви свърже към POP сървър използващ за оторизация Kerberos 4"
 
-#~ msgid "Could not connect to server: %s"
-#~ msgstr "Не мога да се свържа към сървър %s"
-
 #~ msgid "(Unknown)"
 #~ msgstr "(Неизвестен)"
 
 #~ msgid "Could not find 'From' address in message"
 #~ msgstr "Не мога да намеря 'От' адрес в съобщението"
 
-#~ msgid "Cannot send message: sender address not defined."
-#~ msgstr "Не мога да изпратя поща; адеса на изпращача не е указан."
-
-#~ msgid "RCPT TO response error: %s: mail not sent"
-#~ msgstr "RCPT TO върна грешка: %s: пощата не е изпратена"
-
-#~ msgid "DATA response error: %s: mail not sent"
-#~ msgstr "DATA върна грешка: %s: пощата не е изпратена"
-
 #~ msgid "DATA response error: message termination: %s: mail not sent"
 #~ msgstr "DATA върна грешка: съобщението прекъсна: %s: пощата не е изпратена"
 
@@ -29072,9 +26910,6 @@ msgstr ""
 #~ msgid "Composer"
 #~ msgstr "Композер"
 
-#~ msgid "Default Forward style is: "
-#~ msgstr "Подразбираш се стил на Препращане:"
-
 #~ msgid "Edit..."
 #~ msgstr "Редакция...."
 
@@ -29090,15 +26925,9 @@ msgstr ""
 #~ msgid "_Email Address:"
 #~ msgstr "_Email Адрес:"
 
-#~ msgid "_Log filter actions to:"
-#~ msgstr "Де_йствия за филтриране на журнал за:"
-
 #~ msgid "_Organization:"
 #~ msgstr "_Организация:"
 
-#~ msgid "_Send mail in HTML format by default."
-#~ msgstr "_Изпрати mail в HTML формат по подразбиране."
-
 #~ msgid "_Server Type: "
 #~ msgstr "_Тип Сървър:"
 
@@ -29126,9 +26955,6 @@ msgstr ""
 #~ msgid "_Displayed feeds:"
 #~ msgstr "_Показвани полета"
 
-#~ msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
-#~ msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
-
 #~ msgid "(No name)"
 #~ msgstr "(Няма име)"
 
diff --git a/po/ca.po b/po/ca.po
index 9946a6f78b..5d5e84fc02 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2004-05-19 14:00-0400\n"
+"POT-Creation-Date: 2004-06-03 11:14-0400\n"
 "PO-Revision-Date: 2004-04-08 12:21+0200\n"
 "Last-Translator: Softcatala <tradgnome@softcatala.org>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
@@ -69,14 +69,14 @@ msgid "Default Sync Address:"
 msgstr "Adreça de sincronització predeterminada:"
 
 # fitxer: addressbook.conduit.ca.po
-#: addressbook/conduit/address-conduit.c:1150
 #: addressbook/conduit/address-conduit.c:1151
+#: addressbook/conduit/address-conduit.c:1152
 msgid "Could not load addressbook"
 msgstr "No s'ha pogut carregar la llibreta d'adreces"
 
 # fitxer: addressbook.conduit.ca.po
-#: addressbook/conduit/address-conduit.c:1219
-#: addressbook/conduit/address-conduit.c:1222
+#: addressbook/conduit/address-conduit.c:1220
+#: addressbook/conduit/address-conduit.c:1223
 msgid "Could not read pilot's Address application block"
 msgstr "No s'ha pogut llegir el bloc d'aplicació d'adreces del pilot"
 
@@ -86,14 +86,14 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "S'està accedint anònimament al servidor d'LDAP"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
 msgid "Failed to authenticate.\n"
 msgstr "S'ha produït un error en l'autenticació.\n"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sIntroduïu la contrasenya per a %s (usuari %s)"
@@ -146,61 +146,26 @@ msgstr "_Contactes:"
 msgid "Create a new contacts group"
 msgstr "Crea un nou contacte"
 
-#: addressbook/gui/component/addressbook-component.c:182
+#: addressbook/gui/component/addressbook-component.c:184
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr ""
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook-config.c:483
-msgid "Failed to connect to LDAP server"
-msgstr "S'ha produït un error en connectar amb el servidor d'LDAP"
-
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook-config.c:507
-msgid "Failed to authenticate with LDAP server"
-msgstr "S'ha produït un error en autenticar-se al servidor d'LDAP"
-
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook-config.c:535
-msgid "Could not perform query on Root DSE"
-msgstr "No s'ha pogut realitzar la consulta al Root DSE"
-
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook-config.c:840
-msgid "The server responded with no supported search bases"
-msgstr "El servidor ha respost amb bases de cerca no suportades"
-
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook-config.c:1245
-msgid "This server does not support LDAPv3 schema information"
-msgstr "Aquest servidor no suporta la informació de l'esquema d'LDAPv3"
-
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook-config.c:1266
-msgid "Error retrieving schema information"
-msgstr "S'ha produït un error en recuperar la informació de l'esquema"
-
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook-config.c:1274
-msgid "Server did not respond with valid schema information"
-msgstr "El servidor no ha contestat amb una informació d'esquema vàlida"
-
-# fitxer: addressbook.gui.component.ca.po
 #: addressbook/gui/component/addressbook-migrate.c:68
-#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1160
 msgid "Migrating..."
 msgstr "S'està migrant..."
 
 # fitxer: addressbook.gui.component.ca.po
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1201
 #, c-format
 msgid "Migrating `%s':"
 msgstr "S'està migrant '%s':"
 
 # fitxer: addressbook.gui.component.ca.po
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:438
+#: addressbook/gui/component/addressbook-migrate.c:464
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
 #: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
@@ -209,32 +174,32 @@ msgstr "En aquest ordinador"
 
 # fitxer: addressbook.gui.component.ca.po
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:446
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
-#: mail/mail-config.glade.h:106
+#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
+#: mail/mail-config.glade.h:109
 msgid "Personal"
 msgstr "Personal"
 
 # fitxer: addressbook.gui.component.ca.po
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:454
+#: addressbook/gui/component/addressbook-migrate.c:480
 msgid "On LDAP Servers"
 msgstr "Als servidors d'LDAP"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook-migrate.c:582
+#: addressbook/gui/component/addressbook-migrate.c:608
 msgid "LDAP Servers"
 msgstr "Servidors d'LDAP"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook-migrate.c:702
+#: addressbook/gui/component/addressbook-migrate.c:728
 msgid "Autocompletion Settings"
 msgstr "Paràmetres del completat automàtic"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook-migrate.c:1076
+#: addressbook/gui/component/addressbook-migrate.c:1104
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -247,7 +212,7 @@ msgstr ""
 "Espereu mentre l'Evolution migra les carpetes..."
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook-migrate.c:1090
+#: addressbook/gui/component/addressbook-migrate.c:1118
 #, fuzzy
 msgid ""
 "The format of mailing list contacts has changed.\n"
@@ -260,7 +225,7 @@ msgstr ""
 "Espereu mentre l'Evolution migra les carpetes..."
 
 # fitxer: calendar.ca.po.3
-#: addressbook/gui/component/addressbook-migrate.c:1099
+#: addressbook/gui/component/addressbook-migrate.c:1127
 #, fuzzy
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
@@ -273,7 +238,7 @@ msgstr ""
 "Espereu mentre l'Evolution migra les carpetes...<"
 
 # fitxer: calendar.ca.po.3
-#: addressbook/gui/component/addressbook-migrate.c:1109
+#: addressbook/gui/component/addressbook-migrate.c:1137
 #, fuzzy
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
@@ -286,43 +251,38 @@ msgstr ""
 "Espereu mentre l'Evolution migra les carpetes..."
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook-view.c:674
+#: addressbook/gui/component/addressbook-view.c:675
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 "Se suprimirà la llibreta d'adreces '%s'. Esteu segur de voler continuar?"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook-view.c:761
+#: addressbook/gui/component/addressbook-view.c:754
 msgid "New Address Book"
 msgstr "Nova llibreta d'adreces"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook-view.c:762
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
+#: addressbook/gui/component/addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Suprimeix"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/addressbook-view.c:763
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-view.c:756
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Propietats..."
 
 # fitxer: addressbook.gui.component.ca.po
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/addressbook-view.c:1002
+#. Create the contacts group
+#: addressbook/gui/component/addressbook-view.c:995
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
 #: calendar/gui/migration.c:373
 msgid "Contacts"
 msgstr "Contactes"
@@ -420,11 +380,6 @@ msgstr "Gestioneu els vostres certificats S/Mime"
 
 # fitxer: addressbook.gui.component.ca.po
 #: addressbook/gui/component/ldap-config.glade.h:1
-msgid "  S_how Supported Bases "
-msgstr "  Mostra les bas_es suportades "
-
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -439,241 +394,200 @@ msgstr "  Mostra les bas_es suportades "
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr ""
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1:00"
-msgstr "1:00"
-
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr "3268"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr ""
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
-msgstr "5:00"
-
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr "636"
 
 # fitxer: camel.ca.po.1
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "Autenticació d'SMTP"
 
 # fitxer: calendar.ca.po.5
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
 #, fuzzy
 msgid "<b>Display</b>"
 msgstr "_Visualització"
 
 # fitxer: designs.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 #, fuzzy
 msgid "<b>Downloading</b>"
 msgstr "<b>Enviar correu electrònic:</b>"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:10
 #, fuzzy
 msgid "<b>Searching</b>"
 msgstr "S'està cercant"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
 msgid "<b>Server Information</b>"
 msgstr "Pas 2: Informació del servidor"
 
 # fitxer: calendar.ca.po.3
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
 msgid "<b>Type:</b>"
 msgstr "<b>Llavors</b>"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:13
 #, fuzzy
 msgid "Add Contacts Group"
 msgstr "Afegeix als contactes"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Address Book Properties"
 msgstr "Propietats de la llibreta d'adreces"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
-#: mail/mail-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
+#: mail/mail-config.glade.h:42
 msgid "Always"
 msgstr "Sempre"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr "Anònimament"
 
 # fitxer: calendar.ca.po.4
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:17
 #: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Bàsic"
 
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:21
-msgid "Connecting"
-msgstr "S'està connectant"
-
 # fitxer: addressbook.gui.contact-editor.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 #: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Detalls"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:23
-msgid "Distinguished _name:"
-msgstr "_Nom distingit:"
-
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:19
 #, fuzzy
 msgid "Distinguished name"
 msgstr "_Nom distingit:"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:20
 #, fuzzy
 msgid "Download limit:"
 msgstr "Límit de baixa_da:"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Email address"
 msgstr "Adreça de correu electrònic:"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "Email address:"
-msgstr "Adreça de correu electrònic:"
-
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "Evolution will use this DN to authenticate you with the server"
-msgstr "L'Evolution utilitzarà el DN per autenticar-vos al servidor"
-
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:22
+#, fuzzy
 msgid ""
-"Evolution will use this email address to authenticate you with the server"
+"Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "L'Evolution utilitzarà l'adreça de correu electrònic per autenticar-vos al "
 "servidor"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:23
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Les bases de cerca suportades"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:31
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:24
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
+#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "General"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
-#: mail/mail-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
+#: mail/mail-config.glade.h:102
 msgid "Never"
 msgstr "Mai"
 
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:33
-msgid "One"
-msgstr "One"
-
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Only locations within starting point"
 msgstr ""
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:35
-msgid "S_earch scope: "
-msgstr "Àmbit de la c_erca: "
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Search _base:"
+msgstr "Ba_se de la cerca:"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
 msgid "Search base only"
 msgstr "Ba_se de la cerca:"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:29
 #, fuzzy
 msgid "Search base:"
 msgstr "Ba_se de la cerca:"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Search scope:"
 msgstr "Àmbit de la c_erca: "
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:39
-msgid "Searching"
-msgstr "S'està cercant"
-
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:31
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
-"server if\n"
-"your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL or TLS."
 msgstr ""
 "Si seleccioneu aquesta opció l'Evolution només es connectarà al servidor "
 "d'LDAP\n"
 "si aquest suporta SSL o TLS."
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a \n"
-"insecure environment. For example, if you and your LDAP server are behind a "
-"firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection "
-"is already\n"
-"secure."
+"you are in a insecure environment. For example, if you and your LDAP server "
+"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
+"because your connection is already secure."
 msgstr ""
 "Si seleccioneu aquesta opció l'Evolution només intentarà utilitzar l'SSL/TLS "
 "si esteu\n"
@@ -683,13 +597,12 @@ msgstr ""
 "segura."
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:33
+#, fuzzy
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
-"TLS.  This \n"
-"means that your connection will be insecure, and that you will be vulnerable "
-"to security\n"
-"exploits. "
+"TLS.  This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits. "
 msgstr ""
 "Si seleccioneu aquesta opció indiqueu que el vostre servidor no suporta ni "
 "SSL ni TLS.\n"
@@ -697,41 +610,35 @@ msgstr ""
 "sereu vulnerables als errors\n"
 "de seguretat."
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Starting point and locations within it"
 msgstr ""
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Sub"
-msgstr "Sub"
-
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr "Les bases de cerca suportades"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
-"searches will \n"
-"begin. If you leave this blank, the search will begin at the root of the "
-"directory tree."
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
 msgstr ""
 "La base de la cerca és el nom distingit (DN) de l'entrada on començaran les "
 "cerques.\n"
 "Si ho deixeu en blanc, la cerca començarà a l'arrel de l'arbre de directoris."
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:37
+#, fuzzy
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
-"the \n"
-"directory tree. A search scope of \"sub\" will include all entries below "
-"your search base.\n"
-"A search scope of \"one\" will only include the entries one level beneath "
-"your base.\n"
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
 msgstr ""
 "L'àmbit de la cerca defineix fins a quina profunditat voleu que la cerca\n"
 "estengui l'arbre de directoris. L'àmbit de cerca 'sub' inclourà  totes les\n"
@@ -740,7 +647,7 @@ msgstr ""
 "vostra base.\n"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:58
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -748,10 +655,10 @@ msgstr ""
 "És el nom complet del servidor d'LDAP. Per exemple, 'ldap.mycompany.com'."
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:39
+#, fuzzy
 msgid ""
-"This is the maximum number of entries to download. Setting this number to "
-"be \n"
+"This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr ""
 "És el nombre màxim d'entrades a baixar. Si especifiqueu un nombre massa "
@@ -759,7 +666,7 @@ msgstr ""
 "retardarà la llibreta d'adreces."
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -770,169 +677,142 @@ msgstr ""
 "d'LDAP."
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:41
+#, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
-"list.\n"
-"It is for display purposes only. "
+"list. It is for display purposes only. "
 msgstr ""
 "El nom d'aquest servidor que apareixerà a la llista de carpetes de "
 "l'Evolution.\n"
 "Només s'utilitza per visualitzar-la."
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:42
+#, fuzzy
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. "
-"A \n"
-"list of standard ports has been provided. Ask your system administrator\n"
-"what port you should specify."
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
 msgstr ""
 "És el port d'LDAP on s'intentarà connectar l'Evolution.\n"
 "S'ha proporcionat una llista de ports estàndard. Pregunteu a "
 "l'administrador\n"
 "del sistema quin port heu d'especificar."
 
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:67
-msgid "This option controls how long a search will be run."
-msgstr "L'opció especifica la durada de l'execució de la cerca."
-
 # fitxer: calendar.ca.po.5
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:43
 #, fuzzy
 msgid "Timeout:"
 msgstr "Format de l'hora:"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:69
-msgid "U_se SSL/TLS:"
-msgstr "Utilitza _SSL/TLS:"
-
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr "S'està utilitzant el nom distingit (DN)"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr "S'està utilitzant l'adreça de correu electrònic"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
-#: mail/mail-config.glade.h:154
+#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
+#: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr "Sempre que sigui possible"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:47
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "Afegeix als contactes"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:74
-#: calendar/gui/dialogs/calendar-setup.glade.h:12
-msgid "_Display name:"
-msgstr "Nom _de visualització"
-
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr "Límit de baixa_da:"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
 msgid "_Email address:"
 msgstr "Adreça de correu electrònic:"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:50
+#, fuzzy
+msgid "_Find Possible Search Bases"
+msgstr "Les bases de cerca suportades"
+
+# fitxer: addressbook.gui.component.ca.po
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Log in method:"
 msgstr "_Mètode d'entrada:"
 
+# fitxer: camel.ca.po.4
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "_Log in:"
+msgstr "Entrada"
+
 # fitxer: mail.ca.po.1
-#: addressbook/gui/component/ldap-config.glade.h:78
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
+#: addressbook/gui/component/ldap-config.glade.h:53
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
 msgid "_Name:"
 msgstr "_Nom:"
 
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:79
-msgid "_Port number:"
-msgstr "Nombre del _port:"
-
 # fitxer: calendar.ca.po.4
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "_Port:"
 msgstr "_Prioritat:"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:81
-msgid "_Search base:"
-msgstr "Ba_se de la cerca:"
-
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:82
-msgid "_Server name:"
-msgstr "Nom del _servidor:"
+#: addressbook/gui/component/ldap-config.glade.h:55
+#, fuzzy
+msgid "_Search scope:"
+msgstr "Àmbit de la c_erca: "
 
 # fitxer: mail.ca.po.1
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:56
 #, fuzzy
 msgid "_Server:"
 msgstr "S_ervidor:"
 
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:84
-msgid "_Timeout (minutes):"
-msgstr "_Temps d'espera (minuts):"
+# fitxer: calendar.ca.po.5
+#: addressbook/gui/component/ldap-config.glade.h:57
+#, fuzzy
+msgid "_Timeout:"
+msgstr "Format de l'hora:"
 
 # fitxer: mail.ca.po.1
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:58
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "_Utilitza una conexió segura (SSL):"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "targetes"
 
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:87
-msgid "connecting-tab"
-msgstr "pestanya-connexió"
-
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:88
-msgid "general-tab"
-msgstr "pestanya-general"
-
 # fitxer: calendar.ca.po.5
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:60
 #: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
-#: mail/mail-config.glade.h:182
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "minuts"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/ldap-config.glade.h:90
-msgid "searching-tab"
-msgstr "pestanya-cerca"
-
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/select-names/e-select-names.c:497
+#: addressbook/gui/component/select-names/e-select-names.c:503
 #: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid "Select Contacts from Address Book"
 msgstr "Selecciona els contactes de la llibreta d'adreces"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
@@ -980,7 +860,7 @@ msgstr "Contacte sense nom"
 # fitxer: addressbook.gui.component.ca.po
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:222
+#: addressbook/gui/widgets/e-addressbook-view.c:224
 msgid "Source"
 msgstr "Font"
 
@@ -1068,9 +948,9 @@ msgstr "<b>Si</b>"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
-#: addressbook/gui/widgets/eab-contact-display.c:342
-#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/widgets/eab-contact-display.c:334
+#: addressbook/gui/widgets/eab-contact-display.c:353
 msgid "AIM"
 msgstr "AIM"
 
@@ -1118,8 +998,8 @@ msgstr "Ordre:"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:271
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
+#: addressbook/gui/contact-editor/e-contact-editor.c:266
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
@@ -1127,7 +1007,7 @@ msgstr "Contacte"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1527
+#: addressbook/gui/contact-editor/e-contact-editor.c:520
 msgid "Contact Editor"
 msgstr "Editor de contactes"
 
@@ -1154,99 +1034,95 @@ msgstr "URL de lliu_re/ocupat:"
 msgid "Full _Name..."
 msgstr "_Nom complet..."
 
-# fitxer: addressbook.gui.contact-editor.ca.po
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:202
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-msgid "Home"
-msgstr "Particular"
-
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #, fuzzy
 msgid "Home Page:"
 msgstr "Pàgina inicial"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-#, fuzzy
-msgid "Job title:"
-msgstr "_Càrrec:"
-
-# fitxer: addressbook.gui.contact-editor.ca.po
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/e-itip-control.c:936
-msgid "Location:"
-msgstr "Ubicació:"
-
-# fitxer: addressbook.gui.contact-editor.ca.po
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "Missatgeria de l'MSN"
 
 # fitxer: smime.ca.po
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 #, fuzzy
 msgid "Mailing Address"
 msgstr "Adreça de correu electrònic"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 #, fuzzy
 msgid "Manager:"
 msgstr "Administrador"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "Sobre_nom:"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Notes:"
 msgstr "No_tes:"
 
 # fitxer: camel.ca.po.3
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
-#: addressbook/gui/contact-editor/e-contact-editor.c:203
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-msgid "Other"
-msgstr "Altres"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#, fuzzy
+msgid "Office:"
+msgstr "_Oficina:"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "PO Box:"
 msgstr "A_partat de correus:"
 
 # fitxer: calendar.ca.po.3
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 #, fuzzy
 msgid "Personal Information"
 msgstr "Informació diària"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 #, fuzzy
 msgid "Profession:"
 msgstr "P_rofessió:"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#, fuzzy
+msgid "Spouse:"
+msgstr "Con_juge:"
+
+# fitxer: addressbook.gui.contact-editor.ca.po
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "State/Province:"
 msgstr "E_stat/província:"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#, fuzzy
+msgid "Title:"
+msgstr "_Títol:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+msgid "Video Chat:"
+msgstr ""
+
+# fitxer: addressbook.gui.contact-editor.ca.po
 #: addressbook/gui/contact-editor/contact-editor.glade.h:41
 #, fuzzy
 msgid "Wants to receive HTML mail"
@@ -1255,16 +1131,16 @@ msgstr "Voleu rebre correu _HTML"
 # fitxer: calendar.ca.po.3
 #: addressbook/gui/contact-editor/contact-editor.glade.h:42
 #, fuzzy
-msgid "Webcam:"
+msgid "Web Log:"
 msgstr "Pàgina web:"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
-#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
-#: mail/mail-config.glade.h:155
+#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
+#: mail/mail-config.glade.h:157
 msgid "Work"
 msgstr "Feina"
 
@@ -1288,24 +1164,13 @@ msgstr "Nom del fitxer:"
 
 # fitxer: mail.ca.po.1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 #, fuzzy
 msgid "_Where:"
 msgstr "S_ervidor:"
 
-# fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
-#, fuzzy
-msgid "item7"
-msgstr "Títol"
-
-# fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
-#, fuzzy
-msgid "item8"
-msgstr "Títol"
-
 # fitxer: addressbook.gui.contact-editor.ca.po
-#: addressbook/gui/contact-editor/eab-editor.c:316
+#: addressbook/gui/contact-editor/eab-editor.c:315
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -1314,7 +1179,7 @@ msgstr ""
 "suprimir aquests contactes?"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
-#: addressbook/gui/contact-editor/eab-editor.c:319
+#: addressbook/gui/contact-editor/eab-editor.c:318
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -1324,17 +1189,17 @@ msgstr ""
 
 # fitxer: addressbook.gui.contact-editor.ca.po
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:351
-#: addressbook/gui/widgets/eab-contact-display.c:372
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Address"
 msgstr "Adreça"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:292
+#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard.c:174
@@ -2555,100 +2420,125 @@ msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/contact-editor/e-contact-editor.c:179
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:337
+#: addressbook/gui/widgets/eab-contact-display.c:356
 msgid "Jabber"
 msgstr "Jabber"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:347
-#: addressbook/gui/widgets/eab-contact-display.c:366
+#: addressbook/gui/contact-editor/e-contact-editor.c:180
+#: addressbook/gui/widgets/eab-contact-display.c:339
+#: addressbook/gui/widgets/eab-contact-display.c:358
 msgid "Yahoo"
 msgstr "Yahoo"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: addressbook/gui/widgets/eab-contact-display.c:338
+#: addressbook/gui/widgets/eab-contact-display.c:357
 msgid "MSN"
 msgstr "MSN"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
-#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:344
-#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#: addressbook/gui/widgets/eab-contact-display.c:355
 msgid "ICQ"
 msgstr "ICQ"
 
 # fitxer: camel.ca.po.3
-#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/contact-editor/e-contact-editor.c:183
 msgid "GroupWise"
 msgstr "Groupwise"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
-#: addressbook/gui/contact-editor/e-contact-editor.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+msgid "Home"
+msgstr "Particular"
+
+# fitxer: addressbook.gui.contact-editor.ca.po
+#: addressbook/gui/contact-editor/e-contact-editor.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+msgid "Other"
+msgstr "Altres"
+
+# fitxer: addressbook.gui.contact-editor.ca.po
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
 msgid "Source Book"
 msgstr "Llibreta d'adreces d'origen"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
-#: addressbook/gui/contact-editor/e-contact-editor.c:264
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Target Book"
 msgstr "Llibreta d'adreces objectiu"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
-#: addressbook/gui/contact-editor/e-contact-editor.c:278
+#: addressbook/gui/contact-editor/e-contact-editor.c:273
 msgid "Is New Contact"
 msgstr "És un contacte nou"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
-#: addressbook/gui/contact-editor/e-contact-editor.c:285
+#: addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Writable Fields"
 msgstr "Camps d'escriptura"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
-#: addressbook/gui/contact-editor/e-contact-editor.c:299
+#: addressbook/gui/contact-editor/e-contact-editor.c:294
 msgid "Changed"
 msgstr "Modificat"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
-msgid "Category editor not available."
-msgstr "L'editor de categories no està disponible."
-
-# fitxer: addressbook.gui.contact-editor.ca.po
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:2352
 msgid "This contact belongs to these categories:"
 msgstr "Aquest contacte pertany a les categories:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#: addressbook/gui/contact-editor/e-contact-editor.c:2429
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Seleccioneu entre les següents opcions"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
-#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#: addressbook/gui/contact-editor/e-contact-editor.c:2433
 #, fuzzy
 msgid "No image"
 msgstr "Níger"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+# fitxer: calendar.ca.po.4
+#: addressbook/gui/contact-editor/e-contact-editor.c:2636
 #, fuzzy
 msgid ""
-"The following entries are invalid:\n"
+"The contact data is invalid:\n"
 "\n"
-msgstr "Les següents regles de filtratge:\n"
+msgstr "La data de periodicitat no és vàlida"
 
-# fitxer: addressbook.gui.contact-editor.ca.po
-#: addressbook/gui/contact-editor/e-contact-editor.c:2738
-#, c-format
-msgid "Could not find widget for a field: `%s'"
+# fitxer: addressbook.gui.widgets.ca.po
+#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#, fuzzy
+msgid "Invalid contact."
+msgstr "%d contacte"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+msgid ""
+"The contact cannot be saved to the selected address book. Do you want to "
+"discard changes?"
+msgstr ""
+
+# fitxer: addressbook.gui.widgets.ca.po
+#: addressbook/gui/contact-editor/e-contact-editor.c:2727
+#: addressbook/gui/contact-editor/e-contact-editor.c:2751
+msgid "_Discard"
+msgstr "_Descarta"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+msgid ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
 msgstr ""
-"No s'ha pogut trobar l'element de la interfície gràfica per a un camp: '%s'"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:62
@@ -2689,7 +2579,7 @@ msgstr "_Edita el complet"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:166
 msgid "_Full Name:"
 msgstr "Nom compl_et:"
 
@@ -2871,34 +2761,34 @@ msgstr ""
 "Escriviu una adreça de correu o arrossegueu un con_tacte a la llista de sota:"
 
 # fitxer: addressbook.gui.contact-list-editor.ca.po
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "contact-list-editor"
 msgstr "editor de la llista de contactes"
 
 # fitxer: addressbook.gui.contact-list-editor.ca.po
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:153
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:215
+#: addressbook/gui/widgets/e-addressbook-view.c:217
 #: addressbook/gui/widgets/e-minicard-view.c:460
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Llibreta"
 
 # fitxer: addressbook.gui.contact-list-editor.ca.po
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
 msgid "Is New List"
 msgstr "És una llista nova"
 
 # fitxer: addressbook.gui.contact-list-editor.ca.po
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:215
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
 msgid "Contact List Editor"
 msgstr "Editor de la llista de contactes"
 
 # fitxer: addressbook.gui.contact-list-editor.ca.po
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:438
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
 msgid "Save List as VCard"
 msgstr "Desa la llista com a VCard"
 
@@ -2953,136 +2843,136 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Cerca avançada"
 
-#: addressbook/gui/widgets/eab-contact-display.c:129
-#: addressbook/gui/widgets/eab-contact-display.c:192
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
 msgid "(map)"
 msgstr "(mapa)"
 
-#: addressbook/gui/widgets/eab-contact-display.c:139
-#: addressbook/gui/widgets/eab-contact-display.c:205
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
 msgid "map"
 msgstr "mapa"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-contact-display.c:257
-#: addressbook/gui/widgets/eab-contact-display.c:533
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:525
 msgid "List Members"
 msgstr "Llista els membres"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-contact-display.c:329
-#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/eab-contact-display.c:321
+#: addressbook/gui/widgets/eab-contact-display.c:323
 msgid "E-mail"
 msgstr "Adreça electrònica"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/eab-contact-display.c:332
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organització"
 
 # fitxer: mail.ca.po.1
-#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "Position"
 msgstr "Posició"
 
 # fitxer: calendar.ca.po.3
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:354
 msgid "Groupwise"
 msgstr "Groupwise"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:340
 msgid "Video Conferencing"
 msgstr "Videoconferència"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-contact-display.c:349
-#: addressbook/gui/widgets/eab-contact-display.c:370
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Phone"
 msgstr "Telèfon"
 
-#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:342
 msgid "Fax"
 msgstr "Fax"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
-#: addressbook/gui/widgets/eab-contact-display.c:354
+#: addressbook/gui/widgets/eab-contact-display.c:346
 msgid "work"
 msgstr "feina"
 
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:359
 msgid "WWW"
 msgstr "www"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-contact-display.c:368
-#: addressbook/gui/widgets/eab-contact-display.c:587
+#: addressbook/gui/widgets/eab-contact-display.c:360
+#: addressbook/gui/widgets/eab-contact-display.c:579
 msgid "Blog"
 msgstr "Bitàcola"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/eab-contact-display.c:363
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Telèfon mòbil"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/widgets/eab-contact-display.c:375
+#: addressbook/gui/widgets/eab-contact-display.c:367
 msgid "personal"
 msgstr "personal"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/eab-contact-display.c:374
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Nota"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-contact-display.c:548
+#: addressbook/gui/widgets/eab-contact-display.c:540
 msgid "Job Title"
 msgstr "Càrrec"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/eab-contact-display.c:544
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:774
+#: smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "Adreça electrònica"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-contact-display.c:579
+#: addressbook/gui/widgets/eab-contact-display.c:571
 msgid "Home page"
 msgstr "Pàgina inicial"
 
 # fitxer: addressbook.gui.widgets.ca.po
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 msgid "Success"
 msgstr "Correcte"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Backend busy"
 msgstr ""
 
 # fitxer: addressbook.gui.widgets.ca.po
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Repository offline"
 msgstr "El dipòsit està desconnectat"
 
 # fitxer: addressbook.gui.widgets.ca.po
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Address Book does not exist"
 msgstr "La llibreta d'adreces no existeix"
 
 # fitxer: addressbook.gui.component.ca.po
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 #, fuzzy
 msgid "No Self Contact defined"
 msgstr "Nova llista de contactes"
@@ -3091,31 +2981,31 @@ msgstr "Nova llista de contactes"
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Permission denied"
 msgstr "S'ha denegat el permís"
 
 # fitxer: addressbook.gui.widgets.ca.po
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Contact not found"
 msgstr "No s'ha trobat el contacte"
 
 # fitxer: addressbook.gui.widgets.ca.po
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Contact ID already exists"
 msgstr "L'ID del contacte ja existeix"
 
 # fitxer: addressbook.gui.widgets.ca.po
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Protocol not supported"
 msgstr "El protocol no està suportat"
 
 # fitxer: addressbook.gui.widgets.ca.po
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:60
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:233
 #: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
@@ -3129,45 +3019,45 @@ msgstr "Cancel·lat"
 
 # fitxer: calendar.ca.po.3
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:61
 #, fuzzy
 msgid "Could not cancel"
 msgstr "No s'ha pogut obrir la font"
 
 # fitxer: addressbook.gui.widgets.ca.po
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Authentication Failed"
 msgstr "S'ha produït un error en l'autenticació"
 
 # fitxer: addressbook.gui.widgets.ca.po
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Authentication Required"
 msgstr "Es necessita autenticació"
 
 # fitxer: addressbook.gui.widgets.ca.po
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:66
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "TLS not Available"
 msgstr "El TLS no està disponible"
 
 # fitxer: camel.ca.po.3
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#: addressbook/gui/widgets/eab-gui-util.c:66
 #, fuzzy
 msgid "No such source"
 msgstr "No existeix el missatge"
 
 # fitxer: addressbook.gui.widgets.ca.po
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:69
+#: addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Other error"
 msgstr "Un altre error"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:90
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
@@ -3176,7 +3066,7 @@ msgstr ""
 "que hi teniu permís d'accés."
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:110
+#: addressbook/gui/widgets/eab-gui-util.c:97
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -3185,18 +3075,19 @@ msgstr ""
 "incorrecte o el servidor d'LDAP no està disponible."
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:102
+#, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution you must compile the program from the CVS "
-"sources after retrieving OpenLDAP from the link below."
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
 msgstr ""
 "Aquesta versió de l'Evolution no està compilada amb el suport per a LDAP. Si "
 "voleu utilitzar l'Evolution amb l'LDAP heu d'obtenir l'OpenLDAP de l'enllaç "
 "de sota i compilar el programa a partir del codi font del CVS."
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:109
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -3205,12 +3096,7 @@ msgstr ""
 "incorrecte o el servidor no està disponible."
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "Unable to open addressbook"
-msgstr "No es pot obrir la llibreta d'adreces"
-
-# fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:162
+#: addressbook/gui/widgets/eab-gui-util.c:129
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3225,7 +3111,7 @@ msgstr ""
 "llibreta d'adreces."
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:168
+#: addressbook/gui/widgets/eab-gui-util.c:135
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -3238,68 +3124,58 @@ msgstr ""
 "servidor de directori de la llibreta d'adreces."
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:174
+#: addressbook/gui/widgets/eab-gui-util.c:141
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 "El programa de suport de la llibreta d'adreces no ha pogut analitzar la "
 "consulta."
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:177
+#: addressbook/gui/widgets/eab-gui-util.c:144
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 "El programa de suport de la llibreta d'adreces ha refusat realitzar aquesta "
 "consulta."
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:147
 msgid "This query did not complete successfully."
 msgstr "S'ha produït un error en l'execució d'aquesta consulta."
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:206
-msgid "Do you want to save changes?"
-msgstr "Voleu desar els canvis?"
-
-# fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:208
-msgid "_Discard"
-msgstr "_Descarta"
-
-# fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:169
 msgid "Error adding list"
 msgstr "S'ha produït un error en afegir la llista"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:229
-#: addressbook/gui/widgets/eab-gui-util.c:652
+#: addressbook/gui/widgets/eab-gui-util.c:169
+#: addressbook/gui/widgets/eab-gui-util.c:580
 msgid "Error adding contact"
 msgstr "S'ha produït un error en afegir el contacte"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying list"
 msgstr "S'ha produït un error en modificar la llista"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying contact"
 msgstr "S'ha produït un error en modificar el contacte"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:192
 msgid "Error removing list"
 msgstr "S'ha produït un error en suprimir la llista"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:252
-#: addressbook/gui/widgets/eab-gui-util.c:610
+#: addressbook/gui/widgets/eab-gui-util.c:192
+#: addressbook/gui/widgets/eab-gui-util.c:538
 msgid "Error removing contact"
 msgstr "S'ha produït un error en suprimir el contacte"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:334
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -3309,7 +3185,7 @@ msgstr ""
 "Esteu segur de voler mostrar tots aquests contactes?"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:360
+#: addressbook/gui/widgets/eab-gui-util.c:300
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3319,59 +3195,53 @@ msgstr ""
 "El voleu sobreescriure?"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:364
+#: addressbook/gui/widgets/eab-gui-util.c:304
 msgid "Overwrite"
 msgstr "Sobreescriu"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:400
-#, c-format
-msgid "Error saving %s: %s"
-msgstr "S'ha produït un error en desar el fitxer %s: %s"
-
-# fitxer: addressbook.gui.widgets.ca.po
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:437
+#: addressbook/gui/widgets/eab-gui-util.c:365
 msgid "card.vcf"
 msgstr "card.vcf"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:571
+#: addressbook/gui/widgets/eab-gui-util.c:499
 msgid "list"
 msgstr "llista"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:706
+#: addressbook/gui/widgets/eab-gui-util.c:634
 msgid "Move contact to"
 msgstr "Mou el contacte a"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:708
+#: addressbook/gui/widgets/eab-gui-util.c:636
 msgid "Copy contact to"
 msgstr "Copia el contacte a"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:711
+#: addressbook/gui/widgets/eab-gui-util.c:639
 msgid "Move contacts to"
 msgstr "Mou els contactes a"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:713
+#: addressbook/gui/widgets/eab-gui-util.c:641
 msgid "Copy contacts to"
 msgstr "Copia els contactes a"
 
 # fitxer: addressbook.gui.component.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:716
+#: addressbook/gui/widgets/eab-gui-util.c:644
 msgid "Select target addressbook."
 msgstr "Selecciona la llibreta d'adreces destí."
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:939
+#: addressbook/gui/widgets/eab-gui-util.c:867
 msgid "Multiple VCards"
 msgstr "Múltiples VCard"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/eab-gui-util.c:942
+#: addressbook/gui/widgets/eab-gui-util.c:870
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard per a %s"
@@ -3475,7 +3345,7 @@ msgstr[1] "%d contactes"
 # fitxer: addressbook.gui.widgets.ca.po
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:229
+#: addressbook/gui/widgets/e-addressbook-view.c:231
 #: addressbook/gui/widgets/e-minicard-view.c:467
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
@@ -3497,105 +3367,105 @@ msgid "Error modifying card"
 msgstr "S'ha produït un error en modificar la targeta"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:163
 msgid "Name begins with"
 msgstr "El nom comença per"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:164
 msgid "Email begins with"
 msgstr "El correu electrònic comença per"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:57
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "La categoria és"
 
 # fitxer: addressbook.gui.widgets.ca.po
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-#: calendar/gui/cal-search-bar.c:50
+#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Qualsevol camp conté"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+#: addressbook/gui/widgets/e-addressbook-view.c:172
 msgid "Advanced..."
 msgstr "Avançat..."
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:236
+#: addressbook/gui/widgets/e-addressbook-view.c:238
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:249
+#: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Tipus"
 
 # fitxer: camel.ca.po.3
-#: addressbook/gui/widgets/e-addressbook-view.c:506
+#: addressbook/gui/widgets/e-addressbook-view.c:508
 msgid "Address Book"
 msgstr "Llibreta d'adreces"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2076
+#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:2080
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
 msgstr "Desa com a VCard"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 msgid "New Contact..."
 msgstr "Nou contacte..."
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "New Contact List..."
 msgstr "Nova llista de contactes..."
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Go to Folder..."
 msgstr "Vés a la carpeta..."
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Import..."
 msgstr "Importa..."
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1066
 msgid "Search for Contacts..."
 msgstr "Cerca els contactes..."
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 msgid "Address Book Sources..."
 msgstr "Fonts de la llibreta d'adreces..."
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1069
 msgid "Pilot Settings..."
 msgstr "Configuració del Pilot..."
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Reenvia el contacte"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
 msgid "Send Message to Contact"
 msgstr "Envia un missatge al contacte"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
@@ -3603,62 +3473,50 @@ msgid "Print"
 msgstr "Imprimeix"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
+#: addressbook/gui/widgets/e-addressbook-view.c:1077
 msgid "Print Envelope"
 msgstr "Imprimeix el sobre"
 
 # fitxer: calendar.ca.po.4
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
+#: addressbook/gui/widgets/e-addressbook-view.c:1081
 msgid "Copy to Address Book..."
 msgstr "Copia a la llibreta d'adreces..."
 
 # fitxer: calendar.ca.po.4
-#: addressbook/gui/widgets/e-addressbook-view.c:1080
+#: addressbook/gui/widgets/e-addressbook-view.c:1082
 msgid "Move to Address Book..."
 msgstr "Mou a la llibreta d'adreces..."
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Retalla"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Copia"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1087
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Enganxa"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:1092
+#: calendar/gui/e-calendar-view.c:1280
 msgid "Current View"
 msgstr "Visualització actual"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/e-addressbook-view.c:1309
-#, c-format
-msgid ""
-"The addressbook backend for\n"
-"%s\n"
-"has crashed. You will have to restart Evolution in order to use it again"
-msgstr ""
-"S'ha produït un error en el programa de suport\n"
-"de la llibreta d'adreces %s. Haureu de reiniciar l'Evolution per tornar-lo a "
-"utilitzar"
-
-# fitxer: addressbook.gui.widgets.ca.po
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1667
-#: calendar/gui/cal-search-bar.c:362
+#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Qualsevol categoria"
 
@@ -3790,7 +3648,7 @@ msgstr "Ràdio"
 # fitxer: addressbook.gui.widgets.ca.po
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-list-view.c:234
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Rol"
@@ -3960,13 +3818,13 @@ msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
 # fitxer: addressbook.printing.ca.po
-#: addressbook/printing/e-contact-print.c:998
+#: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr "Imprimeix els contactes"
 
 # fitxer: addressbook.printing.ca.po
-#: addressbook/printing/e-contact-print.c:1064
-#: addressbook/printing/e-contact-print.c:1091
+#: addressbook/printing/e-contact-print.c:1066
+#: addressbook/printing/e-contact-print.c:1093
 msgid "Print contact"
 msgstr "Imprimeix el contacte"
 
@@ -4280,16 +4138,23 @@ msgid "Impossible internal error."
 msgstr "Error intern impossible."
 
 # fitxer: addressbook.tools.ca.po
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:629
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
 msgid "Can not open file"
 msgstr "No es pot obrir el fitxer"
 
-# fitxer: addressbook.tools.ca.po
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-msgid "Can not load URI"
-msgstr "No es pot carregar la URI"
+# fitxer: addressbook.conduit.ca.po
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "No s'ha pogut carregar la llibreta d'adreces"
+
+# fitxer: addressbook.gui.component.ca.po
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "No es pot obrir la llibreta d'adreces"
 
 # fitxer: addressbook.tools.ca.po
 #: addressbook/tools/evolution-addressbook-import.c:46
@@ -4313,7 +4178,7 @@ msgid "Unnamed List"
 msgstr "Llista sense nom"
 
 # fitxer: calendar.ca.po.5
-#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Introduïu la contrasenya"
@@ -4650,10 +4515,10 @@ msgstr "Si s'ha de mostrar el número de setmana en el navegador de dates"
 
 # fitxer: calendar.ca.po.5
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:88
-#: calendar/gui/gnome-cal.c:1703
-#: camel/providers/groupwise/camel-gw-listener.c:304
-#: camel/providers/groupwise/camel-gw-listener.c:327
+#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/gnome-cal.c:1705
+#: camel/providers/groupwise/camel-gw-listener.c:311
+#: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
 msgstr "Calendari"
 
@@ -4675,7 +4540,7 @@ msgstr "Buida els esdeveniments anteriors a"
 # fitxer: calendar.ca.po.5
 #: calendar/gui/calendar-commands.c:363
 #: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:19 filter/filter.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
 msgid "days"
 msgstr "dies"
 
@@ -4851,27 +4716,27 @@ msgid "Month View"
 msgstr "Visualització mensual"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "El resum conté"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "La descripció conté"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/cal-search-bar.c:54
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "El comentari conté"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:53
 msgid "Location contains"
 msgstr "La ubicació conté"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
 msgid "Unmatched"
 msgstr "Sense coincidència"
 
@@ -4897,27 +4762,27 @@ msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/alarm-options.c:466
+#: calendar/gui/dialogs/alarm-options.c:467
 msgid "Audio Alarm Options"
 msgstr "Opcions de l'alarma de l'àudio"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/alarm-options.c:475
+#: calendar/gui/dialogs/alarm-options.c:476
 msgid "Message Alarm Options"
 msgstr "Opcions de l'alarma dels missatges"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/alarm-options.c:484
+#: calendar/gui/dialogs/alarm-options.c:485
 msgid "Email Alarm Options"
 msgstr "Opcions de l'alarma del correu electrònic"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/alarm-options.c:493
+#: calendar/gui/dialogs/alarm-options.c:494
 msgid "Program Alarm Options"
 msgstr "Opcions de l'alarma del programa"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:510
 msgid "Unknown Alarm Options"
 msgstr "Es desconeixen les opcions de l'alarma"
 
@@ -4962,7 +4827,7 @@ msgid "With these arguments:"
 msgstr "Amb aquests arguments:"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
 msgid "dialog1"
 msgstr "diàleg1"
 
@@ -4973,7 +4838,7 @@ msgstr "temps extra per cada"
 
 # fitxer: calendar.ca.po.5
 #: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:20 filter/filter.glade.h:16
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr "hores"
 
@@ -5028,7 +4893,7 @@ msgstr "Envia un correu electrònic"
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Resum:"
 
@@ -5065,7 +4930,6 @@ msgstr "hores"
 
 # fitxer: calendar.ca.po.5
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:21
 msgid "minute(s)"
 msgstr "minuts"
 
@@ -5075,30 +4939,30 @@ msgid "start of appointment"
 msgstr "inici de la cita"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/calendar-setup.c:170
+#: calendar/gui/dialogs/calendar-setup.c:172
 msgid "You must specify a location to get the calendar from."
 msgstr "Heu d'especificar una ubicació d'on obtenir el calendari."
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/calendar-setup.c:178
+#: calendar/gui/dialogs/calendar-setup.c:180
 #, c-format
 msgid "The source location '%s' is not well-formed."
 msgstr "La ubicació de l'origen '%s' no està ben formada."
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/calendar-setup.c:193
+#: calendar/gui/dialogs/calendar-setup.c:195
 #, c-format
 msgid "The source location '%s' is not a webcal source."
 msgstr "La ubicació del origen '%s' no es un origen del webcal."
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/calendar-setup.c:265
+#: calendar/gui/dialogs/calendar-setup.c:275
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr "L'origen amb el nom '%s' ja existeix en el grup seleccionat"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/calendar-setup.c:278
+#: calendar/gui/dialogs/calendar-setup.c:288
 #, c-format
 msgid ""
 "The group '%s' is remote. You must specify a location to get the calendar "
@@ -5125,68 +4989,43 @@ msgstr "Grup de la llista de tasques"
 msgid "C_olor:"
 msgstr "Colors"
 
-# fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "Calendar Properties"
-msgstr "Propietats del calendari"
-
 # fitxer: mail.ca.po.1
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
 msgid "Pick a color"
 msgstr "Agafa un color"
 
-# fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/calendar-setup.glade.h:8
-msgid "Remote"
-msgstr "Remota"
-
-# fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "Task List Properties"
-msgstr "Propietats de la llista de tasques"
-
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
 #, fuzzy
 msgid "_Add Calendar"
 msgstr "Afegeix un nou calendari"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
 #, fuzzy
 msgid "_Add Group"
 msgstr "Grup"
 
-# fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-msgid "_Refresh Interval:"
-msgstr "Intè_rval d'actualització:"
-
 # fitxer: calendar.ca.po.3
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
 #, fuzzy
 msgid "_Refresh:"
 msgstr "Refresca"
 
-# fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-msgid "_Source URL:"
-msgstr "URL d'o_rigen:"
-
 # fitxer: addressbook.printing.ca.po
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
 #, fuzzy
 msgid "_Type:"
 msgstr "Tipus:"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
 #, fuzzy
 msgid "_URL:"
 msgstr "URL:"
 
 # fitxer: filter.ca.po
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
 msgid "weeks"
 msgstr "setmanes"
 
@@ -5316,7 +5155,7 @@ msgstr "_Visualització"
 
 # fitxer: calendar.ca.po.5
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:76
 msgid "E_nable"
 msgstr "Habi_lita"
 
@@ -5329,7 +5168,7 @@ msgstr "Publicació _lliure/ocupat"
 # fitxer: calendar.ca.po.5
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:563
+#: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Divendres"
 
@@ -5346,7 +5185,7 @@ msgstr "Minuts"
 # fitxer: calendar.ca.po.5
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:559
+#: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Dilluns"
 
@@ -5358,7 +5197,7 @@ msgstr "d_g"
 # fitxer: calendar.ca.po.5
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:564
+#: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Dissabte"
 
@@ -5375,7 +5214,7 @@ msgstr "Mostra el _número de setmana en el navegador de dates"
 # fitxer: calendar.ca.po.5
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Diumenge"
 
@@ -5392,7 +5231,7 @@ msgstr "d_j"
 # fitxer: calendar.ca.po.5
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:562
+#: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Dijous"
 
@@ -5409,7 +5248,7 @@ msgstr "Format de l'hora:"
 # fitxer: calendar.ca.po.5
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:560
+#: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Dimarts"
 
@@ -5421,7 +5260,7 @@ msgstr "La s_etmana comença:"
 # fitxer: calendar.ca.po.5
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:561
+#: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Dimecres"
 
@@ -5462,7 +5301,7 @@ msgstr "El _dia comença:"
 
 # fitxer: addressbook.gui.component.ca.po
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
-#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:43
@@ -5523,99 +5362,57 @@ msgstr "d_c"
 msgid "before every appointment"
 msgstr "abans de cada cita"
 
-# fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/cancel-comp.c:57
-msgid ""
-"The event being deleted is a meeting, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"L'esdeveniment que esteu suprimint és una reunió, voleu enviar una "
-"notificació de cancel·lació?"
-
-# fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/cancel-comp.c:60
-msgid "Are you sure you want to cancel and delete this meeting?"
-msgstr "Esteu segur de voler cancel·lar i suprimir aquesta reunió?"
-
-# fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/cancel-comp.c:66
-msgid ""
-"The task being deleted is assigned, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"La tasca que se suprimirà està assignada, voleu enviar una notificació de "
-"cancel·lació?"
-
-# fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/cancel-comp.c:69
-msgid "Are you sure you want to cancel and delete this task?"
-msgstr "Esteu segur de voler cancel·lar i suprimir aquesta tasca?"
-
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/cancel-comp.c:75
-msgid ""
-"The journal entry being deleted is published, would you like to send a "
-"cancellation notice?"
-msgstr ""
-"L'entrada del diari que s'està suprimint està publicada, voleu enviar una "
-"notificació de cancel·lació?"
-
-# fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/cancel-comp.c:78
-msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr "Esteu segur de voler cancel·lar i suprimir aquesta entrada del diari?"
-
-# fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "S'ha suprimit l'esdeveniment."
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "S'ha suprimit la tasca."
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:68
 msgid "This journal entry has been deleted."
 msgstr "S'ha suprimit l'entrada del diari."
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/changed-comp.c:75
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s Heu realitzat canvis. Voleu desfer els canvis i tancar l'editor?"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s No heu realitzat cap canvi, voleu tancar l'editor?"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/changed-comp.c:82
+#: calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "S'ha modificat l'esdeveniment."
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "S'ha modificat la tasca."
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:92
 msgid "This journal entry has been changed."
 msgstr "s'ha modificat l'entrada del diari."
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/changed-comp.c:99
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s Heu realitzat canvis. Voleu desfer els canvis i actualitzar l'editor?"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s No heu realitzat cap canvi, voleu actualitzar l'editor?"
@@ -5660,7 +5457,7 @@ msgstr "Sense resum"
 
 # fitxer: calendar.ca.po.4
 #: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
 #: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Anomena i desa..."
@@ -5725,124 +5522,67 @@ msgid "Destination is read only"
 msgstr "El destí només es pot llegir"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/delete-comp.c:95
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "Esteu segur de voler suprimir la cita '%s'?"
-
-# fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/delete-comp.c:98
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "Esteu segur de voler suprimir aquesta cita sense nom?"
-
-# fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/delete-comp.c:104
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "Esteu segur de voler suprimir la tasca '%s'?"
-
-# fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/delete-comp.c:107
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "Esteu segur de voler suprimir aquesta tasca sense nom?"
-
-# fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/delete-comp.c:113
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "Esteu segur de voler suprimir l'entrada del diari '%s'?"
-
-# fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/delete-comp.c:116
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "Esteu segur de voler suprimir aquesta entrada del diari sense nom?"
-
-# fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/delete-comp.c:131
-#, c-format
-msgid "Are you sure you want to delete %d appointment?"
-msgid_plural "Are you sure you want to delete %d appointments?"
-msgstr[0] "Esteu segur de voler suprimir %d cita?"
-msgstr[1] "Esteu segur de voler suprimir %d cites?"
-
-# fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/delete-comp.c:138
-#, c-format
-msgid "Are you sure you want to delete %d task?"
-msgid_plural "Are you sure you want to delete %d tasks?"
-msgstr[0] "Esteu segur de voler suprimir %d tasca?"
-msgstr[1] "Esteu segur de voler suprimir %d tasques?"
-
-# fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/delete-comp.c:145
-#, c-format
-msgid "Are you sure you want to delete %d journal entry?"
-msgid_plural "Are you sure you want to delete %d journal entries?"
-msgstr[0] "Esteu segur de voler suprimir %d entrada del diari?"
-msgstr[1] "Esteu segur de voler suprimir %d entrades del diari?"
-
-# fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/delete-error.c:52
+#: calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr ""
 "No s'ha pogut suprimir l'esdeveniment perquè s'ha produït un error del corba"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/delete-error.c:55
+#: calendar/gui/dialogs/delete-error.c:57
 msgid "The task could not be deleted due to a corba error"
 msgstr "No s'ha pogut suprimir la tasca perquè s'ha produït un error del corba"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/delete-error.c:58
+#: calendar/gui/dialogs/delete-error.c:60
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr ""
 "No s'ha pogut suprimir l'entrada del diari perquè s'ha produït un error del "
 "corba"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/delete-error.c:61
+#: calendar/gui/dialogs/delete-error.c:63
 msgid "The item could not be deleted due to a corba error"
 msgstr ""
 "No s'ha pogut suprimir l'element perquè s'ha produït un error del corba"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/delete-error.c:68
+#: calendar/gui/dialogs/delete-error.c:70
 msgid "The event could not be deleted because permission was denied"
 msgstr "No s'ha pogut suprimir l'esdeveniment perquè us han denegat el permís"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/delete-error.c:71
+#: calendar/gui/dialogs/delete-error.c:73
 msgid "The task could not be deleted because permission was denied"
 msgstr "No s'ha pogut suprimir la tasca perquè no teniu permís"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/delete-error.c:74
+#: calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr "No s'ha pogut suprimir l'entrada del diari perquè no teniu permís"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/delete-error.c:77
+#: calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
 msgstr "No s'ha pogut suprimir l'element perquè us han denegat el permís"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/delete-error.c:84
+#: calendar/gui/dialogs/delete-error.c:86
 msgid "The event could not be deleted due to an error"
 msgstr "No s'ha pogut suprimir l'esdeveniment perquè s'ha produït un error"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/delete-error.c:87
+#: calendar/gui/dialogs/delete-error.c:89
 msgid "The task could not be deleted due to an error"
 msgstr "No s'ha pogut suprimir la tasca perquè s'ha produït un error"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/delete-error.c:90
+#: calendar/gui/dialogs/delete-error.c:92
 msgid "The journal entry could not be deleted due to an error"
 msgstr ""
 "No s'ha pogut suprimir l'entrada del diari perquè s'ha produït un error"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/delete-error.c:93
+#: calendar/gui/dialogs/delete-error.c:95
 msgid "The item could not be deleted due to an error"
 msgstr "No s'ha pogut suprimir l'element perquè s'ha produït un error"
 
@@ -6004,11 +5744,11 @@ msgstr "Hora d'_inici:"
 # fitxer: calendar.ca.po.4
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:3
+#: calendar/gui/dialogs/meeting-page.glade.h:4
 #: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
 #: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1559
-#: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:100
+#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
+#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
@@ -6039,8 +5779,8 @@ msgstr "_Delega a..."
 #. FIXME: need to disable for undeletable folders
 #: calendar/gui/dialogs/meeting-page.c:655
 #: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1310 calendar/gui/e-calendar-view.c:1342
-#: mail/em-folder-tree.c:2557 mail/em-folder-view.c:919
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
+#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -6049,7 +5789,7 @@ msgstr "_Suprimeix"
 
 # fitxer: calendar.ca.po.4
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:240
+#: calendar/gui/e-meeting-list-view.c:218
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Assistents"
@@ -6092,7 +5832,7 @@ msgstr "Membre"
 
 # fitxer: calendar.ca.po.4
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -6100,9 +5840,8 @@ msgstr "RSVP"
 # fitxer: calendar.ca.po.4
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
-#: mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-list-view.c:248
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Estat"
 
@@ -6111,24 +5850,24 @@ msgstr "Estat"
 msgid "Add A_ttendee"
 msgstr "Afegeix assis_tents"
 
+# fitxer: mail.ca.po.3
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "Add attendees from addressbook."
+msgstr "Afegeix el remitent a la lli_breta d'adreces"
+
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.glade.h:5
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Organitzador:"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/meeting-page.glade.h:5
+#: calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "_Change Organizer"
 msgstr "_Canvia l'organitzador"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-#: calendar/gui/e-meeting-time-sel.c:417
-msgid "_Invite Others..."
-msgstr "Conv_ida a altres..."
-
-# fitxer: calendar.ca.po.4
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
 msgstr "<b>Opcions del calendari</b>"
@@ -6311,7 +6050,7 @@ msgstr "Se_nse periodicitat"
 
 # fitxer: calendar.ca.po.4
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:450
+#: composer/e-msg-composer-attachment-bar.c:453
 msgid "_Remove"
 msgstr "Sup_rimeix"
 
@@ -6351,68 +6090,23 @@ msgid "year(s)"
 msgstr "anys"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/save-comp.c:53
-msgid ""
-"This event has been changed, but has not been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"L'esdeveniment s'ha modificat però no s'ha desat.\n"
-"\n"
-"Voleu desar els canvis?"
-
-# fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/save-comp.c:57
-msgid "_Discard Changes"
-msgstr "_Descarta els canvis"
-
-# fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/save-comp.c:62
-msgid "Save Event"
-msgstr "Desa l'esdeveniment"
-
-# fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/select-source-dialog.c:65
+#: calendar/gui/dialogs/select-source-dialog.c:69
 #, fuzzy
 msgid "Select destination"
 msgstr "Seleccioneu el destí %s"
 
 # fitxer: mail.ca.po.2
-#: calendar/gui/dialogs/select-source-dialog.c:86
+#: calendar/gui/dialogs/select-source-dialog.c:90
 #, fuzzy
 msgid "_Destination"
 msgstr "Carpeta de destí:"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/dialogs/select-source-dialog.c:88
+#: calendar/gui/dialogs/select-source-dialog.c:92
 msgid "Task List"
 msgstr "Llista de tasques"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/send-comp.c:57
-msgid "The meeting information has been created. Send it?"
-msgstr "S'ha creat la informació de la reunió. Voleu enviar-la?"
-
-# fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/send-comp.c:60
-msgid "The meeting information has changed. Send an updated version?"
-msgstr ""
-"S'ha modificat la informació de la reunió. Voleu enviar-ne una versió "
-"actualitzada?"
-
-# fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/send-comp.c:67
-msgid "The task assignment information has been created. Send it?"
-msgstr "S'ha creat la informació d'assignació de la tasca. Voleu enviar-la?"
-
-# fitxer: calendar.ca.po.4
-#: calendar/gui/dialogs/send-comp.c:71
-msgid "The task information has changed. Send an updated version?"
-msgstr ""
-"S'ha modificat la informació de la tasca. Voleu enviar-ne una versió "
-"actualitzada?"
-
-# fitxer: calendar.ca.po.4
 #: calendar/gui/dialogs/task-details-page.c:406
 msgid "Completed date is wrong"
 msgstr "La data de finalització és errònia"
@@ -6435,7 +6129,7 @@ msgstr "Completada"
 # fitxer: calendar.ca.po.4
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #: calendar/gui/e-cal-component-preview.c:249
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:960
 msgid "High"
 msgstr "Alta"
 
@@ -6451,7 +6145,7 @@ msgstr "En procés"
 # fitxer: calendar.ca.po.4
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:253
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:958
 msgid "Low"
 msgstr "Baixa"
 
@@ -6459,7 +6153,7 @@ msgstr "Baixa"
 #: calendar/gui/dialogs/task-details-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:251
 #: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:957
+#: mail/message-list.c:959
 msgid "Normal"
 msgstr "Normal"
 
@@ -6528,8 +6222,8 @@ msgstr "Con_fidencial"
 # fitxer: calendar.ca.po.4
 #: calendar/gui/dialogs/task-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
+#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Descripció:"
 
@@ -6726,7 +6420,7 @@ msgstr "Data de venciment:"
 # fitxer: calendar.ca.po.3
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:950
+#: calendar/gui/e-itip-control.c:943
 msgid "Status:"
 msgstr "Estat:"
 
@@ -6830,13 +6524,13 @@ msgid "Deleting selected objects"
 msgstr "S'estan suprimint els objectes seleccionats"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
 msgid "Updating objects"
 msgstr "S'estan actualitzant els objectes"
 
 # fitxer: calendar.ca.po.5
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1370
+#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
 #: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Obre"
@@ -6848,16 +6542,16 @@ msgstr "Obre una pàgina _web"
 
 # fitxer: calendar.ca.po.3
 #: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1291 calendar/gui/e-calendar-view.c:1376
-#: mail/em-folder-view.c:896 mail/em-popup.c:690 mail/em-popup.c:806
+#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
+#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "Anomena i de_sa..."
 
 # fitxer: calendar.ca.po.4
 #: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1292
-#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
+#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
@@ -6866,7 +6560,7 @@ msgstr "Im_primeix..."
 
 # fitxer: calendar.ca.po.3
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
@@ -6874,9 +6568,9 @@ msgstr "Re_talla"
 
 # fitxer: calendar.ca.po.3
 #: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1338
-#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2550
-#: mail/message-list.c:1644 ui/evolution-addressbook.xml.h:31
+#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
+#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
+#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
 msgid "_Copy"
@@ -6884,8 +6578,8 @@ msgstr "_Copia"
 
 # fitxer: calendar.ca.po.4
 #: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1273 calendar/gui/e-calendar-view.c:1299
-#: calendar/gui/e-calendar-view.c:1372 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
+#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
@@ -6966,82 +6660,82 @@ msgid "Task sort"
 msgstr "Ordre de les tasques"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
 msgid "New _Appointment..."
 msgstr "Nova cit_a..."
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
+#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
 msgid "New All Day _Event"
 msgstr "Nou _esdeveniment de tot el dia"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
+#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
 msgid "New Meeting"
 msgstr "Nova reunió"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
 msgid "New Task"
 msgstr "Nova tasca"
 
 # fitxer: ui.evolution-mail-list.xml.h.ca.po
-#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "Selecciona av_ui"
 
 # fitxer: mail.ca.po.1
-#: calendar/gui/e-calendar-view.c:1280
+#: calendar/gui/e-calendar-view.c:1283
 msgid "_Select Date..."
 msgstr "_Selecciona data..."
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publica la informació lliure/ocupat"
 
 # fitxer: ui.evolution-addressbook.xml.h.ca.po
-#: calendar/gui/e-calendar-view.c:1303
+#: calendar/gui/e-calendar-view.c:1306
 msgid "Cop_y to Calendar..."
 msgstr "Cop_ia al calendari..."
 
 # fitxer: mail.ca.po.3
-#: calendar/gui/e-calendar-view.c:1304
+#: calendar/gui/e-calendar-view.c:1307
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_u al calendari..."
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1308
 msgid "_Schedule Meeting..."
 msgstr "Planifica la _reunió..."
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1309
 msgid "_Forward as iCalendar..."
 msgstr "R_eenvia com a iCalendar..."
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
 msgid "Delete this _Occurrence"
 msgstr "Suprimeix aquesta a_parició"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
 msgid "Delete _All Occurrences"
 msgstr "Suprimeix totes les _aparicions"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1349
 msgid "Go to _Today"
 msgstr "Vés a _avui"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1351
 msgid "_Go to Date..."
 msgstr "Vés a una _data..."
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "Configu_ració..."
 
@@ -7058,9 +6752,9 @@ msgstr "Data d'inici"
 # fitxer: calendar.ca.po.4
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:967 calendar/gui/e-itip-control.c:1169
-#: calendar/gui/e-meeting-list-view.c:144
-#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
 #: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
 #: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
 #: camel/camel-tcp-stream-openssl.c:631
@@ -7089,14 +6783,14 @@ msgstr "Assignat"
 
 # fitxer: calendar.ca.po.4
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr "Sí"
 
 # fitxer: calendar.ca.po.4
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "No"
 
@@ -7111,7 +6805,7 @@ msgid "S"
 msgstr "S"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
 msgid "E"
 msgstr "E"
 
@@ -7194,12 +6888,12 @@ msgid "%02i minute divisions"
 msgstr "%02i divisions de minut"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:592
+#: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
 msgstr "Sí. (Repetició complexa)"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:596
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
@@ -7207,7 +6901,7 @@ msgstr[0] "Cada dia"
 msgstr[1] "Cada %d dies"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:601
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
@@ -7215,7 +6909,7 @@ msgstr[0] "Cada setmana"
 msgstr[1] "Cada %d setmanes"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:603
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -7223,24 +6917,24 @@ msgstr[0] "Cada setmana el "
 msgstr[1] "Cada %d setmanes el "
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:618
+#: calendar/gui/e-itip-control.c:611
 msgid " and "
 msgstr " i "
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:618
 #, c-format
 msgid "The %s day of "
 msgstr "El %s dies de "
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:631
 #, c-format
 msgid "The %s %s of "
 msgstr "El %s %s de "
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:645
+#: calendar/gui/e-itip-control.c:638
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
@@ -7248,7 +6942,7 @@ msgstr[0] "cada mes"
 msgstr[1] "cada %d mesos"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:642
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
@@ -7256,7 +6950,7 @@ msgstr[0] "Cada any"
 msgstr[1] "Cada %d anys"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:653
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
@@ -7264,50 +6958,50 @@ msgstr[0] " una vegada"
 msgstr[1] " un total de %d vegades"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:669
+#: calendar/gui/e-itip-control.c:662
 msgid ", ending on "
 msgstr ", finalitza el "
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:686
 msgid "<b>Starts:</b> "
 msgstr "<b>Comença:</b> "
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:696
 msgid "<b>Ends:</b> "
 msgstr "<b>Finalitza:</b> "
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:716
 msgid "<b>Completed:</b> "
 msgstr "<b>Acabat:</b> "
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:733
+#: calendar/gui/e-itip-control.c:726
 msgid "<b>Due:</b> "
 msgstr "<b>Venciment:</b> "
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:771 calendar/gui/e-itip-control.c:827
+#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
 msgid "iCalendar Information"
 msgstr "Informació de l'iCalendar"
 
 # fitxer: calendar.ca.po.3
 #. Title
-#: calendar/gui/e-itip-control.c:788
+#: calendar/gui/e-itip-control.c:781
 msgid "iCalendar Error"
 msgstr "Error de l'iCalendar"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:859 calendar/gui/e-itip-control.c:875
-#: calendar/gui/e-itip-control.c:886 calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
 msgid "An unknown person"
 msgstr "Una persona desconeguda"
 
 # fitxer: calendar.ca.po.3
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:910
+#: calendar/gui/e-itip-control.c:903
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -7315,372 +7009,377 @@ msgstr ""
 "<br>Reviseu la informació següent i sel·leccioneu una acció del menú de sota."
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:925
+#: calendar/gui/e-itip-control.c:918
 msgid "<i>None</i>"
 msgstr "<i>Cap</i>"
 
+# fitxer: addressbook.gui.contact-editor.ca.po
+#: calendar/gui/e-itip-control.c:929
+msgid "Location:"
+msgstr "Ubicació:"
+
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Acceptat"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:959 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Provisionalment acceptat"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:963 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Declinat"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.c:1050
-#: calendar/gui/e-itip-control.c:1076 calendar/gui/e-itip-control.c:1089
-#: calendar/gui/e-itip-control.c:1102 calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
 msgid "Choose an action:"
 msgstr "Escolliu una acció:"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1023
+#: calendar/gui/e-itip-control.c:1016
 msgid "Update"
 msgstr "Actualitza"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1024 calendar/gui/e-itip-control.c:1055
-#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1091
-#: calendar/gui/e-itip-control.c:1104 calendar/gui/e-itip-control.c:1117
-#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
+#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "D'acord"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1044
 msgid "Accept"
 msgstr "Accepta"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1045
 msgid "Tentatively accept"
 msgstr "Accepta provisionalment"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1046
 msgid "Decline"
 msgstr "Declina"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1070
 msgid "Send Free/Busy Information"
 msgstr "Envia la informació lliure/ocupat"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1090
+#: calendar/gui/e-itip-control.c:1083
 msgid "Update respondent status"
 msgstr "Actualitza l'estat de la resposta"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1103
+#: calendar/gui/e-itip-control.c:1096
 msgid "Send Latest Information"
 msgstr "Envia l'última informació"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1116 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cancel·la"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1185
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "En/na <b>%s</b> ha publicat la informació de la reunió."
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1193
+#: calendar/gui/e-itip-control.c:1186
 msgid "Meeting Information"
 msgstr "Informació de la reunió"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1191
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "En/na <b>%s</b> sol·licita la presència del %s a la reunió."
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1193
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "En/na <b>%s</b> sol·licita la vostra presència a una reunió."
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1201
+#: calendar/gui/e-itip-control.c:1194
 msgid "Meeting Proposal"
 msgstr "Proposició de reunió"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "En/na <b>%s</b> es voldria afegir a una reunió existent."
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1206
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Update"
 msgstr "Actualització de la reunió"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1203
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "En/na <b>%s</b> voldria rebre l'última informació de la reunió."
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1204
 msgid "Meeting Update Request"
 msgstr "Petició d'actualització de la reunió"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1218
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "En/na <b>%s</b> ha contestat a la sol·licitud d'una reunió."
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Reply"
 msgstr "Resposta de la reunió"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1226
+#: calendar/gui/e-itip-control.c:1219
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "En/na <b>%s</b> ha cancel·lat la reunió."
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1227
+#: calendar/gui/e-itip-control.c:1220
 msgid "Meeting Cancellation"
 msgstr "Cancel·lació de la reunió"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1234 calendar/gui/e-itip-control.c:1302
-#: calendar/gui/e-itip-control.c:1337
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1330
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "En/na <b>%s</b> ha enviat un missatge inintel·ligible,"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1228
 msgid "Bad Meeting Message"
 msgstr "Missatge de reunió erroni"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1253
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "En/na <b>%s</b> ha publicat la informació de la tasca."
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1254
 msgid "Task Information"
 msgstr "Informació de la tasca"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1259
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "En/na <b>%s</b> sol·licita que el %s realitzi una tasca."
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "En/na <b>%s</b> us sol·licita que realitzeu una tasca."
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1262
 msgid "Task Proposal"
 msgstr "Proposició de la tasca"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "En/na <b>%s</b> es voldria afegir a una tasca existent."
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Update"
 msgstr "Actualització de la tasca"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1278
+#: calendar/gui/e-itip-control.c:1271
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "En/na <b>%s</b> voldria rebre l'última informació de la tasca."
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1272
 msgid "Task Update Request"
 msgstr "Sol·licitud d'actualització de la tasca"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1286
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "En/na <b>%s</b> ha contestat a l'assignació d'una tasca."
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Reply"
 msgstr "Resposta de la tasca"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1294
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "En/na <b>%s</b> ha cancel·lat la tasca."
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1288
 msgid "Task Cancellation"
 msgstr "Cancel·lació de la tasca"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1303
+#: calendar/gui/e-itip-control.c:1296
 msgid "Bad Task Message"
 msgstr "Missatge de tasca erroni"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1315
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "El <b>%s</b> ha publicat la informació lliure/ocupat."
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1323
+#: calendar/gui/e-itip-control.c:1316
 msgid "Free/Busy Information"
 msgstr "Informació lliure/ocupat"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "En/na <b>%s</b> us sol·licita la informació lliure/ocupat."
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1321
 msgid "Free/Busy Request"
 msgstr "Sol·licitud lliure/ocupat"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1325
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "En/na <b>%s</b> ha contestat a la sol·licitud lliure/ocupat."
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1326
 msgid "Free/Busy Reply"
 msgstr "Resposta lliure/ocupat"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1331
 msgid "Bad Free/Busy Message"
 msgstr "Missatge lliure/ocupat erroni"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1413
+#: calendar/gui/e-itip-control.c:1406
 msgid "The message does not appear to be properly formed"
 msgstr "El missatge no està ben format"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1472
+#: calendar/gui/e-itip-control.c:1465
 msgid "The message contains only unsupported requests."
 msgstr "El missatge només conté sol·licituds no suportades."
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1503
+#: calendar/gui/e-itip-control.c:1496
 msgid "The attachment does not contain a valid calendar message"
 msgstr "El fitxer adjunt no conté cap missatge de calendari vàlid"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1535
+#: calendar/gui/e-itip-control.c:1528
 msgid "The attachment has no viewable calendar items"
 msgstr "El fitxer adjunt no té cap element del calendari visualitzable"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1769
+#: calendar/gui/e-itip-control.c:1762
 msgid "Update complete\n"
 msgstr "S'ha acabat l'actualització\n"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
+#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "No es pot actualitzar l'estat de l'assistència perquè l'element no existeix"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
 msgid "Object is invalid and cannot be updated\n"
 msgstr "L'objecte no és vàlid i no es pot actualitzar\n"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1825
+#: calendar/gui/e-itip-control.c:1818
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Aquesta resposta no està associada a cap assistent actual. Voleu afegir-la "
 "com a assistent?"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1837
+#: calendar/gui/e-itip-control.c:1830
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "No s'ha pogut actualitzar l'estat de l'assistència perquè l'estat és "
 "invàlid\n"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1856
+#: calendar/gui/e-itip-control.c:1849
 msgid "There was an error on the CORBA system\n"
 msgstr "S'ha produït un error en el sistema CORBA\n"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1852
 msgid "Object could not be found\n"
 msgstr "No s'ha pogut trobar l'objecte\n"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1855
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "No teniu els permisos necessaris per actualitzar el calendari\n"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1865
+#: calendar/gui/e-itip-control.c:1858
 msgid "Attendee status updated\n"
 msgstr "S'ha actualitzat l'estat de l'assistència\n"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1861
 msgid "Attendee status could not be updated!\n"
 msgstr "No s'ha pogut actualitzar l'estat de l'assistència.\n"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1892
 msgid "Removal Complete"
 msgstr "S'ha acabat la supressió"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
 msgid "Item sent!\n"
 msgstr "S'ha enviat l'element.\n"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
+#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
 msgid "The item could not be sent!\n"
 msgstr "No s'ha pogut enviar l'element.\n"
 
@@ -7731,88 +7430,88 @@ msgid "date-start"
 msgstr "Data d'inici"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-meeting-list-view.c:62
+#: calendar/gui/e-meeting-list-view.c:59
 msgid "Chair Persons"
 msgstr "Persones amb cadira"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:479
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
 msgid "Required Participants"
 msgstr "Participants necessaris"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-meeting-list-view.c:64
+#: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Participants opcionals"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-meeting-list-view.c:65
+#: calendar/gui/e-meeting-list-view.c:62
 msgid "Resources"
 msgstr "Recursos"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-meeting-list-view.c:140 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
 #: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr "Individual"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "Grup"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr "Recurs"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr "Habitació"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-meeting-list-view.c:154 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr "Cadira"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:127
 #: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
 msgid "Required Participant"
 msgstr "Participació necessària"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr "Participació opcional"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr "No es participa"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-meeting-list-view.c:179 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:177
 #: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
 msgid "Needs Action"
 msgstr "Precisa d'una acció"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-meeting-list-view.c:182 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
 #: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "Provisionalment"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr "Delegat"
@@ -7832,6 +7531,12 @@ msgstr "Fora de l'oficina"
 msgid "No Information"
 msgstr "Cap informació"
 
+# fitxer: mail.ca.po.3
+#: calendar/gui/e-meeting-time-sel.c:417
+#, fuzzy
+msgid "Add attendees from addressbook"
+msgstr "Afegeix el remitent a la lli_breta d'adreces"
+
 # fitxer: calendar.ca.po.3
 #: calendar/gui/e-meeting-time-sel.c:440
 msgid "_Options"
@@ -7839,17 +7544,20 @@ msgstr "_Opcions"
 
 # fitxer: calendar.ca.po.3
 #: calendar/gui/e-meeting-time-sel.c:457
-msgid "Show _Only Working Hours"
+#, fuzzy
+msgid "Show _only working hours"
 msgstr "Mostra només les h_ores de treball"
 
 # fitxer: calendar.ca.po.3
 #: calendar/gui/e-meeting-time-sel.c:467
-msgid "Show _Zoomed Out"
+#, fuzzy
+msgid "Show _zoomed out"
 msgstr "Reduei_x l'ampliació i mostra-ho"
 
 # fitxer: calendar.ca.po.3
 #: calendar/gui/e-meeting-time-sel.c:482
-msgid "_Update Free/Busy"
+#, fuzzy
+msgid "_Update free/busy"
 msgstr "Act_ualitza lliure/ocupat"
 
 # fitxer: calendar.ca.po.3
@@ -7869,22 +7577,26 @@ msgstr ">_>"
 
 # fitxer: calendar.ca.po.3
 #: calendar/gui/e-meeting-time-sel.c:547
-msgid "_All People and Resources"
+#, fuzzy
+msgid "_All people and resources"
 msgstr "_Totes les persones i recursos"
 
 # fitxer: calendar.ca.po.3
 #: calendar/gui/e-meeting-time-sel.c:556
-msgid "All _People and One Resource"
+#, fuzzy
+msgid "All _people and one resource"
 msgstr "Totes les _persones i un recurs"
 
 # fitxer: calendar.ca.po.3
 #: calendar/gui/e-meeting-time-sel.c:565
-msgid "_Required People"
+#, fuzzy
+msgid "_Required people"
 msgstr "Persones necessà_ries"
 
 # fitxer: calendar.ca.po.3
 #: calendar/gui/e-meeting-time-sel.c:574
-msgid "Required People and _One Resource"
+#, fuzzy
+msgid "Required people and _one resource"
 msgstr "Pers_ones necessàries i un recurs"
 
 # fitxer: calendar.ca.po.3
@@ -7929,7 +7641,7 @@ msgid "Enter the password for %s"
 msgstr "Introduïu la contrasenya de %s"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7939,21 +7651,15 @@ msgstr ""
 " %s"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr "El suport de la tasca per a '%s' ha fallat."
-
-# fitxer: calendar.ca.po.3
 #. FIXME Loading should be async
 #. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:686
+#: calendar/gui/e-tasks.c:801
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "S'estan obrint les tasques a %s"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-tasks.c:709
+#: calendar/gui/e-tasks.c:824
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -7963,61 +7669,55 @@ msgstr ""
 "%s"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-tasks.c:730
+#: calendar/gui/e-tasks.c:845
 msgid "Loading tasks"
 msgstr "S'estan carregant les tasques"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-tasks.c:834
+#: calendar/gui/e-tasks.c:949
 msgid "Completing tasks..."
 msgstr "S'estan acabant les tasques..."
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-tasks.c:857
+#: calendar/gui/e-tasks.c:972
 msgid "Deleting selected objects..."
 msgstr "S'estan suprimint els objectes seleccionats..."
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/e-tasks.c:884
+#: calendar/gui/e-tasks.c:999
 msgid "Expunging"
 msgstr "S'està ampliant"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/e-tasks.c:960
+#: calendar/gui/e-tasks.c:1075
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
-#: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
+#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
+#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
 #: calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:705
 msgid "Tasks"
 msgstr "Tasques"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/gnome-cal.c:1876
+#: calendar/gui/gnome-cal.c:1878
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "S'estan carregant les cites a %s"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/gnome-cal.c:1895
+#: calendar/gui/gnome-cal.c:1897
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "S'estan carregant les tasques a %s"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1920
 #, c-format
 msgid "Opening %s"
 msgstr "S'està obrint %s"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/gnome-cal.c:2048
-#, c-format
-msgid "The calendar backend for '%s' has crashed."
-msgstr "El suport del calendari per a '%s' ha fallat."
-
-# fitxer: calendar.ca.po.3
-#: calendar/gui/gnome-cal.c:2894
+#: calendar/gui/gnome-cal.c:2906
 msgid "Purging"
 msgstr "S'està buidant"
 
@@ -8256,7 +7956,7 @@ msgid "On The Web"
 msgstr "A la web"
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 
@@ -8269,7 +7969,7 @@ msgstr "No s'ha pogut obrir el calendari '%s'."
 
 # fitxer: calendar.ca.po.4
 #. FIXME: domain/code
-#: calendar/gui/migration.c:869
+#: calendar/gui/migration.c:889
 #, fuzzy, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "No s'han pogut obrir les tasques a '%s'."
@@ -8561,19 +8261,19 @@ msgid "Print Setup"
 msgstr "Configuració de la impressió"
 
 # fitxer: calendar.ca.po.2
-#: calendar/gui/tasks-component.c:303
+#: calendar/gui/tasks-component.c:313
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 "Se suprimirà la llista de tasques '%s'. Esteu segur de voler continuar?"
 
 # fitxer: calendar.ca.po.5
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:371
 msgid "New Task List"
 msgstr "Nova llista de tasques"
 
 # fitxer: calendar.ca.po.2
-#: calendar/gui/tasks-component.c:398
+#: calendar/gui/tasks-component.c:408
 #, fuzzy, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -8581,7 +8281,7 @@ msgstr[0] "Nova tasca"
 msgstr[1] "Nova tasca"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -8589,56 +8289,56 @@ msgstr[0] "Seleccionada"
 msgstr[1] "Seleccionada"
 
 # fitxer: calendar.ca.po.3
-#: calendar/gui/tasks-component.c:447
+#: calendar/gui/tasks-component.c:457
 #, fuzzy
 msgid "Failed upgrading tasks."
 msgstr "S'estan carregant les tasques"
 
 # fitxer: calendar.ca.po.2
-#: calendar/gui/tasks-component.c:526
+#: calendar/gui/tasks-component.c:749
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "No es pot obrir la llista '%s' per crear els esdeveniments i reunions"
 
 # fitxer: calendar.ca.po.2
-#: calendar/gui/tasks-component.c:538
+#: calendar/gui/tasks-component.c:761
 msgid "There is no calendar available for creating tasks"
 msgstr "No hi ha cap calendari disponible per crear les tasques"
 
-#: calendar/gui/tasks-component.c:576
+#: calendar/gui/tasks-component.c:799
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
 # fitxer: calendar.ca.po.2
-#: calendar/gui/tasks-component.c:804
+#: calendar/gui/tasks-component.c:1040
 msgid "New task"
 msgstr "Nova tasca"
 
 # fitxer: calendar.ca.po.2
-#: calendar/gui/tasks-component.c:805
+#: calendar/gui/tasks-component.c:1041
 msgid "_Task"
 msgstr "_Tasca"
 
 # fitxer: calendar.ca.po.2
-#: calendar/gui/tasks-component.c:806
+#: calendar/gui/tasks-component.c:1042
 msgid "Create a new task"
 msgstr "Crea una nova tasca"
 
-#: calendar/gui/tasks-component.c:812
+#: calendar/gui/tasks-component.c:1048
 #, fuzzy
 msgid "New tasks group"
 msgstr "Grups de notícies"
 
 # fitxer: calendar.ca.po.4
-#: calendar/gui/tasks-component.c:813
+#: calendar/gui/tasks-component.c:1049
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Grup de la llista de tasques"
 
 # fitxer: calendar.ca.po.2
-#: calendar/gui/tasks-component.c:814
+#: calendar/gui/tasks-component.c:1050
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Crea una nova tasca"
@@ -10835,13 +10535,13 @@ msgid "Unsupported operation: append message: for %s"
 msgstr "No se suporta l'operació d'afegir un missatge per a %s"
 
 # fitxer: camel.ca.po.4
-#: camel/camel-folder.c:1259
+#: camel/camel-folder.c:1262
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "No se suporta l'operació de cerca per expressió per a %s"
 
 # fitxer: camel.ca.po.4
-#: camel/camel-folder.c:1299
+#: camel/camel-folder.c:1302
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "No se suporta l'operació de cerca per identificador d'usuari per a %s"
@@ -10856,12 +10556,18 @@ msgstr "S'està movent els missatges"
 msgid "Copying messages"
 msgstr "S'està copiant els missatges"
 
-#: camel/camel-folder.c:1666
-msgid "Learning junk and/or non junk message(s)"
-msgstr "S'està aprenent si els missatges són brossa"
+# fitxer: calendar.ca.po.5
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Avís"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr ""
 
 # fitxer: camel.ca.po.4
-#: camel/camel-folder.c:1695
+#: camel/camel-folder.c:1701
 msgid "Filtering new message(s)"
 msgstr "S'està filtrant els nous missatges"
 
@@ -10899,19 +10605,19 @@ msgid "(match-threads) requires a match type string"
 msgstr ""
 
 # fitxer: camel.ca.po.4
-#: camel/camel-folder-search.c:785
+#: camel/camel-folder-search.c:784
 #, fuzzy
 msgid "(match-threads) expects an array result"
 msgstr "(concorda-amb-tot) necessita un únic resultat booleà"
 
 # fitxer: camel.ca.po.4
-#: camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:790
 #, fuzzy
 msgid "(match-threads) requires the folder set"
 msgstr "(concorda-amb-tot) necessita un únic resultat booleà"
 
 # fitxer: camel.ca.po.4
-#: camel/camel-folder-search.c:880
+#: camel/camel-folder-search.c:879
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "S'està realitzant una petició en una capçalera desconeguda: %s"
@@ -10951,7 +10657,8 @@ msgstr ""
 # fitxer: camel.ca.po.4
 #: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
 #: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:706
+#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "S'ha cancel·lat."
@@ -11414,7 +11121,7 @@ msgstr "Les credencials referenciades han caducat."
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1212
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "La resposta d'autenticació del servidor és incorrecta."
 
@@ -11859,50 +11566,50 @@ msgid "export keys: unimplemented"
 msgstr ""
 
 # fitxer: camel.ca.po.3
-#: camel/camel-store.c:214
+#: camel/camel-store.c:213
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr ""
 "No s'ha pogut obtenir la carpeta. L'operació és invàlida en aquest magatzem"
 
 # fitxer: camel.ca.po.2
-#: camel/camel-store.c:244
+#: camel/camel-store.c:243
 #, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr "No s'ha pogut crear la carpeta '%s': la carpeta existeix"
 
 # fitxer: camel.ca.po.3
-#: camel/camel-store.c:295
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 "No s'ha pogut crear la carpeta. L'operació és invàlida en aquest magatzem"
 
 # fitxer: camel.ca.po.2
-#: camel/camel-store.c:323
+#: camel/camel-store.c:325
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "No s'ha pogut crear la carpeta '%s': la carpeta existeix"
 
 # fitxer: camel.ca.po.3
-#: camel/camel-store.c:387 camel/camel-vee-store.c:354
+#: camel/camel-store.c:389 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "No s'ha pogut suprimir la carpeta: %s. L'operació no és vàlida"
 
 # fitxer: camel.ca.po.3
-#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#: camel/camel-store.c:439 camel/camel-vee-store.c:387
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr ""
 "No s'ha pogut canviar el nom de la carpeta: %s. L'operació no és vàlida"
 
 # fitxer: camel.ca.po.3
-#: camel/camel-store.c:811
+#: camel/camel-store.c:777
 msgid "Trash"
 msgstr "Paperera"
 
 # fitxer: camel.ca.po.3
-#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
-#: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/mail-config.glade.h:95
+#: ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Brossa"
 
@@ -12177,13 +11884,13 @@ msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "No s'ha pogut copiar o moure els missatges a la carpeta virtual"
 
 # fitxer: camel.ca.po.3
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:374
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "No s'ha pogut suprimir la carpeta: %s. La carpeta no existeix"
 
 # fitxer: camel.ca.po.3
-#: camel/camel-vee-store.c:398
+#: camel/camel-vee-store.c:395
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "No s'ha pogut canviar el nom de la carpeta: %s. La carpeta no existeix"
@@ -12234,27 +11941,27 @@ msgid "Post Office Agent SOAP Port:"
 msgstr "Port SOAP de l'agent de l'oficina de correus:"
 
 # fitxer: camel.ca.po.3
-#: camel/providers/groupwise/camel-groupwise-provider.c:80
+#: camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "Novell GroupWise"
 msgstr "Novell Groupwise"
 
 # fitxer: camel.ca.po.3
-#: camel/providers/groupwise/camel-groupwise-provider.c:82
+#: camel/providers/groupwise/camel-groupwise-provider.c:85
 msgid "For accessing Novell Groupwise servers"
 msgstr "Per accedir els servidors Novell Groupwise"
 
 # fitxer: camel.ca.po.3
-#: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: camel/providers/groupwise/camel-groupwise-provider.c:100
 #: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
 msgid "Password"
 msgstr "Contrasenya"
 
 # fitxer: camel.ca.po.3
-#: camel/providers/groupwise/camel-groupwise-provider.c:99
+#: camel/providers/groupwise/camel-groupwise-provider.c:102
 #: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
@@ -12263,8 +11970,8 @@ msgstr ""
 "de text sense xifrar."
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: camel/providers/groupwise/camel-gw-listener.c:305
-#: camel/providers/groupwise/camel-gw-listener.c:328
+#: camel/providers/groupwise/camel-gw-listener.c:312
+#: camel/providers/groupwise/camel-gw-listener.c:335
 msgid "Checklist"
 msgstr "Llista de comprovacions"
 
@@ -12432,14 +12139,14 @@ msgstr ""
 
 # fitxer: camel.ca.po.2
 #: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:429
+#: camel/providers/imap/camel-imap-store.c:428
 #, c-format
 msgid "IMAP server %s"
 msgstr "Servidor d'IMAP %s"
 
 # fitxer: camel.ca.po.2
 #: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:431
+#: camel/providers/imap/camel-imap-store.c:430
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "Servei d'IMAP per a %s a %s"
@@ -12450,7 +12157,7 @@ msgstr "Servei d'IMAP per a %s a %s"
 #: camel/providers/imap/camel-imap-store.c:551
 #: camel/providers/imap/camel-imap-store.c:571
 #: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
+#: camel/providers/nntp/camel-nntp-store.c:209
 #: camel/providers/pop3/camel-pop3-store.c:175
 #: camel/providers/smtp/camel-smtp-transport.c:269
 #: camel/providers/smtp/camel-smtp-transport.c:285
@@ -12469,10 +12176,10 @@ msgstr "L'SSL no està disponible"
 # fitxer: camel.ca.po.2
 #: camel/providers/imap4/camel-imap4-store.c:222
 #: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:815
+#: camel/providers/imap/camel-imap-store.c:845
 #: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:137
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
 #: camel/providers/pop3/camel-pop3-store.c:192
 msgid "Connection cancelled"
 msgstr "S'ha cancel·lat la connexió"
@@ -12487,8 +12194,8 @@ msgstr "No s'ha pogut connectar amb el servidor IMAP %s en mode segur: %s"
 
 # fitxer: camel.ca.po.2
 #: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:649
-#: camel/providers/imap/camel-imap-store.c:680
+#: camel/providers/imap/camel-imap-store.c:679
+#: camel/providers/imap/camel-imap-store.c:710
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "No s'ha pogut connectar amb el servidor IMAP %s en mode segur: %s"
@@ -12498,7 +12205,7 @@ msgstr "No s'ha pogut connectar amb el servidor IMAP %s en mode segur: %s"
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1109
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
 msgid "Unknown error"
 msgstr "Error desconegut"
 
@@ -12531,8 +12238,8 @@ msgstr "No s'ha pogut obtenir la carpeta '%s': %s"
 
 # fitxer: camel.ca.po.2
 #: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1857
-#: camel/providers/imap/camel-imap-store.c:2235
+#: camel/providers/imap/camel-imap-store.c:1885
+#: camel/providers/imap/camel-imap-store.c:2263
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -12625,13 +12332,13 @@ msgstr "El servidor s'ha desconnectat inesperadament: %s"
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3168
+#: camel/providers/imap/camel-imap-store.c:3194
 msgid "Operation cancelled"
 msgstr "S'ha cancel·lat l'operació"
 
 # fitxer: camel.ca.po.3
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3171
+#: camel/providers/imap/camel-imap-store.c:3197
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "El servidor s'ha desconnectat inesperadament: %s"
@@ -12707,13 +12414,6 @@ msgstr "No es pot obtenir el missatge: %s"
 
 # fitxer: camel.ca.po.3
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:219
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -12724,16 +12424,16 @@ msgstr ""
 
 # fitxer: camel.ca.po.3
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-mbox-folder.c:418
+#: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
 msgstr "No existeix el missatge"
 
 # fitxer: camel.ca.po.3
 #: camel/providers/imap/camel-imap-folder.c:2019
-#: camel/providers/imap/camel-imap-folder.c:2621
-#: camel/providers/nntp/camel-nntp-folder.c:238
+#: camel/providers/imap/camel-imap-folder.c:2622
+#: camel/providers/nntp/camel-nntp-folder.c:220
 msgid "This message is not currently available"
 msgstr "Aquest missatge no està disponible actualment"
 
@@ -12743,8 +12443,24 @@ msgstr "Aquest missatge no està disponible actualment"
 msgid "Fetching summary information for new messages"
 msgstr "S'està recollint la informació del resum per als nous missatges"
 
+#: camel/providers/imap/camel-imap-folder.c:2463
+#, c-format
+msgid "Incomplete server response: no information provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2471
+#, c-format
+msgid "Incomplete server response: no UID provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2484
+#, c-format
+msgid ""
+"Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgstr ""
+
 # fitxer: camel.ca.po.3
-#: camel/providers/imap/camel-imap-folder.c:2659
+#: camel/providers/imap/camel-imap-folder.c:2660
 msgid "Could not find message body in FETCH response."
 msgstr "No s'ha pogut trobar el cos del missatge en la resposta a FETCH."
 
@@ -12818,51 +12534,51 @@ msgid "For reading and storing mail on IMAP servers."
 msgstr "Per llegir i emmagatzemar correu en servidors IMAP."
 
 # fitxer: camel.ca.po.2
-#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/imap/camel-imap-store.c:680
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "No se suporta l'extensió SSL/TLS."
 
 # fitxer: camel.ca.po.2
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:711
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "S'ha produït un error en la negociació SSL"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/imap/camel-imap-store.c:818
+#: camel/providers/imap/camel-imap-store.c:848
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "No s'ha pogut connectar amb l'ordre '%s': %s"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/imap/camel-imap-store.c:1242
+#: camel/providers/imap/camel-imap-store.c:1272
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 "El servidor IMAP %s no suporta el tipus d'autenticació sol·licitat (%s)"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/imap/camel-imap-store.c:1252
+#: camel/providers/imap/camel-imap-store.c:1282
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "No se suporta el tipus d'autenticació %s"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1305
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sIntroduïu la contrasenya IMAP per a %s@%s"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/imap/camel-imap-store.c:1289
+#: camel/providers/imap/camel-imap-store.c:1319
 msgid "You didn't enter a password."
 msgstr "No heu introduït la contrasenya."
 
 # fitxer: camel.ca.po.2
-#: camel/providers/imap/camel-imap-store.c:1318
+#: camel/providers/imap/camel-imap-store.c:1348
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -12874,20 +12590,20 @@ msgstr ""
 "\n"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/imap/camel-imap-store.c:1839
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:1867
+#: camel/providers/imap/camel-imap-store.c:2057
 #, c-format
 msgid "No such folder %s"
 msgstr "La carpeta '%s' no existeix"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/imap/camel-imap-store.c:1915
-#: camel/providers/imap/camel-imap-store.c:2296
+#: camel/providers/imap/camel-imap-store.c:1943
+#: camel/providers/imap/camel-imap-store.c:2324
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "La carpeta pare no pot contenir subcarpetes"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/imap/camel-imap-store.c:1970
+#: camel/providers/imap/camel-imap-store.c:1998
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -12896,7 +12612,7 @@ msgid "Cannot create folder `%s': folder exists."
 msgstr "No s'ha pogut crear la carpeta '%s': la carpeta existeix."
 
 # fitxer: camel.ca.po.2
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:2274
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "La carpeta pare és desconeguda: %s"
@@ -12939,22 +12655,22 @@ msgstr "Dades del cos de l'índex del missatge"
 
 # fitxer: camel.ca.po.2
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:388
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 # fitxer: camel.ca.po.2
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:393
-#: camel/providers/local/camel-local-folder.c:396
+#: camel/providers/local/camel-local-folder.c:392
+#: camel/providers/local/camel-local-folder.c:395
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "bústia de correu: %s (%s)"
 
 # fitxer: camel.ca.po.2
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:400
+#: camel/providers/local/camel-local-folder.c:399
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -13027,7 +12743,7 @@ msgstr ""
 # fitxer: camel.ca.po.2
 #: camel/providers/local/camel-local-store.c:142
 #: camel/providers/local/camel-local-store.c:253
-#: camel/providers/local/camel-mbox-store.c:356
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -13114,8 +12830,26 @@ msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "No s'ha pogut afegir el missatge a la carpeta maildir: %s. %s"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:226
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mbox-folder.c:417
+#: camel/providers/local/camel-mbox-folder.c:436
+#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:475
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-mh-folder.c:221
+#, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+"No es pot obtenir el missatge %s de la carpeta %s\n"
+"  %s"
+
+# fitxer: camel.ca.po.2
+#: camel/providers/local/camel-maildir-folder.c:236
 msgid "Invalid message contents"
 msgstr "El contingut del missatge no és vàlid"
 
@@ -13163,9 +12897,9 @@ msgid "not a maildir directory"
 msgstr "no és un directori maildir"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/local/camel-maildir-store.c:341
-#: camel/providers/local/camel-spool-store.c:286
-#: camel/providers/local/camel-spool-store.c:316
+#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-spool-store.c:284
+#: camel/providers/local/camel-spool-store.c:314
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "No s'ha pogut cercar a la carpeta '%s': %s"
@@ -13221,30 +12955,20 @@ msgid "Cannot append message to mbox file: %s: %s"
 msgstr "No es pot afegir el missatge al fitxer de la bústia de correu: %s. %s"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/local/camel-mbox-folder.c:435
-#: camel/providers/local/camel-mbox-folder.c:466
-#: camel/providers/local/camel-mbox-folder.c:474
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"No es pot obtenir el missatge %s de la carpeta %s\n"
-"  %s"
-
-# fitxer: camel.ca.po.2
-#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:468
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Sembla que la carpeta està corrupta i no es pot arreglar."
 
 # fitxer: camel.ca.po.2
-#: camel/providers/local/camel-mbox-folder.c:475
-msgid "Message construction failed: Corrupt mailbox?"
+#: camel/providers/local/camel-mbox-folder.c:476
+#: camel/providers/local/camel-mh-folder.c:222
+#, fuzzy
+msgid "Message construction failed."
 msgstr "Ha fallat la construcció del missatge. Potser la bústia està malmesa."
 
 # fitxer: camel.ca.po.2
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:362
+#: camel/providers/local/camel-mbox-store.c:361
 msgid "Cannot create a folder by this name."
 msgstr "No s'ha pogut crear una carpeta amb aquest nom."
 
@@ -13279,35 +13003,35 @@ msgid "Folder `%s' is not empty. Not deleted."
 msgstr "La carpeta '%s' no està buida. No s'ha suprimit."
 
 # fitxer: camel.ca.po.2
-#: camel/providers/local/camel-mbox-store.c:375
+#: camel/providers/local/camel-mbox-store.c:374
 #, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "No s'ha pogut crear el directori '%s': %s."
 
 # fitxer: camel.ca.po.2
-#: camel/providers/local/camel-mbox-store.c:389
+#: camel/providers/local/camel-mbox-store.c:388
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "No s'ha pogut crear la carpeta: %s. %s"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/local/camel-mbox-store.c:391
+#: camel/providers/local/camel-mbox-store.c:390
 msgid "Folder already exists"
 msgstr "La carpeta ja existeix"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/local/camel-mbox-store.c:473
+#: camel/providers/local/camel-mbox-store.c:472
 msgid "The new folder name is illegal."
 msgstr "El nou nom de la carpeta no és vàlid."
 
 # fitxer: camel.ca.po.2
-#: camel/providers/local/camel-mbox-store.c:486
+#: camel/providers/local/camel-mbox-store.c:485
 #, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "No s'ha pogut canviar el nom a '%s': '%s': %s"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/local/camel-mbox-store.c:561
+#: camel/providers/local/camel-mbox-store.c:560
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "No s'ha pogut canviar el nom de %s a %s: %s"
@@ -13534,7 +13258,7 @@ msgstr ""
 
 # fitxer: camel.ca.po.2
 #: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:997
+#: camel/providers/nntp/camel-nntp-store.c:1126
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Introduïu la contrasenya NNTP per a %s@%s"
@@ -13555,19 +13279,10 @@ msgid "Server rejected username/password"
 msgstr "El servidor ha rebutjat el nom d'usuari o la contrasenya"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:263
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr "Cancel·lat per l'usuari"
-
-# fitxer: camel.ca.po.2
-#: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:259
-#: camel/providers/nntp/camel-nntp-folder.c:265
+#: camel/providers/nntp/camel-nntp-folder.c:147
+#: camel/providers/nntp/camel-nntp-folder.c:149
+#: camel/providers/nntp/camel-nntp-folder.c:158
+#: camel/providers/nntp/camel-nntp-folder.c:234
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -13577,81 +13292,58 @@ msgid "Cannot get message %s: %s"
 msgstr "No es pot obtenir el missatge %s: %s"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/nntp/camel-nntp-folder.c:188
-#: camel/providers/nntp/camel-nntp-folder.c:228
+#: camel/providers/nntp/camel-nntp-folder.c:156
+#: camel/providers/nntp/camel-nntp-folder.c:232
+#: camel/providers/nntp/camel-nntp-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+msgid "User cancelled"
+msgstr "Cancel·lat per l'usuari"
+
+# fitxer: camel.ca.po.2
+#: camel/providers/nntp/camel-nntp-folder.c:176
+#: camel/providers/nntp/camel-nntp-folder.c:208
 #, c-format
 msgid "Internal error: uid in invalid format: %s"
 msgstr ""
 "S'ha produït un error intern. El format de l'identificador d'usuari no és "
 "vàlid: %s"
 
-# fitxer: camel.ca.po.2
-#: camel/providers/nntp/camel-nntp-folder.c:201
-#, c-format
-msgid "Could not get article %s from NNTP server"
-msgstr "No s'ha pogut obtenir l'article %s del servidor NNTP"
-
-# fitxer: camel.ca.po.2
-#: camel/providers/nntp/camel-nntp-folder.c:362
-msgid "Posting not allowed by news server"
-msgstr "El servidor de notícies no permet publicar"
-
-# fitxer: camel.ca.po.2
+# fitxer: camel.ca.po.1
+#: camel/providers/nntp/camel-nntp-folder.c:328
+#: camel/providers/nntp/camel-nntp-folder.c:331
 #: camel/providers/nntp/camel-nntp-folder.c:373
-#, c-format
-msgid "Failed to send newsgroups header: %s: message not posted"
-msgstr ""
-"S'ha produït un error en enviar la capçalera del grup de notícies: %s. No "
-"s'ha publicat el missatge"
-
-# fitxer: camel.ca.po.2
-#: camel/providers/nntp/camel-nntp-folder.c:413
-#: camel/providers/nntp/camel-nntp-folder.c:426
-#, c-format
-msgid "Error posting to newsgroup: %s: message not posted"
-msgstr ""
-"S'ha produït un error en publicar al grup de notícies: %s. No s'ha publicat "
-"el missatge"
-
-# fitxer: camel.ca.po.2
-#: camel/providers/nntp/camel-nntp-folder.c:438
-msgid "Error reading response to posted message: message not posted"
-msgstr ""
-"S'ha produït un error en llegir la resposta al missatge publicat. No s'ha "
-"publicat el missatge"
-
-# fitxer: camel.ca.po.2
-#: camel/providers/nntp/camel-nntp-folder.c:441
-#, c-format
-msgid "Error posting message: %s: message not posted"
-msgstr ""
-"S'ha produït un error en publicar el missatge: %s. No s'ha publicat el "
-"missatge"
+#: camel/providers/nntp/camel-nntp-folder.c:375
+#, fuzzy, c-format
+msgid "Posting failed: %s"
+msgstr "S'ha produït un error en l'operació: %s"
 
 # fitxer: camel.ca.po.2
-#: camel/providers/nntp/camel-nntp-folder.c:457
+#: camel/providers/nntp/camel-nntp-folder.c:393
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "S'ha d'estar connectat per enviar missatges NNTP."
 
 # fitxer: camel.ca.po.2
-#: camel/providers/nntp/camel-nntp-folder.c:468
+#: camel/providers/nntp/camel-nntp-folder.c:404
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "No es pot copiar missatges d'una carpeta NNTP."
 
 # fitxer: camel.ca.po.1
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:44
 msgid "Could not get group list from server."
 msgstr "No s'ha pogut obtenir la llista de grups del servidor."
 
 # fitxer: camel.ca.po.1
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#: camel/providers/nntp/camel-nntp-grouplist.c:97
+#: camel/providers/nntp/camel-nntp-grouplist.c:106
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "No es pot carregar el fitxer de llista de grups per a %s: %s"
 
 # fitxer: camel.ca.po.1
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#: camel/providers/nntp/camel-nntp-grouplist.c:157
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
@@ -13689,30 +13381,33 @@ msgstr ""
 "contrasenya sense xifrar."
 
 # fitxer: camel.ca.po.1
-#: camel/providers/nntp/camel-nntp-store.c:158
+#: camel/providers/nntp/camel-nntp-store.c:118
+#: camel/providers/nntp/camel-nntp-store.c:1233
+#: camel/providers/nntp/camel-nntp-store.c:1331
+#, c-format
+msgid "NNTP Command failed: %s"
+msgstr "L'ordre NNTP ha fallat: %s"
+
+# fitxer: camel.ca.po.1
+#: camel/providers/nntp/camel-nntp-store.c:227
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "No s'ha pogut llegir la benvinguda de %s: %s"
 
 # fitxer: camel.ca.po.1
-#: camel/providers/nntp/camel-nntp-store.c:170
+#: camel/providers/nntp/camel-nntp-store.c:239
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "El servidor NNTP %s ha retornat el codi d'error %d: %s"
 
 # fitxer: camel.ca.po.1
-#: camel/providers/nntp/camel-nntp-store.c:326
+#: camel/providers/nntp/camel-nntp-store.c:403
 #, c-format
 msgid "USENET News via %s"
 msgstr "Notícies USENET mitjançant %s"
 
 # fitxer: camel.ca.po.1
-#: camel/providers/nntp/camel-nntp-store.c:640
-msgid "Stream error"
-msgstr "Error en el fluxe"
-
-# fitxer: camel.ca.po.1
-#: camel/providers/nntp/camel-nntp-store.c:643
+#: camel/providers/nntp/camel-nntp-store.c:777
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -13724,7 +13419,7 @@ msgstr ""
 "%s"
 
 # fitxer: camel.ca.po.1
-#: camel/providers/nntp/camel-nntp-store.c:735
+#: camel/providers/nntp/camel-nntp-store.c:872
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
@@ -13735,7 +13430,7 @@ msgstr ""
 "no existeix el grup de notícies. Probablement, l'element és una carpeta pare."
 
 # fitxer: camel.ca.po.1
-#: camel/providers/nntp/camel-nntp-store.c:767
+#: camel/providers/nntp/camel-nntp-store.c:904
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
@@ -13745,74 +13440,74 @@ msgstr ""
 "notícies perquè aquest grup no existeix."
 
 # fitxer: camel.ca.po.1
-#: camel/providers/nntp/camel-nntp-store.c:792
+#: camel/providers/nntp/camel-nntp-store.c:929
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 "No es pot crear una carpeta en un magatzem de notícies. Heu de subscriureu-"
 "us-hi."
 
 # fitxer: camel.ca.po.1
-#: camel/providers/nntp/camel-nntp-store.c:800
+#: camel/providers/nntp/camel-nntp-store.c:937
 msgid "You cannot rename a folder in a News store."
 msgstr "No es pot canviar el nom d'una carpeta en un magatzem de notícies."
 
 # fitxer: camel.ca.po.1
-#: camel/providers/nntp/camel-nntp-store.c:808
+#: camel/providers/nntp/camel-nntp-store.c:945
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 "No es pot suprimir una carpeta en un magatzem de notícies. Heu de suprimir "
 "la subscripció."
 
 # fitxer: camel.ca.po.1
-#: camel/providers/nntp/camel-nntp-summary.c:253
-#, c-format
-msgid "Connection error: %s"
-msgstr "S'ha produït un error en la connexió: %s"
-
-# fitxer: camel.ca.po.1
-#: camel/providers/nntp/camel-nntp-summary.c:262
-#, c-format
-msgid "No such folder: %s"
-msgstr "No existeix la carpeta '%s'"
+#: camel/providers/nntp/camel-nntp-store.c:1118
+#, fuzzy
+msgid "Authentication requested but not username provided"
+msgstr "Es precisa autenticació"
 
 # fitxer: camel.ca.po.1
-#: camel/providers/nntp/camel-nntp-summary.c:268
-#, c-format
-msgid "Could not get group: %s"
-msgstr "No s'ha pogut obtenir el grup: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1146
+#, fuzzy, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr "S'ha produït un error en autenticar-se al servidor POP %s: %s"
 
-# fitxer: camel.ca.po.1
-#: camel/providers/nntp/camel-nntp-summary.c:333
+# fitxer: addressbook.gui.widgets.ca.po
+#: camel/providers/nntp/camel-nntp-store.c:1262
 #, fuzzy
-msgid "Could not get messages: unspecified error"
-msgstr "No s'ha pogut obtenir els missatges. No s'ha especificat l'error"
+msgid "Not connected."
+msgstr "Cap contacte"
 
 # fitxer: camel.ca.po.1
-#: camel/providers/nntp/camel-nntp-summary.c:378
+#: camel/providers/nntp/camel-nntp-store.c:1311
 #, c-format
-msgid "NNTP Command failed: %s"
-msgstr "L'ordre NNTP ha fallat: %s"
+msgid "No such folder: %s"
+msgstr "No existeix la carpeta '%s'"
 
 # fitxer: camel.ca.po.1
-#: camel/providers/nntp/camel-nntp-summary.c:438
-#: camel/providers/nntp/camel-nntp-summary.c:543
+#: camel/providers/nntp/camel-nntp-summary.c:218
+#: camel/providers/nntp/camel-nntp-summary.c:314
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: s'està cercant missatges nous"
 
-# fitxer: camel.ca.po.1
-#: camel/providers/nntp/camel-nntp-summary.c:558
-#, c-format
-msgid "Unknown server response: %s"
-msgstr "Resposta desconeguda del servidor: %s"
+# fitxer: camel.ca.po.3
+#: camel/providers/nntp/camel-nntp-summary.c:225
+#, fuzzy, c-format
+msgid "Unexpected server response from xover: %s"
+msgstr "Resposta inesperada del servidor IMAP: %s"
+
+# fitxer: camel.ca.po.4
+#: camel/providers/nntp/camel-nntp-summary.c:328
+#, fuzzy, c-format
+msgid "Unexpected server response from head: %s"
+msgstr "Resposta inesperada del GnuPG: %s"
 
 # fitxer: camel.ca.po.1
-#: camel/providers/nntp/camel-nntp-summary.c:605
+#: camel/providers/nntp/camel-nntp-summary.c:368
 msgid "Use cancel"
 msgstr "Cancel·la"
 
 # fitxer: camel.ca.po.1
-#: camel/providers/nntp/camel-nntp-summary.c:607
+#: camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
 msgid "Operation failed: %s"
 msgstr "S'ha produït un error en l'operació: %s"
@@ -13870,7 +13565,7 @@ msgid "Disable support for all POP3 extensions"
 msgstr "Inhabilita el suport per a totes les extensions POP3"
 
 # fitxer: camel.ca.po.1
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107
 msgid "POP"
 msgstr "POP"
 
@@ -13975,7 +13670,7 @@ msgstr "No existeix la carpeta '%s'."
 
 # fitxer: camel.ca.po.1
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:132
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -14042,7 +13737,7 @@ msgid "Mail delivery via the sendmail program"
 msgstr "Lliurament de correu mitjançant el programa sendmail"
 
 # fitxer: camel.ca.po.1
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:119
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -14403,22 +14098,22 @@ msgid "%.0fG"
 msgstr "%.0fG"
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
+#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:408
 msgid "attachment"
 msgstr "fitxer adjunt"
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:454
 msgid "Remove selected items from the attachment list"
 msgstr "Elimina els elements seleccionats de la llista de fitxers adjunts"
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer-attachment-bar.c:491
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Add attachment..."
 msgstr "Adjunta un fitxer..."
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:495
 msgid "Attach a file to the message"
 msgstr "Adjunta un fitxer al missatge"
 
@@ -14497,7 +14192,7 @@ msgid "Open file"
 msgstr "Obre un fitxer"
 
 # fitxer: composer.ca.po
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
 msgid "Autogenerated"
 msgstr "Generat automàticament"
 
@@ -14671,17 +14366,17 @@ msgstr "Adjunta fitxers"
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
+msgid "You cannot attach the file `{0}' to this message."
 msgstr "Adjunta un fitxer al missatge"
 
 #. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4
-msgid "${1}"
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
 msgstr ""
 
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
 
 #. mail-composer:attach-directory primary
@@ -14785,7 +14480,7 @@ msgstr "No s'ha pogut crear el conducte: %s"
 
 #. mail-composer:no-build-message secondary
 #: composer/mail-composer-errors.xml.h:34
-msgid "Because \"${0}\", you may need to select different mail options."
+msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 # fitxer: mail.ca.po.1
@@ -14796,8 +14491,10 @@ msgid "Could not read signature file \"{0}\"."
 msgstr "No s'ha pogut desar el fitxer de signatura: %s"
 
 #. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38
-msgid "Because \"${1}\"."
+#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted primary
@@ -15294,12 +14991,12 @@ msgstr "<b>Llavors</b>"
 
 # fitxer: filter.ca.po
 #: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1335
+#: mail/mail-account-gui.c:1347
 msgid "Select Folder"
 msgstr "Seleccioneu una carpeta"
 
 # fitxer: designs.ca.po
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
 msgid "    "
 msgstr "    "
 
@@ -15366,7 +15063,7 @@ msgid "months"
 msgstr "mesos"
 
 # fitxer: filter.ca.po
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
 msgid "seconds"
 msgstr "segons"
 
@@ -15406,22 +15103,22 @@ msgid "years"
 msgstr "anys"
 
 # fitxer: filter.ca.po
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:916
-#: mail/mail-config.c:76 mail/mail-config.glade.h:90
+#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
+#: mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Important"
 
 # fitxer: filter.ca.po
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:919 mail/mail-config.c:79
-#: mail/mail-config.glade.h:145
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: mail/mail-config.glade.h:148
 msgid "To Do"
 msgstr "Per fer"
 
 # fitxer: filter.ca.po
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:920 mail/mail-config.c:80
-#: mail/mail-config.glade.h:94
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: mail/mail-config.glade.h:97
 msgid "Later"
 msgstr "Després"
 
@@ -15490,312 +15187,6 @@ msgid "outgoing"
 msgstr "sortida"
 
 # fitxer: filter.ca.po
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Adjust Score"
-msgstr "Ajusta una puntuació"
-
-# fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:3
-msgid "Assign Color"
-msgstr "Assigna un color"
-
-# fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:4
-msgid "Assign Score"
-msgstr "Assigna una puntuació"
-
-# fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:5
-msgid "Attachments"
-msgstr "Fitxers adjunts"
-
-# fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:6
-msgid "Beep"
-msgstr "Avís sonor"
-
-# fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "conté"
-
-# fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:8
-msgid "Copy to Folder"
-msgstr "Copia a la carpeta"
-
-# fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:9
-msgid "Date received"
-msgstr "Data de recepció"
-
-# fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:10
-msgid "Date sent"
-msgstr "Data d'enviament"
-
-# fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:12
-msgid "Deleted"
-msgstr "Suprimit"
-
-# fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "no conté"
-
-# fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "no acaba amb"
-
-# fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "no existeix"
-
-# fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:16
-msgid "does not return"
-msgstr "no retorna"
-
-# fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "no sona com"
-
-# fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "no comença per"
-
-# fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
-msgstr "No existeix"
-
-# fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr "Esborrany"
-
-# fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "acaba amb"
-
-# fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr "Existeix"
-
-# fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "existeix"
-
-# fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr "Expressió"
-
-# fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr "Respondre a"
-
-# fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "és"
-
-# fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr "està després"
-
-# fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr "està abans"
-
-# fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr "està senyalat"
-
-# fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "és més gran que"
-
-# fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "és més petit que"
-
-# fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "no és"
-
-# fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr "no està senyalat"
-
-# fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:36
-msgid "Junk Test"
-msgstr "Prova de brossa"
-
-# fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
-#: widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Etiqueta"
-
-# fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:38
-msgid "Mailing list"
-msgstr "Llista de correu"
-
-# fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:39
-msgid "Message Body"
-msgstr "Cos del missatge"
-
-# fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:40
-msgid "Message Header"
-msgstr "Capçalera del missatge"
-
-# fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:41
-msgid "Message is Junk"
-msgstr "El missatge és brossa"
-
-# fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:42
-msgid "Message is not Junk"
-msgstr "El missatge no és brossa"
-
-# fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:43
-msgid "Move to Folder"
-msgstr "Mou a la carpeta"
-
-# fitxer: ui.evolution.xml.h.ca.po
-#: filter/libfilter-i18n.h:44
-msgid "Pipe to Program"
-msgstr "Conducte al programa"
-
-# fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:45
-msgid "Play Sound"
-msgstr "Reprodueix un so"
-
-# fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Llegit"
-
-# fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:47
-msgid "Recipients"
-msgstr "Destinataris"
-
-# fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:48
-msgid "Regex Match"
-msgstr "Concorda amb una expressió regular"
-
-# fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:49
-msgid "Replied to"
-msgstr "S'ha respost a"
-
-# fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:50
-msgid "returns"
-msgstr "retorna"
-
-# fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:51
-msgid "returns greater than"
-msgstr "el valor retornat és més gran que"
-
-# fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:52
-msgid "returns less than"
-msgstr "el valor retornat és més petit que"
-
-# fitxer: calendar.ca.po.5
-#: filter/libfilter-i18n.h:53
-msgid "Run Program"
-msgstr "Executa el programa"
-
-# fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Puntuació"
-
-# fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:55
-msgid "Sender"
-msgstr "Remitent"
-
-# fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:56
-msgid "Set Status"
-msgstr "Defineix l'estat"
-
-# fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:57
-msgid "Size (kB)"
-msgstr "Mida (kB)"
-
-# fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:58
-msgid "sounds like"
-msgstr "sona com"
-
-# fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:59
-msgid "Source Account"
-msgstr "Compte origen"
-
-# fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:60
-msgid "Specific header"
-msgstr "Capçalera específica"
-
-# fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "comença per"
-
-# fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:63
-msgid "Stop Processing"
-msgstr "Atura el processament"
-
-# fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:64 mail/em-format.c:755 mail/em-format-html.c:1519
-#: mail/em-format-quote.c:302 mail/em-mailer-prefs.c:87
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
-#: smime/lib/e-cert.c:1079
-msgid "Subject"
-msgstr "Assumpte"
-
-# fitxer: filter.ca.po
-#: filter/libfilter-i18n.h:65
-msgid "Unset Status"
-msgstr "No defineixis l'estat"
-
-# fitxer: filter.ca.po
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Afegeix una regla"
@@ -15816,6 +15207,12 @@ msgid "_Score Rules"
 msgstr "Regle_s de puntuació"
 
 # fitxer: filter.ca.po
+#: filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Puntuació"
+
+# fitxer: filter.ca.po
 #: filter/searchtypes.xml.h:1
 msgid "Body contains"
 msgstr "El cos conté"
@@ -15913,14 +15310,14 @@ msgid "-------- Forwarded Message --------"
 msgstr "-------- Missatge reenviat --------"
 
 # fitxer: mail.ca.po.3
-#: mail/em-composer-utils.c:1499
+#: mail/em-composer-utils.c:1495
 msgid "an unknown sender"
 msgstr "un/a remitent anònim/a"
 
 # fitxer: mail.ca.po.3
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1509
+#: mail/em-composer-utils.c:1505
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "El %A %d de %B del %Y a les %H:%M %%+05d, en/na %%s va escriure:"
 
@@ -15967,8 +15364,8 @@ msgid "Create New Folder"
 msgstr "Crea una carpeta nova"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
-#: mail/mail-component.c:701
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
+#: mail/mail-component.c:704
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Especifiqueu on s'ha de crear la carpeta:"
@@ -15986,123 +15383,124 @@ msgid "Folder _name:"
 msgstr "_Nom de la carpeta:"
 
 # fitxer: mail.ca.po.1
-#: mail/em-folder-tree.c:839
+#: mail/em-folder-tree.c:833
 #, c-format
 msgid "Moving folder %s"
 msgstr "S'està movent la carpeta %s"
 
 # fitxer: mail.ca.po.1
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree.c:835
 #, c-format
 msgid "Copying folder %s"
 msgstr "S'està copiant la carpeta %s"
 
 # fitxer: mail.ca.po.1
-#: mail/em-folder-tree.c:848 mail/message-list.c:1555
+#: mail/em-folder-tree.c:842 mail/message-list.c:1561
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "S'estan movent els missatges a la carpeta %s"
 
 # fitxer: mail.ca.po.1
-#: mail/em-folder-tree.c:850 mail/message-list.c:1557
+#: mail/em-folder-tree.c:844 mail/message-list.c:1563
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "S'estan copiant els missatges a la carpeta %s"
 
 # fitxer: camel.ca.po.3
-#: mail/em-folder-tree.c:866
+#: mail/em-folder-tree.c:860
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "No s'ha deixar anar els missatges al magatzem de nivell superior"
 
 # fitxer: ui.evolution-mail-message.xml.h.ca.po
-#: mail/em-folder-tree.c:956 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Copia a la carpeta"
 
 # fitxer: ui.evolution-mail-message.xml.h.ca.po
-#: mail/em-folder-tree.c:957 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Mou a la carpeta"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2069
-#: mail/em-folder-tree.c:2551 mail/em-folder-view.c:798
-#: mail/message-list.c:1645
+#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
+#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
+#: mail/message-list.c:1651
 msgid "_Move"
 msgstr "_Mou"
 
 # fitxer: ui.evolution-task-editor.xml.h.ca.po
-#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#: mail/em-folder-tree.c:955 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "Cancel·la la tasca"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-tree.c:2056 mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
 #: mail/em-folder-view.c:798 mail/em-folder-view.c:812
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Seleccioneu una carpeta"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
 #, fuzzy
 msgid "C_opy"
 msgstr "Copia"
 
 # fitxer: mail.ca.po.1
-#: mail/em-folder-tree.c:2096
+#: mail/em-folder-tree.c:2088
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "S'està creant la carpeta '%s'"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
+#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
 msgid "Create folder"
 msgstr "Crea una carpeta"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-tree.c:2474
+#: mail/em-folder-tree.c:2463
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Canvia el nom de la carpeta '%s' a:"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-tree.c:2476
+#: mail/em-folder-tree.c:2465
 msgid "Rename Folder"
 msgstr "Canvia el nom de la carpeta"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-tree.c:2545 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Visualitza"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2537
 msgid "Open in _New Window"
 msgstr "Obre'l e_n una finestra nova"
 
 # fitxer: mail.ca.po.3
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2555
+#: mail/em-folder-tree.c:2546
 msgid "_New Folder..."
 msgstr "_Nova carpeta..."
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-tree.c:2558
+#: mail/em-folder-tree.c:2549
 msgid "_Rename"
 msgstr "Ca_nvia el nom"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-tree.c:2561 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Propietats..."
 
 # fitxer: mail.ca.po.3
 #: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:889
+#: mail/mail-vfolder.c:888
 msgid "VFolders"
 msgstr "VFolders"
 
@@ -16119,7 +15517,7 @@ msgid "Inbox"
 msgstr "Bústia d'entrada"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
 msgid "Loading..."
 msgstr "S'està carregant..."
 
@@ -16127,13 +15525,13 @@ msgstr "S'està carregant..."
 #: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
 #: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
 #: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:551
+#: mail/mail-component.c:554
 msgid "Mail"
 msgstr "Correu"
 
 # fitxer: mail.ca.po.3
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Edita com a missatge nou..."
@@ -16149,19 +15547,19 @@ msgid "_Reply to Sender"
 msgstr "_Respon al remitent"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-view.c:901 mail/em-popup.c:810
+#: mail/em-folder-view.c:901 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Respon a _la llista"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-view.c:902 mail/em-popup.c:811
+#: mail/em-folder-view.c:902 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Respon a _tots"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: mail/em-folder-view.c:903 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Reenvia"
@@ -16226,6 +15624,11 @@ msgstr "Mo_u a la carpeta..."
 msgid "_Copy to Folder..."
 msgstr "_Copia a la carpeta..."
 
+# fitxer: filter.ca.po
+#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Etiqueta"
+
 # fitxer: mail.ca.po.3
 #: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
@@ -16288,13 +15691,13 @@ msgstr "Fil_tra per la llista de correu"
 
 # fitxer: camel.ca.po.3
 #. default charset used in mail view
-#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
-#: mail/mail-config.glade.h:66
+#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Predeterminat"
 
 # fitxer: mail.ca.po.3
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1796
 msgid "Print Message"
 msgstr "Imprimeix el missatge"
 
@@ -16340,13 +15743,20 @@ msgstr "Cc"
 msgid "Bcc"
 msgstr "Bcc"
 
+# fitxer: filter.ca.po
+#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
+#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Assumpte"
+
 # fitxer: mail.ca.po.3
 #: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
 #: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Data"
 
-#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
+#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
 msgid "Newsgroups"
 msgstr "Grups de notícies"
 
@@ -16582,7 +15992,7 @@ msgstr ""
 "d'aquest missatge en una quantitat de temps raonable."
 
 # fitxer: mail.ca.po.3
-#: mail/em-format-html-display.c:757
+#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
 msgid "_View Certificate"
 msgstr "_Visualitza el certificat"
 
@@ -16648,7 +16058,7 @@ msgid "Once per month"
 msgstr "Una vegada al mes"
 
 # fitxer: mail.ca.po.3
-#: mail/em-migrate.c:1072
+#: mail/em-migrate.c:1168
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -16661,13 +16071,13 @@ msgstr ""
 "Espereu mentres l'Evolution migra les vostres carpetes..."
 
 # fitxer: camel.ca.po.2
-#: mail/em-migrate.c:1506
+#: mail/em-migrate.c:1602
 #, fuzzy, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "No s'ha pogut crear la carpeta '%s': %s"
 
 # fitxer: composer.ca.po
-#: mail/em-migrate.c:1532
+#: mail/em-migrate.c:1628
 #, fuzzy, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr ""
@@ -16675,86 +16085,86 @@ msgstr ""
 "%s"
 
 # fitxer: camel.ca.po.1
-#: mail/em-migrate.c:1715
+#: mail/em-migrate.c:1811
 #, fuzzy, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
 
 # fitxer: camel.ca.po.1
-#: mail/em-migrate.c:1919
+#: mail/em-migrate.c:2015
 #, fuzzy, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "S'ha produït un error en autenticar-se al servidor POP %s: %s"
 
 # fitxer: mail.ca.po.3
-#: mail/em-migrate.c:1933
+#: mail/em-migrate.c:2029
 #, fuzzy, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "No s'ha pogut crear el directori '%s': %s"
 
-#: mail/em-migrate.c:1962
+#: mail/em-migrate.c:2058
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 
 # fitxer: mail.ca.po.3
-#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#: mail/em-migrate.c:2413 mail/em-migrate.c:2425
 #, fuzzy, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "No s'ha pogut crear el directori '%s': %s"
 
 # fitxer: mail.ca.po.1
-#: mail/em-migrate.c:2480
+#: mail/em-migrate.c:2576
 #, fuzzy, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr ""
 "No s'ha pogut crear el fitxer de sortida: %s\n"
 " %s"
 
-#: mail/em-migrate.c:2498
+#: mail/em-migrate.c:2594
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 msgstr ""
 
 # fitxer: mail.ca.po.3
-#: mail/em-popup.c:699
+#: mail/em-popup.c:700
 msgid "Save As..."
 msgstr "Anomena i desa..."
 
 # fitxer: mail.ca.po.3
-#: mail/em-popup.c:717
+#: mail/em-popup.c:718
 #, c-format
 msgid "untitled_image.%s"
 msgstr "imatge_sense_nom.%s"
 
 # fitxer: mail.ca.po.3
-#: mail/em-popup.c:807
+#: mail/em-popup.c:808
 msgid "Set as _Background"
 msgstr "De_fineix com a fons"
 
 # fitxer: mail.ca.po.3
-#: mail/em-popup.c:809
+#: mail/em-popup.c:810
 msgid "_Reply to sender"
 msgstr "_Respon al remitent"
 
 # fitxer: mail.ca.po.3
-#: mail/em-popup.c:858
+#: mail/em-popup.c:859
 msgid "_Open Link in Browser"
 msgstr "_Obre l'enllaç en el navegador"
 
 # fitxer: mail.ca.po.3
-#: mail/em-popup.c:859
+#: mail/em-popup.c:860
 msgid "Se_nd message to..."
 msgstr "E_nvia un missatge a..."
 
 # fitxer: mail.ca.po.3
-#: mail/em-popup.c:860
+#: mail/em-popup.c:861
 msgid "_Add to Addressbook"
 msgstr "_Afegeix a la llibreta d'adreces"
 
 # fitxer: mail.ca.po.3
-#: mail/em-popup.c:966
+#: mail/em-popup.c:967
 #, c-format
 msgid "Open in %s..."
 msgstr "Obre a %s..."
@@ -17412,7 +16822,7 @@ msgid "Mail Accounts"
 msgstr "Comptes de correu"
 
 # fitxer: mail.ca.po.3
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
 msgid "Mail Preferences"
 msgstr "Preferències del correu"
 
@@ -17428,16 +16838,16 @@ msgstr "L'Evolution està important el vostre antic correu Elm"
 
 # fitxer: mail.ca.po.2
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:226
+#: mail/importers/evolution-mbox-importer.c:221
+#: mail/importers/evolution-outlook-importer.c:255
 #: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "S'està important..."
 
 # fitxer: mail.ca.po.2
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:222
-#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/evolution-mbox-importer.c:223
+#: mail/importers/evolution-outlook-importer.c:257
 #: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Espereu"
@@ -17461,24 +16871,26 @@ msgstr "Elm"
 
 # fitxer: mail.ca.po.2
 #: mail/importers/evolution-mbox-importer.c:116
+#: mail/importers/evolution-outlook-importer.c:130
 msgid "Destination folder:"
 msgstr "Carpeta de destí:"
 
 # fitxer: smime.ca.po
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder to import into"
 msgstr "Seleccioneu a quina carpeta s'importarà"
 
 # fitxer: shell.ca.po
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:254
 #: mail/importers/mail-importer.c:226
 #, c-format
 msgid "Importing `%s'"
 msgstr "S'està important '%s'"
 
 # fitxer: shell.ca.po
-#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/evolution-outlook-importer.c:301
 #: mail/importers/mail-importer.c:140
 msgid "Importing mailbox"
 msgstr "S'estan important una bústia"
@@ -17656,17 +17068,17 @@ msgid "%s License Agreement"
 msgstr "Acord quant a la clau"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
 msgid "_Host:"
 msgstr "Mà_quina:"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
 msgid "User_name:"
 msgstr "_Nom d'usuari:"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
 msgid "_Path:"
 msgstr "_Camí:"
 
@@ -17740,36 +17152,36 @@ msgid ", %d unread"
 msgstr ""
 
 # fitxer: mail.ca.po.2
-#: mail/mail-component.c:653
+#: mail/mail-component.c:656
 msgid "New Mail Message"
 msgstr "Nou missatge de correu"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-component.c:654
+#: mail/mail-component.c:657
 msgid "_Mail Message"
 msgstr "_Missatge de correu"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-component.c:655
+#: mail/mail-component.c:658
 msgid "Compose a new mail message"
 msgstr "Redacta un nou missatge de correu"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-component.c:661
+#: mail/mail-component.c:664
 msgid "New Mail Folder"
 msgstr "Nova carpeta de correu"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-component.c:662
+#: mail/mail-component.c:665
 msgid "Mail _Folder"
 msgstr "Car_peta de correu"
 
 # fitxer: calendar.ca.po.5
-#: mail/mail-component.c:663
+#: mail/mail-component.c:666
 msgid "Create a new mail folder"
 msgstr "Crea una nova carpeta de correu"
 
-#: mail/mail-component.c:795
+#: mail/mail-component.c:798
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
@@ -17783,7 +17195,7 @@ msgid "Connecting to server..."
 msgstr "S'està connectant al servidor..."
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Identitat"
 
@@ -17799,7 +17211,7 @@ msgstr ""
 
 # fitxer: mail.ca.po.2
 #: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid "Receiving Mail"
 msgstr "Rebre correu"
 
@@ -17816,7 +17228,7 @@ msgid "Please select among the following options"
 msgstr "Seleccioneu entre les següents opcions"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr "Enviar correu"
 
@@ -17828,7 +17240,7 @@ msgstr ""
 "Introduïu informació sobre com voleu enviar el correu. Si no n'esteu segur, "
 "pregunteu-ho a l'administrador del sistema o al vostre ISP."
 
-#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37
 msgid "Account Management"
 msgstr "Gestió de comptes"
 
@@ -17847,251 +17259,256 @@ msgstr ""
 "s'utilitzarà per visualitzar-lo."
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:2
 msgid " Ch_eck for Supported Types "
 msgstr "Comprova _els tipus suportats "
 
 # fitxer: calendar.ca.po.4
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
 msgid "<b>Preview</b>"
 msgstr "<b>Previsualització</b>"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "<b>Aquest muntatge de l'evolution no suporta SSL</b>"
 
 # fitxer: designs.ca.po
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "<b>S_ignatures</b>"
 msgstr "<b>S_ignatures</b>"
 
 # fitxer: designs.ca.po
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "<b>_Languages</b>"
 msgstr "<b>_Idiomes</b>"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
+msgid "<small>This will make the the filter more reliable, but slower</small>"
+msgstr ""
+
+#: mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">Informació del compte</span>"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">Alertes</span>"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr "<span weight=\"bold\">Tipus d'autenticació</span>"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">Autenticació</span>"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Checking for New Mail</span>"
 msgstr "<span weight=\"bold\">Comprovació de nou correu</span>"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr "<span weight=\"bold\">Redacció de missatges</span>"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">Configuració</span>"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr "<span weight=\"bold\">Comportament predeterminat</span>"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr "<span weight=\"bold\">Suprimeix el correu</span>"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr "<span weight=\"bold\">Ca_pçaleres del correu mostrat</span>"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr "<span weight=\"bold\">Opcions de filtre</span>"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">General</span>"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr "<span weight=\"bold\">Etiquetes i colors</span>"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr "<span weight=\"bold\">Carregar imatges</span>"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "<span weight=\"bold\">Visualització del missatge</span>"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr "<span weight=\"bold\">Tipus de lletra del missatge</span>"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "<span weight=\"bold\">Notificació de nou correu</span>"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr "span weight=\"bold\">Informació opcional</span>"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<span weight=\"bold\">Opcions</span>"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "<span weight=\"bold\">Privatesa força bona (PGP/GPG)</span>"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">Tipus de lletra impresa</span>"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">Informació necessària</span>"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">MIME segur (S/MIME)</span>"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">Seguretat</span>"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">Missatges enviats i esborranys</span>"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:34
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">Configuració del servidor</span>"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:35
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "Ta_mbé xifra'm quan enviï correu xifrat"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:36
 msgid "Account Editor"
 msgstr "Editor de compte"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:38
 msgid "Add Ne_w Signature..."
 msgstr "Afegeix una no_va signatura..."
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "Add _Script"
 msgstr "Afegeix una _seqüència"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:40
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "_Xifra'm sempre quan enviï correu xifrat"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "_Sempre carbon-copy (Cc) a:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Sempre _blind-carbon-copy (Bcc) a:"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:44
 msgid "Always _sign outgoing messages when using this account"
 msgstr "_Signa sempre els missatges de sortida quan facis servir aquest compte"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Confia sempre en les claus del meu anell de claus quan s'es_tà xifrant"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Attach original message"
 msgstr "Adjunta el missatge original"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Fitxer adjunt"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:48
 msgid "Automatically _insert smiley images"
 msgstr "_Inserta automàticament caretes"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Automatically check for _new mail every"
 msgstr "Comprova automàticame_nt si hi ha nou correu cada"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "Baltic (ISO-8859-13)"
 msgstr "Bàltic (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Baltic (ISO-8859-4)"
 msgstr "Bàltic (ISO-8859-4)"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Beep w_hen new mail arrives"
 msgstr "Avisa amb un so quan arri_bi correu nou"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "C_haracter set:"
 msgstr "_Joc de caràcters:"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 msgid "Ch_eck for Supported Types "
 msgstr "Comprova _els tipus suportats "
 
-# fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:53
-msgid "Check _Incoming Mail"
-msgstr "Comprova correu d'en_trada"
+# fitxer: mail.ca.po.3
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Check _incoming mail for junk"
+msgstr "Comprova si el correu d'entrada és brossa"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Check spelling while I _type"
 msgstr "Comprova l'or_tografia mentre escric"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Comprova que els missatges d'entrada siguin brossa"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 msgid "Color for _misspelled words:"
 msgstr "Color de les paraules i_ncorrectes:"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 msgid "Colors"
 msgstr "Colors"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 msgid "Confirm _when expunging a folder"
 msgstr "Confirma _quan s'està suprimint una carpeta"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -18107,130 +17524,136 @@ msgstr ""
 "Cliqueu 'Aplica' per desar la vostra configuració."
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
 msgid "De_fault"
 msgstr "_Predeterminat"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 msgid "Default character e_ncoding:"
 msgstr "Codi_ficació de caràcters per defecte:"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 msgid "Defaults"
 msgstr "Predeterminats"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 msgid "Do not quote original message"
 msgstr "No citis el missatge original"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "No signis les sol·licituds de reunió (co_mpatible amb l'Outlook)"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Fet"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
 msgid "Drafts _Folder:"
 msgstr "Carpeta d'es_borranys:"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:77
 msgid "Email Accounts"
 msgstr "Comptes de correu"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 msgid "Email _Address:"
 msgstr "_Adreça electrònica:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:79
 msgid "Empty trash folders on e_xit"
 msgstr "Buida les papereres en sor_tir"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
 msgid "Encry_ption certificate:"
 msgstr "Certi_ficats de xifratge:"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:81
 msgid "Evolution Account Assistant"
 msgstr "Assitent per als comptes d'Evolution"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:82
 msgid "Execute Command..."
 msgstr "Executa l'ordre..."
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Fi_xed-width:"
 msgstr "Amplada fi_xa:"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 msgid "Font Properties"
 msgstr "Propietats del tipus de lletra"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 msgid "Format messages in _HTML"
 msgstr "Missatges en format _HTML"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:87
 msgid "HTML Mail"
 msgstr "Correu HTML"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:88
 msgid "Headers"
 msgstr "Capçaleres"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr "Ressalta les _cites amb"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-# fitxer: mail.ca.po.2
+# fitxer: addressbook.printing.ca.po
 #: mail/mail-config.glade.h:91
+#, fuzzy
+msgid "I_nclude remote tests"
+msgstr "Inclou:"
+
+# fitxer: mail.ca.po.2
+#: mail/mail-config.glade.h:94
 msgid "Inline"
 msgstr "Insertat"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Kerberos "
 msgstr "Kerberos "
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Mail Configuration"
 msgstr "Configuració del correu"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "Ubicació de la bústia"
 
 # fitxer: mail.ca.po.2
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr "Redactor de missatge"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
@@ -18238,162 +17661,162 @@ msgstr ""
 "Nota: no es demanarà contrasenya fins que us connecteu per primera vegada"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Or_ganization:"
 msgstr "Or_ganització:"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "PGP/GPG _Key ID:"
 msgstr "Id. de _clau PGP/GPG:"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Play sound file when new mail arri_ves"
 msgstr "Re_produeix un fitxer de so quan arribi correu nou"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Pregunta quan s'enviïn missatges amb destinataris n_omés al camp Bcc"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr "Cita el missatge original"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr "Citat"
 
 # fitxer: calendar.ca.po.4
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 msgid "Re_member password"
 msgstr "Recorda la co_ntrasenya"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr "Res_pon-A:"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "Rebre correu"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:120
 msgid "Receiving Options"
 msgstr "Opcions de recepció"
 
 # fitxer: calendar.ca.po.4
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
 msgid "Remember _password"
 msgstr "Recorda la contrasen_ya"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
 msgid "S_tandard Font:"
 msgstr "_Tipus de lletra estàndard:"
 
 # fitxer: ui.evolution-message-composer.xml.h.ca.po
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 msgid "Security"
 msgstr "Seguretat"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font"
 msgstr "Selecciona el tipus de lletra HTML d'amplada fixa"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:126
 msgid "Select HTML fixed width font for printing"
 msgstr "Selecciona el tipus de lletra HTML d'amplada fixa per imprimir"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:127
 msgid "Select HTML variable width font"
 msgstr "Selecciona el tipus de lletra HTML d'amplada variable"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:128
 msgid "Select HTML variable width font for printing"
 msgstr "Selecciona el tipus de lletra HTML d'amplada variable per imprimir"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:129
 msgid "Select..."
 msgstr "Selecciona..."
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "Enviar correu"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:133
 msgid "Sent _Messages Folder:"
 msgstr "Carpeta de _missatges enviats:"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:134
 msgid "Ser_ver requires authentication"
 msgstr "El ser_vidor requereix autenticació"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:135
 msgid "Server _Type: "
 msgstr "_Tipus de servidor:"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:136
 msgid "Si_gning certificate:"
 msgstr "S'està si_gnant el certificat:"
 
 # fitxer: composer.ca.po
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:137
 msgid "Signat_ure:"
 msgstr "Signat_ura:"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:138
 msgid "Signatures"
 msgstr "Signatures"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr "Especifica un nom de _fitxer:"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:140
 msgid "Spell Checking"
 msgstr "Verificació d'ortografia"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:141
 msgid "Standard Unix mbox"
 msgstr "mbox estàndard de Unix"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:142
 msgid "T_erminal Font:"
 msgstr "Tipus d_e lletra del terminal:"
 
 # fitxer: addressbook.printing.ca.po
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:143
 msgid "T_ype: "
 msgstr "T_ipus:"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -18403,7 +17826,7 @@ msgstr ""
 "signatura. El nom que especifiqueu només s'usarà per visualitzar-lo."
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
@@ -18414,7 +17837,7 @@ msgstr ""
 "als quals teniu instal·lat un diccionari."
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:149
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -18423,17 +17846,12 @@ msgstr ""
 "Per exemple: 'Feina' o 'Personal'"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:148
-msgid "Use _Daemon"
-msgstr "Utilitza el _dimoni"
-
-# fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:152
 msgid "V_ariable-width:"
 msgstr "_Amplada variable:"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:153
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -18444,106 +17862,101 @@ msgstr ""
 "Cliqueu 'Endavant' per començar. "
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:158
 msgid "_Add Signature"
 msgstr "_Afegeix la signatura"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:159
 msgid "_Always load images from the Internet"
 msgstr "C_arrega sempre les imatges de la xarxa"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:160
 msgid "_Digitally sign outgoing messages (by default)"
 msgstr "Signa _digitalment els missatges de sortida (per defecte)"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:161
 msgid "_Do not notify me when new mail arrives"
 msgstr "_No em notifiquis l'arribada de correu electrònic nou"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:163
 msgid "_Enable"
 msgstr "_Habilita"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 msgid "_Encrypt outgoing messages (by default)"
 msgstr "Xifra _els missatges de sortida (per defecte)"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:165
 msgid "_Forward style:"
 msgstr "Estil de reen_viament:"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:168
 msgid "_Load images if sender is in address book"
 msgstr "Carrega _les imatges si el remitent és a la llibreta d'adreces"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:167
-msgid "_Local Tests Only"
-msgstr "Només proves _locals"
-
-# fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Make this my default account"
 msgstr "Fes-lo el _meu compte per defecte"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_Mark messages as read after"
 msgstr "_Marca els missatges com a llegits després de"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 msgid "_Never load images from the Internet"
 msgstr "_No carreguis mai les imatges d'Internet"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "_Pregunta quan enviïs missatges HTML als contactes que no ho volen"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:175
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Pregunta quan enviïs missatges amb l'assumpte buit"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:176
 msgid "_Reply style:"
 msgstr "Estil de la _resposta:"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:177
 msgid "_Script:"
 msgstr "_Seqüència:"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:178
 msgid "_Show animated images"
 msgstr "Mo_stra les imatges animades"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 msgid "_Use Secure Connection (SSL):"
 msgstr "_Utilitza una conexió segura (SSL):"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "_Use the same fonts as other applications"
 msgstr "_Utilitza el mateix tipus de lletra que la resta d'aplicacions"
 
 # fitxer: calendar.ca.po.4
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:181
 msgid "color"
 msgstr "color"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "descripció"
 
@@ -18733,7 +18146,7 @@ msgstr ""
 
 #. mail:camel-exception primary
 #: mail/mail-errors.xml.h:57
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgid "Your message with the subject \"{0}\" was not delivered."
 msgstr ""
 
 #. mail:camel-exception secondary
@@ -18804,11 +18217,6 @@ msgstr ""
 msgid "Cannot save to directory \"{0}\"."
 msgstr "No s'ha pogut crear el directori '%s': %s."
 
-#. mail:no-save-path secondary
-#: mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 # fitxer: mail.ca.po.3
 #. mail:no-create-path primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
@@ -18833,12 +18241,6 @@ msgstr "No s'ha pogut crear el directori '%s': %s."
 msgid "Cannot create temporary save directory."
 msgstr "No s'ha pogut crear el directori temporal: %s"
 
-#. mail:no-create-tmp-path secondary
-#: mail/mail-errors.xml.h:100 mail/mail-errors.xml.h:112
-#: widgets/misc/e-system-errors.xml.h:11 widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 # fitxer: composer.ca.po
 #. mail:no-write-path-exists secondary
 #: mail/mail-errors.xml.h:104
@@ -19140,34 +18542,29 @@ msgid "_Append"
 msgstr "_Obre"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:785
 #, c-format
 msgid "Pinging %s"
 msgstr "S'està enviant un ping a %s"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-mt.c:897
-msgid "Working"
-msgstr "S'està treballant"
-
-# fitxer: mail.ca.po.1
-#: mail/mail-ops.c:99
+#: mail/mail-ops.c:98
 msgid "Filtering Folder"
 msgstr "S'està filtrant la carpeta"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:260
+#: mail/mail-ops.c:259
 msgid "Fetching Mail"
 msgstr "S'està recollint el correu electrònic"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:543
+#: mail/mail-ops.c:542
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "No s'han pogut aplicar els filtres de sortida: %s"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:568
+#: mail/mail-ops.c:567
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -19177,120 +18574,120 @@ msgstr ""
 "S'afegirà a la carpeta local 'Enviat'."
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:577
+#: mail/mail-ops.c:576
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "No s'han pogut afegir a la carpeta local 'Enviat': %s"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:673
+#: mail/mail-ops.c:672
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "S'està enviant el missatge %d de %d"
 
 # fitxer: camel.ca.po.4
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:703
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "No s'han pogut enviar %d de %d missatges"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:708
+#: mail/mail-ops.c:707
 msgid "Complete."
 msgstr "Complet."
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:804
 msgid "Saving message to folder"
 msgstr "S'està desant el missatge a la carpeta"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Moving messages to %s"
 msgstr "S'estan movent els missatges a %s"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Copying messages to %s"
 msgstr "S'estan copiant els missatges a %s"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:1002
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "S'estan escanejant les carpetes de '%s'"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:1116
+#: mail/mail-ops.c:1115
 msgid "Forwarded messages"
 msgstr "Missatges reenviats"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:1159
+#: mail/mail-ops.c:1158
 #, c-format
 msgid "Opening folder %s"
 msgstr "S'està obrint la carpeta %s"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1230
 #, c-format
 msgid "Opening store %s"
 msgstr "S'està obrint el magatzem %s"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1308
 #, c-format
 msgid "Removing folder %s"
 msgstr "S'està suprimint la carpeta %s"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:1403
+#: mail/mail-ops.c:1402
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "S'està emmagatzemant la carpeta '%s'"
 
-#: mail/mail-ops.c:1468
+#: mail/mail-ops.c:1467
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "S'està buidant i emmagatzemant el compte '%s'"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:1469
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Storing account '%s'"
 msgstr "S'està emmagatzemant el compte '%s'"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:1524
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr "S'està refrescant la carpeta"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
+#: mail/mail-ops.c:1559 mail/mail-ops.c:1610
 msgid "Expunging folder"
 msgstr "S'està suprimint la carpeta"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1607
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "S'està buidant la paperera a '%s'"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:1609
+#: mail/mail-ops.c:1608
 msgid "Local Folders"
 msgstr "Carpetes locals"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:1692
+#: mail/mail-ops.c:1691
 #, c-format
 msgid "Retrieving message %s"
 msgstr "S'està recuperant el missatge %s"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:1764
+#: mail/mail-ops.c:1763
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
@@ -19298,7 +18695,7 @@ msgstr[0] "S'està recuperant %d missatge"
 msgstr[1] "S'estan recuperant %d missatges"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:1850
+#: mail/mail-ops.c:1849
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
@@ -19306,7 +18703,7 @@ msgstr[0] "S'està desant %d missatge"
 msgstr[1] "S'estan desant %d missatges"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:1900
+#: mail/mail-ops.c:1899
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -19316,7 +18713,7 @@ msgstr ""
 " %s"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:1928
+#: mail/mail-ops.c:1927
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -19326,12 +18723,12 @@ msgstr ""
 " %s"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:1999
+#: mail/mail-ops.c:1998
 msgid "Saving attachment"
 msgstr "S'està desant el fitxer adjunt"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:2016
+#: mail/mail-ops.c:2015
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -19341,19 +18738,19 @@ msgstr ""
 " %s"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:2046
+#: mail/mail-ops.c:2045
 #, c-format
 msgid "Could not write data: %s"
 msgstr "No s'han pogut escriure les dades: %s"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "S'està desconnectant de %s"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "S'està tornant a connectar a %s"
@@ -19430,28 +18827,28 @@ msgid "Waiting..."
 msgstr "S'està esperant..."
 
 # fitxer: mail.ca.po.1
-#: mail/mail-session.c:238
+#: mail/mail-session.c:239
 msgid "User canceled operation."
 msgstr "L'usuari ha cancel·lat l'operació."
 
 # fitxer: mail.ca.po.1
-#: mail/mail-session.c:271
+#: mail/mail-session.c:272
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Introduïu la contrasenya per a %s"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-session.c:273
+#: mail/mail-session.c:274
 msgid "Enter Password"
 msgstr "Introduïu la contrasenya"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password"
 msgstr "_Recorda aquesta contrasenya"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-session.c:297
+#: mail/mail-session.c:298
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Recorda aquesta contrasenya durant aquesta sessió"
 
@@ -19517,97 +18914,97 @@ msgid "Updating vFolders for '%s'"
 msgstr "S'està actualitzant les vfolders per a la uri: %s"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-vfolder.c:959
+#: mail/mail-vfolder.c:958
 msgid "vFolders"
 msgstr "vFolders"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-vfolder.c:998
+#: mail/mail-vfolder.c:997
 msgid "Edit VFolder"
 msgstr "Edita la VFolder"
 
 # fitxer: mail.ca.po.1
-#: mail/mail-vfolder.c:1082
+#: mail/mail-vfolder.c:1081
 msgid "New VFolder"
 msgstr "Nova VFolder"
 
 # fitxer: mail.ca.po.1
-#: mail/message-list.c:946
+#: mail/message-list.c:948
 msgid "Unseen"
 msgstr "No vist"
 
 # fitxer: mail.ca.po.1
-#: mail/message-list.c:947
+#: mail/message-list.c:949
 msgid "Seen"
 msgstr "Vist"
 
 # fitxer: mail.ca.po.1
-#: mail/message-list.c:948
+#: mail/message-list.c:950
 msgid "Answered"
 msgstr "Respost"
 
 # fitxer: mail.ca.po.1
-#: mail/message-list.c:949
+#: mail/message-list.c:951
 msgid "Multiple Unseen Messages"
 msgstr "Múltiples missatges sense veure"
 
 # fitxer: mail.ca.po.1
-#: mail/message-list.c:950
+#: mail/message-list.c:952
 msgid "Multiple Messages"
 msgstr "Missatges múltiples"
 
 # fitxer: mail.ca.po.1
-#: mail/message-list.c:954
+#: mail/message-list.c:956
 msgid "Lowest"
 msgstr "Molt baixa"
 
 # fitxer: mail.ca.po.1
-#: mail/message-list.c:955
+#: mail/message-list.c:957
 msgid "Lower"
 msgstr "Abaixa"
 
 # fitxer: mail.ca.po.1
-#: mail/message-list.c:959
+#: mail/message-list.c:961
 msgid "Higher"
 msgstr "Alta"
 
 # fitxer: mail.ca.po.1
-#: mail/message-list.c:960
+#: mail/message-list.c:962
 msgid "Highest"
 msgstr "Molt alta"
 
 # fitxer: mail.ca.po.1
-#: mail/message-list.c:1279
+#: mail/message-list.c:1285
 msgid "?"
 msgstr "?"
 
 # fitxer: mail.ca.po.1
-#: mail/message-list.c:1286
+#: mail/message-list.c:1292
 msgid "Today %l:%M %p"
 msgstr "Avui a les %k:%M"
 
 # fitxer: mail.ca.po.1
-#: mail/message-list.c:1295
+#: mail/message-list.c:1301
 msgid "Yesterday %l:%M %p"
 msgstr "Ahir a les %k:%M"
 
 # fitxer: mail.ca.po.1
-#: mail/message-list.c:1307
+#: mail/message-list.c:1313
 msgid "%a %l:%M %p"
 msgstr "%a a les %k:%M"
 
 # fitxer: mail.ca.po.1
-#: mail/message-list.c:1315
+#: mail/message-list.c:1321
 msgid "%b %d %l:%M %p"
 msgstr "el %d de %b a les %k:%M"
 
 # fitxer: mail.ca.po.1
-#: mail/message-list.c:1317
+#: mail/message-list.c:1323
 msgid "%b %d %Y"
 msgstr "%d de %b del %Y"
 
 # fitxer: mail.ca.po.1
-#: mail/message-list.c:3300
+#: mail/message-list.c:3321
 msgid "Generating message list"
 msgstr "S'està generant la llista de missatges"
 
@@ -19676,6 +19073,11 @@ msgstr "Reenvia"
 msgid "No Response Necessary"
 msgstr "No és necessària cap resposta"
 
+# fitxer: filter.ca.po
+#: mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Llegit"
+
 # fitxer: mail.ca.po.1
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
@@ -19803,55 +19205,58 @@ msgstr ""
 "Llista de camins de les carpetes a sincronitzar al disc per a la utilització "
 "desconnectat."
 
-# fitxer: shell.ca.po
 #: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid "Toolbar is visible"
+msgstr ""
+
+# fitxer: shell.ca.po
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Whether Evolution should start up in offline mode"
 msgstr "Si l'Evolution s'hauria d'iniciar en mode desconnectat"
 
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Whether the toolbar should be visible."
+msgstr ""
+
 # fitxer: shell.ca.po
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: shell/apps_evolution_shell.schemas.in.in.h:13
 msgid "Whether to skip the development warning dialog"
 msgstr "Si s'ha d'ometre el diàleg d'avís de desenvolupament"
 
 # fitxer: shell.ca.po
-#: shell/apps_evolution_shell.schemas.in.in.h:12
+#: shell/apps_evolution_shell.schemas.in.in.h:14
 msgid "mail"
 msgstr "correu"
 
-# fitxer: shell.ca.po
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
-msgstr "Desenvolupat per a vos per"
-
 # fitxer: calendar.ca.po.5
-#: shell/e-shell.c:545 shell/e-shell.c:546
+#: shell/e-shell.c:588 shell/e-shell.c:589
 #, fuzzy, c-format
 msgid "%ld KB"
 msgstr "%d %B"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: shell/e-shell.c:744
+#: shell/e-shell.c:786
 #, fuzzy
 msgid "Uknown system error."
 msgstr "Error desconegut"
 
 # fitxer: shell.ca.po
-#: shell/e-shell.c:1101
+#: shell/e-shell.c:1143
 msgid "Invalid arguments"
 msgstr "Els arguments no són vàlids"
 
 # fitxer: shell.ca.po
-#: shell/e-shell.c:1103
+#: shell/e-shell.c:1145
 msgid "Cannot register on OAF"
 msgstr "No s'ha pogut registrar l'OAF"
 
 # fitxer: shell.ca.po
-#: shell/e-shell.c:1105
+#: shell/e-shell.c:1147
 msgid "Configuration Database not found"
 msgstr "No s'ha pogut trobar la base de dades de configuració."
 
 # fitxer: shell.ca.po
-#: shell/e-shell.c:1107
+#: shell/e-shell.c:1149
 msgid "Generic error"
 msgstr "Error genèric"
 
@@ -19919,7 +19324,7 @@ msgid "Select importer"
 msgstr "Seleccioneu l'importador"
 
 # fitxer: shell.ca.po
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1026
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
 #, c-format
 msgid "File %s does not exist"
 msgstr "El fitxer %s no existeix"
@@ -19952,37 +19357,38 @@ msgstr ""
 "S'està important l'element 1."
 
 # fitxer: shell.ca.po
-#: shell/e-shell-importer.c:549
+#: shell/e-shell-importer.c:570
 msgid "Automatic"
 msgstr "Automàtic"
 
-# fitxer: shell.ca.po
-#: shell/e-shell-importer.c:598
-msgid "_Filename:"
-msgstr "Nom del _fitxer:"
+# fitxer: composer.ca.po
+#: shell/e-shell-importer.c:626
+#, fuzzy
+msgid "F_ilename:"
+msgstr "Nom del fitxer:"
 
 # fitxer: shell.ca.po
-#: shell/e-shell-importer.c:603
+#: shell/e-shell-importer.c:631
 msgid "Select a file"
 msgstr "Seleccioneu un fitxer"
 
 # fitxer: shell.ca.po
-#: shell/e-shell-importer.c:613
+#: shell/e-shell-importer.c:642
 msgid "File _type:"
 msgstr "_Tipus de fitxer:"
 
 # fitxer: shell.ca.po
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:681
 msgid "Import data and settings from _older programs"
 msgstr "Importa dades i paràmetres de pr_ogrames més antics"
 
 # fitxer: shell.ca.po
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:684
 msgid "Import a _single file"
 msgstr "Impo_rta un únic fitxer"
 
 # fitxer: shell.ca.po
-#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -19991,29 +19397,29 @@ msgstr ""
 "S'està cercant configuracions prèvies"
 
 # fitxer: shell.ca.po
-#: shell/e-shell-importer.c:727
+#: shell/e-shell-importer.c:756
 msgid "Starting Intelligent Importers"
 msgstr "S'estan iniciant els importadors intel·ligents"
 
 # fitxer: shell.ca.po
-#: shell/e-shell-importer.c:853 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
 #, c-format
 msgid "From %s:"
 msgstr "De %s:"
 
 # fitxer: camel.ca.po.3
-#: shell/e-shell-importer.c:1044
+#: shell/e-shell-importer.c:1073
 #, c-format
 msgid "No importer available for file %s"
 msgstr "No hi ha cap importador disponible per al fitxer %s"
 
 # fitxer: camel.ca.po.4
-#: shell/e-shell-importer.c:1056
+#: shell/e-shell-importer.c:1085
 msgid "Unable to execute importer"
 msgstr "No s'ha pogut executar l'importador"
 
 # fitxer: shell.ca.po
-#: shell/e-shell-importer.c:1169
+#: shell/e-shell-importer.c:1199
 msgid "_Import"
 msgstr "_Importa"
 
@@ -20074,7 +19480,7 @@ msgid "'.' and '..' are reserved folder names."
 msgstr "'.' i '..' són noms de carpeta reservats."
 
 # fitxer: shell.ca.po
-#: shell/e-shell-window.c:336
+#: shell/e-shell-window.c:337
 #, fuzzy
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
@@ -20082,13 +19488,13 @@ msgstr ""
 "treballar desconnectat."
 
 # fitxer: shell.ca.po
-#: shell/e-shell-window.c:343
+#: shell/e-shell-window.c:344
 #, fuzzy
 msgid "Evolution is in the process of going offline."
 msgstr "El Ximian Evolution està en procés de treballar desconnectat."
 
 # fitxer: shell.ca.po
-#: shell/e-shell-window.c:349
+#: shell/e-shell-window.c:350
 #, fuzzy
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
@@ -20096,51 +19502,51 @@ msgstr ""
 "treballar connectat."
 
 # fitxer: mail.ca.po.2
-#: shell/e-shell-window.c:621
+#: shell/e-shell-window.c:637
 #, fuzzy, c-format
 msgid "Switch to %s"
 msgstr "Correu per a %s"
 
 # fitxer: shell.ca.po
-#: shell/e-shell-window-commands.c:64
+#: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 "Sembla que aquest sistema no té instal·lades les eines Pilot del GNOME."
 
 # fitxer: shell.ca.po
-#: shell/e-shell-window-commands.c:72
+#: shell/e-shell-window-commands.c:74
 #, c-format
 msgid "Error executing %s."
 msgstr "S'ha produït un error en executar %s."
 
 # fitxer: shell.ca.po
-#: shell/e-shell-window-commands.c:121
+#: shell/e-shell-window-commands.c:123
 msgid "Bug buddy is not installed."
 msgstr "El Bug buddy no està instal·lat."
 
 # fitxer: shell.ca.po
-#: shell/e-shell-window-commands.c:129
+#: shell/e-shell-window-commands.c:131
 msgid "Bug buddy could not be run."
 msgstr "No es pot executar el Bug buddy."
 
-# fitxer: shell.ca.po
-#: shell/e-shell-window-commands.c:171
+# fitxer: calendar.ca.po.3
+#: shell/e-shell-window-commands.c:323
 #, fuzzy
-msgid "About Evolution"
-msgstr "Quant al Ximian Evolution"
+msgid "Groupware Suite"
+msgstr "Groupwise"
 
 # fitxer: shell.ca.po
-#: shell/e-shell-window-commands.c:382
+#: shell/e-shell-window-commands.c:563
 msgid "_Work Online"
 msgstr "_Treballa connectat"
 
 # fitxer: shell.ca.po
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "_Treballa desconnectat"
 
 # fitxer: shell.ca.po
-#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Treballa desconnectat"
 
@@ -20155,46 +19561,6 @@ msgid "New"
 msgstr "Nou"
 
 # fitxer: shell.ca.po
-#: shell/evolution-shell-component-utils.c:115
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"L'error és desconegut."
-
-# fitxer: shell.ca.po
-#: shell/evolution-shell-component-utils.c:118
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"L'error del sistema del component és:\n"
-"%s"
-
-# fitxer: shell.ca.po
-#: shell/evolution-shell-component-utils.c:125
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"L'error del sistema d'activació és:\n"
-"%s"
-
-# fitxer: shell.ca.po
 #: shell/evolution-test-component.c:140
 msgid "New Test"
 msgstr "Nova prova"
@@ -20572,35 +19938,35 @@ msgid ""
 msgstr ""
 
 # fitxer: smime.ca.po
-#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:522
+#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
+#: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
 msgstr "Seleccioneu quin certificat s'importarà..."
 
 # fitxer: smime.ca.po
-#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:604
+#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
+#: smime/gui/certificate-manager.c:638
 msgid "Certificate Name"
 msgstr "Nom del certificat"
 
 # fitxer: smime.ca.po
-#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
+#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
 msgid "Purposes"
 msgstr "Propòsits"
 
 # fitxer: smime.ca.po
-#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:517
+#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr "Nombre de sèrie"
 
 # fitxer: smime.ca.po
-#: smime/gui/certificate-manager.c:267
+#: smime/gui/certificate-manager.c:271
 msgid "Expires"
 msgstr "Caduca"
 
 # fitxer: smime.ca.po
-#: smime/gui/certificate-manager.c:417
+#: smime/gui/certificate-manager.c:446
 msgid "E-Mail Address"
 msgstr "Adreça de correu electrònic"
 
@@ -20649,6 +20015,12 @@ msgstr ""
 "  Assumpte: %s\n"
 
 # fitxer: smime.ca.po
+#: smime/gui/e-cert-selector.c:169
+#, fuzzy
+msgid "Select certificate"
+msgstr "Certificat del client SSL"
+
+# fitxer: smime.ca.po
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr "<No és una part del certificat>"
@@ -20719,7 +20091,7 @@ msgstr ""
 "procediments (si estan disponibles)"
 
 # fitxer: smime.ca.po
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
 msgid "Certificate"
 msgstr "Certificat"
 
@@ -20743,23 +20115,27 @@ msgstr "Nom comú (CN)"
 msgid "Contact Certificates"
 msgstr "Certificats dels contactes"
 
-# fitxer: smime.ca.po
-#: smime/gui/smime-ui.glade.h:21
-#, no-c-format
-msgid "Do you want to trust \"%s\" for the following purposes?"
-msgstr "Voleu confiar en \"%s\" per als propòsits següents?"
+#: smime/gui/smime-ui.glade.h:20
+msgid "Do not trust the authenticity of this certificate"
+msgstr ""
 
 # fitxer: smime.ca.po
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:21
 msgid "Dummy window only"
 msgstr "Només la finestra tonta"
 
 # fitxer: smime.ca.po
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:22
 msgid "Edit"
 msgstr "Edita"
 
 # fitxer: smime.ca.po
+#: smime/gui/smime-ui.glade.h:23
+#, fuzzy
+msgid "Email Certificate Trust Settings"
+msgstr "Entitat certificadora del correu electrònic"
+
+# fitxer: smime.ca.po
 #: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr "Certificat del receptor de correu electrònic"
@@ -20800,56 +20176,50 @@ msgid "SHA1 Fingerprint"
 msgstr "Marca SHA1"
 
 # fitxer: smime.ca.po
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr "Certificat del client SSL"
 
 # fitxer: smime.ca.po
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr "Certificat del servidor SSL"
 
-# fitxer: smime.ca.po
 #: smime/gui/smime-ui.glade.h:37
+msgid "Trust the authenticity of this certificate"
+msgstr ""
+
+# fitxer: smime.ca.po
+#: smime/gui/smime-ui.glade.h:38
 msgid "Trust this CA to identify email users."
 msgstr ""
 "Confieu en aquesta autoritat certificadora per identificar usuaris de correu "
 "electrònic."
 
 # fitxer: smime.ca.po
-#: smime/gui/smime-ui.glade.h:38
+#: smime/gui/smime-ui.glade.h:39
 msgid "Trust this CA to identify software developers."
 msgstr ""
 "Confieu en aquesta autoritat certificadora per identificar desenvolupadors "
 "de programari."
 
 # fitxer: smime.ca.po
-#: smime/gui/smime-ui.glade.h:39
+#: smime/gui/smime-ui.glade.h:40
 msgid "Trust this CA to identify web sites."
 msgstr "Confieu en aquesta autoritat certificadora per identificar llocs web."
 
 # fitxer: smime.ca.po
-#: smime/gui/smime-ui.glade.h:40
+#: smime/gui/smime-ui.glade.h:41
 msgid "View"
 msgstr "Visualitza"
 
 # fitxer: smime.ca.po
-#: smime/gui/smime-ui.glade.h:41
-msgid "View Certificate"
-msgstr "Visualitza el certificat"
-
-# fitxer: smime.ca.po
 #: smime/gui/smime-ui.glade.h:42
-msgid "You have been asked to trust a new Certificate Authority (CA)."
-msgstr "Se us ha demanat que confieu en una nova entitat certificadora (CA)."
-
-# fitxer: smime.ca.po
-#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr "Teniu certificats d'aquestes organitzations que us identifiquen:"
 
 # fitxer: smime.ca.po
-#: smime/gui/smime-ui.glade.h:44
+#: smime/gui/smime-ui.glade.h:43
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
@@ -20857,255 +20227,272 @@ msgstr ""
 "certificadores:"
 
 # fitxer: smime.ca.po
-#: smime/gui/smime-ui.glade.h:45
+#: smime/gui/smime-ui.glade.h:44
 msgid "You have certificates on file that identify these people:"
 msgstr "Teniu certificats en un fitxer que identifiquen aquestes persones:"
 
 # fitxer: smime.ca.po
-#: smime/gui/smime-ui.glade.h:46
+#: smime/gui/smime-ui.glade.h:45
 msgid "Your Certificates"
 msgstr "Els vostres certificats"
 
+#: smime/gui/smime-ui.glade.h:46
+msgid "_Edit CA Trust"
+msgstr ""
+
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
+#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:478
+#. x509 certificate usage types
+#: smime/lib/e-cert.c:424
+#, fuzzy
+msgid "Sign"
+msgstr "S'està signant"
+
+# fitxer: mail.ca.po.3
+#: smime/lib/e-cert.c:425
+#, fuzzy
+msgid "Encrypt"
+msgstr "Xifrat"
+
+# fitxer: smime.ca.po
+#: smime/lib/e-cert.c:530
 msgid "Version"
 msgstr "Versió"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:493
+#: smime/lib/e-cert.c:545
 msgid "Version 1"
 msgstr "Versió 2"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:496
+#: smime/lib/e-cert.c:548
 msgid "Version 2"
 msgstr "Versió 2"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:499
+#: smime/lib/e-cert.c:551
 msgid "Version 3"
 msgstr "Versió 3"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:581
+#: smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "Xifratge #1 MD2 amb RSA"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:584
+#: smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "Xifratge PKCS #1 MD5 amb RSA"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:587
+#: smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "Xifratge PKCS #1 SHA-1 amb RSA"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:590
+#: smime/lib/e-cert.c:642
 msgid "C"
 msgstr "C"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:593
+#: smime/lib/e-cert.c:645
 msgid "CN"
 msgstr "CN"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:596
+#: smime/lib/e-cert.c:648
 msgid "OU"
 msgstr "OU"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:599
+#: smime/lib/e-cert.c:651
 msgid "O"
 msgstr "O"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:602
+#: smime/lib/e-cert.c:654
 msgid "L"
 msgstr "L"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:605
+#: smime/lib/e-cert.c:657
 msgid "DN"
 msgstr "DN"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:608
+#: smime/lib/e-cert.c:660
 msgid "DC"
 msgstr "DC"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:611
+#: smime/lib/e-cert.c:663
 msgid "ST"
 msgstr "ST"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:614
+#: smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
 msgstr "Xifratge PKCS #1 RSA"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:617
+#: smime/lib/e-cert.c:669
 msgid "Certificate Key Usage"
 msgstr "Ús de la clau de certificat"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:620
+#: smime/lib/e-cert.c:672
 msgid "Netscape Certificate Type"
 msgstr "Tipus de certificat del Netscape"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:623
+#: smime/lib/e-cert.c:675
 msgid "Certificate Authority Key Identifier"
 msgstr "Identificador de clau de l'entitat certificadora"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:626
+#: smime/lib/e-cert.c:678
 msgid "UID"
 msgstr "UID"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:635
+#: smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Identificador de l'objecte (%s)"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:686
+#: smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
 msgstr "Identificador de l'algorisme"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:694
+#: smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
 msgstr "Paràmetres de l'algorisme"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:768
 msgid "Subject Public Key Info"
 msgstr "Informació de clau pública de l'assumpte"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:721
+#: smime/lib/e-cert.c:773
 msgid "Subject Public Key Algorithm"
 msgstr "Algorisme de clau pública de l'assumpte"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:736
+#: smime/lib/e-cert.c:788
 msgid "Subject's Public Key"
 msgstr "Clau pública de l'assumpte"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
+#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
 msgid "Error: Unable to process extension"
 msgstr "S'ha produït un error: no es pot processar l'extensió"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
+#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr "Signador de l'objecte"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:782
+#: smime/lib/e-cert.c:834
 msgid "SSL Certificate Authority"
 msgstr "Entitat certificadora de l'SSL"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:786
+#: smime/lib/e-cert.c:838
 msgid "Email Certificate Authority"
 msgstr "Entitat certificadora del correu electrònic"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:814
+#: smime/lib/e-cert.c:866
 msgid "Signing"
 msgstr "S'està signant"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:818
+#: smime/lib/e-cert.c:870
 msgid "Non-repudiation"
 msgstr "No rebutjable"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:822
+#: smime/lib/e-cert.c:874
 msgid "Key Encipherment"
 msgstr "Xifrat de clau"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:826
+#: smime/lib/e-cert.c:878
 msgid "Data Encipherment"
 msgstr "Xifrat de dades"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:830
+#: smime/lib/e-cert.c:882
 msgid "Key Agreement"
 msgstr "Acord quant a la clau"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:834
+#: smime/lib/e-cert.c:886
 msgid "Certificate Signer"
 msgstr "Signador del certificat"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:838
+#: smime/lib/e-cert.c:890
 msgid "CRL Signer"
 msgstr "Signador CRL"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:938
 msgid "Critical"
 msgstr "És crític"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
+#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
 msgid "Not Critical"
 msgstr "No és crític"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:912
+#: smime/lib/e-cert.c:964
 msgid "Extensions"
 msgstr "Extensions"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:983
+#: smime/lib/e-cert.c:1035
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
 msgid "Certificate Signature Algorithm"
 msgstr "Algorisme de la signatura del certificat"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:1048
+#: smime/lib/e-cert.c:1100
 msgid "Issuer"
 msgstr "Emissor"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:1102
+#: smime/lib/e-cert.c:1154
 msgid "Issuer Unique ID"
 msgstr "Identificador únic de l'emissor"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:1121
+#: smime/lib/e-cert.c:1173
 msgid "Subject Unique ID"
 msgstr "Identificador únic de l'assumpte"
 
 # fitxer: smime.ca.po
-#: smime/lib/e-cert.c:1164
+#: smime/lib/e-cert.c:1216
 msgid "Certificate Signature Value"
 msgstr "Valor de la signatura de certificat"
 
 # fitxer: smime.ca.po
 #. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
+#: smime/lib/e-cert-db.c:608
 msgid "Certificate already exists"
 msgstr "El certificat ja existeix"
 
@@ -21284,7 +20671,7 @@ msgstr "Visualitza el contacte actual"
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "_Accions"
 
@@ -21482,7 +20869,7 @@ msgstr "Ta_nca"
 #: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:3
+#: ui/evolution.xml.h:4
 msgid "Close"
 msgstr "Tanca"
 
@@ -21498,7 +20885,7 @@ msgstr "Suprimeix aquest element"
 
 # fitxer: ui.evolution-comp-editor.xml.h.ca.po
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr "Barra d'eines principal"
 
@@ -21549,7 +20936,7 @@ msgstr "Desa aquest element al disc"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:44
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "_File"
 msgstr "_Fitxer"
 
@@ -21873,14 +21260,14 @@ msgid "_Threaded Message List"
 msgstr "Llis_ta de missatges amb fils"
 
 # fitxer: ui.evolution-mail-messagedisplay.xml.h.ca.po
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Tanca aquesta finestra"
 
 # fitxer: ui.evolution-mail-messagedisplay.xml.h.ca.po
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "_Close"
 msgstr "Tan_ca"
 
@@ -22380,7 +21767,7 @@ msgid "_Quoted"
 msgstr "_Citat"
 
 # fitxer: ui.evolution-mail-message.xml.h.ca.po
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
 msgid "_Tools"
 msgstr "_Eines"
 
@@ -22748,135 +22135,151 @@ msgstr "Visualitza la tasca seleccionada"
 msgid "_Open Task"
 msgstr "_Obre una tasca"
 
-# fitxer: ui.evolution.xml.h.ca.po
+# fitxer: shell.ca.po
 #: ui/evolution.xml.h:1
-msgid "About Ximian Evolution..."
-msgstr "Quant al Ximian Evolution..."
+#, fuzzy
+msgid "About Evolution..."
+msgstr "Quant al Ximian Evolution"
 
 # fitxer: ui.evolution.xml.h.ca.po
 #: ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
 msgstr "Canvia la configuració de l'Evolution"
 
+# fitxer: ui.evolution-mail-list.xml.h.ca.po
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the visibility of the toolbar"
+msgstr "Canvia les propietats de la carpeta"
+
 # fitxer: calendar.ca.po.5
-#: ui/evolution.xml.h:5
+#: ui/evolution.xml.h:6
 #, fuzzy
 msgid "Create a new window displaying this folder"
 msgstr "Crea una nova carpeta de correu"
 
 # fitxer: ui.evolution.xml.h.ca.po
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "S_urt"
 
 # fitxer: ui.evolution.xml.h.ca.po
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "_Preguntes quant a l'Evolution"
+
+# fitxer: ui.evolution.xml.h.ca.po
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Surt del programa"
 
 # fitxer: ui.evolution.xml.h.ca.po
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:10
 msgid "Forget _Passwords"
 msgstr "Oblida les _contrasenyes"
 
 # fitxer: ui.evolution.xml.h.ca.po
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:11
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Oblida les contrasenyes recordades perquè se us preguntin de nou"
 
 # fitxer: ui.evolution.xml.h.ca.po
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:12
 msgid "Import data from other programs"
 msgstr "Importa dades d'altres programes"
 
 # fitxer: ui.evolution.xml.h.ca.po
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:14
 #, fuzzy
 msgid "New _Window"
 msgstr "_Finestra"
 
 # fitxer: ui.evolution.xml.h.ca.po
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Pi_lot Settings..."
 msgstr "Configuració de_l Pilot..."
 
 # fitxer: ui.evolution.xml.h.ca.po
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Send / Receive"
 msgstr "_Envia / reb"
 
 # fitxer: ui.evolution.xml.h.ca.po
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Send queued items and retrieve new items"
 msgstr "Envia els elements encuats i obté els nous"
 
 # fitxer: ui.evolution.xml.h.ca.po
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Set up Pilot configuration"
 msgstr "Defineix la configuració del Pilot"
 
 # fitxer: ui.evolution.xml.h.ca.po
-#: ui/evolution.xml.h:17
-msgid "Show information about Ximian Evolution"
+#: ui/evolution.xml.h:19
+#, fuzzy
+msgid "Show information about Evolution"
 msgstr "Mostra informació quant al Ximian Evolution"
 
 # fitxer: ui.evolution.xml.h.ca.po
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:20
 msgid "Submit Bug Report"
 msgstr "Envia un informe d'error"
 
 # fitxer: ui.evolution.xml.h.ca.po
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:21
 msgid "Submit _Bug Report"
 msgstr "En_via un informe d'error"
 
 # fitxer: ui.evolution.xml.h.ca.po
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Envia un informe d'error utilitzant el Bug Buddy"
 
-# fitxer: ui.evolution.xml.h.ca.po
-#: ui/evolution.xml.h:21
-msgid "Toggle whether we are working offline."
-msgstr "Commuta entre treballar connectat i desconnectat."
-
-# fitxer: ui.evolution.xml.h.ca.po
+# fitxer: ui.evolution-comp-editor.xml.h.ca.po
 #: ui/evolution.xml.h:23
-msgid "Ximian Evolution _FAQ"
-msgstr "_Preguntes quant a l'Evolution"
+#, fuzzy
+msgid "T_oolbar"
+msgstr "Barra d'eines principal"
 
 # fitxer: ui.evolution.xml.h.ca.po
 #: ui/evolution.xml.h:24
-msgid "_About Ximian Evolution..."
-msgstr "_Quant al Ximian Evolution..."
+msgid "Toggle whether we are working offline."
+msgstr "Commuta entre treballar connectat i desconnectat."
+
+# fitxer: shell.ca.po
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "_About Evolution..."
+msgstr "Quant al Ximian Evolution"
 
 # fitxer: ui.evolution.xml.h.ca.po
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "_Help"
 msgstr "_Ajuda"
 
 # fitxer: ui.evolution.xml.h.ca.po
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "_Import..."
 msgstr "_Importa..."
 
 # fitxer: ui.evolution.xml.h.ca.po
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "_New"
 msgstr "_Nou"
 
 # fitxer: mail.ca.po.3
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "_Quick Reference"
 msgstr "Referència rà_pida"
 
 # fitxer: ui.evolution.xml.h.ca.po
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_Send / Receive"
 msgstr "_Envia / reb"
 
 # fitxer: ui.evolution.xml.h.ca.po
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 msgid "_Window"
 msgstr "_Finestra"
 
@@ -22962,7 +22365,7 @@ msgstr "Amb e_stat"
 
 # fitxer: widgets.ca.po
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:626
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:635
 msgid "UTC"
 msgstr "UTC"
 
@@ -23153,33 +22556,33 @@ msgid "..."
 msgstr "..."
 
 # fitxer: shell.ca.po
-#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
-#: widgets/misc/e-error.c:121
+#: widgets/misc/e-error.c:79 widgets/misc/e-error.c:80
+#: widgets/misc/e-error.c:122
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Evolution"
 
 # fitxer: mail.ca.po.3
-#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
-#: widgets/misc/e-error.c:119
+#: widgets/misc/e-error.c:81 widgets/misc/e-error.c:82
+#: widgets/misc/e-error.c:120
 #, fuzzy
 msgid "Evolution Warning"
 msgstr "Correu de l'Evolution"
 
 # fitxer: calendar.ca.po.3
-#: widgets/misc/e-error.c:118
+#: widgets/misc/e-error.c:119
 #, fuzzy
 msgid "Evolution Information"
 msgstr "Informació de la reunió"
 
 # fitxer: shell.ca.po
-#: widgets/misc/e-error.c:120
+#: widgets/misc/e-error.c:121
 #, fuzzy
 msgid "Evolution Query"
 msgstr "Prova de l'Evolution"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:410
+#: widgets/misc/e-error.c:415
 #, fuzzy, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -23356,18 +22759,696 @@ msgid "Cannot open file \"{0}\"."
 msgstr "No es pot obrir el fitxer"
 
 # fitxer: shell.ca.po
-#: widgets/misc/e-task-widget.c:211
+#: widgets/misc/e-task-widget.c:212
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
 # fitxer: shell.ca.po
-#: widgets/misc/e-task-widget.c:216
+#: widgets/misc/e-task-widget.c:217
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% complet)"
 
 # fitxer: addressbook.gui.component.ca.po
+#~ msgid "Failed to connect to LDAP server"
+#~ msgstr "S'ha produït un error en connectar amb el servidor d'LDAP"
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid "Failed to authenticate with LDAP server"
+#~ msgstr "S'ha produït un error en autenticar-se al servidor d'LDAP"
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid "Could not perform query on Root DSE"
+#~ msgstr "No s'ha pogut realitzar la consulta al Root DSE"
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid "The server responded with no supported search bases"
+#~ msgstr "El servidor ha respost amb bases de cerca no suportades"
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid "This server does not support LDAPv3 schema information"
+#~ msgstr "Aquest servidor no suporta la informació de l'esquema d'LDAPv3"
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid "Error retrieving schema information"
+#~ msgstr "S'ha produït un error en recuperar la informació de l'esquema"
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid "Server did not respond with valid schema information"
+#~ msgstr "El servidor no ha contestat amb una informació d'esquema vàlida"
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid "  S_how Supported Bases "
+#~ msgstr "  Mostra les bas_es suportades "
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid "1:00"
+#~ msgstr "1:00"
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid "5:00"
+#~ msgstr "5:00"
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid "Connecting"
+#~ msgstr "S'està connectant"
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid "Distinguished _name:"
+#~ msgstr "_Nom distingit:"
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid "Email address:"
+#~ msgstr "Adreça de correu electrònic:"
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid "Evolution will use this DN to authenticate you with the server"
+#~ msgstr "L'Evolution utilitzarà el DN per autenticar-vos al servidor"
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid "One"
+#~ msgstr "One"
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid "S_earch scope: "
+#~ msgstr "Àmbit de la c_erca: "
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid "Searching"
+#~ msgstr "S'està cercant"
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid "Sub"
+#~ msgstr "Sub"
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid "This option controls how long a search will be run."
+#~ msgstr "L'opció especifica la durada de l'execució de la cerca."
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid "U_se SSL/TLS:"
+#~ msgstr "Utilitza _SSL/TLS:"
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid "_Display name:"
+#~ msgstr "Nom _de visualització"
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid "_Port number:"
+#~ msgstr "Nombre del _port:"
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid "_Search base:"
+#~ msgstr "Ba_se de la cerca:"
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid "_Server name:"
+#~ msgstr "Nom del _servidor:"
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid "_Timeout (minutes):"
+#~ msgstr "_Temps d'espera (minuts):"
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid "connecting-tab"
+#~ msgstr "pestanya-connexió"
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid "general-tab"
+#~ msgstr "pestanya-general"
+
+# fitxer: addressbook.gui.component.ca.po
+#~ msgid "searching-tab"
+#~ msgstr "pestanya-cerca"
+
+# fitxer: addressbook.gui.contact-editor.ca.po
+#, fuzzy
+#~ msgid "Job title:"
+#~ msgstr "_Càrrec:"
+
+# fitxer: calendar.ca.po.3
+#, fuzzy
+#~ msgid "Webcam:"
+#~ msgstr "Pàgina web:"
+
+# fitxer: addressbook.gui.widgets.ca.po
+#, fuzzy
+#~ msgid "item7"
+#~ msgstr "Títol"
+
+# fitxer: addressbook.gui.widgets.ca.po
+#, fuzzy
+#~ msgid "item8"
+#~ msgstr "Títol"
+
+# fitxer: addressbook.gui.contact-editor.ca.po
+#~ msgid "Category editor not available."
+#~ msgstr "L'editor de categories no està disponible."
+
+#, fuzzy
+#~ msgid ""
+#~ "The following entries are invalid:\n"
+#~ "\n"
+#~ msgstr "Les següents regles de filtratge:\n"
+
+# fitxer: addressbook.gui.contact-editor.ca.po
+#~ msgid "Could not find widget for a field: `%s'"
+#~ msgstr ""
+#~ "No s'ha pogut trobar l'element de la interfície gràfica per a un camp: '%"
+#~ "s'"
+
+# fitxer: addressbook.gui.widgets.ca.po
+#~ msgid "Do you want to save changes?"
+#~ msgstr "Voleu desar els canvis?"
+
+# fitxer: addressbook.gui.widgets.ca.po
+#~ msgid "Error saving %s: %s"
+#~ msgstr "S'ha produït un error en desar el fitxer %s: %s"
+
+# fitxer: addressbook.gui.widgets.ca.po
+#~ msgid ""
+#~ "The addressbook backend for\n"
+#~ "%s\n"
+#~ "has crashed. You will have to restart Evolution in order to use it again"
+#~ msgstr ""
+#~ "S'ha produït un error en el programa de suport\n"
+#~ "de la llibreta d'adreces %s. Haureu de reiniciar l'Evolution per tornar-"
+#~ "lo a utilitzar"
+
+# fitxer: addressbook.tools.ca.po
+#~ msgid "Can not load URI"
+#~ msgstr "No es pot carregar la URI"
+
+# fitxer: calendar.ca.po.5
+#~ msgid "Calendar Properties"
+#~ msgstr "Propietats del calendari"
+
+# fitxer: calendar.ca.po.5
+#~ msgid "Remote"
+#~ msgstr "Remota"
+
+# fitxer: calendar.ca.po.5
+#~ msgid "Task List Properties"
+#~ msgstr "Propietats de la llista de tasques"
+
+# fitxer: calendar.ca.po.5
+#~ msgid "_Refresh Interval:"
+#~ msgstr "Intè_rval d'actualització:"
+
+# fitxer: calendar.ca.po.5
+#~ msgid "_Source URL:"
+#~ msgstr "URL d'o_rigen:"
+
+# fitxer: calendar.ca.po.5
+#~ msgid ""
+#~ "The event being deleted is a meeting, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "L'esdeveniment que esteu suprimint és una reunió, voleu enviar una "
+#~ "notificació de cancel·lació?"
+
+# fitxer: calendar.ca.po.5
+#~ msgid "Are you sure you want to cancel and delete this meeting?"
+#~ msgstr "Esteu segur de voler cancel·lar i suprimir aquesta reunió?"
+
+# fitxer: calendar.ca.po.5
+#~ msgid ""
+#~ "The task being deleted is assigned, would you like to send a cancellation "
+#~ "notice?"
+#~ msgstr ""
+#~ "La tasca que se suprimirà està assignada, voleu enviar una notificació de "
+#~ "cancel·lació?"
+
+# fitxer: calendar.ca.po.5
+#~ msgid "Are you sure you want to cancel and delete this task?"
+#~ msgstr "Esteu segur de voler cancel·lar i suprimir aquesta tasca?"
+
+# fitxer: calendar.ca.po.4
+#~ msgid ""
+#~ "The journal entry being deleted is published, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "L'entrada del diari que s'està suprimint està publicada, voleu enviar una "
+#~ "notificació de cancel·lació?"
+
+# fitxer: calendar.ca.po.4
+#~ msgid "Are you sure you want to cancel and delete this journal entry?"
+#~ msgstr ""
+#~ "Esteu segur de voler cancel·lar i suprimir aquesta entrada del diari?"
+
+# fitxer: calendar.ca.po.4
+#~ msgid "Are you sure you want to delete the appointment `%s'?"
+#~ msgstr "Esteu segur de voler suprimir la cita '%s'?"
+
+# fitxer: calendar.ca.po.4
+#~ msgid "Are you sure you want to delete this untitled appointment?"
+#~ msgstr "Esteu segur de voler suprimir aquesta cita sense nom?"
+
+# fitxer: calendar.ca.po.4
+#~ msgid "Are you sure you want to delete the task `%s'?"
+#~ msgstr "Esteu segur de voler suprimir la tasca '%s'?"
+
+# fitxer: calendar.ca.po.4
+#~ msgid "Are you sure you want to delete this untitled task?"
+#~ msgstr "Esteu segur de voler suprimir aquesta tasca sense nom?"
+
+# fitxer: calendar.ca.po.4
+#~ msgid "Are you sure you want to delete the journal entry `%s'?"
+#~ msgstr "Esteu segur de voler suprimir l'entrada del diari '%s'?"
+
+# fitxer: calendar.ca.po.4
+#~ msgid "Are you sure want to delete this untitled journal entry?"
+#~ msgstr "Esteu segur de voler suprimir aquesta entrada del diari sense nom?"
+
+# fitxer: calendar.ca.po.4
+#~ msgid "Are you sure you want to delete %d appointment?"
+#~ msgid_plural "Are you sure you want to delete %d appointments?"
+#~ msgstr[0] "Esteu segur de voler suprimir %d cita?"
+#~ msgstr[1] "Esteu segur de voler suprimir %d cites?"
+
+# fitxer: calendar.ca.po.4
+#~ msgid "Are you sure you want to delete %d task?"
+#~ msgid_plural "Are you sure you want to delete %d tasks?"
+#~ msgstr[0] "Esteu segur de voler suprimir %d tasca?"
+#~ msgstr[1] "Esteu segur de voler suprimir %d tasques?"
+
+# fitxer: calendar.ca.po.4
+#~ msgid "Are you sure you want to delete %d journal entry?"
+#~ msgid_plural "Are you sure you want to delete %d journal entries?"
+#~ msgstr[0] "Esteu segur de voler suprimir %d entrada del diari?"
+#~ msgstr[1] "Esteu segur de voler suprimir %d entrades del diari?"
+
+# fitxer: calendar.ca.po.4
+#~ msgid "_Invite Others..."
+#~ msgstr "Conv_ida a altres..."
+
+# fitxer: calendar.ca.po.4
+#~ msgid ""
+#~ "This event has been changed, but has not been saved.\n"
+#~ "\n"
+#~ "Do you wish to save your changes?"
+#~ msgstr ""
+#~ "L'esdeveniment s'ha modificat però no s'ha desat.\n"
+#~ "\n"
+#~ "Voleu desar els canvis?"
+
+# fitxer: calendar.ca.po.4
+#~ msgid "_Discard Changes"
+#~ msgstr "_Descarta els canvis"
+
+# fitxer: calendar.ca.po.4
+#~ msgid "Save Event"
+#~ msgstr "Desa l'esdeveniment"
+
+# fitxer: calendar.ca.po.4
+#~ msgid "The meeting information has been created. Send it?"
+#~ msgstr "S'ha creat la informació de la reunió. Voleu enviar-la?"
+
+# fitxer: calendar.ca.po.4
+#~ msgid "The meeting information has changed. Send an updated version?"
+#~ msgstr ""
+#~ "S'ha modificat la informació de la reunió. Voleu enviar-ne una versió "
+#~ "actualitzada?"
+
+# fitxer: calendar.ca.po.4
+#~ msgid "The task assignment information has been created. Send it?"
+#~ msgstr "S'ha creat la informació d'assignació de la tasca. Voleu enviar-la?"
+
+# fitxer: calendar.ca.po.4
+#~ msgid "The task information has changed. Send an updated version?"
+#~ msgstr ""
+#~ "S'ha modificat la informació de la tasca. Voleu enviar-ne una versió "
+#~ "actualitzada?"
+
+# fitxer: calendar.ca.po.3
+#~ msgid "The task backend for '%s' has crashed."
+#~ msgstr "El suport de la tasca per a '%s' ha fallat."
+
+# fitxer: calendar.ca.po.3
+#~ msgid "The calendar backend for '%s' has crashed."
+#~ msgstr "El suport del calendari per a '%s' ha fallat."
+
+#~ msgid "Learning junk and/or non junk message(s)"
+#~ msgstr "S'està aprenent si els missatges són brossa"
+
+# fitxer: camel.ca.po.2
+#~ msgid "Could not get article %s from NNTP server"
+#~ msgstr "No s'ha pogut obtenir l'article %s del servidor NNTP"
+
+# fitxer: camel.ca.po.2
+#~ msgid "Posting not allowed by news server"
+#~ msgstr "El servidor de notícies no permet publicar"
+
+# fitxer: camel.ca.po.2
+#~ msgid "Failed to send newsgroups header: %s: message not posted"
+#~ msgstr ""
+#~ "S'ha produït un error en enviar la capçalera del grup de notícies: %s. No "
+#~ "s'ha publicat el missatge"
+
+# fitxer: camel.ca.po.2
+#~ msgid "Error posting to newsgroup: %s: message not posted"
+#~ msgstr ""
+#~ "S'ha produït un error en publicar al grup de notícies: %s. No s'ha "
+#~ "publicat el missatge"
+
+# fitxer: camel.ca.po.2
+#~ msgid "Error reading response to posted message: message not posted"
+#~ msgstr ""
+#~ "S'ha produït un error en llegir la resposta al missatge publicat. No s'ha "
+#~ "publicat el missatge"
+
+# fitxer: camel.ca.po.2
+#~ msgid "Error posting message: %s: message not posted"
+#~ msgstr ""
+#~ "S'ha produït un error en publicar el missatge: %s. No s'ha publicat el "
+#~ "missatge"
+
+# fitxer: camel.ca.po.1
+#~ msgid "Stream error"
+#~ msgstr "Error en el fluxe"
+
+# fitxer: camel.ca.po.1
+#~ msgid "Connection error: %s"
+#~ msgstr "S'ha produït un error en la connexió: %s"
+
+# fitxer: camel.ca.po.1
+#~ msgid "Could not get group: %s"
+#~ msgstr "No s'ha pogut obtenir el grup: %s"
+
+# fitxer: camel.ca.po.1
+#, fuzzy
+#~ msgid "Could not get messages: unspecified error"
+#~ msgstr "No s'ha pogut obtenir els missatges. No s'ha especificat l'error"
+
+# fitxer: camel.ca.po.1
+#~ msgid "Unknown server response: %s"
+#~ msgstr "Resposta desconeguda del servidor: %s"
+
+# fitxer: filter.ca.po
+#~ msgid "Adjust Score"
+#~ msgstr "Ajusta una puntuació"
+
+# fitxer: filter.ca.po
+#~ msgid "Assign Color"
+#~ msgstr "Assigna un color"
+
+# fitxer: filter.ca.po
+#~ msgid "Assign Score"
+#~ msgstr "Assigna una puntuació"
+
+# fitxer: filter.ca.po
+#~ msgid "Attachments"
+#~ msgstr "Fitxers adjunts"
+
+# fitxer: filter.ca.po
+#~ msgid "Beep"
+#~ msgstr "Avís sonor"
+
+# fitxer: filter.ca.po
+#~ msgid "contains"
+#~ msgstr "conté"
+
+# fitxer: filter.ca.po
+#~ msgid "Copy to Folder"
+#~ msgstr "Copia a la carpeta"
+
+# fitxer: filter.ca.po
+#~ msgid "Date received"
+#~ msgstr "Data de recepció"
+
+# fitxer: filter.ca.po
+#~ msgid "Date sent"
+#~ msgstr "Data d'enviament"
+
+# fitxer: filter.ca.po
+#~ msgid "Deleted"
+#~ msgstr "Suprimit"
+
+# fitxer: filter.ca.po
+#~ msgid "does not contain"
+#~ msgstr "no conté"
+
+# fitxer: filter.ca.po
+#~ msgid "does not end with"
+#~ msgstr "no acaba amb"
+
+# fitxer: filter.ca.po
+#~ msgid "does not exist"
+#~ msgstr "no existeix"
+
+# fitxer: filter.ca.po
+#~ msgid "does not return"
+#~ msgstr "no retorna"
+
+# fitxer: filter.ca.po
+#~ msgid "does not sound like"
+#~ msgstr "no sona com"
+
+# fitxer: filter.ca.po
+#~ msgid "does not start with"
+#~ msgstr "no comença per"
+
+# fitxer: filter.ca.po
+#~ msgid "Do Not Exist"
+#~ msgstr "No existeix"
+
+# fitxer: filter.ca.po
+#~ msgid "Draft"
+#~ msgstr "Esborrany"
+
+# fitxer: filter.ca.po
+#~ msgid "ends with"
+#~ msgstr "acaba amb"
+
+# fitxer: filter.ca.po
+#~ msgid "Exist"
+#~ msgstr "Existeix"
+
+# fitxer: filter.ca.po
+#~ msgid "exists"
+#~ msgstr "existeix"
+
+# fitxer: filter.ca.po
+#~ msgid "Expression"
+#~ msgstr "Expressió"
+
+# fitxer: filter.ca.po
+#~ msgid "Follow Up"
+#~ msgstr "Respondre a"
+
+# fitxer: filter.ca.po
+#~ msgid "is"
+#~ msgstr "és"
+
+# fitxer: filter.ca.po
+#~ msgid "is after"
+#~ msgstr "està després"
+
+# fitxer: filter.ca.po
+#~ msgid "is before"
+#~ msgstr "està abans"
+
+# fitxer: filter.ca.po
+#~ msgid "is Flagged"
+#~ msgstr "està senyalat"
+
+# fitxer: filter.ca.po
+#~ msgid "is greater than"
+#~ msgstr "és més gran que"
+
+# fitxer: filter.ca.po
+#~ msgid "is less than"
+#~ msgstr "és més petit que"
+
+# fitxer: filter.ca.po
+#~ msgid "is not"
+#~ msgstr "no és"
+
+# fitxer: filter.ca.po
+#~ msgid "is not Flagged"
+#~ msgstr "no està senyalat"
+
+# fitxer: filter.ca.po
+#~ msgid "Junk Test"
+#~ msgstr "Prova de brossa"
+
+# fitxer: filter.ca.po
+#~ msgid "Mailing list"
+#~ msgstr "Llista de correu"
+
+# fitxer: filter.ca.po
+#~ msgid "Message Body"
+#~ msgstr "Cos del missatge"
+
+# fitxer: filter.ca.po
+#~ msgid "Message Header"
+#~ msgstr "Capçalera del missatge"
+
+# fitxer: filter.ca.po
+#~ msgid "Message is Junk"
+#~ msgstr "El missatge és brossa"
+
+# fitxer: filter.ca.po
+#~ msgid "Message is not Junk"
+#~ msgstr "El missatge no és brossa"
+
+# fitxer: filter.ca.po
+#~ msgid "Move to Folder"
+#~ msgstr "Mou a la carpeta"
+
+# fitxer: ui.evolution.xml.h.ca.po
+#~ msgid "Pipe to Program"
+#~ msgstr "Conducte al programa"
+
+# fitxer: filter.ca.po
+#~ msgid "Play Sound"
+#~ msgstr "Reprodueix un so"
+
+# fitxer: filter.ca.po
+#~ msgid "Recipients"
+#~ msgstr "Destinataris"
+
+# fitxer: filter.ca.po
+#~ msgid "Regex Match"
+#~ msgstr "Concorda amb una expressió regular"
+
+# fitxer: filter.ca.po
+#~ msgid "Replied to"
+#~ msgstr "S'ha respost a"
+
+# fitxer: filter.ca.po
+#~ msgid "returns"
+#~ msgstr "retorna"
+
+# fitxer: filter.ca.po
+#~ msgid "returns greater than"
+#~ msgstr "el valor retornat és més gran que"
+
+# fitxer: filter.ca.po
+#~ msgid "returns less than"
+#~ msgstr "el valor retornat és més petit que"
+
+# fitxer: calendar.ca.po.5
+#~ msgid "Run Program"
+#~ msgstr "Executa el programa"
+
+# fitxer: filter.ca.po
+#~ msgid "Sender"
+#~ msgstr "Remitent"
+
+# fitxer: filter.ca.po
+#~ msgid "Set Status"
+#~ msgstr "Defineix l'estat"
+
+# fitxer: filter.ca.po
+#~ msgid "Size (kB)"
+#~ msgstr "Mida (kB)"
+
+# fitxer: filter.ca.po
+#~ msgid "sounds like"
+#~ msgstr "sona com"
+
+# fitxer: filter.ca.po
+#~ msgid "Source Account"
+#~ msgstr "Compte origen"
+
+# fitxer: filter.ca.po
+#~ msgid "Specific header"
+#~ msgstr "Capçalera específica"
+
+# fitxer: filter.ca.po
+#~ msgid "starts with"
+#~ msgstr "comença per"
+
+# fitxer: filter.ca.po
+#~ msgid "Stop Processing"
+#~ msgstr "Atura el processament"
+
+# fitxer: filter.ca.po
+#~ msgid "Unset Status"
+#~ msgstr "No defineixis l'estat"
+
+# fitxer: mail.ca.po.2
+#~ msgid "Check _Incoming Mail"
+#~ msgstr "Comprova correu d'en_trada"
+
+# fitxer: mail.ca.po.1
+#~ msgid "Use _Daemon"
+#~ msgstr "Utilitza el _dimoni"
+
+# fitxer: mail.ca.po.1
+#~ msgid "_Local Tests Only"
+#~ msgstr "Només proves _locals"
+
+# fitxer: mail.ca.po.1
+#~ msgid "Working"
+#~ msgstr "S'està treballant"
+
+# fitxer: shell.ca.po
+#~ msgid "Brought to you by"
+#~ msgstr "Desenvolupat per a vos per"
+
+# fitxer: shell.ca.po
+#~ msgid "_Filename:"
+#~ msgstr "Nom del _fitxer:"
+
+# fitxer: shell.ca.po
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "Unknown error."
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "L'error és desconegut."
+
+# fitxer: shell.ca.po
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the component system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "L'error del sistema del component és:\n"
+#~ "%s"
+
+# fitxer: shell.ca.po
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the activation system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "L'error del sistema d'activació és:\n"
+#~ "%s"
+
+# fitxer: smime.ca.po
+#~ msgid "Do you want to trust \"%s\" for the following purposes?"
+#~ msgstr "Voleu confiar en \"%s\" per als propòsits següents?"
+
+# fitxer: smime.ca.po
+#~ msgid "View Certificate"
+#~ msgstr "Visualitza el certificat"
+
+# fitxer: smime.ca.po
+#~ msgid "You have been asked to trust a new Certificate Authority (CA)."
+#~ msgstr ""
+#~ "Se us ha demanat que confieu en una nova entitat certificadora (CA)."
+
+# fitxer: ui.evolution.xml.h.ca.po
+#~ msgid "About Ximian Evolution..."
+#~ msgstr "Quant al Ximian Evolution..."
+
+# fitxer: ui.evolution.xml.h.ca.po
+#~ msgid "_About Ximian Evolution..."
+#~ msgstr "_Quant al Ximian Evolution..."
+
+# fitxer: addressbook.gui.component.ca.po
 #~ msgid "Evolution Addressbook folder viewer"
 #~ msgstr "Visualitzador de carpetes de la llibreta d'adreces de l'Evolution"
 
@@ -23585,10 +23666,6 @@ msgstr "%s (%d%% complet)"
 #~ msgstr "Adreça _electrònica primària:"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
-#~ msgid "S_pouse:"
-#~ msgstr "Con_juge:"
-
-# fitxer: addressbook.gui.contact-editor.ca.po
 #~ msgid "_Business:"
 #~ msgstr "_Feina:"
 
@@ -23609,10 +23686,6 @@ msgstr "%s (%d%% complet)"
 #~ msgstr "_Mòbil:"
 
 # fitxer: addressbook.gui.contact-editor.ca.po
-#~ msgid "_Office:"
-#~ msgstr "_Oficina:"
-
-# fitxer: addressbook.gui.contact-editor.ca.po
 #~ msgid "_Public Calendar URL:"
 #~ msgstr "URL del calendari _públic:"
 
diff --git a/po/cs.po b/po/cs.po
index 79ec6e95e0..b23f5d4817 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -8,14 +8,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-27 03:14+0200\n"
+"POT-Creation-Date: 2004-06-03 11:14-0400\n"
 "PO-Revision-Date: 2004-05-27 13:56+0200\n"
 "Last-Translator: Miloslav Trmac <mitr@volny.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
@@ -134,20 +134,16 @@ msgid "Migrating `%s':"
 msgstr "Převádím `%s':"
 
 #. create the local source group
-#. On This Computer is always first and VFolders is always last
-#: addressbook/gui/component/addressbook-migrate.c:508
+#: addressbook/gui/component/addressbook-migrate.c:464
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
 #: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
-#: mail/mail-component.c:233 mail/mail-vfolder.c:218
+#: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr "V tomto počítači"
 
 #. Create the default Person addressbook
-#. Create the default Person calendar
-#. Create the default Person task list
-#. orange
-#: addressbook/gui/component/addressbook-migrate.c:516
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
 #: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
 #: mail/mail-config.glade.h:109
@@ -155,19 +151,19 @@ msgid "Personal"
 msgstr "Osobní"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:524
+#: addressbook/gui/component/addressbook-migrate.c:480
 msgid "On LDAP Servers"
 msgstr "Na serverech LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:652
+#: addressbook/gui/component/addressbook-migrate.c:608
 msgid "LDAP Servers"
 msgstr "Servery LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:772
+#: addressbook/gui/component/addressbook-migrate.c:728
 msgid "Autocompletion Settings"
 msgstr "Nastavení automatického dokončování"
 
-#: addressbook/gui/component/addressbook-migrate.c:1148
+#: addressbook/gui/component/addressbook-migrate.c:1104
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -179,7 +175,7 @@ msgstr ""
 "\n"
 "Počkejte prosím, než Evolution převede vaše složky..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1162
+#: addressbook/gui/component/addressbook-migrate.c:1118
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -189,7 +185,7 @@ msgstr ""
 "\n"
 "Počkejte prosím, než Evolution převede vaše složky..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1171
+#: addressbook/gui/component/addressbook-migrate.c:1127
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -199,7 +195,7 @@ msgstr ""
 "\n"
 "Počkejte prosím, než Evolution převede vaše složky..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1181
+#: addressbook/gui/component/addressbook-migrate.c:1137
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -209,14 +205,6 @@ msgstr ""
 "\n"
 "Počkejte prosím, než Evolution převede vaše data pro synchronizaci s Palm..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1194
-msgid ""
-"Some fields are no longer representable in the contact editor. Please wait "
-"while Evolution copies those fields to the 'Notes' field..."
-msgstr ""
-"Některá pole již v editoru kontaktů nelze reprezentovat. Počkejte prosím, "
-"než Evolution zkopíruje tato pole do pole 'Poznámky'..."
-
 #: addressbook/gui/component/addressbook-view.c:675
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
@@ -228,7 +216,7 @@ msgstr "Nový adresář"
 
 #: addressbook/gui/component/addressbook-view.c:755
 #: addressbook/gui/widgets/e-addressbook-view.c:1088
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:365
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
 #: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
@@ -237,7 +225,7 @@ msgid "Delete"
 msgstr "Odstranit"
 
 #: addressbook/gui/component/addressbook-view.c:756
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Vlastnosti..."
 
@@ -321,10 +309,6 @@ msgid "Manage your S/MIME certificates here"
 msgstr "Zde spravujte vaše certifikáty S/MIME"
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-msgid "  S_how Supported Bases "
-msgstr "  Zo_brazit podporované základy "
-
-#: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -346,182 +330,149 @@ msgstr "  Zo_brazit podporované základy "
 msgid "*"
 msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr "1"
 
-#: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1:00"
-msgstr "1:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr "5"
 
-#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
-msgstr "5:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "<b>Authentication</b>"
 msgstr "<b>Autentizace/<b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Display</b>"
 msgstr "<b>Zobrazení</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "<b>Downloading</b>"
 msgstr "<b>Stahování</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "<b>Searching</b>"
 msgstr "<b>Hledání</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:11
 msgid "<b>Server Information</b>"
 msgstr "<b>Informace o serveru</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:12
 msgid "<b>Type:</b>"
 msgstr "<b>Typ:</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add Contacts Group"
 msgstr "Přidat skupinu kontaktů"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Address Book Properties"
 msgstr "Vlastnosti adresáře"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:42
 msgid "Always"
 msgstr "Vždy"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr "Anonymně"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:17
 #: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Základní"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
-msgid "Connecting"
-msgstr "Připojení"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 #: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Podrobnosti"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
-msgid "Distinguished _name:"
-msgstr "Distinguished _name:"
-
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished name"
 msgstr "Distinguished name"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Download limit:"
 msgstr "Omezení stahování:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Email address"
 msgstr "E-mailová adresa"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "Email address:"
-msgstr "E-mailová adresa:"
-
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "Evolution will use this DN to authenticate you with the server"
-msgstr "Evolution bude používat toto DN k vaší autentizaci u serveru"
-
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:22
+#, fuzzy
 msgid ""
-"Evolution will use this email address to authenticate you with the server"
+"Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "Evolution bude používat tuto e-mailovou adresu k vaší autentizaci u serveru"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Find Possible Search Bases"
 msgstr "Hledat možné základy vyhledávání"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:24
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Obecné"
 
-#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
+#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:102
 msgid "Never"
 msgstr "Nikdy"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
-msgid "One"
-msgstr "Jeden"
-
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Only locations within starting point"
 msgstr "Jen umístění v počátečním bodě"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
-msgid "S_earch scope: "
-msgstr "_Rozsah vyhledávání: "
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Search _base:"
+msgstr "Základ vyhledávání:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:28
 msgid "Search base only"
 msgstr "Jen základ vyhledávání"
 
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid "Search base:"
 msgstr "Základ vyhledávání:"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid "Search scope:"
 msgstr "Rozsah vyhledávání:"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
-msgid "Searching"
-msgstr "Vyhledávání"
-
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:31
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
-"server if\n"
-"your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL or TLS."
 msgstr ""
 "Po výběru této volby se Evolution k serveru LDAP připojí pouze tehdy,\n"
 "pokud LDAP server podporuje SSL nebo TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a \n"
-"insecure environment. For example, if you and your LDAP server are behind a "
-"firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection "
-"is already\n"
-"secure."
+"you are in a insecure environment. For example, if you and your LDAP server "
+"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
+"because your connection is already secure."
 msgstr ""
 "Po výběru této volby bude Evolution používat SSL/TLS, jen pokud se "
 "nacházíte\n"
@@ -530,50 +481,44 @@ msgstr ""
 "v práci za firewallem, není třeba použít SSL/TLS, protože spojení je již "
 "bezpečné."
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:33
+#, fuzzy
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
-"TLS.  This \n"
-"means that your connection will be insecure, and that you will be vulnerable "
-"to security\n"
-"exploits. "
+"TLS.  This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits. "
 msgstr ""
 "Výběr této volby znamená, že váš server nepodporuje SSL ani TLS. To "
 "znamená,\n"
 "že vaše spojení nebude zabezpečené a můžete se stát terčem bezpečnostního "
 "útoku."
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Starting point and locations within it"
 msgstr "Počáteční bod a umístění v něm"
 
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Sub"
-msgstr "Sub"
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr "Podporované základy vyhledávání"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
-"searches will \n"
-"begin. If you leave this blank, the search will begin at the root of the "
-"directory tree."
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
 msgstr ""
 "Základ vyhledávání je distinguished name (DN) záznamu, kde bude začínat\n"
 "vaše hledání. Pokud je ponecháte prázdné, prohledávání začne v kořeni "
 "adresářového stromu."
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:37
+#, fuzzy
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
-"the \n"
-"directory tree. A search scope of \"sub\" will include all entries below "
-"your search base.\n"
-"A search scope of \"one\" will only include the entries one level beneath "
-"your base.\n"
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
 msgstr ""
 "Rozsah vyhledávání označuje, jak hluboko ve stromu chcete hledat.\n"
 "Rozsah vyhledávání \"sub\" zahrnuje všechny záznamy pod základem "
@@ -581,24 +526,24 @@ msgstr ""
 "Rozsah vyhledávání \"jeden\" zahrnuje záznamy jednu úroveň pod základem "
 "vyhledávání.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:58
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 "Toto je plný název vašeho LDAP serveru. Například  \"ldap.mycompany.com\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:39
+#, fuzzy
 msgid ""
-"This is the maximum number of entries to download. Setting this number to "
-"be \n"
+"This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr ""
 "Toto je maximální počet stahovaných položek. Pokud nastavíte toto číslo "
 "příliš\n"
 "vysoké, zpomalí se váš adresář."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -608,135 +553,114 @@ msgstr ""
 "že použití volby \"E-mailová adresa\" vyžaduje anonymní přístup k serveru "
 "LDAP."
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:41
+#, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
-"list.\n"
-"It is for display purposes only. "
+"list. It is for display purposes only. "
 msgstr ""
 "Toto je jméno pro tento server, které se objeví ve vašem seznamu složek "
 "Evolution.\n"
 "Je pouze pro zobrazování."
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:42
+#, fuzzy
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. "
-"A \n"
-"list of standard ports has been provided. Ask your system administrator\n"
-"what port you should specify."
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
 msgstr ""
 "Toto je port na LDAP serveru, ke kterému se Evolution má připojovat.\n"
 "Seznam standardních portů je předvyplněn. Váš správce systému vám sdělí,\n"
 "které číslo portu máte zadat."
 
-#: addressbook/gui/component/ldap-config.glade.h:67
-msgid "This option controls how long a search will be run."
-msgstr "Tato volba určuje, jak dlouho poběží hledání."
-
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid "Timeout:"
 msgstr "Časový limit:"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
-msgid "U_se SSL/TLS:"
-msgstr "Použít _SSL/TLS:"
-
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr "Použít distinguished name (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr "Použít e-mailovou adresu"
 
-#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
+#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr "Kdykoliv je možné"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:47
 msgid "_Add Contacts Group"
 msgstr "_Přidat skupinu kontaktů"
 
-#: addressbook/gui/component/ldap-config.glade.h:74
-#: calendar/gui/dialogs/calendar-setup.glade.h:12
-msgid "_Display name:"
-msgstr "Zobrazovaný _název:"
-
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr "_Omezení stahování:"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Email address:"
 msgstr "_E-mailová adresa:"
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:50
+#, fuzzy
+msgid "_Find Possible Search Bases"
+msgstr "Hledat možné základy vyhledávání"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Log in method:"
 msgstr "_Metoda přihlášení:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:171
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "_Log in:"
+msgstr "Přihlášení do systému"
+
+#: addressbook/gui/component/ldap-config.glade.h:53
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
 msgid "_Name:"
 msgstr "_Název:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
-msgid "_Port number:"
-msgstr "Číslo _portu:"
-
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid "_Port:"
 msgstr "_Port:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
-msgid "_Search base:"
-msgstr "_Základ vyhledávání:"
-
-#: addressbook/gui/component/ldap-config.glade.h:82
-msgid "_Server name:"
-msgstr "Název _serveru:"
+#: addressbook/gui/component/ldap-config.glade.h:55
+#, fuzzy
+msgid "_Search scope:"
+msgstr "Rozsah vyhledávání:"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:56
 msgid "_Server:"
 msgstr "S_erver:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
-msgid "_Timeout (minutes):"
-msgstr "_Prodleva (minuty):"
+#: addressbook/gui/component/ldap-config.glade.h:57
+#, fuzzy
+msgid "_Timeout:"
+msgstr "Časový limit:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:58
 msgid "_Use secure connection:"
 msgstr "Používat za_bezpečené připojení:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "karty"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
-msgid "connecting-tab"
-msgstr "připojovací-karta"
-
-#: addressbook/gui/component/ldap-config.glade.h:88
-msgid "general-tab"
-msgstr "obecný přehled"
-
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:60
 #: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
 #: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "minut"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
-msgid "searching-tab"
-msgstr "vyhledávací přehled"
-
-#: addressbook/gui/component/select-names/e-select-names.c:492
+#: addressbook/gui/component/select-names/e-select-names.c:503
 #: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid "Select Contacts from Address Book"
 msgstr "Vyberte kontakty z adresáře"
 
-#: addressbook/gui/component/select-names/e-select-names.c:691
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
@@ -842,8 +766,8 @@ msgstr "<b>Práce</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
 #: addressbook/gui/contact-editor/e-contact-editor.c:178
-#: addressbook/gui/widgets/eab-contact-display.c:342
-#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/widgets/eab-contact-display.c:334
+#: addressbook/gui/widgets/eab-contact-display.c:353
 msgid "AIM"
 msgstr "AIM"
 
@@ -878,7 +802,7 @@ msgstr "Společnost:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: addressbook/gui/contact-editor/e-contact-editor.c:266
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
@@ -907,79 +831,77 @@ msgid "Full _Name..."
 msgstr "Celé _jméno..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-msgid "Home"
-msgstr "Domů"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "Home Page:"
 msgstr "Domovská stránka:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-#: calendar/gui/e-itip-control.c:930
-msgid "Location:"
-msgstr "Místo:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "Mailing Address"
 msgstr "Poštovní adresa"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "Manager:"
 msgstr "Vedoucí:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "Ni_ckname:"
 msgstr "_Přezdívka:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "Notes:"
 msgstr "Poznámky:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
-#: addressbook/gui/contact-editor/e-contact-editor.c:197
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-msgid "Other"
-msgstr "Další"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#, fuzzy
+msgid "Office:"
+msgstr "Kancelář"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "PO Box:"
 msgstr "PO Box:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "Personal Information"
 msgstr "Osobní informace"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "Profession:"
 msgstr "Povolání:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#, fuzzy
+msgid "Spouse:"
+msgstr "Partner/-ka"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "State/Province:"
 msgstr "Stát/provincie:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "Title:"
 msgstr "Titul:"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+msgid "Video Chat:"
+msgstr ""
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "Wants to receive HTML mail"
 msgstr "Chce dostávat poštu v HTML"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:42
-msgid "Webcam:"
-msgstr "WWW kamera:"
+#, fuzzy
+msgid "Web Log:"
+msgstr "WWW stránka:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
@@ -1003,17 +925,10 @@ msgid "_File under:"
 msgstr "_Uložit jako:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "_Where:"
 msgstr "_Kde:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
-msgid "item7"
-msgstr "item7"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
-msgid "item8"
-msgstr "item8"
-
 #: addressbook/gui/contact-editor/eab-editor.c:315
 msgid ""
 "Are you sure you want\n"
@@ -1031,8 +946,8 @@ msgstr ""
 "odstranit tento kontakt?"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:351
-#: addressbook/gui/widgets/eab-contact-display.c:372
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Address"
 msgstr "Adresa"
 
@@ -1040,7 +955,7 @@ msgstr "Adresa"
 #: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard.c:174
@@ -2020,27 +1935,27 @@ msgstr "Zimbabwe"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:179
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:337
+#: addressbook/gui/widgets/eab-contact-display.c:356
 msgid "Jabber"
 msgstr "Jabber"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:347
-#: addressbook/gui/widgets/eab-contact-display.c:366
+#: addressbook/gui/widgets/eab-contact-display.c:339
+#: addressbook/gui/widgets/eab-contact-display.c:358
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/widgets/eab-contact-display.c:338
+#: addressbook/gui/widgets/eab-contact-display.c:357
 msgid "MSN"
 msgstr "MSN"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:344
-#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#: addressbook/gui/widgets/eab-contact-display.c:355
 msgid "ICQ"
 msgstr "ICQ"
 
@@ -2048,6 +1963,16 @@ msgstr "ICQ"
 msgid "GroupWise"
 msgstr "GroupWise"
 
+#: addressbook/gui/contact-editor/e-contact-editor.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+msgid "Home"
+msgstr "Domů"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+msgid "Other"
+msgstr "Další"
+
 #: addressbook/gui/contact-editor/e-contact-editor.c:252
 msgid "Source Book"
 msgstr "Zdrojový adresář"
@@ -2068,20 +1993,20 @@ msgstr "Zapisovatelná pole"
 msgid "Changed"
 msgstr "Změněno"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2297
+#: addressbook/gui/contact-editor/e-contact-editor.c:2352
 msgid "This contact belongs to these categories:"
 msgstr "Tento kontakt patří do těchto kategorií"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2374
+#: addressbook/gui/contact-editor/e-contact-editor.c:2429
 msgid "Please select an image for this contact"
 msgstr "Zvolte prosím obrázek pro tento kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2378
+#: addressbook/gui/contact-editor/e-contact-editor.c:2433
 msgid "No image"
 msgstr "Žádný obrázek"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2581
+#: addressbook/gui/contact-editor/e-contact-editor.c:2636
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2089,22 +2014,22 @@ msgstr ""
 "Data kontaktu nejsou platná:\n"
 "\n"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2609
+#: addressbook/gui/contact-editor/e-contact-editor.c:2664
 msgid "Invalid contact."
 msgstr "Neplatný kontakt."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2668
+#: addressbook/gui/contact-editor/e-contact-editor.c:2723
 msgid ""
 "The contact cannot be saved to the selected address book. Do you want to "
 "discard changes?"
 msgstr "Kontakt nelze uložit do vybraného adresáře. Chcete změny zahodit?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2672
-#: addressbook/gui/contact-editor/e-contact-editor.c:2696
+#: addressbook/gui/contact-editor/e-contact-editor.c:2727
+#: addressbook/gui/contact-editor/e-contact-editor.c:2751
 msgid "_Discard"
 msgstr "Za_hodit"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2691
+#: addressbook/gui/contact-editor/e-contact-editor.c:2746
 msgid ""
 "You are moving the contact from one address book to another, but it cannot "
 "be removed from the source. Do you want to save a copy instead?"
@@ -2288,11 +2213,11 @@ msgstr "Název _seznamu:"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Napište e-mailovou adresu nebo přetáhněte kontakt do seznamu níže:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "contact-list-editor"
 msgstr "editor-seznamu-kontaktů"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:153
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
 #: addressbook/gui/widgets/e-addressbook-view.c:217
@@ -2301,17 +2226,17 @@ msgstr "editor-seznamu-kontaktů"
 msgid "Book"
 msgstr "Kniha"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
 msgid "Is New List"
 msgstr "Nový seznam"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:215
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
 msgid "Contact List Editor"
 msgstr "Editor seznamu kontaktů"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:438
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
 msgid "Save List as VCard"
 msgstr "Uložit seznam jako VCard"
 
@@ -2358,91 +2283,91 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Pokročilé vyhledávání"
 
-#: addressbook/gui/widgets/eab-contact-display.c:129
-#: addressbook/gui/widgets/eab-contact-display.c:192
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
 msgid "(map)"
 msgstr "(mapa)"
 
-#: addressbook/gui/widgets/eab-contact-display.c:139
-#: addressbook/gui/widgets/eab-contact-display.c:205
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
 msgid "map"
 msgstr "mapa"
 
-#: addressbook/gui/widgets/eab-contact-display.c:257
-#: addressbook/gui/widgets/eab-contact-display.c:533
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:525
 msgid "List Members"
 msgstr "Členové seznamu"
 
-#: addressbook/gui/widgets/eab-contact-display.c:329
-#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/eab-contact-display.c:321
+#: addressbook/gui/widgets/eab-contact-display.c:323
 msgid "E-mail"
 msgstr "E-mail"
 
-#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/eab-contact-display.c:332
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organizace"
 
-#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "Position"
 msgstr "Pozice"
 
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:354
 msgid "Groupwise"
 msgstr "Groupwise"
 
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:340
 msgid "Video Conferencing"
 msgstr "Videokonference:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:349
-#: addressbook/gui/widgets/eab-contact-display.c:370
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Phone"
 msgstr "Telefon"
 
-#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:342
 msgid "Fax"
 msgstr "Fax"
 
-#: addressbook/gui/widgets/eab-contact-display.c:354
+#: addressbook/gui/widgets/eab-contact-display.c:346
 msgid "work"
 msgstr "pracovní"
 
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:359
 msgid "WWW"
 msgstr "WWW"
 
-#: addressbook/gui/widgets/eab-contact-display.c:368
-#: addressbook/gui/widgets/eab-contact-display.c:587
+#: addressbook/gui/widgets/eab-contact-display.c:360
+#: addressbook/gui/widgets/eab-contact-display.c:579
 msgid "Blog"
 msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/eab-contact-display.c:363
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Mobilní telefon"
 
-#: addressbook/gui/widgets/eab-contact-display.c:375
+#: addressbook/gui/widgets/eab-contact-display.c:367
 msgid "personal"
 msgstr "osobní"
 
-#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/eab-contact-display.c:374
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Poznámka"
 
-#: addressbook/gui/widgets/eab-contact-display.c:548
+#: addressbook/gui/widgets/eab-contact-display.c:540
 msgid "Job Title"
 msgstr "Název pozice"
 
-#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/eab-contact-display.c:544
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:774
+#: smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "E-mail"
 
-#: addressbook/gui/widgets/eab-contact-display.c:579
+#: addressbook/gui/widgets/eab-contact-display.c:571
 msgid "Home page"
 msgstr "Pager domů"
 
@@ -2559,7 +2484,10 @@ msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
 "you want to use LDAP in Evolution, you must install an LDAP-enabled "
 "Evolution package."
-msgstr "Tato verze Evolution v sobě nemá zakompilovanou podporu LDAP. Pokud chcete LDAP v Evolution používat, nainstalovar balíček Evolution, ve kterém je povolen LDAP."
+msgstr ""
+"Tato verze Evolution v sobě nemá zakompilovanou podporu LDAP. Pokud chcete "
+"LDAP v Evolution používat, nainstalovar balíček Evolution, ve kterém je "
+"povolen LDAP."
 
 #: addressbook/gui/widgets/eab-gui-util.c:109
 msgid ""
@@ -2804,13 +2732,13 @@ msgid "Email begins with"
 msgstr "E-mail začíná na"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:165
-#: calendar/gui/cal-search-bar.c:57
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Kategorie je"
 
 #. We attach subitems below
 #: addressbook/gui/widgets/e-addressbook-view.c:166
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Jakékoliv políčko obsahuje"
 
@@ -2822,7 +2750,7 @@ msgstr "Pokročilé..."
 #: addressbook/gui/widgets/e-addressbook-view.c:238
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:250
+#: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Typ"
@@ -2900,7 +2828,7 @@ msgid "Cut"
 msgstr "Vyjmout"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
@@ -2912,13 +2840,13 @@ msgid "Paste"
 msgstr "Vložit"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1092
-#: calendar/gui/e-calendar-view.c:1277
+#: calendar/gui/e-calendar-view.c:1280
 msgid "Current View"
 msgstr "Aktuální zobrazení"
 
 #. All, unmatched, separator
 #: addressbook/gui/widgets/e-addressbook-view.c:1665
-#: calendar/gui/cal-search-bar.c:362
+#: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Jakákoliv kategorie"
 
@@ -3024,7 +2952,7 @@ msgstr "Rádio"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:257
+#: calendar/gui/e-meeting-list-view.c:234
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Funkce"
@@ -3132,17 +3060,17 @@ msgstr "Zobrazení karty"
 msgid "GTK Tree View"
 msgstr "GTK Tree View"
 
-#: addressbook/gui/widgets/test-reflow.c:119
+#: addressbook/gui/widgets/test-reflow.c:106
 msgid "Reflow Test"
 msgstr "Test přeformátování"
 
-#: addressbook/gui/widgets/test-reflow.c:120
+#: addressbook/gui/widgets/test-reflow.c:107
 #: addressbook/printing/test-contact-print-style-editor.c:54
 #: addressbook/printing/test-print.c:53
 msgid "Copyright (C) 2000, Ximian, Inc."
 msgstr "Copyright © 2000, Ximian, Inc."
 
-#: addressbook/gui/widgets/test-reflow.c:122
+#: addressbook/gui/widgets/test-reflow.c:109
 msgid "This should test the reflow canvas item"
 msgstr "Toto by mělo otestovat položku canvasu přeformátování"
 
@@ -3750,7 +3678,7 @@ msgstr "Vyčistit události starší než"
 
 #: calendar/gui/calendar-commands.c:363
 #: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:19 filter/filter.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
 msgid "days"
 msgstr "dnů"
 
@@ -3760,10 +3688,6 @@ msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. %d = day of month, %b = abbreviated month name.
-#. You can change the order but don't change the
-#. specifiers or add anything.
 #: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
 #: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
 #: calendar/gui/e-week-view-main-item.c:329
@@ -3900,23 +3824,23 @@ msgstr "Zobrazení týdne"
 msgid "Month View"
 msgstr "Zobrazení měsíce"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Přehled obsahuje"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Popis obsahuje"
 
-#: calendar/gui/cal-search-bar.c:54
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Komentář obsahuje"
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:53
 msgid "Location contains"
 msgstr "Umístění obsahuje"
 
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:327
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
 msgid "Unmatched"
 msgstr "Nepřiřazené"
 
@@ -3989,7 +3913,7 @@ msgstr "Komu poslat:"
 msgid "With these arguments:"
 msgstr "S těmito parametry:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
 msgid "dialog1"
 msgstr "dialog1"
 
@@ -3998,7 +3922,7 @@ msgid "extra times every"
 msgstr "krát navíc každých"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:20 filter/filter.glade.h:16
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr "hodin"
 
@@ -4044,7 +3968,7 @@ msgstr "Poslat e-mail"
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:921 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Shrnutí"
 
@@ -4074,7 +3998,6 @@ msgid "hour(s)"
 msgstr "hodin"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:21
 msgid "minute(s)"
 msgstr "minut"
 
@@ -4096,12 +4019,12 @@ msgstr "Zdrojové umístění `%s' nemá správný tvar."
 msgid "The source location '%s' is not a webcal source."
 msgstr "Zdrojové umístění '%s' není zdroj webcal."
 
-#: calendar/gui/dialogs/calendar-setup.c:264
+#: calendar/gui/dialogs/calendar-setup.c:275
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr "Ve vybrané skupině již existuje zdroj s názvem '%s'"
 
-#: calendar/gui/dialogs/calendar-setup.c:277
+#: calendar/gui/dialogs/calendar-setup.c:288
 #, c-format
 msgid ""
 "The group '%s' is remote. You must specify a location to get the calendar "
@@ -4120,51 +4043,31 @@ msgstr "Přidat skupinu úkolů"
 msgid "C_olor:"
 msgstr "_Barva:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "Calendar Properties"
-msgstr "Vlastnosti kalendáře"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:110
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
 msgid "Pick a color"
 msgstr "Vyberte barvu"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:8
-msgid "Remote"
-msgstr "Vzdálený"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "Task List Properties"
-msgstr "Vlastnosti seznamů úkolů"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
 msgid "_Add Calendar"
 msgstr "_Přidat kalendář"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
 msgid "_Add Group"
 msgstr "_Přidat skupinu"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-msgid "_Refresh Interval:"
-msgstr "_Interval obnovování:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
 msgid "_Refresh:"
 msgstr "_Obnovit:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-msgid "_Source URL:"
-msgstr "_URL zdroje:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "_Type:"
 msgstr "_Typ:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
 msgid "_URL:"
 msgstr "_URL:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
 msgid "weeks"
 msgstr "týdnů"
 
@@ -4276,7 +4179,7 @@ msgstr "Zveřejňování volného/obsazeného času"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:557
+#: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "pátek"
 
@@ -4290,7 +4193,7 @@ msgstr "minut"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:553
+#: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "pondělí"
 
@@ -4300,7 +4203,7 @@ msgstr "_ne"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "sobota"
 
@@ -4314,7 +4217,7 @@ msgstr "Zobrazovat čísla _týdnů v měsíčním přehledu"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:552
+#: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "neděle"
 
@@ -4328,7 +4231,7 @@ msgstr "_čt"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:556
+#: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "čtvrtek"
 
@@ -4342,7 +4245,7 @@ msgstr "Formát času:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:554
+#: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "úterý"
 
@@ -4352,7 +4255,7 @@ msgstr "_Týden začíná:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:555
+#: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "středa"
 
@@ -4511,7 +4414,7 @@ msgid "No summary"
 msgstr "Není shrnutí"
 
 #: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
 #: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Uložit jako..."
@@ -4740,13 +4643,8 @@ msgid "_Start time:"
 msgstr "_Začátek:"
 
 #. an empty string is the same as 'None'
-#. add a "None" option to the stores menu
-#. Put the "None" and "UTC" entries at the top of the combo's list.
-#. When "None" is selected we want the field to be cleared.
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
 #: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:3
+#: calendar/gui/dialogs/meeting-page.glade.h:4
 #: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
 #: filter/filter-rule.c:877 mail/em-account-prefs.c:427
 #: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
@@ -4776,8 +4674,8 @@ msgstr "_Postoupit komu..."
 #. FIXME: need to disable for undeletable folders
 #: calendar/gui/dialogs/meeting-page.c:655
 #: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1310 calendar/gui/e-calendar-view.c:1342
-#: mail/em-folder-tree.c:2537 mail/em-folder-view.c:919
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
+#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -4785,7 +4683,7 @@ msgid "_Delete"
 msgstr "_Odstranit"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:241
+#: calendar/gui/e-meeting-list-view.c:218
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Účastník"
@@ -4821,14 +4719,14 @@ msgid "Member"
 msgstr "Člen"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1048 calendar/gui/e-meeting-list-view.c:264
+#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:271
+#: calendar/gui/e-meeting-list-view.c:248
 #: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Stav"
@@ -4837,20 +4735,20 @@ msgstr "Stav"
 msgid "Add A_ttendee"
 msgstr "Přidat _účastníka"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "Add attendees from addressbook."
+msgstr "Přidat odesílatele do _adresáře"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Organizátor:"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
+#: calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "_Change Organizer"
 msgstr "_Změnit organizátora"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-#: calendar/gui/e-meeting-time-sel.c:417
-msgid "_Invite Others..."
-msgstr "_Pozvat další..."
-
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
 msgstr "<b>Možnosti kalendáře</b>"
@@ -5139,7 +5037,7 @@ msgstr "Dů_věrné"
 
 #: calendar/gui/dialogs/task-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:976 calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Popis:"
@@ -5308,7 +5206,7 @@ msgstr "Termín dokončení:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:944
+#: calendar/gui/e-itip-control.c:943
 msgid "Status:"
 msgstr "Stav"
 
@@ -5392,12 +5290,12 @@ msgstr "Obsazený"
 msgid "Deleting selected objects"
 msgstr "Odstraňuji vybrané objekty"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
 msgid "Updating objects"
 msgstr "Aktualizuji objekty"
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1370
+#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
 #: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Otevřít"
@@ -5407,15 +5305,15 @@ msgid "Open _Web Page"
 msgstr "Otevřít _WWW stránku"
 
 #: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1291 calendar/gui/e-calendar-view.c:1376
+#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
 #: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "_Uložit jako..."
 
 #: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1292
-#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
+#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
@@ -5423,15 +5321,15 @@ msgid "_Print..."
 msgstr "_Tisknout..."
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Vyjmout"
 
 #: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1338
-#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2530
+#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
+#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
 #: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
@@ -5439,8 +5337,8 @@ msgid "_Copy"
 msgstr "_Kopírovat"
 
 #: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1273 calendar/gui/e-calendar-view.c:1299
-#: calendar/gui/e-calendar-view.c:1372 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
+#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
@@ -5506,67 +5404,67 @@ msgstr "Přehled"
 msgid "Task sort"
 msgstr "Třídění úkolů"
 
-#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
 msgid "New _Appointment..."
 msgstr "Nová _událost..."
 
-#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
+#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
 msgid "New All Day _Event"
 msgstr "Nová _celodenní událost"
 
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
+#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
 msgid "New Meeting"
 msgstr "Nová schůzka"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
 msgid "New Task"
 msgstr "Nový úkol"
 
-#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "Vybrat _dnešek"
 
-#: calendar/gui/e-calendar-view.c:1280
+#: calendar/gui/e-calendar-view.c:1283
 msgid "_Select Date..."
 msgstr "_Vybrat datum..."
 
-#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Zveřejnit informaci o volném/obsazeném čase"
 
-#: calendar/gui/e-calendar-view.c:1303
+#: calendar/gui/e-calendar-view.c:1306
 msgid "Cop_y to Calendar..."
 msgstr "_Kopírovat do kalendáře..."
 
-#: calendar/gui/e-calendar-view.c:1304
+#: calendar/gui/e-calendar-view.c:1307
 msgid "Mo_ve to Calendar..."
 msgstr "Pře_sunout do kalendáře..."
 
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1308
 msgid "_Schedule Meeting..."
 msgstr "_Naplánovat schůzku..."
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1309
 msgid "_Forward as iCalendar..."
 msgstr "_Odeslat jako iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
 msgid "Delete this _Occurrence"
 msgstr "Odstranit tento vý_skyt"
 
-#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
 msgid "Delete _All Occurrences"
 msgstr "Odstranit _všechny výskyty"
 
-#: calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1349
 msgid "Go to _Today"
 msgstr "Jít na _dnešek"
 
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1351
 msgid "_Go to Date..."
 msgstr "_Jít na datum..."
 
-#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "Na_stavení..."
 
@@ -5580,9 +5478,9 @@ msgstr "Začátek"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:961 calendar/gui/e-itip-control.c:1163
-#: calendar/gui/e-meeting-list-view.c:145
-#: calendar/gui/e-meeting-list-view.c:159 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
 #: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
 #: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
 #: camel/camel-tcp-stream-openssl.c:631
@@ -5608,13 +5506,13 @@ msgid "Assigned"
 msgstr "Přiřazeno"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr "Ano"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:170 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "Ne"
 
@@ -5626,7 +5524,7 @@ msgstr "S"
 msgid "S"
 msgstr "J"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
 msgid "E"
 msgstr "V"
 
@@ -5645,20 +5543,12 @@ msgstr ""
 "\"45.436845,125.862501\""
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format.
 #: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
@@ -5689,10 +5579,6 @@ msgstr "pm"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#. strftime format %A = full weekday name, %d = day of
-#. month, %B = full month name. You can change the
-#. order but don't change the specifiers or add
-#. anything.
 #: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
@@ -5700,9 +5586,6 @@ msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#. strftime format %d = day of month, %b = abbreviated
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
 #: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
@@ -5713,11 +5596,11 @@ msgstr "%d %b"
 msgid "%02i minute divisions"
 msgstr "%02i rozdělení minuty"
 
-#: calendar/gui/e-itip-control.c:586
+#: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
 msgstr "Ano. (Komplexní opakování)"
 
-#: calendar/gui/e-itip-control.c:597
+#: calendar/gui/e-itip-control.c:596
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
@@ -5725,7 +5608,7 @@ msgstr[0] "Každý %d den"
 msgstr[1] "Každé %d dny"
 msgstr[2] "Každých %d dnů"
 
-#: calendar/gui/e-itip-control.c:602
+#: calendar/gui/e-itip-control.c:601
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
@@ -5733,7 +5616,7 @@ msgstr[0] "Každý %d týden"
 msgstr[1] "Každé %d týdny"
 msgstr[2] "Každých %d týdnů"
 
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:603
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -5741,21 +5624,21 @@ msgstr[0] "Každý %d týden v "
 msgstr[1] "Každé %d týdny v "
 msgstr[2] "Každých %d týdnů v "
 
-#: calendar/gui/e-itip-control.c:612
+#: calendar/gui/e-itip-control.c:611
 msgid " and "
 msgstr " a "
 
-#: calendar/gui/e-itip-control.c:619
+#: calendar/gui/e-itip-control.c:618
 #, c-format
 msgid "The %s day of "
 msgstr "%s. den "
 
-#: calendar/gui/e-itip-control.c:632
+#: calendar/gui/e-itip-control.c:631
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s "
 
-#: calendar/gui/e-itip-control.c:639
+#: calendar/gui/e-itip-control.c:638
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
@@ -5763,7 +5646,7 @@ msgstr[0] "každý %d měsíc"
 msgstr[1] "každé %d měsíce"
 msgstr[2] "každých %d měsíců"
 
-#: calendar/gui/e-itip-control.c:643
+#: calendar/gui/e-itip-control.c:642
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
@@ -5771,7 +5654,7 @@ msgstr[0] "Každý %d rok"
 msgstr[1] "Každé %d roky"
 msgstr[2] "Každých %d roků"
 
-#: calendar/gui/e-itip-control.c:654
+#: calendar/gui/e-itip-control.c:653
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
@@ -5779,42 +5662,42 @@ msgstr[0] " celkem %dkrát"
 msgstr[1] " celkem %dkrát"
 msgstr[2] " celkem %dkrát"
 
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:662
 msgid ", ending on "
 msgstr ", konec "
 
-#: calendar/gui/e-itip-control.c:687
+#: calendar/gui/e-itip-control.c:686
 msgid "<b>Starts:</b> "
 msgstr "<b>Začíná:</b>"
 
-#: calendar/gui/e-itip-control.c:697
+#: calendar/gui/e-itip-control.c:696
 msgid "<b>Ends:</b> "
 msgstr "<b>Končí:</b>"
 
-#: calendar/gui/e-itip-control.c:717
+#: calendar/gui/e-itip-control.c:716
 msgid "<b>Completed:</b> "
 msgstr "<b>Úkol splněn:</b>"
 
-#: calendar/gui/e-itip-control.c:727
+#: calendar/gui/e-itip-control.c:726
 msgid "<b>Due:</b> "
 msgstr "<b>Splnění:</b>"
 
-#: calendar/gui/e-itip-control.c:765 calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
 msgid "iCalendar Information"
 msgstr "Informace iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:781
 msgid "iCalendar Error"
 msgstr "Chyba iCalendar"
 
-#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
-#: calendar/gui/e-itip-control.c:880 calendar/gui/e-itip-control.c:897
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
 msgid "An unknown person"
 msgstr "Neznámá osoba"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:904
+#: calendar/gui/e-itip-control.c:903
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5822,303 +5705,307 @@ msgstr ""
 "Prohlédněte si, prosím, následující informaci a poté vyberte akci z uvedené "
 "nabídky"
 
-#: calendar/gui/e-itip-control.c:919
+#: calendar/gui/e-itip-control.c:918
 msgid "<i>None</i>"
 msgstr "<i>Žádná</i>"
 
-#: calendar/gui/e-itip-control.c:949 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:929
+msgid "Location:"
+msgstr "Místo:"
+
+#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Akceptováno"
 
-#: calendar/gui/e-itip-control.c:953 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Předběžně akceptováno"
 
-#: calendar/gui/e-itip-control.c:957 calendar/gui/e-meeting-list-view.c:182
+#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Zamítnuto"
 
-#: calendar/gui/e-itip-control.c:1016 calendar/gui/e-itip-control.c:1044
-#: calendar/gui/e-itip-control.c:1070 calendar/gui/e-itip-control.c:1083
-#: calendar/gui/e-itip-control.c:1096 calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
 msgid "Choose an action:"
 msgstr "Vybrat akci:"
 
-#: calendar/gui/e-itip-control.c:1017
+#: calendar/gui/e-itip-control.c:1016
 msgid "Update"
 msgstr "Zaktualizovat"
 
-#: calendar/gui/e-itip-control.c:1018 calendar/gui/e-itip-control.c:1049
-#: calendar/gui/e-itip-control.c:1072 calendar/gui/e-itip-control.c:1085
-#: calendar/gui/e-itip-control.c:1098 calendar/gui/e-itip-control.c:1111
-#: shell/e-shell.c:1132 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
+#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1044
 msgid "Accept"
 msgstr "Akceptovat"
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1045
 msgid "Tentatively accept"
 msgstr "Předběžně akceptovat"
 
-#: calendar/gui/e-itip-control.c:1047
+#: calendar/gui/e-itip-control.c:1046
 msgid "Decline"
 msgstr "Odmítnout"
 
-#: calendar/gui/e-itip-control.c:1071
+#: calendar/gui/e-itip-control.c:1070
 msgid "Send Free/Busy Information"
 msgstr "Poslat informaci o volném/obsazeném čase"
 
-#: calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1083
 msgid "Update respondent status"
 msgstr "Aktualizovat stav respondenta"
 
-#: calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1096
 msgid "Send Latest Information"
 msgstr "Poslat nejnovější informace"
 
-#: calendar/gui/e-itip-control.c:1110 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1185
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> zveřejnil(-a) informaci o schůzce."
 
-#: calendar/gui/e-itip-control.c:1187
+#: calendar/gui/e-itip-control.c:1186
 msgid "Meeting Information"
 msgstr "Informace o schůzce"
 
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1191
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> požaduje účast %s na schůzce."
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1193
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> požaduje vaši účast na schůzce."
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1194
 msgid "Meeting Proposal"
 msgstr "Návrh na schůzku"
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> si přeje být přidán(-a) na existující schůzku."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Update"
 msgstr "Aktualizace schůzky"
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1203
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> si přeje obdržet nejnovější informaci o schůzce."
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1204
 msgid "Meeting Update Request"
 msgstr "Požadavek na aktualizaci schůzky"
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> odpověděl(-a) na žádost o schůzku."
 
-#: calendar/gui/e-itip-control.c:1213
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Reply"
 msgstr "Odpověď pro schůzku"
 
-#: calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1219
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> zrušil(-a) schůzku."
 
-#: calendar/gui/e-itip-control.c:1221
+#: calendar/gui/e-itip-control.c:1220
 msgid "Meeting Cancellation"
 msgstr "Zrušení schůzky"
 
-#: calendar/gui/e-itip-control.c:1228 calendar/gui/e-itip-control.c:1296
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1330
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> poslal(-a) nesrozumitelnou zprávu."
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1228
 msgid "Bad Meeting Message"
 msgstr "Neplatná zpráva o schůzce"
 
-#: calendar/gui/e-itip-control.c:1254
+#: calendar/gui/e-itip-control.c:1253
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> zveřejnil(-a) informaci o úkolu."
 
-#: calendar/gui/e-itip-control.c:1255
+#: calendar/gui/e-itip-control.c:1254
 msgid "Task Information"
 msgstr "Informace o úkolu"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1259
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> žádá %s o vypracování úkolu."
 
-#: calendar/gui/e-itip-control.c:1262
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> vás žádá, abyste vypracovali úkol."
 
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1262
 msgid "Task Proposal"
 msgstr "Návrh úkolu"
 
-#: calendar/gui/e-itip-control.c:1267
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> si přeje být přidán(-a) k existujícímu úkolu."
 
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Update"
 msgstr "Aktualizovat úkol"
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1271
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> si přeje získat nejnovější informace o úkolu."
 
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1272
 msgid "Task Update Request"
 msgstr "Požadavek na aktualizaci úkolu."
 
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> odpověděl(-a) na přiřazení úkolu."
 
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Reply"
 msgstr "Odpověď pro úkol"
 
-#: calendar/gui/e-itip-control.c:1288
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> zrušil(-a) úkol."
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1288
 msgid "Task Cancellation"
 msgstr "Zrušení úkolu"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1296
 msgid "Bad Task Message"
 msgstr "Zpráva o špatném úkolu"
 
-#: calendar/gui/e-itip-control.c:1316
+#: calendar/gui/e-itip-control.c:1315
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> zveřejnil(-a) informaci o volném/obsazeném čase."
 
-#: calendar/gui/e-itip-control.c:1317
+#: calendar/gui/e-itip-control.c:1316
 msgid "Free/Busy Information"
 msgstr "Informace o volném/obsazeném čase"
 
-#: calendar/gui/e-itip-control.c:1321
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> požaduje vaše informace o volném/obsazeném čase."
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1321
 msgid "Free/Busy Request"
 msgstr "Požadavek na informace o volném/obsazeném čase"
 
-#: calendar/gui/e-itip-control.c:1326
+#: calendar/gui/e-itip-control.c:1325
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 "<b>%s</b> odpověděl(-a) na požadavek na informace o volném/obsazeném čase."
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1326
 msgid "Free/Busy Reply"
 msgstr "Odpověď s informací o volném/zaneprázdněném čase"
 
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1331
 msgid "Bad Free/Busy Message"
 msgstr "Neplatná zpráva o volném/zaneprázdněném čase"
 
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1406
 msgid "The message does not appear to be properly formed"
 msgstr "Zdá se, že zpráva nebyla správně vytvořena."
 
-#: calendar/gui/e-itip-control.c:1466
+#: calendar/gui/e-itip-control.c:1465
 msgid "The message contains only unsupported requests."
 msgstr "Zpráva obsahuje pouze nepodporované požadavky."
 
-#: calendar/gui/e-itip-control.c:1497
+#: calendar/gui/e-itip-control.c:1496
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Příloha neobsahuje platnou zprávu kalendáře"
 
-#: calendar/gui/e-itip-control.c:1529
+#: calendar/gui/e-itip-control.c:1528
 msgid "The attachment has no viewable calendar items"
 msgstr "Příloha nemá žádné zobrazitelné položky kalendáře"
 
-#: calendar/gui/e-itip-control.c:1763
+#: calendar/gui/e-itip-control.c:1762
 msgid "Update complete\n"
 msgstr "Aktualizace dokončena\n"
 
-#: calendar/gui/e-itip-control.c:1793 calendar/gui/e-itip-control.c:1865
+#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Stav účastníka nemůže být aktualizován, protože položka již neexistuje"
 
-#: calendar/gui/e-itip-control.c:1809 calendar/gui/e-itip-control.c:1847
+#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objekt není platný a nemůže být aktualizován\n"
 
-#: calendar/gui/e-itip-control.c:1819
+#: calendar/gui/e-itip-control.c:1818
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Tato reakce není od stávajícího účastníka. Přidat jako účastníka?"
 
-#: calendar/gui/e-itip-control.c:1831
+#: calendar/gui/e-itip-control.c:1830
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Stav účastníka nemůže být aktualizován, protože jeho stav není platný!\n"
 
-#: calendar/gui/e-itip-control.c:1850
+#: calendar/gui/e-itip-control.c:1849
 msgid "There was an error on the CORBA system\n"
 msgstr "Došlo k chybě v systému CORBA\n"
 
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1852
 msgid "Object could not be found\n"
 msgstr "Objekt nelze nalézt\n"
 
-#: calendar/gui/e-itip-control.c:1856
+#: calendar/gui/e-itip-control.c:1855
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Nemáte příslušná práva pro aktualizaci kalendáře\n"
 
-#: calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1858
 msgid "Attendee status updated\n"
 msgstr "Stav účastníka byl zaktualizován\n"
 
-#: calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1861
 msgid "Attendee status could not be updated!\n"
 msgstr "Stav účastníka nelze aktualizovat!\n"
 
-#: calendar/gui/e-itip-control.c:1893
+#: calendar/gui/e-itip-control.c:1892
 msgid "Removal Complete"
 msgstr "Odstranění dokončeno"
 
-#: calendar/gui/e-itip-control.c:1916 calendar/gui/e-itip-control.c:1964
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
 msgid "Item sent!\n"
 msgstr "Položka odeslána!\n"
 
-#: calendar/gui/e-itip-control.c:1918 calendar/gui/e-itip-control.c:1968
+#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
 msgid "The item could not be sent!\n"
 msgstr "Položka nemůže být odeslána!\n"
 
@@ -6159,74 +6046,74 @@ msgstr "datum ukončení"
 msgid "date-start"
 msgstr "datum začátku"
 
-#: calendar/gui/e-meeting-list-view.c:62
+#: calendar/gui/e-meeting-list-view.c:59
 msgid "Chair Persons"
 msgstr "Předsedové"
 
-#: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:480
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
 msgid "Required Participants"
 msgstr "Vyžadovaní účastníci"
 
-#: calendar/gui/e-meeting-list-view.c:64
+#: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Nepovinní účastníci"
 
-#: calendar/gui/e-meeting-list-view.c:65
+#: calendar/gui/e-meeting-list-view.c:62
 msgid "Resources"
 msgstr "Zdroje"
 
-#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
 #: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr "Individuálně"
 
-#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "Skupina"
 
-#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr "Zdroj"
 
-#: calendar/gui/e-meeting-list-view.c:144 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr "Místnost"
 
-#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr "Předseda"
 
-#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:127
 #: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
 msgid "Required Participant"
 msgstr "Vyžadovaný účastník"
 
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr "Nepovinný účastník"
 
-#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr "Bez účasti"
 
-#: calendar/gui/e-meeting-list-view.c:180 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:177
 #: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
 msgid "Needs Action"
 msgstr "Potřeba akce"
 
-#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
 #: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "Předběžné"
 
-#: calendar/gui/e-meeting-list-view.c:184 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr "Delegováno"
@@ -6243,20 +6130,28 @@ msgstr "Mimo kancelář"
 msgid "No Information"
 msgstr "Žádné informace"
 
+#: calendar/gui/e-meeting-time-sel.c:417
+#, fuzzy
+msgid "Add attendees from addressbook"
+msgstr "Přidat odesílatele do _adresáře"
+
 #: calendar/gui/e-meeting-time-sel.c:440
 msgid "_Options"
 msgstr "_Volby"
 
 #: calendar/gui/e-meeting-time-sel.c:457
-msgid "Show _Only Working Hours"
+#, fuzzy
+msgid "Show _only working hours"
 msgstr "Zobrazovat pouze _pracovní hodiny"
 
 #: calendar/gui/e-meeting-time-sel.c:467
-msgid "Show _Zoomed Out"
+#, fuzzy
+msgid "Show _zoomed out"
 msgstr "Zobrazovat z_menšené"
 
 #: calendar/gui/e-meeting-time-sel.c:482
-msgid "_Update Free/Busy"
+#, fuzzy
+msgid "_Update free/busy"
 msgstr "_Aktualizovat volný/obsazený čas"
 
 #: calendar/gui/e-meeting-time-sel.c:497
@@ -6272,19 +6167,23 @@ msgid ">_>"
 msgstr ">_>"
 
 #: calendar/gui/e-meeting-time-sel.c:547
-msgid "_All People and Resources"
+#, fuzzy
+msgid "_All people and resources"
 msgstr "_Všichni lidé a zdroje"
 
 #: calendar/gui/e-meeting-time-sel.c:556
-msgid "All _People and One Resource"
+#, fuzzy
+msgid "All _people and one resource"
 msgstr "Všichni _lidé a jeden zdroj"
 
 #: calendar/gui/e-meeting-time-sel.c:565
-msgid "_Required People"
+#, fuzzy
+msgid "_Required people"
 msgstr "_Nezbytní lidé"
 
 #: calendar/gui/e-meeting-time-sel.c:574
-msgid "Required People and _One Resource"
+#, fuzzy
+msgid "Required people and _one resource"
 msgstr "Nezbytní lidé a _jeden zdroj"
 
 #: calendar/gui/e-meeting-time-sel.c:593
@@ -6304,10 +6203,6 @@ msgstr "%A, %B %d, %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#. This is a strftime() format string %a = abbreviated weekday
-#. name, %m = month number, %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. strftime format of a weekday and a date.
 #: calendar/gui/e-meeting-time-sel.c:2093
 #: calendar/gui/e-meeting-time-sel-item.c:456 e-util/e-time-utils.c:203
 #: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
@@ -6316,10 +6211,6 @@ msgstr "%a %d/%m/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. This is the preferred date format for the locale.
-#. This is a strftime() format for a short date. %m = month,
-#. %d = day of month, %Y = year (all digits).
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
 #: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
 msgid "%m/%d/%Y"
@@ -6330,7 +6221,7 @@ msgstr "%d/%m/%Y"
 msgid "Enter the password for %s"
 msgstr "Zadejte heslo pro %s"
 
-#: calendar/gui/e-tasks.c:585 calendar/gui/gnome-cal.c:2020
+#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6341,12 +6232,12 @@ msgstr ""
 
 #. FIXME Loading should be async
 #. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:680
+#: calendar/gui/e-tasks.c:801
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Otevírám úkoly v %s"
 
-#: calendar/gui/e-tasks.c:703
+#: calendar/gui/e-tasks.c:824
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6355,26 +6246,26 @@ msgstr ""
 "Chyba při otevírání %s:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:724
+#: calendar/gui/e-tasks.c:845
 msgid "Loading tasks"
 msgstr "Načítám úkoly"
 
-#: calendar/gui/e-tasks.c:828
+#: calendar/gui/e-tasks.c:949
 msgid "Completing tasks..."
 msgstr "Dokončuji úkoly..."
 
-#: calendar/gui/e-tasks.c:851
+#: calendar/gui/e-tasks.c:972
 msgid "Deleting selected objects..."
 msgstr "Mažu vybrané objekty..."
 
-#: calendar/gui/e-tasks.c:878
+#: calendar/gui/e-tasks.c:999
 msgid "Expunging"
 msgstr "Čistím"
 
-#: calendar/gui/e-tasks.c:954
+#: calendar/gui/e-tasks.c:1075
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
-#: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
+#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
+#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
 #: calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:705
 msgid "Tasks"
@@ -6591,7 +6482,7 @@ msgid "On The Web"
 msgstr "Na WWW"
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "Nemohu převést stará nastavení z evolution/config.xmldb"
 
@@ -6602,7 +6493,7 @@ msgid "Unable to migrate calendar `%s'"
 msgstr "Nemohu převést kalendář `%s'"
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:869
+#: calendar/gui/migration.c:889
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Nemohu převést úkoly `%s'"
@@ -6838,16 +6729,16 @@ msgstr "Tisknout položku"
 msgid "Print Setup"
 msgstr "Tisknout nastavení"
 
-#: calendar/gui/tasks-component.c:303
+#: calendar/gui/tasks-component.c:313
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr "Seznam úkolů '%s' bude odstraněn. Opravdu chcete pokračovat?"
 
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:371
 msgid "New Task List"
 msgstr "Nový seznam úkolů"
 
-#: calendar/gui/tasks-component.c:398
+#: calendar/gui/tasks-component.c:408
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -6855,7 +6746,7 @@ msgstr[0] "%d úkol"
 msgstr[1] "%d úkoly"
 msgstr[2] "%d úkolů"
 
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:488
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -6863,20 +6754,20 @@ msgstr[0] ", %d vybráno"
 msgstr[1] ", %d vybráno"
 msgstr[2] ", %d vybráno"
 
-#: calendar/gui/tasks-component.c:447
+#: calendar/gui/tasks-component.c:457
 msgid "Failed upgrading tasks."
 msgstr "Nemohu aktualizovat úkoly."
 
-#: calendar/gui/tasks-component.c:526
+#: calendar/gui/tasks-component.c:749
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "Nemohu otevřít seznam úkolů '%s' pro tvorbu událostí a schůzek"
 
-#: calendar/gui/tasks-component.c:538
+#: calendar/gui/tasks-component.c:761
 msgid "There is no calendar available for creating tasks"
 msgstr "Není k dispozici kalendář pro tvorbu úkolů"
 
-#: calendar/gui/tasks-component.c:576
+#: calendar/gui/tasks-component.c:799
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
@@ -6884,27 +6775,27 @@ msgstr ""
 "Vybraný seznam úkolů je jen pro čtení, události nelze vytvářet. Vyberte "
 "prosím kalendář pro čtení i zápis."
 
-#: calendar/gui/tasks-component.c:804
+#: calendar/gui/tasks-component.c:1040
 msgid "New task"
 msgstr "Nový úkol"
 
-#: calendar/gui/tasks-component.c:805
+#: calendar/gui/tasks-component.c:1041
 msgid "_Task"
 msgstr "_Úkol"
 
-#: calendar/gui/tasks-component.c:806
+#: calendar/gui/tasks-component.c:1042
 msgid "Create a new task"
 msgstr "Vytvořit nový úkol"
 
-#: calendar/gui/tasks-component.c:812
+#: calendar/gui/tasks-component.c:1048
 msgid "New tasks group"
 msgstr "Nová skupina úkolů"
 
-#: calendar/gui/tasks-component.c:813
+#: calendar/gui/tasks-component.c:1049
 msgid "_Tasks Group"
 msgstr "_Skupina úkolů"
 
-#: calendar/gui/tasks-component.c:814
+#: calendar/gui/tasks-component.c:1050
 msgid "Create a new tasks group"
 msgstr "Vytvořit novou skupinu úkolů"
 
@@ -8730,15 +8621,15 @@ msgstr "(match-threads) není povoleno uvnitř match-all"
 msgid "(match-threads) requires a match type string"
 msgstr "(match-threads) vyžaduje řetězec s typem porovnávání"
 
-#: camel/camel-folder-search.c:785
+#: camel/camel-folder-search.c:784
 msgid "(match-threads) expects an array result"
 msgstr "(match-threads) očekává jako výsledek pole"
 
-#: camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:790
 msgid "(match-threads) requires the folder set"
 msgstr "(match-threads) vyžaduje nastavenou složku"
 
-#: camel/camel-folder-search.c:880
+#: camel/camel-folder-search.c:879
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Vykonání otázky na neznámé hlavičce: %s"
@@ -8773,7 +8664,8 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
 #: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:705
+#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Zrušeno"
@@ -9534,11 +9426,11 @@ msgstr "Nemohu odstranit složku: %s: Neplatná operace"
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Nemohu přejmenovat složku: %s: Neplatná operace"
 
-#: camel/camel-store.c:809
+#: camel/camel-store.c:777
 msgid "Trash"
 msgstr "Koš"
 
-#: camel/camel-store.c:811 mail/mail-config.glade.h:95
+#: camel/camel-store.c:779 mail/mail-config.glade.h:95
 #: ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Smetí"
@@ -9986,7 +9878,7 @@ msgstr "IMAP služba pro %s na %s"
 #: camel/providers/imap/camel-imap-store.c:551
 #: camel/providers/imap/camel-imap-store.c:571
 #: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
+#: camel/providers/nntp/camel-nntp-store.c:209
 #: camel/providers/pop3/camel-pop3-store.c:175
 #: camel/providers/smtp/camel-smtp-transport.c:269
 #: camel/providers/smtp/camel-smtp-transport.c:285
@@ -10005,8 +9897,8 @@ msgstr "SSL není k dispozici"
 #: camel/providers/imap/camel-imap-store.c:568
 #: camel/providers/imap/camel-imap-store.c:845
 #: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:137
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
 #: camel/providers/pop3/camel-pop3-store.c:192
 msgid "Connection cancelled"
 msgstr "Spojení zrušeno"
@@ -10031,7 +9923,7 @@ msgstr "Nemohu se připojit k serveru IMAP %s v zabezpečeném režimu: %s"
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1142
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
 msgid "Unknown error"
 msgstr "Neznámá chyba"
 
@@ -10136,12 +10028,12 @@ msgstr "IMAP server %s se neočekávaně odpojil: %s"
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3197
+#: camel/providers/imap/camel-imap-store.c:3194
 msgid "Operation cancelled"
 msgstr "Operace zrušena"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3200
+#: camel/providers/imap/camel-imap-store.c:3197
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server neočekávaně zrušil spojení: %s"
@@ -10222,7 +10114,7 @@ msgstr "Taková zpráva neexistuje"
 
 #: camel/providers/imap/camel-imap-folder.c:2019
 #: camel/providers/imap/camel-imap-folder.c:2622
-#: camel/providers/nntp/camel-nntp-folder.c:238
+#: camel/providers/nntp/camel-nntp-folder.c:220
 msgid "This message is not currently available"
 msgstr "Tato zpráva není právě dostupná"
 
@@ -10919,7 +10811,7 @@ msgstr ""
 "Složka je možná poškozena, kopie uložena do `%s'"
 
 #: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:992
+#: camel/providers/nntp/camel-nntp-store.c:1126
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Zadejte prosím heslo NNTP pro %s@%s"
@@ -10936,18 +10828,10 @@ msgstr "Nemohu odeslat jméno uživatele serveru"
 msgid "Server rejected username/password"
 msgstr "Server odmítl jméno uživatele/heslo"
 
-#: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:263
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr "Uživatel zrušen"
-
-#: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:259
-#: camel/providers/nntp/camel-nntp-folder.c:265
+#: camel/providers/nntp/camel-nntp-folder.c:147
+#: camel/providers/nntp/camel-nntp-folder.c:149
+#: camel/providers/nntp/camel-nntp-folder.c:158
+#: camel/providers/nntp/camel-nntp-folder.c:234
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -10956,60 +10840,49 @@ msgstr "Uživatel zrušen"
 msgid "Cannot get message %s: %s"
 msgstr "Nemohu získat zprávu %s: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:188
-#: camel/providers/nntp/camel-nntp-folder.c:228
+#: camel/providers/nntp/camel-nntp-folder.c:156
+#: camel/providers/nntp/camel-nntp-folder.c:232
+#: camel/providers/nntp/camel-nntp-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+msgid "User cancelled"
+msgstr "Uživatel zrušen"
+
+#: camel/providers/nntp/camel-nntp-folder.c:176
+#: camel/providers/nntp/camel-nntp-folder.c:208
 #, c-format
 msgid "Internal error: uid in invalid format: %s"
 msgstr "Interní chyba: uid v neplatném formátu: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:201
-#, c-format
-msgid "Could not get article %s from NNTP server"
-msgstr "Nemohu získat příspěvek %s ze serveru NNTP"
-
-#: camel/providers/nntp/camel-nntp-folder.c:362
-msgid "Posting not allowed by news server"
-msgstr "Posílání není news serverem povoleno"
-
+#: camel/providers/nntp/camel-nntp-folder.c:328
+#: camel/providers/nntp/camel-nntp-folder.c:331
 #: camel/providers/nntp/camel-nntp-folder.c:373
-#, c-format
-msgid "Failed to send newsgroups header: %s: message not posted"
-msgstr "Nemohu odeslat hlavičku diskusních skupin: %s: zpráva nebyla poslána"
-
-#: camel/providers/nntp/camel-nntp-folder.c:413
-#: camel/providers/nntp/camel-nntp-folder.c:426
-#, c-format
-msgid "Error posting to newsgroup: %s: message not posted"
-msgstr "Chyba při posílání do diskusní skupiny: %s: zpráva nebyla poslána"
-
-#: camel/providers/nntp/camel-nntp-folder.c:438
-msgid "Error reading response to posted message: message not posted"
-msgstr "Chyba při čtení odpovědi na poslanou zprávu: zpráva nebyla poslána"
-
-#: camel/providers/nntp/camel-nntp-folder.c:441
-#, c-format
-msgid "Error posting message: %s: message not posted"
-msgstr "Chyba při posílání zprávy: %s: zpráva nebyla poslána"
+#: camel/providers/nntp/camel-nntp-folder.c:375
+#, fuzzy, c-format
+msgid "Posting failed: %s"
+msgstr "Operace selhala: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:457
+#: camel/providers/nntp/camel-nntp-folder.c:393
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "Nemůžete posílat zprávy NNTP, když pracujete při odpojení!"
 
-#: camel/providers/nntp/camel-nntp-folder.c:468
+#: camel/providers/nntp/camel-nntp-folder.c:404
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Nemůžete kopírovat zprávy ze složky NNTP!"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:44
 msgid "Could not get group list from server."
 msgstr "Nemohu získat ze serveru seznam skupin."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#: camel/providers/nntp/camel-nntp-grouplist.c:97
+#: camel/providers/nntp/camel-nntp-grouplist.c:106
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "Nemohu načíst soubor seznamu skupin pro %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#: camel/providers/nntp/camel-nntp-grouplist.c:157
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Nemohu uložit soubor seznamu skupin pro %s: %s"
@@ -11040,26 +10913,29 @@ msgstr ""
 "Tato volba nastaví autentizaci u NNTP serveru pomocí hesla jako čistého "
 "textu."
 
-#: camel/providers/nntp/camel-nntp-store.c:158
+#: camel/providers/nntp/camel-nntp-store.c:118
+#: camel/providers/nntp/camel-nntp-store.c:1233
+#: camel/providers/nntp/camel-nntp-store.c:1331
+#, c-format
+msgid "NNTP Command failed: %s"
+msgstr "Příkaz NNTP selhal: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:227
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Nemohu číst pozdrav od %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:170
+#: camel/providers/nntp/camel-nntp-store.c:239
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP server %s vrátil chybový kód %d: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:326
+#: camel/providers/nntp/camel-nntp-store.c:403
 #, c-format
 msgid "USENET News via %s"
 msgstr "Diskusní skupiny USENET pomocí %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:635
-msgid "Stream error"
-msgstr "Chyba proudu"
-
-#: camel/providers/nntp/camel-nntp-store.c:638
+#: camel/providers/nntp/camel-nntp-store.c:777
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -11070,7 +10946,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/providers/nntp/camel-nntp-store.c:730
+#: camel/providers/nntp/camel-nntp-store.c:872
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
@@ -11081,7 +10957,7 @@ msgstr ""
 "Taková diskusní skupina neexistuje. Vybraná položka je pravděpodobně "
 "rodičovská složka."
 
-#: camel/providers/nntp/camel-nntp-store.c:762
+#: camel/providers/nntp/camel-nntp-store.c:904
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
@@ -11091,58 +10967,59 @@ msgstr ""
 "\n"
 "Diskusní skupina neexistuje!"
 
-#: camel/providers/nntp/camel-nntp-store.c:787
+#: camel/providers/nntp/camel-nntp-store.c:929
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr "Nemůžete vytvořit složku v úložišti News: místo toho se přihlaste."
 
-#: camel/providers/nntp/camel-nntp-store.c:795
+#: camel/providers/nntp/camel-nntp-store.c:937
 msgid "You cannot rename a folder in a News store."
 msgstr "Nemůžete přejmenovat složku v úložišti News."
 
-#: camel/providers/nntp/camel-nntp-store.c:803
+#: camel/providers/nntp/camel-nntp-store.c:945
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "Nemůžete odstranit složku z úložiště News: místo toho se odhlaste."
 
-#: camel/providers/nntp/camel-nntp-summary.c:253
-#, c-format
-msgid "Connection error: %s"
-msgstr "Chyba spojení: %s"
-
-#: camel/providers/nntp/camel-nntp-summary.c:262
-#, c-format
-msgid "No such folder: %s"
-msgstr "Taková složka neexistuje: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1118
+#, fuzzy
+msgid "Authentication requested but not username provided"
+msgstr "Je požadována autentizace"
 
-#: camel/providers/nntp/camel-nntp-summary.c:268
-#, c-format
-msgid "Could not get group: %s"
-msgstr "Nemohu získat skupinu: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1146
+#, fuzzy, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr "Nemohu se autentizovat u IMAP serveru %s pomocí %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:333
-msgid "Could not get messages: unspecified error"
-msgstr "Nemohu získat zprávy: neurčená chyba"
+#: camel/providers/nntp/camel-nntp-store.c:1262
+#, fuzzy
+msgid "Not connected."
+msgstr "Žádné kontakty"
 
-#: camel/providers/nntp/camel-nntp-summary.c:378
+#: camel/providers/nntp/camel-nntp-store.c:1311
 #, c-format
-msgid "NNTP Command failed: %s"
-msgstr "Příkaz NNTP selhal: %s"
+msgid "No such folder: %s"
+msgstr "Taková složka neexistuje: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:438
-#: camel/providers/nntp/camel-nntp-summary.c:543
+#: camel/providers/nntp/camel-nntp-summary.c:218
+#: camel/providers/nntp/camel-nntp-summary.c:314
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Hledám nové zprávy"
 
-#: camel/providers/nntp/camel-nntp-summary.c:558
-#, c-format
-msgid "Unknown server response: %s"
-msgstr "Neznámá odpověď serveru: %s"
+#: camel/providers/nntp/camel-nntp-summary.c:225
+#, fuzzy, c-format
+msgid "Unexpected server response from xover: %s"
+msgstr "Neočekávaná odpověď od IMAP serveru: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:328
+#, fuzzy, c-format
+msgid "Unexpected server response from head: %s"
+msgstr "Neočekávaná odpověď od GnuPG: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:605
+#: camel/providers/nntp/camel-nntp-summary.c:368
 msgid "Use cancel"
 msgstr "Použít Zrušit"
 
-#: camel/providers/nntp/camel-nntp-summary.c:607
+#: camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Operace selhala: %s"
@@ -11837,17 +11714,19 @@ msgstr "Připojit soubory"
 
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
-msgid "You cannot attach the file `${0}' to this message."
+#, fuzzy
+msgid "You cannot attach the file `{0}' to this message."
 msgstr "K této zprávě nemůžete přiložit soubor `${0}'."
 
 #. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4
-msgid "${1}"
-msgstr "${1}"
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr "{1}"
 
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+#, fuzzy
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr "Soubor `${0}' není obyčejný soubor a nemůže být poslán ve zprávě."
 
 #. mail-composer:attach-directory primary
@@ -11938,7 +11817,8 @@ msgstr "Nemohu vytvořit zprávu."
 
 #. mail-composer:no-build-message secondary
 #: composer/mail-composer-errors.xml.h:34
-msgid "Because \"${0}\", you may need to select different mail options."
+#, fuzzy
+msgid "Because \"{0}\", you may need to select different mail options."
 msgstr "Protože \"${0}\", možná budete muset zvolit jiná nastavení pošty."
 
 #. mail-composer:no-sig-file primary
@@ -11947,9 +11827,11 @@ msgid "Could not read signature file \"{0}\"."
 msgstr "Nemohu číst soubor podpisu \"{0}\"."
 
 #. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38
-msgid "Because \"${1}\"."
-msgstr "Protože \"${1}\"."
+#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr "Protože \"{1}\"."
 
 #. mail-composer:all-accounts-deleted primary
 #: composer/mail-composer-errors.xml.h:40
@@ -12111,16 +11993,12 @@ msgstr "Synchronizované kategorie:"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
 #: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d. %m. %Y %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
 #: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d. %m. %Y %H:%M"
@@ -12172,31 +12050,23 @@ msgid "%m/%d/%Y %H"
 msgstr "%d. %m. %Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#. strftime format of a time in 12-hour format.
 #: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
 msgstr "%H:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#. strftime format of a time in 24-hour format.
 #: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
 #: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%I:%M %p"
 msgstr "%H:%M, %x"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
 #: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
 msgid "%H:%M"
@@ -12300,7 +12170,6 @@ msgid "Missing file name."
 msgstr "Chybí název souboru."
 
 #. filter:no-file secondary
-#. filter:bad-file secondary
 #: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
 msgid "You must specify a file name."
 msgstr "Musíte uvést název souboru:"
@@ -12331,7 +12200,6 @@ msgid "Could not compile regular expression \"{1}\"."
 msgstr "Nemohu zkompilovat regulární výraz \"{1}\"."
 
 #. filter:no-name primary
-#. filter:no-name-vfolder primary
 #: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
 msgid "Missing name."
 msgstr "Chybí název."
@@ -12638,13 +12506,13 @@ msgstr "Podpisy"
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Přeposlaná zpráva --------"
 
-#: mail/em-composer-utils.c:1499
+#: mail/em-composer-utils.c:1495
 msgid "an unknown sender"
 msgstr "neznámý odesílatel"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1509
+#: mail/em-composer-utils.c:1505
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "V %a %d. %m. %Y v %H:%M %%+05d píše %%s:"
 
@@ -12682,8 +12550,8 @@ msgstr "<kliknutím zde vyberete složku>"
 msgid "Create New Folder"
 msgstr "Vytvořit novou složku"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2263
-#: mail/mail-component.c:692
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
+#: mail/mail-component.c:704
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Upřesněte, kde chcete vytvořit složku:"
@@ -12729,8 +12597,8 @@ msgstr "_Kopírovat do složky"
 msgid "_Move to Folder"
 msgstr "_Přesunout do složky"
 
-#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2050
-#: mail/em-folder-tree.c:2531 mail/em-folder-view.c:798
+#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
+#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
 #: mail/message-list.c:1651
 msgid "_Move"
 msgstr "_Přesunout"
@@ -12739,55 +12607,55 @@ msgstr "_Přesunout"
 msgid "Cancel _Drag"
 msgstr "Zrušit _tažení"
 
-#: mail/em-folder-tree.c:2037 mail/em-folder-tree.c:2050
+#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
 #: mail/em-folder-view.c:798 mail/em-folder-view.c:812
 #: mail/importers/evolution-mbox-importer.c:119
 #: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Vyberte složku"
 
-#: mail/em-folder-tree.c:2037 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
 msgid "C_opy"
 msgstr "_Kopírovat"
 
-#: mail/em-folder-tree.c:2077
+#: mail/em-folder-tree.c:2088
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Vytvářím složku `%s'"
 
-#: mail/em-folder-tree.c:2263 mail/mail-component.c:692
+#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
 msgid "Create folder"
 msgstr "Vytvořit složku"
 
-#: mail/em-folder-tree.c:2452
+#: mail/em-folder-tree.c:2463
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Přejmenovat složku \"%s\" na:"
 
-#: mail/em-folder-tree.c:2454
+#: mail/em-folder-tree.c:2465
 msgid "Rename Folder"
 msgstr "Přejmenovat složku"
 
-#: mail/em-folder-tree.c:2525 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Zobrazení"
 
-#: mail/em-folder-tree.c:2526
+#: mail/em-folder-tree.c:2537
 msgid "Open in _New Window"
 msgstr "Otevřít v _novém okně"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2535
+#: mail/em-folder-tree.c:2546
 msgid "_New Folder..."
 msgstr "_Nová složka..."
 
-#: mail/em-folder-tree.c:2538
+#: mail/em-folder-tree.c:2549
 msgid "_Rename"
 msgstr "_Přejmenovat"
 
-#: mail/em-folder-tree.c:2541 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "Vla_stnosti..."
 
@@ -12812,8 +12680,8 @@ msgstr "Načítám..."
 
 #: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
 #: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:496
-#: mail/mail-component.c:542
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
+#: mail/mail-component.c:554
 msgid "Mail"
 msgstr "Pošta"
 
@@ -12993,7 +12861,7 @@ msgstr "Skrytá kopie"
 
 #: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
 #: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1079
+#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
 msgid "Subject"
 msgstr "Předmět"
 
@@ -13193,7 +13061,7 @@ msgstr ""
 "Tato zpráva je šifrována. Pro člověka zvenku by bylo velmi těžké zobrazit "
 "obsah této zprávy v rozumném čase."
 
-#: mail/em-format-html-display.c:757
+#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
 msgid "_View Certificate"
 msgstr "_Zobrazit certifikát"
 
@@ -14168,66 +14036,66 @@ msgstr "%s konferencí"
 msgid "Add Filter Rule"
 msgstr "Přidat pravidlo filtru"
 
-#: mail/mail-component.c:449
+#: mail/mail-component.c:461
 #, c-format
 msgid "%d deleted"
 msgstr "%d odstraněno"
 
-#: mail/mail-component.c:451
+#: mail/mail-component.c:463
 #, c-format
 msgid "%d junk"
 msgstr "%d smetí"
 
-#: mail/mail-component.c:474
+#: mail/mail-component.c:486
 #, c-format
 msgid "%d drafts"
 msgstr "%d konceptů"
 
-#: mail/mail-component.c:476
+#: mail/mail-component.c:488
 #, c-format
 msgid "%d sent"
 msgstr "%d odesláno"
 
-#: mail/mail-component.c:478
+#: mail/mail-component.c:490
 #, c-format
 msgid "%d unsent"
 msgstr "%d neodesláno"
 
-#: mail/mail-component.c:482
+#: mail/mail-component.c:494
 #, c-format
 msgid "%d total"
 msgstr "%d celkem"
 
-#: mail/mail-component.c:484
+#: mail/mail-component.c:496
 #, c-format
 msgid ", %d unread"
 msgstr ", %d nepřečteno"
 
-#: mail/mail-component.c:644
+#: mail/mail-component.c:656
 msgid "New Mail Message"
 msgstr "Nová zpráva"
 
-#: mail/mail-component.c:645
+#: mail/mail-component.c:657
 msgid "_Mail Message"
 msgstr "_Zpráva"
 
-#: mail/mail-component.c:646
+#: mail/mail-component.c:658
 msgid "Compose a new mail message"
 msgstr "Napsat novou zprávu"
 
-#: mail/mail-component.c:652
+#: mail/mail-component.c:664
 msgid "New Mail Folder"
 msgstr "Nová složka pošty"
 
-#: mail/mail-component.c:653
+#: mail/mail-component.c:665
 msgid "Mail _Folder"
 msgstr "_Složka pošty"
 
-#: mail/mail-component.c:654
+#: mail/mail-component.c:666
 msgid "Create a new mail folder"
 msgstr "Vytvořit novou složku pošty"
 
-#: mail/mail-component.c:786
+#: mail/mail-component.c:798
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Nemohu aktualizovat nastavení nebo složky pošty."
 
@@ -14966,7 +14834,6 @@ msgstr ""
 "shrnutí, o čem je vaše zpráva."
 
 #. mail:ask-send-only-bcc-contact primary
-#. mail:ask-send-only-bcc primary
 #: mail/mail-errors.xml.h:22 mail/mail-errors.xml.h:29
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "Opravdu chcete odeslat zprávu jen se skrytými příjemci?"
@@ -15045,7 +14912,6 @@ msgstr ""
 "\"?"
 
 #. mail:ask-expunge secondary
-#. mail:ask-empty-trash secondary
 #: mail/mail-errors.xml.h:45 mail/mail-errors.xml.h:50
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Pokud budete pokračovat, nebudete moci tyto zprávy obnovit."
@@ -15119,13 +14985,6 @@ msgid "{0}."
 msgstr "{0}."
 
 #. mail:session-message-info secondary
-#. mail:session-message-info-cancel secondary
-#. mail:session-message-warning secondary
-#. mail:session-message-warning-cancel secondary
-#. mail:session-message-error secondary
-#. mail:session-message-error-cancel secondary
-#. mail:ask-session-password secondary
-#. mail:filter-load-error secondary
 #: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
 #: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
 #: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
@@ -15148,14 +15007,7 @@ msgstr "Chyba při načítání definic filtrů."
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Nemohu uložit do adresáře \"{0}\"."
 
-#. mail:no-save-path secondary
-#: mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr "{1}"
-
 #. mail:no-create-path primary
-#. mail:no-write-path-exists primary
-#. mail:no-write-path-notfile primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
 msgid "Cannot save to file \"{0}\"."
@@ -15171,15 +15023,6 @@ msgstr "Nemohu vytvořit adresář pro ukládání, protože \"{1}\""
 msgid "Cannot create temporary save directory."
 msgstr "Nemohu vytvořit dočasný adresář pro ukládání."
 
-#. mail:no-create-tmp-path secondary
-#. mail:no-delete-folder secondary
-#. system:no-save-file secondary
-#. system:no-load-file secondary
-#: mail/mail-errors.xml.h:100 mail/mail-errors.xml.h:112
-#: widgets/misc/e-system-errors.xml.h:11 widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr "Protože \"{1}\"."
-
 #. mail:no-write-path-exists secondary
 #: mail/mail-errors.xml.h:104
 msgid "File exists but cannot overwrite it."
@@ -15201,7 +15044,6 @@ msgid "Cannot delete system folder \"{0}\"."
 msgstr "Nemohu odstranit systémovou složku \"{0}\"."
 
 #. mail:no-delete-spethal-folder secondary
-#. mail:no-rename-spethal-folder secondary
 #: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
@@ -15235,13 +15077,11 @@ msgstr ""
 "natrvalo odstraněn."
 
 #. mail:no-rename-folder-exists primary
-#. mail:no-rename-folder primary
 #: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "Nemohu přejmenovat \"{0}\" na \"{1}\"."
 
 #. mail:no-rename-folder-exists secondary
-#. mail:vfolder-notunique secondary
 #: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr "Složka nazvaná \"{1}\" již existuje. Použijte prosím jiný název."
@@ -15252,25 +15092,21 @@ msgid "Because \"{2}\"."
 msgstr "Protože \"{2}\"."
 
 #. mail:no-move-folder-nostore primary
-#. mail:no-move-folder-to-nostore primary
 #: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Nemohu přesunout složku \"{0}\" do \"{1}\"."
 
 #. mail:no-move-folder-nostore secondary
-#. mail:no-copy-folder-nostore secondary
 #: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
 msgid "Cannot open source \"{2}\"."
 msgstr "Nemohu otevřít zdroj \"{2}\"."
 
 #. mail:no-move-folder-to-nostore secondary
-#. mail:no-copy-folder-to-nostore secondary
 #: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
 msgid "Cannot open target \"{2}\"."
 msgstr "Nemohu otevřít cíl \"{2}\"."
 
 #. mail:no-copy-folder-nostore primary
-#. mail:no-copy-folder-to-nostore primary
 #: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "Nemohu zkopírovat složku \"{0}\" do \"{1}\"."
@@ -15286,7 +15122,6 @@ msgid "Cannot open source \"{1}\""
 msgstr "Nemohu otevřít zdroj \"{1}\""
 
 #. mail:account-incomplete primary
-#. mail:account-notunique primary
 #: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
 msgid "Cannot save changes to account."
 msgstr "Nemohu uložit změny účtu."
@@ -15998,43 +15833,47 @@ msgstr ""
 "odpojení"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid "Toolbar is visible"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Whether Evolution should start up in offline mode"
 msgstr "Jestli se má Evolution spouštět v režimu odpojení"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Whether the toolbar should be visible."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
 msgid "Whether to skip the development warning dialog"
 msgstr "Jestli přeskakovat dialog varování o vývoji"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
+#: shell/apps_evolution_shell.schemas.in.in.h:14
 msgid "mail"
 msgstr "pošta"
 
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
-msgstr "Pro vás vytvořili"
-
-#: shell/e-shell.c:579 shell/e-shell.c:580
+#: shell/e-shell.c:588 shell/e-shell.c:589
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: shell/e-shell.c:777
+#: shell/e-shell.c:786
 msgid "Uknown system error."
 msgstr "Neznámá systémová chyba."
 
-#: shell/e-shell.c:1134
+#: shell/e-shell.c:1143
 msgid "Invalid arguments"
 msgstr "Neplatné argumenty"
 
-#: shell/e-shell.c:1136
+#: shell/e-shell.c:1145
 msgid "Cannot register on OAF"
 msgstr "Nemohu se registrovat u OAF"
 
-#: shell/e-shell.c:1138
+#: shell/e-shell.c:1147
 msgid "Configuration Database not found"
 msgstr "Databáze nastavení nebyla nalezena"
 
-#: shell/e-shell.c:1140
+#: shell/e-shell.c:1149
 msgid "Generic error"
 msgstr "Obecná chyba"
 
@@ -16092,7 +15931,7 @@ msgstr ""
 msgid "Select importer"
 msgstr "Vyberte importér"
 
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1027
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
 #, c-format
 msgid "File %s does not exist"
 msgstr "Soubor %s neexistuje"
@@ -16120,31 +15959,31 @@ msgstr ""
 "Importuji %s\n"
 "Importuji položku 1."
 
-#: shell/e-shell-importer.c:549
+#: shell/e-shell-importer.c:570
 msgid "Automatic"
 msgstr "Automaticky"
 
-#: shell/e-shell-importer.c:598
+#: shell/e-shell-importer.c:626
 msgid "F_ilename:"
 msgstr "_Název souboru:"
 
-#: shell/e-shell-importer.c:603
+#: shell/e-shell-importer.c:631
 msgid "Select a file"
 msgstr "Vyberte soubor"
 
-#: shell/e-shell-importer.c:614
+#: shell/e-shell-importer.c:642
 msgid "File _type:"
 msgstr "_Typ souboru:"
 
-#: shell/e-shell-importer.c:653
+#: shell/e-shell-importer.c:681
 msgid "Import data and settings from _older programs"
 msgstr "Importovat data a nastavení ze _starších programů"
 
-#: shell/e-shell-importer.c:656
+#: shell/e-shell-importer.c:684
 msgid "Import a _single file"
 msgstr "Importovat _jeden soubor"
 
-#: shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -16152,25 +15991,25 @@ msgstr ""
 "Čekejte prosím...\n"
 "Hledám existující nastavení"
 
-#: shell/e-shell-importer.c:728
+#: shell/e-shell-importer.c:756
 msgid "Starting Intelligent Importers"
 msgstr "Spouštím inteligentní importy"
 
-#: shell/e-shell-importer.c:854 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
 #, c-format
 msgid "From %s:"
 msgstr "Z %s:"
 
-#: shell/e-shell-importer.c:1045
+#: shell/e-shell-importer.c:1073
 #, c-format
 msgid "No importer available for file %s"
 msgstr "Pro soubor %s není k dispozici importér"
 
-#: shell/e-shell-importer.c:1057
+#: shell/e-shell-importer.c:1085
 msgid "Unable to execute importer"
 msgstr "Nemohu spustit importér"
 
-#: shell/e-shell-importer.c:1170
+#: shell/e-shell-importer.c:1199
 msgid "_Import"
 msgstr "_Importovat"
 
@@ -16220,57 +16059,58 @@ msgstr "Název složky nesmí obsahovat znak \"#\"."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' a '..' jsou rezervované názvy složek."
 
-#: shell/e-shell-window.c:336
+#: shell/e-shell-window.c:337
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Evolution je nyní on-line. Stiskem tohoto tlačítka přejdete do režimu off-"
 "line."
 
-#: shell/e-shell-window.c:343
+#: shell/e-shell-window.c:344
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution přechází do režimu off-line."
 
-#: shell/e-shell-window.c:349
+#: shell/e-shell-window.c:350
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Evolution je nyní off-line. Stiskem tohoto tlačítka přejdete do režimu on-"
 "line."
 
-#: shell/e-shell-window.c:621
+#: shell/e-shell-window.c:637
 #, c-format
 msgid "Switch to %s"
 msgstr "Přepnout na %s"
 
-#: shell/e-shell-window-commands.c:64
+#: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Zdá se, že nemáte nainstalované nástroje pro PalmPilota GNOME."
 
-#: shell/e-shell-window-commands.c:72
+#: shell/e-shell-window-commands.c:74
 #, c-format
 msgid "Error executing %s."
 msgstr "Chyba při spouštění %s."
 
-#: shell/e-shell-window-commands.c:121
+#: shell/e-shell-window-commands.c:123
 msgid "Bug buddy is not installed."
 msgstr "Bug buddy není nainstalován."
 
-#: shell/e-shell-window-commands.c:129
+#: shell/e-shell-window-commands.c:131
 msgid "Bug buddy could not be run."
 msgstr "Nemohu spustit bug buddy."
 
-#: shell/e-shell-window-commands.c:171
-msgid "About Evolution"
-msgstr "O Evolution"
+#: shell/e-shell-window-commands.c:323
+#, fuzzy
+msgid "Groupware Suite"
+msgstr "Groupwise"
 
-#: shell/e-shell-window-commands.c:382
+#: shell/e-shell-window-commands.c:563
 msgid "_Work Online"
 msgstr "Pracovat _on-line"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "_Pracovat při odpojení"
 
-#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Pracovat při odpojení"
 
@@ -16586,13 +16426,11 @@ msgid "Continue"
 msgstr "Pokračovat"
 
 #. shell:noshell title
-#. shell:noshell-reason title
 #: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
 msgid "Cannot start Evolution"
 msgstr "Nemohu spustit Evolution."
 
 #. shell:noshell primary
-#. shell:noshell-reason primary
 #: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
 msgid "Evolution can not start."
 msgstr "Evolution nelze spustit."
@@ -16623,30 +16461,30 @@ msgstr ""
 "\n"
 "Pro podrobonosti klikněte na Nápověda"
 
-#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:522
+#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
+#: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
 msgstr "Vyberte certifikát, který importovat..."
 
-#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:604
+#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
+#: smime/gui/certificate-manager.c:638
 msgid "Certificate Name"
 msgstr "Název certifikátu:"
 
-#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
+#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
 msgid "Purposes"
 msgstr "Účely"
 
-#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:517
+#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr "Sériové číslo"
 
-#: smime/gui/certificate-manager.c:267
+#: smime/gui/certificate-manager.c:271
 msgid "Expires"
 msgstr "Vyprší"
 
-#: smime/gui/certificate-manager.c:417
+#: smime/gui/certificate-manager.c:446
 msgid "E-Mail Address"
 msgstr "E-mailová adresa"
 
@@ -16748,7 +16586,7 @@ msgstr ""
 "Před důvěřováním této CA pro libovolný účel byste měli prozkoumat její "
 "certifikát a, pokud jsou k dispozici, její pravidla a procedury."
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
 msgid "Certificate"
 msgstr "Certifikát"
 
@@ -16768,19 +16606,23 @@ msgstr "Společné jméno (CN)"
 msgid "Contact Certificates"
 msgstr "Certifikáty kontaktů"
 
-#: smime/gui/smime-ui.glade.h:21
-#, no-c-format
-msgid "Do you want to trust \"%s\" for the following purposes?"
-msgstr "Chcete důvěřovat \"%s\" pro následující účely?"
+#: smime/gui/smime-ui.glade.h:20
+msgid "Do not trust the authenticity of this certificate"
+msgstr ""
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:21
 msgid "Dummy window only"
 msgstr "Jen prázdné okno"
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:22
 msgid "Edit"
 msgstr "Upravit"
 
+#: smime/gui/smime-ui.glade.h:23
+#, fuzzy
+msgid "Email Certificate Trust Settings"
+msgstr "Certifikační autorita e-mailu"
+
 #: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr "Certifikát příjemce e-mailu"
@@ -16813,243 +16655,254 @@ msgstr "Organizační jednotka (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "Otisk SHA1"
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr "Certifikát klienta SSL"
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr "Certifikát serveru SSL"
 
 #: smime/gui/smime-ui.glade.h:37
+msgid "Trust the authenticity of this certificate"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
 msgid "Trust this CA to identify email users."
 msgstr "Důvěřovat této CA pro identifikaci uživatelů e-mailu."
 
-#: smime/gui/smime-ui.glade.h:38
+#: smime/gui/smime-ui.glade.h:39
 msgid "Trust this CA to identify software developers."
 msgstr "Důvěřovat této CA pro identifikaci vývojářů software."
 
-#: smime/gui/smime-ui.glade.h:39
+#: smime/gui/smime-ui.glade.h:40
 msgid "Trust this CA to identify web sites."
 msgstr "Důvěřovat této CA pro identifikaci WWW serverů."
 
-#: smime/gui/smime-ui.glade.h:40
+#: smime/gui/smime-ui.glade.h:41
 msgid "View"
 msgstr "Zobrazení"
 
-#: smime/gui/smime-ui.glade.h:41
-msgid "View Certificate"
-msgstr "Zobrazit certifikát"
-
 #: smime/gui/smime-ui.glade.h:42
-msgid "You have been asked to trust a new Certificate Authority (CA)."
-msgstr "Byli jste požádáni, abyste věřili nové certifikační autoritě (CA)."
-
-#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr "Máte certifikáty od těchto organizací, které vás identifikují:"
 
-#: smime/gui/smime-ui.glade.h:44
+#: smime/gui/smime-ui.glade.h:43
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 "Máte uloženy certifikáty, které identifikují tyto certifikační autority:"
 
-#: smime/gui/smime-ui.glade.h:45
+#: smime/gui/smime-ui.glade.h:44
 msgid "You have certificates on file that identify these people:"
 msgstr "Máte uloženy certifikáty, které identifikují tyto lidi:"
 
-#: smime/gui/smime-ui.glade.h:46
+#: smime/gui/smime-ui.glade.h:45
 msgid "Your Certificates"
 msgstr "Vaše certifikáty"
 
-#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
+#: smime/gui/smime-ui.glade.h:46
+msgid "_Edit CA Trust"
+msgstr ""
+
+#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d. %m. %Y"
 
-#: smime/lib/e-cert.c:478
+#. x509 certificate usage types
+#: smime/lib/e-cert.c:424
+#, fuzzy
+msgid "Sign"
+msgstr "Podepisování"
+
+#: smime/lib/e-cert.c:425
+#, fuzzy
+msgid "Encrypt"
+msgstr "Šifrována"
+
+#: smime/lib/e-cert.c:530
 msgid "Version"
 msgstr "Verze"
 
-#: smime/lib/e-cert.c:493
+#: smime/lib/e-cert.c:545
 msgid "Version 1"
 msgstr "Verze 1"
 
-#: smime/lib/e-cert.c:496
+#: smime/lib/e-cert.c:548
 msgid "Version 2"
 msgstr "Verze 2"
 
-#: smime/lib/e-cert.c:499
+#: smime/lib/e-cert.c:551
 msgid "Version 3"
 msgstr "Verze 3"
 
-#: smime/lib/e-cert.c:581
+#: smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 se šifrováním RSA"
 
-#: smime/lib/e-cert.c:584
+#: smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 se šifrováním RSA"
 
-#: smime/lib/e-cert.c:587
+#: smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 se šifrováním RSA"
 
-#: smime/lib/e-cert.c:590
+#: smime/lib/e-cert.c:642
 msgid "C"
 msgstr "C"
 
-#: smime/lib/e-cert.c:593
+#: smime/lib/e-cert.c:645
 msgid "CN"
 msgstr "CN"
 
-#: smime/lib/e-cert.c:596
+#: smime/lib/e-cert.c:648
 msgid "OU"
 msgstr "OU"
 
-#: smime/lib/e-cert.c:599
+#: smime/lib/e-cert.c:651
 msgid "O"
 msgstr "O"
 
-#: smime/lib/e-cert.c:602
+#: smime/lib/e-cert.c:654
 msgid "L"
 msgstr "L"
 
-#: smime/lib/e-cert.c:605
+#: smime/lib/e-cert.c:657
 msgid "DN"
 msgstr "DN"
 
-#: smime/lib/e-cert.c:608
+#: smime/lib/e-cert.c:660
 msgid "DC"
 msgstr "DC"
 
-#: smime/lib/e-cert.c:611
+#: smime/lib/e-cert.c:663
 msgid "ST"
 msgstr "ST"
 
-#: smime/lib/e-cert.c:614
+#: smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 šifrování RSA"
 
-#: smime/lib/e-cert.c:617
+#: smime/lib/e-cert.c:669
 msgid "Certificate Key Usage"
 msgstr "Použití klíče certifikátu"
 
-#: smime/lib/e-cert.c:620
+#: smime/lib/e-cert.c:672
 msgid "Netscape Certificate Type"
 msgstr "Typ certifikátu Netscape"
 
-#: smime/lib/e-cert.c:623
+#: smime/lib/e-cert.c:675
 msgid "Certificate Authority Key Identifier"
 msgstr "Identifikátor klíče certifikační autority"
 
-#: smime/lib/e-cert.c:626
+#: smime/lib/e-cert.c:678
 msgid "UID"
 msgstr "UID"
 
-#: smime/lib/e-cert.c:635
+#: smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Identifikátor objektu (%s)"
 
-#: smime/lib/e-cert.c:686
+#: smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
 msgstr "Identifikátor algoritmu"
 
-#: smime/lib/e-cert.c:694
+#: smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
 msgstr "Parametry algoritmu"
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:768
 msgid "Subject Public Key Info"
 msgstr "Informace o veřejném klíči předmětu"
 
-#: smime/lib/e-cert.c:721
+#: smime/lib/e-cert.c:773
 msgid "Subject Public Key Algorithm"
 msgstr "Algoritmus veřejného klíče předmětu"
 
-#: smime/lib/e-cert.c:736
+#: smime/lib/e-cert.c:788
 msgid "Subject's Public Key"
 msgstr "Veřejný klíč předmětu"
 
-#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
+#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
 msgid "Error: Unable to process extension"
 msgstr "Chyba: Nemohu zpracovat rozšíření"
 
-#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
+#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr "Podpisovatel objektu"
 
-#: smime/lib/e-cert.c:782
+#: smime/lib/e-cert.c:834
 msgid "SSL Certificate Authority"
 msgstr "Certifikační autorita SSL"
 
-#: smime/lib/e-cert.c:786
+#: smime/lib/e-cert.c:838
 msgid "Email Certificate Authority"
 msgstr "Certifikační autorita e-mailu"
 
-#: smime/lib/e-cert.c:814
+#: smime/lib/e-cert.c:866
 msgid "Signing"
 msgstr "Podepisování"
 
-#: smime/lib/e-cert.c:818
+#: smime/lib/e-cert.c:870
 msgid "Non-repudiation"
 msgstr ""
 
-#: smime/lib/e-cert.c:822
+#: smime/lib/e-cert.c:874
 msgid "Key Encipherment"
 msgstr "Šifrování klíče"
 
-#: smime/lib/e-cert.c:826
+#: smime/lib/e-cert.c:878
 msgid "Data Encipherment"
 msgstr "Šifrování dat"
 
-#: smime/lib/e-cert.c:830
+#: smime/lib/e-cert.c:882
 msgid "Key Agreement"
 msgstr "Dohoda na klíči"
 
-#: smime/lib/e-cert.c:834
+#: smime/lib/e-cert.c:886
 msgid "Certificate Signer"
 msgstr "Podpisovatel certifikátu"
 
-#: smime/lib/e-cert.c:838
+#: smime/lib/e-cert.c:890
 msgid "CRL Signer"
 msgstr "Podpisovatel CRL"
 
-#: smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:938
 msgid "Critical"
 msgstr "Kritické"
 
-#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
+#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
 msgid "Not Critical"
 msgstr "Nekritické"
 
-#: smime/lib/e-cert.c:912
+#: smime/lib/e-cert.c:964
 msgid "Extensions"
 msgstr "Rozšíření"
 
-#: smime/lib/e-cert.c:983
+#: smime/lib/e-cert.c:1035
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
 msgid "Certificate Signature Algorithm"
 msgstr "Algoritmus podpisu certifikátu"
 
-#: smime/lib/e-cert.c:1048
+#: smime/lib/e-cert.c:1100
 msgid "Issuer"
 msgstr "Vydavatel"
 
-#: smime/lib/e-cert.c:1102
+#: smime/lib/e-cert.c:1154
 msgid "Issuer Unique ID"
 msgstr "Jedinečné ID vydavatele"
 
-#: smime/lib/e-cert.c:1121
+#: smime/lib/e-cert.c:1173
 msgid "Subject Unique ID"
 msgstr "Jedinečné ID předmětu"
 
-#: smime/lib/e-cert.c:1164
+#: smime/lib/e-cert.c:1216
 msgid "Certificate Signature Value"
 msgstr "Hodnota podpisu certifikátu"
 
@@ -17199,7 +17052,7 @@ msgstr "Zobrazit aktuální kontakt"
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "_Akce"
 
@@ -17358,7 +17211,7 @@ msgstr "Z_avřít"
 #: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:3
+#: ui/evolution.xml.h:4
 msgid "Close"
 msgstr "Zavřít"
 
@@ -17371,7 +17224,7 @@ msgid "Delete this item"
 msgstr "Odstranit tuto položku"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr "Hlavní nástrojová lišta"
 
@@ -17414,7 +17267,7 @@ msgstr "Uložit tuto položku na disk"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:44
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "_File"
 msgstr "_Soubor"
 
@@ -17671,13 +17524,13 @@ msgstr "_Invertovat výběr"
 msgid "_Threaded Message List"
 msgstr "Seznam zpráv _dle vláken"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Zavřít toto okno"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "_Close"
 msgstr "_Zavřít"
 
@@ -18073,7 +17926,7 @@ msgstr "_předchozí zprávu"
 msgid "_Quoted"
 msgstr "_Citace"
 
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
 msgid "_Tools"
 msgstr "_Nástroje"
 
@@ -18370,107 +18223,121 @@ msgid "_Open Task"
 msgstr "_Otevřít úkol"
 
 #: ui/evolution.xml.h:1
-msgid "About Ximian Evolution..."
-msgstr "O Ximian Evolution..."
+#, fuzzy
+msgid "About Evolution..."
+msgstr "O Evolution"
 
 #: ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
 msgstr "Změnit nastavení Evolution"
 
-#: ui/evolution.xml.h:5
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the visibility of the toolbar"
+msgstr "Změnit vlastnosti této složky"
+
+#: ui/evolution.xml.h:6
 msgid "Create a new window displaying this folder"
 msgstr "Vytvořit nové okno zobrazující tuto složku"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "U_končit"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Ximian Evolution _FAQ"
+
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Ukončit program"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:10
 msgid "Forget _Passwords"
 msgstr "Zapomenout _hesla"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:11
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 "Zapomenout zapamatovaná hesla, takže budete znovu vyzváni k jejich zadání"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:12
 msgid "Import data from other programs"
 msgstr "Importovat data z jiných programů"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:14
 msgid "New _Window"
 msgstr "Nové _okno"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Pi_lot Settings..."
 msgstr "Nastavení diáře _Pilot..."
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Send / Receive"
 msgstr "Odeslat / přijmout"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Send queued items and retrieve new items"
 msgstr "Poslat položky čekající ve frontě a přijmout nové položky"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Set up Pilot configuration"
 msgstr "Nastavení Pilota"
 
-#: ui/evolution.xml.h:17
-msgid "Show information about Ximian Evolution"
+#: ui/evolution.xml.h:19
+#, fuzzy
+msgid "Show information about Evolution"
 msgstr "Zobrazit informace o Ximian Evolution"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:20
 msgid "Submit Bug Report"
 msgstr "Poslat hlášení o chybě"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:21
 msgid "Submit _Bug Report"
 msgstr "_Poslat hlášení o chybě"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Poslat hlášení o chybě pomocí Bug Buddy"
 
-#: ui/evolution.xml.h:21
-msgid "Toggle whether we are working offline."
-msgstr "Přepnout, zdali pracujete off-line."
-
 #: ui/evolution.xml.h:23
-msgid "Ximian Evolution _FAQ"
-msgstr "Ximian Evolution _FAQ"
+#, fuzzy
+msgid "T_oolbar"
+msgstr "Hlavní nástrojová lišta"
 
 #: ui/evolution.xml.h:24
-msgid "_About Ximian Evolution..."
-msgstr "O _Ximian Evolution..."
+msgid "Toggle whether we are working offline."
+msgstr "Přepnout, zdali pracujete off-line."
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "_About Evolution..."
+msgstr "O Evolution"
+
+#: ui/evolution.xml.h:30
 msgid "_Help"
 msgstr "Ná_pověda"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "_Import..."
 msgstr "_Importovat..."
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "_New"
 msgstr "_Nový"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "_Quick Reference"
 msgstr "_Stručná příručka"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_Send / Receive"
 msgstr "_Odeslat / přijmout"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 msgid "_Window"
 msgstr "_Okno"
 
@@ -18862,6 +18729,161 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% hotovo)"
 
+#~ msgid ""
+#~ "Some fields are no longer representable in the contact editor. Please "
+#~ "wait while Evolution copies those fields to the 'Notes' field..."
+#~ msgstr ""
+#~ "Některá pole již v editoru kontaktů nelze reprezentovat. Počkejte prosím, "
+#~ "než Evolution zkopíruje tato pole do pole 'Poznámky'..."
+
+#~ msgid "  S_how Supported Bases "
+#~ msgstr "  Zo_brazit podporované základy "
+
+#~ msgid "1:00"
+#~ msgstr "1:00"
+
+#~ msgid "5:00"
+#~ msgstr "5:00"
+
+#~ msgid "Connecting"
+#~ msgstr "Připojení"
+
+#~ msgid "Distinguished _name:"
+#~ msgstr "Distinguished _name:"
+
+#~ msgid "Email address:"
+#~ msgstr "E-mailová adresa:"
+
+#~ msgid "Evolution will use this DN to authenticate you with the server"
+#~ msgstr "Evolution bude používat toto DN k vaší autentizaci u serveru"
+
+#~ msgid "One"
+#~ msgstr "Jeden"
+
+#~ msgid "S_earch scope: "
+#~ msgstr "_Rozsah vyhledávání: "
+
+#~ msgid "Searching"
+#~ msgstr "Vyhledávání"
+
+#~ msgid "Sub"
+#~ msgstr "Sub"
+
+#~ msgid "This option controls how long a search will be run."
+#~ msgstr "Tato volba určuje, jak dlouho poběží hledání."
+
+#~ msgid "U_se SSL/TLS:"
+#~ msgstr "Použít _SSL/TLS:"
+
+#~ msgid "_Display name:"
+#~ msgstr "Zobrazovaný _název:"
+
+#~ msgid "_Port number:"
+#~ msgstr "Číslo _portu:"
+
+#~ msgid "_Search base:"
+#~ msgstr "_Základ vyhledávání:"
+
+#~ msgid "_Server name:"
+#~ msgstr "Název _serveru:"
+
+#~ msgid "_Timeout (minutes):"
+#~ msgstr "_Prodleva (minuty):"
+
+#~ msgid "connecting-tab"
+#~ msgstr "připojovací-karta"
+
+#~ msgid "general-tab"
+#~ msgstr "obecný přehled"
+
+#~ msgid "searching-tab"
+#~ msgstr "vyhledávací přehled"
+
+#~ msgid "Webcam:"
+#~ msgstr "WWW kamera:"
+
+#~ msgid "item7"
+#~ msgstr "item7"
+
+#~ msgid "item8"
+#~ msgstr "item8"
+
+#~ msgid "Calendar Properties"
+#~ msgstr "Vlastnosti kalendáře"
+
+#~ msgid "Remote"
+#~ msgstr "Vzdálený"
+
+#~ msgid "Task List Properties"
+#~ msgstr "Vlastnosti seznamů úkolů"
+
+#~ msgid "_Refresh Interval:"
+#~ msgstr "_Interval obnovování:"
+
+#~ msgid "_Source URL:"
+#~ msgstr "_URL zdroje:"
+
+#~ msgid "_Invite Others..."
+#~ msgstr "_Pozvat další..."
+
+#~ msgid "Could not get article %s from NNTP server"
+#~ msgstr "Nemohu získat příspěvek %s ze serveru NNTP"
+
+#~ msgid "Posting not allowed by news server"
+#~ msgstr "Posílání není news serverem povoleno"
+
+#~ msgid "Failed to send newsgroups header: %s: message not posted"
+#~ msgstr ""
+#~ "Nemohu odeslat hlavičku diskusních skupin: %s: zpráva nebyla poslána"
+
+#~ msgid "Error posting to newsgroup: %s: message not posted"
+#~ msgstr "Chyba při posílání do diskusní skupiny: %s: zpráva nebyla poslána"
+
+#~ msgid "Error reading response to posted message: message not posted"
+#~ msgstr "Chyba při čtení odpovědi na poslanou zprávu: zpráva nebyla poslána"
+
+#~ msgid "Error posting message: %s: message not posted"
+#~ msgstr "Chyba při posílání zprávy: %s: zpráva nebyla poslána"
+
+#~ msgid "Stream error"
+#~ msgstr "Chyba proudu"
+
+#~ msgid "Connection error: %s"
+#~ msgstr "Chyba spojení: %s"
+
+#~ msgid "Could not get group: %s"
+#~ msgstr "Nemohu získat skupinu: %s"
+
+#~ msgid "Could not get messages: unspecified error"
+#~ msgstr "Nemohu získat zprávy: neurčená chyba"
+
+#~ msgid "Unknown server response: %s"
+#~ msgstr "Neznámá odpověď serveru: %s"
+
+#~ msgid "${1}"
+#~ msgstr "${1}"
+
+#~ msgid "Because \"${1}\"."
+#~ msgstr "Protože \"${1}\"."
+
+#~ msgid "Brought to you by"
+#~ msgstr "Pro vás vytvořili"
+
+#~ msgid "Do you want to trust \"%s\" for the following purposes?"
+#~ msgstr "Chcete důvěřovat \"%s\" pro následující účely?"
+
+#~ msgid "View Certificate"
+#~ msgstr "Zobrazit certifikát"
+
+#~ msgid "You have been asked to trust a new Certificate Authority (CA)."
+#~ msgstr "Byli jste požádáni, abyste věřili nové certifikační autoritě (CA)."
+
+#~ msgid "About Ximian Evolution..."
+#~ msgstr "O Ximian Evolution..."
+
+#~ msgid "_About Ximian Evolution..."
+#~ msgstr "O _Ximian Evolution..."
+
 #~ msgid "Failed to connect to LDAP server"
 #~ msgstr "Nemohu se připojit k serveru LDAP."
 
diff --git a/po/da.po b/po/da.po
index 643c5c1a65..c8fb13813b 100644
--- a/po/da.po
+++ b/po/da.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.4.1\n"
-"POT-Creation-Date: 2004-05-19 14:00-0400\n"
+"POT-Creation-Date: 2004-06-03 11:14-0400\n"
 "PO-Revision-Date: 2003-02-02 12:41+0100\n"
 "Last-Translator: Søren Boll Overgaard <boll@debian.org>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -66,14 +66,14 @@ msgstr "1 kort"
 msgid "Default Sync Address:"
 msgstr "Standardsynkroniseringsadresse:"
 
-#: addressbook/conduit/address-conduit.c:1150
 #: addressbook/conduit/address-conduit.c:1151
+#: addressbook/conduit/address-conduit.c:1152
 #, fuzzy
 msgid "Could not load addressbook"
 msgstr "Kunne ikke indlæse %s: %s"
 
-#: addressbook/conduit/address-conduit.c:1219
-#: addressbook/conduit/address-conduit.c:1222
+#: addressbook/conduit/address-conduit.c:1220
+#: addressbook/conduit/address-conduit.c:1223
 msgid "Could not read pilot's Address application block"
 msgstr "Kunne ikke læse pilotens adresseapplikationsblok"
 
@@ -81,13 +81,13 @@ msgstr "Kunne ikke læse pilotens adresseapplikationsblok"
 msgid "Accessing LDAP Server anonymously"
 msgstr "Tilslutter LDAP-serveren anonymt"
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
 msgid "Failed to authenticate.\n"
 msgstr "Mislykkedes med godkendelse.\n"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sAngiv adgangskode for %s (bruger %s)"
@@ -133,52 +133,24 @@ msgstr "_Kontakter:"
 msgid "Create a new contacts group"
 msgstr "Opret en ny genvejsgruppe"
 
-#: addressbook/gui/component/addressbook-component.c:182
+#: addressbook/gui/component/addressbook-component.c:184
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:483
-msgid "Failed to connect to LDAP server"
-msgstr "Tilslutning til LDAP-serveren mislykkedes"
-
-#: addressbook/gui/component/addressbook-config.c:507
-msgid "Failed to authenticate with LDAP server"
-msgstr "Mislykkedes med godkendelse på LDAP-server"
-
-#: addressbook/gui/component/addressbook-config.c:535
-msgid "Could not perform query on Root DSE"
-msgstr "Kunne ikke gennemføre forespørgsel på rod-DSE"
-
-#: addressbook/gui/component/addressbook-config.c:840
-msgid "The server responded with no supported search bases"
-msgstr "Serveren svarede at ingen søgebaser understøttes"
-
-#: addressbook/gui/component/addressbook-config.c:1245
-msgid "This server does not support LDAPv3 schema information"
-msgstr "Denne server understøtter ikke LDAPv3-schemainformation"
-
-#: addressbook/gui/component/addressbook-config.c:1266
-msgid "Error retrieving schema information"
-msgstr "Fejl ved hentning af schemainformation"
-
-#: addressbook/gui/component/addressbook-config.c:1274
-msgid "Server did not respond with valid schema information"
-msgstr "Serveren svarede ikke med gyldig schemainformation"
-
 #: addressbook/gui/component/addressbook-migrate.c:68
-#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1160
 #, fuzzy
 msgid "Migrating..."
 msgstr "Venter..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1201
 #, fuzzy, c-format
 msgid "Migrating `%s':"
 msgstr "Pinger %s"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:438
+#: addressbook/gui/component/addressbook-migrate.c:464
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
 #: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
@@ -186,31 +158,31 @@ msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:446
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
-#: mail/mail-config.glade.h:106
+#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
+#: mail/mail-config.glade.h:109
 msgid "Personal"
 msgstr "Personligt"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:454
+#: addressbook/gui/component/addressbook-migrate.c:480
 #, fuzzy
 msgid "On LDAP Servers"
 msgstr "LDAP-server"
 
-#: addressbook/gui/component/addressbook-migrate.c:582
+#: addressbook/gui/component/addressbook-migrate.c:608
 #, fuzzy
 msgid "LDAP Servers"
 msgstr "LDAP-server"
 
-#: addressbook/gui/component/addressbook-migrate.c:702
+#: addressbook/gui/component/addressbook-migrate.c:728
 #, fuzzy
 msgid "Autocompletion Settings"
 msgstr "Mapper for automatisk udfyldning"
 
-#: addressbook/gui/component/addressbook-migrate.c:1076
+#: addressbook/gui/component/addressbook-migrate.c:1104
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -218,60 +190,55 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1090
+#: addressbook/gui/component/addressbook-migrate.c:1118
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1099
+#: addressbook/gui/component/addressbook-migrate.c:1127
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1109
+#: addressbook/gui/component/addressbook-migrate.c:1137
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:674
+#: addressbook/gui/component/addressbook-view.c:675
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:761
+#: addressbook/gui/component/addressbook-view.c:754
 #, fuzzy
 msgid "New Address Book"
 msgstr "Adressebog"
 
-#: addressbook/gui/component/addressbook-view.c:762
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
+#: addressbook/gui/component/addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Slet"
 
-#: addressbook/gui/component/addressbook-view.c:763
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-view.c:756
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Egenskaber ..."
 
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/addressbook-view.c:1002
+#. Create the contacts group
+#: addressbook/gui/component/addressbook-view.c:995
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
 #: calendar/gui/migration.c:373
 msgid "Contacts"
 msgstr "Kontakter"
@@ -352,10 +319,6 @@ msgid "Manage your S/MIME certificates here"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-msgid "  S_how Supported Bases "
-msgstr "  _Vis de baser som understøttes "
-
-#: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -370,204 +333,170 @@ msgstr "  _Vis de baser som understøttes "
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1:00"
-msgstr "1.00"
-
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
-msgstr "5.00"
-
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "Autenticering"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
 #, fuzzy
 msgid "<b>Display</b>"
 msgstr "<b>Status:</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 #, fuzzy
 msgid "<b>Downloading</b>"
 msgstr "Geografisk lokation:"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:10
 #, fuzzy
 msgid "<b>Searching</b>"
 msgstr "Søger..."
 
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
 msgid "<b>Server Information</b>"
 msgstr "Skridt 1: Serverinformation"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
 msgid "<b>Type:</b>"
 msgstr "<b>Udføres inden:</b> "
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:13
 #, fuzzy
 msgid "Add Contacts Group"
 msgstr "_Kontakter:"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:14
 #, fuzzy
 msgid "Address Book Properties"
 msgstr "Adressebogs-kilder"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
-#: mail/mail-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
+#: mail/mail-config.glade.h:42
 msgid "Always"
 msgstr "Altid"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr "Anonymt"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:17
 #: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Grundlæggende"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
-msgid "Connecting"
-msgstr "Tilslutter"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 #: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Detaljer"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
-msgid "Distinguished _name:"
-msgstr "Distinguished _name:"
-
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:19
 #, fuzzy
 msgid "Distinguished name"
 msgstr "Distinguished _name:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:20
 #, fuzzy
 msgid "Download limit:"
 msgstr "_Nedhæntningsgrænse:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Email address"
 msgstr "E-post-_adresse:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:22
 #, fuzzy
-msgid "Email address:"
-msgstr "E-post-_adresse:"
-
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "Evolution will use this DN to authenticate you with the server"
-msgstr "Evolution vil anvende dette DN for at godkende dig på servern"
-
-#: addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
-"Evolution will use this email address to authenticate you with the server"
+"Evolution will use this email address to authenticate you with the server."
 msgstr "Evolution vil bruge denne adresse til at godkende dig på serveren"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:23
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Understøttede søgebaser"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:24
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
+#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Generelt"
 
-#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
-#: mail/mail-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
+#: mail/mail-config.glade.h:102
 msgid "Never"
 msgstr "Aldrig"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
-msgid "One"
-msgstr "Én"
-
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:35
-msgid "S_earch scope: "
-msgstr "S_øgningsomfang: "
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Search _base:"
+msgstr "_Udgangspunkt for søgning:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
 msgid "Search base only"
 msgstr "_Udgangspunkt for søgning:"
 
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:29
 #, fuzzy
 msgid "Search base:"
 msgstr "_Udgangspunkt for søgning:"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Search scope:"
 msgstr "S_øgningsomfang: "
 
-#: addressbook/gui/component/ldap-config.glade.h:39
-msgid "Searching"
-msgstr "Søger..."
-
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:31
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
-"server if\n"
-"your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL or TLS."
 msgstr ""
 "At vælge dette alternativ indebærer at Evolution kun vil tilslutte til din\n"
 "LDAP-server hvis den understøtter SSL eller TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a \n"
-"insecure environment. For example, if you and your LDAP server are behind a "
-"firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection "
-"is already\n"
-"secure."
+"you are in a insecure environment. For example, if you and your LDAP server "
+"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
+"because your connection is already secure."
 msgstr ""
 "At vælge dette alternativ betyder at Evolution kun vil forsøge at bruge SSL/"
 "TLS\n"
@@ -576,51 +505,45 @@ msgstr ""
 "på arbejdet behøver Evolution ikke at anvende SSL/TLS eftersom forbindelsen "
 "allerede er sikker."
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:33
+#, fuzzy
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
-"TLS.  This \n"
-"means that your connection will be insecure, and that you will be vulnerable "
-"to security\n"
-"exploits. "
+"TLS.  This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits. "
 msgstr ""
 "At vælge dette alternativ betyder at din server hverken understøtter SSL "
 "eller TLS.\n"
 "Dette betyder at din forbindelse vil være usikker, og at du bliver \n"
 "sårbar overfor angreb."
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Sub"
-msgstr "Under"
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr "Understøttede søgebaser"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
-"searches will \n"
-"begin. If you leave this blank, the search will begin at the root of the "
-"directory tree."
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
 msgstr ""
 "Søgebasen er distinguished name (DN) for posten hvor dine søgninger "
 "starter.\n"
 "Hvis du efterlader dette tomt kommer søgningen at begynde ved roden af "
 "katalogtræet."
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:37
+#, fuzzy
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
-"the \n"
-"directory tree. A search scope of \"sub\" will include all entries below "
-"your search base.\n"
-"A search scope of \"one\" will only include the entries one level beneath "
-"your base.\n"
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
 msgstr ""
 "Søgomfanget angiver hvor dybt du ønsker at søgningen skal gå ned i "
 "katalogtræet.\n"
@@ -628,7 +551,7 @@ msgstr ""
 "Søgeomfanget \"one\" inkluderer alene de poster som er et niveau under din "
 "søgebase.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:58
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -636,18 +559,17 @@ msgstr ""
 "Dette er det komplette navn på din ldap-server. For eksempel \"ldap.mitfirma."
 "dk\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:39
 #, fuzzy
 msgid ""
-"This is the maximum number of entries to download. Setting this number to "
-"be \n"
+"This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr ""
 "Dette er det største antal poster der skal hentes. Sættes dette tal for "
 "højt\n"
 "sænkes hastigheden på adressebogen."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -657,141 +579,120 @@ msgstr ""
 "at sætte dette til \"E-postadresse\" kræver anonym adgang til din ldap-"
 "server."
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:41
+#, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
-"list.\n"
-"It is for display purposes only. "
+"list. It is for display purposes only. "
 msgstr ""
 "Dette er navnet på denne server, som vises i din Evolution-mappliste.\n"
 "Det anvends kun i forbindelse med visning."
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:42
+#, fuzzy
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. "
-"A \n"
-"list of standard ports has been provided. Ask your system administrator\n"
-"what port you should specify."
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
 msgstr ""
 "Dette er den port på LDAP-servern som Evolution vil forsøge at tilslutte.\n"
 "En liste med standard er givet. Spørg din systemadministrator hvilken port "
 "du skal bruge."
 
-#: addressbook/gui/component/ldap-config.glade.h:67
-msgid "This option controls how long a search will be run."
-msgstr "Denne indstilling styrer hvor lang tid en søgning må køre."
-
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:43
 #, fuzzy
 msgid "Timeout:"
 msgstr "Tidsformat:"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
-msgid "U_se SSL/TLS:"
-msgstr "An_vend SSL/TLS:"
-
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr "Bruger distinguished name (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr "Bruger e-postadresse"
 
-#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
-#: mail/mail-config.glade.h:154
+#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
+#: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr "Når det er muligt"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:47
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "_Kontakter:"
 
-#: addressbook/gui/component/ldap-config.glade.h:74
-#: calendar/gui/dialogs/calendar-setup.glade.h:12
-msgid "_Display name:"
-msgstr "_Vis navn:"
-
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr "_Nedhæntningsgrænse:"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
 msgid "_Email address:"
 msgstr "E-post-_adresse:"
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:50
+#, fuzzy
+msgid "_Find Possible Search Bases"
+msgstr "Understøttede søgebaser"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Log in method:"
 msgstr "_Logindmetode:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "_Log in:"
+msgstr "Indlogning"
+
+#: addressbook/gui/component/ldap-config.glade.h:53
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
 msgid "_Name:"
 msgstr "_Navn:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
-msgid "_Port number:"
-msgstr "_Portnummer:"
-
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "_Port:"
 msgstr "_Prioritet:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
-msgid "_Search base:"
-msgstr "_Udgangspunkt for søgning:"
-
-#: addressbook/gui/component/ldap-config.glade.h:82
-msgid "_Server name:"
-msgstr "_Servernavn:"
+#: addressbook/gui/component/ldap-config.glade.h:55
+#, fuzzy
+msgid "_Search scope:"
+msgstr "S_øgningsomfang: "
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:56
 #, fuzzy
 msgid "_Server:"
 msgstr "S_erver:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
-msgid "_Timeout (minutes):"
-msgstr "_Timeout (minutter):"
+#: addressbook/gui/component/ldap-config.glade.h:57
+#, fuzzy
+msgid "_Timeout:"
+msgstr "Tidsformat:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:58
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "_Brug sikker anslutning (SSL):"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "kort"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
-msgid "connecting-tab"
-msgstr "forbindelsesfaneblad"
-
-#: addressbook/gui/component/ldap-config.glade.h:88
-msgid "general-tab"
-msgstr "generel-faneblad"
-
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:60
 #: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
-#: mail/mail-config.glade.h:182
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "minutter"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
-msgid "searching-tab"
-msgstr "søgefaneblad"
-
-#: addressbook/gui/component/select-names/e-select-names.c:497
+#: addressbook/gui/component/select-names/e-select-names.c:503
 #: addressbook/gui/component/select-names/select-names.glade.h:6
 #, fuzzy
 msgid "Select Contacts from Address Book"
 msgstr "Vælg kontakter fra adressebogen"
 
-#: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
@@ -831,7 +732,7 @@ msgstr "Kontakt uden navn:"
 
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:222
+#: addressbook/gui/widgets/e-addressbook-view.c:224
 msgid "Source"
 msgstr "Kilde"
 
@@ -910,9 +811,9 @@ msgid "<b>Work</b>"
 msgstr "Arbejdsuge"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
-#: addressbook/gui/widgets/eab-contact-display.c:342
-#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/widgets/eab-contact-display.c:334
+#: addressbook/gui/widgets/eab-contact-display.c:353
 msgid "AIM"
 msgstr ""
 
@@ -953,15 +854,15 @@ msgid "Company:"
 msgstr "Firma"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:271
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
+#: addressbook/gui/contact-editor/e-contact-editor.c:266
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
 msgstr "Kontakt"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1527
+#: addressbook/gui/contact-editor/e-contact-editor.c:520
 msgid "Contact Editor"
 msgstr "Kontaktredigering"
 
@@ -985,83 +886,80 @@ msgid "Full _Name..."
 msgstr "_Fulde navn..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:202
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-msgid "Home"
-msgstr "Hjemme"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #, fuzzy
 msgid "Home Page:"
 msgstr "Fax hjemme"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-#, fuzzy
-msgid "Job title:"
-msgstr "_Jobtitel:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/e-itip-control.c:936
-msgid "Location:"
-msgstr "Sted:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 #, fuzzy
 msgid "MSN Messenger"
 msgstr "Send _besked"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 #, fuzzy
 msgid "Mailing Address"
 msgstr "E-post-adresse:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 #, fuzzy
 msgid "Manager:"
 msgstr "Leder"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "Kalde_navn:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Notes:"
 msgstr "No_tater:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
-#: addressbook/gui/contact-editor/e-contact-editor.c:203
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-msgid "Other"
-msgstr "Andre"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#, fuzzy
+msgid "Office:"
+msgstr "Kont_or:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "PO Box:"
 msgstr "_Postboks:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 #, fuzzy
 msgid "Personal Information"
 msgstr "Yderligere information"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 #, fuzzy
 msgid "Profession:"
 msgstr "_Profession:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#, fuzzy
+msgid "Spouse:"
+msgstr "Ægte_fælle:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "State/Province:"
 msgstr "_Stat/Provins:"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#, fuzzy
+msgid "Title:"
+msgstr "_Titel:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+msgid "Video Chat:"
+msgstr ""
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:41
 #, fuzzy
 msgid "Wants to receive HTML mail"
@@ -1069,15 +967,15 @@ msgstr "Ønsker at modtage e-post som _HTML"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:42
 #, fuzzy
-msgid "Webcam:"
-msgstr "Side"
+msgid "Web Log:"
+msgstr "_Hjemmeside-adresse:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
-#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
-#: mail/mail-config.glade.h:155
+#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
+#: mail/mail-config.glade.h:157
 msgid "Work"
 msgstr "Arbejde"
 
@@ -1097,19 +995,12 @@ msgid "_File under:"
 msgstr "Filnavn:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 #, fuzzy
 msgid "_Where:"
 msgstr "S_erver:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
-msgid "item7"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
-msgid "item8"
-msgstr ""
-
-#: addressbook/gui/contact-editor/eab-editor.c:316
+#: addressbook/gui/contact-editor/eab-editor.c:315
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -1117,7 +1008,7 @@ msgstr ""
 "Er du sikker på at du vil\n"
 "fjerne disse kontakter?"
 
-#: addressbook/gui/contact-editor/eab-editor.c:319
+#: addressbook/gui/contact-editor/eab-editor.c:318
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -1126,16 +1017,16 @@ msgstr ""
 "slette denne kontakt?"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:351
-#: addressbook/gui/widgets/eab-contact-display.c:372
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Address"
 msgstr "Adresse"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:292
+#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard.c:174
@@ -2123,91 +2014,114 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/contact-editor/e-contact-editor.c:179
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:337
+#: addressbook/gui/widgets/eab-contact-display.c:356
 #, fuzzy
 msgid "Jabber"
 msgstr "Navnløs liste"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:347
-#: addressbook/gui/widgets/eab-contact-display.c:366
+#: addressbook/gui/contact-editor/e-contact-editor.c:180
+#: addressbook/gui/widgets/eab-contact-display.c:339
+#: addressbook/gui/widgets/eab-contact-display.c:358
 #, fuzzy
 msgid "Yahoo"
 msgstr "Yoro"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: addressbook/gui/widgets/eab-contact-display.c:338
+#: addressbook/gui/widgets/eab-contact-display.c:357
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:344
-#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#: addressbook/gui/widgets/eab-contact-display.c:355
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/contact-editor/e-contact-editor.c:183
 #, fuzzy
 msgid "GroupWise"
 msgstr "Gruppe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+msgid "Home"
+msgstr "Hjemme"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+msgid "Other"
+msgstr "Andre"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
 #, fuzzy
 msgid "Source Book"
 msgstr "Kilde"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:264
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:278
+#: addressbook/gui/contact-editor/e-contact-editor.c:273
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Ny kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:285
+#: addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Writable Fields"
 msgstr "Skrivbare felter"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:299
+#: addressbook/gui/contact-editor/e-contact-editor.c:294
 msgid "Changed"
 msgstr "Ændret"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
-msgid "Category editor not available."
-msgstr "Kategori-redigering ikke tilgængelig."
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:2352
 msgid "This contact belongs to these categories:"
 msgstr "Denne kontakt hører til disse kategorier:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#: addressbook/gui/contact-editor/e-contact-editor.c:2429
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Venligst vælg mellem følgende alternativer"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#: addressbook/gui/contact-editor/e-contact-editor.c:2433
 #, fuzzy
 msgid "No image"
 msgstr "Nome"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#: addressbook/gui/contact-editor/e-contact-editor.c:2636
 #, fuzzy
 msgid ""
-"The following entries are invalid:\n"
+"The contact data is invalid:\n"
 "\n"
-msgstr "Følgende forbindelser er aktive:"
+msgstr "Gentagelsesdatoen er ugyldig"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2738
-#, c-format
-msgid "Could not find widget for a field: `%s'"
-msgstr "Kunne ikke finde widget for felt: `%s'"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#, fuzzy
+msgid "Invalid contact."
+msgstr "Ugyldigt formål"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+msgid ""
+"The contact cannot be saved to the selected address book. Do you want to "
+"discard changes?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2727
+#: addressbook/gui/contact-editor/e-contact-editor.c:2751
+msgid "_Discard"
+msgstr "_Forkast"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+msgid ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
+msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:62
 #, fuzzy
@@ -2245,7 +2159,7 @@ msgid "_Edit Full"
 msgstr "Redigér alt"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Full Name:"
 msgstr "_Fulde navn:"
@@ -2400,30 +2314,30 @@ msgstr "Listenavn:"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "Skriv en e-post-adresse eller træk en kontakt ind i feltet nedenfor:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "contact-list-editor"
 msgstr "kontakt-liste-redigering"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:153
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:215
+#: addressbook/gui/widgets/e-addressbook-view.c:217
 #: addressbook/gui/widgets/e-minicard-view.c:460
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Bog"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
 msgid "Is New List"
 msgstr "Er ny liste"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:215
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
 msgid "Contact List Editor"
 msgstr "Kontaktlisteredigering"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:438
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
 msgid "Save List as VCard"
 msgstr "Gem liste som VCard"
 
@@ -2470,128 +2384,128 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Avanceret søgning"
 
-#: addressbook/gui/widgets/eab-contact-display.c:129
-#: addressbook/gui/widgets/eab-contact-display.c:192
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:139
-#: addressbook/gui/widgets/eab-contact-display.c:205
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:257
-#: addressbook/gui/widgets/eab-contact-display.c:533
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:525
 #, fuzzy
 msgid "List Members"
 msgstr "Medlemmer"
 
-#: addressbook/gui/widgets/eab-contact-display.c:329
-#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/eab-contact-display.c:321
+#: addressbook/gui/widgets/eab-contact-display.c:323
 #, fuzzy
 msgid "E-mail"
 msgstr "E-post"
 
-#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/eab-contact-display.c:332
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organisation"
 
-#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:333
 #, fuzzy
 msgid "Position"
 msgstr "Boston"
 
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:354
 #, fuzzy
 msgid "Groupwise"
 msgstr "Gruppe"
 
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:340
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:349
-#: addressbook/gui/widgets/eab-contact-display.c:370
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:362
 #, fuzzy
 msgid "Phone"
 msgstr "Ponce"
 
-#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:342
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:354
+#: addressbook/gui/widgets/eab-contact-display.c:346
 #, fuzzy
 msgid "work"
 msgstr "Arbejde"
 
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:359
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:368
-#: addressbook/gui/widgets/eab-contact-display.c:587
+#: addressbook/gui/widgets/eab-contact-display.c:360
+#: addressbook/gui/widgets/eab-contact-display.c:579
 #, fuzzy
 msgid "Blog"
 msgstr "Bologna"
 
-#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/eab-contact-display.c:363
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: addressbook/gui/widgets/eab-contact-display.c:375
+#: addressbook/gui/widgets/eab-contact-display.c:367
 #, fuzzy
 msgid "personal"
 msgstr "Personligt"
 
-#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/eab-contact-display.c:374
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Kommentar"
 
-#: addressbook/gui/widgets/eab-contact-display.c:548
+#: addressbook/gui/widgets/eab-contact-display.c:540
 #, fuzzy
 msgid "Job Title"
 msgstr "_Jobtitel:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/eab-contact-display.c:544
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:774
+#: smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "E-post"
 
-#: addressbook/gui/widgets/eab-contact-display.c:579
+#: addressbook/gui/widgets/eab-contact-display.c:571
 #, fuzzy
 msgid "Home page"
 msgstr "Fax hjemme"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 msgid "Success"
 msgstr "Succes"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Backend busy"
 msgstr ""
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Repository offline"
 msgstr "\"Offline\" lager"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 #, fuzzy
 msgid "Address Book does not exist"
 msgstr "Adressbogen findes ikke"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 #, fuzzy
 msgid "No Self Contact defined"
 msgstr "Ny kontaktliste"
@@ -2599,29 +2513,29 @@ msgstr "Ny kontaktliste"
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Permission denied"
 msgstr "Tilgang nægtet"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:57
 #, fuzzy
 msgid "Contact not found"
 msgstr "Kort ikke fundet"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: addressbook/gui/widgets/eab-gui-util.c:58
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "Kort-ID eksisterer allerede"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Protocol not supported"
 msgstr "Protokollen er ikke understøttet"
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:60
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:233
 #: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
@@ -2634,39 +2548,39 @@ msgid "Cancelled"
 msgstr "Afbrudt"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:61
 #, fuzzy
 msgid "Could not cancel"
 msgstr "Kunne ikke åbne den delte mappe: %s."
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Authentication Failed"
 msgstr "Godkendelse mislykkedes"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Authentication Required"
 msgstr "Godkendelse kræves"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:66
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "TLS not Available"
 msgstr "TLS er ikke tilgængelig"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#: addressbook/gui/widgets/eab-gui-util.c:66
 #, fuzzy
 msgid "No such source"
 msgstr "Ingen sådan besked"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:69
+#: addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Other error"
 msgstr "Anden fejl"
 
-#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:90
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
@@ -2675,7 +2589,7 @@ msgstr ""
 "Kunne ikke åbne denne adressebog. Kontrollér venligst at stien\n"
 "eksisterer, og at du har rettigheder til at tilgå den."
 
-#: addressbook/gui/widgets/eab-gui-util.c:110
+#: addressbook/gui/widgets/eab-gui-util.c:97
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -2685,19 +2599,19 @@ msgstr ""
 "at du har angivet en forkert URI eller at LDAP-serveren ikke\n"
 "kan nåes."
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:102
 #, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution you must compile the program from the CVS "
-"sources after retrieving OpenLDAP from the link below."
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
 msgstr ""
 "Denne udgave af Evolution har ikke LDAP-understøttelse\n"
 "indbygget. Hvis du ønsker at bruge LDAP i Evolution, \n"
 "må du oversætte programmet fra kildekoden i CVS efter at\n"
 "have hentet OpenLDAP fra adressen nedenfor.\n"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:109
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -2707,11 +2621,7 @@ msgstr ""
 "at du har angivet en fejlagtig URI eller at LDAP-serveren ikke\n"
 "kunne nåes."
 
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "Unable to open addressbook"
-msgstr "Kunne ikke åbne adressebogen"
-
-#: addressbook/gui/widgets/eab-gui-util.c:162
+#: addressbook/gui/widgets/eab-gui-util.c:129
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2723,7 +2633,7 @@ msgstr ""
 "Gør din søgning mere specifik eller øg resultatgrænsen i\n"
 "katalogserverindstillingerne for denne adressebog."
 
-#: addressbook/gui/widgets/eab-gui-util.c:168
+#: addressbook/gui/widgets/eab-gui-util.c:135
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -2736,56 +2646,48 @@ msgstr ""
 "specifik eller øg resultatgrænsen i katalogserverindstillingerne\n"
 "for denne adressbog."
 
-#: addressbook/gui/widgets/eab-gui-util.c:174
+#: addressbook/gui/widgets/eab-gui-util.c:141
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "Bagenden for denne adressebog kunne ikke forstå forespørgslen."
 
-#: addressbook/gui/widgets/eab-gui-util.c:177
+#: addressbook/gui/widgets/eab-gui-util.c:144
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Bagenden for denne adressbog nægtede at gennemføre denne forespørgsel."
 
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:147
 msgid "This query did not complete successfully."
 msgstr "Denne forespørgsel udførtes ikke successfuldt."
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
-msgid "Do you want to save changes?"
-msgstr "Vil du gemme ændringene?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:208
-msgid "_Discard"
-msgstr "_Forkast"
-
-#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:169
 msgid "Error adding list"
 msgstr "Fejl ved tilføjelse af liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:229
-#: addressbook/gui/widgets/eab-gui-util.c:652
+#: addressbook/gui/widgets/eab-gui-util.c:169
+#: addressbook/gui/widgets/eab-gui-util.c:580
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Fejl ved tilføjelse af kort"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying list"
 msgstr "Fejl ved ændring af liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Fejl ved ændring af kort"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:192
 msgid "Error removing list"
 msgstr "Fejl ved fjernelse af liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
-#: addressbook/gui/widgets/eab-gui-util.c:610
+#: addressbook/gui/widgets/eab-gui-util.c:192
+#: addressbook/gui/widgets/eab-gui-util.c:538
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Fejl ved fjernelse af kort"
 
-#: addressbook/gui/widgets/eab-gui-util.c:334
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, fuzzy, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2794,7 +2696,7 @@ msgstr ""
 "At åbna %d kort vil yderligere åbne %d nye vinduer.\n"
 "Ønsker du virkelig at vise alle disse kort?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:360
+#: addressbook/gui/widgets/eab-gui-util.c:300
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2803,54 +2705,49 @@ msgstr ""
 "%s eksisterer allerede\n"
 "Vil du overskrive den?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:364
+#: addressbook/gui/widgets/eab-gui-util.c:304
 msgid "Overwrite"
 msgstr "Overskriv"
 
-#: addressbook/gui/widgets/eab-gui-util.c:400
-#, c-format
-msgid "Error saving %s: %s"
-msgstr "Fejl ved gemning af %s: %s"
-
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:437
+#: addressbook/gui/widgets/eab-gui-util.c:365
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:571
+#: addressbook/gui/widgets/eab-gui-util.c:499
 msgid "list"
 msgstr "liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:706
+#: addressbook/gui/widgets/eab-gui-util.c:634
 #, fuzzy
 msgid "Move contact to"
 msgstr "Flyt kort til"
 
-#: addressbook/gui/widgets/eab-gui-util.c:708
+#: addressbook/gui/widgets/eab-gui-util.c:636
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Kopiér kort til"
 
-#: addressbook/gui/widgets/eab-gui-util.c:711
+#: addressbook/gui/widgets/eab-gui-util.c:639
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Flyt kort til"
 
-#: addressbook/gui/widgets/eab-gui-util.c:713
+#: addressbook/gui/widgets/eab-gui-util.c:641
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Kopiér kort til"
 
-#: addressbook/gui/widgets/eab-gui-util.c:716
+#: addressbook/gui/widgets/eab-gui-util.c:644
 #, fuzzy
 msgid "Select target addressbook."
 msgstr "Vælg kontakter fra adressebogen"
 
-#: addressbook/gui/widgets/eab-gui-util.c:939
+#: addressbook/gui/widgets/eab-gui-util.c:867
 msgid "Multiple VCards"
 msgstr "Flere VCard"
 
-#: addressbook/gui/widgets/eab-gui-util.c:942
+#: addressbook/gui/widgets/eab-gui-util.c:870
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard for %s"
@@ -2941,7 +2838,7 @@ msgstr[1] "Kontakter"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:229
+#: addressbook/gui/widgets/e-addressbook-view.c:231
 #: addressbook/gui/widgets/e-minicard-view.c:467
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
@@ -2959,146 +2856,135 @@ msgstr "Model"
 msgid "Error modifying card"
 msgstr "Fejl ved ændring af kort"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:163
 msgid "Name begins with"
 msgstr "Navn begynder med"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:164
 msgid "Email begins with"
 msgstr "E-postadresse begynder med"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:57
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Kategorien er"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-#: calendar/gui/cal-search-bar.c:50
+#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Et felt indeholder"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+#: addressbook/gui/widgets/e-addressbook-view.c:172
 msgid "Advanced..."
 msgstr "Avanceret..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:236
+#: addressbook/gui/widgets/e-addressbook-view.c:238
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:249
+#: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Type"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:506
+#: addressbook/gui/widgets/e-addressbook-view.c:508
 #, fuzzy
 msgid "Address Book"
 msgstr "Adressebog"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2076
+#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:2080
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
 msgstr "Gem som VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 msgid "New Contact..."
 msgstr "Ny kontakt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "New Contact List..."
 msgstr "Ny kontaktliste..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Go to Folder..."
 msgstr "Gå til mappe..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Import..."
 msgstr "Importér..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1066
 msgid "Search for Contacts..."
 msgstr "Søg efter kontakter..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Adressbogskilder..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1069
 msgid "Pilot Settings..."
 msgstr "Pilotindstillinger..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Videresend kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
 msgid "Send Message to Contact"
 msgstr "Send besked til kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Udskriv"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
+#: addressbook/gui/widgets/e-addressbook-view.c:1077
 msgid "Print Envelope"
 msgstr "Udskriv konvolut"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
+#: addressbook/gui/widgets/e-addressbook-view.c:1081
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Adressebog..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1080
+#: addressbook/gui/widgets/e-addressbook-view.c:1082
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Adressebog..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Klip ud"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopier"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1087
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Indsæt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:1092
+#: calendar/gui/e-calendar-view.c:1280
 msgid "Current View"
 msgstr "Aktuel visning"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1309
-#, c-format
-msgid ""
-"The addressbook backend for\n"
-"%s\n"
-"has crashed. You will have to restart Evolution in order to use it again"
-msgstr ""
-"Adressbogsbagenden for\n"
-"%s\n"
-"er gået ned. Du skal genstarte Evolution for at kunne anvende den igen"
-
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1667
-#: calendar/gui/cal-search-bar.c:362
+#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Enhver kategori"
 
@@ -3207,7 +3093,7 @@ msgstr "Radio"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-list-view.c:234
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Rolle"
@@ -3351,13 +3237,13 @@ msgstr "Evolutions VCard-importerer"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: addressbook/printing/e-contact-print.c:998
+#: addressbook/printing/e-contact-print.c:1000
 #, fuzzy
 msgid "Print contacts"
 msgstr "Udskriv valgte kontakter"
 
-#: addressbook/printing/e-contact-print.c:1064
-#: addressbook/printing/e-contact-print.c:1091
+#: addressbook/printing/e-contact-print.c:1066
+#: addressbook/printing/e-contact-print.c:1093
 #, fuzzy
 msgid "Print contact"
 msgstr "Udskriv valgte kontakter"
@@ -3610,17 +3496,22 @@ msgstr ""
 msgid "Impossible internal error."
 msgstr "Intern fejl"
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:629
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
 #, fuzzy
 msgid "Can not open file"
 msgstr "Kan ikke åbne besked"
 
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
 #, fuzzy
-msgid "Can not load URI"
-msgstr "Kort ikke fundet"
+msgid "Couldn't get list of addressbooks"
+msgstr "Kunne ikke indlæse %s: %s"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Kunne ikke åbne adressebogen"
 
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
@@ -3638,7 +3529,7 @@ msgstr "Intet filnavn angivet."
 msgid "Unnamed List"
 msgstr "Navnløs liste"
 
-#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 #, fuzzy
 msgid "Enter password"
@@ -3921,10 +3812,10 @@ msgid "Whether to show week numbers in date navigator"
 msgstr "Vis uge_nummer i datonavigation"
 
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:88
-#: calendar/gui/gnome-cal.c:1703
-#: camel/providers/groupwise/camel-gw-listener.c:304
-#: camel/providers/groupwise/camel-gw-listener.c:327
+#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/gnome-cal.c:1705
+#: camel/providers/groupwise/camel-gw-listener.c:311
+#: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
 msgstr "Kalender"
 
@@ -3947,7 +3838,7 @@ msgstr "returnerer mindre end"
 
 #: calendar/gui/calendar-commands.c:363
 #: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:19 filter/filter.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
 msgid "days"
 msgstr "dage"
 
@@ -4100,24 +3991,24 @@ msgstr "Ugevisning"
 msgid "Month View"
 msgstr "Månedsvisning"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Sammendrag indeholder"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Beskrivelse indeholder"
 
-#: calendar/gui/cal-search-bar.c:54
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Kommentar indeholder"
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:53
 #, fuzzy
 msgid "Location contains"
 msgstr "Beskrivelse indeholder"
 
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
 msgid "Unmatched"
 msgstr "Ingen træffere"
 
@@ -4138,23 +4029,23 @@ msgstr "Du har ikke rettigheder til at åbne kalenderen"
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:466
+#: calendar/gui/dialogs/alarm-options.c:467
 msgid "Audio Alarm Options"
 msgstr "Valgmuligheder for lyd-alarmer"
 
-#: calendar/gui/dialogs/alarm-options.c:475
+#: calendar/gui/dialogs/alarm-options.c:476
 msgid "Message Alarm Options"
 msgstr "Valgmuligheder for beskedsalarmer"
 
-#: calendar/gui/dialogs/alarm-options.c:484
+#: calendar/gui/dialogs/alarm-options.c:485
 msgid "Email Alarm Options"
 msgstr "Valgmuligheder for e-post-alarm"
 
-#: calendar/gui/dialogs/alarm-options.c:493
+#: calendar/gui/dialogs/alarm-options.c:494
 msgid "Program Alarm Options"
 msgstr "Valgmuligheder for program-alarmer"
 
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:510
 msgid "Unknown Alarm Options"
 msgstr "Valgmuligheder for ukendte alarmer"
 
@@ -4192,7 +4083,7 @@ msgstr "Send-til:"
 msgid "With these arguments:"
 msgstr "Med disse argumenter:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
 msgid "dialog1"
 msgstr "dialog1"
 
@@ -4201,7 +4092,7 @@ msgid "extra times every"
 msgstr "ekstra gange hver"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:20 filter/filter.glade.h:16
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr "timer"
 
@@ -4248,7 +4139,7 @@ msgstr "Send en besked"
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Sammendrag:"
 
@@ -4278,7 +4169,6 @@ msgid "hour(s)"
 msgstr "time(r)"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:21
 msgid "minute(s)"
 msgstr "minutt(er)"
 
@@ -4286,27 +4176,27 @@ msgstr "minutt(er)"
 msgid "start of appointment"
 msgstr "start på aftale"
 
-#: calendar/gui/dialogs/calendar-setup.c:170
+#: calendar/gui/dialogs/calendar-setup.c:172
 #, fuzzy
 msgid "You must specify a location to get the calendar from."
 msgstr "Du skal angive et filnavn."
 
-#: calendar/gui/dialogs/calendar-setup.c:178
+#: calendar/gui/dialogs/calendar-setup.c:180
 #, fuzzy, c-format
 msgid "The source location '%s' is not well-formed."
 msgstr "Den nødvendige metode til indlæsning af `%s' er ikke understøttet"
 
-#: calendar/gui/dialogs/calendar-setup.c:193
+#: calendar/gui/dialogs/calendar-setup.c:195
 #, c-format
 msgid "The source location '%s' is not a webcal source."
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:265
+#: calendar/gui/dialogs/calendar-setup.c:275
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:278
+#: calendar/gui/dialogs/calendar-setup.c:288
 #, c-format
 msgid ""
 "The group '%s' is remote. You must specify a location to get the calendar "
@@ -4328,61 +4218,36 @@ msgstr "Opgaveliste"
 msgid "C_olor:"
 msgstr "F_arver"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-#, fuzzy
-msgid "Calendar Properties"
-msgstr "iCalendar-fejl"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
 msgid "Pick a color"
 msgstr "Vælg en farve"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:8
-#, fuzzy
-msgid "Remote"
-msgstr "Fjern"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-#, fuzzy
-msgid "Task List Properties"
-msgstr "Opgaveliste"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
 #, fuzzy
 msgid "_Add Calendar"
 msgstr "Ny-kaledonia"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
 #, fuzzy
 msgid "_Add Group"
 msgstr "_Ny gruppe..."
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-#, fuzzy
-msgid "_Refresh Interval:"
-msgstr "Læs listen igen"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
 #, fuzzy
 msgid "_Refresh:"
 msgstr "Opdatér"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-#, fuzzy
-msgid "_Source URL:"
-msgstr "Kilde-URI for POP"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
 #, fuzzy
 msgid "_Type:"
 msgstr "Type:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
 #, fuzzy
 msgid "_URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
 msgid "weeks"
 msgstr "uger"
 
@@ -4492,7 +4357,7 @@ msgid "Display"
 msgstr "_Vis"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:76
 msgid "E_nable"
 msgstr "A_ktivér"
 
@@ -4503,7 +4368,7 @@ msgstr "Forespørgsel om ledig/optaget"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:563
+#: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Fredag"
 
@@ -4517,7 +4382,7 @@ msgstr "Minutter"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:559
+#: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Mandag"
 
@@ -4527,7 +4392,7 @@ msgstr "_søn"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:564
+#: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Lørdag"
 
@@ -4541,7 +4406,7 @@ msgstr "Vis uge_nummer i datonavigation"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Søndag"
 
@@ -4555,7 +4420,7 @@ msgstr "T_or"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:562
+#: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Torsdag"
 
@@ -4569,7 +4434,7 @@ msgstr "Tidsformat:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:560
+#: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Tirsdag"
 
@@ -4579,7 +4444,7 @@ msgstr "_Ugen begynder:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:561
+#: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Onsdag"
 
@@ -4613,7 +4478,7 @@ msgid "_Day begins:"
 msgstr "_Dagen begynder:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
-#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:43
@@ -4662,83 +4527,50 @@ msgstr "_Ons"
 msgid "before every appointment"
 msgstr "før hvert møde"
 
-#: calendar/gui/dialogs/cancel-comp.c:57
-msgid ""
-"The event being deleted is a meeting, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"Hændelsen som fjernes er et møde. Vil du sende en aflysningsmeddelelse?"
-
-#: calendar/gui/dialogs/cancel-comp.c:60
-msgid "Are you sure you want to cancel and delete this meeting?"
-msgstr "Er du sikker på, at du vil aflyse og slette dette møde?"
-
-#: calendar/gui/dialogs/cancel-comp.c:66
-msgid ""
-"The task being deleted is assigned, would you like to send a cancellation "
-"notice?"
-msgstr "Opgaven som fjernes er tildelt. Vil du sende en aflysningsmeddelselse?"
-
-#: calendar/gui/dialogs/cancel-comp.c:69
-msgid "Are you sure you want to cancel and delete this task?"
-msgstr "Er du sikker på, at du vil aflyse og slette denne opgave?"
-
-#: calendar/gui/dialogs/cancel-comp.c:75
-msgid ""
-"The journal entry being deleted is published, would you like to send a "
-"cancellation notice?"
-msgstr ""
-"Journalindgangen som fjernes er offentliggjort. Vil du sende en "
-"aflysningsmeddelelse?"
-
-#: calendar/gui/dialogs/cancel-comp.c:78
-msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr "Er du sikker på, at du vil aflyse og slette denne journalopføring?"
-
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Denne hændelse er slettet."
 
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "Denne opgave er slettet."
 
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:68
 msgid "This journal entry has been deleted."
 msgstr "Denne journalopføring er slettet."
 
-#: calendar/gui/dialogs/changed-comp.c:75
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  Du har lavet ændringer. Skal disse ændringer forkastes og redigeringen "
 "lukkes?"
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Du har ikke lavet ændringer. Skal redigeringen lukkes?"
 
-#: calendar/gui/dialogs/changed-comp.c:82
+#: calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "Denne hændelse er ændret."
 
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "Denne opgave er ændret."
 
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:92
 msgid "This journal entry has been changed."
 msgstr "Denne journalopføring er ændret."
 
-#: calendar/gui/dialogs/changed-comp.c:99
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Du har lavet ændringer. Skal disse ændringer forkastes og redigeringen "
 "opdateres?"
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Du har ikke gjort ændringer. Opdater redigering?"
@@ -4776,7 +4608,7 @@ msgid "No summary"
 msgstr "Ingen sammendrag"
 
 #: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
 #: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Gem som..."
@@ -4834,103 +4666,55 @@ msgstr "Aflys operation"
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:95
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "Er du sikker på at du vil slette aftalen `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:98
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "Er du sikker på at du vil slette denne aftale uden titel?"
-
-#: calendar/gui/dialogs/delete-comp.c:104
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "Er du sikker på at du vil slette opgaven `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:107
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "Er du sikker på at du vil slette denne opgave uden titel?"
-
-#: calendar/gui/dialogs/delete-comp.c:113
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "Er du sikker på at du vil slette journalopføringen `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:116
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "Er du sikker på at du vil slette denne journalopføring uden titel?"
-
-#: calendar/gui/dialogs/delete-comp.c:131
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d appointment?"
-msgid_plural "Are you sure you want to delete %d appointments?"
-msgstr[0] "Er du sikker på at du vil slette %d aftaler?"
-msgstr[1] "Er du sikker på at du vil slette %d aftaler?"
-
-#: calendar/gui/dialogs/delete-comp.c:138
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d task?"
-msgid_plural "Are you sure you want to delete %d tasks?"
-msgstr[0] "Er du sikker på at du vil slette %d opgaver?"
-msgstr[1] "Er du sikker på at du vil slette %d opgaver?"
-
-#: calendar/gui/dialogs/delete-comp.c:145
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d journal entry?"
-msgid_plural "Are you sure you want to delete %d journal entries?"
-msgstr[0] "Er du sikker på at du vil slette %d journalopføringer?"
-msgstr[1] "Er du sikker på at du vil slette %d journalopføringer?"
-
-#: calendar/gui/dialogs/delete-error.c:52
+#: calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "Begivenheder kunne ikke fjernes pga. en CORBA-fejl"
 
-#: calendar/gui/dialogs/delete-error.c:55
+#: calendar/gui/dialogs/delete-error.c:57
 msgid "The task could not be deleted due to a corba error"
 msgstr "Opgaven kunne ikke fjernes pga. en CORBA-fejl"
 
-#: calendar/gui/dialogs/delete-error.c:58
+#: calendar/gui/dialogs/delete-error.c:60
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr "Journalindgangen kunne ikke fjernes pga. en CORBA-fejl"
 
-#: calendar/gui/dialogs/delete-error.c:61
+#: calendar/gui/dialogs/delete-error.c:63
 msgid "The item could not be deleted due to a corba error"
 msgstr "Punktet kunne ikke fjernes pga. en CORBA-fejl"
 
-#: calendar/gui/dialogs/delete-error.c:68
+#: calendar/gui/dialogs/delete-error.c:70
 msgid "The event could not be deleted because permission was denied"
 msgstr "Begivenheden kunne ikke fjernes da du ikke har rettigheder hertil"
 
-#: calendar/gui/dialogs/delete-error.c:71
+#: calendar/gui/dialogs/delete-error.c:73
 #, fuzzy
 msgid "The task could not be deleted because permission was denied"
 msgstr "Deltagerstatus kunne ikke opdateres pga. ugyldig status!\n"
 
-#: calendar/gui/dialogs/delete-error.c:74
+#: calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr "Journalindgangen kunne ikke fjernes da du ikke har rettigheder hertil"
 
-#: calendar/gui/dialogs/delete-error.c:77
+#: calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
 msgstr "Punktet kunne ikke fjernes da du ikke har rettigheder hertil"
 
-#: calendar/gui/dialogs/delete-error.c:84
+#: calendar/gui/dialogs/delete-error.c:86
 #, fuzzy
 msgid "The event could not be deleted due to an error"
 msgstr "Begivenheder kunne ikke fjernes pga. en CORBA-fejl"
 
-#: calendar/gui/dialogs/delete-error.c:87
+#: calendar/gui/dialogs/delete-error.c:89
 #, fuzzy
 msgid "The task could not be deleted due to an error"
 msgstr "Opgaven kunne ikke fjernes pga. en CORBA-fejl"
 
-#: calendar/gui/dialogs/delete-error.c:90
+#: calendar/gui/dialogs/delete-error.c:92
 #, fuzzy
 msgid "The journal entry could not be deleted due to an error"
 msgstr "Journalindgangen kunne ikke fjernes pga. en CORBA-fejl"
 
-#: calendar/gui/dialogs/delete-error.c:93
+#: calendar/gui/dialogs/delete-error.c:95
 #, fuzzy
 msgid "The item could not be deleted due to an error"
 msgstr "Punktet kunne ikke fjernes pga. en CORBA-fejl"
@@ -5068,11 +4852,11 @@ msgstr "_Start-tid:"
 
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:3
+#: calendar/gui/dialogs/meeting-page.glade.h:4
 #: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
 #: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1559
-#: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:100
+#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
+#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
@@ -5098,8 +4882,8 @@ msgstr "_Deleger til..."
 #. FIXME: need to disable for undeletable folders
 #: calendar/gui/dialogs/meeting-page.c:655
 #: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1310 calendar/gui/e-calendar-view.c:1342
-#: mail/em-folder-tree.c:2557 mail/em-folder-view.c:919
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
+#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -5107,7 +4891,7 @@ msgid "_Delete"
 msgstr "_Slet"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:240
+#: calendar/gui/e-meeting-list-view.c:218
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Deltager"
@@ -5143,16 +4927,15 @@ msgid "Member"
 msgstr "Medlem"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "SU"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
-#: mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-list-view.c:248
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
 
@@ -5161,20 +4944,20 @@ msgstr "Status"
 msgid "Add A_ttendee"
 msgstr "Deltager"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "Add attendees from addressbook."
+msgstr "Tilføj afsenderen til adresse_bogen"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Organisator:"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
+#: calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "_Change Organizer"
 msgstr "Æn_dr organisator"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-#: calendar/gui/e-meeting-time-sel.c:417
-msgid "_Invite Others..."
-msgstr "_Invitér andre..."
-
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 #, fuzzy
 msgid "<b>Calendar options</b>"
@@ -5335,7 +5118,7 @@ msgid "_No recurrence"
 msgstr "I_ngen genindtræffelse"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:450
+#: composer/e-msg-composer-attachment-bar.c:453
 msgid "_Remove"
 msgstr "Fje_rn"
 
@@ -5367,57 +5150,21 @@ msgstr "uge(r)"
 msgid "year(s)"
 msgstr "år"
 
-#: calendar/gui/dialogs/save-comp.c:53
-#, fuzzy
-msgid ""
-"This event has been changed, but has not been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Denne signatur er ændret, men har ikke blevet gemt..\n"
-"\n"
-"Vil du gemme ændringene?"
-
-#: calendar/gui/dialogs/save-comp.c:57
-msgid "_Discard Changes"
-msgstr "_Forkast ændringer"
-
-#: calendar/gui/dialogs/save-comp.c:62
-#, fuzzy
-msgid "Save Event"
-msgstr "Kalenderhændelser"
-
-#: calendar/gui/dialogs/select-source-dialog.c:65
+#: calendar/gui/dialogs/select-source-dialog.c:69
 #, fuzzy
 msgid "Select destination"
 msgstr "Vælg en målmappe til at importere data"
 
-#: calendar/gui/dialogs/select-source-dialog.c:86
+#: calendar/gui/dialogs/select-source-dialog.c:90
 #, fuzzy
 msgid "_Destination"
 msgstr "Slet denne mappe"
 
-#: calendar/gui/dialogs/select-source-dialog.c:88
+#: calendar/gui/dialogs/select-source-dialog.c:92
 #, fuzzy
 msgid "Task List"
 msgstr "Opgaveliste"
 
-#: calendar/gui/dialogs/send-comp.c:57
-msgid "The meeting information has been created. Send it?"
-msgstr "Mødesinformationen er blevet genereret. Send den?"
-
-#: calendar/gui/dialogs/send-comp.c:60
-msgid "The meeting information has changed. Send an updated version?"
-msgstr "Mødeinformationen er ændret. Send en opdateret version?"
-
-#: calendar/gui/dialogs/send-comp.c:67
-msgid "The task assignment information has been created. Send it?"
-msgstr "Opgaveinformationen er genereret. Send den?"
-
-#: calendar/gui/dialogs/send-comp.c:71
-msgid "The task information has changed. Send an updated version?"
-msgstr "Opgaveinformationen er ændret. Send en opdateret version?"
-
 #: calendar/gui/dialogs/task-details-page.c:406
 msgid "Completed date is wrong"
 msgstr "Udførelsesdatoen er forkert"
@@ -5437,7 +5184,7 @@ msgstr "Fuldført"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #: calendar/gui/e-cal-component-preview.c:249
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:960
 msgid "High"
 msgstr "Høj"
 
@@ -5451,14 +5198,14 @@ msgstr "I gang"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:253
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:958
 msgid "Low"
 msgstr "Lav"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:251
 #: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:957
+#: mail/message-list.c:959
 msgid "Normal"
 msgstr "Normal"
 
@@ -5518,8 +5265,8 @@ msgstr "Kon_fidensiel"
 
 #: calendar/gui/dialogs/task-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
+#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Beskrivelse:"
 
@@ -5695,7 +5442,7 @@ msgstr "Fær_dig-dato:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:950
+#: calendar/gui/e-itip-control.c:943
 msgid "Status:"
 msgstr "Status:"
 
@@ -5781,12 +5528,12 @@ msgstr "Optaget"
 msgid "Deleting selected objects"
 msgstr "Sletter de valgte objekter"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
 msgid "Updating objects"
 msgstr "Opdaterer objekter"
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1370
+#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
 #: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Åbn"
@@ -5797,15 +5544,15 @@ msgid "Open _Web Page"
 msgstr "_Åbn besked"
 
 #: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1291 calendar/gui/e-calendar-view.c:1376
-#: mail/em-folder-view.c:896 mail/em-popup.c:690 mail/em-popup.c:806
+#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
+#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "Gem _som..."
 
 #: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1292
-#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
+#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
@@ -5813,24 +5560,24 @@ msgid "_Print..."
 msgstr "S_kriv ud..."
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Klip _ud"
 
 #: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1338
-#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2550
-#: mail/message-list.c:1644 ui/evolution-addressbook.xml.h:31
+#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
+#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
+#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Kopiér"
 
 #: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1273 calendar/gui/e-calendar-view.c:1299
-#: calendar/gui/e-calendar-view.c:1372 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
+#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
@@ -5899,71 +5646,71 @@ msgstr "Sammendrag"
 msgid "Task sort"
 msgstr "Opgavesortering"
 
-#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
 msgid "New _Appointment..."
 msgstr "Ny _aftale..."
 
-#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
+#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
 msgid "New All Day _Event"
 msgstr "Ny aftale som varer h_ele dagen"
 
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
+#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
 msgid "New Meeting"
 msgstr "Nyt møde"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
 msgid "New Task"
 msgstr "Ny opgave"
 
-#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Vælg _tråd"
 
-#: calendar/gui/e-calendar-view.c:1280
+#: calendar/gui/e-calendar-view.c:1283
 #, fuzzy
 msgid "_Select Date..."
 msgstr "Slet..."
 
-#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Udgiv ledig/optaget-information"
 
-#: calendar/gui/e-calendar-view.c:1303
+#: calendar/gui/e-calendar-view.c:1306
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Kopiér til mappe..."
 
-#: calendar/gui/e-calendar-view.c:1304
+#: calendar/gui/e-calendar-view.c:1307
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "Fl_yt til mappe..."
 
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1308
 msgid "_Schedule Meeting..."
 msgstr "_Book møde..."
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1309
 msgid "_Forward as iCalendar..."
 msgstr "_Videresend som iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
 msgid "Delete this _Occurrence"
 msgstr "Slet denne _hændelse"
 
-#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
 msgid "Delete _All Occurrences"
 msgstr "Slet _alle hændelser"
 
-#: calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1349
 msgid "Go to _Today"
 msgstr "Gå _til i dag"
 
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1351
 msgid "_Go to Date..."
 msgstr "_Gå til dato..."
 
-#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "_Indstillinger..."
 
@@ -5977,9 +5724,9 @@ msgstr "Startdato"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:967 calendar/gui/e-itip-control.c:1169
-#: calendar/gui/e-meeting-list-view.c:144
-#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
 #: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
 #: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
 #: camel/camel-tcp-stream-openssl.c:631
@@ -6005,13 +5752,13 @@ msgid "Assigned"
 msgstr "Tildelt"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr "Ja"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "Nej"
 
@@ -6023,7 +5770,7 @@ msgstr "N"
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
 msgid "E"
 msgstr "Ø"
 
@@ -6095,102 +5842,102 @@ msgstr "%d %b"
 msgid "%02i minute divisions"
 msgstr "%02i minutters opdeling"
 
-#: calendar/gui/e-itip-control.c:592
+#: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
 msgstr "Ja. (Kompleks genindtræffelse)"
 
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:596
 #, fuzzy, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Hver dag"
 msgstr[1] "Hver dag"
 
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:601
 #, fuzzy, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Hver uge"
 msgstr[1] "Hver uge"
 
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:603
 #, fuzzy, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "Hver uge på "
 msgstr[1] "Hver uge på "
 
-#: calendar/gui/e-itip-control.c:618
+#: calendar/gui/e-itip-control.c:611
 msgid " and "
 msgstr " og "
 
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:618
 #, c-format
 msgid "The %s day of "
 msgstr "Den %s. dag af "
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:631
 #, c-format
 msgid "The %s %s of "
 msgstr "Den %s %s af "
 
-#: calendar/gui/e-itip-control.c:645
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "hver månede"
 msgstr[1] "hver månede"
 
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:642
 #, fuzzy, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Hver år"
 msgstr[1] "Hver år"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:653
 #, fuzzy, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] " i alt %d gange"
 msgstr[1] " i alt %d gange"
 
-#: calendar/gui/e-itip-control.c:669
+#: calendar/gui/e-itip-control.c:662
 msgid ", ending on "
 msgstr ", sluttende på "
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:686
 msgid "<b>Starts:</b> "
 msgstr "<b>Begynder:</b>"
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:696
 msgid "<b>Ends:</b> "
 msgstr "<b>Slutter:<b>"
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:716
 msgid "<b>Completed:</b> "
 msgstr "<b>Færdig:</b> "
 
-#: calendar/gui/e-itip-control.c:733
+#: calendar/gui/e-itip-control.c:726
 msgid "<b>Due:</b> "
 msgstr "<b>Udføres inden:</b> "
 
-#: calendar/gui/e-itip-control.c:771 calendar/gui/e-itip-control.c:827
+#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
 msgid "iCalendar Information"
 msgstr "iCalendar-information"
 
 #. Title
-#: calendar/gui/e-itip-control.c:788
+#: calendar/gui/e-itip-control.c:781
 msgid "iCalendar Error"
 msgstr "iCalendar-fejl"
 
-#: calendar/gui/e-itip-control.c:859 calendar/gui/e-itip-control.c:875
-#: calendar/gui/e-itip-control.c:886 calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
 msgid "An unknown person"
 msgstr "en ukendt afsender"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:910
+#: calendar/gui/e-itip-control.c:903
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -6198,304 +5945,308 @@ msgstr ""
 "<br>Kontrollér venligst følgende information og vælg så en handling fra "
 "menuen nedenfor."
 
-#: calendar/gui/e-itip-control.c:925
+#: calendar/gui/e-itip-control.c:918
 msgid "<i>None</i>"
 msgstr "<i>Ingen</i>"
 
-#: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:929
+msgid "Location:"
+msgstr "Sted:"
+
+#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Accepteret"
 
-#: calendar/gui/e-itip-control.c:959 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Preliminært godtaget"
 
-#: calendar/gui/e-itip-control.c:963 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Afslået"
 
-#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.c:1050
-#: calendar/gui/e-itip-control.c:1076 calendar/gui/e-itip-control.c:1089
-#: calendar/gui/e-itip-control.c:1102 calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
 msgid "Choose an action:"
 msgstr "Vælg en handling"
 
-#: calendar/gui/e-itip-control.c:1023
+#: calendar/gui/e-itip-control.c:1016
 msgid "Update"
 msgstr "Opgaveopdatering"
 
-#: calendar/gui/e-itip-control.c:1024 calendar/gui/e-itip-control.c:1055
-#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1091
-#: calendar/gui/e-itip-control.c:1104 calendar/gui/e-itip-control.c:1117
-#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
+#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "O.k."
 
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1044
 msgid "Accept"
 msgstr "Godtaget"
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1045
 msgid "Tentatively accept"
 msgstr "Foreslået"
 
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1046
 msgid "Decline"
 msgstr "Afslået"
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1070
 msgid "Send Free/Busy Information"
 msgstr "Send oplysning om ledig/optaget"
 
-#: calendar/gui/e-itip-control.c:1090
+#: calendar/gui/e-itip-control.c:1083
 msgid "Update respondent status"
 msgstr "Opdaterer modpartens status"
 
-#: calendar/gui/e-itip-control.c:1103
+#: calendar/gui/e-itip-control.c:1096
 msgid "Send Latest Information"
 msgstr "Send nyeste oplysninger"
 
-#: calendar/gui/e-itip-control.c:1116 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Afbryd"
 
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1185
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> har offentliggjort mødeoplysning."
 
-#: calendar/gui/e-itip-control.c:1193
+#: calendar/gui/e-itip-control.c:1186
 msgid "Meeting Information"
 msgstr "Mødeinformation"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1191
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> ønsker at %s er til stede ved et møde."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1193
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> beder om din tilstedeværelse i et møde."
 
-#: calendar/gui/e-itip-control.c:1201
+#: calendar/gui/e-itip-control.c:1194
 msgid "Meeting Proposal"
 msgstr "Mødeforslag"
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> ønsker at tilføje information til et eksisterende møde."
 
-#: calendar/gui/e-itip-control.c:1206
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Update"
 msgstr "Mødeopdatering"
 
-#: calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1203
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> ønsker at modtage seneste mødeinformation."
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1204
 msgid "Meeting Update Request"
 msgstr "Anmodning om mødeopdatering"
 
-#: calendar/gui/e-itip-control.c:1218
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> har svaret på en mødeforespørgsel."
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Reply"
 msgstr "Mødesvar"
 
-#: calendar/gui/e-itip-control.c:1226
+#: calendar/gui/e-itip-control.c:1219
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> har aflyst et møde."
 
-#: calendar/gui/e-itip-control.c:1227
+#: calendar/gui/e-itip-control.c:1220
 msgid "Meeting Cancellation"
 msgstr "Mødeaflysing"
 
-#: calendar/gui/e-itip-control.c:1234 calendar/gui/e-itip-control.c:1302
-#: calendar/gui/e-itip-control.c:1337
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1330
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> har sendt en uforståelig besked."
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1228
 msgid "Bad Meeting Message"
 msgstr "Ugyldig mødebesked"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1253
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> har offentliggjort information om en opgave."
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1254
 msgid "Task Information"
 msgstr "Opgaveinformation"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1259
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> ønsker at %s udfører en opgave."
 
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> anmoder om at du udfører en opgave."
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1262
 msgid "Task Proposal"
 msgstr "Forslag om opgave"
 
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> ønsker at tilføje information til en eksisterende opgave."
 
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Update"
 msgstr "Opgaveopdatering"
 
-#: calendar/gui/e-itip-control.c:1278
+#: calendar/gui/e-itip-control.c:1271
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> ønsker at modtage den seneste information om opgaven."
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1272
 msgid "Task Update Request"
 msgstr "Anmodning om opgaveopdatering"
 
-#: calendar/gui/e-itip-control.c:1286
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> har svaret på en opgavetildeling."
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Reply"
 msgstr "Svar på opgave"
 
-#: calendar/gui/e-itip-control.c:1294
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> har aflyst en opgave."
 
-#: calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1288
 msgid "Task Cancellation"
 msgstr "Aflysing af opgave"
 
-#: calendar/gui/e-itip-control.c:1303
+#: calendar/gui/e-itip-control.c:1296
 msgid "Bad Task Message"
 msgstr "Ugyldig opgavebesked"
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1315
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> har publiseret ledig/optaget-information."
 
-#: calendar/gui/e-itip-control.c:1323
+#: calendar/gui/e-itip-control.c:1316
 msgid "Free/Busy Information"
 msgstr "Ugyldig besked om ledig/optaget"
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> anmoder om din oplysning om ledig/optaget."
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1321
 msgid "Free/Busy Request"
 msgstr "Forespørgsel om ledig/optaget"
 
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1325
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 "<b>%s</b> har svaret på en forespørgsel efter oplysning om ledig/optaget."
 
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1326
 msgid "Free/Busy Reply"
 msgstr "Svar på ledig/optaget"
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1331
 msgid "Bad Free/Busy Message"
 msgstr "Ugyldig besked om ledig/optaget"
 
-#: calendar/gui/e-itip-control.c:1413
+#: calendar/gui/e-itip-control.c:1406
 msgid "The message does not appear to be properly formed"
 msgstr "Meddelelsen ser ikke ud til at være korrekt udformet"
 
-#: calendar/gui/e-itip-control.c:1472
+#: calendar/gui/e-itip-control.c:1465
 msgid "The message contains only unsupported requests."
 msgstr "Denne besked indeholder forespørgsler, som ikke er understøttet."
 
-#: calendar/gui/e-itip-control.c:1503
+#: calendar/gui/e-itip-control.c:1496
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Bilaget indeholder ikke en gyldig kalender-besked"
 
-#: calendar/gui/e-itip-control.c:1535
+#: calendar/gui/e-itip-control.c:1528
 msgid "The attachment has no viewable calendar items"
 msgstr "Bilaget har ingen synlige kalender-elementer"
 
-#: calendar/gui/e-itip-control.c:1769
+#: calendar/gui/e-itip-control.c:1762
 msgid "Update complete\n"
 msgstr "Opdatering fuldført\n"
 
-#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
+#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Deltagerstatus kan ikke opdateres, fordi elementet ikke længere eksisterer"
 
-#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objektet er ugyldigt og kan ikke opdateres\n"
 
-#: calendar/gui/e-itip-control.c:1825
+#: calendar/gui/e-itip-control.c:1818
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Dette svar er ikke fra en nuværende mødesdeltager. Tilføj som mødesdeltager?"
 
-#: calendar/gui/e-itip-control.c:1837
+#: calendar/gui/e-itip-control.c:1830
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Deltagerstatus kunne ikke opdateres pga. ugyldig status!\n"
 
-#: calendar/gui/e-itip-control.c:1856
+#: calendar/gui/e-itip-control.c:1849
 msgid "There was an error on the CORBA system\n"
 msgstr "Der opstod en fejl i CORBA-systemet\n"
 
-#: calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1852
 msgid "Object could not be found\n"
 msgstr "Objektet kunne ikke findes\n"
 
-#: calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1855
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Du har ikke rettigheder for at opdatere kalenderen\n"
 
-#: calendar/gui/e-itip-control.c:1865
+#: calendar/gui/e-itip-control.c:1858
 msgid "Attendee status updated\n"
 msgstr "Deltagerstatus opdateret\n"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1861
 msgid "Attendee status could not be updated!\n"
 msgstr "Deltagerstatus kunne ikke opdateres!\n"
 
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1892
 msgid "Removal Complete"
 msgstr "Fjernelse fuldført"
 
-#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
 msgid "Item sent!\n"
 msgstr "Elementet sendt!\n"
 
-#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
+#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
 msgid "The item could not be sent!\n"
 msgstr "Elementet kunne ikke sendes!\n"
 
@@ -6536,74 +6287,74 @@ msgstr "slut-dato"
 msgid "date-start"
 msgstr "start-dato"
 
-#: calendar/gui/e-meeting-list-view.c:62
+#: calendar/gui/e-meeting-list-view.c:59
 msgid "Chair Persons"
 msgstr "Formænd"
 
-#: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:479
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
 msgid "Required Participants"
 msgstr "Obligatoriske deltagere"
 
-#: calendar/gui/e-meeting-list-view.c:64
+#: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Valgfrie deltagere"
 
-#: calendar/gui/e-meeting-list-view.c:65
+#: calendar/gui/e-meeting-list-view.c:62
 msgid "Resources"
 msgstr "Ressourcer"
 
-#: calendar/gui/e-meeting-list-view.c:140 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
 #: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr "Individuel"
 
-#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "Gruppe"
 
-#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr "Ressourse"
 
-#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr "Rum"
 
-#: calendar/gui/e-meeting-list-view.c:154 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr "Formand"
 
-#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:127
 #: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
 msgid "Required Participant"
 msgstr "Obligatorisk deltager"
 
-#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr "Valgfri deltager"
 
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr "Ikke-deltager"
 
-#: calendar/gui/e-meeting-list-view.c:179 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:177
 #: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
 msgid "Needs Action"
 msgstr "Behøver handling"
 
-#: calendar/gui/e-meeting-list-view.c:182 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
 #: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "Foreslået"
 
-#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr "Delegeret"
@@ -6620,20 +6371,28 @@ msgstr "Ude"
 msgid "No Information"
 msgstr "Ingen information"
 
+#: calendar/gui/e-meeting-time-sel.c:417
+#, fuzzy
+msgid "Add attendees from addressbook"
+msgstr "Tilføj afsenderen til adresse_bogen"
+
 #: calendar/gui/e-meeting-time-sel.c:440
 msgid "_Options"
 msgstr "_Tilvalg"
 
 #: calendar/gui/e-meeting-time-sel.c:457
-msgid "Show _Only Working Hours"
+#, fuzzy
+msgid "Show _only working hours"
 msgstr "Vis k_un arbejdstid"
 
 #: calendar/gui/e-meeting-time-sel.c:467
-msgid "Show _Zoomed Out"
+#, fuzzy
+msgid "Show _zoomed out"
 msgstr "Vis _zoomet ud"
 
 #: calendar/gui/e-meeting-time-sel.c:482
-msgid "_Update Free/Busy"
+#, fuzzy
+msgid "_Update free/busy"
 msgstr "_Opdatér ledig/optaget"
 
 #: calendar/gui/e-meeting-time-sel.c:497
@@ -6649,19 +6408,23 @@ msgid ">_>"
 msgstr "_>>"
 
 #: calendar/gui/e-meeting-time-sel.c:547
-msgid "_All People and Resources"
+#, fuzzy
+msgid "_All people and resources"
 msgstr "_Alle mennesker og ressourser"
 
 #: calendar/gui/e-meeting-time-sel.c:556
-msgid "All _People and One Resource"
+#, fuzzy
+msgid "All _people and one resource"
 msgstr "Alle _mennesker og en ressourse"
 
 #: calendar/gui/e-meeting-time-sel.c:565
-msgid "_Required People"
+#, fuzzy
+msgid "_Required people"
 msgstr "_Obligatoriske deltagere"
 
 #: calendar/gui/e-meeting-time-sel.c:574
-msgid "Required People and _One Resource"
+#, fuzzy
+msgid "Required people and _one resource"
 msgstr "Obligatoriske deltagere _og en ressourse"
 
 #: calendar/gui/e-meeting-time-sel.c:593
@@ -6699,7 +6462,7 @@ msgstr "%d/%m-%Y"
 msgid "Enter the password for %s"
 msgstr "Indtast adgangskode for %s"
 
-#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6708,19 +6471,14 @@ msgstr ""
 "Fejl ved %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-
 #. FIXME Loading should be async
 #. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:686
+#: calendar/gui/e-tasks.c:801
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Åbner lager %s"
 
-#: calendar/gui/e-tasks.c:709
+#: calendar/gui/e-tasks.c:824
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6729,53 +6487,48 @@ msgstr ""
 "Fejl ved %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:730
+#: calendar/gui/e-tasks.c:845
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Indlæser billeder"
 
-#: calendar/gui/e-tasks.c:834
+#: calendar/gui/e-tasks.c:949
 msgid "Completing tasks..."
 msgstr "Færdiggør opgaver..."
 
-#: calendar/gui/e-tasks.c:857
+#: calendar/gui/e-tasks.c:972
 msgid "Deleting selected objects..."
 msgstr "Fjerner markerede objekter..."
 
-#: calendar/gui/e-tasks.c:884
+#: calendar/gui/e-tasks.c:999
 msgid "Expunging"
 msgstr "Udrenser"
 
-#: calendar/gui/e-tasks.c:960
+#: calendar/gui/e-tasks.c:1075
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
-#: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
+#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
+#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
 #: calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:705
 msgid "Tasks"
 msgstr "Opgaver"
 
-#: calendar/gui/gnome-cal.c:1876
+#: calendar/gui/gnome-cal.c:1878
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Ingen aftaler."
 
-#: calendar/gui/gnome-cal.c:1895
+#: calendar/gui/gnome-cal.c:1897
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Indlæser billeder"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1920
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Åbn i %s..."
 
-#: calendar/gui/gnome-cal.c:2048
-#, c-format
-msgid "The calendar backend for '%s' has crashed."
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:2894
+#: calendar/gui/gnome-cal.c:2906
 #, fuzzy
 msgid "Purging"
 msgstr "Turin"
@@ -6970,7 +6723,7 @@ msgid "On The Web"
 msgstr ""
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 
@@ -6981,7 +6734,7 @@ msgid "Unable to migrate calendar `%s'"
 msgstr "Du har ikke rettigheder til at åbne kalenderen"
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:869
+#: calendar/gui/migration.c:889
 #, fuzzy, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Kunne ikke åbne adressebogen"
@@ -7217,73 +6970,73 @@ msgstr "Udskriv element"
 msgid "Print Setup"
 msgstr "Printeropsætning"
 
-#: calendar/gui/tasks-component.c:303
+#: calendar/gui/tasks-component.c:313
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:371
 #, fuzzy
 msgid "New Task List"
 msgstr "Opgaveliste"
 
-#: calendar/gui/tasks-component.c:398
+#: calendar/gui/tasks-component.c:408
 #, fuzzy, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "Ingen opgaver"
 msgstr[1] "Ingen opgaver"
 
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] "%d valgte"
 msgstr[1] "%d valgte"
 
-#: calendar/gui/tasks-component.c:447
+#: calendar/gui/tasks-component.c:457
 #, fuzzy
 msgid "Failed upgrading tasks."
 msgstr "Indlæser billeder"
 
-#: calendar/gui/tasks-component.c:526
+#: calendar/gui/tasks-component.c:749
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:538
+#: calendar/gui/tasks-component.c:761
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:576
+#: calendar/gui/tasks-component.c:799
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:804
+#: calendar/gui/tasks-component.c:1040
 msgid "New task"
 msgstr "Nyt gøremål"
 
-#: calendar/gui/tasks-component.c:805
+#: calendar/gui/tasks-component.c:1041
 msgid "_Task"
 msgstr "_Opgave"
 
-#: calendar/gui/tasks-component.c:806
+#: calendar/gui/tasks-component.c:1042
 msgid "Create a new task"
 msgstr "Opret en ny opgave"
 
-#: calendar/gui/tasks-component.c:812
+#: calendar/gui/tasks-component.c:1048
 #, fuzzy
 msgid "New tasks group"
 msgstr "Nyt gøremål"
 
-#: calendar/gui/tasks-component.c:813
+#: calendar/gui/tasks-component.c:1049
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Opgaveliste"
 
-#: calendar/gui/tasks-component.c:814
+#: calendar/gui/tasks-component.c:1050
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Opret en ny opgave"
@@ -9051,12 +8804,12 @@ msgstr "Fejl under udførelse af filtersøgning: %s: %s"
 msgid "Unsupported operation: append message: for %s"
 msgstr "Uunderstøttet operation: tillæg besked: for %s"
 
-#: camel/camel-folder.c:1259
+#: camel/camel-folder.c:1262
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Uunderstøttet operation: søg efter udtryk: efter %s"
 
-#: camel/camel-folder.c:1299
+#: camel/camel-folder.c:1302
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Uunderstøttet operation: søg efter uid'er: efter %s"
@@ -9069,11 +8822,16 @@ msgstr "Flytter beskeder"
 msgid "Copying messages"
 msgstr "Kopierer meddelelser"
 
-#: camel/camel-folder.c:1666
-msgid "Learning junk and/or non junk message(s)"
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Lansing"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
 msgstr ""
 
-#: camel/camel-folder.c:1695
+#: camel/camel-folder.c:1701
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "Henter %d beskeder"
@@ -9108,17 +8866,17 @@ msgstr ""
 msgid "(match-threads) requires a match type string"
 msgstr ""
 
-#: camel/camel-folder-search.c:785
+#: camel/camel-folder-search.c:784
 #, fuzzy
 msgid "(match-threads) expects an array result"
 msgstr "(match-all) kræver et enkelt boolsk resultat"
 
-#: camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:790
 #, fuzzy
 msgid "(match-threads) requires the folder set"
 msgstr "(match-all) kræver et enkelt boolsk resultat"
 
-#: camel/camel-folder-search.c:880
+#: camel/camel-folder-search.c:879
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Udfører forespørgsel på ukendt header: %s"
@@ -9153,7 +8911,8 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
 #: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:706
+#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Afbrudt."
@@ -9529,7 +9288,7 @@ msgstr ""
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1212
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Ugyldigt svar på autenticering fra server."
 
@@ -9913,40 +9672,40 @@ msgstr "Kommando ikke implementeret"
 msgid "export keys: unimplemented"
 msgstr ""
 
-#: camel/camel-store.c:214
+#: camel/camel-store.c:213
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Kan ikke finde mappe: Ugyldig operation på dette lager"
 
-#: camel/camel-store.c:244
+#: camel/camel-store.c:243
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr "Finder ikke mappe: %s: %s"
 
-#: camel/camel-store.c:295
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Kan ikke oprette mappe: Ugyldig operation på dette lager"
 
-#: camel/camel-store.c:323
+#: camel/camel-store.c:325
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Finder ikke mappe: %s: %s"
 
-#: camel/camel-store.c:387 camel/camel-vee-store.c:354
+#: camel/camel-store.c:389 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kan ikke slette mappe: %s: Ugyldig operation"
 
-#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#: camel/camel-store.c:439 camel/camel-vee-store.c:387
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kan ikke ændre navn på mappe: %s: Ugyldig operation"
 
-#: camel/camel-store.c:811
+#: camel/camel-store.c:777
 msgid "Trash"
 msgstr "Affald"
 
-#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
-#: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/mail-config.glade.h:95
+#: ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
 msgstr "Juni"
@@ -10178,12 +9937,12 @@ msgstr "Ingen sådan besked %s i %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Kan ikke kopiere eller flytte meddelelser til en virtuel mappe"
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:374
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kan ikke slette mappe: %s: Ingen sådan mappe"
 
-#: camel/camel-vee-store.c:398
+#: camel/camel-vee-store.c:395
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kan ikke ændre navn på mappe: %s: Ingen sådan mappe"
@@ -10229,24 +9988,24 @@ msgstr "Adressebog"
 msgid "Post Office Agent SOAP Port:"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:80
+#: camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "Novell GroupWise"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:82
+#: camel/providers/groupwise/camel-groupwise-provider.c:85
 msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: camel/providers/groupwise/camel-groupwise-provider.c:100
 #: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
 msgid "Password"
 msgstr "Adgangskode"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:99
+#: camel/providers/groupwise/camel-groupwise-provider.c:102
 #: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
@@ -10254,8 +10013,8 @@ msgstr ""
 "Dette valg vil lade dig koble til en IMAP-server ved at bruge en klartekst-"
 "adgangskode."
 
-#: camel/providers/groupwise/camel-gw-listener.c:305
-#: camel/providers/groupwise/camel-gw-listener.c:328
+#: camel/providers/groupwise/camel-gw-listener.c:312
+#: camel/providers/groupwise/camel-gw-listener.c:335
 #, fuzzy
 msgid "Checklist"
 msgstr "Tyk tåge"
@@ -10400,13 +10159,13 @@ msgstr ""
 "adgangskode."
 
 #: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:429
+#: camel/providers/imap/camel-imap-store.c:428
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP-server %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:431
+#: camel/providers/imap/camel-imap-store.c:430
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP-tjeneste for %s på %s"
@@ -10416,7 +10175,7 @@ msgstr "IMAP-tjeneste for %s på %s"
 #: camel/providers/imap/camel-imap-store.c:551
 #: camel/providers/imap/camel-imap-store.c:571
 #: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
+#: camel/providers/nntp/camel-nntp-store.c:209
 #: camel/providers/pop3/camel-pop3-store.c:175
 #: camel/providers/smtp/camel-smtp-transport.c:269
 #: camel/providers/smtp/camel-smtp-transport.c:285
@@ -10434,10 +10193,10 @@ msgstr "TLS er ikke tilgængelig"
 
 #: camel/providers/imap4/camel-imap4-store.c:222
 #: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:815
+#: camel/providers/imap/camel-imap-store.c:845
 #: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:137
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
 #: camel/providers/pop3/camel-pop3-store.c:192
 msgid "Connection cancelled"
 msgstr "Tilkobling afbrudt"
@@ -10450,8 +10209,8 @@ msgid ""
 msgstr "Kunne ikke tilslutte IMAP-servern %s i sikker tilstand: %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:649
-#: camel/providers/imap/camel-imap-store.c:680
+#: camel/providers/imap/camel-imap-store.c:679
+#: camel/providers/imap/camel-imap-store.c:710
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Kunne ikke tilslutte IMAP-servern %s i sikker tilstand: %s"
@@ -10460,7 +10219,7 @@ msgstr "Kunne ikke tilslutte IMAP-servern %s i sikker tilstand: %s"
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1109
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
 msgid "Unknown error"
 msgstr "Ukendt fejl"
 
@@ -10488,8 +10247,8 @@ msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr "Finder ikke mappe: %s: %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1857
-#: camel/providers/imap/camel-imap-store.c:2235
+#: camel/providers/imap/camel-imap-store.c:1885
+#: camel/providers/imap/camel-imap-store.c:2263
 #, fuzzy, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -10568,12 +10327,12 @@ msgstr "Server koblet fra uventet: %s"
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3168
+#: camel/providers/imap/camel-imap-store.c:3194
 msgid "Operation cancelled"
 msgstr "Operation afbrudt"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3171
+#: camel/providers/imap/camel-imap-store.c:3197
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server koblet fra uventet: %s"
@@ -10637,13 +10396,6 @@ msgid "Unable to retrieve message: %s"
 msgstr "Kan ikke hente meddelelse: %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:219
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -10653,15 +10405,15 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-mbox-folder.c:418
+#: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
 msgstr "Ingen sådan besked"
 
 #: camel/providers/imap/camel-imap-folder.c:2019
-#: camel/providers/imap/camel-imap-folder.c:2621
-#: camel/providers/nntp/camel-nntp-folder.c:238
+#: camel/providers/imap/camel-imap-folder.c:2622
+#: camel/providers/nntp/camel-nntp-folder.c:220
 msgid "This message is not currently available"
 msgstr "Denne besked er ikke tilgængelig"
 
@@ -10670,7 +10422,23 @@ msgstr "Denne besked er ikke tilgængelig"
 msgid "Fetching summary information for new messages"
 msgstr "Henter sammendragsinformation for nye beskeder"
 
-#: camel/providers/imap/camel-imap-folder.c:2659
+#: camel/providers/imap/camel-imap-folder.c:2463
+#, c-format
+msgid "Incomplete server response: no information provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2471
+#, c-format
+msgid "Incomplete server response: no UID provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2484
+#, c-format
+msgid ""
+"Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2660
 msgid "Could not find message body in FETCH response."
 msgstr "Kunne ikke finde beskedens indhold i FETCH-svar."
 
@@ -10734,43 +10502,43 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "For læsning og lagring af e-post på IMAP-servere."
 
-#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/imap/camel-imap-store.c:680
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS-udvidelsen understøttes ikke."
 
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:711
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL-forhandlinger mislykkedes"
 
-#: camel/providers/imap/camel-imap-store.c:818
+#: camel/providers/imap/camel-imap-store.c:848
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Kunne ikke koble til %s (port %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:1242
+#: camel/providers/imap/camel-imap-store.c:1272
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP-server %s understøtter ikke efterspurgt autenticeringstype %s"
 
-#: camel/providers/imap/camel-imap-store.c:1252
+#: camel/providers/imap/camel-imap-store.c:1282
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Ingen understøtte for autenticeringstype %s"
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1305
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sIndtast venligst IMAP-adgangskode for %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1289
+#: camel/providers/imap/camel-imap-store.c:1319
 msgid "You didn't enter a password."
 msgstr "Du indtastede ikke en adgangskode."
 
-#: camel/providers/imap/camel-imap-store.c:1318
+#: camel/providers/imap/camel-imap-store.c:1348
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10781,18 +10549,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1839
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:1867
+#: camel/providers/imap/camel-imap-store.c:2057
 #, c-format
 msgid "No such folder %s"
 msgstr "Mappen %s eksisterer ikke"
 
-#: camel/providers/imap/camel-imap-store.c:1915
-#: camel/providers/imap/camel-imap-store.c:2296
+#: camel/providers/imap/camel-imap-store.c:1943
+#: camel/providers/imap/camel-imap-store.c:2324
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Ophavsmappen tillades ikke at have undermapper"
 
-#: camel/providers/imap/camel-imap-store.c:1970
+#: camel/providers/imap/camel-imap-store.c:1998
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10800,7 +10568,7 @@ msgstr "Ophavsmappen tillades ikke at have undermapper"
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Finder ikke mappe: %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:2274
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Ukendt forældermappe: %s"
@@ -10834,20 +10602,20 @@ msgid "Index message body data"
 msgstr "Send besked til kontakt"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:388
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:393
-#: camel/providers/local/camel-local-folder.c:396
+#: camel/providers/local/camel-local-folder.c:392
+#: camel/providers/local/camel-local-folder.c:395
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "postkasse:%s (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:400
+#: camel/providers/local/camel-local-folder.c:399
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -10907,7 +10675,7 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:142
 #: camel/providers/local/camel-local-store.c:253
-#: camel/providers/local/camel-mbox-store.c:356
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10980,8 +10748,25 @@ msgstr "Besked aflyst"
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Kan ikke tilføje besked i maildir mappe: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:226
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mbox-folder.c:417
+#: camel/providers/local/camel-mbox-folder.c:436
+#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:475
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-mh-folder.c:221
+#, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+"Kan ikke hente besked: %s fra mappe %s\n"
+"  %s"
+
+#: camel/providers/local/camel-maildir-folder.c:236
 msgid "Invalid message contents"
 msgstr "Ugyldig beskedsindhold"
 
@@ -11022,9 +10807,9 @@ msgstr "Kunne ikke slette mappe `%s': %s"
 msgid "not a maildir directory"
 msgstr "ikke et maildir katalog"
 
-#: camel/providers/local/camel-maildir-store.c:341
-#: camel/providers/local/camel-spool-store.c:286
-#: camel/providers/local/camel-spool-store.c:316
+#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-spool-store.c:284
+#: camel/providers/local/camel-spool-store.c:314
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Kunne ikke søge i mappe `%s': %s"
@@ -11071,27 +10856,18 @@ msgstr "Tilføjelse af brev blev aflyst"
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Kan ikke tilføje besked i mbox-filen: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:435
-#: camel/providers/local/camel-mbox-folder.c:466
-#: camel/providers/local/camel-mbox-folder.c:474
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"Kan ikke hente besked: %s fra mappe %s\n"
-"  %s"
-
-#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:468
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Mappen ser ud til at have blevet korrupt og kan ikke repareres."
 
-#: camel/providers/local/camel-mbox-folder.c:475
-msgid "Message construction failed: Corrupt mailbox?"
+#: camel/providers/local/camel-mbox-folder.c:476
+#: camel/providers/local/camel-mh-folder.c:222
+#, fuzzy
+msgid "Message construction failed."
 msgstr "Opbygning af besked mislykkedes: Beskadiget postboks?"
 
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:362
+#: camel/providers/local/camel-mbox-store.c:361
 #, fuzzy
 msgid "Cannot create a folder by this name."
 msgstr "Kan ikke oprette en mappe med det navn"
@@ -11122,32 +10898,32 @@ msgstr "`%s' er ikke en normal fil."
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Mappen `%s' er ikke tom. Ikke slettet."
 
-#: camel/providers/local/camel-mbox-store.c:375
+#: camel/providers/local/camel-mbox-store.c:374
 #, fuzzy, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Kan ikke oprette katalog %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:389
+#: camel/providers/local/camel-mbox-store.c:388
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Finder ikke mappe: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:391
+#: camel/providers/local/camel-mbox-store.c:390
 #, fuzzy
 msgid "Folder already exists"
 msgstr "Kort-ID eksisterer allerede"
 
-#: camel/providers/local/camel-mbox-store.c:473
+#: camel/providers/local/camel-mbox-store.c:472
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "Specificeret mappenavn er ikke gyldigt: %s"
 
-#: camel/providers/local/camel-mbox-store.c:486
+#: camel/providers/local/camel-mbox-store.c:485
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Kunne ikke skifte navn på \"%s\": %s"
 
-#: camel/providers/local/camel-mbox-store.c:561
+#: camel/providers/local/camel-mbox-store.c:560
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Kunne ikke ændre navn på mappe %s til %s: %s"
@@ -11340,7 +11116,7 @@ msgstr ""
 "Mappen kan være beskadiget, kopi gemt i `%s'"
 
 #: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:997
+#: camel/providers/nntp/camel-nntp-store.c:1126
 #, fuzzy, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "%sIndtast venligst SMTP-adgangskode for %s@%s"
@@ -11358,18 +11134,10 @@ msgstr "Tilslutning til LDAP-serveren mislykkedes"
 msgid "Server rejected username/password"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:263
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr "Brugeren afbrød"
-
-#: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:259
-#: camel/providers/nntp/camel-nntp-folder.c:265
+#: camel/providers/nntp/camel-nntp-folder.c:147
+#: camel/providers/nntp/camel-nntp-folder.c:149
+#: camel/providers/nntp/camel-nntp-folder.c:158
+#: camel/providers/nntp/camel-nntp-folder.c:234
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11378,66 +11146,53 @@ msgstr "Brugeren afbrød"
 msgid "Cannot get message %s: %s"
 msgstr "Kan ikke hente meddelelse %s: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:188
-#: camel/providers/nntp/camel-nntp-folder.c:228
+#: camel/providers/nntp/camel-nntp-folder.c:156
+#: camel/providers/nntp/camel-nntp-folder.c:232
+#: camel/providers/nntp/camel-nntp-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+msgid "User cancelled"
+msgstr "Brugeren afbrød"
+
+#: camel/providers/nntp/camel-nntp-folder.c:176
+#: camel/providers/nntp/camel-nntp-folder.c:208
 #, c-format
 msgid "Internal error: uid in invalid format: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:201
-#, fuzzy, c-format
-msgid "Could not get article %s from NNTP server"
-msgstr "Kunne ikke hente gruppe: %s"
-
-#: camel/providers/nntp/camel-nntp-folder.c:362
-msgid "Posting not allowed by news server"
-msgstr ""
-
+#: camel/providers/nntp/camel-nntp-folder.c:328
+#: camel/providers/nntp/camel-nntp-folder.c:331
 #: camel/providers/nntp/camel-nntp-folder.c:373
-#, c-format
-msgid "Failed to send newsgroups header: %s: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:413
-#: camel/providers/nntp/camel-nntp-folder.c:426
-#, c-format
-msgid "Error posting to newsgroup: %s: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:438
-msgid "Error reading response to posted message: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:441
+#: camel/providers/nntp/camel-nntp-folder.c:375
 #, fuzzy, c-format
-msgid "Error posting message: %s: message not posted"
-msgstr ""
-"Fejl under autogemning af besked: %s:\n"
-" %s"
+msgid "Posting failed: %s"
+msgstr "Handlingen mislykkedes: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:457
+#: camel/providers/nntp/camel-nntp-folder.c:393
 msgid "You cannot post NNTP messages while working offline!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:468
+#: camel/providers/nntp/camel-nntp-folder.c:404
 #, fuzzy
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Kunne ikke lukke midlertidig mappe: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:44
 #, fuzzy
 msgid "Could not get group list from server."
 msgstr "Kunne ikke hente gruppe: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#: camel/providers/nntp/camel-nntp-grouplist.c:97
+#: camel/providers/nntp/camel-nntp-grouplist.c:106
 #, fuzzy, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr ""
 "Kunne ikke oprette uddatafil: %s\n"
 " %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#: camel/providers/nntp/camel-nntp-grouplist.c:157
 #, fuzzy, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr ""
@@ -11471,27 +11226,29 @@ msgstr ""
 "Dette alternativ vil autenticere mod NNTP-serveren ved brug af klartekst "
 "adgangskode."
 
-#: camel/providers/nntp/camel-nntp-store.c:158
+#: camel/providers/nntp/camel-nntp-store.c:118
+#: camel/providers/nntp/camel-nntp-store.c:1233
+#: camel/providers/nntp/camel-nntp-store.c:1331
+#, c-format
+msgid "NNTP Command failed: %s"
+msgstr "NNTP-kommandoen mislykkedes: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:227
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Kunne ikke oprette hilsen fra %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:170
+#: camel/providers/nntp/camel-nntp-store.c:239
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP-serveren %s returnerede fejlkoden %d: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:326
+#: camel/providers/nntp/camel-nntp-store.c:403
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET Nyheder via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:640
-#, fuzzy
-msgid "Stream error"
-msgstr "tolkningsfejl"
-
-#: camel/providers/nntp/camel-nntp-store.c:643
+#: camel/providers/nntp/camel-nntp-store.c:777
 #, fuzzy, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -11501,75 +11258,75 @@ msgstr ""
 "Fejl under gemning af beskeder til: %s:\n"
 " %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:735
+#: camel/providers/nntp/camel-nntp-store.c:872
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
 "No such newsgroup. The selected item is a probably a parent folder."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:767
+#: camel/providers/nntp/camel-nntp-store.c:904
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
 "newsgroup does not exist!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:792
+#: camel/providers/nntp/camel-nntp-store.c:929
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:800
+#: camel/providers/nntp/camel-nntp-store.c:937
 #, fuzzy
 msgid "You cannot rename a folder in a News store."
 msgstr "Kunne ikke ændre navn på mappe %s til %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:808
+#: camel/providers/nntp/camel-nntp-store.c:945
 #, fuzzy
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "Kan ikke flytte en mappe til en af dens egne undermapper."
 
-#: camel/providers/nntp/camel-nntp-summary.c:253
-#, fuzzy, c-format
-msgid "Connection error: %s"
-msgstr "Ukendt fejl: %s"
-
-#: camel/providers/nntp/camel-nntp-summary.c:262
-#, c-format
-msgid "No such folder: %s"
-msgstr "Der findes ingen sådan mappe: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1118
+#, fuzzy
+msgid "Authentication requested but not username provided"
+msgstr "Autenticering kræves"
 
-#: camel/providers/nntp/camel-nntp-summary.c:268
-#, c-format
-msgid "Could not get group: %s"
-msgstr "Kunne ikke hente gruppe: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1146
+#, fuzzy, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr "Godkendelse mislykkedes på POP-serveren %s: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:333
+#: camel/providers/nntp/camel-nntp-store.c:1262
 #, fuzzy
-msgid "Could not get messages: unspecified error"
-msgstr "Kunne ikke sende beskeden: %s"
+msgid "Not connected."
+msgstr "Vis kontakter"
 
-#: camel/providers/nntp/camel-nntp-summary.c:378
+#: camel/providers/nntp/camel-nntp-store.c:1311
 #, c-format
-msgid "NNTP Command failed: %s"
-msgstr "NNTP-kommandoen mislykkedes: %s"
+msgid "No such folder: %s"
+msgstr "Der findes ingen sådan mappe: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:438
-#: camel/providers/nntp/camel-nntp-summary.c:543
+#: camel/providers/nntp/camel-nntp-summary.c:218
+#: camel/providers/nntp/camel-nntp-summary.c:314
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Skanner nye meddelelser"
 
-#: camel/providers/nntp/camel-nntp-summary.c:558
-#, c-format
-msgid "Unknown server response: %s"
-msgstr "Ukendt serversvar: %s"
+#: camel/providers/nntp/camel-nntp-summary.c:225
+#, fuzzy, c-format
+msgid "Unexpected server response from xover: %s"
+msgstr "Uventet svar fra IMAP-server: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:605
+#: camel/providers/nntp/camel-nntp-summary.c:328
+#, fuzzy, c-format
+msgid "Unexpected server response from head: %s"
+msgstr "Oventet svar fra GnuPG: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:368
 msgid "Use cancel"
 msgstr "Anvend afbryd"
 
-#: camel/providers/nntp/camel-nntp-summary.c:607
+#: camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Handlingen mislykkedes: %s"
@@ -11617,7 +11374,7 @@ msgstr "Slet efter %s dage"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107
 msgid "POP"
 msgstr "POP"
 
@@ -11707,7 +11464,7 @@ msgid "No such folder `%s'."
 msgstr "Ingen sådan mappe `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:132
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -11761,7 +11518,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Levering af e-post via sendmail programmet"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:119
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -12054,19 +11811,19 @@ msgstr "%.0f M"
 msgid "%.0fG"
 msgstr "%.0f G"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
+#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:408
 msgid "attachment"
 msgstr "bilag"
 
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:454
 msgid "Remove selected items from the attachment list"
 msgstr "Fjern valgte opføringer fra bilagslisten"
 
-#: composer/e-msg-composer-attachment-bar.c:491
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Add attachment..."
 msgstr "Tilføj bilag..."
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:495
 msgid "Attach a file to the message"
 msgstr "Vedlæg en fil til beskeden"
 
@@ -12129,7 +11886,7 @@ msgstr "(Besked uden titel)"
 msgid "Open file"
 msgstr "Åbn fil"
 
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
 msgid "Autogenerated"
 msgstr "Automatisk genereret"
 
@@ -12278,17 +12035,17 @@ msgstr "Vedhæft fil(er)"
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
+msgid "You cannot attach the file `{0}' to this message."
 msgstr "Vedlæg en fil til beskeden"
 
 #. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4
-msgid "${1}"
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
 msgstr ""
 
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
 
 #. mail-composer:attach-directory primary
@@ -12383,7 +12140,7 @@ msgstr "Kunne ikke oprette kanal: %s"
 
 #. mail-composer:no-build-message secondary
 #: composer/mail-composer-errors.xml.h:34
-msgid "Because \"${0}\", you may need to select different mail options."
+msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
@@ -12393,8 +12150,10 @@ msgid "Could not read signature file \"{0}\"."
 msgstr "Kunne ikke gemme signaturfilen: %s"
 
 #. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38
-msgid "Because \"${1}\"."
+#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted primary
@@ -12816,11 +12575,11 @@ msgid "<b>Then</b>"
 msgstr "<b>Udføres inden:</b> "
 
 #: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1335
+#: mail/mail-account-gui.c:1347
 msgid "Select Folder"
 msgstr "Vælg mappe"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
 #, fuzzy
 msgid "    "
 msgstr "      "
@@ -12880,7 +12639,7 @@ msgstr "siden"
 msgid "months"
 msgstr "måneder"
 
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
 msgid "seconds"
 msgstr " sekunder"
 
@@ -12912,20 +12671,20 @@ msgstr "med alle lokale mapper"
 msgid "years"
 msgstr "år"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:916
-#: mail/mail-config.c:76 mail/mail-config.glade.h:90
+#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
+#: mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Vigtig"
 
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:919 mail/mail-config.c:79
-#: mail/mail-config.glade.h:145
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: mail/mail-config.glade.h:148
 msgid "To Do"
 msgstr "At-gøre"
 
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:920 mail/mail-config.c:80
-#: mail/mail-config.glade.h:94
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: mail/mail-config.glade.h:97
 msgid "Later"
 msgstr "Senere"
 
@@ -12983,257 +12742,6 @@ msgstr "indkommende"
 msgid "outgoing"
 msgstr "udgående"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Adjust Score"
-msgstr "Justér point"
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Color"
-msgstr "Tilknyt farve"
-
-#: filter/libfilter-i18n.h:4
-msgid "Assign Score"
-msgstr "Giv point"
-
-#: filter/libfilter-i18n.h:5
-msgid "Attachments"
-msgstr "Bilag"
-
-#: filter/libfilter-i18n.h:6
-msgid "Beep"
-msgstr "Bip"
-
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "indeholder"
-
-#: filter/libfilter-i18n.h:8
-msgid "Copy to Folder"
-msgstr "Kopier til mappe"
-
-#: filter/libfilter-i18n.h:9
-msgid "Date received"
-msgstr "Dato modtaget"
-
-#: filter/libfilter-i18n.h:10
-msgid "Date sent"
-msgstr "Dato sendt"
-
-#: filter/libfilter-i18n.h:12
-msgid "Deleted"
-msgstr "Slettet"
-
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "indeholder ikke"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "slutter ikke med"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "eksisterer ikke"
-
-#: filter/libfilter-i18n.h:16
-msgid "does not return"
-msgstr "returnerer ikke"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "ligner ikke"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "starter ikke med"
-
-#: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
-msgstr "Eksisterer ikke"
-
-#: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr "Skitse"
-
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "slutter med"
-
-#: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr "Eksisterer"
-
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "eksisterer"
-
-#: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr "Udtryk"
-
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr "Følg op"
-
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "er"
-
-#: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr "er efter"
-
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr "er inden"
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr "er markeret med flag"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "er større end"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "er mindre end"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "er ikke"
-
-#: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr "er ikke markeret med flag"
-
-#: filter/libfilter-i18n.h:36
-#, fuzzy
-msgid "Junk Test"
-msgstr "Juni"
-
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
-#: widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Etiket"
-
-#: filter/libfilter-i18n.h:38
-msgid "Mailing list"
-msgstr "E-post-liste"
-
-#: filter/libfilter-i18n.h:39
-msgid "Message Body"
-msgstr "Beskedskrop"
-
-#: filter/libfilter-i18n.h:40
-msgid "Message Header"
-msgstr "Beskedshoved"
-
-#: filter/libfilter-i18n.h:41
-#, fuzzy
-msgid "Message is Junk"
-msgstr "Beskeder"
-
-#: filter/libfilter-i18n.h:42
-#, fuzzy
-msgid "Message is not Junk"
-msgstr "Markér som v_igtig"
-
-#: filter/libfilter-i18n.h:43
-msgid "Move to Folder"
-msgstr "Flyt til mappe"
-
-#: filter/libfilter-i18n.h:44
-#, fuzzy
-msgid "Pipe to Program"
-msgstr "Afslut programmet"
-
-#: filter/libfilter-i18n.h:45
-msgid "Play Sound"
-msgstr "Afspil lyd"
-
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Læs"
-
-#: filter/libfilter-i18n.h:47
-msgid "Recipients"
-msgstr "Modtagere"
-
-#: filter/libfilter-i18n.h:48
-msgid "Regex Match"
-msgstr "Træffer på regulært udtryk"
-
-#: filter/libfilter-i18n.h:49
-msgid "Replied to"
-msgstr "Svaret til"
-
-#: filter/libfilter-i18n.h:50
-msgid "returns"
-msgstr "returnerer"
-
-#: filter/libfilter-i18n.h:51
-msgid "returns greater than"
-msgstr "returnerer større end"
-
-#: filter/libfilter-i18n.h:52
-msgid "returns less than"
-msgstr "returnerer mindre end"
-
-#: filter/libfilter-i18n.h:53
-#, fuzzy
-msgid "Run Program"
-msgstr "Kør program:"
-
-#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Point"
-
-#: filter/libfilter-i18n.h:55
-msgid "Sender"
-msgstr "Afsender"
-
-#: filter/libfilter-i18n.h:56
-msgid "Set Status"
-msgstr "Sæt status"
-
-#: filter/libfilter-i18n.h:57
-msgid "Size (kB)"
-msgstr "Størrelse (kB)"
-
-#: filter/libfilter-i18n.h:58
-msgid "sounds like"
-msgstr "lyder som"
-
-#: filter/libfilter-i18n.h:59
-msgid "Source Account"
-msgstr "Kildekonto"
-
-#: filter/libfilter-i18n.h:60
-msgid "Specific header"
-msgstr "Specifik header"
-
-#: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "starter med"
-
-#: filter/libfilter-i18n.h:63
-msgid "Stop Processing"
-msgstr "Stop behandling"
-
-#: filter/libfilter-i18n.h:64 mail/em-format.c:755 mail/em-format-html.c:1519
-#: mail/em-format-quote.c:302 mail/em-mailer-prefs.c:87
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
-#: smime/lib/e-cert.c:1079
-msgid "Subject"
-msgstr "Emne"
-
-#: filter/libfilter-i18n.h:65
-msgid "Unset Status"
-msgstr "Neutraliser status"
-
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Tilføj regel"
@@ -13251,6 +12759,11 @@ msgstr "Regelnavn"
 msgid "_Score Rules"
 msgstr "Pointregler"
 
+#: filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Point"
+
 #: filter/searchtypes.xml.h:1
 msgid "Body contains"
 msgstr "Krop indeholder"
@@ -13332,13 +12845,13 @@ msgstr "Signatur(er)"
 msgid "-------- Forwarded Message --------"
 msgstr "Videresendt besked"
 
-#: mail/em-composer-utils.c:1499
+#: mail/em-composer-utils.c:1495
 msgid "an unknown sender"
 msgstr "en ukendt afsender"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1509
+#: mail/em-composer-utils.c:1505
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "%a, %Y-%m-%d kl. %H:%M skrev %%s:"
@@ -13381,8 +12894,8 @@ msgstr "<klik her for at vælge en mappe>"
 msgid "Create New Folder"
 msgstr "Opret ny mappe"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
-#: mail/mail-component.c:701
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
+#: mail/mail-component.c:704
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Specificér hvor mappen skal oprettes:"
@@ -13397,107 +12910,108 @@ msgstr "Crestview"
 msgid "Folder _name:"
 msgstr "Mappe_navn:"
 
-#: mail/em-folder-tree.c:839
+#: mail/em-folder-tree.c:833
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Fjerner mappe %s"
 
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree.c:835
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Åbner mappe %s"
 
-#: mail/em-folder-tree.c:848 mail/message-list.c:1555
+#: mail/em-folder-tree.c:842 mail/message-list.c:1561
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Flytter beskeder til %s"
 
-#: mail/em-folder-tree.c:850 mail/message-list.c:1557
+#: mail/em-folder-tree.c:844 mail/message-list.c:1563
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopierer beskeder til %s"
 
-#: mail/em-folder-tree.c:866
+#: mail/em-folder-tree.c:860
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Kan ikke kopiere eller flytte meddelelser til en virtuel mappe"
 
-#: mail/em-folder-tree.c:956 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Kopiér til mappe"
 
-#: mail/em-folder-tree.c:957 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Flyt til mappe"
 
-#: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2069
-#: mail/em-folder-tree.c:2551 mail/em-folder-view.c:798
-#: mail/message-list.c:1645
+#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
+#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
+#: mail/message-list.c:1651
 #, fuzzy
 msgid "_Move"
 msgstr "Flyt"
 
-#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#: mail/em-folder-tree.c:955 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "Annullér opgave"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
 #: mail/em-folder-view.c:798 mail/em-folder-view.c:812
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Vælg mappe"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
 #, fuzzy
 msgid "C_opy"
 msgstr "Kopier"
 
-#: mail/em-folder-tree.c:2096
+#: mail/em-folder-tree.c:2088
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Gemmer mappe '%s'"
 
-#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
+#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
 #, fuzzy
 msgid "Create folder"
 msgstr "Opret en ny mappe"
 
-#: mail/em-folder-tree.c:2474
+#: mail/em-folder-tree.c:2463
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Ændr navn på mappe \"%s\" til:"
 
-#: mail/em-folder-tree.c:2476
+#: mail/em-folder-tree.c:2465
 msgid "Rename Folder"
 msgstr "Ændr navn på mappe"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Vis"
 
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2537
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Åbn i nyt vindue"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2555
+#: mail/em-folder-tree.c:2546
 msgid "_New Folder..."
 msgstr "_Ny mappe..."
 
-#: mail/em-folder-tree.c:2558
+#: mail/em-folder-tree.c:2549
 msgid "_Rename"
 msgstr "Omdøb"
 
-#: mail/em-folder-tree.c:2561 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "Egenska_ber..."
 
 #: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:889
+#: mail/mail-vfolder.c:888
 msgid "VFolders"
 msgstr "Virtuelle mapper "
 
@@ -13511,19 +13025,19 @@ msgstr ""
 msgid "Inbox"
 msgstr "Indbakke"
 
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
 msgid "Loading..."
 msgstr "Indlæser..."
 
 #: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
 #: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
 #: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:551
+#: mail/mail-component.c:554
 msgid "Mail"
 msgstr "Post"
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "R_edigér som ny besked..."
@@ -13536,17 +13050,17 @@ msgstr "S_kriv ud"
 msgid "_Reply to Sender"
 msgstr "Sva_r til sender"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:810
+#: mail/em-folder-view.c:901 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Svar til _listen"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:811
+#: mail/em-folder-view.c:902 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: mail/em-folder-view.c:903 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Videresend"
@@ -13601,6 +13115,10 @@ msgstr "Fl_yt til mappe..."
 msgid "_Copy to Folder..."
 msgstr "K_opiér til mappe..."
 
+#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Etiket"
+
 #: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Tilføj afsenderen til adresse_bogen"
@@ -13651,12 +13169,12 @@ msgid "Filter on _Mailing List"
 msgstr "Filtrér på e-_postliste"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
-#: mail/mail-config.glade.h:66
+#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Standard"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1796
 msgid "Print Message"
 msgstr "Udskriv besked"
 
@@ -13696,12 +13214,18 @@ msgstr "Cc"
 msgid "Bcc"
 msgstr "Bcc:"
 
+#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
+#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Emne"
+
 #: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
 #: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Dato"
 
-#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
+#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
 msgid "Newsgroups"
 msgstr ""
 
@@ -13892,7 +13416,7 @@ msgid ""
 "practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:757
+#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
 #, fuzzy
 msgid "_View Certificate"
 msgstr "_Certifikat-ID:"
@@ -13955,7 +13479,7 @@ msgstr "_En uge"
 msgid "Once per month"
 msgstr "E_n måned"
 
-#: mail/em-migrate.c:1072
+#: mail/em-migrate.c:1168
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13963,92 +13487,92 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1506
+#: mail/em-migrate.c:1602
 #, fuzzy, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Finder ikke mappe: %s: %s"
 
-#: mail/em-migrate.c:1532
+#: mail/em-migrate.c:1628
 #, fuzzy, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr ""
 "Kan ikke kopiere filhandtag: %s\n"
 "%s"
 
-#: mail/em-migrate.c:1715
+#: mail/em-migrate.c:1811
 #, fuzzy, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr ""
 "Kunne ikke oprette uddatafil: %s\n"
 " %s"
 
-#: mail/em-migrate.c:1919
+#: mail/em-migrate.c:2015
 #, fuzzy, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Godkendelse mislykkedes på POP-serveren %s: %s"
 
-#: mail/em-migrate.c:1933
+#: mail/em-migrate.c:2029
 #, fuzzy, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Mislykkedes med at oprette rør til \"%s\": %s"
 
-#: mail/em-migrate.c:1962
+#: mail/em-migrate.c:2058
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#: mail/em-migrate.c:2413 mail/em-migrate.c:2425
 #, fuzzy, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Mislykkedes med at oprette rør til \"%s\": %s"
 
-#: mail/em-migrate.c:2480
+#: mail/em-migrate.c:2576
 #, fuzzy, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr ""
 "Kunne ikke oprette uddatafil: %s\n"
 " %s"
 
-#: mail/em-migrate.c:2498
+#: mail/em-migrate.c:2594
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 msgstr ""
 
-#: mail/em-popup.c:699
+#: mail/em-popup.c:700
 msgid "Save As..."
 msgstr "Gem som..."
 
-#: mail/em-popup.c:717
+#: mail/em-popup.c:718
 #, fuzzy, c-format
 msgid "untitled_image.%s"
 msgstr "Besked uden titel"
 
-#: mail/em-popup.c:807
+#: mail/em-popup.c:808
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:809
+#: mail/em-popup.c:810
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "Sva_r til sender"
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:859
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Åbn henvisning i netlæser"
 
-#: mail/em-popup.c:859
+#: mail/em-popup.c:860
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Send _besked til liste..."
 
-#: mail/em-popup.c:860
+#: mail/em-popup.c:861
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Tilføj afsenderen i adressebogen"
 
-#: mail/em-popup.c:966
+#: mail/em-popup.c:967
 #, c-format
 msgid "Open in %s..."
 msgstr "Åbn i %s..."
@@ -14647,7 +14171,7 @@ msgstr "Evolution e-post-indstillings-styreelement"
 msgid "Mail Accounts"
 msgstr "E-post-konti"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
 msgid "Mail Preferences"
 msgstr "E-post-indstillinger"
 
@@ -14660,15 +14184,15 @@ msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importerer gammel e-post fra Elm"
 
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:226
+#: mail/importers/evolution-mbox-importer.c:221
+#: mail/importers/evolution-outlook-importer.c:255
 #: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Importerer..."
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:222
-#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/evolution-mbox-importer.c:223
+#: mail/importers/evolution-outlook-importer.c:257
 #: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Venligst vent"
@@ -14691,23 +14215,25 @@ msgid "Elm"
 msgstr "Elm"
 
 #: mail/importers/evolution-mbox-importer.c:116
+#: mail/importers/evolution-outlook-importer.c:130
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Slet denne mappe"
 
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 #, fuzzy
 msgid "Select folder to import into"
 msgstr "Vælg importør"
 
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:254
 #: mail/importers/mail-importer.c:226
 #, fuzzy, c-format
 msgid "Importing `%s'"
 msgstr "Importerer"
 
-#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/evolution-outlook-importer.c:301
 #: mail/importers/mail-importer.c:140
 #, fuzzy
 msgid "Importing mailbox"
@@ -14872,15 +14398,15 @@ msgstr ""
 msgid "%s License Agreement"
 msgstr ""
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
 msgid "_Host:"
 msgstr "_Vært:"
 
-#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
 msgid "User_name:"
 msgstr "Bruger_navn:"
 
-#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
 msgid "_Path:"
 msgstr "S_ti:"
 
@@ -14943,34 +14469,34 @@ msgstr "%d totalt"
 msgid ", %d unread"
 msgstr "%d usendte"
 
-#: mail/mail-component.c:653
+#: mail/mail-component.c:656
 msgid "New Mail Message"
 msgstr "Ny e-post-besked"
 
-#: mail/mail-component.c:654
+#: mail/mail-component.c:657
 msgid "_Mail Message"
 msgstr "Send _besked"
 
-#: mail/mail-component.c:655
+#: mail/mail-component.c:658
 msgid "Compose a new mail message"
 msgstr "Skriv en ny e-post-meddelelse"
 
-#: mail/mail-component.c:661
+#: mail/mail-component.c:664
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Ny Virtuel mappe"
 
-#: mail/mail-component.c:662
+#: mail/mail-component.c:665
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "E-post-filtre"
 
-#: mail/mail-component.c:663
+#: mail/mail-component.c:666
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Opret en ny mappe"
 
-#: mail/mail-component.c:795
+#: mail/mail-component.c:798
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
@@ -14982,7 +14508,7 @@ msgstr "Tjekker tjeneste"
 msgid "Connecting to server..."
 msgstr "Kobler til server..."
 
-#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Identitet"
 
@@ -14997,7 +14523,7 @@ msgstr ""
 "informationen i den e-post du sender."
 
 #: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid "Receiving Mail"
 msgstr "Modtager post"
 
@@ -15014,7 +14540,7 @@ msgstr ""
 msgid "Please select among the following options"
 msgstr "Venligst vælg mellem følgende alternativer"
 
-#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr "Sender post"
 
@@ -15026,7 +14552,7 @@ msgstr ""
 "Angiv information om hvordan du vil sende e-post. Hvis du ikke er sikker bør "
 "du spørge din systemadministrator eller Internetleverandør."
 
-#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37
 msgid "Account Management"
 msgstr "Håndtering af konti"
 
@@ -15043,250 +14569,254 @@ msgstr ""
 "angav samles til en Evolution-epostkonto. Angiv et navn for denne konto "
 "nedenfor. Dette navn anvendes kun til visning."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:2
 #, fuzzy
 msgid " Ch_eck for Supported Types "
 msgstr "_Søg efter understøttede typer"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "<b>Preview</b>"
 msgstr "Forhåndsvis"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "(SSL er ikke understøttet i denne version af evolution)"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "<b>S_ignatures</b>"
 msgstr "<b>Status:</b>"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "<b>_Languages</b>"
 msgstr "<b>Status:</b>"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
+msgid "<small>This will make the the filter more reliable, but slower</small>"
+msgstr ""
+
+#: mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "<span weight=\"bold\">Checking for New Mail</span>"
 msgstr "Ser efter nye beskeder"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">General</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
 #, fuzzy
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "Besked som skal vises:"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "Notifikation om ny post"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Security</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "Sendte beskeder og udkast"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:34
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:35
 #, fuzzy
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "Kryptér altid til mig selv ved sending af krypteret e-post."
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:36
 msgid "Account Editor"
 msgstr "Kontoredigeringsværktøj"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:38
 #, fuzzy
 msgid "Add Ne_w Signature..."
 msgstr "Tilføj ny signatur..."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Add _Script"
 msgstr "Tilføj sk_ript"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:40
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "Kryptér a_ltid til mig selv når krypteret post sendes"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Send altid en _kopi (Cc) til:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Send altid en _blindkopi (Bcc) til:"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Always _sign outgoing messages when using this account"
 msgstr "_Altid signér udgående beskeder når denne konto bruges"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "_Stol altid på nøgler i min nøglering ved kryptering"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Attach original message"
 msgstr "Vedhæft originalmeddelelse"
 
-#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Bilag"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:48
 #, fuzzy
 msgid "Automatically _insert smiley images"
 msgstr "Indsæt _automatisk smiley-billeder"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Automatically check for _new mail every"
 msgstr "Hent nye beskeder _automatisk hver(t)"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltisk (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltisk (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Beep w_hen new mail arrives"
 msgstr "_Bib når ny post ankommer"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "C_haracter set:"
 msgstr "Te_gnkodning:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Ch_eck for Supported Types "
 msgstr "_Søg efter understøttede typer"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 #, fuzzy
-msgid "Check _Incoming Mail"
+msgid "Check _incoming mail for junk"
 msgstr "Ser efter nye beskeder"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Check spelling while I _type"
 msgstr "Kontrollér stavning mens jeg skri_ver"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 msgid "Color for _misspelled words:"
 msgstr "Farve på _fejlstavede ord:"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Colors"
 msgstr "F_arver"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Confirm _when expunging a folder"
 msgstr "_Bekræft når en folder udrenses"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -15302,261 +14832,266 @@ msgstr ""
 "\n"
 "Klik på \"Fuldfør\" for at gemme dine indstillinger."
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
 msgid "De_fault"
 msgstr "_Forvalgt"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Default character e_ncoding:"
 msgstr "Standardtegn_kodning: "
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 #, fuzzy
 msgid "Defaults"
 msgstr "_Standardværdier"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 msgid "Do not quote original message"
 msgstr "Citér ikke originalmeddelelse"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Signér ikke _mødeindkaldelser (for kompatibilitet med Outlook)"
 
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Færdig"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Drafts _Folder:"
 msgstr "Udkast_mappe:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:77
 msgid "Email Accounts"
 msgstr "E-post-konti"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Email _Address:"
 msgstr "E-post-_adresse:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "Empty trash folders on e_xit"
 msgstr "Tøm _affaldsmappe ved afslutning"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "_Certifikat-ID:"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:81
 msgid "Evolution Account Assistant"
 msgstr "Evolution kontoassistent"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:82
 msgid "Execute Command..."
 msgstr "Kør kommando..."
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Fi_xed-width:"
 msgstr "Fast _bredde:"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 msgid "Font Properties"
 msgstr "Skrifttypeegenskaber"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 msgid "Format messages in _HTML"
 msgstr "Formatér meddelelser i _HTML"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "HTML Mail"
 msgstr "_HTML-brev"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Headers"
 msgstr "Toptekst"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr "Markér _citat med"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
 #: mail/mail-config.glade.h:91
+#, fuzzy
+msgid "I_nclude remote tests"
+msgstr "Inkludér:"
+
+#: mail/mail-config.glade.h:94
 msgid "Inline"
 msgstr "Indlejret"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Mail Configuration"
 msgstr "E-post-konfiguration"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "Placering af postboks"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr "Meddelelseredigeringsværktøj"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 "Bemærk: du bliver ikke spurgt om adgangskoden før du tilslutter første gange"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Or_ganization:"
 msgstr "Or_ganisation:"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG-_nøgleid:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "Play sound file when new mail arri_ves"
 msgstr "_Spil lydfil når ny post ankommer"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Spørg når der sendes meddelelser kun med blindkopimodtagere"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Qmail maildir "
 msgstr "Qmail maildir"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr "Citér originalmeddelelse"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr "Citeret"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Re_member password"
 msgstr "Husk denne adgangskode"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr "Sva_r-til:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "Modtager e-post"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:120
 #, fuzzy
 msgid "Receiving Options"
 msgstr "_Modtagelsesmuligheder"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
 #, fuzzy
 msgid "Remember _password"
 msgstr "Husk denne adgangskode"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
 #, fuzzy
 msgid "S_tandard Font:"
 msgstr "_Standard-skrifttype:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 #, fuzzy
 msgid "Security"
 msgstr "_Sikkerhed"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font"
 msgstr "Vælg HTML-skrifttype med fast bredde"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:126
 msgid "Select HTML fixed width font for printing"
 msgstr "Vælg HTML-skrifttype med fast bredde til udskrivning"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:127
 msgid "Select HTML variable width font"
 msgstr "Vælg HTML-skrifttype med variabel bredde"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:128
 msgid "Select HTML variable width font for printing"
 msgstr "Vælg HTML-skrifttype med variabel bredde til udskrift"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:129
 #, fuzzy
 msgid "Select..."
 msgstr "Slet..."
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "Sender e-post"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Sent _Messages Folder:"
 msgstr "Mappe til sendte _beskeder:"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:134
 msgid "Ser_ver requires authentication"
 msgstr "Server kræver _godkendelse"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:135
 msgid "Server _Type: "
 msgstr "Server_type: "
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Selvsigneret certifikat i kæden"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:137
 #, fuzzy
 msgid "Signat_ure:"
 msgstr "Signatur:"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "Signatures"
 msgstr "_Signaturer"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr "Angiv _filnavn:"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "Spell Checking"
 msgstr "Stave_kontrol"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:141
 msgid "Standard Unix mbox"
 msgstr "Standard-Unix mbox"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "T_erminal Font:"
 msgstr "_Terminalskrifttype:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "T_ype: "
 msgstr "Type:"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -15566,7 +15101,7 @@ msgstr ""
 "din signatur. Navnet du angiver vil bare\n"
 "anvendas for visning."
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
@@ -15575,7 +15110,7 @@ msgstr ""
 "Denne side lader dig konfigurere opførsel af stavekontrol og sprog. Listen "
 "med sprog her viser kun de sprog for hvilke en ordbog er installeret."
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:149
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -15583,15 +15118,11 @@ msgstr ""
 "Indtast navnet via hvilket du vil referere til denne konto.\n"
 "For eksempel: \"Job\" eller \"Personlig\"."
 
-#: mail/mail-config.glade.h:148
-msgid "Use _Daemon"
-msgstr ""
-
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:152
 msgid "V_ariable-width:"
 msgstr "V_ariabel bredde:"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:153
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -15601,92 +15132,88 @@ msgstr ""
 "\n"
 "Klik \"Næste\" for at begynde. "
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:158
 msgid "_Add Signature"
 msgstr "_Tilføj signatur"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Always load images from the Internet"
 msgstr "_Altid indlæs billeder fra nettet"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Digitally sign outgoing messages (by default)"
 msgstr "_Altid signér udgående beskeder når denne konto bruges"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:161
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Notificér mig ikke når ny post ankommer"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:163
 msgid "_Enable"
 msgstr "_Aktivér"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:165
 msgid "_Forward style:"
 msgstr "_Videresendelsesformat:"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Load images if sender is in address book"
 msgstr "_Indlæs billeder hvis afsender er i adressebogen"
 
-#: mail/mail-config.glade.h:167
-msgid "_Local Tests Only"
-msgstr ""
-
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Make this my default account"
 msgstr "_Gør dette til min standardkonto"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_Mark messages as read after"
 msgstr "_Markér meddelelser som læste efter"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Never load images from the Internet"
 msgstr "Indlæs aldrig billeder fra _nettet"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "_Spørg når HTML-meddelelser sendes til kontakter som ikke vil have dem"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:175
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Spørg når meddelelser sendes med en _tom emnelinie"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:176
 msgid "_Reply style:"
 msgstr "_Svarsstil:"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:177
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:178
 msgid "_Show animated images"
 msgstr "_Vis animerede billeder"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "_Use Secure Connection (SSL):"
 msgstr "_Brug sikker anslutning (SSL):"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "_Use the same fonts as other applications"
 msgstr "Br_ug de samme skrifttyper som andre programmer"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:181
 msgid "color"
 msgstr "farve"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "beskrivelse"
 
@@ -15858,7 +15385,7 @@ msgstr ""
 
 #. mail:camel-exception primary
 #: mail/mail-errors.xml.h:57
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgid "Your message with the subject \"{0}\" was not delivered."
 msgstr ""
 
 #. mail:camel-exception secondary
@@ -15924,11 +15451,6 @@ msgstr ""
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Kan ikke oprette katalog %s: %s"
 
-#. mail:no-save-path secondary
-#: mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail:no-create-path primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
@@ -15953,12 +15475,6 @@ msgstr ""
 msgid "Cannot create temporary save directory."
 msgstr "Kunne ikke oprette midlertidigt katalog: %s"
 
-#. mail:no-create-tmp-path secondary
-#: mail/mail-errors.xml.h:100 mail/mail-errors.xml.h:112
-#: widgets/misc/e-system-errors.xml.h:11 widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail:no-write-path-exists secondary
 #: mail/mail-errors.xml.h:104
 #, fuzzy
@@ -16236,144 +15752,140 @@ msgstr "Overskriv"
 msgid "_Append"
 msgstr "Aspen"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:785
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinger %s"
 
-#: mail/mail-mt.c:897
-msgid "Working"
-msgstr "Arbejder"
-
-#: mail/mail-ops.c:99
+#: mail/mail-ops.c:98
 msgid "Filtering Folder"
 msgstr "Filtrerer mappe"
 
-#: mail/mail-ops.c:260
+#: mail/mail-ops.c:259
 msgid "Fetching Mail"
 msgstr "Henter e-post"
 
-#: mail/mail-ops.c:543
+#: mail/mail-ops.c:542
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Kunne ikke gemme post i midlertidig fil %s: %s"
 
-#: mail/mail-ops.c:568
+#: mail/mail-ops.c:567
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:577
+#: mail/mail-ops.c:576
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Kunne ikke gemme post i midlertidig fil %s: %s"
 
-#: mail/mail-ops.c:673
+#: mail/mail-ops.c:672
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sender besked %d af %d"
 
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:703
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Kunne ikke afkode besked."
 
-#: mail/mail-ops.c:708
+#: mail/mail-ops.c:707
 msgid "Complete."
 msgstr "Fuldført."
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:804
 msgid "Saving message to folder"
 msgstr "Gemmer besked til mappe"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flytter beskeder til %s"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopierer beskeder til %s"
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:1002
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanner mapper i \"%s\""
 
-#: mail/mail-ops.c:1116
+#: mail/mail-ops.c:1115
 msgid "Forwarded messages"
 msgstr "Videresendte beskeder"
 
-#: mail/mail-ops.c:1159
+#: mail/mail-ops.c:1158
 #, c-format
 msgid "Opening folder %s"
 msgstr "Åbner mappe %s"
 
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1230
 #, c-format
 msgid "Opening store %s"
 msgstr "Åbner lager %s"
 
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1308
 #, c-format
 msgid "Removing folder %s"
 msgstr "Fjerner mappe %s"
 
-#: mail/mail-ops.c:1403
+#: mail/mail-ops.c:1402
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Gemmer mappe '%s'"
 
-#: mail/mail-ops.c:1468
+#: mail/mail-ops.c:1467
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1469
+#: mail/mail-ops.c:1468
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Gemmer mappe '%s'"
 
-#: mail/mail-ops.c:1524
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr "Opfrisker mappe"
 
-#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
+#: mail/mail-ops.c:1559 mail/mail-ops.c:1610
 msgid "Expunging folder"
 msgstr "Fjerner slettede beskeder fra mappe"
 
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1607
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Importerer %s som %s"
 
-#: mail/mail-ops.c:1609
+#: mail/mail-ops.c:1608
 msgid "Local Folders"
 msgstr "Lokale mapper"
 
-#: mail/mail-ops.c:1692
+#: mail/mail-ops.c:1691
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Henter besked %s"
 
-#: mail/mail-ops.c:1764
+#: mail/mail-ops.c:1763
 #, fuzzy, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Henter %d beskeder"
 msgstr[1] "Henter %d beskeder"
 
-#: mail/mail-ops.c:1850
+#: mail/mail-ops.c:1849
 #, fuzzy, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Gemmer %d beskeder"
 msgstr[1] "Gemmer %d beskeder"
 
-#: mail/mail-ops.c:1900
+#: mail/mail-ops.c:1899
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -16382,7 +15894,7 @@ msgstr ""
 "Kunne ikke oprette uddatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1928
+#: mail/mail-ops.c:1927
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -16391,11 +15903,11 @@ msgstr ""
 "Fejl under gemning af beskeder til: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1999
+#: mail/mail-ops.c:1998
 msgid "Saving attachment"
 msgstr "Gemmer bilag"
 
-#: mail/mail-ops.c:2016
+#: mail/mail-ops.c:2015
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -16404,17 +15916,17 @@ msgstr ""
 "Kunne ikke oprette uddatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2046
+#: mail/mail-ops.c:2045
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kan ikke skrive data: %s"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Kobler fra %s"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Kobler til %s igen"
@@ -16479,24 +15991,24 @@ msgstr "Opdaterer..."
 msgid "Waiting..."
 msgstr "Venter..."
 
-#: mail/mail-session.c:238
+#: mail/mail-session.c:239
 msgid "User canceled operation."
 msgstr "Operation afbrudt af bruger."
 
-#: mail/mail-session.c:271
+#: mail/mail-session.c:272
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Indtast adgangskode for %s"
 
-#: mail/mail-session.c:273
+#: mail/mail-session.c:274
 msgid "Enter Password"
 msgstr "Indtast adgangskode"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password"
 msgstr "Husk denne adgangs_kode"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:298
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Husk denne adgangskode for resten af denne session"
 
@@ -16553,79 +16065,79 @@ msgstr "Opdaterer vfoldere for URI: %s"
 msgid "Updating vFolders for '%s'"
 msgstr "Opdaterer vfoldere for URI: %s"
 
-#: mail/mail-vfolder.c:959
+#: mail/mail-vfolder.c:958
 msgid "vFolders"
 msgstr "vMapper"
 
-#: mail/mail-vfolder.c:998
+#: mail/mail-vfolder.c:997
 msgid "Edit VFolder"
 msgstr "Rediger Virtuel mappe"
 
-#: mail/mail-vfolder.c:1082
+#: mail/mail-vfolder.c:1081
 msgid "New VFolder"
 msgstr "Ny Virtuel mappe"
 
-#: mail/message-list.c:946
+#: mail/message-list.c:948
 msgid "Unseen"
 msgstr "Ulæst"
 
-#: mail/message-list.c:947
+#: mail/message-list.c:949
 msgid "Seen"
 msgstr "Læst"
 
-#: mail/message-list.c:948
+#: mail/message-list.c:950
 msgid "Answered"
 msgstr "Besvaret"
 
-#: mail/message-list.c:949
+#: mail/message-list.c:951
 msgid "Multiple Unseen Messages"
 msgstr "Flere ulæste beskeder"
 
-#: mail/message-list.c:950
+#: mail/message-list.c:952
 msgid "Multiple Messages"
 msgstr "Flere beskeder"
 
-#: mail/message-list.c:954
+#: mail/message-list.c:956
 msgid "Lowest"
 msgstr "Lavest"
 
-#: mail/message-list.c:955
+#: mail/message-list.c:957
 msgid "Lower"
 msgstr "Lavere"
 
-#: mail/message-list.c:959
+#: mail/message-list.c:961
 msgid "Higher"
 msgstr "Højere"
 
-#: mail/message-list.c:960
+#: mail/message-list.c:962
 msgid "Highest"
 msgstr "Højest"
 
-#: mail/message-list.c:1279
+#: mail/message-list.c:1285
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1286
+#: mail/message-list.c:1292
 msgid "Today %l:%M %p"
 msgstr "I dag %H:%M"
 
-#: mail/message-list.c:1295
+#: mail/message-list.c:1301
 msgid "Yesterday %l:%M %p"
 msgstr "I går %H:%M"
 
-#: mail/message-list.c:1307
+#: mail/message-list.c:1313
 msgid "%a %l:%M %p"
 msgstr "%a %H:%M"
 
-#: mail/message-list.c:1315
+#: mail/message-list.c:1321
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H:%M"
 
-#: mail/message-list.c:1317
+#: mail/message-list.c:1323
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:3300
+#: mail/message-list.c:3321
 msgid "Generating message list"
 msgstr "Genererer beskedsliste"
 
@@ -16681,6 +16193,10 @@ msgstr "Videresend"
 msgid "No Response Necessary"
 msgstr "Intet svar krævet"
 
+#: mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Læs"
+
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Svar"
@@ -16786,45 +16302,49 @@ msgid ""
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:10
-msgid "Whether Evolution should start up in offline mode"
+msgid "Toolbar is visible"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:11
-msgid "Whether to skip the development warning dialog"
+msgid "Whether Evolution should start up in offline mode"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Whether the toolbar should be visible."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:14
 #, fuzzy
 msgid "mail"
 msgstr "E-post"
 
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
-msgstr "Bragt til dig af"
-
-#: shell/e-shell.c:545 shell/e-shell.c:546
+#: shell/e-shell.c:588 shell/e-shell.c:589
 #, fuzzy, c-format
 msgid "%ld KB"
 msgstr "%d %B"
 
-#: shell/e-shell.c:744
+#: shell/e-shell.c:786
 #, fuzzy
 msgid "Uknown system error."
 msgstr "Ukendt fejl"
 
-#: shell/e-shell.c:1101
+#: shell/e-shell.c:1143
 msgid "Invalid arguments"
 msgstr "Ugyldige argumenter"
 
-#: shell/e-shell.c:1103
+#: shell/e-shell.c:1145
 msgid "Cannot register on OAF"
 msgstr "Kan ikke registrere i OAF"
 
-#: shell/e-shell.c:1105
+#: shell/e-shell.c:1147
 msgid "Configuration Database not found"
 msgstr "Konfigurationsdatabase ikke fundet"
 
-#: shell/e-shell.c:1107
+#: shell/e-shell.c:1149
 msgid "Generic error"
 msgstr "Generisk fejl"
 
@@ -16880,7 +16400,7 @@ msgstr ""
 msgid "Select importer"
 msgstr "Vælg importør"
 
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1026
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
 #, c-format
 msgid "File %s does not exist"
 msgstr "Filen %s eksisterer ikke"
@@ -16908,35 +16428,35 @@ msgstr ""
 "Importerer %s\n"
 "Importerer opføring 1."
 
-#: shell/e-shell-importer.c:549
+#: shell/e-shell-importer.c:570
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: shell/e-shell-importer.c:598
+#: shell/e-shell-importer.c:626
 #, fuzzy
-msgid "_Filename:"
+msgid "F_ilename:"
 msgstr "Filnavn:"
 
-#: shell/e-shell-importer.c:603
+#: shell/e-shell-importer.c:631
 msgid "Select a file"
 msgstr "Vælg en fil"
 
-#: shell/e-shell-importer.c:613
+#: shell/e-shell-importer.c:642
 #, fuzzy
 msgid "File _type:"
 msgstr "Filtype:"
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:681
 #, fuzzy
 msgid "Import data and settings from _older programs"
 msgstr "Importer data og indstillinger fra andre programmer"
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:684
 #, fuzzy
 msgid "Import a _single file"
 msgstr "Importer en enkelt fil"
 
-#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -16944,26 +16464,26 @@ msgstr ""
 "Venligst vent...\n"
 "Søger efter eksisterende opsætning"
 
-#: shell/e-shell-importer.c:727
+#: shell/e-shell-importer.c:756
 msgid "Starting Intelligent Importers"
 msgstr "Starter intelligent importering"
 
-#: shell/e-shell-importer.c:853 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
 #, c-format
 msgid "From %s:"
 msgstr "Fra %s:"
 
-#: shell/e-shell-importer.c:1044
+#: shell/e-shell-importer.c:1073
 #, fuzzy, c-format
 msgid "No importer available for file %s"
 msgstr "Ingen udbyder tilgængelig for protokol `%s'"
 
-#: shell/e-shell-importer.c:1056
+#: shell/e-shell-importer.c:1085
 #, fuzzy
 msgid "Unable to execute importer"
 msgstr "gpg kunne ikke udføres."
 
-#: shell/e-shell-importer.c:1169
+#: shell/e-shell-importer.c:1199
 #, fuzzy
 msgid "_Import"
 msgstr "Importér"
@@ -17009,60 +16529,60 @@ msgstr "Mappenavn kan ikke indeholde følgende tegn \"#\"."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' og '..' er reserverede mappenavne."
 
-#: shell/e-shell-window.c:336
+#: shell/e-shell-window.c:337
 #, fuzzy
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution er koblet til. Klik på denne knap for at arbejde frakoblet."
 
-#: shell/e-shell-window.c:343
+#: shell/e-shell-window.c:344
 #, fuzzy
 msgid "Evolution is in the process of going offline."
 msgstr "Ximian Evolution er i færd med at koble fra."
 
-#: shell/e-shell-window.c:349
+#: shell/e-shell-window.c:350
 #, fuzzy
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution er frakoblet. Klik på denne knap for at arbejde tilkoblet."
 
-#: shell/e-shell-window.c:621
+#: shell/e-shell-window.c:637
 #, fuzzy, c-format
 msgid "Switch to %s"
 msgstr "E-post til %s"
 
-#: shell/e-shell-window-commands.c:64
+#: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 "GNOME pilotværktøjerne ser ikke ud til at være installeret på dette system."
 
-#: shell/e-shell-window-commands.c:72
+#: shell/e-shell-window-commands.c:74
 #, c-format
 msgid "Error executing %s."
 msgstr "Fejl under kørsel af %s."
 
-#: shell/e-shell-window-commands.c:121
+#: shell/e-shell-window-commands.c:123
 msgid "Bug buddy is not installed."
 msgstr "Bug buddy er ikke installeret."
 
-#: shell/e-shell-window-commands.c:129
+#: shell/e-shell-window-commands.c:131
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy kunne ikke køres."
 
-#: shell/e-shell-window-commands.c:171
+#: shell/e-shell-window-commands.c:323
 #, fuzzy
-msgid "About Evolution"
-msgstr "Om Ximian Evolution..."
+msgid "Groupware Suite"
+msgstr "Gruppe"
 
-#: shell/e-shell-window-commands.c:382
+#: shell/e-shell-window-commands.c:563
 msgid "_Work Online"
 msgstr "_Arbejd tilkoblet"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "Ar_bejd frakoblet"
 
-#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Arbejd frakoblet"
 
@@ -17074,43 +16594,6 @@ msgstr "Afkrydsningsboks"
 msgid "New"
 msgstr "Ny"
 
-#: shell/evolution-shell-component-utils.c:115
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Ukendt fejl."
-
-#: shell/evolution-shell-component-utils.c:118
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Fejlen fra komponentsystemet er:\n"
-"%s"
-
-#: shell/evolution-shell-component-utils.c:125
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Fejlen fra aktiveringssystemet er:\n"
-"%s"
-
 #: shell/evolution-test-component.c:140
 #, fuzzy
 msgid "New Test"
@@ -17452,34 +16935,34 @@ msgid ""
 "Click help for details."
 msgstr ""
 
-#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:522
+#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
+#: smime/gui/certificate-manager.c:556
 #, fuzzy
 msgid "Select a cert to import..."
 msgstr "Vælg importør"
 
-#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:604
+#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
+#: smime/gui/certificate-manager.c:638
 #, fuzzy
 msgid "Certificate Name"
 msgstr "_Certifikat-ID:"
 
-#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
+#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
 #, fuzzy
 msgid "Purposes"
 msgstr "Fremgang"
 
-#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:517
+#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:267
+#: smime/gui/certificate-manager.c:271
 #, fuzzy
 msgid "Expires"
 msgstr "Udtryk"
 
-#: smime/gui/certificate-manager.c:417
+#: smime/gui/certificate-manager.c:446
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "E-post-adresse:"
@@ -17522,6 +17005,11 @@ msgid ""
 "  Subject: %s\n"
 msgstr ""
 
+#: smime/gui/e-cert-selector.c:169
+#, fuzzy
+msgid "Select certificate"
+msgstr "Gå til en specifik dato"
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -17584,7 +17072,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
 #, fuzzy
 msgid "Certificate"
 msgstr "_Certifikat-ID:"
@@ -17609,20 +17097,24 @@ msgstr "Normalt navn"
 msgid "Contact Certificates"
 msgstr "_Certifikat-ID:"
 
-#: smime/gui/smime-ui.glade.h:21
-#, no-c-format
-msgid "Do you want to trust \"%s\" for the following purposes?"
+#: smime/gui/smime-ui.glade.h:20
+msgid "Do not trust the authenticity of this certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:21
 msgid "Dummy window only"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:22
 #, fuzzy
 msgid "Edit"
 msgstr "R_edigér"
 
+#: smime/gui/smime-ui.glade.h:23
+#, fuzzy
+msgid "Email Certificate Trust Settings"
+msgstr "Ugyldig certifikatmyndighed (CA)"
+
 #: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr ""
@@ -17659,280 +17151,289 @@ msgstr "Organisationsenhed"
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:37
-msgid "Trust this CA to identify email users."
+msgid "Trust the authenticity of this certificate"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:38
-msgid "Trust this CA to identify software developers."
+msgid "Trust this CA to identify email users."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:39
-msgid "Trust this CA to identify web sites."
+msgid "Trust this CA to identify software developers."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:40
-#, fuzzy
-msgid "View"
-msgstr "_Vis"
+msgid "Trust this CA to identify web sites."
+msgstr ""
 
 #: smime/gui/smime-ui.glade.h:41
 #, fuzzy
-msgid "View Certificate"
-msgstr "_Certifikat-ID:"
+msgid "View"
+msgstr "_Vis"
 
 #: smime/gui/smime-ui.glade.h:42
-#, fuzzy
-msgid "You have been asked to trust a new Certificate Authority (CA)."
-msgstr "Ugyldig certifikatmyndighed (CA)"
-
-#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:44
+#: smime/gui/smime-ui.glade.h:43
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:45
+#: smime/gui/smime-ui.glade.h:44
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:46
+#: smime/gui/smime-ui.glade.h:45
 #, fuzzy
 msgid "Your Certificates"
 msgstr "_Certifikat-ID:"
 
-#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
+#: smime/gui/smime-ui.glade.h:46
+msgid "_Edit CA Trust"
+msgstr ""
+
+#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 #, fuzzy
 msgid "%d/%m/%Y"
 msgstr "%d/%m-%Y"
 
-#: smime/lib/e-cert.c:478
+#. x509 certificate usage types
+#: smime/lib/e-cert.c:424
+#, fuzzy
+msgid "Sign"
+msgstr "Stauning"
+
+#: smime/lib/e-cert.c:425
+#, fuzzy
+msgid "Encrypt"
+msgstr "Kryptér med PGP"
+
+#: smime/lib/e-cert.c:530
 #, fuzzy
 msgid "Version"
 msgstr "Vermont"
 
-#: smime/lib/e-cert.c:493
+#: smime/lib/e-cert.c:545
 #, fuzzy
 msgid "Version 1"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:496
+#: smime/lib/e-cert.c:548
 #, fuzzy
 msgid "Version 2"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:499
+#: smime/lib/e-cert.c:551
 #, fuzzy
 msgid "Version 3"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:581
+#: smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:584
+#: smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:587
+#: smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:590
+#: smime/lib/e-cert.c:642
 #, fuzzy
 msgid "C"
 msgstr " C"
 
-#: smime/lib/e-cert.c:593
+#: smime/lib/e-cert.c:645
 #, fuzzy
 msgid "CN"
 msgstr "N"
 
-#: smime/lib/e-cert.c:596
+#: smime/lib/e-cert.c:648
 msgid "OU"
 msgstr ""
 
-#: smime/lib/e-cert.c:599
+#: smime/lib/e-cert.c:651
 #, fuzzy
 msgid "O"
 msgstr "O.k."
 
-#: smime/lib/e-cert.c:602
+#: smime/lib/e-cert.c:654
 msgid "L"
 msgstr ""
 
-#: smime/lib/e-cert.c:605
+#: smime/lib/e-cert.c:657
 #, fuzzy
 msgid "DN"
 msgstr "N"
 
-#: smime/lib/e-cert.c:608
+#: smime/lib/e-cert.c:660
 msgid "DC"
 msgstr ""
 
-#: smime/lib/e-cert.c:611
+#: smime/lib/e-cert.c:663
 #, fuzzy
 msgid "ST"
 msgstr "SMTP"
 
-#: smime/lib/e-cert.c:614
+#: smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:617
+#: smime/lib/e-cert.c:669
 #, fuzzy
 msgid "Certificate Key Usage"
 msgstr "_Certifikat-ID:"
 
-#: smime/lib/e-cert.c:620
+#: smime/lib/e-cert.c:672
 #, fuzzy
 msgid "Netscape Certificate Type"
 msgstr "_Certifikat-ID:"
 
-#: smime/lib/e-cert.c:623
+#: smime/lib/e-cert.c:675
 #, fuzzy
 msgid "Certificate Authority Key Identifier"
 msgstr "Certifikat utroværdigt"
 
-#: smime/lib/e-cert.c:626
+#: smime/lib/e-cert.c:678
 #, fuzzy
 msgid "UID"
 msgstr "ID"
 
-#: smime/lib/e-cert.c:635
+#: smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr ""
 
-#: smime/lib/e-cert.c:686
+#: smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:694
+#: smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
 msgstr ""
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:768
 msgid "Subject Public Key Info"
 msgstr ""
 
-#: smime/lib/e-cert.c:721
+#: smime/lib/e-cert.c:773
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:736
+#: smime/lib/e-cert.c:788
 #, fuzzy
 msgid "Subject's Public Key"
 msgstr "Emne er %s"
 
-#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
+#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
 #, fuzzy
 msgid "Error: Unable to process extension"
 msgstr "Kan ikke behandle spool-mappen"
 
-#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
+#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:782
+#: smime/lib/e-cert.c:834
 #, fuzzy
 msgid "SSL Certificate Authority"
 msgstr "Ugyldig certifikatmyndighed (CA)"
 
-#: smime/lib/e-cert.c:786
+#: smime/lib/e-cert.c:838
 #, fuzzy
 msgid "Email Certificate Authority"
 msgstr "Ugyldig certifikatmyndighed (CA)"
 
-#: smime/lib/e-cert.c:814
+#: smime/lib/e-cert.c:866
 #, fuzzy
 msgid "Signing"
 msgstr "Stauning"
 
-#: smime/lib/e-cert.c:818
+#: smime/lib/e-cert.c:870
 #, fuzzy
 msgid "Non-repudiation"
 msgstr "Ingen information"
 
-#: smime/lib/e-cert.c:822
+#: smime/lib/e-cert.c:874
 msgid "Key Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:826
+#: smime/lib/e-cert.c:878
 #, fuzzy
 msgid "Data Encipherment"
 msgstr "bilag"
 
-#: smime/lib/e-cert.c:830
+#: smime/lib/e-cert.c:882
 msgid "Key Agreement"
 msgstr ""
 
-#: smime/lib/e-cert.c:834
+#: smime/lib/e-cert.c:886
 #, fuzzy
 msgid "Certificate Signer"
 msgstr "_Certifikat-ID:"
 
-#: smime/lib/e-cert.c:838
+#: smime/lib/e-cert.c:890
 msgid "CRL Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:938
 #, fuzzy
 msgid "Critical"
 msgstr "Curitiba"
 
-#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
+#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
 #, fuzzy
 msgid "Not Critical"
 msgstr "North Carolina"
 
-#: smime/lib/e-cert.c:912
+#: smime/lib/e-cert.c:964
 #, fuzzy
 msgid "Extensions"
 msgstr "Udtryk"
 
-#: smime/lib/e-cert.c:983
+#: smime/lib/e-cert.c:1035
 #, fuzzy, c-format
 msgid "%s = %s"
 msgstr "%s ved %s"
 
-#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
 #, fuzzy
 msgid "Certificate Signature Algorithm"
 msgstr "Certifikatsignaturfejl"
 
-#: smime/lib/e-cert.c:1048
+#: smime/lib/e-cert.c:1100
 #, fuzzy
 msgid "Issuer"
 msgstr "_Indsæt"
 
-#: smime/lib/e-cert.c:1102
+#: smime/lib/e-cert.c:1154
 msgid "Issuer Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1121
+#: smime/lib/e-cert.c:1173
 #, fuzzy
 msgid "Subject Unique ID"
 msgstr "Emne er %s"
 
-#: smime/lib/e-cert.c:1164
+#: smime/lib/e-cert.c:1216
 #, fuzzy
 msgid "Certificate Signature Value"
 msgstr "Certifikatsignaturfejl"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
+#: smime/lib/e-cert-db.c:608
 #, fuzzy
 msgid "Certificate already exists"
 msgstr "Kort-ID eksisterer allerede"
@@ -18082,7 +17583,7 @@ msgstr "Vis den aktuelle kontakt"
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "H_andlinger"
 
@@ -18250,7 +17751,7 @@ msgstr "_Luk"
 #: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:3
+#: ui/evolution.xml.h:4
 msgid "Close"
 msgstr "Luk"
 
@@ -18263,7 +17764,7 @@ msgid "Delete this item"
 msgstr "Slet denne opføring"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr "Hovedværktøjslinje"
 
@@ -18307,7 +17808,7 @@ msgstr "Gem denne opføring på disk"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:44
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "_File"
 msgstr "_Fil"
 
@@ -18568,13 +18069,13 @@ msgstr "Re_versér udvalg"
 msgid "_Threaded Message List"
 msgstr "Beskedsliste med _tråde"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Luk dette vindue"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "_Close"
 msgstr "L_uk"
 
@@ -18983,7 +18484,7 @@ msgstr "_Foregående meddelelse"
 msgid "_Quoted"
 msgstr "_Citeret"
 
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
 msgid "_Tools"
 msgstr "_Værktøjer"
 
@@ -19287,108 +18788,122 @@ msgid "_Open Task"
 msgstr "_Opgave"
 
 #: ui/evolution.xml.h:1
-msgid "About Ximian Evolution..."
+#, fuzzy
+msgid "About Evolution..."
 msgstr "Om Ximian Evolution..."
 
 #: ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
 msgstr "Ændr Evolutions indstillinger"
 
-#: ui/evolution.xml.h:5
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the visibility of the toolbar"
+msgstr "Ændr egenskaber for denne mappe"
+
+#: ui/evolution.xml.h:6
 msgid "Create a new window displaying this folder"
 msgstr "Opret et nyt vindue som viser denne mappe"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "A_fslut"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Ximian Evolution _OSS"
+
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Afslut programmet"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:10
 msgid "Forget _Passwords"
 msgstr "Glem _adgangskode"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:11
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Glem alle adgangskoder så du vil blive spurgt om at opgive dem igen"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:12
 msgid "Import data from other programs"
 msgstr "Importér data fra andre programmer"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:14
 #, fuzzy
 msgid "New _Window"
 msgstr "_Søg nu"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Pi_lot Settings..."
 msgstr "Pi_lotindstillinger..."
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Send / Receive"
 msgstr "Send / modtag"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Send queued items and retrieve new items"
 msgstr "Send køede objekter og hent nye objekter"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Set up Pilot configuration"
 msgstr "Konfigurér Pilotkonfiguration"
 
-#: ui/evolution.xml.h:17
-msgid "Show information about Ximian Evolution"
+#: ui/evolution.xml.h:19
+#, fuzzy
+msgid "Show information about Evolution"
 msgstr "Vis information om Ximian Evolution"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:20
 msgid "Submit Bug Report"
 msgstr "Indsend fejlrapport"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:21
 msgid "Submit _Bug Report"
 msgstr "Indsen_d fejlrapport"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Indsend en fejlrapport med Bug Buddy"
 
-#: ui/evolution.xml.h:21
-msgid "Toggle whether we are working offline."
-msgstr "Skift til frakoblet arbejdsmodus."
-
 #: ui/evolution.xml.h:23
-msgid "Ximian Evolution _FAQ"
-msgstr "Ximian Evolution _OSS"
+#, fuzzy
+msgid "T_oolbar"
+msgstr "Hovedværktøjslinje"
 
 #: ui/evolution.xml.h:24
-msgid "_About Ximian Evolution..."
-msgstr "_Om Ximian Evolution..."
+msgid "Toggle whether we are working offline."
+msgstr "Skift til frakoblet arbejdsmodus."
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "_About Evolution..."
+msgstr "Om Ximian Evolution..."
+
+#: ui/evolution.xml.h:30
 msgid "_Help"
 msgstr "_Hjælp"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "_Import..."
 msgstr "_Importér..."
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "_New"
 msgstr "_Ny"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 #, fuzzy
 msgid "_Quick Reference"
 msgstr "E-post-indstillinger"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_Send / Receive"
 msgstr "_Send / modtag"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 #, fuzzy
 msgid "_Window"
 msgstr "_Søg nu"
@@ -19467,7 +18982,7 @@ msgid "With _Status"
 msgstr "Sæt status"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:626
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:635
 msgid "UTC"
 msgstr "UTC"
 
@@ -19625,29 +19140,29 @@ msgstr "Andre..."
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
-#: widgets/misc/e-error.c:121
+#: widgets/misc/e-error.c:79 widgets/misc/e-error.c:80
+#: widgets/misc/e-error.c:122
 msgid "Evolution Error"
 msgstr "Evolution fejl"
 
-#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
-#: widgets/misc/e-error.c:119
+#: widgets/misc/e-error.c:81 widgets/misc/e-error.c:82
+#: widgets/misc/e-error.c:120
 #, fuzzy
 msgid "Evolution Warning"
 msgstr "Evolution e-post"
 
-#: widgets/misc/e-error.c:118
+#: widgets/misc/e-error.c:119
 #, fuzzy
 msgid "Evolution Information"
 msgstr "Mødeinformation"
 
-#: widgets/misc/e-error.c:120
+#: widgets/misc/e-error.c:121
 #, fuzzy
 msgid "Evolution Query"
 msgstr "Evolution sammenfatning"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:410
+#: widgets/misc/e-error.c:415
 #, fuzzy, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -19801,16 +19316,512 @@ msgstr ""
 "Kan ikke gemme til \"%s\":\n"
 " %s"
 
-#: widgets/misc/e-task-widget.c:211
+#: widgets/misc/e-task-widget.c:212
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: widgets/misc/e-task-widget.c:216
+#: widgets/misc/e-task-widget.c:217
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% fuldført)"
 
+#~ msgid "Failed to connect to LDAP server"
+#~ msgstr "Tilslutning til LDAP-serveren mislykkedes"
+
+#~ msgid "Failed to authenticate with LDAP server"
+#~ msgstr "Mislykkedes med godkendelse på LDAP-server"
+
+#~ msgid "Could not perform query on Root DSE"
+#~ msgstr "Kunne ikke gennemføre forespørgsel på rod-DSE"
+
+#~ msgid "The server responded with no supported search bases"
+#~ msgstr "Serveren svarede at ingen søgebaser understøttes"
+
+#~ msgid "This server does not support LDAPv3 schema information"
+#~ msgstr "Denne server understøtter ikke LDAPv3-schemainformation"
+
+#~ msgid "Error retrieving schema information"
+#~ msgstr "Fejl ved hentning af schemainformation"
+
+#~ msgid "Server did not respond with valid schema information"
+#~ msgstr "Serveren svarede ikke med gyldig schemainformation"
+
+#~ msgid "  S_how Supported Bases "
+#~ msgstr "  _Vis de baser som understøttes "
+
+#~ msgid "1:00"
+#~ msgstr "1.00"
+
+#~ msgid "5:00"
+#~ msgstr "5.00"
+
+#~ msgid "Connecting"
+#~ msgstr "Tilslutter"
+
+#~ msgid "Distinguished _name:"
+#~ msgstr "Distinguished _name:"
+
+#, fuzzy
+#~ msgid "Email address:"
+#~ msgstr "E-post-_adresse:"
+
+#~ msgid "Evolution will use this DN to authenticate you with the server"
+#~ msgstr "Evolution vil anvende dette DN for at godkende dig på servern"
+
+#~ msgid "One"
+#~ msgstr "Én"
+
+#~ msgid "S_earch scope: "
+#~ msgstr "S_øgningsomfang: "
+
+#~ msgid "Searching"
+#~ msgstr "Søger..."
+
+#~ msgid "Sub"
+#~ msgstr "Under"
+
+#~ msgid "This option controls how long a search will be run."
+#~ msgstr "Denne indstilling styrer hvor lang tid en søgning må køre."
+
+#~ msgid "U_se SSL/TLS:"
+#~ msgstr "An_vend SSL/TLS:"
+
+#~ msgid "_Display name:"
+#~ msgstr "_Vis navn:"
+
+#~ msgid "_Port number:"
+#~ msgstr "_Portnummer:"
+
+#~ msgid "_Search base:"
+#~ msgstr "_Udgangspunkt for søgning:"
+
+#~ msgid "_Server name:"
+#~ msgstr "_Servernavn:"
+
+#~ msgid "_Timeout (minutes):"
+#~ msgstr "_Timeout (minutter):"
+
+#~ msgid "connecting-tab"
+#~ msgstr "forbindelsesfaneblad"
+
+#~ msgid "general-tab"
+#~ msgstr "generel-faneblad"
+
+#~ msgid "searching-tab"
+#~ msgstr "søgefaneblad"
+
+#, fuzzy
+#~ msgid "Job title:"
+#~ msgstr "_Jobtitel:"
+
+#, fuzzy
+#~ msgid "Webcam:"
+#~ msgstr "Side"
+
+#~ msgid "Category editor not available."
+#~ msgstr "Kategori-redigering ikke tilgængelig."
+
+#, fuzzy
+#~ msgid ""
+#~ "The following entries are invalid:\n"
+#~ "\n"
+#~ msgstr "Følgende forbindelser er aktive:"
+
+#~ msgid "Could not find widget for a field: `%s'"
+#~ msgstr "Kunne ikke finde widget for felt: `%s'"
+
+#~ msgid "Do you want to save changes?"
+#~ msgstr "Vil du gemme ændringene?"
+
+#~ msgid "Error saving %s: %s"
+#~ msgstr "Fejl ved gemning af %s: %s"
+
+#~ msgid ""
+#~ "The addressbook backend for\n"
+#~ "%s\n"
+#~ "has crashed. You will have to restart Evolution in order to use it again"
+#~ msgstr ""
+#~ "Adressbogsbagenden for\n"
+#~ "%s\n"
+#~ "er gået ned. Du skal genstarte Evolution for at kunne anvende den igen"
+
+#, fuzzy
+#~ msgid "Can not load URI"
+#~ msgstr "Kort ikke fundet"
+
+#, fuzzy
+#~ msgid "Calendar Properties"
+#~ msgstr "iCalendar-fejl"
+
+#, fuzzy
+#~ msgid "Remote"
+#~ msgstr "Fjern"
+
+#, fuzzy
+#~ msgid "Task List Properties"
+#~ msgstr "Opgaveliste"
+
+#, fuzzy
+#~ msgid "_Refresh Interval:"
+#~ msgstr "Læs listen igen"
+
+#, fuzzy
+#~ msgid "_Source URL:"
+#~ msgstr "Kilde-URI for POP"
+
+#~ msgid ""
+#~ "The event being deleted is a meeting, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "Hændelsen som fjernes er et møde. Vil du sende en aflysningsmeddelelse?"
+
+#~ msgid "Are you sure you want to cancel and delete this meeting?"
+#~ msgstr "Er du sikker på, at du vil aflyse og slette dette møde?"
+
+#~ msgid ""
+#~ "The task being deleted is assigned, would you like to send a cancellation "
+#~ "notice?"
+#~ msgstr ""
+#~ "Opgaven som fjernes er tildelt. Vil du sende en aflysningsmeddelselse?"
+
+#~ msgid "Are you sure you want to cancel and delete this task?"
+#~ msgstr "Er du sikker på, at du vil aflyse og slette denne opgave?"
+
+#~ msgid ""
+#~ "The journal entry being deleted is published, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "Journalindgangen som fjernes er offentliggjort. Vil du sende en "
+#~ "aflysningsmeddelelse?"
+
+#~ msgid "Are you sure you want to cancel and delete this journal entry?"
+#~ msgstr "Er du sikker på, at du vil aflyse og slette denne journalopføring?"
+
+#~ msgid "Are you sure you want to delete the appointment `%s'?"
+#~ msgstr "Er du sikker på at du vil slette aftalen `%s'?"
+
+#~ msgid "Are you sure you want to delete this untitled appointment?"
+#~ msgstr "Er du sikker på at du vil slette denne aftale uden titel?"
+
+#~ msgid "Are you sure you want to delete the task `%s'?"
+#~ msgstr "Er du sikker på at du vil slette opgaven `%s'?"
+
+#~ msgid "Are you sure you want to delete this untitled task?"
+#~ msgstr "Er du sikker på at du vil slette denne opgave uden titel?"
+
+#~ msgid "Are you sure you want to delete the journal entry `%s'?"
+#~ msgstr "Er du sikker på at du vil slette journalopføringen `%s'?"
+
+#~ msgid "Are you sure want to delete this untitled journal entry?"
+#~ msgstr "Er du sikker på at du vil slette denne journalopføring uden titel?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d appointment?"
+#~ msgid_plural "Are you sure you want to delete %d appointments?"
+#~ msgstr[0] "Er du sikker på at du vil slette %d aftaler?"
+#~ msgstr[1] "Er du sikker på at du vil slette %d aftaler?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d task?"
+#~ msgid_plural "Are you sure you want to delete %d tasks?"
+#~ msgstr[0] "Er du sikker på at du vil slette %d opgaver?"
+#~ msgstr[1] "Er du sikker på at du vil slette %d opgaver?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d journal entry?"
+#~ msgid_plural "Are you sure you want to delete %d journal entries?"
+#~ msgstr[0] "Er du sikker på at du vil slette %d journalopføringer?"
+#~ msgstr[1] "Er du sikker på at du vil slette %d journalopføringer?"
+
+#~ msgid "_Invite Others..."
+#~ msgstr "_Invitér andre..."
+
+#, fuzzy
+#~ msgid ""
+#~ "This event has been changed, but has not been saved.\n"
+#~ "\n"
+#~ "Do you wish to save your changes?"
+#~ msgstr ""
+#~ "Denne signatur er ændret, men har ikke blevet gemt..\n"
+#~ "\n"
+#~ "Vil du gemme ændringene?"
+
+#~ msgid "_Discard Changes"
+#~ msgstr "_Forkast ændringer"
+
+#, fuzzy
+#~ msgid "Save Event"
+#~ msgstr "Kalenderhændelser"
+
+#~ msgid "The meeting information has been created. Send it?"
+#~ msgstr "Mødesinformationen er blevet genereret. Send den?"
+
+#~ msgid "The meeting information has changed. Send an updated version?"
+#~ msgstr "Mødeinformationen er ændret. Send en opdateret version?"
+
+#~ msgid "The task assignment information has been created. Send it?"
+#~ msgstr "Opgaveinformationen er genereret. Send den?"
+
+#~ msgid "The task information has changed. Send an updated version?"
+#~ msgstr "Opgaveinformationen er ændret. Send en opdateret version?"
+
+#, fuzzy
+#~ msgid "Could not get article %s from NNTP server"
+#~ msgstr "Kunne ikke hente gruppe: %s"
+
+#, fuzzy
+#~ msgid "Error posting message: %s: message not posted"
+#~ msgstr ""
+#~ "Fejl under autogemning af besked: %s:\n"
+#~ " %s"
+
+#, fuzzy
+#~ msgid "Stream error"
+#~ msgstr "tolkningsfejl"
+
+#, fuzzy
+#~ msgid "Connection error: %s"
+#~ msgstr "Ukendt fejl: %s"
+
+#~ msgid "Could not get group: %s"
+#~ msgstr "Kunne ikke hente gruppe: %s"
+
+#, fuzzy
+#~ msgid "Could not get messages: unspecified error"
+#~ msgstr "Kunne ikke sende beskeden: %s"
+
+#~ msgid "Unknown server response: %s"
+#~ msgstr "Ukendt serversvar: %s"
+
+#~ msgid "Adjust Score"
+#~ msgstr "Justér point"
+
+#~ msgid "Assign Color"
+#~ msgstr "Tilknyt farve"
+
+#~ msgid "Assign Score"
+#~ msgstr "Giv point"
+
+#~ msgid "Attachments"
+#~ msgstr "Bilag"
+
+#~ msgid "Beep"
+#~ msgstr "Bip"
+
+#~ msgid "contains"
+#~ msgstr "indeholder"
+
+#~ msgid "Copy to Folder"
+#~ msgstr "Kopier til mappe"
+
+#~ msgid "Date received"
+#~ msgstr "Dato modtaget"
+
+#~ msgid "Date sent"
+#~ msgstr "Dato sendt"
+
+#~ msgid "Deleted"
+#~ msgstr "Slettet"
+
+#~ msgid "does not contain"
+#~ msgstr "indeholder ikke"
+
+#~ msgid "does not end with"
+#~ msgstr "slutter ikke med"
+
+#~ msgid "does not exist"
+#~ msgstr "eksisterer ikke"
+
+#~ msgid "does not return"
+#~ msgstr "returnerer ikke"
+
+#~ msgid "does not sound like"
+#~ msgstr "ligner ikke"
+
+#~ msgid "does not start with"
+#~ msgstr "starter ikke med"
+
+#~ msgid "Do Not Exist"
+#~ msgstr "Eksisterer ikke"
+
+#~ msgid "Draft"
+#~ msgstr "Skitse"
+
+#~ msgid "ends with"
+#~ msgstr "slutter med"
+
+#~ msgid "Exist"
+#~ msgstr "Eksisterer"
+
+#~ msgid "exists"
+#~ msgstr "eksisterer"
+
+#~ msgid "Expression"
+#~ msgstr "Udtryk"
+
+#~ msgid "Follow Up"
+#~ msgstr "Følg op"
+
+#~ msgid "is"
+#~ msgstr "er"
+
+#~ msgid "is after"
+#~ msgstr "er efter"
+
+#~ msgid "is before"
+#~ msgstr "er inden"
+
+#~ msgid "is Flagged"
+#~ msgstr "er markeret med flag"
+
+#~ msgid "is greater than"
+#~ msgstr "er større end"
+
+#~ msgid "is less than"
+#~ msgstr "er mindre end"
+
+#~ msgid "is not"
+#~ msgstr "er ikke"
+
+#~ msgid "is not Flagged"
+#~ msgstr "er ikke markeret med flag"
+
+#, fuzzy
+#~ msgid "Junk Test"
+#~ msgstr "Juni"
+
+#~ msgid "Mailing list"
+#~ msgstr "E-post-liste"
+
+#~ msgid "Message Body"
+#~ msgstr "Beskedskrop"
+
+#~ msgid "Message Header"
+#~ msgstr "Beskedshoved"
+
+#, fuzzy
+#~ msgid "Message is Junk"
+#~ msgstr "Beskeder"
+
+#, fuzzy
+#~ msgid "Message is not Junk"
+#~ msgstr "Markér som v_igtig"
+
+#~ msgid "Move to Folder"
+#~ msgstr "Flyt til mappe"
+
+#, fuzzy
+#~ msgid "Pipe to Program"
+#~ msgstr "Afslut programmet"
+
+#~ msgid "Play Sound"
+#~ msgstr "Afspil lyd"
+
+#~ msgid "Recipients"
+#~ msgstr "Modtagere"
+
+#~ msgid "Regex Match"
+#~ msgstr "Træffer på regulært udtryk"
+
+#~ msgid "Replied to"
+#~ msgstr "Svaret til"
+
+#~ msgid "returns"
+#~ msgstr "returnerer"
+
+#~ msgid "returns greater than"
+#~ msgstr "returnerer større end"
+
+#~ msgid "returns less than"
+#~ msgstr "returnerer mindre end"
+
+#, fuzzy
+#~ msgid "Run Program"
+#~ msgstr "Kør program:"
+
+#~ msgid "Sender"
+#~ msgstr "Afsender"
+
+#~ msgid "Set Status"
+#~ msgstr "Sæt status"
+
+#~ msgid "Size (kB)"
+#~ msgstr "Størrelse (kB)"
+
+#~ msgid "sounds like"
+#~ msgstr "lyder som"
+
+#~ msgid "Source Account"
+#~ msgstr "Kildekonto"
+
+#~ msgid "Specific header"
+#~ msgstr "Specifik header"
+
+#~ msgid "starts with"
+#~ msgstr "starter med"
+
+#~ msgid "Stop Processing"
+#~ msgstr "Stop behandling"
+
+#~ msgid "Unset Status"
+#~ msgstr "Neutraliser status"
+
+#~ msgid "Working"
+#~ msgstr "Arbejder"
+
+#~ msgid "Brought to you by"
+#~ msgstr "Bragt til dig af"
+
+#, fuzzy
+#~ msgid "_Filename:"
+#~ msgstr "Filnavn:"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "Unknown error."
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Ukendt fejl."
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the component system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Fejlen fra komponentsystemet er:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the activation system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Fejlen fra aktiveringssystemet er:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "View Certificate"
+#~ msgstr "_Certifikat-ID:"
+
+#, fuzzy
+#~ msgid "You have been asked to trust a new Certificate Authority (CA)."
+#~ msgstr "Ugyldig certifikatmyndighed (CA)"
+
+#~ msgid "About Ximian Evolution..."
+#~ msgstr "Om Ximian Evolution..."
+
+#~ msgid "_About Ximian Evolution..."
+#~ msgstr "_Om Ximian Evolution..."
+
 #~ msgid "Evolution Addressbook folder viewer"
 #~ msgstr "Evolution adressebog - mappevisning"
 
@@ -20117,9 +20128,6 @@ msgstr "%s (%d%% fuldført)"
 #~ msgid "Primary _email:"
 #~ msgstr "Primær e-post"
 
-#~ msgid "S_pouse:"
-#~ msgstr "Ægte_fælle:"
-
 #, fuzzy
 #~ msgid "_Business:"
 #~ msgstr "Arbejde"
@@ -20140,9 +20148,6 @@ msgstr "%s (%d%% fuldført)"
 #~ msgid "_Mobile:"
 #~ msgstr "Mobil"
 
-#~ msgid "_Office:"
-#~ msgstr "Kont_or:"
-
 #~ msgid "_Public Calendar URL:"
 #~ msgstr "URL for _Offentlig kalender:"
 
@@ -21592,10 +21597,6 @@ msgstr "%s (%d%% fuldført)"
 #~ msgstr "Objektet kunne ikke findes\n"
 
 #, fuzzy
-#~ msgid "Invalid object"
-#~ msgstr "Ugyldigt formål"
-
-#, fuzzy
 #~ msgid "URI not loaded"
 #~ msgstr "EBook ikke indlæst\n"
 
@@ -25551,9 +25552,6 @@ msgstr "%s (%d%% fuldført)"
 #~ msgid "Lannion"
 #~ msgstr "Lannion"
 
-#~ msgid "Lansing"
-#~ msgstr "Lansing"
-
 #~ msgid "Lanzhou"
 #~ msgstr "Lanzhou"
 
diff --git a/po/de.po b/po/de.po
index 44db5f67b4..928f150d8c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.5.2\n"
-"POT-Creation-Date: 2004-05-19 14:00-0400\n"
+"POT-Creation-Date: 2004-06-03 11:14-0400\n"
 "PO-Revision-Date: 2004-01-25 17:07+0100\n"
 "Last-Translator: Christian Neumair <chris@gnome-de.org>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
@@ -69,13 +69,13 @@ msgstr "Karten"
 msgid "Default Sync Address:"
 msgstr "Voreingestellte Synchronisierungsadresse:"
 
-#: addressbook/conduit/address-conduit.c:1150
 #: addressbook/conduit/address-conduit.c:1151
+#: addressbook/conduit/address-conduit.c:1152
 msgid "Could not load addressbook"
 msgstr "Adressbuch konnte nicht geladen werden"
 
-#: addressbook/conduit/address-conduit.c:1219
-#: addressbook/conduit/address-conduit.c:1222
+#: addressbook/conduit/address-conduit.c:1220
+#: addressbook/conduit/address-conduit.c:1223
 msgid "Could not read pilot's Address application block"
 msgstr "Adress-Anwendungsblock des Pilot konnte nicht gelesen werden"
 
@@ -83,13 +83,13 @@ msgstr "Adress-Anwendungsblock des Pilot konnte nicht gelesen werden"
 msgid "Accessing LDAP Server anonymously"
 msgstr "Anonymer Zugriff auf LDAP-Server"
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
 msgid "Failed to authenticate.\n"
 msgstr "Legitimation gescheitert.\n"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sPasswort für %s (Benutzer %s) eingeben"
@@ -133,51 +133,23 @@ msgstr "_Kontakte:"
 msgid "Create a new contacts group"
 msgstr "Eine neue Verknüpfungsgruppe anlegen"
 
-#: addressbook/gui/component/addressbook-component.c:182
+#: addressbook/gui/component/addressbook-component.c:184
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:483
-msgid "Failed to connect to LDAP server"
-msgstr "Verbindungsaufbau mit LDAP-Server gescheitert"
-
-#: addressbook/gui/component/addressbook-config.c:507
-msgid "Failed to authenticate with LDAP server"
-msgstr "Legitimation am LDAP-Server gescheitert"
-
-#: addressbook/gui/component/addressbook-config.c:535
-msgid "Could not perform query on Root DSE"
-msgstr "Abfrage auf Root DSE konnte nicht ausgeführt werden"
-
-#: addressbook/gui/component/addressbook-config.c:840
-msgid "The server responded with no supported search bases"
-msgstr "Der Server antwortete mit nicht unterstützten Suchbasen"
-
-#: addressbook/gui/component/addressbook-config.c:1245
-msgid "This server does not support LDAPv3 schema information"
-msgstr "Dieser Server unterstützt keine LDAPv3-Schemainformationen"
-
-#: addressbook/gui/component/addressbook-config.c:1266
-msgid "Error retrieving schema information"
-msgstr "Fehler beim Abrufen der Schemainformationen"
-
-#: addressbook/gui/component/addressbook-config.c:1274
-msgid "Server did not respond with valid schema information"
-msgstr "Server antwortetet nicht mit einer gültigen Schemainformationen"
-
 #: addressbook/gui/component/addressbook-migrate.c:68
-#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1160
 msgid "Migrating..."
 msgstr "Migrationsvorgang..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1201
 #, c-format
 msgid "Migrating `%s':"
 msgstr "»%s« wird migriert:"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:438
+#: addressbook/gui/component/addressbook-migrate.c:464
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
 #: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
@@ -185,28 +157,28 @@ msgid "On This Computer"
 msgstr "Auf diesem Computer"
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:446
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
-#: mail/mail-config.glade.h:106
+#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
+#: mail/mail-config.glade.h:109
 msgid "Personal"
 msgstr "Persönlich"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:454
+#: addressbook/gui/component/addressbook-migrate.c:480
 msgid "On LDAP Servers"
 msgstr "Auf LDAP-Servern"
 
-#: addressbook/gui/component/addressbook-migrate.c:582
+#: addressbook/gui/component/addressbook-migrate.c:608
 msgid "LDAP Servers"
 msgstr "LDAP-Server"
 
-#: addressbook/gui/component/addressbook-migrate.c:702
+#: addressbook/gui/component/addressbook-migrate.c:728
 msgid "Autocompletion Settings"
 msgstr "Einstellungen der Auto-Vervollständigung"
 
-#: addressbook/gui/component/addressbook-migrate.c:1076
+#: addressbook/gui/component/addressbook-migrate.c:1104
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -218,7 +190,7 @@ msgstr ""
 "\n"
 "Bitte haben Sie etwas Geduld. Evolution migriert Ihre Ordner..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1090
+#: addressbook/gui/component/addressbook-migrate.c:1118
 #, fuzzy
 msgid ""
 "The format of mailing list contacts has changed.\n"
@@ -230,7 +202,7 @@ msgstr ""
 "\n"
 "Bitte haben Sie etwas Geduld. Evolution migriert Ihre Ordner..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1099
+#: addressbook/gui/component/addressbook-migrate.c:1127
 #, fuzzy
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
@@ -242,7 +214,7 @@ msgstr ""
 "\n"
 "Bitte haben Sie etwas Geduld. Evolution migriert Ihre Ordner..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1109
+#: addressbook/gui/component/addressbook-migrate.c:1137
 #, fuzzy
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
@@ -254,41 +226,36 @@ msgstr ""
 "\n"
 "Bitte haben Sie etwas Geduld. Evolution migriert Ihre Ordner..."
 
-#: addressbook/gui/component/addressbook-view.c:674
+#: addressbook/gui/component/addressbook-view.c:675
 #, fuzzy, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 "Das Adressbuch »%s« wird hiermit entfernt. Sind Sie sicher, dass Sie "
 "fortfahren möchten?"
 
-#: addressbook/gui/component/addressbook-view.c:761
+#: addressbook/gui/component/addressbook-view.c:754
 #, fuzzy
 msgid "New Address Book"
 msgstr "Neues Adressbuch"
 
-#: addressbook/gui/component/addressbook-view.c:762
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
+#: addressbook/gui/component/addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Löschen"
 
-#: addressbook/gui/component/addressbook-view.c:763
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-view.c:756
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Eigenschaften..."
 
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/addressbook-view.c:1002
+#. Create the contacts group
+#: addressbook/gui/component/addressbook-view.c:995
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
 #: calendar/gui/migration.c:373
 msgid "Contacts"
 msgstr "Kontakte"
@@ -369,10 +336,6 @@ msgid "Manage your S/MIME certificates here"
 msgstr "Hier können Sie Ihre S/MIME-Zertifikate verwalten"
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-msgid "  S_how Supported Bases "
-msgstr "  Unterstützte Basen _anzeigen"
-
-#: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -387,206 +350,171 @@ msgstr "  Unterstützte Basen _anzeigen"
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1:00"
-msgstr "1:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
-msgstr "5:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "Legitimation"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
 #, fuzzy
 msgid "<b>Display</b>"
 msgstr "_Anzeigen"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 #, fuzzy
 msgid "<b>Downloading</b>"
 msgstr "<b>Verschicken von E-Mails:</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:10
 #, fuzzy
 msgid "<b>Searching</b>"
 msgstr "Suchen"
 
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
 msgid "<b>Server Information</b>"
 msgstr "Schritt 2: Server-Informationen"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
 msgid "<b>Type:</b>"
 msgstr "<b>Fällig:</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:13
 #, fuzzy
 msgid "Add Contacts Group"
 msgstr "_Kontakte:"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:14
 #, fuzzy
 msgid "Address Book Properties"
 msgstr "Adressbucheigenschaften"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
-#: mail/mail-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
+#: mail/mail-config.glade.h:42
 msgid "Always"
 msgstr "Immer"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr "Anonym"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:17
 #: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Grundlegend"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
-msgid "Connecting"
-msgstr "Verbindung wird hergestellt"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 #: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Details"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
-msgid "Distinguished _name:"
-msgstr "Eindeutiger _Name:"
-
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:19
 #, fuzzy
 msgid "Distinguished name"
 msgstr "Eindeutiger _Name:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:20
 #, fuzzy
 msgid "Download limit:"
 msgstr "_Download-Begrenzung:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Email address"
 msgstr "E-Mail-Adresse:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "Email address:"
-msgstr "E-Mail-Adresse:"
-
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "Evolution will use this DN to authenticate you with the server"
-msgstr ""
-"Evolution verwendet diesen eindeutigen Namen, um Sie beim Server zu "
-"legitimieren"
-
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:22
+#, fuzzy
 msgid ""
-"Evolution will use this email address to authenticate you with the server"
+"Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "Evolution verwendet diese E-Mail-Adresse, um Sie beim Server zu legitimieren"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:23
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Unterstützte Suchbasen"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:24
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
+#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Allgemein"
 
-#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
-#: mail/mail-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
+#: mail/mail-config.glade.h:102
 msgid "Never"
 msgstr "Nie"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
-msgid "One"
-msgstr "Eins"
-
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:35
-msgid "S_earch scope: "
-msgstr "Suchb_ereich: "
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Search _base:"
+msgstr "Suchbasis:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
 msgid "Search base only"
 msgstr "Suchbasis:"
 
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid "Search base:"
 msgstr "Suchbasis:"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Search scope:"
 msgstr "Suchb_ereich: "
 
-#: addressbook/gui/component/ldap-config.glade.h:39
-msgid "Searching"
-msgstr "Suchen"
-
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:31
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
-"server if\n"
-"your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL or TLS."
 msgstr ""
 "Wenn Sie diese Option auswählen, stellt Evolution nur dann eine Verbindung "
 "mit Ihrem\n"
 "LDAP-Server her, falls dieser SSL oder TLS unterstützt."
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a \n"
-"insecure environment. For example, if you and your LDAP server are behind a "
-"firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection "
-"is already\n"
-"secure."
+"you are in a insecure environment. For example, if you and your LDAP server "
+"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
+"because your connection is already secure."
 msgstr ""
 "Wenn Sie diese Option auswählen, wird Evolution nur in unsicheren Umgebungen "
 "versuchen,\n"
@@ -595,13 +523,12 @@ msgstr ""
 "Ihre Verbindung bereits\n"
 "sicher ist."
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:33
+#, fuzzy
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
-"TLS.  This \n"
-"means that your connection will be insecure, and that you will be vulnerable "
-"to security\n"
-"exploits. "
+"TLS.  This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits. "
 msgstr ""
 "Wenn Sie diese Option auswählen, bedeutet dass, dass Ihr Server kein SSL "
 "oder TLS\n"
@@ -609,38 +536,33 @@ msgstr ""
 "Sie anfällig\n"
 "für Sicherheitslücken sind. "
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Sub"
-msgstr "Sub"
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr "Unterstützte Suchbasen"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
-"searches will \n"
-"begin. If you leave this blank, the search will begin at the root of the "
-"directory tree."
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
 msgstr ""
 "Die Suchbasis ist der eindeutige Name (EN) des Eintrags, bei dem die Suche "
 "beginnt.\n"
 "Wenn Sie dieses Feld leer lassen, beginnt die Suche an der Wurzel des "
 "Verzeichnisbaums."
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:37
+#, fuzzy
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
-"the \n"
-"directory tree. A search scope of \"sub\" will include all entries below "
-"your search base.\n"
-"A search scope of \"one\" will only include the entries one level beneath "
-"your base.\n"
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
 msgstr ""
 "Der Suchbereich legt fest, wie tief Sie bei der Suche im Verzeichnisbaum "
 "absteigen\n"
@@ -649,7 +571,7 @@ msgstr ""
 "Der Suchbereich »one« hingegen schließt lediglich die Ebene unterhalb\n"
 "des Ausgangspunktes der Suche ein.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:58
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -657,17 +579,16 @@ msgstr ""
 "Dies ist der vollständige Name des LDAP-Servers. Zum Beispiel: »ldap."
 "meinefirma.de«."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:39
 #, fuzzy
 msgid ""
-"This is the maximum number of entries to download. Setting this number to "
-"be \n"
+"This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr ""
 "Dies ist die maximale Anzahl herunterzuladender Einträge. Wenn diese\n"
 "Zahl zu hoch angesetzt ist, werden Vorgänge im Adressbuch verlangsamt."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -677,142 +598,121 @@ msgstr ""
 "Beachten Sie, dass ein anonymer Zugriff auf den LDAP-Server erforderlich "
 "ist, wenn Sie dies auf »E-Mail-Adresse« einstellen."
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:41
+#, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
-"list.\n"
-"It is for display purposes only. "
+"list. It is for display purposes only. "
 msgstr ""
 "Dies ist der Name für diesen Server, der in der Ordnerliste von Evolution "
 "angezeigt wird.\n"
 "Er dient lediglich zu Anzeigezwecken. "
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:42
+#, fuzzy
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. "
-"A \n"
-"list of standard ports has been provided. Ask your system administrator\n"
-"what port you should specify."
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
 msgstr ""
 "Dies ist der Port des LDAP-Servers den Evolution zum Verbinden verwenden "
 "soll.\n"
 "Eine Liste der Standard-Ports wurde bereits angegeben. Fragen Sie\n"
 "Ihren Systemadministrator, welchen Port Sie angeben müssen."
 
-#: addressbook/gui/component/ldap-config.glade.h:67
-msgid "This option controls how long a search will be run."
-msgstr "Dies legt fest, wie lange eine Suche ausgeführt wird."
-
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:43
 #, fuzzy
 msgid "Timeout:"
 msgstr "Zeitformat:"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
-msgid "U_se SSL/TLS:"
-msgstr "_SSL/TSL verwenden:"
-
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr "Eindeutigen Namen (EN) verwenden"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr "E-Mail-Adresse verwenden"
 
-#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
-#: mail/mail-config.glade.h:154
+#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
+#: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr "Immer, wenn möglich"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:47
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "_Kontakte:"
 
-#: addressbook/gui/component/ldap-config.glade.h:74
-#: calendar/gui/dialogs/calendar-setup.glade.h:12
-msgid "_Display name:"
-msgstr "Angezeigter _Name:"
-
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr "_Download-Begrenzung:"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
 msgid "_Email address:"
 msgstr "E-Mail-Adresse:"
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:50
+#, fuzzy
+msgid "_Find Possible Search Bases"
+msgstr "Unterstützte Suchbasen"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Log in method:"
 msgstr "_Anmeldemethode:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "_Log in:"
+msgstr "Anmelden"
+
+#: addressbook/gui/component/ldap-config.glade.h:53
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
 msgid "_Name:"
 msgstr "_Name:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
-msgid "_Port number:"
-msgstr "_Port-Nummer:"
-
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "_Port:"
 msgstr "_Priorität:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
-msgid "_Search base:"
-msgstr "Such_basis:"
-
-#: addressbook/gui/component/ldap-config.glade.h:82
-msgid "_Server name:"
-msgstr "_Servername:"
+#: addressbook/gui/component/ldap-config.glade.h:55
+#, fuzzy
+msgid "_Search scope:"
+msgstr "Suchb_ereich: "
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:56
 #, fuzzy
 msgid "_Server:"
 msgstr "_Server:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
-msgid "_Timeout (minutes):"
-msgstr "_Zeitüberschreitung (Minuten):"
+#: addressbook/gui/component/ldap-config.glade.h:57
+#, fuzzy
+msgid "_Timeout:"
+msgstr "Zeitformat:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:58
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "Sichere Verbindung (_SSL) verwenden:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "Karten"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
-msgid "connecting-tab"
-msgstr "connecting-tab"
-
-#: addressbook/gui/component/ldap-config.glade.h:88
-msgid "general-tab"
-msgstr "general-tab"
-
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:60
 #: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
-#: mail/mail-config.glade.h:182
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "Minuten"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
-msgid "searching-tab"
-msgstr "searching-tab"
-
-#: addressbook/gui/component/select-names/e-select-names.c:497
+#: addressbook/gui/component/select-names/e-select-names.c:503
 #: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid "Select Contacts from Address Book"
 msgstr "Kontakte aus dem Adressbuch wählen"
 
-#: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
@@ -852,7 +752,7 @@ msgstr "Namenloser Kontakt"
 
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:222
+#: addressbook/gui/widgets/e-addressbook-view.c:224
 msgid "Source"
 msgstr "Quelle"
 
@@ -925,9 +825,9 @@ msgid "<b>Work</b>"
 msgstr "<b>Fällig:</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
-#: addressbook/gui/widgets/eab-contact-display.c:342
-#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/widgets/eab-contact-display.c:334
+#: addressbook/gui/widgets/eab-contact-display.c:353
 msgid "AIM"
 msgstr "AIM"
 
@@ -967,15 +867,15 @@ msgid "Company:"
 msgstr "Befehl:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:271
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
+#: addressbook/gui/contact-editor/e-contact-editor.c:266
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
 msgstr "Kontakt"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1527
+#: addressbook/gui/contact-editor/e-contact-editor.c:520
 msgid "Contact Editor"
 msgstr "Kontakteditor"
 
@@ -999,84 +899,80 @@ msgid "Full _Name..."
 msgstr "_Voller Name..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:202
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-msgid "Home"
-msgstr "Privat"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #, fuzzy
 msgid "Home Page:"
 msgstr "Homepage"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-#, fuzzy
-msgid "Job title:"
-msgstr "_Tätigkeit:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/e-itip-control.c:936
-msgid "Location:"
-msgstr "Standort:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN-Messenger"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 #, fuzzy
 msgid "Mailing Address"
 msgstr "E-Mail-Adresse"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 #, fuzzy
 msgid "Manager:"
 msgstr "Vorgesetzter"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "S_pitzname:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Notes:"
 msgstr "_Notizen:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 #, fuzzy
 msgid "Novell Groupwise"
 msgstr "Novell GroupWise"
 
-# CHECK
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
-#: addressbook/gui/contact-editor/e-contact-editor.c:203
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-msgid "Other"
-msgstr "Weitere"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#, fuzzy
+msgid "Office:"
+msgstr "_Büro:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "PO Box:"
 msgstr "_Postfach:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 #, fuzzy
 msgid "Personal Information"
 msgstr "Optionale Informationen"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 #, fuzzy
 msgid "Profession:"
 msgstr "B_eruf:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#, fuzzy
+msgid "Spouse:"
+msgstr "E_hepartner:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "State/Province:"
 msgstr "_Bundesstaat/Provinz:"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#, fuzzy
+msgid "Title:"
+msgstr "Titel:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+msgid "Video Chat:"
+msgstr ""
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:41
 #, fuzzy
 msgid "Wants to receive HTML mail"
@@ -1084,15 +980,15 @@ msgstr "Wünscht _HTML-E-Mails"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:42
 #, fuzzy
-msgid "Webcam:"
-msgstr "Website:"
+msgid "Web Log:"
+msgstr "_Website:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
-#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
-#: mail/mail-config.glade.h:155
+#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
+#: mail/mail-config.glade.h:157
 msgid "Work"
 msgstr "Geschäftlich"
 
@@ -1112,19 +1008,12 @@ msgid "_File under:"
 msgstr "Dateiname:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 #, fuzzy
 msgid "_Where:"
 msgstr "_Server:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
-msgid "item7"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
-msgid "item8"
-msgstr ""
-
-#: addressbook/gui/contact-editor/eab-editor.c:316
+#: addressbook/gui/contact-editor/eab-editor.c:315
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -1132,7 +1021,7 @@ msgstr ""
 "Sind Sie sicher, dass Sie\n"
 "diese Kontakte löschen wollen?"
 
-#: addressbook/gui/contact-editor/eab-editor.c:319
+#: addressbook/gui/contact-editor/eab-editor.c:318
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -1141,16 +1030,16 @@ msgstr ""
 "diesen Kontakt löschen wollen?"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:351
-#: addressbook/gui/widgets/eab-contact-display.c:372
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Address"
 msgstr "Adresse"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:292
+#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard.c:174
@@ -2129,87 +2018,112 @@ msgstr "Sambia"
 msgid "Zimbabwe"
 msgstr "Simbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/contact-editor/e-contact-editor.c:179
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:337
+#: addressbook/gui/widgets/eab-contact-display.c:356
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:347
-#: addressbook/gui/widgets/eab-contact-display.c:366
+#: addressbook/gui/contact-editor/e-contact-editor.c:180
+#: addressbook/gui/widgets/eab-contact-display.c:339
+#: addressbook/gui/widgets/eab-contact-display.c:358
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: addressbook/gui/widgets/eab-contact-display.c:338
+#: addressbook/gui/widgets/eab-contact-display.c:357
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:344
-#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#: addressbook/gui/widgets/eab-contact-display.c:355
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/contact-editor/e-contact-editor.c:183
 #, fuzzy
 msgid "GroupWise"
 msgstr "Novell GroupWise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+msgid "Home"
+msgstr "Privat"
+
+# CHECK
+#: addressbook/gui/contact-editor/e-contact-editor.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+msgid "Other"
+msgstr "Weitere"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
 msgid "Source Book"
 msgstr "Quellbuch"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:264
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Target Book"
 msgstr "Zielbuch"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:278
+#: addressbook/gui/contact-editor/e-contact-editor.c:273
 msgid "Is New Contact"
 msgstr "Ist neuer Kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:285
+#: addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Writable Fields"
 msgstr "Beschreibbare Felder"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:299
+#: addressbook/gui/contact-editor/e-contact-editor.c:294
 msgid "Changed"
 msgstr "Geändert"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
-msgid "Category editor not available."
-msgstr "Der Kategorieeditor ist nicht verfügbar."
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:2352
 msgid "This contact belongs to these categories:"
 msgstr "Dieser Kontakt gehört in folgende Kategorien:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#: addressbook/gui/contact-editor/e-contact-editor.c:2429
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Bitte wählen Sie aus den folgenden Optionen"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#: addressbook/gui/contact-editor/e-contact-editor.c:2433
 #, fuzzy
 msgid "No image"
 msgstr "Niger"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#: addressbook/gui/contact-editor/e-contact-editor.c:2636
 #, fuzzy
 msgid ""
-"The following entries are invalid:\n"
+"The contact data is invalid:\n"
 "\n"
-msgstr "Die folgenden Verbindungen sind zur Zeit aktiv:"
+msgstr "Das Wiederholungsdatum ist ungültig"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2738
-#, c-format
-msgid "Could not find widget for a field: `%s'"
-msgstr "Widget für ein Feld konnte nicht gefunden werden: »%s«"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#, fuzzy
+msgid "Invalid contact."
+msgstr "%d Kontakte"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+msgid ""
+"The contact cannot be saved to the selected address book. Do you want to "
+"discard changes?"
+msgstr ""
+
+# CHECK
+#: addressbook/gui/contact-editor/e-contact-editor.c:2727
+#: addressbook/gui/contact-editor/e-contact-editor.c:2751
+msgid "_Discard"
+msgstr "_Verwerfen"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+msgid ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
+msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:62
 msgid "AOL Instant Messenger"
@@ -2242,7 +2156,7 @@ msgid "_Edit Full"
 msgstr "Voll _bearbeiten"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:166
 msgid "_Full Name:"
 msgstr "_Voller Name:"
 
@@ -2392,30 +2306,30 @@ msgstr ""
 "_Geben Sie eine E-Mail-Adresse ein oder ziehen Sie einen Kontakt auf die "
 "untenstehende Liste:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "contact-list-editor"
 msgstr "contact-list-editor"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:153
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:215
+#: addressbook/gui/widgets/e-addressbook-view.c:217
 #: addressbook/gui/widgets/e-minicard-view.c:460
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Buch"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
 msgid "Is New List"
 msgstr "Ist neue Liste"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:215
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
 msgid "Contact List Editor"
 msgstr "Kontaktlisteneditor"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:438
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
 msgid "Save List as VCard"
 msgstr "Liste als VCard speichern"
 
@@ -2463,125 +2377,125 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Komplexe Suche"
 
-#: addressbook/gui/widgets/eab-contact-display.c:129
-#: addressbook/gui/widgets/eab-contact-display.c:192
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:139
-#: addressbook/gui/widgets/eab-contact-display.c:205
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:257
-#: addressbook/gui/widgets/eab-contact-display.c:533
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:525
 msgid "List Members"
 msgstr "Listenmitglieder"
 
-#: addressbook/gui/widgets/eab-contact-display.c:329
-#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/eab-contact-display.c:321
+#: addressbook/gui/widgets/eab-contact-display.c:323
 #, fuzzy
 msgid "E-mail"
 msgstr "E-Mail"
 
-#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/eab-contact-display.c:332
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organisation"
 
-#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:333
 #, fuzzy
 msgid "Position"
 msgstr "Beschreibung"
 
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:354
 #, fuzzy
 msgid "Groupwise"
 msgstr "Gruppe"
 
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:340
 #, fuzzy
 msgid "Video Conferencing"
 msgstr "V_ideokonforenz-URL:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:349
-#: addressbook/gui/widgets/eab-contact-display.c:370
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:362
 #, fuzzy
 msgid "Phone"
 msgstr "Autotelefon"
 
-#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:342
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:354
+#: addressbook/gui/widgets/eab-contact-display.c:346
 #, fuzzy
 msgid "work"
 msgstr "Geschäftlich"
 
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:359
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:368
-#: addressbook/gui/widgets/eab-contact-display.c:587
+#: addressbook/gui/widgets/eab-contact-display.c:360
+#: addressbook/gui/widgets/eab-contact-display.c:579
 msgid "Blog"
 msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/eab-contact-display.c:363
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: addressbook/gui/widgets/eab-contact-display.c:375
+#: addressbook/gui/widgets/eab-contact-display.c:367
 #, fuzzy
 msgid "personal"
 msgstr "Persönlich"
 
-#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/eab-contact-display.c:374
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Notiz"
 
-#: addressbook/gui/widgets/eab-contact-display.c:548
+#: addressbook/gui/widgets/eab-contact-display.c:540
 msgid "Job Title"
 msgstr "Tätigkeit"
 
-#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/eab-contact-display.c:544
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:774
+#: smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "E-Mail"
 
-#: addressbook/gui/widgets/eab-contact-display.c:579
+#: addressbook/gui/widgets/eab-contact-display.c:571
 msgid "Home page"
 msgstr "Homepage"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 msgid "Success"
 msgstr "Erfolg"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Backend busy"
 msgstr ""
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Repository offline"
 msgstr "Repository offline"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 #, fuzzy
 msgid "Address Book does not exist"
 msgstr "Adressbuch existiert nicht"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 #, fuzzy
 msgid "No Self Contact defined"
 msgstr "Neue Kontaktliste"
@@ -2589,27 +2503,27 @@ msgstr "Neue Kontaktliste"
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Permission denied"
 msgstr "Erlaubnis verweigert"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Contact not found"
 msgstr "Kontakt nicht gefunden"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Contact ID already exists"
 msgstr "Kontaktkennung existiert bereits"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Protocol not supported"
 msgstr "Protokoll nicht unterstützt"
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:60
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:233
 #: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
@@ -2622,39 +2536,39 @@ msgid "Cancelled"
 msgstr "Abgesagt"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:61
 #, fuzzy
 msgid "Could not cancel"
 msgstr "»%s« konnte nicht geöffnet werden: %s"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Authentication Failed"
 msgstr "Legitimation gescheitert"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Authentication Required"
 msgstr "Legitimation erforderlich"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:66
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "TLS not Available"
 msgstr "TLS nicht verfügbar"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#: addressbook/gui/widgets/eab-gui-util.c:66
 #, fuzzy
 msgid "No such source"
 msgstr "Nachricht existiert nicht"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:69
+#: addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Other error"
 msgstr "Anderer Fehler"
 
-#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:90
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
@@ -2662,7 +2576,7 @@ msgstr ""
 "Dieses Adressbuch konnte nicht geöffnet werden. Bitte überprüfen Sie, ob der "
 "Pfad existiert und Sie darauf zugreifen dürfen."
 
-#: addressbook/gui/widgets/eab-gui-util.c:110
+#: addressbook/gui/widgets/eab-gui-util.c:97
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -2671,18 +2585,19 @@ msgstr ""
 "Sie eine falschen URI eingegeben haben, oder dass der LDAP-Server nicht "
 "erreichbar ist."
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:102
+#, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution you must compile the program from the CVS "
-"sources after retrieving OpenLDAP from the link below."
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
 msgstr ""
 "In diese Evolution-Version wurde keine LDAP-Unterstützung einkompiliert. "
 "Wenn Sie LDAP in Evolution verwenden wollen, müssen Sie das Programm aus dem "
 "CVS-Quelltext kompilieren, nachdem Sie sich von untenstehendem Link OpenLDAP "
 "besorgt haben."
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:109
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -2691,11 +2606,7 @@ msgstr ""
 "Sie eine falsche URI eingegeben haben, oder dass der Server nicht erreichbar "
 "ist."
 
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "Unable to open addressbook"
-msgstr "Das Adressbuch konnte nicht geöffnet werden"
-
-#: addressbook/gui/widgets/eab-gui-util.c:162
+#: addressbook/gui/widgets/eab-gui-util.c:129
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2707,7 +2618,7 @@ msgstr ""
 "oder erhöhen Sie das Zeitlimit in den Einstellungen des\n"
 "Verzeichnis-Servers für dieses Adressbuch."
 
-#: addressbook/gui/widgets/eab-gui-util.c:168
+#: addressbook/gui/widgets/eab-gui-util.c:135
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -2719,58 +2630,49 @@ msgstr ""
 "Bitte präzisieren Sie Ihre Suche oder erhöhen Sie das Zeitlimit in den\n"
 "Einstellungen des Verzeichnis-Servers für dieses Adressbuch."
 
-#: addressbook/gui/widgets/eab-gui-util.c:174
+#: addressbook/gui/widgets/eab-gui-util.c:141
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 "Die Hintergrundkomponente für dieses Adressbuch konnte die Syntax dieser "
 "Abfrage nicht analysieren."
 
-#: addressbook/gui/widgets/eab-gui-util.c:177
+#: addressbook/gui/widgets/eab-gui-util.c:144
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 "Die Hintergrundkomponente für dieses Adressbuch konnte diese Abfrage nicht "
 "ausführen."
 
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:147
 msgid "This query did not complete successfully."
 msgstr "Diese Abfrage konnte nicht erfolgreich ausgeführt werden"
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
-msgid "Do you want to save changes?"
-msgstr "Wollen Sie die Änderungen speichern?"
-
-# CHECK
-#: addressbook/gui/widgets/eab-gui-util.c:208
-msgid "_Discard"
-msgstr "_Verwerfen"
-
-#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:169
 msgid "Error adding list"
 msgstr "Fehler beim Hinzufügen einer Liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:229
-#: addressbook/gui/widgets/eab-gui-util.c:652
+#: addressbook/gui/widgets/eab-gui-util.c:169
+#: addressbook/gui/widgets/eab-gui-util.c:580
 msgid "Error adding contact"
 msgstr "Fehler beim Hinzufügen eines Kontakts"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying list"
 msgstr "Fehler beim Ändern einer Liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying contact"
 msgstr "Fehler beim Ändern eines Kontakts"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:192
 msgid "Error removing list"
 msgstr "Fehler beim Entfernen einer Liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
-#: addressbook/gui/widgets/eab-gui-util.c:610
+#: addressbook/gui/widgets/eab-gui-util.c:192
+#: addressbook/gui/widgets/eab-gui-util.c:538
 msgid "Error removing contact"
 msgstr "Fehler beim Entfernen eines Kontakts"
 
-#: addressbook/gui/widgets/eab-gui-util.c:334
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2781,7 +2683,7 @@ msgstr ""
 "Wollen Sie wirklich all diese Kontakte anzeigen?"
 
 # CHECK der Kontakt -> diesen?
-#: addressbook/gui/widgets/eab-gui-util.c:360
+#: addressbook/gui/widgets/eab-gui-util.c:300
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2790,50 +2692,45 @@ msgstr ""
 "%s existiert bereits\n"
 "Möchten Sie diesen überschreiben?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:364
+#: addressbook/gui/widgets/eab-gui-util.c:304
 msgid "Overwrite"
 msgstr "Überschreiben"
 
-#: addressbook/gui/widgets/eab-gui-util.c:400
-#, c-format
-msgid "Error saving %s: %s"
-msgstr "Fehler beim Speichern von %s: %s"
-
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:437
+#: addressbook/gui/widgets/eab-gui-util.c:365
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:571
+#: addressbook/gui/widgets/eab-gui-util.c:499
 msgid "list"
 msgstr "Liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:706
+#: addressbook/gui/widgets/eab-gui-util.c:634
 msgid "Move contact to"
 msgstr "Kontakt verschieben nach"
 
-#: addressbook/gui/widgets/eab-gui-util.c:708
+#: addressbook/gui/widgets/eab-gui-util.c:636
 msgid "Copy contact to"
 msgstr "Kontakt kopieren nach"
 
-#: addressbook/gui/widgets/eab-gui-util.c:711
+#: addressbook/gui/widgets/eab-gui-util.c:639
 msgid "Move contacts to"
 msgstr "Kontakt verschieben nach"
 
-#: addressbook/gui/widgets/eab-gui-util.c:713
+#: addressbook/gui/widgets/eab-gui-util.c:641
 msgid "Copy contacts to"
 msgstr "Kontakte kopieren nach"
 
-#: addressbook/gui/widgets/eab-gui-util.c:716
+#: addressbook/gui/widgets/eab-gui-util.c:644
 #, fuzzy
 msgid "Select target addressbook."
 msgstr "Kontakte aus dem Adressbuch wählen"
 
-#: addressbook/gui/widgets/eab-gui-util.c:939
+#: addressbook/gui/widgets/eab-gui-util.c:867
 msgid "Multiple VCards"
 msgstr "Mehrere VCards"
 
-#: addressbook/gui/widgets/eab-gui-util.c:942
+#: addressbook/gui/widgets/eab-gui-util.c:870
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard für %s"
@@ -2921,7 +2818,7 @@ msgstr[1] "%d Kontakte"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:229
+#: addressbook/gui/widgets/e-addressbook-view.c:231
 #: addressbook/gui/widgets/e-minicard-view.c:467
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
@@ -2939,146 +2836,134 @@ msgstr "Modell"
 msgid "Error modifying card"
 msgstr "Fehler beim Ändern einer Karte"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:163
 msgid "Name begins with"
 msgstr "Name beginnt mit"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:164
 msgid "Email begins with"
 msgstr "E-Mail-Adresse beginnt mit"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:57
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Kategorie ist"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-#: calendar/gui/cal-search-bar.c:50
+#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Ein beliebiges Feld enthält"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+#: addressbook/gui/widgets/e-addressbook-view.c:172
 msgid "Advanced..."
 msgstr "Komplex..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:236
+#: addressbook/gui/widgets/e-addressbook-view.c:238
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:249
+#: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Typ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:506
+#: addressbook/gui/widgets/e-addressbook-view.c:508
 msgid "Address Book"
 msgstr "Adressbuch"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2076
+#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:2080
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
 msgstr "Als VCard speichern"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 msgid "New Contact..."
 msgstr "Neuer Kontakt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "New Contact List..."
 msgstr "Neue Kontaktliste..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Go to Folder..."
 msgstr "Gehe zu Ordner..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Import..."
 msgstr "Importvorgang..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1066
 msgid "Search for Contacts..."
 msgstr "Nach Kontakten suchen..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Adressbuchquellen..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1069
 msgid "Pilot Settings..."
 msgstr "Pilot-Einstellungen..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Kontakt weiterleiten"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
 msgid "Send Message to Contact"
 msgstr "Nachricht an Kontakt schicken"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Drucken"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
+#: addressbook/gui/widgets/e-addressbook-view.c:1077
 msgid "Print Envelope"
 msgstr "Umschlag drucken"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
+#: addressbook/gui/widgets/e-addressbook-view.c:1081
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Adressbuch..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1080
+#: addressbook/gui/widgets/e-addressbook-view.c:1082
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Adressbuch..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Ausschneiden"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopieren"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1087
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Einfügen"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:1092
+#: calendar/gui/e-calendar-view.c:1280
 msgid "Current View"
 msgstr "Aktuelle Ansicht"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1309
-#, c-format
-msgid ""
-"The addressbook backend for\n"
-"%s\n"
-"has crashed. You will have to restart Evolution in order to use it again"
-msgstr ""
-"Die Adressbuch-Hintergrundkomponente für\n"
-"%s\n"
-"ist abgestürzt. Sie müssen Evolution neustarten, um sie wieder verwenden zu "
-"können"
-
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1667
-#: calendar/gui/cal-search-bar.c:362
+#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Beliebige Kategorie"
 
@@ -3184,7 +3069,7 @@ msgstr "Funk"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-list-view.c:234
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Position"
@@ -3330,12 +3215,12 @@ msgstr "Evolution-vCalendar-Importeur"
 msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.c:998
+#: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr "Kontakte drucken"
 
-#: addressbook/printing/e-contact-print.c:1064
-#: addressbook/printing/e-contact-print.c:1091
+#: addressbook/printing/e-contact-print.c:1066
+#: addressbook/printing/e-contact-print.c:1093
 msgid "Print contact"
 msgstr "Kontakt drucken"
 
@@ -3585,15 +3470,21 @@ msgstr "Im normalen Modus müssen Sie die Größe nicht angeben."
 msgid "Impossible internal error."
 msgstr "Unmöglicher interner Fehler."
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:629
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
 msgid "Can not open file"
 msgstr "Datei konnte nicht geöffnet werden"
 
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-msgid "Can not load URI"
-msgstr "URI konnte nicht geladen werden"
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "Adressbuch konnte nicht geladen werden"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Das Adressbuch konnte nicht geöffnet werden"
 
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
@@ -3611,7 +3502,7 @@ msgstr "Kein Dateiname angegeben."
 msgid "Unnamed List"
 msgstr "Namenlose Liste"
 
-#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Passwort eingeben"
@@ -3891,10 +3782,10 @@ msgid "Whether to show week numbers in date navigator"
 msgstr "Wochennummern im Datumsnavigator anzeigen"
 
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:88
-#: calendar/gui/gnome-cal.c:1703
-#: camel/providers/groupwise/camel-gw-listener.c:304
-#: camel/providers/groupwise/camel-gw-listener.c:327
+#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/gnome-cal.c:1705
+#: camel/providers/groupwise/camel-gw-listener.c:311
+#: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
 msgstr "Kalender"
 
@@ -3913,7 +3804,7 @@ msgstr "Ereignisse löschen älter als"
 
 #: calendar/gui/calendar-commands.c:363
 #: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:19 filter/filter.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
 msgid "days"
 msgstr "Tage"
 
@@ -4062,25 +3953,25 @@ msgstr "Wochenansicht"
 msgid "Month View"
 msgstr "Monatsansicht"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Zusammenfassung enthält"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Beschreibung enthält"
 
-#: calendar/gui/cal-search-bar.c:54
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Kommentar enthält"
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:53
 #, fuzzy
 msgid "Location contains"
 msgstr "Beschreibung enthält"
 
 # CHECK
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
 msgid "Unmatched"
 msgstr "Nicht einsortiert"
 
@@ -4101,23 +3992,23 @@ msgstr "Erlaubnis zum Öffnen des Kalenders verweigert"
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/dialogs/alarm-options.c:466
+#: calendar/gui/dialogs/alarm-options.c:467
 msgid "Audio Alarm Options"
 msgstr "Audio-Alarmeinstellungen"
 
-#: calendar/gui/dialogs/alarm-options.c:475
+#: calendar/gui/dialogs/alarm-options.c:476
 msgid "Message Alarm Options"
 msgstr "Alarmeinstellungen der Nachricht"
 
-#: calendar/gui/dialogs/alarm-options.c:484
+#: calendar/gui/dialogs/alarm-options.c:485
 msgid "Email Alarm Options"
 msgstr "E-Mail-Alarmeinstellungen"
 
-#: calendar/gui/dialogs/alarm-options.c:493
+#: calendar/gui/dialogs/alarm-options.c:494
 msgid "Program Alarm Options"
 msgstr "Alarmeinstellungen des Programms"
 
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:510
 msgid "Unknown Alarm Options"
 msgstr "Unbekannte Alarmeinstellungen"
 
@@ -4153,7 +4044,7 @@ msgstr "Schicken an:"
 msgid "With these arguments:"
 msgstr "Mit diesen Argumenten:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
 msgid "dialog1"
 msgstr "Dialog1"
 
@@ -4162,7 +4053,7 @@ msgid "extra times every"
 msgstr "weitere Male alle"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:20 filter/filter.glade.h:16
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr "Stunden"
 
@@ -4208,7 +4099,7 @@ msgstr "Eine E-Mail verschicken"
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Zusammenfassung:"
 
@@ -4238,7 +4129,6 @@ msgid "hour(s)"
 msgstr "Stunde(n)"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:21
 msgid "minute(s)"
 msgstr "Minute(n)"
 
@@ -4246,27 +4136,27 @@ msgstr "Minute(n)"
 msgid "start of appointment"
 msgstr "Beginn des Termins"
 
-#: calendar/gui/dialogs/calendar-setup.c:170
+#: calendar/gui/dialogs/calendar-setup.c:172
 msgid "You must specify a location to get the calendar from."
 msgstr ""
 "Sie müssen einen Ort angeben, von dem der Kalender abgerufen werden soll."
 
-#: calendar/gui/dialogs/calendar-setup.c:178
+#: calendar/gui/dialogs/calendar-setup.c:180
 #, c-format
 msgid "The source location '%s' is not well-formed."
 msgstr "Der Quellort »%s« ist nicht wohlgeformt."
 
-#: calendar/gui/dialogs/calendar-setup.c:193
+#: calendar/gui/dialogs/calendar-setup.c:195
 #, c-format
 msgid "The source location '%s' is not a webcal source."
 msgstr "Der Quellord »%s« ist keine Webcal-Quelle."
 
-#: calendar/gui/dialogs/calendar-setup.c:265
+#: calendar/gui/dialogs/calendar-setup.c:275
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr "In der gewählten Gruppe existiert bereits eine Quelle mit Namen »%s«"
 
-#: calendar/gui/dialogs/calendar-setup.c:278
+#: calendar/gui/dialogs/calendar-setup.c:288
 #, c-format
 msgid ""
 "The group '%s' is remote. You must specify a location to get the calendar "
@@ -4290,56 +4180,36 @@ msgstr "Aufgabenlistengruppe"
 msgid "C_olor:"
 msgstr "_Farben"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "Calendar Properties"
-msgstr "Kalendereigenschaften"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
 msgid "Pick a color"
 msgstr "Eine Farbe auswählen"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:8
-msgid "Remote"
-msgstr "Entfernt"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "Task List Properties"
-msgstr "Aufgabenlisteneigenschaften"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
 #, fuzzy
 msgid "_Add Calendar"
 msgstr "Neuen Kalender hinzufügen"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
 #, fuzzy
 msgid "_Add Group"
 msgstr "Gruppe _hinzufügen..."
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-msgid "_Refresh Interval:"
-msgstr "_Auffrischintervall:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
 #, fuzzy
 msgid "_Refresh:"
 msgstr "Auffrischen"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-msgid "_Source URL:"
-msgstr "_Quell-URL:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
 #, fuzzy
 msgid "_Type:"
 msgstr "Typ:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
 #, fuzzy
 msgid "_URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
 msgid "weeks"
 msgstr "Wochen"
 
@@ -4447,7 +4317,7 @@ msgid "Display"
 msgstr "_Anzeigen"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:76
 msgid "E_nable"
 msgstr "_Aktivieren"
 
@@ -4458,7 +4328,7 @@ msgstr "_Verfügbarkeitsinformationen"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:563
+#: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Freitag"
 
@@ -4472,7 +4342,7 @@ msgstr "Minuten"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:559
+#: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Montag"
 
@@ -4482,7 +4352,7 @@ msgstr "_So"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:564
+#: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Samstag"
 
@@ -4496,7 +4366,7 @@ msgstr "_Wochennummern im Datumsnavigator anzeigen"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Sonntag"
 
@@ -4510,7 +4380,7 @@ msgstr "D_o"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:562
+#: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Donnerstag"
 
@@ -4524,7 +4394,7 @@ msgstr "Zeitformat:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:560
+#: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Dienstag"
 
@@ -4534,7 +4404,7 @@ msgstr "W_oche beginnt:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:561
+#: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Mittwoch"
 
@@ -4567,7 +4437,7 @@ msgid "_Day begins:"
 msgstr "_Tag beginnt:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
-#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:43
@@ -4616,88 +4486,50 @@ msgstr "M_i"
 msgid "before every appointment"
 msgstr "vor jedem Termin"
 
-#: calendar/gui/dialogs/cancel-comp.c:57
-msgid ""
-"The event being deleted is a meeting, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"Das zu löschende Ereignis ist eine Besprechung. Soll eine Absagenachricht an "
-"die betroffene(n) Person(en) verschickt werden?"
-
-#: calendar/gui/dialogs/cancel-comp.c:60
-msgid "Are you sure you want to cancel and delete this meeting?"
-msgstr ""
-"Sind Sie sicher, dass Sie diese Besprechung absagen und löschen wollen?"
-
-#: calendar/gui/dialogs/cancel-comp.c:66
-msgid ""
-"The task being deleted is assigned, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"Die zu löschende Aufgabe wurde bereits jemandem zugewiesen. Soll eine "
-"Absagenachricht an die betroffene(n) Person(en) verschickt werden?"
-
-#: calendar/gui/dialogs/cancel-comp.c:69
-msgid "Are you sure you want to cancel and delete this task?"
-msgstr "Sind Sie sicher, dass Sie diese Aufgabe absagen und löschen wollen?"
-
-#: calendar/gui/dialogs/cancel-comp.c:75
-msgid ""
-"The journal entry being deleted is published, would you like to send a "
-"cancellation notice?"
-msgstr ""
-"Der zu löschende Journaleintrag wurde bereits veröffentlicht. Soll eine "
-"Absagenachricht verschickt werden?"
-
-#: calendar/gui/dialogs/cancel-comp.c:78
-msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr ""
-"Sind Sie sicher, dass Sie diesen Journaleintrag absagen und löschen wollen?"
-
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Dieses Ereignis wurde gelöscht."
 
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "Diese Aufgabe wurde gelöscht."
 
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:68
 msgid "This journal entry has been deleted."
 msgstr "Dieser Journaleintrag wurde gelöscht."
 
-#: calendar/gui/dialogs/changed-comp.c:75
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  Sie haben Änderungen vorgenommen. Diese verwerfen und den Editor "
 "schließen?"
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Sie haben keine Änderungen vorgenommen, den Editor schließen?"
 
-#: calendar/gui/dialogs/changed-comp.c:82
+#: calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "Dieses Ereignis wurde geändert."
 
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "Diese Aufgabe wurde geändert."
 
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:92
 msgid "This journal entry has been changed."
 msgstr "Dieser Journaleintrag wurde geändert."
 
-#: calendar/gui/dialogs/changed-comp.c:99
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Sie haben Änderungen vorgenommen. Diese verwerfen und den Editor "
 "aktualisieren?"
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Sie haben keine Änderungen vorgenommen, den Editor aktualisieren?"
@@ -4735,7 +4567,7 @@ msgid "No summary"
 msgstr "Keine Zusammenfassung"
 
 #: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
 #: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Speichern unter..."
@@ -4791,108 +4623,59 @@ msgstr "Zielordner"
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:95
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "Sind Sie sicher, dass Sie den Termin »%s« löschen wollen?"
-
-#: calendar/gui/dialogs/delete-comp.c:98
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "Sind Sie sicher, dass Sie diesen unbenannten Termin löschen wollen?"
-
-#: calendar/gui/dialogs/delete-comp.c:104
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "Sind Sie sicher, dass Sie die Aufgabe »%s« löschen wollen?"
-
-#: calendar/gui/dialogs/delete-comp.c:107
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "Sind Sie sicher, dass Sie diese unbenannte Aufgabe löschen wollen?"
-
-#: calendar/gui/dialogs/delete-comp.c:113
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "Sind Sie sicher, dass Sie den Journaleintrag »%s« löschen wollen?"
-
-#: calendar/gui/dialogs/delete-comp.c:116
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr ""
-"Sind Sie sicher, dass Sie diesen unbenannten Journaleintrag löschen wollen?"
-
-#: calendar/gui/dialogs/delete-comp.c:131
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d appointment?"
-msgid_plural "Are you sure you want to delete %d appointments?"
-msgstr[0] "Sind Sie sicher, dass Sie %d Termine löschen wollen?"
-msgstr[1] "Sind Sie sicher, dass Sie %d Termine löschen wollen?"
-
-#: calendar/gui/dialogs/delete-comp.c:138
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d task?"
-msgid_plural "Are you sure you want to delete %d tasks?"
-msgstr[0] "Sind Sie sicher, dass Sie %d Aufgaben löschen wollen?"
-msgstr[1] "Sind Sie sicher, dass Sie %d Aufgaben löschen wollen?"
-
-#: calendar/gui/dialogs/delete-comp.c:145
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d journal entry?"
-msgid_plural "Are you sure you want to delete %d journal entries?"
-msgstr[0] "Sind Sie sicher, dass Sie %d Journaleinträge löschen wollen?"
-msgstr[1] "Sind Sie sicher, dass Sie %d Journaleinträge löschen wollen?"
-
-#: calendar/gui/dialogs/delete-error.c:52
+#: calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr ""
 "Das Ereignis konnte auf Grund eines Corba-Fehlers nicht gelöscht werden"
 
-#: calendar/gui/dialogs/delete-error.c:55
+#: calendar/gui/dialogs/delete-error.c:57
 msgid "The task could not be deleted due to a corba error"
 msgstr "Die Aufgabe konnte auf Grund eines Corba-Fehlers nicht gelöscht werden"
 
-#: calendar/gui/dialogs/delete-error.c:58
+#: calendar/gui/dialogs/delete-error.c:60
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr ""
 "Der Journaleintrag konnte auf Grund eines Corba-Fehlers nicht gelöscht werden"
 
-#: calendar/gui/dialogs/delete-error.c:61
+#: calendar/gui/dialogs/delete-error.c:63
 msgid "The item could not be deleted due to a corba error"
 msgstr "Das Objekt konnte auf Grund eines Corba-Fehlers nicht gelöscht werden"
 
-#: calendar/gui/dialogs/delete-error.c:68
+#: calendar/gui/dialogs/delete-error.c:70
 msgid "The event could not be deleted because permission was denied"
 msgstr ""
 "Das Ereignis konnte nicht gelöscht werden, da der Zugriff verweigert wurde"
 
-#: calendar/gui/dialogs/delete-error.c:71
+#: calendar/gui/dialogs/delete-error.c:73
 msgid "The task could not be deleted because permission was denied"
 msgstr ""
 "Die Aufgabe konnte nicht gelöscht werden, da der Zugriff verweigert wurde"
 
-#: calendar/gui/dialogs/delete-error.c:74
+#: calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr ""
 "Der Journaleintrag konnte nicht gelöscht werden, da der Zugriff verweigert "
 "wurde"
 
-#: calendar/gui/dialogs/delete-error.c:77
+#: calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
 msgstr ""
 "Das Objekt konnte nicht gelöscht werden, da der Zugriff verweigert wurde"
 
-#: calendar/gui/dialogs/delete-error.c:84
+#: calendar/gui/dialogs/delete-error.c:86
 msgid "The event could not be deleted due to an error"
 msgstr "Das Ereignis konnte auf Grund eines Fehlers nicht gelöscht werden"
 
-#: calendar/gui/dialogs/delete-error.c:87
+#: calendar/gui/dialogs/delete-error.c:89
 msgid "The task could not be deleted due to an error"
 msgstr "Die Aufgabe konnte auf Grund eines Fehlers nicht gelöscht werden"
 
-#: calendar/gui/dialogs/delete-error.c:90
+#: calendar/gui/dialogs/delete-error.c:92
 msgid "The journal entry could not be deleted due to an error"
 msgstr ""
 "Der Journaleintrag konnte auf Grund eines Fehlers nicht gelöscht werden"
 
-#: calendar/gui/dialogs/delete-error.c:93
+#: calendar/gui/dialogs/delete-error.c:95
 msgid "The item could not be deleted due to an error"
 msgstr "Das Objekt konnte auf Grund eines Fehlers nicht gelöscht werden"
 
@@ -5026,11 +4809,11 @@ msgstr "_Anfangszeit:"
 
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:3
+#: calendar/gui/dialogs/meeting-page.glade.h:4
 #: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
 #: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1559
-#: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:100
+#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
+#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
@@ -5056,8 +4839,8 @@ msgstr "_Delegieren an..."
 #. FIXME: need to disable for undeletable folders
 #: calendar/gui/dialogs/meeting-page.c:655
 #: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1310 calendar/gui/e-calendar-view.c:1342
-#: mail/em-folder-tree.c:2557 mail/em-folder-view.c:919
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
+#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -5065,7 +4848,7 @@ msgid "_Delete"
 msgstr "_Löschen"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:240
+#: calendar/gui/e-meeting-list-view.c:218
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Teilnehmer"
@@ -5101,16 +4884,15 @@ msgid "Member"
 msgstr "Mitglied"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "UAwg"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
-#: mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-list-view.c:248
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
 
@@ -5118,20 +4900,20 @@ msgstr "Status"
 msgid "Add A_ttendee"
 msgstr "_Teilnehmer hinzufügen"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "Add attendees from addressbook."
+msgstr "Absender zum Adress_buch hinzufügen"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Organisator:"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
+#: calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "_Change Organizer"
 msgstr "Organisator _ändern"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-#: calendar/gui/e-meeting-time-sel.c:417
-msgid "_Invite Others..."
-msgstr "Andere einladen..."
-
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
 msgstr "<b>Kalendereinstellungen</b>"
@@ -5285,7 +5067,7 @@ msgid "_No recurrence"
 msgstr "_Keine Wiederholung"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:450
+#: composer/e-msg-composer-attachment-bar.c:453
 msgid "_Remove"
 msgstr "_Entfernen"
 
@@ -5317,61 +5099,21 @@ msgstr "Woche(n)"
 msgid "year(s)"
 msgstr "Jahr(e)"
 
-#: calendar/gui/dialogs/save-comp.c:53
-msgid ""
-"This event has been changed, but has not been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Dieses Ereignis wurde geändert, aber nicht gespeichert.\n"
-"\n"
-"Möchten Sie Ihre Änderungen speichern?"
-
-# CHECK
-#: calendar/gui/dialogs/save-comp.c:57
-msgid "_Discard Changes"
-msgstr "Änderungen _verwerfen"
-
-#: calendar/gui/dialogs/save-comp.c:62
-msgid "Save Event"
-msgstr "Ereignis speichern"
-
 # CHECK
-#: calendar/gui/dialogs/select-source-dialog.c:65
+#: calendar/gui/dialogs/select-source-dialog.c:69
 #, fuzzy
 msgid "Select destination"
 msgstr "Wählen Sie eine Zielquelle"
 
-#: calendar/gui/dialogs/select-source-dialog.c:86
+#: calendar/gui/dialogs/select-source-dialog.c:90
 #, fuzzy
 msgid "_Destination"
 msgstr "_Entwurfsordner:"
 
-#: calendar/gui/dialogs/select-source-dialog.c:88
+#: calendar/gui/dialogs/select-source-dialog.c:92
 msgid "Task List"
 msgstr "Aufgabenliste"
 
-#: calendar/gui/dialogs/send-comp.c:57
-msgid "The meeting information has been created. Send it?"
-msgstr "Die Besprechungsinformationen wurden erstellt. Jetzt verschicken?"
-
-#: calendar/gui/dialogs/send-comp.c:60
-msgid "The meeting information has changed. Send an updated version?"
-msgstr ""
-"Die Besprechungsinformationen haben sich geändert. Eine aktualisierte "
-"Version verschicken?"
-
-#: calendar/gui/dialogs/send-comp.c:67
-msgid "The task assignment information has been created. Send it?"
-msgstr ""
-"Die Aufgabenzuweisungsinformationen wurden erstellt. Jetzt verschicken?"
-
-#: calendar/gui/dialogs/send-comp.c:71
-msgid "The task information has changed. Send an updated version?"
-msgstr ""
-"Die Aufgabeninformationen haben sich geändert. Eine aktualisierte Version "
-"verschicken?"
-
 #: calendar/gui/dialogs/task-details-page.c:406
 msgid "Completed date is wrong"
 msgstr "Das Fertigstellungsdatum ist falsch"
@@ -5391,7 +5133,7 @@ msgstr "Abgeschlossen"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #: calendar/gui/e-cal-component-preview.c:249
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:960
 msgid "High"
 msgstr "Hoch"
 
@@ -5405,14 +5147,14 @@ msgstr "In Bearbeitung"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:253
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:958
 msgid "Low"
 msgstr "Niedrig"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:251
 #: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:957
+#: mail/message-list.c:959
 msgid "Normal"
 msgstr "Normal"
 
@@ -5470,8 +5212,8 @@ msgstr "_Vertraulich"
 
 #: calendar/gui/dialogs/task-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
+#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Beschreibung:"
 
@@ -5637,7 +5379,7 @@ msgstr "Fällig am:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:950
+#: calendar/gui/e-itip-control.c:943
 msgid "Status:"
 msgstr "Status:"
 
@@ -5722,12 +5464,12 @@ msgstr "Beschäftigt"
 msgid "Deleting selected objects"
 msgstr "Gewählte Objekte werden gelöscht"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
 msgid "Updating objects"
 msgstr "Objekte werden aktualisiert"
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1370
+#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
 #: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "Ö_ffnen"
@@ -5737,15 +5479,15 @@ msgid "Open _Web Page"
 msgstr "_Website öffnen"
 
 #: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1291 calendar/gui/e-calendar-view.c:1376
-#: mail/em-folder-view.c:896 mail/em-popup.c:690 mail/em-popup.c:806
+#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
+#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "_Speichern unter..."
 
 #: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1292
-#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
+#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
@@ -5753,24 +5495,24 @@ msgid "_Print..."
 msgstr "_Drucken..."
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Ausschneiden"
 
 #: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1338
-#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2550
-#: mail/message-list.c:1644 ui/evolution-addressbook.xml.h:31
+#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
+#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
+#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Kopieren"
 
 #: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1273 calendar/gui/e-calendar-view.c:1299
-#: calendar/gui/e-calendar-view.c:1372 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
+#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
@@ -5840,71 +5582,71 @@ msgstr "Zusammenfassung"
 msgid "Task sort"
 msgstr "Aufgabensortierung"
 
-#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
 msgid "New _Appointment..."
 msgstr "Neuer _Termin..."
 
-#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
+#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
 msgid "New All Day _Event"
 msgstr "Neues _ganztägiges Ereignis"
 
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
+#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
 msgid "New Meeting"
 msgstr "Neue Besprechung"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
 msgid "New Task"
 msgstr "Neue Aufgabe"
 
-#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "_Thread auswählen"
 
-#: calendar/gui/e-calendar-view.c:1280
+#: calendar/gui/e-calendar-view.c:1283
 #, fuzzy
 msgid "_Select Date..."
 msgstr "_Auswählen..."
 
-#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "Ver_fügbarkeitsinformationen veröffentlichen"
 
-#: calendar/gui/e-calendar-view.c:1303
+#: calendar/gui/e-calendar-view.c:1306
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "In Ordner kopieren..."
 
-#: calendar/gui/e-calendar-view.c:1304
+#: calendar/gui/e-calendar-view.c:1307
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "In Ordner _verschieben..."
 
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1308
 msgid "_Schedule Meeting..."
 msgstr "Besprechung _ansetzen..."
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1309
 msgid "_Forward as iCalendar..."
 msgstr "Als i_Calendar weiterleiten..."
 
-#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
 msgid "Delete this _Occurrence"
 msgstr "Diesen _Treffer löschen"
 
-#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
 msgid "Delete _All Occurrences"
 msgstr "_Alle Treffer löschen"
 
-#: calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1349
 msgid "Go to _Today"
 msgstr "Zum _heutigen Tag"
 
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1351
 msgid "_Go to Date..."
 msgstr "_Gehe zu Datum..."
 
-#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "_Einstellungen..."
 
@@ -5919,9 +5661,9 @@ msgstr "Anfangsdatum"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:967 calendar/gui/e-itip-control.c:1169
-#: calendar/gui/e-meeting-list-view.c:144
-#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
 #: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
 #: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
 #: camel/camel-tcp-stream-openssl.c:631
@@ -5947,13 +5689,13 @@ msgid "Assigned"
 msgstr "Zugewiesen"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr "Ja"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "Nein"
 
@@ -5965,7 +5707,7 @@ msgstr "N"
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
 msgid "E"
 msgstr "O"
 
@@ -6037,61 +5779,61 @@ msgstr "%d. %b"
 msgid "%02i minute divisions"
 msgstr "%02i Minuten-Unterteilungen"
 
-#: calendar/gui/e-itip-control.c:592
+#: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
 msgstr "Ja (Komplexe Wiederholung)."
 
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:596
 #, fuzzy, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Täglich"
 msgstr[1] "Täglich"
 
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:601
 #, fuzzy, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Wöchentlich"
 msgstr[1] "Wöchentlich"
 
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:603
 #, fuzzy, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "Wöchentlich am "
 msgstr[1] "Wöchentlich am "
 
-#: calendar/gui/e-itip-control.c:618
+#: calendar/gui/e-itip-control.c:611
 msgid " and "
 msgstr " und "
 
 # CHECK - muss mit erste(r), zweite(r) usw. übereinstimmen
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:618
 #, c-format
 msgid "The %s day of "
 msgstr "%s Tag des "
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:631
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s des "
 
-#: calendar/gui/e-itip-control.c:645
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "monatlich"
 msgstr[1] "monatlich"
 
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:642
 #, fuzzy, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Jährlich"
 msgstr[1] "Jährlich"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:653
 #, fuzzy, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
@@ -6099,42 +5841,42 @@ msgstr[0] " insgesamt %d Mal"
 msgstr[1] " insgesamt %d Mal"
 
 # CHECK
-#: calendar/gui/e-itip-control.c:669
+#: calendar/gui/e-itip-control.c:662
 msgid ", ending on "
 msgstr ", endet am "
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:686
 msgid "<b>Starts:</b> "
 msgstr "<b>Beginnt:</b> "
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:696
 msgid "<b>Ends:</b> "
 msgstr "<b>Endet:</b>"
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:716
 msgid "<b>Completed:</b> "
 msgstr "<b>Abgeschlossen:</b>"
 
-#: calendar/gui/e-itip-control.c:733
+#: calendar/gui/e-itip-control.c:726
 msgid "<b>Due:</b> "
 msgstr "<b>Fällig:</b>"
 
-#: calendar/gui/e-itip-control.c:771 calendar/gui/e-itip-control.c:827
+#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
 msgid "iCalendar Information"
 msgstr "iCalendar-Informationen"
 
 #. Title
-#: calendar/gui/e-itip-control.c:788
+#: calendar/gui/e-itip-control.c:781
 msgid "iCalendar Error"
 msgstr "iCalendar-Fehler"
 
-#: calendar/gui/e-itip-control.c:859 calendar/gui/e-itip-control.c:875
-#: calendar/gui/e-itip-control.c:886 calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
 msgid "An unknown person"
 msgstr "Eine unbekannte Person"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:910
+#: calendar/gui/e-itip-control.c:903
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -6142,309 +5884,313 @@ msgstr ""
 "<br> Bitte sehen Sie sich die folgenden Informationen noch einmal an und "
 "wählen Sie dann eine Aktion aus untenstehendem Menü."
 
-#: calendar/gui/e-itip-control.c:925
+#: calendar/gui/e-itip-control.c:918
 msgid "<i>None</i>"
 msgstr "<i>Keine</i>"
 
-#: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:929
+msgid "Location:"
+msgstr "Standort:"
+
+#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Angenommen"
 
-#: calendar/gui/e-itip-control.c:959 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Vorläufig angenommen"
 
-#: calendar/gui/e-itip-control.c:963 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Abgelehnt"
 
-#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.c:1050
-#: calendar/gui/e-itip-control.c:1076 calendar/gui/e-itip-control.c:1089
-#: calendar/gui/e-itip-control.c:1102 calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
 msgid "Choose an action:"
 msgstr "Eine Aktion wählen:"
 
-#: calendar/gui/e-itip-control.c:1023
+#: calendar/gui/e-itip-control.c:1016
 msgid "Update"
 msgstr "Aktualisieren"
 
-#: calendar/gui/e-itip-control.c:1024 calendar/gui/e-itip-control.c:1055
-#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1091
-#: calendar/gui/e-itip-control.c:1104 calendar/gui/e-itip-control.c:1117
-#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
+#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1044
 msgid "Accept"
 msgstr "Annehmen"
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1045
 msgid "Tentatively accept"
 msgstr "Vorläufig annehmen"
 
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1046
 msgid "Decline"
 msgstr "Ablehnen"
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1070
 msgid "Send Free/Busy Information"
 msgstr "Verfügbarkeitsinformationen übermitteln"
 
-#: calendar/gui/e-itip-control.c:1090
+#: calendar/gui/e-itip-control.c:1083
 msgid "Update respondent status"
 msgstr "Status des Antwortenden aktualisieren"
 
-#: calendar/gui/e-itip-control.c:1103
+#: calendar/gui/e-itip-control.c:1096
 msgid "Send Latest Information"
 msgstr "Neueste Informationen übermitteln"
 
-#: calendar/gui/e-itip-control.c:1116 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1185
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> hat Besprechungsinformationen veröffentlicht."
 
-#: calendar/gui/e-itip-control.c:1193
+#: calendar/gui/e-itip-control.c:1186
 msgid "Meeting Information"
 msgstr "Besprechungsinformationen"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1191
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> wünscht die Teilnahme von %s an einer Besprechung."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1193
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> wünscht Ihre Teilnahme an einer Besprechung."
 
-#: calendar/gui/e-itip-control.c:1201
+#: calendar/gui/e-itip-control.c:1194
 msgid "Meeting Proposal"
 msgstr "Besprechungsvorschlag"
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> wünscht zu einer existierenden Besprechung hinzuzufügen."
 
-#: calendar/gui/e-itip-control.c:1206
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Update"
 msgstr "Besprechungsaktualisierung"
 
-#: calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1203
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> wünscht aktuelle Besprechungsinformationen zu erhalten."
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1204
 msgid "Meeting Update Request"
 msgstr "Besprechungs-Aktualisierungsanfrage"
 
-#: calendar/gui/e-itip-control.c:1218
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> hat auf eine Besprechungsanfrage geantwortet."
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Reply"
 msgstr "Besprechungsantwort"
 
-#: calendar/gui/e-itip-control.c:1226
+#: calendar/gui/e-itip-control.c:1219
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> hat eine Besprechung abgesagt."
 
-#: calendar/gui/e-itip-control.c:1227
+#: calendar/gui/e-itip-control.c:1220
 msgid "Meeting Cancellation"
 msgstr "Besprechungsabsage"
 
-#: calendar/gui/e-itip-control.c:1234 calendar/gui/e-itip-control.c:1302
-#: calendar/gui/e-itip-control.c:1337
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1330
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> hat eine unverständliche Nachricht verschickt."
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1228
 msgid "Bad Meeting Message"
 msgstr "Fehlerhafte Besprechungsmitteilung"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1253
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> hat Aufgabeninformationen veröffentlicht."
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1254
 msgid "Task Information"
 msgstr "Aufgabeninformationen"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1259
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> wünscht, dass %s eine Aufgabe auszuführt."
 
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> wünscht, dass Sie eine Aufgabe ausführen."
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1262
 msgid "Task Proposal"
 msgstr "Aufgabenvorschlag"
 
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> wünscht zu einer bestehenden Aufgabe hinzuzufügen."
 
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Update"
 msgstr "Aufgabenaktualisierung"
 
-#: calendar/gui/e-itip-control.c:1278
+#: calendar/gui/e-itip-control.c:1271
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> wünscht aktuelle Aufgabeninformationen zu erhalten."
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1272
 msgid "Task Update Request"
 msgstr "Aufgaben-Aktualisierungsanfrage"
 
-#: calendar/gui/e-itip-control.c:1286
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> hat auf eine Aufgabenzuweisung geantwortet."
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Reply"
 msgstr "Aufgaben-Antwort"
 
-#: calendar/gui/e-itip-control.c:1294
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> hat eine Aufgabe abgesagt."
 
-#: calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1288
 msgid "Task Cancellation"
 msgstr "Aufgabenabsage"
 
-#: calendar/gui/e-itip-control.c:1303
+#: calendar/gui/e-itip-control.c:1296
 msgid "Bad Task Message"
 msgstr "Fehlerhafte Aufgabenmitteilung"
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1315
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> hat Verfügbarkeitsinformationen veröffentlicht."
 
-#: calendar/gui/e-itip-control.c:1323
+#: calendar/gui/e-itip-control.c:1316
 msgid "Free/Busy Information"
 msgstr "Verfügbarkeitsinformationen"
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> fordert Ihre Verfügbarkeitsinformationen an."
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1321
 msgid "Free/Busy Request"
 msgstr "Verfügbarkeitsanfrage"
 
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1325
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> hat auf eine Verfugbarkeitsanfrage geantwortet."
 
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1326
 msgid "Free/Busy Reply"
 msgstr "Verfügbarkeitsantwort"
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1331
 msgid "Bad Free/Busy Message"
 msgstr "Fehlerhafte Verfügbarkeitsmitteilung"
 
-#: calendar/gui/e-itip-control.c:1413
+#: calendar/gui/e-itip-control.c:1406
 msgid "The message does not appear to be properly formed"
 msgstr "Diese Nachricht scheint falsch formatiert zu sein"
 
-#: calendar/gui/e-itip-control.c:1472
+#: calendar/gui/e-itip-control.c:1465
 msgid "The message contains only unsupported requests."
 msgstr "Diese Nachricht enthält ausschließlich nicht unterstützte Anfragen."
 
-#: calendar/gui/e-itip-control.c:1503
+#: calendar/gui/e-itip-control.c:1496
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Die Anlage enthält keine gültige Kalendernachricht"
 
-#: calendar/gui/e-itip-control.c:1535
+#: calendar/gui/e-itip-control.c:1528
 msgid "The attachment has no viewable calendar items"
 msgstr "Die Anlage hat keine anzeigbaren Kalendereinträge"
 
-#: calendar/gui/e-itip-control.c:1769
+#: calendar/gui/e-itip-control.c:1762
 msgid "Update complete\n"
 msgstr "Aktualisierung abgeschlossen\n"
 
-#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
+#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Teilnahmestatus konnte nicht aktualisiert werden, da der Eintrag nicht mehr "
 "existiert"
 
-#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objekt ist ungültig und konnte nicht aktualisiert werden\n"
 
-#: calendar/gui/e-itip-control.c:1825
+#: calendar/gui/e-itip-control.c:1818
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Diese Antwort stammt von keinem voraussichtlichen Teilnehmer.  Als "
 "Teilnehmer hinzufügen?"
 
-#: calendar/gui/e-itip-control.c:1837
+#: calendar/gui/e-itip-control.c:1830
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Teilnahmestatus konnte auf Grund eines ungültigen Status nicht aktualisiert "
 "werden!\n"
 
-#: calendar/gui/e-itip-control.c:1856
+#: calendar/gui/e-itip-control.c:1849
 msgid "There was an error on the CORBA system\n"
 msgstr "Es trat ein Fehler im CORBA-System auf\n"
 
-#: calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1852
 msgid "Object could not be found\n"
 msgstr "Objekt konnte nicht gefunden werden\n"
 
-#: calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1855
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr ""
 "Sie haben nicht die erforderlichen Zugriffsrechte, um den Kalender zu "
 "aktualisieren\n"
 
-#: calendar/gui/e-itip-control.c:1865
+#: calendar/gui/e-itip-control.c:1858
 msgid "Attendee status updated\n"
 msgstr "Teilnahmestatus aktualisiert\n"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1861
 msgid "Attendee status could not be updated!\n"
 msgstr "Teilnehmerstatus konnte nicht aktualisiert werden!\n"
 
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1892
 msgid "Removal Complete"
 msgstr "Entfernen abgeschlossen"
 
-#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
 msgid "Item sent!\n"
 msgstr "Eintrag verschickt!\n"
 
-#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
+#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
 msgid "The item could not be sent!\n"
 msgstr "Der Eintrag konnte nicht verschickt werden!\n"
 
@@ -6485,74 +6231,74 @@ msgstr "datum-ende"
 msgid "date-start"
 msgstr "datum-anfang"
 
-#: calendar/gui/e-meeting-list-view.c:62
+#: calendar/gui/e-meeting-list-view.c:59
 msgid "Chair Persons"
 msgstr "Vorsitzende"
 
-#: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:479
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
 msgid "Required Participants"
 msgstr "Benötigte Teilnehmer"
 
-#: calendar/gui/e-meeting-list-view.c:64
+#: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Optionale Teilnehmer"
 
-#: calendar/gui/e-meeting-list-view.c:65
+#: calendar/gui/e-meeting-list-view.c:62
 msgid "Resources"
 msgstr "Ressourcen"
 
-#: calendar/gui/e-meeting-list-view.c:140 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
 #: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr "Individuell"
 
-#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "Gruppe"
 
-#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr "Ressource"
 
-#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr "Raum"
 
-#: calendar/gui/e-meeting-list-view.c:154 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr "Vorsitzender"
 
-#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:127
 #: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
 msgid "Required Participant"
 msgstr "Benötigter Teilnehmer"
 
-#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr "Optionaler Teilnehmer"
 
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr "Nicht-Teilnehmer"
 
-#: calendar/gui/e-meeting-list-view.c:179 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:177
 #: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
 msgid "Needs Action"
 msgstr "Erfordert Maßnahme"
 
-#: calendar/gui/e-meeting-list-view.c:182 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
 #: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "Vorläufig"
 
-#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr "Delegiert"
@@ -6569,20 +6315,28 @@ msgstr "Nicht im Büro"
 msgid "No Information"
 msgstr "Keine Informationen"
 
+#: calendar/gui/e-meeting-time-sel.c:417
+#, fuzzy
+msgid "Add attendees from addressbook"
+msgstr "Absender zum Adress_buch hinzufügen"
+
 #: calendar/gui/e-meeting-time-sel.c:440
 msgid "_Options"
 msgstr "_Optionen"
 
 #: calendar/gui/e-meeting-time-sel.c:457
-msgid "Show _Only Working Hours"
+#, fuzzy
+msgid "Show _only working hours"
 msgstr "Nur _Arbeitszeit anzeigen"
 
 #: calendar/gui/e-meeting-time-sel.c:467
-msgid "Show _Zoomed Out"
+#, fuzzy
+msgid "Show _zoomed out"
 msgstr "Ver_kleinert anzeigen"
 
 #: calendar/gui/e-meeting-time-sel.c:482
-msgid "_Update Free/Busy"
+#, fuzzy
+msgid "_Update free/busy"
 msgstr "Verfügbarkeit _aktualisieren"
 
 #: calendar/gui/e-meeting-time-sel.c:497
@@ -6598,19 +6352,23 @@ msgid ">_>"
 msgstr ">>"
 
 #: calendar/gui/e-meeting-time-sel.c:547
-msgid "_All People and Resources"
+#, fuzzy
+msgid "_All people and resources"
 msgstr "_Alle Personen und Ressourcen"
 
 #: calendar/gui/e-meeting-time-sel.c:556
-msgid "All _People and One Resource"
+#, fuzzy
+msgid "All _people and one resource"
 msgstr "Alle _Personen und eine Ressource"
 
 #: calendar/gui/e-meeting-time-sel.c:565
-msgid "_Required People"
+#, fuzzy
+msgid "_Required people"
 msgstr "_Benötigte Personen"
 
 #: calendar/gui/e-meeting-time-sel.c:574
-msgid "Required People and _One Resource"
+#, fuzzy
+msgid "Required people and _one resource"
 msgstr "Benötigte Personen und _eine Ressource"
 
 #: calendar/gui/e-meeting-time-sel.c:593
@@ -6648,7 +6406,7 @@ msgstr "%d.%m.%Y"
 msgid "Enter the password for %s"
 msgstr "Geben Sie das Passwort für %s ein"
 
-#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6657,22 +6415,14 @@ msgstr ""
 "Fehler bei %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
-#, fuzzy, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-"Das Task-Backend für\n"
-"%s\n"
-" ist abgestürzt."
-
 #. FIXME Loading should be async
 #. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:686
+#: calendar/gui/e-tasks.c:801
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Aufgaben unter %s werden geöffnet"
 
-#: calendar/gui/e-tasks.c:709
+#: calendar/gui/e-tasks.c:824
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6681,55 +6431,47 @@ msgstr ""
 "Fehler beim Öffnen von %s:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:730
+#: calendar/gui/e-tasks.c:845
 msgid "Loading tasks"
 msgstr "Aufgaben werden geladen"
 
-#: calendar/gui/e-tasks.c:834
+#: calendar/gui/e-tasks.c:949
 msgid "Completing tasks..."
 msgstr "Aufgaben werden abgeschlossen..."
 
-#: calendar/gui/e-tasks.c:857
+#: calendar/gui/e-tasks.c:972
 msgid "Deleting selected objects..."
 msgstr "Gewählte Objekte werden gelöscht..."
 
-#: calendar/gui/e-tasks.c:884
+#: calendar/gui/e-tasks.c:999
 msgid "Expunging"
 msgstr "Wird gesäubert"
 
-#: calendar/gui/e-tasks.c:960
+#: calendar/gui/e-tasks.c:1075
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
-#: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
+#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
+#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
 #: calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:705
 msgid "Tasks"
 msgstr "Aufgaben"
 
-#: calendar/gui/gnome-cal.c:1876
+#: calendar/gui/gnome-cal.c:1878
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Termin - %s"
 
-#: calendar/gui/gnome-cal.c:1895
+#: calendar/gui/gnome-cal.c:1897
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Aufgaben werden geladen"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1920
 #, c-format
 msgid "Opening %s"
 msgstr "%s wird geöffnet..."
 
-#: calendar/gui/gnome-cal.c:2048
-#, fuzzy, c-format
-msgid "The calendar backend for '%s' has crashed."
-msgstr ""
-"Das Kalender-Backend für\n"
-"%s\n"
-" ist abgestürzt."
-
-#: calendar/gui/gnome-cal.c:2894
+#: calendar/gui/gnome-cal.c:2906
 msgid "Purging"
 msgstr "Säuberungsvorgang"
 
@@ -6932,7 +6674,7 @@ msgid "On The Web"
 msgstr "Im Web"
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 
@@ -6943,7 +6685,7 @@ msgid "Unable to migrate calendar `%s'"
 msgstr "Der Kalender »%s« konnte nicht geöffnet werden."
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:869
+#: calendar/gui/migration.c:889
 #, fuzzy, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Aufgaben in »%s« konnten nicht geöffnet werden."
@@ -7179,76 +6921,76 @@ msgstr "Eintrag drucken"
 msgid "Print Setup"
 msgstr "Druckeinstellungen"
 
-#: calendar/gui/tasks-component.c:303
+#: calendar/gui/tasks-component.c:313
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 "Die Aufgabenliste »%s« wird hiermit entfernt. Sind Sie sicher, dass Sie "
 "fortfahren möchten?"
 
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:371
 msgid "New Task List"
 msgstr "Neue Aufgabenliste"
 
-#: calendar/gui/tasks-component.c:398
+#: calendar/gui/tasks-component.c:408
 #, fuzzy, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d Kontakte"
 msgstr[1] "%d Kontakte"
 
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] "Gelöscht"
 msgstr[1] "Gelöscht"
 
-#: calendar/gui/tasks-component.c:447
+#: calendar/gui/tasks-component.c:457
 #, fuzzy
 msgid "Failed upgrading tasks."
 msgstr "Aufgaben werden geladen"
 
-#: calendar/gui/tasks-component.c:526
+#: calendar/gui/tasks-component.c:749
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 "Die Aufgabenliste »%s« konnte nicht zum Anlegen von Ereignissen und Terminen "
 "geöffnet werden"
 
-#: calendar/gui/tasks-component.c:538
+#: calendar/gui/tasks-component.c:761
 msgid "There is no calendar available for creating tasks"
 msgstr "Es ist kein Kalender zum Anlegen von Aufgaben verfügbar"
 
-#: calendar/gui/tasks-component.c:576
+#: calendar/gui/tasks-component.c:799
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:804
+#: calendar/gui/tasks-component.c:1040
 msgid "New task"
 msgstr "Neue Aufgabe"
 
-#: calendar/gui/tasks-component.c:805
+#: calendar/gui/tasks-component.c:1041
 msgid "_Task"
 msgstr "_Aufgabe"
 
-#: calendar/gui/tasks-component.c:806
+#: calendar/gui/tasks-component.c:1042
 msgid "Create a new task"
 msgstr "Eine neue Aufgabe anlegen"
 
-#: calendar/gui/tasks-component.c:812
+#: calendar/gui/tasks-component.c:1048
 #, fuzzy
 msgid "New tasks group"
 msgstr "Neue Aufgabe"
 
-#: calendar/gui/tasks-component.c:813
+#: calendar/gui/tasks-component.c:1049
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Aufgabenlistengruppe"
 
-#: calendar/gui/tasks-component.c:814
+#: calendar/gui/tasks-component.c:1050
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Eine neue Aufgabe anlegen"
@@ -9017,12 +8759,12 @@ msgstr "Fehler beim Ausführen einer Filtersuche: %s: %s"
 msgid "Unsupported operation: append message: for %s"
 msgstr "Nicht unterstützter Vorgang: Nachricht anhängen: für %s"
 
-#: camel/camel-folder.c:1259
+#: camel/camel-folder.c:1262
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Nicht unterstützter Vorgang: Suche nach Ausdruck: für %s"
 
-#: camel/camel-folder.c:1299
+#: camel/camel-folder.c:1302
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Nicht unterstützter Vorgang: Suche nach UIDs: für %s"
@@ -9035,11 +8777,16 @@ msgstr "Nachrichten werden verschoben"
 msgid "Copying messages"
 msgstr "Nachrichten werden kopiert"
 
-#: camel/camel-folder.c:1666
-msgid "Learning junk and/or non junk message(s)"
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Unerwünscht-Status wird verändert"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
 msgstr ""
 
-#: camel/camel-folder.c:1695
+#: camel/camel-folder.c:1701
 msgid "Filtering new message(s)"
 msgstr "Neue Nachricht(en) wird/werden gefiltert"
 
@@ -9074,19 +8821,19 @@ msgstr ""
 msgid "(match-threads) requires a match type string"
 msgstr ""
 
-#: camel/camel-folder-search.c:785
+#: camel/camel-folder-search.c:784
 #, fuzzy
 msgid "(match-threads) expects an array result"
 msgstr ""
 "(match-all) macht einen einzelnen Boole'schen Wert als Ergebnis erforderlich"
 
-#: camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:790
 #, fuzzy
 msgid "(match-threads) requires the folder set"
 msgstr ""
 "(match-all) macht einen einzelnen Boole'schen Wert als Ergebnis erforderlich"
 
-#: camel/camel-folder-search.c:880
+#: camel/camel-folder-search.c:879
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Abfrage wird auf unbekannte Kopfzeile ausgeführt: %s"
@@ -9124,7 +8871,8 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
 #: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:706
+#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Abgesagt."
@@ -9528,7 +9276,7 @@ msgstr ""
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1212
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Fehlerhafte Legitimationsantwort vom Server."
 
@@ -9911,43 +9659,43 @@ msgstr "Befehl nicht implementiert"
 msgid "export keys: unimplemented"
 msgstr ""
 
-#: camel/camel-store.c:214
+#: camel/camel-store.c:213
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr ""
 "Auf Ordner konnte nicht zugegriffen werden: Ungültiger Vorgang auf diesem "
 "Speicher"
 
-#: camel/camel-store.c:244
+#: camel/camel-store.c:243
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr "Ordner konnte nicht angelegt werden: %s: %s"
 
-#: camel/camel-store.c:295
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 "Ordner konnte nicht angelegt werden: Ungültiger Vorgang auf diesem Speicher"
 
-#: camel/camel-store.c:323
+#: camel/camel-store.c:325
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Ordner konnte nicht angelegt werden: %s: %s"
 
-#: camel/camel-store.c:387 camel/camel-vee-store.c:354
+#: camel/camel-store.c:389 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Ordner konnte nicht gelöscht werden: %s: Ungültiger Vorgang"
 
-#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#: camel/camel-store.c:439 camel/camel-vee-store.c:387
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Ordner konnte nicht umbenannt werden: %s: Ungültiger Vorgang"
 
-#: camel/camel-store.c:811
+#: camel/camel-store.c:777
 msgid "Trash"
 msgstr "Müll"
 
-#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
-#: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/mail-config.glade.h:95
+#: ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Unerwünscht"
 
@@ -10181,12 +9929,12 @@ msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 "Nachrichten können nicht in virtuelle Ordner kopiert oder verschoben werden"
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:374
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Ordner konnte nicht gelöscht werden: %s: Ordner existiert nicht"
 
-#: camel/camel-vee-store.c:398
+#: camel/camel-vee-store.c:395
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Ordner konnte umbenannt werden: %s: Ordner existiert nicht"
@@ -10230,25 +9978,25 @@ msgstr "Adressbuch"
 msgid "Post Office Agent SOAP Port:"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:80
+#: camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "Novell GroupWise"
 msgstr "Novell GroupWise"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:82
+#: camel/providers/groupwise/camel-groupwise-provider.c:85
 #, fuzzy
 msgid "For accessing Novell Groupwise servers"
 msgstr "Zum Zugriff auf Novell Groupwise-Server"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: camel/providers/groupwise/camel-groupwise-provider.c:100
 #: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
 msgid "Password"
 msgstr "Passwort"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:99
+#: camel/providers/groupwise/camel-groupwise-provider.c:102
 #: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
@@ -10256,8 +10004,8 @@ msgstr ""
 "Dies stellt unter Verwendung eines unverschlüsselten Passworts eine "
 "Verbindung mit dem IMAP-Server her."
 
-#: camel/providers/groupwise/camel-gw-listener.c:305
-#: camel/providers/groupwise/camel-gw-listener.c:328
+#: camel/providers/groupwise/camel-gw-listener.c:312
+#: camel/providers/groupwise/camel-gw-listener.c:335
 #, fuzzy
 msgid "Checklist"
 msgstr "Liste"
@@ -10402,13 +10150,13 @@ msgstr ""
 "Verbindung mit dem IMAP-Server her."
 
 #: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:429
+#: camel/providers/imap/camel-imap-store.c:428
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP-Server %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:431
+#: camel/providers/imap/camel-imap-store.c:430
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP-Dienst für %s auf %s"
@@ -10418,7 +10166,7 @@ msgstr "IMAP-Dienst für %s auf %s"
 #: camel/providers/imap/camel-imap-store.c:551
 #: camel/providers/imap/camel-imap-store.c:571
 #: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
+#: camel/providers/nntp/camel-nntp-store.c:209
 #: camel/providers/pop3/camel-pop3-store.c:175
 #: camel/providers/smtp/camel-smtp-transport.c:269
 #: camel/providers/smtp/camel-smtp-transport.c:285
@@ -10435,10 +10183,10 @@ msgstr "SSL nicht verfügbar"
 
 #: camel/providers/imap4/camel-imap4-store.c:222
 #: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:815
+#: camel/providers/imap/camel-imap-store.c:845
 #: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:137
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
 #: camel/providers/pop3/camel-pop3-store.c:192
 msgid "Connection cancelled"
 msgstr "Verbindung abgebrochen"
@@ -10451,8 +10199,8 @@ msgid ""
 msgstr "Verbindung mit IMAP-Server %s im sicheren Modus ist gescheitert: %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:649
-#: camel/providers/imap/camel-imap-store.c:680
+#: camel/providers/imap/camel-imap-store.c:679
+#: camel/providers/imap/camel-imap-store.c:710
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Verbindung mit IMAP-Server %s im sicheren Modus ist gescheitert: %s"
@@ -10461,7 +10209,7 @@ msgstr "Verbindung mit IMAP-Server %s im sicheren Modus ist gescheitert: %s"
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1109
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
@@ -10489,8 +10237,8 @@ msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr "Ordner konnte nicht abgerufen werden: %s: %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1857
-#: camel/providers/imap/camel-imap-store.c:2235
+#: camel/providers/imap/camel-imap-store.c:1885
+#: camel/providers/imap/camel-imap-store.c:2263
 #, fuzzy, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -10569,12 +10317,12 @@ msgstr "Server-Verbindung unerwartet getrennt: %s"
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3168
+#: camel/providers/imap/camel-imap-store.c:3194
 msgid "Operation cancelled"
 msgstr "Vorgang abgebrochen"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3171
+#: camel/providers/imap/camel-imap-store.c:3197
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server-Verbindung unerwartet getrennt: %s"
@@ -10638,13 +10386,6 @@ msgid "Unable to retrieve message: %s"
 msgstr "Nachricht konnte nicht abgerufen werden: %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:219
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -10654,15 +10395,15 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-mbox-folder.c:418
+#: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
 msgstr "Nachricht existiert nicht"
 
 #: camel/providers/imap/camel-imap-folder.c:2019
-#: camel/providers/imap/camel-imap-folder.c:2621
-#: camel/providers/nntp/camel-nntp-folder.c:238
+#: camel/providers/imap/camel-imap-folder.c:2622
+#: camel/providers/nntp/camel-nntp-folder.c:220
 msgid "This message is not currently available"
 msgstr "Diese Nachricht ist derzeit nicht verfügbar"
 
@@ -10671,7 +10412,23 @@ msgstr "Diese Nachricht ist derzeit nicht verfügbar"
 msgid "Fetching summary information for new messages"
 msgstr "Zusammenfassungsinformationen für neue Nachrichten werden abgerufen"
 
-#: camel/providers/imap/camel-imap-folder.c:2659
+#: camel/providers/imap/camel-imap-folder.c:2463
+#, c-format
+msgid "Incomplete server response: no information provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2471
+#, c-format
+msgid "Incomplete server response: no UID provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2484
+#, c-format
+msgid ""
+"Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2660
 msgid "Could not find message body in FETCH response."
 msgstr "Nachrichtenrumpf in Antwort auf FETCH konnte nicht gefunden werden."
 
@@ -10732,43 +10489,43 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Zum Lesen und Speichern von E-Mails auf IMAP-Servern."
 
-#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/imap/camel-imap-store.c:680
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS-Erweiterung nicht unterstützt."
 
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:711
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL-»Verhandlungen« gescheitert"
 
-#: camel/providers/imap/camel-imap-store.c:818
+#: camel/providers/imap/camel-imap-store.c:848
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Verbindung mit Befehl »%s« konnte nicht hergestellt werden: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1242
+#: camel/providers/imap/camel-imap-store.c:1272
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP-Server %s unterstützt den verlangten Legitimationstyp %s nicht."
 
-#: camel/providers/imap/camel-imap-store.c:1252
+#: camel/providers/imap/camel-imap-store.c:1282
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Keine Unterstützung für Legitimationstyp %s"
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1305
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sBitte geben Sie das IMAP-Passwort für %s@%s ein"
 
-#: camel/providers/imap/camel-imap-store.c:1289
+#: camel/providers/imap/camel-imap-store.c:1319
 msgid "You didn't enter a password."
 msgstr "Sie haben kein Passwort eingegeben."
 
-#: camel/providers/imap/camel-imap-store.c:1318
+#: camel/providers/imap/camel-imap-store.c:1348
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10779,18 +10536,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1839
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:1867
+#: camel/providers/imap/camel-imap-store.c:2057
 #, c-format
 msgid "No such folder %s"
 msgstr "Ordner %s existiert nicht"
 
-#: camel/providers/imap/camel-imap-store.c:1915
-#: camel/providers/imap/camel-imap-store.c:2296
+#: camel/providers/imap/camel-imap-store.c:1943
+#: camel/providers/imap/camel-imap-store.c:2324
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Der Elternordner darf keine Unterordner enthalten"
 
-#: camel/providers/imap/camel-imap-store.c:1970
+#: camel/providers/imap/camel-imap-store.c:1998
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10798,7 +10555,7 @@ msgstr "Der Elternordner darf keine Unterordner enthalten"
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Ordner konnte nicht angelegt werden: %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:2274
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Unbekannter Elternerdner: %s"
@@ -10835,20 +10592,20 @@ msgid "Index message body data"
 msgstr "Rumpfdaten der Nachricht indizieren"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:388
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:393
-#: camel/providers/local/camel-local-folder.c:396
+#: camel/providers/local/camel-local-folder.c:392
+#: camel/providers/local/camel-local-folder.c:395
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "Postfach: %s (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:400
+#: camel/providers/local/camel-local-folder.c:399
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -10910,7 +10667,7 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:142
 #: camel/providers/local/camel-local-store.c:253
-#: camel/providers/local/camel-mbox-store.c:356
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10985,8 +10742,25 @@ msgstr "Anhängen der Nachricht an Maildir abgebrochen"
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Nachricht konnte nicht an Maildir-Ordner angehängt werden: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:226
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mbox-folder.c:417
+#: camel/providers/local/camel-mbox-folder.c:436
+#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:475
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-mh-folder.c:221
+#, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+"Nachricht %s konnte nicht aus Ordner %s abgerufen werden\n"
+"  %s"
+
+#: camel/providers/local/camel-maildir-folder.c:236
 msgid "Invalid message contents"
 msgstr "Ungültiger Inhalt der Nachricht"
 
@@ -11027,9 +10801,9 @@ msgstr "Ordner »%s« konnte nicht gelöscht werden: %s"
 msgid "not a maildir directory"
 msgstr "kein Maildir-Verzeichnis"
 
-#: camel/providers/local/camel-maildir-store.c:341
-#: camel/providers/local/camel-spool-store.c:286
-#: camel/providers/local/camel-spool-store.c:316
+#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-spool-store.c:284
+#: camel/providers/local/camel-spool-store.c:314
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Ordner »%s« konnte nicht eingelesen werden: %s"
@@ -11076,27 +10850,18 @@ msgstr "Anhängen der E-Mail abgebrochen"
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Nachricht konnte nicht an mbox-Datei angehängt werden: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:435
-#: camel/providers/local/camel-mbox-folder.c:466
-#: camel/providers/local/camel-mbox-folder.c:474
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"Nachricht %s konnte nicht aus Ordner %s abgerufen werden\n"
-"  %s"
-
-#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:468
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Dieser Ordner scheint irreparabel beschädigt zu sein."
 
-#: camel/providers/local/camel-mbox-folder.c:475
-msgid "Message construction failed: Corrupt mailbox?"
+#: camel/providers/local/camel-mbox-folder.c:476
+#: camel/providers/local/camel-mh-folder.c:222
+#, fuzzy
+msgid "Message construction failed."
 msgstr "Erstellen der Nachricht gescheitert: Fehlerhaftes Postfach?"
 
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:362
+#: camel/providers/local/camel-mbox-store.c:361
 msgid "Cannot create a folder by this name."
 msgstr "Es konnte kein Ordner mit diesem Namen angelegt werden."
 
@@ -11126,30 +10891,30 @@ msgstr "»%s« ist keine reguläre Datei."
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Ordner »%s« ist nicht leer. Nicht gelöscht."
 
-#: camel/providers/local/camel-mbox-store.c:375
+#: camel/providers/local/camel-mbox-store.c:374
 #, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Verzeichnis »%s« konnte nicht angelegt werden: %s."
 
-#: camel/providers/local/camel-mbox-store.c:389
+#: camel/providers/local/camel-mbox-store.c:388
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Ordner konnte nicht angelegt werden: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:391
+#: camel/providers/local/camel-mbox-store.c:390
 msgid "Folder already exists"
 msgstr "Ordner existiert bereits"
 
-#: camel/providers/local/camel-mbox-store.c:473
+#: camel/providers/local/camel-mbox-store.c:472
 msgid "The new folder name is illegal."
 msgstr "Der neue Ordnername ist nicht zulässig."
 
-#: camel/providers/local/camel-mbox-store.c:486
+#: camel/providers/local/camel-mbox-store.c:485
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "»%s« konnte nicht umbenannt werden: %s"
 
-#: camel/providers/local/camel-mbox-store.c:561
+#: camel/providers/local/camel-mbox-store.c:560
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "%s konnte nicht in %s umbenannt werden: %s"
@@ -11347,7 +11112,7 @@ msgstr ""
 "Ordner könnte fehlerhaft sein, Kopie in »%s« gespeichert"
 
 #: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:997
+#: camel/providers/nntp/camel-nntp-store.c:1126
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Bitte geben Sie das NNTP-Passwort für %s@%s ein"
@@ -11364,18 +11129,10 @@ msgstr "Benutzername konnte nicht an Server übermittelt werden"
 msgid "Server rejected username/password"
 msgstr "Server wies Benutzername/Passwort zurück"
 
-#: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:263
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr "Benutzer hat abgebrochen"
-
-#: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:259
-#: camel/providers/nntp/camel-nntp-folder.c:265
+#: camel/providers/nntp/camel-nntp-folder.c:147
+#: camel/providers/nntp/camel-nntp-folder.c:149
+#: camel/providers/nntp/camel-nntp-folder.c:158
+#: camel/providers/nntp/camel-nntp-folder.c:234
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11384,67 +11141,49 @@ msgstr "Benutzer hat abgebrochen"
 msgid "Cannot get message %s: %s"
 msgstr "Nachricht %s konnte nicht abgerufen werden: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:188
-#: camel/providers/nntp/camel-nntp-folder.c:228
+#: camel/providers/nntp/camel-nntp-folder.c:156
+#: camel/providers/nntp/camel-nntp-folder.c:232
+#: camel/providers/nntp/camel-nntp-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+msgid "User cancelled"
+msgstr "Benutzer hat abgebrochen"
+
+#: camel/providers/nntp/camel-nntp-folder.c:176
+#: camel/providers/nntp/camel-nntp-folder.c:208
 #, c-format
 msgid "Internal error: uid in invalid format: %s"
 msgstr "Interner Fehler: UID-Format ungültig: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:201
-#, c-format
-msgid "Could not get article %s from NNTP server"
-msgstr "Artikel %s konnte nicht vom NTTP-Server abgerufen werden"
-
-#: camel/providers/nntp/camel-nntp-folder.c:362
-msgid "Posting not allowed by news server"
-msgstr "Veröffentlichung duch News-Server untersagt"
-
+#: camel/providers/nntp/camel-nntp-folder.c:328
+#: camel/providers/nntp/camel-nntp-folder.c:331
 #: camel/providers/nntp/camel-nntp-folder.c:373
-#, c-format
-msgid "Failed to send newsgroups header: %s: message not posted"
-msgstr ""
-"Newsgroup-Kopfzeile konnte nicht verschickt werden: %s: Nachricht nicht "
-"abgelegt"
-
-#: camel/providers/nntp/camel-nntp-folder.c:413
-#: camel/providers/nntp/camel-nntp-folder.c:426
-#, c-format
-msgid "Error posting to newsgroup: %s: message not posted"
-msgstr ""
-"Fehler beim Veröffentlichen in Newsgroup %s: Nachricht nicht veröffentlicht"
-
-#: camel/providers/nntp/camel-nntp-folder.c:438
-msgid "Error reading response to posted message: message not posted"
-msgstr ""
-"Fehler beim Lesen einer Antwort auf eine veröffentlichte Nachricht: "
-"Nachricht nicht veröffentlicht"
-
-#: camel/providers/nntp/camel-nntp-folder.c:441
-#, c-format
-msgid "Error posting message: %s: message not posted"
-msgstr ""
-"Fehler beim Veröffentlichen einer Nachricht: %s: Nachricht nicht "
-"veröffentlicht"
+#: camel/providers/nntp/camel-nntp-folder.c:375
+#, fuzzy, c-format
+msgid "Posting failed: %s"
+msgstr "Vorgang gescheitert: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:457
+#: camel/providers/nntp/camel-nntp-folder.c:393
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "Sie können im Offline-Modus keine NNTP-Nachrichten veröffentlichen!"
 
-#: camel/providers/nntp/camel-nntp-folder.c:468
+#: camel/providers/nntp/camel-nntp-folder.c:404
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Nachrichten können nicht aus NNTP-Ordnern kopiert werden!"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:44
 msgid "Could not get group list from server."
 msgstr "Die Gruppenliste konnte nicht vom Server abgerufen werden."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#: camel/providers/nntp/camel-nntp-grouplist.c:97
+#: camel/providers/nntp/camel-nntp-grouplist.c:106
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "Gruppenlistendatei für %s konnte nicht geladen werden: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#: camel/providers/nntp/camel-nntp-grouplist.c:157
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Gruppenlistendatei für %s konnte nicht gespeichert werden: %s"
@@ -11476,26 +11215,29 @@ msgstr ""
 "Dies führt die Legitimation am NNTP-Server mit einem unverschlüsselten "
 "Passwort durch."
 
-#: camel/providers/nntp/camel-nntp-store.c:158
+#: camel/providers/nntp/camel-nntp-store.c:118
+#: camel/providers/nntp/camel-nntp-store.c:1233
+#: camel/providers/nntp/camel-nntp-store.c:1331
+#, c-format
+msgid "NNTP Command failed: %s"
+msgstr "NNTP-Befehl gescheitert: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:227
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Begrüßung von %s konnte nicht gelesen werden: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:170
+#: camel/providers/nntp/camel-nntp-store.c:239
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP-Server %s antwortete mit Fehler-Code %d: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:326
+#: camel/providers/nntp/camel-nntp-store.c:403
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET-News über %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:640
-msgid "Stream error"
-msgstr "Fehler im Datenstrom"
-
-#: camel/providers/nntp/camel-nntp-store.c:643
+#: camel/providers/nntp/camel-nntp-store.c:777
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -11506,7 +11248,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/providers/nntp/camel-nntp-store.c:735
+#: camel/providers/nntp/camel-nntp-store.c:872
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
@@ -11515,70 +11257,70 @@ msgstr ""
 "Sie können diese Newsgroup nicht abonnieren, da sie nicht existiert.\n"
 "Vermutlich ist das gewählte Objekt ein Elternordner."
 
-#: camel/providers/nntp/camel-nntp-store.c:767
+#: camel/providers/nntp/camel-nntp-store.c:904
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
 "newsgroup does not exist!"
 msgstr "Sie können diese Newsgroup nicht abonnieren, da sie nicht existiert."
 
-#: camel/providers/nntp/camel-nntp-store.c:792
+#: camel/providers/nntp/camel-nntp-store.c:929
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 "Sie können in Newsgroups keine Ordner anlegen: Abonnieren Sie sie "
 "stattdessen."
 
-#: camel/providers/nntp/camel-nntp-store.c:800
+#: camel/providers/nntp/camel-nntp-store.c:937
 msgid "You cannot rename a folder in a News store."
 msgstr "Sie können in Newsgroups keine Ordner umbenennen."
 
-#: camel/providers/nntp/camel-nntp-store.c:808
+#: camel/providers/nntp/camel-nntp-store.c:945
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 "Sie können in Newsgroups keine Ordner entfernen: Bestellen Sie sie "
 "stattdessen ab."
 
-#: camel/providers/nntp/camel-nntp-summary.c:253
-#, c-format
-msgid "Connection error: %s"
-msgstr "Verbindungsfehler: %s"
-
-#: camel/providers/nntp/camel-nntp-summary.c:262
-#, c-format
-msgid "No such folder: %s"
-msgstr "Ordner existiert nicht: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1118
+#, fuzzy
+msgid "Authentication requested but not username provided"
+msgstr "Legitimation erforderlich"
 
-#: camel/providers/nntp/camel-nntp-summary.c:268
-#, c-format
-msgid "Could not get group: %s"
-msgstr "Gruppe konnte nicht ermittelt werden: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1146
+#, fuzzy, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr "Legitimation am POP-Server %s gescheitert: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:333
+#: camel/providers/nntp/camel-nntp-store.c:1262
 #, fuzzy
-msgid "Could not get messages: unspecified error"
-msgstr "Nachrichten konnten nicht abgerufen werden: unbekannter Fehler"
+msgid "Not connected."
+msgstr "Keine Kontake"
 
-#: camel/providers/nntp/camel-nntp-summary.c:378
+#: camel/providers/nntp/camel-nntp-store.c:1311
 #, c-format
-msgid "NNTP Command failed: %s"
-msgstr "NNTP-Befehl gescheitert: %s"
+msgid "No such folder: %s"
+msgstr "Ordner existiert nicht: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:438
-#: camel/providers/nntp/camel-nntp-summary.c:543
+#: camel/providers/nntp/camel-nntp-summary.c:218
+#: camel/providers/nntp/camel-nntp-summary.c:314
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: neue Nachrichten werden eingelesen"
 
-#: camel/providers/nntp/camel-nntp-summary.c:558
-#, c-format
-msgid "Unknown server response: %s"
-msgstr "Unbekannte Serverrückmeldung: %s"
+#: camel/providers/nntp/camel-nntp-summary.c:225
+#, fuzzy, c-format
+msgid "Unexpected server response from xover: %s"
+msgstr "Unerwartete Antwort von IMAP-Server: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:328
+#, fuzzy, c-format
+msgid "Unexpected server response from head: %s"
+msgstr "Unerwartete GnuPG-Antwort: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:605
+#: camel/providers/nntp/camel-nntp-summary.c:368
 msgid "Use cancel"
 msgstr "Abbrechen verwenden"
 
-#: camel/providers/nntp/camel-nntp-summary.c:607
+#: camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Vorgang gescheitert: %s"
@@ -11626,7 +11368,7 @@ msgstr "Nach %s Tag(en) löschen"
 msgid "Disable support for all POP3 extensions"
 msgstr "Jegliche Unterstützung von POP3-Erweiterungen deaktivieren"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107
 msgid "POP"
 msgstr "POP"
 
@@ -11720,7 +11462,7 @@ msgid "No such folder `%s'."
 msgstr "Ordner »%s« existiert nicht."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:132
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -11776,7 +11518,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "E-Mail-Zustellung über das Programm sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:119
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -12075,19 +11817,19 @@ msgstr "%.0f MB"
 msgid "%.0fG"
 msgstr "%.0f GB"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
+#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:408
 msgid "attachment"
 msgstr "anlage"
 
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:454
 msgid "Remove selected items from the attachment list"
 msgstr "Die gewählten Objekte aus der Anlagenliste entfernen"
 
-#: composer/e-msg-composer-attachment-bar.c:491
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Add attachment..."
 msgstr "Anlage hinzufügen..."
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:495
 msgid "Attach a file to the message"
 msgstr "Der Nachricht eine Datei beilegen"
 
@@ -12154,7 +11896,7 @@ msgstr "Mehrere Nachrichten"
 msgid "Open file"
 msgstr "Datei öffnen"
 
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
 msgid "Autogenerated"
 msgstr "Automatisch erzeugt"
 
@@ -12302,17 +12044,17 @@ msgstr "Datei(en) beilegen"
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
+msgid "You cannot attach the file `{0}' to this message."
 msgstr "Der Nachricht eine Datei beilegen"
 
 #. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4
-msgid "${1}"
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
 msgstr ""
 
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
 
 #. mail-composer:attach-directory primary
@@ -12408,7 +12150,7 @@ msgstr "Weiterleitung konnte nicht angelegt werden: %s"
 
 #. mail-composer:no-build-message secondary
 #: composer/mail-composer-errors.xml.h:34
-msgid "Because \"${0}\", you may need to select different mail options."
+msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
@@ -12418,8 +12160,10 @@ msgid "Could not read signature file \"{0}\"."
 msgstr "Signaturdatei konnte nicht gespeichert werden: %s"
 
 #. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38
-msgid "Because \"${1}\"."
+#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted primary
@@ -12845,11 +12589,11 @@ msgid "<b>Then</b>"
 msgstr "<b>Fällig:</b>"
 
 #: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1335
+#: mail/mail-account-gui.c:1347
 msgid "Select Folder"
 msgstr "Ordner wählen"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
 msgid "    "
 msgstr "    "
 
@@ -12909,7 +12653,7 @@ msgstr "in der Vergangenheit"
 msgid "months"
 msgstr "Monate"
 
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
 msgid "seconds"
 msgstr "Sekunden"
 
@@ -12941,20 +12685,20 @@ msgstr "mit allen lokalen Ordnern"
 msgid "years"
 msgstr "Jahre"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:916
-#: mail/mail-config.c:76 mail/mail-config.glade.h:90
+#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
+#: mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Wichtig"
 
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:919 mail/mail-config.c:79
-#: mail/mail-config.glade.h:145
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: mail/mail-config.glade.h:148
 msgid "To Do"
 msgstr "Zu erledigen"
 
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:920 mail/mail-config.c:80
-#: mail/mail-config.glade.h:94
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: mail/mail-config.glade.h:97
 msgid "Later"
 msgstr "Später"
 
@@ -13012,254 +12756,6 @@ msgstr "Eingang"
 msgid "outgoing"
 msgstr "Ausgang"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Adjust Score"
-msgstr "Bewertung anpassen"
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Color"
-msgstr "Farbe zuweisen"
-
-#: filter/libfilter-i18n.h:4
-msgid "Assign Score"
-msgstr "Bewertung zuweisen"
-
-#: filter/libfilter-i18n.h:5
-msgid "Attachments"
-msgstr "Anlagen"
-
-#: filter/libfilter-i18n.h:6
-msgid "Beep"
-msgstr "Piepston"
-
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "enthält"
-
-#: filter/libfilter-i18n.h:8
-msgid "Copy to Folder"
-msgstr "In Ordner kopieren"
-
-#: filter/libfilter-i18n.h:9
-msgid "Date received"
-msgstr "Empfangsdatum"
-
-#: filter/libfilter-i18n.h:10
-msgid "Date sent"
-msgstr "Verschickt-Datum"
-
-#: filter/libfilter-i18n.h:12
-msgid "Deleted"
-msgstr "Gelöscht"
-
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "enthält nicht"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "endet nicht auf"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "existiert nicht"
-
-#: filter/libfilter-i18n.h:16
-msgid "does not return"
-msgstr "liefert nicht"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "klingt nicht wie"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "beginnt nicht mit"
-
-#: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
-msgstr "Existieren nicht"
-
-#: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr "Entwurf"
-
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "endet auf"
-
-#: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr "Existieren"
-
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "existiert"
-
-#: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr "Ausdruck"
-
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr "Folgenachricht"
-
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "ist"
-
-#: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr "ist nach"
-
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr "ist vor"
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr "ist markiert"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "ist größer als"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "ist kleiner als"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "ist nicht"
-
-#: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr "ist nicht markiert"
-
-#: filter/libfilter-i18n.h:36
-msgid "Junk Test"
-msgstr "Unerwünscht-Test"
-
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
-#: widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Beschriftung"
-
-#: filter/libfilter-i18n.h:38
-msgid "Mailing list"
-msgstr "Mailingliste"
-
-#: filter/libfilter-i18n.h:39
-msgid "Message Body"
-msgstr "Nachrichtenrumpf"
-
-#: filter/libfilter-i18n.h:40
-msgid "Message Header"
-msgstr "Nachrichtenkopf"
-
-#: filter/libfilter-i18n.h:41
-msgid "Message is Junk"
-msgstr "Nachricht ist unerwünscht"
-
-#: filter/libfilter-i18n.h:42
-msgid "Message is not Junk"
-msgstr "Nachricht ist nicht unerwünscht"
-
-#: filter/libfilter-i18n.h:43
-msgid "Move to Folder"
-msgstr "In Ordner verschieben"
-
-#: filter/libfilter-i18n.h:44
-#, fuzzy
-msgid "Pipe to Program"
-msgstr "Das Programm beenden"
-
-#: filter/libfilter-i18n.h:45
-msgid "Play Sound"
-msgstr "Klang abspielen"
-
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Gelesen"
-
-#: filter/libfilter-i18n.h:47
-msgid "Recipients"
-msgstr "Empfänger"
-
-#: filter/libfilter-i18n.h:48
-msgid "Regex Match"
-msgstr "Regex-Treffer"
-
-#: filter/libfilter-i18n.h:49
-msgid "Replied to"
-msgstr "Beantwortet"
-
-#: filter/libfilter-i18n.h:50
-msgid "returns"
-msgstr "liefert"
-
-#: filter/libfilter-i18n.h:51
-msgid "returns greater than"
-msgstr "liefert größer als"
-
-#: filter/libfilter-i18n.h:52
-msgid "returns less than"
-msgstr "liefert kleiner als"
-
-#: filter/libfilter-i18n.h:53
-#, fuzzy
-msgid "Run Program"
-msgstr "Programm ausführen:"
-
-#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Bewertung"
-
-#: filter/libfilter-i18n.h:55
-msgid "Sender"
-msgstr "Absender"
-
-#: filter/libfilter-i18n.h:56
-msgid "Set Status"
-msgstr "Status setzen:"
-
-#: filter/libfilter-i18n.h:57
-msgid "Size (kB)"
-msgstr "Größe (kB)"
-
-#: filter/libfilter-i18n.h:58
-msgid "sounds like"
-msgstr "klingt wie"
-
-#: filter/libfilter-i18n.h:59
-msgid "Source Account"
-msgstr "Quellkonto"
-
-#: filter/libfilter-i18n.h:60
-msgid "Specific header"
-msgstr "Bestimmte Kopfzeile"
-
-#: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "beginnt mit"
-
-#: filter/libfilter-i18n.h:63
-msgid "Stop Processing"
-msgstr "Verarbeitung stoppen"
-
-#: filter/libfilter-i18n.h:64 mail/em-format.c:755 mail/em-format-html.c:1519
-#: mail/em-format-quote.c:302 mail/em-mailer-prefs.c:87
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
-#: smime/lib/e-cert.c:1079
-msgid "Subject"
-msgstr "Betreff"
-
-#: filter/libfilter-i18n.h:65
-msgid "Unset Status"
-msgstr "Status nicht setzen"
-
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Regel hinzufügen"
@@ -13277,6 +12773,11 @@ msgstr "Regelname "
 msgid "_Score Rules"
 msgstr "Bewertungsregeln"
 
+#: filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Bewertung"
+
 #: filter/searchtypes.xml.h:1
 msgid "Body contains"
 msgstr "Rumpf enthält"
@@ -13357,13 +12858,13 @@ msgstr "Signatur(en)"
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Weitergeleitete Nachricht --------"
 
-#: mail/em-composer-utils.c:1499
+#: mail/em-composer-utils.c:1495
 msgid "an unknown sender"
 msgstr "ein unbekannter Absender"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1509
+#: mail/em-composer-utils.c:1505
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "Am %a, den %d.%m.%Y um %k:%M Uhr %%+05d schrieb %%s:"
 
@@ -13401,8 +12902,8 @@ msgstr "<Klicken Sie hier, um einen Ordner auszuwählen>"
 msgid "Create New Folder"
 msgstr "Neuen Ordner anlegen"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
-#: mail/mail-component.c:701
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
+#: mail/mail-component.c:704
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Angeben, wo der Ordner angelegt werden soll:"
@@ -13417,105 +12918,106 @@ msgstr "Ordner anlegen"
 msgid "Folder _name:"
 msgstr "Ordner_name:"
 
-#: mail/em-folder-tree.c:839
+#: mail/em-folder-tree.c:833
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Ordner %s wird entfernt"
 
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree.c:835
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Ordner %s wird geöffnet"
 
-#: mail/em-folder-tree.c:848 mail/message-list.c:1555
+#: mail/em-folder-tree.c:842 mail/message-list.c:1561
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Nachrichten werden nach %s verschoben"
 
-#: mail/em-folder-tree.c:850 mail/message-list.c:1557
+#: mail/em-folder-tree.c:844 mail/message-list.c:1563
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Nachrichten werden nach %s kopiert"
 
-#: mail/em-folder-tree.c:866
+#: mail/em-folder-tree.c:860
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 "Nachrichten können nicht in virtuelle Ordner kopiert oder verschoben werden"
 
-#: mail/em-folder-tree.c:956 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "In Ordner _kopieren"
 
-#: mail/em-folder-tree.c:957 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "In Ordner _verschieben"
 
-#: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2069
-#: mail/em-folder-tree.c:2551 mail/em-folder-view.c:798
-#: mail/message-list.c:1645
+#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
+#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
+#: mail/message-list.c:1651
 msgid "_Move"
 msgstr "_Verschieben"
 
-#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#: mail/em-folder-tree.c:955 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "Aufgabe absagen"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
 #: mail/em-folder-view.c:798 mail/em-folder-view.c:812
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Ordner wählen"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
 #, fuzzy
 msgid "C_opy"
 msgstr "Kopieren"
 
-#: mail/em-folder-tree.c:2096
+#: mail/em-folder-tree.c:2088
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Ordner »%s« wird gespeichert"
 
-#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
+#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
 msgid "Create folder"
 msgstr "Ordner anlegen"
 
-#: mail/em-folder-tree.c:2474
+#: mail/em-folder-tree.c:2463
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Den Ordner »%s« umbenennen in:"
 
-#: mail/em-folder-tree.c:2476
+#: mail/em-folder-tree.c:2465
 msgid "Rename Folder"
 msgstr "Ordner umbenennen"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Ansicht"
 
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2537
 msgid "Open in _New Window"
 msgstr "In _neuem Fenster öffnen"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2555
+#: mail/em-folder-tree.c:2546
 msgid "_New Folder..."
 msgstr "Ordner a_nlegen..."
 
-#: mail/em-folder-tree.c:2558
+#: mail/em-folder-tree.c:2549
 msgid "_Rename"
 msgstr "_Umbenennen"
 
-#: mail/em-folder-tree.c:2561 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "Ei_genschaften..."
 
 #: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:889
+#: mail/mail-vfolder.c:888
 msgid "VFolders"
 msgstr "VOrdner"
 
@@ -13529,19 +13031,19 @@ msgstr ""
 msgid "Inbox"
 msgstr "Eingang"
 
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
 msgid "Loading..."
 msgstr "Ladevorgang..."
 
 #: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
 #: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
 #: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:551
+#: mail/mail-component.c:554
 msgid "Mail"
 msgstr "E-Mail"
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "Als neue Nachricht _bearbeiten..."
@@ -13554,17 +13056,17 @@ msgstr "_Drucken"
 msgid "_Reply to Sender"
 msgstr "_Antwort an Absender"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:810
+#: mail/em-folder-view.c:901 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Antwort an _Liste"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:811
+#: mail/em-folder-view.c:902 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Antwort an a_lle"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: mail/em-folder-view.c:903 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Weiterleiten"
@@ -13617,6 +13119,10 @@ msgstr "In Ordner _verschieben..."
 msgid "_Copy to Folder..."
 msgstr "In Ordner _kopieren..."
 
+#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Beschriftung"
+
 #: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Absender zum Adress_buch hinzufügen"
@@ -13667,12 +13173,12 @@ msgid "Filter on _Mailing List"
 msgstr "Filter über _Mailingliste"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
-#: mail/mail-config.glade.h:66
+#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Vorgabe"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1796
 msgid "Print Message"
 msgstr "Nachricht drucken"
 
@@ -13711,12 +13217,18 @@ msgstr "Kopie"
 msgid "Bcc"
 msgstr "Blindkopie"
 
+#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
+#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Betreff"
+
 #: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
 #: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Datum"
 
-#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
+#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
 msgid "Newsgroups"
 msgstr ""
 
@@ -13925,7 +13437,7 @@ msgstr ""
 "verschlüsselt. Daher können dritte ihren inhalt nur sehr schwerlich "
 "innerhalb eines praktikablen Zeitraums ausspähen."
 
-#: mail/em-format-html-display.c:757
+#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
 msgid "_View Certificate"
 msgstr "_Zertifikat anzeigen"
 
@@ -13982,7 +13494,7 @@ msgstr "Wöchentlich"
 msgid "Once per month"
 msgstr "monatlich"
 
-#: mail/em-migrate.c:1072
+#: mail/em-migrate.c:1168
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13994,86 +13506,86 @@ msgstr ""
 "\n"
 "Bitte haben Sie etwas Geduld. Evolution migriert Ihre Ordner..."
 
-#: mail/em-migrate.c:1506
+#: mail/em-migrate.c:1602
 #, fuzzy, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Ordner konnte nicht angelegt werden: %s: %s"
 
-#: mail/em-migrate.c:1532
+#: mail/em-migrate.c:1628
 #, fuzzy, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr ""
 "Dateideskriptor %s konnte nicht kopiert werden:\n"
 "%s"
 
-#: mail/em-migrate.c:1715
+#: mail/em-migrate.c:1811
 #, fuzzy, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Gruppenlistendatei für %s konnte nicht gespeichert werden: %s"
 
-#: mail/em-migrate.c:1919
+#: mail/em-migrate.c:2015
 #, fuzzy, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Legitimation am POP-Server %s gescheitert: %s"
 
-#: mail/em-migrate.c:1933
+#: mail/em-migrate.c:2029
 #, fuzzy, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Verzeichnis »%s« konnte nicht angelegt werden: %s"
 
-#: mail/em-migrate.c:1962
+#: mail/em-migrate.c:2058
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#: mail/em-migrate.c:2413 mail/em-migrate.c:2425
 #, fuzzy, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Verzeichnis »%s« konnte nicht angelegt werden: %s"
 
-#: mail/em-migrate.c:2480
+#: mail/em-migrate.c:2576
 #, fuzzy, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr ""
 "Ausgabedatei konnte nicht angelegt werden: %s\n"
 " %s"
 
-#: mail/em-migrate.c:2498
+#: mail/em-migrate.c:2594
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 msgstr ""
 
-#: mail/em-popup.c:699
+#: mail/em-popup.c:700
 msgid "Save As..."
 msgstr "Speichern unter..."
 
-#: mail/em-popup.c:717
+#: mail/em-popup.c:718
 #, c-format
 msgid "untitled_image.%s"
 msgstr "namenloses_bild.%s"
 
-#: mail/em-popup.c:807
+#: mail/em-popup.c:808
 msgid "Set as _Background"
 msgstr "Zum _Hintergrund machen"
 
-#: mail/em-popup.c:809
+#: mail/em-popup.c:810
 msgid "_Reply to sender"
 msgstr "_Antwort an Absender"
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:859
 msgid "_Open Link in Browser"
 msgstr "Link im Browser ö_ffnen"
 
-#: mail/em-popup.c:859
+#: mail/em-popup.c:860
 msgid "Se_nd message to..."
 msgstr "_Nachricht schicken an..."
 
-#: mail/em-popup.c:860
+#: mail/em-popup.c:861
 msgid "_Add to Addressbook"
 msgstr "Zum Adressbuch _hinzufügen"
 
-#: mail/em-popup.c:966
+#: mail/em-popup.c:967
 #, c-format
 msgid "Open in %s..."
 msgstr "In %s öffnen..."
@@ -14681,7 +14193,7 @@ msgstr "Evolution-E-Mail-Einstellungsbedienelement"
 msgid "Mail Accounts"
 msgstr "E-Mail-Konten"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
 msgid "Mail Preferences"
 msgstr "E-Mail-Einstellungen"
 
@@ -14695,15 +14207,15 @@ msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importiert Ihre alte Elm-Mail."
 
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:226
+#: mail/importers/evolution-mbox-importer.c:221
+#: mail/importers/evolution-outlook-importer.c:255
 #: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Importieren..."
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:222
-#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/evolution-mbox-importer.c:223
+#: mail/importers/evolution-outlook-importer.c:257
 #: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Bitte warten"
@@ -14726,23 +14238,25 @@ msgid "Elm"
 msgstr "Elm"
 
 #: mail/importers/evolution-mbox-importer.c:116
+#: mail/importers/evolution-outlook-importer.c:130
 #, fuzzy
 msgid "Destination folder:"
 msgstr "_Entwurfsordner:"
 
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 #, fuzzy
 msgid "Select folder to import into"
 msgstr "Wählen Sie ein zu importierendes Zertifikat..."
 
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:254
 #: mail/importers/mail-importer.c:226
 #, fuzzy, c-format
 msgid "Importing `%s'"
 msgstr "Importieren"
 
-#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/evolution-outlook-importer.c:301
 #: mail/importers/mail-importer.c:140
 #, fuzzy
 msgid "Importing mailbox"
@@ -14913,15 +14427,15 @@ msgstr ""
 msgid "%s License Agreement"
 msgstr "Key-Agreement"
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
 msgid "_Host:"
 msgstr "_Rechner:"
 
-#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
 msgid "User_name:"
 msgstr "_Benutzername:"
 
-#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
 msgid "_Path:"
 msgstr "_Pfad:"
 
@@ -14984,34 +14498,34 @@ msgstr "%d Kontakte"
 msgid ", %d unread"
 msgstr ""
 
-#: mail/mail-component.c:653
+#: mail/mail-component.c:656
 msgid "New Mail Message"
 msgstr "Neue E-Mail-Nachricht"
 
-#: mail/mail-component.c:654
+#: mail/mail-component.c:657
 msgid "_Mail Message"
 msgstr "E-_Mail-Nachricht"
 
-#: mail/mail-component.c:655
+#: mail/mail-component.c:658
 msgid "Compose a new mail message"
 msgstr "Eine neue E-Mail-Nachricht verfassen"
 
-#: mail/mail-component.c:661
+#: mail/mail-component.c:664
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Neuer VOrdner"
 
-#: mail/mail-component.c:662
+#: mail/mail-component.c:665
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "E-Mail-Filter"
 
-#: mail/mail-component.c:663
+#: mail/mail-component.c:666
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Einen neuen Kalender anlegen"
 
-#: mail/mail-component.c:795
+#: mail/mail-component.c:798
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
@@ -15023,7 +14537,7 @@ msgstr "Dienst wird überprüft"
 msgid "Connecting to server..."
 msgstr "Verbindung mit Server wird hergestellt..."
 
-#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Identität"
 
@@ -15039,7 +14553,7 @@ msgstr ""
 "verschickten E-Mails einschließen."
 
 #: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid "Receiving Mail"
 msgstr "Abrufen von E-Mails"
 
@@ -15056,7 +14570,7 @@ msgstr ""
 msgid "Please select among the following options"
 msgstr "Bitte wählen Sie aus den folgenden Optionen"
 
-#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr "Verschicken von E-Mails"
 
@@ -15069,7 +14583,7 @@ msgstr ""
 "Mails verschicken wollen. Falls Sie sich nicht sicher sind, wenden Sie sich "
 "bitte an Ihren Systemadministrator oder Internet-Provider."
 
-#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37
 msgid "Account Management"
 msgstr "Kontenverwaltung"
 
@@ -15089,253 +14603,258 @@ msgstr ""
 "Namen für dieses Konto ein.\n"
 "Dieser Name wird nur zur Anzeige auf dem Bildschirm verwendet."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:2
 #, fuzzy
 msgid " Ch_eck for Supported Types "
 msgstr "_Prüfen, welche Typen unterstützt werden "
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "<b>Preview</b>"
 msgstr "Vorschau"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "(SSL wird von diesem Evolution-Build nicht unterstützt)"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "<b>S_ignatures</b>"
 msgstr "<b>Status:</b> "
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "<b>_Languages</b>"
 msgstr "<b>Status:</b> "
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
+msgid "<small>This will make the the filter more reliable, but slower</small>"
+msgstr ""
+
+#: mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "<span weight=\"bold\">Checking for New Mail</span>"
 msgstr "Nach neuen E-Mails sehen"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
 #, fuzzy
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr "<b>_Angezeigte E-Mail-Kopfzeilen</b>"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">General</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "E-Mail-Benachrichtigung"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Security</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "Nachrichten in »Verschickt« und »Entwürfe«"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:34
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr ""
 
 # CHECK
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:35
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr ""
 "Beim Verschicken verschlüsselter E-Mails _immer vor dem Benutzer selbst "
 "verschlüsseln"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:36
 msgid "Account Editor"
 msgstr "Konteneditor"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:38
 #, fuzzy
 msgid "Add Ne_w Signature..."
 msgstr "Signatur hinzufügen..."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Add _Script"
 msgstr "Sk_ript hinzufügen"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:40
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 "Beim Verschicken verschlüsselter E-Mails _immer vor mir selbst verschlüsseln"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "_Kopie immer schicken an:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "_Blindkopie immer schicken an:"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Always _sign outgoing messages when using this account"
 msgstr "Beim Verwenden dieses Kontos ausgehende Nachrichten _immer signieren"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Schlüssel am Schlüsselbund beim Verschlüsseln _immer vertrauen"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Attach original message"
 msgstr "Originalnachricht anhängen"
 
-#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Anlage"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:48
 #, fuzzy
 msgid "Automatically _insert smiley images"
 msgstr "Smiley-Bilder _automatisch einfügen"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Automatically check for _new mail every"
 msgstr "_Automatisch nach neuen E-Mails sehen alle"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltisch (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltisch (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Beep w_hen new mail arrives"
 msgstr "Beim Eintreffen neuer E-Mails _Piepston ausgeben"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "C_haracter set:"
 msgstr "_Zeichensatz:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Ch_eck for Supported Types "
 msgstr "_Prüfen, welche Typen unterstützt werden "
 
-#: mail/mail-config.glade.h:53
-msgid "Check _Incoming Mail"
-msgstr "_Eingehende E-Mails überprüfen"
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Check _incoming mail for junk"
+msgstr "Eingehende E-Mails daraufhin überprüfen, ob sie unerwünscht sind"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Check spelling while I _type"
 msgstr ""
 "Die Rechtschreibprüfung _unmittelbar beim Eingeben der Zeichen durchführen"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Überprüft, ob eingehende Nachrichten unerwünscht sind"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 msgid "Color for _misspelled words:"
 msgstr "_Farbe für falsch geschriebene Wörter:"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Colors"
 msgstr "_Farben"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Confirm _when expunging a folder"
 msgstr "Beim Säubern eines Ordners _rückfragen"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -15353,115 +14872,120 @@ msgstr ""
 "Klicken Sie auf »Anwenden«, um Ihre Einstellungen zu\n"
 "speichern."
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
 msgid "De_fault"
 msgstr "_Vorgabe"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Default character e_ncoding:"
 msgstr "Voreingestellte Zeichen_kodierung:"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 #, fuzzy
 msgid "Defaults"
 msgstr "_Vorgaben"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 msgid "Do not quote original message"
 msgstr "Originalnachricht nicht zitieren"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "_Besprechungsanfragen nicht signieren (zur Kompatibilität mit Outlook)"
 
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Fertig"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Drafts _Folder:"
 msgstr "_Entwurfsordner:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:77
 msgid "Email Accounts"
 msgstr "E-Mail-Konten"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Email _Address:"
 msgstr "_E-Mail-Adresse:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "Empty trash folders on e_xit"
 msgstr "Müllordner beim Beenden _leeren"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
 msgid "Encry_ption certificate:"
 msgstr "_Verschlüsselungszertifikat:"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:81
 msgid "Evolution Account Assistant"
 msgstr "Evolution-Kontoassistent"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:82
 msgid "Execute Command..."
 msgstr "Befehl ausführen..."
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Fi_xed-width:"
 msgstr "_Dicktengleich:"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 msgid "Font Properties"
 msgstr "Schrifteigenschaften"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 msgid "Format messages in _HTML"
 msgstr "Nachrichten in _HTML formatieren"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "HTML Mail"
 msgstr "_HTML-E-Mail"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Headers"
 msgstr "_Kopfzeilen"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr "Zitate _hervorheben mit"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
 #: mail/mail-config.glade.h:91
+#, fuzzy
+msgid "I_nclude remote tests"
+msgstr "Dazunehmen:"
+
+#: mail/mail-config.glade.h:94
 msgid "Inline"
 msgstr "An Ort und Stelle"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Mail Configuration"
 msgstr "E-Mail-Konfiguration"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "Ort des Postfachs"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr "Nachrichteneditor"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
@@ -15469,146 +14993,146 @@ msgstr ""
 "Hinweis: Sie werden erst nach dem Passwort gefragt, wenn Sie das erste Mal "
 "eine Verbindung mit dem Server aufbauen"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Or_ganization:"
 msgstr "_Organisation:"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG-_Schlüsselkennung:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "Play sound file when new mail arri_ves"
 msgstr "Beim Eintreffen neuer E-Mails _Klangdatei abspielen"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "Beim Abschicken von Nachrichten mit ausschließlich _Blindkopie-Empfängern "
 "nachfragen"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Qmail maildir "
 msgstr "Qmail-Maildir "
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr "Originalnachricht zitieren"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr "Zitiert"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Re_member password"
 msgstr "An Passwort erinnern"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr "_Antwort an:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "Abrufen von E-Mails"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:120
 #, fuzzy
 msgid "Receiving Options"
 msgstr "Empfangs-_Optionen"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
 #, fuzzy
 msgid "Remember _password"
 msgstr "An Passwort erinnern"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
 #, fuzzy
 msgid "S_tandard Font:"
 msgstr "_Standard-Schrift:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 #, fuzzy
 msgid "Security"
 msgstr "_Sicherheit"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font"
 msgstr "Dicktengleiche HTML-Schrift wählen"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:126
 msgid "Select HTML fixed width font for printing"
 msgstr "Dicktengleiche HTML-Druckschrift wählen"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:127
 msgid "Select HTML variable width font"
 msgstr "HTML-Proprtionalschrift wählen"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:128
 msgid "Select HTML variable width font for printing"
 msgstr "HTML-Proportionaldruckschrift wählen"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:129
 #, fuzzy
 msgid "Select..."
 msgstr "_Auswählen..."
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "E-Mail wird verschickt"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Sent _Messages Folder:"
 msgstr "Ordner für _verschickte Nachrichten:"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:134
 msgid "Ser_ver requires authentication"
 msgstr "Server erfordert _Legitimation"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:135
 msgid "Server _Type: "
 msgstr "Server-_Typ: "
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:136
 msgid "Si_gning certificate:"
 msgstr "_Signaturzertifikat:"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:137
 #, fuzzy
 msgid "Signat_ure:"
 msgstr "Signatur:"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "Signatures"
 msgstr "_Signaturen"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr "_Dateiname angeben:"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "Spell Checking"
 msgstr "_Rechtschreibprüfung"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:141
 msgid "Standard Unix mbox"
 msgstr "Standard-UNIX-mbox"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "T_erminal Font:"
 msgstr "_Terminal-Schrift:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "T_ype: "
 msgstr "Typ:"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -15618,7 +15142,7 @@ msgstr ""
 "verwendet. Der von Ihnen angegebene Name\n"
 "wird lediglich zu Anzeigezwecken verwendet."
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
@@ -15628,7 +15152,7 @@ msgstr ""
 "konfigurieren. Diese Sprachliste enthält ausschließlich die Sprachen, für "
 "die ein Wörterbuch installiert sind."
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:149
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -15636,15 +15160,11 @@ msgstr ""
 "Geben Sie einen Namen an, den Sie mit diesem Konto assoziieren,\n"
 "zum Beispiel »Arbeit« oder »Persönlich«."
 
-#: mail/mail-config.glade.h:148
-msgid "Use _Daemon"
-msgstr "_Daemon verwenden"
-
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:152
 msgid "V_ariable-width:"
 msgstr "_Proportional:"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:153
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -15654,93 +15174,89 @@ msgstr ""
 "\n"
 "Klicken Sie auf »Weiter«, um zu beginnen."
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:158
 msgid "_Add Signature"
 msgstr "Signatur _hinzufügen"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Always load images from the Internet"
 msgstr "Bilder _immer aus dem Netz laden"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Digitally sign outgoing messages (by default)"
 msgstr "Ausgehende Nachrichten (per Vorgabe) digital _signieren"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:161
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Beim Eintreffen neuer E-Mails nicht benachrichtigen"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:163
 msgid "_Enable"
 msgstr "_Aktivieren"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 msgid "_Encrypt outgoing messages (by default)"
 msgstr "Ausgehende Nachrichten _verschlüsseln (per Vorgabe)"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:165
 msgid "_Forward style:"
 msgstr "_Weiterleitungsstil:"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:168
 msgid "_Load images if sender is in address book"
 msgstr "Bilder _laden, falls der Absender im Adressbuch ist"
 
-#: mail/mail-config.glade.h:167
-msgid "_Local Tests Only"
-msgstr "Ausschließlich _lokale Tests"
-
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Make this my default account"
 msgstr "Dieses zum Vo_rgabekonto machen"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_Mark messages as read after"
 msgstr "_Nachrichten als gelesen markieren nach"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Never load images from the Internet"
 msgstr "Bilder _nie aus dem Netz laden"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "Beim Abschicken von HTML-Nachrichten an Kontakte, die keine wollen, "
 "_nachfragen"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:175
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Beim Abschicken von Nachrichten mit _leerem Betreff nachfragen"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:176
 msgid "_Reply style:"
 msgstr "_Antwortstil:"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:177
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:178
 msgid "_Show animated images"
 msgstr "_Animierte Bilder anzeigen"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "_Use Secure Connection (SSL):"
 msgstr "Sichere Verbindung (_SSL) verwenden:"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "_Use the same fonts as other applications"
 msgstr "Dieselben Schriften wie andere Anwendungen _verwenden"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:181
 msgid "color"
 msgstr "Farbe"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "Beschreibung"
 
@@ -15916,7 +15432,7 @@ msgstr ""
 
 #. mail:camel-exception primary
 #: mail/mail-errors.xml.h:57
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgid "Your message with the subject \"{0}\" was not delivered."
 msgstr ""
 
 #. mail:camel-exception secondary
@@ -15983,11 +15499,6 @@ msgstr ""
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Verzeichnis »%s« konnte nicht angelegt werden: %s."
 
-#. mail:no-save-path secondary
-#: mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail:no-create-path primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
@@ -16009,12 +15520,6 @@ msgstr "Verzeichnis »%s« konnte nicht angelegt werden: %s."
 msgid "Cannot create temporary save directory."
 msgstr "Temporäres Verzeichnis konnte nicht angelegt werden: %s"
 
-#. mail:no-create-tmp-path secondary
-#: mail/mail-errors.xml.h:100 mail/mail-errors.xml.h:112
-#: widgets/misc/e-system-errors.xml.h:11 widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail:no-write-path-exists secondary
 #: mail/mail-errors.xml.h:104
 #, fuzzy
@@ -16297,29 +15802,25 @@ msgstr "Überschreiben"
 msgid "_Append"
 msgstr "Abschicken"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:785
 #, c-format
 msgid "Pinging %s"
 msgstr "Ping zu %s wird ermittelt"
 
-#: mail/mail-mt.c:897
-msgid "Working"
-msgstr "Arbeitet"
-
-#: mail/mail-ops.c:99
+#: mail/mail-ops.c:98
 msgid "Filtering Folder"
 msgstr "Ordner wird gefiltert"
 
-#: mail/mail-ops.c:260
+#: mail/mail-ops.c:259
 msgid "Fetching Mail"
 msgstr "E-Mail wird abgerufen"
 
-#: mail/mail-ops.c:543
+#: mail/mail-ops.c:542
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Ausgangsfilter konnten nicht angewandt werden: %s"
 
-#: mail/mail-ops.c:568
+#: mail/mail-ops.c:567
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -16328,115 +15829,115 @@ msgstr ""
 "Anhängen an %s gescheitert: %s\n"
 "Stattdessen wird versucht, an den lokalen »Verschicken«-Ordner anzuhängen."
 
-#: mail/mail-ops.c:577
+#: mail/mail-ops.c:576
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Anhängen an lokalen »Verschickt«-Ordner gescheitert: %s"
 
-#: mail/mail-ops.c:673
+#: mail/mail-ops.c:672
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Nachricht %d von %d wird verschickt"
 
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:703
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Fehlgeschlagen bei Nachricht %d von %d"
 
-#: mail/mail-ops.c:708
+#: mail/mail-ops.c:707
 msgid "Complete."
 msgstr "Abgeschlossen."
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:804
 msgid "Saving message to folder"
 msgstr "Nachricht wird in Ordner gespeichert"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Nachrichten werden nach %s verschoben"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Nachrichten werden nach %s kopiert"
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:1002
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Ordner in »%s« werden eingelesen"
 
-#: mail/mail-ops.c:1116
+#: mail/mail-ops.c:1115
 msgid "Forwarded messages"
 msgstr "Weitergeleitete Nachrichten"
 
-#: mail/mail-ops.c:1159
+#: mail/mail-ops.c:1158
 #, c-format
 msgid "Opening folder %s"
 msgstr "Ordner %s wird geöffnet"
 
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1230
 #, c-format
 msgid "Opening store %s"
 msgstr "Speicher %s wird geöffnet"
 
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1308
 #, c-format
 msgid "Removing folder %s"
 msgstr "Ordner %s wird entfernt"
 
-#: mail/mail-ops.c:1403
+#: mail/mail-ops.c:1402
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Ordner »%s« wird gespeichert"
 
-#: mail/mail-ops.c:1468
+#: mail/mail-ops.c:1467
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1469
+#: mail/mail-ops.c:1468
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Ordner »%s« wird gespeichert"
 
-#: mail/mail-ops.c:1524
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr "Ordner wird aufgefrischt"
 
-#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
+#: mail/mail-ops.c:1559 mail/mail-ops.c:1610
 msgid "Expunging folder"
 msgstr "Ordner wird gesäubert"
 
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1607
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Müll in »%s« wird geleert"
 
-#: mail/mail-ops.c:1609
+#: mail/mail-ops.c:1608
 msgid "Local Folders"
 msgstr "Lokale Ordner"
 
-#: mail/mail-ops.c:1692
+#: mail/mail-ops.c:1691
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Nachricht %s wird abgerufen"
 
-#: mail/mail-ops.c:1764
+#: mail/mail-ops.c:1763
 #, fuzzy, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "%d Nachricht(en) wird/werden abgerufen"
 msgstr[1] "%d Nachricht(en) wird/werden abgerufen"
 
-#: mail/mail-ops.c:1850
+#: mail/mail-ops.c:1849
 #, fuzzy, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "%d Nachricht(en) wird/werden gespeichert"
 msgstr[1] "%d Nachricht(en) wird/werden gespeichert"
 
-#: mail/mail-ops.c:1900
+#: mail/mail-ops.c:1899
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -16445,7 +15946,7 @@ msgstr ""
 "Ausgabedatei konnte nicht angelegt werden: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1928
+#: mail/mail-ops.c:1927
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -16454,11 +15955,11 @@ msgstr ""
 "Fehler beim Speichern der Nachrichten in: %s\n"
 "%s"
 
-#: mail/mail-ops.c:1999
+#: mail/mail-ops.c:1998
 msgid "Saving attachment"
 msgstr "Anlage wird gespeichert"
 
-#: mail/mail-ops.c:2016
+#: mail/mail-ops.c:2015
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -16467,17 +15968,17 @@ msgstr ""
 "Ausgabedatei konnte nicht angelegt werden: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2046
+#: mail/mail-ops.c:2045
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Daten konnten nicht geschrieben werden: %s"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Verbindung mit %s wird getrennt"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Verbindung mit %s wird erneut hergestellt"
@@ -16541,24 +16042,24 @@ msgstr "Aktualisieren..."
 msgid "Waiting..."
 msgstr "Warten..."
 
-#: mail/mail-session.c:238
+#: mail/mail-session.c:239
 msgid "User canceled operation."
 msgstr "Benutzer hat Vorgang abgebrochen."
 
-#: mail/mail-session.c:271
+#: mail/mail-session.c:272
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Passwort für %s eingeben"
 
-#: mail/mail-session.c:273
+#: mail/mail-session.c:274
 msgid "Enter Password"
 msgstr "Geben Sie das Passwort ein"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password"
 msgstr "An dieses Passwort _erinnern"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:298
 msgid "_Remember this password for the remainder of this session"
 msgstr "Für den Rest dieser Sitzung an dieses Passwort _erinnern"
 
@@ -16615,79 +16116,79 @@ msgstr "vOrdner werden aktualisiert für URI: %s"
 msgid "Updating vFolders for '%s'"
 msgstr "vOrdner werden aktualisiert für URI: %s"
 
-#: mail/mail-vfolder.c:959
+#: mail/mail-vfolder.c:958
 msgid "vFolders"
 msgstr "vOrdner"
 
-#: mail/mail-vfolder.c:998
+#: mail/mail-vfolder.c:997
 msgid "Edit VFolder"
 msgstr "VOrdner bearbeiten"
 
-#: mail/mail-vfolder.c:1082
+#: mail/mail-vfolder.c:1081
 msgid "New VFolder"
 msgstr "Neuer VOrdner"
 
-#: mail/message-list.c:946
+#: mail/message-list.c:948
 msgid "Unseen"
 msgstr "Ungelesen"
 
-#: mail/message-list.c:947
+#: mail/message-list.c:949
 msgid "Seen"
 msgstr "Gelesen"
 
-#: mail/message-list.c:948
+#: mail/message-list.c:950
 msgid "Answered"
 msgstr "Beantwortet"
 
-#: mail/message-list.c:949
+#: mail/message-list.c:951
 msgid "Multiple Unseen Messages"
 msgstr "Mehrere ungelesene Nachrichten"
 
-#: mail/message-list.c:950
+#: mail/message-list.c:952
 msgid "Multiple Messages"
 msgstr "Mehrere Nachrichten"
 
-#: mail/message-list.c:954
+#: mail/message-list.c:956
 msgid "Lowest"
 msgstr "Am niedrigsten"
 
-#: mail/message-list.c:955
+#: mail/message-list.c:957
 msgid "Lower"
 msgstr "Niedriger"
 
-#: mail/message-list.c:959
+#: mail/message-list.c:961
 msgid "Higher"
 msgstr "Höher"
 
-#: mail/message-list.c:960
+#: mail/message-list.c:962
 msgid "Highest"
 msgstr "Am höchsten"
 
-#: mail/message-list.c:1279
+#: mail/message-list.c:1285
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1286
+#: mail/message-list.c:1292
 msgid "Today %l:%M %p"
 msgstr "Heute %I:%M %p"
 
-#: mail/message-list.c:1295
+#: mail/message-list.c:1301
 msgid "Yesterday %l:%M %p"
 msgstr "Gestern %l:%M %p"
 
-#: mail/message-list.c:1307
+#: mail/message-list.c:1313
 msgid "%a %l:%M %p"
 msgstr "%a %I:%M %p"
 
-#: mail/message-list.c:1315
+#: mail/message-list.c:1321
 msgid "%b %d %l:%M %p"
 msgstr "%d. %b, %k:%M"
 
-#: mail/message-list.c:1317
+#: mail/message-list.c:1323
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3300
+#: mail/message-list.c:3321
 msgid "Generating message list"
 msgstr "Nachrichtenliste wird erzeugt"
 
@@ -16743,6 +16244,10 @@ msgstr "Weiterleiten"
 msgid "No Response Necessary"
 msgstr "Keine Antwort erforderlich"
 
+#: mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Gelesen"
+
 # CHECK
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
@@ -16854,44 +16359,48 @@ msgstr ""
 "synchronisiert werden sollen"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid "Toolbar is visible"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Whether Evolution should start up in offline mode"
 msgstr "Evolution im Offline-Modus starten"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Whether the toolbar should be visible."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
 msgid "Whether to skip the development warning dialog"
 msgstr "Den Entwickler-Warndialog nicht anzeigen"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
+#: shell/apps_evolution_shell.schemas.in.in.h:14
 msgid "mail"
 msgstr "E-Mail"
 
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
-msgstr "Das Team:"
-
-#: shell/e-shell.c:545 shell/e-shell.c:546
+#: shell/e-shell.c:588 shell/e-shell.c:589
 #, fuzzy, c-format
 msgid "%ld KB"
 msgstr "%d. %B"
 
-#: shell/e-shell.c:744
+#: shell/e-shell.c:786
 #, fuzzy
 msgid "Uknown system error."
 msgstr "Unbekannter Fehler"
 
-#: shell/e-shell.c:1101
+#: shell/e-shell.c:1143
 msgid "Invalid arguments"
 msgstr "Ungültige Argumente"
 
-#: shell/e-shell.c:1103
+#: shell/e-shell.c:1145
 msgid "Cannot register on OAF"
 msgstr "Registrierung bei OAF konnte nicht stattfinden"
 
-#: shell/e-shell.c:1105
+#: shell/e-shell.c:1147
 msgid "Configuration Database not found"
 msgstr "Konfigurationsdatenbank nicht gefunden"
 
-#: shell/e-shell.c:1107
+#: shell/e-shell.c:1149
 msgid "Generic error"
 msgstr "Allgemeiner Fehler"
 
@@ -16952,7 +16461,7 @@ msgstr ""
 msgid "Select importer"
 msgstr "Wählen Sie einen Importeur"
 
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1026
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
 #, c-format
 msgid "File %s does not exist"
 msgstr "Datei %s existiert nicht"
@@ -16980,31 +16489,32 @@ msgstr ""
 "Importieren von %s.\n"
 "Erstes Objekt wird importiert."
 
-#: shell/e-shell-importer.c:549
+#: shell/e-shell-importer.c:570
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: shell/e-shell-importer.c:598
-msgid "_Filename:"
-msgstr "_Dateiname:"
+#: shell/e-shell-importer.c:626
+#, fuzzy
+msgid "F_ilename:"
+msgstr "Dateiname:"
 
-#: shell/e-shell-importer.c:603
+#: shell/e-shell-importer.c:631
 msgid "Select a file"
 msgstr "Eine Datei wählen"
 
-#: shell/e-shell-importer.c:613
+#: shell/e-shell-importer.c:642
 msgid "File _type:"
 msgstr "Datei_typ:"
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:681
 msgid "Import data and settings from _older programs"
 msgstr "Daten und Einstellungen aus ä_lteren Programmen importieren"
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:684
 msgid "Import a _single file"
 msgstr "Eine _einzelne Datei importieren"
 
-#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -17012,26 +16522,26 @@ msgstr ""
 "Bitte warten...\n"
 "Nach existierenden Einstellungen wird gesucht"
 
-#: shell/e-shell-importer.c:727
+#: shell/e-shell-importer.c:756
 msgid "Starting Intelligent Importers"
 msgstr "Intelligente Importeure werden gestartet"
 
-#: shell/e-shell-importer.c:853 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
 #, c-format
 msgid "From %s:"
 msgstr "Von %s:"
 
-#: shell/e-shell-importer.c:1044
+#: shell/e-shell-importer.c:1073
 #, fuzzy, c-format
 msgid "No importer available for file %s"
 msgstr "Kein Treiber für Protokoll »%s« verfügbar"
 
-#: shell/e-shell-importer.c:1056
+#: shell/e-shell-importer.c:1085
 #, fuzzy
 msgid "Unable to execute importer"
 msgstr "gpg konnte nicht ausgeführt werden."
 
-#: shell/e-shell-importer.c:1169
+#: shell/e-shell-importer.c:1199
 msgid "_Import"
 msgstr "_Importieren"
 
@@ -17081,63 +16591,63 @@ msgstr "Ordnername darf das Raute-Zeichen »#« nicht enthalten."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' und '..' sind reservierte Ordnernamen."
 
-#: shell/e-shell-window.c:336
+#: shell/e-shell-window.c:337
 #, fuzzy
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution ist im Augenblick online. Klicken Sie auf diesen Knopf, um "
 "offline zu arbeiten."
 
-#: shell/e-shell-window.c:343
+#: shell/e-shell-window.c:344
 #, fuzzy
 msgid "Evolution is in the process of going offline."
 msgstr "Ximian Evolution geht gerade offline."
 
-#: shell/e-shell-window.c:349
+#: shell/e-shell-window.c:350
 #, fuzzy
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution ist im Augenblick offline. Klicken Sie auf diesen Knopf, um "
 "online zu arbeiten."
 
-#: shell/e-shell-window.c:621
+#: shell/e-shell-window.c:637
 #, fuzzy, c-format
 msgid "Switch to %s"
 msgstr "E-Mail an %s"
 
-#: shell/e-shell-window-commands.c:64
+#: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 "Die GNOME-Pilot-Werkzeuge scheinen auf diesem System nicht installiert zu "
 "sein."
 
-#: shell/e-shell-window-commands.c:72
+#: shell/e-shell-window-commands.c:74
 #, c-format
 msgid "Error executing %s."
 msgstr "Fehler beim Ausführen von %s."
 
-#: shell/e-shell-window-commands.c:121
+#: shell/e-shell-window-commands.c:123
 msgid "Bug buddy is not installed."
 msgstr "Bug-Buddy ist nicht installiert."
 
-#: shell/e-shell-window-commands.c:129
+#: shell/e-shell-window-commands.c:131
 msgid "Bug buddy could not be run."
 msgstr "Bug-Buddy konnte nicht gestartet werden."
 
-#: shell/e-shell-window-commands.c:171
+#: shell/e-shell-window-commands.c:323
 #, fuzzy
-msgid "About Evolution"
-msgstr "Info zu Ximian Evolution"
+msgid "Groupware Suite"
+msgstr "Gruppe"
 
-#: shell/e-shell-window-commands.c:382
+#: shell/e-shell-window-commands.c:563
 msgid "_Work Online"
 msgstr "_Online arbeiten"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "_Offline arbeiten"
 
-#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Offline arbeiten"
 
@@ -17149,43 +16659,6 @@ msgstr "Kontrollkästchen"
 msgid "New"
 msgstr "Neu"
 
-#: shell/evolution-shell-component-utils.c:115
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Unbekannter Fehler."
-
-#: shell/evolution-shell-component-utils.c:118
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Der Fehler vom Komponentensystem ist:\n"
-"%s"
-
-#: shell/evolution-shell-component-utils.c:125
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Der Fehler vom Aktivierungssystem ist:\n"
-"%s"
-
 #: shell/evolution-test-component.c:140
 msgid "New Test"
 msgstr "Neuer Test"
@@ -17529,30 +17002,30 @@ msgid ""
 "Click help for details."
 msgstr ""
 
-#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:522
+#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
+#: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
 msgstr "Wählen Sie ein zu importierendes Zertifikat..."
 
-#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:604
+#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
+#: smime/gui/certificate-manager.c:638
 msgid "Certificate Name"
 msgstr "Zertifikatname"
 
-#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
+#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
 msgid "Purposes"
 msgstr "Verwendungszwecke"
 
-#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:517
+#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr "Seriennummer"
 
-#: smime/gui/certificate-manager.c:267
+#: smime/gui/certificate-manager.c:271
 msgid "Expires"
 msgstr "Läuft aus"
 
-#: smime/gui/certificate-manager.c:417
+#: smime/gui/certificate-manager.c:446
 msgid "E-Mail Address"
 msgstr "E-Mail-Adresse"
 
@@ -17596,6 +17069,11 @@ msgstr ""
 "Aussteller:\n"
 "      Empfänger: %s\n"
 
+#: smime/gui/e-cert-selector.c:169
+#, fuzzy
+msgid "Select certificate"
+msgstr "SSL-Client-Zertifikat"
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr "<Kein Teil des Zertifikats>"
@@ -17655,7 +17133,7 @@ msgstr ""
 "Sie sein Zertifikat und seine Verfahrensweisen unter die Lupe nehmen (falls "
 "möglich)."
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
 msgid "Certificate"
 msgstr "Zertifikat"
 
@@ -17675,19 +17153,23 @@ msgstr "Common-Name (CN)"
 msgid "Contact Certificates"
 msgstr "Kontaktzertifikate"
 
-#: smime/gui/smime-ui.glade.h:21
-#, no-c-format
-msgid "Do you want to trust \"%s\" for the following purposes?"
-msgstr "Wollen Sie »%s« für folgende Verwendungszwecke vertrauen?"
+#: smime/gui/smime-ui.glade.h:20
+msgid "Do not trust the authenticity of this certificate"
+msgstr ""
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:21
 msgid "Dummy window only"
 msgstr "Nur ein Dummy-Fenster"
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:22
 msgid "Edit"
 msgstr "Bearbeiten"
 
+#: smime/gui/smime-ui.glade.h:23
+#, fuzzy
+msgid "Email Certificate Trust Settings"
+msgstr "E-Mail-Zertifizierungsstelle"
+
 #: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr "E-Mail-Empfangszertifikat"
@@ -17720,253 +17202,262 @@ msgstr "Organisationseinheit (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "SHA1-Fingerabdruck"
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr "SSL-Client-Zertifikat"
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr "SSL-Server-Zertifikat"
 
 #: smime/gui/smime-ui.glade.h:37
+msgid "Trust the authenticity of this certificate"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
 msgid "Trust this CA to identify email users."
 msgstr "Dieser CA bei der Identifikation von E-Mail-Benutzern vertrauen."
 
-#: smime/gui/smime-ui.glade.h:38
+#: smime/gui/smime-ui.glade.h:39
 msgid "Trust this CA to identify software developers."
 msgstr "Dieser CA bei der Identifikation von Software-Entwicklern vertrauen."
 
-#: smime/gui/smime-ui.glade.h:39
+#: smime/gui/smime-ui.glade.h:40
 msgid "Trust this CA to identify web sites."
 msgstr "Dieser CA bei der Website-Identifikation vertrauen."
 
-#: smime/gui/smime-ui.glade.h:40
+#: smime/gui/smime-ui.glade.h:41
 msgid "View"
 msgstr "Anzeigen"
 
-#: smime/gui/smime-ui.glade.h:41
-msgid "View Certificate"
-msgstr "Zertifikat anzeigen"
-
 #: smime/gui/smime-ui.glade.h:42
-msgid "You have been asked to trust a new Certificate Authority (CA)."
-msgstr ""
-"Sie wurden darum gebeten, einer neuen Zertifizierungsstelle (CA) zu "
-"vertrauen."
-
-#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 "Sie haben Zertifikate folgender Organisationen, die Sie identifizieren:"
 
-#: smime/gui/smime-ui.glade.h:44
+#: smime/gui/smime-ui.glade.h:43
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 "Sie haben Zertifikate, die folgende Zertifizierungsstellen identifizieren:"
 
-#: smime/gui/smime-ui.glade.h:45
+#: smime/gui/smime-ui.glade.h:44
 msgid "You have certificates on file that identify these people:"
 msgstr "Sie haben Zertifikate, die folgende Personen identifizieren:"
 
-#: smime/gui/smime-ui.glade.h:46
+#: smime/gui/smime-ui.glade.h:45
 msgid "Your Certificates"
 msgstr "Ihre Zertifikate"
 
-#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
+#: smime/gui/smime-ui.glade.h:46
+msgid "_Edit CA Trust"
+msgstr ""
+
+#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d.%m.%Y"
 
-#: smime/lib/e-cert.c:478
+#. x509 certificate usage types
+#: smime/lib/e-cert.c:424
+#, fuzzy
+msgid "Sign"
+msgstr "Signieren"
+
+#: smime/lib/e-cert.c:425
+#, fuzzy
+msgid "Encrypt"
+msgstr "Verschlüsselt"
+
+#: smime/lib/e-cert.c:530
 msgid "Version"
 msgstr "Version"
 
-#: smime/lib/e-cert.c:493
+#: smime/lib/e-cert.c:545
 msgid "Version 1"
 msgstr "Version 1"
 
-#: smime/lib/e-cert.c:496
+#: smime/lib/e-cert.c:548
 msgid "Version 2"
 msgstr "Version 2"
 
-#: smime/lib/e-cert.c:499
+#: smime/lib/e-cert.c:551
 msgid "Version 3"
 msgstr "Version 3"
 
-#: smime/lib/e-cert.c:581
+#: smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 mit RSA-Verschlüsselung"
 
-#: smime/lib/e-cert.c:584
+#: smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 mit RSA-Verschlüsselung"
 
-#: smime/lib/e-cert.c:587
+#: smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 mit RSA-Verschlüsselung"
 
-#: smime/lib/e-cert.c:590
+#: smime/lib/e-cert.c:642
 msgid "C"
 msgstr "C"
 
-#: smime/lib/e-cert.c:593
+#: smime/lib/e-cert.c:645
 msgid "CN"
 msgstr "CN"
 
-#: smime/lib/e-cert.c:596
+#: smime/lib/e-cert.c:648
 msgid "OU"
 msgstr "OU"
 
-#: smime/lib/e-cert.c:599
+#: smime/lib/e-cert.c:651
 msgid "O"
 msgstr "O"
 
-#: smime/lib/e-cert.c:602
+#: smime/lib/e-cert.c:654
 msgid "L"
 msgstr "L"
 
-#: smime/lib/e-cert.c:605
+#: smime/lib/e-cert.c:657
 msgid "DN"
 msgstr "DN"
 
-#: smime/lib/e-cert.c:608
+#: smime/lib/e-cert.c:660
 msgid "DC"
 msgstr "DC"
 
-#: smime/lib/e-cert.c:611
+#: smime/lib/e-cert.c:663
 msgid "ST"
 msgstr "ST"
 
-#: smime/lib/e-cert.c:614
+#: smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1-RSA-Verschlüsselung"
 
-#: smime/lib/e-cert.c:617
+#: smime/lib/e-cert.c:669
 msgid "Certificate Key Usage"
 msgstr "Verwendungszweck des Zertifikatsschlüssels"
 
-#: smime/lib/e-cert.c:620
+#: smime/lib/e-cert.c:672
 msgid "Netscape Certificate Type"
 msgstr "Netscape-Zertifikattyp"
 
-#: smime/lib/e-cert.c:623
+#: smime/lib/e-cert.c:675
 msgid "Certificate Authority Key Identifier"
 msgstr "Schlüsselidentifikator der Zertifizierungsstelle"
 
-#: smime/lib/e-cert.c:626
+#: smime/lib/e-cert.c:678
 msgid "UID"
 msgstr "UID"
 
-#: smime/lib/e-cert.c:635
+#: smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Objektidentifikator (%s)"
 
-#: smime/lib/e-cert.c:686
+#: smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
 msgstr "Algorithmusidentifikator"
 
-#: smime/lib/e-cert.c:694
+#: smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
 msgstr "Algorithmus-Parameter"
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:768
 msgid "Subject Public Key Info"
 msgstr "Infos zum öffentlichen Empfängerschlüssel"
 
-#: smime/lib/e-cert.c:721
+#: smime/lib/e-cert.c:773
 msgid "Subject Public Key Algorithm"
 msgstr "Algorithmus des öffentlichen Empfängerschlüssels"
 
-#: smime/lib/e-cert.c:736
+#: smime/lib/e-cert.c:788
 msgid "Subject's Public Key"
 msgstr "Öffentlicher Schlüssel des Empfängers"
 
-#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
+#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
 msgid "Error: Unable to process extension"
 msgstr "Fehler: Erweiterung konnte nicht verarbeitet werden"
 
-#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
+#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr "Objektunterzeichner"
 
-#: smime/lib/e-cert.c:782
+#: smime/lib/e-cert.c:834
 msgid "SSL Certificate Authority"
 msgstr "SSL-Zertifizierungsstelle"
 
-#: smime/lib/e-cert.c:786
+#: smime/lib/e-cert.c:838
 msgid "Email Certificate Authority"
 msgstr "E-Mail-Zertifizierungsstelle"
 
-#: smime/lib/e-cert.c:814
+#: smime/lib/e-cert.c:866
 msgid "Signing"
 msgstr "Signieren"
 
 # CHECK
-#: smime/lib/e-cert.c:818
+#: smime/lib/e-cert.c:870
 msgid "Non-repudiation"
 msgstr "Unleugbarkeit"
 
-#: smime/lib/e-cert.c:822
+#: smime/lib/e-cert.c:874
 msgid "Key Encipherment"
 msgstr "Schlüsselverschlüsselung"
 
-#: smime/lib/e-cert.c:826
+#: smime/lib/e-cert.c:878
 msgid "Data Encipherment"
 msgstr "Datenverschlüsselung"
 
 # CHECK gibt's ne Übersetzung für diese Methode?
-#: smime/lib/e-cert.c:830
+#: smime/lib/e-cert.c:882
 msgid "Key Agreement"
 msgstr "Key-Agreement"
 
-#: smime/lib/e-cert.c:834
+#: smime/lib/e-cert.c:886
 msgid "Certificate Signer"
 msgstr "Zertifikatunterzeichner"
 
-#: smime/lib/e-cert.c:838
+#: smime/lib/e-cert.c:890
 msgid "CRL Signer"
 msgstr "CRL-Unterzeichner"
 
-#: smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:938
 msgid "Critical"
 msgstr "Kritisch"
 
-#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
+#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
 msgid "Not Critical"
 msgstr "Nicht-kritisch"
 
-#: smime/lib/e-cert.c:912
+#: smime/lib/e-cert.c:964
 msgid "Extensions"
 msgstr "Erweiterungen"
 
-#: smime/lib/e-cert.c:983
+#: smime/lib/e-cert.c:1035
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
 msgid "Certificate Signature Algorithm"
 msgstr "Algorithmus der Zertifikatsignatur"
 
-#: smime/lib/e-cert.c:1048
+#: smime/lib/e-cert.c:1100
 msgid "Issuer"
 msgstr "Aussteller"
 
-#: smime/lib/e-cert.c:1102
+#: smime/lib/e-cert.c:1154
 msgid "Issuer Unique ID"
 msgstr "Eindeutige Ausstellerkennung"
 
-#: smime/lib/e-cert.c:1121
+#: smime/lib/e-cert.c:1173
 msgid "Subject Unique ID"
 msgstr "Eindeutige Empfängerkennung"
 
-#: smime/lib/e-cert.c:1164
+#: smime/lib/e-cert.c:1216
 msgid "Certificate Signature Value"
 msgstr "Wert der Zertifikatsignatur"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
+#: smime/lib/e-cert-db.c:608
 msgid "Certificate already exists"
 msgstr "Zertifikat existiert bereits"
 
@@ -18112,7 +17603,7 @@ msgstr "Den aktuellen Kontakt anzeigen"
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "A_ktionen"
 
@@ -18275,7 +17766,7 @@ msgstr "S_chließen"
 #: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:3
+#: ui/evolution.xml.h:4
 msgid "Close"
 msgstr "Schließen"
 
@@ -18288,7 +17779,7 @@ msgid "Delete this item"
 msgstr "Diesen Eintrag löschen"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr "Hauptwerkzeugleiste"
 
@@ -18331,7 +17822,7 @@ msgstr "Diesen Eintrag auf Platte speichern"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:44
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "_File"
 msgstr "_Datei"
 
@@ -18590,13 +18081,13 @@ msgstr "Auswahl _umkehren"
 msgid "_Threaded Message List"
 msgstr "Nachrichtenliste nach _Threads sortieren"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Dieses Fenster schließen"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "_Close"
 msgstr "S_chließen"
 
@@ -18999,7 +18490,7 @@ msgstr "_Vorherige Nachricht"
 msgid "_Quoted"
 msgstr "_Zitiert"
 
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
 msgid "_Tools"
 msgstr "_Werkzeuge"
 
@@ -19297,110 +18788,124 @@ msgid "_Open Task"
 msgstr "Aufgabe ö_ffnen"
 
 #: ui/evolution.xml.h:1
-msgid "About Ximian Evolution..."
-msgstr "Info zu Ximian Evolution..."
+#, fuzzy
+msgid "About Evolution..."
+msgstr "Info zu Ximian Evolution"
 
 #: ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
 msgstr "Die Evolution-Einstellungen festlegen"
 
-#: ui/evolution.xml.h:5
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the visibility of the toolbar"
+msgstr "Die Eigenschaften dieses Ordners ändern"
+
+#: ui/evolution.xml.h:6
 #, fuzzy
 msgid "Create a new window displaying this folder"
 msgstr "Einen neuen Kalender anlegen"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "_Beenden"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Ximian-Evolution-_FAQ"
+
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Das Programm beenden"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:10
 msgid "Forget _Passwords"
 msgstr "_Passwörter verwerfen"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:11
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 "Erinnerte Passwörter verwerfen, sodass Sie wieder nach ihnen gefragt werden"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:12
 msgid "Import data from other programs"
 msgstr "Daten aus anderen Programmen importieren"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:14
 #, fuzzy
 msgid "New _Window"
 msgstr "_Fenster"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Pi_lot Settings..."
 msgstr "_Pilot-Einstellungen..."
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Send / Receive"
 msgstr "Verschicken/Abrufen"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Send queued items and retrieve new items"
 msgstr "Objekte in der Warteschlange verschicken und neue Objekte abrufen"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Set up Pilot configuration"
 msgstr "Die Pilot-Einstellungen festlegen"
 
-#: ui/evolution.xml.h:17
-msgid "Show information about Ximian Evolution"
+#: ui/evolution.xml.h:19
+#, fuzzy
+msgid "Show information about Evolution"
 msgstr "Informationen über Ximian Evolution anzeigen"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:20
 msgid "Submit Bug Report"
 msgstr "Fehlerbericht einschicken"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:21
 msgid "Submit _Bug Report"
 msgstr "Fehlerbericht einschicken"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Einen Fehlerbericht mit Bug Buddy einschicken"
 
-#: ui/evolution.xml.h:21
-msgid "Toggle whether we are working offline."
-msgstr "Offline-Arbeitsmodus an/aus."
-
 #: ui/evolution.xml.h:23
-msgid "Ximian Evolution _FAQ"
-msgstr "Ximian-Evolution-_FAQ"
+#, fuzzy
+msgid "T_oolbar"
+msgstr "Hauptwerkzeugleiste"
 
 #: ui/evolution.xml.h:24
-msgid "_About Ximian Evolution..."
-msgstr "_Info zu Ximian Evolution..."
+msgid "Toggle whether we are working offline."
+msgstr "Offline-Arbeitsmodus an/aus."
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "_About Evolution..."
+msgstr "Info zu Ximian Evolution"
+
+#: ui/evolution.xml.h:30
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "_Import..."
 msgstr "_Importieren..."
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "_New"
 msgstr "_Neu"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 #, fuzzy
 msgid "_Quick Reference"
 msgstr "E-Mail-Einstellungen"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_Send / Receive"
 msgstr "_Verschicken/Abrufen"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 #, fuzzy
 msgid "_Window"
 msgstr "_Fenster"
@@ -19473,7 +18978,7 @@ msgid "With _Status"
 msgstr "Status setzen:"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:626
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:635
 msgid "UTC"
 msgstr "UTC"
 
@@ -19631,29 +19136,29 @@ msgstr "Weitere..."
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
-#: widgets/misc/e-error.c:121
+#: widgets/misc/e-error.c:79 widgets/misc/e-error.c:80
+#: widgets/misc/e-error.c:122
 msgid "Evolution Error"
 msgstr "Evolution-Fehler"
 
-#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
-#: widgets/misc/e-error.c:119
+#: widgets/misc/e-error.c:81 widgets/misc/e-error.c:82
+#: widgets/misc/e-error.c:120
 #, fuzzy
 msgid "Evolution Warning"
 msgstr "Evolution-E-Mail"
 
-#: widgets/misc/e-error.c:118
+#: widgets/misc/e-error.c:119
 #, fuzzy
 msgid "Evolution Information"
 msgstr "Besprechungsinformationen"
 
-#: widgets/misc/e-error.c:120
+#: widgets/misc/e-error.c:121
 #, fuzzy
 msgid "Evolution Query"
 msgstr "Evolution-Test"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:410
+#: widgets/misc/e-error.c:415
 #, fuzzy, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -19806,16 +19311,555 @@ msgstr ""
 "In »%s« konnte nicht gespeichert werden:\n"
 "  %s"
 
-#: widgets/misc/e-task-widget.c:211
+#: widgets/misc/e-task-widget.c:212
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: widgets/misc/e-task-widget.c:216
+#: widgets/misc/e-task-widget.c:217
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (zu %d%% abgeschlossen)"
 
+#~ msgid "Failed to connect to LDAP server"
+#~ msgstr "Verbindungsaufbau mit LDAP-Server gescheitert"
+
+#~ msgid "Failed to authenticate with LDAP server"
+#~ msgstr "Legitimation am LDAP-Server gescheitert"
+
+#~ msgid "Could not perform query on Root DSE"
+#~ msgstr "Abfrage auf Root DSE konnte nicht ausgeführt werden"
+
+#~ msgid "The server responded with no supported search bases"
+#~ msgstr "Der Server antwortete mit nicht unterstützten Suchbasen"
+
+#~ msgid "This server does not support LDAPv3 schema information"
+#~ msgstr "Dieser Server unterstützt keine LDAPv3-Schemainformationen"
+
+#~ msgid "Error retrieving schema information"
+#~ msgstr "Fehler beim Abrufen der Schemainformationen"
+
+#~ msgid "Server did not respond with valid schema information"
+#~ msgstr "Server antwortetet nicht mit einer gültigen Schemainformationen"
+
+#~ msgid "  S_how Supported Bases "
+#~ msgstr "  Unterstützte Basen _anzeigen"
+
+#~ msgid "1:00"
+#~ msgstr "1:00"
+
+#~ msgid "5:00"
+#~ msgstr "5:00"
+
+#~ msgid "Connecting"
+#~ msgstr "Verbindung wird hergestellt"
+
+#~ msgid "Distinguished _name:"
+#~ msgstr "Eindeutiger _Name:"
+
+#~ msgid "Email address:"
+#~ msgstr "E-Mail-Adresse:"
+
+#~ msgid "Evolution will use this DN to authenticate you with the server"
+#~ msgstr ""
+#~ "Evolution verwendet diesen eindeutigen Namen, um Sie beim Server zu "
+#~ "legitimieren"
+
+#~ msgid "One"
+#~ msgstr "Eins"
+
+#~ msgid "S_earch scope: "
+#~ msgstr "Suchb_ereich: "
+
+#~ msgid "Searching"
+#~ msgstr "Suchen"
+
+#~ msgid "Sub"
+#~ msgstr "Sub"
+
+#~ msgid "This option controls how long a search will be run."
+#~ msgstr "Dies legt fest, wie lange eine Suche ausgeführt wird."
+
+#~ msgid "U_se SSL/TLS:"
+#~ msgstr "_SSL/TSL verwenden:"
+
+#~ msgid "_Display name:"
+#~ msgstr "Angezeigter _Name:"
+
+#~ msgid "_Port number:"
+#~ msgstr "_Port-Nummer:"
+
+#~ msgid "_Search base:"
+#~ msgstr "Such_basis:"
+
+#~ msgid "_Server name:"
+#~ msgstr "_Servername:"
+
+#~ msgid "_Timeout (minutes):"
+#~ msgstr "_Zeitüberschreitung (Minuten):"
+
+#~ msgid "connecting-tab"
+#~ msgstr "connecting-tab"
+
+#~ msgid "general-tab"
+#~ msgstr "general-tab"
+
+#~ msgid "searching-tab"
+#~ msgstr "searching-tab"
+
+#, fuzzy
+#~ msgid "Job title:"
+#~ msgstr "_Tätigkeit:"
+
+#, fuzzy
+#~ msgid "Webcam:"
+#~ msgstr "Website:"
+
+#~ msgid "Category editor not available."
+#~ msgstr "Der Kategorieeditor ist nicht verfügbar."
+
+#, fuzzy
+#~ msgid ""
+#~ "The following entries are invalid:\n"
+#~ "\n"
+#~ msgstr "Die folgenden Verbindungen sind zur Zeit aktiv:"
+
+#~ msgid "Could not find widget for a field: `%s'"
+#~ msgstr "Widget für ein Feld konnte nicht gefunden werden: »%s«"
+
+#~ msgid "Do you want to save changes?"
+#~ msgstr "Wollen Sie die Änderungen speichern?"
+
+#~ msgid "Error saving %s: %s"
+#~ msgstr "Fehler beim Speichern von %s: %s"
+
+#~ msgid ""
+#~ "The addressbook backend for\n"
+#~ "%s\n"
+#~ "has crashed. You will have to restart Evolution in order to use it again"
+#~ msgstr ""
+#~ "Die Adressbuch-Hintergrundkomponente für\n"
+#~ "%s\n"
+#~ "ist abgestürzt. Sie müssen Evolution neustarten, um sie wieder verwenden "
+#~ "zu können"
+
+#~ msgid "Can not load URI"
+#~ msgstr "URI konnte nicht geladen werden"
+
+#~ msgid "Calendar Properties"
+#~ msgstr "Kalendereigenschaften"
+
+#~ msgid "Remote"
+#~ msgstr "Entfernt"
+
+#~ msgid "Task List Properties"
+#~ msgstr "Aufgabenlisteneigenschaften"
+
+#~ msgid "_Refresh Interval:"
+#~ msgstr "_Auffrischintervall:"
+
+#~ msgid "_Source URL:"
+#~ msgstr "_Quell-URL:"
+
+#~ msgid ""
+#~ "The event being deleted is a meeting, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "Das zu löschende Ereignis ist eine Besprechung. Soll eine Absagenachricht "
+#~ "an die betroffene(n) Person(en) verschickt werden?"
+
+#~ msgid "Are you sure you want to cancel and delete this meeting?"
+#~ msgstr ""
+#~ "Sind Sie sicher, dass Sie diese Besprechung absagen und löschen wollen?"
+
+#~ msgid ""
+#~ "The task being deleted is assigned, would you like to send a cancellation "
+#~ "notice?"
+#~ msgstr ""
+#~ "Die zu löschende Aufgabe wurde bereits jemandem zugewiesen. Soll eine "
+#~ "Absagenachricht an die betroffene(n) Person(en) verschickt werden?"
+
+#~ msgid "Are you sure you want to cancel and delete this task?"
+#~ msgstr "Sind Sie sicher, dass Sie diese Aufgabe absagen und löschen wollen?"
+
+#~ msgid ""
+#~ "The journal entry being deleted is published, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "Der zu löschende Journaleintrag wurde bereits veröffentlicht. Soll eine "
+#~ "Absagenachricht verschickt werden?"
+
+#~ msgid "Are you sure you want to cancel and delete this journal entry?"
+#~ msgstr ""
+#~ "Sind Sie sicher, dass Sie diesen Journaleintrag absagen und löschen "
+#~ "wollen?"
+
+#~ msgid "Are you sure you want to delete the appointment `%s'?"
+#~ msgstr "Sind Sie sicher, dass Sie den Termin »%s« löschen wollen?"
+
+#~ msgid "Are you sure you want to delete this untitled appointment?"
+#~ msgstr "Sind Sie sicher, dass Sie diesen unbenannten Termin löschen wollen?"
+
+#~ msgid "Are you sure you want to delete the task `%s'?"
+#~ msgstr "Sind Sie sicher, dass Sie die Aufgabe »%s« löschen wollen?"
+
+#~ msgid "Are you sure you want to delete this untitled task?"
+#~ msgstr "Sind Sie sicher, dass Sie diese unbenannte Aufgabe löschen wollen?"
+
+#~ msgid "Are you sure you want to delete the journal entry `%s'?"
+#~ msgstr "Sind Sie sicher, dass Sie den Journaleintrag »%s« löschen wollen?"
+
+#~ msgid "Are you sure want to delete this untitled journal entry?"
+#~ msgstr ""
+#~ "Sind Sie sicher, dass Sie diesen unbenannten Journaleintrag löschen "
+#~ "wollen?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d appointment?"
+#~ msgid_plural "Are you sure you want to delete %d appointments?"
+#~ msgstr[0] "Sind Sie sicher, dass Sie %d Termine löschen wollen?"
+#~ msgstr[1] "Sind Sie sicher, dass Sie %d Termine löschen wollen?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d task?"
+#~ msgid_plural "Are you sure you want to delete %d tasks?"
+#~ msgstr[0] "Sind Sie sicher, dass Sie %d Aufgaben löschen wollen?"
+#~ msgstr[1] "Sind Sie sicher, dass Sie %d Aufgaben löschen wollen?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d journal entry?"
+#~ msgid_plural "Are you sure you want to delete %d journal entries?"
+#~ msgstr[0] "Sind Sie sicher, dass Sie %d Journaleinträge löschen wollen?"
+#~ msgstr[1] "Sind Sie sicher, dass Sie %d Journaleinträge löschen wollen?"
+
+#~ msgid "_Invite Others..."
+#~ msgstr "Andere einladen..."
+
+#~ msgid ""
+#~ "This event has been changed, but has not been saved.\n"
+#~ "\n"
+#~ "Do you wish to save your changes?"
+#~ msgstr ""
+#~ "Dieses Ereignis wurde geändert, aber nicht gespeichert.\n"
+#~ "\n"
+#~ "Möchten Sie Ihre Änderungen speichern?"
+
+# CHECK
+#~ msgid "_Discard Changes"
+#~ msgstr "Änderungen _verwerfen"
+
+#~ msgid "Save Event"
+#~ msgstr "Ereignis speichern"
+
+#~ msgid "The meeting information has been created. Send it?"
+#~ msgstr "Die Besprechungsinformationen wurden erstellt. Jetzt verschicken?"
+
+#~ msgid "The meeting information has changed. Send an updated version?"
+#~ msgstr ""
+#~ "Die Besprechungsinformationen haben sich geändert. Eine aktualisierte "
+#~ "Version verschicken?"
+
+#~ msgid "The task assignment information has been created. Send it?"
+#~ msgstr ""
+#~ "Die Aufgabenzuweisungsinformationen wurden erstellt. Jetzt verschicken?"
+
+#~ msgid "The task information has changed. Send an updated version?"
+#~ msgstr ""
+#~ "Die Aufgabeninformationen haben sich geändert. Eine aktualisierte Version "
+#~ "verschicken?"
+
+#, fuzzy
+#~ msgid "The task backend for '%s' has crashed."
+#~ msgstr ""
+#~ "Das Task-Backend für\n"
+#~ "%s\n"
+#~ " ist abgestürzt."
+
+#, fuzzy
+#~ msgid "The calendar backend for '%s' has crashed."
+#~ msgstr ""
+#~ "Das Kalender-Backend für\n"
+#~ "%s\n"
+#~ " ist abgestürzt."
+
+#~ msgid "Could not get article %s from NNTP server"
+#~ msgstr "Artikel %s konnte nicht vom NTTP-Server abgerufen werden"
+
+#~ msgid "Posting not allowed by news server"
+#~ msgstr "Veröffentlichung duch News-Server untersagt"
+
+#~ msgid "Failed to send newsgroups header: %s: message not posted"
+#~ msgstr ""
+#~ "Newsgroup-Kopfzeile konnte nicht verschickt werden: %s: Nachricht nicht "
+#~ "abgelegt"
+
+#~ msgid "Error posting to newsgroup: %s: message not posted"
+#~ msgstr ""
+#~ "Fehler beim Veröffentlichen in Newsgroup %s: Nachricht nicht "
+#~ "veröffentlicht"
+
+#~ msgid "Error reading response to posted message: message not posted"
+#~ msgstr ""
+#~ "Fehler beim Lesen einer Antwort auf eine veröffentlichte Nachricht: "
+#~ "Nachricht nicht veröffentlicht"
+
+#~ msgid "Error posting message: %s: message not posted"
+#~ msgstr ""
+#~ "Fehler beim Veröffentlichen einer Nachricht: %s: Nachricht nicht "
+#~ "veröffentlicht"
+
+#~ msgid "Stream error"
+#~ msgstr "Fehler im Datenstrom"
+
+#~ msgid "Connection error: %s"
+#~ msgstr "Verbindungsfehler: %s"
+
+#~ msgid "Could not get group: %s"
+#~ msgstr "Gruppe konnte nicht ermittelt werden: %s"
+
+#, fuzzy
+#~ msgid "Could not get messages: unspecified error"
+#~ msgstr "Nachrichten konnten nicht abgerufen werden: unbekannter Fehler"
+
+#~ msgid "Unknown server response: %s"
+#~ msgstr "Unbekannte Serverrückmeldung: %s"
+
+#~ msgid "Adjust Score"
+#~ msgstr "Bewertung anpassen"
+
+#~ msgid "Assign Color"
+#~ msgstr "Farbe zuweisen"
+
+#~ msgid "Assign Score"
+#~ msgstr "Bewertung zuweisen"
+
+#~ msgid "Attachments"
+#~ msgstr "Anlagen"
+
+#~ msgid "Beep"
+#~ msgstr "Piepston"
+
+#~ msgid "contains"
+#~ msgstr "enthält"
+
+#~ msgid "Copy to Folder"
+#~ msgstr "In Ordner kopieren"
+
+#~ msgid "Date received"
+#~ msgstr "Empfangsdatum"
+
+#~ msgid "Date sent"
+#~ msgstr "Verschickt-Datum"
+
+#~ msgid "Deleted"
+#~ msgstr "Gelöscht"
+
+#~ msgid "does not contain"
+#~ msgstr "enthält nicht"
+
+#~ msgid "does not end with"
+#~ msgstr "endet nicht auf"
+
+#~ msgid "does not exist"
+#~ msgstr "existiert nicht"
+
+#~ msgid "does not return"
+#~ msgstr "liefert nicht"
+
+#~ msgid "does not sound like"
+#~ msgstr "klingt nicht wie"
+
+#~ msgid "does not start with"
+#~ msgstr "beginnt nicht mit"
+
+#~ msgid "Do Not Exist"
+#~ msgstr "Existieren nicht"
+
+#~ msgid "Draft"
+#~ msgstr "Entwurf"
+
+#~ msgid "ends with"
+#~ msgstr "endet auf"
+
+#~ msgid "Exist"
+#~ msgstr "Existieren"
+
+#~ msgid "exists"
+#~ msgstr "existiert"
+
+#~ msgid "Expression"
+#~ msgstr "Ausdruck"
+
+#~ msgid "Follow Up"
+#~ msgstr "Folgenachricht"
+
+#~ msgid "is"
+#~ msgstr "ist"
+
+#~ msgid "is after"
+#~ msgstr "ist nach"
+
+#~ msgid "is before"
+#~ msgstr "ist vor"
+
+#~ msgid "is Flagged"
+#~ msgstr "ist markiert"
+
+#~ msgid "is greater than"
+#~ msgstr "ist größer als"
+
+#~ msgid "is less than"
+#~ msgstr "ist kleiner als"
+
+#~ msgid "is not"
+#~ msgstr "ist nicht"
+
+#~ msgid "is not Flagged"
+#~ msgstr "ist nicht markiert"
+
+#~ msgid "Junk Test"
+#~ msgstr "Unerwünscht-Test"
+
+#~ msgid "Mailing list"
+#~ msgstr "Mailingliste"
+
+#~ msgid "Message Body"
+#~ msgstr "Nachrichtenrumpf"
+
+#~ msgid "Message Header"
+#~ msgstr "Nachrichtenkopf"
+
+#~ msgid "Message is Junk"
+#~ msgstr "Nachricht ist unerwünscht"
+
+#~ msgid "Message is not Junk"
+#~ msgstr "Nachricht ist nicht unerwünscht"
+
+#~ msgid "Move to Folder"
+#~ msgstr "In Ordner verschieben"
+
+#, fuzzy
+#~ msgid "Pipe to Program"
+#~ msgstr "Das Programm beenden"
+
+#~ msgid "Play Sound"
+#~ msgstr "Klang abspielen"
+
+#~ msgid "Recipients"
+#~ msgstr "Empfänger"
+
+#~ msgid "Regex Match"
+#~ msgstr "Regex-Treffer"
+
+#~ msgid "Replied to"
+#~ msgstr "Beantwortet"
+
+#~ msgid "returns"
+#~ msgstr "liefert"
+
+#~ msgid "returns greater than"
+#~ msgstr "liefert größer als"
+
+#~ msgid "returns less than"
+#~ msgstr "liefert kleiner als"
+
+#, fuzzy
+#~ msgid "Run Program"
+#~ msgstr "Programm ausführen:"
+
+#~ msgid "Sender"
+#~ msgstr "Absender"
+
+#~ msgid "Set Status"
+#~ msgstr "Status setzen:"
+
+#~ msgid "Size (kB)"
+#~ msgstr "Größe (kB)"
+
+#~ msgid "sounds like"
+#~ msgstr "klingt wie"
+
+#~ msgid "Source Account"
+#~ msgstr "Quellkonto"
+
+#~ msgid "Specific header"
+#~ msgstr "Bestimmte Kopfzeile"
+
+#~ msgid "starts with"
+#~ msgstr "beginnt mit"
+
+#~ msgid "Stop Processing"
+#~ msgstr "Verarbeitung stoppen"
+
+#~ msgid "Unset Status"
+#~ msgstr "Status nicht setzen"
+
+#~ msgid "Check _Incoming Mail"
+#~ msgstr "_Eingehende E-Mails überprüfen"
+
+#~ msgid "Use _Daemon"
+#~ msgstr "_Daemon verwenden"
+
+#~ msgid "_Local Tests Only"
+#~ msgstr "Ausschließlich _lokale Tests"
+
+#~ msgid "Working"
+#~ msgstr "Arbeitet"
+
+#~ msgid "Brought to you by"
+#~ msgstr "Das Team:"
+
+#~ msgid "_Filename:"
+#~ msgstr "_Dateiname:"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "Unknown error."
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Unbekannter Fehler."
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the component system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Der Fehler vom Komponentensystem ist:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the activation system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Der Fehler vom Aktivierungssystem ist:\n"
+#~ "%s"
+
+#~ msgid "Do you want to trust \"%s\" for the following purposes?"
+#~ msgstr "Wollen Sie »%s« für folgende Verwendungszwecke vertrauen?"
+
+#~ msgid "View Certificate"
+#~ msgstr "Zertifikat anzeigen"
+
+#~ msgid "You have been asked to trust a new Certificate Authority (CA)."
+#~ msgstr ""
+#~ "Sie wurden darum gebeten, einer neuen Zertifizierungsstelle (CA) zu "
+#~ "vertrauen."
+
+#~ msgid "About Ximian Evolution..."
+#~ msgstr "Info zu Ximian Evolution..."
+
+#~ msgid "_About Ximian Evolution..."
+#~ msgstr "_Info zu Ximian Evolution..."
+
 #~ msgid "Evolution Addressbook folder viewer"
 #~ msgstr "Evolution-Adressbuch-Ordnerbetrachter"
 
@@ -20144,9 +20188,6 @@ msgstr "%s (zu %d%% abgeschlossen)"
 #~ msgid "Primary _email:"
 #~ msgstr "_E-Mail, primär:"
 
-#~ msgid "S_pouse:"
-#~ msgstr "E_hepartner:"
-
 #~ msgid "_Business:"
 #~ msgstr "_Geschäftlich:"
 
@@ -20163,9 +20204,6 @@ msgstr "%s (zu %d%% abgeschlossen)"
 #~ msgid "_Mobile:"
 #~ msgstr "_Mobil:"
 
-#~ msgid "_Office:"
-#~ msgstr "_Büro:"
-
 #~ msgid "_Public Calendar URL:"
 #~ msgstr "Ö_ffentliche Kalenderadresse:"
 
@@ -20798,9 +20836,6 @@ msgstr "%s (zu %d%% abgeschlossen)"
 #~ msgid "Failed on message %d of %d"
 #~ msgstr "Fehlgeschlagen bei Nachricht %d von %d"
 
-#~ msgid "Changing junk status"
-#~ msgstr "Unerwünscht-Status wird verändert"
-
 #~ msgid "Search"
 #~ msgstr "Suchen"
 
diff --git a/po/el.po b/po/el.po
index 8154b5be28..5b9f80248c 100644
--- a/po/el.po
+++ b/po/el.po
@@ -34,7 +34,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: el\n"
-"POT-Creation-Date: 2004-05-19 14:00-0400\n"
+"POT-Creation-Date: 2004-06-03 11:14-0400\n"
 "PO-Revision-Date: 2004-03-18 00:26+0200\n"
 "Last-Translator: Kostas Papadimas <pkst@gnome.org>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -90,13 +90,13 @@ msgstr "κάρτες"
 msgid "Default Sync Address:"
 msgstr "Προεπιλεγμένη διεύθυνση συγχρονισμού:"
 
-#: addressbook/conduit/address-conduit.c:1150
 #: addressbook/conduit/address-conduit.c:1151
+#: addressbook/conduit/address-conduit.c:1152
 msgid "Could not load addressbook"
 msgstr "Δεν ήταν δυνατό να φορτωθεί το ευρετήριο διευθύνσεων"
 
-#: addressbook/conduit/address-conduit.c:1219
-#: addressbook/conduit/address-conduit.c:1222
+#: addressbook/conduit/address-conduit.c:1220
+#: addressbook/conduit/address-conduit.c:1223
 msgid "Could not read pilot's Address application block"
 msgstr ""
 "Δεν ήταν δυνατή η ανάγνωση του τμήματος Διεύθυνσης του υπολογιστή Παλάμης"
@@ -105,13 +105,13 @@ msgstr ""
 msgid "Accessing LDAP Server anonymously"
 msgstr "Ανώνυμη πρόσβαση διακομιστή  LDAP"
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
 msgid "Failed to authenticate.\n"
 msgstr "Δεν ήταν δυνατή η πιστοποίηση.\n"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sΕισάγετε κωδικό πρόσβασης για %s (χρήστης %s)"
@@ -155,51 +155,23 @@ msgstr "Ε_παφές:"
 msgid "Create a new contacts group"
 msgstr "Δημιουργία νέας ομάδας συντομεύσεων"
 
-#: addressbook/gui/component/addressbook-component.c:182
+#: addressbook/gui/component/addressbook-component.c:184
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:483
-msgid "Failed to connect to LDAP server"
-msgstr "Δεν είναι δυνατή η σύνδεση με τον διακομιστή LDAP."
-
-#: addressbook/gui/component/addressbook-config.c:507
-msgid "Failed to authenticate with LDAP server"
-msgstr "Δεν ήταν δυνατή η πιστοποίηση στο διακομιστή  LDAP"
-
-#: addressbook/gui/component/addressbook-config.c:535
-msgid "Could not perform query on Root DSE"
-msgstr "Αδύνατη η δημιουργία ερωτήματος στο Root DSE"
-
-#: addressbook/gui/component/addressbook-config.c:840
-msgid "The server responded with no supported search bases"
-msgstr "Ο διακομιστής αποκρίθηκε χωρίς υποστηριζόμενες βάσεις αναζήτησης"
-
-#: addressbook/gui/component/addressbook-config.c:1245
-msgid "This server does not support LDAPv3 schema information"
-msgstr "Αυτός ο διακομιστής δεν υποστηρίζει σχήμα πληροφοριών LDAPv3"
-
-#: addressbook/gui/component/addressbook-config.c:1266
-msgid "Error retrieving schema information"
-msgstr "Σφάλμα ανάκτησης σχήματος πληροφοριών"
-
-#: addressbook/gui/component/addressbook-config.c:1274
-msgid "Server did not respond with valid schema information"
-msgstr "Η απάντηση του διακομιστή δεν περιείχε έγκυρο σχήμα πληροφοριών"
-
 #: addressbook/gui/component/addressbook-migrate.c:68
-#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1160
 msgid "Migrating..."
 msgstr "Εισαγωγή..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1201
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Εισαγωγή  `%s':"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:438
+#: addressbook/gui/component/addressbook-migrate.c:464
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
 #: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
@@ -207,28 +179,28 @@ msgid "On This Computer"
 msgstr "Σε αυτό τον υπολογιστή"
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:446
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
-#: mail/mail-config.glade.h:106
+#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
+#: mail/mail-config.glade.h:109
 msgid "Personal"
 msgstr "Προσωπικό"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:454
+#: addressbook/gui/component/addressbook-migrate.c:480
 msgid "On LDAP Servers"
 msgstr "Σε διακομιστές LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:582
+#: addressbook/gui/component/addressbook-migrate.c:608
 msgid "LDAP Servers"
 msgstr "Διακομιστές LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:702
+#: addressbook/gui/component/addressbook-migrate.c:728
 msgid "Autocompletion Settings"
 msgstr "Ρυθμίσεις αυτόματης συμπλήρωσης"
 
-#: addressbook/gui/component/addressbook-migrate.c:1076
+#: addressbook/gui/component/addressbook-migrate.c:1104
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -240,7 +212,7 @@ msgstr ""
 "\n"
 "Περιμένετε μέχρι το  Evolution να εισάγει τους φακέλους σας..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1090
+#: addressbook/gui/component/addressbook-migrate.c:1118
 #, fuzzy
 msgid ""
 "The format of mailing list contacts has changed.\n"
@@ -252,7 +224,7 @@ msgstr ""
 "\n"
 "Περιμένετε μέχρι το  Evolution να εισάγει τους φακέλους σας..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1099
+#: addressbook/gui/component/addressbook-migrate.c:1127
 #, fuzzy
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
@@ -264,7 +236,7 @@ msgstr ""
 "\n"
 "Περιμένετε μέχρι το  Evolution να εισάγει τους φακέλους σας..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1109
+#: addressbook/gui/component/addressbook-migrate.c:1137
 #, fuzzy
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
@@ -276,39 +248,34 @@ msgstr ""
 "\n"
 "Περιμένετε μέχρι το  Evolution να εισάγει τους φακέλους σας..."
 
-#: addressbook/gui/component/addressbook-view.c:674
+#: addressbook/gui/component/addressbook-view.c:675
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 "Το ημερολόγιο '%s' θα διαγραφεί. Είστε σίγουροι ότι θέλετε να συνεχίσετε?"
 
-#: addressbook/gui/component/addressbook-view.c:761
+#: addressbook/gui/component/addressbook-view.c:754
 msgid "New Address Book"
 msgstr "Νέο Βιβλίο Διευθύνσεων"
 
-#: addressbook/gui/component/addressbook-view.c:762
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
+#: addressbook/gui/component/addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: addressbook/gui/component/addressbook-view.c:763
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-view.c:756
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Ιδιότητες..."
 
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/addressbook-view.c:1002
+#. Create the contacts group
+#: addressbook/gui/component/addressbook-view.c:995
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
 #: calendar/gui/migration.c:373
 msgid "Contacts"
 msgstr "Επαφές"
@@ -391,10 +358,6 @@ msgid "Manage your S/MIME certificates here"
 msgstr "Διαχείριση των πιστοποιητικών  S/Mime εδώ"
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-msgid "  S_how Supported Bases "
-msgstr "Ε_μφάνιση υποστηριζόμενων βάσεων"
-
-#: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -409,206 +372,171 @@ msgstr "Ε_μφάνιση υποστηριζόμενων βάσεων"
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1:00"
-msgstr "1:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
-msgstr "5:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "Πιστοποίηση"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
 #, fuzzy
 msgid "<b>Display</b>"
 msgstr "_Εμφάνιση"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 #, fuzzy
 msgid "<b>Downloading</b>"
 msgstr "<b>Αποστολή  Μηνύματος:</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:10
 #, fuzzy
 msgid "<b>Searching</b>"
 msgstr "Γίνεται αναζήτηση"
 
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
 msgid "<b>Server Information</b>"
 msgstr "Βήμα 2: Πληροφορίες διακομιστή"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
 msgid "<b>Type:</b>"
 msgstr "<b>Λήγει:</b> "
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:13
 #, fuzzy
 msgid "Add Contacts Group"
 msgstr "Ε_παφές:"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Address Book Properties"
 msgstr "Ιδιότητες Βιβλίου Διευθύνσεων"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
-#: mail/mail-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
+#: mail/mail-config.glade.h:42
 msgid "Always"
 msgstr "Πάντοτε"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr "Ανώνυμα"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:17
 #: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Βασικό"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
-msgid "Connecting"
-msgstr "Σύνδεση"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 #: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Λεπτομέρειες"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
-msgid "Distinguished _name:"
-msgstr "Διακεκριμένο ό_νομα:"
-
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:19
 #, fuzzy
 msgid "Distinguished name"
 msgstr "Διακεκριμένο ό_νομα:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:20
 #, fuzzy
 msgid "Download limit:"
 msgstr "Όριο _μεταφόρτωσης:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Email address"
 msgstr "Διεύθυνση Email:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "Email address:"
-msgstr "Διεύθυνση Email:"
-
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "Evolution will use this DN to authenticate you with the server"
-msgstr ""
-"Το Evolution θα χρησιμοποίησει αυτό το DN για την πιστοποίησή σας στο "
-"διακομιστή"
-
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:22
+#, fuzzy
 msgid ""
-"Evolution will use this email address to authenticate you with the server"
+"Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "Το Evolution θα χρησιμοποίηση αυτήν τη διεύθυνση για την πιστοποίησή σας στο "
 "διακομιστή"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:23
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Υποστηριζόμενες βάσεις αναζήτησης"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:24
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
+#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Γενικά"
 
-#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
-#: mail/mail-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
+#: mail/mail-config.glade.h:102
 msgid "Never"
 msgstr "Ποτέ"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
-msgid "One"
-msgstr "Ένα"
-
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:35
-msgid "S_earch scope: "
-msgstr "Βάθος ανα_ζήτησης: "
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Search _base:"
+msgstr "Βάση  αναζήτησης:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
 msgid "Search base only"
 msgstr "Βάση  αναζήτησης:"
 
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid "Search base:"
 msgstr "Βάση  αναζήτησης:"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Search scope:"
 msgstr "Βάθος ανα_ζήτησης: "
 
-#: addressbook/gui/component/ldap-config.glade.h:39
-msgid "Searching"
-msgstr "Γίνεται αναζήτηση"
-
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:31
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
-"server if\n"
-"your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL or TLS."
 msgstr ""
 "Διαλέγοντας αυτή την επιλογή σημαίνει ότι το Evolution  θα συνδέεται στο "
 "διακομιστή LDAP\n"
 "μόνο αν ο διακομιστής υποστηρίζει SSL ή TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a \n"
-"insecure environment. For example, if you and your LDAP server are behind a "
-"firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection "
-"is already\n"
-"secure."
+"you are in a insecure environment. For example, if you and your LDAP server "
+"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
+"because your connection is already secure."
 msgstr ""
 "Η επιλογή αυτή σημαίνει ότι το Evolution θα προσπαθεί να χρησιμοποιεί μόνο "
 "SSL/TLS αν είστε σε\n"
@@ -618,13 +546,12 @@ msgstr ""
 "σύνδεση σας είναι ήδη\n"
 "ασφαλής."
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:33
+#, fuzzy
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
-"TLS.  This \n"
-"means that your connection will be insecure, and that you will be vulnerable "
-"to security\n"
-"exploits. "
+"TLS.  This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits. "
 msgstr ""
 "Η επιλογή αυτή σημαίνει ότι ο διακομιστής σας δεν υποστηρίζει SSL ή TLS. "
 "Αυτό σημαίνει \n"
@@ -632,38 +559,33 @@ msgstr ""
 "τρύπες \n"
 "ασφαλείας."
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Sub"
-msgstr "Sub"
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr "Υποστηριζόμενες βάσεις αναζήτησης"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
-"searches will \n"
-"begin. If you leave this blank, the search will begin at the root of the "
-"directory tree."
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
 msgstr ""
 "Η βάση αναζήτησης είναι το διακεκριμένο όνομα (DN) της καταχώρησης όπου θα "
 "ξεκινούν οι \n"
 "αναζητήσεις σας. Αν αφήσετε αυτό κενό, η αναζήτηση θα ξεκινά από τον ριζικό "
 "κατάλογο του δέντρου. "
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:37
+#, fuzzy
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
-"the \n"
-"directory tree. A search scope of \"sub\" will include all entries below "
-"your search base.\n"
-"A search scope of \"one\" will only include the entries one level beneath "
-"your base.\n"
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
 msgstr ""
 "Το βάθος αναζήτησης καθορίζει το βάθος της αναζήτησης στο δέντρο του "
 "καταλόγου \n"
@@ -672,7 +594,7 @@ msgstr ""
 "Μια αναζήτηση με \"ένα\"  θα περιλαμβάνει μόνο τις καταχωρήσεις που "
 "βρίσκονται μόνο ένα επίπεδο κάτω.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:58
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -680,17 +602,17 @@ msgstr ""
 "Αυτό είναι το πλήρες όνομα του διακομιστή ldap. Για παράδειγμα , \"ldap."
 "mycompany.com\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:39
+#, fuzzy
 msgid ""
-"This is the maximum number of entries to download. Setting this number to "
-"be \n"
+"This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr ""
 "Αυτός είναι ο μέγιστος αριθμός καταχωρήσεων για μεταφόρτωση. Ο ορισμός ενός "
 "μεγάλου αριθμού \n"
 "θα κάνει αργό το ευρετήριο διευθύνσεων σας."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -700,22 +622,22 @@ msgstr ""
 "σας.Σημειώστε ότι η ρύθμιση σε \"Διεύθυνση Email\" απαιτεί ανώνυμη πρόσβαση "
 "στο διακομιστή ldap."
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:41
+#, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
-"list.\n"
-"It is for display purposes only. "
+"list. It is for display purposes only. "
 msgstr ""
 "Αυτό είναι το όνομα για τον διακομιστή και θα εμφανιστεί στη λίστα φακέλων "
 "του Evolution.\n"
 " Είναι μόνο για λόγους εμφάνισης."
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:42
+#, fuzzy
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. "
-"A \n"
-"list of standard ports has been provided. Ask your system administrator\n"
-"what port you should specify."
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
 msgstr ""
 "Αυτή είναι η θύρα του διακομιστή LDAP στην οποία θα προσπαθεί να συνδεθεί το "
 "Evolution\n"
@@ -723,121 +645,99 @@ msgstr ""
 "συστήματος σας\n"
 "για το ποιά θύρα θα χρησιμοποιήσετε."
 
-#: addressbook/gui/component/ldap-config.glade.h:67
-msgid "This option controls how long a search will be run."
-msgstr ""
-"Αυτή η επιλογή ελέγχει την χρονική διάρκεια της εκτέλεσης της αναζήτησης."
-
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:43
 #, fuzzy
 msgid "Timeout:"
 msgstr "Μορφή ώρας:"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
-msgid "U_se SSL/TLS:"
-msgstr "_Χρήση SSL/TLS:"
-
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr "Χρήση διακεκριμένου ονόματος (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr "Χρήση  διεύθυνσης ταχυδρομείου"
 
-#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
-#: mail/mail-config.glade.h:154
+#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
+#: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr "Όταν είναι δυνατό"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:47
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "Ε_παφές:"
 
-#: addressbook/gui/component/ldap-config.glade.h:74
-#: calendar/gui/dialogs/calendar-setup.glade.h:12
-msgid "_Display name:"
-msgstr "_Όνομα εμφάνισης:"
-
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr "Όριο _μεταφόρτωσης:"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
 msgid "_Email address:"
 msgstr "Διεύθυνση Email:"
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:50
+#, fuzzy
+msgid "_Find Possible Search Bases"
+msgstr "Υποστηριζόμενες βάσεις αναζήτησης"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Log in method:"
 msgstr "Μέθοδος _πιστοποίησης:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "_Log in:"
+msgstr "Είσοδος"
+
+#: addressbook/gui/component/ldap-config.glade.h:53
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
 msgid "_Name:"
 msgstr "_Όνομα:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
-msgid "_Port number:"
-msgstr "Αριθμός _Θύρας:"
-
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "_Port:"
 msgstr "_Προτεραιότητα:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
-msgid "_Search base:"
-msgstr "Βάση  _αναζήτησης:"
-
-#: addressbook/gui/component/ldap-config.glade.h:82
-msgid "_Server name:"
-msgstr "Όνομα _διακομιστή:"
+#: addressbook/gui/component/ldap-config.glade.h:55
+#, fuzzy
+msgid "_Search scope:"
+msgstr "Βάθος ανα_ζήτησης: "
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:56
 #, fuzzy
 msgid "_Server:"
 msgstr "Εξ_υπηρετητής:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
-msgid "_Timeout (minutes):"
-msgstr "_Χρόνος λήξης (λεπτά):"
+#: addressbook/gui/component/ldap-config.glade.h:57
+#, fuzzy
+msgid "_Timeout:"
+msgstr "Μορφή ώρας:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:58
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "_Χρήση ασφαλούς σύνδεσης (SSL):"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "κάρτες"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
-msgid "connecting-tab"
-msgstr "στήλη-σύνδεσης"
-
-#: addressbook/gui/component/ldap-config.glade.h:88
-msgid "general-tab"
-msgstr "στήλη-γενικών"
-
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:60
 #: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
-#: mail/mail-config.glade.h:182
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "λεπτά"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
-msgid "searching-tab"
-msgstr "στήλη-αναζήτησης"
-
-#: addressbook/gui/component/select-names/e-select-names.c:497
+#: addressbook/gui/component/select-names/e-select-names.c:503
 #: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid "Select Contacts from Address Book"
 msgstr "Επιλογή Επαφών από το Βιβλίο Διευθύνσεων"
 
-#: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
@@ -877,7 +777,7 @@ msgstr "Επαφή Χωρίς Τίτλο"
 
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:222
+#: addressbook/gui/widgets/e-addressbook-view.c:224
 msgid "Source"
 msgstr "Πηγή"
 
@@ -950,9 +850,9 @@ msgid "<b>Work</b>"
 msgstr "<b>Λήγει:</b> "
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
-#: addressbook/gui/widgets/eab-contact-display.c:342
-#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/widgets/eab-contact-display.c:334
+#: addressbook/gui/widgets/eab-contact-display.c:353
 msgid "AIM"
 msgstr "AIM"
 
@@ -992,15 +892,15 @@ msgid "Company:"
 msgstr "Εντολή:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:271
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
+#: addressbook/gui/contact-editor/e-contact-editor.c:266
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
 msgstr "Επαφή"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1527
+#: addressbook/gui/contact-editor/e-contact-editor.c:520
 msgid "Contact Editor"
 msgstr "Επεξεργαστής Επαφών"
 
@@ -1024,82 +924,79 @@ msgid "Full _Name..."
 msgstr "Πλήρες Ό_νομα..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:202
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-msgid "Home"
-msgstr "Οικία"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #, fuzzy
 msgid "Home Page:"
 msgstr "Αρχική σελίδα"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-#, fuzzy
-msgid "Job title:"
-msgstr "_Τίτλος εργασίας:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/e-itip-control.c:936
-msgid "Location:"
-msgstr "Τοποθεσία:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 #, fuzzy
 msgid "Mailing Address"
 msgstr "Διεύθυνση E-Mail "
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 #, fuzzy
 msgid "Manager:"
 msgstr "Διευθυντής"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "_Ψευδώνυμο:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Notes:"
 msgstr "Ση_μειώσεις:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr "Novell GroupWise"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
-#: addressbook/gui/contact-editor/e-contact-editor.c:203
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-msgid "Other"
-msgstr "Άλλα"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#, fuzzy
+msgid "Office:"
+msgstr "_Γραφείο:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "PO Box:"
 msgstr "_Ταχ.Θυρίδα:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 #, fuzzy
 msgid "Personal Information"
 msgstr "Προαιρετικές Πληροφορίες"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 #, fuzzy
 msgid "Profession:"
 msgstr "Επά_γγελμα:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#, fuzzy
+msgid "Spouse:"
+msgstr "_Σύζυγος:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "State/Province:"
 msgstr "_Πολιτεία/Επαρχία:"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#, fuzzy
+msgid "Title:"
+msgstr "_Τίτλος:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+msgid "Video Chat:"
+msgstr ""
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:41
 #, fuzzy
 msgid "Wants to receive HTML mail"
@@ -1107,15 +1004,15 @@ msgstr "Επιθυμεί την παραλαβή μηνυμάτων _HTML"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:42
 #, fuzzy
-msgid "Webcam:"
-msgstr "Ιστοσελίδα:"
+msgid "Web Log:"
+msgstr "Ιστοσε_λίδα:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
-#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
-#: mail/mail-config.glade.h:155
+#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
+#: mail/mail-config.glade.h:157
 msgid "Work"
 msgstr "Εργασία"
 
@@ -1135,19 +1032,12 @@ msgid "_File under:"
 msgstr "Όνομα Αρχείου:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 #, fuzzy
 msgid "_Where:"
 msgstr "Εξ_υπηρετητής:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
-msgid "item7"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
-msgid "item8"
-msgstr ""
-
-#: addressbook/gui/contact-editor/eab-editor.c:316
+#: addressbook/gui/contact-editor/eab-editor.c:315
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -1155,7 +1045,7 @@ msgstr ""
 "Είστε βέβαιοι ότι θέλετε\n"
 "να διαγραφούν αυτές οι επαφές?"
 
-#: addressbook/gui/contact-editor/eab-editor.c:319
+#: addressbook/gui/contact-editor/eab-editor.c:318
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -1164,16 +1054,16 @@ msgstr ""
 "να διαγραφεί η επαφή;"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:351
-#: addressbook/gui/widgets/eab-contact-display.c:372
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Address"
 msgstr "Διεύθυνση:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:292
+#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard.c:174
@@ -2151,86 +2041,109 @@ msgstr "Ζάμπια"
 msgid "Zimbabwe"
 msgstr "Ζιμπάμπουε"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/contact-editor/e-contact-editor.c:179
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:337
+#: addressbook/gui/widgets/eab-contact-display.c:356
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:347
-#: addressbook/gui/widgets/eab-contact-display.c:366
+#: addressbook/gui/contact-editor/e-contact-editor.c:180
+#: addressbook/gui/widgets/eab-contact-display.c:339
+#: addressbook/gui/widgets/eab-contact-display.c:358
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: addressbook/gui/widgets/eab-contact-display.c:338
+#: addressbook/gui/widgets/eab-contact-display.c:357
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:344
-#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#: addressbook/gui/widgets/eab-contact-display.c:355
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/contact-editor/e-contact-editor.c:183
 msgid "GroupWise"
 msgstr "Novell GroupWise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+msgid "Home"
+msgstr "Οικία"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+msgid "Other"
+msgstr "Άλλα"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
 msgid "Source Book"
 msgstr "Πηγαίο βιβλίο"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:264
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Target Book"
 msgstr "Βιβλίο στόχου"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:278
+#: addressbook/gui/contact-editor/e-contact-editor.c:273
 msgid "Is New Contact"
 msgstr "Είναι νέα επαφή"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:285
+#: addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Writable Fields"
 msgstr "Εγγράψιμα Πεδία"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:299
+#: addressbook/gui/contact-editor/e-contact-editor.c:294
 msgid "Changed"
 msgstr "Αλλάχθηκε"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
-msgid "Category editor not available."
-msgstr "Ο επεξεργαστής κατηγορίας δεν είναι διαθέσιμος."
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:2352
 msgid "This contact belongs to these categories:"
 msgstr "Αυτή η επαφή ανήκει στις κατηγορίες:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#: addressbook/gui/contact-editor/e-contact-editor.c:2429
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Παρακαλώ επιλέξτε ανάμεσα ανάμεσα στις παρακάτω επιλογές"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#: addressbook/gui/contact-editor/e-contact-editor.c:2433
 #, fuzzy
 msgid "No image"
 msgstr "Νίγηρας"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#: addressbook/gui/contact-editor/e-contact-editor.c:2636
 #, fuzzy
 msgid ""
-"The following entries are invalid:\n"
+"The contact data is invalid:\n"
 "\n"
-msgstr "Οι παρακάτω συνδέσεις είναι ενεργές αυτή τη στιγμή:"
+msgstr "Η ημερομηνία επανεμφάνισης δεν είναι έγκυρη"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2738
-#, c-format
-msgid "Could not find widget for a field: `%s'"
-msgstr "Δε βρέθηκε συστατικό για το πεδίο: `%s'"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#, fuzzy
+msgid "Invalid contact."
+msgstr "%d επαφές"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+msgid ""
+"The contact cannot be saved to the selected address book. Do you want to "
+"discard changes?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2727
+#: addressbook/gui/contact-editor/e-contact-editor.c:2751
+msgid "_Discard"
+msgstr "Α_πόρριψη"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+msgid ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
+msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:62
 msgid "AOL Instant Messenger"
@@ -2263,7 +2176,7 @@ msgid "_Edit Full"
 msgstr "Πλή_ρης Επεξεργασία"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:166
 msgid "_Full Name:"
 msgstr "Π_λήρες Όνομα:"
 
@@ -2412,30 +2325,30 @@ msgid "_Type an email address or drag a contact into the list below:"
 msgstr ""
 "Π_ληκτρολογήστε μια διεύθυνση e-mail ή σύρετε μια επαφή στην παρακάτω λίστα:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "contact-list-editor"
 msgstr "επεξεργαστής-λίστας-επαφών"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:153
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:215
+#: addressbook/gui/widgets/e-addressbook-view.c:217
 #: addressbook/gui/widgets/e-minicard-view.c:460
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Βιβλίο"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
 msgid "Is New List"
 msgstr "Είναι Νέα Λίστα"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:215
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
 msgid "Contact List Editor"
 msgstr "Επεξεργαστής Λίστας Επαφών"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:438
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
 msgid "Save List as VCard"
 msgstr "Αποθήκευση Λίστας ως Vcard"
 
@@ -2482,117 +2395,117 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Προχωρημένη Αναζήτηση"
 
-#: addressbook/gui/widgets/eab-contact-display.c:129
-#: addressbook/gui/widgets/eab-contact-display.c:192
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
 msgid "(map)"
 msgstr "(χάρτης)"
 
-#: addressbook/gui/widgets/eab-contact-display.c:139
-#: addressbook/gui/widgets/eab-contact-display.c:205
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
 msgid "map"
 msgstr "χάρτης"
 
-#: addressbook/gui/widgets/eab-contact-display.c:257
-#: addressbook/gui/widgets/eab-contact-display.c:533
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:525
 msgid "List Members"
 msgstr "Μέλη λίστας"
 
-#: addressbook/gui/widgets/eab-contact-display.c:329
-#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/eab-contact-display.c:321
+#: addressbook/gui/widgets/eab-contact-display.c:323
 msgid "E-mail"
 msgstr "E-mail"
 
-#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/eab-contact-display.c:332
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Οργανισμός"
 
-#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "Position"
 msgstr "Θέση"
 
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:354
 msgid "Groupwise"
 msgstr "Groupwise"
 
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:340
 msgid "Video Conferencing"
 msgstr "Τηλεδιάσκεψη"
 
-#: addressbook/gui/widgets/eab-contact-display.c:349
-#: addressbook/gui/widgets/eab-contact-display.c:370
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Phone"
 msgstr "Τηλέφωνο"
 
-#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:342
 msgid "Fax"
 msgstr "Φαξ"
 
-#: addressbook/gui/widgets/eab-contact-display.c:354
+#: addressbook/gui/widgets/eab-contact-display.c:346
 msgid "work"
 msgstr "εργασία"
 
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:359
 msgid "WWW"
 msgstr "WWW"
 
-#: addressbook/gui/widgets/eab-contact-display.c:368
-#: addressbook/gui/widgets/eab-contact-display.c:587
+#: addressbook/gui/widgets/eab-contact-display.c:360
+#: addressbook/gui/widgets/eab-contact-display.c:579
 msgid "Blog"
 msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/eab-contact-display.c:363
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Κινητό Τηλέφωνο"
 
-#: addressbook/gui/widgets/eab-contact-display.c:375
+#: addressbook/gui/widgets/eab-contact-display.c:367
 msgid "personal"
 msgstr "προσωπικό"
 
-#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/eab-contact-display.c:374
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Σημείωση"
 
-#: addressbook/gui/widgets/eab-contact-display.c:548
+#: addressbook/gui/widgets/eab-contact-display.c:540
 msgid "Job Title"
 msgstr "Τίτλος εργασίας:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/eab-contact-display.c:544
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:774
+#: smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "Email"
 
-#: addressbook/gui/widgets/eab-contact-display.c:579
+#: addressbook/gui/widgets/eab-contact-display.c:571
 msgid "Home page"
 msgstr "Αρχική σελίδα"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 msgid "Success"
 msgstr "Επιτυχία"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Backend busy"
 msgstr ""
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Repository offline"
 msgstr "Αρχείο φύλαξης εκτός δικτύου"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Address Book does not exist"
 msgstr "Το ευρετήριο διευθύνσεων δεν υπάρχει"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 #, fuzzy
 msgid "No Self Contact defined"
 msgstr "Νέα Λίστα Επαφών"
@@ -2600,27 +2513,27 @@ msgstr "Νέα Λίστα Επαφών"
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Permission denied"
 msgstr "Δεν επιτρέπεται η πρόσβαση"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Contact not found"
 msgstr "Η επαφή δεν βρέθηκε"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Contact ID already exists"
 msgstr "Το αναγνωριστικό επαφής υπάρχει ήδη"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Protocol not supported"
 msgstr "Δεν υποστηρίζεται το πρωτόκολλο"
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:60
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:233
 #: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
@@ -2633,39 +2546,39 @@ msgid "Cancelled"
 msgstr "Ακυρώθηκε"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:61
 #, fuzzy
 msgid "Could not cancel"
 msgstr "Δεν ήταν δυνατό το άνοιγμα πηγής"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Authentication Failed"
 msgstr "Η πιστοποίηση απέτυχε."
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Authentication Required"
 msgstr "Απαιτείται πιστοποίηση"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:66
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "TLS not Available"
 msgstr "TLS δεν είναι διαθέσιμο"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#: addressbook/gui/widgets/eab-gui-util.c:66
 #, fuzzy
 msgid "No such source"
 msgstr "Δεν υπάρχει τέτοιο μήνυμα"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:69
+#: addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Other error"
 msgstr "Άλλο σφάλμα"
 
-#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:90
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
@@ -2673,7 +2586,7 @@ msgstr ""
 "Δεν ήταν δυνατό το άνοιγμα του Βιβλίου Διευθύνσεων.  Παρακαλώ ελέγξτε αν η "
 "διαδρομή υπάρχει και ότι έχετε το δικαίωμα πρόσβασης σε αυτό."
 
-#: addressbook/gui/widgets/eab-gui-util.c:110
+#: addressbook/gui/widgets/eab-gui-util.c:97
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -2681,17 +2594,18 @@ msgstr ""
 "Δεν ήταν δυνατό το άνοιγμα του Βιβλίου Διευθύνσεων.  Αυτό σημαίνει ότι έχετε "
 "εισαγάγει  λάθος URI, ή ότι ο εξυπηρετητής LDAP είναι εκτός λειτουργίας."
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:102
+#, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution you must compile the program from the CVS "
-"sources after retrieving OpenLDAP from the link below."
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
 msgstr ""
 "Το Evolution δε διαθέτει στη σύνθεσή του υποστήριξη LDAP. Αν θέλετε να "
 "κάνετε χρήση LDAP  στο Evolution θα πρέπει να συνθέσετε το πρόγραμμα από τις "
 "πηγές CVS αφού κάνετελήψη του OpenLDAP από τον παρακάτω σύνδεσμο."
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:109
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -2699,11 +2613,7 @@ msgstr ""
 "Δεν ήταν δυνατό το άνοιγμα του Βιβλίου Διευθύνσεων. Αυτό σημαίνει ότι έχετε "
 "εισαγάγει λάθος URI, ή ότι ο εξυπηρετητής είναι εκτός λειτουργίας."
 
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "Unable to open addressbook"
-msgstr "Δεν ήταν δυνατό το άνοιγμα του Βιβλίου Διευθύνσεων"
-
-#: addressbook/gui/widgets/eab-gui-util.c:162
+#: addressbook/gui/widgets/eab-gui-util.c:129
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2715,7 +2625,7 @@ msgstr ""
 "ή αυξήστε το όριο αποτελεσμάτων στις προτιμήσεις διακομιστή καταλόγου\n"
 "για αυτό το ευρετήριο διευθύνσεων."
 
-#: addressbook/gui/widgets/eab-gui-util.c:168
+#: addressbook/gui/widgets/eab-gui-util.c:135
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -2729,57 +2639,49 @@ msgstr ""
 "ή αυξήστε το όριο αποτελεσμάτων στις προτιμήσεις διακομιστή καταλόγου\n"
 "για αυτό το ευρετήριο διευθύνσεων. "
 
-#: addressbook/gui/widgets/eab-gui-util.c:174
+#: addressbook/gui/widgets/eab-gui-util.c:141
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 "Το backend για αυτό το ευρετήριο διευθύνσεων αδυνατεί να αναλύσει αυτό το "
 "ερώτημα."
 
-#: addressbook/gui/widgets/eab-gui-util.c:177
+#: addressbook/gui/widgets/eab-gui-util.c:144
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 "Το backend για αυτό το ευρετήριο διευθύνσεων αρνήθηκε να αναλύσει αυτό το "
 "ερώτημα."
 
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:147
 msgid "This query did not complete successfully."
 msgstr "Αυτό το ερώτημα δεν ολοκληρώθηκε επιτυχώς."
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
-msgid "Do you want to save changes?"
-msgstr "Θέλετε να αποθηκεύσετε τις αλλαγές;"
-
-#: addressbook/gui/widgets/eab-gui-util.c:208
-msgid "_Discard"
-msgstr "Α_πόρριψη"
-
-#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:169
 msgid "Error adding list"
 msgstr "Σφάλμα προσθήκης λίστας"
 
-#: addressbook/gui/widgets/eab-gui-util.c:229
-#: addressbook/gui/widgets/eab-gui-util.c:652
+#: addressbook/gui/widgets/eab-gui-util.c:169
+#: addressbook/gui/widgets/eab-gui-util.c:580
 msgid "Error adding contact"
 msgstr "Σφάλμα προσθήκης επαφής"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying list"
 msgstr "Σφάλμα τροποποίησης λίστας"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying contact"
 msgstr "Σφάλμα τροποποίησης επαφής"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:192
 msgid "Error removing list"
 msgstr "Σφάλμα κατάργησης λίστας"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
-#: addressbook/gui/widgets/eab-gui-util.c:610
+#: addressbook/gui/widgets/eab-gui-util.c:192
+#: addressbook/gui/widgets/eab-gui-util.c:538
 msgid "Error removing contact"
 msgstr "Σφάλμα αφαίρεσης επαφής"
 
-#: addressbook/gui/widgets/eab-gui-util.c:334
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2788,7 +2690,7 @@ msgstr ""
 "Το άνοιγμα %d επαφών θα ανοίξει και %d νέα παράθυρα.\n"
 "Θέλετε πραγματικά να εμφανίσετε όλες αυτές τις επαφές?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:360
+#: addressbook/gui/widgets/eab-gui-util.c:300
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2797,49 +2699,44 @@ msgstr ""
 "Το %s υπάρχει ήδη.\n"
 "Θέλετε να αντικατασταθεί;"
 
-#: addressbook/gui/widgets/eab-gui-util.c:364
+#: addressbook/gui/widgets/eab-gui-util.c:304
 msgid "Overwrite"
 msgstr "Αντικατάσταση"
 
-#: addressbook/gui/widgets/eab-gui-util.c:400
-#, c-format
-msgid "Error saving %s: %s"
-msgstr "Σφάλμα αποθήκευσης  %s: %s"
-
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:437
+#: addressbook/gui/widgets/eab-gui-util.c:365
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:571
+#: addressbook/gui/widgets/eab-gui-util.c:499
 msgid "list"
 msgstr "λίστα"
 
-#: addressbook/gui/widgets/eab-gui-util.c:706
+#: addressbook/gui/widgets/eab-gui-util.c:634
 msgid "Move contact to"
 msgstr "Μετακίνηση επαφής σε"
 
-#: addressbook/gui/widgets/eab-gui-util.c:708
+#: addressbook/gui/widgets/eab-gui-util.c:636
 msgid "Copy contact to"
 msgstr "Αντιγραφή επαφής σε"
 
-#: addressbook/gui/widgets/eab-gui-util.c:711
+#: addressbook/gui/widgets/eab-gui-util.c:639
 msgid "Move contacts to"
 msgstr "Μετακίνηση επαφών σε"
 
-#: addressbook/gui/widgets/eab-gui-util.c:713
+#: addressbook/gui/widgets/eab-gui-util.c:641
 msgid "Copy contacts to"
 msgstr "Αντιγραφή επαφών σε"
 
-#: addressbook/gui/widgets/eab-gui-util.c:716
+#: addressbook/gui/widgets/eab-gui-util.c:644
 msgid "Select target addressbook."
 msgstr "Επιλογή βιβλίου διευθύνσεων στόχου"
 
-#: addressbook/gui/widgets/eab-gui-util.c:939
+#: addressbook/gui/widgets/eab-gui-util.c:867
 msgid "Multiple VCards"
 msgstr "Πολλαπλές Εκάρτες"
 
-#: addressbook/gui/widgets/eab-gui-util.c:942
+#: addressbook/gui/widgets/eab-gui-util.c:870
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard για %s"
@@ -2926,7 +2823,7 @@ msgstr[1] "%d επαφές"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:229
+#: addressbook/gui/widgets/e-addressbook-view.c:231
 #: addressbook/gui/widgets/e-minicard-view.c:467
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
@@ -2944,143 +2841,131 @@ msgstr "Μοντέλο"
 msgid "Error modifying card"
 msgstr "Σφάλμα τροποποίησης κάρτας"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:163
 msgid "Name begins with"
 msgstr "Όνομα αρχίζει με"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:164
 msgid "Email begins with"
 msgstr "Email αρχίζει με"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:57
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Η κατηγορία είναι"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-#: calendar/gui/cal-search-bar.c:50
+#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Κάθε πεδίο περιέχει"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+#: addressbook/gui/widgets/e-addressbook-view.c:172
 msgid "Advanced..."
 msgstr "Για Προχωρημένους..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:236
+#: addressbook/gui/widgets/e-addressbook-view.c:238
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:249
+#: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Τύπος"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:506
+#: addressbook/gui/widgets/e-addressbook-view.c:508
 msgid "Address Book"
 msgstr "Βιβλίο Διευθύνσεων"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2076
+#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:2080
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
 msgstr "Αποθήκευση ως (VCard)"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 msgid "New Contact..."
 msgstr "Νέα Επαφή..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "New Contact List..."
 msgstr "Νέα Λίστα Επαφών..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Go to Folder..."
 msgstr "Μετάβαση στο Φάκελο..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Import..."
 msgstr "Εισαγωγή..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1066
 msgid "Search for Contacts..."
 msgstr "Αναζήτηση για επαφές..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 msgid "Address Book Sources..."
 msgstr "Πηγές βιβλίου διευθύνσεων..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1069
 msgid "Pilot Settings..."
 msgstr "Ρυθμίσεις Pilot ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Προώθηση Επαφής"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
 msgid "Send Message to Contact"
 msgstr "Αποστολή Μηνύματος στη Επαφή"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Εκτύπωση"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
+#: addressbook/gui/widgets/e-addressbook-view.c:1077
 msgid "Print Envelope"
 msgstr "Εκτύπωση Φακέλου"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
+#: addressbook/gui/widgets/e-addressbook-view.c:1081
 msgid "Copy to Address Book..."
 msgstr "Αντιγραφή στο Βιβλίο Διευθύνσεων..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1080
+#: addressbook/gui/widgets/e-addressbook-view.c:1082
 msgid "Move to Address Book..."
 msgstr "Μετακίνηση στο Βιβλίο Διευθύνσεων..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Αποκοπή"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Αντιγραφή"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1087
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Επικόλληση"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:1092
+#: calendar/gui/e-calendar-view.c:1280
 msgid "Current View"
 msgstr "Τρέχουσα Προβολή"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1309
-#, c-format
-msgid ""
-"The addressbook backend for\n"
-"%s\n"
-"has crashed. You will have to restart Evolution in order to use it again"
-msgstr ""
-"Το backend του ευρετηρίου διευθύνσεων για\n"
-"%s\n"
-"κόλλησε. Θα πρέπει να επανεκκινήσετε το Evolution για να το "
-"ξαναχρησιμοποιήσετε"
-
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1667
-#: calendar/gui/cal-search-bar.c:362
+#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Κάθε Κατηγορία"
 
@@ -3186,7 +3071,7 @@ msgstr "Ραδιόφωνο"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-list-view.c:234
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Ρόλος"
@@ -3328,12 +3213,12 @@ msgstr "Εισαγωγέας VCard Evolution"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: addressbook/printing/e-contact-print.c:998
+#: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr "Εκτύπωση επαφών"
 
-#: addressbook/printing/e-contact-print.c:1064
-#: addressbook/printing/e-contact-print.c:1091
+#: addressbook/printing/e-contact-print.c:1066
+#: addressbook/printing/e-contact-print.c:1093
 msgid "Print contact"
 msgstr "Εκτύπωση επαφής"
 
@@ -3585,15 +3470,21 @@ msgstr "Σε κανονική λειτουργία, δεν χρειάζεστε
 msgid "Impossible internal error."
 msgstr "Αδύνατο εσωτερικό σφάλμα."
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:629
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
 msgid "Can not open file"
 msgstr "Δεν ήταν δυνατό το άνοιγμα του αρχείου"
 
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-msgid "Can not load URI"
-msgstr "Αδυναμία φόρτωσης URI"
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "Δεν ήταν δυνατό να φορτωθεί το ευρετήριο διευθύνσεων"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Δεν ήταν δυνατό το άνοιγμα του Βιβλίου Διευθύνσεων"
 
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
@@ -3611,7 +3502,7 @@ msgstr "Δεν έχετε δώσει όνομα αρχείου."
 msgid "Unnamed List"
 msgstr "Λίστα Χωρίς Τίτλο"
 
-#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Εισάγετε κωδικό"
@@ -3891,10 +3782,10 @@ msgid "Whether to show week numbers in date navigator"
 msgstr "Αν θα εμφανίζονται οι αριθμοί εβδομάδων στον περιηγητή ημερολογίου"
 
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:88
-#: calendar/gui/gnome-cal.c:1703
-#: camel/providers/groupwise/camel-gw-listener.c:304
-#: camel/providers/groupwise/camel-gw-listener.c:327
+#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/gnome-cal.c:1705
+#: camel/providers/groupwise/camel-gw-listener.c:311
+#: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
 msgstr "Ημερολόγιο"
 
@@ -3914,7 +3805,7 @@ msgstr "Εκκαθάριση γεγονότων παλαιότερων από"
 
 #: calendar/gui/calendar-commands.c:363
 #: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:19 filter/filter.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
 msgid "days"
 msgstr "ημέρες"
 
@@ -4063,24 +3954,24 @@ msgstr "Προβολή Εβδομάδας"
 msgid "Month View"
 msgstr "Προβολή Μήνα"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Η περίληψη περιέχει"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Η περιγραφή περιέχει"
 
-#: calendar/gui/cal-search-bar.c:54
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Το σχόλιο περιέχει"
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:53
 #, fuzzy
 msgid "Location contains"
 msgstr "Η περιγραφή περιέχει"
 
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
 msgid "Unmatched"
 msgstr "Αταίριαστο"
 
@@ -4101,23 +3992,23 @@ msgstr "Δεν επιτρέπεται η πρόσβαση για το άνοιγ
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/dialogs/alarm-options.c:466
+#: calendar/gui/dialogs/alarm-options.c:467
 msgid "Audio Alarm Options"
 msgstr "Επιλογές Ηχητικής Ειδοποίησης"
 
-#: calendar/gui/dialogs/alarm-options.c:475
+#: calendar/gui/dialogs/alarm-options.c:476
 msgid "Message Alarm Options"
 msgstr "Επιλογές Ειδοποίησης Μηνύματος"
 
-#: calendar/gui/dialogs/alarm-options.c:484
+#: calendar/gui/dialogs/alarm-options.c:485
 msgid "Email Alarm Options"
 msgstr "Επιλογές Ειδοποίησης Email"
 
-#: calendar/gui/dialogs/alarm-options.c:493
+#: calendar/gui/dialogs/alarm-options.c:494
 msgid "Program Alarm Options"
 msgstr "Επιλογές Ειδοποίησης Προγράμματος"
 
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:510
 msgid "Unknown Alarm Options"
 msgstr "Άγνωστες Επιλογές Ειδοποίησης"
 
@@ -4153,7 +4044,7 @@ msgstr "Αποστολή Σε:"
 msgid "With these arguments:"
 msgstr "Με αυτές τις παραμέτρους:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
 msgid "dialog1"
 msgstr "διάλογος1"
 
@@ -4162,7 +4053,7 @@ msgid "extra times every"
 msgstr "επιπλέον φορές κάθε"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:20 filter/filter.glade.h:16
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr "ώρες"
 
@@ -4208,7 +4099,7 @@ msgstr "Αποστολή e-mail"
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Περίληψη:"
 
@@ -4238,7 +4129,6 @@ msgid "hour(s)"
 msgstr "ώρα(ες)"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:21
 msgid "minute(s)"
 msgstr "λεπτό(ά)"
 
@@ -4246,28 +4136,28 @@ msgstr "λεπτό(ά)"
 msgid "start of appointment"
 msgstr "αρχή ραντεβού"
 
-#: calendar/gui/dialogs/calendar-setup.c:170
+#: calendar/gui/dialogs/calendar-setup.c:172
 msgid "You must specify a location to get the calendar from."
 msgstr ""
 "Θα πρέπει να καθορίσετε μια τοποθεσία από την οποία θα γίνει η λήψη του "
 "ημερολογίου"
 
-#: calendar/gui/dialogs/calendar-setup.c:178
+#: calendar/gui/dialogs/calendar-setup.c:180
 #, c-format
 msgid "The source location '%s' is not well-formed."
 msgstr "Η τοποθεσία πηγής '%s' δεν είναι σωστά διατυπωμένη"
 
-#: calendar/gui/dialogs/calendar-setup.c:193
+#: calendar/gui/dialogs/calendar-setup.c:195
 #, c-format
 msgid "The source location '%s' is not a webcal source."
 msgstr "Η τοποθεσία πηγής '%s' δεν είναι πηγή webcal "
 
-#: calendar/gui/dialogs/calendar-setup.c:265
+#: calendar/gui/dialogs/calendar-setup.c:275
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr "Η πηγή  με το όνομα  '%s' υπάρχει ήδη στην επιλεγμένη ομάδα"
 
-#: calendar/gui/dialogs/calendar-setup.c:278
+#: calendar/gui/dialogs/calendar-setup.c:288
 #, c-format
 msgid ""
 "The group '%s' is remote. You must specify a location to get the calendar "
@@ -4291,56 +4181,36 @@ msgstr "Ομάδα λίστας εργασιών"
 msgid "C_olor:"
 msgstr "Χ_ρώματα"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "Calendar Properties"
-msgstr "Ιδιότητες ημερολογίου"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
 msgid "Pick a color"
 msgstr "Διαλέξτε χρώμα"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:8
-msgid "Remote"
-msgstr "Απομακρυσμένο: "
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "Task List Properties"
-msgstr "Ιδιότητες  λίστας εργασιών"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
 #, fuzzy
 msgid "_Add Calendar"
 msgstr "Προσθήκη νέου ημερολογίου"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
 #, fuzzy
 msgid "_Add Group"
 msgstr "_Προσθήκη Ομάδας..."
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-msgid "_Refresh Interval:"
-msgstr "Διά_στημα ανανέωσης:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
 #, fuzzy
 msgid "_Refresh:"
 msgstr "Ανανέωση"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-msgid "_Source URL:"
-msgstr "Πηγή URL:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
 #, fuzzy
 msgid "_Type:"
 msgstr "Τύπος:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
 #, fuzzy
 msgid "_URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
 msgid "weeks"
 msgstr "εβδομάδες"
 
@@ -4448,7 +4318,7 @@ msgid "Display"
 msgstr "_Εμφάνιση"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:76
 msgid "E_nable"
 msgstr "_Ενεργοποίηση"
 
@@ -4459,7 +4329,7 @@ msgstr "Γνωστοποίηση _διαθεσιμότητας"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:563
+#: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Παρασκευή"
 
@@ -4473,7 +4343,7 @@ msgstr "Λεπτά"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:559
+#: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Δευτέρα"
 
@@ -4483,7 +4353,7 @@ msgstr "_Κυρ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:564
+#: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Σάββατο"
 
@@ -4497,7 +4367,7 @@ msgstr "Εμφάνιση αριθμών εβδομάδων στον περιηγ
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Κυριακή"
 
@@ -4511,7 +4381,7 @@ msgstr "_Πέμ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:562
+#: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Πέμπτη"
 
@@ -4525,7 +4395,7 @@ msgstr "Μορφή ώρας:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:560
+#: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Τρίτη"
 
@@ -4535,7 +4405,7 @@ msgstr "Ε_βδομάδα ξεκινάει:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:561
+#: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Τετάρτη"
 
@@ -4568,7 +4438,7 @@ msgid "_Day begins:"
 msgstr "Η _μέρα αρχίζει στις :"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
-#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:43
@@ -4617,88 +4487,50 @@ msgstr "_Τετ"
 msgid "before every appointment"
 msgstr "πριν από κάθε ραντεβού"
 
-#: calendar/gui/dialogs/cancel-comp.c:57
-msgid ""
-"The event being deleted is a meeting, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"Το γεγονός που διαγράφηκε ήταν μια συνάντηση, θέλετε να στείλετε μια "
-"ειδοποίηση ακύρωσης?"
-
-#: calendar/gui/dialogs/cancel-comp.c:60
-msgid "Are you sure you want to cancel and delete this meeting?"
-msgstr "Είστε βέβαιοι για την ακύρωση και διαγραφή της συνάντησης;"
-
-#: calendar/gui/dialogs/cancel-comp.c:66
-msgid ""
-"The task being deleted is assigned, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"Η εργασία που διαγράφηκε είχε ανατεθεί, θέλετε να στείλετε μια ειδοποίηση "
-"ακύρωσης?"
-
-#: calendar/gui/dialogs/cancel-comp.c:69
-msgid "Are you sure you want to cancel and delete this task?"
-msgstr "Είστε βέβαιοι για την ακύρωση και την διαγραφή της εργασίας;"
-
-#: calendar/gui/dialogs/cancel-comp.c:75
-msgid ""
-"The journal entry being deleted is published, would you like to send a "
-"cancellation notice?"
-msgstr ""
-"Η καταχώρηση που διαγράφηκε είχε δημοσιευθεί, θέλετε να στείλετε μια "
-"ειδοποίηση ακύρωσης?"
-
-#: calendar/gui/dialogs/cancel-comp.c:78
-msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr ""
-"Είστε βέβαιοι για την ακύρωση και την διαγραφή της καταχώρισης του "
-"ημερολογίου;"
-
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Το συμβάν έχει διαγραφεί."
 
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "Η εργασία έχει διαγραφεί."
 
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:68
 msgid "This journal entry has been deleted."
 msgstr "Η καταχώριση του ημερολογίου έχει διαγραφεί."
 
-#: calendar/gui/dialogs/changed-comp.c:75
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  Έχετε κάνει αλλαγές. Να αγνοηθούν οι αλλαγές και να τερματιστεί ο "
 "επεξεργαστής;"
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Δεν έχετε κάνει αλλαγές. Να τερματιστεί ο επεξεργαστής;"
 
-#: calendar/gui/dialogs/changed-comp.c:82
+#: calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "Το συμβάν έχει αλλάξει."
 
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "Η εργασία έχει αλλάξει."
 
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:92
 msgid "This journal entry has been changed."
 msgstr "Η καταχώριση του ημερολογίου έχει αλλάξει."
 
-#: calendar/gui/dialogs/changed-comp.c:99
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Δεν έχετε κάνει αλλαγές. Να αγνοηθούν οι αλλαγές και να ανανεωθεί ο "
 "επεξεργαστής;"
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Δεν έχετε κάνει αλλαγές. Να ανανεωθεί ο επεξεργαστής;"
@@ -4736,7 +4568,7 @@ msgid "No summary"
 msgstr "Χωρίς περίληψη"
 
 #: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
 #: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Αποθήκευση ως..."
@@ -4790,101 +4622,52 @@ msgstr "Αδύνατο το άνοιγμα προορισμού"
 msgid "Destination is read only"
 msgstr "Ο προορισμός είναι μόνο για ανάγνωση"
 
-#: calendar/gui/dialogs/delete-comp.c:95
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "Είστε βέβαιοι για την διαγραφή του ραντεβού`%s';"
-
-#: calendar/gui/dialogs/delete-comp.c:98
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "Είστε βέβαιοι για την διαγραφή του ραντεβού χωρίς όνομα;"
-
-#: calendar/gui/dialogs/delete-comp.c:104
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "Είστε βέβαιοι για την διαγραφή της εργασίας`%s';"
-
-#: calendar/gui/dialogs/delete-comp.c:107
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "Είστε βέβαιοι για την διαγραφή της εργασίας χωρίς όνομα;"
-
-#: calendar/gui/dialogs/delete-comp.c:113
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "Είστε βέβαιοι για την διαγραφή της καταχώρισης ημερολογίου `%s';"
-
-#: calendar/gui/dialogs/delete-comp.c:116
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr ""
-"Είστε βέβαιοι για την διαγραφή της καταχώρισης ημερολογίου χωρίς τίτλο;"
-
-#: calendar/gui/dialogs/delete-comp.c:131
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d appointment?"
-msgid_plural "Are you sure you want to delete %d appointments?"
-msgstr[0] "Είστε βέβαιοι για την διαγραφή %d ραντεβού;"
-msgstr[1] "Είστε βέβαιοι για την διαγραφή %d ραντεβού;"
-
-#: calendar/gui/dialogs/delete-comp.c:138
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d task?"
-msgid_plural "Are you sure you want to delete %d tasks?"
-msgstr[0] "Είστε βέβαιοι για την διαγραφή %d εργασιών;"
-msgstr[1] "Είστε βέβαιοι για την διαγραφή %d εργασιών;"
-
-#: calendar/gui/dialogs/delete-comp.c:145
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d journal entry?"
-msgid_plural "Are you sure you want to delete %d journal entries?"
-msgstr[0] "Είστε βέβαιοι για την διαγραφή %d καταχωρίσεων ημερολογίου ;"
-msgstr[1] "Είστε βέβαιοι για την διαγραφή %d καταχωρίσεων ημερολογίου ;"
-
-#: calendar/gui/dialogs/delete-error.c:52
+#: calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "Δεν ήταν δυνατή η διαγραφή του γεγονότος λόγω σφάλματος cobra"
 
-#: calendar/gui/dialogs/delete-error.c:55
+#: calendar/gui/dialogs/delete-error.c:57
 msgid "The task could not be deleted due to a corba error"
 msgstr "Δεν ήταν δυνατή η διαγραφή της εργασίας λόγω σφάλματος cobra"
 
-#: calendar/gui/dialogs/delete-error.c:58
+#: calendar/gui/dialogs/delete-error.c:60
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr "Δεν ήταν δυνατή η διαγραφή της καταχώρησης λόγω σφάλματος cobra"
 
-#: calendar/gui/dialogs/delete-error.c:61
+#: calendar/gui/dialogs/delete-error.c:63
 msgid "The item could not be deleted due to a corba error"
 msgstr "Δεν ήταν δυνατή η διαγραφή του αντικειμένου λόγω σφάλματος cobra"
 
-#: calendar/gui/dialogs/delete-error.c:68
+#: calendar/gui/dialogs/delete-error.c:70
 msgid "The event could not be deleted because permission was denied"
 msgstr "Δεν ήταν δυνατή η διαγραφή του γεγονότος λόγω άρνησης πρόσβασης"
 
-#: calendar/gui/dialogs/delete-error.c:71
+#: calendar/gui/dialogs/delete-error.c:73
 msgid "The task could not be deleted because permission was denied"
 msgstr "Δεν ήταν δυνατή η διαγραφή της εργασίας λόγω άρνησης πρόσβασης"
 
-#: calendar/gui/dialogs/delete-error.c:74
+#: calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr ""
 "Δεν ήταν δυνατή η διαγραφή της καταχώρησης ημερολογίου λόγω άρνησης πρόσβασης"
 
-#: calendar/gui/dialogs/delete-error.c:77
+#: calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
 msgstr "Δεν ήταν δυνατή η διαγραφή του αντικειμένου λόγω άρνησης πρόσβασης"
 
-#: calendar/gui/dialogs/delete-error.c:84
+#: calendar/gui/dialogs/delete-error.c:86
 msgid "The event could not be deleted due to an error"
 msgstr "Δεν ήταν δυνατή η διαγραφή του γεγονότος λόγω ενός σφάλματος "
 
-#: calendar/gui/dialogs/delete-error.c:87
+#: calendar/gui/dialogs/delete-error.c:89
 msgid "The task could not be deleted due to an error"
 msgstr "Δεν ήταν δυνατή η διαγραφή της εργασίας λόγω ενός σφάλματος"
 
-#: calendar/gui/dialogs/delete-error.c:90
+#: calendar/gui/dialogs/delete-error.c:92
 msgid "The journal entry could not be deleted due to an error"
 msgstr "Δεν ήταν δυνατή η διαγραφή της καταχώρησης λόγω ενός σφάλματος"
 
-#: calendar/gui/dialogs/delete-error.c:93
+#: calendar/gui/dialogs/delete-error.c:95
 msgid "The item could not be deleted due to an error"
 msgstr "Δεν ήταν δυνατή η διαγραφή του αντικειμένου λόγω ενός σφάλματος"
 
@@ -5018,11 +4801,11 @@ msgstr "Χρόνος Έ_ναρξης:"
 
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:3
+#: calendar/gui/dialogs/meeting-page.glade.h:4
 #: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
 #: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1559
-#: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:100
+#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
+#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
@@ -5048,8 +4831,8 @@ msgstr "_Εξουσιοδότηση Σε..."
 #. FIXME: need to disable for undeletable folders
 #: calendar/gui/dialogs/meeting-page.c:655
 #: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1310 calendar/gui/e-calendar-view.c:1342
-#: mail/em-folder-tree.c:2557 mail/em-folder-view.c:919
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
+#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -5057,7 +4840,7 @@ msgid "_Delete"
 msgstr "_Διαγραφή"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:240
+#: calendar/gui/e-meeting-list-view.c:218
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Παρευρισκόμενος"
@@ -5093,16 +4876,15 @@ msgid "Member"
 msgstr "Μέλος"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
-#: mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-list-view.c:248
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Κατάσταση"
 
@@ -5110,20 +4892,20 @@ msgstr "Κατάσταση"
 msgid "Add A_ttendee"
 msgstr "Προσθήκη πα_ρευρισκόμενου"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "Add attendees from addressbook."
+msgstr "Προσθήκη Αποστολέα στο _Βιβλίο Διευθύνσεων"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Διοργανωτής:"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
+#: calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "_Change Organizer"
 msgstr "Α_λλάξτε Διοργανωτή"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-#: calendar/gui/e-meeting-time-sel.c:417
-msgid "_Invite Others..."
-msgstr "_Πρόσκληση Άλλων..."
-
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
 msgstr "<b>Επιλογές ημερολογίου</b>"
@@ -5275,7 +5057,7 @@ msgid "_No recurrence"
 msgstr "_Χωρίς επανεμφάνιση"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:450
+#: composer/e-msg-composer-attachment-bar.c:453
 msgid "_Remove"
 msgstr "Α_φαίρεση"
 
@@ -5307,57 +5089,20 @@ msgstr "εβδομάδα(ες)"
 msgid "year(s)"
 msgstr "χρόνος(ια)"
 
-#: calendar/gui/dialogs/save-comp.c:53
-msgid ""
-"This event has been changed, but has not been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Το γεγονός  έχει αλλάξει αλλά δεν έχει αποθηκευτεί.\n"
-"\n"
-"Θέλετε να αποθηκεύσετε τις αλλαγές τώρα;"
-
-#: calendar/gui/dialogs/save-comp.c:57
-msgid "_Discard Changes"
-msgstr "Α_πόρριψη Αλλαγών"
-
-#: calendar/gui/dialogs/save-comp.c:62
-msgid "Save Event"
-msgstr "Αποθήκευση Γεγονότος"
-
-#: calendar/gui/dialogs/select-source-dialog.c:65
+#: calendar/gui/dialogs/select-source-dialog.c:69
 #, fuzzy
 msgid "Select destination"
 msgstr "Επιλογή προορισμού %s"
 
-#: calendar/gui/dialogs/select-source-dialog.c:86
+#: calendar/gui/dialogs/select-source-dialog.c:90
 #, fuzzy
 msgid "_Destination"
 msgstr "Φάκελος προορισμού:"
 
-#: calendar/gui/dialogs/select-source-dialog.c:88
+#: calendar/gui/dialogs/select-source-dialog.c:92
 msgid "Task List"
 msgstr "Λίστα Εργασιών"
 
-#: calendar/gui/dialogs/send-comp.c:57
-msgid "The meeting information has been created. Send it?"
-msgstr "Η πληροφορίες της συνάντησης έχουν δημιουργηθεί. Να αποσταλούν?"
-
-#: calendar/gui/dialogs/send-comp.c:60
-msgid "The meeting information has changed. Send an updated version?"
-msgstr ""
-"Η πληροφορίες της συνάντησης έχουν αλλάζει. Να αποσταλεί ενημερωμένη έκδοση;"
-
-#: calendar/gui/dialogs/send-comp.c:67
-msgid "The task assignment information has been created. Send it?"
-msgstr ""
-"Οι πληροφορίες της ανάθεσης εργασίας έχουν δημιουργηθεί. Να αποσταλούν;"
-
-#: calendar/gui/dialogs/send-comp.c:71
-msgid "The task information has changed. Send an updated version?"
-msgstr ""
-"Η πληροφορίες της εργασία έχει αλλάξει. Να αποσταλεί ενημερωμένη έκδοση;"
-
 #: calendar/gui/dialogs/task-details-page.c:406
 msgid "Completed date is wrong"
 msgstr "Η συμπληρωμένη ημερομηνία είναι λανθασμένη"
@@ -5377,7 +5122,7 @@ msgstr "Ολοκληρώθηκε"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #: calendar/gui/e-cal-component-preview.c:249
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:960
 msgid "High"
 msgstr "Υψηλή"
 
@@ -5391,14 +5136,14 @@ msgstr "Σε Εξέλιξη"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:253
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:958
 msgid "Low"
 msgstr "Χαμηλή"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:251
 #: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:957
+#: mail/message-list.c:959
 msgid "Normal"
 msgstr "Κανονική"
 
@@ -5456,8 +5201,8 @@ msgstr "_Εμπιστευτικό"
 
 #: calendar/gui/dialogs/task-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
+#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Περιγραφή:"
 
@@ -5622,7 +5367,7 @@ msgstr "Ημερομηνία Λήξης:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:950
+#: calendar/gui/e-itip-control.c:943
 msgid "Status:"
 msgstr "Κατάσταση:"
 
@@ -5707,12 +5452,12 @@ msgstr "Απασχολημένη"
 msgid "Deleting selected objects"
 msgstr "Διαγραφή επιλεγμένων αντικειμένων"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
 msgid "Updating objects"
 msgstr "Αναβάθμιση Αντικειμένων"
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1370
+#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
 #: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Άνοιγμα"
@@ -5722,15 +5467,15 @@ msgid "Open _Web Page"
 msgstr "Άνοιγμα Ιστο_σελίδας"
 
 #: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1291 calendar/gui/e-calendar-view.c:1376
-#: mail/em-folder-view.c:896 mail/em-popup.c:690 mail/em-popup.c:806
+#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
+#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "Αποθήκευση _ως..."
 
 #: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1292
-#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
+#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
@@ -5738,24 +5483,24 @@ msgid "_Print..."
 msgstr "_Εκτύπωση..."
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Αποκοπή"
 
 #: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1338
-#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2550
-#: mail/message-list.c:1644 ui/evolution-addressbook.xml.h:31
+#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
+#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
+#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "Αντι_γραφή"
 
 #: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1273 calendar/gui/e-calendar-view.c:1299
-#: calendar/gui/e-calendar-view.c:1372 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
+#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
@@ -5824,71 +5569,71 @@ msgstr "Περίληψη"
 msgid "Task sort"
 msgstr "Ταξινόμηση Εργασιών"
 
-#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
 msgid "New _Appointment..."
 msgstr "Νέο Ρ_αντεβού..."
 
-#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
+#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
 msgid "New All Day _Event"
 msgstr "Νέο _Γεγονός Ολόκληρης της Ημέρας"
 
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
+#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
 msgid "New Meeting"
 msgstr "Νέα Συνάντηση"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
 msgid "New Task"
 msgstr "Νέα Εργασία"
 
-#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Επιλογή _Θέματος"
 
-#: calendar/gui/e-calendar-view.c:1280
+#: calendar/gui/e-calendar-view.c:1283
 #, fuzzy
 msgid "_Select Date..."
 msgstr "Επιλο_γή..."
 
-#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "Δημο_σίευση πληροφοριών Διαθεσιμότητας"
 
-#: calendar/gui/e-calendar-view.c:1303
+#: calendar/gui/e-calendar-view.c:1306
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Αντιγραφή σε Φάκελο..."
 
-#: calendar/gui/e-calendar-view.c:1304
+#: calendar/gui/e-calendar-view.c:1307
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "Με_τακίνηση στο Φάκελο..."
 
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1308
 msgid "_Schedule Meeting..."
 msgstr "Προγραμματισμός _Συνάντησης..."
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1309
 msgid "_Forward as iCalendar..."
 msgstr "Προώ_θηση ως iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
 msgid "Delete this _Occurrence"
 msgstr "Διαγραφή αυτής της _Εμφάνισης"
 
-#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
 msgid "Delete _All Occurrences"
 msgstr "Διαγραφή Ό_λων των Εμφανίσεων"
 
-#: calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1349
 msgid "Go to _Today"
 msgstr "Μετάβαση στο _Σήμερα"
 
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1351
 msgid "_Go to Date..."
 msgstr "_Μετάβαση στην Ημερομηνία..."
 
-#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "_Ρυθμίσεις..."
 
@@ -5903,9 +5648,9 @@ msgstr "Ημερομηνία Έναρξης"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:967 calendar/gui/e-itip-control.c:1169
-#: calendar/gui/e-meeting-list-view.c:144
-#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
 #: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
 #: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
 #: camel/camel-tcp-stream-openssl.c:631
@@ -5931,13 +5676,13 @@ msgid "Assigned"
 msgstr "Ανάθεση"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr "Ναι"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "Όχι"
 
@@ -5949,7 +5694,7 @@ msgstr "Β"
 msgid "S"
 msgstr "Ν"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
 msgid "E"
 msgstr "Α"
 
@@ -6021,102 +5766,102 @@ msgstr "%d %b"
 msgid "%02i minute divisions"
 msgstr "%02i τμήματα λεπτών"
 
-#: calendar/gui/e-itip-control.c:592
+#: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
 msgstr "Ναι. (Σύνθετη επανεμφάνιση)"
 
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:596
 #, fuzzy, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Κάθε ημέρα"
 msgstr[1] "Κάθε ημέρα"
 
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:601
 #, fuzzy, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Κάθε εβδομάδα"
 msgstr[1] "Κάθε εβδομάδα"
 
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:603
 #, fuzzy, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "Κάθε εβδομάδα στις"
 msgstr[1] "Κάθε εβδομάδα στις"
 
-#: calendar/gui/e-itip-control.c:618
+#: calendar/gui/e-itip-control.c:611
 msgid " and "
 msgstr " και"
 
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:618
 #, c-format
 msgid "The %s day of "
 msgstr "Την %s ημέρα της"
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:631
 #, c-format
 msgid "The %s %s of "
 msgstr "Την %s %s του"
 
-#: calendar/gui/e-itip-control.c:645
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "κάθε  μήνα"
 msgstr[1] "κάθε  μήνα"
 
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:642
 #, fuzzy, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Κάθε χρόνο"
 msgstr[1] "Κάθε χρόνο"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:653
 #, fuzzy, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] "σύνολο %d φορές"
 msgstr[1] "σύνολο %d φορές"
 
-#: calendar/gui/e-itip-control.c:669
+#: calendar/gui/e-itip-control.c:662
 msgid ", ending on "
 msgstr ", τελειώνει στις"
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:686
 msgid "<b>Starts:</b> "
 msgstr "<b>Ξεκινάει:</b> "
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:696
 msgid "<b>Ends:</b> "
 msgstr "<b>Τελειώνει:</b> "
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:716
 msgid "<b>Completed:</b> "
 msgstr "<b>Ολοκληρώθηκε:</b> "
 
-#: calendar/gui/e-itip-control.c:733
+#: calendar/gui/e-itip-control.c:726
 msgid "<b>Due:</b> "
 msgstr "<b>Λήγει:</b> "
 
-#: calendar/gui/e-itip-control.c:771 calendar/gui/e-itip-control.c:827
+#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
 msgid "iCalendar Information"
 msgstr "Πληροφορίες iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:788
+#: calendar/gui/e-itip-control.c:781
 msgid "iCalendar Error"
 msgstr "Σφάλμα iCalendar"
 
-#: calendar/gui/e-itip-control.c:859 calendar/gui/e-itip-control.c:875
-#: calendar/gui/e-itip-control.c:886 calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
 msgid "An unknown person"
 msgstr "Ένα άγνωστο άτομο"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:910
+#: calendar/gui/e-itip-control.c:903
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -6124,307 +5869,311 @@ msgstr ""
 "<br> Παρακαλώ διαβάστε τις παρακάτω πληροφορίες, και επιλέξτε μετά μια "
 "ενέργεια από το παρακάτω μενού."
 
-#: calendar/gui/e-itip-control.c:925
+#: calendar/gui/e-itip-control.c:918
 msgid "<i>None</i>"
 msgstr "<i>Κανένα</i>"
 
-#: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:929
+msgid "Location:"
+msgstr "Τοποθεσία:"
+
+#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Αποδοχή"
 
-#: calendar/gui/e-itip-control.c:959 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Δοκιμαστική Αποδοχή"
 
-#: calendar/gui/e-itip-control.c:963 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Άρνηση πρόσβασης"
 
-#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.c:1050
-#: calendar/gui/e-itip-control.c:1076 calendar/gui/e-itip-control.c:1089
-#: calendar/gui/e-itip-control.c:1102 calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
 msgid "Choose an action:"
 msgstr "Επιλέξτε μια ενέργεια:"
 
-#: calendar/gui/e-itip-control.c:1023
+#: calendar/gui/e-itip-control.c:1016
 msgid "Update"
 msgstr "Ενημέρωση"
 
-#: calendar/gui/e-itip-control.c:1024 calendar/gui/e-itip-control.c:1055
-#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1091
-#: calendar/gui/e-itip-control.c:1104 calendar/gui/e-itip-control.c:1117
-#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
+#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "ΟΚ"
 
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1044
 msgid "Accept"
 msgstr "Αποδοχή"
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1045
 msgid "Tentatively accept"
 msgstr "Δοκιμαστική αποδοχή"
 
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1046
 msgid "Decline"
 msgstr "Απόκρυψη"
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1070
 msgid "Send Free/Busy Information"
 msgstr "Αποστολή πληροφοριών Διαθεσιμότητας"
 
-#: calendar/gui/e-itip-control.c:1090
+#: calendar/gui/e-itip-control.c:1083
 msgid "Update respondent status"
 msgstr "Ανανέωση κατάστασης απάντησης"
 
-#: calendar/gui/e-itip-control.c:1103
+#: calendar/gui/e-itip-control.c:1096
 msgid "Send Latest Information"
 msgstr "Αποστολή τελευταίων πληροφοριών"
 
-#: calendar/gui/e-itip-control.c:1116 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Άκυρο"
 
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1185
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> έχει δημοσιεύσει πληροφορίες συνάντησης."
 
-#: calendar/gui/e-itip-control.c:1193
+#: calendar/gui/e-itip-control.c:1186
 msgid "Meeting Information"
 msgstr "Πληροφορίες Συνάντησης"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1191
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> παρακαλεί την παρουσία του %s σε μια συνάντηση."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1193
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> παρακαλεί την παρουσία σας σε μια συνάντηση."
 
-#: calendar/gui/e-itip-control.c:1201
+#: calendar/gui/e-itip-control.c:1194
 msgid "Meeting Proposal"
 msgstr "Πρόταση Συνάντησης"
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> θα ήθελε να προσθέσει σε μια υπάρχουσα συνάντηση."
 
-#: calendar/gui/e-itip-control.c:1206
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Update"
 msgstr "Ανανέωση Συνάντησης"
 
-#: calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1203
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> θα ήθελε να παραλάβει τις τελευταίες πληροφορίες συνάντησης."
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1204
 msgid "Meeting Update Request"
 msgstr "Αίτη_ση Ανανέωσης Συνάντησης"
 
-#: calendar/gui/e-itip-control.c:1218
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> έχει απαντήσει σε μία πρόσκληση σε συνάντηση."
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Reply"
 msgstr "Απάντηση Συνάντησης"
 
-#: calendar/gui/e-itip-control.c:1226
+#: calendar/gui/e-itip-control.c:1219
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> ακύρωσε μια συνάντηση."
 
-#: calendar/gui/e-itip-control.c:1227
+#: calendar/gui/e-itip-control.c:1220
 msgid "Meeting Cancellation"
 msgstr "Ακύρωση Συνάντησης"
 
-#: calendar/gui/e-itip-control.c:1234 calendar/gui/e-itip-control.c:1302
-#: calendar/gui/e-itip-control.c:1337
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1330
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "ο/η <b>%s</b> έστειλε ένα ακατανόητο μήνυμα."
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1228
 msgid "Bad Meeting Message"
 msgstr "Εσφαλμένο Μήνυμα Συνάντησης"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1253
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> έχει δημοσιεύσει πληροφορίες εργασιών."
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1254
 msgid "Task Information"
 msgstr "Πληροφορίες Εργασιών"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1259
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> ζητάει από τον %s να εκτελέσει μια εργασία."
 
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> σας έχει ζητήσει να εκτελέσετε μια εργασία"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1262
 msgid "Task Proposal"
 msgstr "Πρόταση Εργασίας"
 
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> θα ήθελε να προσθέσει σε μια υπάρχουσα εργασία."
 
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Update"
 msgstr "Ανανέωση Εργασίας"
 
-#: calendar/gui/e-itip-control.c:1278
+#: calendar/gui/e-itip-control.c:1271
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> θα ήθελε την τελευταία πληροφορία εργασιών."
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1272
 msgid "Task Update Request"
 msgstr "Αίτηση _Ανανέωση Εργασίας"
 
-#: calendar/gui/e-itip-control.c:1286
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> απάντησε σε μια ανάθεση εργασίας"
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Reply"
 msgstr "Απάντηση Εργασίας"
 
-#: calendar/gui/e-itip-control.c:1294
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> έχει ακυρώσει μια εργασία."
 
-#: calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1288
 msgid "Task Cancellation"
 msgstr "Ακύρωση Εργασίας"
 
-#: calendar/gui/e-itip-control.c:1303
+#: calendar/gui/e-itip-control.c:1296
 msgid "Bad Task Message"
 msgstr " Μήνυμα Κακής Εργασίας"
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1315
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> έχει δημοσίευση πληροφορίες διαθεσιμότητας"
 
-#: calendar/gui/e-itip-control.c:1323
+#: calendar/gui/e-itip-control.c:1316
 msgid "Free/Busy Information"
 msgstr "Πληροφορίες Διαθεσιμότητας"
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "ο/η <b>%s</b> ζητά πληροφορίες διαθεσιμότητας."
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1321
 msgid "Free/Busy Request"
 msgstr "Αίτηση Διαθεσιμότητας"
 
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1325
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "ο/η <b>%s</b> απάντησε στην αίτηση διαθεσιμότητας."
 
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1326
 msgid "Free/Busy Reply"
 msgstr "Απάντηση Διαθεσιμότητας"
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1331
 msgid "Bad Free/Busy Message"
 msgstr "Εσφαλμένο Μήνυμα Διαθεσιμότητας"
 
-#: calendar/gui/e-itip-control.c:1413
+#: calendar/gui/e-itip-control.c:1406
 msgid "The message does not appear to be properly formed"
 msgstr "Αυτό το μήνυμα δεν φαίνεται να έχει συνταχθεί σωστά."
 
-#: calendar/gui/e-itip-control.c:1472
+#: calendar/gui/e-itip-control.c:1465
 msgid "The message contains only unsupported requests."
 msgstr "Το μήνυμα περιέχει μόνο αιτήσεις που δεν υποστηρίζονται"
 
-#: calendar/gui/e-itip-control.c:1503
+#: calendar/gui/e-itip-control.c:1496
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Το επισυναπτόμενο αρχείο δεν περιέχει έγκυρο αρχείο ημερολογίου"
 
-#: calendar/gui/e-itip-control.c:1535
+#: calendar/gui/e-itip-control.c:1528
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 "Το επισυναπτόμενο αρχείο περιέχει στοιχεία που δεν μπορούν να προβληθούν"
 
-#: calendar/gui/e-itip-control.c:1769
+#: calendar/gui/e-itip-control.c:1762
 msgid "Update complete\n"
 msgstr "Η ανανέωση ολοκληρώθηκε\n"
 
-#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
+#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Δεν ήταν δυνατή η ανανέωση της κατάστασης παρευρισκομένων επειδή το στοιχείο "
 "δεν υπάρχει πλέον"
 
-#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Το αντικείμενο δεν είναι έγκυρο και δεν μπορεί να ενημερωθεί\n"
 
-#: calendar/gui/e-itip-control.c:1825
+#: calendar/gui/e-itip-control.c:1818
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Αυτή η απάντηση δεν είναι από ένα τρέχοντα παρευρισκόμενο. Να προστεθεί?"
 
-#: calendar/gui/e-itip-control.c:1837
+#: calendar/gui/e-itip-control.c:1830
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Δεν ήταν δυνατή η ανανεωθεί της κατάστασης παρευρισκομένων λόγο μιας μη "
 "έγκυρης κατάστασης\n"
 
-#: calendar/gui/e-itip-control.c:1856
+#: calendar/gui/e-itip-control.c:1849
 msgid "There was an error on the CORBA system\n"
 msgstr "Υπήρξε σφάλμα στο σύστημα CORBA\n"
 
-#: calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1852
 msgid "Object could not be found\n"
 msgstr "Δεν ήταν εύρεση του αντικειμένου\n"
 
-#: calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1855
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Δεν έχετε τα απαραίτητα δικαιώματα για να ενημερώσετε το ημερολόγιο\n"
 
-#: calendar/gui/e-itip-control.c:1865
+#: calendar/gui/e-itip-control.c:1858
 msgid "Attendee status updated\n"
 msgstr "Η κατάσταση παρευρισκομένων ανανεώθηκε\n"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1861
 msgid "Attendee status could not be updated!\n"
 msgstr "Δεν ήταν δυνατή η ανανέωση της κατάστασης παρευρισκομένων\n"
 
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1892
 msgid "Removal Complete"
 msgstr "Η Αφαίρεση Ολοκληρώθηκε"
 
-#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
 msgid "Item sent!\n"
 msgstr "Το στοιχείο στάλθηκε!\n"
 
-#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
+#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
 msgid "The item could not be sent!\n"
 msgstr "Δεν ήταν δυνατή η αποστολή του στοιχείου!\n"
 
@@ -6465,74 +6214,74 @@ msgstr "ημερομηνία τέλους"
 msgid "date-start"
 msgstr "ημερομηνία έναρξης"
 
-#: calendar/gui/e-meeting-list-view.c:62
+#: calendar/gui/e-meeting-list-view.c:59
 msgid "Chair Persons"
 msgstr "Άτομα Προεδρείου"
 
-#: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:479
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
 msgid "Required Participants"
 msgstr "Απαραίτητοι Συμμετέχοντες"
 
-#: calendar/gui/e-meeting-list-view.c:64
+#: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Προαιρετικοί Συμμετέχοντες"
 
-#: calendar/gui/e-meeting-list-view.c:65
+#: calendar/gui/e-meeting-list-view.c:62
 msgid "Resources"
 msgstr "Πόροι"
 
-#: calendar/gui/e-meeting-list-view.c:140 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
 #: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr "Άτομο"
 
-#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "Ομάδα"
 
-#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr "Πόρος"
 
-#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr "Αίθουσα"
 
-#: calendar/gui/e-meeting-list-view.c:154 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr "Προεδρείο"
 
-#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:127
 #: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
 msgid "Required Participant"
 msgstr "Απαραίτητος Συμμετέχων"
 
-#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr "Προαιρετικός Συμμετέχων"
 
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr "Μη-Συμμετέχων"
 
-#: calendar/gui/e-meeting-list-view.c:179 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:177
 #: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
 msgid "Needs Action"
 msgstr "Απαιτεί Ενέργεια"
 
-#: calendar/gui/e-meeting-list-view.c:182 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
 #: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "Δοκιμαστικά"
 
-#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr "Εξουσιοδοτήθηκε"
@@ -6549,20 +6298,28 @@ msgstr "Εκτός Γραφείου"
 msgid "No Information"
 msgstr "Χωρίς Πληροφορίες"
 
+#: calendar/gui/e-meeting-time-sel.c:417
+#, fuzzy
+msgid "Add attendees from addressbook"
+msgstr "Προσθήκη Αποστολέα στο _Βιβλίο Διευθύνσεων"
+
 #: calendar/gui/e-meeting-time-sel.c:440
 msgid "_Options"
 msgstr "_Επιλογές"
 
 #: calendar/gui/e-meeting-time-sel.c:457
-msgid "Show _Only Working Hours"
+#, fuzzy
+msgid "Show _only working hours"
 msgstr "Εμφάνιση _μόνο των ωρών Εργασίας"
 
 #: calendar/gui/e-meeting-time-sel.c:467
-msgid "Show _Zoomed Out"
+#, fuzzy
+msgid "Show _zoomed out"
 msgstr "Εμφάνιση Σμίκρυνσης"
 
 #: calendar/gui/e-meeting-time-sel.c:482
-msgid "_Update Free/Busy"
+#, fuzzy
+msgid "_Update free/busy"
 msgstr "Ανα_νέωση Διαθεσιμότητας"
 
 #: calendar/gui/e-meeting-time-sel.c:497
@@ -6578,19 +6335,23 @@ msgid ">_>"
 msgstr ">_>"
 
 #: calendar/gui/e-meeting-time-sel.c:547
-msgid "_All People and Resources"
+#, fuzzy
+msgid "_All people and resources"
 msgstr "Όλα _τα Άτομα και οι Πόροι"
 
 #: calendar/gui/e-meeting-time-sel.c:556
-msgid "All _People and One Resource"
+#, fuzzy
+msgid "All _people and one resource"
 msgstr "Όλα τα Άτομα και ένας _Πόρος"
 
 #: calendar/gui/e-meeting-time-sel.c:565
-msgid "_Required People"
+#, fuzzy
+msgid "_Required people"
 msgstr "_Απαιτούμενα Άτομα"
 
 #: calendar/gui/e-meeting-time-sel.c:574
-msgid "Required People and _One Resource"
+#, fuzzy
+msgid "Required people and _one resource"
 msgstr "Απαιτούμενα Άτομα και ένας Πόρος"
 
 #: calendar/gui/e-meeting-time-sel.c:593
@@ -6628,7 +6389,7 @@ msgstr "%d/%m/%Y"
 msgid "Enter the password for %s"
 msgstr "Εισάγετε κωδικό πρόσβασης για %s"
 
-#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6637,22 +6398,14 @@ msgstr ""
 "Σφάλμα στο  %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
-#, fuzzy, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-"The task backend for\n"
-"%s\n"
-" has crashed."
-
 #. FIXME Loading should be async
 #. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:686
+#: calendar/gui/e-tasks.c:801
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Άνοιγμα ενεργειών στο %s"
 
-#: calendar/gui/e-tasks.c:709
+#: calendar/gui/e-tasks.c:824
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6661,55 +6414,47 @@ msgstr ""
 "Σφάλμα ανοίγματος %s:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:730
+#: calendar/gui/e-tasks.c:845
 msgid "Loading tasks"
 msgstr "Φόρτωση εργασιών"
 
-#: calendar/gui/e-tasks.c:834
+#: calendar/gui/e-tasks.c:949
 msgid "Completing tasks..."
 msgstr "Ολοκλήρωση εργασιών..."
 
-#: calendar/gui/e-tasks.c:857
+#: calendar/gui/e-tasks.c:972
 msgid "Deleting selected objects..."
 msgstr "Διαγραφή επιλεγμένων αντικειμένων..."
 
-#: calendar/gui/e-tasks.c:884
+#: calendar/gui/e-tasks.c:999
 msgid "Expunging"
 msgstr "Εξάλειψη"
 
-#: calendar/gui/e-tasks.c:960
+#: calendar/gui/e-tasks.c:1075
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
-#: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
+#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
+#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
 #: calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:705
 msgid "Tasks"
 msgstr "Εργασίες"
 
-#: calendar/gui/gnome-cal.c:1876
+#: calendar/gui/gnome-cal.c:1878
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Φόρτωση ραντεβού σε %s"
 
-#: calendar/gui/gnome-cal.c:1895
+#: calendar/gui/gnome-cal.c:1897
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Φόρτωση εργασιών σε %s"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1920
 #, c-format
 msgid "Opening %s"
 msgstr "Άνοιγμα %s."
 
-#: calendar/gui/gnome-cal.c:2048
-#, fuzzy, c-format
-msgid "The calendar backend for '%s' has crashed."
-msgstr ""
-"The calendar backend for\n"
-"%s\n"
-" has crashed."
-
-#: calendar/gui/gnome-cal.c:2894
+#: calendar/gui/gnome-cal.c:2906
 msgid "Purging"
 msgstr "Εκκαθάριση"
 
@@ -6909,7 +6654,7 @@ msgid "On The Web"
 msgstr "Στον δικτυακό ιστό"
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 
@@ -6920,7 +6665,7 @@ msgid "Unable to migrate calendar `%s'"
 msgstr "Αδυναμία ανοίγματος του ημερολογίου '%s'."
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:869
+#: calendar/gui/migration.c:889
 #, fuzzy, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Δεν ήταν δυνατό το άνοιγμα  των εργασιών στο '%s'."
@@ -7156,76 +6901,76 @@ msgstr "Εκτύπωση Στοιχείου"
 msgid "Print Setup"
 msgstr "Ρυθμίσεις Εκτύπωσης"
 
-#: calendar/gui/tasks-component.c:303
+#: calendar/gui/tasks-component.c:313
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 "Η λίστα εργασιών '%s' θα απομακρυνθεί. Είστε σίγουροι ότι θέλετε να "
 "συνεχίσετε?"
 
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:371
 msgid "New Task List"
 msgstr "Νέα λίστα εργασιών"
 
-#: calendar/gui/tasks-component.c:398
+#: calendar/gui/tasks-component.c:408
 #, fuzzy, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d επαφές"
 msgstr[1] "%d επαφές"
 
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] "Διαγραμμένα"
 msgstr[1] "Διαγραμμένα"
 
-#: calendar/gui/tasks-component.c:447
+#: calendar/gui/tasks-component.c:457
 #, fuzzy
 msgid "Failed upgrading tasks."
 msgstr "Φόρτωση εργασιών"
 
-#: calendar/gui/tasks-component.c:526
+#: calendar/gui/tasks-component.c:749
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 "Αδυναμία ανοίγματος της λίστας εργασιών '%s' για την δημιουργία γεγονότων "
 "και συναντήσεων"
 
-#: calendar/gui/tasks-component.c:538
+#: calendar/gui/tasks-component.c:761
 msgid "There is no calendar available for creating tasks"
 msgstr "δεν υπάρχει διαθέσιμο ημερολόγιο για την δημιουργία εργασιών"
 
-#: calendar/gui/tasks-component.c:576
+#: calendar/gui/tasks-component.c:799
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:804
+#: calendar/gui/tasks-component.c:1040
 msgid "New task"
 msgstr "Νέα εργασία"
 
-#: calendar/gui/tasks-component.c:805
+#: calendar/gui/tasks-component.c:1041
 msgid "_Task"
 msgstr "_Εργασία"
 
-#: calendar/gui/tasks-component.c:806
+#: calendar/gui/tasks-component.c:1042
 msgid "Create a new task"
 msgstr "Δημιουργία νέας εργασίας"
 
-#: calendar/gui/tasks-component.c:812
+#: calendar/gui/tasks-component.c:1048
 #, fuzzy
 msgid "New tasks group"
 msgstr "Νέα εργασία"
 
-#: calendar/gui/tasks-component.c:813
+#: calendar/gui/tasks-component.c:1049
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Ομάδα λίστας εργασιών"
 
-#: calendar/gui/tasks-component.c:814
+#: calendar/gui/tasks-component.c:1050
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Δημιουργία νέας εργασίας"
@@ -8994,12 +8739,12 @@ msgstr "Σφάλμα στην εκτέλεση αναζήτησης φίλτρο
 msgid "Unsupported operation: append message: for %s"
 msgstr "Μη υποστηριζόμενη λειτουργία : προθήκη μηνύματος: για  %s"
 
-#: camel/camel-folder.c:1259
+#: camel/camel-folder.c:1262
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Μη υποστηριζόμενη λειτουργία: αναζήτηση βάσει έκφρασης: για %s"
 
-#: camel/camel-folder.c:1299
+#: camel/camel-folder.c:1302
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
@@ -9013,11 +8758,16 @@ msgstr "Μετακίνηση μηνυμάτων"
 msgid "Copying messages"
 msgstr "Αντιγραφή μηνυμάτων"
 
-#: camel/camel-folder.c:1666
-msgid "Learning junk and/or non junk message(s)"
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Αλλαγή κατάστασης ανεπιθύμητης αλληλογραφίας"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
 msgstr ""
 
-#: camel/camel-folder.c:1695
+#: camel/camel-folder.c:1701
 msgid "Filtering new message(s)"
 msgstr "Φιλτράρισμα νέων μηνυμάτων"
 
@@ -9051,17 +8801,17 @@ msgstr ""
 msgid "(match-threads) requires a match type string"
 msgstr ""
 
-#: camel/camel-folder-search.c:785
+#: camel/camel-folder-search.c:784
 #, fuzzy
 msgid "(match-threads) expects an array result"
 msgstr "(ταίρισμα-όλων) απαιτεί ένα single bool result"
 
-#: camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:790
 #, fuzzy
 msgid "(match-threads) requires the folder set"
 msgstr "(ταίρισμα-όλων) απαιτεί ένα single bool result"
 
-#: camel/camel-folder-search.c:880
+#: camel/camel-folder-search.c:879
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Γίνεται επερώτηση σε άγνωστη επικεφαλίδα: %s"
@@ -9096,7 +8846,8 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
 #: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:706
+#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Ακυρώθηκε."
@@ -9488,7 +9239,7 @@ msgstr "Τα αναφερόμενα διαπιστευτήρια έχουν λή
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1212
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Εσφαλμένη απάντηση πιστοποίησης από τον διακομιστή"
 
@@ -9870,42 +9621,42 @@ msgstr "Η εντολή δεν έχει ενσωματωθεί"
 msgid "export keys: unimplemented"
 msgstr ""
 
-#: camel/camel-store.c:214
+#: camel/camel-store.c:213
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr ""
 "Δεν είναι δυνατό να γίνει η λήψη του φακέλου: Μη έγκυρη σε αυτή την αποθήκη"
 
-#: camel/camel-store.c:244
+#: camel/camel-store.c:243
 #, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr "Δεν είναι δυνατή η δημιουργία φακέλου`%s': ο φάκελος υπάρχει"
 
-#: camel/camel-store.c:295
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 "Δεν είναι δυνατό να δημιουργηθεί ο φακέλος: Μη έγκυρη σε αυτή την αποθήκη"
 
-#: camel/camel-store.c:323
+#: camel/camel-store.c:325
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Δεν είναι δυνατή η δημιουργία φακέλου`%s': ο φάκελος υπάρχει"
 
-#: camel/camel-store.c:387 camel/camel-vee-store.c:354
+#: camel/camel-store.c:389 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Δεν ήταν δυνατή η διαγραφή του φακέλου %s: Άκυρη λειτουργία"
 
-#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#: camel/camel-store.c:439 camel/camel-vee-store.c:387
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Δεν ήταν δυνατή η μετονομασία του φακέλου %s: Άκυρη λειτουργία"
 
-#: camel/camel-store.c:811
+#: camel/camel-store.c:777
 msgid "Trash"
 msgstr "Απορρίμματα"
 
-#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
-#: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/mail-config.glade.h:95
+#: ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Ανεπιθύμητη αλληλογραφία"
 
@@ -10136,12 +9887,12 @@ msgstr "Κανένα τέτοιο μήνυμα %s στο %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Αδυναμία αντιγραφής ή μετακίνησης μηνυμάτων σε ένα εικονικό φάκελο"
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:374
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Δεν ήταν δυνατή η διαγραφή του φακέλου %s: Δεν υπάρχει ο φάκελος"
 
-#: camel/camel-vee-store.c:398
+#: camel/camel-vee-store.c:395
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr ""
@@ -10186,24 +9937,24 @@ msgstr "Βιβλίο Διευθύνσεων"
 msgid "Post Office Agent SOAP Port:"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:80
+#: camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "Novell GroupWise"
 msgstr "Novell GroupWise"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:82
+#: camel/providers/groupwise/camel-groupwise-provider.c:85
 msgid "For accessing Novell Groupwise servers"
 msgstr "Για την πρόσβαση σε εξυπηρετητές Novell Groupwise"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: camel/providers/groupwise/camel-groupwise-provider.c:100
 #: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
 msgid "Password"
 msgstr "Κωδικός Πρόσβασης"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:99
+#: camel/providers/groupwise/camel-groupwise-provider.c:102
 #: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
@@ -10211,8 +9962,8 @@ msgstr ""
 "Με την επιλογή αύτη θα γίνει σύνδεση στο διακομιστή IMAP με χρήση κωδικού "
 "απλού κειμένου."
 
-#: camel/providers/groupwise/camel-gw-listener.c:305
-#: camel/providers/groupwise/camel-gw-listener.c:328
+#: camel/providers/groupwise/camel-gw-listener.c:312
+#: camel/providers/groupwise/camel-gw-listener.c:335
 #, fuzzy
 msgid "Checklist"
 msgstr "λίστα"
@@ -10357,13 +10108,13 @@ msgstr ""
 "απλού κειμένου."
 
 #: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:429
+#: camel/providers/imap/camel-imap-store.c:428
 #, c-format
 msgid "IMAP server %s"
 msgstr "Διακομιστής IMAP %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:431
+#: camel/providers/imap/camel-imap-store.c:430
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "Υπηρεσία IMAP για %s στο %s"
@@ -10373,7 +10124,7 @@ msgstr "Υπηρεσία IMAP για %s στο %s"
 #: camel/providers/imap/camel-imap-store.c:551
 #: camel/providers/imap/camel-imap-store.c:571
 #: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
+#: camel/providers/nntp/camel-nntp-store.c:209
 #: camel/providers/pop3/camel-pop3-store.c:175
 #: camel/providers/smtp/camel-smtp-transport.c:269
 #: camel/providers/smtp/camel-smtp-transport.c:285
@@ -10390,10 +10141,10 @@ msgstr "SSL δεν είναι διαθέσιμο"
 
 #: camel/providers/imap4/camel-imap4-store.c:222
 #: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:815
+#: camel/providers/imap/camel-imap-store.c:845
 #: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:137
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
 #: camel/providers/pop3/camel-pop3-store.c:192
 msgid "Connection cancelled"
 msgstr "Η σύνδεση ακυρώθηκε"
@@ -10407,8 +10158,8 @@ msgstr ""
 "Δεν ήταν δυνατή η σύνδεση με τον διακομιστή IMAP %s σε ασφαλή λειτουργία: %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:649
-#: camel/providers/imap/camel-imap-store.c:680
+#: camel/providers/imap/camel-imap-store.c:679
+#: camel/providers/imap/camel-imap-store.c:710
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
@@ -10418,7 +10169,7 @@ msgstr ""
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1109
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
 msgid "Unknown error"
 msgstr "Άγνωστο Σφάλμα"
 
@@ -10446,8 +10197,8 @@ msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr "Δεν είναι δυνατή η λήψη του φακέλου: %s: %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1857
-#: camel/providers/imap/camel-imap-store.c:2235
+#: camel/providers/imap/camel-imap-store.c:1885
+#: camel/providers/imap/camel-imap-store.c:2263
 #, fuzzy, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -10528,12 +10279,12 @@ msgstr "Απροσδόκητη αποσύνδεση του διακομιστή:
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3168
+#: camel/providers/imap/camel-imap-store.c:3194
 msgid "Operation cancelled"
 msgstr "Η λειτουργία ακυρώθηκε"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3171
+#: camel/providers/imap/camel-imap-store.c:3197
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Απροσδόκητη αποσύνδεση του διακομιστή: %s"
@@ -10597,13 +10348,6 @@ msgid "Unable to retrieve message: %s"
 msgstr "Αδυναμία ανάκτησης μηνύματος: %s "
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:219
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -10613,15 +10357,15 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-mbox-folder.c:418
+#: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
 msgstr "Δεν υπάρχει τέτοιο μήνυμα"
 
 #: camel/providers/imap/camel-imap-folder.c:2019
-#: camel/providers/imap/camel-imap-folder.c:2621
-#: camel/providers/nntp/camel-nntp-folder.c:238
+#: camel/providers/imap/camel-imap-folder.c:2622
+#: camel/providers/nntp/camel-nntp-folder.c:220
 msgid "This message is not currently available"
 msgstr "Το μήνυμα δεν είναι διαθέσιμο αύτη την στιγμή"
 
@@ -10630,7 +10374,23 @@ msgstr "Το μήνυμα δεν είναι διαθέσιμο αύτη την �
 msgid "Fetching summary information for new messages"
 msgstr "Λήψη πληροφορίες περίληψης για νέα μηνύματα"
 
-#: camel/providers/imap/camel-imap-folder.c:2659
+#: camel/providers/imap/camel-imap-folder.c:2463
+#, c-format
+msgid "Incomplete server response: no information provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2471
+#, c-format
+msgid "Incomplete server response: no UID provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2484
+#, c-format
+msgid ""
+"Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2660
 msgid "Could not find message body in FETCH response."
 msgstr "Αδυναμία εύρεσης σώματος μηνύματος στην απάντηση FETCH."
 
@@ -10692,44 +10452,44 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Για ανάγνωση και αποθήκευση μηνυμάτων σε διακομιστές IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/imap/camel-imap-store.c:680
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "Η επέκταση SSL/TLS  δεν υποστηρίζεται"
 
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:711
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "Αποτυχία διαπραγματεύσεων SSL"
 
-#: camel/providers/imap/camel-imap-store.c:818
+#: camel/providers/imap/camel-imap-store.c:848
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Δεν ήταν δυνατή η σύνδεση με την εντολή \"%s\": %s"
 
-#: camel/providers/imap/camel-imap-store.c:1242
+#: camel/providers/imap/camel-imap-store.c:1272
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 "Ο διακομιστής IMAP %s δεν υποστηρίζει την αιτούμενο τύπο πιστοποίησης %s"
 
-#: camel/providers/imap/camel-imap-store.c:1252
+#: camel/providers/imap/camel-imap-store.c:1282
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Μη υποστηριζόμενος τύπος πιστοποίησης %s"
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1305
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sΠαρακαλώ εισάγετε τον κωδικό IMAP για %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1289
+#: camel/providers/imap/camel-imap-store.c:1319
 msgid "You didn't enter a password."
 msgstr "Δεν έχετε εισάγει κωδικό πρόσβασης."
 
-#: camel/providers/imap/camel-imap-store.c:1318
+#: camel/providers/imap/camel-imap-store.c:1348
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10740,18 +10500,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1839
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:1867
+#: camel/providers/imap/camel-imap-store.c:2057
 #, c-format
 msgid "No such folder %s"
 msgstr "Δεν υπάρχει τέτοιος φάκελος %s"
 
-#: camel/providers/imap/camel-imap-store.c:1915
-#: camel/providers/imap/camel-imap-store.c:2296
+#: camel/providers/imap/camel-imap-store.c:1943
+#: camel/providers/imap/camel-imap-store.c:2324
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Ο μητρικός φάκελος δεν επιτρέπεται να περιέχει υποφάκελους"
 
-#: camel/providers/imap/camel-imap-store.c:1970
+#: camel/providers/imap/camel-imap-store.c:1998
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10759,7 +10519,7 @@ msgstr "Ο μητρικός φάκελος δεν επιτρέπεται να π
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Δεν είναι δυνατή η δημιουργία φακέλου: `%s': ο φάκελος υπάρχει"
 
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:2274
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Άγνωστος μητρικός φάκελος: %s"
@@ -10795,20 +10555,20 @@ msgid "Index message body data"
 msgstr "Δεδομένα σώματος μηνύματος καταλόγου"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:388
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:393
-#: camel/providers/local/camel-local-folder.c:396
+#: camel/providers/local/camel-local-folder.c:392
+#: camel/providers/local/camel-local-folder.c:395
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "mailbox:%s (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:400
+#: camel/providers/local/camel-local-folder.c:399
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -10869,7 +10629,7 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:142
 #: camel/providers/local/camel-local-store.c:253
-#: camel/providers/local/camel-mbox-store.c:356
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10943,8 +10703,25 @@ msgstr "Ακυρώθηκε η προθήκη μηνύματος Maildir"
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Δεν είναι δυνατή η προσθήκη μηνύματος στο φάκελο maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:226
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mbox-folder.c:417
+#: camel/providers/local/camel-mbox-folder.c:436
+#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:475
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-mh-folder.c:221
+#, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+"Δεν είναι δυνατή η λήψη του μηνύματος: %s από τον φάκελο %s\n"
+"  %s"
+
+#: camel/providers/local/camel-maildir-folder.c:236
 msgid "Invalid message contents"
 msgstr "Μη έγκυρα περιεχόμενα στο μήνυμα"
 
@@ -10985,9 +10762,9 @@ msgstr "Δεν ήταν δυνατή η διαγραφή του φακέλου `
 msgid "not a maildir directory"
 msgstr "δεν είναι κατάλογος maildir"
 
-#: camel/providers/local/camel-maildir-store.c:341
-#: camel/providers/local/camel-spool-store.c:286
-#: camel/providers/local/camel-spool-store.c:316
+#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-spool-store.c:284
+#: camel/providers/local/camel-spool-store.c:314
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Δεν ήταν δυνατή η σάρωση του φακέλου `%s': %s"
@@ -11034,27 +10811,18 @@ msgstr "Ακύρωση πρόσθεσης μηνυμάτων"
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Δεν είναι δυνατή η προσθήκη του μηνύματος στο αρχείο mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:435
-#: camel/providers/local/camel-mbox-folder.c:466
-#: camel/providers/local/camel-mbox-folder.c:474
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"Δεν είναι δυνατή η λήψη του μηνύματος: %s από τον φάκελο %s\n"
-"  %s"
-
-#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:468
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Ο φάκελος φαίνεται να έχει ανεπανόρθωτη ζημιά."
 
-#: camel/providers/local/camel-mbox-folder.c:475
-msgid "Message construction failed: Corrupt mailbox?"
+#: camel/providers/local/camel-mbox-folder.c:476
+#: camel/providers/local/camel-mh-folder.c:222
+#, fuzzy
+msgid "Message construction failed."
 msgstr "Αποτυχία δημιουργίας μηνύματος: Κατεστραμμένο  mailbox;"
 
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:362
+#: camel/providers/local/camel-mbox-store.c:361
 msgid "Cannot create a folder by this name."
 msgstr "Δεν ήταν δυνατή η δημιουργία φακέλου με αυτό το όνομα"
 
@@ -11084,30 +10852,30 @@ msgstr "`%s' δεν είναι κανονικό αρχείο."
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Ο φάκελος `%s' δεν είναι άδειος. Δεν έγινε η διαγραφή."
 
-#: camel/providers/local/camel-mbox-store.c:375
+#: camel/providers/local/camel-mbox-store.c:374
 #, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Δεν ήταν δυνατή η δημιουργία του καταλόγου `%s': %s."
 
-#: camel/providers/local/camel-mbox-store.c:389
+#: camel/providers/local/camel-mbox-store.c:388
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Δεν είναι δυνατή η δημιουργία φακέλου: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:391
+#: camel/providers/local/camel-mbox-store.c:390
 msgid "Folder already exists"
 msgstr "Ο φάκελος υπάρχει ήδη"
 
-#: camel/providers/local/camel-mbox-store.c:473
+#: camel/providers/local/camel-mbox-store.c:472
 msgid "The new folder name is illegal."
 msgstr "Το  όνομα του νέου φακέλου δεν είναι έγκυρο."
 
-#: camel/providers/local/camel-mbox-store.c:486
+#: camel/providers/local/camel-mbox-store.c:485
 #, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Δεν ήταν δυνατή η μετονομασία `%s': `%s': %s"
 
-#: camel/providers/local/camel-mbox-store.c:561
+#: camel/providers/local/camel-mbox-store.c:560
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Δεν ήταν δυνατή η μετονομασία του  '%s' σε %s: %s"
@@ -11299,7 +11067,7 @@ msgstr ""
 "Ο φάκελος μπορεί να είναι κατεστραμμένος, αποθηκεύθηκε αντίγραφο στο  `%s'"
 
 #: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:997
+#: camel/providers/nntp/camel-nntp-store.c:1126
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Παρακαλώ εισάγετε τον κωδικό πρόσβασης NNTP  για %s@%s"
@@ -11316,18 +11084,10 @@ msgstr "Αποτυχία σποστολής ονόματος χρήστη στο
 msgid "Server rejected username/password"
 msgstr "Ο διακομιστής απέρριψε το όνομα χρήστη/κωδικό"
 
-#: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:263
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr "Ακυρώθηκε από τον χρήστη"
-
-#: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:259
-#: camel/providers/nntp/camel-nntp-folder.c:265
+#: camel/providers/nntp/camel-nntp-folder.c:147
+#: camel/providers/nntp/camel-nntp-folder.c:149
+#: camel/providers/nntp/camel-nntp-folder.c:158
+#: camel/providers/nntp/camel-nntp-folder.c:234
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11336,63 +11096,49 @@ msgstr "Ακυρώθηκε από τον χρήστη"
 msgid "Cannot get message %s: %s"
 msgstr "Αδυναμία λήψης  μηνύματος %s: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:188
-#: camel/providers/nntp/camel-nntp-folder.c:228
+#: camel/providers/nntp/camel-nntp-folder.c:156
+#: camel/providers/nntp/camel-nntp-folder.c:232
+#: camel/providers/nntp/camel-nntp-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+msgid "User cancelled"
+msgstr "Ακυρώθηκε από τον χρήστη"
+
+#: camel/providers/nntp/camel-nntp-folder.c:176
+#: camel/providers/nntp/camel-nntp-folder.c:208
 #, c-format
 msgid "Internal error: uid in invalid format: %s"
 msgstr "Εσωτερικό σφάλμα: uid σε μή έγκυρη μορφή: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:201
-#, c-format
-msgid "Could not get article %s from NNTP server"
-msgstr "Αδυναμία λήψης άρθρου %s από τον εξυπηρετητή NNTP"
-
-#: camel/providers/nntp/camel-nntp-folder.c:362
-msgid "Posting not allowed by news server"
-msgstr "Η δημοσίευση δεν επιτρέπεται από τον εξυπηρετητή συζητήσεων"
-
+#: camel/providers/nntp/camel-nntp-folder.c:328
+#: camel/providers/nntp/camel-nntp-folder.c:331
 #: camel/providers/nntp/camel-nntp-folder.c:373
-#, c-format
-msgid "Failed to send newsgroups header: %s: message not posted"
-msgstr "Αποτυχία αποστολής κεφαλίδας συζητήσεων:%s: το μήνυμα δεν δημοσιεύτηκε"
-
-#: camel/providers/nntp/camel-nntp-folder.c:413
-#: camel/providers/nntp/camel-nntp-folder.c:426
-#, c-format
-msgid "Error posting to newsgroup: %s: message not posted"
-msgstr ""
-"Αποτυχία αποστολής στην ομάδα συζητήσεων:%s: το μήνυμα δεν δημοσιεύτηκε"
-
-#: camel/providers/nntp/camel-nntp-folder.c:438
-msgid "Error reading response to posted message: message not posted"
-msgstr ""
-"Αποτυχία ανάγνωσης απάντησης σε δημοσιευμένο μήνυμα: το μήνυμα δεν "
-"δημοσιεύτηκε"
-
-#: camel/providers/nntp/camel-nntp-folder.c:441
-#, c-format
-msgid "Error posting message: %s: message not posted"
-msgstr "Αποτυχία αποστολής μηνύματος:%s: το μήνυμα δεν δημοσιεύτηκε"
+#: camel/providers/nntp/camel-nntp-folder.c:375
+#, fuzzy, c-format
+msgid "Posting failed: %s"
+msgstr "Η λειτουργία απέτυχε: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:457
+#: camel/providers/nntp/camel-nntp-folder.c:393
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "Δεν μπορείτε να στέλνετε μηνύματα NNTP όταν εργάζεστε χωρίς σύνδεση!"
 
-#: camel/providers/nntp/camel-nntp-folder.c:468
+#: camel/providers/nntp/camel-nntp-folder.c:404
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Δεν ήταν δυνατή η αντιγραφή μηνυμάτων από έναν φάκελο NNTP!"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:44
 msgid "Could not get group list from server."
 msgstr "Αδυναμία λήψης λίστας ομάδας από τον διακομιστή"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#: camel/providers/nntp/camel-nntp-grouplist.c:97
+#: camel/providers/nntp/camel-nntp-grouplist.c:106
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "Αδυναμία φόρτωσης αρχείου λίστας ομάδας για %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#: camel/providers/nntp/camel-nntp-grouplist.c:157
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Αδυναμία αποθήκευσης αρχείου λίστας ομάδας για %s: %s"
@@ -11425,26 +11171,29 @@ msgstr ""
 "Με την επιλογή αυτή θα γίνει πιστοποίηση με τον διακομιστή NNTP με την χρήση "
 "κωδικού πρόσβασης σε μορφή απλού κειμένου."
 
-#: camel/providers/nntp/camel-nntp-store.c:158
+#: camel/providers/nntp/camel-nntp-store.c:118
+#: camel/providers/nntp/camel-nntp-store.c:1233
+#: camel/providers/nntp/camel-nntp-store.c:1331
+#, c-format
+msgid "NNTP Command failed: %s"
+msgstr "Η εντολή NNTP απέτυχε: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:227
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Αδυναμία ανάγνωσης χαιρετισμού από %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:170
+#: camel/providers/nntp/camel-nntp-store.c:239
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "Ο διακομιστής NNTP %s επέστρεψε κωδικό σφάλματος %d: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:326
+#: camel/providers/nntp/camel-nntp-store.c:403
 #, c-format
 msgid "USENET News via %s"
 msgstr "Ειδήσεις USENET μέσω %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:640
-msgid "Stream error"
-msgstr "Σφάλμα Stream"
-
-#: camel/providers/nntp/camel-nntp-store.c:643
+#: camel/providers/nntp/camel-nntp-store.c:777
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -11455,7 +11204,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/providers/nntp/camel-nntp-store.c:735
+#: camel/providers/nntp/camel-nntp-store.c:872
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
@@ -11466,7 +11215,7 @@ msgstr ""
 "Δεν υπάρχει τέτοια ομάδα. Το επιλεγμένο αντικείμενο μάλλον είναι ένας "
 "μητρικός φάκελος."
 
-#: camel/providers/nntp/camel-nntp-store.c:767
+#: camel/providers/nntp/camel-nntp-store.c:904
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
@@ -11476,63 +11225,63 @@ msgstr ""
 "\n"
 "η ομάδα δεν υπάρχει!"
 
-#: camel/providers/nntp/camel-nntp-store.c:792
+#: camel/providers/nntp/camel-nntp-store.c:929
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 "Δεν μπορείτε να δημιουργήσετε ένα φάκελο σε ένα News store: καλύτερα να "
 "εγγραφείτε."
 
-#: camel/providers/nntp/camel-nntp-store.c:800
+#: camel/providers/nntp/camel-nntp-store.c:937
 msgid "You cannot rename a folder in a News store."
 msgstr "Δεν ήταν δυνατή η μετονομασία ενός φακέλου  στο News store."
 
-#: camel/providers/nntp/camel-nntp-store.c:808
+#: camel/providers/nntp/camel-nntp-store.c:945
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 "Αδύνατη η απομάκρυνση φακέλου σε ένα News store: καλύτερα να αποχωρήσετε απο "
 "την ομάδα."
 
-#: camel/providers/nntp/camel-nntp-summary.c:253
-#, c-format
-msgid "Connection error: %s"
-msgstr "Σφάλμα σύνδεσης: %s"
-
-#: camel/providers/nntp/camel-nntp-summary.c:262
-#, c-format
-msgid "No such folder: %s"
-msgstr "Δεν υπάρχει τέτοιος φάκελος %s"
+#: camel/providers/nntp/camel-nntp-store.c:1118
+#, fuzzy
+msgid "Authentication requested but not username provided"
+msgstr "Απαιτείται πιστοποίηση"
 
-#: camel/providers/nntp/camel-nntp-summary.c:268
-#, c-format
-msgid "Could not get group: %s"
-msgstr "Αδυναμία λήψης ομάδας: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1146
+#, fuzzy, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr "Δεν είναι δυνατή η πιστοποίηση στο διακομιστή POP %s: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:333
+#: camel/providers/nntp/camel-nntp-store.c:1262
 #, fuzzy
-msgid "Could not get messages: unspecified error"
-msgstr "Δεν είναι δυνατή η λήψη μηνυμάτων: ακαθόριστο σφάλμα"
+msgid "Not connected."
+msgstr "Όχι επαφές"
 
-#: camel/providers/nntp/camel-nntp-summary.c:378
+#: camel/providers/nntp/camel-nntp-store.c:1311
 #, c-format
-msgid "NNTP Command failed: %s"
-msgstr "Η εντολή NNTP απέτυχε: %s"
+msgid "No such folder: %s"
+msgstr "Δεν υπάρχει τέτοιος φάκελος %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:438
-#: camel/providers/nntp/camel-nntp-summary.c:543
+#: camel/providers/nntp/camel-nntp-summary.c:218
+#: camel/providers/nntp/camel-nntp-summary.c:314
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Σάρωση για νέα μηνύματα"
 
-#: camel/providers/nntp/camel-nntp-summary.c:558
-#, c-format
-msgid "Unknown server response: %s"
-msgstr "Άγνωστη απάντηση διακομιστή: %s"
+#: camel/providers/nntp/camel-nntp-summary.c:225
+#, fuzzy, c-format
+msgid "Unexpected server response from xover: %s"
+msgstr "Απροσδόκητη απάντηση από τον διακομιστή IMAP: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:328
+#, fuzzy, c-format
+msgid "Unexpected server response from head: %s"
+msgstr "Αναπάντεχη απάντηση από GnuPG: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:605
+#: camel/providers/nntp/camel-nntp-summary.c:368
 msgid "Use cancel"
 msgstr "Χρήση ακύρωσης"
 
-#: camel/providers/nntp/camel-nntp-summary.c:607
+#: camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Η λειτουργία απέτυχε: %s"
@@ -11580,7 +11329,7 @@ msgstr "Διαγραφή μετά από %s ημέρα(ες)"
 msgid "Disable support for all POP3 extensions"
 msgstr "Απενεργοποίηση υποστήριξης για όλες τις επεκτάσεις  POP3 "
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107
 msgid "POP"
 msgstr "POP"
 
@@ -11671,7 +11420,7 @@ msgid "No such folder `%s'."
 msgstr "Δεν υπάρχει ο φάκελος `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:132
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -11728,7 +11477,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Παράδοση μηνυμάτων μέσω του προγράμματος sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:119
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -12036,19 +11785,19 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
+#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:408
 msgid "attachment"
 msgstr "συννημένο"
 
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:454
 msgid "Remove selected items from the attachment list"
 msgstr "Αφαίρεση επιλεγμένων αντικειμένων από τον κατάλογο συννημένων"
 
-#: composer/e-msg-composer-attachment-bar.c:491
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Add attachment..."
 msgstr "Προσθήκη συννημένου..."
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:495
 msgid "Attach a file to the message"
 msgstr "Επισύναψη αρχείου στο μήνυμα"
 
@@ -12115,7 +11864,7 @@ msgstr "Πολλαπλά Μηνύματα"
 msgid "Open file"
 msgstr "Άνοιγμα αρχείου"
 
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
 msgid "Autogenerated"
 msgstr "Αυτόματη δημιουργία"
 
@@ -12263,17 +12012,17 @@ msgstr "Επισύναψη αρχείου(ων)"
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
+msgid "You cannot attach the file `{0}' to this message."
 msgstr "Επισύναψη αρχείου στο μήνυμα"
 
 #. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4
-msgid "${1}"
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
 msgstr ""
 
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
 
 #. mail-composer:attach-directory primary
@@ -12368,7 +12117,7 @@ msgstr "Δεν ήταν δυνατή η κατασκευή σωλήνωσης: %
 
 #. mail-composer:no-build-message secondary
 #: composer/mail-composer-errors.xml.h:34
-msgid "Because \"${0}\", you may need to select different mail options."
+msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
@@ -12378,8 +12127,10 @@ msgid "Could not read signature file \"{0}\"."
 msgstr "Δεν ήταν δυνατή η αποθήκευση του αρχείου υπογραφής: %s"
 
 #. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38
-msgid "Because \"${1}\"."
+#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted primary
@@ -12804,11 +12555,11 @@ msgid "<b>Then</b>"
 msgstr "<b>Λήγει:</b> "
 
 #: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1335
+#: mail/mail-account-gui.c:1347
 msgid "Select Folder"
 msgstr "Επιλογή Φακέλου"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
 msgid "    "
 msgstr "    "
 
@@ -12866,7 +12617,7 @@ msgstr "πριν"
 msgid "months"
 msgstr "μήνες"
 
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
 msgid "seconds"
 msgstr "δευτερόλεπτα"
 
@@ -12898,20 +12649,20 @@ msgstr "με όλους τους τοπικούς φακέλους"
 msgid "years"
 msgstr "χρόνια"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:916
-#: mail/mail-config.c:76 mail/mail-config.glade.h:90
+#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
+#: mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Σημαντικό"
 
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:919 mail/mail-config.c:79
-#: mail/mail-config.glade.h:145
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: mail/mail-config.glade.h:148
 msgid "To Do"
 msgstr "Πρός Τακτοποίηση"
 
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:920 mail/mail-config.c:80
-#: mail/mail-config.glade.h:94
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: mail/mail-config.glade.h:97
 msgid "Later"
 msgstr "Αργότερα"
 
@@ -12969,254 +12720,6 @@ msgstr "εισερχόμενα"
 msgid "outgoing"
 msgstr "εξερχόμενα"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Adjust Score"
-msgstr "Προσαρμογή Σκορ"
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Color"
-msgstr "Ορισμός Χρώματος"
-
-#: filter/libfilter-i18n.h:4
-msgid "Assign Score"
-msgstr "Ανάθεση σκορ"
-
-#: filter/libfilter-i18n.h:5
-msgid "Attachments"
-msgstr "Επισυνάψεις"
-
-#: filter/libfilter-i18n.h:6
-msgid "Beep"
-msgstr "Ήχος"
-
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "περιέχει"
-
-#: filter/libfilter-i18n.h:8
-msgid "Copy to Folder"
-msgstr "Αντιγραφή σε Φάκελο"
-
-#: filter/libfilter-i18n.h:9
-msgid "Date received"
-msgstr "Ημερομηνία παραλαβής"
-
-#: filter/libfilter-i18n.h:10
-msgid "Date sent"
-msgstr "Ημερομηνία αποστολής"
-
-#: filter/libfilter-i18n.h:12
-msgid "Deleted"
-msgstr "Διαγραμμένα"
-
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "δεν περιέχει"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "δεν τελειώνει με"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "δεν υπάρχει"
-
-#: filter/libfilter-i18n.h:16
-msgid "does not return"
-msgstr "δεν επιστρέφει"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "δεν φαίνεται να είναι"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "δεν ξεκινά με"
-
-#: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
-msgstr "Δεν Υπάρχει"
-
-#: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr "Πρόχειρα"
-
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "τελειώνει με"
-
-#: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr "Υπάρχει"
-
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "υπάρχει"
-
-#: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr "Έκφραση"
-
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr "Παρακολούθηση"
-
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "είναι"
-
-#: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr "είναι μετά"
-
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr "είναι πριν"
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr "έχει Σημαία"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "είναι μεγαλύτερο από"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "είναι μικρότερο από"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "δεν είναι"
-
-#: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr "δεν έχει Σημαία"
-
-#: filter/libfilter-i18n.h:36
-msgid "Junk Test"
-msgstr "Δοκιμή ανεπιθύμητης αλληλογραφίας"
-
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
-#: widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Ετικέτα"
-
-#: filter/libfilter-i18n.h:38
-msgid "Mailing list"
-msgstr "Λίστα Ταχυδρομείου"
-
-#: filter/libfilter-i18n.h:39
-msgid "Message Body"
-msgstr "Σώμα Μηνύματος"
-
-#: filter/libfilter-i18n.h:40
-msgid "Message Header"
-msgstr "Επικεφαλίδα Μηνύματος"
-
-#: filter/libfilter-i18n.h:41
-msgid "Message is Junk"
-msgstr "Το μήνυμα είναι ανεπιθύμητο"
-
-#: filter/libfilter-i18n.h:42
-msgid "Message is not Junk"
-msgstr "Το μήνυμα είναι επιθυμητό"
-
-#: filter/libfilter-i18n.h:43
-msgid "Move to Folder"
-msgstr "Μετακίνηση σε Φάκελο"
-
-#: filter/libfilter-i18n.h:44
-#, fuzzy
-msgid "Pipe to Program"
-msgstr "Έξοδος από το πρόγραμμα"
-
-#: filter/libfilter-i18n.h:45
-msgid "Play Sound"
-msgstr "Εκτέλεση Ήχου"
-
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Αναγνωσμένα"
-
-#: filter/libfilter-i18n.h:47
-msgid "Recipients"
-msgstr "Παραλήπτες"
-
-#: filter/libfilter-i18n.h:48
-msgid "Regex Match"
-msgstr "Ταίριασμα κανον. έκφρ."
-
-#: filter/libfilter-i18n.h:49
-msgid "Replied to"
-msgstr "Απαντημένα στους"
-
-#: filter/libfilter-i18n.h:50
-msgid "returns"
-msgstr "επιστρέφει"
-
-#: filter/libfilter-i18n.h:51
-msgid "returns greater than"
-msgstr "επιστρέφει μεγαλύτερο από"
-
-#: filter/libfilter-i18n.h:52
-msgid "returns less than"
-msgstr "επιστρέφει λιγότερο από"
-
-#: filter/libfilter-i18n.h:53
-#, fuzzy
-msgid "Run Program"
-msgstr "Εκτέλεση προγράμματος:"
-
-#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Σκορ"
-
-#: filter/libfilter-i18n.h:55
-msgid "Sender"
-msgstr "Αποστολέας"
-
-#: filter/libfilter-i18n.h:56
-msgid "Set Status"
-msgstr "Ορισμός Κατάστασης"
-
-#: filter/libfilter-i18n.h:57
-msgid "Size (kB)"
-msgstr "Μέγεθος (kB)"
-
-#: filter/libfilter-i18n.h:58
-msgid "sounds like"
-msgstr "φαίνεται να είναι"
-
-#: filter/libfilter-i18n.h:59
-msgid "Source Account"
-msgstr "Πηγαίος Λογαριασμός"
-
-#: filter/libfilter-i18n.h:60
-msgid "Specific header"
-msgstr "Ακριβής επικεφαλίδα"
-
-#: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "ξεκινά με"
-
-#: filter/libfilter-i18n.h:63
-msgid "Stop Processing"
-msgstr "Τερματισμός Επεξεργασίας"
-
-#: filter/libfilter-i18n.h:64 mail/em-format.c:755 mail/em-format-html.c:1519
-#: mail/em-format-quote.c:302 mail/em-mailer-prefs.c:87
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
-#: smime/lib/e-cert.c:1079
-msgid "Subject"
-msgstr "Θέμα"
-
-#: filter/libfilter-i18n.h:65
-msgid "Unset Status"
-msgstr "Ορισμός Κατάστασης"
-
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Προσθήκη Κανόνα"
@@ -13234,6 +12737,11 @@ msgstr "'Όνομα κανόνα: "
 msgid "_Score Rules"
 msgstr "Κανόνες Σκορ"
 
+#: filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Σκορ"
+
 #: filter/searchtypes.xml.h:1
 msgid "Body contains"
 msgstr "Το σώμα περιέχει"
@@ -13314,13 +12822,13 @@ msgstr "Υπογραφή(ές)"
 msgid "-------- Forwarded Message --------"
 msgstr "--------Προωθημένο Μήνυμα --------"
 
-#: mail/em-composer-utils.c:1499
+#: mail/em-composer-utils.c:1495
 msgid "an unknown sender"
 msgstr "ένας άγνωστος αποστολέας"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1509
+#: mail/em-composer-utils.c:1505
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "Στις  %d-%m-%Y, ημέρα %a, και ώρα %H:%M %%+05d, ο/η %%s έγραψε:"
 
@@ -13358,8 +12866,8 @@ msgstr "<κάντε κλικ εδώ για να επιλέξετε φάκελο>
 msgid "Create New Folder"
 msgstr "Δημιουργία Νέου Φακέλου.."
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
-#: mail/mail-component.c:701
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
+#: mail/mail-component.c:704
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Ορίστε που θα δημιουργηθεί ο φάκελος:"
@@ -13374,103 +12882,104 @@ msgstr "Δημιουργία φακέλου"
 msgid "Folder _name:"
 msgstr "_Όνομα φακέλου:"
 
-#: mail/em-folder-tree.c:839
+#: mail/em-folder-tree.c:833
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Αφαιρείται ο φακέλος %s"
 
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree.c:835
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Άνοιγμα φακέλου %s"
 
-#: mail/em-folder-tree.c:848 mail/message-list.c:1555
+#: mail/em-folder-tree.c:842 mail/message-list.c:1561
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Μετακίνηση μηνυμάτων στο %s"
 
-#: mail/em-folder-tree.c:850 mail/message-list.c:1557
+#: mail/em-folder-tree.c:844 mail/message-list.c:1563
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Αντιγραφή μηνυμάτων στο %s"
 
-#: mail/em-folder-tree.c:866
+#: mail/em-folder-tree.c:860
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Αδυναμία μετακίνησης μηνυμάτων σε ένα toplevel store"
 
-#: mail/em-folder-tree.c:956 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Αντιγραφή σε Φάκελο"
 
-#: mail/em-folder-tree.c:957 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Μετακίνηση σε φάκελο"
 
-#: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2069
-#: mail/em-folder-tree.c:2551 mail/em-folder-view.c:798
-#: mail/message-list.c:1645
+#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
+#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
+#: mail/message-list.c:1651
 msgid "_Move"
 msgstr "_Μετακίνηση"
 
-#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#: mail/em-folder-tree.c:955 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "Ακύρωση Εργασίας"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
 #: mail/em-folder-view.c:798 mail/em-folder-view.c:812
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Επιλογή Φακέλου"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
 #, fuzzy
 msgid "C_opy"
 msgstr "Αντιγραφή"
 
-#: mail/em-folder-tree.c:2096
+#: mail/em-folder-tree.c:2088
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Αποθηκεύεται ο φακέλος '%s'"
 
-#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
+#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
 msgid "Create folder"
 msgstr "Δημιουργία φακέλου"
 
-#: mail/em-folder-tree.c:2474
+#: mail/em-folder-tree.c:2463
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Μετονομασία φακέλου \"%s\" σε:"
 
-#: mail/em-folder-tree.c:2476
+#: mail/em-folder-tree.c:2465
 msgid "Rename Folder"
 msgstr "Μετονομασία Φακέλου"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Προβολή"
 
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2537
 msgid "Open in _New Window"
 msgstr "Άνοιγμα σε _Νέο παράθυρο"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2555
+#: mail/em-folder-tree.c:2546
 msgid "_New Folder..."
 msgstr "_Νέος Φάκελος..."
 
-#: mail/em-folder-tree.c:2558
+#: mail/em-folder-tree.c:2549
 msgid "_Rename"
 msgstr "_Μετονομασία"
 
-#: mail/em-folder-tree.c:2561 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Ιδιότητες..."
 
 #: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:889
+#: mail/mail-vfolder.c:888
 msgid "VFolders"
 msgstr "ΕΦάκελοι"
 
@@ -13484,19 +12993,19 @@ msgstr "ΑΤΑΙΡΙΑΣΤΑ"
 msgid "Inbox"
 msgstr "Εισερχόμενα"
 
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
 msgid "Loading..."
 msgstr "Γίνεται φόρτωση..."
 
 #: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
 #: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
 #: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:551
+#: mail/mail-component.c:554
 msgid "Mail"
 msgstr "Μηνύματα"
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Επεξεργασία ως Νέο Μήνυμα..."
@@ -13509,17 +13018,17 @@ msgstr "_Εκτύπωση"
 msgid "_Reply to Sender"
 msgstr "_Απάντηση στον Αποστολέα"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:810
+#: mail/em-folder-view.c:901 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Απάντηση στη _Λίστα"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:811
+#: mail/em-folder-view.c:902 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Απάντηση σε _Όλους"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: mail/em-folder-view.c:903 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Προώθηση"
@@ -13572,6 +13081,10 @@ msgstr "Με_τακίνηση στο Φάκελο..."
 msgid "_Copy to Folder..."
 msgstr "_Αντιγραφή στο Φάκελο..."
 
+#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Ετικέτα"
+
 #: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Προσθήκη Αποστολέα στο _Βιβλίο Διευθύνσεων"
@@ -13622,12 +13135,12 @@ msgid "Filter on _Mailing List"
 msgstr "Φίλτρο στη Λίστα _Ταχυδρομείου"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
-#: mail/mail-config.glade.h:66
+#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Προεπιλογή"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1796
 msgid "Print Message"
 msgstr "Εκτύπωση Μηνύματος"
 
@@ -13666,12 +13179,18 @@ msgstr "Αντίγραφο:"
 msgid "Bcc"
 msgstr "Ιδιαίτερη Κοινοποίηση"
 
+#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
+#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Θέμα"
+
 #: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
 #: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Ημερομηνία"
 
-#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
+#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
 msgid "Newsgroups"
 msgstr ""
 
@@ -13871,7 +13390,7 @@ msgstr ""
 "Θα είναι εξαρετικά δύσκολο σε ένα τρίτο να διαβάσει το περιεχόμενο του "
 "μηνύματος μέσα σε ένα λογικό χρόνο."
 
-#: mail/em-format-html-display.c:757
+#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
 msgid "_View Certificate"
 msgstr "Προ_βολή πιστοποιητικού"
 
@@ -13927,7 +13446,7 @@ msgstr "Κάθε εβδομάδα"
 msgid "Once per month"
 msgstr "κάθε  μήνα"
 
-#: mail/em-migrate.c:1072
+#: mail/em-migrate.c:1168
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13939,86 +13458,86 @@ msgstr ""
 "\n"
 "Περιμένετε μέχρι το Evolution να εισάγει τους φακέλους σας..."
 
-#: mail/em-migrate.c:1506
+#: mail/em-migrate.c:1602
 #, fuzzy, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Δεν είναι δυνατή η δημιουργία φακέλου `%s': %s"
 
-#: mail/em-migrate.c:1532
+#: mail/em-migrate.c:1628
 #, fuzzy, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr ""
 "Αδυναμία αντιγραφής περιγραφέα αρχείου: %s\n"
 "%s"
 
-#: mail/em-migrate.c:1715
+#: mail/em-migrate.c:1811
 #, fuzzy, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Αδυναμία αποθήκευσης αρχείου λίστας ομάδας για %s: %s"
 
-#: mail/em-migrate.c:1919
+#: mail/em-migrate.c:2015
 #, fuzzy, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Δεν είναι δυνατή η πιστοποίηση στο διακομιστή POP %s: %s"
 
-#: mail/em-migrate.c:1933
+#: mail/em-migrate.c:2029
 #, fuzzy, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Αποτυχία δημιουργίας καταλόγου `%s': %s"
 
-#: mail/em-migrate.c:1962
+#: mail/em-migrate.c:2058
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#: mail/em-migrate.c:2413 mail/em-migrate.c:2425
 #, fuzzy, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Αποτυχία δημιουργίας καταλόγου `%s': %s"
 
-#: mail/em-migrate.c:2480
+#: mail/em-migrate.c:2576
 #, fuzzy, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr ""
 "Δεν είναι δυνατή η δημιουργία του αρχείου αποτελέσματος: %s\n"
 " %s"
 
-#: mail/em-migrate.c:2498
+#: mail/em-migrate.c:2594
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 msgstr ""
 
-#: mail/em-popup.c:699
+#: mail/em-popup.c:700
 msgid "Save As..."
 msgstr "Αποθήκευση ως..."
 
-#: mail/em-popup.c:717
+#: mail/em-popup.c:718
 #, c-format
 msgid "untitled_image.%s"
 msgstr "ανώνυμη_εικόνα.%s"
 
-#: mail/em-popup.c:807
+#: mail/em-popup.c:808
 msgid "Set as _Background"
 msgstr "Καθορισμός ως _παρασκήνιο"
 
-#: mail/em-popup.c:809
+#: mail/em-popup.c:810
 msgid "_Reply to sender"
 msgstr "Α_πάντηση στον αποστολέα"
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:859
 msgid "_Open Link in Browser"
 msgstr "Άν_οιγμα δεσμού στον φυλλομετρητή"
 
-#: mail/em-popup.c:859
+#: mail/em-popup.c:860
 msgid "Se_nd message to..."
 msgstr "Αποστολή _μηνύματος στο..."
 
-#: mail/em-popup.c:860
+#: mail/em-popup.c:861
 msgid "_Add to Addressbook"
 msgstr "Προσ_ήκη στο Βιβλίο Διευθύνσεων"
 
-#: mail/em-popup.c:966
+#: mail/em-popup.c:967
 #, c-format
 msgid "Open in %s..."
 msgstr "Άνοιγμα με %s..."
@@ -14611,7 +14130,7 @@ msgstr "Έλεγχος προτιμήσεων Evolution Mail "
 msgid "Mail Accounts"
 msgstr "Λογαριασμοί Αλληλογραφίας"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
 msgid "Mail Preferences"
 msgstr "Προτιμήσεις Αλληλογραφίας"
 
@@ -14625,15 +14144,15 @@ msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution εισάγει τα παλαιά σας Elm μηνύματα"
 
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:226
+#: mail/importers/evolution-mbox-importer.c:221
+#: mail/importers/evolution-outlook-importer.c:255
 #: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Γίνεται εισαγωγή..."
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:222
-#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/evolution-mbox-importer.c:223
+#: mail/importers/evolution-outlook-importer.c:257
 #: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Παρακαλώ περιμένετε"
@@ -14655,21 +14174,23 @@ msgid "Elm"
 msgstr "Elm"
 
 #: mail/importers/evolution-mbox-importer.c:116
+#: mail/importers/evolution-outlook-importer.c:130
 msgid "Destination folder:"
 msgstr "Φάκελος προορισμού:"
 
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder to import into"
 msgstr "Επιλογή ενός φακέλου για εισαγωγή σε"
 
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:254
 #: mail/importers/mail-importer.c:226
 #, c-format
 msgid "Importing `%s'"
 msgstr "Εισάγεται`%s'"
 
-#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/evolution-outlook-importer.c:301
 #: mail/importers/mail-importer.c:140
 msgid "Importing mailbox"
 msgstr "Γίνεται Εισαγωγή mailbox"
@@ -14832,15 +14353,15 @@ msgstr ""
 msgid "%s License Agreement"
 msgstr "Key Agreement"
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
 msgid "_Host:"
 msgstr "_Σύστημα:"
 
-#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
 msgid "User_name:"
 msgstr "_Όνομα Χρήστη:"
 
-#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
 msgid "_Path:"
 msgstr "_Θέση:"
 
@@ -14903,34 +14424,34 @@ msgstr "%d επαφές"
 msgid ", %d unread"
 msgstr ""
 
-#: mail/mail-component.c:653
+#: mail/mail-component.c:656
 msgid "New Mail Message"
 msgstr "Νέο Μήνυμα Ταχυδρομείου"
 
-#: mail/mail-component.c:654
+#: mail/mail-component.c:657
 msgid "_Mail Message"
 msgstr "_Αποστολή Μηνύματος"
 
-#: mail/mail-component.c:655
+#: mail/mail-component.c:658
 msgid "Compose a new mail message"
 msgstr "Συγγραφή νέου μηνύματος"
 
-#: mail/mail-component.c:661
+#: mail/mail-component.c:664
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Νέος ΕΦάκελος"
 
-#: mail/mail-component.c:662
+#: mail/mail-component.c:665
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Φίλτρα Μηνυμάτων"
 
-#: mail/mail-component.c:663
+#: mail/mail-component.c:666
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Δημιουργία νέου ημερολογίου"
 
-#: mail/mail-component.c:795
+#: mail/mail-component.c:798
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
@@ -14942,7 +14463,7 @@ msgstr "Γίνεται Έλεγχος Υπηρεσίας"
 msgid "Connecting to server..."
 msgstr "Σύνδεση στο διακομιστή..."
 
-#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Ταυτότητα"
 
@@ -14958,7 +14479,7 @@ msgstr ""
 "στέλνετε μηνύματα."
 
 #: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid "Receiving Mail"
 msgstr "Λήψη Μηνυμάτων"
 
@@ -14975,7 +14496,7 @@ msgstr ""
 msgid "Please select among the following options"
 msgstr "Παρακαλώ επιλέξτε ανάμεσα ανάμεσα στις παρακάτω επιλογές"
 
-#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr "Αποστολή Αλληλογραφίας"
 
@@ -14988,7 +14509,7 @@ msgstr ""
 "μηνυμάτων. Αν δεν είστε βέβαιοι ρωτήστε τον διαχειριστή δικτύου σας ή τον "
 "Παροχέα Διαδικτύου."
 
-#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37
 msgid "Account Management"
 msgstr "Διαχείριση Λογαριασμού"
 
@@ -15006,254 +14527,259 @@ msgstr ""
 "ταχυδρομείου Evolution. Παρακαλώ εισάγετε ένα όνομα στο παρακάτω κενό.Το "
 "όνομα είναι μόνο για να προβάλει τον λογαριασμό."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:2
 #, fuzzy
 msgid " Ch_eck for Supported Types "
 msgstr "_Έλεγχος για του υποστηριζόμενος τύπους "
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "<b>Preview</b>"
 msgstr "Προεπισκόπηση"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "(το SSL δεν υποστηρίζεται σε αυτή την έκδοση του evolution)"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "<b>S_ignatures</b>"
 msgstr "<b>Κατάσταση:</b>"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "<b>_Languages</b>"
 msgstr "<b>Κατάσταση:</b>"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
+msgid "<small>This will make the the filter more reliable, but slower</small>"
+msgstr ""
+
+#: mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "<span weight=\"bold\">Checking for New Mail</span>"
 msgstr "Έλεγχος για Νέα Μηνύματα"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
 #, fuzzy
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr "<b>_Προβαλλόμενες κεφαλίδες μηνύματος</b>"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">General</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "Ειδοποίηση Νέου Μηνύματος"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Security</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "Απεσταλμένα και Πρόχειρα Μηνύματα"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:34
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:35
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr ""
 "Να γίνεται πάντα κρυπτογράφηση στον εαυτό μου κατά την αποστολή "
 "κρυπτογραφημένων μηνυμάτων"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:36
 msgid "Account Editor"
 msgstr "Επεξεργαστής Λογαριασμού"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:38
 #, fuzzy
 msgid "Add Ne_w Signature..."
 msgstr "Προσθήκη νέας υπογραφής..."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Add _Script"
 msgstr "Προσθήκη _Δέσμης Ενεργειών"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:40
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 "Να γίνεται πάντα κ_ρυπτογράφηση στον εαυτό μου κατά την αποστολή "
 "κρυπτογραφημένων μηνυμάτων"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Πάντοτε κοι_νοποίηση (Cc) σε:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Πάντοτε _κρυφή κοινοποίηση (Bcc) σε:"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Always _sign outgoing messages when using this account"
 msgstr "Να _υπογράφονται πάντα τα μηνύματα στη χρήση αυτού του λογαριασμού"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 "Να είναι πάντοτε έμπισ_τα τα κλειδία στην κλειδοθήκη μου κατά την "
 "κρυπτογράφηση"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Attach original message"
 msgstr "Επισύναψη αρχικού μηνύματος"
 
-#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Συννημένο"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:48
 #, fuzzy
 msgid "Automatically _insert smiley images"
 msgstr "_Αυτόματη εισαγωγή εικονιδίων φατσούλας"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Automatically check for _new mail every"
 msgstr "_Αυτόματος έλεγχος για νέα μηνύματα κάθε"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltic (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltic (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Beep w_hen new mail arrives"
 msgstr "_Ήχος κατά την άφιξη νέου μηνύματος"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "C_haracter set:"
 msgstr "Κωδικοποίηση  _Χαρακτήρων:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Ch_eck for Supported Types "
 msgstr "_Έλεγχος για του υποστηριζόμενος τύπους "
 
-#: mail/mail-config.glade.h:53
-msgid "Check _Incoming Mail"
-msgstr "Έλεγχος ε_ισερχόμενης αλληλογραφίας"
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Check _incoming mail for junk"
+msgstr "Έλεγχος εισερχόμενης αλληλογραφία για ανεπιθύμητα μηνύματα"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Check spelling while I _type"
 msgstr "Έλεγχος αλληλογραφίας κατά την πληκ_τρολόγηση"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Ελέγχει την εισερχόμενη αλληλογραφία για ανεπιθύμητη αλληλογραφία"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 msgid "Color for _misspelled words:"
 msgstr "Χρώμα για ανορ_θόγραφες λέξεις:"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Colors"
 msgstr "Χ_ρώματα"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Confirm _when expunging a folder"
 msgstr "Επι_βεβαίωση στην εξάλειψη από ένα φάκελο"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -15269,262 +14795,267 @@ msgstr ""
 "\n"
 "Επιλέξτε \"Εφαρμογή\" για να αποθηκεύσετε τις ρυθμίσεις σας."
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
 msgid "De_fault"
 msgstr "Εξ ορισμού"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Default character e_ncoding:"
 msgstr "Προεπιλεγμένη κω_δικοποίηση χαρακτήρων:"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 #, fuzzy
 msgid "Defaults"
 msgstr "_Προεπιλογή"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 msgid "Do not quote original message"
 msgstr "Να μην γίνεται παράθεση αρχικού μηνύματος"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 "Να μην υπογράφονται αιτήσεις _συνατήσεων (για συμβατότητα με το Outlook)"
 
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Τέλος"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Drafts _Folder:"
 msgstr "_Φάκελος προχείρων:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:77
 msgid "Email Accounts"
 msgstr "Λογαριασμοί Email"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Email _Address:"
 msgstr "Διεύ_θυνση Email:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "Empty trash folders on e_xit"
 msgstr "Άδειασμα των φακέλων απορριμμά_των στην έξοδο"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
 msgid "Encry_ption certificate:"
 msgstr "Πιστοποιητικό κρ_υπτογράφησης:"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:81
 msgid "Evolution Account Assistant"
 msgstr "Βοηθός Λογαριασμού Evolution"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:82
 msgid "Execute Command..."
 msgstr "Εκτέλεση Εντολής..."
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Fi_xed-width:"
 msgstr "Στα_θερού πλάτους:"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 msgid "Font Properties"
 msgstr "Ιδιότητες Γραμματοσειράς"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 msgid "Format messages in _HTML"
 msgstr "Μορφοποίηση μηνυμάτων σε _HTML"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "HTML Mail"
 msgstr "Αλληλογραφία _HTML"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Headers"
 msgstr "Κε_φαλίδες"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr "Επισήμανση παρα_θέσεων με"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
 #: mail/mail-config.glade.h:91
+#, fuzzy
+msgid "I_nclude remote tests"
+msgstr "Μαζί με:"
+
+#: mail/mail-config.glade.h:94
 msgid "Inline"
 msgstr "Μέσα στο μήνυμα"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Mail Configuration"
 msgstr "Ρυθμίσεις Ταχυδρομείου"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "Θέση Mailbox"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr "Επεξεργαστής Μηνύματος"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 "Σημείωση: θα σας γίνει ερώτηση για κωδικό μέχρι να συνδεθείτε για πρώτη φορά"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Or_ganization:"
 msgstr "Ορ_γανισμός:"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _Key ID:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "Play sound file when new mail arri_ves"
 msgstr "Ανα_παραγωγή ήχου κατά την άφιξη νέου μηνύματος"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "Ερώτηση στην αποστολή μηνυμάτων όπου έχουν οριστεί μόνο παραλήπτες στην "
 "κρυφή _κοινοποίηση (Bcc)"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr "Παράθεση αρχικού μηνύματος"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr "Με παράθεση"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Re_member password"
 msgstr "Απομνημόνευση κωδικού"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr "Α_πάντηση Σε:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "Γίνεται Λήψη Μηνύματος"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:120
 #, fuzzy
 msgid "Receiving Options"
 msgstr "Επιλ_ογές Λήψης"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
 #, fuzzy
 msgid "Remember _password"
 msgstr "Απομνημόνευση κωδικού"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
 #, fuzzy
 msgid "S_tandard Font:"
 msgstr "_Κανονική γραμματοσειρά:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 #, fuzzy
 msgid "Security"
 msgstr "_Ασφάλεια"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font"
 msgstr "Επιλογή γραμματοσειράς HTML σταθερού πλάτους "
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:126
 msgid "Select HTML fixed width font for printing"
 msgstr "Επιλογή γραμματοσειράς HTML σταθερού πλάτους για εκτύπωση"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:127
 msgid "Select HTML variable width font"
 msgstr "Επιλογή γραμματοσειράς HTML μεταβλητού πλάτους "
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:128
 msgid "Select HTML variable width font for printing"
 msgstr "Επιλογή γραμματοσειράς HTML μεταβλητού πλάτους για εκτύπωση"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:129
 #, fuzzy
 msgid "Select..."
 msgstr "Επιλο_γή..."
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "Αποστέλλονται τα μηνύματα"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Sent _Messages Folder:"
 msgstr "Φάκελος _απεσταλμένων μηνυμάτων:"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:134
 msgid "Ser_ver requires authentication"
 msgstr "Ο _διακομιστής απαιτεί πιστοποίηση"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:135
 msgid "Server _Type: "
 msgstr "Είδος _Διακομιστή: "
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:136
 msgid "Si_gning certificate:"
 msgstr "Πιστοποίητικό υπογρα_φής:"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:137
 #, fuzzy
 msgid "Signat_ure:"
 msgstr "Υπογραφή:"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "Signatures"
 msgstr "_Υπογραφές"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr "Ορισμός όνοματος αρ_χείου:"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "Spell Checking"
 msgstr "Έλεγχος Ορ_θογραφίας"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:141
 msgid "Standard Unix mbox"
 msgstr "Standard Unix mbox"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "T_erminal Font:"
 msgstr "Γραμματοσειρά _Τερματικού:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "T_ype: "
 msgstr "Τύπος:"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -15534,7 +15065,7 @@ msgstr ""
 "η υπογραφή σας. Το όνομα που θα καθορίσετε θα χρησιμοποιηθεί\n"
 "μόνο για την εμφάνιση."
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
@@ -15544,7 +15075,7 @@ msgstr ""
 "ελέγχου και της γλώσσας. Η λίστα των γλωσσών εδώ αντικατοπτρίζει μόνο τις "
 "γλώσσες για τις οποίες έχετε εγκαταστήσει το αντίστοιχο λεξικό."
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:149
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -15552,15 +15083,11 @@ msgstr ""
 "Πληκτρολογήστε το όνομα με το οποίο θα αναφέρεστε για τον λογαριασμό.\n"
 "Για παράδειγμα: \"Work\" or \"Personal\" "
 
-#: mail/mail-config.glade.h:148
-msgid "Use _Daemon"
-msgstr "Χρήση _Δαίμονα"
-
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:152
 msgid "V_ariable-width:"
 msgstr "Μετ_αβλητού πλάτους:"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:153
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -15570,91 +15097,87 @@ msgstr ""
 "\n"
 "Επιλέξτε \"Επόμενο\" για να ξεκινήσετε.. "
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:158
 msgid "_Add Signature"
 msgstr "_Προσθήκη υπογραφής"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Always load images from the Internet"
 msgstr "Να γίνεται _πάντα φόρτωμα των εικόνων από το δικτύου"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Digitally sign outgoing messages (by default)"
 msgstr "Να _υπογράφονται πάντα ψηφιακά τα μηνύματα (προεπιλογή)"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:161
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Να μην ειδοποιούμαι για νέα μηνύματα"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:163
 msgid "_Enable"
 msgstr "_Ενεργοποίηση"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 msgid "_Encrypt outgoing messages (by default)"
 msgstr "Κρυπτογράφηση εξερχόμενης αλληλογραφίας (προεπιλογή)"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:165
 msgid "_Forward style:"
 msgstr " Στυλ προώ_θησης:"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:168
 msgid "_Load images if sender is in address book"
 msgstr "_Φόρτωση εικόνων αν ο αποστολέας υπάρχει στο βιβλίο διευθύνσεων"
 
-#: mail/mail-config.glade.h:167
-msgid "_Local Tests Only"
-msgstr "_Τοπικές δοκιμές μόνο"
-
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Make this my default account"
 msgstr "Αυτός είναι ο _προεπιλεγμένος λογαριασμός"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_Mark messages as read after"
 msgstr "_Σήμανση μηνυμάτων ως αναγνωσμένα μετά από"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Never load images from the Internet"
 msgstr "_Να μην φορτώνονται ποτέ εικόνες από το δίκτυο"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Ερώ_τηση στην αποστολή μηνυμάτων HTML σε επαφές που δεν το θέλουν"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:175
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Ε_ρώτηση στην αποστολή μηνυμάτων με άδειο θέμα"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:176
 msgid "_Reply style:"
 msgstr "Στυλ α_πάντησης:"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:177
 msgid "_Script:"
 msgstr "_Δέσμη ενεργειών:"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:178
 msgid "_Show animated images"
 msgstr "Εμφάνι_ση κινούμενων εικόνων"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "_Use Secure Connection (SSL):"
 msgstr "_Χρήση ασφαλούς σύνδεσης (SSL):"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "_Use the same fonts as other applications"
 msgstr "_Χρήση των ίδιων γραμματοσειρών με τις άλλες εφαρμογές"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:181
 msgid "color"
 msgstr " χρώμα"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "Περιγραφή"
 
@@ -15835,7 +15358,7 @@ msgstr ""
 
 #. mail:camel-exception primary
 #: mail/mail-errors.xml.h:57
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgid "Your message with the subject \"{0}\" was not delivered."
 msgstr ""
 
 #. mail:camel-exception secondary
@@ -15901,11 +15424,6 @@ msgstr ""
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Δεν ήταν δυνατή η δημιουργία του καταλόγου `%s': %s."
 
-#. mail:no-save-path secondary
-#: mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail:no-create-path primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
@@ -15927,12 +15445,6 @@ msgstr "Δεν ήταν δυνατή η δημιουργία του καταλό
 msgid "Cannot create temporary save directory."
 msgstr "Δεν είναι δυνατή η δημιουργία του προσωρινού καταλόγου: %s"
 
-#. mail:no-create-tmp-path secondary
-#: mail/mail-errors.xml.h:100 mail/mail-errors.xml.h:112
-#: widgets/misc/e-system-errors.xml.h:11 widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail:no-write-path-exists secondary
 #: mail/mail-errors.xml.h:104
 #, fuzzy
@@ -16214,29 +15726,25 @@ msgstr "Αντικατάσταση"
 msgid "_Append"
 msgstr "Αποστολή"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:785
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinging %s"
 
-#: mail/mail-mt.c:897
-msgid "Working"
-msgstr "Εργάζεται"
-
-#: mail/mail-ops.c:99
+#: mail/mail-ops.c:98
 msgid "Filtering Folder"
 msgstr "Φιλτράρισμα Φακέλου"
 
-#: mail/mail-ops.c:260
+#: mail/mail-ops.c:259
 msgid "Fetching Mail"
 msgstr "Λήψη Μηνύματος"
 
-#: mail/mail-ops.c:543
+#: mail/mail-ops.c:542
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Αποτυχία εφαρμογής εξερχόμενων φίλτρων:  %s"
 
-#: mail/mail-ops.c:568
+#: mail/mail-ops.c:567
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -16245,115 +15753,115 @@ msgstr ""
 "Αποτυχία προσθήκης στο %s: %s\n"
 "Γίνεται προσθήκη στο φάκελο 'Απεσταλμένα'."
 
-#: mail/mail-ops.c:577
+#: mail/mail-ops.c:576
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Αποτυχία προσθήκης στον φάκελο 'Απεσταλμένα': %s"
 
-#: mail/mail-ops.c:673
+#: mail/mail-ops.c:672
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Αποστολή μηνύματος %d από %d"
 
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:703
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Αποτυχία στο μήνυμα %d από %d"
 
-#: mail/mail-ops.c:708
+#: mail/mail-ops.c:707
 msgid "Complete."
 msgstr "Ολοκληρώθηκε."
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:804
 msgid "Saving message to folder"
 msgstr "Αποθήκευση μηνύματος στο φάκελο"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Μετακίνηση μηνυμάτων στο %s"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Αντιγραφή μηνυμάτων στο %s"
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:1002
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Σάρωση φακέλων στο \"%s\""
 
-#: mail/mail-ops.c:1116
+#: mail/mail-ops.c:1115
 msgid "Forwarded messages"
 msgstr "Προωθημένα μηνύματα"
 
-#: mail/mail-ops.c:1159
+#: mail/mail-ops.c:1158
 #, c-format
 msgid "Opening folder %s"
 msgstr "Άνοιγμα φακέλου %s"
 
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1230
 #, c-format
 msgid "Opening store %s"
 msgstr "Άνοιγμα αποθήκης %s"
 
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1308
 #, c-format
 msgid "Removing folder %s"
 msgstr "Αφαιρείται ο φακέλος %s"
 
-#: mail/mail-ops.c:1403
+#: mail/mail-ops.c:1402
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Αποθηκεύεται ο φακέλος '%s'"
 
-#: mail/mail-ops.c:1468
+#: mail/mail-ops.c:1467
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Expunging and storing account '%s'"
 
-#: mail/mail-ops.c:1469
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Αποθηκεύεται ο λογαριασμός '%s'"
 
-#: mail/mail-ops.c:1524
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr "Ανανεώνεται ο φακέλος"
 
-#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
+#: mail/mail-ops.c:1559 mail/mail-ops.c:1610
 msgid "Expunging folder"
 msgstr "Εξαλείφεται ο φακέλος"
 
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1607
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Άδειασμα κάδου σε '%s'"
 
-#: mail/mail-ops.c:1609
+#: mail/mail-ops.c:1608
 msgid "Local Folders"
 msgstr "Τοπικοί Φάκελοι"
 
-#: mail/mail-ops.c:1692
+#: mail/mail-ops.c:1691
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Παραλαμβάνεται το μήνυμα %s"
 
-#: mail/mail-ops.c:1764
+#: mail/mail-ops.c:1763
 #, fuzzy, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Παραλαμβάνονται %d μήνυμα(τα)"
 msgstr[1] "Παραλαμβάνονται %d μήνυμα(τα)"
 
-#: mail/mail-ops.c:1850
+#: mail/mail-ops.c:1849
 #, fuzzy, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Αποθήκευση %d μηνυμάτων"
 msgstr[1] "Αποθήκευση %d μηνυμάτων"
 
-#: mail/mail-ops.c:1900
+#: mail/mail-ops.c:1899
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -16362,7 +15870,7 @@ msgstr ""
 "Δεν είναι δυνατή η δημιουργία του αρχείου αποτελέσματος: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1928
+#: mail/mail-ops.c:1927
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -16371,11 +15879,11 @@ msgstr ""
 "Σφάλμα κατά την αποθήκευση μηνυμάτων στο %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1999
+#: mail/mail-ops.c:1998
 msgid "Saving attachment"
 msgstr "Αποθήκευση συννημένου"
 
-#: mail/mail-ops.c:2016
+#: mail/mail-ops.c:2015
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -16384,17 +15892,17 @@ msgstr ""
 "Δεν είναι δυνατή η δημιουργία αρχείου αποτελέσματος: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2046
+#: mail/mail-ops.c:2045
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Δεν ήταν δυνατή η εγγραφή δεδομένων:%s"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Αποσύνδεση από το %s"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Επανασύνδεση στο %s"
@@ -16458,24 +15966,24 @@ msgstr "Ανανέωση..."
 msgid "Waiting..."
 msgstr "Αναμονή..."
 
-#: mail/mail-session.c:238
+#: mail/mail-session.c:239
 msgid "User canceled operation."
 msgstr "Ο χρήστης ακύρωσε την λειτουργία."
 
-#: mail/mail-session.c:271
+#: mail/mail-session.c:272
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Εισάγετε Κωδικό Πρόσβασης για %s"
 
-#: mail/mail-session.c:273
+#: mail/mail-session.c:274
 msgid "Enter Password"
 msgstr "Εισάγετε Κωδικό Πρόσβασης"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password"
 msgstr "_Απομνημόνευση αυτού του κωδικού"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:298
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 "Απο_μνημόνευση αυτού του κωδικού πρόσβασης για το υπόλοιπο της συνεδρίας"
@@ -16531,79 +16039,79 @@ msgstr "Αναβάθμιση εφακέλων για το uri: %s"
 msgid "Updating vFolders for '%s'"
 msgstr "Αναβάθμιση εφακέλων για το uri: %s"
 
-#: mail/mail-vfolder.c:959
+#: mail/mail-vfolder.c:958
 msgid "vFolders"
 msgstr "εΦάκελοι"
 
-#: mail/mail-vfolder.c:998
+#: mail/mail-vfolder.c:997
 msgid "Edit VFolder"
 msgstr "Επεξεργασία ΕΦακέλου"
 
-#: mail/mail-vfolder.c:1082
+#: mail/mail-vfolder.c:1081
 msgid "New VFolder"
 msgstr "Νέος ΕΦάκελος"
 
-#: mail/message-list.c:946
+#: mail/message-list.c:948
 msgid "Unseen"
 msgstr "Μη ανοιγμένα"
 
-#: mail/message-list.c:947
+#: mail/message-list.c:949
 msgid "Seen"
 msgstr "Ανοιγμένα"
 
-#: mail/message-list.c:948
+#: mail/message-list.c:950
 msgid "Answered"
 msgstr "Απαντημένα"
 
-#: mail/message-list.c:949
+#: mail/message-list.c:951
 msgid "Multiple Unseen Messages"
 msgstr "Πολλαπλά μή ανοιγμένα μηνύματα"
 
-#: mail/message-list.c:950
+#: mail/message-list.c:952
 msgid "Multiple Messages"
 msgstr "Πολλαπλά Μηνύματα"
 
-#: mail/message-list.c:954
+#: mail/message-list.c:956
 msgid "Lowest"
 msgstr "Χαμηλότερα"
 
-#: mail/message-list.c:955
+#: mail/message-list.c:957
 msgid "Lower"
 msgstr "Χαμηλά"
 
-#: mail/message-list.c:959
+#: mail/message-list.c:961
 msgid "Higher"
 msgstr "Υψηλά"
 
-#: mail/message-list.c:960
+#: mail/message-list.c:962
 msgid "Highest"
 msgstr "Υψηλότερα"
 
-#: mail/message-list.c:1279
+#: mail/message-list.c:1285
 msgid "?"
 msgstr ";"
 
-#: mail/message-list.c:1286
+#: mail/message-list.c:1292
 msgid "Today %l:%M %p"
 msgstr "Σήμερα %l:%M %p"
 
-#: mail/message-list.c:1295
+#: mail/message-list.c:1301
 msgid "Yesterday %l:%M %p"
 msgstr "Χθες %l:%M %p"
 
-#: mail/message-list.c:1307
+#: mail/message-list.c:1313
 msgid "%a %l:%M %p"
 msgstr "%l:%M %p %a"
 
-#: mail/message-list.c:1315
+#: mail/message-list.c:1321
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1317
+#: mail/message-list.c:1323
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:3300
+#: mail/message-list.c:3321
 msgid "Generating message list"
 msgstr "Δημιουργία λίστας μηνυμάτων"
 
@@ -16659,6 +16167,10 @@ msgstr "Προώθηση"
 msgid "No Response Necessary"
 msgstr "Δεν είναι απαραίτητη απάντηση"
 
+#: mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Αναγνωσμένα"
+
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Απάντηση"
@@ -16765,44 +16277,48 @@ msgstr ""
 "εργασία χωρίς σύνδεση"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid "Toolbar is visible"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Whether Evolution should start up in offline mode"
 msgstr "Αν το Evolution θα ξεκινάει σε κατάσταση χωρίς σύνδεση"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Whether the toolbar should be visible."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
 msgid "Whether to skip the development warning dialog"
 msgstr "Αν θα παρακάμπτεται ο διάλογος προειδοποίησης ανάπτυξης"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
+#: shell/apps_evolution_shell.schemas.in.in.h:14
 msgid "mail"
 msgstr "mail"
 
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
-msgstr "Συνεργάστηκαν"
-
-#: shell/e-shell.c:545 shell/e-shell.c:546
+#: shell/e-shell.c:588 shell/e-shell.c:589
 #, fuzzy, c-format
 msgid "%ld KB"
 msgstr "%d %B"
 
-#: shell/e-shell.c:744
+#: shell/e-shell.c:786
 #, fuzzy
 msgid "Uknown system error."
 msgstr "Άγνωστο Σφάλμα"
 
-#: shell/e-shell.c:1101
+#: shell/e-shell.c:1143
 msgid "Invalid arguments"
 msgstr "Μη έγκυρη παράμετρος"
 
-#: shell/e-shell.c:1103
+#: shell/e-shell.c:1145
 msgid "Cannot register on OAF"
 msgstr "Δεν ήταν δυνατή η εγγραφή στο OAF"
 
-#: shell/e-shell.c:1105
+#: shell/e-shell.c:1147
 msgid "Configuration Database not found"
 msgstr "Δεν βρέθηκε η βάση δεδομένων ρυθμίσεων"
 
-#: shell/e-shell.c:1107
+#: shell/e-shell.c:1149
 msgid "Generic error"
 msgstr "Γενικό σφάλμα"
 
@@ -16861,7 +16377,7 @@ msgstr ""
 msgid "Select importer"
 msgstr "Επιλογή εισαγωγής"
 
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1026
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
 #, c-format
 msgid "File %s does not exist"
 msgstr "Το αρχείο %s δεν υπάρχει"
@@ -16889,31 +16405,32 @@ msgstr ""
 "Εισάγεται το %s\n"
 "Εισάγεται το στοιχείο 1."
 
-#: shell/e-shell-importer.c:549
+#: shell/e-shell-importer.c:570
 msgid "Automatic"
 msgstr "Αυτόματη"
 
-#: shell/e-shell-importer.c:598
-msgid "_Filename:"
-msgstr "Όνομα Αρ_χείου:"
+#: shell/e-shell-importer.c:626
+#, fuzzy
+msgid "F_ilename:"
+msgstr "Όνομα Αρχείου:"
 
-#: shell/e-shell-importer.c:603
+#: shell/e-shell-importer.c:631
 msgid "Select a file"
 msgstr "Επιλέξτε ένα αρχείο"
 
-#: shell/e-shell-importer.c:613
+#: shell/e-shell-importer.c:642
 msgid "File _type:"
 msgstr "_Τύπος αρχείου:"
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:681
 msgid "Import data and settings from _older programs"
 msgstr "Εισαγωγή δεδομένων και ρυθμίσεις από πα_λαιότερα προγράμματα"
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:684
 msgid "Import a _single file"
 msgstr "Εισαγωγή μο_ναδικού αρχείου"
 
-#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -16921,25 +16438,25 @@ msgstr ""
 "Παρακαλώ περιμένετε...\n"
 "Γίνεται σάρωση για υπάρχουσες εγκαταστάσεις"
 
-#: shell/e-shell-importer.c:727
+#: shell/e-shell-importer.c:756
 msgid "Starting Intelligent Importers"
 msgstr "Εκκίνηση των Έξυπνων Εισαγωγέων"
 
-#: shell/e-shell-importer.c:853 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
 #, c-format
 msgid "From %s:"
 msgstr "Από %s:"
 
-#: shell/e-shell-importer.c:1044
+#: shell/e-shell-importer.c:1073
 #, c-format
 msgid "No importer available for file %s"
 msgstr "Δεν υπάρχει διαθέσιμος εισαγωγέας για το αρχείο %s"
 
-#: shell/e-shell-importer.c:1056
+#: shell/e-shell-importer.c:1085
 msgid "Unable to execute importer"
 msgstr "Αποτυχία εκτέλεσης εισαγωγέα"
 
-#: shell/e-shell-importer.c:1169
+#: shell/e-shell-importer.c:1199
 msgid "_Import"
 msgstr "Ε_ισαγωγή"
 
@@ -16989,63 +16506,63 @@ msgstr "Ο φάκελος δεν είναι δυνατό να περιέχει �
 msgid "'.' and '..' are reserved folder names."
 msgstr "το '.' and '..' είναι κρατημένα ονόματα φακέλων."
 
-#: shell/e-shell-window.c:336
+#: shell/e-shell-window.c:337
 #, fuzzy
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Το Ximian Evolution είναι συνδεμένο στο δίκτυο. Κάντε κλικ στο πλήκτρο για "
 "να αποσυνδεθείτε."
 
-#: shell/e-shell-window.c:343
+#: shell/e-shell-window.c:344
 #, fuzzy
 msgid "Evolution is in the process of going offline."
 msgstr "Το Ximian Evolution είναι στη διαδικασία αποσύνδεσης από το δίκτυο."
 
-#: shell/e-shell-window.c:349
+#: shell/e-shell-window.c:350
 #, fuzzy
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Το Ximian Evolution είναι εκτός δικτύου. Κάντε κλικ στο πλήκτρο για να "
 "συνδεθείτε."
 
-#: shell/e-shell-window.c:621
+#: shell/e-shell-window.c:637
 #, fuzzy, c-format
 msgid "Switch to %s"
 msgstr "Μήνυμα σε %s"
 
-#: shell/e-shell-window-commands.c:64
+#: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 "Τα εργαλεία GNOME Pilot φαίνεται να μην είναι εγκατεστημένα σ' αυτό το "
 "σύστημα."
 
-#: shell/e-shell-window-commands.c:72
+#: shell/e-shell-window-commands.c:74
 #, c-format
 msgid "Error executing %s."
 msgstr "Σφάλμα κατά την εκτέλεση του%s."
 
-#: shell/e-shell-window-commands.c:121
+#: shell/e-shell-window-commands.c:123
 msgid "Bug buddy is not installed."
 msgstr "Δεν είναι εγκατεστημένο το Bug buddy."
 
-#: shell/e-shell-window-commands.c:129
+#: shell/e-shell-window-commands.c:131
 msgid "Bug buddy could not be run."
 msgstr "Δεν ήταν δυνατή η εκτέλεση του Bug buddy."
 
-#: shell/e-shell-window-commands.c:171
+#: shell/e-shell-window-commands.c:323
 #, fuzzy
-msgid "About Evolution"
-msgstr "Περί του Ximian Evolution"
+msgid "Groupware Suite"
+msgstr "Groupwise"
 
-#: shell/e-shell-window-commands.c:382
+#: shell/e-shell-window-commands.c:563
 msgid "_Work Online"
 msgstr "Εργασία Ε_ντός Δικτύου"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "Εργασία Εκ_τός Δικτύου"
 
-#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Εργασία Εκτός Δικτύου"
 
@@ -17057,43 +16574,6 @@ msgstr "Checkbox"
 msgid "New"
 msgstr "Νέο"
 
-#: shell/evolution-shell-component-utils.c:115
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Άγνωστο σφάλμα."
-
-#: shell/evolution-shell-component-utils.c:118
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Το σφάλμα από το σύστημα συστατικών είναι:\n"
-"%s"
-
-#: shell/evolution-shell-component-utils.c:125
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Το σφάλμα από το σύστημα ενεργοποίησης είναι:\n"
-"%s"
-
 #: shell/evolution-test-component.c:140
 msgid "New Test"
 msgstr "Νέα Δοκιμή"
@@ -17426,30 +16906,30 @@ msgid ""
 "Click help for details."
 msgstr ""
 
-#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:522
+#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
+#: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
 msgstr "Επιλογή ενός πιστοποιητικού για εισαγωγή..."
 
-#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:604
+#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
+#: smime/gui/certificate-manager.c:638
 msgid "Certificate Name"
 msgstr "Όνομα Πιστοποιητικού"
 
-#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
+#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
 msgid "Purposes"
 msgstr "Σκοποί"
 
-#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:517
+#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr "Σειριακός Αριθμός"
 
-#: smime/gui/certificate-manager.c:267
+#: smime/gui/certificate-manager.c:271
 msgid "Expires"
 msgstr "Λήγει"
 
-#: smime/gui/certificate-manager.c:417
+#: smime/gui/certificate-manager.c:446
 msgid "E-Mail Address"
 msgstr "Διεύθυνση E-Mail "
 
@@ -17493,6 +16973,11 @@ msgstr ""
 "Εκδόθηκε από:\n"
 "  Θέμα: %s\n"
 
+#: smime/gui/e-cert-selector.c:169
+#, fuzzy
+msgid "Select certificate"
+msgstr "Πιστοποιητικό πελάτη SSL"
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr "<Δεν είναι μέρος του πιστοποιητικού>"
@@ -17550,7 +17035,7 @@ msgstr ""
 "Πριν να εμπιστευτείτε αυτή την CA για οποιονδήποτε σκοπό, θα πρέπει να "
 "εξετάσετε το πιστοποιητικό της και την πολιτική της (αν είναι διαθέσιμη)."
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
 msgid "Certificate"
 msgstr "Πιστοποιητικό"
 
@@ -17570,19 +17055,23 @@ msgstr "Κοινό Όνομα (CN)"
 msgid "Contact Certificates"
 msgstr "Πιστοποιητικά επαφών"
 
-#: smime/gui/smime-ui.glade.h:21
-#, no-c-format
-msgid "Do you want to trust \"%s\" for the following purposes?"
-msgstr "Θέλετε να εμπιστευθείτε το \"%s\" για τους ακόλουθους σκοπούς?"
+#: smime/gui/smime-ui.glade.h:20
+msgid "Do not trust the authenticity of this certificate"
+msgstr ""
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:21
 msgid "Dummy window only"
 msgstr "Μόνο παράθυρο dummy"
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:22
 msgid "Edit"
 msgstr "Επεξεργασία"
 
+#: smime/gui/smime-ui.glade.h:23
+#, fuzzy
+msgid "Email Certificate Trust Settings"
+msgstr "Αρχή Πιστοποίησης Email"
+
 #: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr "Πιστοποιητικό παραλήπτη email"
@@ -17615,250 +17104,261 @@ msgstr "Μονάδα Οργανισμού (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "Αποτύπωμα SHA1 "
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr "Πιστοποιητικό πελάτη SSL"
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr "Πιστοποιητικό εξυπηρετητή SSL"
 
 #: smime/gui/smime-ui.glade.h:37
+msgid "Trust the authenticity of this certificate"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
 msgid "Trust this CA to identify email users."
 msgstr "Να είναι έμπιστη αυτή η CA για την πιστοποίηση χρηστών email."
 
-#: smime/gui/smime-ui.glade.h:38
+#: smime/gui/smime-ui.glade.h:39
 msgid "Trust this CA to identify software developers."
 msgstr "Να είναι έμπιστη αυτή η CA για την πιστοποίηση ανάπτυξης λογισμικού."
 
-#: smime/gui/smime-ui.glade.h:39
+#: smime/gui/smime-ui.glade.h:40
 msgid "Trust this CA to identify web sites."
 msgstr "Να είναι έμπιστη αυτή η CA για την πιστοποίηση ιστοσελίδων."
 
-#: smime/gui/smime-ui.glade.h:40
+#: smime/gui/smime-ui.glade.h:41
 msgid "View"
 msgstr "Προβολή"
 
-#: smime/gui/smime-ui.glade.h:41
-msgid "View Certificate"
-msgstr "Προβολή Πιστοποιητικού"
-
 #: smime/gui/smime-ui.glade.h:42
-msgid "You have been asked to trust a new Certificate Authority (CA)."
-msgstr "Σας ζητήθηκε να εμπιστευθείτε μια νέα Αρχή Πιστοποίησης (CA)."
-
-#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr "Έχετε πιστοποιητικά από οργανισμούς που πιστοποιούν εσάς:"
 
-#: smime/gui/smime-ui.glade.h:44
+#: smime/gui/smime-ui.glade.h:43
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 "Έχετε πιστοποιητικά στο αρχείο που πιστοποιούν τις παρακάτω αρχές "
 "πιστοποίησης:"
 
-#: smime/gui/smime-ui.glade.h:45
+#: smime/gui/smime-ui.glade.h:44
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 "Έχετε πιστοποιητικά στο αρχείο που πιστοποιούν τους παρακάτω ανθρώπους:"
 
-#: smime/gui/smime-ui.glade.h:46
+#: smime/gui/smime-ui.glade.h:45
 msgid "Your Certificates"
 msgstr "Τα Πιστοποιητικά σας:"
 
-#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
+#: smime/gui/smime-ui.glade.h:46
+msgid "_Edit CA Trust"
+msgstr ""
+
+#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
-#: smime/lib/e-cert.c:478
+#. x509 certificate usage types
+#: smime/lib/e-cert.c:424
+#, fuzzy
+msgid "Sign"
+msgstr "Signing"
+
+#: smime/lib/e-cert.c:425
+#, fuzzy
+msgid "Encrypt"
+msgstr "Κρυπτογραφημένο"
+
+#: smime/lib/e-cert.c:530
 msgid "Version"
 msgstr "Έκδοση"
 
-#: smime/lib/e-cert.c:493
+#: smime/lib/e-cert.c:545
 msgid "Version 1"
 msgstr "Έκδοση 1"
 
-#: smime/lib/e-cert.c:496
+#: smime/lib/e-cert.c:548
 msgid "Version 2"
 msgstr "Έκδοση 2"
 
-#: smime/lib/e-cert.c:499
+#: smime/lib/e-cert.c:551
 msgid "Version 3"
 msgstr "Έκδοση 3"
 
-#: smime/lib/e-cert.c:581
+#: smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "Κρυπτογράφηση PKCS #1 MD2 με RSA"
 
-#: smime/lib/e-cert.c:584
+#: smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "Κρυπτογράφηση PKCS #1 MD5 με RSA "
 
-#: smime/lib/e-cert.c:587
+#: smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "Κρυπτογράφηση PKCS #1 SHA-1 με RSA "
 
-#: smime/lib/e-cert.c:590
+#: smime/lib/e-cert.c:642
 msgid "C"
 msgstr "C"
 
-#: smime/lib/e-cert.c:593
+#: smime/lib/e-cert.c:645
 msgid "CN"
 msgstr "CN"
 
-#: smime/lib/e-cert.c:596
+#: smime/lib/e-cert.c:648
 msgid "OU"
 msgstr "OU"
 
-#: smime/lib/e-cert.c:599
+#: smime/lib/e-cert.c:651
 msgid "O"
 msgstr "O"
 
-#: smime/lib/e-cert.c:602
+#: smime/lib/e-cert.c:654
 msgid "L"
 msgstr "L"
 
-#: smime/lib/e-cert.c:605
+#: smime/lib/e-cert.c:657
 msgid "DN"
 msgstr "DN"
 
-#: smime/lib/e-cert.c:608
+#: smime/lib/e-cert.c:660
 msgid "DC"
 msgstr "DC"
 
-#: smime/lib/e-cert.c:611
+#: smime/lib/e-cert.c:663
 msgid "ST"
 msgstr "ST"
 
-#: smime/lib/e-cert.c:614
+#: smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
 msgstr "Κρυπτογράφηση PKCS #1 RSA "
 
-#: smime/lib/e-cert.c:617
+#: smime/lib/e-cert.c:669
 msgid "Certificate Key Usage"
 msgstr "Χρήση κλειδιού πιστοποιητικού"
 
-#: smime/lib/e-cert.c:620
+#: smime/lib/e-cert.c:672
 msgid "Netscape Certificate Type"
 msgstr "Τύπος πιστοποιητικού Netscape "
 
-#: smime/lib/e-cert.c:623
+#: smime/lib/e-cert.c:675
 msgid "Certificate Authority Key Identifier"
 msgstr "Αναγνωριστικό κλειδί αρχής πιστοποίησης"
 
-#: smime/lib/e-cert.c:626
+#: smime/lib/e-cert.c:678
 msgid "UID"
 msgstr "UID"
 
-#: smime/lib/e-cert.c:635
+#: smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Object Identifier (%s)"
 
-#: smime/lib/e-cert.c:686
+#: smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
 msgstr "Αναγνωριστικό Αλγορίθμου "
 
-#: smime/lib/e-cert.c:694
+#: smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
 msgstr "Παράμετροι Αλγορίθμου "
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:768
 msgid "Subject Public Key Info"
 msgstr "Πληροφορίες Δημοσίου Κλειδιού Θέματος"
 
-#: smime/lib/e-cert.c:721
+#: smime/lib/e-cert.c:773
 msgid "Subject Public Key Algorithm"
 msgstr "Αλγόριθμος Δημοσίου Κλειδιού Θέματος"
 
-#: smime/lib/e-cert.c:736
+#: smime/lib/e-cert.c:788
 msgid "Subject's Public Key"
 msgstr "Δημόσιο κλειδί υποκειμένου"
 
-#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
+#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
 msgid "Error: Unable to process extension"
 msgstr "Σφάλμα: Αδυναμία ανάλυσης επέκτασης"
 
-#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
+#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr "Object Signer"
 
-#: smime/lib/e-cert.c:782
+#: smime/lib/e-cert.c:834
 msgid "SSL Certificate Authority"
 msgstr "Αρχή Πιστοποίησης SSL "
 
-#: smime/lib/e-cert.c:786
+#: smime/lib/e-cert.c:838
 msgid "Email Certificate Authority"
 msgstr "Αρχή Πιστοποίησης Email"
 
-#: smime/lib/e-cert.c:814
+#: smime/lib/e-cert.c:866
 msgid "Signing"
 msgstr "Signing"
 
-#: smime/lib/e-cert.c:818
+#: smime/lib/e-cert.c:870
 msgid "Non-repudiation"
 msgstr "Χωρίς Πληροφορίες"
 
-#: smime/lib/e-cert.c:822
+#: smime/lib/e-cert.c:874
 msgid "Key Encipherment"
 msgstr "Key Encipherment"
 
-#: smime/lib/e-cert.c:826
+#: smime/lib/e-cert.c:878
 msgid "Data Encipherment"
 msgstr "Αποκωδικοποίηση Δεδομένων"
 
-#: smime/lib/e-cert.c:830
+#: smime/lib/e-cert.c:882
 msgid "Key Agreement"
 msgstr "Key Agreement"
 
-#: smime/lib/e-cert.c:834
+#: smime/lib/e-cert.c:886
 msgid "Certificate Signer"
 msgstr "Υπογράφων Πιστοποιητικού"
 
-#: smime/lib/e-cert.c:838
+#: smime/lib/e-cert.c:890
 msgid "CRL Signer"
 msgstr "Υπογραφέας CRL"
 
-#: smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:938
 msgid "Critical"
 msgstr "Κριτικό"
 
-#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
+#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
 msgid "Not Critical"
 msgstr "Όχι Κριτικό"
 
-#: smime/lib/e-cert.c:912
+#: smime/lib/e-cert.c:964
 msgid "Extensions"
 msgstr "Επεκτάσεις"
 
-#: smime/lib/e-cert.c:983
+#: smime/lib/e-cert.c:1035
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
 msgid "Certificate Signature Algorithm"
 msgstr "Αλγόριθμος υπογραφής πιστοποιητικού"
 
-#: smime/lib/e-cert.c:1048
+#: smime/lib/e-cert.c:1100
 msgid "Issuer"
 msgstr "Εκδότης"
 
-#: smime/lib/e-cert.c:1102
+#: smime/lib/e-cert.c:1154
 msgid "Issuer Unique ID"
 msgstr "Μοναδικό Αναγνωριστικό Εκδότη"
 
-#: smime/lib/e-cert.c:1121
+#: smime/lib/e-cert.c:1173
 msgid "Subject Unique ID"
 msgstr "Μοναδικό Αναγνωριστικό Θέματος"
 
-#: smime/lib/e-cert.c:1164
+#: smime/lib/e-cert.c:1216
 msgid "Certificate Signature Value"
 msgstr "Τιμή Υπογραφής Πιστοποιητικού"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
+#: smime/lib/e-cert-db.c:608
 msgid "Certificate already exists"
 msgstr "Το πιστοποιητικό υπάρχει ήδη"
 
@@ -18004,7 +17504,7 @@ msgstr "Προβολή της τρέχουσας επαφής"
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "Ε_νέργειες"
 
@@ -18167,7 +17667,7 @@ msgstr "_Κλείσιμο"
 #: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:3
+#: ui/evolution.xml.h:4
 msgid "Close"
 msgstr "Κλείσιμο"
 
@@ -18180,7 +17680,7 @@ msgid "Delete this item"
 msgstr "Διαγραφή αυτού του στοιχείου"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr "Κεντρική γραμμή εργαλείων"
 
@@ -18223,7 +17723,7 @@ msgstr "Αποθήκευσης αυτού του στοιχείου στο δί�
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:44
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "_File"
 msgstr "_Αρχείο"
 
@@ -18485,13 +17985,13 @@ msgstr "Αντιστρο_φή Επιλογής"
 msgid "_Threaded Message List"
 msgstr "Λίστα μηνυμάτων κατά _θέμα"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Κλείσιμο του παραθύρου"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "_Close"
 msgstr "_Κλείσιμο"
 
@@ -18892,7 +18392,7 @@ msgstr "_Προηγούμενο Μήνυμα"
 msgid "_Quoted"
 msgstr "Σε παρά_θεση"
 
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
 msgid "_Tools"
 msgstr "Εργα_λεία"
 
@@ -19190,110 +18690,124 @@ msgid "_Open Task"
 msgstr "Ά_νοιγμα εργασίας"
 
 #: ui/evolution.xml.h:1
-msgid "About Ximian Evolution..."
-msgstr "Περί του Ximian Evolution..."
+#, fuzzy
+msgid "About Evolution..."
+msgstr "Περί του Ximian Evolution"
 
 #: ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
 msgstr "Αλλαγή ρυθμίσεων Evolution "
 
-#: ui/evolution.xml.h:5
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the visibility of the toolbar"
+msgstr "Αλλαγή των ιδιοτήτων αυτού του φακέλου"
+
+#: ui/evolution.xml.h:6
 #, fuzzy
 msgid "Create a new window displaying this folder"
 msgstr "Δημιουργία νέου ημερολογίου"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "Έξ_οδος"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Συχνές ερωτήσεις για το Evolution"
+
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Έξοδος από το πρόγραμμα"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:10
 msgid "Forget _Passwords"
 msgstr "Ξέχασε τους Κωδικούς Πρόσβασης"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:11
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 "Ξέχασε όλους τους κωδικούς πρόσβασης που υπάρχουν στη μνήμη ώστε να "
 "ξαναζητηθούν"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:12
 msgid "Import data from other programs"
 msgstr "Εισαγωγή δεδομένων από άλλα προγράμματα"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:14
 #, fuzzy
 msgid "New _Window"
 msgstr "Παρά_θυρο"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Pi_lot Settings..."
 msgstr "Ρυθμίσεις Pi_lot ..."
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Send / Receive"
 msgstr "Αποστολή / Λήψη"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Send queued items and retrieve new items"
 msgstr "Αποστολή μηνυμάτων σε αναμονή και λήψη νέων"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Set up Pilot configuration"
 msgstr "Ρύθμιση Pilot "
 
-#: ui/evolution.xml.h:17
-msgid "Show information about Ximian Evolution"
+#: ui/evolution.xml.h:19
+#, fuzzy
+msgid "Show information about Evolution"
 msgstr "Εμφάνιση πληροφοριών σχετικά με το Ximian Evolution"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:20
 msgid "Submit Bug Report"
 msgstr "Στείλτε Αναφορά Προβλήματος"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:21
 msgid "Submit _Bug Report"
 msgstr "Στείλτε _Αναφορά Προβλήματος"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Δηλώστε ένα πρόβλημα με χρήση του Bug Buddy"
 
-#: ui/evolution.xml.h:21
-msgid "Toggle whether we are working offline."
-msgstr "Εναλλαγή της σύνδεσης στο δίκτυο."
-
 #: ui/evolution.xml.h:23
-msgid "Ximian Evolution _FAQ"
-msgstr "Συχνές ερωτήσεις για το Evolution"
+#, fuzzy
+msgid "T_oolbar"
+msgstr "Κεντρική γραμμή εργαλείων"
 
 #: ui/evolution.xml.h:24
-msgid "_About Ximian Evolution..."
-msgstr "_Περί του Ximian Evolution..."
+msgid "Toggle whether we are working offline."
+msgstr "Εναλλαγή της σύνδεσης στο δίκτυο."
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "_About Evolution..."
+msgstr "Περί του Ximian Evolution"
+
+#: ui/evolution.xml.h:30
 msgid "_Help"
 msgstr "_Βοήθεια"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "_Import..."
 msgstr "Ει_σαγωγή..."
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "_New"
 msgstr "_Νέο"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "_Quick Reference"
 msgstr "_Γρήγορη αναφορά"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_Send / Receive"
 msgstr "_Αποστολή / Λήψη"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 #, fuzzy
 msgid "_Window"
 msgstr "Παρά_θυρο"
@@ -19366,7 +18880,7 @@ msgid "With _Status"
 msgstr "Ορισμός Κατάστασης"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:626
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:635
 msgid "UTC"
 msgstr "UTC"
 
@@ -19523,29 +19037,29 @@ msgstr "Άλλο..."
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
-#: widgets/misc/e-error.c:121
+#: widgets/misc/e-error.c:79 widgets/misc/e-error.c:80
+#: widgets/misc/e-error.c:122
 msgid "Evolution Error"
 msgstr "Σφάλμα Evolution"
 
-#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
-#: widgets/misc/e-error.c:119
+#: widgets/misc/e-error.c:81 widgets/misc/e-error.c:82
+#: widgets/misc/e-error.c:120
 #, fuzzy
 msgid "Evolution Warning"
 msgstr "Evolution"
 
-#: widgets/misc/e-error.c:118
+#: widgets/misc/e-error.c:119
 #, fuzzy
 msgid "Evolution Information"
 msgstr "Πληροφορίες Συνάντησης"
 
-#: widgets/misc/e-error.c:120
+#: widgets/misc/e-error.c:121
 #, fuzzy
 msgid "Evolution Query"
 msgstr "Δοκιμή Evolution"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:410
+#: widgets/misc/e-error.c:415
 #, fuzzy, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -19696,16 +19210,546 @@ msgstr ""
 "Αδυναμία αποθήκευσης σε `%s'\n"
 " %s"
 
-#: widgets/misc/e-task-widget.c:211
+#: widgets/misc/e-task-widget.c:212
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: widgets/misc/e-task-widget.c:216
+#: widgets/misc/e-task-widget.c:217
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% έχει ολοκληρωθεί)"
 
+#~ msgid "Failed to connect to LDAP server"
+#~ msgstr "Δεν είναι δυνατή η σύνδεση με τον διακομιστή LDAP."
+
+#~ msgid "Failed to authenticate with LDAP server"
+#~ msgstr "Δεν ήταν δυνατή η πιστοποίηση στο διακομιστή  LDAP"
+
+#~ msgid "Could not perform query on Root DSE"
+#~ msgstr "Αδύνατη η δημιουργία ερωτήματος στο Root DSE"
+
+#~ msgid "The server responded with no supported search bases"
+#~ msgstr "Ο διακομιστής αποκρίθηκε χωρίς υποστηριζόμενες βάσεις αναζήτησης"
+
+#~ msgid "This server does not support LDAPv3 schema information"
+#~ msgstr "Αυτός ο διακομιστής δεν υποστηρίζει σχήμα πληροφοριών LDAPv3"
+
+#~ msgid "Error retrieving schema information"
+#~ msgstr "Σφάλμα ανάκτησης σχήματος πληροφοριών"
+
+#~ msgid "Server did not respond with valid schema information"
+#~ msgstr "Η απάντηση του διακομιστή δεν περιείχε έγκυρο σχήμα πληροφοριών"
+
+#~ msgid "  S_how Supported Bases "
+#~ msgstr "Ε_μφάνιση υποστηριζόμενων βάσεων"
+
+#~ msgid "1:00"
+#~ msgstr "1:00"
+
+#~ msgid "5:00"
+#~ msgstr "5:00"
+
+#~ msgid "Connecting"
+#~ msgstr "Σύνδεση"
+
+#~ msgid "Distinguished _name:"
+#~ msgstr "Διακεκριμένο ό_νομα:"
+
+#~ msgid "Email address:"
+#~ msgstr "Διεύθυνση Email:"
+
+#~ msgid "Evolution will use this DN to authenticate you with the server"
+#~ msgstr ""
+#~ "Το Evolution θα χρησιμοποίησει αυτό το DN για την πιστοποίησή σας στο "
+#~ "διακομιστή"
+
+#~ msgid "One"
+#~ msgstr "Ένα"
+
+#~ msgid "S_earch scope: "
+#~ msgstr "Βάθος ανα_ζήτησης: "
+
+#~ msgid "Searching"
+#~ msgstr "Γίνεται αναζήτηση"
+
+#~ msgid "Sub"
+#~ msgstr "Sub"
+
+#~ msgid "This option controls how long a search will be run."
+#~ msgstr ""
+#~ "Αυτή η επιλογή ελέγχει την χρονική διάρκεια της εκτέλεσης της αναζήτησης."
+
+#~ msgid "U_se SSL/TLS:"
+#~ msgstr "_Χρήση SSL/TLS:"
+
+#~ msgid "_Display name:"
+#~ msgstr "_Όνομα εμφάνισης:"
+
+#~ msgid "_Port number:"
+#~ msgstr "Αριθμός _Θύρας:"
+
+#~ msgid "_Search base:"
+#~ msgstr "Βάση  _αναζήτησης:"
+
+#~ msgid "_Server name:"
+#~ msgstr "Όνομα _διακομιστή:"
+
+#~ msgid "_Timeout (minutes):"
+#~ msgstr "_Χρόνος λήξης (λεπτά):"
+
+#~ msgid "connecting-tab"
+#~ msgstr "στήλη-σύνδεσης"
+
+#~ msgid "general-tab"
+#~ msgstr "στήλη-γενικών"
+
+#~ msgid "searching-tab"
+#~ msgstr "στήλη-αναζήτησης"
+
+#, fuzzy
+#~ msgid "Job title:"
+#~ msgstr "_Τίτλος εργασίας:"
+
+#, fuzzy
+#~ msgid "Webcam:"
+#~ msgstr "Ιστοσελίδα:"
+
+#~ msgid "Category editor not available."
+#~ msgstr "Ο επεξεργαστής κατηγορίας δεν είναι διαθέσιμος."
+
+#, fuzzy
+#~ msgid ""
+#~ "The following entries are invalid:\n"
+#~ "\n"
+#~ msgstr "Οι παρακάτω συνδέσεις είναι ενεργές αυτή τη στιγμή:"
+
+#~ msgid "Could not find widget for a field: `%s'"
+#~ msgstr "Δε βρέθηκε συστατικό για το πεδίο: `%s'"
+
+#~ msgid "Do you want to save changes?"
+#~ msgstr "Θέλετε να αποθηκεύσετε τις αλλαγές;"
+
+#~ msgid "Error saving %s: %s"
+#~ msgstr "Σφάλμα αποθήκευσης  %s: %s"
+
+#~ msgid ""
+#~ "The addressbook backend for\n"
+#~ "%s\n"
+#~ "has crashed. You will have to restart Evolution in order to use it again"
+#~ msgstr ""
+#~ "Το backend του ευρετηρίου διευθύνσεων για\n"
+#~ "%s\n"
+#~ "κόλλησε. Θα πρέπει να επανεκκινήσετε το Evolution για να το "
+#~ "ξαναχρησιμοποιήσετε"
+
+#~ msgid "Can not load URI"
+#~ msgstr "Αδυναμία φόρτωσης URI"
+
+#~ msgid "Calendar Properties"
+#~ msgstr "Ιδιότητες ημερολογίου"
+
+#~ msgid "Remote"
+#~ msgstr "Απομακρυσμένο: "
+
+#~ msgid "Task List Properties"
+#~ msgstr "Ιδιότητες  λίστας εργασιών"
+
+#~ msgid "_Refresh Interval:"
+#~ msgstr "Διά_στημα ανανέωσης:"
+
+#~ msgid "_Source URL:"
+#~ msgstr "Πηγή URL:"
+
+#~ msgid ""
+#~ "The event being deleted is a meeting, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "Το γεγονός που διαγράφηκε ήταν μια συνάντηση, θέλετε να στείλετε μια "
+#~ "ειδοποίηση ακύρωσης?"
+
+#~ msgid "Are you sure you want to cancel and delete this meeting?"
+#~ msgstr "Είστε βέβαιοι για την ακύρωση και διαγραφή της συνάντησης;"
+
+#~ msgid ""
+#~ "The task being deleted is assigned, would you like to send a cancellation "
+#~ "notice?"
+#~ msgstr ""
+#~ "Η εργασία που διαγράφηκε είχε ανατεθεί, θέλετε να στείλετε μια ειδοποίηση "
+#~ "ακύρωσης?"
+
+#~ msgid "Are you sure you want to cancel and delete this task?"
+#~ msgstr "Είστε βέβαιοι για την ακύρωση και την διαγραφή της εργασίας;"
+
+#~ msgid ""
+#~ "The journal entry being deleted is published, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "Η καταχώρηση που διαγράφηκε είχε δημοσιευθεί, θέλετε να στείλετε μια "
+#~ "ειδοποίηση ακύρωσης?"
+
+#~ msgid "Are you sure you want to cancel and delete this journal entry?"
+#~ msgstr ""
+#~ "Είστε βέβαιοι για την ακύρωση και την διαγραφή της καταχώρισης του "
+#~ "ημερολογίου;"
+
+#~ msgid "Are you sure you want to delete the appointment `%s'?"
+#~ msgstr "Είστε βέβαιοι για την διαγραφή του ραντεβού`%s';"
+
+#~ msgid "Are you sure you want to delete this untitled appointment?"
+#~ msgstr "Είστε βέβαιοι για την διαγραφή του ραντεβού χωρίς όνομα;"
+
+#~ msgid "Are you sure you want to delete the task `%s'?"
+#~ msgstr "Είστε βέβαιοι για την διαγραφή της εργασίας`%s';"
+
+#~ msgid "Are you sure you want to delete this untitled task?"
+#~ msgstr "Είστε βέβαιοι για την διαγραφή της εργασίας χωρίς όνομα;"
+
+#~ msgid "Are you sure you want to delete the journal entry `%s'?"
+#~ msgstr "Είστε βέβαιοι για την διαγραφή της καταχώρισης ημερολογίου `%s';"
+
+#~ msgid "Are you sure want to delete this untitled journal entry?"
+#~ msgstr ""
+#~ "Είστε βέβαιοι για την διαγραφή της καταχώρισης ημερολογίου χωρίς τίτλο;"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d appointment?"
+#~ msgid_plural "Are you sure you want to delete %d appointments?"
+#~ msgstr[0] "Είστε βέβαιοι για την διαγραφή %d ραντεβού;"
+#~ msgstr[1] "Είστε βέβαιοι για την διαγραφή %d ραντεβού;"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d task?"
+#~ msgid_plural "Are you sure you want to delete %d tasks?"
+#~ msgstr[0] "Είστε βέβαιοι για την διαγραφή %d εργασιών;"
+#~ msgstr[1] "Είστε βέβαιοι για την διαγραφή %d εργασιών;"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d journal entry?"
+#~ msgid_plural "Are you sure you want to delete %d journal entries?"
+#~ msgstr[0] "Είστε βέβαιοι για την διαγραφή %d καταχωρίσεων ημερολογίου ;"
+#~ msgstr[1] "Είστε βέβαιοι για την διαγραφή %d καταχωρίσεων ημερολογίου ;"
+
+#~ msgid "_Invite Others..."
+#~ msgstr "_Πρόσκληση Άλλων..."
+
+#~ msgid ""
+#~ "This event has been changed, but has not been saved.\n"
+#~ "\n"
+#~ "Do you wish to save your changes?"
+#~ msgstr ""
+#~ "Το γεγονός  έχει αλλάξει αλλά δεν έχει αποθηκευτεί.\n"
+#~ "\n"
+#~ "Θέλετε να αποθηκεύσετε τις αλλαγές τώρα;"
+
+#~ msgid "_Discard Changes"
+#~ msgstr "Α_πόρριψη Αλλαγών"
+
+#~ msgid "Save Event"
+#~ msgstr "Αποθήκευση Γεγονότος"
+
+#~ msgid "The meeting information has been created. Send it?"
+#~ msgstr "Η πληροφορίες της συνάντησης έχουν δημιουργηθεί. Να αποσταλούν?"
+
+#~ msgid "The meeting information has changed. Send an updated version?"
+#~ msgstr ""
+#~ "Η πληροφορίες της συνάντησης έχουν αλλάζει. Να αποσταλεί ενημερωμένη "
+#~ "έκδοση;"
+
+#~ msgid "The task assignment information has been created. Send it?"
+#~ msgstr ""
+#~ "Οι πληροφορίες της ανάθεσης εργασίας έχουν δημιουργηθεί. Να αποσταλούν;"
+
+#~ msgid "The task information has changed. Send an updated version?"
+#~ msgstr ""
+#~ "Η πληροφορίες της εργασία έχει αλλάξει. Να αποσταλεί ενημερωμένη έκδοση;"
+
+#, fuzzy
+#~ msgid "The task backend for '%s' has crashed."
+#~ msgstr ""
+#~ "The task backend for\n"
+#~ "%s\n"
+#~ " has crashed."
+
+#, fuzzy
+#~ msgid "The calendar backend for '%s' has crashed."
+#~ msgstr ""
+#~ "The calendar backend for\n"
+#~ "%s\n"
+#~ " has crashed."
+
+#~ msgid "Could not get article %s from NNTP server"
+#~ msgstr "Αδυναμία λήψης άρθρου %s από τον εξυπηρετητή NNTP"
+
+#~ msgid "Posting not allowed by news server"
+#~ msgstr "Η δημοσίευση δεν επιτρέπεται από τον εξυπηρετητή συζητήσεων"
+
+#~ msgid "Failed to send newsgroups header: %s: message not posted"
+#~ msgstr ""
+#~ "Αποτυχία αποστολής κεφαλίδας συζητήσεων:%s: το μήνυμα δεν δημοσιεύτηκε"
+
+#~ msgid "Error posting to newsgroup: %s: message not posted"
+#~ msgstr ""
+#~ "Αποτυχία αποστολής στην ομάδα συζητήσεων:%s: το μήνυμα δεν δημοσιεύτηκε"
+
+#~ msgid "Error reading response to posted message: message not posted"
+#~ msgstr ""
+#~ "Αποτυχία ανάγνωσης απάντησης σε δημοσιευμένο μήνυμα: το μήνυμα δεν "
+#~ "δημοσιεύτηκε"
+
+#~ msgid "Error posting message: %s: message not posted"
+#~ msgstr "Αποτυχία αποστολής μηνύματος:%s: το μήνυμα δεν δημοσιεύτηκε"
+
+#~ msgid "Stream error"
+#~ msgstr "Σφάλμα Stream"
+
+#~ msgid "Connection error: %s"
+#~ msgstr "Σφάλμα σύνδεσης: %s"
+
+#~ msgid "Could not get group: %s"
+#~ msgstr "Αδυναμία λήψης ομάδας: %s"
+
+#, fuzzy
+#~ msgid "Could not get messages: unspecified error"
+#~ msgstr "Δεν είναι δυνατή η λήψη μηνυμάτων: ακαθόριστο σφάλμα"
+
+#~ msgid "Unknown server response: %s"
+#~ msgstr "Άγνωστη απάντηση διακομιστή: %s"
+
+#~ msgid "Adjust Score"
+#~ msgstr "Προσαρμογή Σκορ"
+
+#~ msgid "Assign Color"
+#~ msgstr "Ορισμός Χρώματος"
+
+#~ msgid "Assign Score"
+#~ msgstr "Ανάθεση σκορ"
+
+#~ msgid "Attachments"
+#~ msgstr "Επισυνάψεις"
+
+#~ msgid "Beep"
+#~ msgstr "Ήχος"
+
+#~ msgid "contains"
+#~ msgstr "περιέχει"
+
+#~ msgid "Copy to Folder"
+#~ msgstr "Αντιγραφή σε Φάκελο"
+
+#~ msgid "Date received"
+#~ msgstr "Ημερομηνία παραλαβής"
+
+#~ msgid "Date sent"
+#~ msgstr "Ημερομηνία αποστολής"
+
+#~ msgid "Deleted"
+#~ msgstr "Διαγραμμένα"
+
+#~ msgid "does not contain"
+#~ msgstr "δεν περιέχει"
+
+#~ msgid "does not end with"
+#~ msgstr "δεν τελειώνει με"
+
+#~ msgid "does not exist"
+#~ msgstr "δεν υπάρχει"
+
+#~ msgid "does not return"
+#~ msgstr "δεν επιστρέφει"
+
+#~ msgid "does not sound like"
+#~ msgstr "δεν φαίνεται να είναι"
+
+#~ msgid "does not start with"
+#~ msgstr "δεν ξεκινά με"
+
+#~ msgid "Do Not Exist"
+#~ msgstr "Δεν Υπάρχει"
+
+#~ msgid "Draft"
+#~ msgstr "Πρόχειρα"
+
+#~ msgid "ends with"
+#~ msgstr "τελειώνει με"
+
+#~ msgid "Exist"
+#~ msgstr "Υπάρχει"
+
+#~ msgid "exists"
+#~ msgstr "υπάρχει"
+
+#~ msgid "Expression"
+#~ msgstr "Έκφραση"
+
+#~ msgid "Follow Up"
+#~ msgstr "Παρακολούθηση"
+
+#~ msgid "is"
+#~ msgstr "είναι"
+
+#~ msgid "is after"
+#~ msgstr "είναι μετά"
+
+#~ msgid "is before"
+#~ msgstr "είναι πριν"
+
+#~ msgid "is Flagged"
+#~ msgstr "έχει Σημαία"
+
+#~ msgid "is greater than"
+#~ msgstr "είναι μεγαλύτερο από"
+
+#~ msgid "is less than"
+#~ msgstr "είναι μικρότερο από"
+
+#~ msgid "is not"
+#~ msgstr "δεν είναι"
+
+#~ msgid "is not Flagged"
+#~ msgstr "δεν έχει Σημαία"
+
+#~ msgid "Junk Test"
+#~ msgstr "Δοκιμή ανεπιθύμητης αλληλογραφίας"
+
+#~ msgid "Mailing list"
+#~ msgstr "Λίστα Ταχυδρομείου"
+
+#~ msgid "Message Body"
+#~ msgstr "Σώμα Μηνύματος"
+
+#~ msgid "Message Header"
+#~ msgstr "Επικεφαλίδα Μηνύματος"
+
+#~ msgid "Message is Junk"
+#~ msgstr "Το μήνυμα είναι ανεπιθύμητο"
+
+#~ msgid "Message is not Junk"
+#~ msgstr "Το μήνυμα είναι επιθυμητό"
+
+#~ msgid "Move to Folder"
+#~ msgstr "Μετακίνηση σε Φάκελο"
+
+#, fuzzy
+#~ msgid "Pipe to Program"
+#~ msgstr "Έξοδος από το πρόγραμμα"
+
+#~ msgid "Play Sound"
+#~ msgstr "Εκτέλεση Ήχου"
+
+#~ msgid "Recipients"
+#~ msgstr "Παραλήπτες"
+
+#~ msgid "Regex Match"
+#~ msgstr "Ταίριασμα κανον. έκφρ."
+
+#~ msgid "Replied to"
+#~ msgstr "Απαντημένα στους"
+
+#~ msgid "returns"
+#~ msgstr "επιστρέφει"
+
+#~ msgid "returns greater than"
+#~ msgstr "επιστρέφει μεγαλύτερο από"
+
+#~ msgid "returns less than"
+#~ msgstr "επιστρέφει λιγότερο από"
+
+#, fuzzy
+#~ msgid "Run Program"
+#~ msgstr "Εκτέλεση προγράμματος:"
+
+#~ msgid "Sender"
+#~ msgstr "Αποστολέας"
+
+#~ msgid "Set Status"
+#~ msgstr "Ορισμός Κατάστασης"
+
+#~ msgid "Size (kB)"
+#~ msgstr "Μέγεθος (kB)"
+
+#~ msgid "sounds like"
+#~ msgstr "φαίνεται να είναι"
+
+#~ msgid "Source Account"
+#~ msgstr "Πηγαίος Λογαριασμός"
+
+#~ msgid "Specific header"
+#~ msgstr "Ακριβής επικεφαλίδα"
+
+#~ msgid "starts with"
+#~ msgstr "ξεκινά με"
+
+#~ msgid "Stop Processing"
+#~ msgstr "Τερματισμός Επεξεργασίας"
+
+#~ msgid "Unset Status"
+#~ msgstr "Ορισμός Κατάστασης"
+
+#~ msgid "Check _Incoming Mail"
+#~ msgstr "Έλεγχος ε_ισερχόμενης αλληλογραφίας"
+
+#~ msgid "Use _Daemon"
+#~ msgstr "Χρήση _Δαίμονα"
+
+#~ msgid "_Local Tests Only"
+#~ msgstr "_Τοπικές δοκιμές μόνο"
+
+#~ msgid "Working"
+#~ msgstr "Εργάζεται"
+
+#~ msgid "Brought to you by"
+#~ msgstr "Συνεργάστηκαν"
+
+#~ msgid "_Filename:"
+#~ msgstr "Όνομα Αρ_χείου:"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "Unknown error."
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Άγνωστο σφάλμα."
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the component system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Το σφάλμα από το σύστημα συστατικών είναι:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the activation system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Το σφάλμα από το σύστημα ενεργοποίησης είναι:\n"
+#~ "%s"
+
+#~ msgid "Do you want to trust \"%s\" for the following purposes?"
+#~ msgstr "Θέλετε να εμπιστευθείτε το \"%s\" για τους ακόλουθους σκοπούς?"
+
+#~ msgid "View Certificate"
+#~ msgstr "Προβολή Πιστοποιητικού"
+
+#~ msgid "You have been asked to trust a new Certificate Authority (CA)."
+#~ msgstr "Σας ζητήθηκε να εμπιστευθείτε μια νέα Αρχή Πιστοποίησης (CA)."
+
+#~ msgid "About Ximian Evolution..."
+#~ msgstr "Περί του Ximian Evolution..."
+
+#~ msgid "_About Ximian Evolution..."
+#~ msgstr "_Περί του Ximian Evolution..."
+
 #~ msgid "Evolution Addressbook folder viewer"
 #~ msgstr "Εφαρμογή προβολής φακέλου του Βιβλίου Διευθύνσεων του Evolution"
 
@@ -20026,9 +20070,6 @@ msgstr "%s (%d%% έχει ολοκληρωθεί)"
 #~ msgid "Primary _email:"
 #~ msgstr "Πρωτεύον e_mail:"
 
-#~ msgid "S_pouse:"
-#~ msgstr "_Σύζυγος:"
-
 #~ msgid "_Business:"
 #~ msgstr "Ε_ργασία:"
 
@@ -20044,9 +20085,6 @@ msgstr "%s (%d%% έχει ολοκληρωθεί)"
 #~ msgid "_Mobile:"
 #~ msgstr "Κιν_ητό:"
 
-#~ msgid "_Office:"
-#~ msgstr "_Γραφείο:"
-
 #~ msgid "_Public Calendar URL:"
 #~ msgstr "URL _Δημοσίου Ημερολογίου:"
 
@@ -20702,9 +20740,6 @@ msgstr "%s (%d%% έχει ολοκληρωθεί)"
 #~ msgid "Failed on message %d of %d"
 #~ msgstr "Αποτυχία στο μήνυμα %d από %d"
 
-#~ msgid "Changing junk status"
-#~ msgstr "Αλλαγή κατάστασης ανεπιθύμητης αλληλογραφίας"
-
 #~ msgid "Quit Assistant"
 #~ msgstr "Έξοδος από τον Βοηθό"
 
diff --git a/po/en_AU.po b/po/en_AU.po
index 26d997774f..8cf16827e5 100644
--- a/po/en_AU.po
+++ b/po/en_AU.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.6\n"
-"POT-Creation-Date: 2004-05-19 14:00-0400\n"
+"POT-Creation-Date: 2004-06-03 11:14-0400\n"
 "PO-Revision-Date: 2000-10-22 16:19+0100\n"
 "Last-Translator: Michael Zucchi <notzed@ximian.com>\n"
 "Language-Team: \n"
@@ -54,14 +54,14 @@ msgstr ""
 msgid "Default Sync Address:"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:1150
 #: addressbook/conduit/address-conduit.c:1151
+#: addressbook/conduit/address-conduit.c:1152
 #, fuzzy
 msgid "Could not load addressbook"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: addressbook/conduit/address-conduit.c:1219
-#: addressbook/conduit/address-conduit.c:1222
+#: addressbook/conduit/address-conduit.c:1220
+#: addressbook/conduit/address-conduit.c:1223
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
@@ -69,14 +69,14 @@ msgstr ""
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
 #, fuzzy
 msgid "Failed to authenticate.\n"
 msgstr "Could not close temporary folder: %s"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr ""
@@ -126,51 +126,23 @@ msgstr "_Other Organiser"
 msgid "Create a new contacts group"
 msgstr "_Other Organiser"
 
-#: addressbook/gui/component/addressbook-component.c:182
+#: addressbook/gui/component/addressbook-component.c:184
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:483
-msgid "Failed to connect to LDAP server"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:507
-msgid "Failed to authenticate with LDAP server"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:535
-msgid "Could not perform query on Root DSE"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:840
-msgid "The server responded with no supported search bases"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1245
-msgid "This server does not support LDAPv3 schema information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1266
-msgid "Error retrieving schema information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1274
-msgid "Server did not respond with valid schema information"
-msgstr ""
-
 #: addressbook/gui/component/addressbook-migrate.c:68
-#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1160
 msgid "Migrating..."
 msgstr ""
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1201
 #, c-format
 msgid "Migrating `%s':"
 msgstr ""
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:438
+#: addressbook/gui/component/addressbook-migrate.c:464
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
 #: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
@@ -178,28 +150,28 @@ msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:446
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
-#: mail/mail-config.glade.h:106
+#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
+#: mail/mail-config.glade.h:109
 msgid "Personal"
 msgstr ""
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:454
+#: addressbook/gui/component/addressbook-migrate.c:480
 msgid "On LDAP Servers"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:582
+#: addressbook/gui/component/addressbook-migrate.c:608
 msgid "LDAP Servers"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:702
+#: addressbook/gui/component/addressbook-migrate.c:728
 msgid "Autocompletion Settings"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1076
+#: addressbook/gui/component/addressbook-migrate.c:1104
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -207,60 +179,55 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1090
+#: addressbook/gui/component/addressbook-migrate.c:1118
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1099
+#: addressbook/gui/component/addressbook-migrate.c:1127
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1109
+#: addressbook/gui/component/addressbook-migrate.c:1137
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:674
+#: addressbook/gui/component/addressbook-view.c:675
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:761
+#: addressbook/gui/component/addressbook-view.c:754
 #, fuzzy
 msgid "New Address Book"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: addressbook/gui/component/addressbook-view.c:762
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
+#: addressbook/gui/component/addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:763
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-view.c:756
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr ""
 
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/addressbook-view.c:1002
+#. Create the contacts group
+#: addressbook/gui/component/addressbook-view.c:995
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
 #: calendar/gui/migration.c:373
 msgid "Contacts"
 msgstr ""
@@ -340,10 +307,6 @@ msgid "Manage your S/MIME certificates here"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-msgid "  S_how Supported Bases "
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -358,382 +321,310 @@ msgstr ""
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1:00"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "Organisation"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Display</b>"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 #, fuzzy
 msgid "<b>Downloading</b>"
 msgstr "Organisation"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:10
 #, fuzzy
 msgid "<b>Searching</b>"
 msgstr "Organisation"
 
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:11
 msgid "<b>Server Information</b>"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
 msgid "<b>Type:</b>"
 msgstr "Organisation"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:13
 #, fuzzy
 msgid "Add Contacts Group"
 msgstr "_Other Organiser"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:14
 #, fuzzy
 msgid "Address Book Properties"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
-#: mail/mail-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
+#: mail/mail-config.glade.h:42
 msgid "Always"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:17
 #: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:21
-msgid "Connecting"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 #: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:23
-msgid "Distinguished _name:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Email address"
 msgstr "Chile"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-#, fuzzy
-msgid "Email address:"
-msgstr "Chile"
-
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "Evolution will use this DN to authenticate you with the server"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid ""
-"Evolution will use this email address to authenticate you with the server"
+"Evolution will use this email address to authenticate you with the server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Find Possible Search Bases"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:31
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:24
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
+#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
-#: mail/mail-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
+#: mail/mail-config.glade.h:102
 msgid "Never"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:33
-msgid "One"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:35
-msgid "S_earch scope: "
-msgstr ""
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Search _base:"
+msgstr "_Other Organiser"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:28
 msgid "Search base only"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:29
 #, fuzzy
 msgid "Search base:"
 msgstr "_Other Organiser"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Search scope:"
 msgstr "_Other Organiser"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
-msgid "Searching"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:31
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
-"server if\n"
-"your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL or TLS."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a \n"
-"insecure environment. For example, if you and your LDAP server are behind a "
-"firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection "
-"is already\n"
-"secure."
+"you are in a insecure environment. For example, if you and your LDAP server "
+"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
+"because your connection is already secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
-"TLS.  This \n"
-"means that your connection will be insecure, and that you will be vulnerable "
-"to security\n"
-"exploits. "
+"TLS.  This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Sub"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
-"searches will \n"
-"begin. If you leave this blank, the search will begin at the root of the "
-"directory tree."
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
-"the \n"
-"directory tree. A search scope of \"sub\" will include all entries below "
-"your search base.\n"
-"A search scope of \"one\" will only include the entries one level beneath "
-"your base.\n"
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:58
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
-"This is the maximum number of entries to download. Setting this number to "
-"be \n"
+"This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:41
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
-"list.\n"
-"It is for display purposes only. "
+"list. It is for display purposes only. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. "
-"A \n"
-"list of standard ports has been provided. Ask your system administrator\n"
-"what port you should specify."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:67
-msgid "This option controls how long a search will be run."
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid "Timeout:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
-msgid "U_se SSL/TLS:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
-#: mail/mail-config.glade.h:154
+#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
+#: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:47
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "_Other Organiser"
 
-#: addressbook/gui/component/ldap-config.glade.h:74
-#: calendar/gui/dialogs/calendar-setup.glade.h:12
-msgid "_Display name:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
 msgid "_Email address:"
 msgstr "Chile"
 
-#: addressbook/gui/component/ldap-config.glade.h:77
-msgid "_Log in method:"
+#: addressbook/gui/component/ldap-config.glade.h:50
+msgid "_Find Possible Search Bases"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
-msgid "_Name:"
+#: addressbook/gui/component/ldap-config.glade.h:51
+msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:79
-msgid "_Port number:"
-msgstr ""
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "_Log in:"
+msgstr "Organisation"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
-msgid "_Port:"
+#: addressbook/gui/component/ldap-config.glade.h:53
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
+msgid "_Name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:81
-msgid "_Search base:"
+#: addressbook/gui/component/ldap-config.glade.h:54
+msgid "_Port:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:82
-msgid "_Server name:"
-msgstr ""
+#: addressbook/gui/component/ldap-config.glade.h:55
+#, fuzzy
+msgid "_Search scope:"
+msgstr "_Other Organiser"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:56
 msgid "_Server:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:84
-msgid "_Timeout (minutes):"
+#: addressbook/gui/component/ldap-config.glade.h:57
+msgid "_Timeout:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:58
 msgid "_Use secure connection:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:87
-msgid "connecting-tab"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:88
-msgid "general-tab"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:60
 #: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
-#: mail/mail-config.glade.h:182
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:90
-msgid "searching-tab"
-msgstr ""
-
-#: addressbook/gui/component/select-names/e-select-names.c:497
+#: addressbook/gui/component/select-names/e-select-names.c:503
 #: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid "Select Contacts from Address Book"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
@@ -774,7 +665,7 @@ msgstr ""
 
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:222
+#: addressbook/gui/widgets/e-addressbook-view.c:224
 msgid "Source"
 msgstr ""
 
@@ -848,9 +739,9 @@ msgid "<b>Work</b>"
 msgstr "Organisation"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
-#: addressbook/gui/widgets/eab-contact-display.c:342
-#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/widgets/eab-contact-display.c:334
+#: addressbook/gui/widgets/eab-contact-display.c:353
 msgid "AIM"
 msgstr ""
 
@@ -887,8 +778,8 @@ msgid "Company:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:271
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
+#: addressbook/gui/contact-editor/e-contact-editor.c:266
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
 #, fuzzy
@@ -896,7 +787,7 @@ msgid "Contact"
 msgstr "_Other Organiser"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1527
+#: addressbook/gui/contact-editor/e-contact-editor.c:520
 msgid "Contact Editor"
 msgstr ""
 
@@ -917,90 +808,84 @@ msgid "Full _Name..."
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:202
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-msgid "Home"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "Home Page:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-msgid "Job title:"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/e-itip-control.c:936
-#, fuzzy
-msgid "Location:"
-msgstr "Organisation"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 #, fuzzy
 msgid "MSN Messenger"
 msgstr "Can not open message"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 #, fuzzy
 msgid "Mailing Address"
 msgstr "Chile"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "Manager:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "Ni_ckname:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "Notes:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
-#: addressbook/gui/contact-editor/e-contact-editor.c:203
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-msgid "Other"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+msgid "Office:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "PO Box:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "Personal Information"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 #, fuzzy
 msgid "Profession:"
 msgstr "Organisation"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+msgid "Spouse:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "State/Province:"
 msgstr ""
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+msgid "Title:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+msgid "Video Chat:"
+msgstr ""
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "Wants to receive HTML mail"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:42
-msgid "Webcam:"
+msgid "Web Log:"
 msgstr ""
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
-#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
-#: mail/mail-config.glade.h:155
+#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
+#: mail/mail-config.glade.h:157
 msgid "Work"
 msgstr ""
 
@@ -1019,41 +904,34 @@ msgid "_File under:"
 msgstr "Synchronising folder"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "_Where:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
-msgid "item7"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
-msgid "item8"
-msgstr ""
-
-#: addressbook/gui/contact-editor/eab-editor.c:316
+#: addressbook/gui/contact-editor/eab-editor.c:315
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/eab-editor.c:319
+#: addressbook/gui/contact-editor/eab-editor.c:318
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:351
-#: addressbook/gui/widgets/eab-contact-display.c:372
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:364
 #, fuzzy
 msgid "Address"
 msgstr "Chile"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:292
+#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard.c:174
@@ -2032,84 +1910,107 @@ msgstr ""
 msgid "Zimbabwe"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/contact-editor/e-contact-editor.c:179
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:337
+#: addressbook/gui/widgets/eab-contact-display.c:356
 msgid "Jabber"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:347
-#: addressbook/gui/widgets/eab-contact-display.c:366
+#: addressbook/gui/contact-editor/e-contact-editor.c:180
+#: addressbook/gui/widgets/eab-contact-display.c:339
+#: addressbook/gui/widgets/eab-contact-display.c:358
 msgid "Yahoo"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: addressbook/gui/widgets/eab-contact-display.c:338
+#: addressbook/gui/widgets/eab-contact-display.c:357
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:344
-#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#: addressbook/gui/widgets/eab-contact-display.c:355
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/contact-editor/e-contact-editor.c:183
 msgid "GroupWise"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+msgid "Home"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+msgid "Other"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
 msgid "Source Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:264
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:278
+#: addressbook/gui/contact-editor/e-contact-editor.c:273
 #, fuzzy
 msgid "Is New Contact"
 msgstr "_Other Organiser"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:285
+#: addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Writable Fields"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:299
+#: addressbook/gui/contact-editor/e-contact-editor.c:294
 #, fuzzy
 msgid "Changed"
 msgstr "Chile"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
-msgid "Category editor not available."
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:2352
 msgid "This contact belongs to these categories:"
 msgstr ""
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#: addressbook/gui/contact-editor/e-contact-editor.c:2429
 msgid "Please select an image for this contact"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#: addressbook/gui/contact-editor/e-contact-editor.c:2433
 msgid "No image"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#: addressbook/gui/contact-editor/e-contact-editor.c:2636
 msgid ""
-"The following entries are invalid:\n"
+"The contact data is invalid:\n"
 "\n"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2738
-#, c-format
-msgid "Could not find widget for a field: `%s'"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#, fuzzy
+msgid "Invalid contact."
+msgstr "_Other Organiser"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+msgid ""
+"The contact cannot be saved to the selected address book. Do you want to "
+"discard changes?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2727
+#: addressbook/gui/contact-editor/e-contact-editor.c:2751
+msgid "_Discard"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+msgid ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:62
@@ -2144,7 +2045,7 @@ msgid "_Edit Full"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:166
 msgid "_Full Name:"
 msgstr ""
 
@@ -2291,30 +2192,30 @@ msgstr ""
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "contact-list-editor"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:153
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:215
+#: addressbook/gui/widgets/e-addressbook-view.c:217
 #: addressbook/gui/widgets/e-minicard-view.c:460
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
 msgid "Is New List"
 msgstr ""
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:215
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
 msgid "Contact List Editor"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:438
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
 msgid "Save List as VCard"
 msgstr ""
 
@@ -2357,120 +2258,120 @@ msgstr ""
 msgid "Advanced Search"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:129
-#: addressbook/gui/widgets/eab-contact-display.c:192
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:139
-#: addressbook/gui/widgets/eab-contact-display.c:205
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:257
-#: addressbook/gui/widgets/eab-contact-display.c:533
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:525
 msgid "List Members"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:329
-#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/eab-contact-display.c:321
+#: addressbook/gui/widgets/eab-contact-display.c:323
 #, fuzzy
 msgid "E-mail"
 msgstr "Chile"
 
-#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/eab-contact-display.c:332
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organisation"
 
-#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:333
 #, fuzzy
 msgid "Position"
 msgstr "Organisation"
 
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:354
 msgid "Groupwise"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:340
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:349
-#: addressbook/gui/widgets/eab-contact-display.c:370
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:342
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:354
+#: addressbook/gui/widgets/eab-contact-display.c:346
 msgid "work"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:359
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:368
-#: addressbook/gui/widgets/eab-contact-display.c:587
+#: addressbook/gui/widgets/eab-contact-display.c:360
+#: addressbook/gui/widgets/eab-contact-display.c:579
 msgid "Blog"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/eab-contact-display.c:363
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:375
+#: addressbook/gui/widgets/eab-contact-display.c:367
 msgid "personal"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/eab-contact-display.c:374
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:548
+#: addressbook/gui/widgets/eab-contact-display.c:540
 msgid "Job Title"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/eab-contact-display.c:544
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:774
+#: smime/lib/e-cert.c:826
 msgid "Email"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:579
+#: addressbook/gui/widgets/eab-contact-display.c:571
 msgid "Home page"
 msgstr ""
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 msgid "Success"
 msgstr ""
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Backend busy"
 msgstr ""
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Repository offline"
 msgstr ""
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 #, fuzzy
 msgid "Address Book does not exist"
 msgstr "Cannot initialise Evolution's mail component."
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 #, fuzzy
 msgid "No Self Contact defined"
 msgstr "_Other Organiser"
@@ -2478,27 +2379,27 @@ msgstr "_Other Organiser"
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Permission denied"
 msgstr ""
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Contact not found"
 msgstr ""
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Contact ID already exists"
 msgstr ""
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Protocol not supported"
 msgstr ""
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:60
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:233
 #: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
@@ -2511,68 +2412,64 @@ msgid "Cancelled"
 msgstr ""
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:61
 #, fuzzy
 msgid "Could not cancel"
 msgstr "Could not close temporary folder: %s"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Authentication Failed"
 msgstr ""
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Authentication Required"
 msgstr ""
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:66
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "TLS not Available"
 msgstr ""
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#: addressbook/gui/widgets/eab-gui-util.c:66
 #, fuzzy
 msgid "No such source"
 msgstr "Synchronising folder failed: %s: %s"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:69
+#: addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Other error"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:90
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:110
+#: addressbook/gui/widgets/eab-gui-util.c:97
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:102
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution you must compile the program from the CVS "
-"sources after retrieving OpenLDAP from the link below."
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:109
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "Unable to open addressbook"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:162
+#: addressbook/gui/widgets/eab-gui-util.c:129
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2580,7 +2477,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:168
+#: addressbook/gui/widgets/eab-gui-util.c:135
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -2588,114 +2485,101 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:174
+#: addressbook/gui/widgets/eab-gui-util.c:141
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:177
+#: addressbook/gui/widgets/eab-gui-util.c:144
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:147
 msgid "This query did not complete successfully."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
-msgid "Do you want to save changes?"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:208
-msgid "_Discard"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:169
 msgid "Error adding list"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:229
-#: addressbook/gui/widgets/eab-gui-util.c:652
+#: addressbook/gui/widgets/eab-gui-util.c:169
+#: addressbook/gui/widgets/eab-gui-util.c:580
 msgid "Error adding contact"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying list"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying contact"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:192
 msgid "Error removing list"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
-#: addressbook/gui/widgets/eab-gui-util.c:610
+#: addressbook/gui/widgets/eab-gui-util.c:192
+#: addressbook/gui/widgets/eab-gui-util.c:538
 msgid "Error removing contact"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:334
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:360
+#: addressbook/gui/widgets/eab-gui-util.c:300
 #, c-format
 msgid ""
 "%s already exists\n"
 "Do you want to overwrite it?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:364
+#: addressbook/gui/widgets/eab-gui-util.c:304
 msgid "Overwrite"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:400
-#, c-format
-msgid "Error saving %s: %s"
-msgstr ""
-
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:437
+#: addressbook/gui/widgets/eab-gui-util.c:365
 msgid "card.vcf"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:571
+#: addressbook/gui/widgets/eab-gui-util.c:499
 msgid "list"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:706
+#: addressbook/gui/widgets/eab-gui-util.c:634
 #, fuzzy
 msgid "Move contact to"
 msgstr "_Other Organiser"
 
-#: addressbook/gui/widgets/eab-gui-util.c:708
+#: addressbook/gui/widgets/eab-gui-util.c:636
 #, fuzzy
 msgid "Copy contact to"
 msgstr "_Other Organiser"
 
-#: addressbook/gui/widgets/eab-gui-util.c:711
+#: addressbook/gui/widgets/eab-gui-util.c:639
 #, fuzzy
 msgid "Move contacts to"
 msgstr "_Other Organiser"
 
-#: addressbook/gui/widgets/eab-gui-util.c:713
+#: addressbook/gui/widgets/eab-gui-util.c:641
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "_Other Organiser"
 
-#: addressbook/gui/widgets/eab-gui-util.c:716
+#: addressbook/gui/widgets/eab-gui-util.c:644
 #, fuzzy
 msgid "Select target addressbook."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: addressbook/gui/widgets/eab-gui-util.c:939
+#: addressbook/gui/widgets/eab-gui-util.c:867
 msgid "Multiple VCards"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:942
+#: addressbook/gui/widgets/eab-gui-util.c:870
 #, c-format
 msgid "VCard for %s"
 msgstr ""
@@ -2784,7 +2668,7 @@ msgstr[1] "_Other Organiser"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:229
+#: addressbook/gui/widgets/e-addressbook-view.c:231
 #: addressbook/gui/widgets/e-minicard-view.c:467
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
@@ -2802,142 +2686,134 @@ msgstr ""
 msgid "Error modifying card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:163
 msgid "Name begins with"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:164
 msgid "Email begins with"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:57
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr ""
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-#: calendar/gui/cal-search-bar.c:50
+#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+#: addressbook/gui/widgets/e-addressbook-view.c:172
 msgid "Advanced..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:236
+#: addressbook/gui/widgets/e-addressbook-view.c:238
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:249
+#: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:506
+#: addressbook/gui/widgets/e-addressbook-view.c:508
 #, fuzzy
 msgid "Address Book"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2076
+#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:2080
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 msgid "New Contact..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "New Contact List..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Go to Folder..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Import..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1066
 msgid "Search for Contacts..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1069
 msgid "Pilot Settings..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
 msgid "Send Message to Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
+#: addressbook/gui/widgets/e-addressbook-view.c:1077
 msgid "Print Envelope"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
+#: addressbook/gui/widgets/e-addressbook-view.c:1081
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1080
+#: addressbook/gui/widgets/e-addressbook-view.c:1082
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1087
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:1092
+#: calendar/gui/e-calendar-view.c:1280
 msgid "Current View"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1309
-#, c-format
-msgid ""
-"The addressbook backend for\n"
-"%s\n"
-"has crashed. You will have to restart Evolution in order to use it again"
-msgstr ""
-
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1667
-#: calendar/gui/cal-search-bar.c:362
+#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr ""
 
@@ -3045,7 +2921,7 @@ msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-list-view.c:234
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr ""
@@ -3182,13 +3058,13 @@ msgstr "Cannot initialise Evolution's mail component."
 msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.c:998
+#: addressbook/printing/e-contact-print.c:1000
 #, fuzzy
 msgid "Print contacts"
 msgstr "_Other Organiser"
 
-#: addressbook/printing/e-contact-print.c:1064
-#: addressbook/printing/e-contact-print.c:1091
+#: addressbook/printing/e-contact-print.c:1066
+#: addressbook/printing/e-contact-print.c:1093
 #, fuzzy
 msgid "Print contact"
 msgstr "_Other Organiser"
@@ -3437,16 +3313,22 @@ msgstr ""
 msgid "Impossible internal error."
 msgstr ""
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:629
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
 #, fuzzy
 msgid "Can not open file"
 msgstr "Can not open message"
 
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-msgid "Can not load URI"
-msgstr ""
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Could not close temporary folder: %s"
 
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
@@ -3464,7 +3346,7 @@ msgstr ""
 msgid "Unnamed List"
 msgstr ""
 
-#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
 msgstr ""
@@ -3728,10 +3610,10 @@ msgid "Whether to show week numbers in date navigator"
 msgstr ""
 
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:88
-#: calendar/gui/gnome-cal.c:1703
-#: camel/providers/groupwise/camel-gw-listener.c:304
-#: camel/providers/groupwise/camel-gw-listener.c:327
+#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/gnome-cal.c:1705
+#: camel/providers/groupwise/camel-gw-listener.c:311
+#: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
 msgstr ""
 
@@ -3748,7 +3630,7 @@ msgstr ""
 
 #: calendar/gui/calendar-commands.c:363
 #: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:19 filter/filter.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
 msgid "days"
 msgstr ""
 
@@ -3896,24 +3778,24 @@ msgstr ""
 msgid "Month View"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:54
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:53
 #, fuzzy
 msgid "Location contains"
 msgstr "Organisation"
 
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
 msgid "Unmatched"
 msgstr ""
 
@@ -3934,23 +3816,23 @@ msgstr ""
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:466
+#: calendar/gui/dialogs/alarm-options.c:467
 msgid "Audio Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:475
+#: calendar/gui/dialogs/alarm-options.c:476
 msgid "Message Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:484
+#: calendar/gui/dialogs/alarm-options.c:485
 msgid "Email Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:493
+#: calendar/gui/dialogs/alarm-options.c:494
 msgid "Program Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:510
 msgid "Unknown Alarm Options"
 msgstr ""
 
@@ -3986,7 +3868,7 @@ msgstr ""
 msgid "With these arguments:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
 msgid "dialog1"
 msgstr ""
 
@@ -3995,7 +3877,7 @@ msgid "extra times every"
 msgstr ""
 
 #: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:20 filter/filter.glade.h:16
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr ""
 
@@ -4041,7 +3923,7 @@ msgstr ""
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr ""
 
@@ -4071,7 +3953,6 @@ msgid "hour(s)"
 msgstr ""
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:21
 msgid "minute(s)"
 msgstr ""
 
@@ -4079,26 +3960,26 @@ msgstr ""
 msgid "start of appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:170
+#: calendar/gui/dialogs/calendar-setup.c:172
 msgid "You must specify a location to get the calendar from."
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:178
+#: calendar/gui/dialogs/calendar-setup.c:180
 #, c-format
 msgid "The source location '%s' is not well-formed."
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:193
+#: calendar/gui/dialogs/calendar-setup.c:195
 #, c-format
 msgid "The source location '%s' is not a webcal source."
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:265
+#: calendar/gui/dialogs/calendar-setup.c:275
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:278
+#: calendar/gui/dialogs/calendar-setup.c:288
 #, c-format
 msgid ""
 "The group '%s' is remote. You must specify a location to get the calendar "
@@ -4120,55 +4001,32 @@ msgstr "_Other Organiser"
 msgid "C_olor:"
 msgstr "C_lose"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-#, fuzzy
-msgid "Calendar Properties"
-msgstr "Organisation"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
 msgid "Pick a color"
 msgstr "Pick a colour"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:8
-#, fuzzy
-msgid "Remote"
-msgstr "Synchronising folder"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-#, fuzzy
-msgid "Task List Properties"
-msgstr "_Other Organiser"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
 #, fuzzy
 msgid "_Add Calendar"
 msgstr "Organisation"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
 msgid "_Add Group"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-msgid "_Refresh Interval:"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
 msgid "_Refresh:"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-msgid "_Source URL:"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "_Type:"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
 msgid "_URL:"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
 msgid "weeks"
 msgstr ""
 
@@ -4276,7 +4134,7 @@ msgid "Display"
 msgstr "Chile"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:76
 msgid "E_nable"
 msgstr ""
 
@@ -4286,7 +4144,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:563
+#: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr ""
 
@@ -4300,7 +4158,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:559
+#: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr ""
 
@@ -4310,7 +4168,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:564
+#: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr ""
 
@@ -4324,7 +4182,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr ""
 
@@ -4339,7 +4197,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:562
+#: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr ""
 
@@ -4353,7 +4211,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:560
+#: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr ""
 
@@ -4363,7 +4221,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:561
+#: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr ""
 
@@ -4396,7 +4254,7 @@ msgid "_Day begins:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
-#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:43
@@ -4445,76 +4303,46 @@ msgstr ""
 msgid "before every appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:57
-msgid ""
-"The event being deleted is a meeting, would you like to send a cancellation "
-"notice?"
-msgstr ""
-
-#: calendar/gui/dialogs/cancel-comp.c:60
-msgid "Are you sure you want to cancel and delete this meeting?"
-msgstr ""
-
-#: calendar/gui/dialogs/cancel-comp.c:66
-msgid ""
-"The task being deleted is assigned, would you like to send a cancellation "
-"notice?"
-msgstr ""
-
-#: calendar/gui/dialogs/cancel-comp.c:69
-msgid "Are you sure you want to cancel and delete this task?"
-msgstr ""
-
-#: calendar/gui/dialogs/cancel-comp.c:75
-msgid ""
-"The journal entry being deleted is published, would you like to send a "
-"cancellation notice?"
-msgstr ""
-
-#: calendar/gui/dialogs/cancel-comp.c:78
-msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr ""
-
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:68
 msgid "This journal entry has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:75
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:82
+#: calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:92
 msgid "This journal entry has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:99
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
@@ -4553,7 +4381,7 @@ msgid "No summary"
 msgstr ""
 
 #: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
 #: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr ""
@@ -4607,99 +4435,51 @@ msgstr "Could not initialise Bonobo"
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:95
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:98
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:104
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:107
-msgid "Are you sure you want to delete this untitled task?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:113
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:116
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:131
-#, c-format
-msgid "Are you sure you want to delete %d appointment?"
-msgid_plural "Are you sure you want to delete %d appointments?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: calendar/gui/dialogs/delete-comp.c:138
-#, c-format
-msgid "Are you sure you want to delete %d task?"
-msgid_plural "Are you sure you want to delete %d tasks?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: calendar/gui/dialogs/delete-comp.c:145
-#, c-format
-msgid "Are you sure you want to delete %d journal entry?"
-msgid_plural "Are you sure you want to delete %d journal entries?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: calendar/gui/dialogs/delete-error.c:52
+#: calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:55
+#: calendar/gui/dialogs/delete-error.c:57
 msgid "The task could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:58
+#: calendar/gui/dialogs/delete-error.c:60
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:61
+#: calendar/gui/dialogs/delete-error.c:63
 msgid "The item could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:68
+#: calendar/gui/dialogs/delete-error.c:70
 msgid "The event could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:71
+#: calendar/gui/dialogs/delete-error.c:73
 msgid "The task could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:74
+#: calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:77
+#: calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:84
+#: calendar/gui/dialogs/delete-error.c:86
 msgid "The event could not be deleted due to an error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:87
+#: calendar/gui/dialogs/delete-error.c:89
 msgid "The task could not be deleted due to an error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:90
+#: calendar/gui/dialogs/delete-error.c:92
 msgid "The journal entry could not be deleted due to an error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:93
+#: calendar/gui/dialogs/delete-error.c:95
 msgid "The item could not be deleted due to an error"
 msgstr ""
 
@@ -4833,11 +4613,11 @@ msgstr ""
 
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:3
+#: calendar/gui/dialogs/meeting-page.glade.h:4
 #: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
 #: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1559
-#: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:100
+#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
+#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
@@ -4863,8 +4643,8 @@ msgstr ""
 #. FIXME: need to disable for undeletable folders
 #: calendar/gui/dialogs/meeting-page.c:655
 #: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1310 calendar/gui/e-calendar-view.c:1342
-#: mail/em-folder-tree.c:2557 mail/em-folder-view.c:919
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
+#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -4872,7 +4652,7 @@ msgid "_Delete"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:240
+#: calendar/gui/e-meeting-list-view.c:218
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr ""
@@ -4908,16 +4688,15 @@ msgid "Member"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
-#: mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-list-view.c:248
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
 msgid "Status"
 msgstr ""
 
@@ -4925,20 +4704,20 @@ msgstr ""
 msgid "Add A_ttendee"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "Add attendees from addressbook."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Organiser:"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
+#: calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "_Change Organizer"
 msgstr "_Change Organiser"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-#: calendar/gui/e-meeting-time-sel.c:417
-msgid "_Invite Others..."
-msgstr ""
-
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
 msgstr ""
@@ -5088,7 +4867,7 @@ msgid "_No recurrence"
 msgstr ""
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:450
+#: composer/e-msg-composer-attachment-bar.c:453
 msgid "_Remove"
 msgstr ""
 
@@ -5120,52 +4899,21 @@ msgstr ""
 msgid "year(s)"
 msgstr ""
 
-#: calendar/gui/dialogs/save-comp.c:53
-msgid ""
-"This event has been changed, but has not been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-
-#: calendar/gui/dialogs/save-comp.c:57
-msgid "_Discard Changes"
-msgstr ""
-
-#: calendar/gui/dialogs/save-comp.c:62
-msgid "Save Event"
-msgstr ""
-
-#: calendar/gui/dialogs/select-source-dialog.c:65
+#: calendar/gui/dialogs/select-source-dialog.c:69
 #, fuzzy
 msgid "Select destination"
 msgstr "Could not initialise Bonobo"
 
-#: calendar/gui/dialogs/select-source-dialog.c:86
+#: calendar/gui/dialogs/select-source-dialog.c:90
 #, fuzzy
 msgid "_Destination"
 msgstr "Synchronising folder"
 
-#: calendar/gui/dialogs/select-source-dialog.c:88
+#: calendar/gui/dialogs/select-source-dialog.c:92
 #, fuzzy
 msgid "Task List"
 msgstr "_Other Organiser"
 
-#: calendar/gui/dialogs/send-comp.c:57
-msgid "The meeting information has been created. Send it?"
-msgstr ""
-
-#: calendar/gui/dialogs/send-comp.c:60
-msgid "The meeting information has changed. Send an updated version?"
-msgstr ""
-
-#: calendar/gui/dialogs/send-comp.c:67
-msgid "The task assignment information has been created. Send it?"
-msgstr ""
-
-#: calendar/gui/dialogs/send-comp.c:71
-msgid "The task information has changed. Send an updated version?"
-msgstr ""
-
 #: calendar/gui/dialogs/task-details-page.c:406
 msgid "Completed date is wrong"
 msgstr ""
@@ -5185,7 +4933,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #: calendar/gui/e-cal-component-preview.c:249
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:960
 msgid "High"
 msgstr ""
 
@@ -5199,14 +4947,14 @@ msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:253
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:958
 msgid "Low"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:251
 #: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:957
+#: mail/message-list.c:959
 msgid "Normal"
 msgstr ""
 
@@ -5264,8 +5012,8 @@ msgstr ""
 
 #: calendar/gui/dialogs/task-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
+#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr ""
 
@@ -5434,7 +5182,7 @@ msgstr "_Other Organiser"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:950
+#: calendar/gui/e-itip-control.c:943
 msgid "Status:"
 msgstr ""
 
@@ -5518,12 +5266,12 @@ msgstr ""
 msgid "Deleting selected objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
 msgid "Updating objects"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1370
+#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
 #: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr ""
@@ -5533,15 +5281,15 @@ msgid "Open _Web Page"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1291 calendar/gui/e-calendar-view.c:1376
-#: mail/em-folder-view.c:896 mail/em-popup.c:690 mail/em-popup.c:806
+#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
+#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr ""
 
 #: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1292
-#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
+#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
@@ -5549,24 +5297,24 @@ msgid "_Print..."
 msgstr ""
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1338
-#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2550
-#: mail/message-list.c:1644 ui/evolution-addressbook.xml.h:31
+#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
+#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
+#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1273 calendar/gui/e-calendar-view.c:1299
-#: calendar/gui/e-calendar-view.c:1372 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
+#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
@@ -5634,70 +5382,70 @@ msgstr ""
 msgid "Task sort"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
 msgid "New _Appointment..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
+#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
+#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
 msgid "New Meeting"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
 msgid "New Task"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1280
+#: calendar/gui/e-calendar-view.c:1283
 #, fuzzy
 msgid "_Select Date..."
 msgstr "Organisation"
 
-#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1303
+#: calendar/gui/e-calendar-view.c:1306
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Organisation"
 
-#: calendar/gui/e-calendar-view.c:1304
+#: calendar/gui/e-calendar-view.c:1307
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1308
 msgid "_Schedule Meeting..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1309
 msgid "_Forward as iCalendar..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1349
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1351
 msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr ""
 
@@ -5711,9 +5459,9 @@ msgstr ""
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:967 calendar/gui/e-itip-control.c:1169
-#: calendar/gui/e-meeting-list-view.c:144
-#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
 #: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
 #: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
 #: camel/camel-tcp-stream-openssl.c:631
@@ -5739,13 +5487,13 @@ msgid "Assigned"
 msgstr ""
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr ""
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr ""
 
@@ -5757,7 +5505,7 @@ msgstr ""
 msgid "S"
 msgstr ""
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
 msgid "E"
 msgstr ""
 
@@ -5823,403 +5571,408 @@ msgstr ""
 msgid "%02i minute divisions"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:592
+#: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:596
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:601
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:603
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:618
+#: calendar/gui/e-itip-control.c:611
 msgid " and "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:618
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:631
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:645
+#: calendar/gui/e-itip-control.c:638
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:642
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:653
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:669
+#: calendar/gui/e-itip-control.c:662
 msgid ", ending on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:686
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:696
 msgid "<b>Ends:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:716
 msgid "<b>Completed:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:733
+#: calendar/gui/e-itip-control.c:726
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:771 calendar/gui/e-itip-control.c:827
+#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
 msgid "iCalendar Information"
 msgstr ""
 
 #. Title
-#: calendar/gui/e-itip-control.c:788
+#: calendar/gui/e-itip-control.c:781
 msgid "iCalendar Error"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:859 calendar/gui/e-itip-control.c:875
-#: calendar/gui/e-itip-control.c:886 calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
 msgid "An unknown person"
 msgstr ""
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:910
+#: calendar/gui/e-itip-control.c:903
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:925
+#: calendar/gui/e-itip-control.c:918
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:929
+#, fuzzy
+msgid "Location:"
+msgstr "Organisation"
+
+#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:959 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:963 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.c:1050
-#: calendar/gui/e-itip-control.c:1076 calendar/gui/e-itip-control.c:1089
-#: calendar/gui/e-itip-control.c:1102 calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
 msgid "Choose an action:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1023
+#: calendar/gui/e-itip-control.c:1016
 msgid "Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1024 calendar/gui/e-itip-control.c:1055
-#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1091
-#: calendar/gui/e-itip-control.c:1104 calendar/gui/e-itip-control.c:1117
-#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
+#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1044
 msgid "Accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1045
 msgid "Tentatively accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1046
 msgid "Decline"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1070
 msgid "Send Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1090
+#: calendar/gui/e-itip-control.c:1083
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1103
+#: calendar/gui/e-itip-control.c:1096
 msgid "Send Latest Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1116 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1185
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1193
+#: calendar/gui/e-itip-control.c:1186
 msgid "Meeting Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1191
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1193
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1201
+#: calendar/gui/e-itip-control.c:1194
 msgid "Meeting Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1206
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1203
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1204
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1218
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1226
+#: calendar/gui/e-itip-control.c:1219
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1227
+#: calendar/gui/e-itip-control.c:1220
 msgid "Meeting Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1234 calendar/gui/e-itip-control.c:1302
-#: calendar/gui/e-itip-control.c:1337
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1330
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1228
 msgid "Bad Meeting Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1253
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1254
 msgid "Task Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1259
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1262
 msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1278
+#: calendar/gui/e-itip-control.c:1271
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1272
 msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1286
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1294
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1288
 msgid "Task Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1303
+#: calendar/gui/e-itip-control.c:1296
 msgid "Bad Task Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1315
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1323
+#: calendar/gui/e-itip-control.c:1316
 msgid "Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1321
 msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1325
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1326
 msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1331
 msgid "Bad Free/Busy Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1413
+#: calendar/gui/e-itip-control.c:1406
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1472
+#: calendar/gui/e-itip-control.c:1465
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1503
+#: calendar/gui/e-itip-control.c:1496
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1535
+#: calendar/gui/e-itip-control.c:1528
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1769
+#: calendar/gui/e-itip-control.c:1762
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
+#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1825
+#: calendar/gui/e-itip-control.c:1818
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1837
+#: calendar/gui/e-itip-control.c:1830
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1856
+#: calendar/gui/e-itip-control.c:1849
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1852
 msgid "Object could not be found\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1855
 #, fuzzy
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Could not close temporary folder: %s"
 
-#: calendar/gui/e-itip-control.c:1865
+#: calendar/gui/e-itip-control.c:1858
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1861
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1892
 msgid "Removal Complete"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
 msgid "Item sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
+#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
 msgid "The item could not be sent!\n"
 msgstr ""
 
@@ -6260,74 +6013,74 @@ msgstr ""
 msgid "date-start"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:62
+#: calendar/gui/e-meeting-list-view.c:59
 msgid "Chair Persons"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:479
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
 msgid "Required Participants"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:64
+#: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:65
+#: calendar/gui/e-meeting-list-view.c:62
 msgid "Resources"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:140 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
 #: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:154 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:127
 #: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
 msgid "Required Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:179 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:177
 #: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
 msgid "Needs Action"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:182 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
 #: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr ""
@@ -6344,20 +6097,25 @@ msgstr ""
 msgid "No Information"
 msgstr ""
 
+#: calendar/gui/e-meeting-time-sel.c:417
+#, fuzzy
+msgid "Add attendees from addressbook"
+msgstr "Cannot initialise Evolution's mail component."
+
 #: calendar/gui/e-meeting-time-sel.c:440
 msgid "_Options"
 msgstr ""
 
 #: calendar/gui/e-meeting-time-sel.c:457
-msgid "Show _Only Working Hours"
+msgid "Show _only working hours"
 msgstr ""
 
 #: calendar/gui/e-meeting-time-sel.c:467
-msgid "Show _Zoomed Out"
+msgid "Show _zoomed out"
 msgstr ""
 
 #: calendar/gui/e-meeting-time-sel.c:482
-msgid "_Update Free/Busy"
+msgid "_Update free/busy"
 msgstr ""
 
 #: calendar/gui/e-meeting-time-sel.c:497
@@ -6373,19 +6131,19 @@ msgid ">_>"
 msgstr ""
 
 #: calendar/gui/e-meeting-time-sel.c:547
-msgid "_All People and Resources"
+msgid "_All people and resources"
 msgstr ""
 
 #: calendar/gui/e-meeting-time-sel.c:556
-msgid "All _People and One Resource"
+msgid "All _people and one resource"
 msgstr ""
 
 #: calendar/gui/e-meeting-time-sel.c:565
-msgid "_Required People"
+msgid "_Required people"
 msgstr ""
 
 #: calendar/gui/e-meeting-time-sel.c:574
-msgid "Required People and _One Resource"
+msgid "Required people and _one resource"
 msgstr ""
 
 #: calendar/gui/e-meeting-time-sel.c:593
@@ -6423,78 +6181,68 @@ msgstr "%d/%m/%Y"
 msgid "Enter the password for %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
 #, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-
 #. FIXME Loading should be async
 #. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:686
+#: calendar/gui/e-tasks.c:801
 #, c-format
 msgid "Opening tasks at %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:709
+#: calendar/gui/e-tasks.c:824
 #, c-format
 msgid ""
 "Error opening %s:\n"
 "%s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:730
+#: calendar/gui/e-tasks.c:845
 msgid "Loading tasks"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:834
+#: calendar/gui/e-tasks.c:949
 msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:857
+#: calendar/gui/e-tasks.c:972
 msgid "Deleting selected objects..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:884
+#: calendar/gui/e-tasks.c:999
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:960
+#: calendar/gui/e-tasks.c:1075
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
-#: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
+#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
+#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
 #: calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:705
 msgid "Tasks"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1876
+#: calendar/gui/gnome-cal.c:1878
 #, c-format
 msgid "Loading appointments at %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1895
+#: calendar/gui/gnome-cal.c:1897
 #, c-format
 msgid "Loading tasks at %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1920
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Synchronising folders"
 
-#: calendar/gui/gnome-cal.c:2048
-#, c-format
-msgid "The calendar backend for '%s' has crashed."
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:2894
+#: calendar/gui/gnome-cal.c:2906
 msgid "Purging"
 msgstr ""
 
@@ -6690,7 +6438,7 @@ msgid "On The Web"
 msgstr ""
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 
@@ -6701,7 +6449,7 @@ msgid "Unable to migrate calendar `%s'"
 msgstr "Could not close temporary folder: %s"
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:869
+#: calendar/gui/migration.c:889
 #, fuzzy, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Could not close temporary folder: %s"
@@ -6937,71 +6685,71 @@ msgstr ""
 msgid "Print Setup"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:303
+#: calendar/gui/tasks-component.c:313
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:371
 #, fuzzy
 msgid "New Task List"
 msgstr "_Other Organiser"
 
-#: calendar/gui/tasks-component.c:398
+#: calendar/gui/tasks-component.c:408
 #, fuzzy, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "_Other Organiser"
 msgstr[1] "_Other Organiser"
 
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] "_Other Organiser"
 msgstr[1] "_Other Organiser"
 
-#: calendar/gui/tasks-component.c:447
+#: calendar/gui/tasks-component.c:457
 msgid "Failed upgrading tasks."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:526
+#: calendar/gui/tasks-component.c:749
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:538
+#: calendar/gui/tasks-component.c:761
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:576
+#: calendar/gui/tasks-component.c:799
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:804
+#: calendar/gui/tasks-component.c:1040
 msgid "New task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:805
+#: calendar/gui/tasks-component.c:1041
 msgid "_Task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:806
+#: calendar/gui/tasks-component.c:1042
 msgid "Create a new task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:812
+#: calendar/gui/tasks-component.c:1048
 #, fuzzy
 msgid "New tasks group"
 msgstr "_Other Organiser"
 
-#: calendar/gui/tasks-component.c:813
+#: calendar/gui/tasks-component.c:1049
 msgid "_Tasks Group"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:814
+#: calendar/gui/tasks-component.c:1050
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "_Other Organiser"
@@ -8759,12 +8507,12 @@ msgstr ""
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1259
+#: camel/camel-folder.c:1262
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1299
+#: camel/camel-folder.c:1302
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
@@ -8778,11 +8526,15 @@ msgstr ""
 msgid "Copying messages"
 msgstr "Can not open message"
 
-#: camel/camel-folder.c:1666
-msgid "Learning junk and/or non junk message(s)"
+#: camel/camel-folder.c:1665
+msgid "Learning junk"
 msgstr ""
 
-#: camel/camel-folder.c:1695
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr ""
+
+#: camel/camel-folder.c:1701
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "Can not open message"
@@ -8815,15 +8567,15 @@ msgstr ""
 msgid "(match-threads) requires a match type string"
 msgstr ""
 
-#: camel/camel-folder-search.c:785
+#: camel/camel-folder-search.c:784
 msgid "(match-threads) expects an array result"
 msgstr ""
 
-#: camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:790
 msgid "(match-threads) requires the folder set"
 msgstr ""
 
-#: camel/camel-folder-search.c:880
+#: camel/camel-folder-search.c:879
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr ""
@@ -8853,7 +8605,8 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
 #: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:706
+#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr ""
@@ -9211,7 +8964,7 @@ msgstr ""
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1212
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -9577,40 +9330,40 @@ msgstr ""
 msgid "export keys: unimplemented"
 msgstr ""
 
-#: camel/camel-store.c:214
+#: camel/camel-store.c:213
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Can not get folder: Invalid operation on this store"
 
-#: camel/camel-store.c:244
+#: camel/camel-store.c:243
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr "Can not get folder: %s: %s"
 
-#: camel/camel-store.c:295
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Can not create folder: Invalid operation on this store"
 
-#: camel/camel-store.c:323
+#: camel/camel-store.c:325
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Can not get folder: %s: %s"
 
-#: camel/camel-store.c:387 camel/camel-vee-store.c:354
+#: camel/camel-store.c:389 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Can not delete folder: %s: Invalid operation"
 
-#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#: camel/camel-store.c:439 camel/camel-vee-store.c:387
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Can not rename folder: %s: Invalid operation"
 
-#: camel/camel-store.c:811
+#: camel/camel-store.c:777
 msgid "Trash"
 msgstr ""
 
-#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
-#: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/mail-config.glade.h:95
+#: ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr ""
 
@@ -9819,12 +9572,12 @@ msgstr ""
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "You can not copy messages from this rubbish bin."
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:374
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Can not delete folder: %s: No such folder"
 
-#: camel/camel-vee-store.c:398
+#: camel/camel-vee-store.c:395
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Can not rename folder: %s: No such folder"
@@ -9868,31 +9621,31 @@ msgstr "Cannot initialise Evolution's mail component."
 msgid "Post Office Agent SOAP Port:"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:80
+#: camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "Novell GroupWise"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:82
+#: camel/providers/groupwise/camel-groupwise-provider.c:85
 msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: camel/providers/groupwise/camel-groupwise-provider.c:100
 #: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
 msgid "Password"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:99
+#: camel/providers/groupwise/camel-groupwise-provider.c:102
 #: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/groupwise/camel-gw-listener.c:305
-#: camel/providers/groupwise/camel-gw-listener.c:328
+#: camel/providers/groupwise/camel-gw-listener.c:312
+#: camel/providers/groupwise/camel-gw-listener.c:335
 msgid "Checklist"
 msgstr ""
 
@@ -10031,13 +9784,13 @@ msgid ""
 msgstr ""
 
 #: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:429
+#: camel/providers/imap/camel-imap-store.c:428
 #, c-format
 msgid "IMAP server %s"
 msgstr ""
 
 #: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:431
+#: camel/providers/imap/camel-imap-store.c:430
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr ""
@@ -10047,7 +9800,7 @@ msgstr ""
 #: camel/providers/imap/camel-imap-store.c:551
 #: camel/providers/imap/camel-imap-store.c:571
 #: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
+#: camel/providers/nntp/camel-nntp-store.c:209
 #: camel/providers/pop3/camel-pop3-store.c:175
 #: camel/providers/smtp/camel-smtp-transport.c:269
 #: camel/providers/smtp/camel-smtp-transport.c:285
@@ -10064,10 +9817,10 @@ msgstr ""
 
 #: camel/providers/imap4/camel-imap4-store.c:222
 #: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:815
+#: camel/providers/imap/camel-imap-store.c:845
 #: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:137
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
 #: camel/providers/pop3/camel-pop3-store.c:192
 msgid "Connection cancelled"
 msgstr ""
@@ -10080,8 +9833,8 @@ msgid ""
 msgstr "Could not close temporary folder: %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:649
-#: camel/providers/imap/camel-imap-store.c:680
+#: camel/providers/imap/camel-imap-store.c:679
+#: camel/providers/imap/camel-imap-store.c:710
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Could not close temporary folder: %s"
@@ -10090,7 +9843,7 @@ msgstr "Could not close temporary folder: %s"
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1109
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
 msgid "Unknown error"
 msgstr ""
 
@@ -10116,8 +9869,8 @@ msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr "Can not get folder: %s: %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1857
-#: camel/providers/imap/camel-imap-store.c:2235
+#: camel/providers/imap/camel-imap-store.c:1885
+#: camel/providers/imap/camel-imap-store.c:2263
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -10195,12 +9948,12 @@ msgstr ""
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3168
+#: camel/providers/imap/camel-imap-store.c:3194
 msgid "Operation cancelled"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3171
+#: camel/providers/imap/camel-imap-store.c:3197
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
@@ -10264,13 +10017,6 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:219
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -10280,15 +10026,15 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-mbox-folder.c:418
+#: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:2019
-#: camel/providers/imap/camel-imap-folder.c:2621
-#: camel/providers/nntp/camel-nntp-folder.c:238
+#: camel/providers/imap/camel-imap-folder.c:2622
+#: camel/providers/nntp/camel-nntp-folder.c:220
 msgid "This message is not currently available"
 msgstr ""
 
@@ -10297,7 +10043,23 @@ msgstr ""
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2659
+#: camel/providers/imap/camel-imap-folder.c:2463
+#, c-format
+msgid "Incomplete server response: no information provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2471
+#, c-format
+msgid "Incomplete server response: no UID provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2484
+#, c-format
+msgid ""
+"Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2660
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -10356,43 +10118,43 @@ msgstr ""
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/imap/camel-imap-store.c:680
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:711
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:818
+#: camel/providers/imap/camel-imap-store.c:848
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1242
+#: camel/providers/imap/camel-imap-store.c:1272
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1252
+#: camel/providers/imap/camel-imap-store.c:1282
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1305
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1289
+#: camel/providers/imap/camel-imap-store.c:1319
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1318
+#: camel/providers/imap/camel-imap-store.c:1348
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10400,18 +10162,18 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1839
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:1867
+#: camel/providers/imap/camel-imap-store.c:2057
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1915
-#: camel/providers/imap/camel-imap-store.c:2296
+#: camel/providers/imap/camel-imap-store.c:1943
+#: camel/providers/imap/camel-imap-store.c:2324
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1970
+#: camel/providers/imap/camel-imap-store.c:1998
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10419,7 +10181,7 @@ msgstr ""
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Can not get folder: %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:2274
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Can not get folder: %s: %s"
@@ -10451,20 +10213,20 @@ msgid "Index message body data"
 msgstr ""
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:388
 #, c-format
 msgid "~%s (%s)"
 msgstr ""
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:393
-#: camel/providers/local/camel-local-folder.c:396
+#: camel/providers/local/camel-local-folder.c:392
+#: camel/providers/local/camel-local-folder.c:395
 #, fuzzy, c-format
 msgid "mailbox:%s (%s)"
 msgstr "Can not open mailbox: %s: %s\n"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:400
+#: camel/providers/local/camel-local-folder.c:399
 #, c-format
 msgid "%s (%s)"
 msgstr ""
@@ -10520,7 +10282,7 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:142
 #: camel/providers/local/camel-local-store.c:253
-#: camel/providers/local/camel-mbox-store.c:356
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10593,8 +10355,25 @@ msgstr ""
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Can not append message to maildir folder: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:226
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mbox-folder.c:417
+#: camel/providers/local/camel-mbox-folder.c:436
+#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:475
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-mh-folder.c:221
+#, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+"Can not get message: %s from folder %s\n"
+"  %s"
+
+#: camel/providers/local/camel-maildir-folder.c:236
 msgid "Invalid message contents"
 msgstr ""
 
@@ -10635,9 +10414,9 @@ msgstr ""
 msgid "not a maildir directory"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:341
-#: camel/providers/local/camel-spool-store.c:286
-#: camel/providers/local/camel-spool-store.c:316
+#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-spool-store.c:284
+#: camel/providers/local/camel-spool-store.c:314
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr ""
@@ -10684,27 +10463,17 @@ msgstr ""
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Can not append message to mbox file: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:435
-#: camel/providers/local/camel-mbox-folder.c:466
-#: camel/providers/local/camel-mbox-folder.c:474
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"Can not get message: %s from folder %s\n"
-"  %s"
-
-#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:468
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:475
-msgid "Message construction failed: Corrupt mailbox?"
+#: camel/providers/local/camel-mbox-folder.c:476
+#: camel/providers/local/camel-mh-folder.c:222
+msgid "Message construction failed."
 msgstr ""
 
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:362
+#: camel/providers/local/camel-mbox-store.c:361
 #, fuzzy
 msgid "Cannot create a folder by this name."
 msgstr "Can not create folder lock on %s: %s"
@@ -10733,30 +10502,30 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:375
+#: camel/providers/local/camel-mbox-store.c:374
 #, fuzzy, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Can not create folder lock on %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:389
+#: camel/providers/local/camel-mbox-store.c:388
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Can not get folder: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:391
+#: camel/providers/local/camel-mbox-store.c:390
 msgid "Folder already exists"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:473
+#: camel/providers/local/camel-mbox-store.c:472
 msgid "The new folder name is illegal."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:486
+#: camel/providers/local/camel-mbox-store.c:485
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/providers/local/camel-mbox-store.c:561
+#: camel/providers/local/camel-mbox-store.c:560
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Could not close temporary folder: %s"
@@ -10941,7 +10710,7 @@ msgid ""
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:997
+#: camel/providers/nntp/camel-nntp-store.c:1126
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr ""
@@ -10959,18 +10728,10 @@ msgstr "Could not close temporary folder: %s"
 msgid "Server rejected username/password"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:263
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:259
-#: camel/providers/nntp/camel-nntp-folder.c:265
+#: camel/providers/nntp/camel-nntp-folder.c:147
+#: camel/providers/nntp/camel-nntp-folder.c:149
+#: camel/providers/nntp/camel-nntp-folder.c:158
+#: camel/providers/nntp/camel-nntp-folder.c:234
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -10981,62 +10742,51 @@ msgstr ""
 "Can not get message: %s\n"
 "  %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:188
-#: camel/providers/nntp/camel-nntp-folder.c:228
-#, c-format
-msgid "Internal error: uid in invalid format: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:201
-#, fuzzy, c-format
-msgid "Could not get article %s from NNTP server"
-msgstr "Could not close temporary folder: %s"
-
-#: camel/providers/nntp/camel-nntp-folder.c:362
-msgid "Posting not allowed by news server"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:373
-#, c-format
-msgid "Failed to send newsgroups header: %s: message not posted"
+#: camel/providers/nntp/camel-nntp-folder.c:156
+#: camel/providers/nntp/camel-nntp-folder.c:232
+#: camel/providers/nntp/camel-nntp-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+msgid "User cancelled"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:413
-#: camel/providers/nntp/camel-nntp-folder.c:426
+#: camel/providers/nntp/camel-nntp-folder.c:176
+#: camel/providers/nntp/camel-nntp-folder.c:208
 #, c-format
-msgid "Error posting to newsgroup: %s: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:438
-msgid "Error reading response to posted message: message not posted"
+msgid "Internal error: uid in invalid format: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:441
-#, c-format
-msgid "Error posting message: %s: message not posted"
-msgstr ""
+#: camel/providers/nntp/camel-nntp-folder.c:328
+#: camel/providers/nntp/camel-nntp-folder.c:331
+#: camel/providers/nntp/camel-nntp-folder.c:373
+#: camel/providers/nntp/camel-nntp-folder.c:375
+#, fuzzy, c-format
+msgid "Posting failed: %s"
+msgstr "Synchronising \"%s\""
 
-#: camel/providers/nntp/camel-nntp-folder.c:457
+#: camel/providers/nntp/camel-nntp-folder.c:393
 msgid "You cannot post NNTP messages while working offline!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:468
+#: camel/providers/nntp/camel-nntp-folder.c:404
 #, fuzzy
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:44
 #, fuzzy
 msgid "Could not get group list from server."
 msgstr "Could not close temporary folder: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#: camel/providers/nntp/camel-nntp-grouplist.c:97
+#: camel/providers/nntp/camel-nntp-grouplist.c:106
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#: camel/providers/nntp/camel-nntp-grouplist.c:157
 #, fuzzy, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Could not close temporary folder: %s"
@@ -11064,26 +10814,29 @@ msgid ""
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:158
+#: camel/providers/nntp/camel-nntp-store.c:118
+#: camel/providers/nntp/camel-nntp-store.c:1233
+#: camel/providers/nntp/camel-nntp-store.c:1331
+#, c-format
+msgid "NNTP Command failed: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:227
 #, fuzzy, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:170
+#: camel/providers/nntp/camel-nntp-store.c:239
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:326
+#: camel/providers/nntp/camel-nntp-store.c:403
 #, c-format
 msgid "USENET News via %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:640
-msgid "Stream error"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-store.c:643
+#: camel/providers/nntp/camel-nntp-store.c:777
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -11091,76 +10844,73 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:735
+#: camel/providers/nntp/camel-nntp-store.c:872
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
 "No such newsgroup. The selected item is a probably a parent folder."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:767
+#: camel/providers/nntp/camel-nntp-store.c:904
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
 "newsgroup does not exist!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:792
+#: camel/providers/nntp/camel-nntp-store.c:929
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:800
+#: camel/providers/nntp/camel-nntp-store.c:937
 #, fuzzy
 msgid "You cannot rename a folder in a News store."
 msgstr "Can not create folder lock on %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:808
+#: camel/providers/nntp/camel-nntp-store.c:945
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:253
-#, c-format
-msgid "Connection error: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1118
+msgid "Authentication requested but not username provided"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:262
-#, fuzzy, c-format
-msgid "No such folder: %s"
-msgstr "Synchronising folder failed: %s: %s"
-
-#: camel/providers/nntp/camel-nntp-summary.c:268
+#: camel/providers/nntp/camel-nntp-store.c:1146
 #, fuzzy, c-format
-msgid "Could not get group: %s"
+msgid "Cannot authenticate to server: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:333
+#: camel/providers/nntp/camel-nntp-store.c:1262
 #, fuzzy
-msgid "Could not get messages: unspecified error"
-msgstr ""
-"Can not get message: %s\n"
-"  %s"
+msgid "Not connected."
+msgstr "_Other Organiser"
 
-#: camel/providers/nntp/camel-nntp-summary.c:378
+#: camel/providers/nntp/camel-nntp-store.c:1311
+#, fuzzy, c-format
+msgid "No such folder: %s"
+msgstr "Synchronising folder failed: %s: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:218
+#: camel/providers/nntp/camel-nntp-summary.c:314
 #, c-format
-msgid "NNTP Command failed: %s"
+msgid "%s: Scanning new messages"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:438
-#: camel/providers/nntp/camel-nntp-summary.c:543
+#: camel/providers/nntp/camel-nntp-summary.c:225
 #, c-format
-msgid "%s: Scanning new messages"
+msgid "Unexpected server response from xover: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:558
+#: camel/providers/nntp/camel-nntp-summary.c:328
 #, c-format
-msgid "Unknown server response: %s"
+msgid "Unexpected server response from head: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:605
+#: camel/providers/nntp/camel-nntp-summary.c:368
 msgid "Use cancel"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:607
+#: camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
 msgid "Operation failed: %s"
 msgstr ""
@@ -11208,7 +10958,7 @@ msgstr ""
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107
 msgid "POP"
 msgstr ""
 
@@ -11288,7 +11038,7 @@ msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:132
 msgid "Sendmail"
 msgstr ""
 
@@ -11340,7 +11090,7 @@ msgstr ""
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:119
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122
 msgid "SMTP"
 msgstr ""
 
@@ -11623,19 +11373,19 @@ msgstr ""
 msgid "%.0fG"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
+#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:408
 msgid "attachment"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:454
 msgid "Remove selected items from the attachment list"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:491
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Add attachment..."
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:495
 msgid "Attach a file to the message"
 msgstr ""
 
@@ -11698,7 +11448,7 @@ msgstr "Can not open message"
 msgid "Open file"
 msgstr ""
 
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
 msgid "Autogenerated"
 msgstr ""
 
@@ -11832,17 +11582,17 @@ msgstr ""
 
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
-msgid "You cannot attach the file `${0}' to this message."
+msgid "You cannot attach the file `{0}' to this message."
 msgstr ""
 
 #. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4
-msgid "${1}"
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
 msgstr ""
 
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
 
 #. mail-composer:attach-directory primary
@@ -11932,7 +11682,7 @@ msgstr "Could not close temporary folder: %s"
 
 #. mail-composer:no-build-message secondary
 #: composer/mail-composer-errors.xml.h:34
-msgid "Because \"${0}\", you may need to select different mail options."
+msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
@@ -11942,8 +11692,10 @@ msgid "Could not read signature file \"{0}\"."
 msgstr "Could not close temporary folder: %s"
 
 #. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38
-msgid "Because \"${1}\"."
+#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted primary
@@ -12346,11 +12098,11 @@ msgid "<b>Then</b>"
 msgstr "Organisation"
 
 #: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1335
+#: mail/mail-account-gui.c:1347
 msgid "Select Folder"
 msgstr ""
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
 msgid "    "
 msgstr ""
 
@@ -12400,7 +12152,7 @@ msgstr ""
 msgid "months"
 msgstr ""
 
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
 msgid "seconds"
 msgstr ""
 
@@ -12432,20 +12184,20 @@ msgstr ""
 msgid "years"
 msgstr ""
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:916
-#: mail/mail-config.c:76 mail/mail-config.glade.h:90
+#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
+#: mail/mail-config.glade.h:93
 msgid "Important"
 msgstr ""
 
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:919 mail/mail-config.c:79
-#: mail/mail-config.glade.h:145
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: mail/mail-config.glade.h:148
 msgid "To Do"
 msgstr ""
 
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:920 mail/mail-config.c:80
-#: mail/mail-config.glade.h:94
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: mail/mail-config.glade.h:97
 msgid "Later"
 msgstr ""
 
@@ -12498,253 +12250,6 @@ msgstr ""
 msgid "outgoing"
 msgstr ""
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Adjust Score"
-msgstr ""
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Color"
-msgstr ""
-
-#: filter/libfilter-i18n.h:4
-msgid "Assign Score"
-msgstr ""
-
-#: filter/libfilter-i18n.h:5
-msgid "Attachments"
-msgstr ""
-
-#: filter/libfilter-i18n.h:6
-msgid "Beep"
-msgstr ""
-
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr ""
-
-#: filter/libfilter-i18n.h:8
-msgid "Copy to Folder"
-msgstr ""
-
-#: filter/libfilter-i18n.h:9
-msgid "Date received"
-msgstr ""
-
-#: filter/libfilter-i18n.h:10
-msgid "Date sent"
-msgstr ""
-
-#: filter/libfilter-i18n.h:12
-msgid "Deleted"
-msgstr ""
-
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr ""
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr ""
-
-#: filter/libfilter-i18n.h:16
-msgid "does not return"
-msgstr ""
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr ""
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
-msgstr ""
-
-#: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr ""
-
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr ""
-
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr ""
-
-#: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr ""
-
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr ""
-
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr ""
-
-#: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr ""
-
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr ""
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr ""
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr ""
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr ""
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr ""
-
-#: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr ""
-
-#: filter/libfilter-i18n.h:36
-#, fuzzy
-msgid "Junk Test"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
-#: widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr ""
-
-#: filter/libfilter-i18n.h:38
-msgid "Mailing list"
-msgstr ""
-
-#: filter/libfilter-i18n.h:39
-msgid "Message Body"
-msgstr ""
-
-#: filter/libfilter-i18n.h:40
-msgid "Message Header"
-msgstr ""
-
-#: filter/libfilter-i18n.h:41
-msgid "Message is Junk"
-msgstr ""
-
-#: filter/libfilter-i18n.h:42
-msgid "Message is not Junk"
-msgstr ""
-
-#: filter/libfilter-i18n.h:43
-msgid "Move to Folder"
-msgstr ""
-
-#: filter/libfilter-i18n.h:44
-msgid "Pipe to Program"
-msgstr ""
-
-#: filter/libfilter-i18n.h:45
-msgid "Play Sound"
-msgstr ""
-
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
-msgid "Read"
-msgstr ""
-
-#: filter/libfilter-i18n.h:47
-msgid "Recipients"
-msgstr ""
-
-#: filter/libfilter-i18n.h:48
-msgid "Regex Match"
-msgstr ""
-
-#: filter/libfilter-i18n.h:49
-msgid "Replied to"
-msgstr ""
-
-#: filter/libfilter-i18n.h:50
-msgid "returns"
-msgstr ""
-
-#: filter/libfilter-i18n.h:51
-msgid "returns greater than"
-msgstr ""
-
-#: filter/libfilter-i18n.h:52
-msgid "returns less than"
-msgstr ""
-
-#: filter/libfilter-i18n.h:53
-msgid "Run Program"
-msgstr ""
-
-#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr ""
-
-#: filter/libfilter-i18n.h:55
-msgid "Sender"
-msgstr ""
-
-#: filter/libfilter-i18n.h:56
-msgid "Set Status"
-msgstr ""
-
-#: filter/libfilter-i18n.h:57
-msgid "Size (kB)"
-msgstr ""
-
-#: filter/libfilter-i18n.h:58
-msgid "sounds like"
-msgstr ""
-
-#: filter/libfilter-i18n.h:59
-msgid "Source Account"
-msgstr ""
-
-#: filter/libfilter-i18n.h:60
-msgid "Specific header"
-msgstr ""
-
-#: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:63
-msgid "Stop Processing"
-msgstr ""
-
-#: filter/libfilter-i18n.h:64 mail/em-format.c:755 mail/em-format-html.c:1519
-#: mail/em-format-quote.c:302 mail/em-mailer-prefs.c:87
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
-#: smime/lib/e-cert.c:1079
-msgid "Subject"
-msgstr ""
-
-#: filter/libfilter-i18n.h:65
-msgid "Unset Status"
-msgstr ""
-
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr ""
@@ -12761,6 +12266,11 @@ msgstr ""
 msgid "_Score Rules"
 msgstr ""
 
+#: filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr ""
+
 #: filter/searchtypes.xml.h:1
 msgid "Body contains"
 msgstr ""
@@ -12840,13 +12350,13 @@ msgstr ""
 msgid "-------- Forwarded Message --------"
 msgstr ""
 
-#: mail/em-composer-utils.c:1499
+#: mail/em-composer-utils.c:1495
 msgid "an unknown sender"
 msgstr ""
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1509
+#: mail/em-composer-utils.c:1505
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr ""
 
@@ -12886,8 +12396,8 @@ msgstr ""
 msgid "Create New Folder"
 msgstr ""
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
-#: mail/mail-component.c:701
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
+#: mail/mail-component.c:704
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr ""
@@ -12902,105 +12412,106 @@ msgstr "Synchronising folder"
 msgid "Folder _name:"
 msgstr ""
 
-#: mail/em-folder-tree.c:839
+#: mail/em-folder-tree.c:833
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Synchronising \"%s\""
 
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree.c:835
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Synchronising \"%s\""
 
-#: mail/em-folder-tree.c:848 mail/message-list.c:1555
+#: mail/em-folder-tree.c:842 mail/message-list.c:1561
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Can not append message to mh folder: %s: %s"
 
-#: mail/em-folder-tree.c:850 mail/message-list.c:1557
+#: mail/em-folder-tree.c:844 mail/message-list.c:1563
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Can not append message to mh folder: %s: %s"
 
-#: mail/em-folder-tree.c:866
+#: mail/em-folder-tree.c:860
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "You can not copy messages from this rubbish bin."
 
-#: mail/em-folder-tree.c:956 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:957 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2069
-#: mail/em-folder-tree.c:2551 mail/em-folder-view.c:798
-#: mail/message-list.c:1645
+#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
+#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
+#: mail/message-list.c:1651
 msgid "_Move"
 msgstr ""
 
-#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#: mail/em-folder-tree.c:955 mail/message-list.c:1653
 msgid "Cancel _Drag"
 msgstr ""
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
 #: mail/em-folder-view.c:798 mail/em-folder-view.c:812
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
 msgid "C_opy"
 msgstr ""
 
-#: mail/em-folder-tree.c:2096
+#: mail/em-folder-tree.c:2088
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Synchronising \"%s\""
 
-#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
+#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
 #, fuzzy
 msgid "Create folder"
 msgstr "Synchronising folder"
 
-#: mail/em-folder-tree.c:2474
+#: mail/em-folder-tree.c:2463
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr ""
 
-#: mail/em-folder-tree.c:2476
+#: mail/em-folder-tree.c:2465
 #, fuzzy
 msgid "Rename Folder"
 msgstr "Synchronising folder"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr ""
 
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2537
 msgid "Open in _New Window"
 msgstr ""
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2555
+#: mail/em-folder-tree.c:2546
 #, fuzzy
 msgid "_New Folder..."
 msgstr "Synchronising folders"
 
-#: mail/em-folder-tree.c:2558
+#: mail/em-folder-tree.c:2549
 msgid "_Rename"
 msgstr ""
 
-#: mail/em-folder-tree.c:2561 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr ""
 
 #: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:889
+#: mail/mail-vfolder.c:888
 msgid "VFolders"
 msgstr ""
 
@@ -13014,19 +12525,19 @@ msgstr ""
 msgid "Inbox"
 msgstr ""
 
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
 msgid "Loading..."
 msgstr ""
 
 #: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
 #: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
 #: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:551
+#: mail/mail-component.c:554
 msgid "Mail"
 msgstr ""
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr ""
@@ -13039,17 +12550,17 @@ msgstr ""
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:810
+#: mail/em-folder-view.c:901 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr ""
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:811
+#: mail/em-folder-view.c:902 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr ""
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: mail/em-folder-view.c:903 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr ""
@@ -13102,6 +12613,10 @@ msgstr ""
 msgid "_Copy to Folder..."
 msgstr ""
 
+#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr ""
+
 #: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr ""
@@ -13151,12 +12666,12 @@ msgid "Filter on _Mailing List"
 msgstr ""
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
-#: mail/mail-config.glade.h:66
+#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr ""
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1796
 msgid "Print Message"
 msgstr ""
 
@@ -13196,12 +12711,18 @@ msgstr ""
 msgid "Bcc"
 msgstr ""
 
+#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
+#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr ""
+
 #: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
 #: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr ""
 
-#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
+#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
 msgid "Newsgroups"
 msgstr ""
 
@@ -13381,7 +12902,7 @@ msgid ""
 "practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:757
+#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
 #, fuzzy
 msgid "_View Certificate"
 msgstr "Could not close temporary folder: %s"
@@ -13438,7 +12959,7 @@ msgstr ""
 msgid "Once per month"
 msgstr ""
 
-#: mail/em-migrate.c:1072
+#: mail/em-migrate.c:1168
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13446,83 +12967,83 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1506
+#: mail/em-migrate.c:1602
 #, fuzzy, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Can not get folder: %s: %s"
 
-#: mail/em-migrate.c:1532
+#: mail/em-migrate.c:1628
 #, fuzzy, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Could not close temporary folder: %s"
 
-#: mail/em-migrate.c:1715
+#: mail/em-migrate.c:1811
 #, fuzzy, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Could not close temporary folder: %s"
 
-#: mail/em-migrate.c:1919
+#: mail/em-migrate.c:2015
 #, fuzzy, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Could not close temporary folder: %s"
 
-#: mail/em-migrate.c:1933
+#: mail/em-migrate.c:2029
 #, fuzzy, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Could not close temporary folder: %s"
 
-#: mail/em-migrate.c:1962
+#: mail/em-migrate.c:2058
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#: mail/em-migrate.c:2413 mail/em-migrate.c:2425
 #, fuzzy, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Could not close temporary folder: %s"
 
-#: mail/em-migrate.c:2480
+#: mail/em-migrate.c:2576
 #, fuzzy, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Could not close temporary folder: %s"
 
-#: mail/em-migrate.c:2498
+#: mail/em-migrate.c:2594
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 msgstr ""
 
-#: mail/em-popup.c:699
+#: mail/em-popup.c:700
 msgid "Save As..."
 msgstr ""
 
-#: mail/em-popup.c:717
+#: mail/em-popup.c:718
 #, c-format
 msgid "untitled_image.%s"
 msgstr ""
 
-#: mail/em-popup.c:807
+#: mail/em-popup.c:808
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:809
+#: mail/em-popup.c:810
 msgid "_Reply to sender"
 msgstr ""
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:859
 msgid "_Open Link in Browser"
 msgstr ""
 
-#: mail/em-popup.c:859
+#: mail/em-popup.c:860
 msgid "Se_nd message to..."
 msgstr ""
 
-#: mail/em-popup.c:860
+#: mail/em-popup.c:861
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/em-popup.c:966
+#: mail/em-popup.c:967
 #, c-format
 msgid "Open in %s..."
 msgstr ""
@@ -14081,7 +13602,7 @@ msgstr ""
 msgid "Mail Accounts"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
 msgid "Mail Preferences"
 msgstr ""
 
@@ -14095,15 +13616,15 @@ msgid "Evolution is importing your old Elm mail"
 msgstr ""
 
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:226
+#: mail/importers/evolution-mbox-importer.c:221
+#: mail/importers/evolution-outlook-importer.c:255
 #: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr ""
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:222
-#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/evolution-mbox-importer.c:223
+#: mail/importers/evolution-outlook-importer.c:257
 #: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr ""
@@ -14123,22 +13644,24 @@ msgid "Elm"
 msgstr ""
 
 #: mail/importers/evolution-mbox-importer.c:116
+#: mail/importers/evolution-outlook-importer.c:130
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Synchronising folder"
 
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder to import into"
 msgstr ""
 
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:254
 #: mail/importers/mail-importer.c:226
 #, c-format
 msgid "Importing `%s'"
 msgstr ""
 
-#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/evolution-outlook-importer.c:301
 #: mail/importers/mail-importer.c:140
 #, fuzzy
 msgid "Importing mailbox"
@@ -14279,15 +13802,15 @@ msgstr ""
 msgid "%s License Agreement"
 msgstr ""
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
 msgid "_Host:"
 msgstr ""
 
-#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
 msgid "User_name:"
 msgstr ""
 
-#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
 msgid "_Path:"
 msgstr ""
 
@@ -14350,37 +13873,37 @@ msgstr "_Other Organiser"
 msgid ", %d unread"
 msgstr ""
 
-#: mail/mail-component.c:653
+#: mail/mail-component.c:656
 #, fuzzy
 msgid "New Mail Message"
 msgstr "Can not open message"
 
-#: mail/mail-component.c:654
+#: mail/mail-component.c:657
 #, fuzzy
 msgid "_Mail Message"
 msgstr "Can not open message"
 
-#: mail/mail-component.c:655
+#: mail/mail-component.c:658
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Can not open message"
 
-#: mail/mail-component.c:661
+#: mail/mail-component.c:664
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Synchronising folders"
 
-#: mail/mail-component.c:662
+#: mail/mail-component.c:665
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Synchronising folder"
 
-#: mail/mail-component.c:663
+#: mail/mail-component.c:666
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Synchronising folder"
 
-#: mail/mail-component.c:795
+#: mail/mail-component.c:798
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
@@ -14392,7 +13915,7 @@ msgstr ""
 msgid "Connecting to server..."
 msgstr ""
 
-#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr ""
 
@@ -14404,7 +13927,7 @@ msgid ""
 msgstr ""
 
 #: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid "Receiving Mail"
 msgstr ""
 
@@ -14418,7 +13941,7 @@ msgstr ""
 msgid "Please select among the following options"
 msgstr ""
 
-#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr ""
 
@@ -14428,7 +13951,7 @@ msgid ""
 "sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37
 msgid "Account Management"
 msgstr ""
 
@@ -14441,231 +13964,235 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:2
 msgid " Ch_eck for Supported Types "
 msgstr ""
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
 msgid "<b>Preview</b>"
 msgstr ""
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr ""
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "<b>S_ignatures</b>"
 msgstr "Organisation"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "<b>_Languages</b>"
 msgstr "Organisation"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
+msgid "<small>This will make the the filter more reliable, but slower</small>"
+msgstr ""
+
+#: mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Checking for New Mail</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">General</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Security</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:34
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:35
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:36
 msgid "Account Editor"
 msgstr ""
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:38
 msgid "Add Ne_w Signature..."
 msgstr ""
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "Add _Script"
 msgstr ""
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:40
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:44
 msgid "Always _sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Attach original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr ""
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:48
 msgid "Automatically _insert smiley images"
 msgstr ""
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Automatically check for _new mail every"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Beep w_hen new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "C_haracter set:"
 msgstr ""
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 msgid "Ch_eck for Supported Types "
 msgstr ""
 
-#: mail/mail-config.glade.h:53
-msgid "Check _Incoming Mail"
+#: mail/mail-config.glade.h:55
+msgid "Check _incoming mail for junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Colours for display"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Colors"
 msgstr "C_lose"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 msgid "Confirm _when expunging a folder"
 msgstr ""
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14675,360 +14202,356 @@ msgid ""
 "Click \"Apply\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
 msgid "De_fault"
 msgstr ""
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 msgid "Default character e_ncoding:"
 msgstr ""
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 msgid "Defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Can not open message"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr ""
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Drafts _Folder:"
 msgstr "Synchronising folder"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:77
 msgid "Email Accounts"
 msgstr ""
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Email _Address:"
 msgstr "Chile"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:79
 msgid "Empty trash folders on e_xit"
 msgstr ""
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
 msgid "Encry_ption certificate:"
 msgstr ""
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:81
 msgid "Evolution Account Assistant"
 msgstr ""
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:82
 msgid "Execute Command..."
 msgstr ""
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:83
 msgid "Fi_xed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 msgid "Font Properties"
 msgstr ""
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 msgid "Format messages in _HTML"
 msgstr ""
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:87
 msgid "HTML Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:88
 msgid "Headers"
 msgstr ""
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr ""
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 msgid "IMAPv4 "
 msgstr ""
 
 #: mail/mail-config.glade.h:91
+msgid "I_nclude remote tests"
+msgstr ""
+
+#: mail/mail-config.glade.h:94
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Kerberos "
 msgstr ""
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Mail Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr ""
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr ""
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organi_sation:"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "PGP/GPG _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Play sound file when new mail arri_ves"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "Quote original message"
 msgstr "Can not open message"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr ""
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 msgid "Re_member password"
 msgstr ""
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr ""
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:120
 msgid "Receiving Options"
 msgstr ""
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
 msgid "Remember _password"
 msgstr ""
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
 msgid "S_tandard Font:"
 msgstr ""
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 msgid "Security"
 msgstr ""
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:126
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:127
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:128
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:129
 #, fuzzy
 msgid "Select..."
 msgstr "Organisation"
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Sent _Messages Folder:"
 msgstr "Synchronising folder"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:134
 msgid "Ser_ver requires authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:135
 msgid "Server _Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:136
 msgid "Si_gning certificate:"
 msgstr ""
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:137
 msgid "Signat_ure:"
 msgstr ""
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:138
 msgid "Signatures"
 msgstr ""
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr ""
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:140
 msgid "Spell Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:141
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:142
 msgid "T_erminal Font:"
 msgstr ""
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:143
 msgid "T_ype: "
 msgstr ""
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:149
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:148
-msgid "Use _Daemon"
-msgstr ""
-
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:152
 msgid "V_ariable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:153
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Forward\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:158
 msgid "_Add Signature"
 msgstr ""
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:159
 msgid "_Always load images from the Internet"
 msgstr ""
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:160
 msgid "_Digitally sign outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:161
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:163
 msgid "_Enable"
 msgstr ""
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:165
 msgid "_Forward style:"
 msgstr ""
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:168
 msgid "_Load images if sender is in address book"
 msgstr ""
 
-#: mail/mail-config.glade.h:167
-msgid "_Local Tests Only"
-msgstr ""
-
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_Mark messages as read after"
 msgstr ""
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 msgid "_Never load images from the Internet"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:175
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:176
 msgid "_Reply style:"
 msgstr ""
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:177
 msgid "_Script:"
 msgstr ""
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:178
 msgid "_Show animated images"
 msgstr ""
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 msgid "_Use Secure Connection (SSL):"
 msgstr ""
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:181
 #, fuzzy
 msgid "color"
 msgstr "Colours"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr ""
 
@@ -15184,7 +14707,7 @@ msgstr ""
 
 #. mail:camel-exception primary
 #: mail/mail-errors.xml.h:57
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgid "Your message with the subject \"{0}\" was not delivered."
 msgstr ""
 
 #. mail:camel-exception secondary
@@ -15240,11 +14763,6 @@ msgstr ""
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Can not create folder lock on %s: %s"
 
-#. mail:no-save-path secondary
-#: mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail:no-create-path primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
@@ -15266,12 +14784,6 @@ msgstr "Can not create folder lock on %s: %s"
 msgid "Cannot create temporary save directory."
 msgstr "Can not create folder lock on %s: %s"
 
-#. mail:no-create-tmp-path secondary
-#: mail/mail-errors.xml.h:100 mail/mail-errors.xml.h:112
-#: widgets/misc/e-system-errors.xml.h:11 widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail:no-write-path-exists secondary
 #: mail/mail-errors.xml.h:104
 msgid "File exists but cannot overwrite it."
@@ -15525,179 +15037,175 @@ msgstr ""
 msgid "_Append"
 msgstr ""
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:785
 #, c-format
 msgid "Pinging %s"
 msgstr ""
 
-#: mail/mail-mt.c:897
-msgid "Working"
-msgstr ""
-
-#: mail/mail-ops.c:99
+#: mail/mail-ops.c:98
 msgid "Filtering Folder"
 msgstr ""
 
-#: mail/mail-ops.c:260
+#: mail/mail-ops.c:259
 msgid "Fetching Mail"
 msgstr ""
 
-#: mail/mail-ops.c:543
+#: mail/mail-ops.c:542
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: mail/mail-ops.c:568
+#: mail/mail-ops.c:567
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:577
+#: mail/mail-ops.c:576
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: mail/mail-ops.c:673
+#: mail/mail-ops.c:672
 #, c-format
 msgid "Sending message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:703
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Could not close temporary folder: %s"
 
-#: mail/mail-ops.c:708
+#: mail/mail-ops.c:707
 msgid "Complete."
 msgstr ""
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:804
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:1002
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1116
+#: mail/mail-ops.c:1115
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1159
+#: mail/mail-ops.c:1158
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1230
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1308
 #, c-format
 msgid "Removing folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1403
+#: mail/mail-ops.c:1402
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-ops.c:1468
+#: mail/mail-ops.c:1467
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1469
+#: mail/mail-ops.c:1468
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-ops.c:1524
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr ""
 
-#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
+#: mail/mail-ops.c:1559 mail/mail-ops.c:1610
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1607
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1609
+#: mail/mail-ops.c:1608
 msgid "Local Folders"
 msgstr ""
 
-#: mail/mail-ops.c:1692
+#: mail/mail-ops.c:1691
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1764
+#: mail/mail-ops.c:1763
 #, fuzzy, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Can not open message"
 msgstr[1] "Can not open message"
 
-#: mail/mail-ops.c:1850
+#: mail/mail-ops.c:1849
 #, fuzzy, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Can not open message"
 msgstr[1] "Can not open message"
 
-#: mail/mail-ops.c:1900
+#: mail/mail-ops.c:1899
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1928
+#: mail/mail-ops.c:1927
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1999
+#: mail/mail-ops.c:1998
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:2016
+#: mail/mail-ops.c:2015
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2046
+#: mail/mail-ops.c:2045
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Reconnecting to %s"
 msgstr ""
@@ -15761,24 +15269,24 @@ msgstr ""
 msgid "Waiting..."
 msgstr ""
 
-#: mail/mail-session.c:238
+#: mail/mail-session.c:239
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-session.c:271
+#: mail/mail-session.c:272
 #, c-format
 msgid "Enter Password for %s"
 msgstr ""
 
-#: mail/mail-session.c:273
+#: mail/mail-session.c:274
 msgid "Enter Password"
 msgstr ""
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password"
 msgstr ""
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:298
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
@@ -15833,79 +15341,79 @@ msgstr "Synchronising \"%s\""
 msgid "Updating vFolders for '%s'"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-vfolder.c:959
+#: mail/mail-vfolder.c:958
 msgid "vFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:998
+#: mail/mail-vfolder.c:997
 msgid "Edit VFolder"
 msgstr ""
 
-#: mail/mail-vfolder.c:1082
+#: mail/mail-vfolder.c:1081
 msgid "New VFolder"
 msgstr ""
 
-#: mail/message-list.c:946
+#: mail/message-list.c:948
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:947
+#: mail/message-list.c:949
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:948
+#: mail/message-list.c:950
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:949
+#: mail/message-list.c:951
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:950
+#: mail/message-list.c:952
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:954
+#: mail/message-list.c:956
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:955
+#: mail/message-list.c:957
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:959
+#: mail/message-list.c:961
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:960
+#: mail/message-list.c:962
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:1279
+#: mail/message-list.c:1285
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:1286
+#: mail/message-list.c:1292
 msgid "Today %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1295
+#: mail/message-list.c:1301
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1307
+#: mail/message-list.c:1313
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1315
+#: mail/message-list.c:1321
 msgid "%b %d %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1317
+#: mail/message-list.c:1323
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:3300
+#: mail/message-list.c:3321
 msgid "Generating message list"
 msgstr ""
 
@@ -15962,6 +15470,10 @@ msgstr ""
 msgid "No Response Necessary"
 msgstr ""
 
+#: mail/message-tag-followup.c:79
+msgid "Read"
+msgstr ""
+
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr ""
@@ -16059,44 +15571,48 @@ msgid ""
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:10
-msgid "Whether Evolution should start up in offline mode"
+msgid "Toolbar is visible"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:11
-msgid "Whether to skip the development warning dialog"
+msgid "Whether Evolution should start up in offline mode"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Whether the toolbar should be visible."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:14
 #, fuzzy
 msgid "mail"
 msgstr "Chile"
 
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
-msgstr ""
-
-#: shell/e-shell.c:545 shell/e-shell.c:546
+#: shell/e-shell.c:588 shell/e-shell.c:589
 #, c-format
 msgid "%ld KB"
 msgstr ""
 
-#: shell/e-shell.c:744
+#: shell/e-shell.c:786
 msgid "Uknown system error."
 msgstr ""
 
-#: shell/e-shell.c:1101
+#: shell/e-shell.c:1143
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:1103
+#: shell/e-shell.c:1145
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:1105
+#: shell/e-shell.c:1147
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:1107
+#: shell/e-shell.c:1149
 msgid "Generic error"
 msgstr ""
 
@@ -16144,7 +15660,7 @@ msgstr ""
 msgid "Select importer"
 msgstr ""
 
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1026
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
 #, c-format
 msgid "File %s does not exist"
 msgstr ""
@@ -16170,56 +15686,57 @@ msgid ""
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:549
+#: shell/e-shell-importer.c:570
 msgid "Automatic"
 msgstr ""
 
-#: shell/e-shell-importer.c:598
-msgid "_Filename:"
-msgstr ""
+#: shell/e-shell-importer.c:626
+#, fuzzy
+msgid "F_ilename:"
+msgstr "_Other Organiser"
 
-#: shell/e-shell-importer.c:603
+#: shell/e-shell-importer.c:631
 msgid "Select a file"
 msgstr ""
 
-#: shell/e-shell-importer.c:613
+#: shell/e-shell-importer.c:642
 msgid "File _type:"
 msgstr ""
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:681
 msgid "Import data and settings from _older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:684
 msgid "Import a _single file"
 msgstr ""
 
-#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:727
+#: shell/e-shell-importer.c:756
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:853 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
 #, c-format
 msgid "From %s:"
 msgstr ""
 
-#: shell/e-shell-importer.c:1044
+#: shell/e-shell-importer.c:1073
 #, c-format
 msgid "No importer available for file %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:1056
+#: shell/e-shell-importer.c:1085
 #, fuzzy
 msgid "Unable to execute importer"
 msgstr "Could not close temporary folder: %s"
 
-#: shell/e-shell-importer.c:1169
+#: shell/e-shell-importer.c:1199
 msgid "_Import"
 msgstr ""
 
@@ -16264,54 +15781,53 @@ msgstr ""
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: shell/e-shell-window.c:336
+#: shell/e-shell-window.c:337
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-window.c:343
+#: shell/e-shell-window.c:344
 msgid "Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-window.c:349
+#: shell/e-shell-window.c:350
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell-window.c:621
+#: shell/e-shell-window.c:637
 #, c-format
 msgid "Switch to %s"
 msgstr ""
 
-#: shell/e-shell-window-commands.c:64
+#: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: shell/e-shell-window-commands.c:72
+#: shell/e-shell-window-commands.c:74
 #, c-format
 msgid "Error executing %s."
 msgstr ""
 
-#: shell/e-shell-window-commands.c:121
+#: shell/e-shell-window-commands.c:123
 msgid "Bug buddy is not installed."
 msgstr ""
 
-#: shell/e-shell-window-commands.c:129
+#: shell/e-shell-window-commands.c:131
 msgid "Bug buddy could not be run."
 msgstr ""
 
-#: shell/e-shell-window-commands.c:171
-#, fuzzy
-msgid "About Evolution"
-msgstr "Can not initialise the Ximian Evolution shell."
+#: shell/e-shell-window-commands.c:323
+msgid "Groupware Suite"
+msgstr ""
 
-#: shell/e-shell-window-commands.c:382
+#: shell/e-shell-window-commands.c:563
 msgid "_Work Online"
 msgstr ""
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr ""
 
-#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr ""
 
@@ -16324,32 +15840,6 @@ msgstr "Chile"
 msgid "New"
 msgstr ""
 
-#: shell/evolution-shell-component-utils.c:115
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-
-#: shell/evolution-shell-component-utils.c:118
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-
-#: shell/evolution-shell-component-utils.c:125
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-
 #: shell/evolution-test-component.c:140
 #, fuzzy
 msgid "New Test"
@@ -16656,32 +16146,32 @@ msgid ""
 "Click help for details."
 msgstr ""
 
-#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:522
+#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
+#: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
 msgstr ""
 
-#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:604
+#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
+#: smime/gui/certificate-manager.c:638
 #, fuzzy
 msgid "Certificate Name"
 msgstr "Could not close temporary folder: %s"
 
-#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
+#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
 #, fuzzy
 msgid "Purposes"
 msgstr "C_lose"
 
-#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:517
+#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:267
+#: smime/gui/certificate-manager.c:271
 msgid "Expires"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:417
+#: smime/gui/certificate-manager.c:446
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "Chile"
@@ -16720,6 +16210,11 @@ msgid ""
 "  Subject: %s\n"
 msgstr ""
 
+#: smime/gui/e-cert-selector.c:169
+#, fuzzy
+msgid "Select certificate"
+msgstr "Could not close temporary folder: %s"
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -16774,7 +16269,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
 #, fuzzy
 msgid "Certificate"
 msgstr "Could not close temporary folder: %s"
@@ -16796,19 +16291,23 @@ msgstr ""
 msgid "Contact Certificates"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:21
-#, no-c-format
-msgid "Do you want to trust \"%s\" for the following purposes?"
+#: smime/gui/smime-ui.glade.h:20
+msgid "Do not trust the authenticity of this certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:21
 msgid "Dummy window only"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:22
 msgid "Edit"
 msgstr ""
 
+#: smime/gui/smime-ui.glade.h:23
+#, fuzzy
+msgid "Email Certificate Trust Settings"
+msgstr "Could not close temporary folder: %s"
+
 #: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr ""
@@ -16843,254 +16342,262 @@ msgstr "Organisation"
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:37
-msgid "Trust this CA to identify email users."
+msgid "Trust the authenticity of this certificate"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:38
-msgid "Trust this CA to identify software developers."
+msgid "Trust this CA to identify email users."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:39
-msgid "Trust this CA to identify web sites."
+msgid "Trust this CA to identify software developers."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:40
-msgid "View"
+msgid "Trust this CA to identify web sites."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:41
-#, fuzzy
-msgid "View Certificate"
-msgstr "Could not close temporary folder: %s"
+msgid "View"
+msgstr ""
 
 #: smime/gui/smime-ui.glade.h:42
-msgid "You have been asked to trust a new Certificate Authority (CA)."
+msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:43
-msgid "You have certificates from these organizations that identify you:"
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:44
-msgid ""
-"You have certificates on file that identify these certificate authorities:"
+msgid "You have certificates on file that identify these people:"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:45
-msgid "You have certificates on file that identify these people:"
+msgid "Your Certificates"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:46
-msgid "Your Certificates"
+msgid "_Edit CA Trust"
 msgstr ""
 
-#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
+#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%m/%d/%Y"
 
-#: smime/lib/e-cert.c:478
+#. x509 certificate usage types
+#: smime/lib/e-cert.c:424
+msgid "Sign"
+msgstr ""
+
+#: smime/lib/e-cert.c:425
+msgid "Encrypt"
+msgstr ""
+
+#: smime/lib/e-cert.c:530
 msgid "Version"
 msgstr ""
 
-#: smime/lib/e-cert.c:493
+#: smime/lib/e-cert.c:545
 msgid "Version 1"
 msgstr ""
 
-#: smime/lib/e-cert.c:496
+#: smime/lib/e-cert.c:548
 msgid "Version 2"
 msgstr ""
 
-#: smime/lib/e-cert.c:499
+#: smime/lib/e-cert.c:551
 msgid "Version 3"
 msgstr ""
 
-#: smime/lib/e-cert.c:581
+#: smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:584
+#: smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:587
+#: smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:590
+#: smime/lib/e-cert.c:642
 msgid "C"
 msgstr ""
 
-#: smime/lib/e-cert.c:593
+#: smime/lib/e-cert.c:645
 msgid "CN"
 msgstr ""
 
-#: smime/lib/e-cert.c:596
+#: smime/lib/e-cert.c:648
 msgid "OU"
 msgstr ""
 
-#: smime/lib/e-cert.c:599
+#: smime/lib/e-cert.c:651
 msgid "O"
 msgstr ""
 
-#: smime/lib/e-cert.c:602
+#: smime/lib/e-cert.c:654
 msgid "L"
 msgstr ""
 
-#: smime/lib/e-cert.c:605
+#: smime/lib/e-cert.c:657
 msgid "DN"
 msgstr ""
 
-#: smime/lib/e-cert.c:608
+#: smime/lib/e-cert.c:660
 msgid "DC"
 msgstr ""
 
-#: smime/lib/e-cert.c:611
+#: smime/lib/e-cert.c:663
 msgid "ST"
 msgstr ""
 
-#: smime/lib/e-cert.c:614
+#: smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:617
+#: smime/lib/e-cert.c:669
 #, fuzzy
 msgid "Certificate Key Usage"
 msgstr "Could not close temporary folder: %s"
 
-#: smime/lib/e-cert.c:620
+#: smime/lib/e-cert.c:672
 #, fuzzy
 msgid "Netscape Certificate Type"
 msgstr "Could not close temporary folder: %s"
 
-#: smime/lib/e-cert.c:623
+#: smime/lib/e-cert.c:675
 msgid "Certificate Authority Key Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:626
+#: smime/lib/e-cert.c:678
 msgid "UID"
 msgstr ""
 
-#: smime/lib/e-cert.c:635
+#: smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr ""
 
-#: smime/lib/e-cert.c:686
+#: smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:694
+#: smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
 msgstr ""
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:768
 msgid "Subject Public Key Info"
 msgstr ""
 
-#: smime/lib/e-cert.c:721
+#: smime/lib/e-cert.c:773
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:736
+#: smime/lib/e-cert.c:788
 msgid "Subject's Public Key"
 msgstr ""
 
-#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
+#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
 msgid "Error: Unable to process extension"
 msgstr ""
 
-#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
+#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:782
+#: smime/lib/e-cert.c:834
 msgid "SSL Certificate Authority"
 msgstr ""
 
-#: smime/lib/e-cert.c:786
+#: smime/lib/e-cert.c:838
 msgid "Email Certificate Authority"
 msgstr ""
 
-#: smime/lib/e-cert.c:814
+#: smime/lib/e-cert.c:866
 msgid "Signing"
 msgstr ""
 
-#: smime/lib/e-cert.c:818
+#: smime/lib/e-cert.c:870
 msgid "Non-repudiation"
 msgstr ""
 
-#: smime/lib/e-cert.c:822
+#: smime/lib/e-cert.c:874
 msgid "Key Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:826
+#: smime/lib/e-cert.c:878
 msgid "Data Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:830
+#: smime/lib/e-cert.c:882
 msgid "Key Agreement"
 msgstr ""
 
-#: smime/lib/e-cert.c:834
+#: smime/lib/e-cert.c:886
 #, fuzzy
 msgid "Certificate Signer"
 msgstr "Could not close temporary folder: %s"
 
-#: smime/lib/e-cert.c:838
+#: smime/lib/e-cert.c:890
 msgid "CRL Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:938
 #, fuzzy
 msgid "Critical"
 msgstr "Chile"
 
-#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
+#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
 msgid "Not Critical"
 msgstr ""
 
-#: smime/lib/e-cert.c:912
+#: smime/lib/e-cert.c:964
 msgid "Extensions"
 msgstr ""
 
-#: smime/lib/e-cert.c:983
+#: smime/lib/e-cert.c:1035
 #, c-format
 msgid "%s = %s"
 msgstr ""
 
-#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
 #, fuzzy
 msgid "Certificate Signature Algorithm"
 msgstr "Could not close temporary folder: %s"
 
-#: smime/lib/e-cert.c:1048
+#: smime/lib/e-cert.c:1100
 msgid "Issuer"
 msgstr ""
 
-#: smime/lib/e-cert.c:1102
+#: smime/lib/e-cert.c:1154
 msgid "Issuer Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1121
+#: smime/lib/e-cert.c:1173
 msgid "Subject Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1164
+#: smime/lib/e-cert.c:1216
 #, fuzzy
 msgid "Certificate Signature Value"
 msgstr "Could not close temporary folder: %s"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
+#: smime/lib/e-cert-db.c:608
 #, fuzzy
 msgid "Certificate already exists"
 msgstr "Could not close temporary folder: %s"
@@ -17237,7 +16744,7 @@ msgstr ""
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr ""
 
@@ -17398,7 +16905,7 @@ msgstr "C_lose"
 #: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:3
+#: ui/evolution.xml.h:4
 msgid "Close"
 msgstr ""
 
@@ -17411,7 +16918,7 @@ msgid "Delete this item"
 msgstr ""
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr ""
 
@@ -17454,7 +16961,7 @@ msgstr ""
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:44
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "_File"
 msgstr ""
 
@@ -17715,13 +17222,13 @@ msgstr ""
 msgid "_Threaded Message List"
 msgstr ""
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr ""
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "_Close"
 msgstr ""
 
@@ -18120,7 +17627,7 @@ msgstr ""
 msgid "_Quoted"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
 msgid "_Tools"
 msgstr ""
 
@@ -18417,107 +17924,118 @@ msgid "_Open Task"
 msgstr ""
 
 #: ui/evolution.xml.h:1
-msgid "About Ximian Evolution..."
-msgstr ""
+#, fuzzy
+msgid "About Evolution..."
+msgstr "Can not initialise the Ximian Evolution shell."
 
 #: ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
 msgstr ""
 
-#: ui/evolution.xml.h:5
+#: ui/evolution.xml.h:3
+msgid "Change the visibility of the toolbar"
+msgstr ""
+
+#: ui/evolution.xml.h:6
 #, fuzzy
 msgid "Create a new window displaying this folder"
 msgstr "Synchronising folder"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr ""
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr ""
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:10
 msgid "Forget _Passwords"
 msgstr ""
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:11
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:12
 msgid "Import data from other programs"
 msgstr ""
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:14
 msgid "New _Window"
 msgstr ""
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Pi_lot Settings..."
 msgstr ""
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Send / Receive"
 msgstr ""
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Send queued items and retrieve new items"
 msgstr ""
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Set up Pilot configuration"
 msgstr ""
 
-#: ui/evolution.xml.h:17
-msgid "Show information about Ximian Evolution"
+#: ui/evolution.xml.h:19
+msgid "Show information about Evolution"
 msgstr ""
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:20
 msgid "Submit Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:21
 msgid "Submit _Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Submit a bug report using Bug Buddy"
 msgstr ""
 
-#: ui/evolution.xml.h:21
-msgid "Toggle whether we are working offline."
-msgstr ""
-
 #: ui/evolution.xml.h:23
-msgid "Ximian Evolution _FAQ"
+msgid "T_oolbar"
 msgstr ""
 
 #: ui/evolution.xml.h:24
-msgid "_About Ximian Evolution..."
+msgid "Toggle whether we are working offline."
 msgstr ""
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "_About Evolution..."
+msgstr "Can not initialise the Ximian Evolution shell."
+
+#: ui/evolution.xml.h:30
 msgid "_Help"
 msgstr ""
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "_Import..."
 msgstr ""
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "_New"
 msgstr ""
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "_Quick Reference"
 msgstr ""
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_Send / Receive"
 msgstr ""
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 msgid "_Window"
 msgstr ""
 
@@ -18588,7 +18106,7 @@ msgid "With _Status"
 msgstr ""
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:626
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:635
 msgid "UTC"
 msgstr ""
 
@@ -18741,30 +18259,30 @@ msgstr ""
 msgid "..."
 msgstr ""
 
-#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
-#: widgets/misc/e-error.c:121
+#: widgets/misc/e-error.c:79 widgets/misc/e-error.c:80
+#: widgets/misc/e-error.c:122
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
-#: widgets/misc/e-error.c:119
+#: widgets/misc/e-error.c:81 widgets/misc/e-error.c:82
+#: widgets/misc/e-error.c:120
 #, fuzzy
 msgid "Evolution Warning"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: widgets/misc/e-error.c:118
+#: widgets/misc/e-error.c:119
 #, fuzzy
 msgid "Evolution Information"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: widgets/misc/e-error.c:120
+#: widgets/misc/e-error.c:121
 #, fuzzy
 msgid "Evolution Query"
 msgstr "Cannot initialise Evolution's mail component."
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:410
+#: widgets/misc/e-error.c:415
 #, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -18908,17 +18426,51 @@ msgstr ""
 "Can not get message: %s\n"
 "  %s"
 
-#: widgets/misc/e-task-widget.c:211
+#: widgets/misc/e-task-widget.c:212
 #, c-format
 msgid "%s (...)"
 msgstr ""
 
-#: widgets/misc/e-task-widget.c:216
+#: widgets/misc/e-task-widget.c:217
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Email address:"
+#~ msgstr "Chile"
+
+#, fuzzy
+#~ msgid "Calendar Properties"
+#~ msgstr "Organisation"
+
+#, fuzzy
+#~ msgid "Remote"
+#~ msgstr "Synchronising folder"
+
+#, fuzzy
+#~ msgid "Task List Properties"
+#~ msgstr "_Other Organiser"
+
+#, fuzzy
+#~ msgid "Could not get article %s from NNTP server"
+#~ msgstr "Could not close temporary folder: %s"
+
+#, fuzzy
+#~ msgid "Could not get group: %s"
+#~ msgstr "Could not close temporary folder: %s"
+
+#, fuzzy
+#~ msgid "Could not get messages: unspecified error"
+#~ msgstr ""
+#~ "Can not get message: %s\n"
+#~ "  %s"
+
+#, fuzzy
+#~ msgid "Junk Test"
+#~ msgstr "Cannot initialise Evolution's mail component."
+
+#, fuzzy
 #~ msgid "Address 2:"
 #~ msgstr "Chile"
 
diff --git a/po/en_CA.po b/po/en_CA.po
index 11c31fcebc..60a1543ad5 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -6,15 +6,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.5.5\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-24 14:56-0700\n"
+"POT-Creation-Date: 2004-06-03 11:14-0400\n"
 "PO-Revision-Date: 2004-05-24 15:07-0700\n"
 "Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
 "Language-Team: Canadian English <adamw@FreeBSD.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);"
+"Report-Msgid-Bugs-To: \n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: a11y/addressbook/ea-addressbook-view.c:94
 #: a11y/addressbook/ea-addressbook-view.c:103
@@ -68,13 +68,13 @@ msgstr "Could not read pilot's Address application block"
 msgid "Accessing LDAP Server anonymously"
 msgstr "Accessing LDAP Server anonymously"
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
 msgid "Failed to authenticate.\n"
 msgstr "Failed to authenticate.\n"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sEnter password for %s (user %s)"
@@ -119,34 +119,6 @@ msgstr "Create a new contacts group"
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr "Failed upgrading Addressbook settings or folders."
 
-#: addressbook/gui/component/addressbook-config.c:483
-msgid "Failed to connect to LDAP server"
-msgstr "Failed to connect to LDAP server"
-
-#: addressbook/gui/component/addressbook-config.c:507
-msgid "Failed to authenticate with LDAP server"
-msgstr "Failed to authenticate with LDAP server"
-
-#: addressbook/gui/component/addressbook-config.c:535
-msgid "Could not perform query on Root DSE"
-msgstr "Could not perform query on Root DSE"
-
-#: addressbook/gui/component/addressbook-config.c:840
-msgid "The server responded with no supported search bases"
-msgstr "The server responded with no supported search bases"
-
-#: addressbook/gui/component/addressbook-config.c:1245
-msgid "This server does not support LDAPv3 schema information"
-msgstr "This server does not support LDAPv3 schema information"
-
-#: addressbook/gui/component/addressbook-config.c:1266
-msgid "Error retrieving schema information"
-msgstr "Error retrieving schema information"
-
-#: addressbook/gui/component/addressbook-config.c:1274
-msgid "Server did not respond with valid schema information"
-msgstr "Server did not respond with valid schema information"
-
 #: addressbook/gui/component/addressbook-migrate.c:68
 #: calendar/gui/migration.c:137 mail/em-migrate.c:1160
 msgid "Migrating..."
@@ -159,20 +131,16 @@ msgid "Migrating `%s':"
 msgstr "Migrating `%s':"
 
 #. create the local source group
-#. On This Computer is always first and VFolders is always last
-#: addressbook/gui/component/addressbook-migrate.c:508
+#: addressbook/gui/component/addressbook-migrate.c:464
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
 #: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
-#: mail/mail-component.c:247 mail/mail-vfolder.c:218
+#: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr "On This Computer"
 
 #. Create the default Person addressbook
-#. Create the default Person calendar
-#. Create the default Person task list
-#. orange
-#: addressbook/gui/component/addressbook-migrate.c:516
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
 #: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
 #: mail/mail-config.glade.h:109
@@ -180,19 +148,19 @@ msgid "Personal"
 msgstr "Personal"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:524
+#: addressbook/gui/component/addressbook-migrate.c:480
 msgid "On LDAP Servers"
 msgstr "On LDAP Servers"
 
-#: addressbook/gui/component/addressbook-migrate.c:652
+#: addressbook/gui/component/addressbook-migrate.c:608
 msgid "LDAP Servers"
 msgstr "LDAP Servers"
 
-#: addressbook/gui/component/addressbook-migrate.c:772
+#: addressbook/gui/component/addressbook-migrate.c:728
 msgid "Autocompletion Settings"
 msgstr "Autocompletion Settings"
 
-#: addressbook/gui/component/addressbook-migrate.c:1148
+#: addressbook/gui/component/addressbook-migrate.c:1104
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -204,7 +172,7 @@ msgstr ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1162
+#: addressbook/gui/component/addressbook-migrate.c:1118
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -214,7 +182,7 @@ msgstr ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1171
+#: addressbook/gui/component/addressbook-migrate.c:1127
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -224,7 +192,7 @@ msgstr ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1181
+#: addressbook/gui/component/addressbook-migrate.c:1137
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -234,41 +202,32 @@ msgstr ""
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1194
-msgid ""
-"Some fields are no longer representable in the contact editor. Please wait "
-"while Evolution copies those fields to the 'Notes' field..."
-msgstr ""
-"Some fields are no longer representable in the contact editor. Please wait "
-"while Evolution copies those fields to the 'Notes' field..."
-
-#: addressbook/gui/component/addressbook-view.c:674
+#: addressbook/gui/component/addressbook-view.c:675
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr "Address book '%s' will be removed. Are you sure you want to continue?"
 
-#: addressbook/gui/component/addressbook-view.c:761
+#: addressbook/gui/component/addressbook-view.c:754
 msgid "New Address Book"
 msgstr "New Address Book"
 
-#: addressbook/gui/component/addressbook-view.c:762
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
+#: addressbook/gui/component/addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Delete"
 
-#: addressbook/gui/component/addressbook-view.c:763
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-view.c:756
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Properties..."
 
 #. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:1002
+#: addressbook/gui/component/addressbook-view.c:995
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
 #: calendar/gui/migration.c:373
 msgid "Contacts"
@@ -347,10 +306,6 @@ msgid "Manage your S/MIME certificates here"
 msgstr "Manage your S/MIME certificates here"
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-msgid "  S_how Supported Bases "
-msgstr "  S_how Supported Bases "
-
-#: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -372,183 +327,150 @@ msgstr "  S_how Supported Bases "
 msgid "*"
 msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr "1"
 
-#: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1:00"
-msgstr "1:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr "5"
 
-#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
-msgstr "5:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "<b>Authentication</b>"
 msgstr "<b>Authentication</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Display</b>"
 msgstr "<b>Display</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "<b>Downloading</b>"
 msgstr "<b>Downloading</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "<b>Searching</b>"
 msgstr "<b>Searching</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:11
 msgid "<b>Server Information</b>"
 msgstr "<b>Server Information</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:12
 msgid "<b>Type:</b>"
 msgstr "<b>Type:</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add Contacts Group"
 msgstr "Add Contacts Group"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Address Book Properties"
 msgstr "Address Book Properties"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:42
 msgid "Always"
 msgstr "Always"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr "Anonymously"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:17
 #: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Basic"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
-msgid "Connecting"
-msgstr "Connecting"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 #: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Details"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
-msgid "Distinguished _name:"
-msgstr "Distinguished _name:"
-
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished name"
 msgstr "Distinguished name"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Download limit:"
 msgstr "Download limit:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Email address"
 msgstr "Email address"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "Email address:"
-msgstr "Email address:"
-
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "Evolution will use this DN to authenticate you with the server"
-msgstr "Evolution will use this DN to authenticate you with the server"
-
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:22
+#, fuzzy
 msgid ""
-"Evolution will use this email address to authenticate you with the server"
+"Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "Evolution will use this email address to authenticate you with the server"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Find Possible Search Bases"
 msgstr "Find Possible Search Bases"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:24
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "General"
 
-#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
+#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:102
 msgid "Never"
 msgstr "Never"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
-msgid "One"
-msgstr "One"
-
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Only locations within starting point"
 msgstr "Only locations within starting point"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
-msgid "S_earch scope: "
-msgstr "S_earch scope: "
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Search _base:"
+msgstr "Search base:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:28
 msgid "Search base only"
 msgstr "Search base only"
 
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid "Search base:"
 msgstr "Search base:"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid "Search scope:"
 msgstr "Search scope:"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
-msgid "Searching"
-msgstr "Searching"
-
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:31
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
-"server if\n"
-"your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL or TLS."
 msgstr ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
 "your LDAP server supports SSL or TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a \n"
-"insecure environment. For example, if you and your LDAP server are behind a "
-"firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection "
-"is already\n"
-"secure."
+"you are in a insecure environment. For example, if you and your LDAP server "
+"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
+"because your connection is already secure."
 msgstr ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -558,13 +480,12 @@ msgstr ""
 "is already\n"
 "secure."
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:33
+#, fuzzy
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
-"TLS.  This \n"
-"means that your connection will be insecure, and that you will be vulnerable "
-"to security\n"
-"exploits. "
+"TLS.  This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits. "
 msgstr ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -572,38 +493,33 @@ msgstr ""
 "to security\n"
 "exploits. "
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Starting point and locations within it"
 msgstr "Starting point and locations within it"
 
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Sub"
-msgstr "Sub"
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr "Supported Search Bases"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
-"searches will \n"
-"begin. If you leave this blank, the search will begin at the root of the "
-"directory tree."
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
 msgstr ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
 "begin. If you leave this blank, the search will begin at the root of the "
 "directory tree."
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:37
+#, fuzzy
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
-"the \n"
-"directory tree. A search scope of \"sub\" will include all entries below "
-"your search base.\n"
-"A search scope of \"one\" will only include the entries one level beneath "
-"your base.\n"
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
 msgstr ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -612,7 +528,7 @@ msgstr ""
 "A search scope of \"one\" will only include the entries one level beneath "
 "your base.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:58
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -620,17 +536,17 @@ msgstr ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:39
+#, fuzzy
 msgid ""
-"This is the maximum number of entries to download. Setting this number to "
-"be \n"
+"This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
 "too large will slow down your address book."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -640,136 +556,115 @@ msgstr ""
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:41
+#, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
-"list.\n"
-"It is for display purposes only. "
+"list. It is for display purposes only. "
 msgstr ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
 "It is for display purposes only. "
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:42
+#, fuzzy
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. "
-"A \n"
-"list of standard ports has been provided. Ask your system administrator\n"
-"what port you should specify."
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
 msgstr ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
 "list of standard ports has been provided. Ask your system administrator\n"
 "what port you should specify."
 
-#: addressbook/gui/component/ldap-config.glade.h:67
-msgid "This option controls how long a search will be run."
-msgstr "This option controls how long a search will be run."
-
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid "Timeout:"
 msgstr "Timeout:"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
-msgid "U_se SSL/TLS:"
-msgstr "U_se SSL/TLS:"
-
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr "Using distinguished name (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr "Using email address"
 
-#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
+#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr "Whenever Possible"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:47
 msgid "_Add Contacts Group"
 msgstr "_Add Contacts Group"
 
-#: addressbook/gui/component/ldap-config.glade.h:74
-#: calendar/gui/dialogs/calendar-setup.glade.h:12
-msgid "_Display name:"
-msgstr "_Display name:"
-
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr "_Download limit:"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Email address:"
 msgstr "_Email address:"
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:50
+#, fuzzy
+msgid "_Find Possible Search Bases"
+msgstr "Find Possible Search Bases"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Log in method:"
 msgstr "_Log in method:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:171
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "_Log in:"
+msgstr "Login"
+
+#: addressbook/gui/component/ldap-config.glade.h:53
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
 msgid "_Name:"
 msgstr "_Name:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
-msgid "_Port number:"
-msgstr "_Port number:"
-
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid "_Port:"
 msgstr "_Port:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
-msgid "_Search base:"
-msgstr "_Search base:"
-
-#: addressbook/gui/component/ldap-config.glade.h:82
-msgid "_Server name:"
-msgstr "_Server name:"
+#: addressbook/gui/component/ldap-config.glade.h:55
+#, fuzzy
+msgid "_Search scope:"
+msgstr "Search scope:"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:56
 msgid "_Server:"
 msgstr "_Server:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
-msgid "_Timeout (minutes):"
-msgstr "_Timeout (minutes):"
+#: addressbook/gui/component/ldap-config.glade.h:57
+#, fuzzy
+msgid "_Timeout:"
+msgstr "Timeout:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:58
 msgid "_Use secure connection:"
 msgstr "_Use secure connection:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "cards"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
-msgid "connecting-tab"
-msgstr "connecting-tab"
-
-#: addressbook/gui/component/ldap-config.glade.h:88
-msgid "general-tab"
-msgstr "general-tab"
-
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:60
 #: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
 #: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "minutes"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
-msgid "searching-tab"
-msgstr "searching-tab"
-
-#: addressbook/gui/component/select-names/e-select-names.c:497
+#: addressbook/gui/component/select-names/e-select-names.c:503
 #: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid "Select Contacts from Address Book"
 msgstr "Select Contacts from Address Book"
 
-#: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
@@ -809,7 +704,7 @@ msgstr "Unnamed Contact"
 
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:222
+#: addressbook/gui/widgets/e-addressbook-view.c:224
 msgid "Source"
 msgstr "Source"
 
@@ -874,9 +769,9 @@ msgid "<b>Work</b>"
 msgstr "<b>Work</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:177
-#: addressbook/gui/widgets/eab-contact-display.c:342
-#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/widgets/eab-contact-display.c:334
+#: addressbook/gui/widgets/eab-contact-display.c:353
 msgid "AIM"
 msgstr "AIM"
 
@@ -910,15 +805,15 @@ msgid "Company:"
 msgstr "Company:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:265
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
+#: addressbook/gui/contact-editor/e-contact-editor.c:266
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
 msgstr "Contact"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:519
+#: addressbook/gui/contact-editor/e-contact-editor.c:520
 msgid "Contact Editor"
 msgstr "Contact Editor"
 
@@ -939,83 +834,81 @@ msgid "Full _Name..."
 msgstr "Full _Name..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-msgid "Home"
-msgstr "Home"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "Home Page:"
 msgstr "Home Page:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-#: calendar/gui/e-itip-control.c:930
-msgid "Location:"
-msgstr "Location:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "Mailing Address"
 msgstr "Mailing Address"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "Manager:"
 msgstr "Manager:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "Ni_ckname:"
 msgstr "Ni_ckname:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "Notes:"
 msgstr "Notes:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-msgid "Other"
-msgstr "Other"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#, fuzzy
+msgid "Office:"
+msgstr "Office"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "PO Box:"
 msgstr "PO Box:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "Personal Information"
 msgstr "Personal information"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "Profession:"
 msgstr "Profession:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#, fuzzy
+msgid "Spouse:"
+msgstr "Spouse"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "State/Province:"
 msgstr "State/Province:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "Title:"
 msgstr "Title:"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+msgid "Video Chat:"
+msgstr ""
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "Wants to receive HTML mail"
 msgstr "Wants to receive HTML mail"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:42
-msgid "Webcam:"
-msgstr "Webcam:"
+#, fuzzy
+msgid "Web Log:"
+msgstr "Web Page:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
+#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
 #: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
 #: mail/mail-config.glade.h:157
@@ -1035,17 +928,10 @@ msgid "_File under:"
 msgstr "_File under:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "_Where:"
 msgstr "_Where:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
-msgid "item7"
-msgstr "item7"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
-msgid "item8"
-msgstr "item8"
-
 #: addressbook/gui/contact-editor/eab-editor.c:315
 msgid ""
 "Are you sure you want\n"
@@ -1063,16 +949,16 @@ msgstr ""
 "to delete this contact?"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:351
-#: addressbook/gui/widgets/eab-contact-display.c:372
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Address"
 msgstr "Address"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:286
+#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard.c:174
@@ -2050,83 +1936,80 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/contact-editor/e-contact-editor.c:179
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:337
+#: addressbook/gui/widgets/eab-contact-display.c:356
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
-#: addressbook/gui/widgets/eab-contact-display.c:347
-#: addressbook/gui/widgets/eab-contact-display.c:366
+#: addressbook/gui/contact-editor/e-contact-editor.c:180
+#: addressbook/gui/widgets/eab-contact-display.c:339
+#: addressbook/gui/widgets/eab-contact-display.c:358
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: addressbook/gui/widgets/eab-contact-display.c:338
+#: addressbook/gui/widgets/eab-contact-display.c:357
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:344
-#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#: addressbook/gui/widgets/eab-contact-display.c:355
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
+#: addressbook/gui/contact-editor/e-contact-editor.c:183
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:251
+#: addressbook/gui/contact-editor/e-contact-editor.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+msgid "Home"
+msgstr "Home"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+msgid "Other"
+msgstr "Other"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
 msgid "Source Book"
 msgstr "Source Book"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:258
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Target Book"
 msgstr "Target Book"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:272
+#: addressbook/gui/contact-editor/e-contact-editor.c:273
 msgid "Is New Contact"
 msgstr "Is New Contact"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:279
+#: addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Writable Fields"
 msgstr "Writable Fields"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:293
+#: addressbook/gui/contact-editor/e-contact-editor.c:294
 msgid "Changed"
 msgstr "Changed"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2294
-msgid "Category editor not available."
-msgstr "Category editor not available."
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2302
+#: addressbook/gui/contact-editor/e-contact-editor.c:2352
 msgid "This contact belongs to these categories:"
 msgstr "This contact belongs to these categories:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2379
+#: addressbook/gui/contact-editor/e-contact-editor.c:2429
 msgid "Please select an image for this contact"
 msgstr "Please select an image for this contact"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2383
+#: addressbook/gui/contact-editor/e-contact-editor.c:2433
 msgid "No image"
 msgstr "No image"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2560
-#: addressbook/gui/contact-editor/e-contact-editor.c:2723
-msgid ""
-"You are moving the contact from one address book to another, but it cannot "
-"be removed from the source. Do you want to save a copy instead?"
-msgstr ""
-"You are moving the contact from one address book to another, but it cannot "
-"be removed from the source. Do you want to save a copy instead?"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2607
+#: addressbook/gui/contact-editor/e-contact-editor.c:2636
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2134,7 +2017,12 @@ msgstr ""
 "The contact data is invalid:\n"
 "\n"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2700
+#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#, fuzzy
+msgid "Invalid contact."
+msgstr "%d contact"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2723
 msgid ""
 "The contact cannot be saved to the selected address book. Do you want to "
 "discard changes?"
@@ -2142,12 +2030,19 @@ msgstr ""
 "The contact cannot be saved to the selected address book. Do you want to "
 "discard changes?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2704
-#: addressbook/gui/contact-editor/e-contact-editor.c:2728
-#: addressbook/gui/widgets/eab-gui-util.c:208
+#: addressbook/gui/contact-editor/e-contact-editor.c:2727
+#: addressbook/gui/contact-editor/e-contact-editor.c:2751
 msgid "_Discard"
 msgstr "_Discard"
 
+#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+msgid ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
+
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:62
 msgid "AOL Instant Messenger"
 msgstr "AOL Instant Messenger"
@@ -2324,30 +2219,30 @@ msgstr "_List name:"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Type an email address or drag a contact into the list below:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "contact-list-editor"
 msgstr "contact-list-editor"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:153
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:215
+#: addressbook/gui/widgets/e-addressbook-view.c:217
 #: addressbook/gui/widgets/e-minicard-view.c:460
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Book"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
 msgid "Is New List"
 msgstr "Is New List"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:215
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
 msgid "Contact List Editor"
 msgstr "Contact List Editor"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:438
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
 msgid "Save List as VCard"
 msgstr "Save List as VCard"
 
@@ -2394,144 +2289,144 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Advanced Search"
 
-#: addressbook/gui/widgets/eab-contact-display.c:129
-#: addressbook/gui/widgets/eab-contact-display.c:192
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
 msgid "(map)"
 msgstr "(map)"
 
-#: addressbook/gui/widgets/eab-contact-display.c:139
-#: addressbook/gui/widgets/eab-contact-display.c:205
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
 msgid "map"
 msgstr "map"
 
-#: addressbook/gui/widgets/eab-contact-display.c:257
-#: addressbook/gui/widgets/eab-contact-display.c:533
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:525
 msgid "List Members"
 msgstr "List Members"
 
-#: addressbook/gui/widgets/eab-contact-display.c:329
-#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/eab-contact-display.c:321
+#: addressbook/gui/widgets/eab-contact-display.c:323
 msgid "E-mail"
 msgstr "E-mail"
 
-#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/eab-contact-display.c:332
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organization"
 
-#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "Position"
 msgstr "Position"
 
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:354
 msgid "Groupwise"
 msgstr "Groupwise"
 
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:340
 msgid "Video Conferencing"
 msgstr "Video Conferencing"
 
-#: addressbook/gui/widgets/eab-contact-display.c:349
-#: addressbook/gui/widgets/eab-contact-display.c:370
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Phone"
 msgstr "Phone"
 
-#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:342
 msgid "Fax"
 msgstr "Fax"
 
-#: addressbook/gui/widgets/eab-contact-display.c:354
+#: addressbook/gui/widgets/eab-contact-display.c:346
 msgid "work"
 msgstr "work"
 
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:359
 msgid "WWW"
 msgstr "WWW"
 
-#: addressbook/gui/widgets/eab-contact-display.c:368
-#: addressbook/gui/widgets/eab-contact-display.c:587
+#: addressbook/gui/widgets/eab-contact-display.c:360
+#: addressbook/gui/widgets/eab-contact-display.c:579
 msgid "Blog"
 msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/eab-contact-display.c:363
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Mobile Phone"
 
-#: addressbook/gui/widgets/eab-contact-display.c:375
+#: addressbook/gui/widgets/eab-contact-display.c:367
 msgid "personal"
 msgstr "personal"
 
-#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/eab-contact-display.c:374
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Note"
 
-#: addressbook/gui/widgets/eab-contact-display.c:548
+#: addressbook/gui/widgets/eab-contact-display.c:540
 msgid "Job Title"
 msgstr "Job Title"
 
-#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/eab-contact-display.c:544
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:774
+#: smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "Email"
 
-#: addressbook/gui/widgets/eab-contact-display.c:579
+#: addressbook/gui/widgets/eab-contact-display.c:571
 msgid "Home page"
 msgstr "Home page"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 msgid "Success"
 msgstr "Success"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Backend busy"
 msgstr "Backend busy"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Repository offline"
 msgstr "Repository offline"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Address Book does not exist"
 msgstr "Address Book does not exist"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "No Self Contact defined"
 msgstr "No Self Contact defined"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Permission denied"
 msgstr "Permission denied"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Contact not found"
 msgstr "Contact not found"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Contact ID already exists"
 msgstr "Contact ID already exists"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Protocol not supported"
 msgstr "Protocol not supported"
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:60
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:233
 #: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
@@ -2544,37 +2439,37 @@ msgid "Cancelled"
 msgstr "Cancelled"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Could not cancel"
 msgstr "Could not cancel"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Authentication Failed"
 msgstr "Authentication Failed"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Authentication Required"
 msgstr "Authentication Required"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:66
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "TLS not Available"
 msgstr "TLS not Available"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#: addressbook/gui/widgets/eab-gui-util.c:66
 msgid "No such source"
 msgstr "No such source"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:69
+#: addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Other error"
 msgstr "Other error"
 
-#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:90
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
@@ -2582,7 +2477,7 @@ msgstr ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
 
-#: addressbook/gui/widgets/eab-gui-util.c:110
+#: addressbook/gui/widgets/eab-gui-util.c:97
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -2590,17 +2485,18 @@ msgstr ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:102
+#, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution you must compile the program from the CVS "
-"sources after retrieving OpenLDAP from the link below."
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
 msgstr ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
 "you want to use LDAP in Evolution you must compile the program from the CVS "
 "sources after retrieving OpenLDAP from the link below."
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:109
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -2608,11 +2504,7 @@ msgstr ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
 
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "Unable to open addressbook"
-msgstr "Unable to open addressbook"
-
-#: addressbook/gui/widgets/eab-gui-util.c:162
+#: addressbook/gui/widgets/eab-gui-util.c:129
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2624,7 +2516,7 @@ msgstr ""
 "Please make your search more specific or raise the result limit in\n"
 "the directory server preferences for this addressbook."
 
-#: addressbook/gui/widgets/eab-gui-util.c:168
+#: addressbook/gui/widgets/eab-gui-util.c:135
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -2636,49 +2528,45 @@ msgstr ""
 "more specific or raise the time limit in the directory server\n"
 "preferences for this addressbook."
 
-#: addressbook/gui/widgets/eab-gui-util.c:174
+#: addressbook/gui/widgets/eab-gui-util.c:141
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "The backend for this addressbook was unable to parse this query."
 
-#: addressbook/gui/widgets/eab-gui-util.c:177
+#: addressbook/gui/widgets/eab-gui-util.c:144
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "The backend for this addressbook refused to perform this query."
 
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:147
 msgid "This query did not complete successfully."
 msgstr "This query did not complete successfully."
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
-msgid "Do you want to save changes?"
-msgstr "Do you want to save changes?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:169
 msgid "Error adding list"
 msgstr "Error adding list"
 
-#: addressbook/gui/widgets/eab-gui-util.c:229
-#: addressbook/gui/widgets/eab-gui-util.c:652
+#: addressbook/gui/widgets/eab-gui-util.c:169
+#: addressbook/gui/widgets/eab-gui-util.c:580
 msgid "Error adding contact"
 msgstr "Error adding contact"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying list"
 msgstr "Error modifying list"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying contact"
 msgstr "Error modifying contact"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:192
 msgid "Error removing list"
 msgstr "Error removing list"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
-#: addressbook/gui/widgets/eab-gui-util.c:610
+#: addressbook/gui/widgets/eab-gui-util.c:192
+#: addressbook/gui/widgets/eab-gui-util.c:538
 msgid "Error removing contact"
 msgstr "Error removing contact"
 
-#: addressbook/gui/widgets/eab-gui-util.c:334
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2687,7 +2575,7 @@ msgstr ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:360
+#: addressbook/gui/widgets/eab-gui-util.c:300
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2696,49 +2584,44 @@ msgstr ""
 "%s already exists\n"
 "Do you want to overwrite it?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:364
+#: addressbook/gui/widgets/eab-gui-util.c:304
 msgid "Overwrite"
 msgstr "Overwrite"
 
-#: addressbook/gui/widgets/eab-gui-util.c:400
-#, c-format
-msgid "Error saving %s: %s"
-msgstr "Error saving %s: %s"
-
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:437
+#: addressbook/gui/widgets/eab-gui-util.c:365
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:571
+#: addressbook/gui/widgets/eab-gui-util.c:499
 msgid "list"
 msgstr "list"
 
-#: addressbook/gui/widgets/eab-gui-util.c:706
+#: addressbook/gui/widgets/eab-gui-util.c:634
 msgid "Move contact to"
 msgstr "Move contact to"
 
-#: addressbook/gui/widgets/eab-gui-util.c:708
+#: addressbook/gui/widgets/eab-gui-util.c:636
 msgid "Copy contact to"
 msgstr "Copy contact to"
 
-#: addressbook/gui/widgets/eab-gui-util.c:711
+#: addressbook/gui/widgets/eab-gui-util.c:639
 msgid "Move contacts to"
 msgstr "Move contacts to"
 
-#: addressbook/gui/widgets/eab-gui-util.c:713
+#: addressbook/gui/widgets/eab-gui-util.c:641
 msgid "Copy contacts to"
 msgstr "Copy contacts to"
 
-#: addressbook/gui/widgets/eab-gui-util.c:716
+#: addressbook/gui/widgets/eab-gui-util.c:644
 msgid "Select target addressbook."
 msgstr "Select target addressbook."
 
-#: addressbook/gui/widgets/eab-gui-util.c:939
+#: addressbook/gui/widgets/eab-gui-util.c:867
 msgid "Multiple VCards"
 msgstr "Multiple VCards"
 
-#: addressbook/gui/widgets/eab-gui-util.c:942
+#: addressbook/gui/widgets/eab-gui-util.c:870
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard for %s"
@@ -2825,7 +2708,7 @@ msgstr[1] "%d contacts"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:229
+#: addressbook/gui/widgets/e-addressbook-view.c:231
 #: addressbook/gui/widgets/e-minicard-view.c:467
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
@@ -2843,141 +2726,130 @@ msgstr "Model"
 msgid "Error modifying card"
 msgstr "Error modifying card"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:163
 msgid "Name begins with"
 msgstr "Name begins with"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:164
 msgid "Email begins with"
 msgstr "Email begins with"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:57
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Category is"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-#: calendar/gui/cal-search-bar.c:50
+#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Any field contains"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+#: addressbook/gui/widgets/e-addressbook-view.c:172
 msgid "Advanced..."
 msgstr "Advanced..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:236
+#: addressbook/gui/widgets/e-addressbook-view.c:238
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:250
+#: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Type"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:506
+#: addressbook/gui/widgets/e-addressbook-view.c:508
 msgid "Address Book"
 msgstr "Address Book"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
 #: addressbook/gui/widgets/e-addressbook-view.c:2080
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard..."
 msgstr "Save as VCard..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 msgid "New Contact..."
 msgstr "New Contact..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "New Contact List..."
 msgstr "New Contact List..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Go to Folder..."
 msgstr "Go to Folder..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Import..."
 msgstr "Import..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1066
 msgid "Search for Contacts..."
 msgstr "Search for Contacts..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 msgid "Address Book Sources..."
 msgstr "Address Book Sources..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1069
 msgid "Pilot Settings..."
 msgstr "Pilot Settings..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Forward Contact"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
 msgid "Send Message to Contact"
 msgstr "Send Message to Contact"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Print"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
+#: addressbook/gui/widgets/e-addressbook-view.c:1077
 msgid "Print Envelope"
 msgstr "Print Envelope"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
+#: addressbook/gui/widgets/e-addressbook-view.c:1081
 msgid "Copy to Address Book..."
 msgstr "Copy to Address Book..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1080
+#: addressbook/gui/widgets/e-addressbook-view.c:1082
 msgid "Move to Address Book..."
 msgstr "Move to Address Book..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Cut"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Copy"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1087
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Paste"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:1092
+#: calendar/gui/e-calendar-view.c:1280
 msgid "Current View"
 msgstr "Current View"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1309
-#, c-format
-msgid ""
-"The addressbook backend for\n"
-"%s\n"
-"has crashed. You will have to restart Evolution in order to use it again"
-msgstr ""
-"The addressbook backend for\n"
-"%s\n"
-"has crashed. You will have to restart Evolution in order to use it again"
-
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1667
-#: calendar/gui/cal-search-bar.c:362
+#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Any Category"
 
@@ -3083,7 +2955,7 @@ msgstr "Radio"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:257
+#: calendar/gui/e-meeting-list-view.c:234
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Role"
@@ -3191,17 +3063,17 @@ msgstr "Card View"
 msgid "GTK Tree View"
 msgstr "GTK Tree View"
 
-#: addressbook/gui/widgets/test-reflow.c:119
+#: addressbook/gui/widgets/test-reflow.c:106
 msgid "Reflow Test"
 msgstr "Reflow Test"
 
-#: addressbook/gui/widgets/test-reflow.c:120
+#: addressbook/gui/widgets/test-reflow.c:107
 #: addressbook/printing/test-contact-print-style-editor.c:54
 #: addressbook/printing/test-print.c:53
 msgid "Copyright (C) 2000, Ximian, Inc."
 msgstr "Copyright (C) 2000, Ximian, Inc."
 
-#: addressbook/gui/widgets/test-reflow.c:122
+#: addressbook/gui/widgets/test-reflow.c:109
 msgid "This should test the reflow canvas item"
 msgstr "This should test the reflow canvas item"
 
@@ -3509,7 +3381,7 @@ msgstr "No filename provided."
 msgid "Unnamed List"
 msgstr "Unnamed List"
 
-#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Enter password"
@@ -3784,10 +3656,10 @@ msgid "Whether to show week numbers in date navigator"
 msgstr "Whether to show week numbers in date navigator"
 
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:88
-#: calendar/gui/gnome-cal.c:1703
-#: camel/providers/groupwise/camel-gw-listener.c:304
-#: camel/providers/groupwise/camel-gw-listener.c:327
+#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/gnome-cal.c:1705
+#: camel/providers/groupwise/camel-gw-listener.c:311
+#: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
 msgstr "Calendar"
 
@@ -3807,7 +3679,7 @@ msgstr "Purge events older than"
 
 #: calendar/gui/calendar-commands.c:363
 #: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:19 filter/filter.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
 msgid "days"
 msgstr "days"
 
@@ -3817,10 +3689,6 @@ msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. %d = day of month, %b = abbreviated month name.
-#. You can change the order but don't change the
-#. specifiers or add anything.
 #: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
 #: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
 #: calendar/gui/e-week-view-main-item.c:329
@@ -3957,23 +3825,23 @@ msgstr "Week View"
 msgid "Month View"
 msgstr "Month View"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Summary contains"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Description contains"
 
-#: calendar/gui/cal-search-bar.c:54
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Comment contains"
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:53
 msgid "Location contains"
 msgstr "Location contains"
 
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
 msgid "Unmatched"
 msgstr "Unmatched"
 
@@ -3994,23 +3862,23 @@ msgstr "Permission denied to open the calendar"
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/dialogs/alarm-options.c:466
+#: calendar/gui/dialogs/alarm-options.c:467
 msgid "Audio Alarm Options"
 msgstr "Audio Alarm Options"
 
-#: calendar/gui/dialogs/alarm-options.c:475
+#: calendar/gui/dialogs/alarm-options.c:476
 msgid "Message Alarm Options"
 msgstr "Message Alarm Options"
 
-#: calendar/gui/dialogs/alarm-options.c:484
+#: calendar/gui/dialogs/alarm-options.c:485
 msgid "Email Alarm Options"
 msgstr "Email Alarm Options"
 
-#: calendar/gui/dialogs/alarm-options.c:493
+#: calendar/gui/dialogs/alarm-options.c:494
 msgid "Program Alarm Options"
 msgstr "Program Alarm Options"
 
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:510
 msgid "Unknown Alarm Options"
 msgstr "Unknown Alarm Options"
 
@@ -4046,7 +3914,7 @@ msgstr "Send To:"
 msgid "With these arguments:"
 msgstr "With these arguments:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
 msgid "dialog1"
 msgstr "dialog1"
 
@@ -4055,7 +3923,7 @@ msgid "extra times every"
 msgstr "extra times every"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:20 filter/filter.glade.h:16
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr "hours"
 
@@ -4101,7 +3969,7 @@ msgstr "Send an email"
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:921 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Summary:"
 
@@ -4131,7 +3999,6 @@ msgid "hour(s)"
 msgstr "hour(s)"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:21
 msgid "minute(s)"
 msgstr "minute(s)"
 
@@ -4139,26 +4006,26 @@ msgstr "minute(s)"
 msgid "start of appointment"
 msgstr "start of appointment"
 
-#: calendar/gui/dialogs/calendar-setup.c:170
+#: calendar/gui/dialogs/calendar-setup.c:172
 msgid "You must specify a location to get the calendar from."
 msgstr "You must specify a location to get the calendar from."
 
-#: calendar/gui/dialogs/calendar-setup.c:178
+#: calendar/gui/dialogs/calendar-setup.c:180
 #, c-format
 msgid "The source location '%s' is not well-formed."
 msgstr "The source location '%s' is not well-formed."
 
-#: calendar/gui/dialogs/calendar-setup.c:193
+#: calendar/gui/dialogs/calendar-setup.c:195
 #, c-format
 msgid "The source location '%s' is not a webcal source."
 msgstr "The source location '%s' is not a webcal source."
 
-#: calendar/gui/dialogs/calendar-setup.c:265
+#: calendar/gui/dialogs/calendar-setup.c:275
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr "Source with name '%s' already exists in the selected group"
 
-#: calendar/gui/dialogs/calendar-setup.c:278
+#: calendar/gui/dialogs/calendar-setup.c:288
 #, c-format
 msgid ""
 "The group '%s' is remote. You must specify a location to get the calendar "
@@ -4179,51 +4046,31 @@ msgstr "Add Tasks Group"
 msgid "C_olor:"
 msgstr "C_olour:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "Calendar Properties"
-msgstr "Calendar Properties"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:110
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
 msgid "Pick a color"
 msgstr "Pick a colour"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:8
-msgid "Remote"
-msgstr "Remote"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "Task List Properties"
-msgstr "Task List Properties"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
 msgid "_Add Calendar"
 msgstr "_Add Calendar"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
 msgid "_Add Group"
 msgstr "_Add Group"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-msgid "_Refresh Interval:"
-msgstr "_Refresh Interval:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
 msgid "_Refresh:"
 msgstr "_Refresh:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-msgid "_Source URL:"
-msgstr "_Source URL:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "_Type:"
 msgstr "_Type:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
 msgid "_URL:"
 msgstr "_URL:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
 msgid "weeks"
 msgstr "weeks"
 
@@ -4335,7 +4182,7 @@ msgstr "Free/Busy Publishing"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:557
+#: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Friday"
 
@@ -4349,7 +4196,7 @@ msgstr "Minutes"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:553
+#: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Monday"
 
@@ -4359,7 +4206,7 @@ msgstr "S_un"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Saturday"
 
@@ -4373,7 +4220,7 @@ msgstr "Show week _numbers in date navigator"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:552
+#: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Sunday"
 
@@ -4387,7 +4234,7 @@ msgstr "T_hu"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:556
+#: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Thursday"
 
@@ -4401,7 +4248,7 @@ msgstr "Time format:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:554
+#: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Tuesday"
 
@@ -4411,7 +4258,7 @@ msgstr "W_eek starts:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:555
+#: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Wednesday"
 
@@ -4493,82 +4340,46 @@ msgstr "_Wed"
 msgid "before every appointment"
 msgstr "before every appointment"
 
-#: calendar/gui/dialogs/cancel-comp.c:57
-msgid ""
-"The event being deleted is a meeting, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"The event being deleted is a meeting, would you like to send a cancellation "
-"notice?"
-
-#: calendar/gui/dialogs/cancel-comp.c:60
-msgid "Are you sure you want to cancel and delete this meeting?"
-msgstr "Are you sure you want to cancel and delete this meeting?"
-
-#: calendar/gui/dialogs/cancel-comp.c:66
-msgid ""
-"The task being deleted is assigned, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"The task being deleted is assigned, would you like to send a cancellation "
-"notice?"
-
-#: calendar/gui/dialogs/cancel-comp.c:69
-msgid "Are you sure you want to cancel and delete this task?"
-msgstr "Are you sure you want to cancel and delete this task?"
-
-#: calendar/gui/dialogs/cancel-comp.c:75
-msgid ""
-"The journal entry being deleted is published, would you like to send a "
-"cancellation notice?"
-msgstr ""
-"The journal entry being deleted is published, would you like to send a "
-"cancellation notice?"
-
-#: calendar/gui/dialogs/cancel-comp.c:78
-msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr "Are you sure you want to cancel and delete this journal entry?"
-
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "This event has been deleted."
 
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "This task has been deleted."
 
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:68
 msgid "This journal entry has been deleted."
 msgstr "This journal entry has been deleted."
 
-#: calendar/gui/dialogs/changed-comp.c:75
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  You have made changes. Forget those changes and close the editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  You have made no changes, close the editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:82
+#: calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "This event has been changed."
 
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "This task has been changed."
 
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:92
 msgid "This journal entry has been changed."
 msgstr "This journal entry has been changed."
 
-#: calendar/gui/dialogs/changed-comp.c:99
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  You have made changes. Forget those changes and update the editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  You have made no changes, update the editor?"
@@ -4606,7 +4417,7 @@ msgid "No summary"
 msgstr "No summary"
 
 #: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
 #: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Save as..."
@@ -4658,99 +4469,51 @@ msgstr "Could not open destination"
 msgid "Destination is read only"
 msgstr "Destination is read only"
 
-#: calendar/gui/dialogs/delete-comp.c:95
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "Are you sure you want to delete the appointment `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:98
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "Are you sure you want to delete this untitled appointment?"
-
-#: calendar/gui/dialogs/delete-comp.c:104
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "Are you sure you want to delete the task `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:107
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "Are you sure you want to delete this untitled task?"
-
-#: calendar/gui/dialogs/delete-comp.c:113
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "Are you sure you want to delete the journal entry `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:116
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "Are you sure want to delete this untitled journal entry?"
-
-#: calendar/gui/dialogs/delete-comp.c:131
-#, c-format
-msgid "Are you sure you want to delete %d appointment?"
-msgid_plural "Are you sure you want to delete %d appointments?"
-msgstr[0] "Are you sure you want to delete %d appointment?"
-msgstr[1] "Are you sure you want to delete %d appointments?"
-
-#: calendar/gui/dialogs/delete-comp.c:138
-#, c-format
-msgid "Are you sure you want to delete %d task?"
-msgid_plural "Are you sure you want to delete %d tasks?"
-msgstr[0] "Are you sure you want to delete %d task?"
-msgstr[1] "Are you sure you want to delete %d tasks?"
-
-#: calendar/gui/dialogs/delete-comp.c:145
-#, c-format
-msgid "Are you sure you want to delete %d journal entry?"
-msgid_plural "Are you sure you want to delete %d journal entries?"
-msgstr[0] "Are you sure you want to delete %d journal entry?"
-msgstr[1] "Are you sure you want to delete %d journal entries?"
-
-#: calendar/gui/dialogs/delete-error.c:52
+#: calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "The event could not be deleted due to a corba error"
 
-#: calendar/gui/dialogs/delete-error.c:55
+#: calendar/gui/dialogs/delete-error.c:57
 msgid "The task could not be deleted due to a corba error"
 msgstr "The task could not be deleted due to a corba error"
 
-#: calendar/gui/dialogs/delete-error.c:58
+#: calendar/gui/dialogs/delete-error.c:60
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr "The journal entry could not be deleted due to a corba error"
 
-#: calendar/gui/dialogs/delete-error.c:61
+#: calendar/gui/dialogs/delete-error.c:63
 msgid "The item could not be deleted due to a corba error"
 msgstr "The item could not be deleted due to a corba error"
 
-#: calendar/gui/dialogs/delete-error.c:68
+#: calendar/gui/dialogs/delete-error.c:70
 msgid "The event could not be deleted because permission was denied"
 msgstr "The event could not be deleted because permission was denied"
 
-#: calendar/gui/dialogs/delete-error.c:71
+#: calendar/gui/dialogs/delete-error.c:73
 msgid "The task could not be deleted because permission was denied"
 msgstr "The task could not be deleted because permission was denied"
 
-#: calendar/gui/dialogs/delete-error.c:74
+#: calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr "The journal entry could not be deleted because permission was denied"
 
-#: calendar/gui/dialogs/delete-error.c:77
+#: calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
 msgstr "The item could not be deleted because permission was denied"
 
-#: calendar/gui/dialogs/delete-error.c:84
+#: calendar/gui/dialogs/delete-error.c:86
 msgid "The event could not be deleted due to an error"
 msgstr "The event could not be deleted due to an error"
 
-#: calendar/gui/dialogs/delete-error.c:87
+#: calendar/gui/dialogs/delete-error.c:89
 msgid "The task could not be deleted due to an error"
 msgstr "The task could not be deleted due to an error"
 
-#: calendar/gui/dialogs/delete-error.c:90
+#: calendar/gui/dialogs/delete-error.c:92
 msgid "The journal entry could not be deleted due to an error"
 msgstr "The journal entry could not be deleted due to an error"
 
-#: calendar/gui/dialogs/delete-error.c:93
+#: calendar/gui/dialogs/delete-error.c:95
 msgid "The item could not be deleted due to an error"
 msgstr "The item could not be deleted due to an error"
 
@@ -4882,13 +4645,8 @@ msgid "_Start time:"
 msgstr "_Start time:"
 
 #. an empty string is the same as 'None'
-#. add a "None" option to the stores menu
-#. Put the "None" and "UTC" entries at the top of the combo's list.
-#. When "None" is selected we want the field to be cleared.
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
 #: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:3
+#: calendar/gui/dialogs/meeting-page.glade.h:4
 #: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
 #: filter/filter-rule.c:877 mail/em-account-prefs.c:427
 #: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
@@ -4918,8 +4676,8 @@ msgstr "_Delegate To..."
 #. FIXME: need to disable for undeletable folders
 #: calendar/gui/dialogs/meeting-page.c:655
 #: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1310 calendar/gui/e-calendar-view.c:1342
-#: mail/em-folder-tree.c:2562 mail/em-folder-view.c:919
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
+#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -4927,7 +4685,7 @@ msgid "_Delete"
 msgstr "_Delete"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:241
+#: calendar/gui/e-meeting-list-view.c:218
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Attendee"
@@ -4963,16 +4721,15 @@ msgid "Member"
 msgstr "Member"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1048 calendar/gui/e-meeting-list-view.c:264
+#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:271
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
-#: mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-list-view.c:248
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
 
@@ -4980,20 +4737,20 @@ msgstr "Status"
 msgid "Add A_ttendee"
 msgstr "Add A_ttendee"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "Add attendees from addressbook."
+msgstr "Add Sender to Address_book"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Organizer:"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
+#: calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "_Change Organizer"
 msgstr "_Change Organizer"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-#: calendar/gui/e-meeting-time-sel.c:417
-msgid "_Invite Others..."
-msgstr "_Invite Others..."
-
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
 msgstr "<b>Calendar options</b>"
@@ -5141,7 +4898,7 @@ msgid "_No recurrence"
 msgstr "_No recurrence"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:450
+#: composer/e-msg-composer-attachment-bar.c:453
 msgid "_Remove"
 msgstr "_Remove"
 
@@ -5173,52 +4930,18 @@ msgstr "week(s)"
 msgid "year(s)"
 msgstr "year(s)"
 
-#: calendar/gui/dialogs/save-comp.c:53
-msgid ""
-"This event has been changed, but has not been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"This event has been changed, but has not been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-
-#: calendar/gui/dialogs/save-comp.c:57
-msgid "_Discard Changes"
-msgstr "_Discard Changes"
-
-#: calendar/gui/dialogs/save-comp.c:62
-msgid "Save Event"
-msgstr "Save Event"
-
-#: calendar/gui/dialogs/select-source-dialog.c:65
+#: calendar/gui/dialogs/select-source-dialog.c:69
 msgid "Select destination"
 msgstr "Select destination"
 
-#: calendar/gui/dialogs/select-source-dialog.c:86
+#: calendar/gui/dialogs/select-source-dialog.c:90
 msgid "_Destination"
 msgstr "_Destination"
 
-#: calendar/gui/dialogs/select-source-dialog.c:88
+#: calendar/gui/dialogs/select-source-dialog.c:92
 msgid "Task List"
 msgstr "Task List"
 
-#: calendar/gui/dialogs/send-comp.c:57
-msgid "The meeting information has been created. Send it?"
-msgstr "The meeting information has been created. Send it?"
-
-#: calendar/gui/dialogs/send-comp.c:60
-msgid "The meeting information has changed. Send an updated version?"
-msgstr "The meeting information has changed. Send an updated version?"
-
-#: calendar/gui/dialogs/send-comp.c:67
-msgid "The task assignment information has been created. Send it?"
-msgstr "The task assignment information has been created. Send it?"
-
-#: calendar/gui/dialogs/send-comp.c:71
-msgid "The task information has changed. Send an updated version?"
-msgstr "The task information has changed. Send an updated version?"
-
 #: calendar/gui/dialogs/task-details-page.c:406
 msgid "Completed date is wrong"
 msgstr "Completed date is wrong"
@@ -5316,7 +5039,7 @@ msgstr "Con_fidential"
 
 #: calendar/gui/dialogs/task-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:976 calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Description:"
@@ -5480,7 +5203,7 @@ msgstr "Due Date:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:944
+#: calendar/gui/e-itip-control.c:943
 msgid "Status:"
 msgstr "Status:"
 
@@ -5564,12 +5287,12 @@ msgstr "Busy"
 msgid "Deleting selected objects"
 msgstr "Deleting selected objects"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
 msgid "Updating objects"
 msgstr "Updating objects"
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1370
+#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
 #: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Open"
@@ -5579,15 +5302,15 @@ msgid "Open _Web Page"
 msgstr "Open _Web Page"
 
 #: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1291 calendar/gui/e-calendar-view.c:1376
+#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
 #: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "_Save As..."
 
 #: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1292
-#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
+#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
@@ -5595,15 +5318,15 @@ msgid "_Print..."
 msgstr "_Print..."
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "C_ut"
 
 #: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1338
-#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2555
+#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
+#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
 #: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
@@ -5611,8 +5334,8 @@ msgid "_Copy"
 msgstr "_Copy"
 
 #: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1273 calendar/gui/e-calendar-view.c:1299
-#: calendar/gui/e-calendar-view.c:1372 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
+#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
@@ -5678,67 +5401,67 @@ msgstr "Summary"
 msgid "Task sort"
 msgstr "Task sort"
 
-#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
 msgid "New _Appointment..."
 msgstr "New _Appointment..."
 
-#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
+#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
 msgid "New All Day _Event"
 msgstr "New All Day _Event"
 
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
+#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
 msgid "New Meeting"
 msgstr "New Meeting"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
 msgid "New Task"
 msgstr "New Task"
 
-#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "Select _Today"
 
-#: calendar/gui/e-calendar-view.c:1280
+#: calendar/gui/e-calendar-view.c:1283
 msgid "_Select Date..."
 msgstr "_Select Date..."
 
-#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publish Free/Busy Information"
 
-#: calendar/gui/e-calendar-view.c:1303
+#: calendar/gui/e-calendar-view.c:1306
 msgid "Cop_y to Calendar..."
 msgstr "Cop_y to Calendar..."
 
-#: calendar/gui/e-calendar-view.c:1304
+#: calendar/gui/e-calendar-view.c:1307
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_ve to Calendar..."
 
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1308
 msgid "_Schedule Meeting..."
 msgstr "_Schedule Meeting..."
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1309
 msgid "_Forward as iCalendar..."
 msgstr "_Forward as iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
 msgid "Delete this _Occurrence"
 msgstr "Delete this _Occurrence"
 
-#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
 msgid "Delete _All Occurrences"
 msgstr "Delete _All Occurrences"
 
-#: calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1349
 msgid "Go to _Today"
 msgstr "Go to _Today"
 
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1351
 msgid "_Go to Date..."
 msgstr "_Go to Date..."
 
-#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "_Settings..."
 
@@ -5752,9 +5475,9 @@ msgstr "Start Date"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:961 calendar/gui/e-itip-control.c:1163
-#: calendar/gui/e-meeting-list-view.c:145
-#: calendar/gui/e-meeting-list-view.c:159 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
 #: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
 #: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
 #: camel/camel-tcp-stream-openssl.c:631
@@ -5780,13 +5503,13 @@ msgid "Assigned"
 msgstr "Assigned"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr "Yes"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:170 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "No"
 
@@ -5798,7 +5521,7 @@ msgstr "N"
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
 msgid "E"
 msgstr "E"
 
@@ -5817,20 +5540,12 @@ msgstr ""
 "45.436845,125.862501"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format.
 #: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
@@ -5861,10 +5576,6 @@ msgstr "pm"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#. strftime format %A = full weekday name, %d = day of
-#. month, %B = full month name. You can change the
-#. order but don't change the specifiers or add
-#. anything.
 #: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
@@ -5872,9 +5583,6 @@ msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#. strftime format %d = day of month, %b = abbreviated
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
 #: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
@@ -5885,101 +5593,102 @@ msgstr "%d %b"
 msgid "%02i minute divisions"
 msgstr "%02i minute divisions"
 
-#: calendar/gui/e-itip-control.c:586
+#: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
 msgstr "Yes. (Complex Recurrence)"
 
-#: calendar/gui/e-itip-control.c:597
+#: calendar/gui/e-itip-control.c:596
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Every day"
 msgstr[1] "Every day"
 
-#: calendar/gui/e-itip-control.c:602
+#: calendar/gui/e-itip-control.c:601
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Every week"
 msgstr[1] "Every week"
 
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:603
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "Every week on "
 msgstr[1] "Every week on "
 
-#: calendar/gui/e-itip-control.c:612
+#: calendar/gui/e-itip-control.c:611
 msgid " and "
 msgstr " and "
 
-#: calendar/gui/e-itip-control.c:619
+#: calendar/gui/e-itip-control.c:618
 #, c-format
 msgid "The %s day of "
 msgstr "The %s day of "
 
-#: calendar/gui/e-itip-control.c:632
+#: calendar/gui/e-itip-control.c:631
 #, c-format
 msgid "The %s %s of "
 msgstr "The %s %s of "
 
-#: calendar/gui/e-itip-control.c:639
+#: calendar/gui/e-itip-control.c:638
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "every month"
 msgstr[1] "every month"
 
-#: calendar/gui/e-itip-control.c:643
+#: calendar/gui/e-itip-control.c:642
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Every year"
 msgstr[1] "Every year"
 
-#: calendar/gui/e-itip-control.c:654
+#: calendar/gui/e-itip-control.c:653
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] "a total of %d time"
 msgstr[1] " a total of %d times"
 
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:662
 msgid ", ending on "
 msgstr ", ending on "
 
-#: calendar/gui/e-itip-control.c:687
+#: calendar/gui/e-itip-control.c:686
 msgid "<b>Starts:</b> "
 msgstr "<b>Starts:</b> "
 
-#: calendar/gui/e-itip-control.c:697
+#: calendar/gui/e-itip-control.c:696
 msgid "<b>Ends:</b> "
 msgstr "<b>Ends:</b> "
 
-#: calendar/gui/e-itip-control.c:717
+#: calendar/gui/e-itip-control.c:716
 msgid "<b>Completed:</b> "
 msgstr "<b>Completed:</b> "
 
-#: calendar/gui/e-itip-control.c:727
+#: calendar/gui/e-itip-control.c:726
 msgid "<b>Due:</b> "
 msgstr "<b>Due:</b> "
 
-#: calendar/gui/e-itip-control.c:765 calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
 msgid "iCalendar Information"
 msgstr "iCalendar Information"
 
 #. Title
-#: calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:781
 msgid "iCalendar Error"
 msgstr "iCalendar Error"
 
-#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
-#: calendar/gui/e-itip-control.c:880 calendar/gui/e-itip-control.c:897
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
 msgid "An unknown person"
 msgstr "An unknown person"
 
-#: calendar/gui/e-itip-control.c:904
+#. Describe what the user can do
+#: calendar/gui/e-itip-control.c:903
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5987,301 +5696,305 @@ msgstr ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 
-#: calendar/gui/e-itip-control.c:919
+#: calendar/gui/e-itip-control.c:918
 msgid "<i>None</i>"
 msgstr "<i>None</i>"
 
-#: calendar/gui/e-itip-control.c:949 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:929
+msgid "Location:"
+msgstr "Location:"
+
+#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Accepted"
 
-#: calendar/gui/e-itip-control.c:953 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Tentatively Accepted"
 
-#: calendar/gui/e-itip-control.c:957 calendar/gui/e-meeting-list-view.c:182
+#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Declined"
 
-#: calendar/gui/e-itip-control.c:1016 calendar/gui/e-itip-control.c:1044
-#: calendar/gui/e-itip-control.c:1070 calendar/gui/e-itip-control.c:1083
-#: calendar/gui/e-itip-control.c:1096 calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
 msgid "Choose an action:"
 msgstr "Choose an action:"
 
-#: calendar/gui/e-itip-control.c:1017
+#: calendar/gui/e-itip-control.c:1016
 msgid "Update"
 msgstr "Update"
 
-#: calendar/gui/e-itip-control.c:1018 calendar/gui/e-itip-control.c:1049
-#: calendar/gui/e-itip-control.c:1072 calendar/gui/e-itip-control.c:1085
-#: calendar/gui/e-itip-control.c:1098 calendar/gui/e-itip-control.c:1111
-#: shell/e-shell.c:1098 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
+#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1044
 msgid "Accept"
 msgstr "Accept"
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1045
 msgid "Tentatively accept"
 msgstr "Tentatively accept"
 
-#: calendar/gui/e-itip-control.c:1047
+#: calendar/gui/e-itip-control.c:1046
 msgid "Decline"
 msgstr "Decline"
 
-#: calendar/gui/e-itip-control.c:1071
+#: calendar/gui/e-itip-control.c:1070
 msgid "Send Free/Busy Information"
 msgstr "Send Free/Busy Information"
 
-#: calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1083
 msgid "Update respondent status"
 msgstr "Update respondent status"
 
-#: calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1096
 msgid "Send Latest Information"
 msgstr "Send Latest Information"
 
-#: calendar/gui/e-itip-control.c:1110 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cancel"
 
-#: calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1185
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> has published meeting information."
 
-#: calendar/gui/e-itip-control.c:1187
+#: calendar/gui/e-itip-control.c:1186
 msgid "Meeting Information"
 msgstr "Meeting Information"
 
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1191
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> requests the presence of %s at a meeting."
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1193
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> requests your presence at a meeting."
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1194
 msgid "Meeting Proposal"
 msgstr "Meeting Proposal"
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> wishes to add to an existing meeting."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Update"
 msgstr "Meeting Update"
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1203
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> wishes to receive the latest meeting information."
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1204
 msgid "Meeting Update Request"
 msgstr "Meeting Update Request"
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> has replied to a meeting request."
 
-#: calendar/gui/e-itip-control.c:1213
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Reply"
 msgstr "Meeting Reply"
 
-#: calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1219
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> has cancelled a meeting."
 
-#: calendar/gui/e-itip-control.c:1221
+#: calendar/gui/e-itip-control.c:1220
 msgid "Meeting Cancellation"
 msgstr "Meeting Cancellation"
 
-#: calendar/gui/e-itip-control.c:1228 calendar/gui/e-itip-control.c:1296
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1330
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> has sent an unintelligible message."
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1228
 msgid "Bad Meeting Message"
 msgstr "Bad Meeting Message"
 
-#: calendar/gui/e-itip-control.c:1254
+#: calendar/gui/e-itip-control.c:1253
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> has published task information."
 
-#: calendar/gui/e-itip-control.c:1255
+#: calendar/gui/e-itip-control.c:1254
 msgid "Task Information"
 msgstr "Task Information"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1259
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> requests %s to perform a task."
 
-#: calendar/gui/e-itip-control.c:1262
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> requests you perform a task."
 
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1262
 msgid "Task Proposal"
 msgstr "Task Proposal"
 
-#: calendar/gui/e-itip-control.c:1267
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> wishes to add to an existing task."
 
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Update"
 msgstr "Task Update"
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1271
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> wishes to receive the latest task information."
 
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1272
 msgid "Task Update Request"
 msgstr "Task Update Request"
 
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> has replied to a task assignment."
 
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Reply"
 msgstr "Task Reply"
 
-#: calendar/gui/e-itip-control.c:1288
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> has cancelled a task."
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1288
 msgid "Task Cancellation"
 msgstr "Task Cancellation"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1296
 msgid "Bad Task Message"
 msgstr "Bad Task Message"
 
-#: calendar/gui/e-itip-control.c:1316
+#: calendar/gui/e-itip-control.c:1315
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> has published free/busy information."
 
-#: calendar/gui/e-itip-control.c:1317
+#: calendar/gui/e-itip-control.c:1316
 msgid "Free/Busy Information"
 msgstr "Free/Busy Information"
 
-#: calendar/gui/e-itip-control.c:1321
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> requests your free/busy information."
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1321
 msgid "Free/Busy Request"
 msgstr "Free/Busy Request"
 
-#: calendar/gui/e-itip-control.c:1326
+#: calendar/gui/e-itip-control.c:1325
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> has replied to a free/busy request."
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1326
 msgid "Free/Busy Reply"
 msgstr "Free/Busy Reply"
 
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1331
 msgid "Bad Free/Busy Message"
 msgstr "Bad Free/Busy Message"
 
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1406
 msgid "The message does not appear to be properly formed"
 msgstr "The message does not appear to be properly formed"
 
-#: calendar/gui/e-itip-control.c:1466
+#: calendar/gui/e-itip-control.c:1465
 msgid "The message contains only unsupported requests."
 msgstr "The message contains only unsupported requests."
 
-#: calendar/gui/e-itip-control.c:1497
+#: calendar/gui/e-itip-control.c:1496
 msgid "The attachment does not contain a valid calendar message"
 msgstr "The attachment does not contain a valid calendar message"
 
-#: calendar/gui/e-itip-control.c:1529
+#: calendar/gui/e-itip-control.c:1528
 msgid "The attachment has no viewable calendar items"
 msgstr "The attachment has no viewable calendar items"
 
-#: calendar/gui/e-itip-control.c:1763
+#: calendar/gui/e-itip-control.c:1762
 msgid "Update complete\n"
 msgstr "Update complete\n"
 
-#: calendar/gui/e-itip-control.c:1793 calendar/gui/e-itip-control.c:1865
+#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Attendee status can not be updated because the item no longer exists"
 
-#: calendar/gui/e-itip-control.c:1809 calendar/gui/e-itip-control.c:1847
+#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Object is invalid and cannot be updated\n"
 
-#: calendar/gui/e-itip-control.c:1819
+#: calendar/gui/e-itip-control.c:1818
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "This response is not from a current attendee.  Add as an attendee?"
 
-#: calendar/gui/e-itip-control.c:1831
+#: calendar/gui/e-itip-control.c:1830
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Attendee status could not be updated because of an invalid status!\n"
 
-#: calendar/gui/e-itip-control.c:1850
+#: calendar/gui/e-itip-control.c:1849
 msgid "There was an error on the CORBA system\n"
 msgstr "There was an error on the CORBA system\n"
 
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1852
 msgid "Object could not be found\n"
 msgstr "Object could not be found\n"
 
-#: calendar/gui/e-itip-control.c:1856
+#: calendar/gui/e-itip-control.c:1855
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "You don't have the right permissions to update the calendar\n"
 
-#: calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1858
 msgid "Attendee status updated\n"
 msgstr "Attendee status updated\n"
 
-#: calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1861
 msgid "Attendee status could not be updated!\n"
 msgstr "Attendee status could not be updated!\n"
 
-#: calendar/gui/e-itip-control.c:1893
+#: calendar/gui/e-itip-control.c:1892
 msgid "Removal Complete"
 msgstr "Removal Complete"
 
-#: calendar/gui/e-itip-control.c:1916 calendar/gui/e-itip-control.c:1964
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
 msgid "Item sent!\n"
 msgstr "Item sent!\n"
 
-#: calendar/gui/e-itip-control.c:1918 calendar/gui/e-itip-control.c:1968
+#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
 msgid "The item could not be sent!\n"
 msgstr "The item could not be sent!\n"
 
@@ -6322,74 +6035,74 @@ msgstr "date-end"
 msgid "date-start"
 msgstr "date-start"
 
-#: calendar/gui/e-meeting-list-view.c:62
+#: calendar/gui/e-meeting-list-view.c:59
 msgid "Chair Persons"
 msgstr "Chair Persons"
 
-#: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:480
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
 msgid "Required Participants"
 msgstr "Required Participants"
 
-#: calendar/gui/e-meeting-list-view.c:64
+#: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Optional Participants"
 
-#: calendar/gui/e-meeting-list-view.c:65
+#: calendar/gui/e-meeting-list-view.c:62
 msgid "Resources"
 msgstr "Resources"
 
-#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
 #: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr "Individual"
 
-#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "Group"
 
-#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr "Resource"
 
-#: calendar/gui/e-meeting-list-view.c:144 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr "Room"
 
-#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr "Chair"
 
-#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:127
 #: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
 msgid "Required Participant"
 msgstr "Required Participant"
 
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr "Optional Participant"
 
-#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr "Non-Participant"
 
-#: calendar/gui/e-meeting-list-view.c:180 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:177
 #: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
 msgid "Needs Action"
 msgstr "Needs Action"
 
-#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
 #: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "Tentative"
 
-#: calendar/gui/e-meeting-list-view.c:184 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr "Delegated"
@@ -6406,20 +6119,28 @@ msgstr "Out of Office"
 msgid "No Information"
 msgstr "No Information"
 
+#: calendar/gui/e-meeting-time-sel.c:417
+#, fuzzy
+msgid "Add attendees from addressbook"
+msgstr "Add Sender to Address_book"
+
 #: calendar/gui/e-meeting-time-sel.c:440
 msgid "_Options"
 msgstr "_Options"
 
 #: calendar/gui/e-meeting-time-sel.c:457
-msgid "Show _Only Working Hours"
+#, fuzzy
+msgid "Show _only working hours"
 msgstr "Show _Only Working Hours"
 
 #: calendar/gui/e-meeting-time-sel.c:467
-msgid "Show _Zoomed Out"
+#, fuzzy
+msgid "Show _zoomed out"
 msgstr "Show _Zoomed Out"
 
 #: calendar/gui/e-meeting-time-sel.c:482
-msgid "_Update Free/Busy"
+#, fuzzy
+msgid "_Update free/busy"
 msgstr "_Update Free/Busy"
 
 #: calendar/gui/e-meeting-time-sel.c:497
@@ -6435,19 +6156,23 @@ msgid ">_>"
 msgstr ">_>"
 
 #: calendar/gui/e-meeting-time-sel.c:547
-msgid "_All People and Resources"
+#, fuzzy
+msgid "_All people and resources"
 msgstr "_All People and Resources"
 
 #: calendar/gui/e-meeting-time-sel.c:556
-msgid "All _People and One Resource"
+#, fuzzy
+msgid "All _people and one resource"
 msgstr "All _People and One Resource"
 
 #: calendar/gui/e-meeting-time-sel.c:565
-msgid "_Required People"
+#, fuzzy
+msgid "_Required people"
 msgstr "_Required People"
 
 #: calendar/gui/e-meeting-time-sel.c:574
-msgid "Required People and _One Resource"
+#, fuzzy
+msgid "Required people and _one resource"
 msgstr "Required People and _One Resource"
 
 #: calendar/gui/e-meeting-time-sel.c:593
@@ -6467,10 +6192,6 @@ msgstr "%A, %B %d, %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#. This is a strftime() format string %a = abbreviated weekday
-#. name, %m = month number, %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. strftime format of a weekday and a date.
 #: calendar/gui/e-meeting-time-sel.c:2093
 #: calendar/gui/e-meeting-time-sel-item.c:456 e-util/e-time-utils.c:203
 #: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
@@ -6479,10 +6200,6 @@ msgstr "%a %d/%m/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. This is the preferred date format for the locale.
-#. This is a strftime() format for a short date. %m = month,
-#. %d = day of month, %Y = year (all digits).
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
 #: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
 msgid "%m/%d/%Y"
@@ -6493,7 +6210,7 @@ msgstr "%d/%m/%Y"
 msgid "Enter the password for %s"
 msgstr "Enter the password for %s"
 
-#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6502,19 +6219,14 @@ msgstr ""
 "Error on %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr "The task backend for '%s' has crashed."
-
 #. FIXME Loading should be async
 #. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:686
+#: calendar/gui/e-tasks.c:801
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Opening tasks at %s"
 
-#: calendar/gui/e-tasks.c:709
+#: calendar/gui/e-tasks.c:824
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6523,52 +6235,47 @@ msgstr ""
 "Error opening %s:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:730
+#: calendar/gui/e-tasks.c:845
 msgid "Loading tasks"
 msgstr "Loading tasks"
 
-#: calendar/gui/e-tasks.c:834
+#: calendar/gui/e-tasks.c:949
 msgid "Completing tasks..."
 msgstr "Completing tasks..."
 
-#: calendar/gui/e-tasks.c:857
+#: calendar/gui/e-tasks.c:972
 msgid "Deleting selected objects..."
 msgstr "Deleting selected objects..."
 
-#: calendar/gui/e-tasks.c:884
+#: calendar/gui/e-tasks.c:999
 msgid "Expunging"
 msgstr "Expunging"
 
-#: calendar/gui/e-tasks.c:960
+#: calendar/gui/e-tasks.c:1075
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
-#: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
+#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
+#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
 #: calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:705
 msgid "Tasks"
 msgstr "Tasks"
 
-#: calendar/gui/gnome-cal.c:1876
+#: calendar/gui/gnome-cal.c:1878
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Loading appointments at %s"
 
-#: calendar/gui/gnome-cal.c:1895
+#: calendar/gui/gnome-cal.c:1897
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Loading tasks at %s"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1920
 #, c-format
 msgid "Opening %s"
 msgstr "Opening %s"
 
-#: calendar/gui/gnome-cal.c:2048
-#, c-format
-msgid "The calendar backend for '%s' has crashed."
-msgstr "The calendar backend for '%s' has crashed."
-
-#: calendar/gui/gnome-cal.c:2894
+#: calendar/gui/gnome-cal.c:2906
 msgid "Purging"
 msgstr "Purging"
 
@@ -6765,7 +6472,7 @@ msgid "On The Web"
 msgstr "On The Web"
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "Unable to migrate old settings from evolution/config.xmldb"
 
@@ -6776,7 +6483,7 @@ msgid "Unable to migrate calendar `%s'"
 msgstr "Unable to migrate calendar `%s'"
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:869
+#: calendar/gui/migration.c:889
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Unable to migrate tasks `%s'"
@@ -7012,43 +6719,43 @@ msgstr "Print Item"
 msgid "Print Setup"
 msgstr "Print Setup"
 
-#: calendar/gui/tasks-component.c:303
+#: calendar/gui/tasks-component.c:313
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr "Task List '%s' will be removed. Are you sure you want to continue?"
 
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:371
 msgid "New Task List"
 msgstr "New Task List"
 
-#: calendar/gui/tasks-component.c:398
+#: calendar/gui/tasks-component.c:408
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d task"
 msgstr[1] "%d tasks"
 
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:502
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", %d selected"
 msgstr[1] ", %d selected"
 
-#: calendar/gui/tasks-component.c:447
+#: calendar/gui/tasks-component.c:457
 msgid "Failed upgrading tasks."
 msgstr "Failed upgrading tasks."
 
-#: calendar/gui/tasks-component.c:526
+#: calendar/gui/tasks-component.c:749
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "Unable to open the task list '%s' for creating events and meetings"
 
-#: calendar/gui/tasks-component.c:538
+#: calendar/gui/tasks-component.c:761
 msgid "There is no calendar available for creating tasks"
 msgstr "There is no calendar available for creating tasks"
 
-#: calendar/gui/tasks-component.c:576
+#: calendar/gui/tasks-component.c:799
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
@@ -7056,27 +6763,27 @@ msgstr ""
 "Events cannot be created in a read-only calendar. Please select a read-write "
 "calendar."
 
-#: calendar/gui/tasks-component.c:804
+#: calendar/gui/tasks-component.c:1040
 msgid "New task"
 msgstr "New task"
 
-#: calendar/gui/tasks-component.c:805
+#: calendar/gui/tasks-component.c:1041
 msgid "_Task"
 msgstr "_Task"
 
-#: calendar/gui/tasks-component.c:806
+#: calendar/gui/tasks-component.c:1042
 msgid "Create a new task"
 msgstr "Create a new task"
 
-#: calendar/gui/tasks-component.c:812
+#: calendar/gui/tasks-component.c:1048
 msgid "New tasks group"
 msgstr "New tasks group"
 
-#: calendar/gui/tasks-component.c:813
+#: calendar/gui/tasks-component.c:1049
 msgid "_Tasks Group"
 msgstr "_Tasks Group"
 
-#: calendar/gui/tasks-component.c:814
+#: calendar/gui/tasks-component.c:1050
 msgid "Create a new tasks group"
 msgstr "Create a new tasks group"
 
@@ -8902,15 +8609,15 @@ msgstr "(match-threads) not allowed inside match-all"
 msgid "(match-threads) requires a match type string"
 msgstr "(match-threads) requires a match type string"
 
-#: camel/camel-folder-search.c:785
+#: camel/camel-folder-search.c:784
 msgid "(match-threads) expects an array result"
 msgstr "(match-threads) expects an array result"
 
-#: camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:790
 msgid "(match-threads) requires the folder set"
 msgstr "(match-threads) requires the folder set"
 
-#: camel/camel-folder-search.c:880
+#: camel/camel-folder-search.c:879
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Performing query on unknown header: %s"
@@ -8945,7 +8652,8 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
 #: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:705
+#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Cancelled."
@@ -9322,7 +9030,7 @@ msgstr "The referenced credentials have expired."
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1243
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Bad authentication response from server."
 
@@ -9682,40 +9390,40 @@ msgstr "import keys: unimplemented"
 msgid "export keys: unimplemented"
 msgstr "export keys: unimplemented"
 
-#: camel/camel-store.c:215
+#: camel/camel-store.c:213
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Cannot get folder: Invalid operation on this store"
 
-#: camel/camel-store.c:245
+#: camel/camel-store.c:243
 #, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr "Cannot create folder `%s': folder exists"
 
-#: camel/camel-store.c:299
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Cannot create folder: Invalid operation on this store"
 
-#: camel/camel-store.c:327
+#: camel/camel-store.c:325
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Cannot create folder: %s: folder exists"
 
-#: camel/camel-store.c:391 camel/camel-vee-store.c:354
+#: camel/camel-store.c:389 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Cannot delete folder: %s: Invalid operation"
 
-#: camel/camel-store.c:441 camel/camel-vee-store.c:390
+#: camel/camel-store.c:439 camel/camel-vee-store.c:387
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Cannot rename folder: %s: Invalid operation"
 
-#: camel/camel-store.c:813
+#: camel/camel-store.c:777
 msgid "Trash"
 msgstr "Trash"
 
-#: camel/camel-store.c:815 filter/libfilter-i18n.h:35
-#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/mail-config.glade.h:95
+#: ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Junk"
 
@@ -9946,12 +9654,12 @@ msgstr "No such message %s in %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Cannot copy or move messages into a Virtual Folder"
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:374
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Cannot delete folder: %s: No such folder"
 
-#: camel/camel-vee-store.c:398
+#: camel/camel-vee-store.c:395
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Cannot rename folder: %s: No such folder"
@@ -10016,8 +9724,8 @@ msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "This option will connect to the IMAP server using a plaintext password."
 
-#: camel/providers/groupwise/camel-gw-listener.c:305
-#: camel/providers/groupwise/camel-gw-listener.c:328
+#: camel/providers/groupwise/camel-gw-listener.c:312
+#: camel/providers/groupwise/camel-gw-listener.c:335
 msgid "Checklist"
 msgstr "Checklist"
 
@@ -10145,23 +9853,23 @@ msgstr ""
 "This option will connect to the IMAPv4rev1 server using a plaintext password."
 
 #: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:429
+#: camel/providers/imap/camel-imap-store.c:428
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP server %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:431
+#: camel/providers/imap/camel-imap-store.c:430
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP service for %s on %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:208
 #: camel/providers/imap4/camel-imap4-store.c:225
-#: camel/providers/imap/camel-imap-store.c:552
-#: camel/providers/imap/camel-imap-store.c:572
+#: camel/providers/imap/camel-imap-store.c:551
+#: camel/providers/imap/camel-imap-store.c:571
 #: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
+#: camel/providers/nntp/camel-nntp-store.c:209
 #: camel/providers/pop3/camel-pop3-store.c:175
 #: camel/providers/smtp/camel-smtp-transport.c:269
 #: camel/providers/smtp/camel-smtp-transport.c:285
@@ -10170,18 +9878,18 @@ msgid "Could not connect to %s (port %d): %s"
 msgstr "Could not connect to %s (port %d): %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:210
-#: camel/providers/imap/camel-imap-store.c:554
+#: camel/providers/imap/camel-imap-store.c:553
 #: camel/providers/pop3/camel-pop3-store.c:177
 #: camel/providers/smtp/camel-smtp-transport.c:271
 msgid "SSL unavailable"
 msgstr "SSL unavailable"
 
 #: camel/providers/imap4/camel-imap4-store.c:222
-#: camel/providers/imap/camel-imap-store.c:569
-#: camel/providers/imap/camel-imap-store.c:846
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/imap/camel-imap-store.c:845
 #: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:137
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
 #: camel/providers/pop3/camel-pop3-store.c:192
 msgid "Connection cancelled"
 msgstr "Connection cancelled"
@@ -10196,8 +9904,8 @@ msgstr ""
 "STARTTLS"
 
 #: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:680
-#: camel/providers/imap/camel-imap-store.c:711
+#: camel/providers/imap/camel-imap-store.c:679
+#: camel/providers/imap/camel-imap-store.c:710
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Failed to connect to IMAP server %s in secure mode: %s"
@@ -10206,7 +9914,7 @@ msgstr "Failed to connect to IMAP server %s in secure mode: %s"
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1108
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
 msgid "Unknown error"
 msgstr "Unknown error"
 
@@ -10233,8 +9941,8 @@ msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr "Cannot get folder `%s' on IMAP server %s: Unknown"
 
 #: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1890
-#: camel/providers/imap/camel-imap-store.c:2268
+#: camel/providers/imap/camel-imap-store.c:1885
+#: camel/providers/imap/camel-imap-store.c:2263
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -10312,12 +10020,12 @@ msgstr "IMAP server %s unexpectedly disconnected: %s"
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3201
+#: camel/providers/imap/camel-imap-store.c:3194
 msgid "Operation cancelled"
 msgstr "Operation cancelled"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3204
+#: camel/providers/imap/camel-imap-store.c:3197
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server unexpectedly disconnected: %s"
@@ -10398,7 +10106,7 @@ msgstr "No such message"
 
 #: camel/providers/imap/camel-imap-folder.c:2019
 #: camel/providers/imap/camel-imap-folder.c:2622
-#: camel/providers/nntp/camel-nntp-folder.c:238
+#: camel/providers/nntp/camel-nntp-folder.c:220
 msgid "This message is not currently available"
 msgstr "This message is not currently available"
 
@@ -10482,43 +10190,43 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "For reading and storing mail on IMAP servers."
 
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:680
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS extension not supported."
 
-#: camel/providers/imap/camel-imap-store.c:712
+#: camel/providers/imap/camel-imap-store.c:711
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL negotiations failed"
 
-#: camel/providers/imap/camel-imap-store.c:849
+#: camel/providers/imap/camel-imap-store.c:848
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Could not connect with command \"%s\": %s"
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1272
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP server %s does not support requested authentication type %s"
 
-#: camel/providers/imap/camel-imap-store.c:1285
+#: camel/providers/imap/camel-imap-store.c:1282
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "No support for authentication type %s"
 
-#: camel/providers/imap/camel-imap-store.c:1308
+#: camel/providers/imap/camel-imap-store.c:1305
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sPlease enter the IMAP password for %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1322
+#: camel/providers/imap/camel-imap-store.c:1319
 msgid "You didn't enter a password."
 msgstr "You didn't enter a password."
 
-#: camel/providers/imap/camel-imap-store.c:1351
+#: camel/providers/imap/camel-imap-store.c:1348
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10529,18 +10237,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1872
-#: camel/providers/imap/camel-imap-store.c:2062
+#: camel/providers/imap/camel-imap-store.c:1867
+#: camel/providers/imap/camel-imap-store.c:2057
 #, c-format
 msgid "No such folder %s"
 msgstr "No such folder %s"
 
-#: camel/providers/imap/camel-imap-store.c:1948
-#: camel/providers/imap/camel-imap-store.c:2329
+#: camel/providers/imap/camel-imap-store.c:1943
+#: camel/providers/imap/camel-imap-store.c:2324
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "The parent folder is not allowed to contain subfolders"
 
-#: camel/providers/imap/camel-imap-store.c:2003
+#: camel/providers/imap/camel-imap-store.c:1998
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10548,7 +10256,7 @@ msgstr "The parent folder is not allowed to contain subfolders"
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Cannot create folder `%s': folder exists."
 
-#: camel/providers/imap/camel-imap-store.c:2279
+#: camel/providers/imap/camel-imap-store.c:2274
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Unknown parent folder: %s"
@@ -10584,20 +10292,20 @@ msgid "Index message body data"
 msgstr "Index message body data"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:388
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:393
-#: camel/providers/local/camel-local-folder.c:396
+#: camel/providers/local/camel-local-folder.c:392
+#: camel/providers/local/camel-local-folder.c:395
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "mailbox:%s (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:400
+#: camel/providers/local/camel-local-folder.c:399
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -10657,7 +10365,7 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:142
 #: camel/providers/local/camel-local-store.c:253
-#: camel/providers/local/camel-mbox-store.c:356
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10789,9 +10497,9 @@ msgstr "Could not delete folder `%s': %s"
 msgid "not a maildir directory"
 msgstr "not a maildir directory"
 
-#: camel/providers/local/camel-maildir-store.c:341
-#: camel/providers/local/camel-spool-store.c:286
-#: camel/providers/local/camel-spool-store.c:316
+#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-spool-store.c:284
+#: camel/providers/local/camel-spool-store.c:314
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Could not scan folder `%s': %s"
@@ -10848,7 +10556,7 @@ msgid "Message construction failed."
 msgstr "Message construction failed."
 
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:362
+#: camel/providers/local/camel-mbox-store.c:361
 msgid "Cannot create a folder by this name."
 msgstr "Cannot create a folder by this name."
 
@@ -10878,30 +10586,30 @@ msgstr "`%s' is not a regular file."
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Folder `%s' is not empty. Not deleted."
 
-#: camel/providers/local/camel-mbox-store.c:375
+#: camel/providers/local/camel-mbox-store.c:374
 #, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Cannot create directory `%s': %s."
 
-#: camel/providers/local/camel-mbox-store.c:389
+#: camel/providers/local/camel-mbox-store.c:388
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Cannot create folder: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:391
+#: camel/providers/local/camel-mbox-store.c:390
 msgid "Folder already exists"
 msgstr "Folder already exists"
 
-#: camel/providers/local/camel-mbox-store.c:473
+#: camel/providers/local/camel-mbox-store.c:472
 msgid "The new folder name is illegal."
 msgstr "The new folder name is illegal."
 
-#: camel/providers/local/camel-mbox-store.c:486
+#: camel/providers/local/camel-mbox-store.c:485
 #, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Could not rename `%s': `%s': %s"
 
-#: camel/providers/local/camel-mbox-store.c:561
+#: camel/providers/local/camel-mbox-store.c:560
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Could not rename '%s' to %s: %s"
@@ -11092,7 +10800,7 @@ msgstr ""
 "Folder may be corrupt, copy saved in `%s'"
 
 #: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:997
+#: camel/providers/nntp/camel-nntp-store.c:1126
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Please enter the NNTP password for %s@%s"
@@ -11109,18 +10817,10 @@ msgstr "Failed to send username to server"
 msgid "Server rejected username/password"
 msgstr "Server rejected username/password"
 
-#: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:263
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr "User cancelled"
-
-#: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:259
-#: camel/providers/nntp/camel-nntp-folder.c:265
+#: camel/providers/nntp/camel-nntp-folder.c:147
+#: camel/providers/nntp/camel-nntp-folder.c:149
+#: camel/providers/nntp/camel-nntp-folder.c:158
+#: camel/providers/nntp/camel-nntp-folder.c:234
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11129,60 +10829,49 @@ msgstr "User cancelled"
 msgid "Cannot get message %s: %s"
 msgstr "Cannot get message %s: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:188
-#: camel/providers/nntp/camel-nntp-folder.c:228
+#: camel/providers/nntp/camel-nntp-folder.c:156
+#: camel/providers/nntp/camel-nntp-folder.c:232
+#: camel/providers/nntp/camel-nntp-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+msgid "User cancelled"
+msgstr "User cancelled"
+
+#: camel/providers/nntp/camel-nntp-folder.c:176
+#: camel/providers/nntp/camel-nntp-folder.c:208
 #, c-format
 msgid "Internal error: uid in invalid format: %s"
 msgstr "Internal error: uid in invalid format: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:201
-#, c-format
-msgid "Could not get article %s from NNTP server"
-msgstr "Could not get article %s from NNTP server"
-
-#: camel/providers/nntp/camel-nntp-folder.c:362
-msgid "Posting not allowed by news server"
-msgstr "Posting not allowed by news server"
-
+#: camel/providers/nntp/camel-nntp-folder.c:328
+#: camel/providers/nntp/camel-nntp-folder.c:331
 #: camel/providers/nntp/camel-nntp-folder.c:373
-#, c-format
-msgid "Failed to send newsgroups header: %s: message not posted"
-msgstr "Failed to send newsgroups header: %s: message not posted"
-
-#: camel/providers/nntp/camel-nntp-folder.c:413
-#: camel/providers/nntp/camel-nntp-folder.c:426
-#, c-format
-msgid "Error posting to newsgroup: %s: message not posted"
-msgstr "Error posting to newsgroup: %s: message not posted"
-
-#: camel/providers/nntp/camel-nntp-folder.c:438
-msgid "Error reading response to posted message: message not posted"
-msgstr "Error reading response to posted message: message not posted"
-
-#: camel/providers/nntp/camel-nntp-folder.c:441
-#, c-format
-msgid "Error posting message: %s: message not posted"
-msgstr "Error posting message: %s: message not posted"
+#: camel/providers/nntp/camel-nntp-folder.c:375
+#, fuzzy, c-format
+msgid "Posting failed: %s"
+msgstr "Operation failed: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:457
+#: camel/providers/nntp/camel-nntp-folder.c:393
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "You cannot post NNTP messages while working offline!"
 
-#: camel/providers/nntp/camel-nntp-folder.c:468
+#: camel/providers/nntp/camel-nntp-folder.c:404
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "You cannot copy messages from a NNTP folder!"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:44
 msgid "Could not get group list from server."
 msgstr "Could not get group list from server."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#: camel/providers/nntp/camel-nntp-grouplist.c:97
+#: camel/providers/nntp/camel-nntp-grouplist.c:106
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "Unable to load grouplist file for %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#: camel/providers/nntp/camel-nntp-grouplist.c:157
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Unable to save grouplist file for %s: %s"
@@ -11213,26 +10902,29 @@ msgstr ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 
-#: camel/providers/nntp/camel-nntp-store.c:158
+#: camel/providers/nntp/camel-nntp-store.c:118
+#: camel/providers/nntp/camel-nntp-store.c:1233
+#: camel/providers/nntp/camel-nntp-store.c:1331
+#, c-format
+msgid "NNTP Command failed: %s"
+msgstr "NNTP Command failed: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:227
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Could not read greeting from %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:170
+#: camel/providers/nntp/camel-nntp-store.c:239
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP server %s returned error code %d: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:326
+#: camel/providers/nntp/camel-nntp-store.c:403
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET News via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:640
-msgid "Stream error"
-msgstr "Stream error"
-
-#: camel/providers/nntp/camel-nntp-store.c:643
+#: camel/providers/nntp/camel-nntp-store.c:777
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -11243,7 +10935,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/providers/nntp/camel-nntp-store.c:735
+#: camel/providers/nntp/camel-nntp-store.c:872
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
@@ -11253,7 +10945,7 @@ msgstr ""
 "\n"
 "No such newsgroup. The selected item is a probably a parent folder."
 
-#: camel/providers/nntp/camel-nntp-store.c:767
+#: camel/providers/nntp/camel-nntp-store.c:904
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
@@ -11263,58 +10955,59 @@ msgstr ""
 "\n"
 "newsgroup does not exist!"
 
-#: camel/providers/nntp/camel-nntp-store.c:792
+#: camel/providers/nntp/camel-nntp-store.c:929
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr "You cannot create a folder in a News store: subscribe instead."
 
-#: camel/providers/nntp/camel-nntp-store.c:800
+#: camel/providers/nntp/camel-nntp-store.c:937
 msgid "You cannot rename a folder in a News store."
 msgstr "You cannot rename a folder in a News store."
 
-#: camel/providers/nntp/camel-nntp-store.c:808
+#: camel/providers/nntp/camel-nntp-store.c:945
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "You cannot remove a folder in a News store: unsubscribe instead."
 
-#: camel/providers/nntp/camel-nntp-summary.c:253
-#, c-format
-msgid "Connection error: %s"
-msgstr "Connection error: %s"
-
-#: camel/providers/nntp/camel-nntp-summary.c:262
-#, c-format
-msgid "No such folder: %s"
-msgstr "No such folder: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1118
+#, fuzzy
+msgid "Authentication requested but not username provided"
+msgstr "Authentication required"
 
-#: camel/providers/nntp/camel-nntp-summary.c:268
-#, c-format
-msgid "Could not get group: %s"
-msgstr "Could not get group: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1146
+#, fuzzy, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr "Cannot authenticate to IMAP server %s using %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:333
-msgid "Could not get messages: unspecified error"
-msgstr "Could not get messages: unspecified error"
+#: camel/providers/nntp/camel-nntp-store.c:1262
+#, fuzzy
+msgid "Not connected."
+msgstr "No contacts"
 
-#: camel/providers/nntp/camel-nntp-summary.c:378
+#: camel/providers/nntp/camel-nntp-store.c:1311
 #, c-format
-msgid "NNTP Command failed: %s"
-msgstr "NNTP Command failed: %s"
+msgid "No such folder: %s"
+msgstr "No such folder: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:438
-#: camel/providers/nntp/camel-nntp-summary.c:543
+#: camel/providers/nntp/camel-nntp-summary.c:218
+#: camel/providers/nntp/camel-nntp-summary.c:314
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Scanning new messages"
 
-#: camel/providers/nntp/camel-nntp-summary.c:558
-#, c-format
-msgid "Unknown server response: %s"
-msgstr "Unknown server response: %s"
+#: camel/providers/nntp/camel-nntp-summary.c:225
+#, fuzzy, c-format
+msgid "Unexpected server response from xover: %s"
+msgstr "Unexpected response from IMAP server: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:328
+#, fuzzy, c-format
+msgid "Unexpected server response from head: %s"
+msgstr "Unexpected response from GnuPG: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:605
+#: camel/providers/nntp/camel-nntp-summary.c:368
 msgid "Use cancel"
 msgstr "Use cancel"
 
-#: camel/providers/nntp/camel-nntp-summary.c:607
+#: camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Operation failed: %s"
@@ -11789,19 +11482,19 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
+#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:408
 msgid "attachment"
 msgstr "attachment"
 
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:454
 msgid "Remove selected items from the attachment list"
 msgstr "Remove selected items from the attachment list"
 
-#: composer/e-msg-composer-attachment-bar.c:491
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Add attachment..."
 msgstr "Add attachment..."
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:495
 msgid "Attach a file to the message"
 msgstr "Attach a file to the message"
 
@@ -12009,17 +11702,19 @@ msgstr "Attach file(s)"
 
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
-msgid "You cannot attach the file `${0}' to this message."
+#, fuzzy
+msgid "You cannot attach the file `{0}' to this message."
 msgstr "You cannot attach the file `${0}' to this message."
 
 #. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4
-msgid "${1}"
-msgstr "${1}"
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr "{1}"
 
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+#, fuzzy
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr "The file `${0}' is not a regular file and cannot be sent in a message."
 
 #. mail-composer:attach-directory primary
@@ -12113,7 +11808,8 @@ msgstr "Could not create message."
 
 #. mail-composer:no-build-message secondary
 #: composer/mail-composer-errors.xml.h:34
-msgid "Because \"${0}\", you may need to select different mail options."
+#, fuzzy
+msgid "Because \"{0}\", you may need to select different mail options."
 msgstr "Because \"${0}\", you may need to select different mail options."
 
 #. mail-composer:no-sig-file primary
@@ -12122,9 +11818,11 @@ msgid "Could not read signature file \"{0}\"."
 msgstr "Could not read signature file \"{0}\"."
 
 #. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38
-msgid "Because \"${1}\"."
-msgstr "Because \"${1}\"."
+#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr "Because \"{1}\"."
 
 #. mail-composer:all-accounts-deleted primary
 #: composer/mail-composer-errors.xml.h:40
@@ -12287,16 +11985,12 @@ msgstr "Sync Categories:"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
 #: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
 #: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M"
@@ -12348,31 +12042,23 @@ msgid "%m/%d/%Y %H"
 msgstr "%d/%m/%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#. strftime format of a time in 12-hour format.
 #: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#. strftime format of a time in 24-hour format.
 #: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
 #: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
 #: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
 msgid "%H:%M"
@@ -12469,7 +12155,6 @@ msgid "Missing file name."
 msgstr "Missing file name."
 
 #. filter:no-file secondary
-#. filter:bad-file secondary
 #: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
 msgid "You must specify a file name."
 msgstr "You must specify a file name."
@@ -12500,7 +12185,6 @@ msgid "Could not compile regular expression \"{1}\"."
 msgstr "Could not compile regular expression \"{1}\"."
 
 #. filter:no-name primary
-#. filter:no-name-vfolder primary
 #: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
 msgid "Missing name."
 msgstr "Missing name."
@@ -12530,6 +12214,7 @@ msgstr "Please choose another name."
 msgid "No sources selected."
 msgstr "No sources selected."
 
+#. filter:vfolder-no-source secondary
 #: filter/filter-errors.xml.h:36
 msgid ""
 "You must specify at least one folder as a source.\n"
@@ -12643,8 +12328,8 @@ msgstr "with all local folders"
 msgid "years"
 msgstr "years"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:1011
-#: mail/mail-config.c:76 mail/mail-config.glade.h:93
+#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
+#: mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Important"
 
@@ -12708,252 +12393,6 @@ msgstr "incoming"
 msgid "outgoing"
 msgstr "outgoing"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Adjust Score"
-msgstr "Adjust Score"
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Color"
-msgstr "Assign Colour"
-
-#: filter/libfilter-i18n.h:4
-msgid "Assign Score"
-msgstr "Assign Score"
-
-#: filter/libfilter-i18n.h:5
-msgid "Attachments"
-msgstr "Attachments"
-
-#: filter/libfilter-i18n.h:6
-msgid "Beep"
-msgstr "Beep"
-
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "contains"
-
-#: filter/libfilter-i18n.h:8
-msgid "Copy to Folder"
-msgstr "Copy to Folder"
-
-#: filter/libfilter-i18n.h:9
-msgid "Date received"
-msgstr "Date received"
-
-#: filter/libfilter-i18n.h:10
-msgid "Date sent"
-msgstr "Date sent"
-
-#: filter/libfilter-i18n.h:12
-msgid "Deleted"
-msgstr "Deleted"
-
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "does not contain"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "does not end with"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "does not exist"
-
-#: filter/libfilter-i18n.h:16
-msgid "does not return"
-msgstr "does not return"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "does not sound like"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "does not start with"
-
-#: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
-msgstr "Do Not Exist"
-
-#: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr "Draft"
-
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "ends with"
-
-#: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr "Exist"
-
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "exists"
-
-#: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr "Expression"
-
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr "Follow Up"
-
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "is"
-
-#: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr "is after"
-
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr "is before"
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr "is Flagged"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "is greater than"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "is less than"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "is not"
-
-#: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr "is not Flagged"
-
-#: filter/libfilter-i18n.h:36
-msgid "Junk Test"
-msgstr "Junk Test"
-
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
-#: widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Label"
-
-#: filter/libfilter-i18n.h:38
-msgid "Mailing list"
-msgstr "Mailing list"
-
-#: filter/libfilter-i18n.h:39
-msgid "Message Body"
-msgstr "Message Body"
-
-#: filter/libfilter-i18n.h:40
-msgid "Message Header"
-msgstr "Message Header"
-
-#: filter/libfilter-i18n.h:41
-msgid "Message is Junk"
-msgstr "Message is Junk"
-
-#: filter/libfilter-i18n.h:42
-msgid "Message is not Junk"
-msgstr "Message is not Junk"
-
-#: filter/libfilter-i18n.h:43
-msgid "Move to Folder"
-msgstr "Move to Folder"
-
-#: filter/libfilter-i18n.h:44
-msgid "Pipe to Program"
-msgstr "Pipe to Program"
-
-#: filter/libfilter-i18n.h:45
-msgid "Play Sound"
-msgstr "Play Sound"
-
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Read"
-
-#: filter/libfilter-i18n.h:47
-msgid "Recipients"
-msgstr "Recipients"
-
-#: filter/libfilter-i18n.h:48
-msgid "Regex Match"
-msgstr "Regex Match"
-
-#: filter/libfilter-i18n.h:49
-msgid "Replied to"
-msgstr "Replied to"
-
-#: filter/libfilter-i18n.h:50
-msgid "returns"
-msgstr "returns"
-
-#: filter/libfilter-i18n.h:51
-msgid "returns greater than"
-msgstr "returns greater than"
-
-#: filter/libfilter-i18n.h:52
-msgid "returns less than"
-msgstr "returns less than"
-
-#: filter/libfilter-i18n.h:53
-msgid "Run Program"
-msgstr "Run Program"
-
-#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Score"
-
-#: filter/libfilter-i18n.h:55
-msgid "Sender"
-msgstr "Sender"
-
-#: filter/libfilter-i18n.h:56
-msgid "Set Status"
-msgstr "Set Status"
-
-#: filter/libfilter-i18n.h:57
-msgid "Size (kB)"
-msgstr "Size (kB)"
-
-#: filter/libfilter-i18n.h:58
-msgid "sounds like"
-msgstr "sounds like"
-
-#: filter/libfilter-i18n.h:59
-msgid "Source Account"
-msgstr "Source Account"
-
-#: filter/libfilter-i18n.h:60
-msgid "Specific header"
-msgstr "Specific header"
-
-#: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "starts with"
-
-#: filter/libfilter-i18n.h:63
-msgid "Stop Processing"
-msgstr "Stop Processing"
-
-#: filter/libfilter-i18n.h:64 mail/em-format.c:755 mail/em-format-html.c:1519
-#: mail/em-format-quote.c:302 mail/em-mailer-prefs.c:87
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
-#: smime/lib/e-cert.c:1079
-msgid "Subject"
-msgstr "Subject"
-
-#: filter/libfilter-i18n.h:65
-msgid "Unset Status"
-msgstr "Unset Status"
-
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Add Rule"
@@ -12970,6 +12409,11 @@ msgstr "Rule name"
 msgid "_Score Rules"
 msgstr "_Score Rules"
 
+#: filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Score"
+
 #: filter/searchtypes.xml.h:1
 msgid "Body contains"
 msgstr "Body contains"
@@ -13048,13 +12492,13 @@ msgstr "Signature(s)"
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Forwarded Message --------"
 
-#: mail/em-composer-utils.c:1499
+#: mail/em-composer-utils.c:1495
 msgid "an unknown sender"
 msgstr "an unknown sender"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1509
+#: mail/em-composer-utils.c:1505
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "On %a, %Y-%d-%m at %H:%M %%+05d, %%s wrote:"
 
@@ -13092,8 +12536,8 @@ msgstr "<click here to select a folder>"
 msgid "Create New Folder"
 msgstr "Create New Folder"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
-#: mail/mail-component.c:706
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
+#: mail/mail-component.c:704
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Specify where to create the folder:"
@@ -13107,96 +12551,97 @@ msgstr "Create"
 msgid "Folder _name:"
 msgstr "Folder _name:"
 
-#: mail/em-folder-tree.c:839
+#: mail/em-folder-tree.c:833
 #, c-format
 msgid "Moving folder %s"
 msgstr "Moving folder %s"
 
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree.c:835
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copying folder %s"
 
-#: mail/em-folder-tree.c:848 mail/message-list.c:1561
+#: mail/em-folder-tree.c:842 mail/message-list.c:1561
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Moving messages into folder %s"
 
-#: mail/em-folder-tree.c:850 mail/message-list.c:1563
+#: mail/em-folder-tree.c:844 mail/message-list.c:1563
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copying messages into folder %s"
 
-#: mail/em-folder-tree.c:866
+#: mail/em-folder-tree.c:860
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Cannot drop message(s) into toplevel store"
 
-#: mail/em-folder-tree.c:956 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Copy to Folder"
 
-#: mail/em-folder-tree.c:957 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Move to Folder"
 
-#: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2069
-#: mail/em-folder-tree.c:2556 mail/em-folder-view.c:798
+#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
+#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
 #: mail/message-list.c:1651
 msgid "_Move"
 msgstr "_Move"
 
-#: mail/em-folder-tree.c:961 mail/message-list.c:1653
+#: mail/em-folder-tree.c:955 mail/message-list.c:1653
 msgid "Cancel _Drag"
 msgstr "Cancel _Drag"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
 #: mail/em-folder-view.c:798 mail/em-folder-view.c:812
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Select folder"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
 msgid "C_opy"
 msgstr "C_opy"
 
-#: mail/em-folder-tree.c:2096
+#: mail/em-folder-tree.c:2088
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Creating folder `%s'"
 
-#: mail/em-folder-tree.c:2282 mail/mail-component.c:706
+#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
 msgid "Create folder"
 msgstr "Create folder"
 
-#: mail/em-folder-tree.c:2477
+#: mail/em-folder-tree.c:2463
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Rename the \"%s\" folder to:"
 
-#: mail/em-folder-tree.c:2479
+#: mail/em-folder-tree.c:2465
 msgid "Rename Folder"
 msgstr "Rename Folder"
 
-#: mail/em-folder-tree.c:2550 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_View"
 
-#: mail/em-folder-tree.c:2551
+#: mail/em-folder-tree.c:2537
 msgid "Open in _New Window"
 msgstr "Open in _New Window"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2560
+#: mail/em-folder-tree.c:2546
 msgid "_New Folder..."
 msgstr "_New Folder..."
 
-#: mail/em-folder-tree.c:2563
+#: mail/em-folder-tree.c:2549
 msgid "_Rename"
 msgstr "_Rename"
 
-#: mail/em-folder-tree.c:2566 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Properties..."
 
@@ -13215,14 +12660,14 @@ msgstr "UNMATCHED"
 msgid "Inbox"
 msgstr "Inbox"
 
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
 msgid "Loading..."
 msgstr "Loading..."
 
 #: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
 #: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:510
-#: mail/mail-component.c:556
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
+#: mail/mail-component.c:554
 msgid "Mail"
 msgstr "Mail"
 
@@ -13303,6 +12748,10 @@ msgstr "Mo_ve to Folder..."
 msgid "_Copy to Folder..."
 msgstr "_Copy to Folder..."
 
+#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Label"
+
 #: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Add Sender to Address_book"
@@ -13396,6 +12845,12 @@ msgstr "Cc"
 msgid "Bcc"
 msgstr "Bcc"
 
+#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
+#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Subject"
+
 #: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
 #: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
 msgid "Date"
@@ -13598,7 +13053,7 @@ msgstr ""
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
 
-#: mail/em-format-html-display.c:757
+#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
 msgid "_View Certificate"
 msgstr "_View Certificate"
 
@@ -14325,15 +13780,15 @@ msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution is importing your old Elm mail"
 
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:226
+#: mail/importers/evolution-mbox-importer.c:221
+#: mail/importers/evolution-outlook-importer.c:255
 #: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Importing..."
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:222
-#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/evolution-mbox-importer.c:223
+#: mail/importers/evolution-outlook-importer.c:257
 #: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Please wait"
@@ -14355,21 +13810,23 @@ msgid "Elm"
 msgstr "Elm"
 
 #: mail/importers/evolution-mbox-importer.c:116
+#: mail/importers/evolution-outlook-importer.c:130
 msgid "Destination folder:"
 msgstr "Destination folder:"
 
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder to import into"
 msgstr "Select folder to import into"
 
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:254
 #: mail/importers/mail-importer.c:226
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importing `%s'"
 
-#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/evolution-outlook-importer.c:301
 #: mail/importers/mail-importer.c:140
 msgid "Importing mailbox"
 msgstr "Importing mailbox"
@@ -14571,66 +14028,66 @@ msgstr "%s mailing list"
 msgid "Add Filter Rule"
 msgstr "Add Filter Rule"
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:461
 #, c-format
 msgid "%d deleted"
 msgstr "%d deleted"
 
-#: mail/mail-component.c:465
+#: mail/mail-component.c:463
 #, c-format
 msgid "%d junk"
 msgstr "%d junk"
 
-#: mail/mail-component.c:488
+#: mail/mail-component.c:486
 #, c-format
 msgid "%d drafts"
 msgstr "%d drafts"
 
-#: mail/mail-component.c:490
+#: mail/mail-component.c:488
 #, c-format
 msgid "%d sent"
 msgstr "%d sent"
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:490
 #, c-format
 msgid "%d unsent"
 msgstr "%d unsent"
 
-#: mail/mail-component.c:496
+#: mail/mail-component.c:494
 #, c-format
 msgid "%d total"
 msgstr "%d total"
 
-#: mail/mail-component.c:498
+#: mail/mail-component.c:496
 #, c-format
 msgid ", %d unread"
 msgstr ", %d unread"
 
-#: mail/mail-component.c:658
+#: mail/mail-component.c:656
 msgid "New Mail Message"
 msgstr "New Mail Message"
 
-#: mail/mail-component.c:659
+#: mail/mail-component.c:657
 msgid "_Mail Message"
 msgstr "_Mail Message"
 
-#: mail/mail-component.c:660
+#: mail/mail-component.c:658
 msgid "Compose a new mail message"
 msgstr "Compose a new mail message"
 
-#: mail/mail-component.c:666
+#: mail/mail-component.c:664
 msgid "New Mail Folder"
 msgstr "New Mail Folder"
 
-#: mail/mail-component.c:667
+#: mail/mail-component.c:665
 msgid "Mail _Folder"
 msgstr "Mail _Folder"
 
-#: mail/mail-component.c:668
+#: mail/mail-component.c:666
 msgid "Create a new mail folder"
 msgstr "Create a new mail folder"
 
-#: mail/mail-component.c:800
+#: mail/mail-component.c:798
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Failed upgrading Mail settings or folders."
 
@@ -15334,6 +14791,7 @@ msgstr ""
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "Are you sure you want to send a message in HTML format?"
 
+#. mail:ask-send-html secondary
 #: mail/mail-errors.xml.h:12
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
@@ -15366,11 +14824,11 @@ msgstr ""
 "an idea of the topic of your letter."
 
 #. mail:ask-send-only-bcc-contact primary
-#. mail:ask-send-only-bcc primary
 #: mail/mail-errors.xml.h:22 mail/mail-errors.xml.h:29
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "Are you sure you want to send a message with only BCC recipients?"
 
+#. mail:ask-send-only-bcc-contact secondary
 #: mail/mail-errors.xml.h:24
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
@@ -15444,7 +14902,6 @@ msgstr ""
 "folder \"{0}\"?"
 
 #. mail:ask-expunge secondary
-#. mail:ask-empty-trash secondary
 #: mail/mail-errors.xml.h:45 mail/mail-errors.xml.h:50
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "If you continue, you will not be able to recover these messages."
@@ -15482,9 +14939,11 @@ msgstr ""
 
 #. mail:camel-exception primary
 #: mail/mail-errors.xml.h:57
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+#, fuzzy
+msgid "Your message with the subject \"{0}\" was not delivered."
 msgstr "Your message message, with the subject \"{0}\" was not delivered."
 
+#. mail:camel-exception secondary
 #: mail/mail-errors.xml.h:59
 msgid ""
 "The message was sent via the \"sendmail\" external application.  Sendmail "
@@ -15518,13 +14977,6 @@ msgid "{0}."
 msgstr "{0}."
 
 #. mail:session-message-info secondary
-#. mail:session-message-info-cancel secondary
-#. mail:session-message-warning secondary
-#. mail:session-message-warning-cancel secondary
-#. mail:session-message-error secondary
-#. mail:session-message-error-cancel secondary
-#. mail:ask-session-password secondary
-#. mail:filter-load-error secondary
 #: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
 #: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
 #: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
@@ -15547,14 +14999,7 @@ msgstr "Error loading filter definitions."
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Cannot save to directory \"{0}\"."
 
-#. mail:no-save-path secondary
-#: mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr "{1}"
-
 #. mail:no-create-path primary
-#. mail:no-write-path-exists primary
-#. mail:no-write-path-notfile primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
 msgid "Cannot save to file \"{0}\"."
@@ -15570,15 +15015,6 @@ msgstr "Cannot create the save directory, because \"{1}\""
 msgid "Cannot create temporary save directory."
 msgstr "Cannot create temporary save directory."
 
-#. mail:no-create-tmp-path secondary
-#. mail:no-delete-folder secondary
-#. system:no-save-file secondary
-#. system:no-load-file secondary
-#: mail/mail-errors.xml.h:100 mail/mail-errors.xml.h:112
-#: widgets/misc/e-system-errors.xml.h:11 widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr "Because \"{1}\"."
-
 #. mail:no-write-path-exists secondary
 #: mail/mail-errors.xml.h:104
 msgid "File exists but cannot overwrite it."
@@ -15600,7 +15036,6 @@ msgid "Cannot delete system folder \"{0}\"."
 msgstr "Cannot delete system folder \"{0}\"."
 
 #. mail:no-delete-spethal-folder secondary
-#. mail:no-rename-spethal-folder secondary
 #: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
@@ -15634,13 +15069,11 @@ msgstr ""
 "will be deleted permanently."
 
 #. mail:no-rename-folder-exists primary
-#. mail:no-rename-folder primary
 #: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "Cannot rename \"{0}\" to \"{1}\"."
 
 #. mail:no-rename-folder-exists secondary
-#. mail:vfolder-notunique secondary
 #: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr "A folder named \"{1}\" already exists. Please use a different name."
@@ -15651,25 +15084,21 @@ msgid "Because \"{2}\"."
 msgstr "Because \"{2}\"."
 
 #. mail:no-move-folder-nostore primary
-#. mail:no-move-folder-to-nostore primary
 #: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Cannot move folder \"{0}\" to \"{1}\"."
 
 #. mail:no-move-folder-nostore secondary
-#. mail:no-copy-folder-nostore secondary
 #: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
 msgid "Cannot open source \"{2}\"."
 msgstr "Cannot open source \"{2}\"."
 
 #. mail:no-move-folder-to-nostore secondary
-#. mail:no-copy-folder-to-nostore secondary
 #: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
 msgid "Cannot open target \"{2}\"."
 msgstr "Cannot open target \"{2}\"."
 
 #. mail:no-copy-folder-nostore primary
-#. mail:no-copy-folder-to-nostore primary
 #: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "Cannot copy folder \"{0}\" to \"{1}\"."
@@ -15685,7 +15114,6 @@ msgid "Cannot open source \"{1}\""
 msgstr "Cannot open source \"{1}\""
 
 #. mail:account-incomplete primary
-#. mail:account-notunique primary
 #: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
 msgid "Cannot save changes to account."
 msgstr "Cannot save changes to account."
@@ -15782,6 +15210,7 @@ msgstr "Cannot add vFolder \"{0}\"."
 msgid "vFolders automatically updated."
 msgstr "vFolders automatically updated."
 
+#. mail:vfolder-updated secondary
 #: mail/mail-errors.xml.h:196
 msgid ""
 "The following vFolder(s):\n"
@@ -15801,6 +15230,7 @@ msgstr ""
 msgid "Mail filters automatically updated."
 msgstr "Mail filters automatically updated."
 
+#. mail:filter-updated secondary
 #: mail/mail-errors.xml.h:204
 msgid ""
 "The following filter rule(s):\n"
@@ -15820,6 +15250,7 @@ msgstr ""
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Problem migrating old mail folder \"{0}\"."
 
+#. mail:ask-migrate-existing secondary
 #: mail/mail-errors.xml.h:212
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
@@ -15844,7 +15275,7 @@ msgstr "_Overwrite"
 msgid "_Append"
 msgstr "_Append"
 
-#: mail/mail-folder-cache.c:791
+#: mail/mail-folder-cache.c:785
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinging %s"
@@ -16284,6 +15715,10 @@ msgstr "Forward"
 msgid "No Response Necessary"
 msgstr "No Response Necessary"
 
+#: mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Read"
+
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Reply"
@@ -16387,43 +15822,47 @@ msgstr ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid "Toolbar is visible"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Whether Evolution should start up in offline mode"
 msgstr "Whether Evolution should start up in offline mode"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Whether the toolbar should be visible."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
 msgid "Whether to skip the development warning dialog"
 msgstr "Whether to skip the development warning dialog"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
+#: shell/apps_evolution_shell.schemas.in.in.h:14
 msgid "mail"
 msgstr "mail"
 
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
-msgstr "Brought to you by"
-
-#: shell/e-shell.c:545 shell/e-shell.c:546
+#: shell/e-shell.c:588 shell/e-shell.c:589
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: shell/e-shell.c:743
+#: shell/e-shell.c:786
 msgid "Uknown system error."
 msgstr "Uknown system error."
 
-#: shell/e-shell.c:1100
+#: shell/e-shell.c:1143
 msgid "Invalid arguments"
 msgstr "Invalid arguments"
 
-#: shell/e-shell.c:1102
+#: shell/e-shell.c:1145
 msgid "Cannot register on OAF"
 msgstr "Cannot register on OAF"
 
-#: shell/e-shell.c:1104
+#: shell/e-shell.c:1147
 msgid "Configuration Database not found"
 msgstr "Configuration Database not found"
 
-#: shell/e-shell.c:1106
+#: shell/e-shell.c:1149
 msgid "Generic error"
 msgstr "Generic error"
 
@@ -16482,7 +15921,7 @@ msgstr ""
 msgid "Select importer"
 msgstr "Select importer"
 
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1026
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
 #, c-format
 msgid "File %s does not exist"
 msgstr "File %s does not exist"
@@ -16510,31 +15949,32 @@ msgstr ""
 "Importing %s\n"
 "Importing item 1."
 
-#: shell/e-shell-importer.c:549
+#: shell/e-shell-importer.c:570
 msgid "Automatic"
 msgstr "Automatic"
 
-#: shell/e-shell-importer.c:598
-msgid "_Filename:"
-msgstr "_Filename:"
+#: shell/e-shell-importer.c:626
+#, fuzzy
+msgid "F_ilename:"
+msgstr "File name:"
 
-#: shell/e-shell-importer.c:603
+#: shell/e-shell-importer.c:631
 msgid "Select a file"
 msgstr "Select a file"
 
-#: shell/e-shell-importer.c:613
+#: shell/e-shell-importer.c:642
 msgid "File _type:"
 msgstr "File _type:"
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:681
 msgid "Import data and settings from _older programs"
 msgstr "Import data and settings from _older programs"
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:684
 msgid "Import a _single file"
 msgstr "Import a _single file"
 
-#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -16542,25 +15982,25 @@ msgstr ""
 "Please wait...\n"
 "Scanning for existing setups"
 
-#: shell/e-shell-importer.c:727
+#: shell/e-shell-importer.c:756
 msgid "Starting Intelligent Importers"
 msgstr "Starting Intelligent Importers"
 
-#: shell/e-shell-importer.c:853 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
 #, c-format
 msgid "From %s:"
 msgstr "From %s:"
 
-#: shell/e-shell-importer.c:1044
+#: shell/e-shell-importer.c:1073
 #, c-format
 msgid "No importer available for file %s"
 msgstr "No importer available for file %s"
 
-#: shell/e-shell-importer.c:1056
+#: shell/e-shell-importer.c:1085
 msgid "Unable to execute importer"
 msgstr "Unable to execute importer"
 
-#: shell/e-shell-importer.c:1169
+#: shell/e-shell-importer.c:1199
 msgid "_Import"
 msgstr "_Import"
 
@@ -16610,53 +16050,54 @@ msgstr "Folder name cannot contain the character \"#\"."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' and '..' are reserved folder names."
 
-#: shell/e-shell-window.c:336
+#: shell/e-shell-window.c:337
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr "Evolution is currently online.  Click on this button to work offline."
 
-#: shell/e-shell-window.c:343
+#: shell/e-shell-window.c:344
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution is in the process of going offline."
 
-#: shell/e-shell-window.c:349
+#: shell/e-shell-window.c:350
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr "Evolution is currently offline.  Click on this button to work online."
 
-#: shell/e-shell-window.c:621
+#: shell/e-shell-window.c:637
 #, c-format
 msgid "Switch to %s"
 msgstr "Switch to %s"
 
-#: shell/e-shell-window-commands.c:64
+#: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "The GNOME Pilot tools do not appear to be installed on this system."
 
-#: shell/e-shell-window-commands.c:72
+#: shell/e-shell-window-commands.c:74
 #, c-format
 msgid "Error executing %s."
 msgstr "Error executing %s."
 
-#: shell/e-shell-window-commands.c:121
+#: shell/e-shell-window-commands.c:123
 msgid "Bug buddy is not installed."
 msgstr "Bug buddy is not installed."
 
-#: shell/e-shell-window-commands.c:129
+#: shell/e-shell-window-commands.c:131
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy could not be run."
 
-#: shell/e-shell-window-commands.c:171
-msgid "About Evolution"
-msgstr "About Evolution"
+#: shell/e-shell-window-commands.c:323
+#, fuzzy
+msgid "Groupware Suite"
+msgstr "Groupwise"
 
-#: shell/e-shell-window-commands.c:382
+#: shell/e-shell-window-commands.c:563
 msgid "_Work Online"
 msgstr "_Work Online"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "_Work Offline"
 
-#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Work Offline"
 
@@ -16840,8 +16281,9 @@ msgstr "Don't ask me again"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution can import data from the following files:"
 
+#. Preview/Alpha/Beta version warning message
 #: shell/main.c:231
-#, c-format
+#, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
@@ -16929,6 +16371,7 @@ msgstr ""
 msgid "Insufficient disk space for upgrade."
 msgstr "Insufficient disk space for upgrade."
 
+#. shell:upgrade-nospace secondary
 #: shell/shell-errors.xml.h:4
 msgid ""
 "Upgrading your data and settings will require upto {0} of disk space, but "
@@ -16943,6 +16386,7 @@ msgstr ""
 "You will need to make more space available in your home directory before you "
 "can continue."
 
+#. shell:upgrade-failed primary
 #: shell/shell-errors.xml.h:8
 msgid ""
 "Upgrade from previous version failed:\n"
@@ -16951,6 +16395,7 @@ msgstr ""
 "Upgrade from previous version failed:\n"
 "{0}"
 
+#. shell:upgrade-failed secondary
 #: shell/shell-errors.xml.h:11
 msgid ""
 "{1}\n"
@@ -16968,17 +16413,16 @@ msgid "Continue"
 msgstr "Continue"
 
 #. shell:noshell title
-#. shell:noshell-reason title
 #: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
 msgid "Cannot start Evolution"
 msgstr "Cannot start Evolution"
 
 #. shell:noshell primary
-#. shell:noshell-reason primary
 #: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
 msgid "Evolution can not start."
 msgstr "Evolution cannot start."
 
+#. shell:noshell secondary
 #: shell/shell-errors.xml.h:21
 msgid ""
 "Your system configuration does not match your Evolution configuration.\n"
@@ -16989,6 +16433,7 @@ msgstr ""
 "\n"
 "Click help for details"
 
+#. shell:noshell-reason secondary
 #: shell/shell-errors.xml.h:29
 msgid ""
 "Your system configuration does not match your Evolution configuration:\n"
@@ -17003,30 +16448,30 @@ msgstr ""
 "\n"
 "Click help for details."
 
-#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:522
+#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
+#: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
 msgstr "Select a cert to import..."
 
-#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:604
+#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
+#: smime/gui/certificate-manager.c:638
 msgid "Certificate Name"
 msgstr "Certificate Name"
 
-#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
+#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
 msgid "Purposes"
 msgstr "Purposes"
 
-#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:517
+#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr "Serial Number"
 
-#: smime/gui/certificate-manager.c:267
+#: smime/gui/certificate-manager.c:271
 msgid "Expires"
 msgstr "Expires"
 
-#: smime/gui/certificate-manager.c:417
+#: smime/gui/certificate-manager.c:446
 msgid "E-Mail Address"
 msgstr "E-Mail Address"
 
@@ -17128,7 +16573,7 @@ msgstr ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
 msgid "Certificate"
 msgstr "Certificate"
 
@@ -17148,19 +16593,23 @@ msgstr "Common Name (CN)"
 msgid "Contact Certificates"
 msgstr "Contact Certificates"
 
-#: smime/gui/smime-ui.glade.h:21
-#, no-c-format
-msgid "Do you want to trust \"%s\" for the following purposes?"
-msgstr "Do you want to trust \"%s\" for the following purposes?"
+#: smime/gui/smime-ui.glade.h:20
+msgid "Do not trust the authenticity of this certificate"
+msgstr ""
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:21
 msgid "Dummy window only"
 msgstr "Dummy window only"
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:22
 msgid "Edit"
 msgstr "Edit"
 
+#: smime/gui/smime-ui.glade.h:23
+#, fuzzy
+msgid "Email Certificate Trust Settings"
+msgstr "Email Certificate Authority"
+
 #: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr "Email Recipient Certificate"
@@ -17193,243 +16642,254 @@ msgstr "Organizational Unit (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 Fingerprint"
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr "SSL Client Certificate"
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr "SSL Server Certificate"
 
 #: smime/gui/smime-ui.glade.h:37
+msgid "Trust the authenticity of this certificate"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
 msgid "Trust this CA to identify email users."
 msgstr "Trust this CA to identify email users."
 
-#: smime/gui/smime-ui.glade.h:38
+#: smime/gui/smime-ui.glade.h:39
 msgid "Trust this CA to identify software developers."
 msgstr "Trust this CA to identify software developers."
 
-#: smime/gui/smime-ui.glade.h:39
+#: smime/gui/smime-ui.glade.h:40
 msgid "Trust this CA to identify web sites."
 msgstr "Trust this CA to identify web sites."
 
-#: smime/gui/smime-ui.glade.h:40
+#: smime/gui/smime-ui.glade.h:41
 msgid "View"
 msgstr "View"
 
-#: smime/gui/smime-ui.glade.h:41
-msgid "View Certificate"
-msgstr "View Certificate"
-
 #: smime/gui/smime-ui.glade.h:42
-msgid "You have been asked to trust a new Certificate Authority (CA)."
-msgstr "You have been asked to trust a new Certificate Authority (CA)."
-
-#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr "You have certificates from these organizations that identify you:"
 
-#: smime/gui/smime-ui.glade.h:44
+#: smime/gui/smime-ui.glade.h:43
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 "You have certificates on file that identify these certificate authorities:"
 
-#: smime/gui/smime-ui.glade.h:45
+#: smime/gui/smime-ui.glade.h:44
 msgid "You have certificates on file that identify these people:"
 msgstr "You have certificates on file that identify these people:"
 
-#: smime/gui/smime-ui.glade.h:46
+#: smime/gui/smime-ui.glade.h:45
 msgid "Your Certificates"
 msgstr "Your Certificates"
 
-#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
+#: smime/gui/smime-ui.glade.h:46
+msgid "_Edit CA Trust"
+msgstr ""
+
+#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
-#: smime/lib/e-cert.c:478
+#. x509 certificate usage types
+#: smime/lib/e-cert.c:424
+#, fuzzy
+msgid "Sign"
+msgstr "Signing"
+
+#: smime/lib/e-cert.c:425
+#, fuzzy
+msgid "Encrypt"
+msgstr "Encrypted"
+
+#: smime/lib/e-cert.c:530
 msgid "Version"
 msgstr "Version"
 
-#: smime/lib/e-cert.c:493
+#: smime/lib/e-cert.c:545
 msgid "Version 1"
 msgstr "Version 1"
 
-#: smime/lib/e-cert.c:496
+#: smime/lib/e-cert.c:548
 msgid "Version 2"
 msgstr "Version 2"
 
-#: smime/lib/e-cert.c:499
+#: smime/lib/e-cert.c:551
 msgid "Version 3"
 msgstr "Version 3"
 
-#: smime/lib/e-cert.c:581
+#: smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 With RSA Encryption"
 
-#: smime/lib/e-cert.c:584
+#: smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 With RSA Encryption"
 
-#: smime/lib/e-cert.c:587
+#: smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 With RSA Encryption"
 
-#: smime/lib/e-cert.c:590
+#: smime/lib/e-cert.c:642
 msgid "C"
 msgstr "C"
 
-#: smime/lib/e-cert.c:593
+#: smime/lib/e-cert.c:645
 msgid "CN"
 msgstr "CN"
 
-#: smime/lib/e-cert.c:596
+#: smime/lib/e-cert.c:648
 msgid "OU"
 msgstr "OU"
 
-#: smime/lib/e-cert.c:599
+#: smime/lib/e-cert.c:651
 msgid "O"
 msgstr "O"
 
-#: smime/lib/e-cert.c:602
+#: smime/lib/e-cert.c:654
 msgid "L"
 msgstr "L"
 
-#: smime/lib/e-cert.c:605
+#: smime/lib/e-cert.c:657
 msgid "DN"
 msgstr "DN"
 
-#: smime/lib/e-cert.c:608
+#: smime/lib/e-cert.c:660
 msgid "DC"
 msgstr "DC"
 
-#: smime/lib/e-cert.c:611
+#: smime/lib/e-cert.c:663
 msgid "ST"
 msgstr "ST"
 
-#: smime/lib/e-cert.c:614
+#: smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA Encryption"
 
-#: smime/lib/e-cert.c:617
+#: smime/lib/e-cert.c:669
 msgid "Certificate Key Usage"
 msgstr "Certificate Key Usage"
 
-#: smime/lib/e-cert.c:620
+#: smime/lib/e-cert.c:672
 msgid "Netscape Certificate Type"
 msgstr "Netscape Certificate Type"
 
-#: smime/lib/e-cert.c:623
+#: smime/lib/e-cert.c:675
 msgid "Certificate Authority Key Identifier"
 msgstr "Certificate Authority Key Identifier"
 
-#: smime/lib/e-cert.c:626
+#: smime/lib/e-cert.c:678
 msgid "UID"
 msgstr "UID"
 
-#: smime/lib/e-cert.c:635
+#: smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Object Identifier (%s)"
 
-#: smime/lib/e-cert.c:686
+#: smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
 msgstr "Algorithm Identifier"
 
-#: smime/lib/e-cert.c:694
+#: smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
 msgstr "Algorithm Parameters"
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:768
 msgid "Subject Public Key Info"
 msgstr "Subject Public Key Info"
 
-#: smime/lib/e-cert.c:721
+#: smime/lib/e-cert.c:773
 msgid "Subject Public Key Algorithm"
 msgstr "Subject Public Key Algorithm"
 
-#: smime/lib/e-cert.c:736
+#: smime/lib/e-cert.c:788
 msgid "Subject's Public Key"
 msgstr "Subject's Public Key"
 
-#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
+#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
 msgid "Error: Unable to process extension"
 msgstr "Error: Unable to process extension"
 
-#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
+#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr "Object Signer"
 
-#: smime/lib/e-cert.c:782
+#: smime/lib/e-cert.c:834
 msgid "SSL Certificate Authority"
 msgstr "SSL Certificate Authority"
 
-#: smime/lib/e-cert.c:786
+#: smime/lib/e-cert.c:838
 msgid "Email Certificate Authority"
 msgstr "Email Certificate Authority"
 
-#: smime/lib/e-cert.c:814
+#: smime/lib/e-cert.c:866
 msgid "Signing"
 msgstr "Signing"
 
-#: smime/lib/e-cert.c:818
+#: smime/lib/e-cert.c:870
 msgid "Non-repudiation"
 msgstr "Non-repudiation"
 
-#: smime/lib/e-cert.c:822
+#: smime/lib/e-cert.c:874
 msgid "Key Encipherment"
 msgstr "Key Encipherment"
 
-#: smime/lib/e-cert.c:826
+#: smime/lib/e-cert.c:878
 msgid "Data Encipherment"
 msgstr "Data Encipherment"
 
-#: smime/lib/e-cert.c:830
+#: smime/lib/e-cert.c:882
 msgid "Key Agreement"
 msgstr "Key Agreement"
 
-#: smime/lib/e-cert.c:834
+#: smime/lib/e-cert.c:886
 msgid "Certificate Signer"
 msgstr "Certificate Signer"
 
-#: smime/lib/e-cert.c:838
+#: smime/lib/e-cert.c:890
 msgid "CRL Signer"
 msgstr "CRL Signer"
 
-#: smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:938
 msgid "Critical"
 msgstr "Critical"
 
-#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
+#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
 msgid "Not Critical"
 msgstr "Not Critical"
 
-#: smime/lib/e-cert.c:912
+#: smime/lib/e-cert.c:964
 msgid "Extensions"
 msgstr "Extensions"
 
-#: smime/lib/e-cert.c:983
+#: smime/lib/e-cert.c:1035
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
 msgid "Certificate Signature Algorithm"
 msgstr "Certificate Signature Algorithm"
 
-#: smime/lib/e-cert.c:1048
+#: smime/lib/e-cert.c:1100
 msgid "Issuer"
 msgstr "Issuer"
 
-#: smime/lib/e-cert.c:1102
+#: smime/lib/e-cert.c:1154
 msgid "Issuer Unique ID"
 msgstr "Issuer Unique ID"
 
-#: smime/lib/e-cert.c:1121
+#: smime/lib/e-cert.c:1173
 msgid "Subject Unique ID"
 msgstr "Subject Unique ID"
 
-#: smime/lib/e-cert.c:1164
+#: smime/lib/e-cert.c:1216
 msgid "Certificate Signature Value"
 msgstr "Certificate Signature Value"
 
@@ -17579,7 +17039,7 @@ msgstr "View the current contact"
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "_Actions"
 
@@ -17738,7 +17198,7 @@ msgstr "C_lose"
 #: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:3
+#: ui/evolution.xml.h:4
 msgid "Close"
 msgstr "Close"
 
@@ -17751,7 +17211,7 @@ msgid "Delete this item"
 msgstr "Delete this item"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr "Main toolbar"
 
@@ -17794,7 +17254,7 @@ msgstr "Save this item to disk"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:44
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "_File"
 msgstr "_File"
 
@@ -18052,13 +17512,13 @@ msgstr "_Invert Selection"
 msgid "_Threaded Message List"
 msgstr "_Threaded Message List"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Close this window"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "_Close"
 msgstr "_Close"
 
@@ -18454,7 +17914,7 @@ msgstr "_Previous Message"
 msgid "_Quoted"
 msgstr "_Quoted"
 
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
 msgid "_Tools"
 msgstr "_Tools"
 
@@ -18751,106 +18211,120 @@ msgid "_Open Task"
 msgstr "_Open Task"
 
 #: ui/evolution.xml.h:1
-msgid "About Ximian Evolution..."
-msgstr "About Ximian Evolution..."
+#, fuzzy
+msgid "About Evolution..."
+msgstr "About Evolution"
 
 #: ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
 msgstr "Change Evolution's settings"
 
-#: ui/evolution.xml.h:5
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the visibility of the toolbar"
+msgstr "Change the properties of this folder"
+
+#: ui/evolution.xml.h:6
 msgid "Create a new window displaying this folder"
 msgstr "Create a new window displaying this folder"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "E_xit"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Ximian Evolution _FAQ"
+
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Exit the program"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:10
 msgid "Forget _Passwords"
 msgstr "Forget _Passwords"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:11
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Forget remembered passwords so you will be prompted for them again"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:12
 msgid "Import data from other programs"
 msgstr "Import data from other programs"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:14
 msgid "New _Window"
 msgstr "New _Window"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Pi_lot Settings..."
 msgstr "Pi_lot Settings..."
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Send / Receive"
 msgstr "Send / Receive"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Send queued items and retrieve new items"
 msgstr "Send queued items and retrieve new items"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Set up Pilot configuration"
 msgstr "Set up Pilot configuration"
 
-#: ui/evolution.xml.h:17
-msgid "Show information about Ximian Evolution"
+#: ui/evolution.xml.h:19
+#, fuzzy
+msgid "Show information about Evolution"
 msgstr "Show information about Ximian Evolution"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:20
 msgid "Submit Bug Report"
 msgstr "Submit Bug Report"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:21
 msgid "Submit _Bug Report"
 msgstr "Submit _Bug Report"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Submit a bug report using Bug Buddy"
 
-#: ui/evolution.xml.h:21
-msgid "Toggle whether we are working offline."
-msgstr "Toggle whether we are working offline."
-
 #: ui/evolution.xml.h:23
-msgid "Ximian Evolution _FAQ"
-msgstr "Ximian Evolution _FAQ"
+#, fuzzy
+msgid "T_oolbar"
+msgstr "Main toolbar"
 
 #: ui/evolution.xml.h:24
-msgid "_About Ximian Evolution..."
-msgstr "_About Ximian Evolution..."
+msgid "Toggle whether we are working offline."
+msgstr "Toggle whether we are working offline."
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "_About Evolution..."
+msgstr "About Evolution"
+
+#: ui/evolution.xml.h:30
 msgid "_Help"
 msgstr "_Help"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "_Import..."
 msgstr "_Import..."
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "_New"
 msgstr "_New"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "_Quick Reference"
 msgstr "_Quick Reference"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_Send / Receive"
 msgstr "_Send / Receive"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 msgid "_Window"
 msgstr "_Window"
 
@@ -19242,6 +18716,469 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% complete)"
 
+#~ msgid "Failed to connect to LDAP server"
+#~ msgstr "Failed to connect to LDAP server"
+
+#~ msgid "Failed to authenticate with LDAP server"
+#~ msgstr "Failed to authenticate with LDAP server"
+
+#~ msgid "Could not perform query on Root DSE"
+#~ msgstr "Could not perform query on Root DSE"
+
+#~ msgid "The server responded with no supported search bases"
+#~ msgstr "The server responded with no supported search bases"
+
+#~ msgid "This server does not support LDAPv3 schema information"
+#~ msgstr "This server does not support LDAPv3 schema information"
+
+#~ msgid "Error retrieving schema information"
+#~ msgstr "Error retrieving schema information"
+
+#~ msgid "Server did not respond with valid schema information"
+#~ msgstr "Server did not respond with valid schema information"
+
+#~ msgid ""
+#~ "Some fields are no longer representable in the contact editor. Please "
+#~ "wait while Evolution copies those fields to the 'Notes' field..."
+#~ msgstr ""
+#~ "Some fields are no longer representable in the contact editor. Please "
+#~ "wait while Evolution copies those fields to the 'Notes' field..."
+
+#~ msgid "  S_how Supported Bases "
+#~ msgstr "  S_how Supported Bases "
+
+#~ msgid "1:00"
+#~ msgstr "1:00"
+
+#~ msgid "5:00"
+#~ msgstr "5:00"
+
+#~ msgid "Connecting"
+#~ msgstr "Connecting"
+
+#~ msgid "Distinguished _name:"
+#~ msgstr "Distinguished _name:"
+
+#~ msgid "Email address:"
+#~ msgstr "Email address:"
+
+#~ msgid "Evolution will use this DN to authenticate you with the server"
+#~ msgstr "Evolution will use this DN to authenticate you with the server"
+
+#~ msgid "One"
+#~ msgstr "One"
+
+#~ msgid "S_earch scope: "
+#~ msgstr "S_earch scope: "
+
+#~ msgid "Searching"
+#~ msgstr "Searching"
+
+#~ msgid "Sub"
+#~ msgstr "Sub"
+
+#~ msgid "This option controls how long a search will be run."
+#~ msgstr "This option controls how long a search will be run."
+
+#~ msgid "U_se SSL/TLS:"
+#~ msgstr "U_se SSL/TLS:"
+
+#~ msgid "_Display name:"
+#~ msgstr "_Display name:"
+
+#~ msgid "_Port number:"
+#~ msgstr "_Port number:"
+
+#~ msgid "_Search base:"
+#~ msgstr "_Search base:"
+
+#~ msgid "_Server name:"
+#~ msgstr "_Server name:"
+
+#~ msgid "_Timeout (minutes):"
+#~ msgstr "_Timeout (minutes):"
+
+#~ msgid "connecting-tab"
+#~ msgstr "connecting-tab"
+
+#~ msgid "general-tab"
+#~ msgstr "general-tab"
+
+#~ msgid "searching-tab"
+#~ msgstr "searching-tab"
+
+#~ msgid "Webcam:"
+#~ msgstr "Webcam:"
+
+#~ msgid "item7"
+#~ msgstr "item7"
+
+#~ msgid "item8"
+#~ msgstr "item8"
+
+#~ msgid "Category editor not available."
+#~ msgstr "Category editor not available."
+
+#~ msgid "Unable to open addressbook"
+#~ msgstr "Unable to open addressbook"
+
+#~ msgid "Do you want to save changes?"
+#~ msgstr "Do you want to save changes?"
+
+#~ msgid "Error saving %s: %s"
+#~ msgstr "Error saving %s: %s"
+
+#~ msgid ""
+#~ "The addressbook backend for\n"
+#~ "%s\n"
+#~ "has crashed. You will have to restart Evolution in order to use it again"
+#~ msgstr ""
+#~ "The addressbook backend for\n"
+#~ "%s\n"
+#~ "has crashed. You will have to restart Evolution in order to use it again"
+
+#~ msgid "Calendar Properties"
+#~ msgstr "Calendar Properties"
+
+#~ msgid "Remote"
+#~ msgstr "Remote"
+
+#~ msgid "Task List Properties"
+#~ msgstr "Task List Properties"
+
+#~ msgid "_Refresh Interval:"
+#~ msgstr "_Refresh Interval:"
+
+#~ msgid "_Source URL:"
+#~ msgstr "_Source URL:"
+
+#~ msgid ""
+#~ "The event being deleted is a meeting, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "The event being deleted is a meeting, would you like to send a "
+#~ "cancellation notice?"
+
+#~ msgid "Are you sure you want to cancel and delete this meeting?"
+#~ msgstr "Are you sure you want to cancel and delete this meeting?"
+
+#~ msgid ""
+#~ "The task being deleted is assigned, would you like to send a cancellation "
+#~ "notice?"
+#~ msgstr ""
+#~ "The task being deleted is assigned, would you like to send a cancellation "
+#~ "notice?"
+
+#~ msgid "Are you sure you want to cancel and delete this task?"
+#~ msgstr "Are you sure you want to cancel and delete this task?"
+
+#~ msgid ""
+#~ "The journal entry being deleted is published, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "The journal entry being deleted is published, would you like to send a "
+#~ "cancellation notice?"
+
+#~ msgid "Are you sure you want to cancel and delete this journal entry?"
+#~ msgstr "Are you sure you want to cancel and delete this journal entry?"
+
+#~ msgid "Are you sure you want to delete the appointment `%s'?"
+#~ msgstr "Are you sure you want to delete the appointment `%s'?"
+
+#~ msgid "Are you sure you want to delete this untitled appointment?"
+#~ msgstr "Are you sure you want to delete this untitled appointment?"
+
+#~ msgid "Are you sure you want to delete the task `%s'?"
+#~ msgstr "Are you sure you want to delete the task `%s'?"
+
+#~ msgid "Are you sure you want to delete this untitled task?"
+#~ msgstr "Are you sure you want to delete this untitled task?"
+
+#~ msgid "Are you sure you want to delete the journal entry `%s'?"
+#~ msgstr "Are you sure you want to delete the journal entry `%s'?"
+
+#~ msgid "Are you sure want to delete this untitled journal entry?"
+#~ msgstr "Are you sure want to delete this untitled journal entry?"
+
+#~ msgid "Are you sure you want to delete %d appointment?"
+#~ msgid_plural "Are you sure you want to delete %d appointments?"
+#~ msgstr[0] "Are you sure you want to delete %d appointment?"
+#~ msgstr[1] "Are you sure you want to delete %d appointments?"
+
+#~ msgid "Are you sure you want to delete %d task?"
+#~ msgid_plural "Are you sure you want to delete %d tasks?"
+#~ msgstr[0] "Are you sure you want to delete %d task?"
+#~ msgstr[1] "Are you sure you want to delete %d tasks?"
+
+#~ msgid "Are you sure you want to delete %d journal entry?"
+#~ msgid_plural "Are you sure you want to delete %d journal entries?"
+#~ msgstr[0] "Are you sure you want to delete %d journal entry?"
+#~ msgstr[1] "Are you sure you want to delete %d journal entries?"
+
+#~ msgid "_Invite Others..."
+#~ msgstr "_Invite Others..."
+
+#~ msgid ""
+#~ "This event has been changed, but has not been saved.\n"
+#~ "\n"
+#~ "Do you wish to save your changes?"
+#~ msgstr ""
+#~ "This event has been changed, but has not been saved.\n"
+#~ "\n"
+#~ "Do you wish to save your changes?"
+
+#~ msgid "_Discard Changes"
+#~ msgstr "_Discard Changes"
+
+#~ msgid "Save Event"
+#~ msgstr "Save Event"
+
+#~ msgid "The meeting information has been created. Send it?"
+#~ msgstr "The meeting information has been created. Send it?"
+
+#~ msgid "The meeting information has changed. Send an updated version?"
+#~ msgstr "The meeting information has changed. Send an updated version?"
+
+#~ msgid "The task assignment information has been created. Send it?"
+#~ msgstr "The task assignment information has been created. Send it?"
+
+#~ msgid "The task information has changed. Send an updated version?"
+#~ msgstr "The task information has changed. Send an updated version?"
+
+#~ msgid "The task backend for '%s' has crashed."
+#~ msgstr "The task backend for '%s' has crashed."
+
+#~ msgid "The calendar backend for '%s' has crashed."
+#~ msgstr "The calendar backend for '%s' has crashed."
+
+#~ msgid "Could not get article %s from NNTP server"
+#~ msgstr "Could not get article %s from NNTP server"
+
+#~ msgid "Posting not allowed by news server"
+#~ msgstr "Posting not allowed by news server"
+
+#~ msgid "Failed to send newsgroups header: %s: message not posted"
+#~ msgstr "Failed to send newsgroups header: %s: message not posted"
+
+#~ msgid "Error posting to newsgroup: %s: message not posted"
+#~ msgstr "Error posting to newsgroup: %s: message not posted"
+
+#~ msgid "Error reading response to posted message: message not posted"
+#~ msgstr "Error reading response to posted message: message not posted"
+
+#~ msgid "Error posting message: %s: message not posted"
+#~ msgstr "Error posting message: %s: message not posted"
+
+#~ msgid "Stream error"
+#~ msgstr "Stream error"
+
+#~ msgid "Connection error: %s"
+#~ msgstr "Connection error: %s"
+
+#~ msgid "Could not get group: %s"
+#~ msgstr "Could not get group: %s"
+
+#~ msgid "Could not get messages: unspecified error"
+#~ msgstr "Could not get messages: unspecified error"
+
+#~ msgid "Unknown server response: %s"
+#~ msgstr "Unknown server response: %s"
+
+#~ msgid "${1}"
+#~ msgstr "${1}"
+
+#~ msgid "Because \"${1}\"."
+#~ msgstr "Because \"${1}\"."
+
+#~ msgid "Adjust Score"
+#~ msgstr "Adjust Score"
+
+#~ msgid "Assign Color"
+#~ msgstr "Assign Colour"
+
+#~ msgid "Assign Score"
+#~ msgstr "Assign Score"
+
+#~ msgid "Attachments"
+#~ msgstr "Attachments"
+
+#~ msgid "Beep"
+#~ msgstr "Beep"
+
+#~ msgid "contains"
+#~ msgstr "contains"
+
+#~ msgid "Copy to Folder"
+#~ msgstr "Copy to Folder"
+
+#~ msgid "Date received"
+#~ msgstr "Date received"
+
+#~ msgid "Date sent"
+#~ msgstr "Date sent"
+
+#~ msgid "Deleted"
+#~ msgstr "Deleted"
+
+#~ msgid "does not contain"
+#~ msgstr "does not contain"
+
+#~ msgid "does not end with"
+#~ msgstr "does not end with"
+
+#~ msgid "does not exist"
+#~ msgstr "does not exist"
+
+#~ msgid "does not return"
+#~ msgstr "does not return"
+
+#~ msgid "does not sound like"
+#~ msgstr "does not sound like"
+
+#~ msgid "does not start with"
+#~ msgstr "does not start with"
+
+#~ msgid "Do Not Exist"
+#~ msgstr "Do Not Exist"
+
+#~ msgid "Draft"
+#~ msgstr "Draft"
+
+#~ msgid "ends with"
+#~ msgstr "ends with"
+
+#~ msgid "Exist"
+#~ msgstr "Exist"
+
+#~ msgid "exists"
+#~ msgstr "exists"
+
+#~ msgid "Expression"
+#~ msgstr "Expression"
+
+#~ msgid "Follow Up"
+#~ msgstr "Follow Up"
+
+#~ msgid "is"
+#~ msgstr "is"
+
+#~ msgid "is after"
+#~ msgstr "is after"
+
+#~ msgid "is before"
+#~ msgstr "is before"
+
+#~ msgid "is Flagged"
+#~ msgstr "is Flagged"
+
+#~ msgid "is greater than"
+#~ msgstr "is greater than"
+
+#~ msgid "is less than"
+#~ msgstr "is less than"
+
+#~ msgid "is not"
+#~ msgstr "is not"
+
+#~ msgid "is not Flagged"
+#~ msgstr "is not Flagged"
+
+#~ msgid "Junk Test"
+#~ msgstr "Junk Test"
+
+#~ msgid "Mailing list"
+#~ msgstr "Mailing list"
+
+#~ msgid "Message Body"
+#~ msgstr "Message Body"
+
+#~ msgid "Message Header"
+#~ msgstr "Message Header"
+
+#~ msgid "Message is Junk"
+#~ msgstr "Message is Junk"
+
+#~ msgid "Message is not Junk"
+#~ msgstr "Message is not Junk"
+
+#~ msgid "Move to Folder"
+#~ msgstr "Move to Folder"
+
+#~ msgid "Pipe to Program"
+#~ msgstr "Pipe to Program"
+
+#~ msgid "Play Sound"
+#~ msgstr "Play Sound"
+
+#~ msgid "Recipients"
+#~ msgstr "Recipients"
+
+#~ msgid "Regex Match"
+#~ msgstr "Regex Match"
+
+#~ msgid "Replied to"
+#~ msgstr "Replied to"
+
+#~ msgid "returns"
+#~ msgstr "returns"
+
+#~ msgid "returns greater than"
+#~ msgstr "returns greater than"
+
+#~ msgid "returns less than"
+#~ msgstr "returns less than"
+
+#~ msgid "Run Program"
+#~ msgstr "Run Program"
+
+#~ msgid "Sender"
+#~ msgstr "Sender"
+
+#~ msgid "Set Status"
+#~ msgstr "Set Status"
+
+#~ msgid "Size (kB)"
+#~ msgstr "Size (kB)"
+
+#~ msgid "sounds like"
+#~ msgstr "sounds like"
+
+#~ msgid "Source Account"
+#~ msgstr "Source Account"
+
+#~ msgid "Specific header"
+#~ msgstr "Specific header"
+
+#~ msgid "starts with"
+#~ msgstr "starts with"
+
+#~ msgid "Stop Processing"
+#~ msgstr "Stop Processing"
+
+#~ msgid "Unset Status"
+#~ msgstr "Unset Status"
+
+#~ msgid "Brought to you by"
+#~ msgstr "Brought to you by"
+
+#~ msgid "_Filename:"
+#~ msgstr "_Filename:"
+
+#~ msgid "Do you want to trust \"%s\" for the following purposes?"
+#~ msgstr "Do you want to trust \"%s\" for the following purposes?"
+
+#~ msgid "View Certificate"
+#~ msgstr "View Certificate"
+
+#~ msgid "You have been asked to trust a new Certificate Authority (CA)."
+#~ msgstr "You have been asked to trust a new Certificate Authority (CA)."
+
+#~ msgid "About Ximian Evolution..."
+#~ msgstr "About Ximian Evolution..."
+
+#~ msgid "_About Ximian Evolution..."
+#~ msgstr "_About Ximian Evolution..."
+
 #~ msgid "Job title:"
 #~ msgstr "Job title:"
 
diff --git a/po/en_GB.po b/po/en_GB.po
index a3a8bb8efd..6e1b71eea8 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -5,14 +5,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.6\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-25 19:21-0400\n"
+"POT-Creation-Date: 2004-06-03 11:14-0400\n"
 "PO-Revision-Date: 2004-05-25 19:22-0400\n"
 "Last-Translator: Gareth Owen <gowen72@yahoo.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: a11y/addressbook/ea-addressbook-view.c:94
@@ -68,12 +68,12 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Accessing LDAP Server anonymously"
 
 #: addressbook/gui/component/addressbook.c:173
-#: camel/providers/groupwise/camel-gw-listener.c:369
+#: camel/providers/groupwise/camel-gw-listener.c:378
 msgid "Failed to authenticate.\n"
 msgstr "Failed to authenticate.\n"
 
 #: addressbook/gui/component/addressbook.c:179
-#: camel/providers/groupwise/camel-gw-listener.c:358
+#: camel/providers/groupwise/camel-gw-listener.c:367
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sEnter password for %s (user %s)"
@@ -130,16 +130,16 @@ msgid "Migrating `%s':"
 msgstr "Migrating `%s':"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:508
+#: addressbook/gui/component/addressbook-migrate.c:464
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
 #: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
-#: mail/mail-component.c:247 mail/mail-vfolder.c:218
+#: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr "On This Computer"
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:516
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
 #: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
 #: mail/mail-config.glade.h:109
@@ -147,19 +147,19 @@ msgid "Personal"
 msgstr "Personal"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:524
+#: addressbook/gui/component/addressbook-migrate.c:480
 msgid "On LDAP Servers"
 msgstr "On LDAP Servers"
 
-#: addressbook/gui/component/addressbook-migrate.c:652
+#: addressbook/gui/component/addressbook-migrate.c:608
 msgid "LDAP Servers"
 msgstr "LDAP Servers"
 
-#: addressbook/gui/component/addressbook-migrate.c:772
+#: addressbook/gui/component/addressbook-migrate.c:728
 msgid "Autocompletion Settings"
 msgstr "Autocompletion Settings"
 
-#: addressbook/gui/component/addressbook-migrate.c:1148
+#: addressbook/gui/component/addressbook-migrate.c:1104
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -171,7 +171,7 @@ msgstr ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1162
+#: addressbook/gui/component/addressbook-migrate.c:1118
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -181,7 +181,7 @@ msgstr ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1171
+#: addressbook/gui/component/addressbook-migrate.c:1127
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -191,7 +191,7 @@ msgstr ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1181
+#: addressbook/gui/component/addressbook-migrate.c:1137
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -201,14 +201,6 @@ msgstr ""
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1194
-msgid ""
-"Some fields are no longer representable in the contact editor. Please wait "
-"while Evolution copies those fields to the 'Notes' field..."
-msgstr ""
-"Some fields are no longer representable in the contact editor. Please wait "
-"while Evolution copies those fields to the 'Notes' field..."
-
 #: addressbook/gui/component/addressbook-view.c:675
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
@@ -220,17 +212,16 @@ msgstr "New Address Book"
 
 #: addressbook/gui/component/addressbook-view.c:755
 #: addressbook/gui/widgets/e-addressbook-view.c:1088
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Delete"
 
 #: addressbook/gui/component/addressbook-view.c:756
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Properties..."
 
@@ -314,10 +305,6 @@ msgid "Manage your S/MIME certificates here"
 msgstr "Manage your S/MIME certificates here"
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-msgid "  S_how Supported Bases "
-msgstr "  S_how Supported Bases "
-
-#: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -339,183 +326,150 @@ msgstr "  S_how Supported Bases "
 msgid "*"
 msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr "1"
 
-#: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1:00"
-msgstr "1:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr "5"
 
-#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
-msgstr "5:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "<b>Authentication</b>"
 msgstr "<b>Authentication</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Display</b>"
 msgstr "<b>Display</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "<b>Downloading</b>"
 msgstr "<b>Downloading</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "<b>Searching</b>"
 msgstr "<b>Searching</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:11
 msgid "<b>Server Information</b>"
 msgstr "<b>Server Information</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:12
 msgid "<b>Type:</b>"
 msgstr "<b>Type:</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add Contacts Group"
 msgstr "Add Contacts Group"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Address Book Properties"
 msgstr "Address Book Properties"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:42
 msgid "Always"
 msgstr "Always"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr "Anonymously"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:17
 #: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Basic"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
-msgid "Connecting"
-msgstr "Connecting"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 #: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Details"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
-msgid "Distinguished _name:"
-msgstr "Distinguished _name:"
-
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished name"
 msgstr "Distinguished name"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Download limit:"
 msgstr "Download limit:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Email address"
 msgstr "Email address"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "Email address:"
-msgstr "Email address:"
-
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "Evolution will use this DN to authenticate you with the server"
-msgstr "Evolution will use this DN to authenticate you with the server"
-
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:22
+#, fuzzy
 msgid ""
-"Evolution will use this email address to authenticate you with the server"
+"Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "Evolution will use this email address to authenticate you with the server"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Find Possible Search Bases"
 msgstr "Find Possible Search Bases"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:24
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "General"
 
-#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
+#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:102
 msgid "Never"
 msgstr "Never"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
-msgid "One"
-msgstr "One"
-
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Only locations within starting point"
 msgstr "Only locations within starting point"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
-msgid "S_earch scope: "
-msgstr "S_earch scope: "
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Search _base:"
+msgstr "Search base:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:28
 msgid "Search base only"
 msgstr "Search base only"
 
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid "Search base:"
 msgstr "Search base:"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid "Search scope:"
 msgstr "Search scope:"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
-msgid "Searching"
-msgstr "Searching"
-
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:31
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
-"server if\n"
-"your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL or TLS."
 msgstr ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
 "your LDAP server supports SSL or TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a \n"
-"insecure environment. For example, if you and your LDAP server are behind a "
-"firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection "
-"is already\n"
-"secure."
+"you are in a insecure environment. For example, if you and your LDAP server "
+"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
+"because your connection is already secure."
 msgstr ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -525,13 +479,12 @@ msgstr ""
 "is already\n"
 "secure."
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:33
+#, fuzzy
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
-"TLS.  This \n"
-"means that your connection will be insecure, and that you will be vulnerable "
-"to security\n"
-"exploits. "
+"TLS.  This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits. "
 msgstr ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -539,38 +492,33 @@ msgstr ""
 "to security\n"
 "exploits. "
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Starting point and locations within it"
 msgstr "Starting point and locations within it"
 
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Sub"
-msgstr "Sub"
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr "Supported Search Bases"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
-"searches will \n"
-"begin. If you leave this blank, the search will begin at the root of the "
-"directory tree."
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
 msgstr ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
 "begin. If you leave this blank, the search will begin at the root of the "
 "directory tree."
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:37
+#, fuzzy
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
-"the \n"
-"directory tree. A search scope of \"sub\" will include all entries below "
-"your search base.\n"
-"A search scope of \"one\" will only include the entries one level beneath "
-"your base.\n"
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
 msgstr ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -579,7 +527,7 @@ msgstr ""
 "A search scope of \"one\" will only include the entries one level beneath "
 "your base.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:58
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -587,17 +535,17 @@ msgstr ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:39
+#, fuzzy
 msgid ""
-"This is the maximum number of entries to download. Setting this number to "
-"be \n"
+"This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
 "too large will slow down your address book."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -607,136 +555,115 @@ msgstr ""
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:41
+#, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
-"list.\n"
-"It is for display purposes only. "
+"list. It is for display purposes only. "
 msgstr ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
 "It is for display purposes only. "
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:42
+#, fuzzy
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. "
-"A \n"
-"list of standard ports has been provided. Ask your system administrator\n"
-"what port you should specify."
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
 msgstr ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
 "list of standard ports has been provided. Ask your system administrator\n"
 "what port you should specify."
 
-#: addressbook/gui/component/ldap-config.glade.h:67
-msgid "This option controls how long a search will be run."
-msgstr "This option controls how long a search will be run."
-
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid "Timeout:"
 msgstr "Timeout:"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
-msgid "U_se SSL/TLS:"
-msgstr "U_se SSL/TLS:"
-
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr "Using distinguished name (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr "Using email address"
 
-#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
+#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr "Whenever Possible"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:47
 msgid "_Add Contacts Group"
 msgstr "_Add Contacts Group"
 
-#: addressbook/gui/component/ldap-config.glade.h:74
-#: calendar/gui/dialogs/calendar-setup.glade.h:12
-msgid "_Display name:"
-msgstr "_Display name:"
-
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr "_Download limit:"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Email address:"
 msgstr "_Email address:"
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:50
+#, fuzzy
+msgid "_Find Possible Search Bases"
+msgstr "Find Possible Search Bases"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Log in method:"
 msgstr "_Log in method:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:171
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "_Log in:"
+msgstr "Login"
+
+#: addressbook/gui/component/ldap-config.glade.h:53
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
 msgid "_Name:"
 msgstr "_Name:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
-msgid "_Port number:"
-msgstr "_Port number:"
-
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid "_Port:"
 msgstr "_Port:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
-msgid "_Search base:"
-msgstr "_Search base:"
-
-#: addressbook/gui/component/ldap-config.glade.h:82
-msgid "_Server name:"
-msgstr "_Server name:"
+#: addressbook/gui/component/ldap-config.glade.h:55
+#, fuzzy
+msgid "_Search scope:"
+msgstr "Search scope:"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:56
 msgid "_Server:"
 msgstr "_Server:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
-msgid "_Timeout (minutes):"
-msgstr "_Timeout (minutes):"
+#: addressbook/gui/component/ldap-config.glade.h:57
+#, fuzzy
+msgid "_Timeout:"
+msgstr "Timeout:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:58
 msgid "_Use secure connection:"
 msgstr "_Use secure connection:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "cards"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
-msgid "connecting-tab"
-msgstr "connecting-tab"
-
-#: addressbook/gui/component/ldap-config.glade.h:88
-msgid "general-tab"
-msgstr "general-tab"
-
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:60
 #: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
 #: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "minutes"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
-msgid "searching-tab"
-msgstr "searching-tab"
-
-#: addressbook/gui/component/select-names/e-select-names.c:492
+#: addressbook/gui/component/select-names/e-select-names.c:503
 #: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid "Select Contacts from Address Book"
 msgstr "Select Contacts from Address Book"
 
-#: addressbook/gui/component/select-names/e-select-names.c:691
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
@@ -842,8 +769,8 @@ msgstr "<b>Work</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
 #: addressbook/gui/contact-editor/e-contact-editor.c:178
-#: addressbook/gui/widgets/eab-contact-display.c:342
-#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/widgets/eab-contact-display.c:334
+#: addressbook/gui/widgets/eab-contact-display.c:353
 msgid "AIM"
 msgstr "AIM"
 
@@ -878,7 +805,7 @@ msgstr "Company:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: addressbook/gui/contact-editor/e-contact-editor.c:266
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
@@ -906,79 +833,77 @@ msgid "Full _Name..."
 msgstr "Full _Name..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-msgid "Home"
-msgstr "Home"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "Home Page:"
 msgstr "Home Page:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-#: calendar/gui/e-itip-control.c:930
-msgid "Location:"
-msgstr "Location:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "Mailing Address"
 msgstr "Mailing Address"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "Manager:"
 msgstr "Manager:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "Ni_ckname:"
 msgstr "Ni_ckname:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "Notes:"
 msgstr "Notes:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
-#: addressbook/gui/contact-editor/e-contact-editor.c:197
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-msgid "Other"
-msgstr "Other"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#, fuzzy
+msgid "Office:"
+msgstr "_Office:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "PO Box:"
 msgstr "PO Box:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "Personal Information"
 msgstr "Personal Information"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "Profession:"
 msgstr "Profession:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#, fuzzy
+msgid "Spouse:"
+msgstr "S_pouse:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "State/Province:"
 msgstr "State/Province:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "Title:"
 msgstr "Title:"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+msgid "Video Chat:"
+msgstr ""
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "Wants to receive HTML mail"
 msgstr "Wants to receive HTML mail"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:42
-msgid "Webcam:"
-msgstr "Webcam:"
+#, fuzzy
+msgid "Web Log:"
+msgstr "Web Page:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
@@ -1002,17 +927,10 @@ msgid "_File under:"
 msgstr "_File under:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "_Where:"
 msgstr "_Where:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
-msgid "item7"
-msgstr "item7"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
-msgid "item8"
-msgstr "item8"
-
 #: addressbook/gui/contact-editor/eab-editor.c:315
 msgid ""
 "Are you sure you want\n"
@@ -1030,8 +948,8 @@ msgstr ""
 "to delete this contact?"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:351
-#: addressbook/gui/widgets/eab-contact-display.c:372
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Address"
 msgstr "Address"
 
@@ -1039,7 +957,7 @@ msgstr "Address"
 #: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard.c:174
@@ -2019,27 +1937,27 @@ msgstr "Zimbabwe"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:179
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:337
+#: addressbook/gui/widgets/eab-contact-display.c:356
 msgid "Jabber"
 msgstr "Jabber"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:347
-#: addressbook/gui/widgets/eab-contact-display.c:366
+#: addressbook/gui/widgets/eab-contact-display.c:339
+#: addressbook/gui/widgets/eab-contact-display.c:358
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/widgets/eab-contact-display.c:338
+#: addressbook/gui/widgets/eab-contact-display.c:357
 msgid "MSN"
 msgstr "MSN"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:344
-#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#: addressbook/gui/widgets/eab-contact-display.c:355
 msgid "ICQ"
 msgstr "ICQ"
 
@@ -2047,6 +1965,16 @@ msgstr "ICQ"
 msgid "GroupWise"
 msgstr "GroupWise"
 
+#: addressbook/gui/contact-editor/e-contact-editor.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+msgid "Home"
+msgstr "Home"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+msgid "Other"
+msgstr "Other"
+
 #: addressbook/gui/contact-editor/e-contact-editor.c:252
 msgid "Source Book"
 msgstr "Source Book"
@@ -2067,20 +1995,20 @@ msgstr "Writable Fields"
 msgid "Changed"
 msgstr "Changed"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2297
+#: addressbook/gui/contact-editor/e-contact-editor.c:2352
 msgid "This contact belongs to these categories:"
 msgstr "This contact belongs to these categories:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2374
+#: addressbook/gui/contact-editor/e-contact-editor.c:2429
 msgid "Please select an image for this contact"
 msgstr "Please select an image for this contact"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2378
+#: addressbook/gui/contact-editor/e-contact-editor.c:2433
 msgid "No image"
 msgstr "No image"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2581
+#: addressbook/gui/contact-editor/e-contact-editor.c:2636
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2088,11 +2016,11 @@ msgstr ""
 "The contact data is invalid:\n"
 "\n"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2609
+#: addressbook/gui/contact-editor/e-contact-editor.c:2664
 msgid "Invalid contact."
 msgstr "Invalid contact."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2668
+#: addressbook/gui/contact-editor/e-contact-editor.c:2723
 msgid ""
 "The contact cannot be saved to the selected address book. Do you want to "
 "discard changes?"
@@ -2100,12 +2028,12 @@ msgstr ""
 "The contact cannot be saved to the selected address book. Do you want to "
 "discard changes?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2672
-#: addressbook/gui/contact-editor/e-contact-editor.c:2696
+#: addressbook/gui/contact-editor/e-contact-editor.c:2727
+#: addressbook/gui/contact-editor/e-contact-editor.c:2751
 msgid "_Discard"
 msgstr "_Discard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2691
+#: addressbook/gui/contact-editor/e-contact-editor.c:2746
 msgid ""
 "You are moving the contact from one address book to another, but it cannot "
 "be removed from the source. Do you want to save a copy instead?"
@@ -2289,11 +2217,11 @@ msgstr "_List name:"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Type an email address or drag a contact into the list below:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "contact-list-editor"
 msgstr "contact-list-editor"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:153
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
 #: addressbook/gui/widgets/e-addressbook-view.c:217
@@ -2302,17 +2230,17 @@ msgstr "contact-list-editor"
 msgid "Book"
 msgstr "Book"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
 msgid "Is New List"
 msgstr "Is New List"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:215
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
 msgid "Contact List Editor"
 msgstr "Contact List Editor"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:438
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
 msgid "Save List as VCard"
 msgstr "Save List as VCard"
 
@@ -2359,91 +2287,91 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Advanced Search"
 
-#: addressbook/gui/widgets/eab-contact-display.c:129
-#: addressbook/gui/widgets/eab-contact-display.c:192
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
 msgid "(map)"
 msgstr "(map)"
 
-#: addressbook/gui/widgets/eab-contact-display.c:139
-#: addressbook/gui/widgets/eab-contact-display.c:205
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
 msgid "map"
 msgstr "map"
 
-#: addressbook/gui/widgets/eab-contact-display.c:257
-#: addressbook/gui/widgets/eab-contact-display.c:533
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:525
 msgid "List Members"
 msgstr "List Members"
 
-#: addressbook/gui/widgets/eab-contact-display.c:329
-#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/eab-contact-display.c:321
+#: addressbook/gui/widgets/eab-contact-display.c:323
 msgid "E-mail"
 msgstr "E-mail"
 
-#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/eab-contact-display.c:332
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organisation"
 
-#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "Position"
 msgstr "Position"
 
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:354
 msgid "Groupwise"
 msgstr "Groupwise"
 
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:340
 msgid "Video Conferencing"
 msgstr "Video Conferencing"
 
-#: addressbook/gui/widgets/eab-contact-display.c:349
-#: addressbook/gui/widgets/eab-contact-display.c:370
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Phone"
 msgstr "Phone"
 
-#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:342
 msgid "Fax"
 msgstr "Fax"
 
-#: addressbook/gui/widgets/eab-contact-display.c:354
+#: addressbook/gui/widgets/eab-contact-display.c:346
 msgid "work"
 msgstr "work"
 
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:359
 msgid "WWW"
 msgstr "WWW"
 
-#: addressbook/gui/widgets/eab-contact-display.c:368
-#: addressbook/gui/widgets/eab-contact-display.c:587
+#: addressbook/gui/widgets/eab-contact-display.c:360
+#: addressbook/gui/widgets/eab-contact-display.c:579
 msgid "Blog"
 msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/eab-contact-display.c:363
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Mobile Phone"
 
-#: addressbook/gui/widgets/eab-contact-display.c:375
+#: addressbook/gui/widgets/eab-contact-display.c:367
 msgid "personal"
 msgstr "personal"
 
-#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/eab-contact-display.c:374
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Note"
 
-#: addressbook/gui/widgets/eab-contact-display.c:548
+#: addressbook/gui/widgets/eab-contact-display.c:540
 msgid "Job Title"
 msgstr "Job Title"
 
-#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/eab-contact-display.c:544
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:774
+#: smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "Email"
 
-#: addressbook/gui/widgets/eab-contact-display.c:579
+#: addressbook/gui/widgets/eab-contact-display.c:571
 msgid "Home page"
 msgstr "Home page"
 
@@ -2804,13 +2732,13 @@ msgid "Email begins with"
 msgstr "Email begins with"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:165
-#: calendar/gui/cal-search-bar.c:57
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Category is"
 
 #. We attach subitems below
 #: addressbook/gui/widgets/e-addressbook-view.c:166
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Any field contains"
 
@@ -2822,7 +2750,7 @@ msgstr "Advanced..."
 #: addressbook/gui/widgets/e-addressbook-view.c:238
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:250
+#: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Type"
@@ -2833,7 +2761,7 @@ msgstr "Address Book"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:852
 #: addressbook/gui/widgets/e-addressbook-view.c:1072
-#: addressbook/gui/widgets/e-addressbook-view.c:2078
+#: addressbook/gui/widgets/e-addressbook-view.c:2080
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard..."
 msgstr "Save as VCard..."
@@ -2900,7 +2828,7 @@ msgid "Cut"
 msgstr "Cut"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
@@ -2912,13 +2840,13 @@ msgid "Paste"
 msgstr "Paste"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1092
-#: calendar/gui/e-calendar-view.c:1277
+#: calendar/gui/e-calendar-view.c:1280
 msgid "Current View"
 msgstr "Current View"
 
 #. All, unmatched, separator
 #: addressbook/gui/widgets/e-addressbook-view.c:1665
-#: calendar/gui/cal-search-bar.c:362
+#: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Any Category"
 
@@ -3024,7 +2952,7 @@ msgstr "Radio"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:257
+#: calendar/gui/e-meeting-list-view.c:234
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Role"
@@ -3726,9 +3654,9 @@ msgstr "Whether to show week numbers in date navigator"
 
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
 #: calendar/gui/dialogs/select-source-dialog.c:92
-#: calendar/gui/gnome-cal.c:1704
-#: camel/providers/groupwise/camel-gw-listener.c:304
-#: camel/providers/groupwise/camel-gw-listener.c:327
+#: calendar/gui/gnome-cal.c:1705
+#: camel/providers/groupwise/camel-gw-listener.c:311
+#: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
 msgstr "Calendar"
 
@@ -3748,7 +3676,7 @@ msgstr "Purge events older than"
 
 #: calendar/gui/calendar-commands.c:363
 #: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:19 filter/filter.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
 msgid "days"
 msgstr "days"
 
@@ -3894,23 +3822,23 @@ msgstr "Week View"
 msgid "Month View"
 msgstr "Month View"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Summary contains"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Description contains"
 
-#: calendar/gui/cal-search-bar.c:54
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Comment contains"
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:53
 msgid "Location contains"
 msgstr "Location contains"
 
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
 msgid "Unmatched"
 msgstr "Unmatched"
 
@@ -3983,7 +3911,7 @@ msgstr "Send To:"
 msgid "With these arguments:"
 msgstr "With these arguments:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
 msgid "dialog1"
 msgstr "dialogue1"
 
@@ -3992,7 +3920,7 @@ msgid "extra times every"
 msgstr "extra times every"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:20 filter/filter.glade.h:16
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr "hours"
 
@@ -4038,7 +3966,7 @@ msgstr "Send an email"
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:921 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Summary:"
 
@@ -4068,7 +3996,6 @@ msgid "hour(s)"
 msgstr "hour(s)"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:21
 msgid "minute(s)"
 msgstr "minute(s)"
 
@@ -4076,26 +4003,26 @@ msgstr "minute(s)"
 msgid "start of appointment"
 msgstr "start of appointment"
 
-#: calendar/gui/dialogs/calendar-setup.c:171
+#: calendar/gui/dialogs/calendar-setup.c:172
 msgid "You must specify a location to get the calendar from."
 msgstr "You must specify a location to get the calendar from."
 
-#: calendar/gui/dialogs/calendar-setup.c:179
+#: calendar/gui/dialogs/calendar-setup.c:180
 #, c-format
 msgid "The source location '%s' is not well-formed."
 msgstr "The source location '%s' is not well-formed."
 
-#: calendar/gui/dialogs/calendar-setup.c:194
+#: calendar/gui/dialogs/calendar-setup.c:195
 #, c-format
 msgid "The source location '%s' is not a webcal source."
 msgstr "The source location '%s' is not a webcal source."
 
-#: calendar/gui/dialogs/calendar-setup.c:266
+#: calendar/gui/dialogs/calendar-setup.c:275
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr "Source with name '%s' already exists in the selected group"
 
-#: calendar/gui/dialogs/calendar-setup.c:279
+#: calendar/gui/dialogs/calendar-setup.c:288
 #, c-format
 msgid ""
 "The group '%s' is remote. You must specify a location to get the calendar "
@@ -4116,51 +4043,31 @@ msgstr "_Tasks Group"
 msgid "C_olor:"
 msgstr "C_olour:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "Calendar Properties"
-msgstr "Calendar Properties"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:110
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
 msgid "Pick a color"
 msgstr "Pick a colour"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:8
-msgid "Remote"
-msgstr "Remote"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "Task List Properties"
-msgstr "Task List Properties"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
 msgid "_Add Calendar"
 msgstr "_Add Calendar"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
 msgid "_Add Group"
 msgstr "_Add Group"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-msgid "_Refresh Interval:"
-msgstr "_Refresh Interval:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
 msgid "_Refresh:"
 msgstr "_Refresh:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-msgid "_Source URL:"
-msgstr "_Source URL:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "_Type:"
 msgstr "_Type:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
 msgid "_URL:"
 msgstr "_URL:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
 msgid "weeks"
 msgstr "weeks"
 
@@ -4272,7 +4179,7 @@ msgstr "Free/Busy Publishing"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:557
+#: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Friday"
 
@@ -4286,7 +4193,7 @@ msgstr "Minutes"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:553
+#: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Monday"
 
@@ -4296,7 +4203,7 @@ msgstr "S_un"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Saturday"
 
@@ -4310,7 +4217,7 @@ msgstr "Show week _numbers in date navigator"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:552
+#: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Sunday"
 
@@ -4324,7 +4231,7 @@ msgstr "T_hu"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:556
+#: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Thursday"
 
@@ -4338,7 +4245,7 @@ msgstr "Time format:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:554
+#: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Tuesday"
 
@@ -4348,7 +4255,7 @@ msgstr "W_eek starts:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:555
+#: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Wednesday"
 
@@ -4507,7 +4414,7 @@ msgid "No summary"
 msgstr "No summary"
 
 #: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
 #: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Save as..."
@@ -4736,7 +4643,7 @@ msgstr "_Start time:"
 
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:3
+#: calendar/gui/dialogs/meeting-page.glade.h:4
 #: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
 #: filter/filter-rule.c:877 mail/em-account-prefs.c:427
 #: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
@@ -4766,8 +4673,8 @@ msgstr "_Delegate To..."
 #. FIXME: need to disable for undeletable folders
 #: calendar/gui/dialogs/meeting-page.c:655
 #: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1310 calendar/gui/e-calendar-view.c:1342
-#: mail/em-folder-tree.c:2562 mail/em-folder-view.c:919
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
+#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -4775,7 +4682,7 @@ msgid "_Delete"
 msgstr "_Delete"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:241
+#: calendar/gui/e-meeting-list-view.c:218
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Attendee"
@@ -4811,16 +4718,15 @@ msgid "Member"
 msgstr "Member"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1048 calendar/gui/e-meeting-list-view.c:264
+#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:271
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
-#: mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-list-view.c:248
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
 
@@ -4828,20 +4734,20 @@ msgstr "Status"
 msgid "Add A_ttendee"
 msgstr "Add A_ttendee"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "Add attendees from addressbook."
+msgstr "Add Sender to Address_book"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Organiser:"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
+#: calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "_Change Organizer"
 msgstr "_Change Organiser"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-#: calendar/gui/e-meeting-time-sel.c:417
-msgid "_Invite Others..."
-msgstr "_Invite Others..."
-
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
 msgstr "<b>Calendar options</b>"
@@ -5130,7 +5036,7 @@ msgstr "Con_fidential"
 
 #: calendar/gui/dialogs/task-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:976 calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Description:"
@@ -5294,7 +5200,7 @@ msgstr "Due Date:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:944
+#: calendar/gui/e-itip-control.c:943
 msgid "Status:"
 msgstr "Status:"
 
@@ -5378,12 +5284,12 @@ msgstr "Busy"
 msgid "Deleting selected objects"
 msgstr "Deleting selected objects"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
 msgid "Updating objects"
 msgstr "Updating objects"
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1370
+#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
 #: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Open"
@@ -5393,15 +5299,15 @@ msgid "Open _Web Page"
 msgstr "Open _Web Page"
 
 #: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1291 calendar/gui/e-calendar-view.c:1376
+#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
 #: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "_Save As..."
 
 #: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1292
-#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
+#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
@@ -5409,15 +5315,15 @@ msgid "_Print..."
 msgstr "_Print..."
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "C_ut"
 
 #: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1338
-#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2555
+#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
+#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
 #: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
@@ -5425,8 +5331,8 @@ msgid "_Copy"
 msgstr "_Copy"
 
 #: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1273 calendar/gui/e-calendar-view.c:1299
-#: calendar/gui/e-calendar-view.c:1372 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
+#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
@@ -5492,67 +5398,67 @@ msgstr "Summary"
 msgid "Task sort"
 msgstr "Task sort"
 
-#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
 msgid "New _Appointment..."
 msgstr "New _Appointment..."
 
-#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
+#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
 msgid "New All Day _Event"
 msgstr "New All Day _Event"
 
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
+#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
 msgid "New Meeting"
 msgstr "New Meeting"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
 msgid "New Task"
 msgstr "New Task"
 
-#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "Select _Today"
 
-#: calendar/gui/e-calendar-view.c:1280
+#: calendar/gui/e-calendar-view.c:1283
 msgid "_Select Date..."
 msgstr "_Select Date..."
 
-#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publish Free/Busy Information"
 
-#: calendar/gui/e-calendar-view.c:1303
+#: calendar/gui/e-calendar-view.c:1306
 msgid "Cop_y to Calendar..."
 msgstr "Cop_y to Calendar..."
 
-#: calendar/gui/e-calendar-view.c:1304
+#: calendar/gui/e-calendar-view.c:1307
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_ve to Calendar..."
 
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1308
 msgid "_Schedule Meeting..."
 msgstr "_Schedule Meeting..."
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1309
 msgid "_Forward as iCalendar..."
 msgstr "_Forward as iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
 msgid "Delete this _Occurrence"
 msgstr "Delete this _Occurrence"
 
-#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
 msgid "Delete _All Occurrences"
 msgstr "Delete _All Occurrences"
 
-#: calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1349
 msgid "Go to _Today"
 msgstr "Go to _Today"
 
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1351
 msgid "_Go to Date..."
 msgstr "_Go to Date..."
 
-#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "_Settings..."
 
@@ -5566,9 +5472,9 @@ msgstr "Start Date"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:961 calendar/gui/e-itip-control.c:1163
-#: calendar/gui/e-meeting-list-view.c:145
-#: calendar/gui/e-meeting-list-view.c:159 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
 #: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
 #: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
 #: camel/camel-tcp-stream-openssl.c:631
@@ -5594,13 +5500,13 @@ msgid "Assigned"
 msgstr "Assigned"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr "Yes"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:170 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "No"
 
@@ -5612,7 +5518,7 @@ msgstr "N"
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
 msgid "E"
 msgstr "E"
 
@@ -5684,102 +5590,102 @@ msgstr "%d %b"
 msgid "%02i minute divisions"
 msgstr "%02i minute divisions"
 
-#: calendar/gui/e-itip-control.c:586
+#: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
 msgstr "Yes. (Complex Recurrence)"
 
-#: calendar/gui/e-itip-control.c:597
+#: calendar/gui/e-itip-control.c:596
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Every day"
 msgstr[1] "Every %d days"
 
-#: calendar/gui/e-itip-control.c:602
+#: calendar/gui/e-itip-control.c:601
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Every week"
 msgstr[1] "Every %d weeks"
 
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:603
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "Every week on "
 msgstr[1] "Every %d weeks on "
 
-#: calendar/gui/e-itip-control.c:612
+#: calendar/gui/e-itip-control.c:611
 msgid " and "
 msgstr " and "
 
-#: calendar/gui/e-itip-control.c:619
+#: calendar/gui/e-itip-control.c:618
 #, c-format
 msgid "The %s day of "
 msgstr "The %s day of "
 
-#: calendar/gui/e-itip-control.c:632
+#: calendar/gui/e-itip-control.c:631
 #, c-format
 msgid "The %s %s of "
 msgstr "The %s %s of "
 
-#: calendar/gui/e-itip-control.c:639
+#: calendar/gui/e-itip-control.c:638
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "every %d month"
 msgstr[1] "every %d month"
 
-#: calendar/gui/e-itip-control.c:643
+#: calendar/gui/e-itip-control.c:642
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Every %d year"
 msgstr[1] "Every %d years"
 
-#: calendar/gui/e-itip-control.c:654
+#: calendar/gui/e-itip-control.c:653
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] " a total of %d time"
 msgstr[1] " a total of %d times"
 
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:662
 msgid ", ending on "
 msgstr ", ending on "
 
-#: calendar/gui/e-itip-control.c:687
+#: calendar/gui/e-itip-control.c:686
 msgid "<b>Starts:</b> "
 msgstr "<b>Starts:</b> "
 
-#: calendar/gui/e-itip-control.c:697
+#: calendar/gui/e-itip-control.c:696
 msgid "<b>Ends:</b> "
 msgstr "<b>Ends:</b> "
 
-#: calendar/gui/e-itip-control.c:717
+#: calendar/gui/e-itip-control.c:716
 msgid "<b>Completed:</b> "
 msgstr "<b>Completed:</b> "
 
-#: calendar/gui/e-itip-control.c:727
+#: calendar/gui/e-itip-control.c:726
 msgid "<b>Due:</b> "
 msgstr "<b>Due:</b> "
 
-#: calendar/gui/e-itip-control.c:765 calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
 msgid "iCalendar Information"
 msgstr "iCalendar Information"
 
 #. Title
-#: calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:781
 msgid "iCalendar Error"
 msgstr "iCalendar Error"
 
-#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
-#: calendar/gui/e-itip-control.c:880 calendar/gui/e-itip-control.c:897
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
 msgid "An unknown person"
 msgstr "An unknown person"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:904
+#: calendar/gui/e-itip-control.c:903
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5787,301 +5693,305 @@ msgstr ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 
-#: calendar/gui/e-itip-control.c:919
+#: calendar/gui/e-itip-control.c:918
 msgid "<i>None</i>"
 msgstr "<i>None</i>"
 
-#: calendar/gui/e-itip-control.c:949 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:929
+msgid "Location:"
+msgstr "Location:"
+
+#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Accepted"
 
-#: calendar/gui/e-itip-control.c:953 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Tentatively Accepted"
 
-#: calendar/gui/e-itip-control.c:957 calendar/gui/e-meeting-list-view.c:182
+#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Declined"
 
-#: calendar/gui/e-itip-control.c:1016 calendar/gui/e-itip-control.c:1044
-#: calendar/gui/e-itip-control.c:1070 calendar/gui/e-itip-control.c:1083
-#: calendar/gui/e-itip-control.c:1096 calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
 msgid "Choose an action:"
 msgstr "Choose an action:"
 
-#: calendar/gui/e-itip-control.c:1017
+#: calendar/gui/e-itip-control.c:1016
 msgid "Update"
 msgstr "Update"
 
-#: calendar/gui/e-itip-control.c:1018 calendar/gui/e-itip-control.c:1049
-#: calendar/gui/e-itip-control.c:1072 calendar/gui/e-itip-control.c:1085
-#: calendar/gui/e-itip-control.c:1098 calendar/gui/e-itip-control.c:1111
-#: shell/e-shell.c:1098 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
+#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1044
 msgid "Accept"
 msgstr "Accept"
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1045
 msgid "Tentatively accept"
 msgstr "Tentatively accept"
 
-#: calendar/gui/e-itip-control.c:1047
+#: calendar/gui/e-itip-control.c:1046
 msgid "Decline"
 msgstr "Decline"
 
-#: calendar/gui/e-itip-control.c:1071
+#: calendar/gui/e-itip-control.c:1070
 msgid "Send Free/Busy Information"
 msgstr "Send Free/Busy Information"
 
-#: calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1083
 msgid "Update respondent status"
 msgstr "Update respondent status"
 
-#: calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1096
 msgid "Send Latest Information"
 msgstr "Send Latest Information"
 
-#: calendar/gui/e-itip-control.c:1110 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cancel"
 
-#: calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1185
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> has published meeting information."
 
-#: calendar/gui/e-itip-control.c:1187
+#: calendar/gui/e-itip-control.c:1186
 msgid "Meeting Information"
 msgstr "Meeting Information"
 
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1191
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> requests the presence of %s at a meeting."
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1193
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> requests your presence at a meeting."
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1194
 msgid "Meeting Proposal"
 msgstr "Meeting Proposal"
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> wishes to add to an existing meeting."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Update"
 msgstr "Meeting Update"
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1203
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> wishes to receive the latest meeting information."
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1204
 msgid "Meeting Update Request"
 msgstr "Meeting Update Request"
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> has replied to a meeting request."
 
-#: calendar/gui/e-itip-control.c:1213
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Reply"
 msgstr "Meeting Reply"
 
-#: calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1219
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> has cancelled a meeting."
 
-#: calendar/gui/e-itip-control.c:1221
+#: calendar/gui/e-itip-control.c:1220
 msgid "Meeting Cancellation"
 msgstr "Meeting Cancellation"
 
-#: calendar/gui/e-itip-control.c:1228 calendar/gui/e-itip-control.c:1296
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1330
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> has sent an unintelligible message."
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1228
 msgid "Bad Meeting Message"
 msgstr "Bad Meeting Message"
 
-#: calendar/gui/e-itip-control.c:1254
+#: calendar/gui/e-itip-control.c:1253
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> has published task information."
 
-#: calendar/gui/e-itip-control.c:1255
+#: calendar/gui/e-itip-control.c:1254
 msgid "Task Information"
 msgstr "Task Information"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1259
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> requests %s to perform a task."
 
-#: calendar/gui/e-itip-control.c:1262
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> requests you perform a task."
 
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1262
 msgid "Task Proposal"
 msgstr "Task Proposal"
 
-#: calendar/gui/e-itip-control.c:1267
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> wishes to add to an existing task."
 
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Update"
 msgstr "Task Update"
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1271
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> wishes to receive the latest task information."
 
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1272
 msgid "Task Update Request"
 msgstr "Task Update Request"
 
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> has replied to a task assignment."
 
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Reply"
 msgstr "Task Reply"
 
-#: calendar/gui/e-itip-control.c:1288
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> has cancelled a task."
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1288
 msgid "Task Cancellation"
 msgstr "Task Cancellation"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1296
 msgid "Bad Task Message"
 msgstr "Bad Task Message"
 
-#: calendar/gui/e-itip-control.c:1316
+#: calendar/gui/e-itip-control.c:1315
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> has published free/busy information."
 
-#: calendar/gui/e-itip-control.c:1317
+#: calendar/gui/e-itip-control.c:1316
 msgid "Free/Busy Information"
 msgstr "Free/Busy Information"
 
-#: calendar/gui/e-itip-control.c:1321
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> requests your free/busy information."
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1321
 msgid "Free/Busy Request"
 msgstr "Free/Busy Request"
 
-#: calendar/gui/e-itip-control.c:1326
+#: calendar/gui/e-itip-control.c:1325
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> has replied to a free/busy request."
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1326
 msgid "Free/Busy Reply"
 msgstr "Free/Busy Reply"
 
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1331
 msgid "Bad Free/Busy Message"
 msgstr "Bad Free/Busy Message"
 
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1406
 msgid "The message does not appear to be properly formed"
 msgstr "The message does not appear to be properly formed"
 
-#: calendar/gui/e-itip-control.c:1466
+#: calendar/gui/e-itip-control.c:1465
 msgid "The message contains only unsupported requests."
 msgstr "The message contains only unsupported requests."
 
-#: calendar/gui/e-itip-control.c:1497
+#: calendar/gui/e-itip-control.c:1496
 msgid "The attachment does not contain a valid calendar message"
 msgstr "The attachment does not contain a valid calendar message"
 
-#: calendar/gui/e-itip-control.c:1529
+#: calendar/gui/e-itip-control.c:1528
 msgid "The attachment has no viewable calendar items"
 msgstr "The attachment has no viewable calendar items"
 
-#: calendar/gui/e-itip-control.c:1763
+#: calendar/gui/e-itip-control.c:1762
 msgid "Update complete\n"
 msgstr "Update complete\n"
 
-#: calendar/gui/e-itip-control.c:1793 calendar/gui/e-itip-control.c:1865
+#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Attendee status can not be updated because the item no longer exists"
 
-#: calendar/gui/e-itip-control.c:1809 calendar/gui/e-itip-control.c:1847
+#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Object is invalid and cannot be updated\n"
 
-#: calendar/gui/e-itip-control.c:1819
+#: calendar/gui/e-itip-control.c:1818
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "This response is not from a current attendee.  Add as an attendee?"
 
-#: calendar/gui/e-itip-control.c:1831
+#: calendar/gui/e-itip-control.c:1830
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Attendee status could not be updated because of an invalid status!\n"
 
-#: calendar/gui/e-itip-control.c:1850
+#: calendar/gui/e-itip-control.c:1849
 msgid "There was an error on the CORBA system\n"
 msgstr "There was an error on the CORBA system\n"
 
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1852
 msgid "Object could not be found\n"
 msgstr "Object could not be found\n"
 
-#: calendar/gui/e-itip-control.c:1856
+#: calendar/gui/e-itip-control.c:1855
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "You don't have the right permissions to update the calendar\n"
 
-#: calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1858
 msgid "Attendee status updated\n"
 msgstr "Attendee status updated\n"
 
-#: calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1861
 msgid "Attendee status could not be updated!\n"
 msgstr "Attendee status could not be updated!\n"
 
-#: calendar/gui/e-itip-control.c:1893
+#: calendar/gui/e-itip-control.c:1892
 msgid "Removal Complete"
 msgstr "Removal Complete"
 
-#: calendar/gui/e-itip-control.c:1916 calendar/gui/e-itip-control.c:1964
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
 msgid "Item sent!\n"
 msgstr "Item sent!\n"
 
-#: calendar/gui/e-itip-control.c:1918 calendar/gui/e-itip-control.c:1968
+#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
 msgid "The item could not be sent!\n"
 msgstr "The item could not be sent!\n"
 
@@ -6122,74 +6032,74 @@ msgstr "date-end"
 msgid "date-start"
 msgstr "date-start"
 
-#: calendar/gui/e-meeting-list-view.c:62
+#: calendar/gui/e-meeting-list-view.c:59
 msgid "Chair Persons"
 msgstr "Chair Persons"
 
-#: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:480
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
 msgid "Required Participants"
 msgstr "Required Participants"
 
-#: calendar/gui/e-meeting-list-view.c:64
+#: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Optional Participants"
 
-#: calendar/gui/e-meeting-list-view.c:65
+#: calendar/gui/e-meeting-list-view.c:62
 msgid "Resources"
 msgstr "Resources"
 
-#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
 #: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr "Individual"
 
-#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "Group"
 
-#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr "Resource"
 
-#: calendar/gui/e-meeting-list-view.c:144 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr "Room"
 
-#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr "Chair"
 
-#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:127
 #: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
 msgid "Required Participant"
 msgstr "Required Participant"
 
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr "Optional Participant"
 
-#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr "Non-Participant"
 
-#: calendar/gui/e-meeting-list-view.c:180 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:177
 #: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
 msgid "Needs Action"
 msgstr "Needs Action"
 
-#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
 #: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "Tentative"
 
-#: calendar/gui/e-meeting-list-view.c:184 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr "Delegated"
@@ -6206,20 +6116,28 @@ msgstr "Out of Office"
 msgid "No Information"
 msgstr "No Information"
 
+#: calendar/gui/e-meeting-time-sel.c:417
+#, fuzzy
+msgid "Add attendees from addressbook"
+msgstr "Add Sender to Address_book"
+
 #: calendar/gui/e-meeting-time-sel.c:440
 msgid "_Options"
 msgstr "_Options"
 
 #: calendar/gui/e-meeting-time-sel.c:457
-msgid "Show _Only Working Hours"
+#, fuzzy
+msgid "Show _only working hours"
 msgstr "Show _Only Working Hours"
 
 #: calendar/gui/e-meeting-time-sel.c:467
-msgid "Show _Zoomed Out"
+#, fuzzy
+msgid "Show _zoomed out"
 msgstr "Show _Zoomed Out"
 
 #: calendar/gui/e-meeting-time-sel.c:482
-msgid "_Update Free/Busy"
+#, fuzzy
+msgid "_Update free/busy"
 msgstr "_Update Free/Busy"
 
 #: calendar/gui/e-meeting-time-sel.c:497
@@ -6235,19 +6153,23 @@ msgid ">_>"
 msgstr ">_>"
 
 #: calendar/gui/e-meeting-time-sel.c:547
-msgid "_All People and Resources"
+#, fuzzy
+msgid "_All people and resources"
 msgstr "_All People and Resources"
 
 #: calendar/gui/e-meeting-time-sel.c:556
-msgid "All _People and One Resource"
+#, fuzzy
+msgid "All _people and one resource"
 msgstr "All _People and One Resource"
 
 #: calendar/gui/e-meeting-time-sel.c:565
-msgid "_Required People"
+#, fuzzy
+msgid "_Required people"
 msgstr "_Required People"
 
 #: calendar/gui/e-meeting-time-sel.c:574
-msgid "Required People and _One Resource"
+#, fuzzy
+msgid "Required people and _one resource"
 msgstr "Required People and _One Resource"
 
 #: calendar/gui/e-meeting-time-sel.c:593
@@ -6285,7 +6207,7 @@ msgstr "%d/%m/%Y"
 msgid "Enter the password for %s"
 msgstr "Enter the password for %s"
 
-#: calendar/gui/e-tasks.c:585 calendar/gui/gnome-cal.c:2019
+#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6296,12 +6218,12 @@ msgstr ""
 
 #. FIXME Loading should be async
 #. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:680
+#: calendar/gui/e-tasks.c:801
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Opening tasks at %s"
 
-#: calendar/gui/e-tasks.c:703
+#: calendar/gui/e-tasks.c:824
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6310,47 +6232,47 @@ msgstr ""
 "Error opening %s:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:724
+#: calendar/gui/e-tasks.c:845
 msgid "Loading tasks"
 msgstr "Loading tasks"
 
-#: calendar/gui/e-tasks.c:828
+#: calendar/gui/e-tasks.c:949
 msgid "Completing tasks..."
 msgstr "Completing tasks..."
 
-#: calendar/gui/e-tasks.c:851
+#: calendar/gui/e-tasks.c:972
 msgid "Deleting selected objects..."
 msgstr "Deleting selected objects..."
 
-#: calendar/gui/e-tasks.c:878
+#: calendar/gui/e-tasks.c:999
 msgid "Expunging"
 msgstr "Expunging"
 
-#: calendar/gui/e-tasks.c:954
+#: calendar/gui/e-tasks.c:1075
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
-#: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
+#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
+#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
 #: calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:705
 msgid "Tasks"
 msgstr "Tasks"
 
-#: calendar/gui/gnome-cal.c:1877
+#: calendar/gui/gnome-cal.c:1878
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Loading appointments at %s"
 
-#: calendar/gui/gnome-cal.c:1896
+#: calendar/gui/gnome-cal.c:1897
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Loading tasks at %s"
 
-#: calendar/gui/gnome-cal.c:1919
+#: calendar/gui/gnome-cal.c:1920
 #, c-format
 msgid "Opening %s"
 msgstr "Opening %s"
 
-#: calendar/gui/gnome-cal.c:2890
+#: calendar/gui/gnome-cal.c:2906
 msgid "Purging"
 msgstr "Purging"
 
@@ -6547,7 +6469,7 @@ msgid "On The Web"
 msgstr "On The Web"
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "Unable to migrate old settings from evolution/config.xmldb"
 
@@ -6558,7 +6480,7 @@ msgid "Unable to migrate calendar `%s'"
 msgstr "Unable to migrate calendar `%s'"
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:869
+#: calendar/gui/migration.c:889
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Unable to migrate tasks `%s'"
@@ -6794,43 +6716,43 @@ msgstr "Print Item"
 msgid "Print Setup"
 msgstr "Print Setup"
 
-#: calendar/gui/tasks-component.c:303
+#: calendar/gui/tasks-component.c:313
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr "Task List '%s' will be removed. Are you sure you want to continue?"
 
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:371
 msgid "New Task List"
 msgstr "New Task List"
 
-#: calendar/gui/tasks-component.c:398
+#: calendar/gui/tasks-component.c:408
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d task"
 msgstr[1] "%d tasks"
 
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:502
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", %d selected"
 msgstr[1] ", %d selected"
 
-#: calendar/gui/tasks-component.c:447
+#: calendar/gui/tasks-component.c:457
 msgid "Failed upgrading tasks."
 msgstr "Failed upgrading tasks."
 
-#: calendar/gui/tasks-component.c:526
+#: calendar/gui/tasks-component.c:749
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "Unable to open the task list '%s' for creating events and meetings"
 
-#: calendar/gui/tasks-component.c:538
+#: calendar/gui/tasks-component.c:761
 msgid "There is no calendar available for creating tasks"
 msgstr "There is no calendar available for creating tasks"
 
-#: calendar/gui/tasks-component.c:576
+#: calendar/gui/tasks-component.c:799
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
@@ -6838,27 +6760,27 @@ msgstr ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 
-#: calendar/gui/tasks-component.c:804
+#: calendar/gui/tasks-component.c:1040
 msgid "New task"
 msgstr "New task"
 
-#: calendar/gui/tasks-component.c:805
+#: calendar/gui/tasks-component.c:1041
 msgid "_Task"
 msgstr "_Task"
 
-#: calendar/gui/tasks-component.c:806
+#: calendar/gui/tasks-component.c:1042
 msgid "Create a new task"
 msgstr "Create a new task"
 
-#: calendar/gui/tasks-component.c:812
+#: calendar/gui/tasks-component.c:1048
 msgid "New tasks group"
 msgstr "New tasks group"
 
-#: calendar/gui/tasks-component.c:813
+#: calendar/gui/tasks-component.c:1049
 msgid "_Tasks Group"
 msgstr "_Tasks Group"
 
-#: calendar/gui/tasks-component.c:814
+#: calendar/gui/tasks-component.c:1050
 msgid "Create a new tasks group"
 msgstr "Create a new tasks group"
 
@@ -8684,15 +8606,15 @@ msgstr "(match-threads) not allowed inside match-all"
 msgid "(match-threads) requires a match type string"
 msgstr "(match-threads) requires a match type string"
 
-#: camel/camel-folder-search.c:785
+#: camel/camel-folder-search.c:784
 msgid "(match-threads) expects an array result"
 msgstr "(match-threads) expects an array result"
 
-#: camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:790
 msgid "(match-threads) requires the folder set"
 msgstr "(match-threads) requires the folder set"
 
-#: camel/camel-folder-search.c:880
+#: camel/camel-folder-search.c:879
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Performing query on unknown header: %s"
@@ -8727,7 +8649,8 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
 #: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:705
+#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Cancelled."
@@ -9104,7 +9027,7 @@ msgstr "The referenced credentials have expired."
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1243
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Bad authentication response from server."
 
@@ -9464,40 +9387,40 @@ msgstr "import keys: unimplemented"
 msgid "export keys: unimplemented"
 msgstr "export keys: unimplemented"
 
-#: camel/camel-store.c:215
+#: camel/camel-store.c:213
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Cannot get folder: Invalid operation on this store"
 
-#: camel/camel-store.c:245
+#: camel/camel-store.c:243
 #, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr "Cannot create folder `%s': folder exists"
 
-#: camel/camel-store.c:299
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Cannot create folder: Invalid operation on this store"
 
-#: camel/camel-store.c:327
+#: camel/camel-store.c:325
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Cannot create folder: %s: folder exists"
 
-#: camel/camel-store.c:391 camel/camel-vee-store.c:354
+#: camel/camel-store.c:389 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Cannot delete folder: %s: Invalid operation"
 
-#: camel/camel-store.c:441 camel/camel-vee-store.c:390
+#: camel/camel-store.c:439 camel/camel-vee-store.c:387
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Cannot rename folder: %s: Invalid operation"
 
-#: camel/camel-store.c:813
+#: camel/camel-store.c:777
 msgid "Trash"
 msgstr "Trash"
 
-#: camel/camel-store.c:815 filter/libfilter-i18n.h:35
-#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/mail-config.glade.h:95
+#: ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Junk"
 
@@ -9728,12 +9651,12 @@ msgstr "No such message %s in %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Cannot copy or move messages into a Virtual Folder"
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:374
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Cannot delete folder: %s: No such folder"
 
-#: camel/camel-vee-store.c:398
+#: camel/camel-vee-store.c:395
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Cannot rename folder: %s: No such folder"
@@ -9798,8 +9721,8 @@ msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "This option will connect to the IMAP server using a plaintext password."
 
-#: camel/providers/groupwise/camel-gw-listener.c:305
-#: camel/providers/groupwise/camel-gw-listener.c:328
+#: camel/providers/groupwise/camel-gw-listener.c:312
+#: camel/providers/groupwise/camel-gw-listener.c:335
 msgid "Checklist"
 msgstr "Checklist"
 
@@ -9927,23 +9850,23 @@ msgstr ""
 "This option will connect to the IMAPv4rev1 server using a plaintext password."
 
 #: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:429
+#: camel/providers/imap/camel-imap-store.c:428
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP server %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:431
+#: camel/providers/imap/camel-imap-store.c:430
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP service for %s on %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:208
 #: camel/providers/imap4/camel-imap4-store.c:225
-#: camel/providers/imap/camel-imap-store.c:552
-#: camel/providers/imap/camel-imap-store.c:572
+#: camel/providers/imap/camel-imap-store.c:551
+#: camel/providers/imap/camel-imap-store.c:571
 #: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
+#: camel/providers/nntp/camel-nntp-store.c:209
 #: camel/providers/pop3/camel-pop3-store.c:175
 #: camel/providers/smtp/camel-smtp-transport.c:269
 #: camel/providers/smtp/camel-smtp-transport.c:285
@@ -9952,18 +9875,18 @@ msgid "Could not connect to %s (port %d): %s"
 msgstr "Could not connect to %s (port %d): %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:210
-#: camel/providers/imap/camel-imap-store.c:554
+#: camel/providers/imap/camel-imap-store.c:553
 #: camel/providers/pop3/camel-pop3-store.c:177
 #: camel/providers/smtp/camel-smtp-transport.c:271
 msgid "SSL unavailable"
 msgstr "SSL unavailable"
 
 #: camel/providers/imap4/camel-imap4-store.c:222
-#: camel/providers/imap/camel-imap-store.c:569
-#: camel/providers/imap/camel-imap-store.c:846
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/imap/camel-imap-store.c:845
 #: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:137
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
 #: camel/providers/pop3/camel-pop3-store.c:192
 msgid "Connection cancelled"
 msgstr "Connection cancelled"
@@ -9978,8 +9901,8 @@ msgstr ""
 "STARTTLS"
 
 #: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:680
-#: camel/providers/imap/camel-imap-store.c:711
+#: camel/providers/imap/camel-imap-store.c:679
+#: camel/providers/imap/camel-imap-store.c:710
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Failed to connect to IMAP server %s in secure mode: %s"
@@ -9988,7 +9911,7 @@ msgstr "Failed to connect to IMAP server %s in secure mode: %s"
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1108
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
 msgid "Unknown error"
 msgstr "Unknown error"
 
@@ -10015,8 +9938,8 @@ msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr "Cannot get folder `%s' on IMAP server %s: Unknown"
 
 #: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1890
-#: camel/providers/imap/camel-imap-store.c:2268
+#: camel/providers/imap/camel-imap-store.c:1885
+#: camel/providers/imap/camel-imap-store.c:2263
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -10094,12 +10017,12 @@ msgstr "IMAP server %s unexpectedly disconnected: %s"
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3201
+#: camel/providers/imap/camel-imap-store.c:3194
 msgid "Operation cancelled"
 msgstr "Operation cancelled"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3204
+#: camel/providers/imap/camel-imap-store.c:3197
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server unexpectedly disconnected: %s"
@@ -10180,7 +10103,7 @@ msgstr "No such message"
 
 #: camel/providers/imap/camel-imap-folder.c:2019
 #: camel/providers/imap/camel-imap-folder.c:2622
-#: camel/providers/nntp/camel-nntp-folder.c:238
+#: camel/providers/nntp/camel-nntp-folder.c:220
 msgid "This message is not currently available"
 msgstr "This message is not currently available"
 
@@ -10264,43 +10187,43 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "For reading and storing mail on IMAP servers."
 
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:680
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS extension not supported."
 
-#: camel/providers/imap/camel-imap-store.c:712
+#: camel/providers/imap/camel-imap-store.c:711
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL negotiations failed"
 
-#: camel/providers/imap/camel-imap-store.c:849
+#: camel/providers/imap/camel-imap-store.c:848
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Could not connect with command \"%s\": %s"
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1272
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP server %s does not support requested authentication type %s"
 
-#: camel/providers/imap/camel-imap-store.c:1285
+#: camel/providers/imap/camel-imap-store.c:1282
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "No support for authentication type %s"
 
-#: camel/providers/imap/camel-imap-store.c:1308
+#: camel/providers/imap/camel-imap-store.c:1305
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sPlease enter the IMAP password for %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1322
+#: camel/providers/imap/camel-imap-store.c:1319
 msgid "You didn't enter a password."
 msgstr "You didn't enter a password."
 
-#: camel/providers/imap/camel-imap-store.c:1351
+#: camel/providers/imap/camel-imap-store.c:1348
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10311,18 +10234,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1872
-#: camel/providers/imap/camel-imap-store.c:2062
+#: camel/providers/imap/camel-imap-store.c:1867
+#: camel/providers/imap/camel-imap-store.c:2057
 #, c-format
 msgid "No such folder %s"
 msgstr "No such folder %s"
 
-#: camel/providers/imap/camel-imap-store.c:1948
-#: camel/providers/imap/camel-imap-store.c:2329
+#: camel/providers/imap/camel-imap-store.c:1943
+#: camel/providers/imap/camel-imap-store.c:2324
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "The parent folder is not allowed to contain subfolders"
 
-#: camel/providers/imap/camel-imap-store.c:2003
+#: camel/providers/imap/camel-imap-store.c:1998
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10330,7 +10253,7 @@ msgstr "The parent folder is not allowed to contain subfolders"
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Cannot create folder `%s': folder exists."
 
-#: camel/providers/imap/camel-imap-store.c:2279
+#: camel/providers/imap/camel-imap-store.c:2274
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Unknown parent folder: %s"
@@ -10366,20 +10289,20 @@ msgid "Index message body data"
 msgstr "Index message body data"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:388
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:393
-#: camel/providers/local/camel-local-folder.c:396
+#: camel/providers/local/camel-local-folder.c:392
+#: camel/providers/local/camel-local-folder.c:395
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "mailbox:%s (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:400
+#: camel/providers/local/camel-local-folder.c:399
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -10439,7 +10362,7 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:142
 #: camel/providers/local/camel-local-store.c:253
-#: camel/providers/local/camel-mbox-store.c:356
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10571,9 +10494,9 @@ msgstr "Could not delete folder `%s': %s"
 msgid "not a maildir directory"
 msgstr "not a maildir directory"
 
-#: camel/providers/local/camel-maildir-store.c:341
-#: camel/providers/local/camel-spool-store.c:286
-#: camel/providers/local/camel-spool-store.c:316
+#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-spool-store.c:284
+#: camel/providers/local/camel-spool-store.c:314
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Could not scan folder `%s': %s"
@@ -10630,7 +10553,7 @@ msgid "Message construction failed."
 msgstr "Message construction failed."
 
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:362
+#: camel/providers/local/camel-mbox-store.c:361
 msgid "Cannot create a folder by this name."
 msgstr "Cannot create a folder by this name."
 
@@ -10660,30 +10583,30 @@ msgstr "`%s' is not a regular file."
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Folder `%s' is not empty. Not deleted."
 
-#: camel/providers/local/camel-mbox-store.c:375
+#: camel/providers/local/camel-mbox-store.c:374
 #, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Cannot create directory `%s': %s."
 
-#: camel/providers/local/camel-mbox-store.c:389
+#: camel/providers/local/camel-mbox-store.c:388
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Cannot create folder: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:391
+#: camel/providers/local/camel-mbox-store.c:390
 msgid "Folder already exists"
 msgstr "Folder already exists"
 
-#: camel/providers/local/camel-mbox-store.c:473
+#: camel/providers/local/camel-mbox-store.c:472
 msgid "The new folder name is illegal."
 msgstr "The new folder name is illegal."
 
-#: camel/providers/local/camel-mbox-store.c:486
+#: camel/providers/local/camel-mbox-store.c:485
 #, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Could not rename `%s': `%s': %s"
 
-#: camel/providers/local/camel-mbox-store.c:561
+#: camel/providers/local/camel-mbox-store.c:560
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Could not rename '%s' to %s: %s"
@@ -10874,7 +10797,7 @@ msgstr ""
 "Folder may be corrupt, copy saved in `%s'"
 
 #: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:997
+#: camel/providers/nntp/camel-nntp-store.c:1126
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Please enter the NNTP password for %s@%s"
@@ -10891,18 +10814,10 @@ msgstr "Failed to send username to server"
 msgid "Server rejected username/password"
 msgstr "Server rejected username/password"
 
-#: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:263
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr "User cancelled"
-
-#: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:259
-#: camel/providers/nntp/camel-nntp-folder.c:265
+#: camel/providers/nntp/camel-nntp-folder.c:147
+#: camel/providers/nntp/camel-nntp-folder.c:149
+#: camel/providers/nntp/camel-nntp-folder.c:158
+#: camel/providers/nntp/camel-nntp-folder.c:234
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -10911,60 +10826,49 @@ msgstr "User cancelled"
 msgid "Cannot get message %s: %s"
 msgstr "Cannot get message %s: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:188
-#: camel/providers/nntp/camel-nntp-folder.c:228
+#: camel/providers/nntp/camel-nntp-folder.c:156
+#: camel/providers/nntp/camel-nntp-folder.c:232
+#: camel/providers/nntp/camel-nntp-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+msgid "User cancelled"
+msgstr "User cancelled"
+
+#: camel/providers/nntp/camel-nntp-folder.c:176
+#: camel/providers/nntp/camel-nntp-folder.c:208
 #, c-format
 msgid "Internal error: uid in invalid format: %s"
 msgstr "Internal error: uid in invalid format: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:201
-#, c-format
-msgid "Could not get article %s from NNTP server"
-msgstr "Could not get article %s from NNTP server"
-
-#: camel/providers/nntp/camel-nntp-folder.c:362
-msgid "Posting not allowed by news server"
-msgstr "Posting not allowed by news server"
-
+#: camel/providers/nntp/camel-nntp-folder.c:328
+#: camel/providers/nntp/camel-nntp-folder.c:331
 #: camel/providers/nntp/camel-nntp-folder.c:373
-#, c-format
-msgid "Failed to send newsgroups header: %s: message not posted"
-msgstr "Failed to send newsgroups header: %s: message not posted"
-
-#: camel/providers/nntp/camel-nntp-folder.c:413
-#: camel/providers/nntp/camel-nntp-folder.c:426
-#, c-format
-msgid "Error posting to newsgroup: %s: message not posted"
-msgstr "Error posting to newsgroup: %s: message not posted"
-
-#: camel/providers/nntp/camel-nntp-folder.c:438
-msgid "Error reading response to posted message: message not posted"
-msgstr "Error reading response to posted message: message not posted"
-
-#: camel/providers/nntp/camel-nntp-folder.c:441
-#, c-format
-msgid "Error posting message: %s: message not posted"
-msgstr "Error posting message: %s: message not posted"
+#: camel/providers/nntp/camel-nntp-folder.c:375
+#, fuzzy, c-format
+msgid "Posting failed: %s"
+msgstr "Operation failed: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:457
+#: camel/providers/nntp/camel-nntp-folder.c:393
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "You cannot post NNTP messages while working offline!"
 
-#: camel/providers/nntp/camel-nntp-folder.c:468
+#: camel/providers/nntp/camel-nntp-folder.c:404
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "You cannot copy messages from a NNTP folder!"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:44
 msgid "Could not get group list from server."
 msgstr "Could not get group list from server."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#: camel/providers/nntp/camel-nntp-grouplist.c:97
+#: camel/providers/nntp/camel-nntp-grouplist.c:106
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "Unable to load grouplist file for %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#: camel/providers/nntp/camel-nntp-grouplist.c:157
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Unable to save grouplist file for %s: %s"
@@ -10995,26 +10899,29 @@ msgstr ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 
-#: camel/providers/nntp/camel-nntp-store.c:158
+#: camel/providers/nntp/camel-nntp-store.c:118
+#: camel/providers/nntp/camel-nntp-store.c:1233
+#: camel/providers/nntp/camel-nntp-store.c:1331
+#, c-format
+msgid "NNTP Command failed: %s"
+msgstr "NNTP Command failed: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:227
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Could not read greeting from %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:170
+#: camel/providers/nntp/camel-nntp-store.c:239
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP server %s returned error code %d: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:326
+#: camel/providers/nntp/camel-nntp-store.c:403
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET News via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:640
-msgid "Stream error"
-msgstr "Stream error"
-
-#: camel/providers/nntp/camel-nntp-store.c:643
+#: camel/providers/nntp/camel-nntp-store.c:777
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -11025,7 +10932,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/providers/nntp/camel-nntp-store.c:735
+#: camel/providers/nntp/camel-nntp-store.c:872
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
@@ -11035,7 +10942,7 @@ msgstr ""
 "\n"
 "No such newsgroup. The selected item is a probably a parent folder."
 
-#: camel/providers/nntp/camel-nntp-store.c:767
+#: camel/providers/nntp/camel-nntp-store.c:904
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
@@ -11045,58 +10952,59 @@ msgstr ""
 "\n"
 "newsgroup does not exist!"
 
-#: camel/providers/nntp/camel-nntp-store.c:792
+#: camel/providers/nntp/camel-nntp-store.c:929
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr "You cannot create a folder in a News store: subscribe instead."
 
-#: camel/providers/nntp/camel-nntp-store.c:800
+#: camel/providers/nntp/camel-nntp-store.c:937
 msgid "You cannot rename a folder in a News store."
 msgstr "You cannot rename a folder in a News store."
 
-#: camel/providers/nntp/camel-nntp-store.c:808
+#: camel/providers/nntp/camel-nntp-store.c:945
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "You cannot remove a folder in a News store: unsubscribe instead."
 
-#: camel/providers/nntp/camel-nntp-summary.c:253
-#, c-format
-msgid "Connection error: %s"
-msgstr "Connection error: %s"
-
-#: camel/providers/nntp/camel-nntp-summary.c:262
-#, c-format
-msgid "No such folder: %s"
-msgstr "No such folder: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1118
+#, fuzzy
+msgid "Authentication requested but not username provided"
+msgstr "Authentication required"
 
-#: camel/providers/nntp/camel-nntp-summary.c:268
-#, c-format
-msgid "Could not get group: %s"
-msgstr "Could not get group: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1146
+#, fuzzy, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr "Cannot authenticate to IMAP server %s using %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:333
-msgid "Could not get messages: unspecified error"
-msgstr "Could not get messages: unspecified error"
+#: camel/providers/nntp/camel-nntp-store.c:1262
+#, fuzzy
+msgid "Not connected."
+msgstr "No contacts"
 
-#: camel/providers/nntp/camel-nntp-summary.c:378
+#: camel/providers/nntp/camel-nntp-store.c:1311
 #, c-format
-msgid "NNTP Command failed: %s"
-msgstr "NNTP Command failed: %s"
+msgid "No such folder: %s"
+msgstr "No such folder: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:438
-#: camel/providers/nntp/camel-nntp-summary.c:543
+#: camel/providers/nntp/camel-nntp-summary.c:218
+#: camel/providers/nntp/camel-nntp-summary.c:314
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Scanning new messages"
 
-#: camel/providers/nntp/camel-nntp-summary.c:558
-#, c-format
-msgid "Unknown server response: %s"
-msgstr "Unknown server response: %s"
+#: camel/providers/nntp/camel-nntp-summary.c:225
+#, fuzzy, c-format
+msgid "Unexpected server response from xover: %s"
+msgstr "Unexpected response from IMAP server: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:328
+#, fuzzy, c-format
+msgid "Unexpected server response from head: %s"
+msgstr "Unexpected response from GnuPG: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:605
+#: camel/providers/nntp/camel-nntp-summary.c:368
 msgid "Use cancel"
 msgstr "Use cancel"
 
-#: camel/providers/nntp/camel-nntp-summary.c:607
+#: camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Operation failed: %s"
@@ -11791,17 +11699,19 @@ msgstr "Attach file(s)"
 
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
-msgid "You cannot attach the file `${0}' to this message."
+#, fuzzy
+msgid "You cannot attach the file `{0}' to this message."
 msgstr "You cannot attach the file `${0}' to this message."
 
 #. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4
-msgid "${1}"
-msgstr "${1}"
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr "{1}"
 
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+#, fuzzy
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr "The file `${0}' is not a regular file and cannot be sent in a message."
 
 #. mail-composer:attach-directory primary
@@ -11895,7 +11805,8 @@ msgstr "Could not create message."
 
 #. mail-composer:no-build-message secondary
 #: composer/mail-composer-errors.xml.h:34
-msgid "Because \"${0}\", you may need to select different mail options."
+#, fuzzy
+msgid "Because \"{0}\", you may need to select different mail options."
 msgstr "Because \"${0}\", you may need to select different mail options."
 
 #. mail-composer:no-sig-file primary
@@ -11904,9 +11815,11 @@ msgid "Could not read signature file \"{0}\"."
 msgstr "Could not read signature file \"{0}\"."
 
 #. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38
-msgid "Because \"${1}\"."
-msgstr "Because \"${1}\"."
+#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr "Because \"{1}\"."
 
 #. mail-composer:all-accounts-deleted primary
 #: composer/mail-composer-errors.xml.h:40
@@ -12411,8 +12324,8 @@ msgstr "with all local folders"
 msgid "years"
 msgstr "years"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:1011
-#: mail/mail-config.c:76 mail/mail-config.glade.h:93
+#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
+#: mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Important"
 
@@ -12476,252 +12389,6 @@ msgstr "incoming"
 msgid "outgoing"
 msgstr "outgoing"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Adjust Score"
-msgstr "Adjust Score"
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Color"
-msgstr "Assign Colour"
-
-#: filter/libfilter-i18n.h:4
-msgid "Assign Score"
-msgstr "Assign Score"
-
-#: filter/libfilter-i18n.h:5
-msgid "Attachments"
-msgstr "Attachments"
-
-#: filter/libfilter-i18n.h:6
-msgid "Beep"
-msgstr "Beep"
-
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "contains"
-
-#: filter/libfilter-i18n.h:8
-msgid "Copy to Folder"
-msgstr "Copy to Folder"
-
-#: filter/libfilter-i18n.h:9
-msgid "Date received"
-msgstr "Date received"
-
-#: filter/libfilter-i18n.h:10
-msgid "Date sent"
-msgstr "Date sent"
-
-#: filter/libfilter-i18n.h:12
-msgid "Deleted"
-msgstr "Deleted"
-
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "does not contain"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "does not end with"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "does not exist"
-
-#: filter/libfilter-i18n.h:16
-msgid "does not return"
-msgstr "does not return"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "does not sound like"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "does not start with"
-
-#: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
-msgstr "Do Not Exist"
-
-#: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr "Draft"
-
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "ends with"
-
-#: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr "Exist"
-
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "exists"
-
-#: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr "Expression"
-
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr "Follow Up"
-
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "is"
-
-#: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr "is after"
-
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr "is before"
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr "is Flagged"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "is greater than"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "is less than"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "is not"
-
-#: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr "is not Flagged"
-
-#: filter/libfilter-i18n.h:36
-msgid "Junk Test"
-msgstr "Junk Test"
-
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
-#: widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Label"
-
-#: filter/libfilter-i18n.h:38
-msgid "Mailing list"
-msgstr "Mailing list"
-
-#: filter/libfilter-i18n.h:39
-msgid "Message Body"
-msgstr "Message Body"
-
-#: filter/libfilter-i18n.h:40
-msgid "Message Header"
-msgstr "Message Header"
-
-#: filter/libfilter-i18n.h:41
-msgid "Message is Junk"
-msgstr "Message is Junk"
-
-#: filter/libfilter-i18n.h:42
-msgid "Message is not Junk"
-msgstr "Message is not Junk"
-
-#: filter/libfilter-i18n.h:43
-msgid "Move to Folder"
-msgstr "Move to Folder"
-
-#: filter/libfilter-i18n.h:44
-msgid "Pipe to Program"
-msgstr "Pipe to Program"
-
-#: filter/libfilter-i18n.h:45
-msgid "Play Sound"
-msgstr "Play Sound"
-
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Read"
-
-#: filter/libfilter-i18n.h:47
-msgid "Recipients"
-msgstr "Recipients"
-
-#: filter/libfilter-i18n.h:48
-msgid "Regex Match"
-msgstr "Regex Match"
-
-#: filter/libfilter-i18n.h:49
-msgid "Replied to"
-msgstr "Replied to"
-
-#: filter/libfilter-i18n.h:50
-msgid "returns"
-msgstr "returns"
-
-#: filter/libfilter-i18n.h:51
-msgid "returns greater than"
-msgstr "returns greater than"
-
-#: filter/libfilter-i18n.h:52
-msgid "returns less than"
-msgstr "returns less than"
-
-#: filter/libfilter-i18n.h:53
-msgid "Run Program"
-msgstr "Run Program"
-
-#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Score"
-
-#: filter/libfilter-i18n.h:55
-msgid "Sender"
-msgstr "Sender"
-
-#: filter/libfilter-i18n.h:56
-msgid "Set Status"
-msgstr "Set Status"
-
-#: filter/libfilter-i18n.h:57
-msgid "Size (kB)"
-msgstr "Size (kB)"
-
-#: filter/libfilter-i18n.h:58
-msgid "sounds like"
-msgstr "sounds like"
-
-#: filter/libfilter-i18n.h:59
-msgid "Source Account"
-msgstr "Source Account"
-
-#: filter/libfilter-i18n.h:60
-msgid "Specific header"
-msgstr "Specific header"
-
-#: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "starts with"
-
-#: filter/libfilter-i18n.h:63
-msgid "Stop Processing"
-msgstr "Stop Processing"
-
-#: filter/libfilter-i18n.h:64 mail/em-format.c:755 mail/em-format-html.c:1519
-#: mail/em-format-quote.c:302 mail/em-mailer-prefs.c:87
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
-#: smime/lib/e-cert.c:1079
-msgid "Subject"
-msgstr "Subject"
-
-#: filter/libfilter-i18n.h:65
-msgid "Unset Status"
-msgstr "Unset Status"
-
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Add Rule"
@@ -12738,6 +12405,11 @@ msgstr "Rule name"
 msgid "_Score Rules"
 msgstr "_Score Rules"
 
+#: filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Score"
+
 #: filter/searchtypes.xml.h:1
 msgid "Body contains"
 msgstr "Body contains"
@@ -12816,13 +12488,13 @@ msgstr "Signature(s)"
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Forwarded Message --------"
 
-#: mail/em-composer-utils.c:1499
+#: mail/em-composer-utils.c:1495
 msgid "an unknown sender"
 msgstr "an unknown sender"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1509
+#: mail/em-composer-utils.c:1505
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 
@@ -12860,8 +12532,8 @@ msgstr "<click here to select a folder>"
 msgid "Create New Folder"
 msgstr "Create New Folder"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
-#: mail/mail-component.c:706
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
+#: mail/mail-component.c:704
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Specify where to create the folder:"
@@ -12875,96 +12547,97 @@ msgstr "Create"
 msgid "Folder _name:"
 msgstr "Folder _name:"
 
-#: mail/em-folder-tree.c:839
+#: mail/em-folder-tree.c:833
 #, c-format
 msgid "Moving folder %s"
 msgstr "Moving folder %s"
 
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree.c:835
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copying folder %s"
 
-#: mail/em-folder-tree.c:848 mail/message-list.c:1561
+#: mail/em-folder-tree.c:842 mail/message-list.c:1561
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Moving messages into folder %s"
 
-#: mail/em-folder-tree.c:850 mail/message-list.c:1563
+#: mail/em-folder-tree.c:844 mail/message-list.c:1563
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copying messages into folder %s"
 
-#: mail/em-folder-tree.c:866
+#: mail/em-folder-tree.c:860
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Cannot drop message(s) into toplevel store"
 
-#: mail/em-folder-tree.c:956 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Copy to Folder"
 
-#: mail/em-folder-tree.c:957 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Move to Folder"
 
-#: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2069
-#: mail/em-folder-tree.c:2556 mail/em-folder-view.c:798
+#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
+#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
 #: mail/message-list.c:1651
 msgid "_Move"
 msgstr "_Move"
 
-#: mail/em-folder-tree.c:961 mail/message-list.c:1653
+#: mail/em-folder-tree.c:955 mail/message-list.c:1653
 msgid "Cancel _Drag"
 msgstr "Cancel _Drag"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
 #: mail/em-folder-view.c:798 mail/em-folder-view.c:812
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Select folder"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
 msgid "C_opy"
 msgstr "C_opy"
 
-#: mail/em-folder-tree.c:2096
+#: mail/em-folder-tree.c:2088
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Creating folder `%s'"
 
-#: mail/em-folder-tree.c:2282 mail/mail-component.c:706
+#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
 msgid "Create folder"
 msgstr "Create folder"
 
-#: mail/em-folder-tree.c:2477
+#: mail/em-folder-tree.c:2463
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Rename the \"%s\" folder to:"
 
-#: mail/em-folder-tree.c:2479
+#: mail/em-folder-tree.c:2465
 msgid "Rename Folder"
 msgstr "Rename Folder"
 
-#: mail/em-folder-tree.c:2550 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_View"
 
-#: mail/em-folder-tree.c:2551
+#: mail/em-folder-tree.c:2537
 msgid "Open in _New Window"
 msgstr "Open in _New Window"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2560
+#: mail/em-folder-tree.c:2546
 msgid "_New Folder..."
 msgstr "_New Folder..."
 
-#: mail/em-folder-tree.c:2563
+#: mail/em-folder-tree.c:2549
 msgid "_Rename"
 msgstr "_Rename"
 
-#: mail/em-folder-tree.c:2566 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Properties..."
 
@@ -12983,14 +12656,14 @@ msgstr "UNMATCHED"
 msgid "Inbox"
 msgstr "Inbox"
 
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
 msgid "Loading..."
 msgstr "Loading..."
 
 #: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
 #: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:510
-#: mail/mail-component.c:556
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
+#: mail/mail-component.c:554
 msgid "Mail"
 msgstr "Mail"
 
@@ -13071,6 +12744,10 @@ msgstr "Mo_ve to Folder..."
 msgid "_Copy to Folder..."
 msgstr "_Copy to Folder..."
 
+#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Label"
+
 #: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Add Sender to Address_book"
@@ -13164,6 +12841,12 @@ msgstr "Cc"
 msgid "Bcc"
 msgstr "Bcc"
 
+#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
+#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Subject"
+
 #: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
 #: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
 msgid "Date"
@@ -13366,7 +13049,7 @@ msgstr ""
 "very difficult for an outsider to view the content of this message in a "
 "practical amount of time."
 
-#: mail/em-format-html-display.c:757
+#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
 msgid "_View Certificate"
 msgstr "_View Certificate"
 
@@ -14093,15 +13776,15 @@ msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution is importing your old Elm mail"
 
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:226
+#: mail/importers/evolution-mbox-importer.c:221
+#: mail/importers/evolution-outlook-importer.c:255
 #: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Importing..."
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:222
-#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/evolution-mbox-importer.c:223
+#: mail/importers/evolution-outlook-importer.c:257
 #: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Please wait"
@@ -14123,21 +13806,23 @@ msgid "Elm"
 msgstr "Elm"
 
 #: mail/importers/evolution-mbox-importer.c:116
+#: mail/importers/evolution-outlook-importer.c:130
 msgid "Destination folder:"
 msgstr "Destination folder:"
 
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder to import into"
 msgstr "Select folder to import into"
 
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:254
 #: mail/importers/mail-importer.c:226
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importing `%s'"
 
-#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/evolution-outlook-importer.c:301
 #: mail/importers/mail-importer.c:140
 msgid "Importing mailbox"
 msgstr "Importing mailbox"
@@ -14339,66 +14024,66 @@ msgstr "%s mailing list"
 msgid "Add Filter Rule"
 msgstr "Add Filter Rule"
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:461
 #, c-format
 msgid "%d deleted"
 msgstr "%d deleted"
 
-#: mail/mail-component.c:465
+#: mail/mail-component.c:463
 #, c-format
 msgid "%d junk"
 msgstr "%d junk"
 
-#: mail/mail-component.c:488
+#: mail/mail-component.c:486
 #, c-format
 msgid "%d drafts"
 msgstr "%d drafts"
 
-#: mail/mail-component.c:490
+#: mail/mail-component.c:488
 #, c-format
 msgid "%d sent"
 msgstr "%d sent"
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:490
 #, c-format
 msgid "%d unsent"
 msgstr "%d unsent"
 
-#: mail/mail-component.c:496
+#: mail/mail-component.c:494
 #, c-format
 msgid "%d total"
 msgstr "%d total"
 
-#: mail/mail-component.c:498
+#: mail/mail-component.c:496
 #, c-format
 msgid ", %d unread"
 msgstr ", %d unread"
 
-#: mail/mail-component.c:658
+#: mail/mail-component.c:656
 msgid "New Mail Message"
 msgstr "New Mail Message"
 
-#: mail/mail-component.c:659
+#: mail/mail-component.c:657
 msgid "_Mail Message"
 msgstr "_Mail Message"
 
-#: mail/mail-component.c:660
+#: mail/mail-component.c:658
 msgid "Compose a new mail message"
 msgstr "Compose a new mail message"
 
-#: mail/mail-component.c:666
+#: mail/mail-component.c:664
 msgid "New Mail Folder"
 msgstr "New Mail Folder"
 
-#: mail/mail-component.c:667
+#: mail/mail-component.c:665
 msgid "Mail _Folder"
 msgstr "Mail _Folder"
 
-#: mail/mail-component.c:668
+#: mail/mail-component.c:666
 msgid "Create a new mail folder"
 msgstr "Create a new mail folder"
 
-#: mail/mail-component.c:800
+#: mail/mail-component.c:798
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Failed upgrading Mail settings or folders."
 
@@ -15309,11 +14994,6 @@ msgstr "Error loading filter definitions."
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Cannot save to directory \"{0}\"."
 
-#. mail:no-save-path secondary
-#: mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr "{1}"
-
 #. mail:no-create-path primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
@@ -15330,12 +15010,6 @@ msgstr "Cannot create the save directory, because \"{1}\""
 msgid "Cannot create temporary save directory."
 msgstr "Cannot create temporary save directory."
 
-#. mail:no-create-tmp-path secondary
-#: mail/mail-errors.xml.h:100 mail/mail-errors.xml.h:112
-#: widgets/misc/e-system-errors.xml.h:11 widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr "Because \"{1}\"."
-
 #. mail:no-write-path-exists secondary
 #: mail/mail-errors.xml.h:104
 msgid "File exists but cannot overwrite it."
@@ -15596,7 +15270,7 @@ msgstr "_Overwrite"
 msgid "_Append"
 msgstr "_Append"
 
-#: mail/mail-folder-cache.c:791
+#: mail/mail-folder-cache.c:785
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinging %s"
@@ -16036,6 +15710,10 @@ msgstr "Forward"
 msgid "No Response Necessary"
 msgstr "No Response Necessary"
 
+#: mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Read"
+
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Reply"
@@ -16139,43 +15817,47 @@ msgstr ""
 "List of paths for the folders to be synchronised to disk for offline usage"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid "Toolbar is visible"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Whether Evolution should start up in offline mode"
 msgstr "Whether Evolution should start up in offline mode"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Whether the toolbar should be visible."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
 msgid "Whether to skip the development warning dialog"
 msgstr "Whether to skip the development warning dialogue"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
+#: shell/apps_evolution_shell.schemas.in.in.h:14
 msgid "mail"
 msgstr "mail"
 
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
-msgstr "Brought to you by"
-
-#: shell/e-shell.c:545 shell/e-shell.c:546
+#: shell/e-shell.c:588 shell/e-shell.c:589
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: shell/e-shell.c:743
+#: shell/e-shell.c:786
 msgid "Uknown system error."
 msgstr "Uknown system error."
 
-#: shell/e-shell.c:1100
+#: shell/e-shell.c:1143
 msgid "Invalid arguments"
 msgstr "Invalid arguments"
 
-#: shell/e-shell.c:1102
+#: shell/e-shell.c:1145
 msgid "Cannot register on OAF"
 msgstr "Cannot register on OAF"
 
-#: shell/e-shell.c:1104
+#: shell/e-shell.c:1147
 msgid "Configuration Database not found"
 msgstr "Configuration Database not found"
 
-#: shell/e-shell.c:1106
+#: shell/e-shell.c:1149
 msgid "Generic error"
 msgstr "Generic error"
 
@@ -16234,7 +15916,7 @@ msgstr ""
 msgid "Select importer"
 msgstr "Select importer"
 
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1026
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
 #, c-format
 msgid "File %s does not exist"
 msgstr "File %s does not exist"
@@ -16262,31 +15944,32 @@ msgstr ""
 "Importing %s\n"
 "Importing item 1."
 
-#: shell/e-shell-importer.c:549
+#: shell/e-shell-importer.c:570
 msgid "Automatic"
 msgstr "Automatic"
 
-#: shell/e-shell-importer.c:598
-msgid "_Filename:"
-msgstr "_Filename:"
+#: shell/e-shell-importer.c:626
+#, fuzzy
+msgid "F_ilename:"
+msgstr "File name:"
 
-#: shell/e-shell-importer.c:603
+#: shell/e-shell-importer.c:631
 msgid "Select a file"
 msgstr "Select a file"
 
-#: shell/e-shell-importer.c:613
+#: shell/e-shell-importer.c:642
 msgid "File _type:"
 msgstr "File _type:"
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:681
 msgid "Import data and settings from _older programs"
 msgstr "Import data and settings from _older programs"
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:684
 msgid "Import a _single file"
 msgstr "Import a _single file"
 
-#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -16294,25 +15977,25 @@ msgstr ""
 "Please wait...\n"
 "Scanning for existing setups"
 
-#: shell/e-shell-importer.c:727
+#: shell/e-shell-importer.c:756
 msgid "Starting Intelligent Importers"
 msgstr "Starting Intelligent Importers"
 
-#: shell/e-shell-importer.c:853 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
 #, c-format
 msgid "From %s:"
 msgstr "From %s:"
 
-#: shell/e-shell-importer.c:1044
+#: shell/e-shell-importer.c:1073
 #, c-format
 msgid "No importer available for file %s"
 msgstr "No importer available for file %s"
 
-#: shell/e-shell-importer.c:1056
+#: shell/e-shell-importer.c:1085
 msgid "Unable to execute importer"
 msgstr "Unable to execute importer"
 
-#: shell/e-shell-importer.c:1169
+#: shell/e-shell-importer.c:1199
 msgid "_Import"
 msgstr "_Import"
 
@@ -16362,53 +16045,54 @@ msgstr "Folder name cannot contain the character \"#\"."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' and '..' are reserved folder names."
 
-#: shell/e-shell-window.c:336
+#: shell/e-shell-window.c:337
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr "Evolution is currently online.  Click on this button to work offline."
 
-#: shell/e-shell-window.c:343
+#: shell/e-shell-window.c:344
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution is in the process of going offline."
 
-#: shell/e-shell-window.c:349
+#: shell/e-shell-window.c:350
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr "Evolution is currently offline.  Click on this button to work online."
 
-#: shell/e-shell-window.c:621
+#: shell/e-shell-window.c:637
 #, c-format
 msgid "Switch to %s"
 msgstr "Switch to %s"
 
-#: shell/e-shell-window-commands.c:64
+#: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "The GNOME Pilot tools do not appear to be installed on this system."
 
-#: shell/e-shell-window-commands.c:72
+#: shell/e-shell-window-commands.c:74
 #, c-format
 msgid "Error executing %s."
 msgstr "Error executing %s."
 
-#: shell/e-shell-window-commands.c:121
+#: shell/e-shell-window-commands.c:123
 msgid "Bug buddy is not installed."
 msgstr "Bug buddy is not installed."
 
-#: shell/e-shell-window-commands.c:129
+#: shell/e-shell-window-commands.c:131
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy could not be run."
 
-#: shell/e-shell-window-commands.c:171
-msgid "About Evolution"
-msgstr "About Evolution"
+#: shell/e-shell-window-commands.c:323
+#, fuzzy
+msgid "Groupware Suite"
+msgstr "Groupwise"
 
-#: shell/e-shell-window-commands.c:382
+#: shell/e-shell-window-commands.c:563
 msgid "_Work Online"
 msgstr "_Work Online"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "_Work Offline"
 
-#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Work Offline"
 
@@ -16759,30 +16443,30 @@ msgstr ""
 "\n"
 "Click help for details."
 
-#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:522
+#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
+#: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
 msgstr "Select a cert to import..."
 
-#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:604
+#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
+#: smime/gui/certificate-manager.c:638
 msgid "Certificate Name"
 msgstr "Certificate Name"
 
-#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
+#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
 msgid "Purposes"
 msgstr "Purposes"
 
-#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:517
+#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr "Serial Number"
 
-#: smime/gui/certificate-manager.c:267
+#: smime/gui/certificate-manager.c:271
 msgid "Expires"
 msgstr "Expires"
 
-#: smime/gui/certificate-manager.c:417
+#: smime/gui/certificate-manager.c:446
 msgid "E-Mail Address"
 msgstr "E-Mail Address"
 
@@ -16884,7 +16568,7 @@ msgstr ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
 msgid "Certificate"
 msgstr "Certificate"
 
@@ -16904,19 +16588,23 @@ msgstr "Common Name (CN)"
 msgid "Contact Certificates"
 msgstr "Contact Certificates"
 
-#: smime/gui/smime-ui.glade.h:21
-#, no-c-format
-msgid "Do you want to trust \"%s\" for the following purposes?"
-msgstr "Do you want to trust \"%s\" for the following purposes?"
+#: smime/gui/smime-ui.glade.h:20
+msgid "Do not trust the authenticity of this certificate"
+msgstr ""
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:21
 msgid "Dummy window only"
 msgstr "Dummy window only"
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:22
 msgid "Edit"
 msgstr "Edit"
 
+#: smime/gui/smime-ui.glade.h:23
+#, fuzzy
+msgid "Email Certificate Trust Settings"
+msgstr "Email Certificate Authority"
+
 #: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr "Email Recipient Certificate"
@@ -16949,243 +16637,254 @@ msgstr "Organisational Unit (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 Fingerprint"
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr "SSL Client Certificate"
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr "SSL Server Certificate"
 
 #: smime/gui/smime-ui.glade.h:37
+msgid "Trust the authenticity of this certificate"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
 msgid "Trust this CA to identify email users."
 msgstr "Trust this CA to identify email users."
 
-#: smime/gui/smime-ui.glade.h:38
+#: smime/gui/smime-ui.glade.h:39
 msgid "Trust this CA to identify software developers."
 msgstr "Trust this CA to identify software developers."
 
-#: smime/gui/smime-ui.glade.h:39
+#: smime/gui/smime-ui.glade.h:40
 msgid "Trust this CA to identify web sites."
 msgstr "Trust this CA to identify web sites."
 
-#: smime/gui/smime-ui.glade.h:40
+#: smime/gui/smime-ui.glade.h:41
 msgid "View"
 msgstr "View"
 
-#: smime/gui/smime-ui.glade.h:41
-msgid "View Certificate"
-msgstr "View Certificate"
-
 #: smime/gui/smime-ui.glade.h:42
-msgid "You have been asked to trust a new Certificate Authority (CA)."
-msgstr "You have been asked to trust a new Certificate Authority (CA)."
-
-#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr "You have certificates from these organisations that identify you:"
 
-#: smime/gui/smime-ui.glade.h:44
+#: smime/gui/smime-ui.glade.h:43
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 "You have certificates on file that identify these certificate authorities:"
 
-#: smime/gui/smime-ui.glade.h:45
+#: smime/gui/smime-ui.glade.h:44
 msgid "You have certificates on file that identify these people:"
 msgstr "You have certificates on file that identify these people:"
 
-#: smime/gui/smime-ui.glade.h:46
+#: smime/gui/smime-ui.glade.h:45
 msgid "Your Certificates"
 msgstr "Your Certificates"
 
-#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
+#: smime/gui/smime-ui.glade.h:46
+msgid "_Edit CA Trust"
+msgstr ""
+
+#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
-#: smime/lib/e-cert.c:478
+#. x509 certificate usage types
+#: smime/lib/e-cert.c:424
+#, fuzzy
+msgid "Sign"
+msgstr "Signing"
+
+#: smime/lib/e-cert.c:425
+#, fuzzy
+msgid "Encrypt"
+msgstr "Encrypted"
+
+#: smime/lib/e-cert.c:530
 msgid "Version"
 msgstr "Version"
 
-#: smime/lib/e-cert.c:493
+#: smime/lib/e-cert.c:545
 msgid "Version 1"
 msgstr "Version 1"
 
-#: smime/lib/e-cert.c:496
+#: smime/lib/e-cert.c:548
 msgid "Version 2"
 msgstr "Version 2"
 
-#: smime/lib/e-cert.c:499
+#: smime/lib/e-cert.c:551
 msgid "Version 3"
 msgstr "Version 3"
 
-#: smime/lib/e-cert.c:581
+#: smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 With RSA Encryption"
 
-#: smime/lib/e-cert.c:584
+#: smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 With RSA Encryption"
 
-#: smime/lib/e-cert.c:587
+#: smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 With RSA Encryption"
 
-#: smime/lib/e-cert.c:590
+#: smime/lib/e-cert.c:642
 msgid "C"
 msgstr "C"
 
-#: smime/lib/e-cert.c:593
+#: smime/lib/e-cert.c:645
 msgid "CN"
 msgstr "CN"
 
-#: smime/lib/e-cert.c:596
+#: smime/lib/e-cert.c:648
 msgid "OU"
 msgstr "OU"
 
-#: smime/lib/e-cert.c:599
+#: smime/lib/e-cert.c:651
 msgid "O"
 msgstr "O"
 
-#: smime/lib/e-cert.c:602
+#: smime/lib/e-cert.c:654
 msgid "L"
 msgstr "L"
 
-#: smime/lib/e-cert.c:605
+#: smime/lib/e-cert.c:657
 msgid "DN"
 msgstr "DN"
 
-#: smime/lib/e-cert.c:608
+#: smime/lib/e-cert.c:660
 msgid "DC"
 msgstr "DC"
 
-#: smime/lib/e-cert.c:611
+#: smime/lib/e-cert.c:663
 msgid "ST"
 msgstr "ST"
 
-#: smime/lib/e-cert.c:614
+#: smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA Encryption"
 
-#: smime/lib/e-cert.c:617
+#: smime/lib/e-cert.c:669
 msgid "Certificate Key Usage"
 msgstr "Certificate Key Usage"
 
-#: smime/lib/e-cert.c:620
+#: smime/lib/e-cert.c:672
 msgid "Netscape Certificate Type"
 msgstr "Netscape Certificate Type"
 
-#: smime/lib/e-cert.c:623
+#: smime/lib/e-cert.c:675
 msgid "Certificate Authority Key Identifier"
 msgstr "Certificate Authority Key Identifier"
 
-#: smime/lib/e-cert.c:626
+#: smime/lib/e-cert.c:678
 msgid "UID"
 msgstr "UID"
 
-#: smime/lib/e-cert.c:635
+#: smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Object Identifier (%s)"
 
-#: smime/lib/e-cert.c:686
+#: smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
 msgstr "Algorithm Identifier"
 
-#: smime/lib/e-cert.c:694
+#: smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
 msgstr "Algorithm Parameters"
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:768
 msgid "Subject Public Key Info"
 msgstr "Subject Public Key Info"
 
-#: smime/lib/e-cert.c:721
+#: smime/lib/e-cert.c:773
 msgid "Subject Public Key Algorithm"
 msgstr "Subject Public Key Algorithm"
 
-#: smime/lib/e-cert.c:736
+#: smime/lib/e-cert.c:788
 msgid "Subject's Public Key"
 msgstr "Subject's Public Key"
 
-#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
+#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
 msgid "Error: Unable to process extension"
 msgstr "Error: Unable to process extension"
 
-#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
+#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr "Object Signer"
 
-#: smime/lib/e-cert.c:782
+#: smime/lib/e-cert.c:834
 msgid "SSL Certificate Authority"
 msgstr "SSL Certificate Authority"
 
-#: smime/lib/e-cert.c:786
+#: smime/lib/e-cert.c:838
 msgid "Email Certificate Authority"
 msgstr "Email Certificate Authority"
 
-#: smime/lib/e-cert.c:814
+#: smime/lib/e-cert.c:866
 msgid "Signing"
 msgstr "Signing"
 
-#: smime/lib/e-cert.c:818
+#: smime/lib/e-cert.c:870
 msgid "Non-repudiation"
 msgstr "Non-repudiation"
 
-#: smime/lib/e-cert.c:822
+#: smime/lib/e-cert.c:874
 msgid "Key Encipherment"
 msgstr "Key Encipherment"
 
-#: smime/lib/e-cert.c:826
+#: smime/lib/e-cert.c:878
 msgid "Data Encipherment"
 msgstr "Data Encipherment"
 
-#: smime/lib/e-cert.c:830
+#: smime/lib/e-cert.c:882
 msgid "Key Agreement"
 msgstr "Key Agreement"
 
-#: smime/lib/e-cert.c:834
+#: smime/lib/e-cert.c:886
 msgid "Certificate Signer"
 msgstr "Certificate Signer"
 
-#: smime/lib/e-cert.c:838
+#: smime/lib/e-cert.c:890
 msgid "CRL Signer"
 msgstr "CRL Signer"
 
-#: smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:938
 msgid "Critical"
 msgstr "Critical"
 
-#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
+#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
 msgid "Not Critical"
 msgstr "Not Critical"
 
-#: smime/lib/e-cert.c:912
+#: smime/lib/e-cert.c:964
 msgid "Extensions"
 msgstr "Extensions"
 
-#: smime/lib/e-cert.c:983
+#: smime/lib/e-cert.c:1035
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
 msgid "Certificate Signature Algorithm"
 msgstr "Certificate Signature Algorithm"
 
-#: smime/lib/e-cert.c:1048
+#: smime/lib/e-cert.c:1100
 msgid "Issuer"
 msgstr "Issuer"
 
-#: smime/lib/e-cert.c:1102
+#: smime/lib/e-cert.c:1154
 msgid "Issuer Unique ID"
 msgstr "Issuer Unique ID"
 
-#: smime/lib/e-cert.c:1121
+#: smime/lib/e-cert.c:1173
 msgid "Subject Unique ID"
 msgstr "Subject Unique ID"
 
-#: smime/lib/e-cert.c:1164
+#: smime/lib/e-cert.c:1216
 msgid "Certificate Signature Value"
 msgstr "Certificate Signature Value"
 
@@ -17335,7 +17034,7 @@ msgstr "View the current contact"
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "_Actions"
 
@@ -17494,7 +17193,7 @@ msgstr "C_lose"
 #: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:3
+#: ui/evolution.xml.h:4
 msgid "Close"
 msgstr "Close"
 
@@ -17507,7 +17206,7 @@ msgid "Delete this item"
 msgstr "Delete this item"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr "Main toolbar"
 
@@ -17550,7 +17249,7 @@ msgstr "Save this item to disk"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:44
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "_File"
 msgstr "_File"
 
@@ -17808,13 +17507,13 @@ msgstr "_Invert Selection"
 msgid "_Threaded Message List"
 msgstr "_Threaded Message List"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Close this window"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "_Close"
 msgstr "_Close"
 
@@ -18210,7 +17909,7 @@ msgstr "_Previous Message"
 msgid "_Quoted"
 msgstr "_Quoted"
 
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
 msgid "_Tools"
 msgstr "_Tools"
 
@@ -18507,106 +18206,120 @@ msgid "_Open Task"
 msgstr "_Open Task"
 
 #: ui/evolution.xml.h:1
-msgid "About Ximian Evolution..."
-msgstr "About Ximian Evolution..."
+#, fuzzy
+msgid "About Evolution..."
+msgstr "About Evolution"
 
 #: ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
 msgstr "Change Evolution's settings"
 
-#: ui/evolution.xml.h:5
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the visibility of the toolbar"
+msgstr "Change the properties of this folder"
+
+#: ui/evolution.xml.h:6
 msgid "Create a new window displaying this folder"
 msgstr "Create a new window displaying this folder"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "E_xit"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Ximian Evolution _FAQ"
+
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Exit the program"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:10
 msgid "Forget _Passwords"
 msgstr "Forget _Passwords"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:11
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Forget remembered passwords so you will be prompted for them again"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:12
 msgid "Import data from other programs"
 msgstr "Import data from other programs"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:14
 msgid "New _Window"
 msgstr "New _Window"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Pi_lot Settings..."
 msgstr "Pi_lot Settings..."
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Send / Receive"
 msgstr "Send / Receive"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Send queued items and retrieve new items"
 msgstr "Send queued items and retrieve new items"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Set up Pilot configuration"
 msgstr "Set up Pilot configuration"
 
-#: ui/evolution.xml.h:17
-msgid "Show information about Ximian Evolution"
+#: ui/evolution.xml.h:19
+#, fuzzy
+msgid "Show information about Evolution"
 msgstr "Show information about Ximian Evolution"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:20
 msgid "Submit Bug Report"
 msgstr "Submit Bug Report"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:21
 msgid "Submit _Bug Report"
 msgstr "Submit _Bug Report"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Submit a bug report using Bug Buddy"
 
-#: ui/evolution.xml.h:21
-msgid "Toggle whether we are working offline."
-msgstr "Toggle whether we are working offline."
-
 #: ui/evolution.xml.h:23
-msgid "Ximian Evolution _FAQ"
-msgstr "Ximian Evolution _FAQ"
+#, fuzzy
+msgid "T_oolbar"
+msgstr "Main toolbar"
 
 #: ui/evolution.xml.h:24
-msgid "_About Ximian Evolution..."
-msgstr "_About Ximian Evolution..."
+msgid "Toggle whether we are working offline."
+msgstr "Toggle whether we are working offline."
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "_About Evolution..."
+msgstr "About Evolution"
+
+#: ui/evolution.xml.h:30
 msgid "_Help"
 msgstr "_Help"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "_Import..."
 msgstr "_Import..."
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "_New"
 msgstr "_New"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "_Quick Reference"
 msgstr "_Quick Reference"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_Send / Receive"
 msgstr "_Send / Receive"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 msgid "_Window"
 msgstr "_Window"
 
@@ -18998,6 +18711,331 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% complete)"
 
+#~ msgid ""
+#~ "Some fields are no longer representable in the contact editor. Please "
+#~ "wait while Evolution copies those fields to the 'Notes' field..."
+#~ msgstr ""
+#~ "Some fields are no longer representable in the contact editor. Please "
+#~ "wait while Evolution copies those fields to the 'Notes' field..."
+
+#~ msgid "  S_how Supported Bases "
+#~ msgstr "  S_how Supported Bases "
+
+#~ msgid "1:00"
+#~ msgstr "1:00"
+
+#~ msgid "5:00"
+#~ msgstr "5:00"
+
+#~ msgid "Connecting"
+#~ msgstr "Connecting"
+
+#~ msgid "Distinguished _name:"
+#~ msgstr "Distinguished _name:"
+
+#~ msgid "Email address:"
+#~ msgstr "Email address:"
+
+#~ msgid "Evolution will use this DN to authenticate you with the server"
+#~ msgstr "Evolution will use this DN to authenticate you with the server"
+
+#~ msgid "One"
+#~ msgstr "One"
+
+#~ msgid "S_earch scope: "
+#~ msgstr "S_earch scope: "
+
+#~ msgid "Searching"
+#~ msgstr "Searching"
+
+#~ msgid "Sub"
+#~ msgstr "Sub"
+
+#~ msgid "This option controls how long a search will be run."
+#~ msgstr "This option controls how long a search will be run."
+
+#~ msgid "U_se SSL/TLS:"
+#~ msgstr "U_se SSL/TLS:"
+
+#~ msgid "_Display name:"
+#~ msgstr "_Display name:"
+
+#~ msgid "_Port number:"
+#~ msgstr "_Port number:"
+
+#~ msgid "_Search base:"
+#~ msgstr "_Search base:"
+
+#~ msgid "_Server name:"
+#~ msgstr "_Server name:"
+
+#~ msgid "_Timeout (minutes):"
+#~ msgstr "_Timeout (minutes):"
+
+#~ msgid "connecting-tab"
+#~ msgstr "connecting-tab"
+
+#~ msgid "general-tab"
+#~ msgstr "general-tab"
+
+#~ msgid "searching-tab"
+#~ msgstr "searching-tab"
+
+#~ msgid "Webcam:"
+#~ msgstr "Webcam:"
+
+#~ msgid "item7"
+#~ msgstr "item7"
+
+#~ msgid "item8"
+#~ msgstr "item8"
+
+#~ msgid "Calendar Properties"
+#~ msgstr "Calendar Properties"
+
+#~ msgid "Remote"
+#~ msgstr "Remote"
+
+#~ msgid "Task List Properties"
+#~ msgstr "Task List Properties"
+
+#~ msgid "_Refresh Interval:"
+#~ msgstr "_Refresh Interval:"
+
+#~ msgid "_Source URL:"
+#~ msgstr "_Source URL:"
+
+#~ msgid "_Invite Others..."
+#~ msgstr "_Invite Others..."
+
+#~ msgid "Could not get article %s from NNTP server"
+#~ msgstr "Could not get article %s from NNTP server"
+
+#~ msgid "Posting not allowed by news server"
+#~ msgstr "Posting not allowed by news server"
+
+#~ msgid "Failed to send newsgroups header: %s: message not posted"
+#~ msgstr "Failed to send newsgroups header: %s: message not posted"
+
+#~ msgid "Error posting to newsgroup: %s: message not posted"
+#~ msgstr "Error posting to newsgroup: %s: message not posted"
+
+#~ msgid "Error reading response to posted message: message not posted"
+#~ msgstr "Error reading response to posted message: message not posted"
+
+#~ msgid "Error posting message: %s: message not posted"
+#~ msgstr "Error posting message: %s: message not posted"
+
+#~ msgid "Stream error"
+#~ msgstr "Stream error"
+
+#~ msgid "Connection error: %s"
+#~ msgstr "Connection error: %s"
+
+#~ msgid "Could not get group: %s"
+#~ msgstr "Could not get group: %s"
+
+#~ msgid "Could not get messages: unspecified error"
+#~ msgstr "Could not get messages: unspecified error"
+
+#~ msgid "Unknown server response: %s"
+#~ msgstr "Unknown server response: %s"
+
+#~ msgid "${1}"
+#~ msgstr "${1}"
+
+#~ msgid "Because \"${1}\"."
+#~ msgstr "Because \"${1}\"."
+
+#~ msgid "Adjust Score"
+#~ msgstr "Adjust Score"
+
+#~ msgid "Assign Color"
+#~ msgstr "Assign Colour"
+
+#~ msgid "Assign Score"
+#~ msgstr "Assign Score"
+
+#~ msgid "Attachments"
+#~ msgstr "Attachments"
+
+#~ msgid "Beep"
+#~ msgstr "Beep"
+
+#~ msgid "contains"
+#~ msgstr "contains"
+
+#~ msgid "Copy to Folder"
+#~ msgstr "Copy to Folder"
+
+#~ msgid "Date received"
+#~ msgstr "Date received"
+
+#~ msgid "Date sent"
+#~ msgstr "Date sent"
+
+#~ msgid "Deleted"
+#~ msgstr "Deleted"
+
+#~ msgid "does not contain"
+#~ msgstr "does not contain"
+
+#~ msgid "does not end with"
+#~ msgstr "does not end with"
+
+#~ msgid "does not exist"
+#~ msgstr "does not exist"
+
+#~ msgid "does not return"
+#~ msgstr "does not return"
+
+#~ msgid "does not sound like"
+#~ msgstr "does not sound like"
+
+#~ msgid "does not start with"
+#~ msgstr "does not start with"
+
+#~ msgid "Do Not Exist"
+#~ msgstr "Do Not Exist"
+
+#~ msgid "Draft"
+#~ msgstr "Draft"
+
+#~ msgid "ends with"
+#~ msgstr "ends with"
+
+#~ msgid "Exist"
+#~ msgstr "Exist"
+
+#~ msgid "exists"
+#~ msgstr "exists"
+
+#~ msgid "Expression"
+#~ msgstr "Expression"
+
+#~ msgid "Follow Up"
+#~ msgstr "Follow Up"
+
+#~ msgid "is"
+#~ msgstr "is"
+
+#~ msgid "is after"
+#~ msgstr "is after"
+
+#~ msgid "is before"
+#~ msgstr "is before"
+
+#~ msgid "is Flagged"
+#~ msgstr "is Flagged"
+
+#~ msgid "is greater than"
+#~ msgstr "is greater than"
+
+#~ msgid "is less than"
+#~ msgstr "is less than"
+
+#~ msgid "is not"
+#~ msgstr "is not"
+
+#~ msgid "is not Flagged"
+#~ msgstr "is not Flagged"
+
+#~ msgid "Junk Test"
+#~ msgstr "Junk Test"
+
+#~ msgid "Mailing list"
+#~ msgstr "Mailing list"
+
+#~ msgid "Message Body"
+#~ msgstr "Message Body"
+
+#~ msgid "Message Header"
+#~ msgstr "Message Header"
+
+#~ msgid "Message is Junk"
+#~ msgstr "Message is Junk"
+
+#~ msgid "Message is not Junk"
+#~ msgstr "Message is not Junk"
+
+#~ msgid "Move to Folder"
+#~ msgstr "Move to Folder"
+
+#~ msgid "Pipe to Program"
+#~ msgstr "Pipe to Program"
+
+#~ msgid "Play Sound"
+#~ msgstr "Play Sound"
+
+#~ msgid "Recipients"
+#~ msgstr "Recipients"
+
+#~ msgid "Regex Match"
+#~ msgstr "Regex Match"
+
+#~ msgid "Replied to"
+#~ msgstr "Replied to"
+
+#~ msgid "returns"
+#~ msgstr "returns"
+
+#~ msgid "returns greater than"
+#~ msgstr "returns greater than"
+
+#~ msgid "returns less than"
+#~ msgstr "returns less than"
+
+#~ msgid "Run Program"
+#~ msgstr "Run Program"
+
+#~ msgid "Sender"
+#~ msgstr "Sender"
+
+#~ msgid "Set Status"
+#~ msgstr "Set Status"
+
+#~ msgid "Size (kB)"
+#~ msgstr "Size (kB)"
+
+#~ msgid "sounds like"
+#~ msgstr "sounds like"
+
+#~ msgid "Source Account"
+#~ msgstr "Source Account"
+
+#~ msgid "Specific header"
+#~ msgstr "Specific header"
+
+#~ msgid "starts with"
+#~ msgstr "starts with"
+
+#~ msgid "Stop Processing"
+#~ msgstr "Stop Processing"
+
+#~ msgid "Unset Status"
+#~ msgstr "Unset Status"
+
+#~ msgid "Brought to you by"
+#~ msgstr "Brought to you by"
+
+#~ msgid "_Filename:"
+#~ msgstr "_Filename:"
+
+#~ msgid "Do you want to trust \"%s\" for the following purposes?"
+#~ msgstr "Do you want to trust \"%s\" for the following purposes?"
+
+#~ msgid "View Certificate"
+#~ msgstr "View Certificate"
+
+#~ msgid "You have been asked to trust a new Certificate Authority (CA)."
+#~ msgstr "You have been asked to trust a new Certificate Authority (CA)."
+
+#~ msgid "About Ximian Evolution..."
+#~ msgstr "About Ximian Evolution..."
+
+#~ msgid "_About Ximian Evolution..."
+#~ msgstr "_About Ximian Evolution..."
+
 #~ msgid "Failed to connect to LDAP server"
 #~ msgstr "Failed to connect to LDAP server"
 
@@ -19687,18 +19725,12 @@ msgstr "%s (%d%% complete)"
 #~ msgid "Primary _email:"
 #~ msgstr "Primary _email:"
 
-#~ msgid "S_pouse:"
-#~ msgstr "S_pouse:"
-
 #~ msgid "_Categories..."
 #~ msgstr "_Categories..."
 
 #~ msgid "_Manager's name:"
 #~ msgstr "_Manager's name:"
 
-#~ msgid "_Office:"
-#~ msgstr "_Office:"
-
 #~ msgid "_Public Calendar URL:"
 #~ msgstr "_Public Calendar URL:"
 
diff --git a/po/es.po b/po/es.po
index a239797d45..2000b1493d 100644
--- a/po/es.po
+++ b/po/es.po
@@ -14,14 +14,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-22 21:54+0200\n"
+"POT-Creation-Date: 2004-06-03 11:14-0400\n"
 "PO-Revision-Date: 2004-05-22 22:33+0200\n"
 "Last-Translator: Francisco Javier F. Serrador <serrador@cvs.gnome.org>\n"
 "Language-Team: Spanish <traductores@es.gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 "serrador@hispalinux.es>\n"
 "X-Generator: KBabel 1.3.1\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
@@ -78,13 +78,13 @@ msgstr "No se pudo leer el bloque de la aplicación de Direcciones del Pilot"
 msgid "Accessing LDAP Server anonymously"
 msgstr "Accediendo al servidor LDAP anónimamente"
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
 msgid "Failed to authenticate.\n"
 msgstr "Falló al autenticarme.\n"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%s Introduzca la contraseña para %s (usuario %s)"
@@ -129,34 +129,6 @@ msgstr "Crea un grupo de contactos nuevo"
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr "Falló al actualizar la configuración de la libreta o las carpetas."
 
-#: addressbook/gui/component/addressbook-config.c:483
-msgid "Failed to connect to LDAP server"
-msgstr "Falló al conectarse al servidor LDAP"
-
-#: addressbook/gui/component/addressbook-config.c:507
-msgid "Failed to authenticate with LDAP server"
-msgstr "Falló al autenticarse con el servidor LDAP"
-
-#: addressbook/gui/component/addressbook-config.c:535
-msgid "Could not perform query on Root DSE"
-msgstr "No se pudo efectuar la consulta en la raíz DSE"
-
-#: addressbook/gui/component/addressbook-config.c:840
-msgid "The server responded with no supported search bases"
-msgstr "El servidor respondió con bases de búsqueda no soportadas"
-
-#: addressbook/gui/component/addressbook-config.c:1245
-msgid "This server does not support LDAPv3 schema information"
-msgstr "Este servidor no soporta el esquema de información LDAPv3"
-
-#: addressbook/gui/component/addressbook-config.c:1266
-msgid "Error retrieving schema information"
-msgstr "Error al obtener información del esquema"
-
-#: addressbook/gui/component/addressbook-config.c:1274
-msgid "Server did not respond with valid schema information"
-msgstr "El servidor no respondió con una información del esquema válida"
-
 #: addressbook/gui/component/addressbook-migrate.c:68
 #: calendar/gui/migration.c:137 mail/em-migrate.c:1160
 msgid "Migrating..."
@@ -169,20 +141,16 @@ msgid "Migrating `%s':"
 msgstr "Migrando «%s»:"
 
 #. create the local source group
-#. On This Computer is always first and VFolders is always last
-#: addressbook/gui/component/addressbook-migrate.c:508
+#: addressbook/gui/component/addressbook-migrate.c:464
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
 #: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
-#: mail/mail-component.c:247 mail/mail-vfolder.c:218
+#: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr "En este equipo"
 
 #. Create the default Person addressbook
-#. Create the default Person calendar
-#. Create the default Person task list
-#. orange
-#: addressbook/gui/component/addressbook-migrate.c:516
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
 #: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
 #: mail/mail-config.glade.h:109
@@ -190,19 +158,19 @@ msgid "Personal"
 msgstr "Privado"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:524
+#: addressbook/gui/component/addressbook-migrate.c:480
 msgid "On LDAP Servers"
 msgstr "En servidores LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:652
+#: addressbook/gui/component/addressbook-migrate.c:608
 msgid "LDAP Servers"
 msgstr "Servidores LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:772
+#: addressbook/gui/component/addressbook-migrate.c:728
 msgid "Autocompletion Settings"
 msgstr "Configuración de autocompletado"
 
-#: addressbook/gui/component/addressbook-migrate.c:1148
+#: addressbook/gui/component/addressbook-migrate.c:1104
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -214,7 +182,7 @@ msgstr ""
 "\n"
 "Tenga paciencia mientras Evolution migra sus carpetas..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1162
+#: addressbook/gui/component/addressbook-migrate.c:1118
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -224,7 +192,7 @@ msgstr ""
 "\n"
 "Tenga paciencia mientras Evolution migra sus carpetas..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1171
+#: addressbook/gui/component/addressbook-migrate.c:1127
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -234,7 +202,7 @@ msgstr ""
 "\n"
 "Tenga paciencia mientras Evolution migra sus carpetas..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1181
+#: addressbook/gui/component/addressbook-migrate.c:1137
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -245,45 +213,33 @@ msgstr ""
 "\n"
 "Tenga paciencia mientras Evolution migra sus datos Pilot Sync..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1194
-msgid ""
-"Some fields are no longer representable in the contact editor. Please wait "
-"while Evolution copies those fields to the 'Notes' field..."
-msgstr "Algunos campos no se pueden representar más en el editor de contactos. Por favor espere mientras Evolution copia esos campos al campo «Notas»..."
-
-#: addressbook/gui/component/addressbook-view.c:674
+#: addressbook/gui/component/addressbook-view.c:675
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr "La libreta «%s» será eliminada. ¿Seguro que quiere continuar?"
 
-#: addressbook/gui/component/addressbook-view.c:761
+#: addressbook/gui/component/addressbook-view.c:754
 msgid "New Address Book"
 msgstr "Libreta de direcciones nueva"
 
-#: addressbook/gui/component/addressbook-view.c:762
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
+#: addressbook/gui/component/addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Borrar"
 
-#: addressbook/gui/component/addressbook-view.c:763
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-view.c:756
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Propiedades..."
 
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
 #. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:1002
+#: addressbook/gui/component/addressbook-view.c:995
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
 #: calendar/gui/migration.c:373
 msgid "Contacts"
 msgstr "Contactos"
@@ -363,10 +319,6 @@ msgid "Manage your S/MIME certificates here"
 msgstr "Gestione sus certificados S/MIME aquí"
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-msgid "  S_how Supported Bases "
-msgstr " Mo_strar bases soportadas "
-
-#: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -388,181 +340,150 @@ msgstr " Mo_strar bases soportadas "
 msgid "*"
 msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr "1"
 
-#: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1:00"
-msgstr "1:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr "5"
 
-#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
-msgstr "5:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "<b>Authentication</b>"
 msgstr "<b>Autenticación</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Display</b>"
 msgstr "<b>Pantalla</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "<b>Downloading</b>"
 msgstr "<b>Descarga</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "<b>Searching</b>"
 msgstr "<b>Búsqueda</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:11
 msgid "<b>Server Information</b>"
 msgstr "<b>Información del servidor</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:12
 msgid "<b>Type:</b>"
 msgstr "<b>Tipo:</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add Contacts Group"
 msgstr "Añadir grupo de contactos"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Address Book Properties"
 msgstr "Propiedades de la libreta de direcciones"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:42
 msgid "Always"
 msgstr "Siempre"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr "Anónimamente"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:17
 #: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Básico"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
-msgid "Connecting"
-msgstr "Conexión"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 #: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Detalles"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
-msgid "Distinguished _name:"
-msgstr "_Nombre distintivo:"
-
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished name"
 msgstr "Nombre distintivo"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Download limit:"
 msgstr "Límite de descarga:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Email address"
 msgstr "Dirección de correo-e"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "Email address:"
-msgstr "Dirección de correo-e:"
-
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "Evolution will use this DN to authenticate you with the server"
-msgstr "Evolution usará este Nombre Distintivo para autenticarle con el servidor"
-
-#: addressbook/gui/component/ldap-config.glade.h:29
-msgid "Evolution will use this email address to authenticate you with the server"
-msgstr "Evolution usará esta dirección de correo-e para autenticarle con el servidor"
+#: addressbook/gui/component/ldap-config.glade.h:22
+#, fuzzy
+msgid ""
+"Evolution will use this email address to authenticate you with the server."
+msgstr ""
+"Evolution usará esta dirección de correo-e para autenticarle con el servidor"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Find Possible Search Bases"
 msgstr "Encontrar bases de búsqueda posibles"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:24
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "General"
 
-#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
+#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:102
 msgid "Never"
 msgstr "Nunca"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
-msgid "One"
-msgstr "Uno"
-
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Only locations within starting point"
 msgstr "Sólo las ubicaciones dentro del punto de inicio"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
-msgid "S_earch scope: "
-msgstr "Ámbito de bú_squeda: "
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Search _base:"
+msgstr "Base de búsqueda:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:28
 msgid "Search base only"
 msgstr "Buscar en la base únicamente"
 
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid "Search base:"
 msgstr "Base de búsqueda:"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid "Search scope:"
 msgstr "Ámbito de búsqueda: "
 
-#: addressbook/gui/component/ldap-config.glade.h:39
-msgid "Searching"
-msgstr "Búsqueda"
-
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:31
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
-"server if\n"
-"your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL or TLS."
 msgstr ""
 "El seleccionar esta opción significa que Evolution sólo conectará a sus "
 "servidores LDAP si\n"
 "sus servidores LDAP soportan SSL o TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a \n"
-"insecure environment. For example, if you and your LDAP server are behind a "
-"firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection "
-"is already\n"
-"secure."
+"you are in a insecure environment. For example, if you and your LDAP server "
+"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
+"because your connection is already secure."
 msgstr ""
 "Seleccionar esta opción significa que Evolution sólo intentará usar SSL/TLS "
 "si está en un\n"
@@ -570,51 +491,45 @@ msgstr ""
 "cortafuegos en el trabajo, entonces Evolution no necesita usar SSL/TLS "
 "porque su conexión ya es segura."
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:33
+#, fuzzy
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
-"TLS.  This \n"
-"means that your connection will be insecure, and that you will be vulnerable "
-"to security\n"
-"exploits. "
+"TLS.  This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits. "
 msgstr ""
 "El seleccionar esta opción significa que su servidor no soporta ni SSL ni "
 "TLS. Esto\n"
 "significa que su conexión será insegura y que usted será vulnerable a fallos "
 "de seguridad. "
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Starting point and locations within it"
 msgstr "Punto de inicio y ubicaciones dentro de él"
 
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Sub"
-msgstr "Sub"
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr "Bases de búsqueda soportadas"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
-"searches will \n"
-"begin. If you leave this blank, the search will begin at the root of the "
-"directory tree."
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
 msgstr ""
 "La base de Búsqueda es el nombre distintivo (ND) de la entrada donde las "
 "búsquedas empezarán.\n"
 "Si deja esto en blanco, la búsqueda empezará en la raíz del árbol de "
 "directorios."
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:37
+#, fuzzy
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
-"the \n"
-"directory tree. A search scope of \"sub\" will include all entries below "
-"your search base.\n"
-"A search scope of \"one\" will only include the entries one level beneath "
-"your base.\n"
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
 msgstr ""
 "El ámbito de búsqueda define hasta qué profundidad desea que la búsqueda se "
 "extienda\n"
@@ -624,7 +539,7 @@ msgstr ""
 "las entradas \n"
 "un nivel bajo su base.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:58
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -632,16 +547,16 @@ msgstr ""
 "Este es el nombre completo del servidor LDAP. Por ejemplo, «ldap.micompañia."
 "com»."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:39
+#, fuzzy
 msgid ""
-"This is the maximum number of entries to download. Setting this number to "
-"be \n"
+"This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr ""
 "Este es el máximo número de entradas para descargar.  Si pone este número\n"
 "demasiado alto ralentizará su libreta de direcciones."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -651,136 +566,115 @@ msgstr ""
 "establecer esto a «Dirección de Correo-e» requiere acceso anónimo a su "
 "servidor ldap."
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:41
+#, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
-"list.\n"
-"It is for display purposes only. "
+"list. It is for display purposes only. "
 msgstr ""
 "Este nombre que identificará este servidor en la lista de carpetas de "
 "Evolution.\n"
 "Es sólo para poder mostrarlo en pantalla. "
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:42
+#, fuzzy
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. "
-"A \n"
-"list of standard ports has been provided. Ask your system administrator\n"
-"what port you should specify."
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
 msgstr ""
 "Este es el puerto del servidor LDAP al que Evolution intentará conectarse. \n"
 "Se ha proporcionado una lista de puertos estándar. Pregunte a su "
 "administrador del\n"
 "sistema qué puerto debería especificar."
 
-#: addressbook/gui/component/ldap-config.glade.h:67
-msgid "This option controls how long a search will be run."
-msgstr "Esta opción controla durante cuánto tiempo va a efectuarse una búsqueda."
-
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid "Timeout:"
 msgstr "Tiempo de expiración:"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
-msgid "U_se SSL/TLS:"
-msgstr "U_sar SSL/TLS:"
-
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr "Usando Nombre Distintivo (ND)"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr "Usando dirección de correo-e"
 
-#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
+#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr "Cuando sea posible"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:47
 msgid "_Add Contacts Group"
 msgstr "_Añadir grupo de contactos"
 
-#: addressbook/gui/component/ldap-config.glade.h:74
-#: calendar/gui/dialogs/calendar-setup.glade.h:12
-msgid "_Display name:"
-msgstr "_Mostrar nombre:"
-
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr "Límite de _descarga:"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Email address:"
 msgstr "Dirección de _correo-e:"
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:50
+#, fuzzy
+msgid "_Find Possible Search Bases"
+msgstr "Encontrar bases de búsqueda posibles"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Log in method:"
 msgstr "Método de _inicio de sesión:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:171
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "_Log in:"
+msgstr "Inicio de sesión"
+
+#: addressbook/gui/component/ldap-config.glade.h:53
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
 msgid "_Name:"
 msgstr "_Nombre:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
-msgid "_Port number:"
-msgstr "Número de _puerto:"
-
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid "_Port:"
 msgstr "_Puerto:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
-msgid "_Search base:"
-msgstr "Base de _búsqueda:"
-
-#: addressbook/gui/component/ldap-config.glade.h:82
-msgid "_Server name:"
-msgstr "Nombre del _servidor:"
+#: addressbook/gui/component/ldap-config.glade.h:55
+#, fuzzy
+msgid "_Search scope:"
+msgstr "Ámbito de búsqueda: "
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:56
 msgid "_Server:"
 msgstr "_Servidor:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
-msgid "_Timeout (minutes):"
-msgstr "_Tiempo de expiración (minutos):"
+#: addressbook/gui/component/ldap-config.glade.h:57
+#, fuzzy
+msgid "_Timeout:"
+msgstr "Tiempo de expiración:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:58
 msgid "_Use secure connection:"
 msgstr "_Usar conexión segura:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "tarjetas"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
-msgid "connecting-tab"
-msgstr "Conexión"
-
-#: addressbook/gui/component/ldap-config.glade.h:88
-msgid "general-tab"
-msgstr "General"
-
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:60
 #: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
 #: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "minutos"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
-msgid "searching-tab"
-msgstr "búsqueda"
-
-#: addressbook/gui/component/select-names/e-select-names.c:497
+#: addressbook/gui/component/select-names/e-select-names.c:503
 #: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid "Select Contacts from Address Book"
 msgstr "Selecciona contactos de la libreta de direcciones"
 
-#: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
@@ -820,13 +714,14 @@ msgstr "Contacto anónimo"
 
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:222
+#: addressbook/gui/widgets/e-addressbook-view.c:224
 msgid "Source"
 msgstr "Fuente"
 
 #: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
 msgid "Evolution Addressbook name selection interface"
-msgstr "Interfaz de selección de nombre de la libreta de direcciones de Evolution"
+msgstr ""
+"Interfaz de selección de nombre de la libreta de direcciones de Evolution"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "<b>Contacts</b>"
@@ -885,9 +780,9 @@ msgid "<b>Work</b>"
 msgstr "<b>Trabajo</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:177
-#: addressbook/gui/widgets/eab-contact-display.c:342
-#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/widgets/eab-contact-display.c:334
+#: addressbook/gui/widgets/eab-contact-display.c:353
 msgid "AIM"
 msgstr "AIM"
 
@@ -921,15 +816,15 @@ msgid "Company:"
 msgstr "Empresa:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:265
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
+#: addressbook/gui/contact-editor/e-contact-editor.c:266
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
 msgstr "Contacto"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:519
+#: addressbook/gui/contact-editor/e-contact-editor.c:520
 msgid "Contact Editor"
 msgstr "Editor de contactos"
 
@@ -950,83 +845,81 @@ msgid "Full _Name..."
 msgstr "_Nombre completo..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-msgid "Home"
-msgstr "Domicilio"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "Home Page:"
 msgstr "Página personal:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-#: calendar/gui/e-itip-control.c:930
-msgid "Location:"
-msgstr "Lugar:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "Mailing Address"
 msgstr "Dirección de correo-e"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "Manager:"
 msgstr "Jefe:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "Ni_ckname:"
 msgstr "_Apodo:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "Notes:"
 msgstr "Notas:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr "Novell GroupWise"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-msgid "Other"
-msgstr "Otro"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#, fuzzy
+msgid "Office:"
+msgstr "_Oficina:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "PO Box:"
 msgstr "Apdo. de correos:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "Personal Information"
 msgstr "Información personal"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "Profession:"
 msgstr "Profesión:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#, fuzzy
+msgid "Spouse:"
+msgstr "_Cónyuge:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "State/Province:"
 msgstr "Estado/Provincia:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "Title:"
 msgstr "Tratamiento:"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+msgid "Video Chat:"
+msgstr ""
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "Wants to receive HTML mail"
 msgstr "Quiere recibir el correo como HTML"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:42
-msgid "Webcam:"
-msgstr "Webcam:"
+#, fuzzy
+msgid "Web Log:"
+msgstr "Página web:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
+#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
 #: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
 #: mail/mail-config.glade.h:157
@@ -1046,17 +939,10 @@ msgid "_File under:"
 msgstr "_Archivar en:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "_Where:"
 msgstr "_Donde:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
-msgid "item7"
-msgstr "item7"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
-msgid "item8"
-msgstr "item8"
-
 #: addressbook/gui/contact-editor/eab-editor.c:315
 msgid ""
 "Are you sure you want\n"
@@ -1074,16 +960,16 @@ msgstr ""
 "borrar este contacto?"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:351
-#: addressbook/gui/widgets/eab-contact-display.c:372
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Address"
 msgstr "Dirección"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:286
+#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard.c:174
@@ -2061,81 +1947,80 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/contact-editor/e-contact-editor.c:179
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:337
+#: addressbook/gui/widgets/eab-contact-display.c:356
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
-#: addressbook/gui/widgets/eab-contact-display.c:347
-#: addressbook/gui/widgets/eab-contact-display.c:366
+#: addressbook/gui/contact-editor/e-contact-editor.c:180
+#: addressbook/gui/widgets/eab-contact-display.c:339
+#: addressbook/gui/widgets/eab-contact-display.c:358
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: addressbook/gui/widgets/eab-contact-display.c:338
+#: addressbook/gui/widgets/eab-contact-display.c:357
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:344
-#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#: addressbook/gui/widgets/eab-contact-display.c:355
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
+#: addressbook/gui/contact-editor/e-contact-editor.c:183
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:251
+#: addressbook/gui/contact-editor/e-contact-editor.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+msgid "Home"
+msgstr "Domicilio"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+msgid "Other"
+msgstr "Otro"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
 msgid "Source Book"
 msgstr "Libro fuente"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:258
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Target Book"
 msgstr "Libro destino"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:272
+#: addressbook/gui/contact-editor/e-contact-editor.c:273
 msgid "Is New Contact"
 msgstr "Es un contacto nuevo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:279
+#: addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Writable Fields"
 msgstr "Campos editables"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:293
+#: addressbook/gui/contact-editor/e-contact-editor.c:294
 msgid "Changed"
 msgstr "Modificados"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2294
-msgid "Category editor not available."
-msgstr "No hay un editor de categorías disponible."
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2302
+#: addressbook/gui/contact-editor/e-contact-editor.c:2352
 msgid "This contact belongs to these categories:"
 msgstr "Este contacto pertenece a estas categorías:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2379
+#: addressbook/gui/contact-editor/e-contact-editor.c:2429
 msgid "Please select an image for this contact"
 msgstr "Por favor seleccione una imagen para este contacto"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2383
+#: addressbook/gui/contact-editor/e-contact-editor.c:2433
 msgid "No image"
 msgstr "Sin imagen"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2560
-#: addressbook/gui/contact-editor/e-contact-editor.c:2723
-msgid ""
-"You are moving the contact from one address book to another, but it cannot "
-"be removed from the source. Do you want to save a copy instead?"
-msgstr "Está moviendo un contacto desde una libreta a otra, pero no puede ser eliminado de la de origen. ¿Quiere guardar una copia en vez de mover?"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2607
+#: addressbook/gui/contact-editor/e-contact-editor.c:2636
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2143,18 +2028,32 @@ msgstr ""
 "La fecha del contacto es inválida:\n"
 "\n"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2700
+#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#, fuzzy
+msgid "Invalid contact."
+msgstr "Objeto inválido"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2723
 msgid ""
 "The contact cannot be saved to the selected address book. Do you want to "
 "discard changes?"
-msgstr "El contacto no puede ser guardado en la libreta de direcciones seleccionada. ¿Quiere descartar estos cambios?"
+msgstr ""
+"El contacto no puede ser guardado en la libreta de direcciones seleccionada. "
+"¿Quiere descartar estos cambios?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2704
-#: addressbook/gui/contact-editor/e-contact-editor.c:2728
-#: addressbook/gui/widgets/eab-gui-util.c:208
+#: addressbook/gui/contact-editor/e-contact-editor.c:2727
+#: addressbook/gui/contact-editor/e-contact-editor.c:2751
 msgid "_Discard"
 msgstr "_Descartar"
 
+#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+msgid ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+"Está moviendo un contacto desde una libreta a otra, pero no puede ser "
+"eliminado de la de origen. ¿Quiere guardar una copia en vez de mover?"
+
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:62
 msgid "AOL Instant Messenger"
 msgstr "Mensajería instantánea de AOL"
@@ -2329,32 +2228,33 @@ msgstr "_Nombre de la lista:"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "_Type an email address or drag a contact into the list below:"
-msgstr "_Teclee una dirección de correo o arrastre un contacto a la lista inferior:"
+msgstr ""
+"_Teclee una dirección de correo o arrastre un contacto a la lista inferior:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "contact-list-editor"
 msgstr "Editor de lista de contactos"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:153
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:215
+#: addressbook/gui/widgets/e-addressbook-view.c:217
 #: addressbook/gui/widgets/e-minicard-view.c:460
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Libro"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
 msgid "Is New List"
 msgstr "Es una lista nueva"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:215
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
 msgid "Contact List Editor"
 msgstr "Editor de listas de contactos"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:438
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
 msgid "Save List as VCard"
 msgstr "Guardar lista como VCard"
 
@@ -2401,144 +2301,144 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Búsqueda avanzada"
 
-#: addressbook/gui/widgets/eab-contact-display.c:129
-#: addressbook/gui/widgets/eab-contact-display.c:192
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
 msgid "(map)"
 msgstr "(mapa)"
 
-#: addressbook/gui/widgets/eab-contact-display.c:139
-#: addressbook/gui/widgets/eab-contact-display.c:205
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
 msgid "map"
 msgstr "mapa"
 
-#: addressbook/gui/widgets/eab-contact-display.c:257
-#: addressbook/gui/widgets/eab-contact-display.c:533
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:525
 msgid "List Members"
 msgstr "Listar miembros"
 
-#: addressbook/gui/widgets/eab-contact-display.c:329
-#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/eab-contact-display.c:321
+#: addressbook/gui/widgets/eab-contact-display.c:323
 msgid "E-mail"
 msgstr "Correo-e"
 
-#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/eab-contact-display.c:332
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organización"
 
-#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "Position"
 msgstr "Posición"
 
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:354
 msgid "Groupwise"
 msgstr "Groupwise"
 
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:340
 msgid "Video Conferencing"
 msgstr "Videoconferencia"
 
-#: addressbook/gui/widgets/eab-contact-display.c:349
-#: addressbook/gui/widgets/eab-contact-display.c:370
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Phone"
 msgstr "Teléfono"
 
-#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:342
 msgid "Fax"
 msgstr "Fax"
 
-#: addressbook/gui/widgets/eab-contact-display.c:354
+#: addressbook/gui/widgets/eab-contact-display.c:346
 msgid "work"
 msgstr "trabajo"
 
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:359
 msgid "WWW"
 msgstr "WWW"
 
-#: addressbook/gui/widgets/eab-contact-display.c:368
-#: addressbook/gui/widgets/eab-contact-display.c:587
+#: addressbook/gui/widgets/eab-contact-display.c:360
+#: addressbook/gui/widgets/eab-contact-display.c:579
 msgid "Blog"
 msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/eab-contact-display.c:363
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Teléfono móvil"
 
-#: addressbook/gui/widgets/eab-contact-display.c:375
+#: addressbook/gui/widgets/eab-contact-display.c:367
 msgid "personal"
 msgstr "personal"
 
-#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/eab-contact-display.c:374
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Nota"
 
-#: addressbook/gui/widgets/eab-contact-display.c:548
+#: addressbook/gui/widgets/eab-contact-display.c:540
 msgid "Job Title"
 msgstr "Puesto"
 
-#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/eab-contact-display.c:544
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:774
+#: smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "Correo-e"
 
-#: addressbook/gui/widgets/eab-contact-display.c:579
+#: addressbook/gui/widgets/eab-contact-display.c:571
 msgid "Home page"
 msgstr "Página personal"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 msgid "Success"
 msgstr "Éxito"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Backend busy"
 msgstr "Backend ocupado"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Repository offline"
 msgstr "Repositorio desconectado"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Address Book does not exist"
 msgstr "La libreta de direcciones no existe"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "No Self Contact defined"
 msgstr "No hay definido un autocontacto"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Contact not found"
 msgstr "Contacto no encontrado"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Contact ID already exists"
 msgstr "Ya existe el ID del contacto"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Protocol not supported"
 msgstr "Protocolo no implementado"
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:60
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:233
 #: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
@@ -2551,37 +2451,37 @@ msgid "Cancelled"
 msgstr "Cancelado"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Could not cancel"
 msgstr "No se pudo cancelar"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Authentication Failed"
 msgstr "Falló en la autenticación"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Authentication Required"
 msgstr "Autenticación Requerida"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:66
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "TLS not Available"
 msgstr "TLS no Disponible"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#: addressbook/gui/widgets/eab-gui-util.c:66
 msgid "No such source"
 msgstr "No existe ese origen"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:69
+#: addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Other error"
 msgstr "Otro error"
 
-#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:90
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
@@ -2589,7 +2489,7 @@ msgstr ""
 "No se pudo abrir esta libreta de direcciones. Compruebe que la ruta exista y "
 "que tenga permisos para acceder a ella."
 
-#: addressbook/gui/widgets/eab-gui-util.c:110
+#: addressbook/gui/widgets/eab-gui-util.c:97
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -2597,17 +2497,18 @@ msgstr ""
 "No se pudo abrir esta libreta de direcciones.  Esto significa que ha "
 "introducido una URI errónea, o que el servidor LDAP es inaccesible."
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:102
+#, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution you must compile the program from the CVS "
-"sources after retrieving OpenLDAP from the link below."
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
 msgstr ""
 "Esta versión de Evolution no se le ha compilado el soporte LDAP.Si quiere "
 "usar LDAP en Evolution debe compilar el programa de las fuentes del CVS una "
 "vez que haya obtenido OpenLDAP del siguiente enlace."
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:109
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -2615,11 +2516,7 @@ msgstr ""
 "No se pudo abrir esta libreta de direcciones.  Esto significa que ha "
 "introducido una URI errónea, o que el servidor LDAP es inaccesible."
 
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "Unable to open addressbook"
-msgstr "No es posible abrir la libreta de direcciones"
-
-#: addressbook/gui/widgets/eab-gui-util.c:162
+#: addressbook/gui/widgets/eab-gui-util.c:129
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2632,7 +2529,7 @@ msgstr ""
 "aumente el límite de resultados en las preferencias del servidor\n"
 "de directorios para esta libreta de direcciones."
 
-#: addressbook/gui/widgets/eab-gui-util.c:168
+#: addressbook/gui/widgets/eab-gui-util.c:135
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -2645,49 +2542,47 @@ msgstr ""
 "tiempo en las opciones del servidor de directorios para esta libreta\n"
 " de direcciones."
 
-#: addressbook/gui/widgets/eab-gui-util.c:174
+#: addressbook/gui/widgets/eab-gui-util.c:141
 msgid "The backend for this addressbook was unable to parse this query."
-msgstr "El soporte de esta libreta de direcciones no pudo analizar esta consulta."
+msgstr ""
+"El soporte de esta libreta de direcciones no pudo analizar esta consulta."
 
-#: addressbook/gui/widgets/eab-gui-util.c:177
+#: addressbook/gui/widgets/eab-gui-util.c:144
 msgid "The backend for this addressbook refused to perform this query."
-msgstr "El motor para esta libreta de direcciones rehusó a efectuar esta consulta."
+msgstr ""
+"El motor para esta libreta de direcciones rehusó a efectuar esta consulta."
 
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:147
 msgid "This query did not complete successfully."
 msgstr "Esta consulta no se completó con éxito."
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
-msgid "Do you want to save changes?"
-msgstr "¿Desea guardar los cambios?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:169
 msgid "Error adding list"
 msgstr "Error añadiendo lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:229
-#: addressbook/gui/widgets/eab-gui-util.c:652
+#: addressbook/gui/widgets/eab-gui-util.c:169
+#: addressbook/gui/widgets/eab-gui-util.c:580
 msgid "Error adding contact"
 msgstr "Error añadiendo contacto"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying list"
 msgstr "Error modificando lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying contact"
 msgstr "Error modificando contacto"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:192
 msgid "Error removing list"
 msgstr "Error eliminando lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
-#: addressbook/gui/widgets/eab-gui-util.c:610
+#: addressbook/gui/widgets/eab-gui-util.c:192
+#: addressbook/gui/widgets/eab-gui-util.c:538
 msgid "Error removing contact"
 msgstr "Error eliminando contacto"
 
-#: addressbook/gui/widgets/eab-gui-util.c:334
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2696,7 +2591,7 @@ msgstr ""
 "Abrir %d contactos abrirá %d ventanas nuevas también.\n"
 "¿Quiere realmente mostrar todas estos contactos?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:360
+#: addressbook/gui/widgets/eab-gui-util.c:300
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2705,49 +2600,44 @@ msgstr ""
 "%s ya existe\n"
 "¿Quiere sobreescribirlo?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:364
+#: addressbook/gui/widgets/eab-gui-util.c:304
 msgid "Overwrite"
 msgstr "Sobreescribir"
 
-#: addressbook/gui/widgets/eab-gui-util.c:400
-#, c-format
-msgid "Error saving %s: %s"
-msgstr "Error guardando %s: %s"
-
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:437
+#: addressbook/gui/widgets/eab-gui-util.c:365
 msgid "card.vcf"
 msgstr "tarjeta.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:571
+#: addressbook/gui/widgets/eab-gui-util.c:499
 msgid "list"
 msgstr "lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:706
+#: addressbook/gui/widgets/eab-gui-util.c:634
 msgid "Move contact to"
 msgstr "Mover contacto a"
 
-#: addressbook/gui/widgets/eab-gui-util.c:708
+#: addressbook/gui/widgets/eab-gui-util.c:636
 msgid "Copy contact to"
 msgstr "Copiar contacto a"
 
-#: addressbook/gui/widgets/eab-gui-util.c:711
+#: addressbook/gui/widgets/eab-gui-util.c:639
 msgid "Move contacts to"
 msgstr "Mover contactos a"
 
-#: addressbook/gui/widgets/eab-gui-util.c:713
+#: addressbook/gui/widgets/eab-gui-util.c:641
 msgid "Copy contacts to"
 msgstr "Copiar contactos a"
 
-#: addressbook/gui/widgets/eab-gui-util.c:716
+#: addressbook/gui/widgets/eab-gui-util.c:644
 msgid "Select target addressbook."
 msgstr "Seleccione la libreta de direcciones destino."
 
-#: addressbook/gui/widgets/eab-gui-util.c:939
+#: addressbook/gui/widgets/eab-gui-util.c:867
 msgid "Multiple VCards"
 msgstr "VCards múltiples"
 
-#: addressbook/gui/widgets/eab-gui-util.c:942
+#: addressbook/gui/widgets/eab-gui-util.c:870
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard para %s"
@@ -2834,7 +2724,7 @@ msgstr[1] "%d contactos"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:229
+#: addressbook/gui/widgets/e-addressbook-view.c:231
 #: addressbook/gui/widgets/e-minicard-view.c:467
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
@@ -2852,141 +2742,130 @@ msgstr "Modelo"
 msgid "Error modifying card"
 msgstr "Error modificando tarjeta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:163
 msgid "Name begins with"
 msgstr "El nombre empieza por"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:164
 msgid "Email begins with"
 msgstr "El correo-e empieza por"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:57
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "La categoría es"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-#: calendar/gui/cal-search-bar.c:50
+#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Cualquier campo contiene"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+#: addressbook/gui/widgets/e-addressbook-view.c:172
 msgid "Advanced..."
 msgstr "Avanzado..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:236
+#: addressbook/gui/widgets/e-addressbook-view.c:238
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:250
+#: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Tipo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:506
+#: addressbook/gui/widgets/e-addressbook-view.c:508
 msgid "Address Book"
 msgstr "Libreta de direcciones"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
 #: addressbook/gui/widgets/e-addressbook-view.c:2080
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard..."
 msgstr "Guardar como VCard..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 msgid "New Contact..."
 msgstr "Contacto nuevo..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "New Contact List..."
 msgstr "Lista de contactos nueva..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Go to Folder..."
 msgstr "Ir a la carpeta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Import..."
 msgstr "Importar..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1066
 msgid "Search for Contacts..."
 msgstr "Buscar contactos..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 msgid "Address Book Sources..."
 msgstr "Fuentes de la libreta de direcciones..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1069
 msgid "Pilot Settings..."
 msgstr "Configuración del Pilot..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Reenviar contacto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
 msgid "Send Message to Contact"
 msgstr "Envía un mensaje al contacto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Imprimir"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
+#: addressbook/gui/widgets/e-addressbook-view.c:1077
 msgid "Print Envelope"
 msgstr "Imprimir sobre"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
+#: addressbook/gui/widgets/e-addressbook-view.c:1081
 msgid "Copy to Address Book..."
 msgstr "Copiar a la libreta de direcciones..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1080
+#: addressbook/gui/widgets/e-addressbook-view.c:1082
 msgid "Move to Address Book..."
 msgstr "Mover a la libreta de direcciones..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Cortar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Copiar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1087
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Pegar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:1092
+#: calendar/gui/e-calendar-view.c:1280
 msgid "Current View"
 msgstr "Vista actual"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1309
-#, c-format
-msgid ""
-"The addressbook backend for\n"
-"%s\n"
-"has crashed. You will have to restart Evolution in order to use it again"
-msgstr ""
-"El soporte de la libreta de direcciones para\n"
-"%s\n"
-"se ha bloqueado. Tendrá que reiniciar Evolution para usarlo de nuevo"
-
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1667
-#: calendar/gui/cal-search-bar.c:362
+#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Cualquier categoría"
 
@@ -3092,7 +2971,7 @@ msgstr "Radio"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:257
+#: calendar/gui/e-meeting-list-view.c:234
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Papel"
@@ -3200,17 +3079,17 @@ msgstr "Vista de la tarjeta"
 msgid "GTK Tree View"
 msgstr "Vista de árbol GTK"
 
-#: addressbook/gui/widgets/test-reflow.c:119
+#: addressbook/gui/widgets/test-reflow.c:106
 msgid "Reflow Test"
 msgstr "Test de reflujo"
 
-#: addressbook/gui/widgets/test-reflow.c:120
+#: addressbook/gui/widgets/test-reflow.c:107
 #: addressbook/printing/test-contact-print-style-editor.c:54
 #: addressbook/printing/test-print.c:53
 msgid "Copyright (C) 2000, Ximian, Inc."
 msgstr "Copyright © 2000, Ximian, Inc."
 
-#: addressbook/gui/widgets/test-reflow.c:122
+#: addressbook/gui/widgets/test-reflow.c:109
 msgid "This should test the reflow canvas item"
 msgstr "Esto debería probar el reflujo del elemento lienzo"
 
@@ -3457,7 +3336,8 @@ msgid "Export in asynchronous mode "
 msgstr "Exportar en modo asíncrono"
 
 #: addressbook/tools/evolution-addressbook-export.c:63
-msgid "The number of cards in one output file in asychronous mode,default size 100."
+msgid ""
+"The number of cards in one output file in asychronous mode,default size 100."
 msgstr ""
 "El número de tarjetas en un archivo de salida en modo asíncrono, tamaño por "
 "omisión 100."
@@ -3467,7 +3347,8 @@ msgid "NUMBER"
 msgstr "NÚMERO"
 
 #: addressbook/tools/evolution-addressbook-export.c:91
-msgid "Command line arguments error, please use --help option to see the usage."
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Error en los argumentos de la línea de comandos, por favor use la opción --"
 "help para ver el uso."
@@ -3488,15 +3369,21 @@ msgstr "En modo normal, no hay necesidad de la opción de tamaño."
 msgid "Impossible internal error."
 msgstr "Error interno imposible."
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:629
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
 msgid "Can not open file"
 msgstr "No se pudo abrir el archivo"
 
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-msgid "Can not load URI"
-msgstr "No se pudo cargar la URI"
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "No se pudo cargar la libreta de direcciones"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "No es posible abrir la libreta de direcciones"
 
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
@@ -3514,7 +3401,7 @@ msgstr "No ha especificado un nombre de archivo."
 msgid "Unnamed List"
 msgstr "Lista de anónimos"
 
-#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Introduzca contraseña"
@@ -3762,7 +3649,8 @@ msgstr "La semana empieza el día"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
 msgid "Whether or not to use the notification tray for display alarms"
-msgstr "Indica si se debe usar o no la bandeja de notificación para mostrar alarmas"
+msgstr ""
+"Indica si se debe usar o no la bandeja de notificación para mostrar alarmas"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 msgid "Whether to ask for confirmation on appointment deletion"
@@ -3778,21 +3666,24 @@ msgstr "Indica si debe ocultar las áreas terminadas"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Whether to set a default reminder for events"
-msgstr "Indica si debe establecer un recordatorio predeterminado para los eventos"
+msgstr ""
+"Indica si debe establecer un recordatorio predeterminado para los eventos"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Whether to show times in 24h format instead of using am/pm"
-msgstr "Indica si debe mostrar las horas en formato militar en vez de usar am/pm"
+msgstr ""
+"Indica si debe mostrar las horas en formato militar en vez de usar am/pm"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Whether to show week numbers in date navigator"
-msgstr "Indica si debe mostrar los números de la semana en el navegador de fechas"
+msgstr ""
+"Indica si debe mostrar los números de la semana en el navegador de fechas"
 
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:88
-#: calendar/gui/gnome-cal.c:1703
-#: camel/providers/groupwise/camel-gw-listener.c:304
-#: camel/providers/groupwise/camel-gw-listener.c:327
+#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/gnome-cal.c:1705
+#: camel/providers/groupwise/camel-gw-listener.c:311
+#: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
 msgstr "Agenda"
 
@@ -3812,7 +3703,7 @@ msgstr "Purgar eventos anteriores a"
 
 #: calendar/gui/calendar-commands.c:363
 #: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:19 filter/filter.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
 msgid "days"
 msgstr "días"
 
@@ -3822,10 +3713,6 @@ msgstr "%A, %d de %B de %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. %d = day of month, %b = abbreviated month name.
-#. You can change the order but don't change the
-#. specifiers or add anything.
 #: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
 #: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
 #: calendar/gui/e-week-view-main-item.c:329
@@ -3962,23 +3849,23 @@ msgstr "Vista semanal"
 msgid "Month View"
 msgstr "Vista mensual"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "El resumen contiene"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "La descripción contiene"
 
-#: calendar/gui/cal-search-bar.c:54
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "El comentario contiene"
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:53
 msgid "Location contains"
 msgstr "La ubicación contiene"
 
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
 msgid "Unmatched"
 msgstr "No coincidente"
 
@@ -3999,23 +3886,23 @@ msgstr "Permiso denegado para abrir la agenda"
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/dialogs/alarm-options.c:466
+#: calendar/gui/dialogs/alarm-options.c:467
 msgid "Audio Alarm Options"
 msgstr "Opciones de los avisos audibles"
 
-#: calendar/gui/dialogs/alarm-options.c:475
+#: calendar/gui/dialogs/alarm-options.c:476
 msgid "Message Alarm Options"
 msgstr "Opciones de los avisos de mensajes"
 
-#: calendar/gui/dialogs/alarm-options.c:484
+#: calendar/gui/dialogs/alarm-options.c:485
 msgid "Email Alarm Options"
 msgstr "Opciones de los avisos por correo-e"
 
-#: calendar/gui/dialogs/alarm-options.c:493
+#: calendar/gui/dialogs/alarm-options.c:494
 msgid "Program Alarm Options"
 msgstr "Opciones de los avisos de programas"
 
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:510
 msgid "Unknown Alarm Options"
 msgstr "Opciones de avisos desconocidos"
 
@@ -4051,7 +3938,7 @@ msgstr "Enviar a:"
 msgid "With these arguments:"
 msgstr "Con estos argumentos:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
 msgid "dialog1"
 msgstr "diálogo1"
 
@@ -4060,7 +3947,7 @@ msgid "extra times every"
 msgstr "veces adicionales cada"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:20 filter/filter.glade.h:16
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr "horas"
 
@@ -4106,7 +3993,7 @@ msgstr "Enviar un correo-e"
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:921 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Resumen:"
 
@@ -4136,7 +4023,6 @@ msgid "hour(s)"
 msgstr "hora(s)"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:21
 msgid "minute(s)"
 msgstr "minuto(s)"
 
@@ -4144,26 +4030,26 @@ msgstr "minuto(s)"
 msgid "start of appointment"
 msgstr "comienzo de cita"
 
-#: calendar/gui/dialogs/calendar-setup.c:170
+#: calendar/gui/dialogs/calendar-setup.c:172
 msgid "You must specify a location to get the calendar from."
 msgstr "Debe especificar una ubicación de la que obtener la agenda."
 
-#: calendar/gui/dialogs/calendar-setup.c:178
+#: calendar/gui/dialogs/calendar-setup.c:180
 #, c-format
 msgid "The source location '%s' is not well-formed."
 msgstr "La ubicación fuente «%s» no está bien formada."
 
-#: calendar/gui/dialogs/calendar-setup.c:193
+#: calendar/gui/dialogs/calendar-setup.c:195
 #, c-format
 msgid "The source location '%s' is not a webcal source."
 msgstr "La ubicación fuente «%s» no es una fuente webcal."
 
-#: calendar/gui/dialogs/calendar-setup.c:265
+#: calendar/gui/dialogs/calendar-setup.c:275
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr "El origen con nombre «%s» ya existe en el grupo seleccionado"
 
-#: calendar/gui/dialogs/calendar-setup.c:278
+#: calendar/gui/dialogs/calendar-setup.c:288
 #, c-format
 msgid ""
 "The group '%s' is remote. You must specify a location to get the calendar "
@@ -4184,51 +4070,31 @@ msgstr "Añadir grupo de tareas"
 msgid "C_olor:"
 msgstr "C_olor:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "Calendar Properties"
-msgstr "Propiedades de la agenda"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:110
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
 msgid "Pick a color"
 msgstr "Elija un color"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:8
-msgid "Remote"
-msgstr "Remoto"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "Task List Properties"
-msgstr "Propiedades de lista de tareas"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
 msgid "_Add Calendar"
 msgstr "_Añadir Calendario"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
 msgid "_Add Group"
 msgstr "_Añadir grupo"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-msgid "_Refresh Interval:"
-msgstr "Intervalo de _refresco:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
 msgid "_Refresh:"
 msgstr "_Refrescar:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-msgid "_Source URL:"
-msgstr "URL de _origen:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "_Type:"
 msgstr "_Tipo:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
 msgid "_URL:"
 msgstr "_URL:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
 msgid "weeks"
 msgstr "semanas"
 
@@ -4340,7 +4206,7 @@ msgstr "Publicación de disponibilidad"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:557
+#: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Viernes"
 
@@ -4354,7 +4220,7 @@ msgstr "minutos"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:553
+#: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Lunes"
 
@@ -4364,7 +4230,7 @@ msgstr "_Dom"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Sábado"
 
@@ -4378,7 +4244,7 @@ msgstr "Mostrar los _números de las semanas en el navegador de fechas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:552
+#: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Domingo"
 
@@ -4392,7 +4258,7 @@ msgstr "_Jue"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:556
+#: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Jueves"
 
@@ -4406,7 +4272,7 @@ msgstr "Formato de la hora:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:554
+#: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Martes"
 
@@ -4416,7 +4282,7 @@ msgstr "La _semana empieza en:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:555
+#: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Miércoles"
 
@@ -4480,7 +4346,8 @@ msgstr "_Sáb"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_Show appointment end times in week and month views"
-msgstr "Mostrar la hora del final de las citas en las vistas s_emanales y mensuales"
+msgstr ""
+"Mostrar la hora del final de las citas en las vistas s_emanales y mensuales"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Time divisions:"
@@ -4498,82 +4365,46 @@ msgstr "M_ié"
 msgid "before every appointment"
 msgstr "antes de cada cita"
 
-#: calendar/gui/dialogs/cancel-comp.c:57
-msgid ""
-"The event being deleted is a meeting, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"El acontecimiento que está borrando es una reunión, ¿quiere que envíe un "
-"aviso de cancelación?"
-
-#: calendar/gui/dialogs/cancel-comp.c:60
-msgid "Are you sure you want to cancel and delete this meeting?"
-msgstr "¿Seguro que quiere cancelar y borrar esta reunión?"
-
-#: calendar/gui/dialogs/cancel-comp.c:66
-msgid ""
-"The task being deleted is assigned, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"La tarea que está siendo borrada está asignada, ¿quiere mandar un mensaje "
-"advirtiéndolo?"
-
-#: calendar/gui/dialogs/cancel-comp.c:69
-msgid "Are you sure you want to cancel and delete this task?"
-msgstr "¿Seguro que quiere cancelar y borrar esta tarea?"
-
-#: calendar/gui/dialogs/cancel-comp.c:75
-msgid ""
-"The journal entry being deleted is published, would you like to send a "
-"cancellation notice?"
-msgstr ""
-"La entrada del diario que está borrando está publicada, ¿Quiere que envíe un "
-"aviso de cancelación?"
-
-#: calendar/gui/dialogs/cancel-comp.c:78
-msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr "¿Seguro que quiere cancelar y borrar esta entrada del diario?"
-
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Este acontecimiento ha sido borrado."
 
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "Esta tarea ha sido borrada."
 
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:68
 msgid "This journal entry has been deleted."
 msgstr "Esta entrada del diario ha sido borrada."
 
-#: calendar/gui/dialogs/changed-comp.c:75
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  Ha hecho cambios. ¿Olvido los cambios y cierro el editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  No ha hecho cambios, ¿cerrar el editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:82
+#: calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "Este acontecimiento ha cambiado."
 
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "Esta tarea a cambiado."
 
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:92
 msgid "This journal entry has been changed."
 msgstr "Esta entrada del diario ha cambiado."
 
-#: calendar/gui/dialogs/changed-comp.c:99
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  Ha realizado cambios. ¿Olvido estos cambios y actualizo el editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  No ha realizado cambios, ¿actualizar el editor?"
@@ -4611,7 +4442,7 @@ msgid "No summary"
 msgstr "Sin resumen"
 
 #: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
 #: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Guardar como..."
@@ -4665,99 +4496,52 @@ msgstr "No se pudo abrir el destino"
 msgid "Destination is read only"
 msgstr "El destino es de sólo lectura"
 
-#: calendar/gui/dialogs/delete-comp.c:95
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "¿Seguro que quiere borrar la cita «%s»?"
-
-#: calendar/gui/dialogs/delete-comp.c:98
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "¿Seguro que quiere borrar esta cita sin título?"
-
-#: calendar/gui/dialogs/delete-comp.c:104
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "¿Seguro que quiere borrar la tarea «%s»?"
-
-#: calendar/gui/dialogs/delete-comp.c:107
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "¿Seguro que quiere borrar esta tarea sin título?"
-
-#: calendar/gui/dialogs/delete-comp.c:113
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "¿Seguro que quiere borrar la entrada del diario «%s»?"
-
-#: calendar/gui/dialogs/delete-comp.c:116
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "¿Esta seguro que quiere borrar esta entrada del diario sin título?"
-
-#: calendar/gui/dialogs/delete-comp.c:131
-#, c-format
-msgid "Are you sure you want to delete %d appointment?"
-msgid_plural "Are you sure you want to delete %d appointments?"
-msgstr[0] "¿Seguro que quiere borrar %d cita?"
-msgstr[1] "¿Seguro que quiere borrar %d citas?"
-
-#: calendar/gui/dialogs/delete-comp.c:138
-#, c-format
-msgid "Are you sure you want to delete %d task?"
-msgid_plural "Are you sure you want to delete %d tasks?"
-msgstr[0] "¿Seguro que quiere borrar %d tarea?"
-msgstr[1] "¿Seguro que quiere borrar %d tareas?"
-
-#: calendar/gui/dialogs/delete-comp.c:145
-#, c-format
-msgid "Are you sure you want to delete %d journal entry?"
-msgid_plural "Are you sure you want to delete %d journal entries?"
-msgstr[0] "¿Seguro que quiere borrar %d entrada del diario?"
-msgstr[1] "¿Seguro que quiere borrar %d entradas del diario?"
-
-#: calendar/gui/dialogs/delete-error.c:52
+#: calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "El acontecimiento no pudo ser borrado debido a un error de CORBA"
 
-#: calendar/gui/dialogs/delete-error.c:55
+#: calendar/gui/dialogs/delete-error.c:57
 msgid "The task could not be deleted due to a corba error"
 msgstr "La tarea no pudo ser borrada debido a un error de CORBA"
 
-#: calendar/gui/dialogs/delete-error.c:58
+#: calendar/gui/dialogs/delete-error.c:60
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr "La entrada del diario no pudo ser borrada debido a un error de CORBA"
 
-#: calendar/gui/dialogs/delete-error.c:61
+#: calendar/gui/dialogs/delete-error.c:63
 msgid "The item could not be deleted due to a corba error"
 msgstr "El elemento no pudo ser borrado debido a un error de CORBA"
 
-#: calendar/gui/dialogs/delete-error.c:68
+#: calendar/gui/dialogs/delete-error.c:70
 msgid "The event could not be deleted because permission was denied"
 msgstr "El acontecimiento no pudo ser borrado porque el permiso fue denegado"
 
-#: calendar/gui/dialogs/delete-error.c:71
+#: calendar/gui/dialogs/delete-error.c:73
 msgid "The task could not be deleted because permission was denied"
 msgstr "La tarea no pudo ser borrada porque el permiso fue denegado"
 
-#: calendar/gui/dialogs/delete-error.c:74
+#: calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
-msgstr "La entrada del diario no pudo ser borrada porque el permiso fue denegado"
+msgstr ""
+"La entrada del diario no pudo ser borrada porque el permiso fue denegado"
 
-#: calendar/gui/dialogs/delete-error.c:77
+#: calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
 msgstr "El elemento no pudo ser borrado porque el permiso fue denegado"
 
-#: calendar/gui/dialogs/delete-error.c:84
+#: calendar/gui/dialogs/delete-error.c:86
 msgid "The event could not be deleted due to an error"
 msgstr "El evento no pudo ser borrado debido a un error"
 
-#: calendar/gui/dialogs/delete-error.c:87
+#: calendar/gui/dialogs/delete-error.c:89
 msgid "The task could not be deleted due to an error"
 msgstr "La tarea no pudo ser borrada debido a un error"
 
-#: calendar/gui/dialogs/delete-error.c:90
+#: calendar/gui/dialogs/delete-error.c:92
 msgid "The journal entry could not be deleted due to an error"
 msgstr "La entrada del diario no pudo ser borrada debido a un error"
 
-#: calendar/gui/dialogs/delete-error.c:93
+#: calendar/gui/dialogs/delete-error.c:95
 msgid "The item could not be deleted due to an error"
 msgstr "El elemento no pudo ser borrado debido a un error"
 
@@ -4889,17 +4673,12 @@ msgid "_Start time:"
 msgstr "Hora de _inicio:"
 
 #. an empty string is the same as 'None'
-#. add a "None" option to the stores menu
-#. Put the "None" and "UTC" entries at the top of the combo's list.
-#. When "None" is selected we want the field to be cleared.
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
 #: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:3
+#: calendar/gui/dialogs/meeting-page.glade.h:4
 #: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
 #: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1559
-#: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:103
+#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
+#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
@@ -4925,8 +4704,8 @@ msgstr "_Delegado a..."
 #. FIXME: need to disable for undeletable folders
 #: calendar/gui/dialogs/meeting-page.c:655
 #: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1310 calendar/gui/e-calendar-view.c:1342
-#: mail/em-folder-tree.c:2562 mail/em-folder-view.c:919
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
+#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -4934,7 +4713,7 @@ msgid "_Delete"
 msgstr "_Borrar"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:241
+#: calendar/gui/e-meeting-list-view.c:218
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Participantes"
@@ -4970,16 +4749,15 @@ msgid "Member"
 msgstr "Miembro"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1048 calendar/gui/e-meeting-list-view.c:264
+#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "Confirmar"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:271
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
-#: mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-list-view.c:248
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Estado"
 
@@ -4987,20 +4765,20 @@ msgstr "Estado"
 msgid "Add A_ttendee"
 msgstr "Añadir _participante"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "Add attendees from addressbook."
+msgstr "Añadir remitente a la li_breta de direcciones"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Organizador:"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
+#: calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "_Change Organizer"
 msgstr "_Cambiar organizador"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-#: calendar/gui/e-meeting-time-sel.c:417
-msgid "_Invite Others..."
-msgstr "_Invitar a otros..."
-
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
 msgstr "<b>Opciones de agenda</b>"
@@ -5039,15 +4817,18 @@ msgstr "Nombre de la lista de tareas"
 
 #: calendar/gui/dialogs/recur-comp.c:50
 msgid "You are modifying a recurring event, what would you like to modify?"
-msgstr "Está modificando un acontecimiento que se repite, ¿qué quiere modificar?"
+msgstr ""
+"Está modificando un acontecimiento que se repite, ¿qué quiere modificar?"
 
 #: calendar/gui/dialogs/recur-comp.c:54
 msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr "Está modificando una tarea que se repite, ¿qué quiere modificar?"
 
 #: calendar/gui/dialogs/recur-comp.c:58
-msgid "You are modifying a recurring journal entry, what would you like to modify?"
-msgstr "Está modificando una entrada del diario que se repite, ¿qué quiere modificar?"
+msgid ""
+"You are modifying a recurring journal entry, what would you like to modify?"
+msgstr ""
+"Está modificando una entrada del diario que se repite, ¿qué quiere modificar?"
 
 #: calendar/gui/dialogs/recur-comp.c:72
 msgid "This Instance Only"
@@ -5146,7 +4927,7 @@ msgid "_No recurrence"
 msgstr "Si_n repetición"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:450
+#: composer/e-msg-composer-attachment-bar.c:453
 msgid "_Remove"
 msgstr "_Quitar"
 
@@ -5178,54 +4959,18 @@ msgstr "semana(s)"
 msgid "year(s)"
 msgstr "año(s)"
 
-#: calendar/gui/dialogs/save-comp.c:53
-msgid ""
-"This event has been changed, but has not been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Este acontecimiento ha sido modificado, pero no se ha guardado.\n"
-"\n"
-"¿Quiere guardar los cambios?"
-
-#: calendar/gui/dialogs/save-comp.c:57
-msgid "_Discard Changes"
-msgstr "_Descartar cambios"
-
-#: calendar/gui/dialogs/save-comp.c:62
-msgid "Save Event"
-msgstr "Guardar acontecimiento"
-
-#: calendar/gui/dialogs/select-source-dialog.c:65
+#: calendar/gui/dialogs/select-source-dialog.c:69
 msgid "Select destination"
 msgstr "Seleccione destino"
 
-#: calendar/gui/dialogs/select-source-dialog.c:86
+#: calendar/gui/dialogs/select-source-dialog.c:90
 msgid "_Destination"
 msgstr "_Destino"
 
-#: calendar/gui/dialogs/select-source-dialog.c:88
+#: calendar/gui/dialogs/select-source-dialog.c:92
 msgid "Task List"
 msgstr "Lista de tareas"
 
-#: calendar/gui/dialogs/send-comp.c:57
-msgid "The meeting information has been created. Send it?"
-msgstr "La información de la reunión ha sido creada. ¿Desea enviarla?"
-
-#: calendar/gui/dialogs/send-comp.c:60
-msgid "The meeting information has changed. Send an updated version?"
-msgstr ""
-"La información de la reunión ha cambiado. ¿Desea enviar una versión "
-"actualizada?"
-
-#: calendar/gui/dialogs/send-comp.c:67
-msgid "The task assignment information has been created. Send it?"
-msgstr "La información de asignación de tareas ha sido creada. ¿Desea enviarla?"
-
-#: calendar/gui/dialogs/send-comp.c:71
-msgid "The task information has changed. Send an updated version?"
-msgstr "La información de la tarea ha cambiado. ¿Enviar versión actualizada?"
-
 #: calendar/gui/dialogs/task-details-page.c:406
 msgid "Completed date is wrong"
 msgstr "La fecha de terminación es errónea"
@@ -5323,7 +5068,7 @@ msgstr "Con_fidencial"
 
 #: calendar/gui/dialogs/task-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:976 calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Descripción:"
@@ -5487,7 +5232,7 @@ msgstr "Fecha de vencimiento:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:944
+#: calendar/gui/e-itip-control.c:943
 msgid "Status:"
 msgstr "Estado:"
 
@@ -5571,12 +5316,12 @@ msgstr "Ocupada"
 msgid "Deleting selected objects"
 msgstr "Borrando los objetos seleccionados"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
 msgid "Updating objects"
 msgstr "Actualizando objetos"
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1370
+#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
 #: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Abrir"
@@ -5586,15 +5331,15 @@ msgid "Open _Web Page"
 msgstr "Abrir página _web"
 
 #: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1291 calendar/gui/e-calendar-view.c:1376
-#: mail/em-folder-view.c:896 mail/em-popup.c:690 mail/em-popup.c:806
+#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
+#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "Guardar _como..."
 
 #: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1292
-#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
+#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
@@ -5602,15 +5347,15 @@ msgid "_Print..."
 msgstr "Im_primir..."
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "C_ortar"
 
 #: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1338
-#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2555
+#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
+#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
 #: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
@@ -5618,8 +5363,8 @@ msgid "_Copy"
 msgstr "_Copiar"
 
 #: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1273 calendar/gui/e-calendar-view.c:1299
-#: calendar/gui/e-calendar-view.c:1372 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
+#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
@@ -5685,67 +5430,67 @@ msgstr "Resumen"
 msgid "Task sort"
 msgstr "Ordenar tareas"
 
-#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
 msgid "New _Appointment..."
 msgstr "Cit_a nueva..."
 
-#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
+#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
 msgid "New All Day _Event"
 msgstr "Acont_ecimiento nuevo para todo el día"
 
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
+#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
 msgid "New Meeting"
 msgstr "Reunión nueva"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
 msgid "New Task"
 msgstr "Tarea nueva"
 
-#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "Seleccionar _hoy"
 
-#: calendar/gui/e-calendar-view.c:1280
+#: calendar/gui/e-calendar-view.c:1283
 msgid "_Select Date..."
 msgstr "_Seleccionar fecha..."
 
-#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publicar la información de disponibilidad"
 
-#: calendar/gui/e-calendar-view.c:1303
+#: calendar/gui/e-calendar-view.c:1306
 msgid "Cop_y to Calendar..."
 msgstr "Cop_ia al calendario..."
 
-#: calendar/gui/e-calendar-view.c:1304
+#: calendar/gui/e-calendar-view.c:1307
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_ver al calendario..."
 
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1308
 msgid "_Schedule Meeting..."
 msgstr "Concertar una _reunión..."
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1309
 msgid "_Forward as iCalendar..."
 msgstr "Reenviar como i_Calendar..."
 
-#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
 msgid "Delete this _Occurrence"
 msgstr "Borrar esta _repetición"
 
-#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
 msgid "Delete _All Occurrences"
 msgstr "Borrar tod_as las repeticiones"
 
-#: calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1349
 msgid "Go to _Today"
 msgstr "Ir a _hoy"
 
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1351
 msgid "_Go to Date..."
 msgstr "_Ir a una fecha..."
 
-#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "_Configuración..."
 
@@ -5759,9 +5504,9 @@ msgstr "Fecha de inicio"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:961 calendar/gui/e-itip-control.c:1163
-#: calendar/gui/e-meeting-list-view.c:145
-#: calendar/gui/e-meeting-list-view.c:159 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
 #: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
 #: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
 #: camel/camel-tcp-stream-openssl.c:631
@@ -5787,13 +5532,13 @@ msgid "Assigned"
 msgstr "Asignado"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr "Sí"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:170 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "No"
 
@@ -5805,7 +5550,7 @@ msgstr "N"
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
 msgid "E"
 msgstr "E"
 
@@ -5824,20 +5569,12 @@ msgstr ""
 "45.436845,125.862501"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format.
 #: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
@@ -5868,10 +5605,6 @@ msgstr "pm"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#. strftime format %A = full weekday name, %d = day of
-#. month, %B = full month name. You can change the
-#. order but don't change the specifiers or add
-#. anything.
 #: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
@@ -5879,9 +5612,6 @@ msgstr "%A %d de %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#. strftime format %d = day of month, %b = abbreviated
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
 #: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
@@ -5892,102 +5622,102 @@ msgstr "%d de %b"
 msgid "%02i minute divisions"
 msgstr "%02i divisiones por minuto"
 
-#: calendar/gui/e-itip-control.c:586
+#: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
 msgstr "Sí. (Repetición compuesta)"
 
-#: calendar/gui/e-itip-control.c:597
+#: calendar/gui/e-itip-control.c:596
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Cada día"
 msgstr[1] "Cada %d días"
 
-#: calendar/gui/e-itip-control.c:602
+#: calendar/gui/e-itip-control.c:601
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Cada semana"
 msgstr[1] "Cada %d semanas"
 
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:603
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "Cada semana en"
 msgstr[1] "Cada %d semanas en"
 
-#: calendar/gui/e-itip-control.c:612
+#: calendar/gui/e-itip-control.c:611
 msgid " and "
 msgstr " y "
 
-#: calendar/gui/e-itip-control.c:619
+#: calendar/gui/e-itip-control.c:618
 #, c-format
 msgid "The %s day of "
 msgstr "El %s día de "
 
-#: calendar/gui/e-itip-control.c:632
+#: calendar/gui/e-itip-control.c:631
 #, c-format
 msgid "The %s %s of "
 msgstr "El %s %s de"
 
-#: calendar/gui/e-itip-control.c:639
+#: calendar/gui/e-itip-control.c:638
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "cada mes"
 msgstr[1] "cada %d meses"
 
-#: calendar/gui/e-itip-control.c:643
+#: calendar/gui/e-itip-control.c:642
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Cada año"
 msgstr[1] "Cada %d años"
 
-#: calendar/gui/e-itip-control.c:654
+#: calendar/gui/e-itip-control.c:653
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] "un total de %d vez"
 msgstr[1] " un total de %d veces"
 
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:662
 msgid ", ending on "
 msgstr ", terminando en "
 
-#: calendar/gui/e-itip-control.c:687
+#: calendar/gui/e-itip-control.c:686
 msgid "<b>Starts:</b> "
 msgstr "<b>Empieza:</b>"
 
-#: calendar/gui/e-itip-control.c:697
+#: calendar/gui/e-itip-control.c:696
 msgid "<b>Ends:</b> "
 msgstr "<b>Termina:</b>"
 
-#: calendar/gui/e-itip-control.c:717
+#: calendar/gui/e-itip-control.c:716
 msgid "<b>Completed:</b> "
 msgstr "<b>Completado:</b> "
 
-#: calendar/gui/e-itip-control.c:727
+#: calendar/gui/e-itip-control.c:726
 msgid "<b>Due:</b> "
 msgstr "<b>Vencimiento:</b>"
 
-#: calendar/gui/e-itip-control.c:765 calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
 msgid "iCalendar Information"
 msgstr "Información de iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:781
 msgid "iCalendar Error"
 msgstr "Error de iCalendar"
 
-#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
-#: calendar/gui/e-itip-control.c:880 calendar/gui/e-itip-control.c:897
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
 msgid "An unknown person"
 msgstr "Una persona desconocida"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:904
+#: calendar/gui/e-itip-control.c:903
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5995,303 +5725,308 @@ msgstr ""
 "<br> Revise la siguiente información y seleccione una acción del menú de "
 "abajo."
 
-#: calendar/gui/e-itip-control.c:919
+#: calendar/gui/e-itip-control.c:918
 msgid "<i>None</i>"
 msgstr "<i>Ninguna</i>"
 
-#: calendar/gui/e-itip-control.c:949 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:929
+msgid "Location:"
+msgstr "Lugar:"
+
+#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Aceptado"
 
-#: calendar/gui/e-itip-control.c:953 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Aceptado provisionalmente"
 
-#: calendar/gui/e-itip-control.c:957 calendar/gui/e-meeting-list-view.c:182
+#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Rechazado"
 
-#: calendar/gui/e-itip-control.c:1016 calendar/gui/e-itip-control.c:1044
-#: calendar/gui/e-itip-control.c:1070 calendar/gui/e-itip-control.c:1083
-#: calendar/gui/e-itip-control.c:1096 calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
 msgid "Choose an action:"
 msgstr "Elija una acción:"
 
-#: calendar/gui/e-itip-control.c:1017
+#: calendar/gui/e-itip-control.c:1016
 msgid "Update"
 msgstr "Actualizar"
 
-#: calendar/gui/e-itip-control.c:1018 calendar/gui/e-itip-control.c:1049
-#: calendar/gui/e-itip-control.c:1072 calendar/gui/e-itip-control.c:1085
-#: calendar/gui/e-itip-control.c:1098 calendar/gui/e-itip-control.c:1111
-#: shell/e-shell.c:1098 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
+#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Aceptar"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1044
 msgid "Accept"
 msgstr "Aceptar"
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1045
 msgid "Tentatively accept"
 msgstr "Aceptar provisionalmente"
 
-#: calendar/gui/e-itip-control.c:1047
+#: calendar/gui/e-itip-control.c:1046
 msgid "Decline"
 msgstr "Rechazar"
 
-#: calendar/gui/e-itip-control.c:1071
+#: calendar/gui/e-itip-control.c:1070
 msgid "Send Free/Busy Information"
 msgstr "Enviar información de disponibilidad"
 
-#: calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1083
 msgid "Update respondent status"
 msgstr "Actualizar el estado del remitente"
 
-#: calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1096
 msgid "Send Latest Information"
 msgstr "Enviar la última información"
 
-#: calendar/gui/e-itip-control.c:1110 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1185
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> ha publicado información de reunión."
 
-#: calendar/gui/e-itip-control.c:1187
+#: calendar/gui/e-itip-control.c:1186
 msgid "Meeting Information"
 msgstr "Información de reunió"
 
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1191
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> solicita la presencia de %s en una reunión."
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1193
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> solicita su presencia en una reunión."
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1194
 msgid "Meeting Proposal"
 msgstr "Propuesta de reunión"
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> desea apuntarse a una reunión existente."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Update"
 msgstr "Actualización de reunión"
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1203
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> desea recibir la última información de la reunión."
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1204
 msgid "Meeting Update Request"
 msgstr "Solicitud de actualización de la reunión"
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> ha contestado a la solicitud de reunión."
 
-#: calendar/gui/e-itip-control.c:1213
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Reply"
 msgstr "Respuesta de reunión"
 
-#: calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1219
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> ha cancelado una reunión."
 
-#: calendar/gui/e-itip-control.c:1221
+#: calendar/gui/e-itip-control.c:1220
 msgid "Meeting Cancellation"
 msgstr "Cancelación de reunión"
 
-#: calendar/gui/e-itip-control.c:1228 calendar/gui/e-itip-control.c:1296
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1330
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> ha enviado un mensaje ininteligible."
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1228
 msgid "Bad Meeting Message"
 msgstr "Mensaje de reunión erróneo"
 
-#: calendar/gui/e-itip-control.c:1254
+#: calendar/gui/e-itip-control.c:1253
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> ha publicado la información de la tarea."
 
-#: calendar/gui/e-itip-control.c:1255
+#: calendar/gui/e-itip-control.c:1254
 msgid "Task Information"
 msgstr "Información de la tarea"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1259
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> pide a %s que realice una tarea."
 
-#: calendar/gui/e-itip-control.c:1262
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> le pide que realice una tarea."
 
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1262
 msgid "Task Proposal"
 msgstr "Propuesta de tarea"
 
-#: calendar/gui/e-itip-control.c:1267
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> desea añadirse a una tarea existente."
 
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Update"
 msgstr "Actualización de tarea"
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1271
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> quiere recibir la última información de la tarea."
 
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1272
 msgid "Task Update Request"
 msgstr "Solicitud de actualización de tarea"
 
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> ha contestado a una asignación de tarea."
 
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Reply"
 msgstr "Respuesta a una tarea"
 
-#: calendar/gui/e-itip-control.c:1288
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> ha cancelado una tarea."
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1288
 msgid "Task Cancellation"
 msgstr "Cancelación de tarea"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1296
 msgid "Bad Task Message"
 msgstr "Mensaje de tarea erróneo"
 
-#: calendar/gui/e-itip-control.c:1316
+#: calendar/gui/e-itip-control.c:1315
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> ha publicado la información de disponibilidad."
 
-#: calendar/gui/e-itip-control.c:1317
+#: calendar/gui/e-itip-control.c:1316
 msgid "Free/Busy Information"
 msgstr "Información de disponibilidad"
 
-#: calendar/gui/e-itip-control.c:1321
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> pide su información de disponibilidad."
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1321
 msgid "Free/Busy Request"
 msgstr "Solicitud de disponibilidad"
 
-#: calendar/gui/e-itip-control.c:1326
+#: calendar/gui/e-itip-control.c:1325
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> ha contestado a una solicitud de disponibilidad."
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1326
 msgid "Free/Busy Reply"
 msgstr "Respuesta sobre disponibilidad"
 
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1331
 msgid "Bad Free/Busy Message"
 msgstr "Mensaje de disponibilidad erróneo"
 
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1406
 msgid "The message does not appear to be properly formed"
 msgstr "El mensaje no parece estar formado correctamente"
 
-#: calendar/gui/e-itip-control.c:1466
+#: calendar/gui/e-itip-control.c:1465
 msgid "The message contains only unsupported requests."
 msgstr "Este mensaje sólo contiene solicitudes no soportadas."
 
-#: calendar/gui/e-itip-control.c:1497
+#: calendar/gui/e-itip-control.c:1496
 msgid "The attachment does not contain a valid calendar message"
 msgstr "El adjunto no contiene un mensaje de agenda válido"
 
-#: calendar/gui/e-itip-control.c:1529
+#: calendar/gui/e-itip-control.c:1528
 msgid "The attachment has no viewable calendar items"
 msgstr "El adjunto no tiene elementos de agenda visibles"
 
-#: calendar/gui/e-itip-control.c:1763
+#: calendar/gui/e-itip-control.c:1762
 msgid "Update complete\n"
 msgstr "Actualización terminada\n"
 
-#: calendar/gui/e-itip-control.c:1793 calendar/gui/e-itip-control.c:1865
+#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
 msgid "Attendee status can not be updated because the item no longer exists"
-msgstr "El estado de asistencia no puede ser actualizado porque no existe el elemento"
+msgstr ""
+"El estado de asistencia no puede ser actualizado porque no existe el elemento"
 
-#: calendar/gui/e-itip-control.c:1809 calendar/gui/e-itip-control.c:1847
+#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
 msgid "Object is invalid and cannot be updated\n"
 msgstr "El objeto es inválido y no puede ser actualizado\n"
 
-#: calendar/gui/e-itip-control.c:1819
+#: calendar/gui/e-itip-control.c:1818
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Esta respuesta no es de un asistente. ¿Desea añadirlo como asistente?"
 
-#: calendar/gui/e-itip-control.c:1831
+#: calendar/gui/e-itip-control.c:1830
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "El estado de asistencia no pudo ser actualizado a causa de un estado "
 "inválido\n"
 
-#: calendar/gui/e-itip-control.c:1850
+#: calendar/gui/e-itip-control.c:1849
 msgid "There was an error on the CORBA system\n"
 msgstr "Hubo un error en el sistema CORBA\n"
 
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1852
 msgid "Object could not be found\n"
 msgstr "El objeto no pudo encontrarse\n"
 
-#: calendar/gui/e-itip-control.c:1856
+#: calendar/gui/e-itip-control.c:1855
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "No tiene los permisos necesarios para actualizar la agenda\n"
 
-#: calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1858
 msgid "Attendee status updated\n"
 msgstr "Estado de asistencia actualizado\n"
 
-#: calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1861
 msgid "Attendee status could not be updated!\n"
 msgstr "El estado de asistencia no pudo ser actualizado.\n"
 
-#: calendar/gui/e-itip-control.c:1893
+#: calendar/gui/e-itip-control.c:1892
 msgid "Removal Complete"
 msgstr "Eliminación terminada"
 
-#: calendar/gui/e-itip-control.c:1916 calendar/gui/e-itip-control.c:1964
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
 msgid "Item sent!\n"
 msgstr "Elemento enviado.\n"
 
-#: calendar/gui/e-itip-control.c:1918 calendar/gui/e-itip-control.c:1968
+#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
 msgid "The item could not be sent!\n"
 msgstr "El elemento no pudo ser enviado.\n"
 
@@ -6332,74 +6067,74 @@ msgstr "fecha de fin"
 msgid "date-start"
 msgstr "fecha de inicio"
 
-#: calendar/gui/e-meeting-list-view.c:62
+#: calendar/gui/e-meeting-list-view.c:59
 msgid "Chair Persons"
 msgstr "Presidencia"
 
-#: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:480
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
 msgid "Required Participants"
 msgstr "Participantes requeridos"
 
-#: calendar/gui/e-meeting-list-view.c:64
+#: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Participantes opcionales"
 
-#: calendar/gui/e-meeting-list-view.c:65
+#: calendar/gui/e-meeting-list-view.c:62
 msgid "Resources"
 msgstr "Recursos"
 
-#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
 #: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr "Individual"
 
-#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "Grupo"
 
-#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr "Recurso"
 
-#: calendar/gui/e-meeting-list-view.c:144 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr "Sala"
 
-#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr "Presidente"
 
-#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:127
 #: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
 msgid "Required Participant"
 msgstr "Participante requerido"
 
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr "Participante opcional"
 
-#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr "No participan"
 
-#: calendar/gui/e-meeting-list-view.c:180 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:177
 #: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
 msgid "Needs Action"
 msgstr "Necesita acción"
 
-#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
 #: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "Provisional"
 
-#: calendar/gui/e-meeting-list-view.c:184 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr "Delegado"
@@ -6416,20 +6151,28 @@ msgstr "Fuera de la oficina"
 msgid "No Information"
 msgstr "Sin información"
 
+#: calendar/gui/e-meeting-time-sel.c:417
+#, fuzzy
+msgid "Add attendees from addressbook"
+msgstr "Añadir remitente a la li_breta de direcciones"
+
 #: calendar/gui/e-meeting-time-sel.c:440
 msgid "_Options"
 msgstr "_Opciones"
 
 #: calendar/gui/e-meeting-time-sel.c:457
-msgid "Show _Only Working Hours"
+#, fuzzy
+msgid "Show _only working hours"
 msgstr "Mostrar _sólo las horas de trabajo"
 
 #: calendar/gui/e-meeting-time-sel.c:467
-msgid "Show _Zoomed Out"
+#, fuzzy
+msgid "Show _zoomed out"
 msgstr "Mostrar quitando _ampliación"
 
 #: calendar/gui/e-meeting-time-sel.c:482
-msgid "_Update Free/Busy"
+#, fuzzy
+msgid "_Update free/busy"
 msgstr "_Actualizar libre/ocupada"
 
 #: calendar/gui/e-meeting-time-sel.c:497
@@ -6445,19 +6188,23 @@ msgid ">_>"
 msgstr ">_>"
 
 #: calendar/gui/e-meeting-time-sel.c:547
-msgid "_All People and Resources"
+#, fuzzy
+msgid "_All people and resources"
 msgstr "_Todas las personas y los recursos"
 
 #: calendar/gui/e-meeting-time-sel.c:556
-msgid "All _People and One Resource"
+#, fuzzy
+msgid "All _people and one resource"
 msgstr "Todas las _personas y un recurso"
 
 #: calendar/gui/e-meeting-time-sel.c:565
-msgid "_Required People"
+#, fuzzy
+msgid "_Required people"
 msgstr "Personas _requeridas"
 
 #: calendar/gui/e-meeting-time-sel.c:574
-msgid "Required People and _One Resource"
+#, fuzzy
+msgid "Required people and _one resource"
 msgstr "Personas requeridas y _un recurso"
 
 #: calendar/gui/e-meeting-time-sel.c:593
@@ -6477,10 +6224,6 @@ msgstr "%A, %d de %B de %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#. This is a strftime() format string %a = abbreviated weekday
-#. name, %m = month number, %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. strftime format of a weekday and a date.
 #: calendar/gui/e-meeting-time-sel.c:2093
 #: calendar/gui/e-meeting-time-sel-item.c:456 e-util/e-time-utils.c:203
 #: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
@@ -6489,10 +6232,6 @@ msgstr "%a %d/%m/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. This is the preferred date format for the locale.
-#. This is a strftime() format for a short date. %m = month,
-#. %d = day of month, %Y = year (all digits).
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
 #: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
 msgid "%m/%d/%Y"
@@ -6503,7 +6242,7 @@ msgstr "%d/%m/%Y"
 msgid "Enter the password for %s"
 msgstr "Introduzca su contraseña para %s"
 
-#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6512,19 +6251,14 @@ msgstr ""
 "Error en %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr "El backend de tareas para %s se ha colgado."
-
 #. FIXME Loading should be async
 #. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:686
+#: calendar/gui/e-tasks.c:801
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Abriendo tareas en %s"
 
-#: calendar/gui/e-tasks.c:709
+#: calendar/gui/e-tasks.c:824
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6533,52 +6267,47 @@ msgstr ""
 "Error al abrir %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:730
+#: calendar/gui/e-tasks.c:845
 msgid "Loading tasks"
 msgstr "Cargando tareas"
 
-#: calendar/gui/e-tasks.c:834
+#: calendar/gui/e-tasks.c:949
 msgid "Completing tasks..."
 msgstr "Terminando tareas..."
 
-#: calendar/gui/e-tasks.c:857
+#: calendar/gui/e-tasks.c:972
 msgid "Deleting selected objects..."
 msgstr "Borrando los objetos seleccionados..."
 
-#: calendar/gui/e-tasks.c:884
+#: calendar/gui/e-tasks.c:999
 msgid "Expunging"
 msgstr "Compactando"
 
-#: calendar/gui/e-tasks.c:960
+#: calendar/gui/e-tasks.c:1075
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
-#: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
+#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
+#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
 #: calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:705
 msgid "Tasks"
 msgstr "Tareas"
 
-#: calendar/gui/gnome-cal.c:1876
+#: calendar/gui/gnome-cal.c:1878
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Cargando citas de %s"
 
-#: calendar/gui/gnome-cal.c:1895
+#: calendar/gui/gnome-cal.c:1897
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Cargando tareas de %s"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1920
 #, c-format
 msgid "Opening %s"
 msgstr "Abriendo %s"
 
-#: calendar/gui/gnome-cal.c:2048
-#, c-format
-msgid "The calendar backend for '%s' has crashed."
-msgstr "El backend de la agenda para %s se ha colgado."
-
-#: calendar/gui/gnome-cal.c:2894
+#: calendar/gui/gnome-cal.c:2906
 msgid "Purging"
 msgstr "Compactando"
 
@@ -6775,9 +6504,10 @@ msgid "On The Web"
 msgstr "En la web"
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
 msgid "Unable to migrate old settings from evolution/config.xmldb"
-msgstr "No es posible migrar la configuración antigua desde evolution/config.xmldb"
+msgstr ""
+"No es posible migrar la configuración antigua desde evolution/config.xmldb"
 
 #. FIXME: domain/code
 #: calendar/gui/migration.c:737
@@ -6786,7 +6516,7 @@ msgid "Unable to migrate calendar `%s'"
 msgstr "No se pudo migrar la agenda «%s»."
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:869
+#: calendar/gui/migration.c:889
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "No es posible migrar las tareas en «%s»."
@@ -7022,43 +6752,44 @@ msgstr "Imprimir elemento"
 msgid "Print Setup"
 msgstr "Configurar impresión"
 
-#: calendar/gui/tasks-component.c:303
+#: calendar/gui/tasks-component.c:313
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr "La lista de tareas «%s» será eliminada. ¿Seguro que quiere continuar?"
 
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:371
 msgid "New Task List"
 msgstr "Lista de tareas nueva"
 
-#: calendar/gui/tasks-component.c:398
+#: calendar/gui/tasks-component.c:408
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d tarea"
 msgstr[1] "%d tareas"
 
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:502
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ",%d seleccionado"
 msgstr[1] ",%d seleccionados"
 
-#: calendar/gui/tasks-component.c:447
+#: calendar/gui/tasks-component.c:457
 msgid "Failed upgrading tasks."
 msgstr "Fallo al actualizar las tareas."
 
-#: calendar/gui/tasks-component.c:526
+#: calendar/gui/tasks-component.c:749
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
-msgstr "No es posible abrir la lista de tareas «%s» para crear eventos y reuniones"
+msgstr ""
+"No es posible abrir la lista de tareas «%s» para crear eventos y reuniones"
 
-#: calendar/gui/tasks-component.c:538
+#: calendar/gui/tasks-component.c:761
 msgid "There is no calendar available for creating tasks"
 msgstr "No hay una agenda disponible para crear tareas"
 
-#: calendar/gui/tasks-component.c:576
+#: calendar/gui/tasks-component.c:799
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
@@ -7066,27 +6797,27 @@ msgstr ""
 "La lista de tareas seleccionada es de sólo lectura, los eventos no pueden "
 "crearse. Seleccione una agenda con lectura-escritura."
 
-#: calendar/gui/tasks-component.c:804
+#: calendar/gui/tasks-component.c:1040
 msgid "New task"
 msgstr "Tarea nueva"
 
-#: calendar/gui/tasks-component.c:805
+#: calendar/gui/tasks-component.c:1041
 msgid "_Task"
 msgstr "_Tarea"
 
-#: calendar/gui/tasks-component.c:806
+#: calendar/gui/tasks-component.c:1042
 msgid "Create a new task"
 msgstr "Crea una tarea nueva"
 
-#: calendar/gui/tasks-component.c:812
+#: calendar/gui/tasks-component.c:1048
 msgid "New tasks group"
 msgstr "Nuevo grupo de tareas"
 
-#: calendar/gui/tasks-component.c:813
+#: calendar/gui/tasks-component.c:1049
 msgid "_Tasks Group"
 msgstr "Grupo de _tareas"
 
-#: calendar/gui/tasks-component.c:814
+#: calendar/gui/tasks-component.c:1050
 msgid "Create a new tasks group"
 msgstr "Crea una grupo de tareas nuevo"
 
@@ -8748,7 +8479,8 @@ msgstr "Resincronizando con el servidor"
 
 #: camel/camel-disco-folder.c:41
 msgid "Copy folder content locally for offline operation"
-msgstr "Copiar el contenido de la carpeta localmente para operación desconectada"
+msgstr ""
+"Copiar el contenido de la carpeta localmente para operación desconectada"
 
 #: camel/camel-disco-folder.c:103
 msgid "Downloading new messages for offline mode"
@@ -8912,15 +8644,15 @@ msgstr "(coincidir-conversaciones) no se permite dentro de «coincidir-todo»"
 msgid "(match-threads) requires a match type string"
 msgstr "(coincidir-conversaciones) requiere una cadena de coincidencia"
 
-#: camel/camel-folder-search.c:785
+#: camel/camel-folder-search.c:784
 msgid "(match-threads) expects an array result"
 msgstr "(coincidir-conversaciones) espera un resultado array"
 
-#: camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:790
 msgid "(match-threads) requires the folder set"
 msgstr "(coincidir-conversaciones) requiere que se establezca una carpeta"
 
-#: camel/camel-folder-search.c:880
+#: camel/camel-folder-search.c:879
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Realizando búsqueda en cabecera desconocida: %s"
@@ -8955,7 +8687,8 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
 #: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:705
+#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Cancelado."
@@ -9015,7 +8748,8 @@ msgstr "Esta parte del mensaje está firmada digitalmente"
 #: camel/camel-smime-context.c:721 camel/camel-smime-context.c:732
 #: camel/camel-smime-context.c:739
 msgid "Cannot verify message signature: Incorrect message format"
-msgstr "No se pudo verificar la firma del mensaje: Formato de mensaje incorrecto"
+msgstr ""
+"No se pudo verificar la firma del mensaje: Formato de mensaje incorrecto"
 
 #: camel/camel-gpg-context.c:1413
 #, c-format
@@ -9049,7 +8783,8 @@ msgstr "No se pudo bloquear el archivo para %s: %s"
 #: camel/camel-lock.c:154
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr "Expiró el tiempo tratando de cerrar el archivo %s. Inténtelo más tarde."
+msgstr ""
+"Expiró el tiempo tratando de cerrar el archivo %s. Inténtelo más tarde."
 
 #: camel/camel-lock.c:209
 #, c-format
@@ -9250,7 +8985,8 @@ msgstr "Reto del servidor no válido\n"
 
 #: camel/camel-sasl-digest-md5.c:828
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
-msgstr "El reto del servidor contiene una valor «Calidad de Protección» no válido\n"
+msgstr ""
+"El reto del servidor contiene una valor «Calidad de Protección» no válido\n"
 
 #: camel/camel-sasl-digest-md5.c:850
 msgid "Server response did not contain authorization data\n"
@@ -9258,7 +8994,8 @@ msgstr "La respuesta del servidor no contenía información de autorización\n"
 
 #: camel/camel-sasl-digest-md5.c:868
 msgid "Server response contained incomplete authorization data\n"
-msgstr "La respuesta del servidor contenía información de autorización incompleta\n"
+msgstr ""
+"La respuesta del servidor contenía información de autorización incompleta\n"
 
 #: camel/camel-sasl-digest-md5.c:878
 msgid "Server response does not match\n"
@@ -9319,7 +9056,8 @@ msgstr ""
 
 #: camel/camel-sasl-gssapi.c:174
 msgid "The supplied context handle did not refer to a valid context."
-msgstr "El manipulador de contexto suministrado no se refiere a un contexto válido."
+msgstr ""
+"El manipulador de contexto suministrado no se refiere a un contexto válido."
 
 #: camel/camel-sasl-gssapi.c:177
 msgid "The consistency checks performed on the input_token failed."
@@ -9336,7 +9074,7 @@ msgstr "Las credenciales referenciadas han expirado."
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1243
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Respuesta de autenticación errónea desde el servidor."
 
@@ -9695,40 +9433,40 @@ msgstr "importación de claves: no implementado"
 msgid "export keys: unimplemented"
 msgstr "exportación de claves: no implementado"
 
-#: camel/camel-store.c:215
+#: camel/camel-store.c:213
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "No se pudo obtener la carpeta: Operación no válida en este almacén"
 
-#: camel/camel-store.c:245
+#: camel/camel-store.c:243
 #, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr "No se pudo crear la carpeta: %s: la carpeta existe"
 
-#: camel/camel-store.c:299
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "No se pudo crear la carpeta: Operación no válida en este almacén"
 
-#: camel/camel-store.c:327
+#: camel/camel-store.c:325
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "No se pudo crear la carpeta: %s: la carpeta existe"
 
-#: camel/camel-store.c:391 camel/camel-vee-store.c:354
+#: camel/camel-store.c:389 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "No se pudo borrar la carpeta: %s: Operación no válida"
 
-#: camel/camel-store.c:441 camel/camel-vee-store.c:390
+#: camel/camel-store.c:439 camel/camel-vee-store.c:387
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "No se pudo renombrar la carpeta: %s: Operación no válida"
 
-#: camel/camel-store.c:813
+#: camel/camel-store.c:777
 msgid "Trash"
 msgstr "Papelera"
 
-#: camel/camel-store.c:815 filter/libfilter-i18n.h:35
-#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/mail-config.glade.h:95
+#: ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Spam"
 
@@ -9746,7 +9484,8 @@ msgstr "No se pudo descifrar la firma del certificado"
 
 #: camel/camel-tcp-stream-openssl.c:574
 msgid "Unable to decrypt Certificate Revocation List signature"
-msgstr "No se pudo descifrar la firma de la Lista de Revocación de Certificados"
+msgstr ""
+"No se pudo descifrar la firma de la Lista de Revocación de Certificados"
 
 #: camel/camel-tcp-stream-openssl.c:576
 msgid "Unable to decode issuer's public key"
@@ -9959,12 +9698,12 @@ msgstr "No existe el mensaje %s en %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "No se pudo copiar o mover mensajes a una Carpeta Virtual"
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:374
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "No se pudo borrar la carpeta: %s: No existe tal carpeta"
 
-#: camel/camel-vee-store.c:398
+#: camel/camel-vee-store.c:395
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "No se pudo cambiarle el nombre a la carpeta: %s: No existe"
@@ -10007,15 +9746,15 @@ msgstr "Libreta de direcciones y agenda"
 msgid "Post Office Agent SOAP Port:"
 msgstr "Puerto del agente de la oficina de correos SOAP:"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:80
+#: camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "Novell GroupWise"
 msgstr "Novell GroupWise"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:82
+#: camel/providers/groupwise/camel-groupwise-provider.c:85
 msgid "For accessing Novell Groupwise servers"
 msgstr "Para acceder a servidores Novell Groupwise"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: camel/providers/groupwise/camel-groupwise-provider.c:100
 #: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
@@ -10024,7 +9763,7 @@ msgstr "Para acceder a servidores Novell Groupwise"
 msgid "Password"
 msgstr "Contraseña"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:99
+#: camel/providers/groupwise/camel-groupwise-provider.c:102
 #: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
@@ -10032,8 +9771,8 @@ msgstr ""
 "Esta opción conectará con el servidor IMAP usando una contraseña de texto "
 "plano."
 
-#: camel/providers/groupwise/camel-gw-listener.c:305
-#: camel/providers/groupwise/camel-gw-listener.c:328
+#: camel/providers/groupwise/camel-gw-listener.c:312
+#: camel/providers/groupwise/camel-gw-listener.c:335
 msgid "Checklist"
 msgstr "Lista de comprobación"
 
@@ -10088,7 +9827,8 @@ msgstr "No se pudo compactar la carpeta «%s»: Comando erróneo"
 #: camel/providers/imap4/camel-imap4-folder.c:616
 #, c-format
 msgid "Cannot get message %s from folder `%s': No such message"
-msgstr "No se pudo obtener el mensaje; %s de la carpeta «%s»: No existe dicho mensaje"
+msgstr ""
+"No se pudo obtener el mensaje; %s de la carpeta «%s»: No existe dicho mensaje"
 
 #: camel/providers/imap4/camel-imap4-folder.c:621
 #, c-format
@@ -10163,29 +9903,30 @@ msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
 msgstr "Para leer y almacenar correo en los servidores IMAPv4rev. EXPERIMENTAL"
 
 #: camel/providers/imap4/camel-imap4-provider.c:72
-msgid "This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
 msgstr ""
 "Esta opción conectará con el servidor IMAPv4rev1 usando una contraseña de "
 "texto plano."
 
 #: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:429
+#: camel/providers/imap/camel-imap-store.c:428
 #, c-format
 msgid "IMAP server %s"
 msgstr "Servidor IMAP %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:431
+#: camel/providers/imap/camel-imap-store.c:430
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "Servicio IMAP para %s en %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:208
 #: camel/providers/imap4/camel-imap4-store.c:225
-#: camel/providers/imap/camel-imap-store.c:552
-#: camel/providers/imap/camel-imap-store.c:572
+#: camel/providers/imap/camel-imap-store.c:551
+#: camel/providers/imap/camel-imap-store.c:571
 #: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
+#: camel/providers/nntp/camel-nntp-store.c:209
 #: camel/providers/pop3/camel-pop3-store.c:175
 #: camel/providers/smtp/camel-smtp-transport.c:269
 #: camel/providers/smtp/camel-smtp-transport.c:285
@@ -10194,18 +9935,18 @@ msgid "Could not connect to %s (port %d): %s"
 msgstr "No se pudo conectar con %s (puerto %d): %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:210
-#: camel/providers/imap/camel-imap-store.c:554
+#: camel/providers/imap/camel-imap-store.c:553
 #: camel/providers/pop3/camel-pop3-store.c:177
 #: camel/providers/smtp/camel-smtp-transport.c:271
 msgid "SSL unavailable"
 msgstr "SSL no disponible"
 
 #: camel/providers/imap4/camel-imap4-store.c:222
-#: camel/providers/imap/camel-imap-store.c:569
-#: camel/providers/imap/camel-imap-store.c:846
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/imap/camel-imap-store.c:845
 #: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:137
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
 #: camel/providers/pop3/camel-pop3-store.c:192
 msgid "Connection cancelled"
 msgstr "Conexión cancelada"
@@ -10220,8 +9961,8 @@ msgstr ""
 "STARTTLS"
 
 #: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:680
-#: camel/providers/imap/camel-imap-store.c:711
+#: camel/providers/imap/camel-imap-store.c:679
+#: camel/providers/imap/camel-imap-store.c:710
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Falló al conectar al servidor IMAP %s en modo seguro: %s"
@@ -10230,13 +9971,14 @@ msgstr "Falló al conectar al servidor IMAP %s en modo seguro: %s"
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1108
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
 msgid "Unknown error"
 msgstr "Error desconocido"
 
 #: camel/providers/imap4/camel-imap4-store.c:373
 #, c-format
-msgid "Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
 msgstr ""
 "No se pudo autenticar con el servidor IMAP %s usando el mecanismo de "
 "autenticación %s"
@@ -10257,11 +9999,13 @@ msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr "No se pudo obtener la carpeta «%s» en el servidor IMAP %s: Desconocido"
 
 #: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1888
-#: camel/providers/imap/camel-imap-store.c:2266
+#: camel/providers/imap/camel-imap-store.c:1885
+#: camel/providers/imap/camel-imap-store.c:2263
 #, c-format
-msgid "The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "El nombre de la carpeta «%s» es inválido porque contiene elcarácter «%c»"
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr ""
+"El nombre de la carpeta «%s» es inválido porque contiene elcarácter «%c»"
 
 #: camel/providers/imap4/camel-imap4-store.c:826
 #, c-format
@@ -10336,12 +10080,12 @@ msgstr "El servidor IMAP %s se desconectó inesperadamente: %s"
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3199
+#: camel/providers/imap/camel-imap-store.c:3194
 msgid "Operation cancelled"
 msgstr "Operación cancelada"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3202
+#: camel/providers/imap/camel-imap-store.c:3197
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "El servidor se desconectó inesperadamente: %s"
@@ -10422,7 +10166,7 @@ msgstr "No existe ese mensaje"
 
 #: camel/providers/imap/camel-imap-folder.c:2019
 #: camel/providers/imap/camel-imap-folder.c:2622
-#: camel/providers/nntp/camel-nntp-folder.c:238
+#: camel/providers/nntp/camel-nntp-folder.c:220
 msgid "This message is not currently available"
 msgstr "Este mensaje no está disponible actualmente"
 
@@ -10434,17 +10178,24 @@ msgstr "Obteniendo información de los nuevos mensajes"
 #: camel/providers/imap/camel-imap-folder.c:2463
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
-msgstr "Respuesta del servidor incompleta: no hay información proporcionada para el mensaje %d"
+msgstr ""
+"Respuesta del servidor incompleta: no hay información proporcionada para el "
+"mensaje %d"
 
 #: camel/providers/imap/camel-imap-folder.c:2471
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
-msgstr "Respuesta incompleta del servidor: No se proporcionó un UID para el mensaje %d"
+msgstr ""
+"Respuesta incompleta del servidor: No se proporcionó un UID para el mensaje %"
+"d"
 
 #: camel/providers/imap/camel-imap-folder.c:2484
 #, c-format
-msgid "Unexpected server response: Identical UIDs provided for messages %d and %d"
-msgstr "Respuesta inesperada del servidor: Se proporcioneron UIDs idénticos para los mensajes %d y %d"
+msgid ""
+"Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgstr ""
+"Respuesta inesperada del servidor: Se proporcioneron UIDs idénticos para los "
+"mensajes %d y %d"
 
 #: camel/providers/imap/camel-imap-folder.c:2660
 msgid "Could not find message body in FETCH response."
@@ -10506,43 +10257,43 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Para leer y almacenar correo en los servidores IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:680
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "Extensión SSL/TLS no implementada."
 
-#: camel/providers/imap/camel-imap-store.c:712
+#: camel/providers/imap/camel-imap-store.c:711
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "Falló la negociación SSL"
 
-#: camel/providers/imap/camel-imap-store.c:849
+#: camel/providers/imap/camel-imap-store.c:848
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "No se pudo conectar con el comando «%s»: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1273
+#: camel/providers/imap/camel-imap-store.c:1272
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "El servidor IMAP %s no soporta el método de autenticación requerido %s"
 
-#: camel/providers/imap/camel-imap-store.c:1283
+#: camel/providers/imap/camel-imap-store.c:1282
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "No hay soporte para el tipo de autenticación %s"
 
-#: camel/providers/imap/camel-imap-store.c:1306
+#: camel/providers/imap/camel-imap-store.c:1305
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%s escriba la contraseña IMAP para %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1320
+#: camel/providers/imap/camel-imap-store.c:1319
 msgid "You didn't enter a password."
 msgstr "No introdujo una contraseña."
 
-#: camel/providers/imap/camel-imap-store.c:1349
+#: camel/providers/imap/camel-imap-store.c:1348
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10553,18 +10304,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1870
-#: camel/providers/imap/camel-imap-store.c:2060
+#: camel/providers/imap/camel-imap-store.c:1867
+#: camel/providers/imap/camel-imap-store.c:2057
 #, c-format
 msgid "No such folder %s"
 msgstr "No existe la carpeta %s"
 
-#: camel/providers/imap/camel-imap-store.c:1946
-#: camel/providers/imap/camel-imap-store.c:2327
+#: camel/providers/imap/camel-imap-store.c:1943
+#: camel/providers/imap/camel-imap-store.c:2324
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "No está permitido que la carpeta raíz contenga subcarpetas"
 
-#: camel/providers/imap/camel-imap-store.c:2001
+#: camel/providers/imap/camel-imap-store.c:1998
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10572,7 +10323,7 @@ msgstr "No está permitido que la carpeta raíz contenga subcarpetas"
 msgid "Cannot create folder `%s': folder exists."
 msgstr "No se pudo crear la carpeta: %s: la carpeta existe."
 
-#: camel/providers/imap/camel-imap-store.c:2277
+#: camel/providers/imap/camel-imap-store.c:2274
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Carpeta padre desconocida: %s"
@@ -10609,20 +10360,20 @@ msgid "Index message body data"
 msgstr "Indexar datos del cuerpo del mensaje"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:388
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:393
-#: camel/providers/local/camel-local-folder.c:396
+#: camel/providers/local/camel-local-folder.c:392
+#: camel/providers/local/camel-local-folder.c:395
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "buzón: %s: (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:400
+#: camel/providers/local/camel-local-folder.c:399
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -10683,7 +10434,7 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:142
 #: camel/providers/local/camel-local-store.c:253
-#: camel/providers/local/camel-mbox-store.c:356
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10816,9 +10567,9 @@ msgstr "No se pudo borrar la carpeta «%s»: %s"
 msgid "not a maildir directory"
 msgstr "no es un directorio tipo maildir"
 
-#: camel/providers/local/camel-maildir-store.c:341
-#: camel/providers/local/camel-spool-store.c:286
-#: camel/providers/local/camel-spool-store.c:316
+#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-spool-store.c:284
+#: camel/providers/local/camel-spool-store.c:314
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "No se pudo analizar la carpeta «%s»: %s"
@@ -10875,7 +10626,7 @@ msgid "Message construction failed."
 msgstr "Falló la construcción del mensaje."
 
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:362
+#: camel/providers/local/camel-mbox-store.c:361
 msgid "Cannot create a folder by this name."
 msgstr "No se pudo crear una carpeta con ese nombre."
 
@@ -10905,30 +10656,30 @@ msgstr "«%s» no es un archivo normal."
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "La carpeta «%s» no esta vacía. No fue borrada."
 
-#: camel/providers/local/camel-mbox-store.c:375
+#: camel/providers/local/camel-mbox-store.c:374
 #, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "No se pudo crear el directorio «%s»: %s."
 
-#: camel/providers/local/camel-mbox-store.c:389
+#: camel/providers/local/camel-mbox-store.c:388
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "No se pudo crear la carpeta: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:391
+#: camel/providers/local/camel-mbox-store.c:390
 msgid "Folder already exists"
 msgstr "La carpeta ya existe"
 
-#: camel/providers/local/camel-mbox-store.c:473
+#: camel/providers/local/camel-mbox-store.c:472
 msgid "The new folder name is illegal."
 msgstr "El nombre de carpeta nuevo es ilegal."
 
-#: camel/providers/local/camel-mbox-store.c:486
+#: camel/providers/local/camel-mbox-store.c:485
 #, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "No se pudo renombrar: «%s»: «%s» : %s"
 
-#: camel/providers/local/camel-mbox-store.c:561
+#: camel/providers/local/camel-mbox-store.c:560
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "No se pudo renombrar «%s» a %s: %s"
@@ -11120,7 +10871,7 @@ msgstr ""
 "La carpeta puede estar corrupta, copia guardada en «%s»"
 
 #: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:997
+#: camel/providers/nntp/camel-nntp-store.c:1126
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Escriba la contraseña NNTP para %s@%s"
@@ -11137,18 +10888,10 @@ msgstr "Falló al enviar el nombre de usuario al servidor"
 msgid "Server rejected username/password"
 msgstr "El servidor rechazó el nombre de usuario/contraseña"
 
-#: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:263
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr "El usuario canceló"
-
-#: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:259
-#: camel/providers/nntp/camel-nntp-folder.c:265
+#: camel/providers/nntp/camel-nntp-folder.c:147
+#: camel/providers/nntp/camel-nntp-folder.c:149
+#: camel/providers/nntp/camel-nntp-folder.c:158
+#: camel/providers/nntp/camel-nntp-folder.c:234
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11157,69 +10900,58 @@ msgstr "El usuario canceló"
 msgid "Cannot get message %s: %s"
 msgstr "No se pudo obtener mensaje %s: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:188
-#: camel/providers/nntp/camel-nntp-folder.c:228
+#: camel/providers/nntp/camel-nntp-folder.c:156
+#: camel/providers/nntp/camel-nntp-folder.c:232
+#: camel/providers/nntp/camel-nntp-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+msgid "User cancelled"
+msgstr "El usuario canceló"
+
+#: camel/providers/nntp/camel-nntp-folder.c:176
+#: camel/providers/nntp/camel-nntp-folder.c:208
 #, c-format
 msgid "Internal error: uid in invalid format: %s"
 msgstr "Error interno: uid en formato inválido: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:201
-#, c-format
-msgid "Could not get article %s from NNTP server"
-msgstr "No se pudo obtener el artículo %s del servidor NNTP"
-
-#: camel/providers/nntp/camel-nntp-folder.c:362
-msgid "Posting not allowed by news server"
-msgstr "Publicación no permitida por el servidor de noticias"
-
+#: camel/providers/nntp/camel-nntp-folder.c:328
+#: camel/providers/nntp/camel-nntp-folder.c:331
 #: camel/providers/nntp/camel-nntp-folder.c:373
-#, c-format
-msgid "Failed to send newsgroups header: %s: message not posted"
-msgstr ""
-"Fallo al enviar la cabecera de los grupos de noticias: %s mensaje no "
-"publicado"
-
-#: camel/providers/nntp/camel-nntp-folder.c:413
-#: camel/providers/nntp/camel-nntp-folder.c:426
-#, c-format
-msgid "Error posting to newsgroup: %s: message not posted"
-msgstr "Error al publicar en el grupo de noticias %s: mensaje no publicado"
-
-#: camel/providers/nntp/camel-nntp-folder.c:438
-msgid "Error reading response to posted message: message not posted"
-msgstr "Error leyendo la respuesta al mensaje publicado: mensaje no publicado"
-
-#: camel/providers/nntp/camel-nntp-folder.c:441
-#, c-format
-msgid "Error posting message: %s: message not posted"
-msgstr "Error al publicar el mensaje: %s: mensaje no publicado"
+#: camel/providers/nntp/camel-nntp-folder.c:375
+#, fuzzy, c-format
+msgid "Posting failed: %s"
+msgstr "Operación falló: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:457
+#: camel/providers/nntp/camel-nntp-folder.c:393
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "No puede publicar mensajes NNTP mientras trabaja desconectado."
 
-#: camel/providers/nntp/camel-nntp-folder.c:468
+#: camel/providers/nntp/camel-nntp-folder.c:404
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "No puede copiar mensajes desde una carpeta NNTP."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:44
 msgid "Could not get group list from server."
 msgstr "No se pudo obtener la lista de grupo del servidor."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#: camel/providers/nntp/camel-nntp-grouplist.c:97
+#: camel/providers/nntp/camel-nntp-grouplist.c:106
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "No se pudo cargar el archivo de lista de grupo: %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#: camel/providers/nntp/camel-nntp-grouplist.c:157
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "No se pudo guardar el archivo de lista de grupo para %s: %s"
 
 #: camel/providers/nntp/camel-nntp-provider.c:43
-msgid "Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
-msgstr "Mostrar carpetas en notación corta (ej: c.o.linux en vez de comp.os.linux)"
+msgid ""
+"Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
+msgstr ""
+"Mostrar carpetas en notación corta (ej: c.o.linux en vez de comp.os.linux)"
 
 #: camel/providers/nntp/camel-nntp-provider.c:45
 msgid "In the subscription dialog, show relative folder names"
@@ -11241,26 +10973,29 @@ msgstr ""
 "Esta opción es para autenticarse con el servidor NNTP usando una contraseña "
 "de texto."
 
-#: camel/providers/nntp/camel-nntp-store.c:158
+#: camel/providers/nntp/camel-nntp-store.c:118
+#: camel/providers/nntp/camel-nntp-store.c:1233
+#: camel/providers/nntp/camel-nntp-store.c:1331
+#, c-format
+msgid "NNTP Command failed: %s"
+msgstr "El comando NNTP ha fallado: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:227
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "No se pudo leer saludo desde %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:170
+#: camel/providers/nntp/camel-nntp-store.c:239
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "El servidor NNTP %s devolvió un código de error %d %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:326
+#: camel/providers/nntp/camel-nntp-store.c:403
 #, c-format
 msgid "USENET News via %s"
 msgstr "Noticias USENET vía %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:640
-msgid "Stream error"
-msgstr "error de flujo"
-
-#: camel/providers/nntp/camel-nntp-store.c:643
+#: camel/providers/nntp/camel-nntp-store.c:777
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -11271,7 +11006,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/providers/nntp/camel-nntp-store.c:735
+#: camel/providers/nntp/camel-nntp-store.c:872
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
@@ -11282,7 +11017,7 @@ msgstr ""
 "No existe dicho grupo. El elemento seleccionado probablemente es una carpeta "
 "madre."
 
-#: camel/providers/nntp/camel-nntp-store.c:767
+#: camel/providers/nntp/camel-nntp-store.c:904
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
@@ -11292,60 +11027,62 @@ msgstr ""
 "\n"
 "el grupo de noticias no existe."
 
-#: camel/providers/nntp/camel-nntp-store.c:792
+#: camel/providers/nntp/camel-nntp-store.c:929
 msgid "You cannot create a folder in a News store: subscribe instead."
-msgstr "No puede crear una carpeta en un almacén de noticias: suscríbase en su lugar."
+msgstr ""
+"No puede crear una carpeta en un almacén de noticias: suscríbase en su lugar."
 
-#: camel/providers/nntp/camel-nntp-store.c:800
+#: camel/providers/nntp/camel-nntp-store.c:937
 msgid "You cannot rename a folder in a News store."
 msgstr "No se puede renombrar una carpeta en un almacén de noticias."
 
-#: camel/providers/nntp/camel-nntp-store.c:808
+#: camel/providers/nntp/camel-nntp-store.c:945
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 "No puede eliminar una carpeta en un almacén de noticias:desuscríbase en su "
 "lugar."
 
-#: camel/providers/nntp/camel-nntp-summary.c:253
-#, c-format
-msgid "Connection error: %s"
-msgstr "Error de conexión: %s"
-
-#: camel/providers/nntp/camel-nntp-summary.c:262
-#, c-format
-msgid "No such folder: %s"
-msgstr "No existe la carpeta %s"
+#: camel/providers/nntp/camel-nntp-store.c:1118
+#, fuzzy
+msgid "Authentication requested but not username provided"
+msgstr "Autenticación requerida"
 
-#: camel/providers/nntp/camel-nntp-summary.c:268
-#, c-format
-msgid "Could not get group: %s"
-msgstr "No se pudo obtener grupo: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1146
+#, fuzzy, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr "No se pudo autenticar frente al servidor IMAP %s usando %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:333
-msgid "Could not get messages: unspecified error"
-msgstr "No se pudieron obtener mensajes: error no especificado"
+#: camel/providers/nntp/camel-nntp-store.c:1262
+#, fuzzy
+msgid "Not connected."
+msgstr "Sin contactos"
 
-#: camel/providers/nntp/camel-nntp-summary.c:378
+#: camel/providers/nntp/camel-nntp-store.c:1311
 #, c-format
-msgid "NNTP Command failed: %s"
-msgstr "El comando NNTP ha fallado: %s"
+msgid "No such folder: %s"
+msgstr "No existe la carpeta %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:438
-#: camel/providers/nntp/camel-nntp-summary.c:543
+#: camel/providers/nntp/camel-nntp-summary.c:218
+#: camel/providers/nntp/camel-nntp-summary.c:314
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Buscando mensajes nuevos"
 
-#: camel/providers/nntp/camel-nntp-summary.c:558
-#, c-format
-msgid "Unknown server response: %s"
-msgstr "Respuesta del servidor desconocida: %s"
+#: camel/providers/nntp/camel-nntp-summary.c:225
+#, fuzzy, c-format
+msgid "Unexpected server response from xover: %s"
+msgstr "Respuesta inesperada del servidor IMAP: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:605
+#: camel/providers/nntp/camel-nntp-summary.c:328
+#, fuzzy, c-format
+msgid "Unexpected server response from head: %s"
+msgstr "Respuesta inesperada del GNUPG: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:368
 msgid "Use cancel"
 msgstr "Usar cancelar"
 
-#: camel/providers/nntp/camel-nntp-summary.c:607
+#: camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Operación falló: %s"
@@ -11454,7 +11191,8 @@ msgstr "SASL «%s» Falló el inicio de sesión para servidor POP %s: %s"
 #: camel/providers/pop3/camel-pop3-store.c:435
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
-msgstr "No se pudo iniciar sesión en el servidor POP %s: Error del protocolo SASL"
+msgstr ""
+"No se pudo iniciar sesión en el servidor POP %s: Error del protocolo SASL"
 
 #: camel/providers/pop3/camel-pop3-store.c:454
 #, c-format
@@ -11490,7 +11228,8 @@ msgstr "Sendmail"
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
-msgstr "Para enviar correo pasándoselo al programa «sendmail» en el sistema local."
+msgstr ""
+"Para enviar correo pasándoselo al programa «sendmail» en el sistema local."
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:113
 msgid "Could not parse recipient list"
@@ -11588,7 +11327,8 @@ msgstr "El usuario no es local; se reenviará a <forward-path>"
 
 #: camel/providers/smtp/camel-smtp-transport.c:196
 msgid "Requested mail action not taken: mailbox unavailable"
-msgstr "Acción solicitada del correo no realizada: el mailbox no está disponible"
+msgstr ""
+"Acción solicitada del correo no realizada: el mailbox no está disponible"
 
 #: camel/providers/smtp/camel-smtp-transport.c:198
 msgid "Requested action not taken: mailbox unavailable"
@@ -11604,7 +11344,8 @@ msgstr "El usuario no es local; pruebe con <forward-path>"
 
 #: camel/providers/smtp/camel-smtp-transport.c:204
 msgid "Requested action not taken: insufficient system storage"
-msgstr "Acción solicitada no realizada: la capacidad del sistema es insuficiente"
+msgstr ""
+"Acción solicitada no realizada: la capacidad del sistema es insuficiente"
 
 #: camel/providers/smtp/camel-smtp-transport.c:206
 msgid "Requested mail action aborted: exceeded storage allocation"
@@ -11668,7 +11409,8 @@ msgstr "El comando STARTTLS ha fallado"
 #: camel/providers/smtp/camel-smtp-transport.c:476
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
-msgstr "El servidor SMTP %s no implementa el método de autenticación requerido %s."
+msgstr ""
+"El servidor SMTP %s no implementa el método de autenticación requerido %s."
 
 #: camel/providers/smtp/camel-smtp-transport.c:514
 #, c-format
@@ -11818,19 +11560,19 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
+#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:408
 msgid "attachment"
 msgstr "adjunto"
 
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:454
 msgid "Remove selected items from the attachment list"
 msgstr "Quitar los elementos seleccionados de la lista de adjuntos"
 
-#: composer/e-msg-composer-attachment-bar.c:491
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Add attachment..."
 msgstr "Incluir adjunto..."
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:495
 msgid "Attach a file to the message"
 msgstr "Adjuntar un archivo al mensaje"
 
@@ -11863,7 +11605,8 @@ msgid "Suggest automatic display of attachment"
 msgstr "Sugerir mostrar adjuntos automáticamente"
 
 #: composer/e-msg-composer.c:704
-msgid "Cannot sign outgoing message: No signing certificate set for this account"
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "No se puede firmar el mensaje saliente: No hay establecido un certificado de "
 "firma para esta cuenta"
@@ -11892,7 +11635,7 @@ msgstr "Mensaje sin título"
 msgid "Open file"
 msgstr "Abrir archivo"
 
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
 msgid "Autogenerated"
 msgstr "Auto-generado"
 
@@ -11952,7 +11695,8 @@ msgstr ""
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
-msgstr "<b>(El editor contiene un mensaje sin texto, que no puede editarse)</b>"
+msgstr ""
+"<b>(El editor contiene un mensaje sin texto, que no puede editarse)</b>"
 
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
@@ -12036,18 +11780,21 @@ msgstr "Adjuntar archivo(s)"
 
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
-msgid "You cannot attach the file `${0}' to this message."
+#, fuzzy
+msgid "You cannot attach the file `{0}' to this message."
 msgstr "No puede adjuntar el archivo «{0}» a este mensaje."
 
 #. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4
-msgid "${1}"
-msgstr "${1}"
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr "{1}"
 
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
-msgstr "El archivo «${0}» no es un archivo regular y no puede enviarse en un mensaje."
+#, fuzzy
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
+msgstr ""
+"El archivo «${0}» no es un archivo regular y no puede enviarse en un mensaje."
 
 #. mail-composer:attach-directory primary
 #: composer/mail-composer-errors.xml.h:8
@@ -12110,7 +11857,8 @@ msgstr "Aviso: Mensaje modificado"
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
-msgstr "¿Seguro que quiere descartar el mensaje titulado '{0}' que está redactando?"
+msgstr ""
+"¿Seguro que quiere descartar el mensaje titulado '{0}' que está redactando?"
 
 #. mail-composer:exit-unsaved secondary
 #: composer/mail-composer-errors.xml.h:28
@@ -12138,8 +11886,10 @@ msgstr "No se pudo crear un mensaje."
 
 #. mail-composer:no-build-message secondary
 #: composer/mail-composer-errors.xml.h:34
-msgid "Because \"${0}\", you may need to select different mail options."
-msgstr "Debido a «${0}», quizá necesite seleccionar diferentes opciones de correo."
+#, fuzzy
+msgid "Because \"{0}\", you may need to select different mail options."
+msgstr ""
+"Debido a «${0}», quizá necesite seleccionar diferentes opciones de correo."
 
 #. mail-composer:no-sig-file primary
 #: composer/mail-composer-errors.xml.h:36
@@ -12147,9 +11897,11 @@ msgid "Could not read signature file \"{0}\"."
 msgstr "No se pudo leer el archivo de firma «{0}."
 
 #. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38
-msgid "Because \"${1}\"."
-msgstr "Debido a «${1}»"
+#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr "Porque «{1}»"
 
 #. mail-composer:all-accounts-deleted primary
 #: composer/mail-composer-errors.xml.h:40
@@ -12313,16 +12065,12 @@ msgstr "Sincr. de categorías:"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
 #: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
 #: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M"
@@ -12374,31 +12122,23 @@ msgid "%m/%d/%Y %H"
 msgstr "%d/%m/%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#. strftime format of a time in 12-hour format.
 #: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#. strftime format of a time in 24-hour format.
 #: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
 #: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
 #: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
 msgid "%H:%M"
@@ -12495,7 +12235,6 @@ msgid "Missing file name."
 msgstr "Falta el nombre de archivo."
 
 #. filter:no-file secondary
-#. filter:bad-file secondary
 #: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
 msgid "You must specify a file name."
 msgstr "Debe especificar un nombre de archivo."
@@ -12526,7 +12265,6 @@ msgid "Could not compile regular expression \"{1}\"."
 msgstr "No se puede compilar la expresión regular «{1}»."
 
 #. filter:no-name primary
-#. filter:no-name-vfolder primary
 #: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
 msgid "Missing name."
 msgstr "Falta el nombre."
@@ -12578,7 +12316,7 @@ msgid "<b>Then</b>"
 msgstr "<b>Entonces</b>"
 
 #: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1335
+#: mail/mail-account-gui.c:1347
 msgid "Select Folder"
 msgstr "Seleccionar carpeta"
 
@@ -12670,8 +12408,8 @@ msgstr "con todas las carpetas locales"
 msgid "years"
 msgstr "años"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:1011
-#: mail/mail-config.c:76 mail/mail-config.glade.h:93
+#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
+#: mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Importante"
 
@@ -12735,252 +12473,6 @@ msgstr "entrante"
 msgid "outgoing"
 msgstr "saliente"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Adjust Score"
-msgstr "Ajustar puntuación"
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Color"
-msgstr "Asignar color"
-
-#: filter/libfilter-i18n.h:4
-msgid "Assign Score"
-msgstr "Asignar puntuación"
-
-#: filter/libfilter-i18n.h:5
-msgid "Attachments"
-msgstr "Adjuntos"
-
-#: filter/libfilter-i18n.h:6
-msgid "Beep"
-msgstr "Pitar"
-
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "contiene"
-
-#: filter/libfilter-i18n.h:8
-msgid "Copy to Folder"
-msgstr "Copiar a la carpeta"
-
-#: filter/libfilter-i18n.h:9
-msgid "Date received"
-msgstr "Fecha de recepción"
-
-#: filter/libfilter-i18n.h:10
-msgid "Date sent"
-msgstr "Fecha de envío"
-
-#: filter/libfilter-i18n.h:12
-msgid "Deleted"
-msgstr "Borrado"
-
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "no contiene"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "no acaba en"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "no existe"
-
-#: filter/libfilter-i18n.h:16
-msgid "does not return"
-msgstr "no devuelve"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "no suena como"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "no comienza por"
-
-#: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
-msgstr "No existen"
-
-#: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr "Borrador"
-
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "acaba en"
-
-#: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr "Existen"
-
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "existe"
-
-#: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr "Expresión"
-
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr "Seguimiento"
-
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "es"
-
-#: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr "está después de"
-
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr "está antes de"
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr "está marcado"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "es mayor que"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "es menor que"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "no es"
-
-#: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr "no está marcado"
-
-#: filter/libfilter-i18n.h:36
-msgid "Junk Test"
-msgstr "Test de correo Spam"
-
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
-#: widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Etiquetar"
-
-#: filter/libfilter-i18n.h:38
-msgid "Mailing list"
-msgstr "Lista de correo"
-
-#: filter/libfilter-i18n.h:39
-msgid "Message Body"
-msgstr "Cuerpo del mensaje"
-
-#: filter/libfilter-i18n.h:40
-msgid "Message Header"
-msgstr "Cabecera del mensaje"
-
-#: filter/libfilter-i18n.h:41
-msgid "Message is Junk"
-msgstr "El mensaje es Spam"
-
-#: filter/libfilter-i18n.h:42
-msgid "Message is not Junk"
-msgstr "El mensaje no es Spam"
-
-#: filter/libfilter-i18n.h:43
-msgid "Move to Folder"
-msgstr "Mover a la carpeta"
-
-#: filter/libfilter-i18n.h:44
-msgid "Pipe to Program"
-msgstr "Encauzar al programa"
-
-#: filter/libfilter-i18n.h:45
-msgid "Play Sound"
-msgstr "Reproducir un sonido"
-
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Leído"
-
-#: filter/libfilter-i18n.h:47
-msgid "Recipients"
-msgstr "Destinatarios"
-
-#: filter/libfilter-i18n.h:48
-msgid "Regex Match"
-msgstr "Expresión regular"
-
-#: filter/libfilter-i18n.h:49
-msgid "Replied to"
-msgstr "Respondió a"
-
-#: filter/libfilter-i18n.h:50
-msgid "returns"
-msgstr "devuelve"
-
-#: filter/libfilter-i18n.h:51
-msgid "returns greater than"
-msgstr "devuelve mayor que"
-
-#: filter/libfilter-i18n.h:52
-msgid "returns less than"
-msgstr "devuelve menor que"
-
-#: filter/libfilter-i18n.h:53
-msgid "Run Program"
-msgstr "Ejecutar programa"
-
-#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Puntuación"
-
-#: filter/libfilter-i18n.h:55
-msgid "Sender"
-msgstr "Remitente"
-
-#: filter/libfilter-i18n.h:56
-msgid "Set Status"
-msgstr "Poner estado"
-
-#: filter/libfilter-i18n.h:57
-msgid "Size (kB)"
-msgstr "Tamaño (Kib)"
-
-#: filter/libfilter-i18n.h:58
-msgid "sounds like"
-msgstr "suena como"
-
-#: filter/libfilter-i18n.h:59
-msgid "Source Account"
-msgstr "Cuenta origen"
-
-#: filter/libfilter-i18n.h:60
-msgid "Specific header"
-msgstr "Cabecera específica"
-
-#: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "comienza por"
-
-#: filter/libfilter-i18n.h:63
-msgid "Stop Processing"
-msgstr "Parar el proceso"
-
-#: filter/libfilter-i18n.h:64 mail/em-format.c:755 mail/em-format-html.c:1519
-#: mail/em-format-quote.c:302 mail/em-mailer-prefs.c:87
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
-#: smime/lib/e-cert.c:1079
-msgid "Subject"
-msgstr "Asunto"
-
-#: filter/libfilter-i18n.h:65
-msgid "Unset Status"
-msgstr "Quitar estado"
-
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Añadir regla"
@@ -12997,6 +12489,11 @@ msgstr "Nombre de la regla"
 msgid "_Score Rules"
 msgstr "Reglas de _puntuación"
 
+#: filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Puntuación"
+
 #: filter/searchtypes.xml.h:1
 msgid "Body contains"
 msgstr "El cuerpo contiene"
@@ -13075,13 +12572,13 @@ msgstr "Firma(s)"
 msgid "-------- Forwarded Message --------"
 msgstr "--------- Mensaje reenviado --------"
 
-#: mail/em-composer-utils.c:1499
+#: mail/em-composer-utils.c:1495
 msgid "an unknown sender"
 msgstr "un remitente desconocido"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1509
+#: mail/em-composer-utils.c:1505
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "El %a, %d-%m-%Y a las %H:%M, %%+05d, %%s escribió:"
 
@@ -13119,8 +12616,8 @@ msgstr "<pulse aquí para seleccionar una carpeta>"
 msgid "Create New Folder"
 msgstr "Crear carpeta nueva"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
-#: mail/mail-component.c:706
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
+#: mail/mail-component.c:704
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Especifique donde crear la carpeta:"
@@ -13134,96 +12631,97 @@ msgstr "Crear"
 msgid "Folder _name:"
 msgstr "_Nombre de la carpeta:"
 
-#: mail/em-folder-tree.c:839
+#: mail/em-folder-tree.c:833
 #, c-format
 msgid "Moving folder %s"
 msgstr "Moviendo carpeta %s"
 
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree.c:835
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copiando carpeta %s"
 
-#: mail/em-folder-tree.c:848 mail/message-list.c:1561
+#: mail/em-folder-tree.c:842 mail/message-list.c:1561
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Moviendo mensajes a la carpeta %s"
 
-#: mail/em-folder-tree.c:850 mail/message-list.c:1563
+#: mail/em-folder-tree.c:844 mail/message-list.c:1563
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copiando mensajes a la carpeta %s"
 
-#: mail/em-folder-tree.c:866
+#: mail/em-folder-tree.c:860
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "No se pudo dejar el(los) mensaje(s) en el almacén de nivel superior"
 
-#: mail/em-folder-tree.c:956 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Copiar a la carpeta"
 
-#: mail/em-folder-tree.c:957 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Mover a la carpeta"
 
-#: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2069
-#: mail/em-folder-tree.c:2556 mail/em-folder-view.c:798
+#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
+#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
 #: mail/message-list.c:1651
 msgid "_Move"
 msgstr "_Mover"
 
-#: mail/em-folder-tree.c:961 mail/message-list.c:1653
+#: mail/em-folder-tree.c:955 mail/message-list.c:1653
 msgid "Cancel _Drag"
 msgstr "Cancelar _arrastre"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
 #: mail/em-folder-view.c:798 mail/em-folder-view.c:812
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Seleccionar carpeta"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
 msgid "C_opy"
 msgstr "C_opiar"
 
-#: mail/em-folder-tree.c:2096
+#: mail/em-folder-tree.c:2088
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Creando carpeta «%s»"
 
-#: mail/em-folder-tree.c:2282 mail/mail-component.c:706
+#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
 msgid "Create folder"
 msgstr "Crear carpeta"
 
-#: mail/em-folder-tree.c:2477
+#: mail/em-folder-tree.c:2463
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Renombrar la carpeta «%s» a:"
 
-#: mail/em-folder-tree.c:2479
+#: mail/em-folder-tree.c:2465
 msgid "Rename Folder"
 msgstr "Renombrar carpeta"
 
-#: mail/em-folder-tree.c:2550 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Ver"
 
-#: mail/em-folder-tree.c:2551
+#: mail/em-folder-tree.c:2537
 msgid "Open in _New Window"
 msgstr "Abrir en una ventana _nueva"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2560
+#: mail/em-folder-tree.c:2546
 msgid "_New Folder..."
 msgstr "Carpeta _nueva..."
 
-#: mail/em-folder-tree.c:2563
+#: mail/em-folder-tree.c:2549
 msgid "_Rename"
 msgstr "_Renombrar"
 
-#: mail/em-folder-tree.c:2566 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Propiedades..."
 
@@ -13242,19 +12740,19 @@ msgstr "NO COINCIDENTE"
 msgid "Inbox"
 msgstr "Bandeja de entrada"
 
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
 msgid "Loading..."
 msgstr "Cargando..."
 
 #: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
 #: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:510
-#: mail/mail-component.c:556
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
+#: mail/mail-component.c:554
 msgid "Mail"
 msgstr "Correo"
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Editar como un mensaje nuevo..."
@@ -13267,17 +12765,17 @@ msgstr "Im_primir"
 msgid "_Reply to Sender"
 msgstr "Responder al _remitente"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:810
+#: mail/em-folder-view.c:901 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Responder a la _lista"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:811
+#: mail/em-folder-view.c:902 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Responder a _todos"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: mail/em-folder-view.c:903 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "Reen_viar"
@@ -13330,6 +12828,10 @@ msgstr "Mo_ver a la carpeta..."
 msgid "_Copy to Folder..."
 msgstr "_Copiar a la carpeta..."
 
+#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Etiquetar"
+
 #: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Añadir remitente a la li_breta de direcciones"
@@ -13379,12 +12881,12 @@ msgid "Filter on _Mailing List"
 msgstr "Filtro según la lista de _correo"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
+#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
 #: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Predeterminado"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1796
 msgid "Print Message"
 msgstr "Imprimir mensaje"
 
@@ -13423,12 +12925,18 @@ msgstr "Cc"
 msgid "Bcc"
 msgstr "Cco"
 
+#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
+#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Asunto"
+
 #: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
 #: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Fecha"
 
-#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
+#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
 msgid "Newsgroups"
 msgstr "Grupos de noticias"
 
@@ -13625,7 +13133,7 @@ msgstr ""
 "difícil que un espía vea el contenido de este mensaje en empleando un tiempo "
 "razonable."
 
-#: mail/em-format-html-display.c:757
+#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
 msgid "_View Certificate"
 msgstr "_Ver certificado"
 
@@ -13734,38 +13242,40 @@ msgstr "No se pudo crear las carpetas de correo local en: «%s»: %s"
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
-msgstr "No se pudo leer la configuración de la instalación anterior de Evolution, «evolution/config.xmldb» no existe o está corrompido."
+msgstr ""
+"No se pudo leer la configuración de la instalación anterior de Evolution, "
+"«evolution/config.xmldb» no existe o está corrompido."
 
-#: mail/em-popup.c:699
+#: mail/em-popup.c:700
 msgid "Save As..."
 msgstr "Guardar como..."
 
-#: mail/em-popup.c:717
+#: mail/em-popup.c:718
 #, c-format
 msgid "untitled_image.%s"
 msgstr "imagen_sin_título.%s"
 
-#: mail/em-popup.c:807
+#: mail/em-popup.c:808
 msgid "Set as _Background"
 msgstr "Establecer como _fondo"
 
-#: mail/em-popup.c:809
+#: mail/em-popup.c:810
 msgid "_Reply to sender"
 msgstr "_Responder al remitente"
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:859
 msgid "_Open Link in Browser"
 msgstr "_Abrir enlace en el navegador"
 
-#: mail/em-popup.c:859
+#: mail/em-popup.c:860
 msgid "Se_nd message to..."
 msgstr "E_nviar un mensaje a..."
 
-#: mail/em-popup.c:860
+#: mail/em-popup.c:861
 msgid "_Add to Addressbook"
 msgstr "_Añadir a la libreta de direcciones"
 
-#: mail/em-popup.c:966
+#: mail/em-popup.c:967
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir en %s..."
@@ -14063,7 +13573,8 @@ msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Preguntar al usuario cuando intenta compactar una carpeta."
 
 #: mail/evolution-mail.schemas.in.in.h:56
-msgid "Prompt the user when he or she tries to send a message without a Subject."
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Preguntar al usuario cuando intenta enviar un mensaje sin un asunto."
 
 #: mail/evolution-mail.schemas.in.in.h:57
@@ -14140,7 +13651,8 @@ msgstr "Reproducir un archivo de sonido cuando llegue correo nuevo."
 
 #: mail/evolution-mail.schemas.in.in.h:74
 msgid "Specifies the type of New Mail Notification the user wishes to use."
-msgstr "Especifica el tipo de notificación de correo nuevo que el usuario desea usar."
+msgstr ""
+"Especifica el tipo de notificación de correo nuevo que el usuario desea usar."
 
 #: mail/evolution-mail.schemas.in.in.h:75
 msgid "Spell check inline"
@@ -14299,7 +13811,8 @@ msgid "Composer Preferences"
 msgstr "Preferencias del editor"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure mail preferences, including security and message display, here"
+msgid ""
+"Configure mail preferences, including security and message display, here"
 msgstr ""
 "Configure las preferencias de correo incluyendo seguridad y visualización de "
 "mensajes, aquí"
@@ -14353,15 +13866,15 @@ msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution está importando su correo antiguo de Elm"
 
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:226
+#: mail/importers/evolution-mbox-importer.c:221
+#: mail/importers/evolution-outlook-importer.c:255
 #: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Importando..."
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:222
-#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/evolution-mbox-importer.c:223
+#: mail/importers/evolution-outlook-importer.c:257
 #: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Por favor espere"
@@ -14383,21 +13896,23 @@ msgid "Elm"
 msgstr "Elm"
 
 #: mail/importers/evolution-mbox-importer.c:116
+#: mail/importers/evolution-outlook-importer.c:130
 msgid "Destination folder:"
 msgstr "Carpeta de destino:"
 
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder to import into"
 msgstr "Seleccione la carpeta en la que importar"
 
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:254
 #: mail/importers/mail-importer.c:226
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importando «%s»"
 
-#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/evolution-outlook-importer.c:301
 #: mail/importers/mail-importer.c:140
 msgid "Importing mailbox"
 msgstr "Importando buzón de correo"
@@ -14563,15 +14078,15 @@ msgstr ""
 msgid "%s License Agreement"
 msgstr "Acuerdo de Licencia %s"
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:167
+#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
 msgid "_Host:"
 msgstr "_Servidor:"
 
-#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:151
+#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
 msgid "User_name:"
 msgstr "_Usuario:"
 
-#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:173
+#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
 msgid "_Path:"
 msgstr "R_uta:"
 
@@ -14599,66 +14114,66 @@ msgstr "lista de correo %s"
 msgid "Add Filter Rule"
 msgstr "Añadir regla de filtrado"
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:461
 #, c-format
 msgid "%d deleted"
 msgstr "%d borrados"
 
-#: mail/mail-component.c:465
+#: mail/mail-component.c:463
 #, c-format
 msgid "%d junk"
 msgstr "%d spam"
 
-#: mail/mail-component.c:488
+#: mail/mail-component.c:486
 #, c-format
 msgid "%d drafts"
 msgstr "%d borradores"
 
-#: mail/mail-component.c:490
+#: mail/mail-component.c:488
 #, c-format
 msgid "%d sent"
 msgstr "%d enviar"
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:490
 #, c-format
 msgid "%d unsent"
 msgstr "%d sin enviar"
 
-#: mail/mail-component.c:496
+#: mail/mail-component.c:494
 #, c-format
 msgid "%d total"
 msgstr "%d en total"
 
-#: mail/mail-component.c:498
+#: mail/mail-component.c:496
 #, c-format
 msgid ", %d unread"
 msgstr ", %d no leídos"
 
-#: mail/mail-component.c:658
+#: mail/mail-component.c:656
 msgid "New Mail Message"
 msgstr "Mensaje de correo nuevo"
 
-#: mail/mail-component.c:659
+#: mail/mail-component.c:657
 msgid "_Mail Message"
 msgstr "_Mensaje de correo"
 
-#: mail/mail-component.c:660
+#: mail/mail-component.c:658
 msgid "Compose a new mail message"
 msgstr "Redacta un mensaje de correo nuevo"
 
-#: mail/mail-component.c:666
+#: mail/mail-component.c:664
 msgid "New Mail Folder"
 msgstr "Nueva carpeta de correo"
 
-#: mail/mail-component.c:667
+#: mail/mail-component.c:665
 msgid "Mail _Folder"
 msgstr "_Carpeta de correo"
 
-#: mail/mail-component.c:668
+#: mail/mail-component.c:666
 msgid "Create a new mail folder"
 msgstr "Crea una carpeta de correo nueva"
 
-#: mail/mail-component.c:800
+#: mail/mail-component.c:798
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Fallo al actualizar la configuración de correo o carpetas."
 
@@ -14755,7 +14270,8 @@ msgstr "<b>_Idiomas</b>"
 
 #: mail/mail-config.glade.h:8
 msgid "<small>This will make the the filter more reliable, but slower</small>"
-msgstr "<small>Esto hará que el filtrado sea más exacto, pero más lento</small>"
+msgstr ""
+"<small>Esto hará que el filtrado sea más exacto, pero más lento</small>"
 
 #: mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
@@ -14991,7 +14507,8 @@ msgstr "No citar el mensaje original"
 
 #: mail/mail-config.glade.h:73
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
-msgstr "No _firmar las solicitudes de reunión (para compatibilidad con Outlook)"
+msgstr ""
+"No _firmar las solicitudes de reunión (para compatibilidad con Outlook)"
 
 #: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
@@ -15398,7 +14915,6 @@ msgstr ""
 "destinatarios una idea de qué trata su correo."
 
 #. mail:ask-send-only-bcc-contact primary
-#. mail:ask-send-only-bcc primary
 #: mail/mail-errors.xml.h:22 mail/mail-errors.xml.h:29
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "¿Seguro que quiere enviar un mensaje con sólo destinatarios Cco?"
@@ -15415,10 +14931,10 @@ msgid ""
 msgstr ""
 "La lista de contactos que está enviando está configurada para ocultar los "
 "destinatarios de la lista.\n"
-"Muchos sistemas de correo añaden una cabecera Apparentely-To a los "
-"mensajes que sólo tienen destinatarios Cco. Esta cabecera listará todos "
-"los destinatarios en su mensaje. Para evitar esto, debería añadir al "
-"menos un destinatario a Para: o Cc:"
+"Muchos sistemas de correo añaden una cabecera Apparentely-To a los mensajes "
+"que sólo tienen destinatarios Cco. Esta cabecera listará todos los "
+"destinatarios en su mensaje. Para evitar esto, debería añadir al menos un "
+"destinatario a Para: o Cc:"
 
 #. mail:ask-send-only-bcc secondary
 #: mail/mail-errors.xml.h:31
@@ -15435,8 +14951,10 @@ msgstr ""
 
 #. mail:send-no-recipients primary
 #: mail/mail-errors.xml.h:34
-msgid "This message cannot be sent because you have not specified any Recipients"
-msgstr "El mensaje no puede ser enviado porque no ha especificado ningún destinatario"
+msgid ""
+"This message cannot be sent because you have not specified any Recipients"
+msgstr ""
+"El mensaje no puede ser enviado porque no ha especificado ningún destinatario"
 
 #. mail:send-no-recipients secondary
 #: mail/mail-errors.xml.h:36
@@ -15476,7 +14994,6 @@ msgstr ""
 "la carpeta «{0}»?"
 
 #. mail:ask-expunge secondary
-#. mail:ask-empty-trash secondary
 #: mail/mail-errors.xml.h:45 mail/mail-errors.xml.h:50
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Si continua, no podrá recuperar estos mensajes."
@@ -15514,7 +15031,8 @@ msgstr ""
 
 #. mail:camel-exception primary
 #: mail/mail-errors.xml.h:57
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+#, fuzzy
+msgid "Your message with the subject \"{0}\" was not delivered."
 msgstr "Su mensaje, con el asunto «{0}» no fue entregado."
 
 #. mail:camel-exception secondary
@@ -15551,13 +15069,6 @@ msgid "{0}."
 msgstr "{0}."
 
 #. mail:session-message-info secondary
-#. mail:session-message-info-cancel secondary
-#. mail:session-message-warning secondary
-#. mail:session-message-warning-cancel secondary
-#. mail:session-message-error secondary
-#. mail:session-message-error-cancel secondary
-#. mail:ask-session-password secondary
-#. mail:filter-load-error secondary
 #: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
 #: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
 #: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
@@ -15580,14 +15091,7 @@ msgstr "Error al cargar las definiciones de filtros."
 msgid "Cannot save to directory \"{0}\"."
 msgstr "No se pudo guardar al directorio «{0}»."
 
-#. mail:no-save-path secondary
-#: mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr "{1}"
-
 #. mail:no-create-path primary
-#. mail:no-write-path-exists primary
-#. mail:no-write-path-notfile primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
 msgid "Cannot save to file \"{0}\"."
@@ -15603,15 +15107,6 @@ msgstr "No se pudo crear el directorio de guardado, debido a «{1}»"
 msgid "Cannot create temporary save directory."
 msgstr "No se pudo crear el directorio de guardado temporal."
 
-#. mail:no-create-tmp-path secondary
-#. mail:no-delete-folder secondary
-#. system:no-save-file secondary
-#. system:no-load-file secondary
-#: mail/mail-errors.xml.h:100 mail/mail-errors.xml.h:112
-#: widgets/misc/e-system-errors.xml.h:11 widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr "Porque «{1}»"
-
 #. mail:no-write-path-exists secondary
 #: mail/mail-errors.xml.h:104
 msgid "File exists but cannot overwrite it."
@@ -15633,7 +15128,6 @@ msgid "Cannot delete system folder \"{0}\"."
 msgstr "No se pudo borrar la carpeta de sistema «{0}»."
 
 #. mail:no-delete-spethal-folder secondary
-#. mail:no-rename-spethal-folder secondary
 #: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
@@ -15667,16 +15161,15 @@ msgstr ""
 "permanentemente."
 
 #. mail:no-rename-folder-exists primary
-#. mail:no-rename-folder primary
 #: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "No se puede renombrar «{0}» a «{1}»."
 
 #. mail:no-rename-folder-exists secondary
-#. mail:vfolder-notunique secondary
 #: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
 msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr "Ya existe una carpeta llamada «{1}». Por favor, use un nombre diferente."
+msgstr ""
+"Ya existe una carpeta llamada «{1}». Por favor, use un nombre diferente."
 
 #. mail:no-rename-folder secondary
 #: mail/mail-errors.xml.h:134
@@ -15684,25 +15177,21 @@ msgid "Because \"{2}\"."
 msgstr "Porque «{2}»"
 
 #. mail:no-move-folder-nostore primary
-#. mail:no-move-folder-to-nostore primary
 #: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "No se puede mover la carpeta «{0}» a «{1}»."
 
 #. mail:no-move-folder-nostore secondary
-#. mail:no-copy-folder-nostore secondary
 #: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
 msgid "Cannot open source \"{2}\"."
 msgstr "No se pudo abrir el origen «{2}»"
 
 #. mail:no-move-folder-to-nostore secondary
-#. mail:no-copy-folder-to-nostore secondary
 #: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
 msgid "Cannot open target \"{2}\"."
 msgstr "No se pudo abrir el destino «{2}»."
 
 #. mail:no-copy-folder-nostore primary
-#. mail:no-copy-folder-to-nostore primary
 #: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "No se pudo copiar la carpeta: «{0}» a «{1}»."
@@ -15718,7 +15207,6 @@ msgid "Cannot open source \"{1}\""
 msgstr "No se pudo abrir el origen «{1}»"
 
 #. mail:account-incomplete primary
-#. mail:account-notunique primary
 #: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
 msgid "Cannot save changes to account."
 msgstr "No se puede guardar los cambios en la cuenta."
@@ -15865,7 +15353,8 @@ msgid ""
 msgstr ""
 "Ya existe una carpeta no vacía en «{1}».\n"
 "\n"
-"Puede elegir ignorar esta carpeta, sobreescribirla o agregar su contenido, o salir.\n"
+"Puede elegir ignorar esta carpeta, sobreescribirla o agregar su contenido, o "
+"salir.\n"
 
 #: mail/mail-errors.xml.h:216
 msgid "Ignore"
@@ -15879,7 +15368,7 @@ msgstr "_Sobreescribir"
 msgid "_Append"
 msgstr "_Agregar"
 
-#: mail/mail-folder-cache.c:791
+#: mail/mail-folder-cache.c:785
 #, c-format
 msgid "Pinging %s"
 msgstr "Haciendo ping a %s"
@@ -16319,6 +15808,10 @@ msgstr "Reenviar"
 msgid "No Response Necessary"
 msgstr "No es necesaria una respuesta"
 
+#: mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Leído"
+
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Responder"
@@ -16416,47 +15909,53 @@ msgstr ""
 "desarrollo de Evolution no se mostrará."
 
 #: shell/apps_evolution_shell.schemas.in.in.h:9
-msgid "List of paths for the folders to be synchronized to disk for offline usage"
-msgstr "Lista de rutas a las carpetas que serán sincronizadas para uso en desconexión"
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
+msgstr ""
+"Lista de rutas a las carpetas que serán sincronizadas para uso en desconexión"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid "Toolbar is visible"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Whether Evolution should start up in offline mode"
 msgstr "Indica si Evolution debería iniciarse en modo desconectado"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Whether the toolbar should be visible."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
 msgid "Whether to skip the development warning dialog"
 msgstr "Indica si debe saltar el diálogo de advertencia de desarrollo"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
+#: shell/apps_evolution_shell.schemas.in.in.h:14
 msgid "mail"
 msgstr "correo"
 
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
-msgstr "Producido por"
-
-#: shell/e-shell.c:545 shell/e-shell.c:546
+#: shell/e-shell.c:588 shell/e-shell.c:589
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KiB"
 
-#: shell/e-shell.c:743
+#: shell/e-shell.c:786
 msgid "Uknown system error."
 msgstr "Error de sistema desconocido."
 
-#: shell/e-shell.c:1100
+#: shell/e-shell.c:1143
 msgid "Invalid arguments"
 msgstr "Argumentos inválidos"
 
-#: shell/e-shell.c:1102
+#: shell/e-shell.c:1145
 msgid "Cannot register on OAF"
 msgstr "No se pudo registrar en OAF"
 
-#: shell/e-shell.c:1104
+#: shell/e-shell.c:1147
 msgid "Configuration Database not found"
 msgstr "No se encontró la base de datos de configuración"
 
-#: shell/e-shell.c:1106
+#: shell/e-shell.c:1149
 msgid "Generic error"
 msgstr "Error genérico"
 
@@ -16514,7 +16013,7 @@ msgstr ""
 msgid "Select importer"
 msgstr "Seleccionar importador"
 
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1026
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
 #, c-format
 msgid "File %s does not exist"
 msgstr "El archivo %s no existe"
@@ -16542,31 +16041,32 @@ msgstr ""
 "Importando %s\n"
 "Importando elemento 1."
 
-#: shell/e-shell-importer.c:549
+#: shell/e-shell-importer.c:570
 msgid "Automatic"
 msgstr "Automático"
 
-#: shell/e-shell-importer.c:598
-msgid "_Filename:"
-msgstr "_Nombre de archivo:"
+#: shell/e-shell-importer.c:626
+#, fuzzy
+msgid "F_ilename:"
+msgstr "Nombre del archivo:"
 
-#: shell/e-shell-importer.c:603
+#: shell/e-shell-importer.c:631
 msgid "Select a file"
 msgstr "Elija un archivo"
 
-#: shell/e-shell-importer.c:613
+#: shell/e-shell-importer.c:642
 msgid "File _type:"
 msgstr "_Tipo de archivo:"
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:681
 msgid "Import data and settings from _older programs"
 msgstr "Importar datos y configuración de programas _antiguos"
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:684
 msgid "Import a _single file"
 msgstr "Importar un _único archivo"
 
-#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -16574,25 +16074,25 @@ msgstr ""
 "Por favor espere...\n"
 "Buscando configuraciones existentes"
 
-#: shell/e-shell-importer.c:727
+#: shell/e-shell-importer.c:756
 msgid "Starting Intelligent Importers"
 msgstr "Comenzando importadores inteligentes"
 
-#: shell/e-shell-importer.c:853 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
 #, c-format
 msgid "From %s:"
 msgstr "De %s:"
 
-#: shell/e-shell-importer.c:1044
+#: shell/e-shell-importer.c:1073
 #, c-format
 msgid "No importer available for file %s"
 msgstr "No hay importador disponible para el archivo «%s»"
 
-#: shell/e-shell-importer.c:1056
+#: shell/e-shell-importer.c:1085
 msgid "Unable to execute importer"
 msgstr "Imposible ejecutar importador"
 
-#: shell/e-shell-importer.c:1169
+#: shell/e-shell-importer.c:1199
 msgid "_Import"
 msgstr "_Importar"
 
@@ -16628,7 +16128,8 @@ msgstr "No ha especificado un nombre de carpeta."
 
 #: shell/e-shell-utils.c:123
 msgid "Folder name cannot contain the Return character."
-msgstr "El nombre de la carpeta no puede contener el carácter de retorno de carro."
+msgstr ""
+"El nombre de la carpeta no puede contener el carácter de retorno de carro."
 
 #: shell/e-shell-utils.c:129
 msgid "Folder name cannot contain the character \"/\"."
@@ -16642,57 +16143,57 @@ msgstr "El nombre de la carpeta no puede contener el carácter «#»."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' y '..' son nombres reservados de carpetas."
 
-#: shell/e-shell-window.c:336
+#: shell/e-shell-window.c:337
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
-"Evolution está conectado.  Pulse este botón para trabajar "
-"desconectado."
+"Evolution está conectado.  Pulse este botón para trabajar desconectado."
 
-#: shell/e-shell-window.c:343
+#: shell/e-shell-window.c:344
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution está en proceso de desconectarse."
 
-#: shell/e-shell-window.c:349
+#: shell/e-shell-window.c:350
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
-"Evolution está desconectado.  Pulse este botón para trabajar "
-"conectado."
+"Evolution está desconectado.  Pulse este botón para trabajar conectado."
 
-#: shell/e-shell-window.c:621
+#: shell/e-shell-window.c:637
 #, c-format
 msgid "Switch to %s"
 msgstr "Cambiar a %s"
 
-#: shell/e-shell-window-commands.c:64
+#: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
-msgstr "Las utilidades GNOME Pilot no parecen estar instaladas en este sistema."
+msgstr ""
+"Las utilidades GNOME Pilot no parecen estar instaladas en este sistema."
 
-#: shell/e-shell-window-commands.c:72
+#: shell/e-shell-window-commands.c:74
 #, c-format
 msgid "Error executing %s."
 msgstr "Error ejecutando %s."
 
-#: shell/e-shell-window-commands.c:121
+#: shell/e-shell-window-commands.c:123
 msgid "Bug buddy is not installed."
 msgstr "Bug Buddy no está instalado."
 
-#: shell/e-shell-window-commands.c:129
+#: shell/e-shell-window-commands.c:131
 msgid "Bug buddy could not be run."
 msgstr "No se ha podido ejecutar bug Buddy."
 
-#: shell/e-shell-window-commands.c:171
-msgid "About Evolution"
-msgstr "Acerca de Evolution"
+#: shell/e-shell-window-commands.c:323
+#, fuzzy
+msgid "Groupware Suite"
+msgstr "Groupwise"
 
-#: shell/e-shell-window-commands.c:382
+#: shell/e-shell-window-commands.c:563
 msgid "_Work Online"
 msgstr "_Trabajar conectado"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "_Trabajar desconectado"
 
-#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Trabajar desconectado"
 
@@ -16975,10 +16476,11 @@ msgid ""
 "You will need to make more space available in your home directory before you "
 "can continue."
 msgstr ""
-"La actualización de sus datos y configuración requerirá hasta  {0} de espacio de disco, "
-"pero sñolo tiene {1} disponibles.\n"
+"La actualización de sus datos y configuración requerirá hasta  {0} de "
+"espacio de disco, pero sñolo tiene {1} disponibles.\n"
 "\n"
-"Necesitará hacer más espacio libre en su directorio personal antes de que pueda continuar."
+"Necesitará hacer más espacio libre en su directorio personal antes de que "
+"pueda continuar."
 
 #. shell:upgrade-failed primary
 #: shell/shell-errors.xml.h:8
@@ -17006,13 +16508,11 @@ msgid "Continue"
 msgstr "Continuar"
 
 #. shell:noshell title
-#. shell:noshell-reason title
 #: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
 msgid "Cannot start Evolution"
 msgstr "No se pudo iniciar Evolution."
 
 #. shell:noshell primary
-#. shell:noshell-reason primary
 #: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
 msgid "Evolution can not start."
 msgstr "Evolution no pudo iniciar."
@@ -17037,36 +16537,37 @@ msgid ""
 "\n"
 "Click help for details."
 msgstr ""
-"La configuración de su sistema no coincide con su configuración de Evolution:\n"
+"La configuración de su sistema no coincide con su configuración de "
+"Evolution:\n"
 "\n"
 "{0}\n"
 "\n"
 "Pulse en la ayuda para los detalles."
 
-#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:522
+#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
+#: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
 msgstr "Seleccione un certificado para importar..."
 
-#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:604
+#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
+#: smime/gui/certificate-manager.c:638
 msgid "Certificate Name"
 msgstr "Nombre del certificado"
 
-#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
+#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
 msgid "Purposes"
 msgstr "Propósito"
 
-#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:517
+#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr "Número de serie"
 
-#: smime/gui/certificate-manager.c:267
+#: smime/gui/certificate-manager.c:271
 msgid "Expires"
 msgstr "Caducidad"
 
-#: smime/gui/certificate-manager.c:417
+#: smime/gui/certificate-manager.c:446
 msgid "E-Mail Address"
 msgstr "Dirección de correo-e"
 
@@ -17168,7 +16669,7 @@ msgstr ""
 "Antes de confiar en esta AC para cualquier propósito, debería examinar su "
 "certificado y su directiva y procedimientos (si están disponibles)."
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
 msgid "Certificate"
 msgstr "Certificado"
 
@@ -17188,19 +16689,23 @@ msgstr "Nombre común (CN)"
 msgid "Contact Certificates"
 msgstr "Certificados de contactos"
 
-#: smime/gui/smime-ui.glade.h:21
-#, no-c-format
-msgid "Do you want to trust \"%s\" for the following purposes?"
-msgstr "¿Quiere confiar en «%s» para los siguientes propósitos?"
+#: smime/gui/smime-ui.glade.h:20
+msgid "Do not trust the authenticity of this certificate"
+msgstr ""
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:21
 msgid "Dummy window only"
 msgstr "Ventana muda únicamente"
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:22
 msgid "Edit"
 msgstr "Editar"
 
+#: smime/gui/smime-ui.glade.h:23
+#, fuzzy
+msgid "Email Certificate Trust Settings"
+msgstr "Autoridad certificadora de correo"
+
 #: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr "Certificado del destinatario del correo-e"
@@ -17233,243 +16738,255 @@ msgstr "Unidad de organización (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "Huella SHA1"
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr "Certificado de cliente SSL"
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr "Certificado de servidor SSL"
 
 #: smime/gui/smime-ui.glade.h:37
+msgid "Trust the authenticity of this certificate"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
 msgid "Trust this CA to identify email users."
 msgstr "Confiar en esta AC para identificar a usuarios de correo-e."
 
-#: smime/gui/smime-ui.glade.h:38
+#: smime/gui/smime-ui.glade.h:39
 msgid "Trust this CA to identify software developers."
 msgstr "Confiar en esta AC para identificar a desarrolladores de software."
 
-#: smime/gui/smime-ui.glade.h:39
+#: smime/gui/smime-ui.glade.h:40
 msgid "Trust this CA to identify web sites."
 msgstr "Confiar en esta AC para identificar sitios web."
 
-#: smime/gui/smime-ui.glade.h:40
+#: smime/gui/smime-ui.glade.h:41
 msgid "View"
 msgstr "Ver"
 
-#: smime/gui/smime-ui.glade.h:41
-msgid "View Certificate"
-msgstr "Ver certificado"
-
 #: smime/gui/smime-ui.glade.h:42
-msgid "You have been asked to trust a new Certificate Authority (CA)."
-msgstr "Se le ha pedido que confíe en una nueva autoridad certificadora (CA)."
-
-#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr "Tiene certificados de estas organizaciones que le identifican:"
 
-#: smime/gui/smime-ui.glade.h:44
-msgid "You have certificates on file that identify these certificate authorities:"
+#: smime/gui/smime-ui.glade.h:43
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
 msgstr ""
 "Tiene archivados los certificados que identifican a estas autoridades de "
 "certificación:"
 
-#: smime/gui/smime-ui.glade.h:45
+#: smime/gui/smime-ui.glade.h:44
 msgid "You have certificates on file that identify these people:"
 msgstr "Tiene archivados los certificados que identifican a estas personas:"
 
-#: smime/gui/smime-ui.glade.h:46
+#: smime/gui/smime-ui.glade.h:45
 msgid "Your Certificates"
 msgstr "Sus certificados"
 
-#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
+#: smime/gui/smime-ui.glade.h:46
+msgid "_Edit CA Trust"
+msgstr ""
+
+#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
-#: smime/lib/e-cert.c:478
+#. x509 certificate usage types
+#: smime/lib/e-cert.c:424
+#, fuzzy
+msgid "Sign"
+msgstr "Firma"
+
+#: smime/lib/e-cert.c:425
+#, fuzzy
+msgid "Encrypt"
+msgstr "Cifrado"
+
+#: smime/lib/e-cert.c:530
 msgid "Version"
 msgstr "Versión"
 
-#: smime/lib/e-cert.c:493
+#: smime/lib/e-cert.c:545
 msgid "Version 1"
 msgstr "Versión 1"
 
-#: smime/lib/e-cert.c:496
+#: smime/lib/e-cert.c:548
 msgid "Version 2"
 msgstr "Versión 2"
 
-#: smime/lib/e-cert.c:499
+#: smime/lib/e-cert.c:551
 msgid "Version 3"
 msgstr "Versión 3"
 
-#: smime/lib/e-cert.c:581
+#: smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 con cifrado RSA"
 
-#: smime/lib/e-cert.c:584
+#: smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 con cifrado RSA"
 
-#: smime/lib/e-cert.c:587
+#: smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 con cifrado RSA"
 
-#: smime/lib/e-cert.c:590
+#: smime/lib/e-cert.c:642
 msgid "C"
 msgstr "C"
 
-#: smime/lib/e-cert.c:593
+#: smime/lib/e-cert.c:645
 msgid "CN"
 msgstr "CN"
 
-#: smime/lib/e-cert.c:596
+#: smime/lib/e-cert.c:648
 msgid "OU"
 msgstr "OU"
 
-#: smime/lib/e-cert.c:599
+#: smime/lib/e-cert.c:651
 msgid "O"
 msgstr "O"
 
-#: smime/lib/e-cert.c:602
+#: smime/lib/e-cert.c:654
 msgid "L"
 msgstr "L"
 
-#: smime/lib/e-cert.c:605
+#: smime/lib/e-cert.c:657
 msgid "DN"
 msgstr "ND"
 
-#: smime/lib/e-cert.c:608
+#: smime/lib/e-cert.c:660
 msgid "DC"
 msgstr "DC"
 
-#: smime/lib/e-cert.c:611
+#: smime/lib/e-cert.c:663
 msgid "ST"
 msgstr "ST"
 
-#: smime/lib/e-cert.c:614
+#: smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 cifrado RSA"
 
-#: smime/lib/e-cert.c:617
+#: smime/lib/e-cert.c:669
 msgid "Certificate Key Usage"
 msgstr "Uso de la clave del certificado"
 
-#: smime/lib/e-cert.c:620
+#: smime/lib/e-cert.c:672
 msgid "Netscape Certificate Type"
 msgstr "Tipo de certificado Netscape"
 
-#: smime/lib/e-cert.c:623
+#: smime/lib/e-cert.c:675
 msgid "Certificate Authority Key Identifier"
 msgstr "Identificador de la autoridad de la clave del certificado"
 
-#: smime/lib/e-cert.c:626
+#: smime/lib/e-cert.c:678
 msgid "UID"
 msgstr "UID"
 
-#: smime/lib/e-cert.c:635
+#: smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Identificador del objeto (%s)"
 
-#: smime/lib/e-cert.c:686
+#: smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
 msgstr "Identificador del algoritmo"
 
-#: smime/lib/e-cert.c:694
+#: smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
 msgstr "Parámetros del algoritmo"
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:768
 msgid "Subject Public Key Info"
 msgstr "Información de clave pública del propósito"
 
-#: smime/lib/e-cert.c:721
+#: smime/lib/e-cert.c:773
 msgid "Subject Public Key Algorithm"
 msgstr "Algoritmo de clave pública del propósito"
 
-#: smime/lib/e-cert.c:736
+#: smime/lib/e-cert.c:788
 msgid "Subject's Public Key"
 msgstr "Clave pública del sujeto"
 
-#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
+#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
 msgid "Error: Unable to process extension"
 msgstr "Erro:No se pudo procesar la extensión"
 
-#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
+#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr "Firmante del objeto"
 
-#: smime/lib/e-cert.c:782
+#: smime/lib/e-cert.c:834
 msgid "SSL Certificate Authority"
 msgstr "Autoridad certificadora SSL"
 
-#: smime/lib/e-cert.c:786
+#: smime/lib/e-cert.c:838
 msgid "Email Certificate Authority"
 msgstr "Autoridad certificadora de correo"
 
-#: smime/lib/e-cert.c:814
+#: smime/lib/e-cert.c:866
 msgid "Signing"
 msgstr "Firma"
 
-#: smime/lib/e-cert.c:818
+#: smime/lib/e-cert.c:870
 msgid "Non-repudiation"
 msgstr "No repudio"
 
-#: smime/lib/e-cert.c:822
+#: smime/lib/e-cert.c:874
 msgid "Key Encipherment"
 msgstr "Cifrado de la clave"
 
-#: smime/lib/e-cert.c:826
+#: smime/lib/e-cert.c:878
 msgid "Data Encipherment"
 msgstr "Cifrado de datos"
 
-#: smime/lib/e-cert.c:830
+#: smime/lib/e-cert.c:882
 msgid "Key Agreement"
 msgstr "Acuerdo de claves"
 
-#: smime/lib/e-cert.c:834
+#: smime/lib/e-cert.c:886
 msgid "Certificate Signer"
 msgstr "Firmante del certificado"
 
-#: smime/lib/e-cert.c:838
+#: smime/lib/e-cert.c:890
 msgid "CRL Signer"
 msgstr "Firmante de la LRC"
 
-#: smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:938
 msgid "Critical"
 msgstr "Crítico"
 
-#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
+#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
 msgid "Not Critical"
 msgstr "No crítico"
 
-#: smime/lib/e-cert.c:912
+#: smime/lib/e-cert.c:964
 msgid "Extensions"
 msgstr "Extensiones"
 
-#: smime/lib/e-cert.c:983
+#: smime/lib/e-cert.c:1035
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
 msgid "Certificate Signature Algorithm"
 msgstr "Algoritmo de firma del certificado"
 
-#: smime/lib/e-cert.c:1048
+#: smime/lib/e-cert.c:1100
 msgid "Issuer"
 msgstr "Emisor"
 
-#: smime/lib/e-cert.c:1102
+#: smime/lib/e-cert.c:1154
 msgid "Issuer Unique ID"
 msgstr "ID único del emisor"
 
-#: smime/lib/e-cert.c:1121
+#: smime/lib/e-cert.c:1173
 msgid "Subject Unique ID"
 msgstr "ID único del propósito"
 
-#: smime/lib/e-cert.c:1164
+#: smime/lib/e-cert.c:1216
 msgid "Certificate Signature Value"
 msgstr "Valor de la firma del certificado"
 
@@ -17619,7 +17136,7 @@ msgstr "Ver el contacto actual"
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "A_cciones"
 
@@ -17778,7 +17295,7 @@ msgstr "_Cerrar"
 #: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:3
+#: ui/evolution.xml.h:4
 msgid "Close"
 msgstr "Cerrar"
 
@@ -17791,7 +17308,7 @@ msgid "Delete this item"
 msgstr "Borrar este elemento"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr "Barra de herramientas principal"
 
@@ -17834,7 +17351,7 @@ msgstr "Guarda este elemento a disco"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:44
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "_File"
 msgstr "_Archivo"
 
@@ -17964,7 +17481,8 @@ msgstr "Abre una ventana para escribir un mensaje de correo"
 
 #: ui/evolution-mail-global.xml.h:8
 msgid "Permanently remove all deleted messages from all folders"
-msgstr "Elimina permanentemente todos los mensajes borrados de todas las carpetas"
+msgstr ""
+"Elimina permanentemente todos los mensajes borrados de todas las carpetas"
 
 #: ui/evolution-mail-global.xml.h:9
 msgid "Post Ne_w Message"
@@ -18023,8 +17541,10 @@ msgid "Hide _Read Messages"
 msgstr "Oculta_r mensajes leídos"
 
 #: ui/evolution-mail-list.xml.h:8
-msgid "Hide deleted messages rather than displaying them with a line through them"
-msgstr "Oculta los mensajes borrados en lugar de mostrarlos tachados por una línea"
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr ""
+"Oculta los mensajes borrados en lugar de mostrarlos tachados por una línea"
 
 #: ui/evolution-mail-list.xml.h:9
 msgid "Mark All as _Read"
@@ -18092,13 +17612,13 @@ msgstr "_Invertir selección"
 msgid "_Threaded Message List"
 msgstr "_Lista de mensajes por conversaciones"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Cerrar esta ventana"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "_Close"
 msgstr "_Cerrar"
 
@@ -18494,7 +18014,7 @@ msgstr "Mensaje a_nterior"
 msgid "_Quoted"
 msgstr "_Citado"
 
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
 msgid "_Tools"
 msgstr "_Herramientas"
 
@@ -18791,106 +18311,120 @@ msgid "_Open Task"
 msgstr "_Abrir tarea"
 
 #: ui/evolution.xml.h:1
-msgid "About Ximian Evolution..."
-msgstr "Acerca de Ximian Evolution..."
+#, fuzzy
+msgid "About Evolution..."
+msgstr "Acerca de Evolution"
 
 #: ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
 msgstr "Cambiar la configuración de Evolution"
 
-#: ui/evolution.xml.h:5
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the visibility of the toolbar"
+msgstr "Cambia las propiedades de esta carpeta"
+
+#: ui/evolution.xml.h:6
 msgid "Create a new window displaying this folder"
 msgstr "Crear una nueva ventana mostrando esta carpeta"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "_Salir"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "P+_F de Ximian Evolution"
+
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Sale del programa"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:10
 msgid "Forget _Passwords"
 msgstr "O_lvidar contraseñas"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:11
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Olvida las contraseñas almacenadas así que se le preguntarán de nuevo"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:12
 msgid "Import data from other programs"
 msgstr "Importar datos de otros programas"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:14
 msgid "New _Window"
 msgstr "_Ventana nueva"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Pi_lot Settings..."
 msgstr "Configuración del _Pilot..."
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Send / Receive"
 msgstr "Enviar / Recibir"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Send queued items and retrieve new items"
 msgstr "Envía el correo en la cola y obtiene el nuevo"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Set up Pilot configuration"
 msgstr "Configuración del Pilot"
 
-#: ui/evolution.xml.h:17
-msgid "Show information about Ximian Evolution"
+#: ui/evolution.xml.h:19
+#, fuzzy
+msgid "Show information about Evolution"
 msgstr "Mostrar información acerca de Ximian Evolution"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:20
 msgid "Submit Bug Report"
 msgstr "Envía un informe de fallos"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:21
 msgid "Submit _Bug Report"
 msgstr "Enviar informe de _fallos"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Enviar un informe de fallos usando Bug Buddy"
 
-#: ui/evolution.xml.h:21
-msgid "Toggle whether we are working offline."
-msgstr "Conmutador que indica si se está trabajando desconectado o no."
-
 #: ui/evolution.xml.h:23
-msgid "Ximian Evolution _FAQ"
-msgstr "P+_F de Ximian Evolution"
+#, fuzzy
+msgid "T_oolbar"
+msgstr "Barra de herramientas principal"
 
 #: ui/evolution.xml.h:24
-msgid "_About Ximian Evolution..."
-msgstr "_Acerca de Ximian Evolution..."
+msgid "Toggle whether we are working offline."
+msgstr "Conmutador que indica si se está trabajando desconectado o no."
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "_About Evolution..."
+msgstr "Acerca de Evolution"
+
+#: ui/evolution.xml.h:30
 msgid "_Help"
 msgstr "A_yuda"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "_Import..."
 msgstr "_Importar..."
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "_New"
 msgstr "_Nuevo"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "_Quick Reference"
 msgstr "_Referencia rápida"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_Send / Receive"
 msgstr "_Enviar / Recibir"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 msgid "_Window"
 msgstr "_Ventana"
 
@@ -19134,7 +18668,8 @@ msgstr "Consulta de Evolution"
 #. setup a dummy error
 #: widgets/misc/e-error.c:415
 #, c-format
-msgid "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
 msgstr ""
 "<span weight=\"bold\">Error interno, solicitado un error desconocido «%s»</"
 "span>"
@@ -19282,6 +18817,479 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% completado)"
 
+#~ msgid "Failed to connect to LDAP server"
+#~ msgstr "Falló al conectarse al servidor LDAP"
+
+#~ msgid "Failed to authenticate with LDAP server"
+#~ msgstr "Falló al autenticarse con el servidor LDAP"
+
+#~ msgid "Could not perform query on Root DSE"
+#~ msgstr "No se pudo efectuar la consulta en la raíz DSE"
+
+#~ msgid "The server responded with no supported search bases"
+#~ msgstr "El servidor respondió con bases de búsqueda no soportadas"
+
+#~ msgid "This server does not support LDAPv3 schema information"
+#~ msgstr "Este servidor no soporta el esquema de información LDAPv3"
+
+#~ msgid "Error retrieving schema information"
+#~ msgstr "Error al obtener información del esquema"
+
+#~ msgid "Server did not respond with valid schema information"
+#~ msgstr "El servidor no respondió con una información del esquema válida"
+
+#~ msgid ""
+#~ "Some fields are no longer representable in the contact editor. Please "
+#~ "wait while Evolution copies those fields to the 'Notes' field..."
+#~ msgstr ""
+#~ "Algunos campos no se pueden representar más en el editor de contactos. "
+#~ "Por favor espere mientras Evolution copia esos campos al campo «Notas»..."
+
+#~ msgid "  S_how Supported Bases "
+#~ msgstr " Mo_strar bases soportadas "
+
+#~ msgid "1:00"
+#~ msgstr "1:00"
+
+#~ msgid "5:00"
+#~ msgstr "5:00"
+
+#~ msgid "Connecting"
+#~ msgstr "Conexión"
+
+#~ msgid "Distinguished _name:"
+#~ msgstr "_Nombre distintivo:"
+
+#~ msgid "Email address:"
+#~ msgstr "Dirección de correo-e:"
+
+#~ msgid "Evolution will use this DN to authenticate you with the server"
+#~ msgstr ""
+#~ "Evolution usará este Nombre Distintivo para autenticarle con el servidor"
+
+#~ msgid "One"
+#~ msgstr "Uno"
+
+#~ msgid "S_earch scope: "
+#~ msgstr "Ámbito de bú_squeda: "
+
+#~ msgid "Searching"
+#~ msgstr "Búsqueda"
+
+#~ msgid "Sub"
+#~ msgstr "Sub"
+
+#~ msgid "This option controls how long a search will be run."
+#~ msgstr ""
+#~ "Esta opción controla durante cuánto tiempo va a efectuarse una búsqueda."
+
+#~ msgid "U_se SSL/TLS:"
+#~ msgstr "U_sar SSL/TLS:"
+
+#~ msgid "_Display name:"
+#~ msgstr "_Mostrar nombre:"
+
+#~ msgid "_Port number:"
+#~ msgstr "Número de _puerto:"
+
+#~ msgid "_Search base:"
+#~ msgstr "Base de _búsqueda:"
+
+#~ msgid "_Server name:"
+#~ msgstr "Nombre del _servidor:"
+
+#~ msgid "_Timeout (minutes):"
+#~ msgstr "_Tiempo de expiración (minutos):"
+
+#~ msgid "connecting-tab"
+#~ msgstr "Conexión"
+
+#~ msgid "general-tab"
+#~ msgstr "General"
+
+#~ msgid "searching-tab"
+#~ msgstr "búsqueda"
+
+#~ msgid "Webcam:"
+#~ msgstr "Webcam:"
+
+#~ msgid "item7"
+#~ msgstr "item7"
+
+#~ msgid "item8"
+#~ msgstr "item8"
+
+#~ msgid "Category editor not available."
+#~ msgstr "No hay un editor de categorías disponible."
+
+#~ msgid "Do you want to save changes?"
+#~ msgstr "¿Desea guardar los cambios?"
+
+#~ msgid "Error saving %s: %s"
+#~ msgstr "Error guardando %s: %s"
+
+#~ msgid ""
+#~ "The addressbook backend for\n"
+#~ "%s\n"
+#~ "has crashed. You will have to restart Evolution in order to use it again"
+#~ msgstr ""
+#~ "El soporte de la libreta de direcciones para\n"
+#~ "%s\n"
+#~ "se ha bloqueado. Tendrá que reiniciar Evolution para usarlo de nuevo"
+
+#~ msgid "Can not load URI"
+#~ msgstr "No se pudo cargar la URI"
+
+#~ msgid "Calendar Properties"
+#~ msgstr "Propiedades de la agenda"
+
+#~ msgid "Remote"
+#~ msgstr "Remoto"
+
+#~ msgid "Task List Properties"
+#~ msgstr "Propiedades de lista de tareas"
+
+#~ msgid "_Refresh Interval:"
+#~ msgstr "Intervalo de _refresco:"
+
+#~ msgid "_Source URL:"
+#~ msgstr "URL de _origen:"
+
+#~ msgid ""
+#~ "The event being deleted is a meeting, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "El acontecimiento que está borrando es una reunión, ¿quiere que envíe un "
+#~ "aviso de cancelación?"
+
+#~ msgid "Are you sure you want to cancel and delete this meeting?"
+#~ msgstr "¿Seguro que quiere cancelar y borrar esta reunión?"
+
+#~ msgid ""
+#~ "The task being deleted is assigned, would you like to send a cancellation "
+#~ "notice?"
+#~ msgstr ""
+#~ "La tarea que está siendo borrada está asignada, ¿quiere mandar un mensaje "
+#~ "advirtiéndolo?"
+
+#~ msgid "Are you sure you want to cancel and delete this task?"
+#~ msgstr "¿Seguro que quiere cancelar y borrar esta tarea?"
+
+#~ msgid ""
+#~ "The journal entry being deleted is published, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "La entrada del diario que está borrando está publicada, ¿Quiere que envíe "
+#~ "un aviso de cancelación?"
+
+#~ msgid "Are you sure you want to cancel and delete this journal entry?"
+#~ msgstr "¿Seguro que quiere cancelar y borrar esta entrada del diario?"
+
+#~ msgid "Are you sure you want to delete the appointment `%s'?"
+#~ msgstr "¿Seguro que quiere borrar la cita «%s»?"
+
+#~ msgid "Are you sure you want to delete this untitled appointment?"
+#~ msgstr "¿Seguro que quiere borrar esta cita sin título?"
+
+#~ msgid "Are you sure you want to delete the task `%s'?"
+#~ msgstr "¿Seguro que quiere borrar la tarea «%s»?"
+
+#~ msgid "Are you sure you want to delete this untitled task?"
+#~ msgstr "¿Seguro que quiere borrar esta tarea sin título?"
+
+#~ msgid "Are you sure you want to delete the journal entry `%s'?"
+#~ msgstr "¿Seguro que quiere borrar la entrada del diario «%s»?"
+
+#~ msgid "Are you sure want to delete this untitled journal entry?"
+#~ msgstr "¿Esta seguro que quiere borrar esta entrada del diario sin título?"
+
+#~ msgid "Are you sure you want to delete %d appointment?"
+#~ msgid_plural "Are you sure you want to delete %d appointments?"
+#~ msgstr[0] "¿Seguro que quiere borrar %d cita?"
+#~ msgstr[1] "¿Seguro que quiere borrar %d citas?"
+
+#~ msgid "Are you sure you want to delete %d task?"
+#~ msgid_plural "Are you sure you want to delete %d tasks?"
+#~ msgstr[0] "¿Seguro que quiere borrar %d tarea?"
+#~ msgstr[1] "¿Seguro que quiere borrar %d tareas?"
+
+#~ msgid "Are you sure you want to delete %d journal entry?"
+#~ msgid_plural "Are you sure you want to delete %d journal entries?"
+#~ msgstr[0] "¿Seguro que quiere borrar %d entrada del diario?"
+#~ msgstr[1] "¿Seguro que quiere borrar %d entradas del diario?"
+
+#~ msgid "_Invite Others..."
+#~ msgstr "_Invitar a otros..."
+
+#~ msgid ""
+#~ "This event has been changed, but has not been saved.\n"
+#~ "\n"
+#~ "Do you wish to save your changes?"
+#~ msgstr ""
+#~ "Este acontecimiento ha sido modificado, pero no se ha guardado.\n"
+#~ "\n"
+#~ "¿Quiere guardar los cambios?"
+
+#~ msgid "_Discard Changes"
+#~ msgstr "_Descartar cambios"
+
+#~ msgid "Save Event"
+#~ msgstr "Guardar acontecimiento"
+
+#~ msgid "The meeting information has been created. Send it?"
+#~ msgstr "La información de la reunión ha sido creada. ¿Desea enviarla?"
+
+#~ msgid "The meeting information has changed. Send an updated version?"
+#~ msgstr ""
+#~ "La información de la reunión ha cambiado. ¿Desea enviar una versión "
+#~ "actualizada?"
+
+#~ msgid "The task assignment information has been created. Send it?"
+#~ msgstr ""
+#~ "La información de asignación de tareas ha sido creada. ¿Desea enviarla?"
+
+#~ msgid "The task information has changed. Send an updated version?"
+#~ msgstr ""
+#~ "La información de la tarea ha cambiado. ¿Enviar versión actualizada?"
+
+#~ msgid "The task backend for '%s' has crashed."
+#~ msgstr "El backend de tareas para %s se ha colgado."
+
+#~ msgid "The calendar backend for '%s' has crashed."
+#~ msgstr "El backend de la agenda para %s se ha colgado."
+
+#~ msgid "Could not get article %s from NNTP server"
+#~ msgstr "No se pudo obtener el artículo %s del servidor NNTP"
+
+#~ msgid "Posting not allowed by news server"
+#~ msgstr "Publicación no permitida por el servidor de noticias"
+
+#~ msgid "Failed to send newsgroups header: %s: message not posted"
+#~ msgstr ""
+#~ "Fallo al enviar la cabecera de los grupos de noticias: %s mensaje no "
+#~ "publicado"
+
+#~ msgid "Error posting to newsgroup: %s: message not posted"
+#~ msgstr "Error al publicar en el grupo de noticias %s: mensaje no publicado"
+
+#~ msgid "Error reading response to posted message: message not posted"
+#~ msgstr ""
+#~ "Error leyendo la respuesta al mensaje publicado: mensaje no publicado"
+
+#~ msgid "Error posting message: %s: message not posted"
+#~ msgstr "Error al publicar el mensaje: %s: mensaje no publicado"
+
+#~ msgid "Stream error"
+#~ msgstr "error de flujo"
+
+#~ msgid "Connection error: %s"
+#~ msgstr "Error de conexión: %s"
+
+#~ msgid "Could not get group: %s"
+#~ msgstr "No se pudo obtener grupo: %s"
+
+#~ msgid "Could not get messages: unspecified error"
+#~ msgstr "No se pudieron obtener mensajes: error no especificado"
+
+#~ msgid "Unknown server response: %s"
+#~ msgstr "Respuesta del servidor desconocida: %s"
+
+#~ msgid "${1}"
+#~ msgstr "${1}"
+
+#~ msgid "Because \"${1}\"."
+#~ msgstr "Debido a «${1}»"
+
+#~ msgid "Adjust Score"
+#~ msgstr "Ajustar puntuación"
+
+#~ msgid "Assign Color"
+#~ msgstr "Asignar color"
+
+#~ msgid "Assign Score"
+#~ msgstr "Asignar puntuación"
+
+#~ msgid "Attachments"
+#~ msgstr "Adjuntos"
+
+#~ msgid "Beep"
+#~ msgstr "Pitar"
+
+#~ msgid "contains"
+#~ msgstr "contiene"
+
+#~ msgid "Copy to Folder"
+#~ msgstr "Copiar a la carpeta"
+
+#~ msgid "Date received"
+#~ msgstr "Fecha de recepción"
+
+#~ msgid "Date sent"
+#~ msgstr "Fecha de envío"
+
+#~ msgid "Deleted"
+#~ msgstr "Borrado"
+
+#~ msgid "does not contain"
+#~ msgstr "no contiene"
+
+#~ msgid "does not end with"
+#~ msgstr "no acaba en"
+
+#~ msgid "does not exist"
+#~ msgstr "no existe"
+
+#~ msgid "does not return"
+#~ msgstr "no devuelve"
+
+#~ msgid "does not sound like"
+#~ msgstr "no suena como"
+
+#~ msgid "does not start with"
+#~ msgstr "no comienza por"
+
+#~ msgid "Do Not Exist"
+#~ msgstr "No existen"
+
+#~ msgid "Draft"
+#~ msgstr "Borrador"
+
+#~ msgid "ends with"
+#~ msgstr "acaba en"
+
+#~ msgid "Exist"
+#~ msgstr "Existen"
+
+#~ msgid "exists"
+#~ msgstr "existe"
+
+#~ msgid "Expression"
+#~ msgstr "Expresión"
+
+#~ msgid "Follow Up"
+#~ msgstr "Seguimiento"
+
+#~ msgid "is"
+#~ msgstr "es"
+
+#~ msgid "is after"
+#~ msgstr "está después de"
+
+#~ msgid "is before"
+#~ msgstr "está antes de"
+
+#~ msgid "is Flagged"
+#~ msgstr "está marcado"
+
+#~ msgid "is greater than"
+#~ msgstr "es mayor que"
+
+#~ msgid "is less than"
+#~ msgstr "es menor que"
+
+#~ msgid "is not"
+#~ msgstr "no es"
+
+#~ msgid "is not Flagged"
+#~ msgstr "no está marcado"
+
+#~ msgid "Junk Test"
+#~ msgstr "Test de correo Spam"
+
+#~ msgid "Mailing list"
+#~ msgstr "Lista de correo"
+
+#~ msgid "Message Body"
+#~ msgstr "Cuerpo del mensaje"
+
+#~ msgid "Message Header"
+#~ msgstr "Cabecera del mensaje"
+
+#~ msgid "Message is Junk"
+#~ msgstr "El mensaje es Spam"
+
+#~ msgid "Message is not Junk"
+#~ msgstr "El mensaje no es Spam"
+
+#~ msgid "Move to Folder"
+#~ msgstr "Mover a la carpeta"
+
+#~ msgid "Pipe to Program"
+#~ msgstr "Encauzar al programa"
+
+#~ msgid "Play Sound"
+#~ msgstr "Reproducir un sonido"
+
+#~ msgid "Recipients"
+#~ msgstr "Destinatarios"
+
+#~ msgid "Regex Match"
+#~ msgstr "Expresión regular"
+
+#~ msgid "Replied to"
+#~ msgstr "Respondió a"
+
+#~ msgid "returns"
+#~ msgstr "devuelve"
+
+#~ msgid "returns greater than"
+#~ msgstr "devuelve mayor que"
+
+#~ msgid "returns less than"
+#~ msgstr "devuelve menor que"
+
+#~ msgid "Run Program"
+#~ msgstr "Ejecutar programa"
+
+#~ msgid "Sender"
+#~ msgstr "Remitente"
+
+#~ msgid "Set Status"
+#~ msgstr "Poner estado"
+
+#~ msgid "Size (kB)"
+#~ msgstr "Tamaño (Kib)"
+
+#~ msgid "sounds like"
+#~ msgstr "suena como"
+
+#~ msgid "Source Account"
+#~ msgstr "Cuenta origen"
+
+#~ msgid "Specific header"
+#~ msgstr "Cabecera específica"
+
+#~ msgid "starts with"
+#~ msgstr "comienza por"
+
+#~ msgid "Stop Processing"
+#~ msgstr "Parar el proceso"
+
+#~ msgid "Unset Status"
+#~ msgstr "Quitar estado"
+
+#~ msgid "Brought to you by"
+#~ msgstr "Producido por"
+
+#~ msgid "_Filename:"
+#~ msgstr "_Nombre de archivo:"
+
+#~ msgid "Do you want to trust \"%s\" for the following purposes?"
+#~ msgstr "¿Quiere confiar en «%s» para los siguientes propósitos?"
+
+#~ msgid "View Certificate"
+#~ msgstr "Ver certificado"
+
+#~ msgid "You have been asked to trust a new Certificate Authority (CA)."
+#~ msgstr ""
+#~ "Se le ha pedido que confíe en una nueva autoridad certificadora (CA)."
+
+#~ msgid "About Ximian Evolution..."
+#~ msgstr "Acerca de Ximian Evolution..."
+
+#~ msgid "_About Ximian Evolution..."
+#~ msgstr "_Acerca de Ximian Evolution..."
+
 #~ msgid "UID of the contacts source that the view will display"
 #~ msgstr "UID de la fuente de contactos que la vista mostrará"
 
@@ -19846,18 +19854,12 @@ msgstr "%s (%d%% completado)"
 #~ msgid "Primary _email:"
 #~ msgstr "Correo-_e principal:"
 
-#~ msgid "S_pouse:"
-#~ msgstr "_Cónyuge:"
-
 #~ msgid "_Categories..."
 #~ msgstr "_Categorías..."
 
 #~ msgid "_Manager's name:"
 #~ msgstr "_Jefe:"
 
-#~ msgid "_Office:"
-#~ msgstr "_Oficina:"
-
 #~ msgid "_Public Calendar URL:"
 #~ msgstr "URL de agenda _pública:"
 
@@ -21126,9 +21128,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "Object not found"
 #~ msgstr "El objeto no pudo encontrarse"
 
-#~ msgid "Invalid object"
-#~ msgstr "Objeto inválido"
-
 #~ msgid "URI not loaded"
 #~ msgstr "URI no cargada"
 
@@ -30541,4 +30540,3 @@ msgstr "%s (%d%% completado)"
 
 #~ msgid "th"
 #~ msgstr "º"
-
diff --git a/po/et.po b/po/et.po
index b7d7ce285d..ade432075b 100644
--- a/po/et.po
+++ b/po/et.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution pre-2.0\n"
-"POT-Creation-Date: 2004-02-27 03:15+0100\n"
+"POT-Creation-Date: 2004-06-03 11:14-0400\n"
 "PO-Revision-Date: 2004-05-22 11:02+0300\n"
 "Last-Translator: Priit Laes <amd@tt.ee>\n"
 "Language-Team: Estonian <gnome-et@linux.ee>\n"
@@ -70,13 +70,13 @@ msgstr "Pilot'i aadressirakenduse blokki ei suudetud lugeda"
 msgid "Accessing LDAP Server anonymously"
 msgstr "Ühendan uuesti LDAP serveriga anonüümselt"
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
 msgid "Failed to authenticate.\n"
 msgstr "Autentimine ebaõnnestus.\n"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sPalun sisesta %s parool (kasutaja %s)"
@@ -121,44 +121,13 @@ msgstr "Uue kontaktide grupi loomine"
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:483
-msgid "Failed to connect to LDAP server"
-msgstr "Ei saa luua ühendust LDAP serveriga"
-
-#: addressbook/gui/component/addressbook-config.c:507
-msgid "Failed to authenticate with LDAP server"
-msgstr "Autentimine LDAP serverile nurjus"
-
-#: addressbook/gui/component/addressbook-config.c:535
-msgid "Could not perform query on Root DSE"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:840
-msgid "The server responded with no supported search bases"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1245
-msgid "This server does not support LDAPv3 schema information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1266
-#, fuzzy
-msgid "Error retrieving schema information"
-msgstr "Viga GSM faili info hankimisel: "
-
-#: addressbook/gui/component/addressbook-config.c:1274
-msgid "Server did not respond with valid schema information"
-msgstr ""
-
 #: addressbook/gui/component/addressbook-migrate.c:68
-#: calendar/gui/migration.c:137
-#: mail/em-migrate.c:1160
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1160
 msgid "Migrating..."
 msgstr "Siirdamine..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184
-#: mail/em-migrate.c:1201
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1201
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Siirdamine `%s':"
@@ -172,14 +141,10 @@ msgstr "Siirdamine `%s':"
 #  create the local source group
 #  On This Computer is always first and VFolders is always last
 #. create the local source group
-#. On This Computer is always first and VFolders is always last
-#: addressbook/gui/component/addressbook-migrate.c:508
-#: calendar/gui/migration.c:446
-#: calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:195
-#: mail/em-folder-tree-model.c:197
-#: mail/mail-component.c:245
-#: mail/mail-vfolder.c:218
+#: addressbook/gui/component/addressbook-migrate.c:464
+#: calendar/gui/migration.c:446 calendar/gui/migration.c:528
+#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
+#: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr "Kohalik arvuti"
 
@@ -190,45 +155,41 @@ msgstr "Kohalik arvuti"
 #  Create the default Person task list
 #  orange
 #. Create the default Person addressbook
-#. Create the default Person calendar
-#. Create the default Person task list
-#. orange
-#: addressbook/gui/component/addressbook-migrate.c:516
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
-#: calendar/gui/migration.c:454
-#: calendar/gui/migration.c:536
-#: filter/filter-label.c:123
-#: mail/em-migrate.c:1013
-#: mail/mail-config.c:78
+#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: calendar/gui/migration.c:454 calendar/gui/migration.c:536
+#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
 #: mail/mail-config.glade.h:109
 msgid "Personal"
 msgstr "Isiklik"
 
 #  Create the LDAP source group
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:524
+#: addressbook/gui/component/addressbook-migrate.c:480
 msgid "On LDAP Servers"
 msgstr "LDAP serveris"
 
-#: addressbook/gui/component/addressbook-migrate.c:652
+#: addressbook/gui/component/addressbook-migrate.c:608
 msgid "LDAP Servers"
 msgstr "LDAP serverid"
 
-#: addressbook/gui/component/addressbook-migrate.c:772
+#: addressbook/gui/component/addressbook-migrate.c:728
 msgid "Autocompletion Settings"
 msgstr "Automaatlõpetamise sätted"
 
-#: addressbook/gui/component/addressbook-migrate.c:1148
+#: addressbook/gui/component/addressbook-migrate.c:1104
 msgid ""
-"The location and hierarchy of the Evolution contact folders has changed since Evolution 1.x.\n"
+"The location and hierarchy of the Evolution contact folders has changed "
+"since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Evolutioni kontaktikaustade asukoht ja hierarhia on alates Evolution 1.x. versioonist muutunud.\n"
+"Evolutioni kontaktikaustade asukoht ja hierarhia on alates Evolution 1.x. "
+"versioonist muutunud.\n"
 "\n"
 "Palun oota kuni Evolution siirdab sinu kaustasid..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1162
+#: addressbook/gui/component/addressbook-migrate.c:1118
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -238,7 +199,7 @@ msgstr ""
 "\n"
 "Palun oota kuni Evolution siirdab sinu kaustasid..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1171
+#: addressbook/gui/component/addressbook-migrate.c:1127
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -248,44 +209,34 @@ msgstr ""
 "\n"
 "Palun oota kuni Evolution siirdab sinu kaustasid..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1181
+#: addressbook/gui/component/addressbook-migrate.c:1137
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1194
-msgid "Some fields are no longer representable in the contact editor. Please wait while Evolution copies those fields to the 'Notes' field..."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-view.c:674
+#: addressbook/gui/component/addressbook-view.c:675
 #, fuzzy, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr "Kalender '%s' kustutatakse. Oled sa kindel, et soovid jätkata?"
 
-#: addressbook/gui/component/addressbook-view.c:761
+#: addressbook/gui/component/addressbook-view.c:754
 msgid "New Address Book"
 msgstr "Uus aadressiraamat"
 
-#: addressbook/gui/component/addressbook-view.c:762
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:430
-#: calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11
-#: ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5
-#: ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
-#: ui/evolution-contact-list-editor.xml.h:3
-#: ui/evolution-mail-message.xml.h:24
+#: addressbook/gui/component/addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Kustuta"
 
-#: addressbook/gui/component/addressbook-view.c:763
-#: calendar/gui/calendar-component.c:431
-#: calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-view.c:756
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Omadused..."
 
@@ -297,14 +248,9 @@ msgstr "Omadused..."
 #  can not get name, should be a bug of e-book.Anyway, should set a default name.
 #  name = e_book_get_name (book);
 #  Create the contacts group
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
 #. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:1002
+#: addressbook/gui/component/addressbook-view.c:995
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
 #: calendar/gui/migration.c:373
 msgid "Contacts"
 msgstr "Kontaktid"
@@ -318,8 +264,11 @@ msgid "Position of the vertical pane in main view"
 msgstr "Vertikaalpaani asukoht põhivaates"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
-msgid "The number of characters that must be typed before evolution will attempt to autocomplete"
-msgstr "Tähtede arv, mis tuleb sisestada enne kui Evolution üritab automaatlõpetamist"
+msgid ""
+"The number of characters that must be typed before evolution will attempt to "
+"autocomplete"
+msgstr ""
+"Tähtede arv, mis tuleb sisestada enne kui Evolution üritab automaatlõpetamist"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
 msgid "URI for the folder last used in the select names dialog"
@@ -388,11 +337,6 @@ msgid "Manage your S/MIME certificates here"
 msgstr "Siin saad hallata oma S/MIME sertifikaate"
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-#, fuzzy
-msgid "  S_how Supported Bases "
-msgstr "Toetatud otsingubaasid"
-
-#: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -407,379 +351,330 @@ msgstr "Toetatud otsingubaasid"
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1
-#: mail/mail-config.glade.h:3
-#: mail/mail-search.glade.h:1
-#: mail/message-tags.glade.h:1
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
+#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr "1"
 
-#: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1:00"
-msgstr "1:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr "5"
 
-#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
-msgstr "5:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "<b>Authentication</b>"
 msgstr "<b>Autentimine</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Display</b>"
 msgstr "<b>Kuva</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "<b>Downloading</b>"
 msgstr "<b>Allalaadimine</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "<b>Searching</b>"
 msgstr "<b>Otsimine</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:11
 msgid "<b>Server Information</b>"
 msgstr "<b>Serveri info</b>"
 
 #  and now for the action area
 #  and now for the action area
 #  and now for the action area
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:12
 msgid "<b>Type:</b>"
 msgstr "<b>Tüüp:</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add Contacts Group"
 msgstr "Lisa kontaktide grupp"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Address Book Properties"
 msgstr "Aadressiraamatu omadused"
 
-#: addressbook/gui/component/ldap-config.glade.h:18
-#: mail/mail-account-gui.c:79
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:42
 msgid "Always"
 msgstr "Alati"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr "Anonüümselt"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:17
 #: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Peamine"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
-msgid "Connecting"
-msgstr "Ühendamine"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
-#: calendar/gui/dialogs/task-editor.c:200
-#: mail/mail-security.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:18
+#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Täpsustused"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
-msgid "Distinguished _name:"
-msgstr "_Eraldusnimi:"
-
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished name"
 msgstr "Eraldusnimi"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Download limit:"
 msgstr "Allalaadimise piirang:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Email address"
 msgstr "E-posti aadress:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "Email address:"
-msgstr "E-posti aadress: "
-
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "Evolution will use this DN to authenticate you with the server"
-msgstr "Evolution esitab selle eraldusnime serverile audentsuse kontrollil"
-
 # !PARANDA! - sõnasus on kuidagi mäda
-#: addressbook/gui/component/ldap-config.glade.h:29
-msgid "Evolution will use this email address to authenticate you with the server"
-msgstr "Evolution esitab selle e-posti aadressi serverile sinu identuse tõendamiseks"
+#: addressbook/gui/component/ldap-config.glade.h:22
+#, fuzzy
+msgid ""
+"Evolution will use this email address to authenticate you with the server."
+msgstr ""
+"Evolution esitab selle e-posti aadressi serverile sinu identuse tõendamiseks"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Find Possible Search Bases"
 msgstr "Leia võimalikud otsingubaasid"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:24
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: mail/mail-config.glade.h:86
-#: smime/gui/smime-ui.glade.h:27
+#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Üldine"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
-#: mail/mail-account-gui.c:81
+#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:102
 msgid "Never"
 msgstr "Mitte kunagi"
 
-# !PARANDA! - LDAP serveri kehtivuspiirkond
-#: addressbook/gui/component/ldap-config.glade.h:33
-msgid "One"
-msgstr "Üks"
-
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:35
-msgid "S_earch scope: "
-msgstr "Otsingu _kehtivuspiirkond: "
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Search _base:"
+msgstr "Otsingu baas:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:28
 msgid "Search base only"
 msgstr "Otsi ainult baasist"
 
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid "Search base:"
 msgstr "Otsingu baas:"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid "Search scope:"
 msgstr "Otsingu ulatus:"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
-msgid "Searching"
-msgstr "Otsin"
-
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:31
+#, fuzzy
 msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP server if\n"
-"your LDAP server supports SSL or TLS."
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports SSL or TLS."
 msgstr ""
-"See valik tähendab seda, et Evolution ühendub sinu LDAP serverisse ainult siis\n"
+"See valik tähendab seda, et Evolution ühendub sinu LDAP serverisse ainult "
+"siis\n"
 "kui LDAP server toetab SSL või TLS protokolli."
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
 msgid ""
-"Selecting this option means that Evolution will only try to use SSL/TLS if you are in a \n"
-"insecure environment. For example, if you and your LDAP server are behind a firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection is already\n"
-"secure."
-msgstr ""
-"See valik tähendab seda, et Evolution üritab kasutada SSL/TLS protokolli ainult siis kui sa oled\n"
-"ebaturvalises keskkonnas. Näiteks kui sina ja sinu LDAP server asuvad mõlemad tulemüüri taga,\n"
+"Selecting this option means that Evolution will only try to use SSL/TLS if "
+"you are in a insecure environment. For example, if you and your LDAP server "
+"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
+"because your connection is already secure."
+msgstr ""
+"See valik tähendab seda, et Evolution üritab kasutada SSL/TLS protokolli "
+"ainult siis kui sa oled\n"
+"ebaturvalises keskkonnas. Näiteks kui sina ja sinu LDAP server asuvad "
+"mõlemad tulemüüri taga,\n"
 "siis Evolution ei pea kasutama SSL/TLS protokolli, kuna sinu ühendus\n"
 "on juba turvaline."
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:33
 #, fuzzy
 msgid ""
-"Selecting this option means that your server does not support either SSL or TLS.  This \n"
-"means that your connection will be insecure, and that you will be vulnerable to security\n"
-"exploits. "
+"Selecting this option means that your server does not support either SSL or "
+"TLS.  This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits. "
 msgstr ""
-"See valik tähendab seda, et sinu server ei toeta SSL ega TLS protokolli. Seega\n"
+"See valik tähendab seda, et sinu server ei toeta SSL ega TLS protokolli. "
+"Seega\n"
 "on sinu ühendus ebaturvaline ja sa võid olla turvaaukude\n"
 "tõttu ohus."
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Starting point and locations within it"
 msgstr ""
 
-# !PARANDA! - LDAP serveri kehtivuspiirkond
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Sub"
-msgstr "Alam"
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr "Toetatud otsingubaasid"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid ""
-"The search base is the distinguished name (DN)  of the entry where your searches will \n"
-"begin. If you leave this blank, the search will begin at the root of the directory tree."
+"The search base is the distinguished name (DN)  of the entry where your "
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
-"The search scope defines how deep you would like the search to extend down the \n"
-"directory tree. A search scope of \"sub\" will include all entries below your search base.\n"
-"A search scope of \"one\" will only include the entries one level beneath your base.\n"
+"The search scope defines how deep you would like the search to extend down "
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:58
-msgid "This is the full name of your ldap server. For example, \"ldap.mycompany.com\"."
+#: addressbook/gui/component/ldap-config.glade.h:38
+msgid ""
+"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"\"."
 msgstr "See on LDAP serveri täispikk nimi. Näiteks: \"ldap.minufirma.ee\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
-"This is the maximum number of entries to download. Setting this number to be \n"
+"This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:61
-msgid "This is the method evolution will use to authenticate you.  Note that setting this to \"Email Address\" requires anonymous access to your ldap server."
-msgstr "Siin määrataks, mil viisil Evolution tõendab serverile kasutajat.  Märkus: seades selle väärtuseks \"E-posti aadress\", peab valitud LDAP serveri toetama anonüümset ligipääsu."
+#: addressbook/gui/component/ldap-config.glade.h:40
+msgid ""
+"This is the method evolution will use to authenticate you.  Note that "
+"setting this to \"Email Address\" requires anonymous access to your ldap "
+"server."
+msgstr ""
+"Siin määrataks, mil viisil Evolution tõendab serverile kasutajat.  Märkus: "
+"seades selle väärtuseks \"E-posti aadress\", peab valitud LDAP serveri "
+"toetama anonüümset ligipääsu."
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:41
 msgid ""
-"This is the name for this server that will appear in your Evolution folder list.\n"
-"It is for display purposes only. "
+"This is the name for this server that will appear in your Evolution folder "
+"list. It is for display purposes only. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:42
+#, fuzzy
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A \n"
-"list of standard ports has been provided. Ask your system administrator\n"
-"what port you should specify."
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
 msgstr ""
 "See on LDAP serveri port, kuhu Evolution üritab ühendust luua. \n"
 "Nimekiri standardportidest on väljatoodud. Küsi oma süsteemiülemalt\n"
 "millise pordi sa peaksid määrama."
 
-#: addressbook/gui/component/ldap-config.glade.h:67
-msgid "This option controls how long a search will be run."
-msgstr "See valik kontrollib kui kaua lubatakse otsingul töötada."
-
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid "Timeout:"
 msgstr "Taimaut:"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
-msgid "U_se SSL/TLS:"
-msgstr "_Kasuta SSL/TLS:"
-
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr "Eraldusnime (DN) kasutamine"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr "E-posti aadressi kasutamine"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
-#: mail/mail-account-gui.c:80
+#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr "Kui võimalik"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:47
 msgid "_Add Contacts Group"
 msgstr "_Lisa kontaktide grupp"
 
-#: addressbook/gui/component/ldap-config.glade.h:74
-#: calendar/gui/dialogs/calendar-setup.glade.h:12
-msgid "_Display name:"
-msgstr "_Näidatav nimi:"
-
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr "_Allalaadimise piirang:"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Email address:"
 msgstr "_E-posti aadress: "
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:50
+#, fuzzy
+msgid "_Find Possible Search Bases"
+msgstr "Leia võimalikud otsingubaasid"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Log in method:"
 msgstr "_Sisselogimismeetod"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
-#: calendar/gui/dialogs/calendar-setup.glade.h:13
-#: mail/mail-config.glade.h:171
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "_Log in:"
+msgstr "Kasutajanimi"
+
+#: addressbook/gui/component/ldap-config.glade.h:53
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
 msgid "_Name:"
 msgstr "_Nimi:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
-msgid "_Port number:"
-msgstr "_Pordi number:"
-
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid "_Port:"
 msgstr "_Port:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
-msgid "_Search base:"
-msgstr "_Otsingu baas:"
-
-#: addressbook/gui/component/ldap-config.glade.h:82
-msgid "_Server name:"
-msgstr "_Serveri nimi:"
+#: addressbook/gui/component/ldap-config.glade.h:55
+#, fuzzy
+msgid "_Search scope:"
+msgstr "Otsingu ulatus:"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:56
 msgid "_Server:"
 msgstr "_Server:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
-msgid "_Timeout (minutes):"
-msgstr "_Taimaut (minutites):"
+#: addressbook/gui/component/ldap-config.glade.h:57
+#, fuzzy
+msgid "_Timeout:"
+msgstr "Taimaut:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:58
 msgid "_Use secure connection:"
 msgstr "_Turvalise ühenduse kasutamine:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "kaardid"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
-#, fuzzy
-msgid "connecting-tab"
-msgstr "Uus s_akk"
-
-#: addressbook/gui/component/ldap-config.glade.h:88
-msgid "general-tab"
-msgstr "üldine-sakk"
-
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:60
 #: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:22
-#: filter/filter.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
 #: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "minutit"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
-msgid "searching-tab"
-msgstr "otsingu-sakk"
-
-#: addressbook/gui/component/select-names/e-select-names.c:497
+#: addressbook/gui/component/select-names/e-select-names.c:503
 #: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid "Select Contacts from Address Book"
 msgstr "Kontaktide valimine aadressiraamatust"
 
-#: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
@@ -819,7 +714,7 @@ msgstr "Nimetu kontakt"
 
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:222
+#: addressbook/gui/widgets/e-addressbook-view.c:224
 msgid "Source"
 msgstr "Allikas"
 
@@ -891,9 +786,9 @@ msgid "<b>Work</b>"
 msgstr "<b>Töö</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:177
-#: addressbook/gui/widgets/eab-contact-display.c:342
-#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/widgets/eab-contact-display.c:334
+#: addressbook/gui/widgets/eab-contact-display.c:353
 msgid "AIM"
 msgstr "AIM"
 
@@ -927,15 +822,15 @@ msgid "Company:"
 msgstr "Firma:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:265
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
+#: addressbook/gui/contact-editor/e-contact-editor.c:266
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
 msgstr "Kontakt"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:519
+#: addressbook/gui/contact-editor/e-contact-editor.c:520
 msgid "Contact Editor"
 msgstr "Kontaktiredaktor"
 
@@ -956,89 +851,84 @@ msgid "Full _Name..."
 msgstr "T_äisnimi..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-msgid "Home"
-msgstr "Kodu"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "Home Page:"
 msgstr "Kodulehekülg:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-#: calendar/gui/e-itip-control.c:930
-msgid "Location:"
-msgstr "Asukoht:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN Kiirsuhtlusklient"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "Mailing Address"
 msgstr "Kodune aadress"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "Manager:"
 msgstr "Juht:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "Ni_ckname:"
 msgstr "_Hüüdnimi:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "Notes:"
 msgstr "Märkused:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-msgid "Other"
-msgstr "Muu"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#, fuzzy
+msgid "Office:"
+msgstr "Kontor"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "PO Box:"
 msgstr "Sidejaoskonna postkast:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "Personal Information"
 msgstr "Isiklik info"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "Profession:"
 msgstr "Amet:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#, fuzzy
+msgid "Spouse:"
+msgstr "Abikaasa"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "State/Province:"
 msgstr "Maakond/Provints:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "Title:"
 msgstr "Pealkiri:"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+msgid "Video Chat:"
+msgstr ""
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "Wants to receive HTML mail"
 msgstr "Soovib saada _HTML sõnumeid"
 
-#  URL
 #: addressbook/gui/contact-editor/contact-editor.glade.h:42
-msgid "Webcam:"
-msgstr "Veebikaamera:"
+#, fuzzy
+msgid "Web Log:"
+msgstr "Veebilehekülg:"
 
 #  red
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
+#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
-#: filter/filter-label.c:122
-#: mail/em-migrate.c:1012
-#: mail/mail-config.c:77
+#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
 #: mail/mail-config.glade.h:157
 msgid "Work"
 msgstr "Töö"
@@ -1056,17 +946,10 @@ msgid "_File under:"
 msgstr "_Salvesta kui:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "_Where:"
 msgstr "_Kus:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
-msgid "item7"
-msgstr "element7"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
-msgid "item8"
-msgstr "element8"
-
 #: addressbook/gui/contact-editor/eab-editor.c:315
 msgid ""
 "Are you sure you want\n"
@@ -1084,16 +967,16 @@ msgstr ""
 "kustutada seda kontakti?"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:351
-#: addressbook/gui/widgets/eab-contact-display.c:372
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Address"
 msgstr "Aadress"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:286
+#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard.c:174
@@ -2071,96 +1954,110 @@ msgstr "Sambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/contact-editor/e-contact-editor.c:179
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:337
+#: addressbook/gui/widgets/eab-contact-display.c:356
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
-#: addressbook/gui/widgets/eab-contact-display.c:347
-#: addressbook/gui/widgets/eab-contact-display.c:366
+#: addressbook/gui/contact-editor/e-contact-editor.c:180
+#: addressbook/gui/widgets/eab-contact-display.c:339
+#: addressbook/gui/widgets/eab-contact-display.c:358
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: addressbook/gui/widgets/eab-contact-display.c:338
+#: addressbook/gui/widgets/eab-contact-display.c:357
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:344
-#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#: addressbook/gui/widgets/eab-contact-display.c:355
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
+#: addressbook/gui/contact-editor/e-contact-editor.c:183
 msgid "GroupWise"
 msgstr "Groupwise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:251
+#: addressbook/gui/contact-editor/e-contact-editor.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+msgid "Home"
+msgstr "Kodu"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+msgid "Other"
+msgstr "Muu"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
 msgid "Source Book"
 msgstr "Lähteraamat"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:258
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Target Book"
 msgstr "Sihtraamat"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:272
+#: addressbook/gui/contact-editor/e-contact-editor.c:273
 msgid "Is New Contact"
 msgstr "Tegemist on uue kontaktiga"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:279
+#: addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Writable Fields"
 msgstr "Muudetavad väljad"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:293
+#: addressbook/gui/contact-editor/e-contact-editor.c:294
 msgid "Changed"
 msgstr "Muudetud"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2294
-msgid "Category editor not available."
-msgstr "Kategooriaredaktor pole saadaval."
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2302
+#: addressbook/gui/contact-editor/e-contact-editor.c:2352
 msgid "This contact belongs to these categories:"
 msgstr "Antud kontakt kuulub järgnevatesse kategooriatesse:"
 
 #  Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2379
+#. Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:2429
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Kustuta valitud kontaktid"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2383
+#: addressbook/gui/contact-editor/e-contact-editor.c:2433
 msgid "No image"
 msgstr "Puuduv pilt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2560
-#: addressbook/gui/contact-editor/e-contact-editor.c:2723
-msgid "You are moving the contact from one address book to another, but it cannot be removed from the source. Do you want to save a copy instead?"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2607
+#: addressbook/gui/contact-editor/e-contact-editor.c:2636
 #, fuzzy
 msgid ""
 "The contact data is invalid:\n"
 "\n"
 msgstr "Otsimisvahemik ei ole sobiv."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2700
-msgid "The contact cannot be saved to the selected address book. Do you want to discard changes?"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#, fuzzy
+msgid "Invalid contact."
+msgstr "Vigane allkiri"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+msgid ""
+"The contact cannot be saved to the selected address book. Do you want to "
+"discard changes?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2704
-#: addressbook/gui/contact-editor/e-contact-editor.c:2728
-#: addressbook/gui/widgets/eab-gui-util.c:208
+#: addressbook/gui/contact-editor/e-contact-editor.c:2727
+#: addressbook/gui/contact-editor/e-contact-editor.c:2751
 msgid "_Discard"
 msgstr "_Unusta"
 
+#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+msgid ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:62
 msgid "AOL Instant Messenger"
 msgstr "AOL kiirsuhtlusklient"
@@ -2338,30 +2235,30 @@ msgstr "_Loetelu nimi:"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "Kirjuta e-posti aadress või tiri kontakt allolevasse loendisse:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "contact-list-editor"
 msgstr "kontaktide-nimekirja-redaktor"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:153
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:215
+#: addressbook/gui/widgets/e-addressbook-view.c:217
 #: addressbook/gui/widgets/e-minicard-view.c:460
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Raamat"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
 msgid "Is New List"
 msgstr "On uus nimekiri"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:215
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
 msgid "Contact List Editor"
 msgstr "Kontaktiloendi redaktor"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:438
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
 msgid "Save List as VCard"
 msgstr "Salvesta nimekiri VKaardina"
 
@@ -2408,96 +2305,96 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Laiendatud otsing"
 
-#: addressbook/gui/widgets/eab-contact-display.c:129
-#: addressbook/gui/widgets/eab-contact-display.c:192
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
 msgid "(map)"
 msgstr "(kaart)"
 
-#: addressbook/gui/widgets/eab-contact-display.c:139
-#: addressbook/gui/widgets/eab-contact-display.c:205
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
 msgid "map"
 msgstr "kaart"
 
-#: addressbook/gui/widgets/eab-contact-display.c:257
-#: addressbook/gui/widgets/eab-contact-display.c:533
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:525
 msgid "List Members"
 msgstr "Nimekirja liikmed"
 
-#: addressbook/gui/widgets/eab-contact-display.c:329
-#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/eab-contact-display.c:321
+#: addressbook/gui/widgets/eab-contact-display.c:323
 msgid "E-mail"
 msgstr "E-post"
 
-#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/eab-contact-display.c:332
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organisatsioon"
 
-#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "Position"
 msgstr "Ametikoht"
 
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:354
 msgid "Groupwise"
 msgstr "Groupwise"
 
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:340
 msgid "Video Conferencing"
 msgstr "Videokonverents"
 
-#: addressbook/gui/widgets/eab-contact-display.c:349
-#: addressbook/gui/widgets/eab-contact-display.c:370
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Phone"
 msgstr "Telefon"
 
-#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:342
 msgid "Fax"
 msgstr "Faks"
 
-#: addressbook/gui/widgets/eab-contact-display.c:354
+#: addressbook/gui/widgets/eab-contact-display.c:346
 msgid "work"
 msgstr "töö"
 
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:359
 msgid "WWW"
 msgstr "WWW"
 
-#: addressbook/gui/widgets/eab-contact-display.c:368
-#: addressbook/gui/widgets/eab-contact-display.c:587
+#: addressbook/gui/widgets/eab-contact-display.c:360
+#: addressbook/gui/widgets/eab-contact-display.c:579
 msgid "Blog"
 msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/eab-contact-display.c:363
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Mobiiltelefon"
 
-#: addressbook/gui/widgets/eab-contact-display.c:375
+#: addressbook/gui/widgets/eab-contact-display.c:367
 msgid "personal"
 msgstr "isiklik"
 
-#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/eab-contact-display.c:374
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Märkus"
 
-#: addressbook/gui/widgets/eab-contact-display.c:548
+#: addressbook/gui/widgets/eab-contact-display.c:540
 msgid "Job Title"
 msgstr "Ametinimetus"
 
-#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/eab-contact-display.c:544
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:774
+#: smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "E-post"
 
-#: addressbook/gui/widgets/eab-contact-display.c:579
+#: addressbook/gui/widgets/eab-contact-display.c:571
 msgid "Home page"
 msgstr "Kodulehekülg"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 msgid "Success"
 msgstr "Õnnestus"
 
@@ -2505,23 +2402,26 @@ msgstr "Õnnestus"
 #  E_BOOK_ERROR_BUSY
 #  E_BOOK_ERROR_INVALID_ARG
 #  E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:50
 #, fuzzy
 msgid "Backend busy"
 msgstr "Kataloog on töös"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Repository offline"
 msgstr "Hoidla offlain"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Address Book does not exist"
 msgstr "Aadressiraamatut ei eksisteeri"
 
 #  E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:53
 #, fuzzy
 msgid "No Self Contact defined"
 msgstr "Ühtegi valikut pole määratud"
@@ -2529,37 +2429,33 @@ msgstr "Ühtegi valikut pole määratud"
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Permission denied"
 msgstr "Juurdepääs keelatud"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Contact not found"
 msgstr "Kontakti ei leitud"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Contact ID already exists"
 msgstr "Kontakti ID on juba olemas"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Protocol not supported"
 msgstr "Mitte toetatud protokoll"
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:60
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:233
-#: calendar/gui/e-calendar-table.c:450
-#: calendar/gui/e-cal-model-tasks.c:352
-#: calendar/gui/e-cal-model-tasks.c:655
-#: calendar/gui/print.c:2349
-#: camel/camel-service.c:728
-#: camel/camel-service.c:766
-#: camel/camel-service.c:850
-#: camel/camel-service.c:890
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
+#: calendar/gui/e-cal-model-tasks.c:655 calendar/gui/print.c:2349
+#: camel/camel-service.c:728 camel/camel-service.c:766
+#: camel/camel-service.c:850 camel/camel-service.c:890
 #: camel/providers/pop3/camel-pop3-store.c:451
 #: camel/providers/pop3/camel-pop3-store.c:532
 msgid "Cancelled"
@@ -2567,59 +2463,77 @@ msgstr "Katkestatud"
 
 #  E_BOOK_ERROR_COULD_NOT_CANCEL
 #  E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:61
 #, fuzzy
 msgid "Could not cancel"
 msgstr "Kuulamist ei õnnestunud peatada"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Authentication Failed"
 msgstr "Autentimine ebaõnnestus."
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Authentication Required"
 msgstr "Autentimine on vajalik"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:66
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "TLS not Available"
 msgstr "TLS ei ole kättesaadav"
 
 #  E_BOOK_ERROR_CORBA_EXCEPTION
 #  E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:66
 #, fuzzy
 msgid "No such source"
 msgstr "%s: sellist partitsiooni ei ole\n"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:69
+#: addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Other error"
 msgstr "Muu viga"
 
-#: addressbook/gui/widgets/eab-gui-util.c:103
-msgid "We were unable to open this addressbook.  Please check that the path exists and that you have permission to access it."
-msgstr "Aadressiraamatu avamine nurjus.  Palun kontrolli, kas otsingutee on õige ja kas sul on sellele vajalikud ligipääsuõigused."
-
-#: addressbook/gui/widgets/eab-gui-util.c:110
-msgid "We were unable to open this addressbook.  This either means you have entered an incorrect URI, or the LDAP server is unreachable."
-msgstr "Aadressiraamatu avamine nurjus. Põhjuseks võibolla see, et sisestasid vigase URI või kasutatav LDAP serverei ole kättesaadav."
+#: addressbook/gui/widgets/eab-gui-util.c:90
+msgid ""
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
+msgstr ""
+"Aadressiraamatu avamine nurjus.  Palun kontrolli, kas otsingutee on õige ja "
+"kas sul on sellele vajalikud ligipääsuõigused."
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
-msgid "This version of Evolution does not have LDAP support compiled in to it.  If you want to use LDAP in Evolution you must compile the program from the CVS sources after retrieving OpenLDAP from the link below."
-msgstr "Käesolev Evolution'i versioon ei ole kompileeritud LDAPtoega. Kui sa soovid Evolution'i koos LDAP'i toega, peadise Evolution'i lähtetekstidest kokku kompileerima.Eelnevalt laadi OpenLDAP alljärgneva viida abil."
+#: addressbook/gui/widgets/eab-gui-util.c:97
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+"Aadressiraamatu avamine nurjus. Põhjuseks võibolla see, et sisestasid vigase "
+"URI või kasutatav LDAP serverei ole kättesaadav."
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
-msgid "We were unable to open this addressbook.  This either means you have entered an incorrect URI, or the server is unreachable."
-msgstr "Aadressiraamatu avamine ebaõnnestus. Põhjuseks võibolla see, et sisestasid vale URI või kasutatav serverei ole kättesaadav."
+#: addressbook/gui/widgets/eab-gui-util.c:102
+#, fuzzy
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  If "
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
+msgstr ""
+"Käesolev Evolution'i versioon ei ole kompileeritud LDAPtoega. Kui sa soovid "
+"Evolution'i koos LDAP'i toega, peadise Evolution'i lähtetekstidest kokku "
+"kompileerima.Eelnevalt laadi OpenLDAP alljärgneva viida abil."
 
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "Unable to open addressbook"
-msgstr "Aadressiraamatu avamine ebaõnnestus"
+#: addressbook/gui/widgets/eab-gui-util.c:109
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+msgstr ""
+"Aadressiraamatu avamine ebaõnnestus. Põhjuseks võibolla see, et sisestasid "
+"vale URI või kasutatav serverei ole kättesaadav."
 
-#: addressbook/gui/widgets/eab-gui-util.c:162
+#: addressbook/gui/widgets/eab-gui-util.c:129
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2627,7 +2541,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:168
+#: addressbook/gui/widgets/eab-gui-util.c:135
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -2635,49 +2549,45 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:174
+#: addressbook/gui/widgets/eab-gui-util.c:141
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:177
+#: addressbook/gui/widgets/eab-gui-util.c:144
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:147
 msgid "This query did not complete successfully."
 msgstr "See päring ei lõpetanud edukalt."
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
-msgid "Do you want to save changes?"
-msgstr "Kas soovid muudatused salvestada?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:169
 msgid "Error adding list"
 msgstr "Viga listi lisamisel"
 
-#: addressbook/gui/widgets/eab-gui-util.c:229
-#: addressbook/gui/widgets/eab-gui-util.c:652
+#: addressbook/gui/widgets/eab-gui-util.c:169
+#: addressbook/gui/widgets/eab-gui-util.c:580
 msgid "Error adding contact"
 msgstr "Viga kontakti lisamisel"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying list"
 msgstr "Viga listi muutmisel"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying contact"
 msgstr "Viga kontakti muutmisel"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:192
 msgid "Error removing list"
 msgstr "Viga listi eemaldamisel"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
-#: addressbook/gui/widgets/eab-gui-util.c:610
+#: addressbook/gui/widgets/eab-gui-util.c:192
+#: addressbook/gui/widgets/eab-gui-util.c:538
 msgid "Error removing contact"
 msgstr "Viga kontakti eemaldamisel"
 
-#: addressbook/gui/widgets/eab-gui-util.c:334
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2686,7 +2596,7 @@ msgstr ""
 "%d kontakti avamisega kaasneb %d uue akna avamine.\n"
 "Oled sa kindel, et soovid kuvada kõiki neid kontakte?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:360
+#: addressbook/gui/widgets/eab-gui-util.c:300
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2695,49 +2605,44 @@ msgstr ""
 "%s on juba olemas\n"
 "Kas soovid üle kirjutada?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:364
+#: addressbook/gui/widgets/eab-gui-util.c:304
 msgid "Overwrite"
 msgstr "Kirjuta üle"
 
-#: addressbook/gui/widgets/eab-gui-util.c:400
-#, c-format
-msgid "Error saving %s: %s"
-msgstr "Viga %s salvestamisel: %s"
-
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:437
+#: addressbook/gui/widgets/eab-gui-util.c:365
 msgid "card.vcf"
 msgstr "kaart.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:571
+#: addressbook/gui/widgets/eab-gui-util.c:499
 msgid "list"
 msgstr "nimekiri"
 
-#: addressbook/gui/widgets/eab-gui-util.c:706
+#: addressbook/gui/widgets/eab-gui-util.c:634
 msgid "Move contact to"
 msgstr "Liiguta kontaktid"
 
-#: addressbook/gui/widgets/eab-gui-util.c:708
+#: addressbook/gui/widgets/eab-gui-util.c:636
 msgid "Copy contact to"
 msgstr "Kopeeri kontaktid"
 
-#: addressbook/gui/widgets/eab-gui-util.c:711
+#: addressbook/gui/widgets/eab-gui-util.c:639
 msgid "Move contacts to"
 msgstr "Liiguta kontaktid"
 
-#: addressbook/gui/widgets/eab-gui-util.c:713
+#: addressbook/gui/widgets/eab-gui-util.c:641
 msgid "Copy contacts to"
 msgstr "Kopeeri kontaktid"
 
-#: addressbook/gui/widgets/eab-gui-util.c:716
+#: addressbook/gui/widgets/eab-gui-util.c:644
 msgid "Select target addressbook."
 msgstr "Vali sihtaadressiraamat."
 
-#: addressbook/gui/widgets/eab-gui-util.c:939
+#: addressbook/gui/widgets/eab-gui-util.c:867
 msgid "Multiple VCards"
 msgstr "Mitu VKaarti"
 
-#: addressbook/gui/widgets/eab-gui-util.c:942
+#: addressbook/gui/widgets/eab-gui-util.c:870
 #, c-format
 msgid "VCard for %s"
 msgstr "VKaart %s kohta"
@@ -2792,9 +2697,14 @@ msgid "Merge E-Mail Address"
 msgstr "Ühenda e-posti aadressid"
 
 #: addressbook/gui/widgets/eab-vcard-control.c:139
+#, fuzzy, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "ei sisalda"
+msgstr[1] "ei sisalda"
+
 #: addressbook/gui/widgets/eab-vcard-control.c:223
 #: addressbook/gui/widgets/eab-vcard-control.c:273
-#, c-format
 msgid "Show Full VCard"
 msgstr "Kogu VKaardi kuvamine"
 
@@ -2811,12 +2721,17 @@ msgid "No contacts"
 msgstr "Kontakte pole"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:151
+#, fuzzy, c-format
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "Kontakte pole"
+msgstr[1] "Kontakte pole"
+
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:229
+#: addressbook/gui/widgets/e-addressbook-view.c:231
 #: addressbook/gui/widgets/e-minicard-view.c:467
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
-#, c-format
 msgid "Query"
 msgstr "Päring"
 
@@ -2833,146 +2748,130 @@ msgstr "Mudel"
 msgid "Error modifying card"
 msgstr "Viga kaardi muutmisel"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:163
 msgid "Name begins with"
 msgstr "Nimi algab stringiga"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:164
 msgid "Email begins with"
 msgstr "E-post algab stringiga"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:57
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Kategooria on"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-#: calendar/gui/cal-search-bar.c:50
+#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Suvaline väli sisaldab"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+#: addressbook/gui/widgets/e-addressbook-view.c:172
 msgid "Advanced..."
 msgstr "Edasijõudnutele..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:236
+#: addressbook/gui/widgets/e-addressbook-view.c:238
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:250
+#: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Tüüp"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:506
+#: addressbook/gui/widgets/e-addressbook-view.c:508
 msgid "Address Book"
 msgstr "Aadressiraamat"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
 #: addressbook/gui/widgets/e-addressbook-view.c:2080
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard..."
 msgstr "Salvesta vKaardina..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 msgid "New Contact..."
 msgstr "Uus kontakt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "New Contact List..."
 msgstr "Uus kontaktide nimekiri..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Go to Folder..."
 msgstr "Mine kausta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Import..."
 msgstr "Impordi..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1066
 msgid "Search for Contacts..."
 msgstr "Otsi kontakte..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 msgid "Address Book Sources..."
 msgstr "Aadressiraamatu allikad..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1069
 msgid "Pilot Settings..."
 msgstr "Pilot pihuarvuti sätted..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Edasta kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
 msgid "Send Message to Contact"
 msgstr "Saada kontaktile sõnum"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073
-#: calendar/gui/print.c:2480
-#: ui/evolution-addressbook.xml.h:16
-#: ui/evolution-calendar.xml.h:19
-#: ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5
-#: ui/evolution-mail-message.xml.h:80
-#: ui/evolution-tasks.xml.h:14
+#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
+#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Trüki"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
+#: addressbook/gui/widgets/e-addressbook-view.c:1077
 msgid "Print Envelope"
 msgstr "Trüki ümbrik"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
+#: addressbook/gui/widgets/e-addressbook-view.c:1081
 msgid "Copy to Address Book..."
 msgstr "Kopeeri aadressiraamatusse..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1080
+#: addressbook/gui/widgets/e-addressbook-view.c:1082
 msgid "Move to Address Book..."
 msgstr "Liiguta aadressiraamatusse..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
-#: ui/evolution-addressbook.xml.h:6
-#: ui/evolution-tasks.xml.h:4
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Lõika"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:428
-#: calendar/gui/tasks-component.c:363
-#: ui/evolution-addressbook.xml.h:2
-#: ui/evolution-mail-message.xml.h:9
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopeeri"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
-#: ui/evolution-addressbook.xml.h:13
-#: ui/evolution-tasks.xml.h:11
+#: addressbook/gui/widgets/e-addressbook-view.c:1087
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Aseta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:1092
+#: calendar/gui/e-calendar-view.c:1280
 msgid "Current View"
 msgstr "Käesolev vaade"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1309
-#, c-format
-msgid ""
-"The addressbook backend for\n"
-"%s\n"
-"has crashed. You will have to restart Evolution in order to use it again"
-msgstr ""
-
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1667
-#: calendar/gui/cal-search-bar.c:362
+#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Suvaline kategooria"
 
@@ -3078,7 +2977,7 @@ msgstr "Raadio"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:257
+#: calendar/gui/e-meeting-list-view.c:234
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Roll"
@@ -3190,18 +3089,18 @@ msgstr "Kaardi vaade"
 msgid "GTK Tree View"
 msgstr "GTK Puuvaade"
 
-#: addressbook/gui/widgets/test-reflow.c:119
+#: addressbook/gui/widgets/test-reflow.c:106
 #, fuzzy
 msgid "Reflow Test"
 msgstr "Html test"
 
-#: addressbook/gui/widgets/test-reflow.c:120
+#: addressbook/gui/widgets/test-reflow.c:107
 #: addressbook/printing/test-contact-print-style-editor.c:54
 #: addressbook/printing/test-print.c:53
 msgid "Copyright (C) 2000, Ximian, Inc."
 msgstr "Autoriõigus (C) 2000, Ximian, Inc."
 
-#: addressbook/gui/widgets/test-reflow.c:122
+#: addressbook/gui/widgets/test-reflow.c:109
 msgid "This should test the reflow canvas item"
 msgstr ""
 
@@ -3452,7 +3351,8 @@ msgid "Export in asynchronous mode "
 msgstr "  -s, --slideshow            käivitu slaidiseanss-moodis\n"
 
 #: addressbook/tools/evolution-addressbook-export.c:63
-msgid "The number of cards in one output file in asychronous mode,default size 100."
+msgid ""
+"The number of cards in one output file in asychronous mode,default size 100."
 msgstr ""
 
 #: addressbook/tools/evolution-addressbook-export.c:63
@@ -3460,7 +3360,8 @@ msgid "NUMBER"
 msgstr "NUMBER"
 
 #: addressbook/tools/evolution-addressbook-export.c:91
-msgid "Command line arguments error, please use --help option to see the usage."
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
 msgstr ""
 
 #: addressbook/tools/evolution-addressbook-export.c:105
@@ -3479,15 +3380,21 @@ msgstr ""
 msgid "Impossible internal error."
 msgstr "Võimatu sisemine viga."
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:629
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
 msgid "Can not open file"
 msgstr "Faili ei saa avada"
 
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-msgid "Can not load URI"
-msgstr "URI't ei saa laadida"
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "Aadressiraamatut ei õnnestunud laadida"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Aadressiraamatu avamine ebaõnnestus"
 
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
@@ -3505,8 +3412,7 @@ msgstr "Failinime ei esitatud."
 msgid "Unnamed List"
 msgstr "Nimetu nimekiri"
 
-#: calendar/common/authentication.c:37
-#: calendar/gui/e-pub-utils.c:301
+#: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Sisesta parool"
@@ -3616,7 +3522,8 @@ msgstr ""
 #: calendar/gui/alarm-notify/alarm-queue.c:1099
 #, c-format
 msgid ""
-"An Evolution Calendar reminder is about to trigger. This reminder is configured to run the following program:\n"
+"An Evolution Calendar reminder is about to trigger. This reminder is "
+"configured to run the following program:\n"
 "\n"
 "        %s\n"
 "\n"
@@ -3782,20 +3689,23 @@ msgstr "Kas näidata kellaaega 24 tunni formaadis või kasutada am/pm formaati."
 msgid "Whether to show week numbers in date navigator"
 msgstr "Kas kuvada nädalate numbreid kuupäevasirvijas"
 
-#: calendar/gui/calendar-commands.c:117
-#: calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:88
-#: calendar/gui/gnome-cal.c:1703
-#: camel/providers/groupwise/camel-gw-listener.c:304
-#: camel/providers/groupwise/camel-gw-listener.c:327
+#: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
+#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/gnome-cal.c:1705
+#: camel/providers/groupwise/camel-gw-listener.c:311
+#: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
 msgstr "Kalender"
 
 #: calendar/gui/calendar-commands.c:352
 #, fuzzy
-msgid "This operation will permanently erase all events older than the selected amount of time. If you continue, you will not be able to recover these events."
+msgid ""
+"This operation will permanently erase all events older than the selected "
+"amount of time. If you continue, you will not be able to recover these "
+"events."
 msgstr ""
-"See tegevus eemaldab kõik kustutatud sõnumid. Hiljem ei ole neid sõnumeid enam võimalik taastada.\n"
+"See tegevus eemaldab kõik kustutatud sõnumid. Hiljem ei ole neid sõnumeid "
+"enam võimalik taastada.\n"
 "\n"
 "Kas tõesti eemaldame kustutatud sõnumid?"
 
@@ -3806,57 +3716,40 @@ msgstr "on väiksem kui"
 
 #: calendar/gui/calendar-commands.c:363
 #: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:19
-#: filter/filter.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
 msgid "days"
 msgstr "päeva"
 
-#: calendar/gui/calendar-commands.c:432
-#: calendar/gui/calendar-component.c:504
+#: calendar/gui/calendar-commands.c:432 calendar/gui/calendar-component.c:504
 msgid "%A %d %B %Y"
 msgstr "%A, %d. %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. %d = day of month, %b = abbreviated month name.
-#. You can change the order but don't change the
-#. specifiers or add anything.
-#: calendar/gui/calendar-commands.c:435
-#: calendar/gui/calendar-component.c:507
-#: calendar/gui/e-day-view.c:1588
-#: calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
+#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
 #: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a, %d. %b"
 
-#: calendar/gui/calendar-commands.c:437
-#: calendar/gui/calendar-commands.c:442
-#: calendar/gui/calendar-commands.c:444
-#: calendar/gui/calendar-component.c:509
-#: calendar/gui/calendar-component.c:514
-#: calendar/gui/calendar-component.c:516
+#: calendar/gui/calendar-commands.c:437 calendar/gui/calendar-commands.c:442
+#: calendar/gui/calendar-commands.c:444 calendar/gui/calendar-component.c:509
+#: calendar/gui/calendar-component.c:514 calendar/gui/calendar-component.c:516
 msgid "%a %d %b %Y"
 msgstr "%a, %d. %b %Y"
 
-#: calendar/gui/calendar-commands.c:461
-#: calendar/gui/calendar-commands.c:467
-#: calendar/gui/calendar-commands.c:473
-#: calendar/gui/calendar-commands.c:475
-#: calendar/gui/calendar-component.c:528
-#: calendar/gui/calendar-component.c:535
-#: calendar/gui/calendar-component.c:541
-#: calendar/gui/calendar-component.c:543
+#: calendar/gui/calendar-commands.c:461 calendar/gui/calendar-commands.c:467
+#: calendar/gui/calendar-commands.c:473 calendar/gui/calendar-commands.c:475
+#: calendar/gui/calendar-component.c:528 calendar/gui/calendar-component.c:535
+#: calendar/gui/calendar-component.c:541 calendar/gui/calendar-component.c:543
 msgid "%d %B %Y"
 msgstr "%d. %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:465
-#: calendar/gui/calendar-component.c:533
-#: calendar/gui/e-week-view-main-item.c:337
-#: calendar/gui/print.c:1498
+#: calendar/gui/calendar-commands.c:465 calendar/gui/calendar-component.c:533
+#: calendar/gui/e-week-view-main-item.c:337 calendar/gui/print.c:1498
 msgid "%d %B"
 msgstr "%d. %B"
 
@@ -3884,7 +3777,9 @@ msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
 #: calendar/gui/calendar-component.c:963
-msgid "Selected calendar is read-only, events cannot be created. Please select a read-write calendar."
+msgid ""
+"Selected calendar is read-only, events cannot be created. Please select a "
+"read-write calendar."
 msgstr ""
 
 #: calendar/gui/calendar-component.c:1071
@@ -3966,24 +3861,23 @@ msgstr "Nädala vaade"
 msgid "Month View"
 msgstr "Kuu vaade"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Kokkuvõte sisaldab"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Kirjeldus sisaldab"
 
-#: calendar/gui/cal-search-bar.c:54
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Kommentaar sisaldab"
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:53
 msgid "Location contains"
 msgstr "Asukoht sisaldab"
 
-#: calendar/gui/cal-search-bar.c:366
-#: camel/camel-vee-store.c:329
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
 msgid "Unmatched"
 msgstr "Puudub"
 
@@ -4006,24 +3900,24 @@ msgstr " Sul ei ole õigusi avada Piloti seadet."
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/dialogs/alarm-options.c:466
+#: calendar/gui/dialogs/alarm-options.c:467
 msgid "Audio Alarm Options"
 msgstr "Helialarmi häälestus"
 
-#: calendar/gui/dialogs/alarm-options.c:475
+#: calendar/gui/dialogs/alarm-options.c:476
 msgid "Message Alarm Options"
 msgstr "Sõnumialarmi häälestus"
 
-#: calendar/gui/dialogs/alarm-options.c:484
+#: calendar/gui/dialogs/alarm-options.c:485
 #, fuzzy
 msgid "Email Alarm Options"
 msgstr "Helialarmi häälestus"
 
-#: calendar/gui/dialogs/alarm-options.c:493
+#: calendar/gui/dialogs/alarm-options.c:494
 msgid "Program Alarm Options"
 msgstr "Programmi alarmi häälestus"
 
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:510
 msgid "Unknown Alarm Options"
 msgstr "Tundmatu alarmi häälestus"
 
@@ -4060,8 +3954,7 @@ msgstr "Saaja"
 msgid "With these arguments:"
 msgstr "Nende parameetritega:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11
-#: smime/gui/smime-ui.glade.h:47
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
 msgid "dialog1"
 msgstr "dialog1"
 
@@ -4070,8 +3963,7 @@ msgid "extra times every"
 msgstr "korda, vahemikuga"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:20
-#: filter/filter.glade.h:16
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr "tundi"
 
@@ -4094,13 +3986,11 @@ msgstr "Põhilised asjad"
 msgid "Date/Time:"
 msgstr "Kuupäev ja kell:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4
-#: calendar/gui/e-alarm-list.c:444
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Mängi heli"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5
-#: calendar/gui/e-alarm-list.c:448
+#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:448
 #, fuzzy
 msgid "Pop up an alert"
 msgstr "GenericName=Meilide teadustaja"
@@ -4109,21 +3999,18 @@ msgstr "GenericName=Meilide teadustaja"
 msgid "Reminders"
 msgstr "Meeldetuletajad"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:7
-#: calendar/gui/e-alarm-list.c:456
+#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Käivita programm"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8
-#: calendar/gui/e-alarm-list.c:452
+#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Saada sõnum"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:921
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Kokkuvõte:"
 
@@ -4153,7 +4040,6 @@ msgid "hour(s)"
 msgstr "tund(i)"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:21
 msgid "minute(s)"
 msgstr "minut(it)"
 
@@ -4161,29 +4047,31 @@ msgstr "minut(it)"
 msgid "start of appointment"
 msgstr "kokkusaamise algust"
 
-#: calendar/gui/dialogs/calendar-setup.c:170
+#: calendar/gui/dialogs/calendar-setup.c:172
 #, fuzzy
 msgid "You must specify a location to get the calendar from."
 msgstr "Stiili nimi:"
 
-#: calendar/gui/dialogs/calendar-setup.c:178
+#: calendar/gui/dialogs/calendar-setup.c:180
 #, fuzzy, c-format
 msgid "The source location '%s' is not well-formed."
 msgstr "`%s' laadimiseks vajalik meetod ei ole toetatud."
 
-#: calendar/gui/dialogs/calendar-setup.c:193
+#: calendar/gui/dialogs/calendar-setup.c:195
 #, fuzzy, c-format
 msgid "The source location '%s' is not a webcal source."
 msgstr "Asukoha URL ei ole absoluutne."
 
-#: calendar/gui/dialogs/calendar-setup.c:265
+#: calendar/gui/dialogs/calendar-setup.c:275
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:278
+#: calendar/gui/dialogs/calendar-setup.c:288
 #, c-format
-msgid "The group '%s' is remote. You must specify a location to get the calendar from"
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
 msgstr ""
 
 #: calendar/gui/dialogs/calendar-setup.glade.h:2
@@ -4198,53 +4086,31 @@ msgstr "Ülesannetegrupi lisamine"
 msgid "C_olor:"
 msgstr "_Värv:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "Calendar Properties"
-msgstr "Kalendri atribuudid"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
-#: mail/mail-config.glade.h:110
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
 msgid "Pick a color"
 msgstr "Vali värvus"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:8
-msgid "Remote"
-msgstr "Võrgus"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "Task List Properties"
-msgstr "Ülesandeloetelu omadused"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
 msgid "_Add Calendar"
 msgstr "_Kalendri lisamine"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
 msgid "_Add Group"
 msgstr "_Grupi lisamine"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-msgid "_Refresh Interval:"
-msgstr "_Uuendamise intervall:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
 msgid "_Refresh:"
 msgstr "_Värskenda:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-msgid "_Source URL:"
-msgstr "_Lähte-URL:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "_Type:"
 msgstr "_Tüüp:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
 msgid "_URL:"
 msgstr "_URL:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:23
-#: filter/filter.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
 msgid "weeks"
 msgstr "nädalat"
 
@@ -4254,10 +4120,8 @@ msgstr "nädalat"
 #  has "activatable" set.
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
-#: calendar/gui/dialogs/cal-prefs-dialog.c:567
-#: mail/em-account-prefs.c:466
-#: mail/em-composer-prefs.c:677
-#: mail/em-composer-prefs.c:905
+#: calendar/gui/dialogs/cal-prefs-dialog.c:567 mail/em-account-prefs.c:466
+#: mail/em-composer-prefs.c:677 mail/em-composer-prefs.c:905
 msgid "Enabled"
 msgstr "Lubatud"
 
@@ -4271,24 +4135,18 @@ msgstr "Ära eemalda"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.c:778
 #: calendar/gui/dialogs/cal-prefs-dialog.c:811
-#: calendar/gui/dialogs/cal-prefs-dialog.c:844
-#: mail/em-account-prefs.c:288
-#: mail/em-account-prefs.c:329
-#: mail/em-account-prefs.c:372
-#: mail/em-composer-prefs.c:596
-#: mail/em-composer-prefs.c:654
+#: calendar/gui/dialogs/cal-prefs-dialog.c:844 mail/em-account-prefs.c:288
+#: mail/em-account-prefs.c:329 mail/em-account-prefs.c:372
+#: mail/em-composer-prefs.c:596 mail/em-composer-prefs.c:654
 #: mail/em-composer-prefs.c:684
 msgid "Disable"
 msgstr "Keela"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.c:778
 #: calendar/gui/dialogs/cal-prefs-dialog.c:811
-#: calendar/gui/dialogs/cal-prefs-dialog.c:846
-#: mail/em-account-prefs.c:288
-#: mail/em-account-prefs.c:329
-#: mail/em-account-prefs.c:374
-#: mail/em-composer-prefs.c:596
-#: mail/em-composer-prefs.c:654
+#: calendar/gui/dialogs/cal-prefs-dialog.c:846 mail/em-account-prefs.c:288
+#: mail/em-account-prefs.c:329 mail/em-account-prefs.c:374
+#: mail/em-composer-prefs.c:596 mail/em-composer-prefs.c:654
 #: mail/em-composer-prefs.c:684
 msgid "Enable"
 msgstr "Luba"
@@ -4375,7 +4233,7 @@ msgstr "Vaba/Hõivatud info avalikustamine"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:557
+#: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Reede"
 
@@ -4389,7 +4247,7 @@ msgstr "Minut(it)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:553
+#: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Esmaspäev"
 
@@ -4399,7 +4257,7 @@ msgstr "_P"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Laupäev"
 
@@ -4413,7 +4271,7 @@ msgstr "_Kuupäeva valikul kuvatakse nädalate numbreid"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:552
+#: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Pühapäev"
 
@@ -4427,7 +4285,7 @@ msgstr "_N"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:556
+#: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Neljapäev"
 
@@ -4441,7 +4299,7 @@ msgstr "Aja vorming:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:554
+#: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Teisipäev"
 
@@ -4451,7 +4309,7 @@ msgstr "_Nädala algus:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:555
+#: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Kolmapäev"
 
@@ -4483,17 +4341,12 @@ msgstr "_Nädalalõpud kuvatakse kokkusurutud vormis"
 msgid "_Day begins:"
 msgstr "_Päev algab:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: filter/filter.glade.h:12
-#: mail/mail-config.glade.h:162
-#: ui/evolution-addressbook.xml.h:34
-#: ui/evolution-calendar.xml.h:41
-#: ui/evolution-composer-entries.xml.h:8
-#: ui/evolution-mail-list.xml.h:24
-#: ui/evolution-mail-messagedisplay.xml.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
+#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
+#: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
+#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:43
-#: ui/evolution-signature-editor.xml.h:12
-#: ui/evolution-subscribe.xml.h:10
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
 #: ui/evolution-tasks.xml.h:22
 msgid "_Edit"
 msgstr "_Redaktor"
@@ -4538,70 +4391,49 @@ msgstr "_K"
 msgid "before every appointment"
 msgstr "enne iga kokkusaamise algust"
 
-#: calendar/gui/dialogs/cancel-comp.c:57
-msgid "The event being deleted is a meeting, would you like to send a cancellation notice?"
-msgstr "Sündmus, mida te kustutate, on koosolek. Kas soovid saata osavõtjatele teate koosoleku ärajätmise kohta?"
-
-#: calendar/gui/dialogs/cancel-comp.c:60
-msgid "Are you sure you want to cancel and delete this meeting?"
-msgstr "Kas sa tõesti soovid katkestada ja kustutada antud koosoleku?"
-
-#: calendar/gui/dialogs/cancel-comp.c:66
-msgid "The task being deleted is assigned, would you like to send a cancellation notice?"
-msgstr "Ülesanne, mida te kustutate, on antud täitmiseks. Kas soovite saata tühistamise teate?"
-
-#: calendar/gui/dialogs/cancel-comp.c:69
-msgid "Are you sure you want to cancel and delete this task?"
-msgstr "Kas sa tõesti soovid katkestada ja kustutada antud ülesande?"
-
-#: calendar/gui/dialogs/cancel-comp.c:75
-msgid "The journal entry being deleted is published, would you like to send a cancellation notice?"
-msgstr "Päevaraamatu sissekanne, mida te kustutate on avalik. Kas soovite saata ärajätmise teate?"
-
-#: calendar/gui/dialogs/cancel-comp.c:78
-msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr "Kas sa tõesti soovid katkestada ja kustutada antud päeviku sissekande?"
-
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Antud sündmus on kustutatud."
 
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "Antud ülesanne on kustutatud."
 
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:68
 msgid "This journal entry has been deleted."
 msgstr "Antud päeviku sissekanne on kustutatud."
 
-#: calendar/gui/dialogs/changed-comp.c:75
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
-msgstr "%s  Sa oled teinud muutusi. Kas unustada need muudatused ja sulgeda aken?"
+msgstr ""
+"%s  Sa oled teinud muutusi. Kas unustada need muudatused ja sulgeda aken?"
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Sa ei muutnud midagi. Kas sulgeda aken?"
 
-#: calendar/gui/dialogs/changed-comp.c:82
+#: calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "Antud sündmust on muudetud."
 
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "Antud ülesannet on muudetud."
 
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:92
 msgid "This journal entry has been changed."
 msgstr "Antud päeviku sissekannet on muudetud."
 
-#: calendar/gui/dialogs/changed-comp.c:99
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
-msgstr "%s  On tehtud muudatusi.  Kas tühistada need muudatused ja uuendada redaktorit?"
+msgstr ""
+"%s  On tehtud muudatusi.  Kas tühistada need muudatused ja uuendada "
+"redaktorit?"
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Muudatusi ei ole tehtud. Kas värskendada redaktorit?"
@@ -4639,8 +4471,7 @@ msgid "No summary"
 msgstr "Kokkuvõte puudub"
 
 #: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175
-#: calendar/gui/e-calendar-view.c:1035
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
 #: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Salvesta kui..."
@@ -4660,28 +4491,23 @@ msgstr "Praegust versiooni ei saa kasutada!"
 msgid "Validation error: %s"
 msgstr "Valideerimisviga: %s"
 
-#: calendar/gui/dialogs/comp-editor-util.c:187
-#: calendar/gui/print.c:2258
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
 msgid " to "
 msgstr " kuni "
 
-#: calendar/gui/dialogs/comp-editor-util.c:191
-#: calendar/gui/print.c:2262
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
 msgid " (Completed "
 msgstr " (Valmis "
 
-#: calendar/gui/dialogs/comp-editor-util.c:193
-#: calendar/gui/print.c:2264
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
 msgid "Completed "
 msgstr "Lõpetatud "
 
-#: calendar/gui/dialogs/comp-editor-util.c:198
-#: calendar/gui/print.c:2269
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
 msgid " (Due "
 msgstr " (Tähtaeg "
 
-#: calendar/gui/dialogs/comp-editor-util.c:200
-#: calendar/gui/print.c:2271
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
 msgid "Due "
 msgstr "Tähtaeg "
 
@@ -4697,82 +4523,51 @@ msgstr "Sihtkoha avamine ebaõnnestus"
 msgid "Destination is read only"
 msgstr "Sihtkoht on kirjutuskaitsega"
 
-#: calendar/gui/dialogs/delete-comp.c:95
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "Kas sa tõesti soovid kustutada kokkusaamist '%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:98
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "Kas sa tõesti soovid kustutada seda nimetut kokkusaamist?"
-
-#: calendar/gui/dialogs/delete-comp.c:104
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "Kas sa tõesti soovid kustutada ülesannet '%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:107
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "Kas sa tõesti soovid kustutada seda nimetut ülesannet?"
-
-#: calendar/gui/dialogs/delete-comp.c:113
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "Kas sa tõesti soovid kustutada päeviku sissekannet '%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:116
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "Kas sa tõesti soovid kustutada seda nimetut päeviku sissekannet?"
-
-#: calendar/gui/dialogs/delete-comp.c:131
-#: calendar/gui/dialogs/delete-comp.c:138
-#: calendar/gui/dialogs/delete-comp.c:145
-#: calendar/gui/dialogs/delete-error.c:52
-#, c-format
+#: calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "Seda sündmust ei saa tänu corba veale kustutada"
 
-#: calendar/gui/dialogs/delete-error.c:55
+#: calendar/gui/dialogs/delete-error.c:57
 msgid "The task could not be deleted due to a corba error"
 msgstr "Seda ülesannet ei saa tänu corba veale kustutada"
 
-#: calendar/gui/dialogs/delete-error.c:58
+#: calendar/gui/dialogs/delete-error.c:60
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr "Päeviku sissekannet ei saa kustutada tänu corba veale"
 
-#: calendar/gui/dialogs/delete-error.c:61
+#: calendar/gui/dialogs/delete-error.c:63
 msgid "The item could not be deleted due to a corba error"
 msgstr "Seda elementi ei saa tänu corba veale kustutada"
 
-#: calendar/gui/dialogs/delete-error.c:68
+#: calendar/gui/dialogs/delete-error.c:70
 msgid "The event could not be deleted because permission was denied"
 msgstr "Sündmust ei saanud kustutada, kuna juurdepääs puudub"
 
-#: calendar/gui/dialogs/delete-error.c:71
+#: calendar/gui/dialogs/delete-error.c:73
 msgid "The task could not be deleted because permission was denied"
 msgstr "Ülesannet ei saanud kustutada, kuna juurdepääs puudub"
 
-#: calendar/gui/dialogs/delete-error.c:74
+#: calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr "Päeviku sissekannet ei saanud kustutada, kuna juurdepääs puudub"
 
-#: calendar/gui/dialogs/delete-error.c:77
+#: calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
 msgstr "Elementi ei saanud kustutada, kuna juurdepääs puudub"
 
-#: calendar/gui/dialogs/delete-error.c:84
+#: calendar/gui/dialogs/delete-error.c:86
 msgid "The event could not be deleted due to an error"
 msgstr "Sündmust ei ole vea tõttu võimalik kustutada"
 
-#: calendar/gui/dialogs/delete-error.c:87
+#: calendar/gui/dialogs/delete-error.c:89
 msgid "The task could not be deleted due to an error"
 msgstr "Ülesannet ei ole vea tõttu võimalik kustutada"
 
-#: calendar/gui/dialogs/delete-error.c:90
+#: calendar/gui/dialogs/delete-error.c:92
 msgid "The journal entry could not be deleted due to an error"
 msgstr "Päeviku sissekannet ei ole vea tõttu võimalik kustutada"
 
-#: calendar/gui/dialogs/delete-error.c:93
+#: calendar/gui/dialogs/delete-error.c:95
 msgid "The item could not be deleted due to an error"
 msgstr "Elementi ei ole vea tõttu võimalik kustutada"
 
@@ -4788,8 +4583,7 @@ msgstr "Delegeerida:"
 msgid "Enter Delegate"
 msgstr "Sisesta Delegaat"
 
-#: calendar/gui/dialogs/event-editor.c:201
-#: calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Kokkusaamine"
 
@@ -4809,8 +4603,7 @@ msgstr "Planeering"
 
 #: calendar/gui/dialogs/event-editor.c:229
 #: calendar/gui/dialogs/event-editor.c:298
-#: calendar/gui/dialogs/event-editor.c:442
-#: ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Koosolek"
 
@@ -4822,8 +4615,7 @@ msgstr "Sündmus ilma alguskuupäevata"
 msgid "Event with no end date"
 msgstr "Sündmis ilma lõppkuupäevata"
 
-#: calendar/gui/dialogs/event-page.c:617
-#: calendar/gui/dialogs/task-page.c:513
+#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
 msgid "Start date is wrong"
 msgstr "Alguskuupäev on vale"
 
@@ -4907,26 +4699,15 @@ msgid "_Start time:"
 msgstr "_Algus:"
 
 #. an empty string is the same as 'None'
-#. add a "None" option to the stores menu
-#. Put the "None" and "UTC" entries at the top of the combo's list.
-#. When "None" is selected we want the field to be cleared.
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
 #: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:647
-#: composer/e-msg-composer.c:2112
-#: filter/filter-rule.c:877
-#: mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928
-#: mail/mail-account-gui.c:1559
-#: mail/mail-account-gui.c:1955
-#: mail/mail-config.glade.h:103
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
+#: filter/filter-rule.c:877 mail/em-account-prefs.c:427
+#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
+#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
-#: widgets/misc/e-cell-date-edit.c:257
-#: widgets/misc/e-dateedit.c:443
-#: widgets/misc/e-dateedit.c:1480
-#: widgets/misc/e-dateedit.c:1595
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
+#: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr "Puudub"
 
@@ -4949,23 +4730,17 @@ msgstr "_Delegeerida..."
 #  FIXME: need to disable for undeletable folders
 #. FIXME: need to disable for undeletable folders
 #: calendar/gui/dialogs/meeting-page.c:655
-#: calendar/gui/e-calendar-table.c:1042
-#: calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1310
-#: calendar/gui/e-calendar-view.c:1342
-#: mail/em-folder-tree.c:2562
-#: mail/em-folder-view.c:919
-#: ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:40
-#: ui/evolution-comp-editor.xml.h:17
-#: ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:112
-#: ui/evolution-tasks.xml.h:21
+#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
+#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
 msgid "_Delete"
 msgstr "_Kustuta"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:241
+#: calendar/gui/e-meeting-list-view.c:218
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Osavõtja"
@@ -5001,18 +4776,15 @@ msgid "Member"
 msgstr "Liige"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1048
-#: calendar/gui/e-meeting-list-view.c:264
+#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:271
-#: calendar/gui/e-meeting-time-sel.etspec.h:10
-#: filter/libfilter-i18n.h:62
-#: mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-list-view.c:248
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Olek"
 
@@ -5020,20 +4792,20 @@ msgstr "Olek"
 msgid "Add A_ttendee"
 msgstr "Lisa _osavõtja"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "Add attendees from addressbook."
+msgstr "Lisa saatja _aadressiraamatusse"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Organiseerija:"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
+#: calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "_Change Organizer"
 msgstr "_Muuda organiseerijat:"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-#: calendar/gui/e-meeting-time-sel.c:417
-msgid "_Invite Others..."
-msgstr "_Kutsu teisi..."
-
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
 msgstr "<b>Kalendri seaded</b>"
@@ -5079,7 +4851,8 @@ msgid "You are modifying a recurring task, what would you like to modify?"
 msgstr ""
 
 #: calendar/gui/dialogs/recur-comp.c:58
-msgid "You are modifying a recurring journal entry, what would you like to modify?"
+msgid ""
+"You are modifying a recurring journal entry, what would you like to modify?"
 msgstr ""
 
 #: calendar/gui/dialogs/recur-comp.c:72
@@ -5179,7 +4952,7 @@ msgid "_No recurrence"
 msgstr "E_i kordu"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:450
+#: composer/e-msg-composer-attachment-bar.c:453
 msgid "_Remove"
 msgstr "_Eemalda"
 
@@ -5211,53 +4984,19 @@ msgstr "nädal(at)"
 msgid "year(s)"
 msgstr "aasta(t)"
 
-#: calendar/gui/dialogs/save-comp.c:53
-msgid ""
-"This event has been changed, but has not been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Sündmust on muudetud kuid seda ei ole salvestatud.\n"
-"\n"
-"Kas sa soovid muudatused salvestada?"
-
-#: calendar/gui/dialogs/save-comp.c:57
-msgid "_Discard Changes"
-msgstr "_Loobu muudatustest"
-
-#: calendar/gui/dialogs/save-comp.c:62
-msgid "Save Event"
-msgstr "Salvesta sündmus"
-
-#: calendar/gui/dialogs/select-source-dialog.c:65
+#: calendar/gui/dialogs/select-source-dialog.c:69
 #, fuzzy
 msgid "Select destination"
 msgstr "Vali sihtkoht %s"
 
-#: calendar/gui/dialogs/select-source-dialog.c:86
+#: calendar/gui/dialogs/select-source-dialog.c:90
 msgid "_Destination"
 msgstr "_Sihtkoht"
 
-#: calendar/gui/dialogs/select-source-dialog.c:88
+#: calendar/gui/dialogs/select-source-dialog.c:92
 msgid "Task List"
 msgstr "Ülesannete nimekiri"
 
-#: calendar/gui/dialogs/send-comp.c:57
-msgid "The meeting information has been created. Send it?"
-msgstr "Koosoleku info on valmis. Kas soovid selle laiali saata?"
-
-#: calendar/gui/dialogs/send-comp.c:60
-msgid "The meeting information has changed. Send an updated version?"
-msgstr "Koosoleku infot on muudetud. Kas soovid saata uuendatud versiooni? "
-
-#: calendar/gui/dialogs/send-comp.c:67
-msgid "The task assignment information has been created. Send it?"
-msgstr ""
-
-#: calendar/gui/dialogs/send-comp.c:71
-msgid "The task information has changed. Send an updated version?"
-msgstr "Ülesande infot on muudetud. Kas soovid saata uuendatud versiooni?"
-
 #: calendar/gui/dialogs/task-details-page.c:406
 msgid "Completed date is wrong"
 msgstr "Lõpetamise kuupäev on vale"
@@ -5269,53 +5008,43 @@ msgstr "(%) _valmis"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-cal-component-preview.c:230
-#: calendar/gui/e-calendar-table.c:449
-#: calendar/gui/e-cal-model-tasks.c:350
-#: calendar/gui/e-cal-model-tasks.c:653
-#: calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210
-#: calendar/gui/print.c:2346
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350
+#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-meeting-store.c:187
+#: calendar/gui/e-meeting-store.c:210 calendar/gui/print.c:2346
 msgid "Completed"
 msgstr "Lõpetatud"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #: calendar/gui/e-cal-component-preview.c:249
-#: calendar/gui/e-calendar-table.c:374
-#: mail/message-list.c:960
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:960
 msgid "High"
 msgstr "Kõrge"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:227
-#: calendar/gui/e-calendar-table.c:448
-#: calendar/gui/e-cal-model-tasks.c:348
-#: calendar/gui/e-cal-model-tasks.c:651
-#: calendar/gui/e-cal-model-tasks.c:726
+#: calendar/gui/e-calendar-table.c:448 calendar/gui/e-cal-model-tasks.c:348
+#: calendar/gui/e-cal-model-tasks.c:651 calendar/gui/e-cal-model-tasks.c:726
 #: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "Töös"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:253
-#: calendar/gui/e-calendar-table.c:376
-#: mail/message-list.c:958
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:958
 msgid "Low"
 msgstr "Madal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:251
-#: calendar/gui/e-calendar-table.c:375
-#: calendar/gui/e-cal-model.c:909
+#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
 #: mail/message-list.c:959
 msgid "Normal"
 msgstr "Keskmine"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-component-preview.c:237
-#: calendar/gui/e-calendar-table.c:447
-#: calendar/gui/e-cal-model-tasks.c:346
-#: calendar/gui/e-cal-model-tasks.c:649
-#: calendar/gui/print.c:2340
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/e-cal-model-tasks.c:346
+#: calendar/gui/e-cal-model-tasks.c:649 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "Pole alanud"
 
@@ -5365,10 +5094,8 @@ msgstr "_Salajane"
 
 #: calendar/gui/dialogs/task-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:976
-#: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3
-#: mail/mail-config.glade.h:71
+#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Kirjeldus:"
 
@@ -5436,12 +5163,41 @@ msgid "Weekly"
 msgstr "Iganädalane"
 
 #: calendar/gui/e-alarm-list.c:395
+#, fuzzy, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d mustandid"
+msgstr[1] "%d mustandid"
+
 #: calendar/gui/e-alarm-list.c:400
+#, fuzzy, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] "nädalat"
+msgstr[1] "nädalat"
+
 #: calendar/gui/e-alarm-list.c:405
+#, fuzzy, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "_24 tunnine"
+msgstr[1] "_24 tunnine"
+
 #: calendar/gui/e-alarm-list.c:410
+#, fuzzy, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "minutit"
+msgstr[1] "minutit"
+
 #: calendar/gui/e-alarm-list.c:415
+#, fuzzy, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "teine"
+msgstr[1] "teine"
+
 #: calendar/gui/e-alarm-list.c:462
-#, c-format
 msgid "Unknown action to be performed"
 msgstr "Teostatakse tundmatu tegevus"
 
@@ -5485,14 +5241,12 @@ msgstr "%s @ %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s tundmatule trigeri tüübile"
 
-#: calendar/gui/e-cal-component-preview.c:71
-#: mail/em-folder-view.c:2346
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
 #, c-format
 msgid "Click to open %s"
 msgstr "Avamiseks kliki %s"
 
-#: calendar/gui/e-cal-component-preview.c:156
-#: filter/filter-rule.c:794
+#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
 msgid "Untitled"
 msgstr "Nimetu"
 
@@ -5507,7 +5261,7 @@ msgstr "Tähtaeg:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:944
+#: calendar/gui/e-itip-control.c:943
 msgid "Status:"
 msgstr "Olek:"
 
@@ -5519,21 +5273,17 @@ msgstr "Tähtsus:"
 msgid "Web Page:"
 msgstr "Veebilehekülg:"
 
-#: calendar/gui/e-calendar-table.c:352
-#: calendar/gui/e-cal-list-view.c:257
-#: calendar/gui/e-cal-model.c:321
-#: calendar/gui/e-cal-model.c:328
+#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
 msgid "Public"
 msgstr "Avalik"
 
-#: calendar/gui/e-calendar-table.c:353
-#: calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-calendar-table.c:353 calendar/gui/e-cal-list-view.c:258
 #: calendar/gui/e-cal-model.c:330
 msgid "Private"
 msgstr "Isiklik"
 
-#: calendar/gui/e-calendar-table.c:354
-#: calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-calendar-table.c:354 calendar/gui/e-cal-list-view.c:259
 #: calendar/gui/e-cal-model.c:332
 msgid "Confidential"
 msgstr "Salajane"
@@ -5582,33 +5332,26 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:426
-#: calendar/gui/e-cal-model-calendar.c:163
+#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
 msgid "Free"
 msgstr "Vaba"
 
-#: calendar/gui/e-calendar-table.c:427
-#: calendar/gui/e-cal-model-calendar.c:166
+#: calendar/gui/e-calendar-table.c:427 calendar/gui/e-cal-model-calendar.c:166
 #: calendar/gui/e-meeting-time-sel.c:399
 msgid "Busy"
 msgstr "Hõivatud"
 
-#: calendar/gui/e-calendar-table.c:683
-#: calendar/gui/e-calendar-view.c:646
+#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
 msgid "Deleting selected objects"
 msgstr "Kustutan valitud objektid"
 
-#: calendar/gui/e-calendar-table.c:846
-#: calendar/gui/e-calendar-view.c:747
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
 msgid "Updating objects"
 msgstr "Objektide uuendamine"
 
-#: calendar/gui/e-calendar-table.c:1022
-#: calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1290
-#: calendar/gui/e-calendar-view.c:1370
-#: mail/em-folder-view.c:894
-#: ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
+#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
+#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "A_va"
 
@@ -5616,66 +5359,43 @@ msgstr "A_va"
 msgid "Open _Web Page"
 msgstr "_Ava veebilehekülg"
 
-#: calendar/gui/e-calendar-table.c:1024
-#: calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1291
-#: calendar/gui/e-calendar-view.c:1376
-#: mail/em-folder-view.c:896
-#: mail/em-popup.c:690
-#: mail/em-popup.c:806
+#: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
+#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
+#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "_Salvesta kui..."
 
-#: calendar/gui/e-calendar-table.c:1025
-#: calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1269
-#: calendar/gui/e-calendar-view.c:1292
-#: calendar/gui/e-calendar-view.c:1374
-#: ui/evolution-addressbook.xml.h:40
-#: ui/evolution-calendar.xml.h:44
-#: ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17
-#: ui/evolution-mail-message.xml.h:125
+#: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
+#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
+#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
+#: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "_Trüki..."
 
-#: calendar/gui/e-calendar-table.c:1029
-#: calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1297
-#: calendar/gui/e-calendar-view.c:1340
-#: ui/evolution-addressbook.xml.h:1
-#: ui/evolution-calendar.xml.h:1
+#: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
+#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
+#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Lõika"
 
-#: calendar/gui/e-calendar-table.c:1030
-#: calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1298
-#: calendar/gui/e-calendar-view.c:1338
-#: mail/em-folder-tree.c:958
-#: mail/em-folder-tree.c:2555
-#: mail/message-list.c:1650
-#: ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:39
-#: ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:109
-#: ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
+#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
+#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
+#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
+#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Kopeeri"
 
-#: calendar/gui/e-calendar-table.c:1031
-#: calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1273
-#: calendar/gui/e-calendar-view.c:1299
-#: calendar/gui/e-calendar-view.c:1372
-#: ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:43
-#: ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:123
-#: ui/evolution-tasks.xml.h:24
+#: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
+#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
+#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
+#: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Aseta"
 
@@ -5695,8 +5415,7 @@ msgstr "_Märgi lõpetatuks"
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Märgi valitud ülesanne lõpetatuks"
 
-#: calendar/gui/e-calendar-table.c:1043
-#: calendar/gui/e-calendar-table.c:1061
+#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1061
 msgid "_Delete Selected Tasks"
 msgstr "_Kustuta valitud ülesanded"
 
@@ -5710,10 +5429,8 @@ msgstr "Ülesande lisamiseks vajuta siia"
 msgid "% Complete"
 msgstr "(%) valmis"
 
-#: calendar/gui/e-calendar-table.etspec.h:4
-#: camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259
-#: mail/mail-send-recv.c:615
+#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1167
+#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:615
 msgid "Complete"
 msgstr "Lõpetatud"
 
@@ -5734,8 +5451,7 @@ msgid "Start date"
 msgstr "Alguskuupäev"
 
 #: calendar/gui/e-calendar-table.etspec.h:10
-#: calendar/gui/e-cal-list-view.etspec.h:4
-#: mail/mail-security.glade.h:5
+#: calendar/gui/e-cal-list-view.etspec.h:4 mail/mail-security.glade.h:5
 msgid "Summary"
 msgstr "Kokkuvõte"
 
@@ -5743,76 +5459,67 @@ msgstr "Kokkuvõte"
 msgid "Task sort"
 msgstr "Ülesannete sorteerimine"
 
-#: calendar/gui/e-calendar-view.c:1262
-#: calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
 msgid "New _Appointment..."
 msgstr "Uus _kokkusaamine..."
 
-#: calendar/gui/e-calendar-view.c:1263
-#: calendar/gui/e-calendar-view.c:1355
+#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
 msgid "New All Day _Event"
 msgstr "Uus kogu päeva _sündmus"
 
-#: calendar/gui/e-calendar-view.c:1264
-#: calendar/gui/e-calendar-view.c:1360
+#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
 msgid "New Meeting"
 msgstr "Uus koosolek"
 
-#: calendar/gui/e-calendar-view.c:1265
-#: calendar/gui/e-calendar-view.c:1365
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
 msgid "New Task"
 msgstr "Uus ülesanne"
 
-#: calendar/gui/e-calendar-view.c:1279
-#: ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "Vali _tänane kuupäev"
 
-#: calendar/gui/e-calendar-view.c:1280
+#: calendar/gui/e-calendar-view.c:1283
 msgid "_Select Date..."
 msgstr "_Kuupäeva valimine..."
 
-#: calendar/gui/e-calendar-view.c:1284
-#: ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publitseeri vaba/hõivatud infot"
 
-#: calendar/gui/e-calendar-view.c:1303
+#: calendar/gui/e-calendar-view.c:1306
 msgid "Cop_y to Calendar..."
 msgstr "Kop_eeri kalendrisse..."
 
-#: calendar/gui/e-calendar-view.c:1304
+#: calendar/gui/e-calendar-view.c:1307
 msgid "Mo_ve to Calendar..."
 msgstr "_Liiguta kalendrisse..."
 
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1308
 msgid "_Schedule Meeting..."
 msgstr "_Ajasta koosolek..."
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1309
 msgid "_Forward as iCalendar..."
 msgstr "Edasta i_Kalendrina"
 
-#: calendar/gui/e-calendar-view.c:1311
-#: calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
 msgid "Delete this _Occurrence"
 msgstr "Ku_stuta see sündmus"
 
-#: calendar/gui/e-calendar-view.c:1312
-#: calendar/gui/e-calendar-view.c:1344
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
 msgid "Delete _All Occurrences"
 msgstr "Kustuta k_õik sündmused"
 
-#: calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1349
 msgid "Go to _Today"
 msgstr "Mine tänasele _päevale"
 
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1351
 msgid "_Go to Date..."
 msgstr "_Mine kuupäevale..."
 
-#: calendar/gui/e-calendar-view.c:1378
-#: ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "_Sätted..."
 
@@ -5825,17 +5532,12 @@ msgid "Start Date"
 msgstr "Alguskuupäev"
 
 #. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:334
-#: calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:961
-#: calendar/gui/e-itip-control.c:1163
-#: calendar/gui/e-meeting-list-view.c:145
-#: calendar/gui/e-meeting-list-view.c:159
-#: calendar/gui/e-meeting-store.c:115
-#: calendar/gui/e-meeting-store.c:150
-#: calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1703
-#: camel/camel-gpg-context.c:1754
+#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
+#: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
 #: camel/camel-tcp-stream-openssl.c:631
 #: camel/providers/imap4/camel-imap4-engine.c:1534
 #: camel/providers/imap4/camel-imap4-engine.c:1561
@@ -5844,10 +5546,8 @@ msgstr "Alguskuupäev"
 #: camel/providers/imap4/camel-imap4-store.c:1039
 #: camel/providers/imap4/camel-imap4-utils.c:292
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227
-#: mail/em-utils.c:1115
-#: shell/e-component-registry.c:186
-#: shell/e-component-registry.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1115
+#: shell/e-component-registry.c:186 shell/e-component-registry.c:190
 #: widgets/misc/e-charset-picker.c:62
 msgid "Unknown"
 msgstr "Tundmatu"
@@ -5860,19 +5560,14 @@ msgstr "Korduv"
 msgid "Assigned"
 msgstr "Määratud"
 
-#: calendar/gui/e-cal-model.c:915
-#: calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:169
-#: calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169
-#: calendar/gui/e-meeting-store.c:765
+#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr "Jah"
 
-#: calendar/gui/e-cal-model.c:915
-#: calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:170
-#: calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "Ei"
 
@@ -5884,8 +5579,7 @@ msgstr "Põ"
 msgid "S"
 msgstr "Lõ"
 
-#: calendar/gui/e-cal-model-tasks.c:304
-#: smime/lib/e-cert.c:629
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
 msgid "E"
 msgstr "Ida"
 
@@ -5904,23 +5598,13 @@ msgstr ""
 "45.436845,125.862501"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
-#: calendar/gui/e-cell-date-edit-text.c:117
-#: e-util/e-time-utils.c:180
+#: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a, %d.%m.%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format.
-#: calendar/gui/e-cell-date-edit-text.c:120
-#: e-util/e-time-utils.c:175
+#: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
@@ -5937,39 +5621,27 @@ msgstr ""
 "%s"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817
-#: calendar/gui/e-week-view.c:592
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:592
 #: calendar/gui/print.c:838
 msgid "am"
 msgstr "el"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820
-#: calendar/gui/e-week-view.c:595
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:595
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr "pl"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#. strftime format %A = full weekday name, %d = day of
-#. month, %B = full month name. You can change the
-#. order but don't change the specifiers or add
-#. anything.
-#: calendar/gui/e-day-view.c:1571
-#: calendar/gui/e-day-view-top-item.c:690
-#: calendar/gui/e-week-view-main-item.c:320
-#: calendar/gui/print.c:1514
+#: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
+#: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A, %d. %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#. strftime format %d = day of month, %b = abbreviated
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
-#: calendar/gui/e-day-view.c:1604
-#: calendar/gui/e-day-view-top-item.c:698
+#: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%d. %b"
@@ -5979,391 +5651,411 @@ msgstr "%d. %b"
 msgid "%02i minute divisions"
 msgstr "Segmendilised alamjaotised"
 
-#: calendar/gui/e-itip-control.c:586
+#: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
 msgstr "Jah. (Lihtne kordumine)"
 
-#: calendar/gui/e-itip-control.c:597
-#: calendar/gui/e-itip-control.c:602
-#: calendar/gui/e-itip-control.c:604
-#: calendar/gui/e-itip-control.c:612
+#: calendar/gui/e-itip-control.c:596
+#, fuzzy, c-format
+msgid "Every day"
+msgid_plural "Every %d days"
+msgstr[0] "Vahemikuga"
+msgstr[1] "Vahemikuga"
+
+#: calendar/gui/e-itip-control.c:601
+#, fuzzy, c-format
+msgid "Every week"
+msgid_plural "Every %d weeks"
+msgstr[0] "Iga kord"
+msgstr[1] "Iga kord"
+
+#: calendar/gui/e-itip-control.c:603
 #, c-format
+msgid "Every week on "
+msgid_plural "Every %d weeks on "
+msgstr[0] ""
+msgstr[1] ""
+
+#: calendar/gui/e-itip-control.c:611
 msgid " and "
 msgstr " ja "
 
-#: calendar/gui/e-itip-control.c:619
+#: calendar/gui/e-itip-control.c:618
 #, c-format
 msgid "The %s day of "
 msgstr "%s päev"
 
-#: calendar/gui/e-itip-control.c:632
+#: calendar/gui/e-itip-control.c:631
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:639
-#: calendar/gui/e-itip-control.c:643
-#: calendar/gui/e-itip-control.c:654
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:638
+#, fuzzy, c-format
+msgid "every month"
+msgid_plural "every %d months"
+msgstr[0] "Kord kuus"
+msgstr[1] "Kord kuus"
+
+#: calendar/gui/e-itip-control.c:642
+#, fuzzy, c-format
+msgid "Every year"
+msgid_plural "Every %d years"
+msgstr[0] "Iga kord"
+msgstr[1] "Iga kord"
+
+#: calendar/gui/e-itip-control.c:653
 #, c-format
+msgid "a total of %d time"
+msgid_plural " a total of %d times"
+msgstr[0] ""
+msgstr[1] ""
+
+#: calendar/gui/e-itip-control.c:662
 msgid ", ending on "
 msgstr ", lõpeb"
 
-#: calendar/gui/e-itip-control.c:687
+#: calendar/gui/e-itip-control.c:686
 msgid "<b>Starts:</b> "
 msgstr "<b>Algus:</b> "
 
-#: calendar/gui/e-itip-control.c:697
+#: calendar/gui/e-itip-control.c:696
 msgid "<b>Ends:</b> "
 msgstr "<b>Lõpp: </b>"
 
-#: calendar/gui/e-itip-control.c:717
+#: calendar/gui/e-itip-control.c:716
 msgid "<b>Completed:</b> "
 msgstr "<b>Lõpetatud:</b>"
 
-#: calendar/gui/e-itip-control.c:727
+#: calendar/gui/e-itip-control.c:726
 msgid "<b>Due:</b> "
 msgstr "<b>Tähtaeg:</b>"
 
-#: calendar/gui/e-itip-control.c:765
-#: calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
 msgid "iCalendar Information"
 msgstr "iKalendri informatsioon"
 
 #. Title
-#: calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:781
 msgid "iCalendar Error"
 msgstr "iKalendri viga"
 
-#: calendar/gui/e-itip-control.c:853
-#: calendar/gui/e-itip-control.c:869
-#: calendar/gui/e-itip-control.c:880
-#: calendar/gui/e-itip-control.c:897
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
 msgid "An unknown person"
 msgstr "Tundmatu isik"
 
 #  Describe what the user can do
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:904
-msgid "<br> Please review the following information, and then select an action from the menu below."
-msgstr "<br> Palun vaata järgnev info üle ja vali allpool olevast menüüst  sobilik tegevus."
+#: calendar/gui/e-itip-control.c:903
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
+msgstr ""
+"<br> Palun vaata järgnev info üle ja vali allpool olevast menüüst  sobilik "
+"tegevus."
 
-#: calendar/gui/e-itip-control.c:919
+#: calendar/gui/e-itip-control.c:918
 msgid "<i>None</i>"
 msgstr "<i>Puudub</i>"
 
-#: calendar/gui/e-itip-control.c:949
-#: calendar/gui/e-meeting-list-view.c:181
-#: calendar/gui/e-meeting-store.c:179
-#: calendar/gui/e-meeting-store.c:202
+#: calendar/gui/e-itip-control.c:929
+msgid "Location:"
+msgstr "Asukoht:"
+
+#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
+#: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Vastu võetud"
 
-#: calendar/gui/e-itip-control.c:953
-#: calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Proovinõusolek antud"
 
-#: calendar/gui/e-itip-control.c:957
-#: calendar/gui/e-meeting-list-view.c:182
-#: calendar/gui/e-meeting-store.c:181
-#: calendar/gui/e-meeting-store.c:204
-#: calendar/gui/itip-utils.c:428
-#: calendar/gui/itip-utils.c:454
+#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
+#: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
+#: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Tagasi lükatud"
 
-#: calendar/gui/e-itip-control.c:1016
-#: calendar/gui/e-itip-control.c:1044
-#: calendar/gui/e-itip-control.c:1070
-#: calendar/gui/e-itip-control.c:1083
-#: calendar/gui/e-itip-control.c:1096
-#: calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
 msgid "Choose an action:"
 msgstr "Vali tegevus"
 
-#: calendar/gui/e-itip-control.c:1017
+#: calendar/gui/e-itip-control.c:1016
 msgid "Update"
 msgstr "Uuenda"
 
-#: calendar/gui/e-itip-control.c:1018
-#: calendar/gui/e-itip-control.c:1049
-#: calendar/gui/e-itip-control.c:1072
-#: calendar/gui/e-itip-control.c:1085
-#: calendar/gui/e-itip-control.c:1098
-#: calendar/gui/e-itip-control.c:1111
-#: shell/e-shell.c:1098
-#: widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
+#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Olgu"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1044
 msgid "Accept"
 msgstr "Nõustu"
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1045
 msgid "Tentatively accept"
 msgstr "Proovinõusolek"
 
-#: calendar/gui/e-itip-control.c:1047
+#: calendar/gui/e-itip-control.c:1046
 msgid "Decline"
 msgstr "Lükka tagasi"
 
-#: calendar/gui/e-itip-control.c:1071
+#: calendar/gui/e-itip-control.c:1070
 msgid "Send Free/Busy Information"
 msgstr "Vaba/hõivatud info saatmine"
 
-#: calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1083
 #, fuzzy
 msgid "Update respondent status"
 msgstr "GGV juhtimise staatus"
 
-#: calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1096
 msgid "Send Latest Information"
 msgstr "Saadab värskeima informatsiooni"
 
-#: calendar/gui/e-itip-control.c:1110
-#: calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:410
-#: mail/mail-send-recv.c:464
+#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
+#: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Tühista"
 
-#: calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1185
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> avalikustas koosoleku info."
 
-#: calendar/gui/e-itip-control.c:1187
+#: calendar/gui/e-itip-control.c:1186
 msgid "Meeting Information"
 msgstr "Koosoleku info"
 
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1191
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> soovib, et koosolekul osaleks ka %s."
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1193
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> soovib, et sa osaleksid koosolekul."
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1194
 msgid "Meeting Proposal"
 msgstr "Koosoleku ettepanek"
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> soovib lisada olemasolevale koosolekule."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Update"
 msgstr "Koosoleku info uuendus"
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1203
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> soovib saada värskeimat infot koosoleku kohta."
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1204
 msgid "Meeting Update Request"
 msgstr "Soov muuta koosolekut"
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> vastas koosoleku soovile."
 
-#: calendar/gui/e-itip-control.c:1213
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Reply"
 msgstr "Koosoleku vastus"
 
-#: calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1219
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> tühistas koosoleku."
 
-#: calendar/gui/e-itip-control.c:1221
+#: calendar/gui/e-itip-control.c:1220
 msgid "Meeting Cancellation"
 msgstr "Koosoleku tühistamine"
 
-#: calendar/gui/e-itip-control.c:1228
-#: calendar/gui/e-itip-control.c:1296
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1330
 #, fuzzy, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "Märgi kiri &saadetud kirjaks"
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1228
 msgid "Bad Meeting Message"
 msgstr "Vigane koosoleku sõnum"
 
-#: calendar/gui/e-itip-control.c:1254
+#: calendar/gui/e-itip-control.c:1253
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> avalikustas ülesande info."
 
-#: calendar/gui/e-itip-control.c:1255
+#: calendar/gui/e-itip-control.c:1254
 msgid "Task Information"
 msgstr "Ülesande info"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1259
 #, fuzzy, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> soovib, et sa täidaksid ülesande."
 
-#: calendar/gui/e-itip-control.c:1262
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> soovib, et sa täidaksid ülesande."
 
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1262
 msgid "Task Proposal"
 msgstr "Ettepanek ülesandeks"
 
-#: calendar/gui/e-itip-control.c:1267
+#: calendar/gui/e-itip-control.c:1266
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> soovib lisada olemasolevale koosolekule."
 
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Update"
 msgstr "Ülesande uuendus"
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1271
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> soovib saada värskeimat infot ülesande kohta."
 
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1272
 msgid "Task Update Request"
 msgstr "Soov muuta ülesannet"
 
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> vastas ülesande määramisele."
 
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Reply"
 msgstr "Ülesande vastus"
 
-#: calendar/gui/e-itip-control.c:1288
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> katkestas ülesande."
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1288
 msgid "Task Cancellation"
 msgstr "Ülesande tühistamine"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1296
 msgid "Bad Task Message"
 msgstr "Vigane ülesande sõnum"
 
-#: calendar/gui/e-itip-control.c:1316
+#: calendar/gui/e-itip-control.c:1315
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> avalikustas vaba/hõivatud info."
 
-#: calendar/gui/e-itip-control.c:1317
+#: calendar/gui/e-itip-control.c:1316
 msgid "Free/Busy Information"
 msgstr "Vaba/hõivatud info"
 
-#: calendar/gui/e-itip-control.c:1321
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> soovib saada sinu vaba/hõivatud infot."
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1321
 msgid "Free/Busy Request"
 msgstr "Soov saada vaba/hõivatud infot"
 
-#: calendar/gui/e-itip-control.c:1326
+#: calendar/gui/e-itip-control.c:1325
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> vastas vaba/hõivatud päringule."
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1326
 msgid "Free/Busy Reply"
 msgstr "Vaba/hõivatud vastus"
 
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1331
 msgid "Bad Free/Busy Message"
 msgstr "Vigane vaba/hõivatud sõnum"
 
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1406
 msgid "The message does not appear to be properly formed"
 msgstr "Sõnum ei tundu olevalt õigesti vormistatud"
 
-#: calendar/gui/e-itip-control.c:1466
+#: calendar/gui/e-itip-control.c:1465
 msgid "The message contains only unsupported requests."
 msgstr "Sõnum sisaldab ainult toetamata päringuid."
 
-#: calendar/gui/e-itip-control.c:1497
+#: calendar/gui/e-itip-control.c:1496
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Manus ei sisalda arusaadavat kalendriteadet"
 
-#: calendar/gui/e-itip-control.c:1529
+#: calendar/gui/e-itip-control.c:1528
 msgid "The attachment has no viewable calendar items"
 msgstr "Manus ei sisalda vaadeldavaid kalendri elemente"
 
-#: calendar/gui/e-itip-control.c:1763
+#: calendar/gui/e-itip-control.c:1762
 msgid "Update complete\n"
 msgstr "Uuendamine lõpetatud\n"
 
-#: calendar/gui/e-itip-control.c:1793
-#: calendar/gui/e-itip-control.c:1865
+#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
 msgid "Attendee status can not be updated because the item no longer exists"
-msgstr "Osavõtja olekut ei olnud võimailk uuendada, kuna objekti enam ei eksisteeri"
+msgstr ""
+"Osavõtja olekut ei olnud võimailk uuendada, kuna objekti enam ei eksisteeri"
 
-#: calendar/gui/e-itip-control.c:1809
-#: calendar/gui/e-itip-control.c:1847
+#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1819
+#: calendar/gui/e-itip-control.c:1818
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "See vastus pole praegu kohalviibijalt. Kas lisame ta kohalviibijaks?"
 
-#: calendar/gui/e-itip-control.c:1831
+#: calendar/gui/e-itip-control.c:1830
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Osavõtja olekut ei ole võimailk uuendada, kuna selle olek on vigane!\n"
 
-#: calendar/gui/e-itip-control.c:1850
+#: calendar/gui/e-itip-control.c:1849
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1852
 msgid "Object could not be found\n"
 msgstr "Objekti ei suudetud leida\n"
 
-#: calendar/gui/e-itip-control.c:1856
+#: calendar/gui/e-itip-control.c:1855
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Sul pole õigusi kalendri muutmiseks\n"
 
-#: calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1858
 msgid "Attendee status updated\n"
 msgstr "Osavõtja olek uuendatud\n"
 
-#: calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1861
 msgid "Attendee status could not be updated!\n"
 msgstr "Osavõtja olekut ei ole võimailk uuendada!\n"
 
-#: calendar/gui/e-itip-control.c:1893
+#: calendar/gui/e-itip-control.c:1892
 msgid "Removal Complete"
 msgstr "Eemaldamine lõpetatud"
 
-#: calendar/gui/e-itip-control.c:1916
-#: calendar/gui/e-itip-control.c:1964
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
 msgid "Item sent!\n"
 msgstr "Kirje saadetud!\n"
 
-#: calendar/gui/e-itip-control.c:1918
-#: calendar/gui/e-itip-control.c:1968
+#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
 msgid "The item could not be sent!\n"
 msgstr "Kirje saatmine ebaõnnestus!\n"
 
@@ -6404,100 +6096,83 @@ msgstr "lõppkuup."
 msgid "date-start"
 msgstr "alguskuup."
 
-#: calendar/gui/e-meeting-list-view.c:62
+#: calendar/gui/e-meeting-list-view.c:59
 msgid "Chair Persons"
 msgstr "Juhid"
 
-#: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:480
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
 msgid "Required Participants"
 msgstr "Vajalikud osalejad"
 
-#: calendar/gui/e-meeting-list-view.c:64
+#: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Võimalikud osalejad"
 
-#: calendar/gui/e-meeting-list-view.c:65
+#: calendar/gui/e-meeting-list-view.c:62
 msgid "Resources"
 msgstr "Ressursid"
 
-#: calendar/gui/e-meeting-list-view.c:141
-#: calendar/gui/e-meeting-store.c:90
-#: calendar/gui/e-meeting-store.c:107
-#: calendar/gui/e-meeting-store.c:759
+#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr "Individuaalne"
 
-#: calendar/gui/e-meeting-list-view.c:142
-#: calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "Grupp"
 
-#: calendar/gui/e-meeting-list-view.c:143
-#: calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr "Ressurss"
 
-#: calendar/gui/e-meeting-list-view.c:144
-#: calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr "Ruum"
 
-#: calendar/gui/e-meeting-list-view.c:155
-#: calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr "Juht"
 
-#: calendar/gui/e-meeting-list-view.c:156
-#: calendar/gui/e-meeting-store.c:127
-#: calendar/gui/e-meeting-store.c:144
-#: calendar/gui/e-meeting-store.c:762
+#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
 msgid "Required Participant"
 msgstr "Nõutav osaleja"
 
-#: calendar/gui/e-meeting-list-view.c:157
-#: calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr "Võimalik osavõtja"
 
-#: calendar/gui/e-meeting-list-view.c:158
-#: calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr "Mitteosaleja"
 
-#: calendar/gui/e-meeting-list-view.c:180
-#: calendar/gui/e-meeting-store.c:177
-#: calendar/gui/e-meeting-store.c:200
-#: calendar/gui/e-meeting-store.c:772
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
 msgid "Needs Action"
 msgstr "Vajab tegevust"
 
-#: calendar/gui/e-meeting-list-view.c:183
-#: calendar/gui/e-meeting-store.c:183
-#: calendar/gui/e-meeting-store.c:206
-#: calendar/gui/e-meeting-time-sel.c:398
+#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "Katseline"
 
-#: calendar/gui/e-meeting-list-view.c:184
-#: calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr "Delegeeritud"
 
-#: calendar/gui/e-meeting-store.c:189
-#: calendar/gui/e-meeting-store.c:212
+#: calendar/gui/e-meeting-store.c:189 calendar/gui/e-meeting-store.c:212
 msgid "In Process"
 msgstr "Töös"
 
-#: calendar/gui/e-meeting-time-sel.c:400
-#: designs/OOA/ooa.glade.h:11
+#: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Kontorist väljas"
 
@@ -6505,20 +6180,28 @@ msgstr "Kontorist väljas"
 msgid "No Information"
 msgstr "Info puudub"
 
+#: calendar/gui/e-meeting-time-sel.c:417
+#, fuzzy
+msgid "Add attendees from addressbook"
+msgstr "Lisa saatja _aadressiraamatusse"
+
 #: calendar/gui/e-meeting-time-sel.c:440
 msgid "_Options"
 msgstr "_Häälestus"
 
 #: calendar/gui/e-meeting-time-sel.c:457
-msgid "Show _Only Working Hours"
+#, fuzzy
+msgid "Show _only working hours"
 msgstr "Näita tunde _tööpäeva piires"
 
 #: calendar/gui/e-meeting-time-sel.c:467
-msgid "Show _Zoomed Out"
+#, fuzzy
+msgid "Show _zoomed out"
 msgstr "Näita _suures plaanis"
 
 #: calendar/gui/e-meeting-time-sel.c:482
-msgid "_Update Free/Busy"
+#, fuzzy
+msgid "_Update free/busy"
 msgstr "_Värskenda vaba/hõivatud"
 
 #: calendar/gui/e-meeting-time-sel.c:497
@@ -6534,19 +6217,23 @@ msgid ">_>"
 msgstr ">_>"
 
 #: calendar/gui/e-meeting-time-sel.c:547
-msgid "_All People and Resources"
+#, fuzzy
+msgid "_All people and resources"
 msgstr "_Kõik inimesed ja ressursid"
 
 #: calendar/gui/e-meeting-time-sel.c:556
-msgid "All _People and One Resource"
+#, fuzzy
+msgid "All _people and one resource"
 msgstr "Kõik _inimesed ja üks ressurss"
 
 #: calendar/gui/e-meeting-time-sel.c:565
-msgid "_Required People"
+#, fuzzy
+msgid "_Required people"
 msgstr "_Vajalikud inimesed"
 
 #: calendar/gui/e-meeting-time-sel.c:574
-msgid "Required People and _One Resource"
+#, fuzzy
+msgid "Required people and _one resource"
 msgstr "Vajalikud inimesed ja _üks ressurss"
 
 #: calendar/gui/e-meeting-time-sel.c:593
@@ -6566,28 +6253,16 @@ msgstr "%A, %d. %B %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#. This is a strftime() format string %a = abbreviated weekday
-#. name, %m = month number, %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. strftime format of a weekday and a date.
 #: calendar/gui/e-meeting-time-sel.c:2093
-#: calendar/gui/e-meeting-time-sel-item.c:456
-#: e-util/e-time-utils.c:203
-#: e-util/e-time-utils.c:296
-#: e-util/e-time-utils.c:384
+#: calendar/gui/e-meeting-time-sel-item.c:456 e-util/e-time-utils.c:203
+#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
 msgid "%a %m/%d/%Y"
 msgstr "%a, %d.%m.%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. This is the preferred date format for the locale.
-#. This is a strftime() format for a short date. %m = month,
-#. %d = day of month, %Y = year (all digits).
-#: calendar/gui/e-meeting-time-sel-item.c:460
-#: e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299
-#: widgets/misc/e-dateedit.c:1604
+#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
@@ -6596,8 +6271,7 @@ msgstr "%d.%m.%Y"
 msgid "Enter the password for %s"
 msgstr "Sisesta sisesta parool %s jaoks"
 
-#: calendar/gui/e-tasks.c:584
-#: calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6606,74 +6280,61 @@ msgstr ""
 "Viga tegevusel %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:612
-#: calendar/gui/gnome-cal.c:2057
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-
 #. FIXME Loading should be async
 #. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:686
+#: calendar/gui/e-tasks.c:801
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Avan %s ülesanded"
 
-#: calendar/gui/e-tasks.c:709
+#: calendar/gui/e-tasks.c:824
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
 "%s"
 msgstr "Tõrge faili %s avamisel!"
 
-#: calendar/gui/e-tasks.c:730
+#: calendar/gui/e-tasks.c:845
 msgid "Loading tasks"
 msgstr "Ülesannete laadimine"
 
-#: calendar/gui/e-tasks.c:834
+#: calendar/gui/e-tasks.c:949
 msgid "Completing tasks..."
 msgstr "Ülesannete lõpetamine..."
 
-#: calendar/gui/e-tasks.c:857
+#: calendar/gui/e-tasks.c:972
 msgid "Deleting selected objects..."
 msgstr "Valitud objektide kustutamine..."
 
-#: calendar/gui/e-tasks.c:884
+#: calendar/gui/e-tasks.c:999
 msgid "Expunging"
 msgstr "Puhastamine"
 
-#: calendar/gui/e-tasks.c:960
+#: calendar/gui/e-tasks.c:1075
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:402
-#: calendar/gui/tasks-component.c:648
-#: calendar/gui/tasks-control.c:405
+#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
+#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
 #: calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:705
 msgid "Tasks"
 msgstr "Ülesanded"
 
-#: calendar/gui/gnome-cal.c:1876
+#: calendar/gui/gnome-cal.c:1878
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Austria (de_AT)"
 
-#: calendar/gui/gnome-cal.c:1895
+#: calendar/gui/gnome-cal.c:1897
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Avan %s ülesanded"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1920
 #, c-format
 msgid "Opening %s"
 msgstr "%s avamine"
 
-#: calendar/gui/gnome-cal.c:2048
-#, c-format
-msgid "The calendar backend for '%s' has crashed."
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:2894
+#: calendar/gui/gnome-cal.c:2906
 msgid "Purging"
 msgstr "Puhastamine"
 
@@ -6791,8 +6452,7 @@ msgstr "September"
 msgid "_Select Today"
 msgstr "_Vali tänane kuupäev"
 
-#: calendar/gui/itip-utils.c:271
-#: calendar/gui/itip-utils.c:319
+#: calendar/gui/itip-utils.c:271 calendar/gui/itip-utils.c:319
 #: calendar/gui/itip-utils.c:351
 msgid "An organizer must be set."
 msgstr "Organiseerija peab olema määrtud."
@@ -6801,23 +6461,19 @@ msgstr "Organiseerija peab olema määrtud."
 msgid "At least one attendee is necessary"
 msgstr "Vaja on vähemalt ühte osavõtjat"
 
-#: calendar/gui/itip-utils.c:394
-#: calendar/gui/itip-utils.c:503
+#: calendar/gui/itip-utils.c:394 calendar/gui/itip-utils.c:503
 msgid "Event information"
 msgstr "Teave sündmuse kohta"
 
-#: calendar/gui/itip-utils.c:396
-#: calendar/gui/itip-utils.c:505
+#: calendar/gui/itip-utils.c:396 calendar/gui/itip-utils.c:505
 msgid "Task information"
 msgstr "Teave ülesande kohta"
 
-#: calendar/gui/itip-utils.c:398
-#: calendar/gui/itip-utils.c:507
+#: calendar/gui/itip-utils.c:398 calendar/gui/itip-utils.c:507
 msgid "Journal information"
 msgstr "Päevaraamatu informatsioon"
 
-#: calendar/gui/itip-utils.c:400
-#: calendar/gui/itip-utils.c:525
+#: calendar/gui/itip-utils.c:400 calendar/gui/itip-utils.c:525
 msgid "Free/Busy information"
 msgstr "Vaba/Hõivatud informatsioon"
 
@@ -6853,22 +6509,26 @@ msgstr "Sa pead ise olema sündmusest osavõtja."
 #: calendar/gui/migration.c:146
 #, fuzzy
 msgid ""
-"The location and hierarchy of the Evolution task folders has changed since Evolution 1.x.\n"
+"The location and hierarchy of the Evolution task folders has changed since "
+"Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Evolutioni kontaktikaustade asukoht ja hierarhia on alates Evolution 1.x. versioonist muutunud.\n"
+"Evolutioni kontaktikaustade asukoht ja hierarhia on alates Evolution 1.x. "
+"versioonist muutunud.\n"
 "\n"
 "Palun oota kuni Evolution siirdab sinu kaustasid..."
 
 #: calendar/gui/migration.c:150
 #, fuzzy
 msgid ""
-"The location and hierarchy of the Evolution calendar folders has changed since Evolution 1.x.\n"
+"The location and hierarchy of the Evolution calendar folders has changed "
+"since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Evolutioni kontaktikaustade asukoht ja hierarhia on alates Evolution 1.x. versioonist muutunud.\n"
+"Evolutioni kontaktikaustade asukoht ja hierarhia on alates Evolution 1.x. "
+"versioonist muutunud.\n"
 "\n"
 "Palun oota kuni Evolution siirdab sinu kaustasid..."
 
@@ -6878,14 +6538,12 @@ msgstr "Sünnipäevad ja tähtpäevad"
 
 #  Create the Webcal source group
 #. Create the Webcal source group
-#: calendar/gui/migration.c:462
-#: calendar/gui/migration.c:544
+#: calendar/gui/migration.c:462 calendar/gui/migration.c:544
 msgid "On The Web"
 msgstr "Veebis"
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:708
-#: calendar/gui/migration.c:840
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 
@@ -6896,7 +6554,7 @@ msgid "Unable to migrate calendar `%s'"
 msgstr "Kalendrit '%s' ei saa avada."
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:869
+#: calendar/gui/migration.c:889
 #, fuzzy, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr ""
@@ -7061,8 +6719,7 @@ msgstr "L"
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Valitud päev (%a, %d. %b %Y)"
 
-#: calendar/gui/print.c:1939
-#: calendar/gui/print.c:1943
+#: calendar/gui/print.c:1939 calendar/gui/print.c:1943
 msgid "%a %b %d"
 msgstr "%a, %d. %b"
 
@@ -7070,8 +6727,7 @@ msgstr "%a, %d. %b"
 msgid "%a %d %Y"
 msgstr "%a, %d. %Y"
 
-#: calendar/gui/print.c:1944
-#: calendar/gui/print.c:1946
+#: calendar/gui/print.c:1944 calendar/gui/print.c:1946
 #: calendar/gui/print.c:1947
 msgid "%a %b %d %Y"
 msgstr "%a, %d. %b %Y"
@@ -7124,10 +6780,8 @@ msgstr "Kategooriad: %s"
 msgid "Contacts: "
 msgstr "Kontaktid:"
 
-#: calendar/gui/print.c:2559
-#: calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737
-#: mail/em-format-html-print.c:174
+#: calendar/gui/print.c:2559 calendar/gui/print.c:2645
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
 msgid "Print Preview"
 msgstr "Väljatrüki eelvaade"
 
@@ -7139,67 +6793,82 @@ msgstr "Trüki kirje"
 msgid "Print Setup"
 msgstr "Trükkimise sätted"
 
-#: calendar/gui/tasks-component.c:303
+#: calendar/gui/tasks-component.c:313
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:371
 msgid "New Task List"
 msgstr "Uus ülesannete nimekiri"
 
-#: calendar/gui/tasks-component.c:398
-#: calendar/gui/tasks-component.c:400
-#: mail/mail-component.c:500
-#: calendar/gui/tasks-component.c:447
+#: calendar/gui/tasks-component.c:408
 #, fuzzy, c-format
+msgid "%d task"
+msgid_plural "%d tasks"
+msgstr[0] "%d kokku"
+msgstr[1] "%d kokku"
+
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
+#, fuzzy, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] "%d kustutatud"
+msgstr[1] "%d kustutatud"
+
+#: calendar/gui/tasks-component.c:457
+#, fuzzy
 msgid "Failed upgrading tasks."
 msgstr "Kalender ja ülesanded"
 
-#: calendar/gui/tasks-component.c:526
+#: calendar/gui/tasks-component.c:749
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:538
+#: calendar/gui/tasks-component.c:761
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:576
-msgid "Selected task list is read-only, events cannot be created. Please select a read-write calendar."
+#: calendar/gui/tasks-component.c:799
+msgid ""
+"Selected task list is read-only, events cannot be created. Please select a "
+"read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:804
+#: calendar/gui/tasks-component.c:1040
 msgid "New task"
 msgstr "Uus ülesanne"
 
-#: calendar/gui/tasks-component.c:805
+#: calendar/gui/tasks-component.c:1041
 msgid "_Task"
 msgstr "_Ülesanne"
 
-#: calendar/gui/tasks-component.c:806
+#: calendar/gui/tasks-component.c:1042
 msgid "Create a new task"
 msgstr "Lisab uue ülesande"
 
-#: calendar/gui/tasks-component.c:812
+#: calendar/gui/tasks-component.c:1048
 msgid "New tasks group"
 msgstr "Uus ülesannet grupp"
 
-#: calendar/gui/tasks-component.c:813
+#: calendar/gui/tasks-component.c:1049
 msgid "_Tasks Group"
 msgstr "Ü_lesannete grupp"
 
-#: calendar/gui/tasks-component.c:814
+#: calendar/gui/tasks-component.c:1050
 msgid "Create a new tasks group"
 msgstr "Loo uus kontaktide grupp"
 
 #: calendar/gui/tasks-control.c:367
 msgid ""
-"This operation will permanently erase all tasks marked as completed. If you continue, you will not be able to recover these tasks.\n"
+"This operation will permanently erase all tasks marked as completed. If you "
+"continue, you will not be able to recover these tasks.\n"
 "\n"
 "Really erase these tasks?"
 msgstr ""
-"See operatsioon kustutab jäädavalt kõik ülesanded, mis on märgitud kui lõpetatud. Kui sa jätkad, siis neid ülesandeid ei ole võimalik taastada.\n"
+"See operatsioon kustutab jäädavalt kõik ülesanded, mis on märgitud kui "
+"lõpetatud. Kui sa jätkad, siis neid ülesandeid ei ole võimalik taastada.\n"
 "Kas tõesti kustutada need ülesanded? "
 
 #: calendar/gui/tasks-control.c:370
@@ -8867,15 +8536,13 @@ msgstr "kirjete ettevalmistamine võrdlemiseks"
 msgid "You must be working online to complete this operation"
 msgstr "Selle operatsiooni täitmiseks pead olema onlainis"
 
-#: camel/camel-filter-driver.c:667
-#: camel/camel-filter-search.c:513
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
 #, fuzzy, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Kataloogi %s loomine ebaõnnestus."
 
-#: camel/camel-filter-driver.c:711
-#: camel/camel-filter-search.c:549
+#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
 #: camel/camel-process.c:90
 #, fuzzy, c-format
 msgid "Failed to create create child process '%s': %s"
@@ -8886,19 +8553,16 @@ msgstr "Alamprotsessi \"%s\" käivitamine ebaõnnestus (%s)"
 msgid "Invalid message stream received from %s: %s"
 msgstr "Haldurilt saadi veateade:</p><p>%1</p>"
 
-#: camel/camel-filter-driver.c:934
-#: camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
 msgid "Syncing folders"
 msgstr "Kaustade sünkroniseerimine"
 
-#: camel/camel-filter-driver.c:1032
-#: camel/camel-filter-driver.c:1405
+#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Viga filtri analüüsil: %s: %s"
 
-#: camel/camel-filter-driver.c:1041
-#: camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Viga filtri täitmisel: %s: %s"
@@ -8920,14 +8584,12 @@ msgstr "Võetakse vastu teadet %d (%d%%)"
 msgid "Cannot open message"
 msgstr "Sõnumi avamine ebaõnnestus"
 
-#: camel/camel-filter-driver.c:1137
-#: camel/camel-filter-driver.c:1149
+#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
 #, c-format
 msgid "Failed on message %d"
 msgstr "Nurjumine teate %d juures"
 
-#: camel/camel-filter-driver.c:1163
-#: camel/camel-filter-driver.c:1254
+#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
 msgid "Syncing folder"
 msgstr "Kausta sünkroniseerimine"
 
@@ -8952,10 +8614,10 @@ msgstr ""
 #: camel/camel-filter-search.c:401
 #, fuzzy
 msgid "Invalid arguments to (user-tag)"
-msgstr "<p>Elemendi <b>Tekstivahemik</b> vigane alamelement. Silt oli <b>%1</b></p>"
+msgstr ""
+"<p>Elemendi <b>Tekstivahemik</b> vigane alamelement. Silt oli <b>%1</b></p>"
 
-#: camel/camel-filter-search.c:670
-#: camel/camel-filter-search.c:678
+#: camel/camel-filter-search.c:670 camel/camel-filter-search.c:678
 #, fuzzy, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Viga otsingu avaldises."
@@ -8997,8 +8659,7 @@ msgstr "Sõnum on rämps"
 msgid "Filtering new message(s)"
 msgstr "Uute sõnumite filtreerimine"
 
-#: camel/camel-folder-search.c:355
-#: camel/camel-folder-search.c:476
+#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -9007,16 +8668,14 @@ msgstr ""
 "Otsinguavaldist ei ole võimalik analüüsida: %s\n"
 "%s"
 
-#: camel/camel-folder-search.c:365
-#: camel/camel-folder-search.c:486
+#: camel/camel-folder-search.c:365 camel/camel-folder-search.c:486
 #, fuzzy, c-format
 msgid ""
 "Error executing search expression: %s:\n"
 "%s"
 msgstr "Viga otsingu avaldises."
 
-#: camel/camel-folder-search.c:672
-#: camel/camel-folder-search.c:705
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:705
 #, fuzzy
 msgid "(match-all) requires a single bool result"
 msgstr "(match-all) nõuab ühtainust tõeväärtustüüpi tulemust"
@@ -9025,22 +8684,21 @@ msgstr "(match-all) nõuab ühtainust tõeväärtustüüpi tulemust"
 msgid "(match-threads) not allowed inside match-all"
 msgstr ""
 
-#: camel/camel-folder-search.c:758
-#: camel/camel-folder-search.c:762
+#: camel/camel-folder-search.c:758 camel/camel-folder-search.c:762
 msgid "(match-threads) requires a match type string"
 msgstr ""
 
-#: camel/camel-folder-search.c:785
+#: camel/camel-folder-search.c:784
 #, fuzzy
 msgid "(match-threads) expects an array result"
 msgstr "(match-all) nõuab ühtainust tõeväärtustüüpi tulemust"
 
-#: camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:790
 #, fuzzy
 msgid "(match-threads) requires the folder set"
 msgstr "(match-all) nõuab ühtainust tõeväärtustüüpi tulemust"
 
-#: camel/camel-folder-search.c:880
+#: camel/camel-folder-search.c:879
 #, fuzzy, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Täidetakse päring tundmatul päisel: %s"
@@ -9074,12 +8732,10 @@ msgstr ""
 "Te vajate kasutaja salajase võtme lahtilukustamiseks\n"
 "parooli: \""
 
-#: camel/camel-gpg-context.c:789
-#: camel/camel-gpg-context.c:1280
-#: camel/camel-gpg-context.c:1438
-#: camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637
-#: mail/mail-ops.c:706
+#: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
+#: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
+#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Loobutud."
@@ -9111,27 +8767,21 @@ msgstr "gpg käivitamine ebaõnnestus: %s"
 msgid "Failed to GPG %s: %s\n"
 msgstr "gpg käivitamine ebaõnnestus: %s"
 
-#: camel/camel-gpg-context.c:1259
-#: camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "%s: Ei õnnestu lugeda autentimisandmeid"
 
-#: camel/camel-gpg-context.c:1273
-#: camel/camel-gpg-context.c:1702
+#: camel/camel-gpg-context.c:1273 camel/camel-gpg-context.c:1702
 #: camel/camel-gpg-context.c:1753
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "gpg käivitamine ebaõnnestus: %s"
 
-#: camel/camel-gpg-context.c:1297
-#: camel/camel-gpg-context.c:1430
-#: camel/camel-gpg-context.c:1523
-#: camel/camel-gpg-context.c:1546
-#: camel/camel-gpg-context.c:1630
-#: camel/camel-gpg-context.c:1654
-#: camel/camel-gpg-context.c:1724
-#: camel/camel-gpg-context.c:1775
+#: camel/camel-gpg-context.c:1297 camel/camel-gpg-context.c:1430
+#: camel/camel-gpg-context.c:1523 camel/camel-gpg-context.c:1546
+#: camel/camel-gpg-context.c:1630 camel/camel-gpg-context.c:1654
+#: camel/camel-gpg-context.c:1724 camel/camel-gpg-context.c:1775
 msgid "Failed to execute gpg."
 msgstr "gpg käivitamine ebaõnnestus."
 
@@ -9139,10 +8789,8 @@ msgstr "gpg käivitamine ebaõnnestus."
 msgid "This is a digitally signed message part"
 msgstr "See on sõnumi digitaalselt allkirjastatud osa"
 
-#: camel/camel-gpg-context.c:1397
-#: camel/camel-gpg-context.c:1406
-#: camel/camel-smime-context.c:721
-#: camel/camel-smime-context.c:732
+#: camel/camel-gpg-context.c:1397 camel/camel-gpg-context.c:1406
+#: camel/camel-smime-context.c:721 camel/camel-smime-context.c:732
 #: camel/camel-smime-context.c:739
 #, fuzzy
 msgid "Cannot verify message signature: Incorrect message format"
@@ -9163,8 +8811,7 @@ msgstr "%s: Ei õnnestu lugeda autentimisandmeid"
 msgid "This is a digitally encrypted message part"
 msgstr "See on sõnumi digitaalselt allkirjastatud osa"
 
-#: camel/camel-gpg-context.c:1661
-#: camel/camel-smime-context.c:994
+#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr "Krüpteeritud sisu"
 
@@ -9173,8 +8820,7 @@ msgstr "Krüpteeritud sisu"
 msgid "Unable to parse message content"
 msgstr "Vastuse analüüsimine ebaõnnestus."
 
-#: camel/camel-lock.c:92
-#: camel/camel-lock.c:113
+#: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, fuzzy, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Faili ei õnnestu lahtipakkimiseks avada!"
@@ -9204,8 +8850,7 @@ msgstr "Ei suuda luua lukustamisabilise toru: %s"
 msgid "Cannot fork locking helper: %s"
 msgstr "Ei saa teha uut protsessi saalimise välja lülitamiseks. Oeh!"
 
-#: camel/camel-lock-client.c:191
-#: camel/camel-lock-client.c:214
+#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
 #, fuzzy, c-format
 msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr "'%s' ei õnnestnud lukustada, protokolli viga lukustamisabilises"
@@ -9264,14 +8909,12 @@ msgstr "Viga faili lugemisel."
 msgid "Error writing mail temp file: %s"
 msgstr "VIGA - Faili saatmine ebaõnnestus"
 
-#: camel/camel-movemail.c:465
-#: camel/camel-movemail.c:532
+#: camel/camel-movemail.c:465 camel/camel-movemail.c:532
 #, fuzzy, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "VIGA - Faili saatmine ebaõnnestus"
 
-#: camel/camel-multipart-encrypted.c:229
-#: camel/camel-multipart-encrypted.c:244
+#: camel/camel-multipart-encrypted.c:229 camel/camel-multipart-encrypted.c:244
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "MIME osa dekrüpteerimine ebaõnnestus: protokolli viga"
 
@@ -9279,8 +8922,7 @@ msgstr "MIME osa dekrüpteerimine ebaõnnestus: protokolli viga"
 msgid "Failed to decrypt MIME part: invalid structure"
 msgstr "MIME osa dekrüpteerimine ebaõnnestus: vigane struktuur"
 
-#: camel/camel-multipart-signed.c:673
-#: camel/camel-multipart-signed.c:724
+#: camel/camel-multipart-signed.c:673 camel/camel-multipart-signed.c:724
 msgid "parse error"
 msgstr "analüüsimisviga"
 
@@ -9310,8 +8952,7 @@ msgstr ""
 msgid "Could not load %s: No initialization code in module."
 msgstr "Ei saa laadida %s: moodulis puudub initsialiseerimiskood."
 
-#: camel/camel-provider.c:356
-#: camel/camel-session.c:160
+#: camel/camel-provider.c:356 camel/camel-session.c:160
 #, fuzzy, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "\"%s\" jaoks pole ühtegi vaaturit saadaval."
@@ -9324,8 +8965,7 @@ msgstr "Anonüümne"
 msgid "This option will connect to the server using an anonymous login."
 msgstr "See valik ühendub serveriga, kasutades anonüümset sisselogimist."
 
-#: camel/camel-sasl-anonymous.c:112
-#: camel/camel-sasl-plain.c:87
+#: camel/camel-sasl-anonymous.c:112 camel/camel-sasl-plain.c:87
 msgid "Authentication failed."
 msgstr "Autentimine ebaõnnestus."
 
@@ -9361,16 +9001,24 @@ msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
 #: camel/camel-sasl-cram-md5.c:37
-msgid "This option will connect to the server using a secure CRAM-MD5 password, if the server supports it."
-msgstr "See seadistus aitab juhul, kui server seda toetab, ühenduda serverisse kasutades turvalist CRAM-MD5 parooli."
+msgid ""
+"This option will connect to the server using a secure CRAM-MD5 password, if "
+"the server supports it."
+msgstr ""
+"See seadistus aitab juhul, kui server seda toetab, ühenduda serverisse "
+"kasutades turvalist CRAM-MD5 parooli."
 
 #: camel/camel-sasl-digest-md5.c:48
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
 #: camel/camel-sasl-digest-md5.c:50
-msgid "This option will connect to the server using a secure DIGEST-MD5 password, if the server supports it."
-msgstr "See seadistus aitab juhul, kui server seda toetab, ühenduda serverisse kasutades turvalist DIGEST-MD5 parooli."
+msgid ""
+"This option will connect to the server using a secure DIGEST-MD5 password, "
+"if the server supports it."
+msgstr ""
+"See seadistus aitab juhul, kui server seda toetab, ühenduda serverisse "
+"kasutades turvalist DIGEST-MD5 parooli."
 
 #: camel/camel-sasl-digest-md5.c:813
 msgid "Server challenge too long (>2048 octets)\n"
@@ -9406,7 +9054,9 @@ msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr "See valik loob ühenduse serverisse kasutades Kerberos 4 autentimist."
 
 #: camel/camel-sasl-gssapi.c:148
-msgid "The specified mechanism is not supported by the provided credential, or is unrecognized by the implementation."
+msgid ""
+"The specified mechanism is not supported by the provided credential, or is "
+"unrecognized by the implementation."
 msgstr ""
 
 #: camel/camel-sasl-gssapi.c:153
@@ -9414,19 +9064,27 @@ msgid "The provided target_name parameter was ill-formed."
 msgstr ""
 
 #: camel/camel-sasl-gssapi.c:156
-msgid "The provided target_name parameter contained an invalid or unsupported type of name."
+msgid ""
+"The provided target_name parameter contained an invalid or unsupported type "
+"of name."
 msgstr ""
 
 #: camel/camel-sasl-gssapi.c:160
-msgid "The input_token contains different channel bindings to those specified via the input_chan_bindings parameter."
+msgid ""
+"The input_token contains different channel bindings to those specified via "
+"the input_chan_bindings parameter."
 msgstr ""
 
 #: camel/camel-sasl-gssapi.c:165
-msgid "The input_token contains an invalid signature, or a signature that could not be verified."
+msgid ""
+"The input_token contains an invalid signature, or a signature that could not "
+"be verified."
 msgstr ""
 
 #: camel/camel-sasl-gssapi.c:169
-msgid "The supplied credentials were not valid for context initiation, or the credential handle did not reference any credentials."
+msgid ""
+"The supplied credentials were not valid for context initiation, or the "
+"credential handle did not reference any credentials."
 msgstr ""
 
 #: camel/camel-sasl-gssapi.c:174
@@ -9446,12 +9104,10 @@ msgstr ""
 msgid "The referenced credentials have expired."
 msgstr "Aegunud allkiri kasutajalt \""
 
-#: camel/camel-sasl-gssapi.c:189
-#: camel/camel-sasl-gssapi.c:238
-#: camel/camel-sasl-gssapi.c:274
-#: camel/camel-sasl-gssapi.c:289
+#: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
+#: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1243
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Serverilt saadi vigane autentimise vastus."
 
@@ -9486,8 +9142,7 @@ msgstr ""
 msgid "Login"
 msgstr "Kasutajanimi"
 
-#: camel/camel-sasl-login.c:34
-#: camel/camel-sasl-plain.c:34
+#: camel/camel-sasl-login.c:34 camel/camel-sasl-plain.c:34
 msgid "This option will connect to the server using a simple password."
 msgstr "See valik loob ühenduse serveriga kasutades tavalist parooli."
 
@@ -9501,7 +9156,9 @@ msgstr "NTLM / SPA"
 
 #: camel/camel-sasl-ntlm.c:33
 #, fuzzy
-msgid "This option will connect to a Windows-based server using NTLM / Secure Password Authentication."
+msgid ""
+"This option will connect to a Windows-based server using NTLM / Secure "
+"Password Authentication."
 msgstr "See valik loob ühenduse serverisse kasutades Kerberos 4 autentimist."
 
 #: camel/camel-sasl-plain.c:32
@@ -9554,14 +9211,12 @@ msgstr "URL '%s' vajab kataloogitee osa"
 msgid "Resolving: %s"
 msgstr "Lahendan: %s"
 
-#: camel/camel-service.c:764
-#: camel/camel-service.c:888
+#: camel/camel-service.c:764 camel/camel-service.c:888
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Viga nime lahendamisel: %s"
 
-#: camel/camel-service.c:785
-#: camel/camel-service.c:909
+#: camel/camel-service.c:785 camel/camel-service.c:909
 #, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr "Hosti lahendamine ebaõnnestus: lõimu ei saa luua: %s"
@@ -9639,8 +9294,7 @@ msgstr "Ei suuda kindlaks teha Teie kasutajanime"
 msgid "Cannot add CMS SigningTime"
 msgstr "CMS RecipientInfo-t ei saa lisada"
 
-#: camel/camel-smime-context.c:325
-#: camel/camel-smime-context.c:337
+#: camel/camel-smime-context.c:325 camel/camel-smime-context.c:337
 #, fuzzy, c-format
 msgid "Encryption cert for '%s' does not exist"
 msgstr "Sertifikaati \"%s\" krüpteerimise jaoks ei ole olemas."
@@ -9674,8 +9328,7 @@ msgstr "Ei saa luua andmebaasikataloogi!"
 msgid "Failed to add data to CMS encoder"
 msgstr "Kausta \"Saadetud\" teisendamine versiooni 0.4 ebaõnnestus!!"
 
-#: camel/camel-smime-context.c:441
-#: camel/camel-smime-context.c:894
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
 #, fuzzy
 msgid "Failed to encode data"
 msgstr "Ei saa lugeda METAR andmeid.\n"
@@ -9733,8 +9386,7 @@ msgstr "Vastavat allkirja salajaste võtmete hoidlas pole\n"
 msgid "Digests missing from enveloped data"
 msgstr ""
 
-#: camel/camel-smime-context.c:589
-#: camel/camel-smime-context.c:599
+#: camel/camel-smime-context.c:589 camel/camel-smime-context.c:599
 #, fuzzy
 msgid "Cannot calculate digests"
 msgstr "faili ei õnnestu sulgeda"
@@ -9744,8 +9396,7 @@ msgstr "faili ei õnnestu sulgeda"
 msgid "Cannot set message digests"
 msgstr "Sõnumi tähtsuseks määratakse:"
 
-#: camel/camel-smime-context.c:614
-#: camel/camel-smime-context.c:619
+#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
 msgid "Certificate import failed"
 msgstr "Sertifikaadi importimine ebaõnnestus"
 
@@ -9839,43 +9490,39 @@ msgstr "võtmete importimine: pole veel teostatud"
 msgid "export keys: unimplemented"
 msgstr "võtmete eksportimine: pole veel teostatud"
 
-#: camel/camel-store.c:214
+#: camel/camel-store.c:213
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-store.c:244
+#: camel/camel-store.c:243
 #, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr "Kausta `%s' ei saa luua: kaust juba eksisteerib"
 
-#: camel/camel-store.c:295
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-store.c:323
+#: camel/camel-store.c:325
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Kausta `%s' ei saa luua: kaust juba eksisteerib"
 
-#: camel/camel-store.c:387
-#: camel/camel-vee-store.c:354
+#: camel/camel-store.c:389 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kausta kustutamine nurjus: %s: vigane operatsioon"
 
-#: camel/camel-store.c:437
-#: camel/camel-vee-store.c:390
+#: camel/camel-store.c:439 camel/camel-vee-store.c:387
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kausta ümbernimetamine nurjus: %s: vigane operatsioon"
 
-#: camel/camel-store.c:811
+#: camel/camel-store.c:777
 msgid "Trash"
 msgstr "Prügikast"
 
-#: camel/camel-store.c:813
-#: filter/libfilter-i18n.h:35
-#: mail/mail-config.glade.h:95
+#: camel/camel-store.c:779 mail/mail-config.glade.h:95
 #: ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Rämps"
@@ -10011,8 +9658,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr "&Funktsioon sooritatakse rakendusel:"
 
-#: camel/camel-tcp-stream-openssl.c:696
-#: camel/camel-tcp-stream-ssl.c:825
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -10025,13 +9671,11 @@ msgstr ""
 "Sõrmejälg:       %s\n"
 "Allkiri:         %s"
 
-#: camel/camel-tcp-stream-openssl.c:702
-#: camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "GOOD"
 msgstr "HEA"
 
-#: camel/camel-tcp-stream-openssl.c:702
-#: camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "BAD"
 msgstr "HALB"
 
@@ -10119,17 +9763,16 @@ msgstr "Viga `%s' salvestamisel: %s"
 msgid "No such message %s in %s"
 msgstr "Sõnumit %s ei ole %s seas"
 
-#: camel/camel-vee-folder.c:841
-#: camel/camel-vee-folder.c:847
+#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Sõnumeid ei saa koppeerida või liigutaad Virtuaalkausta"
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:374
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kausta kustutamine nurjus: %s: kausta ei ole olemas"
 
-#: camel/camel-vee-store.c:398
+#: camel/camel-vee-store.c:395
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Ei saa muuta kausta nime: %s: kausta ei ole olemas"
@@ -10155,7 +9798,9 @@ msgstr "Kontrolli uusi sõnumeid kõikides kaustades"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:59
 msgid "Apply filters to new messages in Inbox on this server"
-msgstr "Rakenda filtreid kõikidele selles serveris Sisendkastis asuvatele uutele sõnumitele "
+msgstr ""
+"Rakenda filtreid kõikidele selles serveris Sisendkastis asuvatele uutele "
+"sõnumitele "
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:62
 #: camel/providers/imap/camel-imap-provider.c:70
@@ -10170,32 +9815,31 @@ msgstr "Aadressiraamat ja kalender"
 msgid "Post Office Agent SOAP Port:"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:80
+#: camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "Novell GroupWise"
 msgstr "Novell Groupwise"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:82
+#: camel/providers/groupwise/camel-groupwise-provider.c:85
 msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: camel/providers/groupwise/camel-groupwise-provider.c:100
 #: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71
-#: mail/mail-config.glade.h:108
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
 msgid "Password"
 msgstr "Parool"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:99
+#: camel/providers/groupwise/camel-groupwise-provider.c:102
 #: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/groupwise/camel-gw-listener.c:305
-#: camel/providers/groupwise/camel-gw-listener.c:328
+#: camel/providers/groupwise/camel-gw-listener.c:312
+#: camel/providers/groupwise/camel-gw-listener.c:335
 msgid "Checklist"
 msgstr "Kontroll-loend"
 
@@ -10323,27 +9967,28 @@ msgstr "E-posti loetakse ja hoitakse IMAP serveris."
 
 #: camel/providers/imap4/camel-imap4-provider.c:72
 #, fuzzy
-msgid "This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
 msgstr "See valik loob ühenduse serveriga kasutades tavalist parooli."
 
 #: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:429
+#: camel/providers/imap/camel-imap-store.c:428
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP server %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:431
+#: camel/providers/imap/camel-imap-store.c:430
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "Teenu&sest võrgus teatamine"
 
 #: camel/providers/imap4/camel-imap4-store.c:208
 #: camel/providers/imap4/camel-imap4-store.c:225
-#: camel/providers/imap/camel-imap-store.c:552
-#: camel/providers/imap/camel-imap-store.c:572
+#: camel/providers/imap/camel-imap-store.c:551
+#: camel/providers/imap/camel-imap-store.c:571
 #: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
+#: camel/providers/nntp/camel-nntp-store.c:209
 #: camel/providers/pop3/camel-pop3-store.c:175
 #: camel/providers/smtp/camel-smtp-transport.c:269
 #: camel/providers/smtp/camel-smtp-transport.c:285
@@ -10352,30 +9997,32 @@ msgid "Could not connect to %s (port %d): %s"
 msgstr "Ei saa ühenduda %s (port: %d): %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:210
-#: camel/providers/imap/camel-imap-store.c:554
+#: camel/providers/imap/camel-imap-store.c:553
 #: camel/providers/pop3/camel-pop3-store.c:177
 #: camel/providers/smtp/camel-smtp-transport.c:271
 msgid "SSL unavailable"
 msgstr "SSL ei ole saadaval"
 
 #: camel/providers/imap4/camel-imap4-store.c:222
-#: camel/providers/imap/camel-imap-store.c:569
-#: camel/providers/imap/camel-imap-store.c:846
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/imap/camel-imap-store.c:845
 #: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:137
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
 #: camel/providers/pop3/camel-pop3-store.c:192
 msgid "Connection cancelled"
 msgstr "Ühendus katkestatud"
 
 #: camel/providers/imap4/camel-imap4-store.c:261
 #, fuzzy, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: Server does not support STARTTLS"
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
 msgstr "Ei saa luua ühendust LDAP serveriga"
 
 #: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:680
-#: camel/providers/imap/camel-imap-store.c:711
+#: camel/providers/imap/camel-imap-store.c:679
+#: camel/providers/imap/camel-imap-store.c:710
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Ei saa luua ühendust LDAP serveriga"
@@ -10384,14 +10031,14 @@ msgstr "Ei saa luua ühendust LDAP serveriga"
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545
-#: shell/e-shell.c:1108
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
 msgid "Unknown error"
 msgstr "Tundmatu viga"
 
 #: camel/providers/imap4/camel-imap4-store.c:373
 #, fuzzy, c-format
-msgid "Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
 msgstr "SMTP server %s ei toeta küsitud autentimistüüpi %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:418
@@ -10410,10 +10057,11 @@ msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr "Kausta `%s' ei saadud IMAP serverist %s: Tundmatu"
 
 #: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1888
-#: camel/providers/imap/camel-imap-store.c:2266
+#: camel/providers/imap/camel-imap-store.c:1885
+#: camel/providers/imap/camel-imap-store.c:2263
 #, fuzzy, c-format
-msgid "The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr "Kausta nimi \"%s\" on vigane kuna see sisaldab \"%c\" kirjamärki"
 
 #: camel/providers/imap4/camel-imap4-store.c:826
@@ -10487,12 +10135,12 @@ msgstr "Konto tüüp: lahutatud IMAP konto"
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3199
+#: camel/providers/imap/camel-imap-store.c:3194
 msgid "Operation cancelled"
 msgstr "Operatsioon katekstatud"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3202
+#: camel/providers/imap/camel-imap-store.c:3197
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server katkestas ootamatult: %s"
@@ -10575,7 +10223,7 @@ msgstr "Sõnumit ei leitud"
 
 #: camel/providers/imap/camel-imap-folder.c:2019
 #: camel/providers/imap/camel-imap-folder.c:2622
-#: camel/providers/nntp/camel-nntp-folder.c:238
+#: camel/providers/nntp/camel-nntp-folder.c:220
 msgid "This message is not currently available"
 msgstr "See sõnum ei ole hetkel kättesaadav"
 
@@ -10596,7 +10244,8 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:2484
 #, c-format
-msgid "Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgid ""
+"Unexpected server response: Identical UIDs provided for messages %d and %d"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:2660
@@ -10659,44 +10308,44 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "E-posti loetakse ja hoitakse IMAP serveris."
 
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:680
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS laiend ei ole toetatud."
 
-#: camel/providers/imap/camel-imap-store.c:712
+#: camel/providers/imap/camel-imap-store.c:711
 #: camel/providers/pop3/camel-pop3-store.c:269
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "abiprogramm `%s' ebaõnnestus"
 
-#: camel/providers/imap/camel-imap-store.c:849
+#: camel/providers/imap/camel-imap-store.c:848
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "DCOP'iga pole võimalik registreerida.\n"
 
-#: camel/providers/imap/camel-imap-store.c:1273
+#: camel/providers/imap/camel-imap-store.c:1272
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP server %s ei toeta küsitud autentimistüüpi %s"
 
-#: camel/providers/imap/camel-imap-store.c:1283
+#: camel/providers/imap/camel-imap-store.c:1282
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Autentimistüübi %s tugi puudub"
 
-#: camel/providers/imap/camel-imap-store.c:1306
+#: camel/providers/imap/camel-imap-store.c:1305
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, fuzzy, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "Palun sisesta parool %1 jaoks"
 
-#: camel/providers/imap/camel-imap-store.c:1320
+#: camel/providers/imap/camel-imap-store.c:1319
 msgid "You didn't enter a password."
 msgstr "Sa ei sisestanud parooli."
 
-#: camel/providers/imap/camel-imap-store.c:1349
+#: camel/providers/imap/camel-imap-store.c:1348
 #, fuzzy, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10707,18 +10356,18 @@ msgstr ""
 "Serveri vastus:\n"
 "%2"
 
-#: camel/providers/imap/camel-imap-store.c:1870
-#: camel/providers/imap/camel-imap-store.c:2060
+#: camel/providers/imap/camel-imap-store.c:1867
+#: camel/providers/imap/camel-imap-store.c:2057
 #, c-format
 msgid "No such folder %s"
 msgstr "Kausta %s ei leitud"
 
-#: camel/providers/imap/camel-imap-store.c:1946
-#: camel/providers/imap/camel-imap-store.c:2327
+#: camel/providers/imap/camel-imap-store.c:1943
+#: camel/providers/imap/camel-imap-store.c:2324
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:2001
+#: camel/providers/imap/camel-imap-store.c:1998
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10726,7 +10375,7 @@ msgstr ""
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Kausta `%s' ei saa luua: kaust juba eksisteerib"
 
-#: camel/providers/imap/camel-imap-store.c:2277
+#: camel/providers/imap/camel-imap-store.c:2274
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Tundmatu ülemkaust: %s"
@@ -10748,7 +10397,8 @@ msgid ""
 " !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
 msgstr ""
 "Eksperimentaalne IMAP 4(.1) klient\n"
-"See on testimata ja mittetoetatud kood, parem kasuta selle asemel tavalist imap'i.\n"
+"See on testimata ja mittetoetatud kood, parem kasuta selle asemel tavalist "
+"imap'i.\n"
 "\n"
 " !!! ÄRA KASUTA SEDA OMA TAVAKIRJADE PUHUL !!!\n"
 
@@ -10767,22 +10417,22 @@ msgstr ""
 
 #  $HOME relative path + protocol string
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:388
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #  /var/spool/mail relative path + protocol
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:393
-#: camel/providers/local/camel-local-folder.c:396
+#: camel/providers/local/camel-local-folder.c:392
+#: camel/providers/local/camel-local-folder.c:395
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "postkast:%s (%s)"
 
 #  a full path + protocol
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:400
+#: camel/providers/local/camel-local-folder.c:399
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -10806,7 +10456,9 @@ msgstr "Kohalik postijagaja"
 
 #: camel/providers/local/camel-local-provider.c:66
 #, fuzzy
-msgid "For retrieving (moving) local mail from standard mbox formated spools into folders managed by Evolution."
+msgid ""
+"For retrieving (moving) local mail from standard mbox formated spools into "
+"folders managed by Evolution."
 msgstr "Kohalikku e-posti võetakse standardsest \"mbox\" vorminguga puhvrist"
 
 #: camel/providers/local/camel-local-provider.c:77
@@ -10836,11 +10488,13 @@ msgstr "Standardne Unix'i \"mbox\" puhver"
 msgid ""
 "For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
-msgstr "Kohalikku e-posti loetakse ja hoitakse standardsetes \"mbox\" vorminguga puhverfailides"
+msgstr ""
+"Kohalikku e-posti loetakse ja hoitakse standardsetes \"mbox\" vorminguga "
+"puhverfailides"
 
 #: camel/providers/local/camel-local-store.c:142
 #: camel/providers/local/camel-local-store.c:253
-#: camel/providers/local/camel-mbox-store.c:356
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10974,9 +10628,9 @@ msgstr "Kausta `%s' ei saa kustutada: %s"
 msgid "not a maildir directory"
 msgstr "ei ole maildir vormingus kataloog"
 
-#: camel/providers/local/camel-maildir-store.c:341
-#: camel/providers/local/camel-spool-store.c:286
-#: camel/providers/local/camel-spool-store.c:316
+#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-spool-store.c:284
+#: camel/providers/local/camel-spool-store.c:314
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Kausta `%s' ei saa läbi vaadata: %s"
@@ -11037,7 +10691,7 @@ msgid "Message construction failed."
 msgstr "Sõnumi kokkupanek ebaõnnestus: Rikutud kirjakast?"
 
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:362
+#: camel/providers/local/camel-mbox-store.c:361
 msgid "Cannot create a folder by this name."
 msgstr "Sellise nimega kausta ei saa luua."
 
@@ -11065,31 +10719,31 @@ msgstr "`%s' ei ole tavaline fail."
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Kaust '%s' ei ole tühi, jätan kustutamata."
 
-#: camel/providers/local/camel-mbox-store.c:375
+#: camel/providers/local/camel-mbox-store.c:374
 #, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Kataloogi %s ei saa luua: %s"
 
-#: camel/providers/local/camel-mbox-store.c:389
+#: camel/providers/local/camel-mbox-store.c:388
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Kausta %s ei saa luua: %s"
 
-#: camel/providers/local/camel-mbox-store.c:391
+#: camel/providers/local/camel-mbox-store.c:390
 msgid "Folder already exists"
 msgstr "Kaust juba eksisteerib"
 
-#: camel/providers/local/camel-mbox-store.c:473
+#: camel/providers/local/camel-mbox-store.c:472
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "Uus failinimi on tühi!"
 
-#: camel/providers/local/camel-mbox-store.c:486
+#: camel/providers/local/camel-mbox-store.c:485
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Ei saa ümber nimetada '%s': %s"
 
-#: camel/providers/local/camel-mbox-store.c:561
+#: camel/providers/local/camel-mbox-store.c:560
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Kausta %s ei saa ümber nimetada %s-ks: %s"
@@ -11283,7 +10937,7 @@ msgid ""
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:997
+#: camel/providers/nntp/camel-nntp-store.c:1126
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Palun sisesta NNTP parool %s@%s jaoks"
@@ -11300,18 +10954,10 @@ msgstr "Kasutajanime saatmine serverisse ebaõnnestus"
 msgid "Server rejected username/password"
 msgstr "Server keeldus kasutajanime/parooli vastu võtmast"
 
-#: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:263
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr "Kasutaja tühistas"
-
-#: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:259
-#: camel/providers/nntp/camel-nntp-folder.c:265
+#: camel/providers/nntp/camel-nntp-folder.c:147
+#: camel/providers/nntp/camel-nntp-folder.c:149
+#: camel/providers/nntp/camel-nntp-folder.c:158
+#: camel/providers/nntp/camel-nntp-folder.c:234
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11322,66 +10968,56 @@ msgstr ""
 "Sõnumit %s ei saadud: \n"
 "  %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:188
-#: camel/providers/nntp/camel-nntp-folder.c:228
+#: camel/providers/nntp/camel-nntp-folder.c:156
+#: camel/providers/nntp/camel-nntp-folder.c:232
+#: camel/providers/nntp/camel-nntp-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+msgid "User cancelled"
+msgstr "Kasutaja tühistas"
+
+#: camel/providers/nntp/camel-nntp-folder.c:176
+#: camel/providers/nntp/camel-nntp-folder.c:208
 #, c-format
 msgid "Internal error: uid in invalid format: %s"
 msgstr "Sisemine viga: uid on vigases vormingus: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:201
-#, fuzzy, c-format
-msgid "Could not get article %s from NNTP server"
-msgstr "Gruppide nimekirja serverist ei saadud."
-
-#: camel/providers/nntp/camel-nntp-folder.c:362
-msgid "Posting not allowed by news server"
-msgstr "Uudisteserver ei luba postitusi"
-
+#: camel/providers/nntp/camel-nntp-folder.c:328
+#: camel/providers/nntp/camel-nntp-folder.c:331
 #: camel/providers/nntp/camel-nntp-folder.c:373
-#, c-format
-msgid "Failed to send newsgroups header: %s: message not posted"
-msgstr "Uudistegruppide päise saatmine ebaõnnestus: %s: sõnimit ei postitatud"
-
-#: camel/providers/nntp/camel-nntp-folder.c:413
-#: camel/providers/nntp/camel-nntp-folder.c:426
-#, c-format
-msgid "Error posting to newsgroup: %s: message not posted"
-msgstr "Viga uudistegruppi postitamisel: %s: sõnumit ei postitatud"
-
-#: camel/providers/nntp/camel-nntp-folder.c:438
-msgid "Error reading response to posted message: message not posted"
-msgstr "Viga postitatud sõnumi vastuse lugemisel: sõnumit ei postitatud"
-
-#: camel/providers/nntp/camel-nntp-folder.c:441
+#: camel/providers/nntp/camel-nntp-folder.c:375
 #, fuzzy, c-format
-msgid "Error posting message: %s: message not posted"
-msgstr "Viga uudistegruppi postitamisel: %s: sõnumit ei postitatud"
+msgid "Posting failed: %s"
+msgstr "Operatsioon ebaõnnestus: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:457
+#: camel/providers/nntp/camel-nntp-folder.c:393
 msgid "You cannot post NNTP messages while working offline!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:468
+#: camel/providers/nntp/camel-nntp-folder.c:404
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Sõnumeid ei saa NNTP kaustast kopeerida!"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:44
 msgid "Could not get group list from server."
 msgstr "Gruppide nimekirja serverist ei saadud."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#: camel/providers/nntp/camel-nntp-grouplist.c:97
+#: camel/providers/nntp/camel-nntp-grouplist.c:106
 #, fuzzy, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "Faili %1 avamine %2 järjehoidjate jaoks ei õnnestunud."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#: camel/providers/nntp/camel-nntp-grouplist.c:157
 #, fuzzy, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Faili %1 avamine %2 järjehoidjate jaoks ei õnnestunud."
 
 #: camel/providers/nntp/camel-nntp-provider.c:43
-msgid "Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
+msgid ""
+"Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
 msgstr "Näita kaustasid lühendatult (comp.os.linux asemel c.o.linux)"
 
 #: camel/providers/nntp/camel-nntp-provider.c:45
@@ -11397,29 +11033,34 @@ msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-provider.c:73
-msgid "This option will authenticate with the NNTP server using a plaintext password."
+msgid ""
+"This option will authenticate with the NNTP server using a plaintext "
+"password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:158
+#: camel/providers/nntp/camel-nntp-store.c:118
+#: camel/providers/nntp/camel-nntp-store.c:1233
+#: camel/providers/nntp/camel-nntp-store.c:1331
+#, c-format
+msgid "NNTP Command failed: %s"
+msgstr "NNTP käsk ebaõnnestus: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:227
 #, fuzzy, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Standardsisendist (stdin) andmete lugemine ebaõnnestus."
 
-#: camel/providers/nntp/camel-nntp-store.c:170
+#: camel/providers/nntp/camel-nntp-store.c:239
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP server %s tagastas veakoodi %d: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:326
+#: camel/providers/nntp/camel-nntp-store.c:403
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENETi uudised üle %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:640
-msgid "Stream error"
-msgstr "Andmevoo viga"
-
-#: camel/providers/nntp/camel-nntp-store.c:643
+#: camel/providers/nntp/camel-nntp-store.c:777
 #, fuzzy, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -11427,75 +11068,75 @@ msgid ""
 "%s"
 msgstr "Meili vastuvõtmisel tekkis viga"
 
-#: camel/providers/nntp/camel-nntp-store.c:735
+#: camel/providers/nntp/camel-nntp-store.c:872
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
 "No such newsgroup. The selected item is a probably a parent folder."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:767
+#: camel/providers/nntp/camel-nntp-store.c:904
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
 "newsgroup does not exist!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:792
+#: camel/providers/nntp/camel-nntp-store.c:929
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:800
+#: camel/providers/nntp/camel-nntp-store.c:937
 #, fuzzy
 msgid "You cannot rename a folder in a News store."
 msgstr "Ei saa muuda kausta %s nime %s-ks: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:808
+#: camel/providers/nntp/camel-nntp-store.c:945
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:253
-#, c-format
-msgid "Connection error: %s"
-msgstr "Ühenduse viga: %s"
-
-#: camel/providers/nntp/camel-nntp-summary.c:262
-#, c-format
-msgid "No such folder: %s"
-msgstr "Kausta ei leitud: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1118
+#, fuzzy
+msgid "Authentication requested but not username provided"
+msgstr "Autentimine on vajalik"
 
-#: camel/providers/nntp/camel-nntp-summary.c:268
+#: camel/providers/nntp/camel-nntp-store.c:1146
 #, fuzzy, c-format
-msgid "Could not get group: %s"
-msgstr "Infot pole võimalik saada!"
+msgid "Cannot authenticate to server: %s"
+msgstr "Autentimine LDAP serverile nurjus"
 
-#: camel/providers/nntp/camel-nntp-summary.c:333
+#: camel/providers/nntp/camel-nntp-store.c:1262
 #, fuzzy
-msgid "Could not get messages: unspecified error"
-msgstr "Sõnumi võtmine nurjus: %s"
+msgid "Not connected."
+msgstr "Kontakte pole"
 
-#: camel/providers/nntp/camel-nntp-summary.c:378
+#: camel/providers/nntp/camel-nntp-store.c:1311
 #, c-format
-msgid "NNTP Command failed: %s"
-msgstr "NNTP käsk ebaõnnestus: %s"
+msgid "No such folder: %s"
+msgstr "Kausta ei leitud: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:438
-#: camel/providers/nntp/camel-nntp-summary.c:543
+#: camel/providers/nntp/camel-nntp-summary.c:218
+#: camel/providers/nntp/camel-nntp-summary.c:314
 #, fuzzy, c-format
 msgid "%s: Scanning new messages"
 msgstr "%1: uute kirjade tõmbamine"
 
-#: camel/providers/nntp/camel-nntp-summary.c:558
+#: camel/providers/nntp/camel-nntp-summary.c:225
 #, fuzzy, c-format
-msgid "Unknown server response: %s"
-msgstr "Serveri viimane vastus"
+msgid "Unexpected server response from xover: %s"
+msgstr "Ootamatu vastus IMAP serverilt: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:605
+#: camel/providers/nntp/camel-nntp-summary.c:328
+#, fuzzy, c-format
+msgid "Unexpected server response from head: %s"
+msgstr "Ootamatu vastus IMAP serverilt: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:368
 #, fuzzy
 msgid "Use cancel"
 msgstr "Katkestada avamine?"
 
-#: camel/providers/nntp/camel-nntp-summary.c:607
+#: camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Operatsioon ebaõnnestus: %s"
@@ -11529,8 +11170,7 @@ msgstr "[Elemendid ]omaniku UID-ga \"%s\""
 msgid "Retrieving POP message %d"
 msgstr "POP sõnumi %d vastuvõtt"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501
-#: composer/e-msg-composer.c:1225
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1225
 #: composer/e-msg-composer.c:1246
 msgid "Unknown reason"
 msgstr "Tundmatu põhjus"
@@ -11548,8 +11188,7 @@ msgstr "Kustuta %s päeva möödumisel"
 msgid "Disable support for all POP3 extensions"
 msgstr "Keela kõigi POP3 laienduste toetus"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54
-#: mail/mail-config.glade.h:107
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107
 msgid "POP"
 msgstr "POP"
 
@@ -11558,11 +11197,18 @@ msgid "For connecting to and downloading mail from POP servers."
 msgstr "E-posti laetakse alla POP serverist"
 
 #: camel/providers/pop3/camel-pop3-provider.c:73
-msgid "This option will connect to the POP server using a plaintext password. This is the only option supported by many POP servers."
-msgstr "See valik ühendub POP serverisse kasutades lihttekstiparooli. See on ainus valik, mida toetavad paljud POP serverid."
+msgid ""
+"This option will connect to the POP server using a plaintext password. This "
+"is the only option supported by many POP servers."
+msgstr ""
+"See valik ühendub POP serverisse kasutades lihttekstiparooli. See on ainus "
+"valik, mida toetavad paljud POP serverid."
 
 #: camel/providers/pop3/camel-pop3-provider.c:83
-msgid "This option will connect to the POP server using an encrypted password via the APOP protocol. This may not work for all users even on servers that claim to support it."
+msgid ""
+"This option will connect to the POP server using an encrypted password via "
+"the APOP protocol. This may not work for all users even on servers that "
+"claim to support it."
 msgstr ""
 
 #: camel/providers/pop3/camel-pop3-store.c:195
@@ -11585,7 +11231,9 @@ msgstr "Ei õnnestu luua ühendust WAIS serveriga."
 #: camel/providers/pop3/camel-pop3-store.c:407
 #: camel/providers/pop3/camel-pop3-store.c:521
 #, fuzzy, c-format
-msgid "Unable to connect to POP server %s: No support for requested authentication mechanism."
+msgid ""
+"Unable to connect to POP server %s: No support for requested authentication "
+"mechanism."
 msgstr "SMTP server %s ei toeta küsitud autentimistüüpi %s"
 
 #: camel/providers/pop3/camel-pop3-store.c:423
@@ -11629,7 +11277,9 @@ msgid "Sendmail"
 msgstr "Sendmail"
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:38
-msgid "For delivering mail by passing it to the \"sendmail\" program on the local system."
+msgid ""
+"For delivering mail by passing it to the \"sendmail\" program on the local "
+"system."
 msgstr "E-posti saatmiseks kohaliku süsteemi programmi \"sendmail\" abil."
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:113
@@ -11645,7 +11295,8 @@ msgstr "Ei saa luua toru sendmailiga: %s: sõnumit ei saadetud"
 #: camel/providers/sendmail/camel-sendmail-transport.c:165
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
-msgstr "Sendmail'i haruprotsessi pole võimalik tekitada: %s: e-post jäi saatmata"
+msgstr ""
+"Sendmail'i haruprotsessi pole võimalik tekitada: %s: e-post jäi saatmata"
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:205
 #, c-format
@@ -11675,8 +11326,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Sõnumite trantsport sendmail programmiga"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37
-#: mail/mail-config.glade.h:122
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11967,20 +11617,19 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295
-#: mail/em-utils.c:408
+#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:408
 msgid "attachment"
 msgstr "manus"
 
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:454
 msgid "Remove selected items from the attachment list"
 msgstr "Eemalda valitud kirjed manuste nimekirjast"
 
-#: composer/e-msg-composer-attachment-bar.c:491
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Add attachment..."
 msgstr "Lisa manus..."
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:495
 msgid "Attach a file to the message"
 msgstr "Faili manustamine sõnumile"
 
@@ -12014,12 +11663,15 @@ msgstr "Soovita manuse automaatset kuvamist"
 
 #: composer/e-msg-composer.c:704
 #, fuzzy
-msgid "Cannot sign outgoing message: No signing certificate set for this account"
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "Väljuvad sõnumid _allkirjastatakse alati selle konto abil"
 
 #: composer/e-msg-composer.c:711
 #, fuzzy
-msgid "Cannot encrypt outgoing message: No encryption certificate set for this account"
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
 msgstr "Seda teadet pole võimalik krüpteerida: puudub krüpteeritav algtekst"
 
 #: composer/e-msg-composer.c:1283
@@ -12040,8 +11692,7 @@ msgstr "Pealkirjata sõnum"
 msgid "Open file"
 msgstr "Ava fail"
 
-#: composer/e-msg-composer.c:1998
-#: mail/mail-account-gui.c:1479
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
 msgid "Autogenerated"
 msgstr "Automaatselt genereeritud"
 
@@ -12050,18 +11701,21 @@ msgid "Signature:"
 msgstr "Allkiri:"
 
 #: composer/e-msg-composer.c:2298
-#: composer/e-msg-composer.c:2327
 #, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] ""
+msgstr[1] ""
+
+#: composer/e-msg-composer.c:2327
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr "_Manuseriba peitmine (tõsta manused siia)"
 
-#: composer/e-msg-composer.c:2330
-#: composer/e-msg-composer.c:3234
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr "_Manuseriba kuvamine (tõsta manused siia)"
 
-#: composer/e-msg-composer.c:2347
-#: composer/e-msg-composer.c:3113
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3113
 #: composer/e-msg-composer.c:3114
 msgid "Compose a message"
 msgstr "Sõnumi koostamine"
@@ -12093,7 +11747,9 @@ msgstr ""
 "Ei saa aktiveerida HTML redaktori komponenti."
 
 #: composer/e-msg-composer.c:4284
-msgid "<b>(The composer contains a non-text message body, which cannot be edited.)<b>"
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
 msgstr ""
 
 #: composer/e-msg-composer-hdrs.c:512
@@ -12155,7 +11811,9 @@ msgid "Bcc:"
 msgstr "Pimekoopia:"
 
 #: composer/e-msg-composer-hdrs.c:607
-msgid "Enter the addresses that will receive a carbon copy of the message without appearing in the recipient list of the message."
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message."
 msgstr "Sisesta aadressid, millele saadetakse sõnumi pimekoopiad."
 
 #  * Post-To
@@ -12165,6 +11823,9 @@ msgstr "Sisesta aadressid, millele saadetakse sõnumi pimekoopiad."
 #  * Post-To
 #  * Post-To
 #  * Post-To
+#.
+#. * Post-To
+#.
 #: composer/e-msg-composer-hdrs.c:614
 #, fuzzy
 msgid "Post To:"
@@ -12179,19 +11840,21 @@ msgid "Attach file(s)"
 msgstr "Faili(de) manustamine"
 
 #  mail-composer:no-attach primary
+#. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
+msgid "You cannot attach the file `{0}' to this message."
 msgstr "Faili manustamine sõnumile"
 
 #. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4
-msgid "${1}"
-msgstr "${1}"
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr "{1}"
 
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+#, fuzzy
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr "Fail `${0}' ei ole tavafail ja seda ei saa sõnumis saata."
 
 #. mail-composer:attach-directory primary
@@ -12201,16 +11864,20 @@ msgstr "Katalooge ei saa sõnumeile manustada."
 
 #. mail-composer:attach-directory secondary
 #: composer/mail-composer-errors.xml.h:10
-msgid "To attach the contents of this directory, either attach the files in this directory individually, or create an archive of the directory and attach it."
+msgid ""
+"To attach the contents of this directory, either attach the files in this "
+"directory individually, or create an archive of the directory and attach it."
 msgstr ""
 
 #  mail-composer:recover-autosave title
+#. mail-composer:recover-autosave title
 #: composer/mail-composer-errors.xml.h:12
 #, fuzzy
 msgid "Unfinished messages found"
 msgstr "Topeltkirju ei leitud."
 
 #  mail-composer:recover-autosave primary
+#. mail-composer:recover-autosave primary
 #: composer/mail-composer-errors.xml.h:14
 #, fuzzy
 msgid "Do you want to recover unfinished messages?"
@@ -12220,7 +11887,9 @@ msgstr ""
 
 #. mail-composer:recover-autosave secondary
 #: composer/mail-composer-errors.xml.h:16
-msgid "Evolution quit unexpectedly while you were composing a new message. Recovering the message will allow you to continue where you left off."
+msgid ""
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
 msgstr ""
 
 #: composer/mail-composer-errors.xml.h:17
@@ -12232,16 +11901,20 @@ msgid "Recover"
 msgstr "Taasta"
 
 #  mail-composer:no-autosave primary
+#. mail-composer:no-autosave primary
 #: composer/mail-composer-errors.xml.h:20
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Ajutisse faili kirjutamine ei õnnestunud."
 
 #  mail-composer:no-autosave secondary
+#. mail-composer:no-autosave secondary
 #: composer/mail-composer-errors.xml.h:22
 #, fuzzy
 msgid "Error saving to autosave because \"{1}\"."
-msgstr "Viga faili salvestamisel. Kontrolli, kas sul on õigus seda asukohas \"%1\" üldse teha."
+msgstr ""
+"Viga faili salvestamisel. Kontrolli, kas sul on õigus seda asukohas \"%1\" "
+"üldse teha."
 
 #. mail-composer:exit-unsaved title
 #: composer/mail-composer-errors.xml.h:24
@@ -12250,15 +11923,21 @@ msgstr "Hoiatus: salvestamata sõnum"
 
 #  mail-composer:exit-unsaved primary
 #  mail-composer:exit-unsaved primary
+#. mail-composer:exit-unsaved primary
 #: composer/mail-composer-errors.xml.h:26
 #, fuzzy
-msgid "Are you sure you want to discard the message, titled '{0}', you are composing?"
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
 msgstr "Kas sa tõesti soovid kustutada seda nimetut kokkusaamist?"
 
 #  mail-composer:exit-unsaved secondary
 #. mail-composer:exit-unsaved secondary
 #: composer/mail-composer-errors.xml.h:28
-msgid "Closing this composer window will discard the message permanently, unless you choose to save the message in your Drafts folder. This will allow you to continue the message at a later date."
+msgid ""
+"Closing this composer window will discard the message permanently, unless "
+"you choose to save the message in your Drafts folder. This will allow you to "
+"continue the message at a later date."
 msgstr ""
 
 #: composer/mail-composer-errors.xml.h:29
@@ -12277,7 +11956,8 @@ msgstr "Sõnumit ei saa luua."
 
 #. mail-composer:no-build-message secondary
 #: composer/mail-composer-errors.xml.h:34
-msgid "Because \"${0}\", you may need to select different mail options."
+#, fuzzy
+msgid "Because \"{0}\", you may need to select different mail options."
 msgstr "Kuna \"${0}\", pead sa valima teised kirjade sätted."
 
 #  mail-composer:no-sig-file primary
@@ -12287,9 +11967,11 @@ msgid "Could not read signature file \"{0}\"."
 msgstr "Signatuurifaili \"{0}\" ei õnnestu lugeda."
 
 #. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38
-msgid "Because \"${1}\"."
-msgstr "Kuna \"${1}\"."
+#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr "Kuna \"{1}\"."
 
 #  mail-composer:all-accounts-deleted primary
 #. mail-composer:all-accounts-deleted primary
@@ -12336,7 +12018,8 @@ msgstr "<b>Olek:</b>"
 
 #: designs/OOA/ooa.glade.h:6
 msgid ""
-"<small>The message specified below will be automatically sent to each person who sends\n"
+"<small>The message specified below will be automatically sent to each person "
+"who sends\n"
 "mail to you while you are out of the office.</small>"
 msgstr ""
 "<small>See allpool näidatud sõnum saadetakse automaatselt igale isikule,\n"
@@ -12376,8 +12059,10 @@ msgstr "<b>E-posti saatmine:</b>"
 
 #: designs/read_receipts/read.glade.h:4
 msgid ""
-"<small>This page allows you to choose if you want to be notified via a read receipt when a message you\n"
-"sent is read, and to specify what Evolution should do when someone requests a receipt from you.</small>"
+"<small>This page allows you to choose if you want to be notified via a read "
+"receipt when a message you\n"
+"sent is read, and to specify what Evolution should do when someone requests "
+"a receipt from you.</small>"
 msgstr ""
 
 #: designs/read_receipts/read.glade.h:6
@@ -12406,7 +12091,9 @@ msgid "Unless the message is sent to a mailing list, and not to me personally"
 msgstr ""
 
 #: designs/read_receipts/read.glade.h:12
-msgid "When you receive an email with a read receipt request, what should Evolution do?"
+msgid ""
+"When you receive an email with a read receipt request, what should Evolution "
+"do?"
 msgstr ""
 
 #: e-util/e-dialog-utils.c:249
@@ -12418,8 +12105,7 @@ msgstr ""
 "Kirjutada üle?"
 
 #. system:ask-save-file-exists-overwrite title
-#: e-util/e-dialog-utils.c:251
-#: widgets/misc/e-system-errors.xml.h:2
+#: e-util/e-dialog-utils.c:251 widgets/misc/e-system-errors.xml.h:2
 msgid "Overwrite file?"
 msgstr "Fail üle kirjutada?"
 
@@ -12453,10 +12139,7 @@ msgstr "Katekooriate sünkroniseerimine:"
 #  time, in 12-hour format, without seconds.
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:185
-#: e-util/e-time-utils.c:398
+#: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 
@@ -12466,10 +12149,7 @@ msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 #  time, in 24-hour format, without seconds.
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:190
-#: e-util/e-time-utils.c:389
+#: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a, %d.%m.%Y %H:%M:%S"
 
@@ -12548,39 +12228,25 @@ msgstr "%d.%m.%Y"
 #  strptime format for a time of day, in 12-hour format.
 #  strftime format of a time in 12-hour format.
 #. strptime format for a time of day, in 12-hour format.
-#. strftime format of a time in 12-hour format.
-#: e-util/e-time-utils.c:339
-#: e-util/e-time-utils.c:438
+#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#. strftime format of a time in 24-hour format.
-#: e-util/e-time-utils.c:343
-#: e-util/e-time-utils.c:430
+#: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: e-util/e-time-utils.c:348
-#: e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1414
-#: widgets/misc/e-dateedit.c:1639
+#: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
+#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: e-util/e-time-utils.c:352
-#: e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1411
-#: widgets/misc/e-dateedit.c:1636
+#: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
+#: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -12590,19 +12256,59 @@ msgid "%I %p"
 msgstr "%I %p"
 
 #: filter/filter-datespec.c:73
+#, fuzzy, c-format
+msgid "1 second ago"
+msgid_plural "%d seconds ago"
+msgstr[0] "teine"
+msgstr[1] "teine"
+
 #: filter/filter-datespec.c:74
+#, fuzzy, c-format
+msgid "1 minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "10 minutit"
+msgstr[1] "10 minutit"
+
 #: filter/filter-datespec.c:75
+#, c-format
+msgid "1 hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
 #: filter/filter-datespec.c:76
+#, c-format
+msgid "1 day ago"
+msgid_plural "%d days ago"
+msgstr[0] ""
+msgstr[1] ""
+
 #: filter/filter-datespec.c:77
+#, c-format
+msgid "1 week ago"
+msgid_plural "%d weeks ago"
+msgstr[0] ""
+msgstr[1] ""
+
 #: filter/filter-datespec.c:78
+#, c-format
+msgid "1 month ago"
+msgid_plural "%d months ago"
+msgstr[0] ""
+msgstr[1] ""
+
 #: filter/filter-datespec.c:79
-#: filter/filter-datespec.c:280
 #, c-format
+msgid "1 year ago"
+msgid_plural "%d years ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: filter/filter-datespec.c:280
 msgid "<click here to select a date>"
 msgstr "<kuupäeva valimiseks kliki siia>"
 
-#: filter/filter-datespec.c:283
-#: filter/filter-datespec.c:294
+#: filter/filter-datespec.c:283 filter/filter-datespec.c:294
 msgid "now"
 msgstr "praegu"
 
@@ -12637,9 +12343,7 @@ msgid "Missing file name."
 msgstr "Puuduv faili nimi."
 
 #. filter:no-file secondary
-#. filter:bad-file secondary
-#: filter/filter-errors.xml.h:8
-#: filter/filter-errors.xml.h:12
+#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
 msgid "You must specify a file name."
 msgstr "Failinime andmine on kohustuslik"
 
@@ -12670,9 +12374,7 @@ msgid "Could not compile regular expression \"{1}\"."
 msgstr "Regulaaravaldiselt \"{1}\" ei õnnestu kompileerida."
 
 #. filter:no-name primary
-#. filter:no-name-vfolder primary
-#: filter/filter-errors.xml.h:22
-#: filter/filter-errors.xml.h:26
+#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
 msgid "Missing name."
 msgstr "Puuduv nimi."
 
@@ -12721,14 +12423,12 @@ msgstr "Vali faili"
 msgid "<b>Then</b>"
 msgstr "<b>siis</b>"
 
-#: filter/filter-folder.c:238
-#: filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1335
+#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
+#: mail/mail-account-gui.c:1347
 msgid "Select Folder"
 msgstr "Kausta valimine"
 
-#: filter/filter.glade.h:1
-#: mail/mail-config.glade.h:1
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
 msgid "    "
 msgstr "    "
 
@@ -12788,8 +12488,7 @@ msgstr "tagasi"
 msgid "months"
 msgstr "kuud"
 
-#: filter/filter.glade.h:19
-#: mail/mail-config.glade.h:184
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
 msgid "seconds"
 msgstr "sekundit"
 
@@ -12821,10 +12520,7 @@ msgstr "koos kõigi kohalike kalatoogidega"
 msgid "years"
 msgstr "aastat"
 
-#: filter/filter-label.c:121
-#: filter/libfilter-i18n.h:26
-#: mail/em-migrate.c:1011
-#: mail/mail-config.c:76
+#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
 #: mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Tähtis"
@@ -12832,9 +12528,7 @@ msgstr "Tähtis"
 #  forest green
 #  forest green
 #. forest green
-#: filter/filter-label.c:124
-#: mail/em-migrate.c:1014
-#: mail/mail-config.c:79
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
 #: mail/mail-config.glade.h:148
 msgid "To Do"
 msgstr "Ülesanne"
@@ -12842,15 +12536,12 @@ msgstr "Ülesanne"
 #  blue
 #  blue
 #. blue
-#: filter/filter-label.c:125
-#: mail/em-migrate.c:1015
-#: mail/mail-config.c:80
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
 #: mail/mail-config.glade.h:97
 msgid "Later"
 msgstr "Hiljem"
 
-#: filter/filter-part.c:532
-#: shell/GNOME_Evolution_Test.server.in.in.h:3
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "Test"
 
@@ -12900,263 +12591,6 @@ msgstr "sissetulev"
 msgid "outgoing"
 msgstr "väljaminev"
 
-#  Automatically generated. Do not edit.
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Adjust Score"
-msgstr "Kohanda hinnet"
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Color"
-msgstr "Määra värvus"
-
-#: filter/libfilter-i18n.h:4
-msgid "Assign Score"
-msgstr "Omista hinne"
-
-#: filter/libfilter-i18n.h:5
-msgid "Attachments"
-msgstr "Manused"
-
-#: filter/libfilter-i18n.h:6
-msgid "Beep"
-msgstr "Piiks"
-
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "sisaldab"
-
-#: filter/libfilter-i18n.h:8
-msgid "Copy to Folder"
-msgstr "Kopeeri kausta"
-
-#: filter/libfilter-i18n.h:9
-msgid "Date received"
-msgstr "Vastuvõtmise kuupäev"
-
-#: filter/libfilter-i18n.h:10
-msgid "Date sent"
-msgstr "Saatmise kuupäev"
-
-#: filter/libfilter-i18n.h:12
-msgid "Deleted"
-msgstr "Kustutatud"
-
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "ei sisalda"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "ei lõppe"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "ei eksisteeri"
-
-#: filter/libfilter-i18n.h:16
-msgid "does not return"
-msgstr "ei tagasta"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "ei kõla nagu"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "ei alga"
-
-#: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
-msgstr "Ei ole olemas"
-
-#: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr "Mustand"
-
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "lõpeb"
-
-#: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr "On olemas"
-
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "on olemas"
-
-#: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr "Avaldis"
-
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr "Vastukaja"
-
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "on"
-
-#: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr "on peale"
-
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr "on enne"
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr "on märgistatud"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "on suurem kui"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "on väiksem kui"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "ei ole"
-
-#: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr "ei ole märgistatud"
-
-#: filter/libfilter-i18n.h:36
-msgid "Junk Test"
-msgstr "Rämpsukontroll"
-
-#: filter/libfilter-i18n.h:37
-#: mail/em-folder-view.c:927
-#: widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Silt"
-
-#: filter/libfilter-i18n.h:38
-msgid "Mailing list"
-msgstr "Meililist"
-
-#: filter/libfilter-i18n.h:39
-msgid "Message Body"
-msgstr "Kirja tekst"
-
-#: filter/libfilter-i18n.h:40
-msgid "Message Header"
-msgstr "Kirja päis"
-
-#: filter/libfilter-i18n.h:41
-msgid "Message is Junk"
-msgstr "Sõnum on rämps"
-
-#: filter/libfilter-i18n.h:42
-msgid "Message is not Junk"
-msgstr "Sõnum ei ole rämps"
-
-#: filter/libfilter-i18n.h:43
-msgid "Move to Folder"
-msgstr "Tõsta kausta"
-
-#: filter/libfilter-i18n.h:44
-#, fuzzy
-msgid "Pipe to Program"
-msgstr "Käivitatav programm"
-
-#: filter/libfilter-i18n.h:45
-msgid "Play Sound"
-msgstr "Mängi heli"
-
-#: filter/libfilter-i18n.h:46
-#: mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Loetud"
-
-#: filter/libfilter-i18n.h:47
-msgid "Recipients"
-msgstr "Adressaadid"
-
-#: filter/libfilter-i18n.h:48
-msgid "Regex Match"
-msgstr "Regulaaravaldis vastab"
-
-#: filter/libfilter-i18n.h:49
-msgid "Replied to"
-msgstr "Vastatud kellele"
-
-#: filter/libfilter-i18n.h:50
-msgid "returns"
-msgstr "tagastab"
-
-#: filter/libfilter-i18n.h:51
-msgid "returns greater than"
-msgstr "tagastab rohkem kui"
-
-#: filter/libfilter-i18n.h:52
-msgid "returns less than"
-msgstr "tagastab vähem kui"
-
-#: filter/libfilter-i18n.h:53
-msgid "Run Program"
-msgstr "Käivita programm"
-
-#: filter/libfilter-i18n.h:54
-#: filter/score-rule.c:184
-#: filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Hinne"
-
-#: filter/libfilter-i18n.h:55
-msgid "Sender"
-msgstr "Saatja"
-
-#: filter/libfilter-i18n.h:56
-msgid "Set Status"
-msgstr "Määra oma staatus"
-
-#: filter/libfilter-i18n.h:57
-msgid "Size (kB)"
-msgstr "Suurus (kB)"
-
-#: filter/libfilter-i18n.h:58
-msgid "sounds like"
-msgstr "kõlab kui"
-
-#: filter/libfilter-i18n.h:59
-msgid "Source Account"
-msgstr "Lähtekonto"
-
-#: filter/libfilter-i18n.h:60
-msgid "Specific header"
-msgstr "Päise eripära"
-
-#: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "algab"
-
-#: filter/libfilter-i18n.h:63
-msgid "Stop Processing"
-msgstr "Peata töötlemine"
-
-#: filter/libfilter-i18n.h:64
-#: mail/em-format.c:755
-#: mail/em-format-html.c:1519
-#: mail/em-format-quote.c:302
-#: mail/em-mailer-prefs.c:87
-#: mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:329
-#: smime/lib/e-cert.c:1079
-msgid "Subject"
-msgstr "Teema"
-
-#: filter/libfilter-i18n.h:65
-#, fuzzy
-msgid "Unset Status"
-msgstr "Kahtlase oleku a&utomaatne eemaldamine"
-
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Reegli lisamine"
@@ -13173,6 +12607,11 @@ msgstr "Reegli nimi"
 msgid "_Score Rules"
 msgstr "_Hindereeglid"
 
+#: filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Hinne"
+
 #: filter/searchtypes.xml.h:1
 msgid "Body contains"
 msgstr "Sisu sisaldab"
@@ -13232,8 +12671,7 @@ msgstr "Konto nimi"
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: mail/em-composer-prefs.c:305
-#: mail/em-composer-prefs.c:424
+#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
 #: mail/mail-config.c:1045
 msgid "Unnamed"
 msgstr "Nimetu"
@@ -13254,7 +12692,7 @@ msgstr "Allkiri(jad)"
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Edastatud sõnum --------"
 
-#: mail/em-composer-utils.c:1499
+#: mail/em-composer-utils.c:1495
 msgid "an unknown sender"
 msgstr "tundmatu saatja"
 
@@ -13262,7 +12700,7 @@ msgstr "tundmatu saatja"
 #  it must contain a single single %%+05d followed by a single '%%s'
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1509
+#: mail/em-composer-utils.c:1505
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "%a. %Y-%m-%d, kell %H:%M %%+05d, %%s kirjutas:"
 
@@ -13302,8 +12740,7 @@ msgstr "<kausta valimiseks kliki siia>"
 msgid "Create New Folder"
 msgstr "Loo uus kaust"
 
-#: mail/em-folder-selector.c:166
-#: mail/em-folder-tree.c:2282
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
 #: mail/mail-component.c:704
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
@@ -13318,120 +12755,105 @@ msgstr "Loo"
 msgid "Folder _name:"
 msgstr "_Kausta nimi:"
 
-#: mail/em-folder-tree.c:839
+#: mail/em-folder-tree.c:833
 #, c-format
 msgid "Moving folder %s"
 msgstr "Kausta %s liigutamine"
 
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree.c:835
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kausta %s kopeerimine"
 
-#: mail/em-folder-tree.c:848
-#: mail/message-list.c:1561
+#: mail/em-folder-tree.c:842 mail/message-list.c:1561
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Sõnumite liigutamine %s kausta"
 
-#: mail/em-folder-tree.c:850
-#: mail/message-list.c:1563
+#: mail/em-folder-tree.c:844 mail/message-list.c:1563
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Sõnumite kopeerimine %s kausta"
 
-#: mail/em-folder-tree.c:866
+#: mail/em-folder-tree.c:860
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Kontrolli uusi sõnumeid kõikides kaustades"
 
-#: mail/em-folder-tree.c:956
-#: ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Kopeeri kausta"
 
-#: mail/em-folder-tree.c:957
-#: ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Tõsta kausta"
 
-#: mail/em-folder-tree.c:959
-#: mail/em-folder-tree.c:2069
-#: mail/em-folder-tree.c:2556
-#: mail/em-folder-view.c:798
+#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
+#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
 #: mail/message-list.c:1651
 msgid "_Move"
 msgstr "_Liiguta"
 
-#: mail/em-folder-tree.c:961
-#: mail/message-list.c:1653
+#: mail/em-folder-tree.c:955 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "Lohistamise pide"
 
-#: mail/em-folder-tree.c:2056
-#: mail/em-folder-tree.c:2069
-#: mail/em-folder-view.c:798
-#: mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
+#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Kataloogi valimine"
 
-#: mail/em-folder-tree.c:2056
-#: mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
 msgid "C_opy"
 msgstr "K_opeeri"
 
-#: mail/em-folder-tree.c:2096
+#: mail/em-folder-tree.c:2088
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Kataloogi `%s' loomine"
 
-#: mail/em-folder-tree.c:2282
-#: mail/mail-component.c:704
+#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
 msgid "Create folder"
 msgstr "Kataloogi loomine"
 
-#: mail/em-folder-tree.c:2477
+#: mail/em-folder-tree.c:2463
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Nimeta kaust \"%s\" uue nimega:"
 
-#: mail/em-folder-tree.c:2479
+#: mail/em-folder-tree.c:2465
 msgid "Rename Folder"
 msgstr "Kataloogi ümbernimetamine"
 
-#: mail/em-folder-tree.c:2550
-#: ui/evolution-addressbook.xml.h:44
-#: ui/evolution-mail-global.xml.h:18
-#: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53
-#: ui/evolution.xml.h:35
+#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
+#: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Vaade"
 
-#: mail/em-folder-tree.c:2551
+#: mail/em-folder-tree.c:2537
 msgid "Open in _New Window"
 msgstr "Uues _aknas avamine"
 
 #  FIXME: need to disable for nochildren folders
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2560
+#: mail/em-folder-tree.c:2546
 msgid "_New Folder..."
 msgstr "_Uus kataloog..."
 
-#: mail/em-folder-tree.c:2563
+#: mail/em-folder-tree.c:2549
 msgid "_Rename"
 msgstr "_Nimeta ümber"
 
-#: mail/em-folder-tree.c:2566
-#: ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Omadused..."
 
-#: mail/em-folder-tree-model.c:199
-#: mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:889
+#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
+#: mail/mail-vfolder.c:888
 msgid "VFolders"
 msgstr "VKaustad"
 
@@ -13439,30 +12861,25 @@ msgstr "VKaustad"
 #  UNMATCHED is always last
 #  UNMATCHED is always last
 #  UNMATCHED is always last
-#: mail/em-folder-tree-model.c:205
-#: mail/em-folder-tree-model.c:207
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
 #, fuzzy
 msgid "UNMATCHED"
 msgstr "Puudub \\{"
 
 #  Inbox is always first
 #. Inbox is always first
-#: mail/em-folder-tree-model.c:211
-#: mail/em-folder-tree-model.c:213
+#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
 msgid "Inbox"
 msgstr "Sisendkast"
 
-#: mail/em-folder-tree-model.c:469
-#: mail/em-folder-tree-model.c:778
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
 msgid "Loading..."
 msgstr "Laadimine..."
 
-#: mail/em-folder-view.c:414
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:418
-#: mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474
-#: mail/mail-component.c:508
+#: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
 #: mail/mail-component.c:554
 msgid "Mail"
 msgstr "E-Post"
@@ -13471,8 +12888,7 @@ msgstr "E-Post"
 #  { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
 #  { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895
-#: mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Redigeeri kui uut kirja..."
@@ -13481,25 +12897,21 @@ msgstr "_Redigeeri kui uut kirja..."
 msgid "_Print"
 msgstr "_Trüki"
 
-#: mail/em-folder-view.c:900
-#: ui/evolution-mail-message.xml.h:127
+#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Vasta saatjale"
 
-#: mail/em-folder-view.c:901
-#: mail/em-popup.c:810
+#: mail/em-folder-view.c:901 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Vasta postiloendisse"
 
-#: mail/em-folder-view.c:902
-#: mail/em-popup.c:811
+#: mail/em-folder-view.c:902 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Vasta _kõigile"
 
-#: mail/em-folder-view.c:903
-#: mail/em-popup.c:813
+#: mail/em-folder-view.c:903 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Edasta"
@@ -13516,8 +12928,7 @@ msgstr "Märgista kui lõpetatud"
 msgid "Cl_ear Flag"
 msgstr "_Eemalda silt"
 
-#: mail/em-folder-view.c:911
-#: ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:911 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "_Märgi loetuks"
 
@@ -13533,13 +12944,11 @@ msgstr "Märgi _tähtsaks "
 msgid "_Mark as Unimportant"
 msgstr "Märgi m_ittetähtsaks"
 
-#: mail/em-folder-view.c:915
-#: ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
 msgid "Mark as _Junk"
 msgstr "Märgi _rämpsuks"
 
-#: mail/em-folder-view.c:916
-#: ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
 msgid "Mark as _Not Junk"
 msgstr "Märgista kui _mitte rämps"
 
@@ -13551,11 +12960,14 @@ msgstr "T_aasta"
 msgid "Mo_ve to Folder..."
 msgstr "_Tõsta kausta..."
 
-#: mail/em-folder-view.c:924
-#: ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Kopeeri kausta..."
 
+#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Silt"
+
 #: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Lisa saatja _aadressiraamatusse"
@@ -13606,13 +13018,12 @@ msgstr "Filter  p_ostiloendi järgi"
 
 #  default charset used in mail view
 #. default charset used in mail view
-#: mail/em-folder-view.c:1710
-#: mail/em-folder-view.c:1750
+#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
 #: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "UTF-8"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1796
 msgid "Print Message"
 msgstr "Sõnumi trükkimine"
 
@@ -13625,55 +13036,44 @@ msgstr "Kopeeri _lingi asukoht"
 msgid "Click to mail %s"
 msgstr "Kirja saatmiseks kliki %s"
 
-#: mail/em-format.c:750
-#: mail/em-format-html.c:1413
-#: mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:82
-#: mail/message-list.etspec.h:7
+#: mail/em-format.c:750 mail/em-format-html.c:1413 mail/em-format-quote.c:192
+#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
 #: mail/message-tag-followup.c:325
 msgid "From"
 msgstr "Saatja"
 
-#: mail/em-format.c:751
-#: mail/em-format-html.c:1413
-#: mail/em-format-quote.c:192
+#: mail/em-format.c:751 mail/em-format-html.c:1413 mail/em-format-quote.c:192
 #: mail/em-mailer-prefs.c:83
 msgid "Reply-To"
 msgstr "Vastus-Kuhu"
 
-#: mail/em-format.c:752
-#: mail/em-format-html.c:1413
-#: mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:84
-#: mail/message-list.etspec.h:14
+#: mail/em-format.c:752 mail/em-format-html.c:1413 mail/em-format-quote.c:192
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Kellele"
 
-#: mail/em-format.c:753
-#: mail/em-format-html.c:1413
-#: mail/em-format-quote.c:192
+#: mail/em-format.c:753 mail/em-format-html.c:1413 mail/em-format-quote.c:192
 #: mail/em-mailer-prefs.c:85
 msgid "Cc"
 msgstr "Koopia"
 
-#: mail/em-format.c:754
-#: mail/em-format-html.c:1413
-#: mail/em-format-quote.c:192
+#: mail/em-format.c:754 mail/em-format-html.c:1413 mail/em-format-quote.c:192
 #: mail/em-mailer-prefs.c:86
 msgid "Bcc"
 msgstr "Pimekoopia"
 
-#: mail/em-format.c:756
-#: mail/em-format-html.c:1563
-#: mail/em-format-quote.c:316
-#: mail/em-mailer-prefs.c:88
-#: mail/message-list.etspec.h:2
+#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
+#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Teema"
+
+#: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
+#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Kuupäev"
 
-#: mail/em-format.c:757
-#: mail/em-format-html.c:1584
-#: mail/em-mailer-prefs.c:89
+#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
 msgid "Newsgroups"
 msgstr "Uudisegrupid"
 
@@ -13682,8 +13082,7 @@ msgstr "Uudisegrupid"
 msgid "%s attachment"
 msgstr "\"%s\" tüüpi manus"
 
-#: mail/em-format.c:1024
-#: mail/em-format.c:1143
+#: mail/em-format.c:1024 mail/em-format.c:1143
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "S/MIME sõnumit ei saa analüüsida: Tundmatu viga"
 
@@ -13707,24 +13106,20 @@ msgstr "Viga allkirja tõestamisel"
 msgid "Unknown error verifying signature"
 msgstr "Tundmatu viga allkirja tõestamisel"
 
-#: mail/em-format-html.c:452
-#: mail/em-format-html.c:454
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "`%s' tõmbamine"
 
-#: mail/em-format-html.c:559
-#: mail/em-format-html-display.c:644
+#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
 msgid "Unsigned"
 msgstr "Allkirjastamata"
 
-#: mail/em-format-html.c:560
-#: mail/em-format-html-display.c:645
+#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
 msgid "Valid signature"
 msgstr "Kehtiv allkiri"
 
-#: mail/em-format-html.c:561
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
 msgid "Invalid signature"
 msgstr "Vigane allkiri"
 
@@ -13733,23 +13128,19 @@ msgstr "Vigane allkiri"
 msgid "Valid signature but cannot verify sender"
 msgstr "Kehtiv allkiri, saatjat ei saa tuvastada"
 
-#: mail/em-format-html.c:568
-#: mail/em-format-html-display.c:653
+#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
 msgid "Unencrypted"
 msgstr "Krüpteerimata"
 
-#: mail/em-format-html.c:569
-#: mail/em-format-html-display.c:654
+#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
 msgid "Encrypted, weak"
 msgstr "Krüptitud, nõrgalt"
 
-#: mail/em-format-html.c:570
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
 msgid "Encrypted"
 msgstr "Krüptitud"
 
-#: mail/em-format-html.c:571
-#: mail/em-format-html-display.c:656
+#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
 msgid "Encrypted, strong"
 msgstr "Krüptitud, tugevalt"
 
@@ -13787,8 +13178,7 @@ msgid "Formatting message"
 msgstr "Sõnumi vormindamine"
 
 #. pseudo-header
-#: mail/em-format-html.c:1523
-#: mail/em-format-quote.c:309
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
 #: mail/em-mailer-prefs.c:930
 msgid "Mailer"
 msgstr "Postiprogramm:"
@@ -13822,15 +13212,24 @@ msgid "Matches: %d"
 msgstr "Sobivaid: %d"
 
 #: mail/em-format-html-display.c:644
-msgid "This message is not signed. There is no guarantee that this message is authentic."
-msgstr "See sõnum ei ole allkirjastatud. Selle sõnumi tõesust ei saa garanteerida."
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
+msgstr ""
+"See sõnum ei ole allkirjastatud. Selle sõnumi tõesust ei saa garanteerida."
 
 #: mail/em-format-html-display.c:645
-msgid "This message is signed and is valid meaning that it is very likely that this message is authentic."
-msgstr "See sõnum on allkirjastatud ja kehtiv, seega on väga tõenäoline, et tegemist on tõese sõnumiga."
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
+msgstr ""
+"See sõnum on allkirjastatud ja kehtiv, seega on väga tõenäoline, et tegemist "
+"on tõese sõnumiga."
 
 #: mail/em-format-html-display.c:646
-msgid "The signature of this message cannot be verified, it may have been altered in transit."
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
 msgstr ""
 
 #: mail/em-format-html-display.c:647
@@ -13838,26 +13237,38 @@ msgid "Valid signature, cannot verify sender"
 msgstr "Kehtiv allkiri, saatjat ei saa tuvastada"
 
 #: mail/em-format-html-display.c:647
-msgid "This message is signed with a valid signature, but the sender of the message cannot be verified."
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
 msgstr ""
 
 #: mail/em-format-html-display.c:653
-msgid "This message is not encrypted.  Its content may be viewed in transit across The Internet."
+msgid ""
+"This message is not encrypted.  Its content may be viewed in transit across "
+"The Internet."
 msgstr ""
 
 #: mail/em-format-html-display.c:654
-msgid "This message is encrypted, but with a weak encryption algorithm.  It would be difficult, but not impossible for an outsider to view the content of this message in a practical amount of time."
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm.  It would "
+"be difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
 msgstr ""
 
 #: mail/em-format-html-display.c:655
-msgid "This message is encrypted.  It would be difficult for an outsider to view the content of this message."
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
 msgstr ""
 
 #: mail/em-format-html-display.c:656
-msgid "This message is encrypted, with a strong encryption algorithm.  It would be very difficult for an outsider to view the content of this message in a practical amount of time."
+msgid ""
+"This message is encrypted, with a strong encryption algorithm.  It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:757
+#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
 msgid "_View Certificate"
 msgstr "_Sertifikaadi kuvamine"
 
@@ -13913,11 +13324,13 @@ msgstr "Kord kuus"
 #: mail/em-migrate.c:1168
 #, fuzzy
 msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed since Evolution 1.x.\n"
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
-"Evolutioni kontaktikaustade asukoht ja hierarhia on alates Evolution 1.x. versioonist muutunud.\n"
+"Evolutioni kontaktikaustade asukoht ja hierarhia on alates Evolution 1.x. "
+"versioonist muutunud.\n"
 "\n"
 "Palun oota kuni Evolution siirdab sinu kaustasid..."
 
@@ -13951,8 +13364,7 @@ msgstr "Kataloogi '%s' loomine ebaõnnestus: %s"
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2413
-#: mail/em-migrate.c:2425
+#: mail/em-migrate.c:2413 mail/em-migrate.c:2425
 #, fuzzy, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Kataloogi '%s' loomine ebaõnnestus: %s"
@@ -13965,39 +13377,41 @@ msgstr ""
 " %s"
 
 #: mail/em-migrate.c:2594
-msgid "Unable to read settings from previous Evolution install, `evolution/config.xmldb' does not exist or is corrupt."
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
 msgstr ""
 
-#: mail/em-popup.c:699
+#: mail/em-popup.c:700
 msgid "Save As..."
 msgstr "Salvesta kui..."
 
-#: mail/em-popup.c:717
+#: mail/em-popup.c:718
 #, c-format
 msgid "untitled_image.%s"
 msgstr "nimetu_pilt.%s"
 
-#: mail/em-popup.c:807
+#: mail/em-popup.c:808
 msgid "Set as _Background"
 msgstr "Säti _taustapildiks"
 
-#: mail/em-popup.c:809
+#: mail/em-popup.c:810
 msgid "_Reply to sender"
 msgstr "Saatjale _vastamine"
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:859
 msgid "_Open Link in Browser"
 msgstr "Ava _viit veebilehitsejas"
 
-#: mail/em-popup.c:859
+#: mail/em-popup.c:860
 msgid "Se_nd message to..."
 msgstr "S_aada sõnum..."
 
-#: mail/em-popup.c:860
+#: mail/em-popup.c:861
 msgid "_Add to Addressbook"
 msgstr "_Lisa aadressiraamatusse"
 
-#: mail/em-popup.c:966
+#: mail/em-popup.c:967
 #, c-format
 msgid "Open in %s..."
 msgstr "Ava programmiga %s..."
@@ -14011,8 +13425,7 @@ msgstr "IMAP serveri vastus ei sisaldanud %s infot"
 msgid "Subscribed"
 msgstr "Tellitud"
 
-#: mail/em-subscribe-editor.c:639
-#: shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Kaust"
 
@@ -14050,6 +13463,7 @@ msgstr "Aadressi lisamine"
 #  Drop filename for messages from a mailbox
 #  Drop filename for messages from a mailbox
 #  Drop filename for messages from a mailbox
+#. Drop filename for messages from a mailbox
 #: mail/em-utils.c:1016
 #, fuzzy, c-format
 msgid "Messages from %s"
@@ -14165,7 +13579,10 @@ msgid "Height of the message-list pane."
 msgstr "Sõnumiloendi paani kõrgus."
 
 #: mail/evolution-mail.schemas.in.in.h:27
-msgid "If there isn't a builtin viewer for a particular mime-type inside Evolution, any mime-types appearing in this list which map to a bonobo-component viewer in GNOME's mime-type database may be used for displaying content."
+msgid ""
+"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
+"any mime-types appearing in this list which map to a bonobo-component viewer "
+"in GNOME's mime-type database may be used for displaying content."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:28
@@ -14186,7 +13603,9 @@ msgid "List of accounts"
 msgstr "Kontode nimekiri"
 
 #: mail/evolution-mail.schemas.in.in.h:32
-msgid "List of accounts known to the mail component of Evolution. The list contains strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:33
@@ -14194,7 +13613,9 @@ msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:34
-msgid "List of labels known to the mail component of Evolution. The list contains strings containing name:color where color uses the HTML hex encoding."
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:35
@@ -14210,8 +13631,14 @@ msgid "Load images for HTML messages over http"
 msgstr "Laadi HTML sõnumite pildid üle http"
 
 #: mail/evolution-mail.schemas.in.in.h:38
-msgid "Load images for HTML messages over http(s). Possible values are: 0 - Never load images off the net 1 - Load images if sender is in the addressbook 2 - Always load images off the net"
-msgstr "Laadi HTML sõnumite pildid üle http(s). Võimalikud väärtused on: 0 - Kunagi ära laadi pilte võrgust maha 2 - Laadi pildid ainult siis kui saatja on aadressiraamatus 3 - Alati laadi pildid võrgust maha."
+msgid ""
+"Load images for HTML messages over http(s). Possible values are: 0 - Never "
+"load images off the net 1 - Load images if sender is in the addressbook 2 - "
+"Always load images off the net"
+msgstr ""
+"Laadi HTML sõnumite pildid üle http(s). Võimalikud väärtused on: 0 - Kunagi "
+"ära laadi pilte võrgust maha 2 - Laadi pildid ainult siis kui saatja on "
+"aadressiraamatus 3 - Alati laadi pildid võrgust maha."
 
 #: mail/evolution-mail.schemas.in.in.h:39
 msgid "Log filter actions"
@@ -14285,7 +13712,8 @@ msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Viipa kasutajale, kui ta proovib kausta puhastada."
 
 #: mail/evolution-mail.schemas.in.in.h:56
-msgid "Prompt the user when he or she tries to send a message without a Subject."
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Viipa kasutajale, kui ta proovib saata sõnumit ilma Teemata."
 
 #: mail/evolution-mail.schemas.in.in.h:57
@@ -14299,13 +13727,17 @@ msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:59
 #, fuzzy
-msgid "Prompt when user tries to send HTML mail to recipients that may not want to receive HTML mail."
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
 msgstr "Täpsustus, kui püütakse saata HTML sõnumit isikule, kes seda ei soovi"
 
 #: mail/evolution-mail.schemas.in.in.h:60
 #, fuzzy
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
-msgstr "Täpsustus, kui püütakse saata sõnumit, millel on kirjeldatud ainult pimekoopia adressaadid"
+msgstr ""
+"Täpsustus, kui püütakse saata sõnumit, millel on kirjeldatud ainult "
+"pimekoopia adressaadid"
 
 #: mail/evolution-mail.schemas.in.in.h:61
 msgid "Prompt when user tries to send unwanted HTML"
@@ -14395,7 +13827,11 @@ msgid "The variable width font for mail display"
 msgstr "Muutuva laiusega kirjatüüp sõnumikuvas"
 
 #: mail/evolution-mail.schemas.in.in.h:82
-msgid "This key should contain a list of XML structures specifying custom headers, and whether they are to be displayed. The format of the XML structure is &lt;header enabled&gt; - set enabled if the header is to be displayed in the mail view."
+msgid ""
+"This key should contain a list of XML structures specifying custom headers, "
+"and whether they are to be displayed. The format of the XML structure is &lt;"
+"header enabled&gt; - set enabled if the header is to be displayed in the "
+"mail view."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:83
@@ -14498,7 +13934,9 @@ msgid "View/ReplyTo menu item is checked."
 msgstr "Vaade/Bcc menüüelement on valitud"
 
 #: mail/evolution-mail.schemas.in.in.h:106
-msgid "Whether or not to fall back on threading by subjects when the messages do not contain In-Reply-To or References headers."
+msgid ""
+"Whether or not to fall back on threading by subjects when the messages do "
+"not contain In-Reply-To or References headers."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:107
@@ -14520,7 +13958,8 @@ msgid "Composer Preferences"
 msgstr "Kella häälestus"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure mail preferences, including security and message display, here"
+msgid ""
+"Configure mail preferences, including security and message display, here"
 msgstr ""
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:4
@@ -14564,8 +14003,7 @@ msgstr "Evolutioni Netscape Mail'i importija"
 msgid "Mail Accounts"
 msgstr "Meilikontod"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14
-#: mail/mail-config.glade.h:99
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
 msgid "Mail Preferences"
 msgstr "Meili häälestus"
 
@@ -14578,18 +14016,16 @@ msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution impordib sinu sõnumeid programmist Elm'i"
 
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:226
-#: mail/importers/netscape-importer.c:1251
-#: mail/importers/pine-importer.c:117
+#: mail/importers/evolution-mbox-importer.c:221
+#: mail/importers/evolution-outlook-importer.c:255
+#: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Importimine..."
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:222
-#: mail/importers/evolution-outlook-importer.c:228
-#: mail/importers/netscape-importer.c:1253
-#: mail/importers/pine-importer.c:119
+#: mail/importers/evolution-mbox-importer.c:223
+#: mail/importers/evolution-outlook-importer.c:257
+#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Palun oota"
 
@@ -14611,21 +14047,23 @@ msgid "Elm"
 msgstr "Elm"
 
 #: mail/importers/evolution-mbox-importer.c:116
+#: mail/importers/evolution-outlook-importer.c:130
 msgid "Destination folder:"
 msgstr "Sihtkataloog:"
 
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder to import into"
 msgstr "Vali kaust, kuhu importida"
 
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:254
 #: mail/importers/mail-importer.c:226
 #, c-format
 msgid "Importing `%s'"
 msgstr "'%s' importimine"
 
-#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/evolution-outlook-importer.c:301
 #: mail/importers/mail-importer.c:140
 msgid "Importing mailbox"
 msgstr "Postkasti importimine"
@@ -14773,18 +14211,15 @@ msgstr ""
 msgid "%s License Agreement"
 msgstr "&Litsents"
 
-#: mail/mail-account-gui.c:954
-#: mail/mail-config.glade.h:167
+#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
 msgid "_Host:"
 msgstr "_Host:"
 
-#: mail/mail-account-gui.c:958
-#: mail/mail-config.glade.h:151
+#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
 msgid "User_name:"
 msgstr "_Kasutajanimi:"
 
-#: mail/mail-account-gui.c:962
-#: mail/mail-config.glade.h:173
+#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
 msgid "_Path:"
 msgstr "_Otsingutee:"
 
@@ -14881,59 +14316,72 @@ msgstr ""
 msgid "Checking Service"
 msgstr "Teenuse kontrollimine"
 
-#: mail/mail-config.c:973
-#: mail/mail-config.c:977
+#: mail/mail-config.c:973 mail/mail-config.c:977
 msgid "Connecting to server..."
 msgstr "Serveriga ühendumine..."
 
-#: mail/mail-config-druid.c:362
-#: mail/mail-config.glade.h:92
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Identiteet"
 
 #: mail/mail-config-druid.c:364
 #, fuzzy
-msgid "Please enter your name and email address below. The \"optional\" fields below do not need to be filled in, unless you wish to include this information in email you send."
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
 msgstr ""
-"Palun sisesta allpool olevasse vormi oma nimi ja e-posti aadress. \"Mittekohustuslikud\" väljad\n"
-"võib täita siis, kui sa soovid nendes väljades olevat infot kaasata oma sõnumitesse."
+"Palun sisesta allpool olevasse vormi oma nimi ja e-posti aadress. "
+"\"Mittekohustuslikud\" väljad\n"
+"võib täita siis, kui sa soovid nendes väljades olevat infot kaasata oma "
+"sõnumitesse."
 
-#: mail/mail-config-druid.c:370
-#: mail/mail-config-druid.c:377
+#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
 #: mail/mail-config.glade.h:119
 msgid "Receiving Mail"
 msgstr "Meili vastuvõtmine"
 
 #: mail/mail-config-druid.c:372
 #, fuzzy
-msgid "Please enter information about your incoming mail server below. If you are not sure, ask your system administrator or Internet Service Provider."
+msgid ""
+"Please enter information about your incoming mail server below. If you are "
+"not sure, ask your system administrator or Internet Service Provider."
 msgstr ""
-"Palun sisesta info oma postiserveri kohta, kust sa soovit posti vastu võtta. Kui sa ei ole para-\n"
-"meetrites kindel, küsi oma lisainfot oma süsteemiadministraatorilt või interneti teenusepakkujalt"
+"Palun sisesta info oma postiserveri kohta, kust sa soovit posti vastu võtta. "
+"Kui sa ei ole para-\n"
+"meetrites kindel, küsi oma lisainfot oma süsteemiadministraatorilt või "
+"interneti teenusepakkujalt"
 
 #: mail/mail-config-druid.c:379
 msgid "Please select among the following options"
 msgstr ""
 
-#: mail/mail-config-druid.c:382
-#: mail/mail-config.glade.h:131
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr "Meili saatmine"
 
 #: mail/mail-config-druid.c:384
 #, fuzzy
-msgid "Please enter information about the way you will send mail. If you are not sure, ask your system administrator or Internet Service Provider."
+msgid ""
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system administrator or Internet Service Provider."
 msgstr ""
-"Palun sisesta info oma postiserveri kohta, mille kaudu soovid oma posti välja saata. Kui sa ei ole\n"
-"parameetrites kindel, küsi oma lisainfot oma süsteemiadministraatorilt või interneti teenusepakkujalt"
+"Palun sisesta info oma postiserveri kohta, mille kaudu soovid oma posti "
+"välja saata. Kui sa ei ole\n"
+"parameetrites kindel, küsi oma lisainfot oma süsteemiadministraatorilt või "
+"interneti teenusepakkujalt"
 
-#: mail/mail-config-druid.c:389
-#: mail/mail-config.glade.h:37
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37
 msgid "Account Management"
 msgstr "Kontohaldus"
 
 #: mail/mail-config-druid.c:391
-msgid "You are almost done with the mail configuration process. The identity, incoming mail server and outgoing mail transport method which you provided will be grouped together to make an Evolution mail account. Please enter a name for this account in the space below. This name will be used for display purposes only."
+msgid ""
+"You are almost done with the mail configuration process. The identity, "
+"incoming mail server and outgoing mail transport method which you provided "
+"will be grouped together to make an Evolution mail account. Please enter a "
+"name for this account in the space below. This name will be used for display "
+"purposes only."
 msgstr ""
 
 #: mail/mail-config.glade.h:2
@@ -15107,8 +14555,7 @@ msgstr ""
 msgid "Attach original message"
 msgstr "Originaalsõnumi manustamine"
 
-#: mail/mail-config.glade.h:47
-#: mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Manus"
 
@@ -15205,8 +14652,7 @@ msgstr "Originaalsõnumite ei tsiteerita"
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Ära allkirjasta kohtumispalveid (ühilduvus Outlookiga)"
 
-#: mail/mail-config.glade.h:74
-#: shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Valmis"
 
@@ -15294,7 +14740,9 @@ msgid "Message Composer"
 msgstr "Sõnumiredaktor"
 
 #: mail/mail-config.glade.h:104
-msgid "Note: you will not be prompted for a password until you connect for the first time"
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
 msgstr ""
 
 #: mail/mail-config.glade.h:105
@@ -15313,7 +14761,9 @@ msgstr "Helifail, mida mängitakse uute kirjade saabumisel."
 #: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
-msgstr "Täpsustus, kui püütakse saata sõnumit, millel on kirjeldatud ainult pimekoopia adressaadid"
+msgstr ""
+"Täpsustus, kui püütakse saata sõnumit, millel on kirjeldatud ainult "
+"pimekoopia adressaadid"
 
 #: mail/mail-config.glade.h:113
 #, fuzzy
@@ -15433,7 +14883,10 @@ msgid ""
 msgstr ""
 
 #: mail/mail-config.glade.h:147
-msgid "This page allows you to configure spell checking behavior and language. The list of languages here reflects only the languages for which you have a dictionary installed."
+msgid ""
+"This page allows you to configure spell checking behavior and language. The "
+"list of languages here reflects only the languages for which you have a "
+"dictionary installed."
 msgstr ""
 
 #: mail/mail-config.glade.h:149
@@ -15545,8 +14998,12 @@ msgstr "Vigane autentimine"
 
 #. mail:camel-service-auth-invalid secondary
 #: mail/mail-errors.xml.h:4
-msgid "This server does not support this type of authentication and may not support authentication at all."
-msgstr "See server ei toeta seda tüüpi autentimist ja arvatavasti ei toeta see autentimist üleüldse."
+msgid ""
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+msgstr ""
+"See server ei toeta seda tüüpi autentimist ja arvatavasti ei toeta see "
+"autentimist üleüldse."
 
 #. mail:camel-service-auth-failed primary
 #: mail/mail-errors.xml.h:6
@@ -15554,10 +15011,15 @@ msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr "Sisselogimine serverisse \"{0}\" kasutajana \"{0}\" ebaõnnestus."
 
 #  mail:camel-service-auth-failed secondary
+#. mail:camel-service-auth-failed secondary
 #: mail/mail-errors.xml.h:8
 #, fuzzy
-msgid "Check to make sure your password is spelled correctly.  Remember that many passwords are case sensitive; your caps lock might be on."
-msgstr "Kontrolli, kas parool on õigesti kirjutatud. Kuna paroolid on üldiselt tõstutundlikud, siis vaata, et caps lock ei oleks peal."
+msgid ""
+"Check to make sure your password is spelled correctly.  Remember that many "
+"passwords are case sensitive; your caps lock might be on."
+msgstr ""
+"Kontrolli, kas parool on õigesti kirjutatud. Kuna paroolid on üldiselt "
+"tõstutundlikud, siis vaata, et caps lock ei oleks peal."
 
 #. mail:ask-send-html primary
 #: mail/mail-errors.xml.h:10
@@ -15568,19 +15030,19 @@ msgstr "Oled sa kindel, et soovid seda sõnumit saata HTML vormingus?"
 #. mail:ask-send-html secondary
 #: mail/mail-errors.xml.h:12
 msgid ""
-"Please make sure the following recipients are willing and able to receive HTML email:\n"
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
 "{0}\n"
 "Send anyway?"
 msgstr ""
 
-#: mail/mail-errors.xml.h:15
-#: mail/mail-errors.xml.h:20
-#: mail/mail-errors.xml.h:27
-#: mail/mail-errors.xml.h:32
+#: mail/mail-errors.xml.h:15 mail/mail-errors.xml.h:20
+#: mail/mail-errors.xml.h:27 mail/mail-errors.xml.h:32
 msgid "_Send"
 msgstr "_Saada"
 
 #  mail:ask-send-no-subject primary
+#. mail:ask-send-no-subject primary
 #: mail/mail-errors.xml.h:17
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "Oled sa kindel, et soovid seda sõnumit saata ilma pealkirjata?"
@@ -15588,15 +15050,18 @@ msgstr "Oled sa kindel, et soovid seda sõnumit saata ilma pealkirjata?"
 #  mail:ask-send-no-subject secondary
 #. mail:ask-send-no-subject secondary
 #: mail/mail-errors.xml.h:19
-msgid "Adding a meaningful Subject line to your messages will give your recipients an idea of what your mail is about."
+msgid ""
+"Adding a meaningful Subject line to your messages will give your recipients "
+"an idea of what your mail is about."
 msgstr ""
 
 #  mail:ask-send-only-bcc-contact primary
 #  mail:ask-send-only-bcc primary
-#: mail/mail-errors.xml.h:22
-#: mail/mail-errors.xml.h:29
+#. mail:ask-send-only-bcc-contact primary
+#: mail/mail-errors.xml.h:22 mail/mail-errors.xml.h:29
 msgid "Are you sure you want to send a message with only BCC recipients?"
-msgstr "Oled sa kindel, et soovid saata seda sõnumit pimekoopia adressaatidele?"
+msgstr ""
+"Oled sa kindel, et soovid saata seda sõnumit pimekoopia adressaatidele?"
 
 #  mail:ask-send-only-bcc-contact secondary
 #. mail:ask-send-only-bcc-contact secondary
@@ -15604,23 +15069,33 @@ msgstr "Oled sa kindel, et soovid saata seda sõnumit pimekoopia adressaatidele?
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
-"Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients in your message. To avoid this, you should add at least one To: or CC: recipient. "
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients in "
+"your message. To avoid this, you should add at least one To: or CC: "
+"recipient. "
 msgstr ""
 
 #  mail:ask-send-only-bcc secondary
 #. mail:ask-send-only-bcc secondary
 #: mail/mail-errors.xml.h:31
-msgid "Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients to your message anyway. To avoid this, you should add at least one To: or CC: recipient."
+msgid ""
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients to "
+"your message anyway. To avoid this, you should add at least one To: or CC: "
+"recipient."
 msgstr ""
 
 #. mail:send-no-recipients primary
 #: mail/mail-errors.xml.h:34
-msgid "This message cannot be sent because you have not specified any Recipients"
+msgid ""
+"This message cannot be sent because you have not specified any Recipients"
 msgstr ""
 
 #. mail:send-no-recipients secondary
 #: mail/mail-errors.xml.h:36
-msgid "Please enter a valid email address in the To: field. You can search for email addresses by clicking on the To: button next to the entry box."
+msgid ""
+"Please enter a valid email address in the To: field. You can search for "
+"email addresses by clicking on the To: button next to the entry box."
 msgstr ""
 
 #. mail:ask-default-drafts primary
@@ -15630,7 +15105,9 @@ msgstr "Vaikekausta kasutamine mustandite jaoks?"
 
 #. mail:ask-default-drafts secondary
 #: mail/mail-errors.xml.h:40
-msgid "Unable to open the drafts folder for this account.  Use the system drafts folder instead?"
+msgid ""
+"Unable to open the drafts folder for this account.  Use the system drafts "
+"folder instead?"
 msgstr ""
 
 #  default charset used in mail view
@@ -15639,15 +15116,16 @@ msgid "Use _Default"
 msgstr "Kasuta _vaikekodeeringut"
 
 #  mail:ask-expunge primary
+#. mail:ask-expunge primary
 #: mail/mail-errors.xml.h:43
 #, fuzzy
-msgid "Are you sure you want to permanently remove all the deleted message in folder \"{0}\"?"
+msgid ""
+"Are you sure you want to permanently remove all the deleted message in "
+"folder \"{0}\"?"
 msgstr "Eemaldab lõplikult sellest kaustadest kõik kustutatud sõnumid"
 
 #. mail:ask-expunge secondary
-#. mail:ask-empty-trash secondary
-#: mail/mail-errors.xml.h:45
-#: mail/mail-errors.xml.h:50
+#: mail/mail-errors.xml.h:45 mail/mail-errors.xml.h:50
 msgid "If you continue, you will not be able to recover these messages."
 msgstr ""
 
@@ -15656,9 +15134,12 @@ msgid "_Expunge"
 msgstr "_Puhasta"
 
 #  mail:ask-empty-trash primary
+#. mail:ask-empty-trash primary
 #: mail/mail-errors.xml.h:48
 #, fuzzy
-msgid "Are you sure you want to permanently remove all the deleted messages in all folders?"
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
 msgstr "Eemaldab lõplikult kõikidest kaustadest kõik kustutatud sõnumid"
 
 #: mail/mail-errors.xml.h:51
@@ -15672,19 +15153,23 @@ msgstr "Sul on saatmata sõnumeid, kas tõesti soovid lõpetada?"
 
 #. mail:exit-unsaved secondary
 #: mail/mail-errors.xml.h:55
-msgid "If you quit, these messages will not be sent until Evolution is started again."
+msgid ""
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
 msgstr ""
 
 #. mail:camel-exception primary
 #: mail/mail-errors.xml.h:57
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgid "Your message with the subject \"{0}\" was not delivered."
 msgstr ""
 
 #. mail:camel-exception secondary
 #: mail/mail-errors.xml.h:59
 msgid ""
-"The message was sent via the \"sendmail\" external application.  Sendmail reports the following error: status 67: mail not sent.\n"
-"The message is stored in the Outbox folder.  Check the message for errors and resend."
+"The message was sent via the \"sendmail\" external application.  Sendmail "
+"reports the following error: status 67: mail not sent.\n"
+"The message is stored in the Outbox folder.  Check the message for errors "
+"and resend."
 msgstr ""
 
 #. mail:async-error primary
@@ -15708,21 +15193,10 @@ msgid "{0}."
 msgstr "{0}."
 
 #. mail:session-message-info secondary
-#. mail:session-message-info-cancel secondary
-#. mail:session-message-warning secondary
-#. mail:session-message-warning-cancel secondary
-#. mail:session-message-error secondary
-#. mail:session-message-error-cancel secondary
-#. mail:ask-session-password secondary
-#. mail:filter-load-error secondary
-#: mail/mail-errors.xml.h:70
-#: mail/mail-errors.xml.h:72
-#: mail/mail-errors.xml.h:74
-#: mail/mail-errors.xml.h:76
-#: mail/mail-errors.xml.h:78
-#: mail/mail-errors.xml.h:80
-#: mail/mail-errors.xml.h:84
-#: mail/mail-errors.xml.h:88
+#: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
+#: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
+#: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
+#: mail/mail-errors.xml.h:84 mail/mail-errors.xml.h:88
 msgid "{0}"
 msgstr "{0}"
 
@@ -15741,16 +15215,8 @@ msgstr "Viga filtridefinitsioonide laadimisel."
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Kataloogi \"{0}\" ei saa salvestada."
 
-#. mail:no-save-path secondary
-#: mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr "{1}"
-
 #. mail:no-create-path primary
-#. mail:no-write-path-exists primary
-#. mail:no-write-path-notfile primary
-#: mail/mail-errors.xml.h:94
-#: mail/mail-errors.xml.h:102
+#: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
 msgid "Cannot save to file \"{0}\"."
 msgstr "Faili \"{0}\" ei saa salvestada."
@@ -15765,17 +15231,6 @@ msgstr "Salvestuskataloogi ei saa luua, sest \"{1}\""
 msgid "Cannot create temporary save directory."
 msgstr "Ajutist salvestuskataloogi ei saa luua."
 
-#. mail:no-create-tmp-path secondary
-#. mail:no-delete-folder secondary
-#. system:no-save-file secondary
-#. system:no-load-file secondary
-#: mail/mail-errors.xml.h:100
-#: mail/mail-errors.xml.h:112
-#: widgets/misc/e-system-errors.xml.h:11
-#: widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr "Kuna \"{1}\"."
-
 #. mail:no-write-path-exists secondary
 #: mail/mail-errors.xml.h:104
 msgid "File exists but cannot overwrite it."
@@ -15797,10 +15252,10 @@ msgid "Cannot delete system folder \"{0}\"."
 msgstr "Süsteemikausta \"{0}\" ei saa kustutada."
 
 #. mail:no-delete-spethal-folder secondary
-#. mail:no-rename-spethal-folder secondary
-#: mail/mail-errors.xml.h:116
-#: mail/mail-errors.xml.h:120
-msgid "System folders are required for Ximian Evolution to function correctly and cannot be renamed, moved, or deleted."
+#: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
+msgid ""
+"System folders are required for Ximian Evolution to function correctly and "
+"cannot be renamed, moved, or deleted."
 msgstr ""
 
 #. mail:no-rename-spethal-folder primary
@@ -15820,20 +15275,18 @@ msgstr "Kas tõesti kustutada kaust \"{0}\" ja selle kõik alamkaustad?"
 
 #. mail:ask-delete-folder secondary
 #: mail/mail-errors.xml.h:126
-msgid "If you delete the folder, all of its contents and its subfolders contents will be deleted permanently."
+msgid ""
+"If you delete the folder, all of its contents and its subfolders contents "
+"will be deleted permanently."
 msgstr ""
 
 #. mail:no-rename-folder-exists primary
-#. mail:no-rename-folder primary
-#: mail/mail-errors.xml.h:128
-#: mail/mail-errors.xml.h:132
+#: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "\"{0}\"-a ei saa ümber nimetada \"{1}\"-ks."
 
 #. mail:no-rename-folder-exists secondary
-#. mail:vfolder-notunique secondary
-#: mail/mail-errors.xml.h:130
-#: mail/mail-errors.xml.h:192
+#: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr "Kaust nimega \"{1}\" juba eksisteerib. Palun kasuta teistsugust nime."
 
@@ -15843,30 +15296,22 @@ msgid "Because \"{2}\"."
 msgstr "Kuna \"{2}\"."
 
 #. mail:no-move-folder-nostore primary
-#. mail:no-move-folder-to-nostore primary
-#: mail/mail-errors.xml.h:136
-#: mail/mail-errors.xml.h:140
+#: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Kausta \"{0}\" ei saa liigutada \"{1}\" kausta."
 
 #. mail:no-move-folder-nostore secondary
-#. mail:no-copy-folder-nostore secondary
-#: mail/mail-errors.xml.h:138
-#: mail/mail-errors.xml.h:146
+#: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
 msgid "Cannot open source \"{2}\"."
 msgstr "Allikat \"{2}\" ei saa avada."
 
 #. mail:no-move-folder-to-nostore secondary
-#. mail:no-copy-folder-to-nostore secondary
-#: mail/mail-errors.xml.h:142
-#: mail/mail-errors.xml.h:150
+#: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
 msgid "Cannot open target \"{2}\"."
 msgstr "Sihtkohta \"{2}\" ei saa avada."
 
 #. mail:no-copy-folder-nostore primary
-#. mail:no-copy-folder-to-nostore primary
-#: mail/mail-errors.xml.h:144
-#: mail/mail-errors.xml.h:148
+#: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "Kausta \"{0}\" ei saa kopeerida \"{1}\" kausta."
 
@@ -15881,9 +15326,7 @@ msgid "Cannot open source \"{1}\""
 msgstr "Allikat \"{1}\" ei saa avada"
 
 #. mail:account-incomplete primary
-#. mail:account-notunique primary
-#: mail/mail-errors.xml.h:156
-#: mail/mail-errors.xml.h:160
+#: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
 msgid "Cannot save changes to account."
 msgstr "Konto muudatusi ei saa salvestada."
 
@@ -15927,6 +15370,7 @@ msgid "Because \"{0}\"."
 msgstr "Kuna \"{0}\"."
 
 #  mail:signature-notscript primary
+#. mail:signature-notscript primary
 #: mail/mail-errors.xml.h:175
 #, fuzzy
 msgid "Cannot set signature script \"{0}\"."
@@ -15963,7 +15407,9 @@ msgstr "vKausta \"{0}\" ei saa redigeerida, kuna seda ei eksisteeri."
 
 #. mail:vfolder-notexist secondary
 #: mail/mail-errors.xml.h:188
-msgid "This folder may have been added implictly, go to the virtual folder editor to add it explictly, if required."
+msgid ""
+"This folder may have been added implictly, go to the virtual folder editor "
+"to add it explictly, if required."
 msgstr ""
 
 #. mail:vfolder-notunique primary
@@ -16011,15 +15457,15 @@ msgstr ""
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
-"You can choose to ignore this folder, overwrite or append its contents, or quit.\n"
+"You can choose to ignore this folder, overwrite or append its contents, or "
+"quit.\n"
 msgstr ""
 
 #: mail/mail-errors.xml.h:216
 msgid "Ignore"
 msgstr "Eira"
 
-#: mail/mail-errors.xml.h:217
-#: widgets/misc/e-system-errors.xml.h:7
+#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
 msgid "_Overwrite"
 msgstr "_Kirjuta üle"
 
@@ -16027,129 +15473,140 @@ msgstr "_Kirjuta üle"
 msgid "_Append"
 msgstr "_Lisa"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:785
 #, c-format
 msgid "Pinging %s"
 msgstr "Kontrollin %s"
 
-#: mail/mail-ops.c:99
+#: mail/mail-ops.c:98
 msgid "Filtering Folder"
 msgstr "Filtreerin kausta"
 
-#: mail/mail-ops.c:260
+#: mail/mail-ops.c:259
 msgid "Fetching Mail"
 msgstr "E-posti võtmine"
 
-#: mail/mail-ops.c:543
+#: mail/mail-ops.c:542
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Filtrite rakendamine väljuvatele sõnumitele ebaõnnestus: %s"
 
-#: mail/mail-ops.c:568
+#: mail/mail-ops.c:567
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:577
+#: mail/mail-ops.c:576
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Kausta \"Saadetud\" teisendamine versiooni 0.4 ebaõnnestus!!"
 
-#: mail/mail-ops.c:673
+#: mail/mail-ops.c:672
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sõnumi %d/%d saatmine"
 
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:703
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Järjekorras olnud kirjade saatmine ebaõnnestus."
 
-#: mail/mail-ops.c:708
+#: mail/mail-ops.c:707
 msgid "Complete."
 msgstr "Valmis."
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:804
 msgid "Saving message to folder"
 msgstr "Sõnumi salvestamine kausta"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Sõnumite liigutamine %s kausta"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Sõnumite kopeerimine %s kausta"
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:1002
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" kaustade läbivaatamine"
 
-#: mail/mail-ops.c:1116
+#: mail/mail-ops.c:1115
 msgid "Forwarded messages"
 msgstr "Edastatud sõnum"
 
-#: mail/mail-ops.c:1159
+#: mail/mail-ops.c:1158
 #, c-format
 msgid "Opening folder %s"
 msgstr "Kausta %s avamine"
 
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1230
 #, fuzzy, c-format
 msgid "Opening store %s"
 msgstr "--store [failinimi]"
 
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1308
 #, c-format
 msgid "Removing folder %s"
 msgstr "Kausta %s eemaldamine"
 
-#: mail/mail-ops.c:1403
+#: mail/mail-ops.c:1402
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Kausta %s salvestamine"
 
-#: mail/mail-ops.c:1468
+#: mail/mail-ops.c:1467
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1469
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Konto %s salvestamine"
 
-#: mail/mail-ops.c:1524
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr "Kausta värskendamine"
 
-#: mail/mail-ops.c:1560
-#: mail/mail-ops.c:1611
+#: mail/mail-ops.c:1559 mail/mail-ops.c:1610
 msgid "Expunging folder"
 msgstr "Kataloogi puhtastamine"
 
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1607
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Prügikasti '%s' tühjendamine"
 
-#: mail/mail-ops.c:1609
+#: mail/mail-ops.c:1608
 msgid "Local Folders"
 msgstr "Kohalikud kaustad"
 
-#: mail/mail-ops.c:1692
+#: mail/mail-ops.c:1691
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Sõnumi %s vastuvõtt"
 
-#: mail/mail-ops.c:1764
-#: mail/mail-ops.c:1850
-#: mail/mail-ops.c:1900
+#: mail/mail-ops.c:1763
+#, fuzzy, c-format
+msgid "Retrieving %d message"
+msgid_plural "Retrieving %d messages"
+msgstr[0] "Sõnumi %s vastuvõtt"
+msgstr[1] "Sõnumi %s vastuvõtt"
+
+#: mail/mail-ops.c:1849
+#, fuzzy, c-format
+msgid "Saving %d message"
+msgid_plural "Saving %d messsages"
+msgstr[0] "Sõnumite liigutamine"
+msgstr[1] "Sõnumite liigutamine"
+
+#: mail/mail-ops.c:1899
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -16158,7 +15615,7 @@ msgstr ""
 "Väljundfaili %s loomine ebaõnnestus\n"
 " %s"
 
-#: mail/mail-ops.c:1928
+#: mail/mail-ops.c:1927
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -16167,11 +15624,11 @@ msgstr ""
 "Viga sõnumite salvestamisel %s kausta\n"
 " %s"
 
-#: mail/mail-ops.c:1999
+#: mail/mail-ops.c:1998
 msgid "Saving attachment"
 msgstr "Manuse salvestamine"
 
-#: mail/mail-ops.c:2016
+#: mail/mail-ops.c:2015
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -16180,17 +15637,17 @@ msgstr ""
 "Väljundfaili %s loomine ebaõnnestus\n"
 " %s"
 
-#: mail/mail-ops.c:2046
+#: mail/mail-ops.c:2045
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Andmeid ei saa kirjutada: %s"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Ühendun lahti: %s"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Taasühendamine %s"
@@ -16250,8 +15707,7 @@ msgstr "Tühista _kõik"
 msgid "Updating..."
 msgstr "Uuendamine..."
 
-#: mail/mail-send-recv.c:412
-#: mail/mail-send-recv.c:466
+#: mail/mail-send-recv.c:412 mail/mail-send-recv.c:466
 msgid "Waiting..."
 msgstr "Ootamine..."
 
@@ -16327,15 +15783,15 @@ msgstr "'%s:%s' vkaustade uuendamine"
 msgid "Updating vFolders for '%s'"
 msgstr "'%s' vKaustade uuendamine"
 
-#: mail/mail-vfolder.c:959
+#: mail/mail-vfolder.c:958
 msgid "vFolders"
 msgstr "VKaustad"
 
-#: mail/mail-vfolder.c:998
+#: mail/mail-vfolder.c:997
 msgid "Edit VFolder"
 msgstr "vKausta redigeerimine"
 
-#: mail/mail-vfolder.c:1082
+#: mail/mail-vfolder.c:1081
 msgid "New VFolder"
 msgstr "Uus vKaust"
 
@@ -16448,8 +15904,7 @@ msgstr "Vastukaja"
 msgid "For Your Information"
 msgstr "Muudan kasutaja %s kohta käivat informatsiooni\n"
 
-#: mail/message-tag-followup.c:77
-#: ui/evolution-mail-message.xml.h:42
+#: mail/message-tag-followup.c:77 ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Edasta"
 
@@ -16458,13 +15913,15 @@ msgstr "Edasta"
 msgid "No Response Necessary"
 msgstr "Käsule %s ei tulnud vastust."
 
-#: mail/message-tag-followup.c:80
-#: ui/evolution-mail-message.xml.h:85
+#: mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Loetud"
+
+#: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Vasta"
 
-#: mail/message-tag-followup.c:81
-#: ui/evolution-mail-message.xml.h:86
+#: mail/message-tag-followup.c:81 ui/evolution-mail-message.xml.h:86
 msgid "Reply to All"
 msgstr "Vasta kõigile"
 
@@ -16472,8 +15929,7 @@ msgstr "Vasta kõigile"
 msgid "Review"
 msgstr "Eelvaade"
 
-#: mail/message-tag-followup.c:294
-#: mail/message-tags.glade.h:3
+#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
 #, fuzzy
 msgid "Flag to Follow Up"
 msgstr "_Vastukaja sildi järgi"
@@ -16542,61 +15998,68 @@ msgid "ID or alias of the component to be shown by default at start-up."
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:7
-msgid "If set to true, Evolution will start up in offline mode instead of online mode."
+msgid ""
+"If set to true, Evolution will start up in offline mode instead of online "
+"mode."
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:8
-msgid "If set to true, the warning dialog in development versions of Evolution is not displayed."
+msgid ""
+"If set to true, the warning dialog in development versions of Evolution is "
+"not displayed."
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:9
-msgid "List of paths for the folders to be synchronized to disk for offline usage"
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:10
-msgid "Whether Evolution should start up in offline mode"
+msgid "Toolbar is visible"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:11
-msgid "Whether to skip the development warning dialog"
+msgid "Whether Evolution should start up in offline mode"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Whether the toolbar should be visible."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:14
 msgid "mail"
 msgstr "kirjad"
 
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
-msgstr "Teieni tõid"
-
-#: shell/e-shell.c:545
-#: shell/e-shell.c:546
+#: shell/e-shell.c:588 shell/e-shell.c:589
 #, fuzzy, c-format
 msgid "%ld KB"
 msgstr "%.0f kb/s"
 
-#: shell/e-shell.c:743
+#: shell/e-shell.c:786
 msgid "Uknown system error."
 msgstr "Tundmatu süsteemi viga."
 
-#: shell/e-shell.c:1100
+#: shell/e-shell.c:1143
 msgid "Invalid arguments"
 msgstr "Vigased argumendid"
 
-#: shell/e-shell.c:1102
+#: shell/e-shell.c:1145
 msgid "Cannot register on OAF"
 msgstr "OAF'i ei saa registreerida"
 
-#: shell/e-shell.c:1104
+#: shell/e-shell.c:1147
 msgid "Configuration Database not found"
 msgstr "Ei leia häälestusandmebaasi"
 
-#: shell/e-shell.c:1106
+#: shell/e-shell.c:1149
 msgid "Generic error"
 msgstr "Üldine viga"
 
-#: shell/e-shell-folder-title-bar.c:592
-#: shell/e-shell-folder-title-bar.c:593
+#: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Pealkirjata)"
 
@@ -16606,17 +16069,18 @@ msgstr "Vali, millist tüüpi importerit sa soovid kasutada:"
 
 #: shell/e-shell-importer.c:149
 msgid ""
-"Choose the file that you want to import into Evolution, and select what type of file it is from the list.\n"
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
 "\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt to work it out."
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
 msgstr ""
 
 #: shell/e-shell-importer.c:155
 msgid "Choose the destination for this import"
 msgstr "Vali selle importimise sihtkoht"
 
-#: shell/e-shell-importer.c:158
-#: shell/e-shell-startup-wizard.c:748
+#: shell/e-shell-importer.c:158 shell/e-shell-startup-wizard.c:748
 msgid "Please select the information that you would like to import:"
 msgstr "Palun valige informatsioon, mida soovite importida:"
 
@@ -16628,8 +16092,7 @@ msgid ""
 "try again, please click the \"Back\" button.\n"
 msgstr ""
 
-#: shell/e-shell-importer.c:229
-#: shell/e-shell-importer.c:260
+#: shell/e-shell-importer.c:229 shell/e-shell-importer.c:260
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -16642,8 +16105,7 @@ msgstr ""
 msgid "Select importer"
 msgstr "Importija valimine"
 
-#: shell/e-shell-importer.c:451
-#: shell/e-shell-importer.c:1026
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
 #, c-format
 msgid "File %s does not exist"
 msgstr "Faili %s pole olemas"
@@ -16657,8 +16119,7 @@ msgstr "Importimine"
 msgid "Importing %s.\n"
 msgstr "%s importimine.\n"
 
-#: shell/e-shell-importer.c:477
-#: shell/e-shell-importer.c:478
+#: shell/e-shell-importer.c:477 shell/e-shell-importer.c:478
 #, c-format
 msgid "Error loading %s"
 msgstr "Viga '%s' laadimisel"
@@ -16672,33 +16133,33 @@ msgstr ""
 "Impordin %s\n"
 "Impordin elementi 1."
 
-#: shell/e-shell-importer.c:549
+#: shell/e-shell-importer.c:570
 msgid "Automatic"
 msgstr "Automaatne"
 
-#: shell/e-shell-importer.c:598
-msgid "_Filename:"
-msgstr "_Faili nimi:"
+#: shell/e-shell-importer.c:626
+#, fuzzy
+msgid "F_ilename:"
+msgstr "Faili nimi:"
 
-#: shell/e-shell-importer.c:603
+#: shell/e-shell-importer.c:631
 msgid "Select a file"
 msgstr "Faili valimine"
 
-#: shell/e-shell-importer.c:613
+#: shell/e-shell-importer.c:642
 msgid "File _type:"
 msgstr "Faili _tüüp:"
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:681
 msgid "Import data and settings from _older programs"
 msgstr "Andmete ja sätete importimine _vanematest programmidest"
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:684
 msgid "Import a _single file"
 msgstr "Üksiku _faili importimine"
 
 # !PARANDA!
-#: shell/e-shell-importer.c:723
-#: shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -16707,26 +16168,25 @@ msgstr ""
 "Üritan tuvastada olemasolevaid programme"
 
 # !PARANDA!
-#: shell/e-shell-importer.c:727
+#: shell/e-shell-importer.c:756
 msgid "Starting Intelligent Importers"
 msgstr "Intelligentsete importijate käivitamine"
 
-#: shell/e-shell-importer.c:853
-#: shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
 #, c-format
 msgid "From %s:"
 msgstr "Programmist %s:"
 
-#: shell/e-shell-importer.c:1044
+#: shell/e-shell-importer.c:1073
 #, c-format
 msgid "No importer available for file %s"
 msgstr "Faili %s jaoks ei ühtegi importijat saadaval"
 
-#: shell/e-shell-importer.c:1056
+#: shell/e-shell-importer.c:1085
 msgid "Unable to execute importer"
 msgstr "Importijat ei saa käivitada"
 
-#: shell/e-shell-importer.c:1169
+#: shell/e-shell-importer.c:1199
 msgid "_Import"
 msgstr "_Importimine"
 
@@ -16744,7 +16204,9 @@ msgstr "Importimise alustamine"
 
 #: shell/e-shell-startup-wizard.c:795
 msgid ""
-"If you quit the Evolution Setup Assistant now, all of the information that you have entered will be forgotten. You will need to run this assistant again before using Evolution.\n"
+"If you quit the Evolution Setup Assistant now, all of the information that "
+"you have entered will be forgotten. You will need to run this assistant "
+"again before using Evolution.\n"
 "\n"
 "Do you want to quit using the Assistant now?"
 msgstr ""
@@ -16769,59 +16231,61 @@ msgstr "Kausta nimi ei tohi sisaldada \"#\" sümbolit."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' ja '..' on reserveeritud kaustanimed."
 
-#: shell/e-shell-window.c:336
+#: shell/e-shell-window.c:337
 #, fuzzy
 msgid "Evolution is currently online.  Click on this button to work offline."
-msgstr "Ximian Evolution on hetkel autonoomses olekus. Võrku ühendumiseks vajuta seda nuppu."
+msgstr ""
+"Ximian Evolution on hetkel autonoomses olekus. Võrku ühendumiseks vajuta "
+"seda nuppu."
 
-#: shell/e-shell-window.c:343
+#: shell/e-shell-window.c:344
 #, fuzzy
 msgid "Evolution is in the process of going offline."
 msgstr "Ximian Evolution siirdub autonoomsesse olekusse."
 
-#: shell/e-shell-window.c:349
+#: shell/e-shell-window.c:350
 #, fuzzy
 msgid "Evolution is currently offline.  Click on this button to work online."
-msgstr "Ximian Evolution on hetkel autonoomses olekus. Võrku ühendumiseks vajuta seda nuppu."
+msgstr ""
+"Ximian Evolution on hetkel autonoomses olekus. Võrku ühendumiseks vajuta "
+"seda nuppu."
 
-#: shell/e-shell-window.c:621
+#: shell/e-shell-window.c:637
 #, fuzzy, c-format
 msgid "Switch to %s"
 msgstr "Lülitumine: %1"
 
-#: shell/e-shell-window-commands.c:64
+#: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "GNOME Pilot vahendid ei paista sellesse süsteemi paigaldatud olevat."
 
-#: shell/e-shell-window-commands.c:72
+#: shell/e-shell-window-commands.c:74
 #, c-format
 msgid "Error executing %s."
 msgstr "Viga %s käivitamisel."
 
-#: shell/e-shell-window-commands.c:121
+#: shell/e-shell-window-commands.c:123
 msgid "Bug buddy is not installed."
 msgstr "Veateatamisprogramm ei ole paigaldatud."
 
-#: shell/e-shell-window-commands.c:129
+#: shell/e-shell-window-commands.c:131
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy (veateatamisprogramm) ei saa käivitada."
 
-#: shell/e-shell-window-commands.c:171
+#: shell/e-shell-window-commands.c:323
 #, fuzzy
-msgid "About Evolution"
-msgstr "Ximian Evolutionist"
+msgid "Groupware Suite"
+msgstr "Groupwise"
 
-#: shell/e-shell-window-commands.c:382
+#: shell/e-shell-window-commands.c:563
 msgid "_Work Online"
 msgstr "Ühendu v_õrku"
 
-#: shell/e-shell-window-commands.c:395
-#: ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "Siirdu aut_onoomsesse olekusse"
 
-#: shell/e-shell-window-commands.c:408
-#: ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Siirdu autonoomsesse olekusse"
 
@@ -16985,8 +16449,7 @@ msgstr ""
 msgid "Importers"
 msgstr "Importijad"
 
-#: shell/importer/intelligent.c:195
-#: smime/gui/smime-ui.glade.h:28
+#: shell/importer/intelligent.c:195 smime/gui/smime-ui.glade.h:28
 msgid "Import"
 msgstr "Impordi"
 
@@ -17079,9 +16542,11 @@ msgstr ""
 #. shell:upgrade-nospace secondary
 #: shell/shell-errors.xml.h:4
 msgid ""
-"Upgrading your data and settings will require upto {0} of disk space, but you only have {1} available.\n"
+"Upgrading your data and settings will require upto {0} of disk space, but "
+"you only have {1} available.\n"
 "\n"
-"You will need to make more space available in your home directory before you can continue."
+"You will need to make more space available in your home directory before you "
+"can continue."
 msgstr ""
 
 #. shell:upgrade-failed primary
@@ -17096,7 +16561,8 @@ msgstr ""
 msgid ""
 "{1}\n"
 "\n"
-"If you choose to continue, you may not have access to some of your old data.\n"
+"If you choose to continue, you may not have access to some of your old "
+"data.\n"
 msgstr ""
 
 #: shell/shell-errors.xml.h:15
@@ -17105,17 +16571,13 @@ msgid "Continue"
 msgstr "Jätka"
 
 #. shell:noshell title
-#. shell:noshell-reason title
-#: shell/shell-errors.xml.h:17
-#: shell/shell-errors.xml.h:25
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
 #, fuzzy
 msgid "Cannot start Evolution"
 msgstr "Rakendust <i>kcheckpass</i> pole võimalik käivitada."
 
 #. shell:noshell primary
-#. shell:noshell-reason primary
-#: shell/shell-errors.xml.h:19
-#: shell/shell-errors.xml.h:27
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
 #, fuzzy
 msgid "Evolution can not start."
 msgstr "EI saa käivitada wombatit"
@@ -17138,34 +16600,30 @@ msgid ""
 "Click help for details."
 msgstr ""
 
-#: smime/gui/certificate-manager.c:128
-#: smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:522
+#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
+#: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
 msgstr "Imporditava sertifikaadi valimine..."
 
-#: smime/gui/certificate-manager.c:243
-#: smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:604
+#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
+#: smime/gui/certificate-manager.c:638
 msgid "Certificate Name"
 msgstr "Sertifikaati nimi"
 
-#: smime/gui/certificate-manager.c:251
-#: smime/gui/certificate-manager.c:425
+#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
 msgid "Purposes"
 msgstr "Eesmärgid"
 
-#: smime/gui/certificate-manager.c:259
-#: smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:517
+#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr "Seerianumber"
 
-#: smime/gui/certificate-manager.c:267
+#: smime/gui/certificate-manager.c:271
 msgid "Expires"
 msgstr "Lõpeb"
 
-#: smime/gui/certificate-manager.c:417
+#: smime/gui/certificate-manager.c:446
 msgid "E-Mail Address"
 msgstr "E-posti aadress"
 
@@ -17268,11 +16726,12 @@ msgid "Backup All"
 msgstr "Kogu päev"
 
 #: smime/gui/smime-ui.glade.h:13
-msgid "Before trusting this CA for any purpose, you should examine its certificate and its policy and procedures (if available)."
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14
-#: smime/lib/e-cert.c:1024
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
 msgid "Certificate"
 msgstr "Sertifikaat"
 
@@ -17295,20 +16754,24 @@ msgstr "Juhan Julm"
 msgid "Contact Certificates"
 msgstr "Kontakti sertifikaadid"
 
-#: smime/gui/smime-ui.glade.h:21
-#, no-c-format
-msgid "Do you want to trust \"%s\" for the following purposes?"
+#: smime/gui/smime-ui.glade.h:20
+msgid "Do not trust the authenticity of this certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:21
 #, fuzzy
 msgid "Dummy window only"
 msgstr "Ainult akna suuruse muutmine"
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:22
 msgid "Edit"
 msgstr "Redigeermine"
 
+#: smime/gui/smime-ui.glade.h:23
+#, fuzzy
+msgid "Email Certificate Trust Settings"
+msgstr "E-posti sertifikaadi atesteerimisorgan"
+
 #: smime/gui/smime-ui.glade.h:24
 #, fuzzy
 msgid "Email Recipient Certificate"
@@ -17343,253 +16806,258 @@ msgstr "Organisatsiooniüksus (OÜ):"
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 sõrmejälg"
 
-#: smime/gui/smime-ui.glade.h:34
-#: smime/lib/e-cert.c:766
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr "SSL-kliendi sertifikaat"
 
-#: smime/gui/smime-ui.glade.h:35
-#: smime/lib/e-cert.c:770
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr "SSL-serveri sertifikaat"
 
 #: smime/gui/smime-ui.glade.h:37
-msgid "Trust this CA to identify email users."
+msgid "Trust the authenticity of this certificate"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:38
-msgid "Trust this CA to identify software developers."
+msgid "Trust this CA to identify email users."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:39
-msgid "Trust this CA to identify web sites."
+msgid "Trust this CA to identify software developers."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:40
-msgid "View"
-msgstr "Vaade"
+msgid "Trust this CA to identify web sites."
+msgstr ""
 
 #: smime/gui/smime-ui.glade.h:41
-msgid "View Certificate"
-msgstr "Sertifikaadi kuvamine"
+msgid "View"
+msgstr "Vaade"
 
 #: smime/gui/smime-ui.glade.h:42
-msgid "You have been asked to trust a new Certificate Authority (CA)."
+msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:43
-msgid "You have certificates from these organizations that identify you:"
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:44
-msgid "You have certificates on file that identify these certificate authorities:"
-msgstr ""
-
-#: smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:46
+#: smime/gui/smime-ui.glade.h:45
 msgid "Your Certificates"
 msgstr "Sinu sertifikaadid"
 
-#: smime/lib/e-cert.c:234
-#: smime/lib/e-cert.c:244
+#: smime/gui/smime-ui.glade.h:46
+msgid "_Edit CA Trust"
+msgstr ""
+
+#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
-#: smime/lib/e-cert.c:478
+#. x509 certificate usage types
+#: smime/lib/e-cert.c:424
+#, fuzzy
+msgid "Sign"
+msgstr "Allkirjastamine"
+
+#: smime/lib/e-cert.c:425
+#, fuzzy
+msgid "Encrypt"
+msgstr "Krüptitud"
+
+#: smime/lib/e-cert.c:530
 msgid "Version"
 msgstr "Versioon"
 
-#: smime/lib/e-cert.c:493
+#: smime/lib/e-cert.c:545
 msgid "Version 1"
 msgstr "Versioon 1"
 
-#: smime/lib/e-cert.c:496
+#: smime/lib/e-cert.c:548
 msgid "Version 2"
 msgstr "Versioon 2"
 
-#: smime/lib/e-cert.c:499
+#: smime/lib/e-cert.c:551
 msgid "Version 3"
 msgstr "Versioon 3"
 
-#: smime/lib/e-cert.c:581
+#: smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 koos RSA krüpteeringuga"
 
-#: smime/lib/e-cert.c:584
+#: smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 koos RSA krüpteeringuga"
 
-#: smime/lib/e-cert.c:587
+#: smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 koos RSA krüpteeringuga"
 
-#: smime/lib/e-cert.c:590
+#: smime/lib/e-cert.c:642
 msgid "C"
 msgstr "C"
 
-#: smime/lib/e-cert.c:593
+#: smime/lib/e-cert.c:645
 msgid "CN"
 msgstr "CN"
 
-#: smime/lib/e-cert.c:596
+#: smime/lib/e-cert.c:648
 msgid "OU"
 msgstr "OÜ"
 
-#: smime/lib/e-cert.c:599
+#: smime/lib/e-cert.c:651
 msgid "O"
 msgstr "O"
 
-#: smime/lib/e-cert.c:602
+#: smime/lib/e-cert.c:654
 msgid "L"
 msgstr "L"
 
-#: smime/lib/e-cert.c:605
+#: smime/lib/e-cert.c:657
 msgid "DN"
 msgstr "DN"
 
-#: smime/lib/e-cert.c:608
+#: smime/lib/e-cert.c:660
 msgid "DC"
 msgstr "DC"
 
-#: smime/lib/e-cert.c:611
+#: smime/lib/e-cert.c:663
 msgid "ST"
 msgstr "ST"
 
-#: smime/lib/e-cert.c:614
+#: smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA krüpteerimine"
 
-#: smime/lib/e-cert.c:617
+#: smime/lib/e-cert.c:669
 #, fuzzy
 msgid "Certificate Key Usage"
 msgstr "võti %08lX: \"%s\" tühistamise sertifikaat lisatud\n"
 
-#: smime/lib/e-cert.c:620
+#: smime/lib/e-cert.c:672
 msgid "Netscape Certificate Type"
 msgstr "Netscape'i sertifikaadi tüüp"
 
-#: smime/lib/e-cert.c:623
+#: smime/lib/e-cert.c:675
 #, fuzzy
 msgid "Certificate Authority Key Identifier"
 msgstr "võti %08lX: \"%s\" tühistamise sertifikaat lisatud\n"
 
-#: smime/lib/e-cert.c:626
+#: smime/lib/e-cert.c:678
 msgid "UID"
 msgstr "UID"
 
-#: smime/lib/e-cert.c:635
+#: smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Objekti identifikaator (%s)"
 
-#: smime/lib/e-cert.c:686
+#: smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
 msgstr "Algoritmi identifikaator"
 
-#: smime/lib/e-cert.c:694
+#: smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
 msgstr "Algoritmi parameetrid"
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:768
 msgid "Subject Public Key Info"
 msgstr "Teema avaliku võtme info"
 
-#: smime/lib/e-cert.c:721
+#: smime/lib/e-cert.c:773
 #, fuzzy
 msgid "Subject Public Key Algorithm"
 msgstr "Teema avaliku võtme info"
 
-#: smime/lib/e-cert.c:736
+#: smime/lib/e-cert.c:788
 msgid "Subject's Public Key"
 msgstr "Teema avalik võti"
 
-#: smime/lib/e-cert.c:757
-#: smime/lib/e-cert.c:806
+#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
 msgid "Error: Unable to process extension"
 msgstr "Viga: laiendit ei saa töödelda"
 
-#: smime/lib/e-cert.c:778
-#: smime/lib/e-cert.c:790
+#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr "Objekti allkirjastaja"
 
-#: smime/lib/e-cert.c:782
+#: smime/lib/e-cert.c:834
 msgid "SSL Certificate Authority"
 msgstr "SSL sertifikaadi atesteerimisorgan"
 
-#: smime/lib/e-cert.c:786
+#: smime/lib/e-cert.c:838
 msgid "Email Certificate Authority"
 msgstr "E-posti sertifikaadi atesteerimisorgan"
 
-#: smime/lib/e-cert.c:814
+#: smime/lib/e-cert.c:866
 msgid "Signing"
 msgstr "Allkirjastamine"
 
-#: smime/lib/e-cert.c:818
+#: smime/lib/e-cert.c:870
 msgid "Non-repudiation"
 msgstr "Ebausaldusväärne"
 
-#: smime/lib/e-cert.c:822
+#: smime/lib/e-cert.c:874
 #, fuzzy
 msgid "Key Encipherment"
 msgstr "Andmete "
 
-#: smime/lib/e-cert.c:826
+#: smime/lib/e-cert.c:878
 msgid "Data Encipherment"
 msgstr "Andmete "
 
-#: smime/lib/e-cert.c:830
+#: smime/lib/e-cert.c:882
 #, fuzzy
 msgid "Key Agreement"
 msgstr "&Litsents"
 
-#: smime/lib/e-cert.c:834
+#: smime/lib/e-cert.c:886
 msgid "Certificate Signer"
 msgstr "Sertifikaadi allkirjastaja"
 
-#: smime/lib/e-cert.c:838
+#: smime/lib/e-cert.c:890
 msgid "CRL Signer"
 msgstr "CRL allkirjastaja"
 
-#: smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:938
 msgid "Critical"
 msgstr "Kriitiline"
 
-#: smime/lib/e-cert.c:888
-#: smime/lib/e-cert.c:891
+#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
 msgid "Not Critical"
 msgstr "Mittekriitiline"
 
-#: smime/lib/e-cert.c:912
+#: smime/lib/e-cert.c:964
 msgid "Extensions"
 msgstr "Laiendused"
 
-#: smime/lib/e-cert.c:983
+#: smime/lib/e-cert.c:1035
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: smime/lib/e-cert.c:1039
-#: smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
 msgid "Certificate Signature Algorithm"
 msgstr "Sertifikaadi allkirja algoritm"
 
-#: smime/lib/e-cert.c:1048
+#: smime/lib/e-cert.c:1100
 msgid "Issuer"
 msgstr "Väljaandja"
 
-#: smime/lib/e-cert.c:1102
+#: smime/lib/e-cert.c:1154
 msgid "Issuer Unique ID"
 msgstr "Väljastaja unikaalne ID"
 
-#: smime/lib/e-cert.c:1121
+#: smime/lib/e-cert.c:1173
 msgid "Subject Unique ID"
 msgstr "Teema unikaalne ID"
 
-#: smime/lib/e-cert.c:1164
+#: smime/lib/e-cert.c:1216
 msgid "Certificate Signature Value"
 msgstr "Sertifikaadi signatuuri väärtus"
 
@@ -17657,8 +17125,7 @@ msgstr "Süsteemi %s sulgemine (%s)\n"
 msgid "Copy Contact(s) to Another Folder..."
 msgstr "Kopeeri kontakt(id) teise kausta..."
 
-#: ui/evolution-addressbook.xml.h:4
-#: ui/evolution-calendar.xml.h:2
+#: ui/evolution-addressbook.xml.h:4 ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "Kopeerib valiku"
 
@@ -17666,8 +17133,7 @@ msgstr "Kopeerib valiku"
 msgid "Copy to Folder..."
 msgstr "Kopeeri kausta..."
 
-#: ui/evolution-addressbook.xml.h:7
-#: ui/evolution-calendar.xml.h:3
+#: ui/evolution-addressbook.xml.h:7 ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "Lõikab valiku"
 
@@ -17683,8 +17149,7 @@ msgstr "Liiguta kontakt(id) teise kausta..."
 msgid "Move to Folder..."
 msgstr "Tõsta kausta..."
 
-#: ui/evolution-addressbook.xml.h:14
-#: ui/evolution-calendar.xml.h:16
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:16
 msgid "Paste the clipboard"
 msgstr "Kleebib lõikepuhvri"
 
@@ -17692,10 +17157,8 @@ msgstr "Kleebib lõikepuhvri"
 msgid "Previews the contacts to be printed"
 msgstr "Trükitavate kontaktide eelvaatlemine"
 
-#: ui/evolution-addressbook.xml.h:17
-#: ui/evolution-calendar.xml.h:20
-#: ui/evolution-comp-editor.xml.h:9
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:81
 #: ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "Printimise eel_vaade"
@@ -17745,24 +17208,17 @@ msgstr "Peata laadimine"
 msgid "View the current contact"
 msgstr "Kuva käesolev kontakt"
 
-#: ui/evolution-addressbook.xml.h:30
-#: ui/evolution-calendar.xml.h:38
-#: ui/evolution-comp-editor.xml.h:16
-#: ui/evolution-contact-editor.xml.h:13
+#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:38
+#: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
-#: ui/evolution-event-editor.xml.h:11
-#: ui/evolution-mail-global.xml.h:15
-#: ui/evolution-mail-list.xml.h:23
-#: ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:107
-#: ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:19
-#: ui/evolution.xml.h:25
+#: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "_Tegevused"
 
-#: ui/evolution-addressbook.xml.h:35
-#: ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-addressbook.xml.h:35 ui/evolution-contact-editor.xml.h:16
 msgid "_Forward Contact..."
 msgstr "_Edasta kontakt..."
 
@@ -17770,8 +17226,7 @@ msgstr "_Edasta kontakt..."
 msgid "_Move to Folder..."
 msgstr "_Tõsta kausta..."
 
-#: ui/evolution-addressbook.xml.h:39
-#: ui/evolution-mail-global.xml.h:17
+#: ui/evolution-addressbook.xml.h:39 ui/evolution-mail-global.xml.h:17
 msgid "_Preview Pane"
 msgstr "_Eelvaatepaan"
 
@@ -17828,8 +17283,7 @@ msgstr "Loend"
 msgid "Month"
 msgstr "Kuu"
 
-#: ui/evolution-calendar.xml.h:15
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-calendar.xml.h:15 ui/evolution-mail-message.xml.h:65
 msgid "Next"
 msgstr "Järgmine"
 
@@ -17837,8 +17291,7 @@ msgstr "Järgmine"
 msgid "Previews the calendar to be printed"
 msgstr "Trükitava kalendri eelvaatlemine"
 
-#: ui/evolution-calendar.xml.h:18
-#: ui/evolution-mail-message.xml.h:79
+#: ui/evolution-calendar.xml.h:18 ui/evolution-mail-message.xml.h:79
 msgid "Previous"
 msgstr "Eelmine"
 
@@ -17850,8 +17303,7 @@ msgstr "Kalendri trükkimine"
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Publitseeri selle kalendri vaba/hõivatud info"
 
-#: ui/evolution-calendar.xml.h:23
-#: ui/evolution-tasks.xml.h:17
+#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:17
 msgid "Purg_e"
 msgstr "_Puhastamine"
 
@@ -17891,8 +17343,7 @@ msgstr "Näitab ühte nädalat"
 msgid "Show the working week"
 msgstr "Näitab ühte töönädalat"
 
-#: ui/evolution-calendar.xml.h:34
-#: widgets/misc/e-cell-date-edit.c:249
+#: ui/evolution-calendar.xml.h:34 widgets/misc/e-cell-date-edit.c:249
 #: widgets/misc/e-dateedit.c:435
 msgid "Today"
 msgstr "Täna"
@@ -17913,20 +17364,17 @@ msgstr "Töönädal"
 msgid "_Open Appointment"
 msgstr "_Sündmus avamine"
 
-#: ui/evolution-comp-editor.xml.h:1
-#: ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-signature-editor.xml.h:1
 msgid "C_lose"
 msgstr "_Sulge"
 
-#: ui/evolution-comp-editor.xml.h:2
-#: ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:3
-#: ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:3
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
+#: ui/evolution.xml.h:4
 msgid "Close"
 msgstr "Sulge"
 
@@ -17934,15 +17382,12 @@ msgstr "Sulge"
 msgid "Close this item"
 msgstr "Sulgeb elemendi"
 
-#: ui/evolution-comp-editor.xml.h:5
-#: ui/evolution-contact-editor.xml.h:4
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:4
 msgid "Delete this item"
 msgstr "Kustuta see element"
 
-#: ui/evolution-comp-editor.xml.h:6
-#: ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3
-#: ui/evolution.xml.h:11
+#: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr "Peatööriistariba"
 
@@ -17950,27 +17395,23 @@ msgstr "Peatööriistariba"
 msgid "Preview the printed item"
 msgstr "Trükitava elemendi eelvaatlemine"
 
-#: ui/evolution-comp-editor.xml.h:10
-#: ui/evolution-contact-editor.xml.h:7
+#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:7
 msgid "Print this item"
 msgstr "Trüki see element"
 
-#: ui/evolution-comp-editor.xml.h:11
-#: ui/evolution-contact-editor.xml.h:8
+#: ui/evolution-comp-editor.xml.h:11 ui/evolution-contact-editor.xml.h:8
 #: ui/evolution-contact-list-editor.xml.h:5
 #: ui/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr "_Salvesta kui..."
 
-#: ui/evolution-comp-editor.xml.h:12
-#: ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:9
 #: ui/evolution-contact-list-editor.xml.h:6
 #: ui/evolution-signature-editor.xml.h:7
 msgid "Save and Close"
 msgstr "Salvesta ja sulge"
 
-#: ui/evolution-comp-editor.xml.h:13
-#: ui/evolution-contact-editor.xml.h:10
+#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:10
 #: ui/evolution-contact-list-editor.xml.h:7
 #: ui/evolution-signature-editor.xml.h:8
 msgid "Save and _Close"
@@ -17984,14 +17425,12 @@ msgstr "Salvestab elemendi kettale ja sulgeb dialoogiakna"
 msgid "Save this item to disk"
 msgstr "Salvestab elemendi kettale"
 
-#: ui/evolution-comp-editor.xml.h:18
-#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:15
 #: ui/evolution-contact-list-editor.xml.h:13
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-signature-editor.xml.h:13
-#: ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:27
+#: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
+#: ui/evolution.xml.h:29
 msgid "_File"
 msgstr "_Fail"
 
@@ -17999,8 +17438,7 @@ msgstr "_Fail"
 msgid "Copy selected text to the clipboard"
 msgstr ";ärgitud teksti lõikelauale kopeerimine"
 
-#: ui/evolution-composer-entries.xml.h:2
-#: ui/evolution-mail-message.xml.h:21
+#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-message.xml.h:21
 msgid "Cu_t"
 msgstr "Lõ_ika"
 
@@ -18012,8 +17450,7 @@ msgstr "Lõika valitud tekst lõikelauale"
 msgid "Paste text from the clipboard"
 msgstr "Teksti asetamine lõikepuhvrist"
 
-#: ui/evolution-composer-entries.xml.h:5
-#: ui/evolution-mail-list.xml.h:13
+#: ui/evolution-composer-entries.xml.h:5 ui/evolution-mail-list.xml.h:13
 #: ui/evolution-subscribe.xml.h:6
 msgid "Select _All"
 msgstr "Vali _kõik"
@@ -18069,13 +17506,11 @@ msgstr "Koo_soleku ärajätmine"
 msgid "Cancel the meeting for this item"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:3
-#: ui/evolution-task-editor.xml.h:5
+#: ui/evolution-event-editor.xml.h:3 ui/evolution-task-editor.xml.h:5
 msgid "Forward as i_Calendar"
 msgstr "_Edasta iKalendrina"
 
-#: ui/evolution-event-editor.xml.h:4
-#: ui/evolution-task-editor.xml.h:6
+#: ui/evolution-event-editor.xml.h:4 ui/evolution-task-editor.xml.h:6
 msgid "Forward this item via email"
 msgstr "Edastab elemendi e-posti kaudu"
 
@@ -18160,13 +17595,11 @@ msgstr "_Filtrid..."
 msgid "Change the properties of this folder"
 msgstr "Muuda kausta omadusi"
 
-#: ui/evolution-mail-list.xml.h:2
-#: ui/evolution-mail-message.xml.h:10
+#: ui/evolution-mail-list.xml.h:2 ui/evolution-mail-message.xml.h:10
 msgid "Copy selected message(s) to the clipboard"
 msgstr "Valitud sõnumi(te) kopeerimine lõikelauale"
 
-#: ui/evolution-mail-list.xml.h:3
-#: ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-list.xml.h:3 ui/evolution-mail-message.xml.h:22
 msgid "Cut selected message(s) to the clipboard"
 msgstr "Valitud sõnumi(te) lõikamine lõikelauale"
 
@@ -18187,7 +17620,8 @@ msgid "Hide _Read Messages"
 msgstr "Peida _loetud sõnumid"
 
 #: ui/evolution-mail-list.xml.h:8
-msgid "Hide deleted messages rather than displaying them with a line through them"
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 
 #: ui/evolution-mail-list.xml.h:9
@@ -18198,8 +17632,7 @@ msgstr "Märgi Kõik loetuks"
 msgid "Mark all visible messages as read"
 msgstr "Märgib kõik peitmata sõnumid loetuks"
 
-#: ui/evolution-mail-list.xml.h:11
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:74
 msgid "Paste message(s) from the clipboard"
 msgstr "Sõnumi(te) asetamine lõikepuhvrist"
 
@@ -18247,8 +17680,7 @@ msgstr "Esitab sõnumeid jutulõngadena"
 msgid "_Folder"
 msgstr "_Kaust"
 
-#: ui/evolution-mail-list.xml.h:26
-#: ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "_Inverteeri valik"
 
@@ -18256,15 +17688,13 @@ msgstr "_Inverteeri valik"
 msgid "_Threaded Message List"
 msgstr "_Esita sõnumeid jutulõngadena"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2
-#: ui/evolution.xml.h:4
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Sulgeb akna"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41
-#: ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:26
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:28
 msgid "_Close"
 msgstr "Sul_ge"
 
@@ -18667,8 +18097,7 @@ msgstr "_Eelmine sõnum"
 msgid "_Quoted"
 msgstr "_Tsiteeritud"
 
-#: ui/evolution-mail-message.xml.h:129
-#: ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
 msgid "_Tools"
 msgstr "T_ööriistad"
 
@@ -18684,8 +18113,7 @@ msgstr "Manusta"
 msgid "Attach a file"
 msgstr "Lisab sõnumile faili"
 
-#: ui/evolution-message-composer.xml.h:4
-#: ui/evolution-signature-editor.xml.h:3
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:3
 msgid "Close the current file"
 msgstr "Sulge fail"
 
@@ -18701,8 +18129,7 @@ msgstr "Krüpteeri sõnum PGPga"
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "Krüptib kirja sinu S/MIME krüptimissertifikaadi abil"
 
-#: ui/evolution-message-composer.xml.h:8
-#: ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:4
 msgid "For_mat"
 msgstr "Vor_ming"
 
@@ -18970,106 +18397,120 @@ msgid "_Open Task"
 msgstr "Ava _ülesanne"
 
 #: ui/evolution.xml.h:1
-msgid "About Ximian Evolution..."
-msgstr "Ximian Evolutionist..."
+#, fuzzy
+msgid "About Evolution..."
+msgstr "Ximian Evolutionist"
 
 #: ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
 msgstr "Muuda Evolutioni seadeid "
 
-#: ui/evolution.xml.h:5
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the visibility of the toolbar"
+msgstr "Muuda kausta omadusi"
+
+#: ui/evolution.xml.h:6
 msgid "Create a new window displaying this folder"
 msgstr "Loo uus aken, mis kuvab seda kausta"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "_Välju"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Ximian Evolution'i _KKK "
+
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Välju programmist"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:10
 msgid "Forget _Passwords"
 msgstr "Unusta _paroolid"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:11
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Unustab meeldejäetud paroolid, vajadusel küsitakse paroolid uuesti."
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:12
 msgid "Import data from other programs"
 msgstr "Impordib andmeid teistest programmidest"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:14
 msgid "New _Window"
 msgstr "Uus _aken"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Pi_lot Settings..."
 msgstr "P_ilot'i sätted..."
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Send / Receive"
 msgstr "Saada / võta vastu"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Send queued items and retrieve new items"
 msgstr "Saada ära järjekorras olevad teated ja tõmba ära uued teated"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Set up Pilot configuration"
 msgstr "Säti Pilot'i seadeid"
 
-#: ui/evolution.xml.h:17
-msgid "Show information about Ximian Evolution"
+#: ui/evolution.xml.h:19
+#, fuzzy
+msgid "Show information about Evolution"
 msgstr "Näita infot Ximian Evolutioni kohta"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:20
 msgid "Submit Bug Report"
 msgstr "Saada veateade"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:21
 msgid "Submit _Bug Report"
 msgstr "Saada _veateade"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Saada veateade kasutades Bug Buddy't"
 
-#: ui/evolution.xml.h:21
-msgid "Toggle whether we are working offline."
-msgstr "Lülitab autonoomse reziimi sisse või välja"
-
 #: ui/evolution.xml.h:23
-msgid "Ximian Evolution _FAQ"
-msgstr "Ximian Evolution'i _KKK "
+#, fuzzy
+msgid "T_oolbar"
+msgstr "Peatööriistariba"
 
 #: ui/evolution.xml.h:24
-msgid "_About Ximian Evolution..."
-msgstr "Ximian _Evolutionist..."
+msgid "Toggle whether we are working offline."
+msgstr "Lülitab autonoomse reziimi sisse või välja"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "_About Evolution..."
+msgstr "Ximian Evolutionist"
+
+#: ui/evolution.xml.h:30
 msgid "_Help"
 msgstr "_Abi"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "_Import..."
 msgstr "_Impordi..."
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "_New"
 msgstr "_Uus"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "_Quick Reference"
 msgstr "_Kiirviide"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_Send / Receive"
 msgstr "_Saada / Võta vastu"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 msgid "_Window"
 msgstr "_Aken"
 
@@ -19157,7 +18598,8 @@ msgstr "Vali ajavöönd"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
 msgid ""
-"Use the left mouse button to zoom in on an area of the map and select a time zone.\n"
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
 "Use the right mouse button to zoom out."
 msgstr ""
 "Kasuta vasakut hiirenuppu, et kaarti suurendada ja ajavööndit valida.\n"
@@ -19196,8 +18638,7 @@ msgstr "ETKNRLP"
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:241
-#: widgets/misc/e-dateedit.c:429
+#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:429
 msgid "Now"
 msgstr "Praegu"
 
@@ -19258,16 +18699,13 @@ msgstr "lääne-euroopa"
 msgid "Western European, New"
 msgstr "Lääne-euroopa, uust"
 
-#: widgets/misc/e-charset-picker.c:91
-#: widgets/misc/e-charset-picker.c:92
+#: widgets/misc/e-charset-picker.c:91 widgets/misc/e-charset-picker.c:92
 #: widgets/misc/e-charset-picker.c:93
 msgid "Traditional"
 msgstr "traditsiooniline"
 
-#: widgets/misc/e-charset-picker.c:94
-#: widgets/misc/e-charset-picker.c:95
-#: widgets/misc/e-charset-picker.c:96
-#: widgets/misc/e-charset-picker.c:97
+#: widgets/misc/e-charset-picker.c:94 widgets/misc/e-charset-picker.c:95
+#: widgets/misc/e-charset-picker.c:96 widgets/misc/e-charset-picker.c:97
 msgid "Simplified"
 msgstr "Lihtsustatud"
 
@@ -19284,8 +18722,7 @@ msgstr "visuaalne"
 msgid "Unknown character set: %s"
 msgstr "Tundmatu märgistik: %s"
 
-#: widgets/misc/e-charset-picker.c:216
-#: widgets/misc/e-charset-picker.c:479
+#: widgets/misc/e-charset-picker.c:216 widgets/misc/e-charset-picker.c:479
 msgid "Character Encoding"
 msgstr "Kodeering"
 
@@ -19301,14 +18738,12 @@ msgstr "Muu..."
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-error.c:79
-#: widgets/misc/e-error.c:80
+#: widgets/misc/e-error.c:79 widgets/misc/e-error.c:80
 #: widgets/misc/e-error.c:122
 msgid "Evolution Error"
 msgstr "Evolutioni viga"
 
-#: widgets/misc/e-error.c:81
-#: widgets/misc/e-error.c:82
+#: widgets/misc/e-error.c:81 widgets/misc/e-error.c:82
 #: widgets/misc/e-error.c:120
 msgid "Evolution Warning"
 msgstr "Evolutioni hoiatus"
@@ -19325,8 +18760,10 @@ msgstr "Evolutioni päring"
 #. setup a dummy error
 #: widgets/misc/e-error.c:415
 #, c-format
-msgid "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
-msgstr "<span weight=\"bold\">Sisemine viga, tundmatu viga '%s'  küsitud</span>"
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr ""
+"<span weight=\"bold\">Sisemine viga, tundmatu viga '%s'  küsitud</span>"
 
 #: widgets/misc/e-expander.c:181
 msgid "Expanded"
@@ -19345,7 +18782,9 @@ msgid "Use underline"
 msgstr "Kasuta allakriipsutust"
 
 #: widgets/misc/e-expander.c:198
-msgid "If set, an underline in the text indicates the next character should be used for the mnemonic accelerator key"
+msgid ""
+"If set, an underline in the text indicates the next character should be used "
+"for the mnemonic accelerator key"
 msgstr ""
 
 #: widgets/misc/e-expander.c:205
@@ -19394,18 +18833,15 @@ msgstr "Otsinguredaktor"
 msgid "Save Search"
 msgstr "Salvesta otsing"
 
-#: widgets/misc/e-filter-bar.h:92
-#: widgets/misc/e-filter-bar.h:99
+#: widgets/misc/e-filter-bar.h:92 widgets/misc/e-filter-bar.h:99
 msgid "_Save Search..."
 msgstr "_Salvesta otsing..."
 
-#: widgets/misc/e-filter-bar.h:93
-#: widgets/misc/e-filter-bar.h:100
+#: widgets/misc/e-filter-bar.h:93 widgets/misc/e-filter-bar.h:100
 msgid "_Edit Saved Searches..."
 msgstr "_Redigeeri salvestatud otsinguid..."
 
-#: widgets/misc/e-filter-bar.h:94
-#: widgets/misc/e-filter-bar.h:101
+#: widgets/misc/e-filter-bar.h:94 widgets/misc/e-filter-bar.h:101
 msgid "_Advanced..."
 msgstr "_Täpsemalt..."
 
@@ -19421,8 +18857,7 @@ msgstr "_Otsing"
 msgid "_Find Now"
 msgstr "_Otsing"
 
-#: widgets/misc/e-search-bar.c:547
-#: widgets/misc/e-search-bar.c:929
+#: widgets/misc/e-search-bar.c:547 widgets/misc/e-search-bar.c:929
 msgid "_Clear"
 msgstr "_Puhasta"
 
@@ -19472,3 +18907,420 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% valmis)"
 
+#~ msgid "Failed to connect to LDAP server"
+#~ msgstr "Ei saa luua ühendust LDAP serveriga"
+
+#~ msgid "Failed to authenticate with LDAP server"
+#~ msgstr "Autentimine LDAP serverile nurjus"
+
+#, fuzzy
+#~ msgid "Error retrieving schema information"
+#~ msgstr "Viga GSM faili info hankimisel: "
+
+#, fuzzy
+#~ msgid "  S_how Supported Bases "
+#~ msgstr "Toetatud otsingubaasid"
+
+#~ msgid "1:00"
+#~ msgstr "1:00"
+
+#~ msgid "5:00"
+#~ msgstr "5:00"
+
+#~ msgid "Connecting"
+#~ msgstr "Ühendamine"
+
+#~ msgid "Distinguished _name:"
+#~ msgstr "_Eraldusnimi:"
+
+#~ msgid "Email address:"
+#~ msgstr "E-posti aadress: "
+
+#~ msgid "Evolution will use this DN to authenticate you with the server"
+#~ msgstr "Evolution esitab selle eraldusnime serverile audentsuse kontrollil"
+
+# !PARANDA! - LDAP serveri kehtivuspiirkond
+#~ msgid "One"
+#~ msgstr "Üks"
+
+#~ msgid "S_earch scope: "
+#~ msgstr "Otsingu _kehtivuspiirkond: "
+
+#~ msgid "Searching"
+#~ msgstr "Otsin"
+
+# !PARANDA! - LDAP serveri kehtivuspiirkond
+#~ msgid "Sub"
+#~ msgstr "Alam"
+
+#~ msgid "This option controls how long a search will be run."
+#~ msgstr "See valik kontrollib kui kaua lubatakse otsingul töötada."
+
+#~ msgid "U_se SSL/TLS:"
+#~ msgstr "_Kasuta SSL/TLS:"
+
+#~ msgid "_Display name:"
+#~ msgstr "_Näidatav nimi:"
+
+#~ msgid "_Port number:"
+#~ msgstr "_Pordi number:"
+
+#~ msgid "_Search base:"
+#~ msgstr "_Otsingu baas:"
+
+#~ msgid "_Server name:"
+#~ msgstr "_Serveri nimi:"
+
+#~ msgid "_Timeout (minutes):"
+#~ msgstr "_Taimaut (minutites):"
+
+#, fuzzy
+#~ msgid "connecting-tab"
+#~ msgstr "Uus s_akk"
+
+#~ msgid "general-tab"
+#~ msgstr "üldine-sakk"
+
+#~ msgid "searching-tab"
+#~ msgstr "otsingu-sakk"
+
+#  URL
+#~ msgid "Webcam:"
+#~ msgstr "Veebikaamera:"
+
+#~ msgid "item7"
+#~ msgstr "element7"
+
+#~ msgid "item8"
+#~ msgstr "element8"
+
+#~ msgid "Category editor not available."
+#~ msgstr "Kategooriaredaktor pole saadaval."
+
+#~ msgid "Do you want to save changes?"
+#~ msgstr "Kas soovid muudatused salvestada?"
+
+#~ msgid "Error saving %s: %s"
+#~ msgstr "Viga %s salvestamisel: %s"
+
+#~ msgid "Can not load URI"
+#~ msgstr "URI't ei saa laadida"
+
+#~ msgid "Calendar Properties"
+#~ msgstr "Kalendri atribuudid"
+
+#~ msgid "Remote"
+#~ msgstr "Võrgus"
+
+#~ msgid "Task List Properties"
+#~ msgstr "Ülesandeloetelu omadused"
+
+#~ msgid "_Refresh Interval:"
+#~ msgstr "_Uuendamise intervall:"
+
+#~ msgid "_Source URL:"
+#~ msgstr "_Lähte-URL:"
+
+#~ msgid ""
+#~ "The event being deleted is a meeting, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "Sündmus, mida te kustutate, on koosolek. Kas soovid saata osavõtjatele "
+#~ "teate koosoleku ärajätmise kohta?"
+
+#~ msgid "Are you sure you want to cancel and delete this meeting?"
+#~ msgstr "Kas sa tõesti soovid katkestada ja kustutada antud koosoleku?"
+
+#~ msgid ""
+#~ "The task being deleted is assigned, would you like to send a cancellation "
+#~ "notice?"
+#~ msgstr ""
+#~ "Ülesanne, mida te kustutate, on antud täitmiseks. Kas soovite saata "
+#~ "tühistamise teate?"
+
+#~ msgid "Are you sure you want to cancel and delete this task?"
+#~ msgstr "Kas sa tõesti soovid katkestada ja kustutada antud ülesande?"
+
+#~ msgid ""
+#~ "The journal entry being deleted is published, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "Päevaraamatu sissekanne, mida te kustutate on avalik. Kas soovite saata "
+#~ "ärajätmise teate?"
+
+#~ msgid "Are you sure you want to cancel and delete this journal entry?"
+#~ msgstr ""
+#~ "Kas sa tõesti soovid katkestada ja kustutada antud päeviku sissekande?"
+
+#~ msgid "Are you sure you want to delete the appointment `%s'?"
+#~ msgstr "Kas sa tõesti soovid kustutada kokkusaamist '%s'?"
+
+#~ msgid "Are you sure you want to delete this untitled appointment?"
+#~ msgstr "Kas sa tõesti soovid kustutada seda nimetut kokkusaamist?"
+
+#~ msgid "Are you sure you want to delete the task `%s'?"
+#~ msgstr "Kas sa tõesti soovid kustutada ülesannet '%s'?"
+
+#~ msgid "Are you sure you want to delete this untitled task?"
+#~ msgstr "Kas sa tõesti soovid kustutada seda nimetut ülesannet?"
+
+#~ msgid "Are you sure you want to delete the journal entry `%s'?"
+#~ msgstr "Kas sa tõesti soovid kustutada päeviku sissekannet '%s'?"
+
+#~ msgid "Are you sure want to delete this untitled journal entry?"
+#~ msgstr "Kas sa tõesti soovid kustutada seda nimetut päeviku sissekannet?"
+
+#~ msgid "_Invite Others..."
+#~ msgstr "_Kutsu teisi..."
+
+#~ msgid ""
+#~ "This event has been changed, but has not been saved.\n"
+#~ "\n"
+#~ "Do you wish to save your changes?"
+#~ msgstr ""
+#~ "Sündmust on muudetud kuid seda ei ole salvestatud.\n"
+#~ "\n"
+#~ "Kas sa soovid muudatused salvestada?"
+
+#~ msgid "_Discard Changes"
+#~ msgstr "_Loobu muudatustest"
+
+#~ msgid "Save Event"
+#~ msgstr "Salvesta sündmus"
+
+#~ msgid "The meeting information has been created. Send it?"
+#~ msgstr "Koosoleku info on valmis. Kas soovid selle laiali saata?"
+
+#~ msgid "The meeting information has changed. Send an updated version?"
+#~ msgstr "Koosoleku infot on muudetud. Kas soovid saata uuendatud versiooni? "
+
+#~ msgid "The task information has changed. Send an updated version?"
+#~ msgstr "Ülesande infot on muudetud. Kas soovid saata uuendatud versiooni?"
+
+#, fuzzy
+#~ msgid "Could not get article %s from NNTP server"
+#~ msgstr "Gruppide nimekirja serverist ei saadud."
+
+#~ msgid "Posting not allowed by news server"
+#~ msgstr "Uudisteserver ei luba postitusi"
+
+#~ msgid "Failed to send newsgroups header: %s: message not posted"
+#~ msgstr ""
+#~ "Uudistegruppide päise saatmine ebaõnnestus: %s: sõnimit ei postitatud"
+
+#~ msgid "Error posting to newsgroup: %s: message not posted"
+#~ msgstr "Viga uudistegruppi postitamisel: %s: sõnumit ei postitatud"
+
+#~ msgid "Error reading response to posted message: message not posted"
+#~ msgstr "Viga postitatud sõnumi vastuse lugemisel: sõnumit ei postitatud"
+
+#, fuzzy
+#~ msgid "Error posting message: %s: message not posted"
+#~ msgstr "Viga uudistegruppi postitamisel: %s: sõnumit ei postitatud"
+
+#~ msgid "Stream error"
+#~ msgstr "Andmevoo viga"
+
+#~ msgid "Connection error: %s"
+#~ msgstr "Ühenduse viga: %s"
+
+#, fuzzy
+#~ msgid "Could not get group: %s"
+#~ msgstr "Infot pole võimalik saada!"
+
+#, fuzzy
+#~ msgid "Could not get messages: unspecified error"
+#~ msgstr "Sõnumi võtmine nurjus: %s"
+
+#, fuzzy
+#~ msgid "Unknown server response: %s"
+#~ msgstr "Serveri viimane vastus"
+
+#~ msgid "${1}"
+#~ msgstr "${1}"
+
+#~ msgid "Because \"${1}\"."
+#~ msgstr "Kuna \"${1}\"."
+
+#  Automatically generated. Do not edit.
+#~ msgid "Adjust Score"
+#~ msgstr "Kohanda hinnet"
+
+#~ msgid "Assign Color"
+#~ msgstr "Määra värvus"
+
+#~ msgid "Assign Score"
+#~ msgstr "Omista hinne"
+
+#~ msgid "Attachments"
+#~ msgstr "Manused"
+
+#~ msgid "Beep"
+#~ msgstr "Piiks"
+
+#~ msgid "contains"
+#~ msgstr "sisaldab"
+
+#~ msgid "Copy to Folder"
+#~ msgstr "Kopeeri kausta"
+
+#~ msgid "Date received"
+#~ msgstr "Vastuvõtmise kuupäev"
+
+#~ msgid "Date sent"
+#~ msgstr "Saatmise kuupäev"
+
+#~ msgid "Deleted"
+#~ msgstr "Kustutatud"
+
+#~ msgid "does not end with"
+#~ msgstr "ei lõppe"
+
+#~ msgid "does not exist"
+#~ msgstr "ei eksisteeri"
+
+#~ msgid "does not return"
+#~ msgstr "ei tagasta"
+
+#~ msgid "does not sound like"
+#~ msgstr "ei kõla nagu"
+
+#~ msgid "does not start with"
+#~ msgstr "ei alga"
+
+#~ msgid "Do Not Exist"
+#~ msgstr "Ei ole olemas"
+
+#~ msgid "Draft"
+#~ msgstr "Mustand"
+
+#~ msgid "ends with"
+#~ msgstr "lõpeb"
+
+#~ msgid "Exist"
+#~ msgstr "On olemas"
+
+#~ msgid "exists"
+#~ msgstr "on olemas"
+
+#~ msgid "Expression"
+#~ msgstr "Avaldis"
+
+#~ msgid "Follow Up"
+#~ msgstr "Vastukaja"
+
+#~ msgid "is"
+#~ msgstr "on"
+
+#~ msgid "is after"
+#~ msgstr "on peale"
+
+#~ msgid "is before"
+#~ msgstr "on enne"
+
+#~ msgid "is Flagged"
+#~ msgstr "on märgistatud"
+
+#~ msgid "is greater than"
+#~ msgstr "on suurem kui"
+
+#~ msgid "is less than"
+#~ msgstr "on väiksem kui"
+
+#~ msgid "is not"
+#~ msgstr "ei ole"
+
+#~ msgid "is not Flagged"
+#~ msgstr "ei ole märgistatud"
+
+#~ msgid "Junk Test"
+#~ msgstr "Rämpsukontroll"
+
+#~ msgid "Mailing list"
+#~ msgstr "Meililist"
+
+#~ msgid "Message Body"
+#~ msgstr "Kirja tekst"
+
+#~ msgid "Message Header"
+#~ msgstr "Kirja päis"
+
+#~ msgid "Message is Junk"
+#~ msgstr "Sõnum on rämps"
+
+#~ msgid "Message is not Junk"
+#~ msgstr "Sõnum ei ole rämps"
+
+#~ msgid "Move to Folder"
+#~ msgstr "Tõsta kausta"
+
+#, fuzzy
+#~ msgid "Pipe to Program"
+#~ msgstr "Käivitatav programm"
+
+#~ msgid "Play Sound"
+#~ msgstr "Mängi heli"
+
+#~ msgid "Recipients"
+#~ msgstr "Adressaadid"
+
+#~ msgid "Regex Match"
+#~ msgstr "Regulaaravaldis vastab"
+
+#~ msgid "Replied to"
+#~ msgstr "Vastatud kellele"
+
+#~ msgid "returns"
+#~ msgstr "tagastab"
+
+#~ msgid "returns greater than"
+#~ msgstr "tagastab rohkem kui"
+
+#~ msgid "returns less than"
+#~ msgstr "tagastab vähem kui"
+
+#~ msgid "Run Program"
+#~ msgstr "Käivita programm"
+
+#~ msgid "Sender"
+#~ msgstr "Saatja"
+
+#~ msgid "Set Status"
+#~ msgstr "Määra oma staatus"
+
+#~ msgid "Size (kB)"
+#~ msgstr "Suurus (kB)"
+
+#~ msgid "sounds like"
+#~ msgstr "kõlab kui"
+
+#~ msgid "Source Account"
+#~ msgstr "Lähtekonto"
+
+#~ msgid "Specific header"
+#~ msgstr "Päise eripära"
+
+#~ msgid "starts with"
+#~ msgstr "algab"
+
+#~ msgid "Stop Processing"
+#~ msgstr "Peata töötlemine"
+
+#, fuzzy
+#~ msgid "Unset Status"
+#~ msgstr "Kahtlase oleku a&utomaatne eemaldamine"
+
+#~ msgid "Brought to you by"
+#~ msgstr "Teieni tõid"
+
+#~ msgid "_Filename:"
+#~ msgstr "_Faili nimi:"
+
+#~ msgid "View Certificate"
+#~ msgstr "Sertifikaadi kuvamine"
+
+#~ msgid "About Ximian Evolution..."
+#~ msgstr "Ximian Evolutionist..."
+
+#~ msgid "_About Ximian Evolution..."
+#~ msgstr "Ximian _Evolutionist..."
diff --git a/po/eu.po b/po/eu.po
index 7f7daa70ec..c7d7d9a9e6 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
-"POT-Creation-Date: 2004-05-19 14:00-0400\n"
+"POT-Creation-Date: 2004-06-03 11:14-0400\n"
 "PO-Revision-Date: 2004-04-05 21:04+0200\n"
 "Last-Translator: Hizkuntza Politikarako Sailburuordetza <hizpol@ej-gv.es>\n"
 "Language-Team: basque <itzulpena@euskalgnu.org>\n"
@@ -53,13 +53,13 @@ msgstr " txartel"
 msgid "Default Sync Address:"
 msgstr "Sinkronizazio-helbide lehenetsia:"
 
-#: addressbook/conduit/address-conduit.c:1150
 #: addressbook/conduit/address-conduit.c:1151
+#: addressbook/conduit/address-conduit.c:1152
 msgid "Could not load addressbook"
 msgstr "Ezin izan da helbide-liburua kargatu"
 
-#: addressbook/conduit/address-conduit.c:1219
-#: addressbook/conduit/address-conduit.c:1222
+#: addressbook/conduit/address-conduit.c:1220
+#: addressbook/conduit/address-conduit.c:1223
 msgid "Could not read pilot's Address application block"
 msgstr "Ezin izan da pilot-aren Helbidearen aplikazio-blokea irakurri"
 
@@ -67,13 +67,13 @@ msgstr "Ezin izan da pilot-aren Helbidearen aplikazio-blokea irakurri"
 msgid "Accessing LDAP Server anonymously"
 msgstr "LDAP zerbitzarian anonimoki sartzea"
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
 msgid "Failed to authenticate.\n"
 msgstr "Huts egin du autentifikatzean.\n"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sIdatzi %s(r)en pasahitza (%s erabiltzailea)"
@@ -117,51 +117,23 @@ msgstr "_Kontaktuak:"
 msgid "Create a new contacts group"
 msgstr "Sortu lasterbide-talde berria"
 
-#: addressbook/gui/component/addressbook-component.c:182
+#: addressbook/gui/component/addressbook-component.c:184
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:483
-msgid "Failed to connect to LDAP server"
-msgstr "Huts egin du LDAP zerbitzariarekin konektatzean"
-
-#: addressbook/gui/component/addressbook-config.c:507
-msgid "Failed to authenticate with LDAP server"
-msgstr "Huts egin du LDAP zerbitzarian autentifikatzean"
-
-#: addressbook/gui/component/addressbook-config.c:535
-msgid "Could not perform query on Root DSE"
-msgstr "Ezin izan da egin kontsulta Root DSEn"
-
-#: addressbook/gui/component/addressbook-config.c:840
-msgid "The server responded with no supported search bases"
-msgstr "Onartzen ez diren bilaketa-oinarriekin erantzun du zerbitzariak"
-
-#: addressbook/gui/component/addressbook-config.c:1245
-msgid "This server does not support LDAPv3 schema information"
-msgstr "Zerbitzari honek ez du onartzen LDAPv3 eskema-informazioa"
-
-#: addressbook/gui/component/addressbook-config.c:1266
-msgid "Error retrieving schema information"
-msgstr "Errorea eskema-informazioa eskuratzean"
-
-#: addressbook/gui/component/addressbook-config.c:1274
-msgid "Server did not respond with valid schema information"
-msgstr "Zerbitzariak ez du erantzun baliozko eskema-informazioarekin"
-
 #: addressbook/gui/component/addressbook-migrate.c:68
-#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1160
 msgid "Migrating..."
 msgstr "Migratzen..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1201
 #, c-format
 msgid "Migrating `%s':"
 msgstr "'%s' migratzen:"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:438
+#: addressbook/gui/component/addressbook-migrate.c:464
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
 #: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
@@ -169,28 +141,28 @@ msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:446
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
-#: mail/mail-config.glade.h:106
+#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
+#: mail/mail-config.glade.h:109
 msgid "Personal"
 msgstr "Pertsonala"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:454
+#: addressbook/gui/component/addressbook-migrate.c:480
 msgid "On LDAP Servers"
 msgstr "LDAP zerbitzarian"
 
-#: addressbook/gui/component/addressbook-migrate.c:582
+#: addressbook/gui/component/addressbook-migrate.c:608
 msgid "LDAP Servers"
 msgstr "LDAP zerbitzariak"
 
-#: addressbook/gui/component/addressbook-migrate.c:702
+#: addressbook/gui/component/addressbook-migrate.c:728
 msgid "Autocompletion Settings"
 msgstr "Osatze automatikoaren ezarpenak"
 
-#: addressbook/gui/component/addressbook-migrate.c:1076
+#: addressbook/gui/component/addressbook-migrate.c:1104
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -198,59 +170,54 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1090
+#: addressbook/gui/component/addressbook-migrate.c:1118
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1099
+#: addressbook/gui/component/addressbook-migrate.c:1127
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1109
+#: addressbook/gui/component/addressbook-migrate.c:1137
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:674
+#: addressbook/gui/component/addressbook-view.c:675
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:761
+#: addressbook/gui/component/addressbook-view.c:754
 msgid "New Address Book"
 msgstr "Helbide-liburu berria"
 
-#: addressbook/gui/component/addressbook-view.c:762
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
+#: addressbook/gui/component/addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: addressbook/gui/component/addressbook-view.c:763
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-view.c:756
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Propietateak..."
 
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/addressbook-view.c:1002
+#. Create the contacts group
+#: addressbook/gui/component/addressbook-view.c:995
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
 #: calendar/gui/migration.c:373
 msgid "Contacts"
 msgstr "Kontaktuak"
@@ -328,10 +295,6 @@ msgid "Manage your S/MIME certificates here"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-msgid "  S_how Supported Bases "
-msgstr "  E_rakutsi onartzen diren oinarriak "
-
-#: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -346,206 +309,171 @@ msgstr "  E_rakutsi onartzen diren oinarriak "
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1:00"
-msgstr "1:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
-msgstr "5:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "Autentifikazioa"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
 #, fuzzy
 msgid "<b>Display</b>"
 msgstr "_Bistaratzea"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 #, fuzzy
 msgid "<b>Downloading</b>"
 msgstr "<b>Mezuak bidali:</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:10
 #, fuzzy
 msgid "<b>Searching</b>"
 msgstr "Bilaketa"
 
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
 msgid "<b>Server Information</b>"
 msgstr "2. urratsa: zerbitzariaren datuak"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
 msgid "<b>Type:</b>"
 msgstr "<b>Falta:</b> "
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:13
 #, fuzzy
 msgid "Add Contacts Group"
 msgstr "_Kontaktuak:"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Address Book Properties"
 msgstr "Helbide-liburuaren propietateak"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
-#: mail/mail-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
+#: mail/mail-config.glade.h:42
 msgid "Always"
 msgstr "Beti"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr "Anonimoki"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:17
 #: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Oinarrizkoa"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
-msgid "Connecting"
-msgstr "Konektatzea"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 #: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Xehetasunak"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
-msgid "Distinguished _name:"
-msgstr "_Izen bereizia (DN):"
-
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:19
 #, fuzzy
 msgid "Distinguished name"
 msgstr "_Izen bereizia (DN):"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:20
 #, fuzzy
 msgid "Download limit:"
 msgstr "Des_karga-muga:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Email address"
 msgstr "Helbide elektronikoa:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "Email address:"
-msgstr "Helbide elektronikoa:"
-
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "Evolution will use this DN to authenticate you with the server"
-msgstr ""
-"Evolution-ek izen bereizi (DN) hau erabiliko du zu zerbitzarian "
-"autentifikatzeko"
-
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:22
+#, fuzzy
 msgid ""
-"Evolution will use this email address to authenticate you with the server"
+"Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "Evolution-ek helbide elektroniko hau erabiliko du zu zerbitzarian "
 "autentifikatzeko"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:23
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Onartutako Bilaketa Oinarriak"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:24
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
+#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Orokorra"
 
-#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
-#: mail/mail-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
+#: mail/mail-config.glade.h:102
 msgid "Never"
 msgstr "Inoiz ere ez"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
-msgid "One"
-msgstr "Bat"
-
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:35
-msgid "S_earch scope: "
-msgstr "Bilaketa-_esparrua: "
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Search _base:"
+msgstr "_Bilaketa-oinarria:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
 msgid "Search base only"
 msgstr "_Bilaketa-oinarria:"
 
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:29
 #, fuzzy
 msgid "Search base:"
 msgstr "_Bilaketa-oinarria:"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Search scope:"
 msgstr "Bilaketa-_esparrua: "
 
-#: addressbook/gui/component/ldap-config.glade.h:39
-msgid "Searching"
-msgstr "Bilaketa"
-
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:31
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
-"server if\n"
-"your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL or TLS."
 msgstr ""
 "Aukera hau hautatuz gero, zure LDAP zerbitzariak SSL edo TLS onartzen badu\n"
 "bakarrik konektatuko da Evolution LDAP zerbitzarira."
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a \n"
-"insecure environment. For example, if you and your LDAP server are behind a "
-"firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection "
-"is already\n"
-"secure."
+"you are in a insecure environment. For example, if you and your LDAP server "
+"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
+"because your connection is already secure."
 msgstr ""
 "Aukera hau hautatuz gero, segurua ez den ingurunean zaudenean bakarrik "
 "saiatuko da Evolution \n"
@@ -554,50 +482,44 @@ msgstr ""
 "lanean, Evolution-ek ez dauka SSL/TLS erabili beharrik, \n"
 "zure konexioa dagoeneko segurua baita."
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:33
+#, fuzzy
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
-"TLS.  This \n"
-"means that your connection will be insecure, and that you will be vulnerable "
-"to security\n"
-"exploits. "
+"TLS.  This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits. "
 msgstr ""
 "Aukera hau hautatzeak esan nahi du zure zerbitzariak ez duela onartzen ez "
 "SSL eta ez TLS.  Horrek \n"
 "esan nahi du zure konexioa ez dela segurua izango, eta segurtasun-zuloak "
 "izan ditzakezula."
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Sub"
-msgstr "Sub"
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr "Onartutako Bilaketa Oinarriak"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
-"searches will \n"
-"begin. If you leave this blank, the search will begin at the root of the "
-"directory tree."
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
 msgstr ""
 "Zure bilaketen abiapuntu gisa erabiliko den sarreraren izen bereizia (DN) da "
 "bilaketa-oinarria.\n"
 " Hutsik uzten baduzu, bilaketa direktorio-zuhaitzaren erroan hasiko da."
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:37
+#, fuzzy
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
-"the \n"
-"directory tree. A search scope of \"sub\" will include all entries below "
-"your search base.\n"
-"A search scope of \"one\" will only include the entries one level beneath "
-"your base.\n"
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
 msgstr ""
 "Bilaketa-esparruak definitzen du zein mailataraino bilatu nahi duzun \n"
 "direktorio-zuhaitzean behera. \"sub\" bilaketa-esparruak zure bilaketa-"
@@ -605,7 +527,7 @@ msgstr ""
 "\"one\" bilaketa-esparruak oinarritik maila bat beherago arteko sarrerak "
 "bakarrik hartuko ditu.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:58
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -613,18 +535,17 @@ msgstr ""
 "LDAP zerbitzariaren izen osoa eman behar da. Adibidez, \"ldap.nireenpresa.com"
 "\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:39
 #, fuzzy
 msgid ""
-"This is the maximum number of entries to download. Setting this number to "
-"be \n"
+"This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr ""
 "Hau gehienez deskargatuko den sarrera-kopurua da. Kopuru handiegia ezartzen "
 "baduzu, \n"
 "helbide-liburua mantso ibiliko da."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -634,142 +555,121 @@ msgstr ""
 "hemen \"Helbide elektronikoa\" ezartzen bada, anonimoki sartu behar dela "
 "LDAP zerbitzarian."
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:41
+#, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
-"list.\n"
-"It is for display purposes only. "
+"list. It is for display purposes only. "
 msgstr ""
 "Hau da zerbitzariak zure Evolution karpeta-zerrendan izango duen izena.\n"
 "Bistaratzeko bakarrik erabiliko da. "
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:42
+#, fuzzy
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. "
-"A \n"
-"list of standard ports has been provided. Ask your system administrator\n"
-"what port you should specify."
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
 msgstr ""
 "LDAP zerbitzariko ataka horretatik saiatuko da konektatzen Evolution. "
 "Ataka \n"
 "estandarren zerrenda bat ematen da. Galdetu sistema-administratzaileari\n"
 "zein ataka ezarri behar duzun."
 
-#: addressbook/gui/component/ldap-config.glade.h:67
-msgid "This option controls how long a search will be run."
-msgstr "Bilaketek zenbat iraungo duten kontrolatzen du aukera honek."
-
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:43
 #, fuzzy
 msgid "Timeout:"
 msgstr "Ordu-formatua:"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
-msgid "U_se SSL/TLS:"
-msgstr "_Erabili SSL/TLS:"
-
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr "Erabili izen bereizia (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr "Erabili helbide elektronikoa"
 
-#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
-#: mail/mail-config.glade.h:154
+#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
+#: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr "Ahal den guztietan"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:47
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "_Kontaktuak:"
 
-#: addressbook/gui/component/ldap-config.glade.h:74
-#: calendar/gui/dialogs/calendar-setup.glade.h:12
-msgid "_Display name:"
-msgstr "_Bistaratzeko izena:"
-
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr "Des_karga-muga:"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
 msgid "_Email address:"
 msgstr "Helbide elektronikoa:"
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:50
+#, fuzzy
+msgid "_Find Possible Search Bases"
+msgstr "Onartutako Bilaketa Oinarriak"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Log in method:"
 msgstr "_Saioa hasteko metodoa:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "_Log in:"
+msgstr "Saio-hasiera"
+
+#: addressbook/gui/component/ldap-config.glade.h:53
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
 msgid "_Name:"
 msgstr "_Izena:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
-msgid "_Port number:"
-msgstr "_Ataka-zenbakia:"
-
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "_Port:"
 msgstr "_Lehentasuna:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
-msgid "_Search base:"
-msgstr "_Bilaketa-oinarria:"
-
-#: addressbook/gui/component/ldap-config.glade.h:82
-msgid "_Server name:"
-msgstr "_Zerbitzariaren izena:"
+#: addressbook/gui/component/ldap-config.glade.h:55
+#, fuzzy
+msgid "_Search scope:"
+msgstr "Bilaketa-_esparrua: "
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:56
 #, fuzzy
 msgid "_Server:"
 msgstr "_Zerbitzaria:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
-msgid "_Timeout (minutes):"
-msgstr "_Denbora-muga (minututan):"
+#: addressbook/gui/component/ldap-config.glade.h:57
+#, fuzzy
+msgid "_Timeout:"
+msgstr "Ordu-formatua:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:58
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "E_rabili konexio segurua (SSL):"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "txartel"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
-msgid "connecting-tab"
-msgstr "konektatzeko fitxa"
-
-#: addressbook/gui/component/ldap-config.glade.h:88
-msgid "general-tab"
-msgstr "fitxa orokorra"
-
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:60
 #: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
-#: mail/mail-config.glade.h:182
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "minutu"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
-msgid "searching-tab"
-msgstr "bilaketa-fitxa"
-
-#: addressbook/gui/component/select-names/e-select-names.c:497
+#: addressbook/gui/component/select-names/e-select-names.c:503
 #: addressbook/gui/component/select-names/select-names.glade.h:6
 #, fuzzy
 msgid "Select Contacts from Address Book"
 msgstr "Hautatu kontaktuak helbide-liburutik"
 
-#: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
@@ -809,7 +709,7 @@ msgstr "Kontaktu izengabea"
 
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:222
+#: addressbook/gui/widgets/e-addressbook-view.c:224
 msgid "Source"
 msgstr "Iturburua"
 
@@ -887,9 +787,9 @@ msgid "<b>Work</b>"
 msgstr "<b>Falta:</b> "
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
-#: addressbook/gui/widgets/eab-contact-display.c:342
-#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/widgets/eab-contact-display.c:334
+#: addressbook/gui/widgets/eab-contact-display.c:353
 msgid "AIM"
 msgstr ""
 
@@ -930,15 +830,15 @@ msgid "Company:"
 msgstr "Enpresakoa"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:271
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
+#: addressbook/gui/contact-editor/e-contact-editor.c:266
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
 msgstr "Kontaktua"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1527
+#: addressbook/gui/contact-editor/e-contact-editor.c:520
 msgid "Contact Editor"
 msgstr "Kontaktu-editorea"
 
@@ -962,83 +862,80 @@ msgid "Full _Name..."
 msgstr "_Izen-abizenak..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:202
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-msgid "Home"
-msgstr "Etxekoa"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #, fuzzy
 msgid "Home Page:"
 msgstr "Etxeko faxa"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-#, fuzzy
-msgid "Job title:"
-msgstr "Kar_gua:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/e-itip-control.c:936
-msgid "Location:"
-msgstr "Kokalekua:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 #, fuzzy
 msgid "MSN Messenger"
 msgstr "_Mezua"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 #, fuzzy
 msgid "Mailing Address"
 msgstr "Fusionatu helbide elektronikoa"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 #, fuzzy
 msgid "Manager:"
 msgstr "Zuzendaria"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "_Goitizena:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Notes:"
 msgstr "_Oharrak:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
-#: addressbook/gui/contact-editor/e-contact-editor.c:203
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-msgid "Other"
-msgstr "Bestelakoa"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#, fuzzy
+msgid "Office:"
+msgstr "_Bulegoa:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "PO Box:"
 msgstr "_Posta-kutxa:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 #, fuzzy
 msgid "Personal Information"
 msgstr "Aukerako informazioa"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 #, fuzzy
 msgid "Profession:"
 msgstr "_Lanbidea:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#, fuzzy
+msgid "Spouse:"
+msgstr "_Ezkontidea:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "State/Province:"
 msgstr "E_statua/Probintzia:"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#, fuzzy
+msgid "Title:"
+msgstr "_Titulua:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+msgid "Video Chat:"
+msgstr ""
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:41
 #, fuzzy
 msgid "Wants to receive HTML mail"
@@ -1046,15 +943,15 @@ msgstr "Mezuak HT_ML formatuan jaso nahi ditu"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:42
 #, fuzzy
-msgid "Webcam:"
-msgstr "Orrialdea"
+msgid "Web Log:"
+msgstr "_Web orriaren helbidea:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
-#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
-#: mail/mail-config.glade.h:155
+#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
+#: mail/mail-config.glade.h:157
 msgid "Work"
 msgstr "Lanekoa"
 
@@ -1074,19 +971,12 @@ msgid "_File under:"
 msgstr "Fitxategi-izena:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 #, fuzzy
 msgid "_Where:"
 msgstr "_Zerbitzaria:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
-msgid "item7"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
-msgid "item8"
-msgstr ""
-
-#: addressbook/gui/contact-editor/eab-editor.c:316
+#: addressbook/gui/contact-editor/eab-editor.c:315
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -1094,7 +984,7 @@ msgstr ""
 "Ziur zaude kontaktu hauek\n"
 "ezabatu nahi dituzula?"
 
-#: addressbook/gui/contact-editor/eab-editor.c:319
+#: addressbook/gui/contact-editor/eab-editor.c:318
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -1103,16 +993,16 @@ msgstr ""
 "ezabatu nahi duzula?"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:351
-#: addressbook/gui/widgets/eab-contact-display.c:372
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Address"
 msgstr "Helbidea"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:292
+#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard.c:174
@@ -2097,90 +1987,113 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbawe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/contact-editor/e-contact-editor.c:179
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:337
+#: addressbook/gui/widgets/eab-contact-display.c:356
 msgid "Jabber"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:347
-#: addressbook/gui/widgets/eab-contact-display.c:366
+#: addressbook/gui/contact-editor/e-contact-editor.c:180
+#: addressbook/gui/widgets/eab-contact-display.c:339
+#: addressbook/gui/widgets/eab-contact-display.c:358
 #, fuzzy
 msgid "Yahoo"
 msgstr "Yoro"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: addressbook/gui/widgets/eab-contact-display.c:338
+#: addressbook/gui/widgets/eab-contact-display.c:357
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:344
-#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#: addressbook/gui/widgets/eab-contact-display.c:355
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/contact-editor/e-contact-editor.c:183
 #, fuzzy
 msgid "GroupWise"
 msgstr "Taldea"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+msgid "Home"
+msgstr "Etxekoa"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+msgid "Other"
+msgstr "Bestelakoa"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
 #, fuzzy
 msgid "Source Book"
 msgstr "Iturburua"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:264
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:278
+#: addressbook/gui/contact-editor/e-contact-editor.c:273
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Kontaktu berria"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:285
+#: addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Writable Fields"
 msgstr "Eremu editagarriak"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:299
+#: addressbook/gui/contact-editor/e-contact-editor.c:294
 msgid "Changed"
 msgstr "Aldatuta"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
-msgid "Category editor not available."
-msgstr "Kategoria-editorea ez dago erabilgarri."
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:2352
 msgid "This contact belongs to these categories:"
 msgstr "Kontaktu hau kategoria hauetakoa da:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#: addressbook/gui/contact-editor/e-contact-editor.c:2429
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Hautatu ondorengo aukeretako bat"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#: addressbook/gui/contact-editor/e-contact-editor.c:2433
 #, fuzzy
 msgid "No image"
 msgstr "Nome"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#: addressbook/gui/contact-editor/e-contact-editor.c:2636
 #, fuzzy
 msgid ""
-"The following entries are invalid:\n"
+"The contact data is invalid:\n"
 "\n"
-msgstr "Konexio hauek aktibo daude:"
+msgstr "Errepikatze-data ez da baliozkoa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2738
-#, c-format
-msgid "Could not find widget for a field: `%s'"
-msgstr "Ezin izan da eremu baten trepeta aurkitu: `%s'"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#, fuzzy
+msgid "Invalid contact."
+msgstr "Bilatu kontaktua hemen:"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+msgid ""
+"The contact cannot be saved to the selected address book. Do you want to "
+"discard changes?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2727
+#: addressbook/gui/contact-editor/e-contact-editor.c:2751
+msgid "_Discard"
+msgstr "_Ez"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+msgid ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
+msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:62
 msgid "AOL Instant Messenger"
@@ -2216,7 +2129,7 @@ msgid "_Edit Full"
 msgstr "_Editatu osoa"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:166
 msgid "_Full Name:"
 msgstr "_Izen-abizenak:"
 
@@ -2366,30 +2279,30 @@ msgid "_Type an email address or drag a contact into the list below:"
 msgstr ""
 "_Idatzi helbide elektronikoa edo arrastatu kontaktua beheko zerrendara:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "contact-list-editor"
 msgstr "kontaktu-zerrendaren editorea"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:153
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:215
+#: addressbook/gui/widgets/e-addressbook-view.c:217
 #: addressbook/gui/widgets/e-minicard-view.c:460
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Liburua"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
 msgid "Is New List"
 msgstr "Zerrenda berria da"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:215
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
 msgid "Contact List Editor"
 msgstr "Kontaktu-zerrendaren editorea"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:438
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
 msgid "Save List as VCard"
 msgstr "Gorde zerrenda VCard gisa"
 
@@ -2436,129 +2349,129 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Bilaketa aurreratua"
 
-#: addressbook/gui/widgets/eab-contact-display.c:129
-#: addressbook/gui/widgets/eab-contact-display.c:192
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:139
-#: addressbook/gui/widgets/eab-contact-display.c:205
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
 #, fuzzy
 msgid "map"
 msgstr "Amapala"
 
-#: addressbook/gui/widgets/eab-contact-display.c:257
-#: addressbook/gui/widgets/eab-contact-display.c:533
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:525
 #, fuzzy
 msgid "List Members"
 msgstr "Kideak"
 
-#: addressbook/gui/widgets/eab-contact-display.c:329
-#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/eab-contact-display.c:321
+#: addressbook/gui/widgets/eab-contact-display.c:323
 #, fuzzy
 msgid "E-mail"
 msgstr "Helb. el."
 
-#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/eab-contact-display.c:332
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Erakundea"
 
-#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:333
 #, fuzzy
 msgid "Position"
 msgstr "Boston"
 
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:354
 #, fuzzy
 msgid "Groupwise"
 msgstr "Taldea"
 
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:340
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:349
-#: addressbook/gui/widgets/eab-contact-display.c:370
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Phone"
 msgstr "Telefonoa"
 
-#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:342
 #, fuzzy
 msgid "Fax"
 msgstr "Lan fax"
 
-#: addressbook/gui/widgets/eab-contact-display.c:354
+#: addressbook/gui/widgets/eab-contact-display.c:346
 #, fuzzy
 msgid "work"
 msgstr "Lanekoa"
 
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:359
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:368
-#: addressbook/gui/widgets/eab-contact-display.c:587
+#: addressbook/gui/widgets/eab-contact-display.c:360
+#: addressbook/gui/widgets/eab-contact-display.c:579
 #, fuzzy
 msgid "Blog"
 msgstr "Bologna"
 
-#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/eab-contact-display.c:363
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Telefono mugikorra"
 
-#: addressbook/gui/widgets/eab-contact-display.c:375
+#: addressbook/gui/widgets/eab-contact-display.c:367
 #, fuzzy
 msgid "personal"
 msgstr "Pertsonala"
 
-#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/eab-contact-display.c:374
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Oharra"
 
-#: addressbook/gui/widgets/eab-contact-display.c:548
+#: addressbook/gui/widgets/eab-contact-display.c:540
 #, fuzzy
 msgid "Job Title"
 msgstr "Kar_gua:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/eab-contact-display.c:544
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:774
+#: smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "Helb. el."
 
-#: addressbook/gui/widgets/eab-contact-display.c:579
+#: addressbook/gui/widgets/eab-contact-display.c:571
 #, fuzzy
 msgid "Home page"
 msgstr "Etxeko faxa"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 msgid "Success"
 msgstr "Behar bezala egin da"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Backend busy"
 msgstr ""
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Repository offline"
 msgstr "Biltegia deskonektatuta"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 #, fuzzy
 msgid "Address Book does not exist"
 msgstr "Helbide-liburu hori ez dago"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 #, fuzzy
 msgid "No Self Contact defined"
 msgstr "Kontaktuen zerrenda berria"
@@ -2566,29 +2479,29 @@ msgstr "Kontaktuen zerrenda berria"
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Permission denied"
 msgstr "Baimena ukatuta"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:57
 #, fuzzy
 msgid "Contact not found"
 msgstr "Ez da txartela aurkitu"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: addressbook/gui/widgets/eab-gui-util.c:58
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "Txartelaren ID hori badago lehendik"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Protocol not supported"
 msgstr "Protokoloa ez da onartzen"
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:60
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:233
 #: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
@@ -2601,39 +2514,39 @@ msgid "Cancelled"
 msgstr "Bertan behera utzita"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:61
 #, fuzzy
 msgid "Could not cancel"
 msgstr "Ezin izan da objektua eguneratu"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Authentication Failed"
 msgstr "Autentifikazioak huts egin du"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Authentication Required"
 msgstr "Autentifikazioa behar da"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:66
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "TLS not Available"
 msgstr "TLS ez dago erabilgarri"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#: addressbook/gui/widgets/eab-gui-util.c:66
 #, fuzzy
 msgid "No such source"
 msgstr "Ez dago horrelako mezurik"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:69
+#: addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Other error"
 msgstr "Beste errore bat"
 
-#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:90
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
@@ -2641,7 +2554,7 @@ msgstr ""
 "Ezin izan da helbide-liburu hori ireki.  Egiaztatu bide-izena ondo dagoela "
 "eta sarbidea baduzula."
 
-#: addressbook/gui/widgets/eab-gui-util.c:110
+#: addressbook/gui/widgets/eab-gui-util.c:97
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -2649,17 +2562,18 @@ msgstr ""
 "Ezin izan da helbide-liburu hori ireki.  Horrek esan nahi du okerreko URIa "
 "idatzi duzula, edo LDAP zerbitzaria ezin dela atzitu."
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:102
+#, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution you must compile the program from the CVS "
-"sources after retrieving OpenLDAP from the link below."
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
 msgstr ""
 "Evolution-en bertsio honek ez dauka konpilatuta LDAP euskarria.  LDAP "
 "erabili nahi baduzu Evolution-en programa konpilatu behar duzu CVS "
 "iturburuetatik beheko estekatik OpenLDAP eskuratuz."
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:109
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -2667,11 +2581,7 @@ msgstr ""
 "Ezin izan da helbide-liburu hori ireki.  Horrek esan nahi du okerreko URIa "
 "idatzi duzula, edo zerbitzaria ezin dela atzitu."
 
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "Unable to open addressbook"
-msgstr "Ezin da helbide-liburua ireki"
-
-#: addressbook/gui/widgets/eab-gui-util.c:162
+#: addressbook/gui/widgets/eab-gui-util.c:129
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2684,7 +2594,7 @@ msgstr ""
 "gehienezko kopurua, helbide-liburu honen direktorio-zerbitzariaren\n"
 "hobespenetan."
 
-#: addressbook/gui/widgets/eab-gui-util.c:168
+#: addressbook/gui/widgets/eab-gui-util.c:135
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -2696,56 +2606,48 @@ msgstr ""
 "edo gehitu denbora-muga, helbide-liburu honen\n"
 "direktorio-zerbitzariaren hobespenetan."
 
-#: addressbook/gui/widgets/eab-gui-util.c:174
+#: addressbook/gui/widgets/eab-gui-util.c:141
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "Helbide-liburuaren moduluak ezin izan du kontsulta analizatu."
 
-#: addressbook/gui/widgets/eab-gui-util.c:177
+#: addressbook/gui/widgets/eab-gui-util.c:144
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Helbide-liburuaren moduluak kontsulta ezetsi du."
 
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:147
 msgid "This query did not complete successfully."
 msgstr "Kontsulta ez da behar bezala egin."
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
-msgid "Do you want to save changes?"
-msgstr "Aldaketak gorde nahi dituzu?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:208
-msgid "_Discard"
-msgstr "_Ez"
-
-#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:169
 msgid "Error adding list"
 msgstr "Errorea zerrenda gehitzean"
 
-#: addressbook/gui/widgets/eab-gui-util.c:229
-#: addressbook/gui/widgets/eab-gui-util.c:652
+#: addressbook/gui/widgets/eab-gui-util.c:169
+#: addressbook/gui/widgets/eab-gui-util.c:580
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Errorea txartela gehitzean"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying list"
 msgstr "Errorea zerrenda aldatzean"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Errorea txartela aldatzean"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:192
 msgid "Error removing list"
 msgstr "Errorea zerrenda kentzean"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
-#: addressbook/gui/widgets/eab-gui-util.c:610
+#: addressbook/gui/widgets/eab-gui-util.c:192
+#: addressbook/gui/widgets/eab-gui-util.c:538
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Errorea txartela kentzean"
 
-#: addressbook/gui/widgets/eab-gui-util.c:334
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, fuzzy, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2754,7 +2656,7 @@ msgstr ""
 "%d txartel irekitzen badituzu, %d leiho irekiko dira.\n"
 "Ziur zaude txartel horiek guztiak bistaratu nahi dituzula?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:360
+#: addressbook/gui/widgets/eab-gui-util.c:300
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2763,54 +2665,49 @@ msgstr ""
 "%s badago lehendik\n"
 "Gainidatzi nahi duzu?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:364
+#: addressbook/gui/widgets/eab-gui-util.c:304
 msgid "Overwrite"
 msgstr "Gainidatzi"
 
-#: addressbook/gui/widgets/eab-gui-util.c:400
-#, c-format
-msgid "Error saving %s: %s"
-msgstr "Errorea %s gordetzean: %s"
-
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:437
+#: addressbook/gui/widgets/eab-gui-util.c:365
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:571
+#: addressbook/gui/widgets/eab-gui-util.c:499
 msgid "list"
 msgstr "zerrenda"
 
-#: addressbook/gui/widgets/eab-gui-util.c:706
+#: addressbook/gui/widgets/eab-gui-util.c:634
 #, fuzzy
 msgid "Move contact to"
 msgstr "Eraman txartela hona:"
 
-#: addressbook/gui/widgets/eab-gui-util.c:708
+#: addressbook/gui/widgets/eab-gui-util.c:636
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Kopiatu txartela hemen:"
 
-#: addressbook/gui/widgets/eab-gui-util.c:711
+#: addressbook/gui/widgets/eab-gui-util.c:639
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Eraman txartelak hona:"
 
-#: addressbook/gui/widgets/eab-gui-util.c:713
+#: addressbook/gui/widgets/eab-gui-util.c:641
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Kopiatu txartelak hemen:"
 
-#: addressbook/gui/widgets/eab-gui-util.c:716
+#: addressbook/gui/widgets/eab-gui-util.c:644
 #, fuzzy
 msgid "Select target addressbook."
 msgstr "Hautatu kontaktuak helbide-liburutik"
 
-#: addressbook/gui/widgets/eab-gui-util.c:939
+#: addressbook/gui/widgets/eab-gui-util.c:867
 msgid "Multiple VCards"
 msgstr "VCard anitz"
 
-#: addressbook/gui/widgets/eab-gui-util.c:942
+#: addressbook/gui/widgets/eab-gui-util.c:870
 #, c-format
 msgid "VCard for %s"
 msgstr "%s - VCard-a"
@@ -2901,7 +2798,7 @@ msgstr[1] "Bilatu kontaktua hemen:"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:229
+#: addressbook/gui/widgets/e-addressbook-view.c:231
 #: addressbook/gui/widgets/e-minicard-view.c:467
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
@@ -2919,146 +2816,135 @@ msgstr "Modeloa"
 msgid "Error modifying card"
 msgstr "Errorea txartela aldatzean"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:163
 msgid "Name begins with"
 msgstr "Izena honela hasten da:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:164
 msgid "Email begins with"
 msgstr "Helb. el. honela hasten da:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:57
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Kategoria da:"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-#: calendar/gui/cal-search-bar.c:50
+#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Edozein eremuk hau dauka:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+#: addressbook/gui/widgets/e-addressbook-view.c:172
 msgid "Advanced..."
 msgstr "Aurreratua..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:236
+#: addressbook/gui/widgets/e-addressbook-view.c:238
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:249
+#: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Mota"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:506
+#: addressbook/gui/widgets/e-addressbook-view.c:508
 #, fuzzy
 msgid "Address Book"
 msgstr "Helbide-liburua"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2076
+#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:2080
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
 msgstr "Gorde VCard gisa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 msgid "New Contact..."
 msgstr "Kontaktu berria..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "New Contact List..."
 msgstr "Kontaktuen zerrenda berria..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Go to Folder..."
 msgstr "Joan karpeta honetara..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Import..."
 msgstr "Inportatu..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1066
 msgid "Search for Contacts..."
 msgstr "Bilatu kontaktuak..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Helbide-liburuaren iturburuak..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1069
 msgid "Pilot Settings..."
 msgstr "Pilot-aren ezarpenak..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Birbidali kontaktua"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
 msgid "Send Message to Contact"
 msgstr "Bidali mezua kontaktuari"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Inprimatu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
+#: addressbook/gui/widgets/e-addressbook-view.c:1077
 msgid "Print Envelope"
 msgstr "Inprimatu gutun-azala"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
+#: addressbook/gui/widgets/e-addressbook-view.c:1081
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Helbide-liburua..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1080
+#: addressbook/gui/widgets/e-addressbook-view.c:1082
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Helbide-liburua..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Ebaki"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopiatu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1087
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Itsatsi"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:1092
+#: calendar/gui/e-calendar-view.c:1280
 msgid "Current View"
 msgstr "Uneko ikuspegia"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1309
-#, c-format
-msgid ""
-"The addressbook backend for\n"
-"%s\n"
-"has crashed. You will have to restart Evolution in order to use it again"
-msgstr ""
-"%s\n"
-"helbide-liburuaren modulua kraskatu egin da.\n"
-" Berriro erabili ahal izateko, Evolution berrabiarazi beharko duzu"
-
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1667
-#: calendar/gui/cal-search-bar.c:362
+#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Edozein kategoria"
 
@@ -3167,7 +3053,7 @@ msgstr "Irrati-telefonoa"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-list-view.c:234
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Funtzioa"
@@ -3311,13 +3197,13 @@ msgstr "Evolution-en Vcard inportatzailea"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: addressbook/printing/e-contact-print.c:998
+#: addressbook/printing/e-contact-print.c:1000
 #, fuzzy
 msgid "Print contacts"
 msgstr "Inprimatu hautatutako kontaktuak"
 
-#: addressbook/printing/e-contact-print.c:1064
-#: addressbook/printing/e-contact-print.c:1091
+#: addressbook/printing/e-contact-print.c:1066
+#: addressbook/printing/e-contact-print.c:1093
 #, fuzzy
 msgid "Print contact"
 msgstr "Inprimatu hautatutako kontaktuak"
@@ -3570,17 +3456,22 @@ msgstr ""
 msgid "Impossible internal error."
 msgstr "Barne-errorea"
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:629
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
 #, fuzzy
 msgid "Can not open file"
 msgstr "Ezin da mezua ireki"
 
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
 #, fuzzy
-msgid "Can not load URI"
-msgstr "Ez da txartela aurkitu"
+msgid "Couldn't get list of addressbooks"
+msgstr "Ezin izan da helbide-liburua kargatu"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Ezin da helbide-liburua ireki"
 
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
@@ -3598,7 +3489,7 @@ msgstr "Ez da fitxategi-izenik eman."
 msgid "Unnamed List"
 msgstr "Zerrenda izengabea"
 
-#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 #, fuzzy
 msgid "Enter password"
@@ -3880,10 +3771,10 @@ msgid "Whether to show week numbers in date navigator"
 msgstr "E_rakutsi aste-zenbakiak data-nabigatzailean"
 
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:88
-#: calendar/gui/gnome-cal.c:1703
-#: camel/providers/groupwise/camel-gw-listener.c:304
-#: camel/providers/groupwise/camel-gw-listener.c:327
+#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/gnome-cal.c:1705
+#: camel/providers/groupwise/camel-gw-listener.c:311
+#: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
 msgstr "Egutegia"
 
@@ -3906,7 +3797,7 @@ msgstr "hau baino txikiagoa ematen du"
 
 #: calendar/gui/calendar-commands.c:363
 #: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:19 filter/filter.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
 msgid "days"
 msgstr "egun"
 
@@ -4057,24 +3948,24 @@ msgstr "Asteko ikuspegia"
 msgid "Month View"
 msgstr "Hileko ikuspegia"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Laburpenak hau dauka"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Azalpenak hau dauka"
 
-#: calendar/gui/cal-search-bar.c:54
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Iruzkinak hau dauka"
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:53
 #, fuzzy
 msgid "Location contains"
 msgstr "Azalpenak hau dauka"
 
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
 msgid "Unmatched"
 msgstr "Sailkatu gabeak"
 
@@ -4095,23 +3986,23 @@ msgstr "Egutegia irekitzeko baimena ukatu egin da"
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:466
+#: calendar/gui/dialogs/alarm-options.c:467
 msgid "Audio Alarm Options"
 msgstr "Audio alarmaren aukerak"
 
-#: calendar/gui/dialogs/alarm-options.c:475
+#: calendar/gui/dialogs/alarm-options.c:476
 msgid "Message Alarm Options"
 msgstr "Mezu-alarmaren aukerak"
 
-#: calendar/gui/dialogs/alarm-options.c:484
+#: calendar/gui/dialogs/alarm-options.c:485
 msgid "Email Alarm Options"
 msgstr "Posta elektronikoaren alarmaren aukerak"
 
-#: calendar/gui/dialogs/alarm-options.c:493
+#: calendar/gui/dialogs/alarm-options.c:494
 msgid "Program Alarm Options"
 msgstr "Programa-alarmaren aukerak"
 
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:510
 msgid "Unknown Alarm Options"
 msgstr "Alarma ezezagunen aukerak"
 
@@ -4147,7 +4038,7 @@ msgstr "Bidali honi:"
 msgid "With these arguments:"
 msgstr "Argumentu hauekin:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
 msgid "dialog1"
 msgstr "1 elkarrizketa-koadroa"
 
@@ -4156,7 +4047,7 @@ msgid "extra times every"
 msgstr "bider, maiztasun honekin:"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:20 filter/filter.glade.h:16
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr "ordu"
 
@@ -4202,7 +4093,7 @@ msgstr "Bidali mezua"
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Laburpena:"
 
@@ -4232,7 +4123,6 @@ msgid "hour(s)"
 msgstr "ordu"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:21
 msgid "minute(s)"
 msgstr "minutu"
 
@@ -4240,27 +4130,27 @@ msgstr "minutu"
 msgid "start of appointment"
 msgstr "hitzordu-hasiera baino"
 
-#: calendar/gui/dialogs/calendar-setup.c:170
+#: calendar/gui/dialogs/calendar-setup.c:172
 #, fuzzy
 msgid "You must specify a location to get the calendar from."
 msgstr "Fitxategi-izen bat zehaztu behar duzu."
 
-#: calendar/gui/dialogs/calendar-setup.c:178
+#: calendar/gui/dialogs/calendar-setup.c:180
 #, fuzzy, c-format
 msgid "The source location '%s' is not well-formed."
 msgstr "`%s' kargatzeko behar den metodoa ez da onartzen"
 
-#: calendar/gui/dialogs/calendar-setup.c:193
+#: calendar/gui/dialogs/calendar-setup.c:195
 #, c-format
 msgid "The source location '%s' is not a webcal source."
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:265
+#: calendar/gui/dialogs/calendar-setup.c:275
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:278
+#: calendar/gui/dialogs/calendar-setup.c:288
 #, c-format
 msgid ""
 "The group '%s' is remote. You must specify a location to get the calendar "
@@ -4282,60 +4172,35 @@ msgstr "Zereginen zerrenda"
 msgid "C_olor:"
 msgstr "_Koloreak"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-#, fuzzy
-msgid "Calendar Properties"
-msgstr "iCalendar errorea"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
 msgid "Pick a color"
 msgstr "Aukeratu kolorea"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:8
-#, fuzzy
-msgid "Remote"
-msgstr "Kendu"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-#, fuzzy
-msgid "Task List Properties"
-msgstr "Letra-tipoen propietateak"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
 #, fuzzy
 msgid "_Add Calendar"
 msgstr "Kaledonia Berria"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
 #, fuzzy
 msgid "_Add Group"
 msgstr "_Gehitu taldea..."
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-#, fuzzy
-msgid "_Refresh Interval:"
-msgstr "Freskatu zerrenda"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
 #, fuzzy
 msgid "_Refresh:"
 msgstr "Freskatu"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-#, fuzzy
-msgid "_Source URL:"
-msgstr "POP Source URI"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
 #, fuzzy
 msgid "_Type:"
 msgstr "Mota:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
 msgid "_URL:"
 msgstr "_URLa:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
 msgid "weeks"
 msgstr "aste"
 
@@ -4445,7 +4310,7 @@ msgid "Display"
 msgstr "_Bistaratzea"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:76
 msgid "E_nable"
 msgstr "_Gaitu"
 
@@ -4456,7 +4321,7 @@ msgstr "Libre/okupatuta eskaera"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:563
+#: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Ostirala"
 
@@ -4470,7 +4335,7 @@ msgstr "minutu"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:559
+#: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Astelehena"
 
@@ -4480,7 +4345,7 @@ msgstr "_ig."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:564
+#: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Larunbata"
 
@@ -4494,7 +4359,7 @@ msgstr "E_rakutsi aste-zenbakiak data-nabigatzailean"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Igandea"
 
@@ -4508,7 +4373,7 @@ msgstr "o_g."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:562
+#: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Osteguna"
 
@@ -4522,7 +4387,7 @@ msgstr "Ordu-formatua:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:560
+#: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Asteartea"
 
@@ -4532,7 +4397,7 @@ msgstr "Astearen _hasiera:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:561
+#: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Asteazkena"
 
@@ -4566,7 +4431,7 @@ msgid "_Day begins:"
 msgstr "_Egunaren hasiera:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
-#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:43
@@ -4615,83 +4480,46 @@ msgstr "a_z."
 msgid "before every appointment"
 msgstr "lehenago"
 
-#: calendar/gui/dialogs/cancel-comp.c:57
-msgid ""
-"The event being deleted is a meeting, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"Ezabatzen ari zaren gertaera bilera bat da. Bilera bertan beherautzi dela "
-"dioen oharra bidali nahi duzu?"
-
-#: calendar/gui/dialogs/cancel-comp.c:60
-msgid "Are you sure you want to cancel and delete this meeting?"
-msgstr "Ziur zaude bilera hau bertan behera utzi eta ezabatu nahi duzula?"
-
-#: calendar/gui/dialogs/cancel-comp.c:66
-msgid ""
-"The task being deleted is assigned, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"Ezabatzen ari zaren zeregina esleituta dago. Bertan beherautzi dela dioen "
-"oharra bidali nahi duzu?"
-
-#: calendar/gui/dialogs/cancel-comp.c:69
-msgid "Are you sure you want to cancel and delete this task?"
-msgstr "Ziur zaude zeregin hau bertan behera utzi eta ezabatu nahi duzula?"
-
-#: calendar/gui/dialogs/cancel-comp.c:75
-msgid ""
-"The journal entry being deleted is published, would you like to send a "
-"cancellation notice?"
-msgstr ""
-"Ezabatzen ari zaren egunkari-sarrera argitaratuta dago. Bertan behera utzi "
-"dela dioen oharra bidali nahi nahi duzu?"
-
-#: calendar/gui/dialogs/cancel-comp.c:78
-msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr ""
-"Ziur zaude egunkariko sarrera hau bertan behera utzi eta ezabatu nahi duzula?"
-
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Gertaera ezabatu da."
 
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "Zeregina ezabatu da."
 
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:68
 msgid "This journal entry has been deleted."
 msgstr "Egunkariko sarrera ezabatu da."
 
-#: calendar/gui/dialogs/changed-comp.c:75
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  Aldaketak egin dituzu. Aldaketa horiek ahaztu eta editorea itxi?"
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Ez duzu aldaketarik egin; editorea itxi?"
 
-#: calendar/gui/dialogs/changed-comp.c:82
+#: calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "Gertaera hau aldatu egin da."
 
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "Zeregin hau aldatu egin da."
 
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:92
 msgid "This journal entry has been changed."
 msgstr "Egunkariko sarrera hau aldatu egin da."
 
-#: calendar/gui/dialogs/changed-comp.c:99
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  Aldaketak egin dituzu. Aldaketak ahaztu eta editorea eguneratu?"
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Ez duzu aldaketarik egin; editorea eguneratu?"
@@ -4729,7 +4557,7 @@ msgid "No summary"
 msgstr "Laburpenik ez"
 
 #: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
 #: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Gorde honela..."
@@ -4785,104 +4613,56 @@ msgstr "Bidalketa-helburua"
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:95
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "Ziur zaude `%s' hitzordua ezabatu nahi duzula?"
-
-#: calendar/gui/dialogs/delete-comp.c:98
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "Ziur zaude izenik gabeko hitzordu hau ezabatu nahi duzula?"
-
-#: calendar/gui/dialogs/delete-comp.c:104
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "Ziur zaude `%s' zeregina ezabatu nahi duzula?"
-
-#: calendar/gui/dialogs/delete-comp.c:107
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "Ziur zaude izenik gabeko zeregin hau ezabatu nahi duzula?"
-
-#: calendar/gui/dialogs/delete-comp.c:113
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "Ziur zaude egunkariko `%s' sarrera ezabatu nahi duzula?"
-
-#: calendar/gui/dialogs/delete-comp.c:116
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "Ziur zaude egunkariko sarrera izengabe hau ezabatu nahi duzula?"
-
-#: calendar/gui/dialogs/delete-comp.c:131
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d appointment?"
-msgid_plural "Are you sure you want to delete %d appointments?"
-msgstr[0] "Ziur zaude %d hitzordu ezabatu nahi dituzula?"
-msgstr[1] "Ziur zaude %d hitzordu ezabatu nahi dituzula?"
-
-#: calendar/gui/dialogs/delete-comp.c:138
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d task?"
-msgid_plural "Are you sure you want to delete %d tasks?"
-msgstr[0] "Ziur zaude %d zeregin ezabatu nahi dituzula?"
-msgstr[1] "Ziur zaude %d zeregin ezabatu nahi dituzula?"
-
-#: calendar/gui/dialogs/delete-comp.c:145
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d journal entry?"
-msgid_plural "Are you sure you want to delete %d journal entries?"
-msgstr[0] "Ziur zaude %d egunkari-sarrera ezabatu nahi dituzula?"
-msgstr[1] "Ziur zaude %d egunkari-sarrera ezabatu nahi dituzula?"
-
-#: calendar/gui/dialogs/delete-error.c:52
+#: calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "Gertaera ezin izan da ezabatu, corba errore bat gertatu delako"
 
-#: calendar/gui/dialogs/delete-error.c:55
+#: calendar/gui/dialogs/delete-error.c:57
 msgid "The task could not be deleted due to a corba error"
 msgstr "Zeregina ezin izan da ezabatu, corba errore bat gertatu delako"
 
-#: calendar/gui/dialogs/delete-error.c:58
+#: calendar/gui/dialogs/delete-error.c:60
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr ""
 "Egunkariko sarrera ezin izan da ezabatu, corba errore bat gertatu delako"
 
-#: calendar/gui/dialogs/delete-error.c:61
+#: calendar/gui/dialogs/delete-error.c:63
 msgid "The item could not be deleted due to a corba error"
 msgstr "Elementua ezin izan da ezabatu, corba errore bat gertatu delako"
 
-#: calendar/gui/dialogs/delete-error.c:68
+#: calendar/gui/dialogs/delete-error.c:70
 msgid "The event could not be deleted because permission was denied"
 msgstr "Gertaera ezin izan da ezabatu, baimena ukatu delako"
 
-#: calendar/gui/dialogs/delete-error.c:71
+#: calendar/gui/dialogs/delete-error.c:73
 msgid "The task could not be deleted because permission was denied"
 msgstr "Zeregina ezin izan da ezabatu, baimena ukatu delako"
 
-#: calendar/gui/dialogs/delete-error.c:74
+#: calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr "Egunkariko sarrera ezin izan da ezabatu, baimena ukatu delako"
 
-#: calendar/gui/dialogs/delete-error.c:77
+#: calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
 msgstr "Elementua ezin izan da ezabatu, baimena ukatu delako"
 
-#: calendar/gui/dialogs/delete-error.c:84
+#: calendar/gui/dialogs/delete-error.c:86
 #, fuzzy
 msgid "The event could not be deleted due to an error"
 msgstr "Gertaera ezin izan da ezabatu, corba errore bat gertatu delako"
 
-#: calendar/gui/dialogs/delete-error.c:87
+#: calendar/gui/dialogs/delete-error.c:89
 #, fuzzy
 msgid "The task could not be deleted due to an error"
 msgstr "Zeregina ezin izan da ezabatu, corba errore bat gertatu delako"
 
-#: calendar/gui/dialogs/delete-error.c:90
+#: calendar/gui/dialogs/delete-error.c:92
 #, fuzzy
 msgid "The journal entry could not be deleted due to an error"
 msgstr ""
 "Egunkariko sarrera ezin izan da ezabatu, corba errore bat gertatu delako"
 
-#: calendar/gui/dialogs/delete-error.c:93
+#: calendar/gui/dialogs/delete-error.c:95
 #, fuzzy
 msgid "The item could not be deleted due to an error"
 msgstr "Elementua ezin izan da ezabatu, corba errore bat gertatu delako"
@@ -5017,11 +4797,11 @@ msgstr "_Hasiera:"
 
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:3
+#: calendar/gui/dialogs/meeting-page.glade.h:4
 #: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
 #: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1559
-#: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:100
+#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
+#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
@@ -5047,8 +4827,8 @@ msgstr "_Delegatu ..."
 #. FIXME: need to disable for undeletable folders
 #: calendar/gui/dialogs/meeting-page.c:655
 #: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1310 calendar/gui/e-calendar-view.c:1342
-#: mail/em-folder-tree.c:2557 mail/em-folder-view.c:919
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
+#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -5056,7 +4836,7 @@ msgid "_Delete"
 msgstr "E_zabatu"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:240
+#: calendar/gui/e-meeting-list-view.c:218
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Partaidea"
@@ -5092,16 +4872,15 @@ msgid "Member"
 msgstr "Kidea"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
-#: mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-list-view.c:248
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Egoera"
 
@@ -5110,20 +4889,20 @@ msgstr "Egoera"
 msgid "Add A_ttendee"
 msgstr "Partaidea"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "Add attendees from addressbook."
+msgstr "Gehitu bidaltzailea helbide-liburuan"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Antolatzailea:"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
+#: calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "_Change Organizer"
 msgstr "_Aldatu antolatzailea"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-#: calendar/gui/e-meeting-time-sel.c:417
-msgid "_Invite Others..."
-msgstr "_Gonbidatu beste batzuk..."
-
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 #, fuzzy
 msgid "<b>Calendar options</b>"
@@ -5281,7 +5060,7 @@ msgid "_No recurrence"
 msgstr "E_rrepikapenik ez"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:450
+#: composer/e-msg-composer-attachment-bar.c:453
 msgid "_Remove"
 msgstr "_Kendu"
 
@@ -5313,56 +5092,20 @@ msgstr "aste"
 msgid "year(s)"
 msgstr "urte"
 
-#: calendar/gui/dialogs/save-comp.c:53
-msgid ""
-"This event has been changed, but has not been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Gertaera hau aldatu egin duzu, baina ez duzu gorde.\n"
-"\n"
-"Aldaketak gorde nahi dituzu?"
-
-#: calendar/gui/dialogs/save-comp.c:57
-msgid "_Discard Changes"
-msgstr "_Ez gorde"
-
-#: calendar/gui/dialogs/save-comp.c:62
-msgid "Save Event"
-msgstr "Gorde gertaera"
-
-#: calendar/gui/dialogs/select-source-dialog.c:65
+#: calendar/gui/dialogs/select-source-dialog.c:69
 #, fuzzy
 msgid "Select destination"
 msgstr "Bidalketa-helburua"
 
-#: calendar/gui/dialogs/select-source-dialog.c:86
+#: calendar/gui/dialogs/select-source-dialog.c:90
 #, fuzzy
 msgid "_Destination"
 msgstr "Ezabatu karpeta hau"
 
-#: calendar/gui/dialogs/select-source-dialog.c:88
+#: calendar/gui/dialogs/select-source-dialog.c:92
 msgid "Task List"
 msgstr "Zereginen zerrenda"
 
-#: calendar/gui/dialogs/send-comp.c:57
-msgid "The meeting information has been created. Send it?"
-msgstr "Bileraren informazioa sortu da. Bidali?"
-
-#: calendar/gui/dialogs/send-comp.c:60
-msgid "The meeting information has changed. Send an updated version?"
-msgstr ""
-"Bilerari buruzko informazioa aldatu egin da. Bertsio eguneratua bidali?"
-
-#: calendar/gui/dialogs/send-comp.c:67
-msgid "The task assignment information has been created. Send it?"
-msgstr "Zeregina esleitzeko informazioa sortu da. Bidali?"
-
-#: calendar/gui/dialogs/send-comp.c:71
-msgid "The task information has changed. Send an updated version?"
-msgstr ""
-"Zereginari buruzko informazioa aldatu egin da. Bertsio eguneratua bidali?"
-
 #: calendar/gui/dialogs/task-details-page.c:406
 msgid "Completed date is wrong"
 msgstr "Osatze-data gaizki dago"
@@ -5382,7 +5125,7 @@ msgstr "Eginda"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #: calendar/gui/e-cal-component-preview.c:249
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:960
 msgid "High"
 msgstr "Handia"
 
@@ -5396,14 +5139,14 @@ msgstr "Egiten ari da"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:253
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:958
 msgid "Low"
 msgstr "Txikia"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:251
 #: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:957
+#: mail/message-list.c:959
 msgid "Normal"
 msgstr "Normala"
 
@@ -5462,8 +5205,8 @@ msgstr "Kon_fidentziala"
 
 #: calendar/gui/dialogs/task-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
+#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Azalpena:"
 
@@ -5639,7 +5382,7 @@ msgstr "_Mugaeguna:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:950
+#: calendar/gui/e-itip-control.c:943
 msgid "Status:"
 msgstr "Egoera:"
 
@@ -5725,12 +5468,12 @@ msgstr "Okupatuta"
 msgid "Deleting selected objects"
 msgstr "Hautatutako objektuak ezabatzen"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
 msgid "Updating objects"
 msgstr "Objektuak eguneratzen"
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1370
+#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
 #: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Ireki"
@@ -5741,15 +5484,15 @@ msgid "Open _Web Page"
 msgstr "_Ireki mezua"
 
 #: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1291 calendar/gui/e-calendar-view.c:1376
-#: mail/em-folder-view.c:896 mail/em-popup.c:690 mail/em-popup.c:806
+#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
+#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "_Gorde honela..."
 
 #: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1292
-#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
+#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
@@ -5757,24 +5500,24 @@ msgid "_Print..."
 msgstr "I_nprimatu..."
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "E_baki"
 
 #: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1338
-#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2550
-#: mail/message-list.c:1644 ui/evolution-addressbook.xml.h:31
+#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
+#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
+#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "Ko_piatu"
 
 #: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1273 calendar/gui/e-calendar-view.c:1299
-#: calendar/gui/e-calendar-view.c:1372 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
+#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
@@ -5843,71 +5586,71 @@ msgstr "Laburpena"
 msgid "Task sort"
 msgstr "Zereginen ordena"
 
-#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
 msgid "New _Appointment..."
 msgstr "Hitz_ordu berria..."
 
-#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
+#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
 msgid "New All Day _Event"
 msgstr "Egun osoko gertaera _berria"
 
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
+#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
 msgid "New Meeting"
 msgstr "Bilera berria"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
 msgid "New Task"
 msgstr "Zeregin berria"
 
-#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Hautatu _haria"
 
-#: calendar/gui/e-calendar-view.c:1280
+#: calendar/gui/e-calendar-view.c:1283
 #, fuzzy
 msgid "_Select Date..."
 msgstr "_Joan data jakin batera..."
 
-#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Argitaratu libre/okupatuta informazioa"
 
-#: calendar/gui/e-calendar-view.c:1303
+#: calendar/gui/e-calendar-view.c:1306
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Kopiatu karpeta honetan..."
 
-#: calendar/gui/e-calendar-view.c:1304
+#: calendar/gui/e-calendar-view.c:1307
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "_Eraman karpeta honetara..."
 
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1308
 msgid "_Schedule Meeting..."
 msgstr "_Antolatu Bilera..."
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1309
 msgid "_Forward as iCalendar..."
 msgstr "_Birbidali iCalendar gisa..."
 
-#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
 msgid "Delete this _Occurrence"
 msgstr "Ezabatu _agerraldi hau"
 
-#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
 msgid "Delete _All Occurrences"
 msgstr "Ezabatu agerraldi _guztiak"
 
-#: calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1349
 msgid "Go to _Today"
 msgstr "_Joan gaurko egunera"
 
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1351
 msgid "_Go to Date..."
 msgstr "_Joan data jakin batera..."
 
-#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "_Ezarpenak..."
 
@@ -5921,9 +5664,9 @@ msgstr "Hasiera-data"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:967 calendar/gui/e-itip-control.c:1169
-#: calendar/gui/e-meeting-list-view.c:144
-#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
 #: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
 #: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
 #: camel/camel-tcp-stream-openssl.c:631
@@ -5949,13 +5692,13 @@ msgid "Assigned"
 msgstr "Esleitua"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr "Bai"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "Ez"
 
@@ -5967,7 +5710,7 @@ msgstr "I"
 msgid "S"
 msgstr "H"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
 msgid "E"
 msgstr "E"
 
@@ -6039,403 +5782,407 @@ msgstr "%b %d"
 msgid "%02i minute divisions"
 msgstr "%02i minutu-zatiketa"
 
-#: calendar/gui/e-itip-control.c:592
+#: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
 msgstr "Bai. (Errepikapen konplexua)"
 
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:596
 #, fuzzy, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Egunero"
 msgstr[1] "Egunero"
 
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:601
 #, fuzzy, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Astero"
 msgstr[1] "Astero"
 
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:603
 #, fuzzy, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "Astero, eguna: "
 msgstr[1] "Astero, eguna: "
 
-#: calendar/gui/e-itip-control.c:618
+#: calendar/gui/e-itip-control.c:611
 msgid " and "
 msgstr " eta "
 
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:618
 #, c-format
 msgid "The %s day of "
 msgstr "%s. eguna - "
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:631
 #, c-format
 msgid "The %s %s of "
 msgstr "%s. %s - "
 
-#: calendar/gui/e-itip-control.c:645
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "hilero"
 msgstr[1] "hilero"
 
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:642
 #, fuzzy, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Urtero"
 msgstr[1] "Urtero"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:653
 #, fuzzy, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] " guztira %d aldiz"
 msgstr[1] " guztira %d aldiz"
 
-#: calendar/gui/e-itip-control.c:669
+#: calendar/gui/e-itip-control.c:662
 msgid ", ending on "
 msgstr ", data honetan amaituta: "
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:686
 msgid "<b>Starts:</b> "
 msgstr "<b>Hasiera:</b> "
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:696
 msgid "<b>Ends:</b> "
 msgstr "<b>Amaiera:</b> "
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:716
 msgid "<b>Completed:</b> "
 msgstr "<b>Eginda:</b> "
 
-#: calendar/gui/e-itip-control.c:733
+#: calendar/gui/e-itip-control.c:726
 msgid "<b>Due:</b> "
 msgstr "<b>Falta:</b> "
 
-#: calendar/gui/e-itip-control.c:771 calendar/gui/e-itip-control.c:827
+#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
 msgid "iCalendar Information"
 msgstr "iCalendar informazioa"
 
 #. Title
-#: calendar/gui/e-itip-control.c:788
+#: calendar/gui/e-itip-control.c:781
 msgid "iCalendar Error"
 msgstr "iCalendar errorea"
 
-#: calendar/gui/e-itip-control.c:859 calendar/gui/e-itip-control.c:875
-#: calendar/gui/e-itip-control.c:886 calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
 msgid "An unknown person"
 msgstr "Pertsona ezezaguna"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:910
+#: calendar/gui/e-itip-control.c:903
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 "<br> Aztertu ondorengo informazioa, eta hautatu ekintza bat beheko menuan."
 
-#: calendar/gui/e-itip-control.c:925
+#: calendar/gui/e-itip-control.c:918
 msgid "<i>None</i>"
 msgstr "<i>Bat ere ez</i>"
 
-#: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:929
+msgid "Location:"
+msgstr "Kokalekua:"
+
+#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Onartua"
 
-#: calendar/gui/e-itip-control.c:959 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Oraingoz onartua"
 
-#: calendar/gui/e-itip-control.c:963 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Ukatua"
 
-#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.c:1050
-#: calendar/gui/e-itip-control.c:1076 calendar/gui/e-itip-control.c:1089
-#: calendar/gui/e-itip-control.c:1102 calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
 msgid "Choose an action:"
 msgstr "Aukeratu ekintza bat:"
 
-#: calendar/gui/e-itip-control.c:1023
+#: calendar/gui/e-itip-control.c:1016
 msgid "Update"
 msgstr "Eguneratu"
 
-#: calendar/gui/e-itip-control.c:1024 calendar/gui/e-itip-control.c:1055
-#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1091
-#: calendar/gui/e-itip-control.c:1104 calendar/gui/e-itip-control.c:1117
-#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
+#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Ados"
 
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1044
 msgid "Accept"
 msgstr "Onartu"
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1045
 msgid "Tentatively accept"
 msgstr "Onartu oraingoz"
 
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1046
 msgid "Decline"
 msgstr "Ukatu"
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1070
 msgid "Send Free/Busy Information"
 msgstr "Bidali libre/okupatuta informazioa"
 
-#: calendar/gui/e-itip-control.c:1090
+#: calendar/gui/e-itip-control.c:1083
 msgid "Update respondent status"
 msgstr "Eguneratu erantzun-emailearen egoera"
 
-#: calendar/gui/e-itip-control.c:1103
+#: calendar/gui/e-itip-control.c:1096
 msgid "Send Latest Information"
 msgstr "Bidali azken orduko informazioa"
 
-#: calendar/gui/e-itip-control.c:1116 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Utzi"
 
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1185
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b>(e)k bilera-informazioa argitaratu du."
 
-#: calendar/gui/e-itip-control.c:1193
+#: calendar/gui/e-itip-control.c:1186
 msgid "Meeting Information"
 msgstr "Bileraren informazioa"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1191
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b>(e)k bilerarako deia egiten dio %s(r)i."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1193
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b>(e)k bilerarako deia egiten dizu."
 
-#: calendar/gui/e-itip-control.c:1201
+#: calendar/gui/e-itip-control.c:1194
 msgid "Meeting Proposal"
 msgstr "Bilera-proposamena"
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b>(e)k bilera batean sartu nahi du."
 
-#: calendar/gui/e-itip-control.c:1206
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Update"
 msgstr "Bilera-eguneratzea"
 
-#: calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1203
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b>(e)k bilera-informazio berria jaso nahi du."
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1204
 msgid "Meeting Update Request"
 msgstr "Bilera eguneratzeko eskaera"
 
-#: calendar/gui/e-itip-control.c:1218
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b>(e)k bilera-eskaerari erantzun dio."
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Reply"
 msgstr "Bilera-erantzuna"
 
-#: calendar/gui/e-itip-control.c:1226
+#: calendar/gui/e-itip-control.c:1219
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b>(e)k bilera bertan behera utzi du."
 
-#: calendar/gui/e-itip-control.c:1227
+#: calendar/gui/e-itip-control.c:1220
 msgid "Meeting Cancellation"
 msgstr "Bilera bertan behera uztea"
 
-#: calendar/gui/e-itip-control.c:1234 calendar/gui/e-itip-control.c:1302
-#: calendar/gui/e-itip-control.c:1337
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1330
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b>(e)k mezu ulertezina bidali du."
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1228
 msgid "Bad Meeting Message"
 msgstr "Bilera-mezu txarra"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1253
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b>(e)k zeregin-informazioa argitaratu du."
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1254
 msgid "Task Information"
 msgstr "Zereginaren informazioa"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1259
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b>(e)k zeregin bat egiteko eskatzen dio %s(r)i."
 
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b>(e)k zeregin bat egiteko eskatzen dizu."
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1262
 msgid "Task Proposal"
 msgstr "Zeregin-proposamena"
 
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b>(e)k zeregin batean sartu nahi du."
 
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Update"
 msgstr "Zeregin-eguneratzea"
 
-#: calendar/gui/e-itip-control.c:1278
+#: calendar/gui/e-itip-control.c:1271
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b>(e)k zereginaren informazio berria jaso nahi du."
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1272
 msgid "Task Update Request"
 msgstr "Zeregina eguneratzeko eskaera"
 
-#: calendar/gui/e-itip-control.c:1286
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b>(e)k zeregin-esleipenari erantzun dio."
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Reply"
 msgstr "Zereginaren erantzuna"
 
-#: calendar/gui/e-itip-control.c:1294
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b>(e)k zeregina bertan behera utzi du."
 
-#: calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1288
 msgid "Task Cancellation"
 msgstr "Zeregina bertan behera uztea"
 
-#: calendar/gui/e-itip-control.c:1303
+#: calendar/gui/e-itip-control.c:1296
 msgid "Bad Task Message"
 msgstr "Zeregin-mezu txarra"
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1315
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b>(e)k libre/okupatuta informazioa argitaratu du."
 
-#: calendar/gui/e-itip-control.c:1323
+#: calendar/gui/e-itip-control.c:1316
 msgid "Free/Busy Information"
 msgstr "Libre/okupatuta informazioa"
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b>(e)k libre/okupatuta informazioa eskatzen dizu."
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1321
 msgid "Free/Busy Request"
 msgstr "Libre/okupatuta eskaera"
 
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1325
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b>(e)k libre/okupatuta eskaerari erantzun dio."
 
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1326
 msgid "Free/Busy Reply"
 msgstr "Libre/okupatuta erantzuna"
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1331
 msgid "Bad Free/Busy Message"
 msgstr "Libre/okupatuta mezu txarra"
 
-#: calendar/gui/e-itip-control.c:1413
+#: calendar/gui/e-itip-control.c:1406
 msgid "The message does not appear to be properly formed"
 msgstr "Ez dirudi mezua behar bezala osatuta dagoenik"
 
-#: calendar/gui/e-itip-control.c:1472
+#: calendar/gui/e-itip-control.c:1465
 msgid "The message contains only unsupported requests."
 msgstr "Mezu honek onartzen ez diren eskaerak bakarrik ditu."
 
-#: calendar/gui/e-itip-control.c:1503
+#: calendar/gui/e-itip-control.c:1496
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Eranskinak ez du baliozko egutegi-mezurik"
 
-#: calendar/gui/e-itip-control.c:1535
+#: calendar/gui/e-itip-control.c:1528
 msgid "The attachment has no viewable calendar items"
 msgstr "Eranskinak ez du ikusteko moduko egutegi-elementurik"
 
-#: calendar/gui/e-itip-control.c:1769
+#: calendar/gui/e-itip-control.c:1762
 msgid "Update complete\n"
 msgstr "Eguneratzea osatu da\n"
 
-#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
+#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Partaidearen egoera ezin da eguneratu elementua ez dagoelako"
 
-#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objektua ez da baliozkoa eta ezin da eguneratu\n"
 
-#: calendar/gui/e-itip-control.c:1825
+#: calendar/gui/e-itip-control.c:1818
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Erantzun hau ez da uneko partaide batena.  Partaide gisa gehitu?"
 
-#: calendar/gui/e-itip-control.c:1837
+#: calendar/gui/e-itip-control.c:1830
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Partaidearen egoera ezin da eguneratu egoera baliogabea delako\n"
 
-#: calendar/gui/e-itip-control.c:1856
+#: calendar/gui/e-itip-control.c:1849
 msgid "There was an error on the CORBA system\n"
 msgstr "Errorea izan da CORBA sisteman\n"
 
-#: calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1852
 msgid "Object could not be found\n"
 msgstr "Objektua ezin izan da aurkitu\n"
 
-#: calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1855
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Ez dauzkazu egutegia eguneratzeko behar diren baimenak\n"
 
-#: calendar/gui/e-itip-control.c:1865
+#: calendar/gui/e-itip-control.c:1858
 msgid "Attendee status updated\n"
 msgstr "Partaidearen egoera eguneratu da\n"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1861
 msgid "Attendee status could not be updated!\n"
 msgstr "Partaidearen egoera ezin izan da eguneratu\n"
 
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1892
 msgid "Removal Complete"
 msgstr "Kentzea osatu da"
 
-#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
 msgid "Item sent!\n"
 msgstr "Elementua bidali da!\n"
 
-#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
+#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
 msgid "The item could not be sent!\n"
 msgstr "Elementua ezin izan da bidali!\n"
 
@@ -6476,74 +6223,74 @@ msgstr "data-amaiera"
 msgid "date-start"
 msgstr "data-hasiera"
 
-#: calendar/gui/e-meeting-list-view.c:62
+#: calendar/gui/e-meeting-list-view.c:59
 msgid "Chair Persons"
 msgstr "Mahaiburuak"
 
-#: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:479
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
 msgid "Required Participants"
 msgstr "Beharrezko partaideak"
 
-#: calendar/gui/e-meeting-list-view.c:64
+#: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Aukerako partaideak"
 
-#: calendar/gui/e-meeting-list-view.c:65
+#: calendar/gui/e-meeting-list-view.c:62
 msgid "Resources"
 msgstr "Baliabideak"
 
-#: calendar/gui/e-meeting-list-view.c:140 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
 #: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr "Indibiduala"
 
-#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "Taldea"
 
-#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr "Baliabidea"
 
-#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr "Gela"
 
-#: calendar/gui/e-meeting-list-view.c:154 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr "Mahaiburua"
 
-#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:127
 #: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
 msgid "Required Participant"
 msgstr "Beharrezko partaidea"
 
-#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr "Aukerako partaidea"
 
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr "Ez-partaidea"
 
-#: calendar/gui/e-meeting-list-view.c:179 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:177
 #: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
 msgid "Needs Action"
 msgstr "Ekintza behar du"
 
-#: calendar/gui/e-meeting-list-view.c:182 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
 #: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "Behin-behinekoa"
 
-#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr "Delegatua"
@@ -6560,20 +6307,28 @@ msgstr "Bulegotik kanpo"
 msgid "No Information"
 msgstr "Ez dago informaziorik"
 
+#: calendar/gui/e-meeting-time-sel.c:417
+#, fuzzy
+msgid "Add attendees from addressbook"
+msgstr "Gehitu bidaltzailea helbide-liburuan"
+
 #: calendar/gui/e-meeting-time-sel.c:440
 msgid "_Options"
 msgstr "Au_kerak"
 
 #: calendar/gui/e-meeting-time-sel.c:457
-msgid "Show _Only Working Hours"
+#, fuzzy
+msgid "Show _only working hours"
 msgstr "Erakutsi lan-orduak _bakarrik"
 
 #: calendar/gui/e-meeting-time-sel.c:467
-msgid "Show _Zoomed Out"
+#, fuzzy
+msgid "Show _zoomed out"
 msgstr "Erakutsi _txikiagotuta"
 
 #: calendar/gui/e-meeting-time-sel.c:482
-msgid "_Update Free/Busy"
+#, fuzzy
+msgid "_Update free/busy"
 msgstr "_Eguneratu Libre/okupatuta"
 
 #: calendar/gui/e-meeting-time-sel.c:497
@@ -6589,19 +6344,23 @@ msgid ">_>"
 msgstr ">_>"
 
 #: calendar/gui/e-meeting-time-sel.c:547
-msgid "_All People and Resources"
+#, fuzzy
+msgid "_All people and resources"
 msgstr "_Pertsona eta baliabide guztiak"
 
 #: calendar/gui/e-meeting-time-sel.c:556
-msgid "All _People and One Resource"
+#, fuzzy
+msgid "All _people and one resource"
 msgstr "Pert_sona guztiak eta baliabide bat"
 
 #: calendar/gui/e-meeting-time-sel.c:565
-msgid "_Required People"
+#, fuzzy
+msgid "_Required people"
 msgstr "_Beharrezko pertsonak"
 
 #: calendar/gui/e-meeting-time-sel.c:574
-msgid "Required People and _One Resource"
+#, fuzzy
+msgid "Required people and _one resource"
 msgstr "Beharrezko pertsonak eta ba_liabide bat"
 
 #: calendar/gui/e-meeting-time-sel.c:593
@@ -6639,7 +6398,7 @@ msgstr "%Y/%m/%d"
 msgid "Enter the password for %s"
 msgstr "Idatzi %s(r)en pasahitza"
 
-#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6648,19 +6407,14 @@ msgstr ""
 "Errorea %s(e)n:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-
 #. FIXME Loading should be async
 #. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:686
+#: calendar/gui/e-tasks.c:801
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%s - zereginak irekitzen"
 
-#: calendar/gui/e-tasks.c:709
+#: calendar/gui/e-tasks.c:824
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6669,53 +6423,48 @@ msgstr ""
 "Errorea %s(e)n:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:730
+#: calendar/gui/e-tasks.c:845
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Irudi-kargatzea"
 
-#: calendar/gui/e-tasks.c:834
+#: calendar/gui/e-tasks.c:949
 msgid "Completing tasks..."
 msgstr "Zereginak egiten..."
 
-#: calendar/gui/e-tasks.c:857
+#: calendar/gui/e-tasks.c:972
 msgid "Deleting selected objects..."
 msgstr "Hautatutako objektuak ezabatzen..."
 
-#: calendar/gui/e-tasks.c:884
+#: calendar/gui/e-tasks.c:999
 msgid "Expunging"
 msgstr "Betiko borratzen"
 
-#: calendar/gui/e-tasks.c:960
+#: calendar/gui/e-tasks.c:1075
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
-#: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
+#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
+#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
 #: calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:705
 msgid "Tasks"
 msgstr "Zereginak"
 
-#: calendar/gui/gnome-cal.c:1876
+#: calendar/gui/gnome-cal.c:1878
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Hitzordurik ez."
 
-#: calendar/gui/gnome-cal.c:1895
+#: calendar/gui/gnome-cal.c:1897
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "%s - zereginak irekitzen"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1920
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Ireki honekin: %s..."
 
-#: calendar/gui/gnome-cal.c:2048
-#, c-format
-msgid "The calendar backend for '%s' has crashed."
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:2894
+#: calendar/gui/gnome-cal.c:2906
 #, fuzzy
 msgid "Purging"
 msgstr "Turin"
@@ -6910,7 +6659,7 @@ msgid "On The Web"
 msgstr ""
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 
@@ -6921,7 +6670,7 @@ msgid "Unable to migrate calendar `%s'"
 msgstr "Egutegia irekitzeko baimena ukatu egin da"
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:869
+#: calendar/gui/migration.c:889
 #, fuzzy, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Ezin da helbide-liburua ireki"
@@ -7157,73 +6906,73 @@ msgstr "Inprimatu elementua"
 msgid "Print Setup"
 msgstr "Prestatu inprimatzeko"
 
-#: calendar/gui/tasks-component.c:303
+#: calendar/gui/tasks-component.c:313
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:371
 #, fuzzy
 msgid "New Task List"
 msgstr "Zereginen zerrenda"
 
-#: calendar/gui/tasks-component.c:398
+#: calendar/gui/tasks-component.c:408
 #, fuzzy, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "Zereginik ez"
 msgstr[1] "Zereginik ez"
 
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] "%d hautatuta"
 msgstr[1] "%d hautatuta"
 
-#: calendar/gui/tasks-component.c:447
+#: calendar/gui/tasks-component.c:457
 #, fuzzy
 msgid "Failed upgrading tasks."
 msgstr "Irudi-kargatzea"
 
-#: calendar/gui/tasks-component.c:526
+#: calendar/gui/tasks-component.c:749
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:538
+#: calendar/gui/tasks-component.c:761
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:576
+#: calendar/gui/tasks-component.c:799
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:804
+#: calendar/gui/tasks-component.c:1040
 msgid "New task"
 msgstr "Zeregin berria"
 
-#: calendar/gui/tasks-component.c:805
+#: calendar/gui/tasks-component.c:1041
 msgid "_Task"
 msgstr "_Zeregina"
 
-#: calendar/gui/tasks-component.c:806
+#: calendar/gui/tasks-component.c:1042
 msgid "Create a new task"
 msgstr "Sortu zeregin berria"
 
-#: calendar/gui/tasks-component.c:812
+#: calendar/gui/tasks-component.c:1048
 #, fuzzy
 msgid "New tasks group"
 msgstr "Zeregin berria"
 
-#: calendar/gui/tasks-component.c:813
+#: calendar/gui/tasks-component.c:1049
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Zereginen zerrenda"
 
-#: calendar/gui/tasks-component.c:814
+#: calendar/gui/tasks-component.c:1050
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Sortu zeregin berria"
@@ -8991,12 +8740,12 @@ msgstr "Errorea iragazki-bilaketa exekutatzean: %s: %s"
 msgid "Unsupported operation: append message: for %s"
 msgstr "Eragiketa hau ez da onartzen: mezua erantsi: %s"
 
-#: camel/camel-folder.c:1259
+#: camel/camel-folder.c:1262
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Eragiketa hau ez da onartzen: adierazpen bidezko bilaketa: %s"
 
-#: camel/camel-folder.c:1299
+#: camel/camel-folder.c:1302
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Eragiketa hau ez da onartzen: uid bidezko bilaketa: %s"
@@ -9009,11 +8758,16 @@ msgstr "Mezuak lekuz aldatzen"
 msgid "Copying messages"
 msgstr "Mezuak kopiatzen"
 
-#: camel/camel-folder.c:1666
-msgid "Learning junk and/or non junk message(s)"
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Lansing"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
 msgstr ""
 
-#: camel/camel-folder.c:1695
+#: camel/camel-folder.c:1701
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "%d mezu eskuratzen"
@@ -9048,17 +8802,17 @@ msgstr ""
 msgid "(match-threads) requires a match type string"
 msgstr ""
 
-#: camel/camel-folder-search.c:785
+#: camel/camel-folder-search.c:784
 #, fuzzy
 msgid "(match-threads) expects an array result"
 msgstr "(bat-etorri-guztiekin)ek emaitza boolear bakarra behar du"
 
-#: camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:790
 #, fuzzy
 msgid "(match-threads) requires the folder set"
 msgstr "(bat-etorri-guztiekin)ek emaitza boolear bakarra behar du"
 
-#: camel/camel-folder-search.c:880
+#: camel/camel-folder-search.c:879
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Kontsulta egiten goiburu ezezagunean: %s"
@@ -9093,7 +8847,8 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
 #: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:706
+#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Bertan behera utzita."
@@ -9486,7 +9241,7 @@ msgstr "Erreferentziatutako kredentzialak iraungita daude."
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1212
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Zerbitzariak autentifikazio-erantzun txarra eman du."
 
@@ -9873,40 +9628,40 @@ msgstr "Komandoa ez dago inplementatuta"
 msgid "export keys: unimplemented"
 msgstr ""
 
-#: camel/camel-store.c:214
+#: camel/camel-store.c:213
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Ezin da karpeta atzitu: eragiketa baliogabea biltegi honetarako"
 
-#: camel/camel-store.c:244
+#: camel/camel-store.c:243
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr "Ezin da karpetaren izena aldatu: %s: Ez dago horrelako karpetarik"
 
-#: camel/camel-store.c:295
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Ezin da karpeta sortu: eragiketa baliogabea biltegi honetarako"
 
-#: camel/camel-store.c:323
+#: camel/camel-store.c:325
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Ezin da karpetaren izena aldatu: %s: Ez dago horrelako karpetarik"
 
-#: camel/camel-store.c:387 camel/camel-vee-store.c:354
+#: camel/camel-store.c:389 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Ezin da karpeta ezabatu: %s: Eragiketa baliogabea"
 
-#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#: camel/camel-store.c:439 camel/camel-vee-store.c:387
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Ezin da karpetaren izena aldatu: %s: Eragiketa baliogabea"
 
-#: camel/camel-store.c:811
+#: camel/camel-store.c:777
 msgid "Trash"
 msgstr "Zakarrontzia"
 
-#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
-#: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/mail-config.glade.h:95
+#: ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
 msgstr "ekaina"
@@ -10138,12 +9893,12 @@ msgstr "%s mezurik ez dago %s(e)n"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Ezin dira mezuak Karpeta Birtual batera kopiatu edo eraman"
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:374
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Ezin da karpeta ezabatu: %s: Ez dago horrelako karpetarik"
 
-#: camel/camel-vee-store.c:398
+#: camel/camel-vee-store.c:395
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Ezin da karpetaren izena aldatu: %s: Ez dago horrelako karpetarik"
@@ -10188,24 +9943,24 @@ msgstr ""
 msgid "Post Office Agent SOAP Port:"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:80
+#: camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "Novell GroupWise"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:82
+#: camel/providers/groupwise/camel-groupwise-provider.c:85
 msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: camel/providers/groupwise/camel-groupwise-provider.c:100
 #: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
 msgid "Password"
 msgstr "Pasahitza"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:99
+#: camel/providers/groupwise/camel-groupwise-provider.c:102
 #: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
@@ -10213,8 +9968,8 @@ msgstr ""
 "Aukera honek IMAP zerbitzariarekin konektatuko zaitu testu arrunteko "
 "pasahitzaren bidez."
 
-#: camel/providers/groupwise/camel-gw-listener.c:305
-#: camel/providers/groupwise/camel-gw-listener.c:328
+#: camel/providers/groupwise/camel-gw-listener.c:312
+#: camel/providers/groupwise/camel-gw-listener.c:335
 #, fuzzy
 msgid "Checklist"
 msgstr "Lainobera itxia"
@@ -10361,13 +10116,13 @@ msgstr ""
 "pasahitzaren bidez."
 
 #: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:429
+#: camel/providers/imap/camel-imap-store.c:428
 #, c-format
 msgid "IMAP server %s"
 msgstr "%s IMAP zerbitzaria"
 
 #: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:431
+#: camel/providers/imap/camel-imap-store.c:430
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP zerbitzua:  %s - %s"
@@ -10377,7 +10132,7 @@ msgstr "IMAP zerbitzua:  %s - %s"
 #: camel/providers/imap/camel-imap-store.c:551
 #: camel/providers/imap/camel-imap-store.c:571
 #: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
+#: camel/providers/nntp/camel-nntp-store.c:209
 #: camel/providers/pop3/camel-pop3-store.c:175
 #: camel/providers/smtp/camel-smtp-transport.c:269
 #: camel/providers/smtp/camel-smtp-transport.c:285
@@ -10395,10 +10150,10 @@ msgstr "TLS ez dago erabilgarri"
 
 #: camel/providers/imap4/camel-imap4-store.c:222
 #: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:815
+#: camel/providers/imap/camel-imap-store.c:845
 #: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:137
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
 #: camel/providers/pop3/camel-pop3-store.c:192
 msgid "Connection cancelled"
 msgstr "Konexioa etenda"
@@ -10411,8 +10166,8 @@ msgid ""
 msgstr "Huts egin du %s IMAP zerbitzariarekin modu seguruan konektatzean: %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:649
-#: camel/providers/imap/camel-imap-store.c:680
+#: camel/providers/imap/camel-imap-store.c:679
+#: camel/providers/imap/camel-imap-store.c:710
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Huts egin du %s IMAP zerbitzariarekin modu seguruan konektatzean: %s"
@@ -10421,7 +10176,7 @@ msgstr "Huts egin du %s IMAP zerbitzariarekin modu seguruan konektatzean: %s"
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1109
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
 msgid "Unknown error"
 msgstr "Errore ezezaguna"
 
@@ -10449,8 +10204,8 @@ msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr "Ezin da karpeta atzitu: %s: %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1857
-#: camel/providers/imap/camel-imap-store.c:2235
+#: camel/providers/imap/camel-imap-store.c:1885
+#: camel/providers/imap/camel-imap-store.c:2263
 #, fuzzy, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -10535,12 +10290,12 @@ msgstr "Zerbitzaria deskonektatu egin da ustekabean:: %s"
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3168
+#: camel/providers/imap/camel-imap-store.c:3194
 msgid "Operation cancelled"
 msgstr "Eragiketa bertan behera utzi da"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3171
+#: camel/providers/imap/camel-imap-store.c:3197
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Zerbitzaria deskonektatu egin da ustekabean:: %s"
@@ -10604,13 +10359,6 @@ msgid "Unable to retrieve message: %s"
 msgstr "Ezin da mezua eskuratu: %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:219
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -10620,15 +10368,15 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-mbox-folder.c:418
+#: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
 msgstr "Ez dago horrelako mezurik"
 
 #: camel/providers/imap/camel-imap-folder.c:2019
-#: camel/providers/imap/camel-imap-folder.c:2621
-#: camel/providers/nntp/camel-nntp-folder.c:238
+#: camel/providers/imap/camel-imap-folder.c:2622
+#: camel/providers/nntp/camel-nntp-folder.c:220
 msgid "This message is not currently available"
 msgstr "Mezu hau orain ez dago erabilgarri"
 
@@ -10637,7 +10385,23 @@ msgstr "Mezu hau orain ez dago erabilgarri"
 msgid "Fetching summary information for new messages"
 msgstr "Mezu berrien laburpen-informazioa bilatzen"
 
-#: camel/providers/imap/camel-imap-folder.c:2659
+#: camel/providers/imap/camel-imap-folder.c:2463
+#, c-format
+msgid "Incomplete server response: no information provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2471
+#, c-format
+msgid "Incomplete server response: no UID provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2484
+#, c-format
+msgid ""
+"Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2660
 msgid "Could not find message body in FETCH response."
 msgstr "Ezin izan da mezuaren gorputza aurkitu FETCH erantzunean."
 
@@ -10701,44 +10465,44 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "IMAP zerbitzarietako posta irakurri eta gordetzeko."
 
-#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/imap/camel-imap-store.c:680
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS hedapena ez da onartzen."
 
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:711
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL negoziazioek huts egin dute"
 
-#: camel/providers/imap/camel-imap-store.c:818
+#: camel/providers/imap/camel-imap-store.c:848
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Ezin da %s(r)ekin konektatu (%d ataka): %s"
 
-#: camel/providers/imap/camel-imap-store.c:1242
+#: camel/providers/imap/camel-imap-store.c:1272
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 "%s IMAP zerbitzariak ez du onartzen eskatutako %s motako autentifikazioa"
 
-#: camel/providers/imap/camel-imap-store.c:1252
+#: camel/providers/imap/camel-imap-store.c:1282
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "%s motako autentifikazioa ez da onartzen"
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1305
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sIdatzi %s@%s(r)en IMAP pasahitza"
 
-#: camel/providers/imap/camel-imap-store.c:1289
+#: camel/providers/imap/camel-imap-store.c:1319
 msgid "You didn't enter a password."
 msgstr "Ez duzu idatzi pasahitza."
 
-#: camel/providers/imap/camel-imap-store.c:1318
+#: camel/providers/imap/camel-imap-store.c:1348
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10749,18 +10513,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1839
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:1867
+#: camel/providers/imap/camel-imap-store.c:2057
 #, c-format
 msgid "No such folder %s"
 msgstr "%s karpeta ez dago"
 
-#: camel/providers/imap/camel-imap-store.c:1915
-#: camel/providers/imap/camel-imap-store.c:2296
+#: camel/providers/imap/camel-imap-store.c:1943
+#: camel/providers/imap/camel-imap-store.c:2324
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Karpeta gurasoak ez du azpikarpetak edukitzeko baimenik"
 
-#: camel/providers/imap/camel-imap-store.c:1970
+#: camel/providers/imap/camel-imap-store.c:1998
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10768,7 +10532,7 @@ msgstr "Karpeta gurasoak ez du azpikarpetak edukitzeko baimenik"
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Ezin da karpetaren izena aldatu: %s: Ez dago horrelako karpetarik"
 
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:2274
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Karpeta guraso ezezaguna: %s"
@@ -10802,20 +10566,20 @@ msgid "Index message body data"
 msgstr "Bidali mezua kontaktuari"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:388
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:393
-#: camel/providers/local/camel-local-folder.c:396
+#: camel/providers/local/camel-local-folder.c:392
+#: camel/providers/local/camel-local-folder.c:395
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "postontzia:%s (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:400
+#: camel/providers/local/camel-local-folder.c:399
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -10875,7 +10639,7 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:142
 #: camel/providers/local/camel-local-store.c:253
-#: camel/providers/local/camel-mbox-store.c:356
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10948,8 +10712,25 @@ msgstr "Maildir mezua eranstea bertan behera utzi da"
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Ezin zaio mezua erantsi maildir karpetari: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:226
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mbox-folder.c:417
+#: camel/providers/local/camel-mbox-folder.c:436
+#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:475
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-mh-folder.c:221
+#, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+"Ezin da mezua hartu: %s %s karpetatik\n"
+"  %s"
+
+#: camel/providers/local/camel-maildir-folder.c:236
 msgid "Invalid message contents"
 msgstr "Mezu-eduki baliogabea"
 
@@ -10992,9 +10773,9 @@ msgstr "Ezin izan da '%s' karpeta ezabatu: %s"
 msgid "not a maildir directory"
 msgstr "ez da maildir direktorioa"
 
-#: camel/providers/local/camel-maildir-store.c:341
-#: camel/providers/local/camel-spool-store.c:286
-#: camel/providers/local/camel-spool-store.c:316
+#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-spool-store.c:284
+#: camel/providers/local/camel-spool-store.c:314
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Ezin izan da `%s' karpeta eskaneatu: %s"
@@ -11041,27 +10822,18 @@ msgstr "Posta eranstea bertan behera utzi da"
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Ezin zaio mezua erantsi mbox fitxategiari: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:435
-#: camel/providers/local/camel-mbox-folder.c:466
-#: camel/providers/local/camel-mbox-folder.c:474
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"Ezin da mezua hartu: %s %s karpetatik\n"
-"  %s"
-
-#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:468
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Badirudi fitxategia hondatuta dagoela eta ezin dela berreskuratu."
 
-#: camel/providers/local/camel-mbox-folder.c:475
-msgid "Message construction failed: Corrupt mailbox?"
+#: camel/providers/local/camel-mbox-folder.c:476
+#: camel/providers/local/camel-mh-folder.c:222
+#, fuzzy
+msgid "Message construction failed."
 msgstr "Mezu-eraikuntzak huts egin du: Postontzia hondatuta?"
 
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:362
+#: camel/providers/local/camel-mbox-store.c:361
 #, fuzzy
 msgid "Cannot create a folder by this name."
 msgstr "Ezin da izen horretako karpetarik sortu"
@@ -11092,32 +10864,32 @@ msgstr "`%s' ez da fitxategi erregularra."
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "`%s' karpeta ez dago hutsik. Ez da ezabatu."
 
-#: camel/providers/local/camel-mbox-store.c:375
+#: camel/providers/local/camel-mbox-store.c:374
 #, fuzzy, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Ezin izan da %s direktorioa sortu: %s"
 
-#: camel/providers/local/camel-mbox-store.c:389
+#: camel/providers/local/camel-mbox-store.c:388
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Ezin da karpeta atzitu: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:391
+#: camel/providers/local/camel-mbox-store.c:390
 #, fuzzy
 msgid "Folder already exists"
 msgstr "Txartelaren ID hori badago lehendik"
 
-#: camel/providers/local/camel-mbox-store.c:473
+#: camel/providers/local/camel-mbox-store.c:472
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "Adierazitako karpeta-izena ez da baliozkoa: %s"
 
-#: camel/providers/local/camel-mbox-store.c:486
+#: camel/providers/local/camel-mbox-store.c:485
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Ezin izan zaio izena aldatu '%s'(r)i: %s"
 
-#: camel/providers/local/camel-mbox-store.c:561
+#: camel/providers/local/camel-mbox-store.c:560
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Ezin izan zaio izena aldatu '%s'(r)i: %s"
@@ -11311,7 +11083,7 @@ msgstr ""
 "Karpeta hondatuta egon liteke, kopia `%s'(e)n gorde da"
 
 #: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:997
+#: camel/providers/nntp/camel-nntp-store.c:1126
 #, fuzzy, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "%sIdatzi %s@%s(r)en SMTP pasahitza"
@@ -11329,18 +11101,10 @@ msgstr "Huts egin du LDAP zerbitzariarekin konektatzean"
 msgid "Server rejected username/password"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:263
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr "Erabiltzaileak bertan behera utzi du"
-
-#: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:259
-#: camel/providers/nntp/camel-nntp-folder.c:265
+#: camel/providers/nntp/camel-nntp-folder.c:147
+#: camel/providers/nntp/camel-nntp-folder.c:149
+#: camel/providers/nntp/camel-nntp-folder.c:158
+#: camel/providers/nntp/camel-nntp-folder.c:234
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11349,66 +11113,53 @@ msgstr "Erabiltzaileak bertan behera utzi du"
 msgid "Cannot get message %s: %s"
 msgstr "Ezin da %s mezua hartu: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:188
-#: camel/providers/nntp/camel-nntp-folder.c:228
+#: camel/providers/nntp/camel-nntp-folder.c:156
+#: camel/providers/nntp/camel-nntp-folder.c:232
+#: camel/providers/nntp/camel-nntp-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+msgid "User cancelled"
+msgstr "Erabiltzaileak bertan behera utzi du"
+
+#: camel/providers/nntp/camel-nntp-folder.c:176
+#: camel/providers/nntp/camel-nntp-folder.c:208
 #, c-format
 msgid "Internal error: uid in invalid format: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:201
-#, fuzzy, c-format
-msgid "Could not get article %s from NNTP server"
-msgstr "Ezin izan da wombat zerbitzaria abiarazi"
-
-#: camel/providers/nntp/camel-nntp-folder.c:362
-msgid "Posting not allowed by news server"
-msgstr ""
-
+#: camel/providers/nntp/camel-nntp-folder.c:328
+#: camel/providers/nntp/camel-nntp-folder.c:331
 #: camel/providers/nntp/camel-nntp-folder.c:373
-#, c-format
-msgid "Failed to send newsgroups header: %s: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:413
-#: camel/providers/nntp/camel-nntp-folder.c:426
-#, c-format
-msgid "Error posting to newsgroup: %s: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:438
-msgid "Error reading response to posted message: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:441
+#: camel/providers/nntp/camel-nntp-folder.c:375
 #, fuzzy, c-format
-msgid "Error posting message: %s: message not posted"
-msgstr ""
-"Errorea mezua automatikoki gordetzean: %s\n"
-"  %s"
+msgid "Posting failed: %s"
+msgstr "Eragiketak huts egin du: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:457
+#: camel/providers/nntp/camel-nntp-folder.c:393
 msgid "You cannot post NNTP messages while working offline!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:468
+#: camel/providers/nntp/camel-nntp-folder.c:404
 #, fuzzy
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Ezin dira mezuak Karpeta Birtual batera kopiatu edo eraman"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:44
 #, fuzzy
 msgid "Could not get group list from server."
 msgstr "Ezin izan da taldea hartu: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#: camel/providers/nntp/camel-nntp-grouplist.c:97
+#: camel/providers/nntp/camel-nntp-grouplist.c:106
 #, fuzzy, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr ""
 "Ezin da sortu irteera-fitxategi hau: %s\n"
 " %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#: camel/providers/nntp/camel-nntp-grouplist.c:157
 #, fuzzy, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr ""
@@ -11441,27 +11192,29 @@ msgstr ""
 "Aukera honek NNTP zerbitzariarekin autentifikatuko du testu arrunteko "
 "pasahitzaren bidez."
 
-#: camel/providers/nntp/camel-nntp-store.c:158
+#: camel/providers/nntp/camel-nntp-store.c:118
+#: camel/providers/nntp/camel-nntp-store.c:1233
+#: camel/providers/nntp/camel-nntp-store.c:1331
+#, c-format
+msgid "NNTP Command failed: %s"
+msgstr "NNTP komandoak huts egin du: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:227
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Ezin izan da %s(r)en agurra irakurri: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:170
+#: camel/providers/nntp/camel-nntp-store.c:239
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "%s NNTP zerbitzariak %d errore-kodea bidali du: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:326
+#: camel/providers/nntp/camel-nntp-store.c:403
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET berriak %s bidez"
 
-#: camel/providers/nntp/camel-nntp-store.c:640
-#, fuzzy
-msgid "Stream error"
-msgstr "analisi-errorea"
-
-#: camel/providers/nntp/camel-nntp-store.c:643
+#: camel/providers/nntp/camel-nntp-store.c:777
 #, fuzzy, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -11471,75 +11224,75 @@ msgstr ""
 "Errorea mezuak hemen gordetzean: %s:\n"
 " %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:735
+#: camel/providers/nntp/camel-nntp-store.c:872
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
 "No such newsgroup. The selected item is a probably a parent folder."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:767
+#: camel/providers/nntp/camel-nntp-store.c:904
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
 "newsgroup does not exist!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:792
+#: camel/providers/nntp/camel-nntp-store.c:929
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:800
+#: camel/providers/nntp/camel-nntp-store.c:937
 #, fuzzy
 msgid "You cannot rename a folder in a News store."
 msgstr "Ezin izan da karpeta-izena aldatu %s --> %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:808
+#: camel/providers/nntp/camel-nntp-store.c:945
 #, fuzzy
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "Karpeta bat ezin da bere menpeko karpeta batera eraman."
 
-#: camel/providers/nntp/camel-nntp-summary.c:253
-#, fuzzy, c-format
-msgid "Connection error: %s"
-msgstr "Errore ezezaguna: %s"
-
-#: camel/providers/nntp/camel-nntp-summary.c:262
-#, c-format
-msgid "No such folder: %s"
-msgstr "Karpeta ez dago: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1118
+#, fuzzy
+msgid "Authentication requested but not username provided"
+msgstr "Autentifikazioa behar da"
 
-#: camel/providers/nntp/camel-nntp-summary.c:268
-#, c-format
-msgid "Could not get group: %s"
-msgstr "Ezin izan da taldea hartu: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1146
+#, fuzzy, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr "Huts egin du %s POP zerbitzarian autentifikatzean: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:333
+#: camel/providers/nntp/camel-nntp-store.c:1262
 #, fuzzy
-msgid "Could not get messages: unspecified error"
-msgstr "Ezin izan da mezua bidali: %s"
+msgid "Not connected."
+msgstr "Erakutsi kontaktuak"
 
-#: camel/providers/nntp/camel-nntp-summary.c:378
+#: camel/providers/nntp/camel-nntp-store.c:1311
 #, c-format
-msgid "NNTP Command failed: %s"
-msgstr "NNTP komandoak huts egin du: %s"
+msgid "No such folder: %s"
+msgstr "Karpeta ez dago: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:438
-#: camel/providers/nntp/camel-nntp-summary.c:543
+#: camel/providers/nntp/camel-nntp-summary.c:218
+#: camel/providers/nntp/camel-nntp-summary.c:314
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Mezu berrien bila eskaneatzen"
 
-#: camel/providers/nntp/camel-nntp-summary.c:558
-#, c-format
-msgid "Unknown server response: %s"
-msgstr "Zerbitzari-erantzun ezezaguna: %s"
+#: camel/providers/nntp/camel-nntp-summary.c:225
+#, fuzzy, c-format
+msgid "Unexpected server response from xover: %s"
+msgstr "Ustekabeko erantzuna IMAP zerbitzaritik: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:605
+#: camel/providers/nntp/camel-nntp-summary.c:328
+#, fuzzy, c-format
+msgid "Unexpected server response from head: %s"
+msgstr "Ustekabeko erantzuna GnuPG-tik: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:368
 msgid "Use cancel"
 msgstr "Utzi bertan behera"
 
-#: camel/providers/nntp/camel-nntp-summary.c:607
+#: camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Eragiketak huts egin du: %s"
@@ -11587,7 +11340,7 @@ msgstr "Ezabatu %s egunen ondoren"
 msgid "Disable support for all POP3 extensions"
 msgstr "Desgaitu POP3 hedapen guztien euskarria"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107
 msgid "POP"
 msgstr "POP"
 
@@ -11677,7 +11430,7 @@ msgid "No such folder `%s'."
 msgstr "`%s' karpeta ez dago."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:132
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -11730,7 +11483,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Posta-banaketa sendmail programaren bidez"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:119
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -12025,19 +11778,19 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
+#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:408
 msgid "attachment"
 msgstr "eranskina"
 
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:454
 msgid "Remove selected items from the attachment list"
 msgstr "Kendu hautatutako elementuak eranskin-zerrendatik"
 
-#: composer/e-msg-composer-attachment-bar.c:491
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Add attachment..."
 msgstr "Gehitu eranskina..."
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:495
 msgid "Attach a file to the message"
 msgstr "Erantsi fitxategi bat mezuari"
 
@@ -12099,7 +11852,7 @@ msgstr "Mezu izengabea"
 msgid "Open file"
 msgstr "Ireki fitxategia"
 
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
 msgid "Autogenerated"
 msgstr "Automatikoki sortua"
 
@@ -12246,17 +11999,17 @@ msgstr "Erantsi fitxategia(k)"
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
+msgid "You cannot attach the file `{0}' to this message."
 msgstr "Erantsi fitxategi bat mezuari"
 
 #. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4
-msgid "${1}"
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
 msgstr ""
 
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
 
 #. mail-composer:attach-directory primary
@@ -12351,7 +12104,7 @@ msgstr "Ezin izan da kanalizaziorik sortu: %s"
 
 #. mail-composer:no-build-message secondary
 #: composer/mail-composer-errors.xml.h:34
-msgid "Because \"${0}\", you may need to select different mail options."
+msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
@@ -12361,8 +12114,10 @@ msgid "Could not read signature file \"{0}\"."
 msgstr "Ezin izan da sinadura-fitxategia gorde: %s"
 
 #. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38
-msgid "Because \"${1}\"."
+#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted primary
@@ -12787,11 +12542,11 @@ msgid "<b>Then</b>"
 msgstr "<b>Falta:</b> "
 
 #: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1335
+#: mail/mail-account-gui.c:1347
 msgid "Select Folder"
 msgstr "Hautatu karpeta"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
 #, fuzzy
 msgid "    "
 msgstr "      "
@@ -12850,7 +12605,7 @@ msgstr "lehenago"
 msgid "months"
 msgstr "hilabete"
 
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
 msgid "seconds"
 msgstr "segundo igarotakoan"
 
@@ -12882,20 +12637,20 @@ msgstr "karpeta lokal guztiekin"
 msgid "years"
 msgstr "urte"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:916
-#: mail/mail-config.c:76 mail/mail-config.glade.h:90
+#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
+#: mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Garrantzitsua"
 
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:919 mail/mail-config.c:79
-#: mail/mail-config.glade.h:145
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: mail/mail-config.glade.h:148
 msgid "To Do"
 msgstr "Egitekoa"
 
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:920 mail/mail-config.c:80
-#: mail/mail-config.glade.h:94
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: mail/mail-config.glade.h:97
 msgid "Later"
 msgstr "Geroago"
 
@@ -12953,257 +12708,6 @@ msgstr "sarrerakoa"
 msgid "outgoing"
 msgstr "irteerakoa"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Adjust Score"
-msgstr "Doitu puntuazioa"
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Color"
-msgstr "Esleitu kolorea"
-
-#: filter/libfilter-i18n.h:4
-msgid "Assign Score"
-msgstr "Esleitu puntuazioa"
-
-#: filter/libfilter-i18n.h:5
-msgid "Attachments"
-msgstr "Eranskinak"
-
-#: filter/libfilter-i18n.h:6
-msgid "Beep"
-msgstr "Soinu-seinalea"
-
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "hau daukana"
-
-#: filter/libfilter-i18n.h:8
-msgid "Copy to Folder"
-msgstr "Kopiatu karpeta honetara"
-
-#: filter/libfilter-i18n.h:9
-msgid "Date received"
-msgstr "Jasotze-data"
-
-#: filter/libfilter-i18n.h:10
-msgid "Date sent"
-msgstr "Bidaltze-data"
-
-#: filter/libfilter-i18n.h:12
-msgid "Deleted"
-msgstr "Ezabatuta"
-
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "hau ez daukana"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "ez da honela amaitzen"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "ez dago"
-
-#: filter/libfilter-i18n.h:16
-msgid "does not return"
-msgstr "ez du hau ematen"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "ez da honen antzekoa"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "ez da honela hasten"
-
-#: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
-msgstr "Ez"
-
-#: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr "Zirriborroa"
-
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "honela amaitzen da"
-
-#: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr "Bai"
-
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "badago"
-
-#: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr "Adierazpena"
-
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr "Jarraipena"
-
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "da"
-
-#: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr "honen ondorengoa da"
-
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr "honen aurrekoa da"
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr "Banderaduna da"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "hau baino handiagoa da"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "hau baino txikiagoa da"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "ez da"
-
-#: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr "ez da Banderaduna"
-
-#: filter/libfilter-i18n.h:36
-#, fuzzy
-msgid "Junk Test"
-msgstr "ekaina"
-
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
-#: widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Etiketa"
-
-#: filter/libfilter-i18n.h:38
-msgid "Mailing list"
-msgstr "Posta-zerrenda"
-
-#: filter/libfilter-i18n.h:39
-msgid "Message Body"
-msgstr "Mezuaren gorputza"
-
-#: filter/libfilter-i18n.h:40
-msgid "Message Header"
-msgstr "Mezuaren goiburua"
-
-#: filter/libfilter-i18n.h:41
-#, fuzzy
-msgid "Message is Junk"
-msgstr "Mezuak"
-
-#: filter/libfilter-i18n.h:42
-#, fuzzy
-msgid "Message is not Junk"
-msgstr "Bidali beharreko mezua"
-
-#: filter/libfilter-i18n.h:43
-msgid "Move to Folder"
-msgstr "Eraman karpeta honetara"
-
-#: filter/libfilter-i18n.h:44
-#, fuzzy
-msgid "Pipe to Program"
-msgstr "Programatik irten"
-
-#: filter/libfilter-i18n.h:45
-msgid "Play Sound"
-msgstr "Jo soinua"
-
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Irakurrita"
-
-#: filter/libfilter-i18n.h:47
-msgid "Recipients"
-msgstr "Hartzailea"
-
-#: filter/libfilter-i18n.h:48
-msgid "Regex Match"
-msgstr "Adierazpen erregularra"
-
-#: filter/libfilter-i18n.h:49
-msgid "Replied to"
-msgstr "Erantzunda"
-
-#: filter/libfilter-i18n.h:50
-msgid "returns"
-msgstr "hau ematen du"
-
-#: filter/libfilter-i18n.h:51
-msgid "returns greater than"
-msgstr "hau baino handiagoa ematen du"
-
-#: filter/libfilter-i18n.h:52
-msgid "returns less than"
-msgstr "hau baino txikiagoa ematen du"
-
-#: filter/libfilter-i18n.h:53
-#, fuzzy
-msgid "Run Program"
-msgstr "Ireki programa:"
-
-#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Puntuazioa"
-
-#: filter/libfilter-i18n.h:55
-msgid "Sender"
-msgstr "Bidaltzailea"
-
-#: filter/libfilter-i18n.h:56
-msgid "Set Status"
-msgstr "Ezarri egoera"
-
-#: filter/libfilter-i18n.h:57
-msgid "Size (kB)"
-msgstr "Tamaina (kB)"
-
-#: filter/libfilter-i18n.h:58
-msgid "sounds like"
-msgstr "honen antzekoa da"
-
-#: filter/libfilter-i18n.h:59
-msgid "Source Account"
-msgstr "Iturburu-kontua"
-
-#: filter/libfilter-i18n.h:60
-msgid "Specific header"
-msgstr "Goiburu espezifikoa"
-
-#: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "honela hasten da"
-
-#: filter/libfilter-i18n.h:63
-msgid "Stop Processing"
-msgstr "Utzi prozesatzeari"
-
-#: filter/libfilter-i18n.h:64 mail/em-format.c:755 mail/em-format-html.c:1519
-#: mail/em-format-quote.c:302 mail/em-mailer-prefs.c:87
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
-#: smime/lib/e-cert.c:1079
-msgid "Subject"
-msgstr "Gaia"
-
-#: filter/libfilter-i18n.h:65
-msgid "Unset Status"
-msgstr "Egoera ezarri gabe"
-
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Gehitu araua"
@@ -13221,6 +12725,11 @@ msgstr "Arau-izena"
 msgid "_Score Rules"
 msgstr "Puntuazio-arauak"
 
+#: filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Puntuazioa"
+
 #: filter/searchtypes.xml.h:1
 msgid "Body contains"
 msgstr "gorputzak hau dauka"
@@ -13302,13 +12811,13 @@ msgstr "Sinadura(k)"
 msgid "-------- Forwarded Message --------"
 msgstr "Birbidalitako mezua"
 
-#: mail/em-composer-utils.c:1499
+#: mail/em-composer-utils.c:1495
 msgid "an unknown sender"
 msgstr "bidaltzaile ezezaguna"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1509
+#: mail/em-composer-utils.c:1505
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr ""
@@ -13353,8 +12862,8 @@ msgstr "<egin klik hemen karpeta hautatzeko>"
 msgid "Create New Folder"
 msgstr "Sortu karpeta berria"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
-#: mail/mail-component.c:701
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
+#: mail/mail-component.c:704
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Adierazi karpeta non sortu behar den:"
@@ -13369,107 +12878,108 @@ msgstr "Crestview"
 msgid "Folder _name:"
 msgstr "_Karpetaren izena:"
 
-#: mail/em-folder-tree.c:839
+#: mail/em-folder-tree.c:833
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "%s karpeta kentzen"
 
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree.c:835
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "%s karpeta irekitzen"
 
-#: mail/em-folder-tree.c:848 mail/message-list.c:1555
+#: mail/em-folder-tree.c:842 mail/message-list.c:1561
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Mezuak %s(e)ra eramaten"
 
-#: mail/em-folder-tree.c:850 mail/message-list.c:1557
+#: mail/em-folder-tree.c:844 mail/message-list.c:1563
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Mezuak %s(e)n kopiatzen"
 
-#: mail/em-folder-tree.c:866
+#: mail/em-folder-tree.c:860
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Ezin dira mezuak Karpeta Birtual batera kopiatu edo eraman"
 
-#: mail/em-folder-tree.c:956 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Kopiatu karpetan"
 
-#: mail/em-folder-tree.c:957 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Eraman karpetara"
 
-#: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2069
-#: mail/em-folder-tree.c:2551 mail/em-folder-view.c:798
-#: mail/message-list.c:1645
+#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
+#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
+#: mail/message-list.c:1651
 #, fuzzy
 msgid "_Move"
 msgstr "Eraman"
 
-#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#: mail/em-folder-tree.c:955 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "Bertan behera utzi zeregina"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
 #: mail/em-folder-view.c:798 mail/em-folder-view.c:812
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Hautatu karpeta"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
 #, fuzzy
 msgid "C_opy"
 msgstr "Kopiatu"
 
-#: mail/em-folder-tree.c:2096
+#: mail/em-folder-tree.c:2088
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "%s karpeta biltegiratzen"
 
-#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
+#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
 #, fuzzy
 msgid "Create folder"
 msgstr "Sortu karpeta berria"
 
-#: mail/em-folder-tree.c:2474
+#: mail/em-folder-tree.c:2463
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "\"%s\" karpetaren izena aldatu eta jarri:"
 
-#: mail/em-folder-tree.c:2476
+#: mail/em-folder-tree.c:2465
 msgid "Rename Folder"
 msgstr "Karpetaren izena aldatu"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Ikusi"
 
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2537
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Ireki leiho berrian"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2555
+#: mail/em-folder-tree.c:2546
 msgid "_New Folder..."
 msgstr "Kar_peta berria..."
 
-#: mail/em-folder-tree.c:2558
+#: mail/em-folder-tree.c:2549
 msgid "_Rename"
 msgstr "_Izena aldatu"
 
-#: mail/em-folder-tree.c:2561 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Propietateak..."
 
 #: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:889
+#: mail/mail-vfolder.c:888
 msgid "VFolders"
 msgstr "Karpeta birtualak"
 
@@ -13483,19 +12993,19 @@ msgstr ""
 msgid "Inbox"
 msgstr "Sarrerako ontzia"
 
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
 msgid "Loading..."
 msgstr "Kargatzen..."
 
 #: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
 #: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
 #: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:551
+#: mail/mail-component.c:554
 msgid "Mail"
 msgstr "Posta"
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Editatu mezu berri gisa..."
@@ -13508,17 +13018,17 @@ msgstr "_Inprimatu"
 msgid "_Reply to Sender"
 msgstr "Erantzun bidal_tzaileari"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:810
+#: mail/em-folder-view.c:901 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Erantzun zerre_ndari"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:811
+#: mail/em-folder-view.c:902 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Erantzun g_uztiei"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: mail/em-folder-view.c:903 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Birbidali"
@@ -13573,6 +13083,10 @@ msgstr "_Eraman karpeta honetara..."
 msgid "_Copy to Folder..."
 msgstr "K_opiatu karpeta honetan..."
 
+#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Etiketa"
+
 #: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Gehitu bidaltzailea helbide-liburuan"
@@ -13623,12 +13137,12 @@ msgid "Filter on _Mailing List"
 msgstr "Po_sta-zerrendaren araberako iragazkia"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
-#: mail/mail-config.glade.h:66
+#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Lehenetsia"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1796
 msgid "Print Message"
 msgstr "Inprimatu mezua"
 
@@ -13668,12 +13182,18 @@ msgstr "Cc"
 msgid "Bcc"
 msgstr "Bcc"
 
+#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
+#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Gaia"
+
 #: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
 #: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Data"
 
-#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
+#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
 msgid "Newsgroups"
 msgstr ""
 
@@ -13865,7 +13385,7 @@ msgid ""
 "practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:757
+#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
 #, fuzzy
 msgid "_View Certificate"
 msgstr "_Ziurtagiri-IDa:"
@@ -13927,7 +13447,7 @@ msgstr "_Astebete"
 msgid "Once per month"
 msgstr "_Hilabete"
 
-#: mail/em-migrate.c:1072
+#: mail/em-migrate.c:1168
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13935,95 +13455,95 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1506
+#: mail/em-migrate.c:1602
 #, fuzzy, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr ""
 "Ezin izan da `%s' karpeta sortu:\n"
 "%s"
 
-#: mail/em-migrate.c:1532
+#: mail/em-migrate.c:1628
 #, fuzzy, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr ""
 "Fitxategi-deskriptorea ezin da kopiatu: %s\n"
 "%s"
 
-#: mail/em-migrate.c:1715
+#: mail/em-migrate.c:1811
 #, fuzzy, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr ""
 "Ezin da sortu irteera-fitxategi hau: %s\n"
 " %s"
 
-#: mail/em-migrate.c:1919
+#: mail/em-migrate.c:2015
 #, fuzzy, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Huts egin du %s POP zerbitzarian autentifikatzean: %s"
 
-#: mail/em-migrate.c:1933
+#: mail/em-migrate.c:2029
 #, fuzzy, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Huts egin du '%s'(e)rako kanalizazioa sortzean: %s"
 
-#: mail/em-migrate.c:1962
+#: mail/em-migrate.c:2058
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#: mail/em-migrate.c:2413 mail/em-migrate.c:2425
 #, fuzzy, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Huts egin du '%s'(e)rako kanalizazioa sortzean: %s"
 
-#: mail/em-migrate.c:2480
+#: mail/em-migrate.c:2576
 #, fuzzy, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr ""
 "Ezin da sortu irteera-fitxategi hau: %s\n"
 " %s"
 
-#: mail/em-migrate.c:2498
+#: mail/em-migrate.c:2594
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 msgstr ""
 
-#: mail/em-popup.c:699
+#: mail/em-popup.c:700
 #, fuzzy
 msgid "Save As..."
 msgstr "Gorde hone_la..."
 
-#: mail/em-popup.c:717
+#: mail/em-popup.c:718
 #, fuzzy, c-format
 msgid "untitled_image.%s"
 msgstr "Mezu izengabea"
 
-#: mail/em-popup.c:807
+#: mail/em-popup.c:808
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:809
+#: mail/em-popup.c:810
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "Erantzun bidal_tzaileari"
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:859
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Ireki esteka arakatzailean"
 
-#: mail/em-popup.c:859
+#: mail/em-popup.c:860
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Bidali _mezua zerrendara..."
 
-#: mail/em-popup.c:860
+#: mail/em-popup.c:861
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Gehitu bidaltzailea helbide-liburuan"
 
-#: mail/em-popup.c:966
+#: mail/em-popup.c:967
 #, c-format
 msgid "Open in %s..."
 msgstr "Ireki honekin: %s..."
@@ -14616,7 +14136,7 @@ msgstr "Evolution-en postaren hobespenen kontrola"
 msgid "Mail Accounts"
 msgstr "Posta-kontuak"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
 msgid "Mail Preferences"
 msgstr "Posta-hobespenak"
 
@@ -14630,15 +14150,15 @@ msgid "Evolution is importing your old Elm mail"
 msgstr "Elm posta zaharra inportatzen ari da Evolution"
 
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:226
+#: mail/importers/evolution-mbox-importer.c:221
+#: mail/importers/evolution-outlook-importer.c:255
 #: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Inportatzen..."
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:222
-#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/evolution-mbox-importer.c:223
+#: mail/importers/evolution-outlook-importer.c:257
 #: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Itxaron"
@@ -14661,23 +14181,25 @@ msgid "Elm"
 msgstr "Elm"
 
 #: mail/importers/evolution-mbox-importer.c:116
+#: mail/importers/evolution-outlook-importer.c:130
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Ezabatu karpeta hau"
 
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 #, fuzzy
 msgid "Select folder to import into"
 msgstr "Hautatu karpeta"
 
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:254
 #: mail/importers/mail-importer.c:226
 #, fuzzy, c-format
 msgid "Importing `%s'"
 msgstr "Inportatzen"
 
-#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/evolution-outlook-importer.c:301
 #: mail/importers/mail-importer.c:140
 #, fuzzy
 msgid "Importing mailbox"
@@ -14841,15 +14363,15 @@ msgstr ""
 msgid "%s License Agreement"
 msgstr ""
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
 msgid "_Host:"
 msgstr "_Ostalaria:"
 
-#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
 msgid "User_name:"
 msgstr "_Erabiltzaile-izena:"
 
-#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
 msgid "_Path:"
 msgstr "_Bide-izena:"
 
@@ -14912,34 +14434,34 @@ msgstr "%d guztira"
 msgid ", %d unread"
 msgstr "%d bidali gabe"
 
-#: mail/mail-component.c:653
+#: mail/mail-component.c:656
 msgid "New Mail Message"
 msgstr "Posta-mezu berria"
 
-#: mail/mail-component.c:654
+#: mail/mail-component.c:657
 msgid "_Mail Message"
 msgstr "_Mezua"
 
-#: mail/mail-component.c:655
+#: mail/mail-component.c:658
 msgid "Compose a new mail message"
 msgstr "Prestatu posta-mezu berria"
 
-#: mail/mail-component.c:661
+#: mail/mail-component.c:664
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Karpeta birtual berria"
 
-#: mail/mail-component.c:662
+#: mail/mail-component.c:665
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Posta-iragazkiak"
 
-#: mail/mail-component.c:663
+#: mail/mail-component.c:666
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Sortu karpeta berria"
 
-#: mail/mail-component.c:795
+#: mail/mail-component.c:798
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
@@ -14951,7 +14473,7 @@ msgstr "Zerbitzua egiaztatzen"
 msgid "Connecting to server..."
 msgstr "Zerbitzariarekin konektatzen..."
 
-#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Identitatea"
 
@@ -14966,7 +14488,7 @@ msgstr ""
 "mezuetan agertzea nahi baduzu bakarrik bete behar dituzu."
 
 #: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid "Receiving Mail"
 msgstr "Mezuak hartu"
 
@@ -14983,7 +14505,7 @@ msgstr ""
 msgid "Please select among the following options"
 msgstr "Hautatu ondorengo aukeretako bat"
 
-#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr "Mezuak bidali"
 
@@ -14995,7 +14517,7 @@ msgstr ""
 "Idatzi posta bidaltzeko erabiliko duzun bidearen datuak. Ziur ez bazaude, "
 "galdetu sistema-administratzaileari edo Interneteko zerbitzu-hornitzaileari."
 
-#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37
 msgid "Account Management"
 msgstr "Kontuaren kudeaketa"
 
@@ -15012,249 +14534,253 @@ msgstr ""
 "egingo dira Evolution-eko posta-kontua sortzeko. Idatzi behean kontuari eman "
 "nahi diozun izena. Izen hori bistaratzeko bakarrik erabiliko da."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:2
 #, fuzzy
 msgid " Ch_eck for Supported Types "
 msgstr " _Begiratu zein mota onartzen diren "
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "<b>Preview</b>"
 msgstr "Aurrebista"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "(SSL ez da onartzen evolution-en bertsio honetan)"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "<b>S_ignatures</b>"
 msgstr "<b>Egoera:</b>"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "<b>_Languages</b>"
 msgstr "<b>Egoera:</b>"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
+msgid "<small>This will make the the filter more reliable, but slower</small>"
+msgstr ""
+
+#: mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "<span weight=\"bold\">Checking for New Mail</span>"
 msgstr "Begiratu mezu berririk dagoen"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">General</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "Mezu berrien jakinarazpena"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Security</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "Bidalitako mezuak eta zirriborroak"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:34
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:35
 #, fuzzy
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "Enkriptatu _beti neure buruari posta enkriptatua bidaltzean"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:36
 msgid "Account Editor"
 msgstr "Kontu-editorea"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:38
 #, fuzzy
 msgid "Add Ne_w Signature..."
 msgstr "Gehitu sinadura berria..."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Add _Script"
 msgstr "_Gehitu script-a"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:40
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "_Enkriptatu beti neure buruari posta enkriptatua bidaltzean"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Beti bidali _Cc kopia honi:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Beti bidali _Bcc kopia honi:"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Always _sign outgoing messages when using this account"
 msgstr "Beti _sinatu kontu honetatik bidalitako mezuak"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Enkriptatzean beti _fidagarritzat jo nire gako-sortako gakoak"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Attach original message"
 msgstr "Erantsi jatorrizko mezua"
 
-#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Eranskina"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:48
 #, fuzzy
 msgid "Automatically _insert smiley images"
 msgstr "_Automatikoki txertatu smiley irudiak"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Automatically check for _new mail every"
 msgstr "_Automatikoki begiratu mezu berririk dagoen"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltikokoa (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltikokoa (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Beep w_hen new mail arrives"
 msgstr "J_o sistema-soinua mezu berriak iristen direnean"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "C_haracter set:"
 msgstr "_Karaktere-jokoa:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Ch_eck for Supported Types "
 msgstr " _Begiratu zein mota onartzen diren "
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 #, fuzzy
-msgid "Check _Incoming Mail"
+msgid "Check _incoming mail for junk"
 msgstr "Begiratu mezu berririk dagoen"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Check spelling while I _type"
 msgstr "_Egiaztatu ortografia idatzi ahala"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 msgid "Color for _misspelled words:"
 msgstr "_Ortografia-akatsa duten hitzen kolorea:"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Colors"
 msgstr "_Koloreak"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Confirm _when expunging a folder"
 msgstr "_Berretsi karpeta betiko borratu aurretik"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -15270,116 +14796,121 @@ msgstr ""
 "\n"
 "Ezarpenak gordetzeko, egin klik \"Aplikatu\" botoian."
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
 msgid "De_fault"
 msgstr "Le_henetsi"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Default character e_ncoding:"
 msgstr "_Karaktere-kodeketa lehenetsia:"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 #, fuzzy
 msgid "Defaults"
 msgstr "_Lehenespenak"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 msgid "Do not quote original message"
 msgstr "Ez aipatu jatorrizko mezua"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Ez sinatu bilera-eskaerak (Outlook-ekin bateragarria izateko)"
 
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Eginda"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Drafts _Folder:"
 msgstr "_Zirriborroen karpeta:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:77
 msgid "Email Accounts"
 msgstr "Posta-kontuak"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Email _Address:"
 msgstr "_Helbide elektronikoa:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "Empty trash folders on e_xit"
 msgstr "H_ustu zakarrontziko karpetak irtetean"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "_Ziurtagiri-IDa:"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:81
 msgid "Evolution Account Assistant"
 msgstr "Evolution-eko kontuaren morroia"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:82
 msgid "Execute Command..."
 msgstr "Exekutatu komandoa..."
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Fi_xed-width:"
 msgstr "_Zabalera-finkoa:"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 msgid "Font Properties"
 msgstr "Letra-tipoen propietateak"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 msgid "Format messages in _HTML"
 msgstr "Eman _HTML formatua mezuei"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "HTML Mail"
 msgstr "_HTML mezuak"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Headers"
 msgstr "Goiburua"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr "_Aipamenak nabarmentzeko erabili"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
 #: mail/mail-config.glade.h:91
+#, fuzzy
+msgid "I_nclude remote tests"
+msgstr "Sartu:"
+
+#: mail/mail-config.glade.h:94
 msgid "Inline"
 msgstr "Barnean"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Mail Configuration"
 msgstr "Posta-konfigurazioa"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "Postontziaren kokalekua"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr "Mezu-prestatzailea"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
@@ -15387,145 +14918,145 @@ msgstr ""
 "Oharra: ez dizu pasahitzik eskatuko, harik eta lehen aldiz konektatzen zaren "
 "arte"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Or_ganization:"
 msgstr "E_rakundea:"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/_GPG gakoaren IDa:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "Play sound file when new mail arri_ves"
 msgstr "Jo _soinu-fitxategia mezu berriak iristen direnean"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Abisatu B_cc hartzaileak bakarrik dituzten mezuak bidali aurretik"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr "Aipatu jatorrizko mezua"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr "Aipamen gisa"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Re_member password"
 msgstr "_Gogoratu pasahitz hau"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr "Erant_zun honi:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "Mezuak jaso"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:120
 #, fuzzy
 msgid "Receiving Options"
 msgstr "_Jasotzeko aukerak"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
 #, fuzzy
 msgid "Remember _password"
 msgstr "_Gogoratu pasahitz hau"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
 #, fuzzy
 msgid "S_tandard Font:"
 msgstr "_Letra-tipo estandarra:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 #, fuzzy
 msgid "Security"
 msgstr "Se_gurtasuna"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font"
 msgstr "Hautatu HTML zabalera finkoko letra-tipoa"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:126
 msgid "Select HTML fixed width font for printing"
 msgstr "Hautatu HTML zabalera finkoko letra-tipoa inprimatzeko"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:127
 msgid "Select HTML variable width font"
 msgstr "Hautatu HTML zabalera aldakorreko letra-tipoa"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:128
 msgid "Select HTML variable width font for printing"
 msgstr "Hautatu HTML zabalera aldakorreko letra-tipoa inprimatzeko"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:129
 #, fuzzy
 msgid "Select..."
 msgstr "Ezabatu..."
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "Mezuak bidali"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Sent _Messages Folder:"
 msgstr "_Bidalitako mezuen karpeta:"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:134
 msgid "Ser_ver requires authentication"
 msgstr "Zerbitzariak _autentifikazioa behar du"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:135
 msgid "Server _Type: "
 msgstr "_Zerbitzari-mota: "
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "_Ziurtagiri-IDa:"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:137
 #, fuzzy
 msgid "Signat_ure:"
 msgstr "Sinadura:"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "Signatures"
 msgstr "_Sinadurak"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr "Zehaztu _fitxategi-izena:"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "Spell Checking"
 msgstr "O_rtografia-egiaztapena"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:141
 msgid "Standard Unix mbox"
 msgstr "Unix mbox estandarra"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "T_erminal Font:"
 msgstr "_Terminaleko letra-tipoa:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "T_ype: "
 msgstr "Mota:"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -15535,7 +15066,7 @@ msgstr ""
 "erabiliko da. Idazten duzun izena bistaratzeko\n"
 "bakarrik erabiliko da. "
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
@@ -15545,7 +15076,7 @@ msgstr ""
 "honetan. Hiztegia instalatuta daukaten hizkuntzak bakarrik azaltzen dira "
 "hemen."
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:149
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -15553,15 +15084,11 @@ msgstr ""
 "Idatzi kontu honentzat erabili nahi duzun izena.\n"
 "Adibidez: \"Lanekoa\" edo \"Nirea\""
 
-#: mail/mail-config.glade.h:148
-msgid "Use _Daemon"
-msgstr ""
-
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:152
 msgid "V_ariable-width:"
 msgstr "_Zabalera aldakorra:"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:153
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -15571,92 +15098,88 @@ msgstr ""
 "\n"
 "Hasteko, egin klik \"Aurrera\"n. "
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:158
 msgid "_Add Signature"
 msgstr "_Gehitu sinadura"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Always load images from the Internet"
 msgstr "_Beti kargatu irudiak saretik"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Digitally sign outgoing messages (by default)"
 msgstr "_Beti sinatu kontu honetatik bidalitako mezuak"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:161
 msgid "_Do not notify me when new mail arrives"
 msgstr "Ez _jakinarazi mezu berriak iristen direnean"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:163
 msgid "_Enable"
 msgstr "_Gaitu"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:165
 msgid "_Forward style:"
 msgstr "_Birbidaltzeko estiloa:"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Load images if sender is in address book"
 msgstr "_Kargatu irudiak bidaltzailea helbide-liburuan badago"
 
-#: mail/mail-config.glade.h:167
-msgid "_Local Tests Only"
-msgstr ""
-
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Make this my default account"
 msgstr "_Lehenetsi kontu hau"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_Mark messages as read after"
 msgstr "_Markatu mezuak irakurritako gisa"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Never load images from the Internet"
 msgstr "_Inoiz ez kargatu irudirik saretik"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Abisatu _HTML formaturik nahi ez dutenei HTML mezuak bidali aurretik"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:175
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Abisatu _mezuak gairik gabe bidali aurretik"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:176
 msgid "_Reply style:"
 msgstr "_Erantzuteko estiloa:"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:177
 msgid "_Script:"
 msgstr "_Script-a:"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:178
 msgid "_Show animated images"
 msgstr "_Erakutsi irudi-animazioak"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "_Use Secure Connection (SSL):"
 msgstr "E_rabili konexio segurua (SSL):"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "_Use the same fonts as other applications"
 msgstr "_Erabili beste aplikazioetako letra-tipo berak"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:181
 msgid "color"
 msgstr "kolorea"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "azalpena"
 
@@ -15829,7 +15352,7 @@ msgstr ""
 
 #. mail:camel-exception primary
 #: mail/mail-errors.xml.h:57
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgid "Your message with the subject \"{0}\" was not delivered."
 msgstr ""
 
 #. mail:camel-exception secondary
@@ -15895,11 +15418,6 @@ msgstr ""
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Ezin izan da %s direktorioa sortu: %s"
 
-#. mail:no-save-path secondary
-#: mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail:no-create-path primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
@@ -15924,12 +15442,6 @@ msgstr ""
 msgid "Cannot create temporary save directory."
 msgstr "Ezin izan da aldi baterako direktorioa sortu: %s"
 
-#. mail:no-create-tmp-path secondary
-#: mail/mail-errors.xml.h:100 mail/mail-errors.xml.h:112
-#: widgets/misc/e-system-errors.xml.h:11 widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail:no-write-path-exists secondary
 #: mail/mail-errors.xml.h:104
 #, fuzzy
@@ -16208,29 +15720,25 @@ msgstr "Gainidatzi"
 msgid "_Append"
 msgstr "Aspen"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:785
 #, c-format
 msgid "Pinging %s"
 msgstr "%s(e)n ping egiten"
 
-#: mail/mail-mt.c:897
-msgid "Working"
-msgstr "Lanean"
-
-#: mail/mail-ops.c:99
+#: mail/mail-ops.c:98
 msgid "Filtering Folder"
 msgstr "Karpeta iragazten"
 
-#: mail/mail-ops.c:260
+#: mail/mail-ops.c:259
 msgid "Fetching Mail"
 msgstr "Mezuak bilatzen"
 
-#: mail/mail-ops.c:543
+#: mail/mail-ops.c:542
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Huts egin du irteerako iragazkiak aplikatzean: %s"
 
-#: mail/mail-ops.c:568
+#: mail/mail-ops.c:567
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -16239,115 +15747,115 @@ msgstr ""
 "Huts egin du %s(r)i eranstean: %s\n"
 "Horren ordez, Bidalitakoen karpeta lokalean gehituko da."
 
-#: mail/mail-ops.c:577
+#: mail/mail-ops.c:576
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Huts egin du `Bidalitakoen' karpeta lokalean eranstean: %s"
 
-#: mail/mail-ops.c:673
+#: mail/mail-ops.c:672
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%d/%d mezua bidaltzen"
 
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:703
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Huts egin du mezua deskodetzean."
 
-#: mail/mail-ops.c:708
+#: mail/mail-ops.c:707
 msgid "Complete."
 msgstr "Osatuta."
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:804
 msgid "Saving message to folder"
 msgstr "Mezua karpetan gordetzen"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Mezuak %s(e)ra eramaten"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Mezuak %s(e)n kopiatzen"
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:1002
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\": karpetak eskaneatzen"
 
-#: mail/mail-ops.c:1116
+#: mail/mail-ops.c:1115
 msgid "Forwarded messages"
 msgstr "Birbidalitako mezuak"
 
-#: mail/mail-ops.c:1159
+#: mail/mail-ops.c:1158
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s karpeta irekitzen"
 
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1230
 #, c-format
 msgid "Opening store %s"
 msgstr "%s biltegia irekitzen"
 
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1308
 #, c-format
 msgid "Removing folder %s"
 msgstr "%s karpeta kentzen"
 
-#: mail/mail-ops.c:1403
+#: mail/mail-ops.c:1402
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "%s karpeta biltegiratzen"
 
-#: mail/mail-ops.c:1468
+#: mail/mail-ops.c:1467
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1469
+#: mail/mail-ops.c:1468
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "%s karpeta biltegiratzen"
 
-#: mail/mail-ops.c:1524
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr "Karpeta freskatzen"
 
-#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
+#: mail/mail-ops.c:1559 mail/mail-ops.c:1610
 msgid "Expunging folder"
 msgstr "Karpeta betiko borratzen"
 
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1607
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "'%s' zakarrontzia husten"
 
-#: mail/mail-ops.c:1609
+#: mail/mail-ops.c:1608
 msgid "Local Folders"
 msgstr "Karpeta lokalak"
 
-#: mail/mail-ops.c:1692
+#: mail/mail-ops.c:1691
 #, c-format
 msgid "Retrieving message %s"
 msgstr "%s mezua eskuratzen"
 
-#: mail/mail-ops.c:1764
+#: mail/mail-ops.c:1763
 #, fuzzy, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "%d mezu eskuratzen"
 msgstr[1] "%d mezu eskuratzen"
 
-#: mail/mail-ops.c:1850
+#: mail/mail-ops.c:1849
 #, fuzzy, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "%d mezu gordetzen"
 msgstr[1] "%d mezu gordetzen"
 
-#: mail/mail-ops.c:1900
+#: mail/mail-ops.c:1899
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -16356,7 +15864,7 @@ msgstr ""
 "Ezin da sortu irteera-fitxategi hau: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1928
+#: mail/mail-ops.c:1927
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -16365,11 +15873,11 @@ msgstr ""
 "Errorea mezuak hemen gordetzean: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1999
+#: mail/mail-ops.c:1998
 msgid "Saving attachment"
 msgstr "Eranskina gordetzen"
 
-#: mail/mail-ops.c:2016
+#: mail/mail-ops.c:2015
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -16378,17 +15886,17 @@ msgstr ""
 "Ezin da irteera-fitxategia sortu: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2046
+#: mail/mail-ops.c:2045
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Ezin izan da daturik idatzi: %s"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s -- deskonektatzen"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s -- berriro konektatzen"
@@ -16453,24 +15961,24 @@ msgstr "Eguneratzen..."
 msgid "Waiting..."
 msgstr "Zain..."
 
-#: mail/mail-session.c:238
+#: mail/mail-session.c:239
 msgid "User canceled operation."
 msgstr "Erabiltzaileak bertan behera utzi du eragiketa."
 
-#: mail/mail-session.c:271
+#: mail/mail-session.c:272
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Idatzi %s(r)en pasahitza"
 
-#: mail/mail-session.c:273
+#: mail/mail-session.c:274
 msgid "Enter Password"
 msgstr "Idatzi pasahitza"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password"
 msgstr "Gogora_tu pasahitz hau"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:298
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Gogoratu pasahitz hau saio hau amaitu arte"
 
@@ -16525,79 +16033,79 @@ msgstr "uri-aren karpeta birtualak eguneratzen: %s"
 msgid "Updating vFolders for '%s'"
 msgstr "uri-aren karpeta birtualak eguneratzen: %s"
 
-#: mail/mail-vfolder.c:959
+#: mail/mail-vfolder.c:958
 msgid "vFolders"
 msgstr "Karpeta birtualak"
 
-#: mail/mail-vfolder.c:998
+#: mail/mail-vfolder.c:997
 msgid "Edit VFolder"
 msgstr "Editatu karpeta birtuala"
 
-#: mail/mail-vfolder.c:1082
+#: mail/mail-vfolder.c:1081
 msgid "New VFolder"
 msgstr "Karpeta birtual berria"
 
-#: mail/message-list.c:946
+#: mail/message-list.c:948
 msgid "Unseen"
 msgstr "Ikusi gabe"
 
-#: mail/message-list.c:947
+#: mail/message-list.c:949
 msgid "Seen"
 msgstr "Ikusita"
 
-#: mail/message-list.c:948
+#: mail/message-list.c:950
 msgid "Answered"
 msgstr "Erantzunda"
 
-#: mail/message-list.c:949
+#: mail/message-list.c:951
 msgid "Multiple Unseen Messages"
 msgstr "Ikusi gabeko hainbat mezu"
 
-#: mail/message-list.c:950
+#: mail/message-list.c:952
 msgid "Multiple Messages"
 msgstr "Hainbat mezu"
 
-#: mail/message-list.c:954
+#: mail/message-list.c:956
 msgid "Lowest"
 msgstr "Txikiena"
 
-#: mail/message-list.c:955
+#: mail/message-list.c:957
 msgid "Lower"
 msgstr "Txikia"
 
-#: mail/message-list.c:959
+#: mail/message-list.c:961
 msgid "Higher"
 msgstr "Handia"
 
-#: mail/message-list.c:960
+#: mail/message-list.c:962
 msgid "Highest"
 msgstr "Handiena"
 
-#: mail/message-list.c:1279
+#: mail/message-list.c:1285
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1286
+#: mail/message-list.c:1292
 msgid "Today %l:%M %p"
 msgstr "Gaur %l:%M %p"
 
-#: mail/message-list.c:1295
+#: mail/message-list.c:1301
 msgid "Yesterday %l:%M %p"
 msgstr "Atzo %l:%M %p"
 
-#: mail/message-list.c:1307
+#: mail/message-list.c:1313
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1315
+#: mail/message-list.c:1321
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1317
+#: mail/message-list.c:1323
 msgid "%b %d %Y"
 msgstr "%Y %b %d"
 
-#: mail/message-list.c:3300
+#: mail/message-list.c:3321
 msgid "Generating message list"
 msgstr "Mezuen zerrenda sortzen"
 
@@ -16653,6 +16161,10 @@ msgstr "Birbidali"
 msgid "No Response Necessary"
 msgstr "Ez da beharrezkoa erantzutea"
 
+#: mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Irakurrita"
+
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Erantzun"
@@ -16758,45 +16270,49 @@ msgid ""
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:10
-msgid "Whether Evolution should start up in offline mode"
+msgid "Toolbar is visible"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:11
-msgid "Whether to skip the development warning dialog"
+msgid "Whether Evolution should start up in offline mode"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Whether the toolbar should be visible."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:14
 #, fuzzy
 msgid "mail"
 msgstr "Helb. el."
 
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
-msgstr "Hauei esker daukazu:"
-
-#: shell/e-shell.c:545 shell/e-shell.c:546
+#: shell/e-shell.c:588 shell/e-shell.c:589
 #, fuzzy, c-format
 msgid "%ld KB"
 msgstr "%B %d"
 
-#: shell/e-shell.c:744
+#: shell/e-shell.c:786
 #, fuzzy
 msgid "Uknown system error."
 msgstr "Errore ezezaguna"
 
-#: shell/e-shell.c:1101
+#: shell/e-shell.c:1143
 msgid "Invalid arguments"
 msgstr "Argumentu baliogabeak"
 
-#: shell/e-shell.c:1103
+#: shell/e-shell.c:1145
 msgid "Cannot register on OAF"
 msgstr "Ezin da OAFen erregistratu"
 
-#: shell/e-shell.c:1105
+#: shell/e-shell.c:1147
 msgid "Configuration Database not found"
 msgstr "Ez da aurkitu konfigurazioko datu-basea"
 
-#: shell/e-shell.c:1107
+#: shell/e-shell.c:1149
 msgid "Generic error"
 msgstr "Errore generikoa"
 
@@ -16856,7 +16372,7 @@ msgstr ""
 msgid "Select importer"
 msgstr "Hautatu inportatzailea"
 
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1026
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
 #, c-format
 msgid "File %s does not exist"
 msgstr "%s fitxategia ez dago"
@@ -16884,35 +16400,35 @@ msgstr ""
 "%s inportatzen\n"
 "1. elementua inportatzen."
 
-#: shell/e-shell-importer.c:549
+#: shell/e-shell-importer.c:570
 msgid "Automatic"
 msgstr "Automatikoa"
 
-#: shell/e-shell-importer.c:598
+#: shell/e-shell-importer.c:626
 #, fuzzy
-msgid "_Filename:"
+msgid "F_ilename:"
 msgstr "Fitxategi-izena:"
 
-#: shell/e-shell-importer.c:603
+#: shell/e-shell-importer.c:631
 msgid "Select a file"
 msgstr "Hautatu fitxategia"
 
-#: shell/e-shell-importer.c:613
+#: shell/e-shell-importer.c:642
 #, fuzzy
 msgid "File _type:"
 msgstr "Fitxategi-mota:"
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:681
 #, fuzzy
 msgid "Import data and settings from _older programs"
 msgstr "Inportatu programa zaharretako datuak eta ezarpenak"
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:684
 #, fuzzy
 msgid "Import a _single file"
 msgstr "Inportatu fitxategi bakarra"
 
-#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -16920,26 +16436,26 @@ msgstr ""
 "Itxaron...\n"
 "Lehengo instalazio bila eskaneatzen"
 
-#: shell/e-shell-importer.c:727
+#: shell/e-shell-importer.c:756
 msgid "Starting Intelligent Importers"
 msgstr "Inportatzaile adimendunak abiarazten"
 
-#: shell/e-shell-importer.c:853 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
 #, c-format
 msgid "From %s:"
 msgstr "%s(e)tik:"
 
-#: shell/e-shell-importer.c:1044
+#: shell/e-shell-importer.c:1073
 #, fuzzy, c-format
 msgid "No importer available for file %s"
 msgstr "Ez dago hornitzailerik `%s' protokolorako"
 
-#: shell/e-shell-importer.c:1056
+#: shell/e-shell-importer.c:1085
 #, fuzzy
 msgid "Unable to execute importer"
 msgstr "Huts egin du gpg exekutatzean."
 
-#: shell/e-shell-importer.c:1169
+#: shell/e-shell-importer.c:1199
 #, fuzzy
 msgid "_Import"
 msgstr "Inportatu"
@@ -16985,61 +16501,61 @@ msgstr "Karpeta-izenak ezin du \"#\" karaktererik eduki."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' eta '..' karpeta-izen erreserbatuak dira."
 
-#: shell/e-shell-window.c:336
+#: shell/e-shell-window.c:337
 #, fuzzy
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution linean dago.  Egin klik botoi honetan lineaz kanpo lan "
 "egiteko."
 
-#: shell/e-shell-window.c:343
+#: shell/e-shell-window.c:344
 #, fuzzy
 msgid "Evolution is in the process of going offline."
 msgstr "Ximian Evolution lineaz kanpo jartzeko prozesuan dago."
 
-#: shell/e-shell-window.c:349
+#: shell/e-shell-window.c:350
 #, fuzzy
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution lineaz kanpo dago.  Egin klik botoi honetan linean lan "
 "egiteko."
 
-#: shell/e-shell-window.c:621
+#: shell/e-shell-window.c:637
 #, fuzzy, c-format
 msgid "Switch to %s"
 msgstr "Mezu-hartzailea: %s"
 
-#: shell/e-shell-window-commands.c:64
+#: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Ez dirudi GNOME Pilot tresnak instalatuta dauzkazunik sisteman."
 
-#: shell/e-shell-window-commands.c:72
+#: shell/e-shell-window-commands.c:74
 #, c-format
 msgid "Error executing %s."
 msgstr "Errorea %s exekutatzean."
 
-#: shell/e-shell-window-commands.c:121
+#: shell/e-shell-window-commands.c:123
 msgid "Bug buddy is not installed."
 msgstr "Bug buddy ez dago instalatuta."
 
-#: shell/e-shell-window-commands.c:129
+#: shell/e-shell-window-commands.c:131
 msgid "Bug buddy could not be run."
 msgstr "Ezin izan da Bug Buddy exekutatu."
 
-#: shell/e-shell-window-commands.c:171
+#: shell/e-shell-window-commands.c:323
 #, fuzzy
-msgid "About Evolution"
-msgstr "Ximian Evolution-i buruz"
+msgid "Groupware Suite"
+msgstr "Taldea"
 
-#: shell/e-shell-window-commands.c:382
+#: shell/e-shell-window-commands.c:563
 msgid "_Work Online"
 msgstr "_Lan egin linean"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "_Lan egin lineaz kanpo"
 
-#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Lan egin lineaz kanpo"
 
@@ -17051,43 +16567,6 @@ msgstr "Kontrol-laukia"
 msgid "New"
 msgstr "Berria"
 
-#: shell/evolution-shell-component-utils.c:115
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Errore ezezaguna."
-
-#: shell/evolution-shell-component-utils.c:118
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Osagai-sistemak eman duen errorea:\n"
-"%s"
-
-#: shell/evolution-shell-component-utils.c:125
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Aktibazio-sistemak eman duen errorea:\n"
-"%s"
-
 #: shell/evolution-test-component.c:140
 #, fuzzy
 msgid "New Test"
@@ -17426,34 +16905,34 @@ msgid ""
 "Click help for details."
 msgstr ""
 
-#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:522
+#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
+#: smime/gui/certificate-manager.c:556
 #, fuzzy
 msgid "Select a cert to import..."
 msgstr "Hautatu inportatzailea"
 
-#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:604
+#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
+#: smime/gui/certificate-manager.c:638
 #, fuzzy
 msgid "Certificate Name"
 msgstr "_Ziurtagiri-IDa:"
 
-#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
+#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
 #, fuzzy
 msgid "Purposes"
 msgstr "Lanean"
 
-#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:517
+#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:267
+#: smime/gui/certificate-manager.c:271
 #, fuzzy
 msgid "Expires"
 msgstr "Adierazpena"
 
-#: smime/gui/certificate-manager.c:417
+#: smime/gui/certificate-manager.c:446
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "Fusionatu helbide elektronikoa"
@@ -17496,6 +16975,11 @@ msgid ""
 "  Subject: %s\n"
 msgstr ""
 
+#: smime/gui/e-cert-selector.c:169
+#, fuzzy
+msgid "Select certificate"
+msgstr "Joan data jakin batera"
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -17558,7 +17042,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
 #, fuzzy
 msgid "Certificate"
 msgstr "_Ziurtagiri-IDa:"
@@ -17583,20 +17067,24 @@ msgstr "Izen arrunta"
 msgid "Contact Certificates"
 msgstr "_Ziurtagiri-IDa:"
 
-#: smime/gui/smime-ui.glade.h:21
-#, no-c-format
-msgid "Do you want to trust \"%s\" for the following purposes?"
+#: smime/gui/smime-ui.glade.h:20
+msgid "Do not trust the authenticity of this certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:21
 msgid "Dummy window only"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:22
 #, fuzzy
 msgid "Edit"
 msgstr "E_ditatu"
 
+#: smime/gui/smime-ui.glade.h:23
+#, fuzzy
+msgid "Email Certificate Trust Settings"
+msgstr "Autoritate ziurtagiri-emailea baliogabea da"
+
 #: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr ""
@@ -17633,279 +17121,288 @@ msgstr "Erakundeko saila"
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:37
-msgid "Trust this CA to identify email users."
+msgid "Trust the authenticity of this certificate"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:38
-msgid "Trust this CA to identify software developers."
+msgid "Trust this CA to identify email users."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:39
-msgid "Trust this CA to identify web sites."
+msgid "Trust this CA to identify software developers."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:40
-#, fuzzy
-msgid "View"
-msgstr "_Ikusi"
+msgid "Trust this CA to identify web sites."
+msgstr ""
 
 #: smime/gui/smime-ui.glade.h:41
 #, fuzzy
-msgid "View Certificate"
-msgstr "_Ziurtagiri-IDa:"
+msgid "View"
+msgstr "_Ikusi"
 
 #: smime/gui/smime-ui.glade.h:42
-#, fuzzy
-msgid "You have been asked to trust a new Certificate Authority (CA)."
-msgstr "Autoritate ziurtagiri-emailea baliogabea da"
-
-#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:44
+#: smime/gui/smime-ui.glade.h:43
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:45
+#: smime/gui/smime-ui.glade.h:44
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:46
+#: smime/gui/smime-ui.glade.h:45
 #, fuzzy
 msgid "Your Certificates"
 msgstr "_Ziurtagiri-IDa:"
 
-#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
+#: smime/gui/smime-ui.glade.h:46
+msgid "_Edit CA Trust"
+msgstr ""
+
+#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 #, fuzzy
 msgid "%d/%m/%Y"
 msgstr "%Y/%m/%d"
 
-#: smime/lib/e-cert.c:478
+#. x509 certificate usage types
+#: smime/lib/e-cert.c:424
+#, fuzzy
+msgid "Sign"
+msgstr "Stauning"
+
+#: smime/lib/e-cert.c:425
+#, fuzzy
+msgid "Encrypt"
+msgstr "PGP enkriptatzea"
+
+#: smime/lib/e-cert.c:530
 #, fuzzy
 msgid "Version"
 msgstr "Vermont"
 
-#: smime/lib/e-cert.c:493
+#: smime/lib/e-cert.c:545
 #, fuzzy
 msgid "Version 1"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:496
+#: smime/lib/e-cert.c:548
 #, fuzzy
 msgid "Version 2"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:499
+#: smime/lib/e-cert.c:551
 #, fuzzy
 msgid "Version 3"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:581
+#: smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:584
+#: smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:587
+#: smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:590
+#: smime/lib/e-cert.c:642
 #, fuzzy
 msgid "C"
 msgstr " C"
 
-#: smime/lib/e-cert.c:593
+#: smime/lib/e-cert.c:645
 #, fuzzy
 msgid "CN"
 msgstr "I"
 
-#: smime/lib/e-cert.c:596
+#: smime/lib/e-cert.c:648
 msgid "OU"
 msgstr ""
 
-#: smime/lib/e-cert.c:599
+#: smime/lib/e-cert.c:651
 #, fuzzy
 msgid "O"
 msgstr "Ados"
 
-#: smime/lib/e-cert.c:602
+#: smime/lib/e-cert.c:654
 msgid "L"
 msgstr ""
 
-#: smime/lib/e-cert.c:605
+#: smime/lib/e-cert.c:657
 #, fuzzy
 msgid "DN"
 msgstr "I"
 
-#: smime/lib/e-cert.c:608
+#: smime/lib/e-cert.c:660
 msgid "DC"
 msgstr ""
 
-#: smime/lib/e-cert.c:611
+#: smime/lib/e-cert.c:663
 #, fuzzy
 msgid "ST"
 msgstr "SMTP"
 
-#: smime/lib/e-cert.c:614
+#: smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:617
+#: smime/lib/e-cert.c:669
 #, fuzzy
 msgid "Certificate Key Usage"
 msgstr "Ziurtagiria errebokatu egin da"
 
-#: smime/lib/e-cert.c:620
+#: smime/lib/e-cert.c:672
 msgid "Netscape Certificate Type"
 msgstr ""
 
-#: smime/lib/e-cert.c:623
+#: smime/lib/e-cert.c:675
 #, fuzzy
 msgid "Certificate Authority Key Identifier"
 msgstr "Ziurtagiria ez da fidagarria"
 
-#: smime/lib/e-cert.c:626
+#: smime/lib/e-cert.c:678
 #, fuzzy
 msgid "UID"
 msgstr "IDa"
 
-#: smime/lib/e-cert.c:635
+#: smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr ""
 
-#: smime/lib/e-cert.c:686
+#: smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:694
+#: smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
 msgstr ""
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:768
 msgid "Subject Public Key Info"
 msgstr ""
 
-#: smime/lib/e-cert.c:721
+#: smime/lib/e-cert.c:773
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:736
+#: smime/lib/e-cert.c:788
 #, fuzzy
 msgid "Subject's Public Key"
 msgstr "Gaia: %s"
 
-#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
+#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
 #, fuzzy
 msgid "Error: Unable to process extension"
 msgstr "Ezin da spool-karpeta prozesatu"
 
-#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
+#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:782
+#: smime/lib/e-cert.c:834
 #, fuzzy
 msgid "SSL Certificate Authority"
 msgstr "Autoritate ziurtagiri-emailea baliogabea da"
 
-#: smime/lib/e-cert.c:786
+#: smime/lib/e-cert.c:838
 #, fuzzy
 msgid "Email Certificate Authority"
 msgstr "Autoritate ziurtagiri-emailea baliogabea da"
 
-#: smime/lib/e-cert.c:814
+#: smime/lib/e-cert.c:866
 #, fuzzy
 msgid "Signing"
 msgstr "Stauning"
 
-#: smime/lib/e-cert.c:818
+#: smime/lib/e-cert.c:870
 #, fuzzy
 msgid "Non-repudiation"
 msgstr "Ez dago informaziorik"
 
-#: smime/lib/e-cert.c:822
+#: smime/lib/e-cert.c:874
 msgid "Key Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:826
+#: smime/lib/e-cert.c:878
 #, fuzzy
 msgid "Data Encipherment"
 msgstr "eranskina"
 
-#: smime/lib/e-cert.c:830
+#: smime/lib/e-cert.c:882
 msgid "Key Agreement"
 msgstr ""
 
-#: smime/lib/e-cert.c:834
+#: smime/lib/e-cert.c:886
 #, fuzzy
 msgid "Certificate Signer"
 msgstr "Ziurtagiri-sinaduraren hutsegitea"
 
-#: smime/lib/e-cert.c:838
+#: smime/lib/e-cert.c:890
 msgid "CRL Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:938
 #, fuzzy
 msgid "Critical"
 msgstr "Curitiba"
 
-#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
+#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
 #, fuzzy
 msgid "Not Critical"
 msgstr "Ipar Carolina"
 
-#: smime/lib/e-cert.c:912
+#: smime/lib/e-cert.c:964
 #, fuzzy
 msgid "Extensions"
 msgstr "Adierazpena"
 
-#: smime/lib/e-cert.c:983
+#: smime/lib/e-cert.c:1035
 #, fuzzy, c-format
 msgid "%s = %s"
 msgstr "%s - %s"
 
-#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
 #, fuzzy
 msgid "Certificate Signature Algorithm"
 msgstr "Ziurtagiri-sinaduraren hutsegitea"
 
-#: smime/lib/e-cert.c:1048
+#: smime/lib/e-cert.c:1100
 #, fuzzy
 msgid "Issuer"
 msgstr "_Txertatu"
 
-#: smime/lib/e-cert.c:1102
+#: smime/lib/e-cert.c:1154
 msgid "Issuer Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1121
+#: smime/lib/e-cert.c:1173
 #, fuzzy
 msgid "Subject Unique ID"
 msgstr "Gaia: %s"
 
-#: smime/lib/e-cert.c:1164
+#: smime/lib/e-cert.c:1216
 #, fuzzy
 msgid "Certificate Signature Value"
 msgstr "Ziurtagiri-sinaduraren hutsegitea"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
+#: smime/lib/e-cert-db.c:608
 #, fuzzy
 msgid "Certificate already exists"
 msgstr "Txartelaren ID hori badago lehendik"
@@ -18055,7 +17552,7 @@ msgstr "Ikusi uneko kontaktua"
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "_Ekintzak"
 
@@ -18223,7 +17720,7 @@ msgstr "_Itxi"
 #: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:3
+#: ui/evolution.xml.h:4
 msgid "Close"
 msgstr "Itxi"
 
@@ -18236,7 +17733,7 @@ msgid "Delete this item"
 msgstr "Ezabatu elementu hau"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr "Tresna-barra nagusia"
 
@@ -18279,7 +17776,7 @@ msgstr "Gorde elementu hau diskoan"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:44
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "_File"
 msgstr "_Fitxategia"
 
@@ -18539,13 +18036,13 @@ msgstr "_Alderantzikatu hautapena"
 msgid "_Threaded Message List"
 msgstr "_Harian sartutako mezu-zerrenda"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Itxi leiho hau"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "_Close"
 msgstr "It_xi"
 
@@ -18953,7 +18450,7 @@ msgstr "_Aurreko mezua"
 msgid "_Quoted"
 msgstr "_Aipamen gisa"
 
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
 msgid "_Tools"
 msgstr "_Tresnak"
 
@@ -19256,108 +18753,122 @@ msgid "_Open Task"
 msgstr "Zeregin berria"
 
 #: ui/evolution.xml.h:1
-msgid "About Ximian Evolution..."
-msgstr "Ximian Evolution-i buruz..."
+#, fuzzy
+msgid "About Evolution..."
+msgstr "Ximian Evolution-i buruz"
 
 #: ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
 msgstr "Aldatu Evolution-en ezarpenak"
 
-#: ui/evolution.xml.h:5
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the visibility of the toolbar"
+msgstr "Aldatu karpeta honen propietateak"
+
+#: ui/evolution.xml.h:6
 msgid "Create a new window displaying this folder"
 msgstr "Sortu karpeta hau erakusten duen leiho berri bat"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "I_rten"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Ximian Evolution-i buruzko galderak (FAQ)"
+
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Programatik irten"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:10
 msgid "Forget _Passwords"
 msgstr "Ahaztu _pasahitzak"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:11
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Ahaztu gogoratutako pasahitzak (horrela berriz galdetuko dizkizu)"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:12
 msgid "Import data from other programs"
 msgstr "Inportatu datuak beste programa batzuetatik"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:14
 #, fuzzy
 msgid "New _Window"
 msgstr "_Bilatu orain"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Pi_lot Settings..."
 msgstr "_Pilot-en ezarpenak..."
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Send / Receive"
 msgstr "Bidali / Jaso"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Send queued items and retrieve new items"
 msgstr "Bidali ilaran gordetako elementuak eta hartu elementu berriak"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Set up Pilot configuration"
 msgstr "Konfiguratu Pilot-en ezarpenak"
 
-#: ui/evolution.xml.h:17
-msgid "Show information about Ximian Evolution"
+#: ui/evolution.xml.h:19
+#, fuzzy
+msgid "Show information about Evolution"
 msgstr "Erakutsi Ximian Evolution-i buruzko informazioa"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:20
 msgid "Submit Bug Report"
 msgstr "Bidali programa-erroreen berri-ematea"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:21
 msgid "Submit _Bug Report"
 msgstr "_Bidali programa-erroreen berri-ematea"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Eman programa-erroreen berri Bug Buddy erabiliz"
 
-#: ui/evolution.xml.h:21
-msgid "Toggle whether we are working offline."
-msgstr "Gaitu/desgaitu lineaz kanpo lanean aritzea."
-
 #: ui/evolution.xml.h:23
-msgid "Ximian Evolution _FAQ"
-msgstr "Ximian Evolution-i buruzko galderak (FAQ)"
+#, fuzzy
+msgid "T_oolbar"
+msgstr "Tresna-barra nagusia"
 
 #: ui/evolution.xml.h:24
-msgid "_About Ximian Evolution..."
-msgstr "Ximian E_volution-i buruz..."
+msgid "Toggle whether we are working offline."
+msgstr "Gaitu/desgaitu lineaz kanpo lanean aritzea."
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "_About Evolution..."
+msgstr "Ximian Evolution-i buruz"
+
+#: ui/evolution.xml.h:30
 msgid "_Help"
 msgstr "_Laguntza"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "_Import..."
 msgstr "Inp_ortatu..."
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "_New"
 msgstr "_Berria"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 #, fuzzy
 msgid "_Quick Reference"
 msgstr "Posta-hobespenak"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_Send / Receive"
 msgstr "_Bidali / Jaso"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 #, fuzzy
 msgid "_Window"
 msgstr "_Bilatu orain"
@@ -19436,7 +18947,7 @@ msgid "With _Status"
 msgstr "Ezarri egoera"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:626
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:635
 msgid "UTC"
 msgstr "UTC"
 
@@ -19593,29 +19104,29 @@ msgstr "Besterik..."
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
-#: widgets/misc/e-error.c:121
+#: widgets/misc/e-error.c:79 widgets/misc/e-error.c:80
+#: widgets/misc/e-error.c:122
 msgid "Evolution Error"
 msgstr "Evolution errorea"
 
-#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
-#: widgets/misc/e-error.c:119
+#: widgets/misc/e-error.c:81 widgets/misc/e-error.c:82
+#: widgets/misc/e-error.c:120
 #, fuzzy
 msgid "Evolution Warning"
 msgstr "Evolution-en posta"
 
-#: widgets/misc/e-error.c:118
+#: widgets/misc/e-error.c:119
 #, fuzzy
 msgid "Evolution Information"
 msgstr "Bileraren informazioa"
 
-#: widgets/misc/e-error.c:120
+#: widgets/misc/e-error.c:121
 #, fuzzy
 msgid "Evolution Query"
 msgstr "Evolution"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:410
+#: widgets/misc/e-error.c:415
 #, fuzzy, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -19768,16 +19279,517 @@ msgstr ""
 "Ezin da gorde `%s'(e)n\n"
 " %s"
 
-#: widgets/misc/e-task-widget.c:211
+#: widgets/misc/e-task-widget.c:212
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: widgets/misc/e-task-widget.c:216
+#: widgets/misc/e-task-widget.c:217
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%%%d osatuta)"
 
+#~ msgid "Failed to connect to LDAP server"
+#~ msgstr "Huts egin du LDAP zerbitzariarekin konektatzean"
+
+#~ msgid "Failed to authenticate with LDAP server"
+#~ msgstr "Huts egin du LDAP zerbitzarian autentifikatzean"
+
+#~ msgid "Could not perform query on Root DSE"
+#~ msgstr "Ezin izan da egin kontsulta Root DSEn"
+
+#~ msgid "The server responded with no supported search bases"
+#~ msgstr "Onartzen ez diren bilaketa-oinarriekin erantzun du zerbitzariak"
+
+#~ msgid "This server does not support LDAPv3 schema information"
+#~ msgstr "Zerbitzari honek ez du onartzen LDAPv3 eskema-informazioa"
+
+#~ msgid "Error retrieving schema information"
+#~ msgstr "Errorea eskema-informazioa eskuratzean"
+
+#~ msgid "Server did not respond with valid schema information"
+#~ msgstr "Zerbitzariak ez du erantzun baliozko eskema-informazioarekin"
+
+#~ msgid "  S_how Supported Bases "
+#~ msgstr "  E_rakutsi onartzen diren oinarriak "
+
+#~ msgid "1:00"
+#~ msgstr "1:00"
+
+#~ msgid "5:00"
+#~ msgstr "5:00"
+
+#~ msgid "Connecting"
+#~ msgstr "Konektatzea"
+
+#~ msgid "Distinguished _name:"
+#~ msgstr "_Izen bereizia (DN):"
+
+#~ msgid "Email address:"
+#~ msgstr "Helbide elektronikoa:"
+
+#~ msgid "Evolution will use this DN to authenticate you with the server"
+#~ msgstr ""
+#~ "Evolution-ek izen bereizi (DN) hau erabiliko du zu zerbitzarian "
+#~ "autentifikatzeko"
+
+#~ msgid "One"
+#~ msgstr "Bat"
+
+#~ msgid "S_earch scope: "
+#~ msgstr "Bilaketa-_esparrua: "
+
+#~ msgid "Searching"
+#~ msgstr "Bilaketa"
+
+#~ msgid "Sub"
+#~ msgstr "Sub"
+
+#~ msgid "This option controls how long a search will be run."
+#~ msgstr "Bilaketek zenbat iraungo duten kontrolatzen du aukera honek."
+
+#~ msgid "U_se SSL/TLS:"
+#~ msgstr "_Erabili SSL/TLS:"
+
+#~ msgid "_Display name:"
+#~ msgstr "_Bistaratzeko izena:"
+
+#~ msgid "_Port number:"
+#~ msgstr "_Ataka-zenbakia:"
+
+#~ msgid "_Search base:"
+#~ msgstr "_Bilaketa-oinarria:"
+
+#~ msgid "_Server name:"
+#~ msgstr "_Zerbitzariaren izena:"
+
+#~ msgid "_Timeout (minutes):"
+#~ msgstr "_Denbora-muga (minututan):"
+
+#~ msgid "connecting-tab"
+#~ msgstr "konektatzeko fitxa"
+
+#~ msgid "general-tab"
+#~ msgstr "fitxa orokorra"
+
+#~ msgid "searching-tab"
+#~ msgstr "bilaketa-fitxa"
+
+#, fuzzy
+#~ msgid "Job title:"
+#~ msgstr "Kar_gua:"
+
+#, fuzzy
+#~ msgid "Webcam:"
+#~ msgstr "Orrialdea"
+
+#~ msgid "Category editor not available."
+#~ msgstr "Kategoria-editorea ez dago erabilgarri."
+
+#, fuzzy
+#~ msgid ""
+#~ "The following entries are invalid:\n"
+#~ "\n"
+#~ msgstr "Konexio hauek aktibo daude:"
+
+#~ msgid "Could not find widget for a field: `%s'"
+#~ msgstr "Ezin izan da eremu baten trepeta aurkitu: `%s'"
+
+#~ msgid "Do you want to save changes?"
+#~ msgstr "Aldaketak gorde nahi dituzu?"
+
+#~ msgid "Error saving %s: %s"
+#~ msgstr "Errorea %s gordetzean: %s"
+
+#~ msgid ""
+#~ "The addressbook backend for\n"
+#~ "%s\n"
+#~ "has crashed. You will have to restart Evolution in order to use it again"
+#~ msgstr ""
+#~ "%s\n"
+#~ "helbide-liburuaren modulua kraskatu egin da.\n"
+#~ " Berriro erabili ahal izateko, Evolution berrabiarazi beharko duzu"
+
+#, fuzzy
+#~ msgid "Can not load URI"
+#~ msgstr "Ez da txartela aurkitu"
+
+#, fuzzy
+#~ msgid "Calendar Properties"
+#~ msgstr "iCalendar errorea"
+
+#, fuzzy
+#~ msgid "Remote"
+#~ msgstr "Kendu"
+
+#, fuzzy
+#~ msgid "Task List Properties"
+#~ msgstr "Letra-tipoen propietateak"
+
+#, fuzzy
+#~ msgid "_Refresh Interval:"
+#~ msgstr "Freskatu zerrenda"
+
+#, fuzzy
+#~ msgid "_Source URL:"
+#~ msgstr "POP Source URI"
+
+#~ msgid ""
+#~ "The event being deleted is a meeting, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "Ezabatzen ari zaren gertaera bilera bat da. Bilera bertan beherautzi dela "
+#~ "dioen oharra bidali nahi duzu?"
+
+#~ msgid "Are you sure you want to cancel and delete this meeting?"
+#~ msgstr "Ziur zaude bilera hau bertan behera utzi eta ezabatu nahi duzula?"
+
+#~ msgid ""
+#~ "The task being deleted is assigned, would you like to send a cancellation "
+#~ "notice?"
+#~ msgstr ""
+#~ "Ezabatzen ari zaren zeregina esleituta dago. Bertan beherautzi dela dioen "
+#~ "oharra bidali nahi duzu?"
+
+#~ msgid "Are you sure you want to cancel and delete this task?"
+#~ msgstr "Ziur zaude zeregin hau bertan behera utzi eta ezabatu nahi duzula?"
+
+#~ msgid ""
+#~ "The journal entry being deleted is published, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "Ezabatzen ari zaren egunkari-sarrera argitaratuta dago. Bertan behera "
+#~ "utzi dela dioen oharra bidali nahi nahi duzu?"
+
+#~ msgid "Are you sure you want to cancel and delete this journal entry?"
+#~ msgstr ""
+#~ "Ziur zaude egunkariko sarrera hau bertan behera utzi eta ezabatu nahi "
+#~ "duzula?"
+
+#~ msgid "Are you sure you want to delete the appointment `%s'?"
+#~ msgstr "Ziur zaude `%s' hitzordua ezabatu nahi duzula?"
+
+#~ msgid "Are you sure you want to delete this untitled appointment?"
+#~ msgstr "Ziur zaude izenik gabeko hitzordu hau ezabatu nahi duzula?"
+
+#~ msgid "Are you sure you want to delete the task `%s'?"
+#~ msgstr "Ziur zaude `%s' zeregina ezabatu nahi duzula?"
+
+#~ msgid "Are you sure you want to delete this untitled task?"
+#~ msgstr "Ziur zaude izenik gabeko zeregin hau ezabatu nahi duzula?"
+
+#~ msgid "Are you sure you want to delete the journal entry `%s'?"
+#~ msgstr "Ziur zaude egunkariko `%s' sarrera ezabatu nahi duzula?"
+
+#~ msgid "Are you sure want to delete this untitled journal entry?"
+#~ msgstr "Ziur zaude egunkariko sarrera izengabe hau ezabatu nahi duzula?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d appointment?"
+#~ msgid_plural "Are you sure you want to delete %d appointments?"
+#~ msgstr[0] "Ziur zaude %d hitzordu ezabatu nahi dituzula?"
+#~ msgstr[1] "Ziur zaude %d hitzordu ezabatu nahi dituzula?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d task?"
+#~ msgid_plural "Are you sure you want to delete %d tasks?"
+#~ msgstr[0] "Ziur zaude %d zeregin ezabatu nahi dituzula?"
+#~ msgstr[1] "Ziur zaude %d zeregin ezabatu nahi dituzula?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d journal entry?"
+#~ msgid_plural "Are you sure you want to delete %d journal entries?"
+#~ msgstr[0] "Ziur zaude %d egunkari-sarrera ezabatu nahi dituzula?"
+#~ msgstr[1] "Ziur zaude %d egunkari-sarrera ezabatu nahi dituzula?"
+
+#~ msgid "_Invite Others..."
+#~ msgstr "_Gonbidatu beste batzuk..."
+
+#~ msgid ""
+#~ "This event has been changed, but has not been saved.\n"
+#~ "\n"
+#~ "Do you wish to save your changes?"
+#~ msgstr ""
+#~ "Gertaera hau aldatu egin duzu, baina ez duzu gorde.\n"
+#~ "\n"
+#~ "Aldaketak gorde nahi dituzu?"
+
+#~ msgid "_Discard Changes"
+#~ msgstr "_Ez gorde"
+
+#~ msgid "Save Event"
+#~ msgstr "Gorde gertaera"
+
+#~ msgid "The meeting information has been created. Send it?"
+#~ msgstr "Bileraren informazioa sortu da. Bidali?"
+
+#~ msgid "The meeting information has changed. Send an updated version?"
+#~ msgstr ""
+#~ "Bilerari buruzko informazioa aldatu egin da. Bertsio eguneratua bidali?"
+
+#~ msgid "The task assignment information has been created. Send it?"
+#~ msgstr "Zeregina esleitzeko informazioa sortu da. Bidali?"
+
+#~ msgid "The task information has changed. Send an updated version?"
+#~ msgstr ""
+#~ "Zereginari buruzko informazioa aldatu egin da. Bertsio eguneratua bidali?"
+
+#, fuzzy
+#~ msgid "Could not get article %s from NNTP server"
+#~ msgstr "Ezin izan da wombat zerbitzaria abiarazi"
+
+#, fuzzy
+#~ msgid "Error posting message: %s: message not posted"
+#~ msgstr ""
+#~ "Errorea mezua automatikoki gordetzean: %s\n"
+#~ "  %s"
+
+#, fuzzy
+#~ msgid "Stream error"
+#~ msgstr "analisi-errorea"
+
+#, fuzzy
+#~ msgid "Connection error: %s"
+#~ msgstr "Errore ezezaguna: %s"
+
+#~ msgid "Could not get group: %s"
+#~ msgstr "Ezin izan da taldea hartu: %s"
+
+#, fuzzy
+#~ msgid "Could not get messages: unspecified error"
+#~ msgstr "Ezin izan da mezua bidali: %s"
+
+#~ msgid "Unknown server response: %s"
+#~ msgstr "Zerbitzari-erantzun ezezaguna: %s"
+
+#~ msgid "Adjust Score"
+#~ msgstr "Doitu puntuazioa"
+
+#~ msgid "Assign Color"
+#~ msgstr "Esleitu kolorea"
+
+#~ msgid "Assign Score"
+#~ msgstr "Esleitu puntuazioa"
+
+#~ msgid "Attachments"
+#~ msgstr "Eranskinak"
+
+#~ msgid "Beep"
+#~ msgstr "Soinu-seinalea"
+
+#~ msgid "contains"
+#~ msgstr "hau daukana"
+
+#~ msgid "Copy to Folder"
+#~ msgstr "Kopiatu karpeta honetara"
+
+#~ msgid "Date received"
+#~ msgstr "Jasotze-data"
+
+#~ msgid "Date sent"
+#~ msgstr "Bidaltze-data"
+
+#~ msgid "Deleted"
+#~ msgstr "Ezabatuta"
+
+#~ msgid "does not contain"
+#~ msgstr "hau ez daukana"
+
+#~ msgid "does not end with"
+#~ msgstr "ez da honela amaitzen"
+
+#~ msgid "does not exist"
+#~ msgstr "ez dago"
+
+#~ msgid "does not return"
+#~ msgstr "ez du hau ematen"
+
+#~ msgid "does not sound like"
+#~ msgstr "ez da honen antzekoa"
+
+#~ msgid "does not start with"
+#~ msgstr "ez da honela hasten"
+
+#~ msgid "Do Not Exist"
+#~ msgstr "Ez"
+
+#~ msgid "Draft"
+#~ msgstr "Zirriborroa"
+
+#~ msgid "ends with"
+#~ msgstr "honela amaitzen da"
+
+#~ msgid "Exist"
+#~ msgstr "Bai"
+
+#~ msgid "exists"
+#~ msgstr "badago"
+
+#~ msgid "Expression"
+#~ msgstr "Adierazpena"
+
+#~ msgid "Follow Up"
+#~ msgstr "Jarraipena"
+
+#~ msgid "is"
+#~ msgstr "da"
+
+#~ msgid "is after"
+#~ msgstr "honen ondorengoa da"
+
+#~ msgid "is before"
+#~ msgstr "honen aurrekoa da"
+
+#~ msgid "is Flagged"
+#~ msgstr "Banderaduna da"
+
+#~ msgid "is greater than"
+#~ msgstr "hau baino handiagoa da"
+
+#~ msgid "is less than"
+#~ msgstr "hau baino txikiagoa da"
+
+#~ msgid "is not"
+#~ msgstr "ez da"
+
+#~ msgid "is not Flagged"
+#~ msgstr "ez da Banderaduna"
+
+#, fuzzy
+#~ msgid "Junk Test"
+#~ msgstr "ekaina"
+
+#~ msgid "Mailing list"
+#~ msgstr "Posta-zerrenda"
+
+#~ msgid "Message Body"
+#~ msgstr "Mezuaren gorputza"
+
+#~ msgid "Message Header"
+#~ msgstr "Mezuaren goiburua"
+
+#, fuzzy
+#~ msgid "Message is Junk"
+#~ msgstr "Mezuak"
+
+#, fuzzy
+#~ msgid "Message is not Junk"
+#~ msgstr "Bidali beharreko mezua"
+
+#~ msgid "Move to Folder"
+#~ msgstr "Eraman karpeta honetara"
+
+#, fuzzy
+#~ msgid "Pipe to Program"
+#~ msgstr "Programatik irten"
+
+#~ msgid "Play Sound"
+#~ msgstr "Jo soinua"
+
+#~ msgid "Recipients"
+#~ msgstr "Hartzailea"
+
+#~ msgid "Regex Match"
+#~ msgstr "Adierazpen erregularra"
+
+#~ msgid "Replied to"
+#~ msgstr "Erantzunda"
+
+#~ msgid "returns"
+#~ msgstr "hau ematen du"
+
+#~ msgid "returns greater than"
+#~ msgstr "hau baino handiagoa ematen du"
+
+#~ msgid "returns less than"
+#~ msgstr "hau baino txikiagoa ematen du"
+
+#, fuzzy
+#~ msgid "Run Program"
+#~ msgstr "Ireki programa:"
+
+#~ msgid "Sender"
+#~ msgstr "Bidaltzailea"
+
+#~ msgid "Set Status"
+#~ msgstr "Ezarri egoera"
+
+#~ msgid "Size (kB)"
+#~ msgstr "Tamaina (kB)"
+
+#~ msgid "sounds like"
+#~ msgstr "honen antzekoa da"
+
+#~ msgid "Source Account"
+#~ msgstr "Iturburu-kontua"
+
+#~ msgid "Specific header"
+#~ msgstr "Goiburu espezifikoa"
+
+#~ msgid "starts with"
+#~ msgstr "honela hasten da"
+
+#~ msgid "Stop Processing"
+#~ msgstr "Utzi prozesatzeari"
+
+#~ msgid "Unset Status"
+#~ msgstr "Egoera ezarri gabe"
+
+#~ msgid "Working"
+#~ msgstr "Lanean"
+
+#~ msgid "Brought to you by"
+#~ msgstr "Hauei esker daukazu:"
+
+#, fuzzy
+#~ msgid "_Filename:"
+#~ msgstr "Fitxategi-izena:"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "Unknown error."
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Errore ezezaguna."
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the component system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Osagai-sistemak eman duen errorea:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the activation system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Aktibazio-sistemak eman duen errorea:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "View Certificate"
+#~ msgstr "_Ziurtagiri-IDa:"
+
+#, fuzzy
+#~ msgid "You have been asked to trust a new Certificate Authority (CA)."
+#~ msgstr "Autoritate ziurtagiri-emailea baliogabea da"
+
+#~ msgid "About Ximian Evolution..."
+#~ msgstr "Ximian Evolution-i buruz..."
+
+#~ msgid "_About Ximian Evolution..."
+#~ msgstr "Ximian E_volution-i buruz..."
+
 #~ msgid "Evolution Addressbook folder viewer"
 #~ msgstr "Evolution-en helbide-liburuaren karpeten ikustailea"
 
@@ -20075,9 +20087,6 @@ msgstr "%s (%%%d osatuta)"
 #~ msgid "Primary _email:"
 #~ msgstr "_Helb. el. nagusia:"
 
-#~ msgid "S_pouse:"
-#~ msgstr "_Ezkontidea:"
-
 #~ msgid "_Business:"
 #~ msgstr "_Lanekoa:"
 
@@ -20093,9 +20102,6 @@ msgstr "%s (%%%d osatuta)"
 #~ msgid "_Mobile:"
 #~ msgstr "_Mugikorra:"
 
-#~ msgid "_Office:"
-#~ msgstr "_Bulegoa:"
-
 #~ msgid "_Public Calendar URL:"
 #~ msgstr "Egu_tegi publikoaren URLa:"
 
@@ -24820,9 +24826,6 @@ msgstr "%s (%%%d osatuta)"
 #~ msgid "Lannion"
 #~ msgstr "Lannion"
 
-#~ msgid "Lansing"
-#~ msgstr "Lansing"
-
 #~ msgid "Lanzhou"
 #~ msgstr "Lanzhou"
 
diff --git a/po/fa.po b/po/fa.po
index 42a901821f..cc1026c12b 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.4\n"
-"POT-Creation-Date: 2004-05-19 14:00-0400\n"
+"POT-Creation-Date: 2004-06-03 11:14-0400\n"
 "PO-Revision-Date: 2004-01-11 20:23+0330\n"
 "Last-Translator: Roozbeh Pournader <roozbeh@sharif.edu>\n"
 "Language-Team: Persian <farsi@lists.sharif.edu>\n"
@@ -56,13 +56,13 @@ msgstr "۱ کارت"
 msgid "Default Sync Address:"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:1150
 #: addressbook/conduit/address-conduit.c:1151
+#: addressbook/conduit/address-conduit.c:1152
 msgid "Could not load addressbook"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:1219
-#: addressbook/conduit/address-conduit.c:1222
+#: addressbook/conduit/address-conduit.c:1220
+#: addressbook/conduit/address-conduit.c:1223
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
@@ -70,13 +70,13 @@ msgstr ""
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
 msgid "Failed to authenticate.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr ""
@@ -118,51 +118,23 @@ msgstr ""
 msgid "Create a new contacts group"
 msgstr "ایجاد پنجره‌ی جدید"
 
-#: addressbook/gui/component/addressbook-component.c:182
+#: addressbook/gui/component/addressbook-component.c:184
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:483
-msgid "Failed to connect to LDAP server"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:507
-msgid "Failed to authenticate with LDAP server"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:535
-msgid "Could not perform query on Root DSE"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:840
-msgid "The server responded with no supported search bases"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1245
-msgid "This server does not support LDAPv3 schema information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1266
-msgid "Error retrieving schema information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1274
-msgid "Server did not respond with valid schema information"
-msgstr ""
-
 #: addressbook/gui/component/addressbook-migrate.c:68
-#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1160
 msgid "Migrating..."
 msgstr ""
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1201
 #, c-format
 msgid "Migrating `%s':"
 msgstr ""
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:438
+#: addressbook/gui/component/addressbook-migrate.c:464
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
 #: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
@@ -170,28 +142,28 @@ msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:446
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
-#: mail/mail-config.glade.h:106
+#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
+#: mail/mail-config.glade.h:109
 msgid "Personal"
 msgstr "شخصی"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:454
+#: addressbook/gui/component/addressbook-migrate.c:480
 msgid "On LDAP Servers"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:582
+#: addressbook/gui/component/addressbook-migrate.c:608
 msgid "LDAP Servers"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:702
+#: addressbook/gui/component/addressbook-migrate.c:728
 msgid "Autocompletion Settings"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1076
+#: addressbook/gui/component/addressbook-migrate.c:1104
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -199,60 +171,55 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1090
+#: addressbook/gui/component/addressbook-migrate.c:1118
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1099
+#: addressbook/gui/component/addressbook-migrate.c:1127
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1109
+#: addressbook/gui/component/addressbook-migrate.c:1137
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:674
+#: addressbook/gui/component/addressbook-view.c:675
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:761
+#: addressbook/gui/component/addressbook-view.c:754
 #, fuzzy
 msgid "New Address Book"
 msgstr "نشانی"
 
-#: addressbook/gui/component/addressbook-view.c:762
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
+#: addressbook/gui/component/addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:763
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-view.c:756
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr ""
 
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/addressbook-view.c:1002
+#. Create the contacts group
+#: addressbook/gui/component/addressbook-view.c:995
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
 #: calendar/gui/migration.c:373
 msgid "Contacts"
 msgstr ""
@@ -328,10 +295,6 @@ msgid "Manage your S/MIME certificates here"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-msgid "  S_how Supported Bases "
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -346,379 +309,309 @@ msgstr ""
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1:00"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "<b>Authentication</b>"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Display</b>"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "<b>Downloading</b>"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "<b>Searching</b>"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:11
 msgid "<b>Server Information</b>"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
 msgid "<b>Type:</b>"
 msgstr "قبلی"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add Contacts Group"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:14
 #, fuzzy
 msgid "Address Book Properties"
 msgstr "نشانی"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
-#: mail/mail-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
+#: mail/mail-config.glade.h:42
 msgid "Always"
 msgstr "همیشه"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:17
 #: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:21
-msgid "Connecting"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 #: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "جزئیات"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
-msgid "Distinguished _name:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Email address"
 msgstr "نشانی پست الکترونیکی:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "Email address:"
-msgstr "نشانی پست الکترونیکی:"
-
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "Evolution will use this DN to authenticate you with the server"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid ""
-"Evolution will use this email address to authenticate you with the server"
+"Evolution will use this email address to authenticate you with the server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Find Possible Search Bases"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:31
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:24
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
+#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "عمومی"
 
-#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
-#: mail/mail-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
+#: mail/mail-config.glade.h:102
 msgid "Never"
 msgstr "هرگز"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
-msgid "One"
-msgstr "یک"
-
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:35
-msgid "S_earch scope: "
-msgstr ""
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Search _base:"
+msgstr "تاریخ آغاز:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:28
 msgid "Search base only"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:29
 #, fuzzy
 msgid "Search base:"
 msgstr "تاریخ آغاز:"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Search scope:"
 msgstr "تاریخ آغاز:"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
-msgid "Searching"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:31
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
-"server if\n"
-"your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL or TLS."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a \n"
-"insecure environment. For example, if you and your LDAP server are behind a "
-"firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection "
-"is already\n"
-"secure."
+"you are in a insecure environment. For example, if you and your LDAP server "
+"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
+"because your connection is already secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
-"TLS.  This \n"
-"means that your connection will be insecure, and that you will be vulnerable "
-"to security\n"
-"exploits. "
+"TLS.  This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Sub"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
-"searches will \n"
-"begin. If you leave this blank, the search will begin at the root of the "
-"directory tree."
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
-"the \n"
-"directory tree. A search scope of \"sub\" will include all entries below "
-"your search base.\n"
-"A search scope of \"one\" will only include the entries one level beneath "
-"your base.\n"
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:58
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
-"This is the maximum number of entries to download. Setting this number to "
-"be \n"
+"This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:41
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
-"list.\n"
-"It is for display purposes only. "
+"list. It is for display purposes only. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. "
-"A \n"
-"list of standard ports has been provided. Ask your system administrator\n"
-"what port you should specify."
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:67
-msgid "This option controls how long a search will be run."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:43
 #, fuzzy
 msgid "Timeout:"
 msgstr "عنوان"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
-msgid "U_se SSL/TLS:"
-msgstr "ا_ستفاده از SSL/TLS:"
-
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr "استفاده از نشانی پست الکترونیکی"
 
-#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
-#: mail/mail-config.glade.h:154
+#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
+#: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:47
 msgid "_Add Contacts Group"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:74
-#: calendar/gui/dialogs/calendar-setup.glade.h:12
-msgid "_Display name:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
 msgid "_Email address:"
 msgstr "نشانی پست الکترونیکی:"
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:50
+msgid "_Find Possible Search Bases"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "_Log in:"
+msgstr "_خانوادگی"
+
+#: addressbook/gui/component/ldap-config.glade.h:53
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
 msgid "_Name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:79
-msgid "_Port number:"
-msgstr "شماره‌ی _درگاه:"
-
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "_Port:"
 msgstr "شماره‌ی _درگاه:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
-msgid "_Search base:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:82
-msgid "_Server name:"
-msgstr ""
+#: addressbook/gui/component/ldap-config.glade.h:55
+#, fuzzy
+msgid "_Search scope:"
+msgstr "تاریخ آغاز:"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:56
 #, fuzzy
 msgid "_Server:"
 msgstr "منبع"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
-msgid "_Timeout (minutes):"
-msgstr ""
+#: addressbook/gui/component/ldap-config.glade.h:57
+#, fuzzy
+msgid "_Timeout:"
+msgstr "عنوان"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:58
 msgid "_Use secure connection:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "کارت‌ها"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
-msgid "connecting-tab"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:88
-msgid "general-tab"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:60
 #: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
-#: mail/mail-config.glade.h:182
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:90
-msgid "searching-tab"
-msgstr ""
-
-#: addressbook/gui/component/select-names/e-select-names.c:497
+#: addressbook/gui/component/select-names/e-select-names.c:503
 #: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid "Select Contacts from Address Book"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
@@ -758,7 +651,7 @@ msgstr ""
 
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:222
+#: addressbook/gui/widgets/e-addressbook-view.c:224
 msgid "Source"
 msgstr "منبع"
 
@@ -827,9 +720,9 @@ msgid "<b>Work</b>"
 msgstr "قبلی"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
-#: addressbook/gui/widgets/eab-contact-display.c:342
-#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/widgets/eab-contact-display.c:334
+#: addressbook/gui/widgets/eab-contact-display.c:353
 msgid "AIM"
 msgstr ""
 
@@ -869,15 +762,15 @@ msgid "Company:"
 msgstr "فرمان:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:271
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
+#: addressbook/gui/contact-editor/e-contact-editor.c:266
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1527
+#: addressbook/gui/contact-editor/e-contact-editor.c:520
 msgid "Contact Editor"
 msgstr ""
 
@@ -900,94 +793,92 @@ msgid "Full _Name..."
 msgstr "_نام کامل..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:202
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-msgid "Home"
-msgstr "منزل"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #, fuzzy
 msgid "Home Page:"
 msgstr "صفحه‌ی آغازه"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-#, fuzzy
-msgid "Job title:"
-msgstr "عنوان شغل"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/e-itip-control.c:936
-msgid "Location:"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 #, fuzzy
 msgid "MSN Messenger"
 msgstr "پیغام _بعدی"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 #, fuzzy
 msgid "Mailing Address"
 msgstr "نشانی پست الکترونیکی"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 #, fuzzy
 msgid "Manager:"
 msgstr "مدیر"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "Ni_ckname:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "Notes:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
-#: addressbook/gui/contact-editor/e-contact-editor.c:203
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-msgid "Other"
-msgstr ""
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#, fuzzy
+msgid "Office:"
+msgstr "_دفتر:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "PO Box:"
 msgstr "_صندوق پستی:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "Personal Information"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 #, fuzzy
 msgid "Profession:"
 msgstr "_شغل:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#, fuzzy
+msgid "Spouse:"
+msgstr "_همسر:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "State/Province:"
 msgstr "_استان/ایالت:"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#, fuzzy
+msgid "Title:"
+msgstr "_عنوان:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+msgid "Video Chat:"
+msgstr ""
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "Wants to receive HTML mail"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:42
-msgid "Webcam:"
-msgstr ""
+#, fuzzy
+msgid "Web Log:"
+msgstr "نشانی صفحه‌ی _وب:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
-#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
-#: mail/mail-config.glade.h:155
+#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
+#: mail/mail-config.glade.h:157
 msgid "Work"
 msgstr "کاری"
 
@@ -1007,40 +898,33 @@ msgid "_File under:"
 msgstr "_نام پرونده:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "_Where:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
-msgid "item7"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
-msgid "item8"
-msgstr ""
-
-#: addressbook/gui/contact-editor/eab-editor.c:316
+#: addressbook/gui/contact-editor/eab-editor.c:315
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/eab-editor.c:319
+#: addressbook/gui/contact-editor/eab-editor.c:318
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:351
-#: addressbook/gui/widgets/eab-contact-display.c:372
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Address"
 msgstr "نشانی"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:292
+#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard.c:174
@@ -2018,83 +1902,105 @@ msgstr "زامبیا"
 msgid "Zimbabwe"
 msgstr "زیمبابوه"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/contact-editor/e-contact-editor.c:179
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:337
+#: addressbook/gui/widgets/eab-contact-display.c:356
 msgid "Jabber"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:347
-#: addressbook/gui/widgets/eab-contact-display.c:366
+#: addressbook/gui/contact-editor/e-contact-editor.c:180
+#: addressbook/gui/widgets/eab-contact-display.c:339
+#: addressbook/gui/widgets/eab-contact-display.c:358
 msgid "Yahoo"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: addressbook/gui/widgets/eab-contact-display.c:338
+#: addressbook/gui/widgets/eab-contact-display.c:357
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:344
-#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#: addressbook/gui/widgets/eab-contact-display.c:355
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/contact-editor/e-contact-editor.c:183
 msgid "GroupWise"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+msgid "Home"
+msgstr "منزل"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+msgid "Other"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
 msgid "Source Book"
 msgstr "کتاب منبع"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:264
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Target Book"
 msgstr "کتاب مقصد"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:278
+#: addressbook/gui/contact-editor/e-contact-editor.c:273
 msgid "Is New Contact"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:285
+#: addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Writable Fields"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:299
+#: addressbook/gui/contact-editor/e-contact-editor.c:294
 msgid "Changed"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
-msgid "Category editor not available."
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:2352
 msgid "This contact belongs to these categories:"
 msgstr ""
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#: addressbook/gui/contact-editor/e-contact-editor.c:2429
 msgid "Please select an image for this contact"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#: addressbook/gui/contact-editor/e-contact-editor.c:2433
 #, fuzzy
 msgid "No image"
 msgstr "نیجر"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#: addressbook/gui/contact-editor/e-contact-editor.c:2636
 msgid ""
-"The following entries are invalid:\n"
+"The contact data is invalid:\n"
 "\n"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2738
-#, c-format
-msgid "Could not find widget for a field: `%s'"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+msgid "Invalid contact."
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+msgid ""
+"The contact cannot be saved to the selected address book. Do you want to "
+"discard changes?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2727
+#: addressbook/gui/contact-editor/e-contact-editor.c:2751
+msgid "_Discard"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+msgid ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:62
@@ -2130,7 +2036,7 @@ msgid "_Edit Full"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:166
 msgid "_Full Name:"
 msgstr "نام _کامل:"
 
@@ -2278,30 +2184,30 @@ msgstr "نام _فهرست:"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "contact-list-editor"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:153
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:215
+#: addressbook/gui/widgets/e-addressbook-view.c:217
 #: addressbook/gui/widgets/e-minicard-view.c:460
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "کتاب"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
 msgid "Is New List"
 msgstr ""
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:215
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
 msgid "Contact List Editor"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:438
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
 msgid "Save List as VCard"
 msgstr ""
 
@@ -2344,147 +2250,147 @@ msgstr ""
 msgid "Advanced Search"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:129
-#: addressbook/gui/widgets/eab-contact-display.c:192
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:139
-#: addressbook/gui/widgets/eab-contact-display.c:205
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:257
-#: addressbook/gui/widgets/eab-contact-display.c:533
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:525
 msgid "List Members"
 msgstr "اعضای فهرست"
 
-#: addressbook/gui/widgets/eab-contact-display.c:329
-#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/eab-contact-display.c:321
+#: addressbook/gui/widgets/eab-contact-display.c:323
 msgid "E-mail"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/eab-contact-display.c:332
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "سازمان"
 
-#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "Position"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:354
 msgid "Groupwise"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:340
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:349
-#: addressbook/gui/widgets/eab-contact-display.c:370
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:342
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:354
+#: addressbook/gui/widgets/eab-contact-display.c:346
 #, fuzzy
 msgid "work"
 msgstr "کاری"
 
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:359
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:368
-#: addressbook/gui/widgets/eab-contact-display.c:587
+#: addressbook/gui/widgets/eab-contact-display.c:360
+#: addressbook/gui/widgets/eab-contact-display.c:579
 msgid "Blog"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/eab-contact-display.c:363
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:375
+#: addressbook/gui/widgets/eab-contact-display.c:367
 #, fuzzy
 msgid "personal"
 msgstr "شخصی"
 
-#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/eab-contact-display.c:374
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:548
+#: addressbook/gui/widgets/eab-contact-display.c:540
 msgid "Job Title"
 msgstr "عنوان شغل"
 
-#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/eab-contact-display.c:544
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:774
+#: smime/lib/e-cert.c:826
 msgid "Email"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:579
+#: addressbook/gui/widgets/eab-contact-display.c:571
 msgid "Home page"
 msgstr "صفحه‌ی آغازه"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 msgid "Success"
 msgstr "موفقیت"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Backend busy"
 msgstr ""
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Repository offline"
 msgstr ""
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 #, fuzzy
 msgid "Address Book does not exist"
 msgstr "نشانی"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "No Self Contact defined"
 msgstr ""
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Permission denied"
 msgstr ""
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Contact not found"
 msgstr ""
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Contact ID already exists"
 msgstr ""
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Protocol not supported"
 msgstr ""
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:60
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:233
 #: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
@@ -2497,66 +2403,62 @@ msgid "Cancelled"
 msgstr "لغو شد"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Could not cancel"
 msgstr ""
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Authentication Failed"
 msgstr ""
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Authentication Required"
 msgstr ""
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:66
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "TLS not Available"
 msgstr ""
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#: addressbook/gui/widgets/eab-gui-util.c:66
 msgid "No such source"
 msgstr ""
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:69
+#: addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Other error"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:90
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:110
+#: addressbook/gui/widgets/eab-gui-util.c:97
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:102
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution you must compile the program from the CVS "
-"sources after retrieving OpenLDAP from the link below."
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:109
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "Unable to open addressbook"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:162
+#: addressbook/gui/widgets/eab-gui-util.c:129
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2564,7 +2466,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:168
+#: addressbook/gui/widgets/eab-gui-util.c:135
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -2572,109 +2474,96 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:174
+#: addressbook/gui/widgets/eab-gui-util.c:141
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:177
+#: addressbook/gui/widgets/eab-gui-util.c:144
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:147
 msgid "This query did not complete successfully."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
-msgid "Do you want to save changes?"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:208
-msgid "_Discard"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:169
 msgid "Error adding list"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:229
-#: addressbook/gui/widgets/eab-gui-util.c:652
+#: addressbook/gui/widgets/eab-gui-util.c:169
+#: addressbook/gui/widgets/eab-gui-util.c:580
 msgid "Error adding contact"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying list"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying contact"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:192
 msgid "Error removing list"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
-#: addressbook/gui/widgets/eab-gui-util.c:610
+#: addressbook/gui/widgets/eab-gui-util.c:192
+#: addressbook/gui/widgets/eab-gui-util.c:538
 msgid "Error removing contact"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:334
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:360
+#: addressbook/gui/widgets/eab-gui-util.c:300
 #, c-format
 msgid ""
 "%s already exists\n"
 "Do you want to overwrite it?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:364
+#: addressbook/gui/widgets/eab-gui-util.c:304
 msgid "Overwrite"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:400
-#, c-format
-msgid "Error saving %s: %s"
-msgstr ""
-
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:437
+#: addressbook/gui/widgets/eab-gui-util.c:365
 msgid "card.vcf"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:571
+#: addressbook/gui/widgets/eab-gui-util.c:499
 msgid "list"
 msgstr "فهرست"
 
-#: addressbook/gui/widgets/eab-gui-util.c:706
+#: addressbook/gui/widgets/eab-gui-util.c:634
 msgid "Move contact to"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:708
+#: addressbook/gui/widgets/eab-gui-util.c:636
 msgid "Copy contact to"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:711
+#: addressbook/gui/widgets/eab-gui-util.c:639
 msgid "Move contacts to"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:713
+#: addressbook/gui/widgets/eab-gui-util.c:641
 msgid "Copy contacts to"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:716
+#: addressbook/gui/widgets/eab-gui-util.c:644
 msgid "Select target addressbook."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:939
+#: addressbook/gui/widgets/eab-gui-util.c:867
 msgid "Multiple VCards"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:942
+#: addressbook/gui/widgets/eab-gui-util.c:870
 #, c-format
 msgid "VCard for %s"
 msgstr ""
@@ -2762,7 +2651,7 @@ msgstr[1] ""
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:229
+#: addressbook/gui/widgets/e-addressbook-view.c:231
 #: addressbook/gui/widgets/e-minicard-view.c:467
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
@@ -2780,142 +2669,134 @@ msgstr ""
 msgid "Error modifying card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:163
 msgid "Name begins with"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:164
 msgid "Email begins with"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:57
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr ""
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-#: calendar/gui/cal-search-bar.c:50
+#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+#: addressbook/gui/widgets/e-addressbook-view.c:172
 msgid "Advanced..."
 msgstr "پیش‌رفته..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:236
+#: addressbook/gui/widgets/e-addressbook-view.c:238
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:249
+#: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:506
+#: addressbook/gui/widgets/e-addressbook-view.c:508
 #, fuzzy
 msgid "Address Book"
 msgstr "نشانی"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2076
+#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:2080
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 msgid "New Contact..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "New Contact List..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Go to Folder..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Import..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1066
 msgid "Search for Contacts..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "نشانی"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1069
 msgid "Pilot Settings..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
 msgid "Send Message to Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
+#: addressbook/gui/widgets/e-addressbook-view.c:1077
 msgid "Print Envelope"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
+#: addressbook/gui/widgets/e-addressbook-view.c:1081
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "نشانی"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1080
+#: addressbook/gui/widgets/e-addressbook-view.c:1082
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "نشانی"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1087
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:1092
+#: calendar/gui/e-calendar-view.c:1280
 msgid "Current View"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1309
-#, c-format
-msgid ""
-"The addressbook backend for\n"
-"%s\n"
-"has crashed. You will have to restart Evolution in order to use it again"
-msgstr ""
-
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1667
-#: calendar/gui/cal-search-bar.c:362
+#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr ""
 
@@ -3021,7 +2902,7 @@ msgstr "رادیو"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-list-view.c:234
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "نقش"
@@ -3155,12 +3036,12 @@ msgstr ""
 msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.c:998
+#: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.c:1064
-#: addressbook/printing/e-contact-print.c:1091
+#: addressbook/printing/e-contact-print.c:1066
+#: addressbook/printing/e-contact-print.c:1093
 msgid "Print contact"
 msgstr ""
 
@@ -3407,15 +3288,19 @@ msgstr ""
 msgid "Impossible internal error."
 msgstr ""
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:629
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
 msgid "Can not open file"
 msgstr ""
 
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-msgid "Can not load URI"
-msgstr "نمی‌توان URI را بار کرد"
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+msgid "Couldn't get list of addressbooks"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+msgid "failed to open book"
+msgstr ""
 
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
@@ -3433,7 +3318,7 @@ msgstr ""
 msgid "Unnamed List"
 msgstr ""
 
-#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
 msgstr ""
@@ -3694,10 +3579,10 @@ msgid "Whether to show week numbers in date navigator"
 msgstr ""
 
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:88
-#: calendar/gui/gnome-cal.c:1703
-#: camel/providers/groupwise/camel-gw-listener.c:304
-#: camel/providers/groupwise/camel-gw-listener.c:327
+#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/gnome-cal.c:1705
+#: camel/providers/groupwise/camel-gw-listener.c:311
+#: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
 msgstr ""
 
@@ -3714,7 +3599,7 @@ msgstr ""
 
 #: calendar/gui/calendar-commands.c:363
 #: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:19 filter/filter.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
 msgid "days"
 msgstr ""
 
@@ -3858,23 +3743,23 @@ msgstr ""
 msgid "Month View"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:54
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:53
 msgid "Location contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
 msgid "Unmatched"
 msgstr ""
 
@@ -3895,23 +3780,23 @@ msgstr ""
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:466
+#: calendar/gui/dialogs/alarm-options.c:467
 msgid "Audio Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:475
+#: calendar/gui/dialogs/alarm-options.c:476
 msgid "Message Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:484
+#: calendar/gui/dialogs/alarm-options.c:485
 msgid "Email Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:493
+#: calendar/gui/dialogs/alarm-options.c:494
 msgid "Program Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:510
 msgid "Unknown Alarm Options"
 msgstr ""
 
@@ -3947,7 +3832,7 @@ msgstr ""
 msgid "With these arguments:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
 msgid "dialog1"
 msgstr ""
 
@@ -3956,7 +3841,7 @@ msgid "extra times every"
 msgstr ""
 
 #: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:20 filter/filter.glade.h:16
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr ""
 
@@ -4003,7 +3888,7 @@ msgstr ""
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr ""
 
@@ -4033,7 +3918,6 @@ msgid "hour(s)"
 msgstr ""
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:21
 msgid "minute(s)"
 msgstr ""
 
@@ -4041,26 +3925,26 @@ msgstr ""
 msgid "start of appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:170
+#: calendar/gui/dialogs/calendar-setup.c:172
 msgid "You must specify a location to get the calendar from."
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:178
+#: calendar/gui/dialogs/calendar-setup.c:180
 #, c-format
 msgid "The source location '%s' is not well-formed."
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:193
+#: calendar/gui/dialogs/calendar-setup.c:195
 #, c-format
 msgid "The source location '%s' is not a webcal source."
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:265
+#: calendar/gui/dialogs/calendar-setup.c:275
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:278
+#: calendar/gui/dialogs/calendar-setup.c:288
 #, c-format
 msgid ""
 "The group '%s' is remote. You must specify a location to get the calendar "
@@ -4081,54 +3965,34 @@ msgstr ""
 msgid "C_olor:"
 msgstr "کومورو"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "Calendar Properties"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
 msgid "Pick a color"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:8
-msgid "Remote"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "Task List Properties"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
 #, fuzzy
 msgid "_Add Calendar"
 msgstr "تقویم‌ها"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
 msgid "_Add Group"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-msgid "_Refresh Interval:"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
 msgid "_Refresh:"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-msgid "_Source URL:"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
 #, fuzzy
 msgid "_Type:"
 msgstr "_عنوان:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
 #, fuzzy
 msgid "_URL:"
 msgstr "_اضافه شود"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
 msgid "weeks"
 msgstr ""
 
@@ -4237,7 +4101,7 @@ msgid "Display"
 msgstr "جزئیات"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:76
 msgid "E_nable"
 msgstr ""
 
@@ -4247,7 +4111,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:563
+#: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr ""
 
@@ -4261,7 +4125,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:559
+#: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr ""
 
@@ -4271,7 +4135,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:564
+#: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr ""
 
@@ -4285,7 +4149,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr ""
 
@@ -4299,7 +4163,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:562
+#: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr ""
 
@@ -4313,7 +4177,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:560
+#: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr ""
 
@@ -4323,7 +4187,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:561
+#: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr ""
 
@@ -4357,7 +4221,7 @@ msgid "_Day begins:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
-#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:43
@@ -4406,76 +4270,46 @@ msgstr ""
 msgid "before every appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:57
-msgid ""
-"The event being deleted is a meeting, would you like to send a cancellation "
-"notice?"
-msgstr ""
-
-#: calendar/gui/dialogs/cancel-comp.c:60
-msgid "Are you sure you want to cancel and delete this meeting?"
-msgstr ""
-
-#: calendar/gui/dialogs/cancel-comp.c:66
-msgid ""
-"The task being deleted is assigned, would you like to send a cancellation "
-"notice?"
-msgstr ""
-
-#: calendar/gui/dialogs/cancel-comp.c:69
-msgid "Are you sure you want to cancel and delete this task?"
-msgstr ""
-
-#: calendar/gui/dialogs/cancel-comp.c:75
-msgid ""
-"The journal entry being deleted is published, would you like to send a "
-"cancellation notice?"
-msgstr ""
-
-#: calendar/gui/dialogs/cancel-comp.c:78
-msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr ""
-
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:68
 msgid "This journal entry has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:75
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:82
+#: calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:92
 msgid "This journal entry has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:99
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
@@ -4513,7 +4347,7 @@ msgid "No summary"
 msgstr ""
 
 #: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
 #: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr ""
@@ -4565,99 +4399,51 @@ msgstr ""
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:95
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:98
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:104
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:107
-msgid "Are you sure you want to delete this untitled task?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:113
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:116
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:131
-#, c-format
-msgid "Are you sure you want to delete %d appointment?"
-msgid_plural "Are you sure you want to delete %d appointments?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: calendar/gui/dialogs/delete-comp.c:138
-#, c-format
-msgid "Are you sure you want to delete %d task?"
-msgid_plural "Are you sure you want to delete %d tasks?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: calendar/gui/dialogs/delete-comp.c:145
-#, c-format
-msgid "Are you sure you want to delete %d journal entry?"
-msgid_plural "Are you sure you want to delete %d journal entries?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: calendar/gui/dialogs/delete-error.c:52
+#: calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:55
+#: calendar/gui/dialogs/delete-error.c:57
 msgid "The task could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:58
+#: calendar/gui/dialogs/delete-error.c:60
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:61
+#: calendar/gui/dialogs/delete-error.c:63
 msgid "The item could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:68
+#: calendar/gui/dialogs/delete-error.c:70
 msgid "The event could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:71
+#: calendar/gui/dialogs/delete-error.c:73
 msgid "The task could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:74
+#: calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:77
+#: calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:84
+#: calendar/gui/dialogs/delete-error.c:86
 msgid "The event could not be deleted due to an error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:87
+#: calendar/gui/dialogs/delete-error.c:89
 msgid "The task could not be deleted due to an error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:90
+#: calendar/gui/dialogs/delete-error.c:92
 msgid "The journal entry could not be deleted due to an error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:93
+#: calendar/gui/dialogs/delete-error.c:95
 msgid "The item could not be deleted due to an error"
 msgstr ""
 
@@ -4790,11 +4576,11 @@ msgstr ""
 
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:3
+#: calendar/gui/dialogs/meeting-page.glade.h:4
 #: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
 #: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1559
-#: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:100
+#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
+#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
@@ -4820,8 +4606,8 @@ msgstr ""
 #. FIXME: need to disable for undeletable folders
 #: calendar/gui/dialogs/meeting-page.c:655
 #: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1310 calendar/gui/e-calendar-view.c:1342
-#: mail/em-folder-tree.c:2557 mail/em-folder-view.c:919
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
+#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -4829,7 +4615,7 @@ msgid "_Delete"
 msgstr "_حذف شود"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:240
+#: calendar/gui/e-meeting-list-view.c:218
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr ""
@@ -4865,16 +4651,15 @@ msgid "Member"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
-#: mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-list-view.c:248
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
 msgid "Status"
 msgstr ""
 
@@ -4882,18 +4667,18 @@ msgstr ""
 msgid "Add A_ttendee"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr ""
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "Add attendees from addressbook."
+msgstr "نشانی"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "_Change Organizer"
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.glade.h:6
-#: calendar/gui/e-meeting-time-sel.c:417
-msgid "_Invite Others..."
+msgid "_Change Organizer"
 msgstr ""
 
 #: calendar/gui/dialogs/new-calendar.glade.h:2
@@ -5043,7 +4828,7 @@ msgid "_No recurrence"
 msgstr ""
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:450
+#: composer/e-msg-composer-attachment-bar.c:453
 msgid "_Remove"
 msgstr ""
 
@@ -5075,51 +4860,20 @@ msgstr ""
 msgid "year(s)"
 msgstr ""
 
-#: calendar/gui/dialogs/save-comp.c:53
-msgid ""
-"This event has been changed, but has not been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-
-#: calendar/gui/dialogs/save-comp.c:57
-msgid "_Discard Changes"
-msgstr ""
-
-#: calendar/gui/dialogs/save-comp.c:62
-msgid "Save Event"
-msgstr ""
-
-#: calendar/gui/dialogs/select-source-dialog.c:65
+#: calendar/gui/dialogs/select-source-dialog.c:69
 #, fuzzy
 msgid "Select destination"
 msgstr "انتخاب نام‌ها"
 
-#: calendar/gui/dialogs/select-source-dialog.c:86
+#: calendar/gui/dialogs/select-source-dialog.c:90
 msgid "_Destination"
 msgstr ""
 
-#: calendar/gui/dialogs/select-source-dialog.c:88
+#: calendar/gui/dialogs/select-source-dialog.c:92
 #, fuzzy
 msgid "Task List"
 msgstr "تاجیکستان"
 
-#: calendar/gui/dialogs/send-comp.c:57
-msgid "The meeting information has been created. Send it?"
-msgstr ""
-
-#: calendar/gui/dialogs/send-comp.c:60
-msgid "The meeting information has changed. Send an updated version?"
-msgstr ""
-
-#: calendar/gui/dialogs/send-comp.c:67
-msgid "The task assignment information has been created. Send it?"
-msgstr ""
-
-#: calendar/gui/dialogs/send-comp.c:71
-msgid "The task information has changed. Send an updated version?"
-msgstr ""
-
 #: calendar/gui/dialogs/task-details-page.c:406
 msgid "Completed date is wrong"
 msgstr ""
@@ -5139,7 +4893,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #: calendar/gui/e-cal-component-preview.c:249
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:960
 msgid "High"
 msgstr ""
 
@@ -5153,14 +4907,14 @@ msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:253
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:958
 msgid "Low"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:251
 #: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:957
+#: mail/message-list.c:959
 msgid "Normal"
 msgstr ""
 
@@ -5220,8 +4974,8 @@ msgstr ""
 
 #: calendar/gui/dialogs/task-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
+#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr ""
 
@@ -5390,7 +5144,7 @@ msgstr "نشانی صفحه‌ی _وب:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:950
+#: calendar/gui/e-itip-control.c:943
 msgid "Status:"
 msgstr ""
 
@@ -5476,12 +5230,12 @@ msgstr ""
 msgid "Deleting selected objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
 msgid "Updating objects"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1370
+#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
 #: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr ""
@@ -5491,15 +5245,15 @@ msgid "Open _Web Page"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1291 calendar/gui/e-calendar-view.c:1376
-#: mail/em-folder-view.c:896 mail/em-popup.c:690 mail/em-popup.c:806
+#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
+#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr ""
 
 #: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1292
-#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
+#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
@@ -5507,24 +5261,24 @@ msgid "_Print..."
 msgstr ""
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1338
-#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2550
-#: mail/message-list.c:1644 ui/evolution-addressbook.xml.h:31
+#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
+#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
+#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1273 calendar/gui/e-calendar-view.c:1299
-#: calendar/gui/e-calendar-view.c:1372 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
+#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
@@ -5591,71 +5345,71 @@ msgstr ""
 msgid "Task sort"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
 msgid "New _Appointment..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
+#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
+#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
 msgid "New Meeting"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
 msgid "New Task"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "انتخاب _همه"
 
-#: calendar/gui/e-calendar-view.c:1280
+#: calendar/gui/e-calendar-view.c:1283
 #, fuzzy
 msgid "_Select Date..."
 msgstr "_حذف شود..."
 
-#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1303
+#: calendar/gui/e-calendar-view.c:1306
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "_تقویم"
 
-#: calendar/gui/e-calendar-view.c:1304
+#: calendar/gui/e-calendar-view.c:1307
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "تقویم جدید"
 
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1308
 msgid "_Schedule Meeting..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1309
 msgid "_Forward as iCalendar..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1349
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1351
 msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr ""
 
@@ -5669,9 +5423,9 @@ msgstr ""
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:967 calendar/gui/e-itip-control.c:1169
-#: calendar/gui/e-meeting-list-view.c:144
-#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
 #: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
 #: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
 #: camel/camel-tcp-stream-openssl.c:631
@@ -5697,13 +5451,13 @@ msgid "Assigned"
 msgstr ""
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr ""
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr ""
 
@@ -5715,7 +5469,7 @@ msgstr ""
 msgid "S"
 msgstr ""
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
 msgid "E"
 msgstr ""
 
@@ -5781,402 +5535,406 @@ msgstr ""
 msgid "%02i minute divisions"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:592
+#: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:596
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:601
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:603
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:618
+#: calendar/gui/e-itip-control.c:611
 msgid " and "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:618
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:631
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:645
+#: calendar/gui/e-itip-control.c:638
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:642
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:653
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:669
+#: calendar/gui/e-itip-control.c:662
 msgid ", ending on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:686
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:696
 msgid "<b>Ends:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:716
 msgid "<b>Completed:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:733
+#: calendar/gui/e-itip-control.c:726
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:771 calendar/gui/e-itip-control.c:827
+#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
 msgid "iCalendar Information"
 msgstr ""
 
 #. Title
-#: calendar/gui/e-itip-control.c:788
+#: calendar/gui/e-itip-control.c:781
 msgid "iCalendar Error"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:859 calendar/gui/e-itip-control.c:875
-#: calendar/gui/e-itip-control.c:886 calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
 msgid "An unknown person"
 msgstr ""
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:910
+#: calendar/gui/e-itip-control.c:903
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:925
+#: calendar/gui/e-itip-control.c:918
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:929
+msgid "Location:"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:959 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:963 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.c:1050
-#: calendar/gui/e-itip-control.c:1076 calendar/gui/e-itip-control.c:1089
-#: calendar/gui/e-itip-control.c:1102 calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
 msgid "Choose an action:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1023
+#: calendar/gui/e-itip-control.c:1016
 msgid "Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1024 calendar/gui/e-itip-control.c:1055
-#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1091
-#: calendar/gui/e-itip-control.c:1104 calendar/gui/e-itip-control.c:1117
-#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
+#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1044
 msgid "Accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1045
 msgid "Tentatively accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1046
 msgid "Decline"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1070
 msgid "Send Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1090
+#: calendar/gui/e-itip-control.c:1083
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1103
+#: calendar/gui/e-itip-control.c:1096
 msgid "Send Latest Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1116 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1185
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1193
+#: calendar/gui/e-itip-control.c:1186
 msgid "Meeting Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1191
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1193
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1201
+#: calendar/gui/e-itip-control.c:1194
 msgid "Meeting Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1206
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1203
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1204
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1218
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1226
+#: calendar/gui/e-itip-control.c:1219
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1227
+#: calendar/gui/e-itip-control.c:1220
 msgid "Meeting Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1234 calendar/gui/e-itip-control.c:1302
-#: calendar/gui/e-itip-control.c:1337
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1330
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1228
 msgid "Bad Meeting Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1253
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1254
 msgid "Task Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1259
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1262
 msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1278
+#: calendar/gui/e-itip-control.c:1271
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1272
 msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1286
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1294
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1288
 msgid "Task Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1303
+#: calendar/gui/e-itip-control.c:1296
 msgid "Bad Task Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1315
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1323
+#: calendar/gui/e-itip-control.c:1316
 msgid "Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1321
 msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1325
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1326
 msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1331
 msgid "Bad Free/Busy Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1413
+#: calendar/gui/e-itip-control.c:1406
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1472
+#: calendar/gui/e-itip-control.c:1465
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1503
+#: calendar/gui/e-itip-control.c:1496
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1535
+#: calendar/gui/e-itip-control.c:1528
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1769
+#: calendar/gui/e-itip-control.c:1762
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
+#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1825
+#: calendar/gui/e-itip-control.c:1818
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1837
+#: calendar/gui/e-itip-control.c:1830
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1856
+#: calendar/gui/e-itip-control.c:1849
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1852
 msgid "Object could not be found\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1855
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1865
+#: calendar/gui/e-itip-control.c:1858
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1861
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1892
 msgid "Removal Complete"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
 msgid "Item sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
+#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
 msgid "The item could not be sent!\n"
 msgstr ""
 
@@ -6217,74 +5975,74 @@ msgstr ""
 msgid "date-start"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:62
+#: calendar/gui/e-meeting-list-view.c:59
 msgid "Chair Persons"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:479
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
 msgid "Required Participants"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:64
+#: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:65
+#: calendar/gui/e-meeting-list-view.c:62
 msgid "Resources"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:140 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
 #: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:154 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:127
 #: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
 msgid "Required Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:179 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:177
 #: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
 msgid "Needs Action"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:182 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
 #: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr ""
@@ -6301,20 +6059,26 @@ msgstr ""
 msgid "No Information"
 msgstr ""
 
+#: calendar/gui/e-meeting-time-sel.c:417
+#, fuzzy
+msgid "Add attendees from addressbook"
+msgstr "نشانی"
+
 #: calendar/gui/e-meeting-time-sel.c:440
 msgid "_Options"
 msgstr ""
 
 #: calendar/gui/e-meeting-time-sel.c:457
-msgid "Show _Only Working Hours"
-msgstr ""
+#, fuzzy
+msgid "Show _only working hours"
+msgstr "نمایس هفته‌ی کاری"
 
 #: calendar/gui/e-meeting-time-sel.c:467
-msgid "Show _Zoomed Out"
+msgid "Show _zoomed out"
 msgstr ""
 
 #: calendar/gui/e-meeting-time-sel.c:482
-msgid "_Update Free/Busy"
+msgid "_Update free/busy"
 msgstr ""
 
 #: calendar/gui/e-meeting-time-sel.c:497
@@ -6330,19 +6094,19 @@ msgid ">_>"
 msgstr ""
 
 #: calendar/gui/e-meeting-time-sel.c:547
-msgid "_All People and Resources"
+msgid "_All people and resources"
 msgstr ""
 
 #: calendar/gui/e-meeting-time-sel.c:556
-msgid "All _People and One Resource"
+msgid "All _people and one resource"
 msgstr ""
 
 #: calendar/gui/e-meeting-time-sel.c:565
-msgid "_Required People"
+msgid "_Required people"
 msgstr ""
 
 #: calendar/gui/e-meeting-time-sel.c:574
-msgid "Required People and _One Resource"
+msgid "Required people and _one resource"
 msgstr ""
 
 #: calendar/gui/e-meeting-time-sel.c:593
@@ -6380,78 +6144,68 @@ msgstr ""
 msgid "Enter the password for %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
 #, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-
 #. FIXME Loading should be async
 #. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:686
+#: calendar/gui/e-tasks.c:801
 #, c-format
 msgid "Opening tasks at %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:709
+#: calendar/gui/e-tasks.c:824
 #, c-format
 msgid ""
 "Error opening %s:\n"
 "%s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:730
+#: calendar/gui/e-tasks.c:845
 msgid "Loading tasks"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:834
+#: calendar/gui/e-tasks.c:949
 msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:857
+#: calendar/gui/e-tasks.c:972
 msgid "Deleting selected objects..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:884
+#: calendar/gui/e-tasks.c:999
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:960
+#: calendar/gui/e-tasks.c:1075
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
-#: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
+#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
+#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
 #: calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:705
 msgid "Tasks"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1876
+#: calendar/gui/gnome-cal.c:1878
 #, c-format
 msgid "Loading appointments at %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1895
+#: calendar/gui/gnome-cal.c:1897
 #, c-format
 msgid "Loading tasks at %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1920
 #, c-format
 msgid "Opening %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2048
-#, c-format
-msgid "The calendar backend for '%s' has crashed."
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:2894
+#: calendar/gui/gnome-cal.c:2906
 msgid "Purging"
 msgstr ""
 
@@ -6643,7 +6397,7 @@ msgid "On The Web"
 msgstr ""
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 
@@ -6654,7 +6408,7 @@ msgid "Unable to migrate calendar `%s'"
 msgstr ""
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:869
+#: calendar/gui/migration.c:889
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr ""
@@ -6890,69 +6644,69 @@ msgstr ""
 msgid "Print Setup"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:303
+#: calendar/gui/tasks-component.c:313
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:371
 msgid "New Task List"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:398
+#: calendar/gui/tasks-component.c:408
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/tasks-component.c:447
+#: calendar/gui/tasks-component.c:457
 msgid "Failed upgrading tasks."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:526
+#: calendar/gui/tasks-component.c:749
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:538
+#: calendar/gui/tasks-component.c:761
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:576
+#: calendar/gui/tasks-component.c:799
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:804
+#: calendar/gui/tasks-component.c:1040
 msgid "New task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:805
+#: calendar/gui/tasks-component.c:1041
 msgid "_Task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:806
+#: calendar/gui/tasks-component.c:1042
 msgid "Create a new task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:812
+#: calendar/gui/tasks-component.c:1048
 msgid "New tasks group"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:813
+#: calendar/gui/tasks-component.c:1049
 msgid "_Tasks Group"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:814
+#: calendar/gui/tasks-component.c:1050
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "ایجاد پنجره‌ی جدید"
@@ -8707,12 +8461,12 @@ msgstr ""
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1259
+#: camel/camel-folder.c:1262
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1299
+#: camel/camel-folder.c:1302
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
@@ -8725,11 +8479,15 @@ msgstr ""
 msgid "Copying messages"
 msgstr ""
 
-#: camel/camel-folder.c:1666
-msgid "Learning junk and/or non junk message(s)"
+#: camel/camel-folder.c:1665
+msgid "Learning junk"
+msgstr ""
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
 msgstr ""
 
-#: camel/camel-folder.c:1695
+#: camel/camel-folder.c:1701
 msgid "Filtering new message(s)"
 msgstr ""
 
@@ -8759,15 +8517,15 @@ msgstr ""
 msgid "(match-threads) requires a match type string"
 msgstr ""
 
-#: camel/camel-folder-search.c:785
+#: camel/camel-folder-search.c:784
 msgid "(match-threads) expects an array result"
 msgstr ""
 
-#: camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:790
 msgid "(match-threads) requires the folder set"
 msgstr ""
 
-#: camel/camel-folder-search.c:880
+#: camel/camel-folder-search.c:879
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr ""
@@ -8797,7 +8555,8 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
 #: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:706
+#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr ""
@@ -9150,7 +8909,7 @@ msgstr ""
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1212
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -9503,40 +9262,40 @@ msgstr ""
 msgid "export keys: unimplemented"
 msgstr ""
 
-#: camel/camel-store.c:214
+#: camel/camel-store.c:213
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-store.c:244
+#: camel/camel-store.c:243
 #, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr ""
 
-#: camel/camel-store.c:295
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-store.c:323
+#: camel/camel-store.c:325
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr ""
 
-#: camel/camel-store.c:387 camel/camel-vee-store.c:354
+#: camel/camel-store.c:389 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr ""
 
-#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#: camel/camel-store.c:439 camel/camel-vee-store.c:387
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr ""
 
-#: camel/camel-store.c:811
+#: camel/camel-store.c:777
 msgid "Trash"
 msgstr ""
 
-#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
-#: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/mail-config.glade.h:95
+#: ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr ""
 
@@ -9743,12 +9502,12 @@ msgstr ""
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:374
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr ""
 
-#: camel/camel-vee-store.c:398
+#: camel/camel-vee-store.c:395
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr ""
@@ -9790,31 +9549,31 @@ msgstr "نشانی"
 msgid "Post Office Agent SOAP Port:"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:80
+#: camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "Novell GroupWise"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:82
+#: camel/providers/groupwise/camel-groupwise-provider.c:85
 msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: camel/providers/groupwise/camel-groupwise-provider.c:100
 #: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
 msgid "Password"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:99
+#: camel/providers/groupwise/camel-groupwise-provider.c:102
 #: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/groupwise/camel-gw-listener.c:305
-#: camel/providers/groupwise/camel-gw-listener.c:328
+#: camel/providers/groupwise/camel-gw-listener.c:312
+#: camel/providers/groupwise/camel-gw-listener.c:335
 #, fuzzy
 msgid "Checklist"
 msgstr "فهرست"
@@ -9942,13 +9701,13 @@ msgid ""
 msgstr ""
 
 #: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:429
+#: camel/providers/imap/camel-imap-store.c:428
 #, c-format
 msgid "IMAP server %s"
 msgstr ""
 
 #: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:431
+#: camel/providers/imap/camel-imap-store.c:430
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr ""
@@ -9958,7 +9717,7 @@ msgstr ""
 #: camel/providers/imap/camel-imap-store.c:551
 #: camel/providers/imap/camel-imap-store.c:571
 #: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
+#: camel/providers/nntp/camel-nntp-store.c:209
 #: camel/providers/pop3/camel-pop3-store.c:175
 #: camel/providers/smtp/camel-smtp-transport.c:269
 #: camel/providers/smtp/camel-smtp-transport.c:285
@@ -9975,10 +9734,10 @@ msgstr ""
 
 #: camel/providers/imap4/camel-imap4-store.c:222
 #: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:815
+#: camel/providers/imap/camel-imap-store.c:845
 #: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:137
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
 #: camel/providers/pop3/camel-pop3-store.c:192
 msgid "Connection cancelled"
 msgstr ""
@@ -9991,8 +9750,8 @@ msgid ""
 msgstr ""
 
 #: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:649
-#: camel/providers/imap/camel-imap-store.c:680
+#: camel/providers/imap/camel-imap-store.c:679
+#: camel/providers/imap/camel-imap-store.c:710
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
@@ -10001,7 +9760,7 @@ msgstr ""
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1109
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
 msgid "Unknown error"
 msgstr ""
 
@@ -10027,8 +9786,8 @@ msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr ""
 
 #: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1857
-#: camel/providers/imap/camel-imap-store.c:2235
+#: camel/providers/imap/camel-imap-store.c:1885
+#: camel/providers/imap/camel-imap-store.c:2263
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -10106,12 +9865,12 @@ msgstr ""
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3168
+#: camel/providers/imap/camel-imap-store.c:3194
 msgid "Operation cancelled"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3171
+#: camel/providers/imap/camel-imap-store.c:3197
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
@@ -10173,13 +9932,6 @@ msgid "Unable to retrieve message: %s"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:219
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -10187,15 +9939,15 @@ msgid ""
 msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-mbox-folder.c:418
+#: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:2019
-#: camel/providers/imap/camel-imap-folder.c:2621
-#: camel/providers/nntp/camel-nntp-folder.c:238
+#: camel/providers/imap/camel-imap-folder.c:2622
+#: camel/providers/nntp/camel-nntp-folder.c:220
 msgid "This message is not currently available"
 msgstr ""
 
@@ -10204,7 +9956,23 @@ msgstr ""
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2659
+#: camel/providers/imap/camel-imap-folder.c:2463
+#, c-format
+msgid "Incomplete server response: no information provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2471
+#, c-format
+msgid "Incomplete server response: no UID provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2484
+#, c-format
+msgid ""
+"Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2660
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -10262,43 +10030,43 @@ msgstr ""
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/imap/camel-imap-store.c:680
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:711
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:818
+#: camel/providers/imap/camel-imap-store.c:848
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1242
+#: camel/providers/imap/camel-imap-store.c:1272
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1252
+#: camel/providers/imap/camel-imap-store.c:1282
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1305
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1289
+#: camel/providers/imap/camel-imap-store.c:1319
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1318
+#: camel/providers/imap/camel-imap-store.c:1348
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10306,18 +10074,18 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1839
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:1867
+#: camel/providers/imap/camel-imap-store.c:2057
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1915
-#: camel/providers/imap/camel-imap-store.c:2296
+#: camel/providers/imap/camel-imap-store.c:1943
+#: camel/providers/imap/camel-imap-store.c:2324
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1970
+#: camel/providers/imap/camel-imap-store.c:1998
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10325,7 +10093,7 @@ msgstr ""
 msgid "Cannot create folder `%s': folder exists."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:2274
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr ""
@@ -10357,20 +10125,20 @@ msgid "Index message body data"
 msgstr ""
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:388
 #, c-format
 msgid "~%s (%s)"
 msgstr ""
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:393
-#: camel/providers/local/camel-local-folder.c:396
+#: camel/providers/local/camel-local-folder.c:392
+#: camel/providers/local/camel-local-folder.c:395
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr ""
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:400
+#: camel/providers/local/camel-local-folder.c:399
 #, c-format
 msgid "%s (%s)"
 msgstr ""
@@ -10426,7 +10194,7 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:142
 #: camel/providers/local/camel-local-store.c:253
-#: camel/providers/local/camel-mbox-store.c:356
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10499,8 +10267,23 @@ msgstr ""
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:226
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mbox-folder.c:417
+#: camel/providers/local/camel-mbox-folder.c:436
+#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:475
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-mh-folder.c:221
+#, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-folder.c:236
 msgid "Invalid message contents"
 msgstr ""
 
@@ -10541,9 +10324,9 @@ msgstr ""
 msgid "not a maildir directory"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:341
-#: camel/providers/local/camel-spool-store.c:286
-#: camel/providers/local/camel-spool-store.c:316
+#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-spool-store.c:284
+#: camel/providers/local/camel-spool-store.c:314
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr ""
@@ -10590,25 +10373,17 @@ msgstr ""
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:435
-#: camel/providers/local/camel-mbox-folder.c:466
-#: camel/providers/local/camel-mbox-folder.c:474
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:468
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:475
-msgid "Message construction failed: Corrupt mailbox?"
+#: camel/providers/local/camel-mbox-folder.c:476
+#: camel/providers/local/camel-mh-folder.c:222
+msgid "Message construction failed."
 msgstr ""
 
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:362
+#: camel/providers/local/camel-mbox-store.c:361
 msgid "Cannot create a folder by this name."
 msgstr ""
 
@@ -10636,30 +10411,30 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:375
+#: camel/providers/local/camel-mbox-store.c:374
 #, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:389
+#: camel/providers/local/camel-mbox-store.c:388
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:391
+#: camel/providers/local/camel-mbox-store.c:390
 msgid "Folder already exists"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:473
+#: camel/providers/local/camel-mbox-store.c:472
 msgid "The new folder name is illegal."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:486
+#: camel/providers/local/camel-mbox-store.c:485
 #, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:561
+#: camel/providers/local/camel-mbox-store.c:560
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr ""
@@ -10844,7 +10619,7 @@ msgid ""
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:997
+#: camel/providers/nntp/camel-nntp-store.c:1126
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr ""
@@ -10861,18 +10636,10 @@ msgstr ""
 msgid "Server rejected username/password"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:263
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:259
-#: camel/providers/nntp/camel-nntp-folder.c:265
+#: camel/providers/nntp/camel-nntp-folder.c:147
+#: camel/providers/nntp/camel-nntp-folder.c:149
+#: camel/providers/nntp/camel-nntp-folder.c:158
+#: camel/providers/nntp/camel-nntp-folder.c:234
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -10881,60 +10648,49 @@ msgstr ""
 msgid "Cannot get message %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:188
-#: camel/providers/nntp/camel-nntp-folder.c:228
-#, c-format
-msgid "Internal error: uid in invalid format: %s"
+#: camel/providers/nntp/camel-nntp-folder.c:156
+#: camel/providers/nntp/camel-nntp-folder.c:232
+#: camel/providers/nntp/camel-nntp-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+msgid "User cancelled"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:201
+#: camel/providers/nntp/camel-nntp-folder.c:176
+#: camel/providers/nntp/camel-nntp-folder.c:208
 #, c-format
-msgid "Could not get article %s from NNTP server"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:362
-msgid "Posting not allowed by news server"
+msgid "Internal error: uid in invalid format: %s"
 msgstr ""
 
+#: camel/providers/nntp/camel-nntp-folder.c:328
+#: camel/providers/nntp/camel-nntp-folder.c:331
 #: camel/providers/nntp/camel-nntp-folder.c:373
+#: camel/providers/nntp/camel-nntp-folder.c:375
 #, c-format
-msgid "Failed to send newsgroups header: %s: message not posted"
+msgid "Posting failed: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:413
-#: camel/providers/nntp/camel-nntp-folder.c:426
-#, c-format
-msgid "Error posting to newsgroup: %s: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:438
-msgid "Error reading response to posted message: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:441
-#, c-format
-msgid "Error posting message: %s: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:457
+#: camel/providers/nntp/camel-nntp-folder.c:393
 msgid "You cannot post NNTP messages while working offline!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:468
+#: camel/providers/nntp/camel-nntp-folder.c:404
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:44
 msgid "Could not get group list from server."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#: camel/providers/nntp/camel-nntp-grouplist.c:97
+#: camel/providers/nntp/camel-nntp-grouplist.c:106
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#: camel/providers/nntp/camel-nntp-grouplist.c:157
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr ""
@@ -10962,26 +10718,29 @@ msgid ""
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:158
+#: camel/providers/nntp/camel-nntp-store.c:118
+#: camel/providers/nntp/camel-nntp-store.c:1233
+#: camel/providers/nntp/camel-nntp-store.c:1331
+#, c-format
+msgid "NNTP Command failed: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:227
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:170
+#: camel/providers/nntp/camel-nntp-store.c:239
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:326
+#: camel/providers/nntp/camel-nntp-store.c:403
 #, c-format
 msgid "USENET News via %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:640
-msgid "Stream error"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-store.c:643
+#: camel/providers/nntp/camel-nntp-store.c:777
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -10989,72 +10748,71 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:735
+#: camel/providers/nntp/camel-nntp-store.c:872
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
 "No such newsgroup. The selected item is a probably a parent folder."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:767
+#: camel/providers/nntp/camel-nntp-store.c:904
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
 "newsgroup does not exist!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:792
+#: camel/providers/nntp/camel-nntp-store.c:929
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:800
+#: camel/providers/nntp/camel-nntp-store.c:937
 msgid "You cannot rename a folder in a News store."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:808
+#: camel/providers/nntp/camel-nntp-store.c:945
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:253
-#, c-format
-msgid "Connection error: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1118
+msgid "Authentication requested but not username provided"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:262
+#: camel/providers/nntp/camel-nntp-store.c:1146
 #, c-format
-msgid "No such folder: %s"
+msgid "Cannot authenticate to server: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:268
-#, c-format
-msgid "Could not get group: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1262
+msgid "Not connected."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:333
-msgid "Could not get messages: unspecified error"
+#: camel/providers/nntp/camel-nntp-store.c:1311
+#, c-format
+msgid "No such folder: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:378
+#: camel/providers/nntp/camel-nntp-summary.c:218
+#: camel/providers/nntp/camel-nntp-summary.c:314
 #, c-format
-msgid "NNTP Command failed: %s"
+msgid "%s: Scanning new messages"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:438
-#: camel/providers/nntp/camel-nntp-summary.c:543
+#: camel/providers/nntp/camel-nntp-summary.c:225
 #, c-format
-msgid "%s: Scanning new messages"
+msgid "Unexpected server response from xover: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:558
+#: camel/providers/nntp/camel-nntp-summary.c:328
 #, c-format
-msgid "Unknown server response: %s"
+msgid "Unexpected server response from head: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:605
+#: camel/providers/nntp/camel-nntp-summary.c:368
 msgid "Use cancel"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:607
+#: camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
 msgid "Operation failed: %s"
 msgstr ""
@@ -11102,7 +10860,7 @@ msgstr ""
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107
 msgid "POP"
 msgstr ""
 
@@ -11182,7 +10940,7 @@ msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:132
 msgid "Sendmail"
 msgstr ""
 
@@ -11234,7 +10992,7 @@ msgstr ""
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:119
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122
 msgid "SMTP"
 msgstr ""
 
@@ -11515,19 +11273,19 @@ msgstr ""
 msgid "%.0fG"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
+#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:408
 msgid "attachment"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:454
 msgid "Remove selected items from the attachment list"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:491
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Add attachment..."
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:495
 msgid "Attach a file to the message"
 msgstr ""
 
@@ -11587,7 +11345,7 @@ msgstr "ایالات متحده"
 msgid "Open file"
 msgstr ""
 
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
 msgid "Autogenerated"
 msgstr ""
 
@@ -11721,17 +11479,17 @@ msgstr ""
 
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
-msgid "You cannot attach the file `${0}' to this message."
+msgid "You cannot attach the file `{0}' to this message."
 msgstr ""
 
 #. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4
-msgid "${1}"
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
 msgstr ""
 
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
 
 #. mail-composer:attach-directory primary
@@ -11819,7 +11577,7 @@ msgstr ""
 
 #. mail-composer:no-build-message secondary
 #: composer/mail-composer-errors.xml.h:34
-msgid "Because \"${0}\", you may need to select different mail options."
+msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
@@ -11828,8 +11586,10 @@ msgid "Could not read signature file \"{0}\"."
 msgstr ""
 
 #. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38
-msgid "Because \"${1}\"."
+#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted primary
@@ -12226,11 +11986,11 @@ msgid "<b>Then</b>"
 msgstr ""
 
 #: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1335
+#: mail/mail-account-gui.c:1347
 msgid "Select Folder"
 msgstr ""
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
 msgid "    "
 msgstr ""
 
@@ -12280,7 +12040,7 @@ msgstr ""
 msgid "months"
 msgstr ""
 
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
 msgid "seconds"
 msgstr ""
 
@@ -12312,20 +12072,20 @@ msgstr ""
 msgid "years"
 msgstr ""
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:916
-#: mail/mail-config.c:76 mail/mail-config.glade.h:90
+#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
+#: mail/mail-config.glade.h:93
 msgid "Important"
 msgstr ""
 
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:919 mail/mail-config.c:79
-#: mail/mail-config.glade.h:145
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: mail/mail-config.glade.h:148
 msgid "To Do"
 msgstr ""
 
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:920 mail/mail-config.c:80
-#: mail/mail-config.glade.h:94
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: mail/mail-config.glade.h:97
 msgid "Later"
 msgstr ""
 
@@ -12379,253 +12139,6 @@ msgstr ""
 msgid "outgoing"
 msgstr ""
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Adjust Score"
-msgstr ""
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Color"
-msgstr ""
-
-#: filter/libfilter-i18n.h:4
-msgid "Assign Score"
-msgstr ""
-
-#: filter/libfilter-i18n.h:5
-msgid "Attachments"
-msgstr ""
-
-#: filter/libfilter-i18n.h:6
-msgid "Beep"
-msgstr ""
-
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr ""
-
-#: filter/libfilter-i18n.h:8
-msgid "Copy to Folder"
-msgstr ""
-
-#: filter/libfilter-i18n.h:9
-msgid "Date received"
-msgstr ""
-
-#: filter/libfilter-i18n.h:10
-msgid "Date sent"
-msgstr ""
-
-#: filter/libfilter-i18n.h:12
-msgid "Deleted"
-msgstr ""
-
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr ""
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr ""
-
-#: filter/libfilter-i18n.h:16
-msgid "does not return"
-msgstr ""
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr ""
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
-msgstr ""
-
-#: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr ""
-
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr ""
-
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr ""
-
-#: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr ""
-
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr ""
-
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr ""
-
-#: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr ""
-
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr ""
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr ""
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr ""
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr ""
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr ""
-
-#: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr ""
-
-#: filter/libfilter-i18n.h:36
-msgid "Junk Test"
-msgstr ""
-
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
-#: widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr ""
-
-#: filter/libfilter-i18n.h:38
-msgid "Mailing list"
-msgstr ""
-
-#: filter/libfilter-i18n.h:39
-msgid "Message Body"
-msgstr ""
-
-#: filter/libfilter-i18n.h:40
-msgid "Message Header"
-msgstr ""
-
-#: filter/libfilter-i18n.h:41
-#, fuzzy
-msgid "Message is Junk"
-msgstr "_پیغام‌ها"
-
-#: filter/libfilter-i18n.h:42
-msgid "Message is not Junk"
-msgstr ""
-
-#: filter/libfilter-i18n.h:43
-msgid "Move to Folder"
-msgstr ""
-
-#: filter/libfilter-i18n.h:44
-msgid "Pipe to Program"
-msgstr ""
-
-#: filter/libfilter-i18n.h:45
-msgid "Play Sound"
-msgstr ""
-
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
-msgid "Read"
-msgstr ""
-
-#: filter/libfilter-i18n.h:47
-msgid "Recipients"
-msgstr ""
-
-#: filter/libfilter-i18n.h:48
-msgid "Regex Match"
-msgstr ""
-
-#: filter/libfilter-i18n.h:49
-msgid "Replied to"
-msgstr ""
-
-#: filter/libfilter-i18n.h:50
-msgid "returns"
-msgstr ""
-
-#: filter/libfilter-i18n.h:51
-msgid "returns greater than"
-msgstr ""
-
-#: filter/libfilter-i18n.h:52
-msgid "returns less than"
-msgstr ""
-
-#: filter/libfilter-i18n.h:53
-msgid "Run Program"
-msgstr ""
-
-#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr ""
-
-#: filter/libfilter-i18n.h:55
-msgid "Sender"
-msgstr ""
-
-#: filter/libfilter-i18n.h:56
-msgid "Set Status"
-msgstr ""
-
-#: filter/libfilter-i18n.h:57
-msgid "Size (kB)"
-msgstr ""
-
-#: filter/libfilter-i18n.h:58
-msgid "sounds like"
-msgstr ""
-
-#: filter/libfilter-i18n.h:59
-msgid "Source Account"
-msgstr ""
-
-#: filter/libfilter-i18n.h:60
-msgid "Specific header"
-msgstr ""
-
-#: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:63
-msgid "Stop Processing"
-msgstr ""
-
-#: filter/libfilter-i18n.h:64 mail/em-format.c:755 mail/em-format-html.c:1519
-#: mail/em-format-quote.c:302 mail/em-mailer-prefs.c:87
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
-#: smime/lib/e-cert.c:1079
-msgid "Subject"
-msgstr ""
-
-#: filter/libfilter-i18n.h:65
-msgid "Unset Status"
-msgstr ""
-
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr ""
@@ -12642,6 +12155,11 @@ msgstr ""
 msgid "_Score Rules"
 msgstr ""
 
+#: filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr ""
+
 #: filter/searchtypes.xml.h:1
 msgid "Body contains"
 msgstr ""
@@ -12721,13 +12239,13 @@ msgstr ""
 msgid "-------- Forwarded Message --------"
 msgstr ""
 
-#: mail/em-composer-utils.c:1499
+#: mail/em-composer-utils.c:1495
 msgid "an unknown sender"
 msgstr ""
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1509
+#: mail/em-composer-utils.c:1505
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr ""
 
@@ -12766,8 +12284,8 @@ msgstr ""
 msgid "Create New Folder"
 msgstr ""
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
-#: mail/mail-component.c:701
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
+#: mail/mail-component.c:704
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr ""
@@ -12782,102 +12300,103 @@ msgstr "کرواسی"
 msgid "Folder _name:"
 msgstr ""
 
-#: mail/em-folder-tree.c:839
+#: mail/em-folder-tree.c:833
 #, c-format
 msgid "Moving folder %s"
 msgstr ""
 
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree.c:835
 #, c-format
 msgid "Copying folder %s"
 msgstr ""
 
-#: mail/em-folder-tree.c:848 mail/message-list.c:1555
+#: mail/em-folder-tree.c:842 mail/message-list.c:1561
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "_پیغام‌ها"
 
-#: mail/em-folder-tree.c:850 mail/message-list.c:1557
+#: mail/em-folder-tree.c:844 mail/message-list.c:1563
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr ""
 
-#: mail/em-folder-tree.c:866
+#: mail/em-folder-tree.c:860
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 
-#: mail/em-folder-tree.c:956 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:957 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2069
-#: mail/em-folder-tree.c:2551 mail/em-folder-view.c:798
-#: mail/message-list.c:1645
+#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
+#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
+#: mail/message-list.c:1651
 msgid "_Move"
 msgstr ""
 
-#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#: mail/em-folder-tree.c:955 mail/message-list.c:1653
 msgid "Cancel _Drag"
 msgstr ""
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
 #: mail/em-folder-view.c:798 mail/em-folder-view.c:812
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
 #, fuzzy
 msgid "C_opy"
 msgstr "فرمان:"
 
-#: mail/em-folder-tree.c:2096
+#: mail/em-folder-tree.c:2088
 #, c-format
 msgid "Creating folder `%s'"
 msgstr ""
 
-#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
+#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
 msgid "Create folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:2474
+#: mail/em-folder-tree.c:2463
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr ""
 
-#: mail/em-folder-tree.c:2476
+#: mail/em-folder-tree.c:2465
 msgid "Rename Folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:2545 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr ""
 
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2537
 msgid "Open in _New Window"
 msgstr ""
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2555
+#: mail/em-folder-tree.c:2546
 msgid "_New Folder..."
 msgstr ""
 
-#: mail/em-folder-tree.c:2558
+#: mail/em-folder-tree.c:2549
 msgid "_Rename"
 msgstr ""
 
-#: mail/em-folder-tree.c:2561 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr ""
 
 #: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:889
+#: mail/mail-vfolder.c:888
 msgid "VFolders"
 msgstr ""
 
@@ -12891,19 +12410,19 @@ msgstr ""
 msgid "Inbox"
 msgstr ""
 
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
 msgid "Loading..."
 msgstr ""
 
 #: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
 #: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
 #: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:551
+#: mail/mail-component.c:554
 msgid "Mail"
 msgstr ""
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr ""
@@ -12916,17 +12435,17 @@ msgstr ""
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:810
+#: mail/em-folder-view.c:901 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr ""
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:811
+#: mail/em-folder-view.c:902 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr ""
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: mail/em-folder-view.c:903 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr ""
@@ -12979,6 +12498,10 @@ msgstr ""
 msgid "_Copy to Folder..."
 msgstr ""
 
+#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr ""
+
 #: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr ""
@@ -13028,12 +12551,12 @@ msgid "Filter on _Mailing List"
 msgstr ""
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
-#: mail/mail-config.glade.h:66
+#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr ""
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1796
 msgid "Print Message"
 msgstr ""
 
@@ -13072,12 +12595,18 @@ msgstr ""
 msgid "Bcc"
 msgstr ""
 
+#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
+#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr ""
+
 #: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
 #: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr ""
 
-#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
+#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
 msgid "Newsgroups"
 msgstr ""
 
@@ -13256,7 +12785,7 @@ msgid ""
 "practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:757
+#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
 msgid "_View Certificate"
 msgstr ""
 
@@ -13309,7 +12838,7 @@ msgstr ""
 msgid "Once per month"
 msgstr ""
 
-#: mail/em-migrate.c:1072
+#: mail/em-migrate.c:1168
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13317,82 +12846,82 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1506
+#: mail/em-migrate.c:1602
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:1532
+#: mail/em-migrate.c:1628
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:1715
+#: mail/em-migrate.c:1811
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:1919
+#: mail/em-migrate.c:2015
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:1933
+#: mail/em-migrate.c:2029
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:1962
+#: mail/em-migrate.c:2058
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#: mail/em-migrate.c:2413 mail/em-migrate.c:2425
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2480
+#: mail/em-migrate.c:2576
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2498
+#: mail/em-migrate.c:2594
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 msgstr ""
 
-#: mail/em-popup.c:699
+#: mail/em-popup.c:700
 msgid "Save As..."
 msgstr ""
 
-#: mail/em-popup.c:717
+#: mail/em-popup.c:718
 #, c-format
 msgid "untitled_image.%s"
 msgstr ""
 
-#: mail/em-popup.c:807
+#: mail/em-popup.c:808
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:809
+#: mail/em-popup.c:810
 msgid "_Reply to sender"
 msgstr ""
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:859
 msgid "_Open Link in Browser"
 msgstr ""
 
-#: mail/em-popup.c:859
+#: mail/em-popup.c:860
 msgid "Se_nd message to..."
 msgstr ""
 
-#: mail/em-popup.c:860
+#: mail/em-popup.c:861
 msgid "_Add to Addressbook"
 msgstr ""
 
-#: mail/em-popup.c:966
+#: mail/em-popup.c:967
 #, c-format
 msgid "Open in %s..."
 msgstr ""
@@ -13944,7 +13473,7 @@ msgstr ""
 msgid "Mail Accounts"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
 msgid "Mail Preferences"
 msgstr ""
 
@@ -13958,15 +13487,15 @@ msgid "Evolution is importing your old Elm mail"
 msgstr ""
 
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:226
+#: mail/importers/evolution-mbox-importer.c:221
+#: mail/importers/evolution-outlook-importer.c:255
 #: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr ""
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:222
-#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/evolution-mbox-importer.c:223
+#: mail/importers/evolution-outlook-importer.c:257
 #: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr ""
@@ -13986,21 +13515,23 @@ msgid "Elm"
 msgstr ""
 
 #: mail/importers/evolution-mbox-importer.c:116
+#: mail/importers/evolution-outlook-importer.c:130
 msgid "Destination folder:"
 msgstr ""
 
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder to import into"
 msgstr ""
 
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:254
 #: mail/importers/mail-importer.c:226
 #, c-format
 msgid "Importing `%s'"
 msgstr ""
 
-#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/evolution-outlook-importer.c:301
 #: mail/importers/mail-importer.c:140
 msgid "Importing mailbox"
 msgstr ""
@@ -14138,15 +13669,15 @@ msgstr ""
 msgid "%s License Agreement"
 msgstr ""
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
 msgid "_Host:"
 msgstr ""
 
-#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
 msgid "User_name:"
 msgstr ""
 
-#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
 msgid "_Path:"
 msgstr ""
 
@@ -14209,33 +13740,33 @@ msgstr ""
 msgid ", %d unread"
 msgstr ""
 
-#: mail/mail-component.c:653
+#: mail/mail-component.c:656
 msgid "New Mail Message"
 msgstr ""
 
-#: mail/mail-component.c:654
+#: mail/mail-component.c:657
 msgid "_Mail Message"
 msgstr ""
 
-#: mail/mail-component.c:655
+#: mail/mail-component.c:658
 msgid "Compose a new mail message"
 msgstr ""
 
-#: mail/mail-component.c:661
+#: mail/mail-component.c:664
 msgid "New Mail Folder"
 msgstr ""
 
-#: mail/mail-component.c:662
+#: mail/mail-component.c:665
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "_پوشه"
 
-#: mail/mail-component.c:663
+#: mail/mail-component.c:666
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "ایجاد پنجره‌ی جدید"
 
-#: mail/mail-component.c:795
+#: mail/mail-component.c:798
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
@@ -14247,7 +13778,7 @@ msgstr ""
 msgid "Connecting to server..."
 msgstr ""
 
-#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr ""
 
@@ -14259,7 +13790,7 @@ msgid ""
 msgstr ""
 
 #: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid "Receiving Mail"
 msgstr ""
 
@@ -14273,7 +13804,7 @@ msgstr ""
 msgid "Please select among the following options"
 msgstr ""
 
-#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr ""
 
@@ -14283,7 +13814,7 @@ msgid ""
 "sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37
 msgid "Account Management"
 msgstr ""
 
@@ -14296,229 +13827,233 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:2
 msgid " Ch_eck for Supported Types "
 msgstr ""
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "<b>Preview</b>"
 msgstr "قبلی"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr ""
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "<b>S_ignatures</b>"
 msgstr ""
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "<b>_Languages</b>"
 msgstr ""
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
+msgid "<small>This will make the the filter more reliable, but slower</small>"
+msgstr ""
+
+#: mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Checking for New Mail</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">General</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Security</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:34
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:35
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:36
 msgid "Account Editor"
 msgstr ""
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:38
 msgid "Add Ne_w Signature..."
 msgstr ""
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "Add _Script"
 msgstr ""
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:40
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:44
 msgid "Always _sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Attach original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr ""
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:48
 msgid "Automatically _insert smiley images"
 msgstr ""
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Automatically check for _new mail every"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Beep w_hen new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "C_haracter set:"
 msgstr ""
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 msgid "Ch_eck for Supported Types "
 msgstr ""
 
-#: mail/mail-config.glade.h:53
-msgid "Check _Incoming Mail"
+#: mail/mail-config.glade.h:55
+msgid "Check _incoming mail for junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 msgid "Color for _misspelled words:"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Colors"
 msgstr "کومورو"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 msgid "Confirm _when expunging a folder"
 msgstr ""
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14528,359 +14063,355 @@ msgid ""
 "Click \"Apply\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
 msgid "De_fault"
 msgstr ""
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 msgid "Default character e_ncoding:"
 msgstr ""
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 #, fuzzy
 msgid "Defaults"
 msgstr "جزئیات"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 msgid "Do not quote original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr ""
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Drafts _Folder:"
 msgstr "_پوشه:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:77
 msgid "Email Accounts"
 msgstr ""
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Email _Address:"
 msgstr "نشانی پست الکترونیکی:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:79
 msgid "Empty trash folders on e_xit"
 msgstr ""
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
 msgid "Encry_ption certificate:"
 msgstr ""
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:81
 msgid "Evolution Account Assistant"
 msgstr ""
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:82
 msgid "Execute Command..."
 msgstr ""
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:83
 msgid "Fi_xed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 msgid "Font Properties"
 msgstr ""
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 msgid "Format messages in _HTML"
 msgstr ""
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:87
 msgid "HTML Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Headers"
 msgstr "اعضا"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr ""
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 msgid "IMAPv4 "
 msgstr ""
 
 #: mail/mail-config.glade.h:91
+msgid "I_nclude remote tests"
+msgstr ""
+
+#: mail/mail-config.glade.h:94
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Kerberos "
 msgstr ""
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Mail Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr ""
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr ""
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Or_ganization:"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "PGP/GPG _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Play sound file when new mail arri_ves"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr ""
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 msgid "Re_member password"
 msgstr ""
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr ""
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:120
 msgid "Receiving Options"
 msgstr ""
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
 msgid "Remember _password"
 msgstr ""
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
 msgid "S_tandard Font:"
 msgstr ""
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 msgid "Security"
 msgstr ""
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:126
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:127
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:128
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:129
 #, fuzzy
 msgid "Select..."
 msgstr "_حذف شود..."
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:133
 msgid "Sent _Messages Folder:"
 msgstr ""
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:134
 msgid "Ser_ver requires authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:135
 msgid "Server _Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:136
 msgid "Si_gning certificate:"
 msgstr ""
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:137
 #, fuzzy
 msgid "Signat_ure:"
 msgstr "سنگاپور"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "Signatures"
 msgstr "سنگاپور"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr ""
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:140
 msgid "Spell Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:141
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:142
 msgid "T_erminal Font:"
 msgstr ""
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:143
 msgid "T_ype: "
 msgstr ""
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:149
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:148
-msgid "Use _Daemon"
-msgstr ""
-
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:152
 msgid "V_ariable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:153
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Forward\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:158
 msgid "_Add Signature"
 msgstr ""
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:159
 msgid "_Always load images from the Internet"
 msgstr ""
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:160
 msgid "_Digitally sign outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:161
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:163
 msgid "_Enable"
 msgstr ""
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:165
 msgid "_Forward style:"
 msgstr ""
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:168
 msgid "_Load images if sender is in address book"
 msgstr ""
 
-#: mail/mail-config.glade.h:167
-msgid "_Local Tests Only"
-msgstr ""
-
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_Mark messages as read after"
 msgstr ""
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 msgid "_Never load images from the Internet"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:175
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:176
 msgid "_Reply style:"
 msgstr ""
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:177
 msgid "_Script:"
 msgstr ""
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:178
 msgid "_Show animated images"
 msgstr ""
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 msgid "_Use Secure Connection (SSL):"
 msgstr ""
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:181
 msgid "color"
 msgstr ""
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr ""
 
@@ -15035,7 +14566,7 @@ msgstr ""
 
 #. mail:camel-exception primary
 #: mail/mail-errors.xml.h:57
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgid "Your message with the subject \"{0}\" was not delivered."
 msgstr ""
 
 #. mail:camel-exception secondary
@@ -15090,11 +14621,6 @@ msgstr ""
 msgid "Cannot save to directory \"{0}\"."
 msgstr ""
 
-#. mail:no-save-path secondary
-#: mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail:no-create-path primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
@@ -15111,12 +14637,6 @@ msgstr ""
 msgid "Cannot create temporary save directory."
 msgstr ""
 
-#. mail:no-create-tmp-path secondary
-#: mail/mail-errors.xml.h:100 mail/mail-errors.xml.h:112
-#: widgets/misc/e-system-errors.xml.h:11 widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail:no-write-path-exists secondary
 #: mail/mail-errors.xml.h:104
 msgid "File exists but cannot overwrite it."
@@ -15357,179 +14877,175 @@ msgstr ""
 msgid "_Append"
 msgstr ""
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:785
 #, c-format
 msgid "Pinging %s"
 msgstr ""
 
-#: mail/mail-mt.c:897
-msgid "Working"
-msgstr ""
-
-#: mail/mail-ops.c:99
+#: mail/mail-ops.c:98
 msgid "Filtering Folder"
 msgstr ""
 
-#: mail/mail-ops.c:260
+#: mail/mail-ops.c:259
 msgid "Fetching Mail"
 msgstr ""
 
-#: mail/mail-ops.c:543
+#: mail/mail-ops.c:542
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr ""
 
-#: mail/mail-ops.c:568
+#: mail/mail-ops.c:567
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:577
+#: mail/mail-ops.c:576
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr ""
 
-#: mail/mail-ops.c:673
+#: mail/mail-ops.c:672
 #, c-format
 msgid "Sending message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:703
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr ""
 
-#: mail/mail-ops.c:708
+#: mail/mail-ops.c:707
 msgid "Complete."
 msgstr ""
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:804
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:1002
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1116
+#: mail/mail-ops.c:1115
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1159
+#: mail/mail-ops.c:1158
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1230
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1308
 #, c-format
 msgid "Removing folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1403
+#: mail/mail-ops.c:1402
 #, c-format
 msgid "Storing folder '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1468
+#: mail/mail-ops.c:1467
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1469
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1524
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr ""
 
-#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
+#: mail/mail-ops.c:1559 mail/mail-ops.c:1610
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1607
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1609
+#: mail/mail-ops.c:1608
 msgid "Local Folders"
 msgstr ""
 
-#: mail/mail-ops.c:1692
+#: mail/mail-ops.c:1691
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1764
+#: mail/mail-ops.c:1763
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: mail/mail-ops.c:1850
+#: mail/mail-ops.c:1849
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: mail/mail-ops.c:1900
+#: mail/mail-ops.c:1899
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1928
+#: mail/mail-ops.c:1927
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1999
+#: mail/mail-ops.c:1998
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:2016
+#: mail/mail-ops.c:2015
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2046
+#: mail/mail-ops.c:2045
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Reconnecting to %s"
 msgstr ""
@@ -15593,24 +15109,24 @@ msgstr ""
 msgid "Waiting..."
 msgstr ""
 
-#: mail/mail-session.c:238
+#: mail/mail-session.c:239
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-session.c:271
+#: mail/mail-session.c:272
 #, c-format
 msgid "Enter Password for %s"
 msgstr ""
 
-#: mail/mail-session.c:273
+#: mail/mail-session.c:274
 msgid "Enter Password"
 msgstr ""
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password"
 msgstr ""
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:298
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
@@ -15665,79 +15181,79 @@ msgstr ""
 msgid "Updating vFolders for '%s'"
 msgstr ""
 
-#: mail/mail-vfolder.c:959
+#: mail/mail-vfolder.c:958
 msgid "vFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:998
+#: mail/mail-vfolder.c:997
 msgid "Edit VFolder"
 msgstr ""
 
-#: mail/mail-vfolder.c:1082
+#: mail/mail-vfolder.c:1081
 msgid "New VFolder"
 msgstr ""
 
-#: mail/message-list.c:946
+#: mail/message-list.c:948
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:947
+#: mail/message-list.c:949
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:948
+#: mail/message-list.c:950
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:949
+#: mail/message-list.c:951
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:950
+#: mail/message-list.c:952
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:954
+#: mail/message-list.c:956
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:955
+#: mail/message-list.c:957
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:959
+#: mail/message-list.c:961
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:960
+#: mail/message-list.c:962
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:1279
+#: mail/message-list.c:1285
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:1286
+#: mail/message-list.c:1292
 msgid "Today %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1295
+#: mail/message-list.c:1301
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1307
+#: mail/message-list.c:1313
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1315
+#: mail/message-list.c:1321
 msgid "%b %d %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1317
+#: mail/message-list.c:1323
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:3300
+#: mail/message-list.c:3321
 msgid "Generating message list"
 msgstr ""
 
@@ -15793,6 +15309,10 @@ msgstr ""
 msgid "No Response Necessary"
 msgstr ""
 
+#: mail/message-tag-followup.c:79
+msgid "Read"
+msgstr ""
+
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr ""
@@ -15889,43 +15409,47 @@ msgid ""
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:10
-msgid "Whether Evolution should start up in offline mode"
+msgid "Toolbar is visible"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:11
-msgid "Whether to skip the development warning dialog"
+msgid "Whether Evolution should start up in offline mode"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:12
-msgid "mail"
+msgid "Whether the toolbar should be visible."
 msgstr ""
 
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+msgid "Whether to skip the development warning dialog"
 msgstr ""
 
-#: shell/e-shell.c:545 shell/e-shell.c:546
+#: shell/apps_evolution_shell.schemas.in.in.h:14
+msgid "mail"
+msgstr ""
+
+#: shell/e-shell.c:588 shell/e-shell.c:589
 #, c-format
 msgid "%ld KB"
 msgstr ""
 
-#: shell/e-shell.c:744
+#: shell/e-shell.c:786
 msgid "Uknown system error."
 msgstr ""
 
-#: shell/e-shell.c:1101
+#: shell/e-shell.c:1143
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:1103
+#: shell/e-shell.c:1145
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:1105
+#: shell/e-shell.c:1147
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:1107
+#: shell/e-shell.c:1149
 msgid "Generic error"
 msgstr ""
 
@@ -15973,7 +15497,7 @@ msgstr ""
 msgid "Select importer"
 msgstr ""
 
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1026
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
 #, c-format
 msgid "File %s does not exist"
 msgstr ""
@@ -15999,55 +15523,56 @@ msgid ""
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:549
+#: shell/e-shell-importer.c:570
 msgid "Automatic"
 msgstr ""
 
-#: shell/e-shell-importer.c:598
-msgid "_Filename:"
+#: shell/e-shell-importer.c:626
+#, fuzzy
+msgid "F_ilename:"
 msgstr "_نام پرونده:"
 
-#: shell/e-shell-importer.c:603
+#: shell/e-shell-importer.c:631
 msgid "Select a file"
 msgstr ""
 
-#: shell/e-shell-importer.c:613
+#: shell/e-shell-importer.c:642
 msgid "File _type:"
 msgstr ""
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:681
 msgid "Import data and settings from _older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:684
 msgid "Import a _single file"
 msgstr ""
 
-#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:727
+#: shell/e-shell-importer.c:756
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:853 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
 #, c-format
 msgid "From %s:"
 msgstr ""
 
-#: shell/e-shell-importer.c:1044
+#: shell/e-shell-importer.c:1073
 #, c-format
 msgid "No importer available for file %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:1056
+#: shell/e-shell-importer.c:1085
 msgid "Unable to execute importer"
 msgstr ""
 
-#: shell/e-shell-importer.c:1169
+#: shell/e-shell-importer.c:1199
 msgid "_Import"
 msgstr ""
 
@@ -16092,53 +15617,53 @@ msgstr ""
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: shell/e-shell-window.c:336
+#: shell/e-shell-window.c:337
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-window.c:343
+#: shell/e-shell-window.c:344
 msgid "Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-window.c:349
+#: shell/e-shell-window.c:350
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell-window.c:621
+#: shell/e-shell-window.c:637
 #, c-format
 msgid "Switch to %s"
 msgstr ""
 
-#: shell/e-shell-window-commands.c:64
+#: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: shell/e-shell-window-commands.c:72
+#: shell/e-shell-window-commands.c:74
 #, c-format
 msgid "Error executing %s."
 msgstr ""
 
-#: shell/e-shell-window-commands.c:121
+#: shell/e-shell-window-commands.c:123
 msgid "Bug buddy is not installed."
 msgstr ""
 
-#: shell/e-shell-window-commands.c:129
+#: shell/e-shell-window-commands.c:131
 msgid "Bug buddy could not be run."
 msgstr ""
 
-#: shell/e-shell-window-commands.c:171
-msgid "About Evolution"
+#: shell/e-shell-window-commands.c:323
+msgid "Groupware Suite"
 msgstr ""
 
-#: shell/e-shell-window-commands.c:382
+#: shell/e-shell-window-commands.c:563
 msgid "_Work Online"
 msgstr ""
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr ""
 
-#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr ""
 
@@ -16150,32 +15675,6 @@ msgstr ""
 msgid "New"
 msgstr ""
 
-#: shell/evolution-shell-component-utils.c:115
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-
-#: shell/evolution-shell-component-utils.c:118
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-
-#: shell/evolution-shell-component-utils.c:125
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-
 #: shell/evolution-test-component.c:140
 msgid "New Test"
 msgstr ""
@@ -16473,30 +15972,30 @@ msgid ""
 "Click help for details."
 msgstr ""
 
-#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:522
+#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
+#: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
 msgstr ""
 
-#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:604
+#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
+#: smime/gui/certificate-manager.c:638
 msgid "Certificate Name"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
+#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
 msgid "Purposes"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:517
+#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:267
+#: smime/gui/certificate-manager.c:271
 msgid "Expires"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:417
+#: smime/gui/certificate-manager.c:446
 msgid "E-Mail Address"
 msgstr "نشانی پست الکترونیکی"
 
@@ -16534,6 +16033,11 @@ msgid ""
 "  Subject: %s\n"
 msgstr ""
 
+#: smime/gui/e-cert-selector.c:169
+#, fuzzy
+msgid "Select certificate"
+msgstr "انتخاب نام‌ها"
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -16588,7 +16092,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
 msgid "Certificate"
 msgstr ""
 
@@ -16608,19 +16112,22 @@ msgstr ""
 msgid "Contact Certificates"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:21
-#, no-c-format
-msgid "Do you want to trust \"%s\" for the following purposes?"
+#: smime/gui/smime-ui.glade.h:20
+msgid "Do not trust the authenticity of this certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:21
 msgid "Dummy window only"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:22
 msgid "Edit"
 msgstr "ویرایش"
 
+#: smime/gui/smime-ui.glade.h:23
+msgid "Email Certificate Trust Settings"
+msgstr ""
+
 #: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr ""
@@ -16653,247 +16160,258 @@ msgstr "واحد سازمانی (وس)"
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:37
-msgid "Trust this CA to identify email users."
+msgid "Trust the authenticity of this certificate"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:38
-msgid "Trust this CA to identify software developers."
+msgid "Trust this CA to identify email users."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:39
-msgid "Trust this CA to identify web sites."
+msgid "Trust this CA to identify software developers."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:40
-msgid "View"
+msgid "Trust this CA to identify web sites."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:41
-msgid "View Certificate"
+msgid "View"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:42
-msgid "You have been asked to trust a new Certificate Authority (CA)."
+msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:43
-msgid "You have certificates from these organizations that identify you:"
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:44
-msgid ""
-"You have certificates on file that identify these certificate authorities:"
+msgid "You have certificates on file that identify these people:"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:45
-msgid "You have certificates on file that identify these people:"
+msgid "Your Certificates"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:46
-msgid "Your Certificates"
+msgid "_Edit CA Trust"
 msgstr ""
 
-#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
+#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr ""
 
-#: smime/lib/e-cert.c:478
+#. x509 certificate usage types
+#: smime/lib/e-cert.c:424
+#, fuzzy
+msgid "Sign"
+msgstr "امضا با PGP"
+
+#: smime/lib/e-cert.c:425
+#, fuzzy
+msgid "Encrypt"
+msgstr "مصر"
+
+#: smime/lib/e-cert.c:530
 msgid "Version"
 msgstr ""
 
-#: smime/lib/e-cert.c:493
+#: smime/lib/e-cert.c:545
 msgid "Version 1"
 msgstr ""
 
-#: smime/lib/e-cert.c:496
+#: smime/lib/e-cert.c:548
 msgid "Version 2"
 msgstr ""
 
-#: smime/lib/e-cert.c:499
+#: smime/lib/e-cert.c:551
 msgid "Version 3"
 msgstr ""
 
-#: smime/lib/e-cert.c:581
+#: smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:584
+#: smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:587
+#: smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:590
+#: smime/lib/e-cert.c:642
 msgid "C"
 msgstr ""
 
-#: smime/lib/e-cert.c:593
+#: smime/lib/e-cert.c:645
 msgid "CN"
 msgstr ""
 
-#: smime/lib/e-cert.c:596
+#: smime/lib/e-cert.c:648
 msgid "OU"
 msgstr ""
 
-#: smime/lib/e-cert.c:599
+#: smime/lib/e-cert.c:651
 msgid "O"
 msgstr ""
 
-#: smime/lib/e-cert.c:602
+#: smime/lib/e-cert.c:654
 msgid "L"
 msgstr ""
 
-#: smime/lib/e-cert.c:605
+#: smime/lib/e-cert.c:657
 msgid "DN"
 msgstr ""
 
-#: smime/lib/e-cert.c:608
+#: smime/lib/e-cert.c:660
 msgid "DC"
 msgstr ""
 
-#: smime/lib/e-cert.c:611
+#: smime/lib/e-cert.c:663
 msgid "ST"
 msgstr ""
 
-#: smime/lib/e-cert.c:614
+#: smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:617
+#: smime/lib/e-cert.c:669
 msgid "Certificate Key Usage"
 msgstr ""
 
-#: smime/lib/e-cert.c:620
+#: smime/lib/e-cert.c:672
 msgid "Netscape Certificate Type"
 msgstr ""
 
-#: smime/lib/e-cert.c:623
+#: smime/lib/e-cert.c:675
 msgid "Certificate Authority Key Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:626
+#: smime/lib/e-cert.c:678
 msgid "UID"
 msgstr ""
 
-#: smime/lib/e-cert.c:635
+#: smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr ""
 
-#: smime/lib/e-cert.c:686
+#: smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:694
+#: smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
 msgstr ""
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:768
 msgid "Subject Public Key Info"
 msgstr ""
 
-#: smime/lib/e-cert.c:721
+#: smime/lib/e-cert.c:773
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:736
+#: smime/lib/e-cert.c:788
 msgid "Subject's Public Key"
 msgstr ""
 
-#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
+#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
 msgid "Error: Unable to process extension"
 msgstr ""
 
-#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
+#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:782
+#: smime/lib/e-cert.c:834
 msgid "SSL Certificate Authority"
 msgstr ""
 
-#: smime/lib/e-cert.c:786
+#: smime/lib/e-cert.c:838
 msgid "Email Certificate Authority"
 msgstr ""
 
-#: smime/lib/e-cert.c:814
+#: smime/lib/e-cert.c:866
 msgid "Signing"
 msgstr ""
 
-#: smime/lib/e-cert.c:818
+#: smime/lib/e-cert.c:870
 msgid "Non-repudiation"
 msgstr ""
 
-#: smime/lib/e-cert.c:822
+#: smime/lib/e-cert.c:874
 msgid "Key Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:826
+#: smime/lib/e-cert.c:878
 msgid "Data Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:830
+#: smime/lib/e-cert.c:882
 msgid "Key Agreement"
 msgstr ""
 
-#: smime/lib/e-cert.c:834
+#: smime/lib/e-cert.c:886
 msgid "Certificate Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:838
+#: smime/lib/e-cert.c:890
 msgid "CRL Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:938
 msgid "Critical"
 msgstr ""
 
-#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
+#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
 msgid "Not Critical"
 msgstr ""
 
-#: smime/lib/e-cert.c:912
+#: smime/lib/e-cert.c:964
 msgid "Extensions"
 msgstr ""
 
-#: smime/lib/e-cert.c:983
+#: smime/lib/e-cert.c:1035
 #, c-format
 msgid "%s = %s"
 msgstr ""
 
-#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
 msgid "Certificate Signature Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:1048
+#: smime/lib/e-cert.c:1100
 msgid "Issuer"
 msgstr ""
 
-#: smime/lib/e-cert.c:1102
+#: smime/lib/e-cert.c:1154
 msgid "Issuer Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1121
+#: smime/lib/e-cert.c:1173
 msgid "Subject Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1164
+#: smime/lib/e-cert.c:1216
 msgid "Certificate Signature Value"
 msgstr ""
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
+#: smime/lib/e-cert-db.c:608
 msgid "Certificate already exists"
 msgstr ""
 
@@ -17038,7 +16556,7 @@ msgstr ""
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr ""
 
@@ -17200,7 +16718,7 @@ msgstr ""
 #: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:3
+#: ui/evolution.xml.h:4
 msgid "Close"
 msgstr "بستن"
 
@@ -17213,7 +16731,7 @@ msgid "Delete this item"
 msgstr ""
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr ""
 
@@ -17256,7 +16774,7 @@ msgstr ""
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:44
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "_File"
 msgstr "_پرونده"
 
@@ -17513,13 +17031,13 @@ msgstr ""
 msgid "_Threaded Message List"
 msgstr ""
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr ""
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "_Close"
 msgstr "_بستن"
 
@@ -17917,7 +17435,7 @@ msgstr ""
 msgid "_Quoted"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
 msgid "_Tools"
 msgstr "_ابزارها"
 
@@ -18214,108 +17732,116 @@ msgid "_Open Task"
 msgstr ""
 
 #: ui/evolution.xml.h:1
-msgid "About Ximian Evolution..."
+msgid "About Evolution..."
 msgstr ""
 
 #: ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
 msgstr ""
 
-#: ui/evolution.xml.h:5
+#: ui/evolution.xml.h:3
+msgid "Change the visibility of the toolbar"
+msgstr ""
+
+#: ui/evolution.xml.h:6
 #, fuzzy
 msgid "Create a new window displaying this folder"
 msgstr "ایجاد پنجره‌ی جدید"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr ""
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
+msgid "Evolution _FAQ"
+msgstr ""
+
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr ""
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:10
 msgid "Forget _Passwords"
 msgstr ""
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:11
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:12
 msgid "Import data from other programs"
 msgstr ""
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:14
 #, fuzzy
 msgid "New _Window"
 msgstr "_پنجره"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Pi_lot Settings..."
 msgstr ""
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Send / Receive"
 msgstr ""
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Send queued items and retrieve new items"
 msgstr ""
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Set up Pilot configuration"
 msgstr ""
 
-#: ui/evolution.xml.h:17
-msgid "Show information about Ximian Evolution"
+#: ui/evolution.xml.h:19
+msgid "Show information about Evolution"
 msgstr ""
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:20
 msgid "Submit Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:21
 msgid "Submit _Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Submit a bug report using Bug Buddy"
 msgstr ""
 
-#: ui/evolution.xml.h:21
-msgid "Toggle whether we are working offline."
-msgstr ""
-
 #: ui/evolution.xml.h:23
-msgid "Ximian Evolution _FAQ"
+msgid "T_oolbar"
 msgstr ""
 
 #: ui/evolution.xml.h:24
-msgid "_About Ximian Evolution..."
+msgid "Toggle whether we are working offline."
 msgstr ""
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:26
+msgid "_About Evolution..."
+msgstr ""
+
+#: ui/evolution.xml.h:30
 msgid "_Help"
 msgstr "_راهنما"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "_Import..."
 msgstr ""
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "_New"
 msgstr "_جدید"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "_Quick Reference"
 msgstr ""
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_Send / Receive"
 msgstr ""
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 #, fuzzy
 msgid "_Window"
 msgstr "_پنجره"
@@ -18387,7 +17913,7 @@ msgid "With _Status"
 msgstr "ایالات متحده"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:626
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:635
 msgid "UTC"
 msgstr ""
 
@@ -18539,26 +18065,26 @@ msgstr ""
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
-#: widgets/misc/e-error.c:121
+#: widgets/misc/e-error.c:79 widgets/misc/e-error.c:80
+#: widgets/misc/e-error.c:122
 msgid "Evolution Error"
 msgstr ""
 
-#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
-#: widgets/misc/e-error.c:119
+#: widgets/misc/e-error.c:81 widgets/misc/e-error.c:82
+#: widgets/misc/e-error.c:120
 msgid "Evolution Warning"
 msgstr ""
 
-#: widgets/misc/e-error.c:118
+#: widgets/misc/e-error.c:119
 msgid "Evolution Information"
 msgstr ""
 
-#: widgets/misc/e-error.c:120
+#: widgets/misc/e-error.c:121
 msgid "Evolution Query"
 msgstr ""
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:410
+#: widgets/misc/e-error.c:415
 #, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -18696,16 +18222,39 @@ msgstr ""
 msgid "Cannot open file \"{0}\"."
 msgstr ""
 
-#: widgets/misc/e-task-widget.c:211
+#: widgets/misc/e-task-widget.c:212
 #, c-format
 msgid "%s (...)"
 msgstr ""
 
-#: widgets/misc/e-task-widget.c:216
+#: widgets/misc/e-task-widget.c:217
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr ""
 
+#~ msgid "Email address:"
+#~ msgstr "نشانی پست الکترونیکی:"
+
+#~ msgid "One"
+#~ msgstr "یک"
+
+#~ msgid "U_se SSL/TLS:"
+#~ msgstr "ا_ستفاده از SSL/TLS:"
+
+#~ msgid "_Port number:"
+#~ msgstr "شماره‌ی _درگاه:"
+
+#, fuzzy
+#~ msgid "Job title:"
+#~ msgstr "عنوان شغل"
+
+#~ msgid "Can not load URI"
+#~ msgstr "نمی‌توان URI را بار کرد"
+
+#, fuzzy
+#~ msgid "Message is Junk"
+#~ msgstr "_پیغام‌ها"
+
 #, fuzzy
 #~ msgid "Address 2:"
 #~ msgstr "نشانی _۲:"
@@ -18738,18 +18287,12 @@ msgstr ""
 #~ msgid "Organi_zation:"
 #~ msgstr "_سازمان:"
 
-#~ msgid "S_pouse:"
-#~ msgstr "_همسر:"
-
 #~ msgid "_Manager's name:"
 #~ msgstr "نام _مدیر:"
 
 #~ msgid "_Mobile:"
 #~ msgstr "_همراه:"
 
-#~ msgid "_Office:"
-#~ msgstr "_دفتر:"
-
 #~ msgid "_Web page address:"
 #~ msgstr "نشانی صفحه‌ی _وب:"
 
diff --git a/po/fi.po b/po/fi.po
index a3d65fcc1d..6d5a1162c6 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2004-05-19 14:00-0400\n"
+"POT-Creation-Date: 2004-06-03 11:14-0400\n"
 "PO-Revision-Date: 2004-02-04 20:45+0200\n"
 "Last-Translator: Ilkka Tuohela <hile@iki.fi>\n"
 "Language-Team: Gnome Finnish Translation Team <laatu@gnome-fi.org>\n"
@@ -61,13 +61,13 @@ msgstr "kortteja"
 msgid "Default Sync Address:"
 msgstr "Synkronoinnin oletusosoite:"
 
-#: addressbook/conduit/address-conduit.c:1150
 #: addressbook/conduit/address-conduit.c:1151
+#: addressbook/conduit/address-conduit.c:1152
 msgid "Could not load addressbook"
 msgstr "Osoitekirjaa ei voitu ladata"
 
-#: addressbook/conduit/address-conduit.c:1219
-#: addressbook/conduit/address-conduit.c:1222
+#: addressbook/conduit/address-conduit.c:1220
+#: addressbook/conduit/address-conduit.c:1223
 msgid "Could not read pilot's Address application block"
 msgstr "Pilotin osoitekirjan ohjelmalohkoa ei voitu lukea"
 
@@ -75,13 +75,13 @@ msgstr "Pilotin osoitekirjan ohjelmalohkoa ei voitu lukea"
 msgid "Accessing LDAP Server anonymously"
 msgstr "Otetaan yhteyttä LDAP-palvelimeen anonyymisti"
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
 msgid "Failed to authenticate.\n"
 msgstr "Kirjautuminen epäonnistui.\n"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sSyötä salasana palvelulle %s (käyttäjä %s)"
@@ -125,51 +125,23 @@ msgstr "_Yhteystiedot:"
 msgid "Create a new contacts group"
 msgstr "Luo uusi oikotieryhmä"
 
-#: addressbook/gui/component/addressbook-component.c:182
+#: addressbook/gui/component/addressbook-component.c:184
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:483
-msgid "Failed to connect to LDAP server"
-msgstr "Yhdistäminen LDAP-palvelimeen epäonnistui"
-
-#: addressbook/gui/component/addressbook-config.c:507
-msgid "Failed to authenticate with LDAP server"
-msgstr "Kirjautuminen LDAP-palvelimelle epäonnistui"
-
-#: addressbook/gui/component/addressbook-config.c:535
-msgid "Could not perform query on Root DSE"
-msgstr "Kyselyä Juuri-DSE:lle ei voitu suorittaa"
-
-#: addressbook/gui/component/addressbook-config.c:840
-msgid "The server responded with no supported search bases"
-msgstr "Palvelin ei palauttanut tuettuja hakupohjia"
-
-#: addressbook/gui/component/addressbook-config.c:1245
-msgid "This server does not support LDAPv3 schema information"
-msgstr "Tämä palvelin ei tue LDAPv3 skeemooja"
-
-#: addressbook/gui/component/addressbook-config.c:1266
-msgid "Error retrieving schema information"
-msgstr "Virhe haettaessa skeeman tietoja"
-
-#: addressbook/gui/component/addressbook-config.c:1274
-msgid "Server did not respond with valid schema information"
-msgstr "Palvelin ei vastannut kelvollisella skeematiedolla"
-
 #: addressbook/gui/component/addressbook-migrate.c:68
-#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1160
 msgid "Migrating..."
 msgstr "Siirretään..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1201
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Siirretään  '%s'"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:438
+#: addressbook/gui/component/addressbook-migrate.c:464
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
 #: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
@@ -177,28 +149,28 @@ msgid "On This Computer"
 msgstr "Tällä tietokoneella"
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:446
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
-#: mail/mail-config.glade.h:106
+#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
+#: mail/mail-config.glade.h:109
 msgid "Personal"
 msgstr "Henkilökohtainen"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:454
+#: addressbook/gui/component/addressbook-migrate.c:480
 msgid "On LDAP Servers"
 msgstr "LDAP-palvelimilla"
 
-#: addressbook/gui/component/addressbook-migrate.c:582
+#: addressbook/gui/component/addressbook-migrate.c:608
 msgid "LDAP Servers"
 msgstr "LDAP-palvelimet"
 
-#: addressbook/gui/component/addressbook-migrate.c:702
+#: addressbook/gui/component/addressbook-migrate.c:728
 msgid "Autocompletion Settings"
 msgstr "Automaattisen täydennyksen asetukset"
 
-#: addressbook/gui/component/addressbook-migrate.c:1076
+#: addressbook/gui/component/addressbook-migrate.c:1104
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -210,7 +182,7 @@ msgstr ""
 "\n"
 "Odota kärsivällisesti, kun Evolution siirtää kansioitasi..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1090
+#: addressbook/gui/component/addressbook-migrate.c:1118
 #, fuzzy
 msgid ""
 "The format of mailing list contacts has changed.\n"
@@ -222,7 +194,7 @@ msgstr ""
 "\n"
 "Odota kärsivällisesti, kun Evolution siirtää kansioitasi..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1099
+#: addressbook/gui/component/addressbook-migrate.c:1127
 #, fuzzy
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
@@ -234,7 +206,7 @@ msgstr ""
 "\n"
 "Odota kärsivällisesti, kun Evolution siirtää kansioitasi..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1109
+#: addressbook/gui/component/addressbook-migrate.c:1137
 #, fuzzy
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
@@ -246,38 +218,33 @@ msgstr ""
 "\n"
 "Odota kärsivällisesti, kun Evolution siirtää kansioitasi..."
 
-#: addressbook/gui/component/addressbook-view.c:674
+#: addressbook/gui/component/addressbook-view.c:675
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr "Osoitekirja '%s' poistetaan. Oletko varma että haluat jatkaa?"
 
-#: addressbook/gui/component/addressbook-view.c:761
+#: addressbook/gui/component/addressbook-view.c:754
 msgid "New Address Book"
 msgstr "Uusi osoitekirja"
 
-#: addressbook/gui/component/addressbook-view.c:762
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
+#: addressbook/gui/component/addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Poista"
 
-#: addressbook/gui/component/addressbook-view.c:763
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-view.c:756
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Ominaisuudet..."
 
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/addressbook-view.c:1002
+#. Create the contacts group
+#: addressbook/gui/component/addressbook-view.c:995
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
 #: calendar/gui/migration.c:373
 msgid "Contacts"
 msgstr "Yhteystiedot"
@@ -358,10 +325,6 @@ msgid "Manage your S/MIME certificates here"
 msgstr "Hallitse S/Mime varmenteitasi täältä"
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-msgid "  S_how Supported Bases "
-msgstr " Tar_kista tuetut kannat "
-
-#: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -376,206 +339,171 @@ msgstr " Tar_kista tuetut kannat "
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1:00"
-msgstr "1:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
-msgstr "5:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "Todennus"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
 #, fuzzy
 msgid "<b>Display</b>"
 msgstr "_Näyttö"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 #, fuzzy
 msgid "<b>Downloading</b>"
 msgstr "<b>Lähetetään sähköpostia:</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:10
 #, fuzzy
 msgid "<b>Searching</b>"
 msgstr "Etsitään"
 
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
 msgid "<b>Server Information</b>"
 msgstr "Askel 2: Palvelimen tiedot"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
 msgid "<b>Type:</b>"
 msgstr "<b>Erääntyy:</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:13
 #, fuzzy
 msgid "Add Contacts Group"
 msgstr "_Yhteystiedot:"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Address Book Properties"
 msgstr "Osoitekirjan ominaisuudet"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
-#: mail/mail-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
+#: mail/mail-config.glade.h:42
 msgid "Always"
 msgstr "Aina"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr "Anonyymisti"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:17
 #: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Yleistä"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
-msgid "Connecting"
-msgstr "Yhdistetään"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 #: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Yksityiskohtaiset"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
-msgid "Distinguished _name:"
-msgstr "Yksikäsitteinen _nimi:"
-
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:19
 #, fuzzy
 msgid "Distinguished name"
 msgstr "Yksikäsitteinen _nimi:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:20
 #, fuzzy
 msgid "Download limit:"
 msgstr "_Haun rajoitus:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Email address"
 msgstr "Sähköpostiosoite:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "Email address:"
-msgstr "Sähköpostiosoite:"
-
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "Evolution will use this DN to authenticate you with the server"
-msgstr ""
-"Evolution käyttää tätä yksikäsitteistä nimeä sinun todentamiseksesi "
-"palvelimelle"
-
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:22
+#, fuzzy
 msgid ""
-"Evolution will use this email address to authenticate you with the server"
+"Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "Evolution käyttää tätä sähköpostiosoitetta sinun todentamiseksesi "
 "palvelimelle"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:23
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Tuetut hakupohjat"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:24
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
+#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Yleiset"
 
-#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
-#: mail/mail-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
+#: mail/mail-config.glade.h:102
 msgid "Never"
 msgstr "Ei koskaan"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
-msgid "One"
-msgstr "Yksi"
-
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:35
-msgid "S_earch scope: "
-msgstr "_Hakualue:"
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Search _base:"
+msgstr "Hakupohja:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
 msgid "Search base only"
 msgstr "Hakupohja:"
 
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid "Search base:"
 msgstr "Hakupohja:"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Search scope:"
 msgstr "_Hakualue:"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
-msgid "Searching"
-msgstr "Etsitään"
-
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:31
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
-"server if\n"
-"your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL or TLS."
 msgstr ""
 "Tämän vaihtoehdon valinta tarkoittaa, että Evolution ottaa yhteyttä LDAP-"
 "palvelimeen\n"
 "vain jos se tukee SSL- tai TLS-salausta."
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a \n"
-"insecure environment. For example, if you and your LDAP server are behind a "
-"firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection "
-"is already\n"
-"secure."
+"you are in a insecure environment. For example, if you and your LDAP server "
+"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
+"because your connection is already secure."
 msgstr ""
 "Tämän vaihtoehdon valinta tarkoittaa, että Evolution yrittää käyttää SSL- "
 "tai TLS-salausta\n"
@@ -585,13 +513,12 @@ msgstr ""
 "salausta, koska\n"
 "yhteytesi on jo muutenkin turvallinen."
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:33
+#, fuzzy
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
-"TLS.  This \n"
-"means that your connection will be insecure, and that you will be vulnerable "
-"to security\n"
-"exploits. "
+"TLS.  This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits. "
 msgstr ""
 "Tämän vaihtoehdon valinta tarkoittaa, ettei palvelimesi tue SSL- tai TLS-"
 "salausta. Tämä\n"
@@ -599,37 +526,32 @@ msgstr ""
 "turvaan kohdistuville\n"
 "hyökkäyksille."
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Sub"
-msgstr "Ali"
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr "Tuetut hakupohjat"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
-"searches will \n"
-"begin. If you leave this blank, the search will begin at the root of the "
-"directory tree."
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
 msgstr ""
 "Hakupohja on sen kentän, josta hakusi alkavat, yksilöllinen nimi (DN). Jos "
 "jätät tämän\n"
 "tyhjäksi, haut alkavat hakemistopuun juuresta."
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:37
+#, fuzzy
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
-"the \n"
-"directory tree. A search scope of \"sub\" will include all entries below "
-"your search base.\n"
-"A search scope of \"one\" will only include the entries one level beneath "
-"your base.\n"
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
 msgstr ""
 "Haun kattavuus määrittelee, kuinka syvälle hakemistopuuhun haluat hakusi "
 "menevän.\n"
@@ -637,23 +559,23 @@ msgstr ""
 "kun taas\n"
 "kattavuus \"Yksi\" kattaa kentät yhden tason hakupohjastasi alaspäin.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:58
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "LDAP-palvelimesi koko nimi, esimerkiksi \"ldap.mycompany.com\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:39
+#, fuzzy
 msgid ""
-"This is the maximum number of entries to download. Setting this number to "
-"be \n"
+"This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr ""
 "Suurin sallittu haettavien korttien määrä hakua kohti. Tämän arvon "
 "asettaminen \n"
 "liian suureksi hidastaa osoitekirjaasi."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -662,21 +584,21 @@ msgstr ""
 "Määrittele tapa, jolla Evolution tunnistaa sinut. Huomioi, että asetuksen "
 "arvo \"Sähköpostiosoite\" vaatii anonyymiä pääsyäLDAP-palvelimellesi."
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:41
+#, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
-"list.\n"
-"It is for display purposes only. "
+"list. It is for display purposes only. "
 msgstr ""
 "Tämä on nimi, jolla tämä palvelin näkyy Evolutionin kansiolistoissa.\n"
 "Sitä käytetään ainoastaan listoilla näyttämiseen."
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:42
+#, fuzzy
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. "
-"A \n"
-"list of standard ports has been provided. Ask your system administrator\n"
-"what port you should specify."
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
 msgstr ""
 "Portti LDAP-palvelimella, johon Evolution yrittää ottaa yhteyttä. Tarjolla "
 "on lista\n"
@@ -684,120 +606,99 @@ msgstr ""
 "porttia sinun\n"
 "tulisi käyttää."
 
-#: addressbook/gui/component/ldap-config.glade.h:67
-msgid "This option controls how long a search will be run."
-msgstr "Asettaa hakujen suoritukseen käytetyn ajan."
-
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:43
 #, fuzzy
 msgid "Timeout:"
 msgstr "Ajan muoto:"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
-msgid "U_se SSL/TLS:"
-msgstr "Käytä SSL/TLS-salausta:"
-
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr "Käytetään yksilöllistä nimeä (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr "Käytetään sähköpostiosoitetta"
 
-#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
-#: mail/mail-config.glade.h:154
+#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
+#: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr "Milloin mahdollista"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:47
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "_Yhteystiedot:"
 
-#: addressbook/gui/component/ldap-config.glade.h:74
-#: calendar/gui/dialogs/calendar-setup.glade.h:12
-msgid "_Display name:"
-msgstr "Näytettävä _nimi:"
-
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr "_Haun rajoitus:"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
 msgid "_Email address:"
 msgstr "Sähköpostiosoite:"
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:50
+#, fuzzy
+msgid "_Find Possible Search Bases"
+msgstr "Tuetut hakupohjat"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Log in method:"
 msgstr "_Tunnistusmenetelmä:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "_Log in:"
+msgstr "Kirjautuminen"
+
+#: addressbook/gui/component/ldap-config.glade.h:53
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
 msgid "_Name:"
 msgstr "_Nimi:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
-msgid "_Port number:"
-msgstr "_Portin numero:"
-
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "_Port:"
 msgstr "_Prioriteetti:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
-msgid "_Search base:"
-msgstr "_Hakupohja:"
-
-#: addressbook/gui/component/ldap-config.glade.h:82
-msgid "_Server name:"
-msgstr "Palvelimen _nimi: "
+#: addressbook/gui/component/ldap-config.glade.h:55
+#, fuzzy
+msgid "_Search scope:"
+msgstr "_Hakualue:"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:56
 #, fuzzy
 msgid "_Server:"
 msgstr "_Palvelin: "
 
-#: addressbook/gui/component/ldap-config.glade.h:84
-msgid "_Timeout (minutes):"
-msgstr "_Aikakatkaisu (minuuttia):"
+#: addressbook/gui/component/ldap-config.glade.h:57
+#, fuzzy
+msgid "_Timeout:"
+msgstr "Ajan muoto:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:58
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "_Käytä salattua yhteyttä (SSL):"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "kortteja"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
-msgid "connecting-tab"
-msgstr "yhdistetään-tab"
-
-#: addressbook/gui/component/ldap-config.glade.h:88
-msgid "general-tab"
-msgstr "yleistä-tab"
-
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:60
 #: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
-#: mail/mail-config.glade.h:182
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "minuutti"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
-msgid "searching-tab"
-msgstr "haetaan-tab"
-
-#: addressbook/gui/component/select-names/e-select-names.c:497
+#: addressbook/gui/component/select-names/e-select-names.c:503
 #: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid "Select Contacts from Address Book"
 msgstr "Valitse yhteystiedot osoitekirjasta"
 
-#: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
@@ -837,7 +738,7 @@ msgstr "Nimetön yhteystieto"
 
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:222
+#: addressbook/gui/widgets/e-addressbook-view.c:224
 msgid "Source"
 msgstr "Lähde"
 
@@ -910,9 +811,9 @@ msgid "<b>Work</b>"
 msgstr "<b>Erääntyy:</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
-#: addressbook/gui/widgets/eab-contact-display.c:342
-#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/widgets/eab-contact-display.c:334
+#: addressbook/gui/widgets/eab-contact-display.c:353
 msgid "AIM"
 msgstr "AIM"
 
@@ -952,15 +853,15 @@ msgid "Company:"
 msgstr "Komento:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:271
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
+#: addressbook/gui/contact-editor/e-contact-editor.c:266
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
 msgstr "Yhteystieto"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1527
+#: addressbook/gui/contact-editor/e-contact-editor.c:520
 msgid "Contact Editor"
 msgstr "Yhteystiedonhallinta"
 
@@ -984,83 +885,80 @@ msgid "Full _Name..."
 msgstr "_Koko nimi..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:202
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-msgid "Home"
-msgstr "Koti"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #, fuzzy
 msgid "Home Page:"
 msgstr "Kotisivu"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-#, fuzzy
-msgid "Job title:"
-msgstr "_Tehtävänimike:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/e-itip-control.c:936
-msgid "Location:"
-msgstr "Sijainti:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 #, fuzzy
 msgid "Mailing Address"
 msgstr "Sähköpostiosoite"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 #, fuzzy
 msgid "Manager:"
 msgstr "Johtaja"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "_Kutsumanimi:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Notes:"
 msgstr "_Huomioita:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 #, fuzzy
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
-#: addressbook/gui/contact-editor/e-contact-editor.c:203
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-msgid "Other"
-msgstr "Muut"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#, fuzzy
+msgid "Office:"
+msgstr "_Asema:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "PO Box:"
 msgstr "_Postilokero:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 #, fuzzy
 msgid "Personal Information"
 msgstr "Valinnaiset tiedot"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 #, fuzzy
 msgid "Profession:"
 msgstr "_Ammatti:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#, fuzzy
+msgid "Spouse:"
+msgstr "Puoli_so:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "State/Province:"
 msgstr "_Osavaltio/lääni:"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#, fuzzy
+msgid "Title:"
+msgstr "_Titteli:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+msgid "Video Chat:"
+msgstr ""
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:41
 #, fuzzy
 msgid "Wants to receive HTML mail"
@@ -1068,15 +966,15 @@ msgstr "Haluaa sähköpostit HTML-muodossa"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:42
 #, fuzzy
-msgid "Webcam:"
-msgstr "WWW-sivu:"
+msgid "Web Log:"
+msgstr "_Kotisivun osoite:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
-#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
-#: mail/mail-config.glade.h:155
+#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
+#: mail/mail-config.glade.h:157
 msgid "Work"
 msgstr "Työ"
 
@@ -1096,19 +994,12 @@ msgid "_File under:"
 msgstr "Tiedostonimi:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 #, fuzzy
 msgid "_Where:"
 msgstr "_Palvelin: "
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
-msgid "item7"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
-msgid "item8"
-msgstr ""
-
-#: addressbook/gui/contact-editor/eab-editor.c:316
+#: addressbook/gui/contact-editor/eab-editor.c:315
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -1116,7 +1007,7 @@ msgstr ""
 "Haluatko varmasti\n"
 "poistaa nämä yhteystiedot?"
 
-#: addressbook/gui/contact-editor/eab-editor.c:319
+#: addressbook/gui/contact-editor/eab-editor.c:318
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -1125,16 +1016,16 @@ msgstr ""
 "poistaa tämän yhteystiedon?"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:351
-#: addressbook/gui/widgets/eab-contact-display.c:372
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Address"
 msgstr "Osoite"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:292
+#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard.c:174
@@ -2112,87 +2003,110 @@ msgstr "Sambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/contact-editor/e-contact-editor.c:179
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:337
+#: addressbook/gui/widgets/eab-contact-display.c:356
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:347
-#: addressbook/gui/widgets/eab-contact-display.c:366
+#: addressbook/gui/contact-editor/e-contact-editor.c:180
+#: addressbook/gui/widgets/eab-contact-display.c:339
+#: addressbook/gui/widgets/eab-contact-display.c:358
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: addressbook/gui/widgets/eab-contact-display.c:338
+#: addressbook/gui/widgets/eab-contact-display.c:357
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:344
-#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#: addressbook/gui/widgets/eab-contact-display.c:355
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/contact-editor/e-contact-editor.c:183
 #, fuzzy
 msgid "GroupWise"
 msgstr "Novell Groupwise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+msgid "Home"
+msgstr "Koti"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+msgid "Other"
+msgstr "Muut"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
 msgid "Source Book"
 msgstr "Lähdekirja"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:264
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Target Book"
 msgstr "Kohdekirja"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:278
+#: addressbook/gui/contact-editor/e-contact-editor.c:273
 msgid "Is New Contact"
 msgstr "Uusi yhteystieto"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:285
+#: addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Writable Fields"
 msgstr "Muokattavat kentät"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:299
+#: addressbook/gui/contact-editor/e-contact-editor.c:294
 msgid "Changed"
 msgstr "Muutettu"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
-msgid "Category editor not available."
-msgstr "Luokkien muokkain ei ole käytettävissä."
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:2352
 msgid "This contact belongs to these categories:"
 msgstr "Tämä yhteystieto kuuluu näihin ryhmiin:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#: addressbook/gui/contact-editor/e-contact-editor.c:2429
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Valitse joku seuraavista vaihtoehdoista"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#: addressbook/gui/contact-editor/e-contact-editor.c:2433
 #, fuzzy
 msgid "No image"
 msgstr "Niger"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#: addressbook/gui/contact-editor/e-contact-editor.c:2636
 #, fuzzy
 msgid ""
-"The following entries are invalid:\n"
+"The contact data is invalid:\n"
 "\n"
-msgstr "Seuraavat yhteydet ovat tällä hetkellä auki:"
+msgstr "Toistuvuuden päiväys on virheellinen"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2738
-#, c-format
-msgid "Could not find widget for a field: `%s'"
-msgstr "Kentälle ei voitu löytää widgettiä: '%s'"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#, fuzzy
+msgid "Invalid contact."
+msgstr "%d yhteystietoa"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+msgid ""
+"The contact cannot be saved to the selected address book. Do you want to "
+"discard changes?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2727
+#: addressbook/gui/contact-editor/e-contact-editor.c:2751
+msgid "_Discard"
+msgstr "Hylkää"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+msgid ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
+msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:62
 msgid "AOL Instant Messenger"
@@ -2225,7 +2139,7 @@ msgid "_Edit Full"
 msgstr "Muokkaa _kaikkia tietoja"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:166
 msgid "_Full Name:"
 msgstr "_Koko nimi:"
 
@@ -2373,30 +2287,30 @@ msgstr "_Listanimi:"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Syötä sähköpostiosoite tai raahaa yhteystieto alla olevaa listaan:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "contact-list-editor"
 msgstr "yhteystiedonhallinta"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:153
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:215
+#: addressbook/gui/widgets/e-addressbook-view.c:217
 #: addressbook/gui/widgets/e-minicard-view.c:460
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Kirja"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
 msgid "Is New List"
 msgstr "Uusi lista"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:215
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
 msgid "Contact List Editor"
 msgstr "Yhteystiedonhallinta"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:438
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
 msgid "Save List as VCard"
 msgstr "Tallenna lista VCardina"
 
@@ -2443,118 +2357,118 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Edistynyt haku"
 
-#: addressbook/gui/widgets/eab-contact-display.c:129
-#: addressbook/gui/widgets/eab-contact-display.c:192
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
 msgid "(map)"
 msgstr "(kartta)"
 
-#: addressbook/gui/widgets/eab-contact-display.c:139
-#: addressbook/gui/widgets/eab-contact-display.c:205
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
 msgid "map"
 msgstr "kartta"
 
-#: addressbook/gui/widgets/eab-contact-display.c:257
-#: addressbook/gui/widgets/eab-contact-display.c:533
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:525
 msgid "List Members"
 msgstr "Listan jäsenet"
 
-#: addressbook/gui/widgets/eab-contact-display.c:329
-#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/eab-contact-display.c:321
+#: addressbook/gui/widgets/eab-contact-display.c:323
 msgid "E-mail"
 msgstr "Sähköposti"
 
-#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/eab-contact-display.c:332
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organisaatio"
 
-#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "Position"
 msgstr "Asema"
 
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:354
 #, fuzzy
 msgid "Groupwise"
 msgstr "Ryhmä"
 
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:340
 msgid "Video Conferencing"
 msgstr "Videoneuvottelu"
 
-#: addressbook/gui/widgets/eab-contact-display.c:349
-#: addressbook/gui/widgets/eab-contact-display.c:370
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Phone"
 msgstr "Puhelin"
 
-#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:342
 msgid "Fax"
 msgstr "Fax"
 
-#: addressbook/gui/widgets/eab-contact-display.c:354
+#: addressbook/gui/widgets/eab-contact-display.c:346
 msgid "work"
 msgstr "työ"
 
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:359
 msgid "WWW"
 msgstr "WWW"
 
-#: addressbook/gui/widgets/eab-contact-display.c:368
-#: addressbook/gui/widgets/eab-contact-display.c:587
+#: addressbook/gui/widgets/eab-contact-display.c:360
+#: addressbook/gui/widgets/eab-contact-display.c:579
 msgid "Blog"
 msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/eab-contact-display.c:363
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Matkapuhelin"
 
-#: addressbook/gui/widgets/eab-contact-display.c:375
+#: addressbook/gui/widgets/eab-contact-display.c:367
 msgid "personal"
 msgstr "henkilökohtainen"
 
-#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/eab-contact-display.c:374
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Huomio"
 
-#: addressbook/gui/widgets/eab-contact-display.c:548
+#: addressbook/gui/widgets/eab-contact-display.c:540
 msgid "Job Title"
 msgstr "Tehtävänimike"
 
-#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/eab-contact-display.c:544
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:774
+#: smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "Sähköposti"
 
-#: addressbook/gui/widgets/eab-contact-display.c:579
+#: addressbook/gui/widgets/eab-contact-display.c:571
 msgid "Home page"
 msgstr "Kotisivu"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 msgid "Success"
 msgstr "Onnistui"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Backend busy"
 msgstr ""
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Repository offline"
 msgstr "Lähde poissa käytöstä"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Address Book does not exist"
 msgstr "Osoitekirjaa ei ole olemassa"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 #, fuzzy
 msgid "No Self Contact defined"
 msgstr "Uusi yhteystietoluettelo"
@@ -2562,27 +2476,27 @@ msgstr "Uusi yhteystietoluettelo"
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Permission denied"
 msgstr "Lupa evätty"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Contact not found"
 msgstr "Yhteystietoa ei löytynyt"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Contact ID already exists"
 msgstr "Yhteystiedon tunniste on jo olemassa"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Protocol not supported"
 msgstr "Protokolla ei ole tuettu"
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:60
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:233
 #: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
@@ -2595,39 +2509,39 @@ msgid "Cancelled"
 msgstr "Peruutettu"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:61
 #, fuzzy
 msgid "Could not cancel"
 msgstr "Lähdettä ei voitu avata"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Authentication Failed"
 msgstr "Todennus epäonnistui"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Authentication Required"
 msgstr "Todennus vaaditaan"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:66
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "TLS not Available"
 msgstr "TLS ei ole käytettävissä"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#: addressbook/gui/widgets/eab-gui-util.c:66
 #, fuzzy
 msgid "No such source"
 msgstr "Ei tällaista viestiä"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:69
+#: addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Other error"
 msgstr "Muu virhe"
 
-#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:90
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
@@ -2635,7 +2549,7 @@ msgstr ""
 "Osoitekirjan avaus epäonnistui. Tarkista että polku on olemassa ja että "
 "sinulla on oikeudet käyttää sitä."
 
-#: addressbook/gui/widgets/eab-gui-util.c:110
+#: addressbook/gui/widgets/eab-gui-util.c:97
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -2643,17 +2557,18 @@ msgstr ""
 "Osoitekirjan avaus epäonnistui. Olet joko syöttänyt virheellisen URI:n tai "
 "LDAP-palvelinta ei tavoiteta."
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:102
+#, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution you must compile the program from the CVS "
-"sources after retrieving OpenLDAP from the link below."
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
 msgstr ""
 "Tässä Evolutionin versiossa ei ole LDAP-tukea käytettävissä. Jos haluat LDAP-"
 "tuen Evolutioniin, tulee sinun kääntää ohjelma CVS-lähdekoodista "
 "asennettuasi OpenLDAPin alla olevasta linkistä."
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:109
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -2661,11 +2576,7 @@ msgstr ""
 "Osoitekirjan avaus epäonnistui. Syötit joko virheellisen URIn tai palvelinta "
 "ei voida tavoittaa."
 
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "Unable to open addressbook"
-msgstr "Osoitekirjaa ei voitu avata"
-
-#: addressbook/gui/widgets/eab-gui-util.c:162
+#: addressbook/gui/widgets/eab-gui-util.c:129
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2677,7 +2588,7 @@ msgstr ""
 "Tarkenna hakuasi tai muuta tulosten määrän rajaa tämän\n"
 "osoitekirjan hakemistopalvelimen asetuksissa."
 
-#: addressbook/gui/widgets/eab-gui-util.c:168
+#: addressbook/gui/widgets/eab-gui-util.c:135
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -2689,53 +2600,45 @@ msgstr ""
 "hakuasi tai pidennä palvelimen aikarajoitusta tämän osoitekirjan\n"
 "hakemistopalvelimen asetuksissa."
 
-#: addressbook/gui/widgets/eab-gui-util.c:174
+#: addressbook/gui/widgets/eab-gui-util.c:141
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "Osoitekirjan taustajärjestelmä ei ymmärtänyt tätä kyselyä."
 
-#: addressbook/gui/widgets/eab-gui-util.c:177
+#: addressbook/gui/widgets/eab-gui-util.c:144
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Osoitekirjan taustajärjestelmä ei suostunut suorittamaan tätä kyselyä."
 
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:147
 msgid "This query did not complete successfully."
 msgstr "Tämä kysely ei valmistunut menestyksellisesti."
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
-msgid "Do you want to save changes?"
-msgstr "Haluatko tallentaa muutokset?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:208
-msgid "_Discard"
-msgstr "Hylkää"
-
-#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:169
 msgid "Error adding list"
 msgstr "Virhe lisättäessä listalle"
 
-#: addressbook/gui/widgets/eab-gui-util.c:229
-#: addressbook/gui/widgets/eab-gui-util.c:652
+#: addressbook/gui/widgets/eab-gui-util.c:169
+#: addressbook/gui/widgets/eab-gui-util.c:580
 msgid "Error adding contact"
 msgstr "Virhe lisättäessä yhteystietoa"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying list"
 msgstr "Virhe muokattaessa listaa"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying contact"
 msgstr "Virhe muokattessa yhteystietoa"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:192
 msgid "Error removing list"
 msgstr "Virhe poistettaessa listaa"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
-#: addressbook/gui/widgets/eab-gui-util.c:610
+#: addressbook/gui/widgets/eab-gui-util.c:192
+#: addressbook/gui/widgets/eab-gui-util.c:538
 msgid "Error removing contact"
 msgstr "Virhe poistettaessa yhteystietoa"
 
-#: addressbook/gui/widgets/eab-gui-util.c:334
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2744,7 +2647,7 @@ msgstr ""
 "%d yhteystiedo avaaminen avaisi myös %d uutta ikkunaa.\n"
 "Haluatko varmasti näyttää kaikki nämä yhteystiedot?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:360
+#: addressbook/gui/widgets/eab-gui-util.c:300
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2753,49 +2656,44 @@ msgstr ""
 "%s on jo olemassa\n"
 "Haluatko ylikirjoittaa?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:364
+#: addressbook/gui/widgets/eab-gui-util.c:304
 msgid "Overwrite"
 msgstr "Kirjoita yli"
 
-#: addressbook/gui/widgets/eab-gui-util.c:400
-#, c-format
-msgid "Error saving %s: %s"
-msgstr "Virhe tallennettaessa %s: %s"
-
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:437
+#: addressbook/gui/widgets/eab-gui-util.c:365
 msgid "card.vcf"
 msgstr "kortti.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:571
+#: addressbook/gui/widgets/eab-gui-util.c:499
 msgid "list"
 msgstr "lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:706
+#: addressbook/gui/widgets/eab-gui-util.c:634
 msgid "Move contact to"
 msgstr "Siirry yhteystieto"
 
-#: addressbook/gui/widgets/eab-gui-util.c:708
+#: addressbook/gui/widgets/eab-gui-util.c:636
 msgid "Copy contact to"
 msgstr "Kopioi yhteystieto"
 
-#: addressbook/gui/widgets/eab-gui-util.c:711
+#: addressbook/gui/widgets/eab-gui-util.c:639
 msgid "Move contacts to"
 msgstr "Siirrä yhteystiedot"
 
-#: addressbook/gui/widgets/eab-gui-util.c:713
+#: addressbook/gui/widgets/eab-gui-util.c:641
 msgid "Copy contacts to"
 msgstr "Kopioi yhteystiedot"
 
-#: addressbook/gui/widgets/eab-gui-util.c:716
+#: addressbook/gui/widgets/eab-gui-util.c:644
 msgid "Select target addressbook."
 msgstr "Valitse osoitekirja"
 
-#: addressbook/gui/widgets/eab-gui-util.c:939
+#: addressbook/gui/widgets/eab-gui-util.c:867
 msgid "Multiple VCards"
 msgstr "Useita VCardeja"
 
-#: addressbook/gui/widgets/eab-gui-util.c:942
+#: addressbook/gui/widgets/eab-gui-util.c:870
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard %s:lle"
@@ -2882,7 +2780,7 @@ msgstr[1] "%d yhteystietoa"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:229
+#: addressbook/gui/widgets/e-addressbook-view.c:231
 #: addressbook/gui/widgets/e-minicard-view.c:467
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
@@ -2900,143 +2798,131 @@ msgstr "Malli"
 msgid "Error modifying card"
 msgstr "Virhe muutettaessa korttia"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:163
 msgid "Name begins with"
 msgstr "Nimi alkaa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:164
 msgid "Email begins with"
 msgstr "Sähköposti alkaa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:57
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Luokka on"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-#: calendar/gui/cal-search-bar.c:50
+#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Mikä tahansa kenttä sisältää"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+#: addressbook/gui/widgets/e-addressbook-view.c:172
 msgid "Advanced..."
 msgstr "Edistyneet..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:236
+#: addressbook/gui/widgets/e-addressbook-view.c:238
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:249
+#: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Tyyppi"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:506
+#: addressbook/gui/widgets/e-addressbook-view.c:508
 msgid "Address Book"
 msgstr "Osoitekirja"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2076
+#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:2080
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
 msgstr "Tallenna VCardina"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 msgid "New Contact..."
 msgstr "Uusi yhteystieto..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "New Contact List..."
 msgstr "Uusi yhteystietoluettelo..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Go to Folder..."
 msgstr "_Siirry kansioon..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Import..."
 msgstr "_Tuo..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1066
 msgid "Search for Contacts..."
 msgstr "Etsi yhteystietoja..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 msgid "Address Book Sources..."
 msgstr "Osoitekirjan lähteet..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1069
 msgid "Pilot Settings..."
 msgstr "_Pilotin asetukset..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Välitä yhteystieto eteenpäin"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
 msgid "Send Message to Contact"
 msgstr "Lähetä viesti yhteystiedolle"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Tulosta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
+#: addressbook/gui/widgets/e-addressbook-view.c:1077
 msgid "Print Envelope"
 msgstr "Tulosta kuori"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
+#: addressbook/gui/widgets/e-addressbook-view.c:1081
 msgid "Copy to Address Book..."
 msgstr "Kopioi osoitekirjaan..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1080
+#: addressbook/gui/widgets/e-addressbook-view.c:1082
 msgid "Move to Address Book..."
 msgstr "Siirrä osoitekirjaan..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Leikkaa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopioi"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1087
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Liitä"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:1092
+#: calendar/gui/e-calendar-view.c:1280
 msgid "Current View"
 msgstr "Nykyinen näkymä"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1309
-#, c-format
-msgid ""
-"The addressbook backend for\n"
-"%s\n"
-"has crashed. You will have to restart Evolution in order to use it again"
-msgstr ""
-"Osoitekirjan taustajärjestelmä\n"
-"%s:lle\n"
-"on kaatunut. Sinun täytyy käynnistää Evolution uudestaan käyttääksesi sitä "
-"uudestaan"
-
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1667
-#: calendar/gui/cal-search-bar.c:362
+#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Mikä tahansa luokka"
 
@@ -3142,7 +3028,7 @@ msgstr "Radio"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-list-view.c:234
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Rooli"
@@ -3284,12 +3170,12 @@ msgstr "Evolutionin VCard-tuoja"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: addressbook/printing/e-contact-print.c:998
+#: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr "Tulosta yhteystiedot"
 
-#: addressbook/printing/e-contact-print.c:1064
-#: addressbook/printing/e-contact-print.c:1091
+#: addressbook/printing/e-contact-print.c:1066
+#: addressbook/printing/e-contact-print.c:1093
 msgid "Print contact"
 msgstr "Tulosta yhteystieto"
 
@@ -3539,15 +3425,21 @@ msgstr "Normaalissa tilassa optiota koko ei pitäisi tarvita"
 msgid "Impossible internal error."
 msgstr "Mahdoton sisäinen virhe."
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:629
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
 msgid "Can not open file"
 msgstr "Tiedostoa ei voida avata"
 
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-msgid "Can not load URI"
-msgstr "URI:a ei voida ladata"
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "Osoitekirjaa ei voitu ladata"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Osoitekirjaa ei voitu avata"
 
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
@@ -3565,7 +3457,7 @@ msgstr "Tiedostonimeä ei annettu."
 msgid "Unnamed List"
 msgstr "Nimeämätön lista"
 
-#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Syötä salasana"
@@ -3842,10 +3734,10 @@ msgid "Whether to show week numbers in date navigator"
 msgstr "Näytetäänkö viikkonumerot päivämääräselaimessa"
 
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:88
-#: calendar/gui/gnome-cal.c:1703
-#: camel/providers/groupwise/camel-gw-listener.c:304
-#: camel/providers/groupwise/camel-gw-listener.c:327
+#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/gnome-cal.c:1705
+#: camel/providers/groupwise/camel-gw-listener.c:311
+#: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
 msgstr "Kalenteri"
 
@@ -3864,7 +3756,7 @@ msgstr "Poista vanhemmat tapahtumat kuin"
 
 #: calendar/gui/calendar-commands.c:363
 #: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:19 filter/filter.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
 msgid "days"
 msgstr "päivää"
 
@@ -4010,24 +3902,24 @@ msgstr "Työviikko"
 msgid "Month View"
 msgstr "Kuukausinäkymä"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Yhteenveto sisältää"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Kuvaus sisältää"
 
-#: calendar/gui/cal-search-bar.c:54
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Kommentti sisältää"
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:53
 #, fuzzy
 msgid "Location contains"
 msgstr "Kuvaus sisältää"
 
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
 msgid "Unmatched"
 msgstr "Ei vastaavaa"
 
@@ -4048,23 +3940,23 @@ msgstr "Kalenterin avaamiseen ei ollut tarvittavia oikeuksia"
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/dialogs/alarm-options.c:466
+#: calendar/gui/dialogs/alarm-options.c:467
 msgid "Audio Alarm Options"
 msgstr "Äänihälytyksen asetukset"
 
-#: calendar/gui/dialogs/alarm-options.c:475
+#: calendar/gui/dialogs/alarm-options.c:476
 msgid "Message Alarm Options"
 msgstr "Viestin hälytyksen ominaisuudet"
 
-#: calendar/gui/dialogs/alarm-options.c:484
+#: calendar/gui/dialogs/alarm-options.c:485
 msgid "Email Alarm Options"
 msgstr "Sähköpostin hälytysvaihtoehdot"
 
-#: calendar/gui/dialogs/alarm-options.c:493
+#: calendar/gui/dialogs/alarm-options.c:494
 msgid "Program Alarm Options"
 msgstr "Ohjelmallisen hälytyksen asetukset"
 
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:510
 msgid "Unknown Alarm Options"
 msgstr "Tuntemattoman hälytyksen asetukset"
 
@@ -4100,7 +3992,7 @@ msgstr "Lähetä:"
 msgid "With these arguments:"
 msgstr "Näillä argumenteilla:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
 msgid "dialog1"
 msgstr "dialog1"
 
@@ -4109,7 +4001,7 @@ msgid "extra times every"
 msgstr "ylimääräisiä kertoja joka"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:20 filter/filter.glade.h:16
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr "tuntia"
 
@@ -4155,7 +4047,7 @@ msgstr "Lähetä sähköpostia"
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Kuvaus:"
 
@@ -4185,7 +4077,6 @@ msgid "hour(s)"
 msgstr "tunti(a)"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:21
 msgid "minute(s)"
 msgstr "minuutti"
 
@@ -4193,26 +4084,26 @@ msgstr "minuutti"
 msgid "start of appointment"
 msgstr "tapaamisen alku"
 
-#: calendar/gui/dialogs/calendar-setup.c:170
+#: calendar/gui/dialogs/calendar-setup.c:172
 msgid "You must specify a location to get the calendar from."
 msgstr "Määrittele paikka, josta kalenteri haetaan."
 
-#: calendar/gui/dialogs/calendar-setup.c:178
+#: calendar/gui/dialogs/calendar-setup.c:180
 #, c-format
 msgid "The source location '%s' is not well-formed."
 msgstr "Lähteen sijainti '%s' ei ole hyvinmuotoiltu."
 
-#: calendar/gui/dialogs/calendar-setup.c:193
+#: calendar/gui/dialogs/calendar-setup.c:195
 #, c-format
 msgid "The source location '%s' is not a webcal source."
 msgstr "Lähteen sijainti '%s' ei ole verkkokalenterin lähde."
 
-#: calendar/gui/dialogs/calendar-setup.c:265
+#: calendar/gui/dialogs/calendar-setup.c:275
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr "Lähde nimellä '%s' on jo olemassa valitussa ryhmässä."
 
-#: calendar/gui/dialogs/calendar-setup.c:278
+#: calendar/gui/dialogs/calendar-setup.c:288
 #, c-format
 msgid ""
 "The group '%s' is remote. You must specify a location to get the calendar "
@@ -4234,56 +4125,36 @@ msgstr "Tehtävälistan ryhmä"
 msgid "C_olor:"
 msgstr "_Värit"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "Calendar Properties"
-msgstr "Kalenterin ominaisuudet"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
 msgid "Pick a color"
 msgstr "Valitse väri"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:8
-msgid "Remote"
-msgstr "Etä"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "Task List Properties"
-msgstr "Tehtävälistan ominaisuudet"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
 #, fuzzy
 msgid "_Add Calendar"
 msgstr "Lisää uusi kalenteri"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
 #, fuzzy
 msgid "_Add Group"
 msgstr "_Lisää ryhmä..."
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-msgid "_Refresh Interval:"
-msgstr "_Virkistysväli:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
 #, fuzzy
 msgid "_Refresh:"
 msgstr "Virkistä"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-msgid "_Source URL:"
-msgstr "_Lähde-URL:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
 #, fuzzy
 msgid "_Type:"
 msgstr "Tyyppi:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
 #, fuzzy
 msgid "_URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
 msgid "weeks"
 msgstr "viikkoa"
 
@@ -4391,7 +4262,7 @@ msgid "Display"
 msgstr "_Näyttö"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:76
 msgid "E_nable"
 msgstr "Kä_ytä"
 
@@ -4402,7 +4273,7 @@ msgstr "Vapaa/varattu julkaisu"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:563
+#: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Perjantai"
 
@@ -4416,7 +4287,7 @@ msgstr "Minuutti"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:559
+#: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Maanantai"
 
@@ -4426,7 +4297,7 @@ msgstr "_Su"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:564
+#: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Lauantai"
 
@@ -4440,7 +4311,7 @@ msgstr "Näytä _viikkonumerot"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Sunnuntai"
 
@@ -4454,7 +4325,7 @@ msgstr "_To"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:562
+#: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Torstai"
 
@@ -4468,7 +4339,7 @@ msgstr "Ajan muoto:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:560
+#: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Tiistai"
 
@@ -4478,7 +4349,7 @@ msgstr "Viikko _alkaa:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:561
+#: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Keskiviikko"
 
@@ -4511,7 +4382,7 @@ msgid "_Day begins:"
 msgstr "_Päivä alkaa:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
-#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:43
@@ -4560,80 +4431,46 @@ msgstr "_Ke"
 msgid "before every appointment"
 msgstr "_Ennen joka tapaamista"
 
-#: calendar/gui/dialogs/cancel-comp.c:57
-msgid ""
-"The event being deleted is a meeting, would you like to send a cancellation "
-"notice?"
-msgstr "Poistettava tapahtuma on kokous, haluatko lähettää perumisilmoituksen?"
-
-#: calendar/gui/dialogs/cancel-comp.c:60
-msgid "Are you sure you want to cancel and delete this meeting?"
-msgstr "Haluatko varmasti peruuttaa ja poistaa tämän tapaamisen?"
-
-#: calendar/gui/dialogs/cancel-comp.c:66
-msgid ""
-"The task being deleted is assigned, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"Poistettava tehtävä on annettu tehtäväksi, haluatko lähettää "
-"perumisilmoituksen?"
-
-#: calendar/gui/dialogs/cancel-comp.c:69
-msgid "Are you sure you want to cancel and delete this task?"
-msgstr "Haluatko todella peruuttaa ja poistaa tämän tehtävän?"
-
-#: calendar/gui/dialogs/cancel-comp.c:75
-msgid ""
-"The journal entry being deleted is published, would you like to send a "
-"cancellation notice?"
-msgstr ""
-"Poistettava päiväkirjamerkintä on julkaistu, haluatko lähettää "
-"perumisilmoituksen?"
-
-#: calendar/gui/dialogs/cancel-comp.c:78
-msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr "Haluatko varmasti peruuttaa ja poistaa tämän päiväkirjamerkinnän?"
-
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Tapahtuma on poistettu."
 
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "Tehtävä on poistettu."
 
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:68
 msgid "This journal entry has been deleted."
 msgstr "Päiväkirjamerkintä on poistettu."
 
-#: calendar/gui/dialogs/changed-comp.c:75
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s olet tehnyt muutoksia. Unohda nämä muutokset ja sulje muokkain?"
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s Et ole tehnyt muutoksia, sulje muokkain?"
 
-#: calendar/gui/dialogs/changed-comp.c:82
+#: calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "Tapahtumaa on muutettu."
 
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "Tehtävää on muutettu."
 
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:92
 msgid "This journal entry has been changed."
 msgstr "Päiväkirjamerkintää on muutettu."
 
-#: calendar/gui/dialogs/changed-comp.c:99
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s Olet tehnyt muutoksia. Unohda nämä muutokset ja päivitä muokkain?"
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Et tehnyt muutoksia, suljetaanko muokkain?"
@@ -4671,7 +4508,7 @@ msgid "No summary"
 msgstr "Ei kuvausta"
 
 #: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
 #: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Tallenna nimellä..."
@@ -4723,101 +4560,53 @@ msgstr "Kohdetta ei voitu avata"
 msgid "Destination is read only"
 msgstr "Kohde on vain luettavissa"
 
-#: calendar/gui/dialogs/delete-comp.c:95
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "Haluatko todella poistaa tapaamisen '%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:98
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "Haluatko todella poistaa tämän nimettömän tapaamisen?"
-
-#: calendar/gui/dialogs/delete-comp.c:104
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "Haluatko todella poistaa tehtävän '%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:107
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "Haluatko todella poistaa tämän nimettömän tehtävän?"
-
-#: calendar/gui/dialogs/delete-comp.c:113
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "Haluatko varmasti poistaa päiväkirjamerkinnän '%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:116
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "Haluatko varmasti poistaa tämän nimeämättömän päiväkirjamerkinnän?"
-
-#: calendar/gui/dialogs/delete-comp.c:131
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d appointment?"
-msgid_plural "Are you sure you want to delete %d appointments?"
-msgstr[0] "Haluatko todella poistaa %d tapaamiset?"
-msgstr[1] "Haluatko todella poistaa %d tapaamiset?"
-
-#: calendar/gui/dialogs/delete-comp.c:138
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d task?"
-msgid_plural "Are you sure you want to delete %d tasks?"
-msgstr[0] "Haluatko todella poistaa %d tehtävää?"
-msgstr[1] "Haluatko todella poistaa %d tehtävää?"
-
-#: calendar/gui/dialogs/delete-comp.c:145
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d journal entry?"
-msgid_plural "Are you sure you want to delete %d journal entries?"
-msgstr[0] "Haluatko varmasti poistaa %d päiväkirjamerkintää?"
-msgstr[1] "Haluatko varmasti poistaa %d päiväkirjamerkintää?"
-
-#: calendar/gui/dialogs/delete-error.c:52
+#: calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "Tapahtumaa ei voitu poistaa corba-virheen takia"
 
-#: calendar/gui/dialogs/delete-error.c:55
+#: calendar/gui/dialogs/delete-error.c:57
 msgid "The task could not be deleted due to a corba error"
 msgstr "Tehtävää ei voitu poistaa corba-virheen takia"
 
-#: calendar/gui/dialogs/delete-error.c:58
+#: calendar/gui/dialogs/delete-error.c:60
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr "Päiväkirjamerkintää ei voitu poistaa corba-virheen takia"
 
-#: calendar/gui/dialogs/delete-error.c:61
+#: calendar/gui/dialogs/delete-error.c:63
 msgid "The item could not be deleted due to a corba error"
 msgstr "Kohdetta ei voitu poistaa corba-virheen takia"
 
-#: calendar/gui/dialogs/delete-error.c:68
+#: calendar/gui/dialogs/delete-error.c:70
 msgid "The event could not be deleted because permission was denied"
 msgstr "Tapahtumaa ei voitu poistaa, koska oikeudet eivät riittäneet poistoon"
 
-#: calendar/gui/dialogs/delete-error.c:71
+#: calendar/gui/dialogs/delete-error.c:73
 msgid "The task could not be deleted because permission was denied"
 msgstr "Tehtävää ei voitu poistaa, koska oikeudet eivät riittäneet poistoon"
 
-#: calendar/gui/dialogs/delete-error.c:74
+#: calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr ""
 "Päiväkirjamerkintää ei voitu poistaa, koska oikeudet eivät riittäneet "
 "poistoon"
 
-#: calendar/gui/dialogs/delete-error.c:77
+#: calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
 msgstr "Kohdetta ei voitu poistaa, koska oikeudet eivät riittäneet poistoon"
 
-#: calendar/gui/dialogs/delete-error.c:84
+#: calendar/gui/dialogs/delete-error.c:86
 msgid "The event could not be deleted due to an error"
 msgstr "Tapahtumaa ei voitu poistaa virheen takia"
 
-#: calendar/gui/dialogs/delete-error.c:87
+#: calendar/gui/dialogs/delete-error.c:89
 msgid "The task could not be deleted due to an error"
 msgstr "Tehtävää ei voitu poistaa virheen takia"
 
-#: calendar/gui/dialogs/delete-error.c:90
+#: calendar/gui/dialogs/delete-error.c:92
 msgid "The journal entry could not be deleted due to an error"
 msgstr "Päiväkirjamerkintää ei voitu poistaa virheen takia"
 
-#: calendar/gui/dialogs/delete-error.c:93
+#: calendar/gui/dialogs/delete-error.c:95
 msgid "The item could not be deleted due to an error"
 msgstr "Kohdetta ei voitu poistaa virheen takia"
 
@@ -4951,11 +4740,11 @@ msgstr "_Alkamisaika:"
 
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:3
+#: calendar/gui/dialogs/meeting-page.glade.h:4
 #: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
 #: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1559
-#: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:100
+#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
+#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
@@ -4981,8 +4770,8 @@ msgstr "_Valtuuta..."
 #. FIXME: need to disable for undeletable folders
 #: calendar/gui/dialogs/meeting-page.c:655
 #: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1310 calendar/gui/e-calendar-view.c:1342
-#: mail/em-folder-tree.c:2557 mail/em-folder-view.c:919
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
+#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -4990,7 +4779,7 @@ msgid "_Delete"
 msgstr "_Poista"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:240
+#: calendar/gui/e-meeting-list-view.c:218
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Osanottaja"
@@ -5026,16 +4815,15 @@ msgid "Member"
 msgstr "Jäsen"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "Kuittauspyyntö"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
-#: mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-list-view.c:248
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Tila"
 
@@ -5043,20 +4831,20 @@ msgstr "Tila"
 msgid "Add A_ttendee"
 msgstr "Lisää _osallistuja"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "Add attendees from addressbook."
+msgstr "Lisää lähettäjä _osoitekirjaan"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Organisoija:"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
+#: calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "_Change Organizer"
 msgstr "Vaihda _järjestäjää"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-#: calendar/gui/e-meeting-time-sel.c:417
-msgid "_Invite Others..."
-msgstr "_Kutsu muita..."
-
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
 msgstr "<b>Kalenterin vaihtoehdot</b>"
@@ -5204,7 +4992,7 @@ msgid "_No recurrence"
 msgstr "_Ei toistuvuutta"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:450
+#: composer/e-msg-composer-attachment-bar.c:453
 msgid "_Remove"
 msgstr "_Poista"
 
@@ -5236,54 +5024,20 @@ msgstr "viikkoa"
 msgid "year(s)"
 msgstr "vuotta"
 
-#: calendar/gui/dialogs/save-comp.c:53
-msgid ""
-"This event has been changed, but has not been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Tätä tapahtumaa on muutettu, mutta sitä ei ole tallennettu.\n"
-"\n"
-"Haluatko tallentaa muutokset?"
-
-#: calendar/gui/dialogs/save-comp.c:57
-msgid "_Discard Changes"
-msgstr "_Hylkää muutokset"
-
-#: calendar/gui/dialogs/save-comp.c:62
-msgid "Save Event"
-msgstr "Tallenna tapahtuma"
-
-#: calendar/gui/dialogs/select-source-dialog.c:65
+#: calendar/gui/dialogs/select-source-dialog.c:69
 #, fuzzy
 msgid "Select destination"
 msgstr "Valitse kohde %s"
 
-#: calendar/gui/dialogs/select-source-dialog.c:86
+#: calendar/gui/dialogs/select-source-dialog.c:90
 #, fuzzy
 msgid "_Destination"
 msgstr "Kohdekansio:"
 
-#: calendar/gui/dialogs/select-source-dialog.c:88
+#: calendar/gui/dialogs/select-source-dialog.c:92
 msgid "Task List"
 msgstr "Tehtävät"
 
-#: calendar/gui/dialogs/send-comp.c:57
-msgid "The meeting information has been created. Send it?"
-msgstr "Kokouskutsu on luotu. Lähetetäänkö se?"
-
-#: calendar/gui/dialogs/send-comp.c:60
-msgid "The meeting information has changed. Send an updated version?"
-msgstr "Kokouskutsua on muutettu. Lähetetäänkö päivitetty versio?"
-
-#: calendar/gui/dialogs/send-comp.c:67
-msgid "The task assignment information has been created. Send it?"
-msgstr "Tehtävän toimeksinto on luotu. Lähetetäänkö se?"
-
-#: calendar/gui/dialogs/send-comp.c:71
-msgid "The task information has changed. Send an updated version?"
-msgstr "Tehtävän toimeksiantoa on muutettu. Lähetetäänkö päivitetty versio?"
-
 #: calendar/gui/dialogs/task-details-page.c:406
 msgid "Completed date is wrong"
 msgstr "Valmistumispäivä on väärin"
@@ -5303,7 +5057,7 @@ msgstr "Valmis"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #: calendar/gui/e-cal-component-preview.c:249
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:960
 msgid "High"
 msgstr "Korkea"
 
@@ -5317,14 +5071,14 @@ msgstr "Työn alla"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:253
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:958
 msgid "Low"
 msgstr "Matala"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:251
 #: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:957
+#: mail/message-list.c:959
 msgid "Normal"
 msgstr "Tavallinen"
 
@@ -5382,8 +5136,8 @@ msgstr "_Luottamuksellinen"
 
 #: calendar/gui/dialogs/task-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
+#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Kuvaus:"
 
@@ -5548,7 +5302,7 @@ msgstr "Eräpäivä:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:950
+#: calendar/gui/e-itip-control.c:943
 msgid "Status:"
 msgstr "Tila:"
 
@@ -5633,12 +5387,12 @@ msgstr "Varattu"
 msgid "Deleting selected objects"
 msgstr "Poistetaan valitut kohteet"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
 msgid "Updating objects"
 msgstr "Päivitetään olioita"
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1370
+#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
 #: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Avaa"
@@ -5648,15 +5402,15 @@ msgid "Open _Web Page"
 msgstr "_Avaa www-sivu"
 
 #: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1291 calendar/gui/e-calendar-view.c:1376
-#: mail/em-folder-view.c:896 mail/em-popup.c:690 mail/em-popup.c:806
+#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
+#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "Tallenna _nimellä..."
 
 #: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1292
-#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
+#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
@@ -5664,24 +5418,24 @@ msgid "_Print..."
 msgstr "T_ulosta..."
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "L_eikkaa"
 
 #: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1338
-#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2550
-#: mail/message-list.c:1644 ui/evolution-addressbook.xml.h:31
+#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
+#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
+#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Kopioi"
 
 #: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1273 calendar/gui/e-calendar-view.c:1299
-#: calendar/gui/e-calendar-view.c:1372 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
+#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
@@ -5750,71 +5504,71 @@ msgstr "Kuvaus"
 msgid "Task sort"
 msgstr "Tehtävän tyyppi"
 
-#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
 msgid "New _Appointment..."
 msgstr "Uusi t_apaaminen..."
 
-#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
+#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
 msgid "New All Day _Event"
 msgstr "Uusi koko pä_ivän tapahtuma"
 
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
+#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
 msgid "New Meeting"
 msgstr "Uusi kokous"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
 msgid "New Task"
 msgstr "Uusi tehtävä"
 
-#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Valitse _säie"
 
-#: calendar/gui/e-calendar-view.c:1280
+#: calendar/gui/e-calendar-view.c:1283
 #, fuzzy
 msgid "_Select Date..."
 msgstr "_Valitse..."
 
-#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Julkaise vapaa/varattu-tietoja"
 
-#: calendar/gui/e-calendar-view.c:1303
+#: calendar/gui/e-calendar-view.c:1306
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Kopioi kansioon..."
 
-#: calendar/gui/e-calendar-view.c:1304
+#: calendar/gui/e-calendar-view.c:1307
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "_Siirrä kansioon..."
 
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1308
 msgid "_Schedule Meeting..."
 msgstr "_Järjestä kokous..."
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1309
 msgid "_Forward as iCalendar..."
 msgstr "_Välitä iCalendar-muodossa..."
 
-#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
 msgid "Delete this _Occurrence"
 msgstr "Poista tämä _tapahtumakerta"
 
-#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
 msgid "Delete _All Occurrences"
 msgstr "Poista _kaikki tapahtumakerrat"
 
-#: calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1349
 msgid "Go to _Today"
 msgstr "Siirry _tähän päivään"
 
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1351
 msgid "_Go to Date..."
 msgstr "Siirry _päivään..."
 
-#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "_Asetukset..."
 
@@ -5829,9 +5583,9 @@ msgstr "Aloituspäivä"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:967 calendar/gui/e-itip-control.c:1169
-#: calendar/gui/e-meeting-list-view.c:144
-#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
 #: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
 #: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
 #: camel/camel-tcp-stream-openssl.c:631
@@ -5857,13 +5611,13 @@ msgid "Assigned"
 msgstr "Annettu tehtäväksi"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr "Kyllä"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "Ei"
 
@@ -5875,7 +5629,7 @@ msgstr "P"
 msgid "S"
 msgstr "E"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
 msgid "E"
 msgstr "I"
 
@@ -5947,404 +5701,408 @@ msgstr "%d %b"
 msgid "%02i minute divisions"
 msgstr "%02.i minuutin välein"
 
-#: calendar/gui/e-itip-control.c:592
+#: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
 msgstr "Kyllä (monimutkainen toistuvuus)"
 
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:596
 #, fuzzy, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Joka päivä"
 msgstr[1] "Joka päivä"
 
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:601
 #, fuzzy, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Joka viikko"
 msgstr[1] "Joka viikko"
 
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:603
 #, fuzzy, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "Viikoittain"
 msgstr[1] "Viikoittain"
 
-#: calendar/gui/e-itip-control.c:618
+#: calendar/gui/e-itip-control.c:611
 msgid " and "
 msgstr " ja "
 
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:618
 #, c-format
 msgid "The %s day of "
 msgstr "%s:s päivä"
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:631
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s"
 
-#: calendar/gui/e-itip-control.c:645
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "Joka kuukausi"
 msgstr[1] "Joka kuukausi"
 
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:642
 #, fuzzy, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Joka vuosi"
 msgstr[1] "Joka vuosi"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:653
 #, fuzzy, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] "Kaikkiaan %d kertaa"
 msgstr[1] "Kaikkiaan %d kertaa"
 
-#: calendar/gui/e-itip-control.c:669
+#: calendar/gui/e-itip-control.c:662
 msgid ", ending on "
 msgstr ", päättyen"
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:686
 msgid "<b>Starts:</b> "
 msgstr "<b>Alkaa:</b>"
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:696
 msgid "<b>Ends:</b> "
 msgstr "<b>Loppuu:</b> "
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:716
 msgid "<b>Completed:</b> "
 msgstr "<b>Valmis:</b> "
 
-#: calendar/gui/e-itip-control.c:733
+#: calendar/gui/e-itip-control.c:726
 msgid "<b>Due:</b> "
 msgstr "<b>Erääntyy:</b>"
 
-#: calendar/gui/e-itip-control.c:771 calendar/gui/e-itip-control.c:827
+#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
 msgid "iCalendar Information"
 msgstr "iCalendarin tiedot"
 
 #. Title
-#: calendar/gui/e-itip-control.c:788
+#: calendar/gui/e-itip-control.c:781
 msgid "iCalendar Error"
 msgstr "iCalendarin virhe"
 
-#: calendar/gui/e-itip-control.c:859 calendar/gui/e-itip-control.c:875
-#: calendar/gui/e-itip-control.c:886 calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
 msgid "An unknown person"
 msgstr "Tuntematon henkilö"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:910
+#: calendar/gui/e-itip-control.c:903
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 "<br> Tarkista seuraavat tiedot ja valitse toimenpide allaolevasta valikosta"
 
-#: calendar/gui/e-itip-control.c:925
+#: calendar/gui/e-itip-control.c:918
 msgid "<i>None</i>"
 msgstr "<i>Ei mitään</i>"
 
-#: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:929
+msgid "Location:"
+msgstr "Sijainti:"
+
+#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Hyväksytty"
 
-#: calendar/gui/e-itip-control.c:959 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Alustavasti hyväksytty"
 
-#: calendar/gui/e-itip-control.c:963 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Hylätty"
 
-#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.c:1050
-#: calendar/gui/e-itip-control.c:1076 calendar/gui/e-itip-control.c:1089
-#: calendar/gui/e-itip-control.c:1102 calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
 msgid "Choose an action:"
 msgstr "Valitse toiminto:"
 
-#: calendar/gui/e-itip-control.c:1023
+#: calendar/gui/e-itip-control.c:1016
 msgid "Update"
 msgstr "Päivitä"
 
-#: calendar/gui/e-itip-control.c:1024 calendar/gui/e-itip-control.c:1055
-#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1091
-#: calendar/gui/e-itip-control.c:1104 calendar/gui/e-itip-control.c:1117
-#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
+#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1044
 msgid "Accept"
 msgstr "Hyväksy"
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1045
 msgid "Tentatively accept"
 msgstr "Hyväksy alustavasti"
 
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1046
 msgid "Decline"
 msgstr "Hylkää"
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1070
 msgid "Send Free/Busy Information"
 msgstr "Lähetä vapaa/varattu-tiedot"
 
-#: calendar/gui/e-itip-control.c:1090
+#: calendar/gui/e-itip-control.c:1083
 msgid "Update respondent status"
 msgstr "Päivitä vastaajan tila"
 
-#: calendar/gui/e-itip-control.c:1103
+#: calendar/gui/e-itip-control.c:1096
 msgid "Send Latest Information"
 msgstr "Lähetä viimeisimmät tiedot"
 
-#: calendar/gui/e-itip-control.c:1116 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Peruuta"
 
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1185
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> on julkaissut tapaamistietonsa."
 
-#: calendar/gui/e-itip-control.c:1193
+#: calendar/gui/e-itip-control.c:1186
 msgid "Meeting Information"
 msgstr "Kokouksen tiedot"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1191
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> pyytää %s läsnäoloa tapaamisessa."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1193
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> pyytää läsnäoloasi kokouksessa."
 
-#: calendar/gui/e-itip-control.c:1201
+#: calendar/gui/e-itip-control.c:1194
 msgid "Meeting Proposal"
 msgstr "Kokousehdotus"
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> toivoo pääsyä olemassaolevaan kokoukseen."
 
-#: calendar/gui/e-itip-control.c:1206
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Update"
 msgstr "Kokouksen päivitys"
 
-#: calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1203
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> toivoo saavansa viimeisimmät tapaamistiedot."
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1204
 msgid "Meeting Update Request"
 msgstr "Kokouksen päivtyspyyntö"
 
-#: calendar/gui/e-itip-control.c:1218
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> on vastannut tapaamispyyntöön."
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Reply"
 msgstr "Kokouspyynnön vastaus"
 
-#: calendar/gui/e-itip-control.c:1226
+#: calendar/gui/e-itip-control.c:1219
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> on peruuttanut tapaamisen."
 
-#: calendar/gui/e-itip-control.c:1227
+#: calendar/gui/e-itip-control.c:1220
 msgid "Meeting Cancellation"
 msgstr "Kokouksen peruminen"
 
-#: calendar/gui/e-itip-control.c:1234 calendar/gui/e-itip-control.c:1302
-#: calendar/gui/e-itip-control.c:1337
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1330
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> lähetti järjettömän viestin."
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1228
 msgid "Bad Meeting Message"
 msgstr "Huono tapaaminen-sanoma"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1253
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> on julkaissut tehtävätietonsa."
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1254
 msgid "Task Information"
 msgstr "Tehtävän tiedot"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1259
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> pyytää %s tekemään työtehtävän."
 
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> pyytää sinua suorittamaan tehtävän."
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1262
 msgid "Task Proposal"
 msgstr "Tehtäväehdotus"
 
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> toivoo lisäystään olemassaolevaan tehtävään"
 
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Update"
 msgstr "Tehtävän päivitys"
 
-#: calendar/gui/e-itip-control.c:1278
+#: calendar/gui/e-itip-control.c:1271
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> toivoo saavansa viimeisimmät työtehtävätiedot."
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1272
 msgid "Task Update Request"
 msgstr "Tehtävän päivityspyyntö"
 
-#: calendar/gui/e-itip-control.c:1286
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> on vastannut työtehtävän antoon."
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Reply"
 msgstr "Vastaus tehtävään"
 
-#: calendar/gui/e-itip-control.c:1294
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> perui tehtävän."
 
-#: calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1288
 msgid "Task Cancellation"
 msgstr "Tehtävän peruminen"
 
-#: calendar/gui/e-itip-control.c:1303
+#: calendar/gui/e-itip-control.c:1296
 msgid "Bad Task Message"
 msgstr "Huono tehtävä-sanoma"
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1315
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> on julkaissut vapaa/kiireinen-tietonsa."
 
-#: calendar/gui/e-itip-control.c:1323
+#: calendar/gui/e-itip-control.c:1316
 msgid "Free/Busy Information"
 msgstr "Vapaa/varattu-tiedot"
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> pyytää sinun vapaa/varattu -tietoja."
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1321
 msgid "Free/Busy Request"
 msgstr "Vapaa/varattu-tiedustulu"
 
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1325
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> on vastannut vapaa/varattu -kyselyyn."
 
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1326
 msgid "Free/Busy Reply"
 msgstr "Vapaa/varattu-vastaus"
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1331
 msgid "Bad Free/Busy Message"
 msgstr "Huono vapaa/kiireinen -viesti"
 
-#: calendar/gui/e-itip-control.c:1413
+#: calendar/gui/e-itip-control.c:1406
 msgid "The message does not appear to be properly formed"
 msgstr "Viesti ei näytä olevan kunnolla muotoiltu."
 
-#: calendar/gui/e-itip-control.c:1472
+#: calendar/gui/e-itip-control.c:1465
 msgid "The message contains only unsupported requests."
 msgstr "Viesti sisältää vain pyyntöjä, jotka eivät ole tuettu."
 
-#: calendar/gui/e-itip-control.c:1503
+#: calendar/gui/e-itip-control.c:1496
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Liite ei sisällä kelvollista kalenteriviestiä"
 
-#: calendar/gui/e-itip-control.c:1535
+#: calendar/gui/e-itip-control.c:1528
 msgid "The attachment has no viewable calendar items"
 msgstr "Liitteessä ei ole näytettäviä kalenteriviestejä"
 
-#: calendar/gui/e-itip-control.c:1769
+#: calendar/gui/e-itip-control.c:1762
 msgid "Update complete\n"
 msgstr "Päivitys valmis\n"
 
-#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
+#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Läsnäolon tilaa ei voida päivittää, koska kohdetta ei enää ole olemassa"
 
-#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Kohde on virheellinen eikä sitä voida päivittää\n"
 
-#: calendar/gui/e-itip-control.c:1825
+#: calendar/gui/e-itip-control.c:1818
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Vastaus ei ole tämänhetkiseltä läsnäolijalta. Lisää läsnäolijaksi?"
 
-#: calendar/gui/e-itip-control.c:1837
+#: calendar/gui/e-itip-control.c:1830
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Läsnäolon tilaa ei voitu päivittää virheellisen tilan takia\n"
 
-#: calendar/gui/e-itip-control.c:1856
+#: calendar/gui/e-itip-control.c:1849
 msgid "There was an error on the CORBA system\n"
 msgstr "Virhe CORBA-järjestelmässä\n"
 
-#: calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1852
 msgid "Object could not be found\n"
 msgstr "Kohdetta ei löytynyt\n"
 
-#: calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1855
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Sinulla ei ole kalenterin päivitykseen vaadittavia oikeuksia\n"
 
-#: calendar/gui/e-itip-control.c:1865
+#: calendar/gui/e-itip-control.c:1858
 msgid "Attendee status updated\n"
 msgstr "Läsnäolon tila päivitetty\n"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1861
 msgid "Attendee status could not be updated!\n"
 msgstr "Osallistujan tilan päivitys epäonnistui!\n"
 
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1892
 msgid "Removal Complete"
 msgstr "Poisto valmis"
 
-#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
 msgid "Item sent!\n"
 msgstr "Lähetetty\n"
 
-#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
+#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
 msgid "The item could not be sent!\n"
 msgstr "Kohdetta ei voitu lähettää!\n"
 
@@ -6385,74 +6143,74 @@ msgstr "loppumispäivä"
 msgid "date-start"
 msgstr "alkamispäivä"
 
-#: calendar/gui/e-meeting-list-view.c:62
+#: calendar/gui/e-meeting-list-view.c:59
 msgid "Chair Persons"
 msgstr "Toimi puheenjohtajana"
 
-#: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:479
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
 msgid "Required Participants"
 msgstr "Vaaditut läsnäolijat"
 
-#: calendar/gui/e-meeting-list-view.c:64
+#: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Vapaaehtoiset läsnäolijat"
 
-#: calendar/gui/e-meeting-list-view.c:65
+#: calendar/gui/e-meeting-list-view.c:62
 msgid "Resources"
 msgstr "Resurssit"
 
-#: calendar/gui/e-meeting-list-view.c:140 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
 #: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr "Henkilö"
 
-#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "Ryhmä"
 
-#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr "Resurssi"
 
-#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr "Huone"
 
-#: calendar/gui/e-meeting-list-view.c:154 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr "Puheenjohtaja"
 
-#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:127
 #: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
 msgid "Required Participant"
 msgstr "Vaadittu läsnäolija"
 
-#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr "Vapaaehoinen läsnäolija"
 
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr "Ei läsnä"
 
-#: calendar/gui/e-meeting-list-view.c:179 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:177
 #: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
 msgid "Needs Action"
 msgstr "Vaatii toimenpiteitä"
 
-#: calendar/gui/e-meeting-list-view.c:182 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
 #: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "Alustava"
 
-#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr "Valtuutettu"
@@ -6469,20 +6227,28 @@ msgstr "Poissa konttorilta"
 msgid "No Information"
 msgstr "Ei tietoa"
 
+#: calendar/gui/e-meeting-time-sel.c:417
+#, fuzzy
+msgid "Add attendees from addressbook"
+msgstr "Lisää lähettäjä _osoitekirjaan"
+
 #: calendar/gui/e-meeting-time-sel.c:440
 msgid "_Options"
 msgstr "_Asetukset"
 
 #: calendar/gui/e-meeting-time-sel.c:457
-msgid "Show _Only Working Hours"
+#, fuzzy
+msgid "Show _only working hours"
 msgstr "Näytä vain työtunnit"
 
 #: calendar/gui/e-meeting-time-sel.c:467
-msgid "Show _Zoomed Out"
+#, fuzzy
+msgid "Show _zoomed out"
 msgstr "Näytä _etäänpää"
 
 #: calendar/gui/e-meeting-time-sel.c:482
-msgid "_Update Free/Busy"
+#, fuzzy
+msgid "_Update free/busy"
 msgstr "_Päivitä vapaa/varattu"
 
 #: calendar/gui/e-meeting-time-sel.c:497
@@ -6498,19 +6264,23 @@ msgid ">_>"
 msgstr ">_>"
 
 #: calendar/gui/e-meeting-time-sel.c:547
-msgid "_All People and Resources"
+#, fuzzy
+msgid "_All people and resources"
 msgstr "_Kaikki henkilöt ja resurssit"
 
 #: calendar/gui/e-meeting-time-sel.c:556
-msgid "All _People and One Resource"
+#, fuzzy
+msgid "All _people and one resource"
 msgstr "Kaikki _henkilöt ja yksi resurssi"
 
 #: calendar/gui/e-meeting-time-sel.c:565
-msgid "_Required People"
+#, fuzzy
+msgid "_Required people"
 msgstr "_Vaaditut henkilöt"
 
 #: calendar/gui/e-meeting-time-sel.c:574
-msgid "Required People and _One Resource"
+#, fuzzy
+msgid "Required people and _one resource"
 msgstr "Vaaditut henkilöt ja _yksi resurssi"
 
 #: calendar/gui/e-meeting-time-sel.c:593
@@ -6548,7 +6318,7 @@ msgstr "%d/%m/%Y"
 msgid "Enter the password for %s"
 msgstr "Syötä salasana %s:lle"
 
-#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6557,22 +6327,14 @@ msgstr ""
 "Virhe %s:ssä:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
-#, fuzzy, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-"Tehtävien taustajärjestelmä\n"
-"%s\n"
-"on kaatunut."
-
 #. FIXME Loading should be async
 #. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:686
+#: calendar/gui/e-tasks.c:801
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Avataan tehtävät %s"
 
-#: calendar/gui/e-tasks.c:709
+#: calendar/gui/e-tasks.c:824
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6581,55 +6343,47 @@ msgstr ""
 "Virhe avattaessa %s:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:730
+#: calendar/gui/e-tasks.c:845
 msgid "Loading tasks"
 msgstr "Ladataan tehtäviä"
 
-#: calendar/gui/e-tasks.c:834
+#: calendar/gui/e-tasks.c:949
 msgid "Completing tasks..."
 msgstr "Viimeistellään tehtäviä..."
 
-#: calendar/gui/e-tasks.c:857
+#: calendar/gui/e-tasks.c:972
 msgid "Deleting selected objects..."
 msgstr "Valtuutetaan seuraavat tehtävät...."
 
-#: calendar/gui/e-tasks.c:884
+#: calendar/gui/e-tasks.c:999
 msgid "Expunging"
 msgstr "Poistetaan poistettuja"
 
-#: calendar/gui/e-tasks.c:960
+#: calendar/gui/e-tasks.c:1075
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
-#: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
+#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
+#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
 #: calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:705
 msgid "Tasks"
 msgstr "Tehtävät"
 
-#: calendar/gui/gnome-cal.c:1876
+#: calendar/gui/gnome-cal.c:1878
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Ladataan tapaamisia %s"
 
-#: calendar/gui/gnome-cal.c:1895
+#: calendar/gui/gnome-cal.c:1897
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Ladataan tehtäviä %s"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1920
 #, c-format
 msgid "Opening %s"
 msgstr "Avataan %s"
 
-#: calendar/gui/gnome-cal.c:2048
-#, fuzzy, c-format
-msgid "The calendar backend for '%s' has crashed."
-msgstr ""
-"Kalenterin taustajärjestelmä\n"
-"%s\n"
-"on kaatunut."
-
-#: calendar/gui/gnome-cal.c:2894
+#: calendar/gui/gnome-cal.c:2906
 msgid "Purging"
 msgstr "Tyhjennetään"
 
@@ -6829,7 +6583,7 @@ msgid "On The Web"
 msgstr "Verkossa"
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 
@@ -6840,7 +6594,7 @@ msgid "Unable to migrate calendar `%s'"
 msgstr "Kalenterin '%s' ei voitu avata"
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:869
+#: calendar/gui/migration.c:889
 #, fuzzy, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Tehtäviä kohteessa '%s' ei voitu avata."
@@ -7076,74 +6830,74 @@ msgstr "Tulosta kohta"
 msgid "Print Setup"
 msgstr "Tulostusasetukset"
 
-#: calendar/gui/tasks-component.c:303
+#: calendar/gui/tasks-component.c:313
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr "Tehtävälista '%s' poistetaan. Oletko varma että haluat jatkaa?"
 
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:371
 msgid "New Task List"
 msgstr "Uusi tehtävälista"
 
-#: calendar/gui/tasks-component.c:398
+#: calendar/gui/tasks-component.c:408
 #, fuzzy, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d yhteystietoa"
 msgstr[1] "%d yhteystietoa"
 
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] "Poistettu"
 msgstr[1] "Poistettu"
 
-#: calendar/gui/tasks-component.c:447
+#: calendar/gui/tasks-component.c:457
 #, fuzzy
 msgid "Failed upgrading tasks."
 msgstr "Ladataan tehtäviä"
 
-#: calendar/gui/tasks-component.c:526
+#: calendar/gui/tasks-component.c:749
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 "Tehtävälistaa '%s' ei voitu avata uusien tehtävien ja tapaamisten tekemistä "
 "varten"
 
-#: calendar/gui/tasks-component.c:538
+#: calendar/gui/tasks-component.c:761
 msgid "There is no calendar available for creating tasks"
 msgstr "Tehtävien luomiseen tarvittavaa kalenteria ei ole saatavilla"
 
-#: calendar/gui/tasks-component.c:576
+#: calendar/gui/tasks-component.c:799
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:804
+#: calendar/gui/tasks-component.c:1040
 msgid "New task"
 msgstr "Uusi tehtävä"
 
-#: calendar/gui/tasks-component.c:805
+#: calendar/gui/tasks-component.c:1041
 msgid "_Task"
 msgstr "_Tehtävä"
 
-#: calendar/gui/tasks-component.c:806
+#: calendar/gui/tasks-component.c:1042
 msgid "Create a new task"
 msgstr "Luo uusi tehtävä"
 
-#: calendar/gui/tasks-component.c:812
+#: calendar/gui/tasks-component.c:1048
 #, fuzzy
 msgid "New tasks group"
 msgstr "Uusi tehtävä"
 
-#: calendar/gui/tasks-component.c:813
+#: calendar/gui/tasks-component.c:1049
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Tehtävälistan ryhmä"
 
-#: calendar/gui/tasks-component.c:814
+#: calendar/gui/tasks-component.c:1050
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Luo uusi tehtävä"
@@ -8912,12 +8666,12 @@ msgstr "Virhe suoritettaessa suodatinhakua: %s: %s"
 msgid "Unsupported operation: append message: for %s"
 msgstr "Toiminto ei ole tuettu: lisää viesti: %s:lle"
 
-#: camel/camel-folder.c:1259
+#: camel/camel-folder.c:1262
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Toiminto ei ole tuettu: hae lausekkeella: %s:lle"
 
-#: camel/camel-folder.c:1299
+#: camel/camel-folder.c:1302
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Toiminto ei ole tuettu: hae UIDien perusteella: %s:lle"
@@ -8930,11 +8684,16 @@ msgstr "Siirretään viestejä"
 msgid "Copying messages"
 msgstr "Kopioidaan viestejä"
 
-#: camel/camel-folder.c:1666
-msgid "Learning junk and/or non junk message(s)"
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Muutetaan roskapostitilaa"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
 msgstr ""
 
-#: camel/camel-folder.c:1695
+#: camel/camel-folder.c:1701
 msgid "Filtering new message(s)"
 msgstr "Suodatetaan uusia viestejä"
 
@@ -8968,17 +8727,17 @@ msgstr ""
 msgid "(match-threads) requires a match type string"
 msgstr ""
 
-#: camel/camel-folder-search.c:785
+#: camel/camel-folder-search.c:784
 #, fuzzy
 msgid "(match-threads) expects an array result"
 msgstr "(match-all) vaatii yhden totuusarvoisen tuloksen"
 
-#: camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:790
 #, fuzzy
 msgid "(match-threads) requires the folder set"
 msgstr "(match-all) vaatii yhden totuusarvoisen tuloksen"
 
-#: camel/camel-folder-search.c:880
+#: camel/camel-folder-search.c:879
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Kysely tuntemattomaan otsakkeeseen: %s"
@@ -9013,7 +8772,8 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
 #: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:706
+#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Peruutettu."
@@ -9398,7 +9158,7 @@ msgstr "Viitatut valtuustiedot ovat vanhentuneet."
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1212
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Virheellinen vastaus varmennukseen palvelimelta."
 
@@ -9779,41 +9539,41 @@ msgstr "Komentoa ei ole toteutettu"
 msgid "export keys: unimplemented"
 msgstr ""
 
-#: camel/camel-store.c:214
+#: camel/camel-store.c:213
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr ""
 "Kansion hakeminen ei onnistu: virheellinen toiminto tässä tallennuspaikassa"
 
-#: camel/camel-store.c:244
+#: camel/camel-store.c:243
 #, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr "Kansiota '%s' ei voida luoda: kansio on jo olemassa"
 
-#: camel/camel-store.c:295
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Kansion luominen ei onnistu: virheellinen tapahtuma tallennuspaikassa"
 
-#: camel/camel-store.c:323
+#: camel/camel-store.c:325
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Kansiota '%s' ei voida luoda: kansio on jo olemassa"
 
-#: camel/camel-store.c:387 camel/camel-vee-store.c:354
+#: camel/camel-store.c:389 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kansion poistaminen ei onnistu: %s: Virheellinen tapahtuma"
 
-#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#: camel/camel-store.c:439 camel/camel-vee-store.c:387
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kansion nimeäminen ei onnistu: %s: virheellinen toiminto"
 
-#: camel/camel-store.c:811
+#: camel/camel-store.c:777
 msgid "Trash"
 msgstr "Roskakori"
 
-#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
-#: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/mail-config.glade.h:95
+#: ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Roskapostia"
 
@@ -10045,12 +9805,12 @@ msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 "Viestien kopioiminen tai siirtäminen ei onnistu virtuaalisiin kansioihin"
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:374
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kansion poistaminen ei onnistu: %s: Kansiota ei ole"
 
-#: camel/camel-vee-store.c:398
+#: camel/camel-vee-store.c:395
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kansion nimeäminen ei onnistu: %s: kansiota ei löydy"
@@ -10095,31 +9855,31 @@ msgstr "Osoitekirja"
 msgid "Post Office Agent SOAP Port:"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:80
+#: camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "Novell GroupWise"
 msgstr "Novell Groupwise"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:82
+#: camel/providers/groupwise/camel-groupwise-provider.c:85
 msgid "For accessing Novell Groupwise servers"
 msgstr "Novell GroupWise-palvelinten käyttöä varten"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: camel/providers/groupwise/camel-groupwise-provider.c:100
 #: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
 msgid "Password"
 msgstr "Salasana"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:99
+#: camel/providers/groupwise/camel-groupwise-provider.c:102
 #: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Ota yhteys IMAP-palvelimeen tekstimuotoista salasanaa käyttäen."
 
-#: camel/providers/groupwise/camel-gw-listener.c:305
-#: camel/providers/groupwise/camel-gw-listener.c:328
+#: camel/providers/groupwise/camel-gw-listener.c:312
+#: camel/providers/groupwise/camel-gw-listener.c:335
 #, fuzzy
 msgid "Checklist"
 msgstr "lista"
@@ -10262,13 +10022,13 @@ msgid ""
 msgstr "Ota yhteys IMAP-palvelimeen tekstimuotoista salasanaa käyttäen."
 
 #: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:429
+#: camel/providers/imap/camel-imap-store.c:428
 #, c-format
 msgid "IMAP server %s"
 msgstr "Imap-palvelin %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:431
+#: camel/providers/imap/camel-imap-store.c:430
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP-palvelin %s:lle palvelimella %s"
@@ -10278,7 +10038,7 @@ msgstr "IMAP-palvelin %s:lle palvelimella %s"
 #: camel/providers/imap/camel-imap-store.c:551
 #: camel/providers/imap/camel-imap-store.c:571
 #: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
+#: camel/providers/nntp/camel-nntp-store.c:209
 #: camel/providers/pop3/camel-pop3-store.c:175
 #: camel/providers/smtp/camel-smtp-transport.c:269
 #: camel/providers/smtp/camel-smtp-transport.c:285
@@ -10295,10 +10055,10 @@ msgstr "SSL ei käytettävissä"
 
 #: camel/providers/imap4/camel-imap4-store.c:222
 #: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:815
+#: camel/providers/imap/camel-imap-store.c:845
 #: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:137
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
 #: camel/providers/pop3/camel-pop3-store.c:192
 msgid "Connection cancelled"
 msgstr "Yhteys peruutettu"
@@ -10312,8 +10072,8 @@ msgstr ""
 "IMAP-palvelimeen %s yhdistäminen turvallisessa muodossa epäonnistui: %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:649
-#: camel/providers/imap/camel-imap-store.c:680
+#: camel/providers/imap/camel-imap-store.c:679
+#: camel/providers/imap/camel-imap-store.c:710
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
@@ -10323,7 +10083,7 @@ msgstr ""
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1109
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
@@ -10351,8 +10111,8 @@ msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr "Kansiota '%s' ei voida hakea: %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1857
-#: camel/providers/imap/camel-imap-store.c:2235
+#: camel/providers/imap/camel-imap-store.c:1885
+#: camel/providers/imap/camel-imap-store.c:2263
 #, fuzzy, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -10431,12 +10191,12 @@ msgstr "Palvelin katkaisi yhteyden odottamatta: %s"
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3168
+#: camel/providers/imap/camel-imap-store.c:3194
 msgid "Operation cancelled"
 msgstr "Toiminto keskeytetty"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3171
+#: camel/providers/imap/camel-imap-store.c:3197
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Palvelin katkaisi yhteyden odottamatta: %s"
@@ -10500,13 +10260,6 @@ msgid "Unable to retrieve message: %s"
 msgstr "Viestin haku epäonnistui: %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:219
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -10516,15 +10269,15 @@ msgstr ""
 " %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-mbox-folder.c:418
+#: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
 msgstr "Ei tällaista viestiä"
 
 #: camel/providers/imap/camel-imap-folder.c:2019
-#: camel/providers/imap/camel-imap-folder.c:2621
-#: camel/providers/nntp/camel-nntp-folder.c:238
+#: camel/providers/imap/camel-imap-folder.c:2622
+#: camel/providers/nntp/camel-nntp-folder.c:220
 msgid "This message is not currently available"
 msgstr "Tätä viestiä ei ole juuri nyt saatavilla"
 
@@ -10533,7 +10286,23 @@ msgstr "Tätä viestiä ei ole juuri nyt saatavilla"
 msgid "Fetching summary information for new messages"
 msgstr "Haetaan yhteenvedon tietoja uusista viesteistä"
 
-#: camel/providers/imap/camel-imap-folder.c:2659
+#: camel/providers/imap/camel-imap-folder.c:2463
+#, c-format
+msgid "Incomplete server response: no information provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2471
+#, c-format
+msgid "Incomplete server response: no UID provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2484
+#, c-format
+msgid ""
+"Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2660
 msgid "Could not find message body in FETCH response."
 msgstr "Viestin runkoa ei löytynyt FETCH-vastauksesta"
 
@@ -10595,43 +10364,43 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Sähköpostien luku ja tallennus IMAP-palvelimilta."
 
-#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/imap/camel-imap-store.c:680
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS laajennos ei ole käytettävissä"
 
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:711
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL-kättely epäonnistui."
 
-#: camel/providers/imap/camel-imap-store.c:818
+#: camel/providers/imap/camel-imap-store.c:848
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Komentoon \"%s\" liittyminen epäonnistui: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1242
+#: camel/providers/imap/camel-imap-store.c:1272
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP-palvelin %s ei tue vaadittua varmennusmenetelmää %s"
 
-#: camel/providers/imap/camel-imap-store.c:1252
+#: camel/providers/imap/camel-imap-store.c:1282
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Varmennusmenetelmä %s ei ole tuettu"
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1305
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sSyötä IMAP salasana käyttäjälle %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1289
+#: camel/providers/imap/camel-imap-store.c:1319
 msgid "You didn't enter a password."
 msgstr "Et antanut salasanaa."
 
-#: camel/providers/imap/camel-imap-store.c:1318
+#: camel/providers/imap/camel-imap-store.c:1348
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10642,18 +10411,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1839
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:1867
+#: camel/providers/imap/camel-imap-store.c:2057
 #, c-format
 msgid "No such folder %s"
 msgstr "Kansioita %s ei ole olemassa"
 
-#: camel/providers/imap/camel-imap-store.c:1915
-#: camel/providers/imap/camel-imap-store.c:2296
+#: camel/providers/imap/camel-imap-store.c:1943
+#: camel/providers/imap/camel-imap-store.c:2324
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Ylempi kansio ei voi sisältää alikansioita"
 
-#: camel/providers/imap/camel-imap-store.c:1970
+#: camel/providers/imap/camel-imap-store.c:1998
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10661,7 +10430,7 @@ msgstr "Ylempi kansio ei voi sisältää alikansioita"
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Kansiota '%s' ei voida luoda: kansio on jo olemassa"
 
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:2274
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Ylempi kansio on tuntematon: %s"
@@ -10698,20 +10467,20 @@ msgid "Index message body data"
 msgstr "Indeksoi viestin rungon tiedot"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:388
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:393
-#: camel/providers/local/camel-local-folder.c:396
+#: camel/providers/local/camel-local-folder.c:392
+#: camel/providers/local/camel-local-folder.c:395
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "postilaatikko:%s (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:400
+#: camel/providers/local/camel-local-folder.c:399
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -10772,7 +10541,7 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:142
 #: camel/providers/local/camel-local-store.c:253
-#: camel/providers/local/camel-mbox-store.c:356
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10845,8 +10614,25 @@ msgstr "Maildir-kansiion lisäys keskeytettiin"
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Viestiä ei voida lisätä maildir-kansioon: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:226
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mbox-folder.c:417
+#: camel/providers/local/camel-mbox-folder.c:436
+#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:475
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-mh-folder.c:221
+#, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+"Viestin %s hakeminen kansiosta %s epäonnistui\n"
+"  %s"
+
+#: camel/providers/local/camel-maildir-folder.c:236
 msgid "Invalid message contents"
 msgstr "Virheellinen viestin sisältö"
 
@@ -10887,9 +10673,9 @@ msgstr "Kansion `%s' poistaminen epäonnistui: %s"
 msgid "not a maildir directory"
 msgstr "ei maildir-hakemisto"
 
-#: camel/providers/local/camel-maildir-store.c:341
-#: camel/providers/local/camel-spool-store.c:286
-#: camel/providers/local/camel-spool-store.c:316
+#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-spool-store.c:284
+#: camel/providers/local/camel-spool-store.c:314
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Kansiota '%s' ei voitu käydä läpi: %s"
@@ -10936,27 +10722,18 @@ msgstr "Postin lisäys keskeytetty"
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Viestiä ei voida lisätä mbox-tiedostoon: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:435
-#: camel/providers/local/camel-mbox-folder.c:466
-#: camel/providers/local/camel-mbox-folder.c:474
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"Viestin %s hakeminen kansiosta %s epäonnistui\n"
-"  %s"
-
-#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:468
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Kansio näyttäisi olevan peruuttamattomasti vaurioitunut."
 
-#: camel/providers/local/camel-mbox-folder.c:475
-msgid "Message construction failed: Corrupt mailbox?"
+#: camel/providers/local/camel-mbox-folder.c:476
+#: camel/providers/local/camel-mh-folder.c:222
+#, fuzzy
+msgid "Message construction failed."
 msgstr "Viestin koostaminen epäonnistui: vaurioitunut postilaatikko?"
 
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:362
+#: camel/providers/local/camel-mbox-store.c:361
 msgid "Cannot create a folder by this name."
 msgstr "Tämännimistä kansiota ei voida luoda."
 
@@ -10986,30 +10763,30 @@ msgstr "`%s' ei ole tavallinen tiedosto."
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Kansio '%s' ei ole tyhjä, sitä ei poistettu."
 
-#: camel/providers/local/camel-mbox-store.c:375
+#: camel/providers/local/camel-mbox-store.c:374
 #, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Hakemistoa %s ei voitu luoda: %s."
 
-#: camel/providers/local/camel-mbox-store.c:389
+#: camel/providers/local/camel-mbox-store.c:388
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Kansiota ei voida luoda: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:391
+#: camel/providers/local/camel-mbox-store.c:390
 msgid "Folder already exists"
 msgstr "Kansio on jo olemassa"
 
-#: camel/providers/local/camel-mbox-store.c:473
+#: camel/providers/local/camel-mbox-store.c:472
 msgid "The new folder name is illegal."
 msgstr "Kansion nimi ei ole sallittu."
 
-#: camel/providers/local/camel-mbox-store.c:486
+#: camel/providers/local/camel-mbox-store.c:485
 #, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "%s:n uudelleennimeäminen epäonnistui: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:561
+#: camel/providers/local/camel-mbox-store.c:560
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Uudelleennimeäminen %s:stä %s:ksi epäonnistui: %s"
@@ -11200,7 +10977,7 @@ msgstr ""
 "Kansio saattaa olla vaurioitunut, kopio tallennettu tiedostoon '%s'"
 
 #: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:997
+#: camel/providers/nntp/camel-nntp-store.c:1126
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Syötä NNTP-salasana käyttäjälle %s@%s"
@@ -11217,18 +10994,10 @@ msgstr "Käyttäjätunnuksen lähettäminen palvelimelle epäonnistui."
 msgid "Server rejected username/password"
 msgstr "Palvelin hylkäsi käyttäjätunnuksen ia salasanan"
 
-#: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:263
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr "Käyttäjä perui"
-
-#: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:259
-#: camel/providers/nntp/camel-nntp-folder.c:265
+#: camel/providers/nntp/camel-nntp-folder.c:147
+#: camel/providers/nntp/camel-nntp-folder.c:149
+#: camel/providers/nntp/camel-nntp-folder.c:158
+#: camel/providers/nntp/camel-nntp-folder.c:234
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11237,60 +11006,49 @@ msgstr "Käyttäjä perui"
 msgid "Cannot get message %s: %s"
 msgstr "Viestin %s hakeminen ei onnistu: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:188
-#: camel/providers/nntp/camel-nntp-folder.c:228
+#: camel/providers/nntp/camel-nntp-folder.c:156
+#: camel/providers/nntp/camel-nntp-folder.c:232
+#: camel/providers/nntp/camel-nntp-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+msgid "User cancelled"
+msgstr "Käyttäjä perui"
+
+#: camel/providers/nntp/camel-nntp-folder.c:176
+#: camel/providers/nntp/camel-nntp-folder.c:208
 #, c-format
 msgid "Internal error: uid in invalid format: %s"
 msgstr "Sisäinen virhe: UID on virheellisessä muodossa: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:201
-#, c-format
-msgid "Could not get article %s from NNTP server"
-msgstr "Artikkelin %s luku NNTP-palvelimelta epäonnistui"
-
-#: camel/providers/nntp/camel-nntp-folder.c:362
-msgid "Posting not allowed by news server"
-msgstr "News-palvelin ei salli viestien lähettämistä"
-
+#: camel/providers/nntp/camel-nntp-folder.c:328
+#: camel/providers/nntp/camel-nntp-folder.c:331
 #: camel/providers/nntp/camel-nntp-folder.c:373
-#, c-format
-msgid "Failed to send newsgroups header: %s: message not posted"
-msgstr "Uutisryhmän otsakkeen lähetys epäonnistu: %s: viestiä ei lähetetty"
-
-#: camel/providers/nntp/camel-nntp-folder.c:413
-#: camel/providers/nntp/camel-nntp-folder.c:426
-#, c-format
-msgid "Error posting to newsgroup: %s: message not posted"
-msgstr "Uutisryhmään kirjoittaminen epäonnistui: %s: viestiä ei lähetetty"
-
-#: camel/providers/nntp/camel-nntp-folder.c:438
-msgid "Error reading response to posted message: message not posted"
-msgstr "Virhe luettaessa vastausta lähetettyyn viestii: viestiä ei lähetetty"
-
-#: camel/providers/nntp/camel-nntp-folder.c:441
-#, c-format
-msgid "Error posting message: %s: message not posted"
-msgstr "Virhe lähetettäessä viestiä: %s: viestiä ei lähetetty"
+#: camel/providers/nntp/camel-nntp-folder.c:375
+#, fuzzy, c-format
+msgid "Posting failed: %s"
+msgstr "Toiminto epäonnistui: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:457
+#: camel/providers/nntp/camel-nntp-folder.c:393
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "Et voi lähettää NNTP-viestejä ollessasi yhteydettömässä tilassa!"
 
-#: camel/providers/nntp/camel-nntp-folder.c:468
+#: camel/providers/nntp/camel-nntp-folder.c:404
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Et voi kopioida viestejä NNTP-kansiosta"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:44
 msgid "Could not get group list from server."
 msgstr "Ryhmälistaa ei voitu hakea palvelimelta."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#: camel/providers/nntp/camel-nntp-grouplist.c:97
+#: camel/providers/nntp/camel-nntp-grouplist.c:106
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "Ryhmälistatiedoston avaus %s:lle epäonnistui: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#: camel/providers/nntp/camel-nntp-grouplist.c:157
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Ryhmälistatiedoston tallennus %s:lle epäonnistui: %s"
@@ -11320,26 +11078,29 @@ msgstr ""
 "Tämä vaihtoehto tunnistautuu NNTP-palvelimelle käyttäen selväkielistä "
 "salasanaa."
 
-#: camel/providers/nntp/camel-nntp-store.c:158
+#: camel/providers/nntp/camel-nntp-store.c:118
+#: camel/providers/nntp/camel-nntp-store.c:1233
+#: camel/providers/nntp/camel-nntp-store.c:1331
+#, c-format
+msgid "NNTP Command failed: %s"
+msgstr "NNTP-komento epäonnistui: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:227
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Tervehdystä %s:stä ei voitu lukea: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:170
+#: camel/providers/nntp/camel-nntp-store.c:239
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP-paveline %s palautti virhekoodin %d: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:326
+#: camel/providers/nntp/camel-nntp-store.c:403
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET uutisryhmät palvelimelta %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:640
-msgid "Stream error"
-msgstr "Virhe virrassa"
-
-#: camel/providers/nntp/camel-nntp-store.c:643
+#: camel/providers/nntp/camel-nntp-store.c:777
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -11350,7 +11111,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/providers/nntp/camel-nntp-store.c:735
+#: camel/providers/nntp/camel-nntp-store.c:872
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
@@ -11360,7 +11121,7 @@ msgstr ""
 "\n"
 "Uutisryhmää ei ole olemassa. Valittu kohta on luultavasti ylempi kansio."
 
-#: camel/providers/nntp/camel-nntp-store.c:767
+#: camel/providers/nntp/camel-nntp-store.c:904
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
@@ -11370,60 +11131,60 @@ msgstr ""
 "\n"
 "Uutisryhmää ei ole olemassa!"
 
-#: camel/providers/nntp/camel-nntp-store.c:792
+#: camel/providers/nntp/camel-nntp-store.c:929
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr "Et voi luoda kansioita uutisryhmien alle: tilaa sen sijaan ryhmiä."
 
-#: camel/providers/nntp/camel-nntp-store.c:800
+#: camel/providers/nntp/camel-nntp-store.c:937
 msgid "You cannot rename a folder in a News store."
 msgstr "Et voi nimetä kansiota Uutisryhmissä."
 
-#: camel/providers/nntp/camel-nntp-store.c:808
+#: camel/providers/nntp/camel-nntp-store.c:945
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 "Et voi poistaa kansiota uutisryhmistä: lopeta sen sijaan ryhmän tilaaminen."
 
-#: camel/providers/nntp/camel-nntp-summary.c:253
-#, c-format
-msgid "Connection error: %s"
-msgstr "Yhteysvirhe: %s"
-
-#: camel/providers/nntp/camel-nntp-summary.c:262
-#, c-format
-msgid "No such folder: %s"
-msgstr "Kansiota ei ole: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1118
+#, fuzzy
+msgid "Authentication requested but not username provided"
+msgstr "Todennus vaaditaan"
 
-#: camel/providers/nntp/camel-nntp-summary.c:268
-#, c-format
-msgid "Could not get group: %s"
-msgstr "Ryhmää ei voitu hakea: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1146
+#, fuzzy, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr "Tunnistautuminen POP-palvelimelle %s epäonnistui: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:333
+#: camel/providers/nntp/camel-nntp-store.c:1262
 #, fuzzy
-msgid "Could not get messages: unspecified error"
-msgstr "Viestejä ei voitu hakea: tuntematon virhe"
+msgid "Not connected."
+msgstr "Ei yhteystietoja"
 
-#: camel/providers/nntp/camel-nntp-summary.c:378
+#: camel/providers/nntp/camel-nntp-store.c:1311
 #, c-format
-msgid "NNTP Command failed: %s"
-msgstr "NNTP-komento epäonnistui: %s"
+msgid "No such folder: %s"
+msgstr "Kansiota ei ole: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:438
-#: camel/providers/nntp/camel-nntp-summary.c:543
+#: camel/providers/nntp/camel-nntp-summary.c:218
+#: camel/providers/nntp/camel-nntp-summary.c:314
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Etsii uusia viestejä"
 
-#: camel/providers/nntp/camel-nntp-summary.c:558
-#, c-format
-msgid "Unknown server response: %s"
-msgstr "Tuntematon palvelimen vastaus: %s"
+#: camel/providers/nntp/camel-nntp-summary.c:225
+#, fuzzy, c-format
+msgid "Unexpected server response from xover: %s"
+msgstr "Odottamaton vastaus IMAP-palvelimelta: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:605
+#: camel/providers/nntp/camel-nntp-summary.c:328
+#, fuzzy, c-format
+msgid "Unexpected server response from head: %s"
+msgstr "Odottamaton vastaus GnuPG:ltä: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:368
 msgid "Use cancel"
 msgstr "Käytä perumista"
 
-#: camel/providers/nntp/camel-nntp-summary.c:607
+#: camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Toiminto epäonnistui: %s"
@@ -11471,7 +11232,7 @@ msgstr "Poista %s:n päivän kuluttua"
 msgid "Disable support for all POP3 extensions"
 msgstr "Poista käytöstä tuki POP3 laajennoksille"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107
 msgid "POP"
 msgstr "POP"
 
@@ -11560,7 +11321,7 @@ msgid "No such folder `%s'."
 msgstr "Kansiota '%s' ei ole olemassa."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:132
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -11614,7 +11375,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Sähköpostin lähetys ohjelman sendmail avulla"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:119
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11912,19 +11673,19 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
+#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:408
 msgid "attachment"
 msgstr "liite"
 
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:454
 msgid "Remove selected items from the attachment list"
 msgstr "Poista seuraavat tiedostot liiteluettelosta"
 
-#: composer/e-msg-composer-attachment-bar.c:491
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Add attachment..."
 msgstr "Lisää liite..."
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:495
 msgid "Attach a file to the message"
 msgstr "Lisää viestiin liitetiedoston"
 
@@ -11991,7 +11752,7 @@ msgstr "Useita viestejä"
 msgid "Open file"
 msgstr "Avaa tiedosto"
 
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
 msgid "Autogenerated"
 msgstr "Automaattisesti luotu"
 
@@ -12138,17 +11899,17 @@ msgstr "Liitä tiedosto(t)"
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
+msgid "You cannot attach the file `{0}' to this message."
 msgstr "Lisää viestiin liitetiedoston"
 
 #. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4
-msgid "${1}"
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
 msgstr ""
 
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
 
 #. mail-composer:attach-directory primary
@@ -12243,7 +12004,7 @@ msgstr "Putken luonti epäonnistui: %s"
 
 #. mail-composer:no-build-message secondary
 #: composer/mail-composer-errors.xml.h:34
-msgid "Because \"${0}\", you may need to select different mail options."
+msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
@@ -12253,8 +12014,10 @@ msgid "Could not read signature file \"{0}\"."
 msgstr "Allekirjoitusta ei voitu tallentaa: %s"
 
 #. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38
-msgid "Because \"${1}\"."
+#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted primary
@@ -12680,11 +12443,11 @@ msgid "<b>Then</b>"
 msgstr "<b>Erääntyy:</b>"
 
 #: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1335
+#: mail/mail-account-gui.c:1347
 msgid "Select Folder"
 msgstr "Valitse kansio"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
 msgid "    "
 msgstr " "
 
@@ -12742,7 +12505,7 @@ msgstr "sitten"
 msgid "months"
 msgstr "kuukautta"
 
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
 msgid "seconds"
 msgstr "sekuntia"
 
@@ -12774,20 +12537,20 @@ msgstr "kaikille paikallisille kansioille"
 msgid "years"
 msgstr "vuotta"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:916
-#: mail/mail-config.c:76 mail/mail-config.glade.h:90
+#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
+#: mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Tärkeä"
 
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:919 mail/mail-config.c:79
-#: mail/mail-config.glade.h:145
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: mail/mail-config.glade.h:148
 msgid "To Do"
 msgstr "Tehtävää"
 
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:920 mail/mail-config.c:80
-#: mail/mail-config.glade.h:94
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: mail/mail-config.glade.h:97
 msgid "Later"
 msgstr "Myöhemmin"
 
@@ -12845,254 +12608,6 @@ msgstr "tulevat"
 msgid "outgoing"
 msgstr "lähtevät"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Adjust Score"
-msgstr "Säädä pistemäärää"
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Color"
-msgstr "Aseta väri"
-
-#: filter/libfilter-i18n.h:4
-msgid "Assign Score"
-msgstr "Aseta pistemäärä"
-
-#: filter/libfilter-i18n.h:5
-msgid "Attachments"
-msgstr "Liitteet"
-
-#: filter/libfilter-i18n.h:6
-msgid "Beep"
-msgstr "Piippaus"
-
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "sisältää"
-
-#: filter/libfilter-i18n.h:8
-msgid "Copy to Folder"
-msgstr "Kopioi kansioon"
-
-#: filter/libfilter-i18n.h:9
-msgid "Date received"
-msgstr "Otettu vastaan"
-
-#: filter/libfilter-i18n.h:10
-msgid "Date sent"
-msgstr "Lähetetty"
-
-#: filter/libfilter-i18n.h:12
-msgid "Deleted"
-msgstr "Poistettu"
-
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "ei sisällä"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "ei lopu merkkijonoon"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "ei ole olemassa"
-
-#: filter/libfilter-i18n.h:16
-msgid "does not return"
-msgstr "ei palauta"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "ei kuulosta samalta kuin"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "ei ala merkkijonolla"
-
-#: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
-msgstr "Ei ole olemassa"
-
-#: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr "Luonnos"
-
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "loppuu merkkijonoon"
-
-#: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr "On olemassa"
-
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "on olemassa"
-
-#: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr "Lauseke"
-
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr "Vastine"
-
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "on"
-
-#: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr "on jälkeen"
-
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr "on ennen"
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr "On merkitty"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "on suurempi kuin"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "on pienempi kuin"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "ei ole"
-
-#: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr "ei ole merkitty"
-
-#: filter/libfilter-i18n.h:36
-msgid "Junk Test"
-msgstr "Roskapostitesti"
-
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
-#: widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Otsikko"
-
-#: filter/libfilter-i18n.h:38
-msgid "Mailing list"
-msgstr "Postituslista"
-
-#: filter/libfilter-i18n.h:39
-msgid "Message Body"
-msgstr "Viestin runko"
-
-#: filter/libfilter-i18n.h:40
-msgid "Message Header"
-msgstr "Viestin otsikko"
-
-#: filter/libfilter-i18n.h:41
-msgid "Message is Junk"
-msgstr "Viesti on roskapostia"
-
-#: filter/libfilter-i18n.h:42
-msgid "Message is not Junk"
-msgstr "Viesti ei ole roskapostia"
-
-#: filter/libfilter-i18n.h:43
-msgid "Move to Folder"
-msgstr "Siirrä kansioon"
-
-#: filter/libfilter-i18n.h:44
-#, fuzzy
-msgid "Pipe to Program"
-msgstr "Poistu ohjelmasta"
-
-#: filter/libfilter-i18n.h:45
-msgid "Play Sound"
-msgstr "Soita ääni"
-
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Lue"
-
-#: filter/libfilter-i18n.h:47
-msgid "Recipients"
-msgstr "Vastaanottajat"
-
-#: filter/libfilter-i18n.h:48
-msgid "Regex Match"
-msgstr "Säännöllisen lausekkeen osuma"
-
-#: filter/libfilter-i18n.h:49
-msgid "Replied to"
-msgstr "Vastattu osoitteeseen"
-
-#: filter/libfilter-i18n.h:50
-msgid "returns"
-msgstr "palauttaa"
-
-#: filter/libfilter-i18n.h:51
-msgid "returns greater than"
-msgstr "palauttaa suuremman kuin"
-
-#: filter/libfilter-i18n.h:52
-msgid "returns less than"
-msgstr "palauttaa pienemmän kuin"
-
-#: filter/libfilter-i18n.h:53
-#, fuzzy
-msgid "Run Program"
-msgstr "Suorita ohjelma:"
-
-#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Pistemäärä"
-
-#: filter/libfilter-i18n.h:55
-msgid "Sender"
-msgstr "Lähettäjä"
-
-#: filter/libfilter-i18n.h:56
-msgid "Set Status"
-msgstr "Aseta tila"
-
-#: filter/libfilter-i18n.h:57
-msgid "Size (kB)"
-msgstr "Koko (kt)"
-
-#: filter/libfilter-i18n.h:58
-msgid "sounds like"
-msgstr "kuulostaa samalta kuin"
-
-#: filter/libfilter-i18n.h:59
-msgid "Source Account"
-msgstr "Lähdetili"
-
-#: filter/libfilter-i18n.h:60
-msgid "Specific header"
-msgstr "Määritelty otsake"
-
-#: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "alkaa merkkijonolla"
-
-#: filter/libfilter-i18n.h:63
-msgid "Stop Processing"
-msgstr "Lopeta käsittely"
-
-#: filter/libfilter-i18n.h:64 mail/em-format.c:755 mail/em-format-html.c:1519
-#: mail/em-format-quote.c:302 mail/em-mailer-prefs.c:87
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
-#: smime/lib/e-cert.c:1079
-msgid "Subject"
-msgstr "Aihe"
-
-#: filter/libfilter-i18n.h:65
-msgid "Unset Status"
-msgstr "Poista tila"
-
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Lisää sääntö"
@@ -13110,6 +12625,11 @@ msgstr "Säännön nimi"
 msgid "_Score Rules"
 msgstr "Pistemäärien säännöt"
 
+#: filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Pistemäärä"
+
 #: filter/searchtypes.xml.h:1
 msgid "Body contains"
 msgstr "Runko sisältää"
@@ -13190,13 +12710,13 @@ msgstr "Allekirjoitukset"
 msgid "-------- Forwarded Message --------"
 msgstr "------- Välitetty viesti ---------"
 
-#: mail/em-composer-utils.c:1499
+#: mail/em-composer-utils.c:1495
 msgid "an unknown sender"
 msgstr "Tuntematon lähettäjä"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1509
+#: mail/em-composer-utils.c:1505
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "%a, %d-%m-%Y kello %H:%M %%+05d, %%s kirjoitti:"
 
@@ -13234,8 +12754,8 @@ msgstr "<Valitse kansio näpäyttämällä tästä>"
 msgid "Create New Folder"
 msgstr "Luo uusi kansio"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
-#: mail/mail-component.c:701
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
+#: mail/mail-component.c:704
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Määrittele mihin kansio luodaan:"
@@ -13250,103 +12770,104 @@ msgstr "Luo uusi kansio"
 msgid "Folder _name:"
 msgstr "Kansion _nimi:"
 
-#: mail/em-folder-tree.c:839
+#: mail/em-folder-tree.c:833
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Poistetaan kansiota %s"
 
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree.c:835
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Avataan kansiota %s"
 
-#: mail/em-folder-tree.c:848 mail/message-list.c:1555
+#: mail/em-folder-tree.c:842 mail/message-list.c:1561
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Siirretään viestejä kohteeseen %s"
 
-#: mail/em-folder-tree.c:850 mail/message-list.c:1557
+#: mail/em-folder-tree.c:844 mail/message-list.c:1563
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopioidaan viestejä kohteeseen %s"
 
-#: mail/em-folder-tree.c:866
+#: mail/em-folder-tree.c:860
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Viestiä ei voida tiputtaa ylätason taltioon"
 
-#: mail/em-folder-tree.c:956 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Kopioi kansioon"
 
-#: mail/em-folder-tree.c:957 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Siirrä kansioon"
 
-#: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2069
-#: mail/em-folder-tree.c:2551 mail/em-folder-view.c:798
-#: mail/message-list.c:1645
+#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
+#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
+#: mail/message-list.c:1651
 msgid "_Move"
 msgstr "_Siirrä"
 
-#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#: mail/em-folder-tree.c:955 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "Peruuta tehtävä"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
 #: mail/em-folder-view.c:798 mail/em-folder-view.c:812
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Valitse kansio"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
 #, fuzzy
 msgid "C_opy"
 msgstr "Kopioi"
 
-#: mail/em-folder-tree.c:2096
+#: mail/em-folder-tree.c:2088
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Tallennetaan kansiota %s"
 
-#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
+#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
 msgid "Create folder"
 msgstr "Luo uusi kansio"
 
-#: mail/em-folder-tree.c:2474
+#: mail/em-folder-tree.c:2463
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Nimeä '%s' uudelleen: "
 
-#: mail/em-folder-tree.c:2476
+#: mail/em-folder-tree.c:2465
 msgid "Rename Folder"
 msgstr "Nimeä kansio uudestaan"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Näytä"
 
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2537
 msgid "Open in _New Window"
 msgstr "Avaa _uudessa ikkunassa"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2555
+#: mail/em-folder-tree.c:2546
 msgid "_New Folder..."
 msgstr "_Uusi kansio..."
 
-#: mail/em-folder-tree.c:2558
+#: mail/em-folder-tree.c:2549
 msgid "_Rename"
 msgstr "_Nimeä uudestaan"
 
-#: mail/em-folder-tree.c:2561 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Ominaisuudet..."
 
 #: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:889
+#: mail/mail-vfolder.c:888
 msgid "VFolders"
 msgstr "vKansiot"
 
@@ -13360,19 +12881,19 @@ msgstr "EI VASTAAVAA"
 msgid "Inbox"
 msgstr "Saapuneet"
 
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
 msgid "Loading..."
 msgstr "Ladataan..."
 
 #: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
 #: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
 #: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:551
+#: mail/mail-component.c:554
 msgid "Mail"
 msgstr "Sähköposti"
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Muokkaa uutena viestinä..."
@@ -13385,17 +12906,17 @@ msgstr "_Tulosta"
 msgid "_Reply to Sender"
 msgstr "_Vastaa lähettäjälle"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:810
+#: mail/em-folder-view.c:901 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Vastaa _listalle"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:811
+#: mail/em-folder-view.c:902 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Vastaa k_aikille"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: mail/em-folder-view.c:903 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Välitä"
@@ -13448,6 +12969,10 @@ msgstr "_Siirrä kansioon..."
 msgid "_Copy to Folder..."
 msgstr "_Kopioi kansioon..."
 
+#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Otsikko"
+
 #: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Lisää lähettäjä _osoitekirjaan"
@@ -13498,12 +13023,12 @@ msgid "Filter on _Mailing List"
 msgstr "Suodata _postituslistan mukaan"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
-#: mail/mail-config.glade.h:66
+#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Oletukset"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1796
 msgid "Print Message"
 msgstr "Tulosta viesti"
 
@@ -13542,12 +13067,18 @@ msgstr "Kopiot:"
 msgid "Bcc"
 msgstr "Piilokopiot"
 
+#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
+#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Aihe"
+
 #: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
 #: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Päiväys"
 
-#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
+#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
 msgid "Newsgroups"
 msgstr ""
 
@@ -13748,7 +13279,7 @@ msgstr ""
 "vaikea purkaa salausta ja nähdä tämän viestin sisältön missään "
 "käytännöllisessä ajassa."
 
-#: mail/em-format-html-display.c:757
+#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
 msgid "_View Certificate"
 msgstr "_Näytä varmenne"
 
@@ -13804,7 +13335,7 @@ msgstr "Joka viikko"
 msgid "Once per month"
 msgstr "Joka kuukausi"
 
-#: mail/em-migrate.c:1072
+#: mail/em-migrate.c:1168
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13816,86 +13347,86 @@ msgstr ""
 "\n"
 "Odota kärsivällisesti, että Evolution muuntaa kansioitasi..."
 
-#: mail/em-migrate.c:1506
+#: mail/em-migrate.c:1602
 #, fuzzy, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Kansiota '%s' ei voida luoda: %s"
 
-#: mail/em-migrate.c:1532
+#: mail/em-migrate.c:1628
 #, fuzzy, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr ""
 "Tiedostokuvaajan kopiointi epäonnistui: %s\n"
 "%s"
 
-#: mail/em-migrate.c:1715
+#: mail/em-migrate.c:1811
 #, fuzzy, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Ryhmälistatiedoston tallennus %s:lle epäonnistui: %s"
 
-#: mail/em-migrate.c:1919
+#: mail/em-migrate.c:2015
 #, fuzzy, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Tunnistautuminen POP-palvelimelle %s epäonnistui: %s"
 
-#: mail/em-migrate.c:1933
+#: mail/em-migrate.c:2029
 #, fuzzy, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Hakemiston '%s' luonti epäonnistui: %s"
 
-#: mail/em-migrate.c:1962
+#: mail/em-migrate.c:2058
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#: mail/em-migrate.c:2413 mail/em-migrate.c:2425
 #, fuzzy, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Hakemiston '%s' luonti epäonnistui: %s"
 
-#: mail/em-migrate.c:2480
+#: mail/em-migrate.c:2576
 #, fuzzy, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr ""
 "Tulostiedoston luonti epäonnistui: %s\n"
 "%s"
 
-#: mail/em-migrate.c:2498
+#: mail/em-migrate.c:2594
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 msgstr ""
 
-#: mail/em-popup.c:699
+#: mail/em-popup.c:700
 msgid "Save As..."
 msgstr "Tallenna nimellä..."
 
-#: mail/em-popup.c:717
+#: mail/em-popup.c:718
 #, c-format
 msgid "untitled_image.%s"
 msgstr "nimetön_kuva.%s"
 
-#: mail/em-popup.c:807
+#: mail/em-popup.c:808
 msgid "Set as _Background"
 msgstr "Aseta _taustaksi"
 
-#: mail/em-popup.c:809
+#: mail/em-popup.c:810
 msgid "_Reply to sender"
 msgstr "_Vastaa lähettäjälle"
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:859
 msgid "_Open Link in Browser"
 msgstr "_Avaa linkki selaimessa"
 
-#: mail/em-popup.c:859
+#: mail/em-popup.c:860
 msgid "Se_nd message to..."
 msgstr "Lähetä _viesti..."
 
-#: mail/em-popup.c:860
+#: mail/em-popup.c:861
 msgid "_Add to Addressbook"
 msgstr "_Lisää osoitekirjaan"
 
-#: mail/em-popup.c:966
+#: mail/em-popup.c:967
 #, c-format
 msgid "Open in %s..."
 msgstr "Avaa ohjelmassa %s..."
@@ -14484,7 +14015,7 @@ msgstr "Evolution sähköpostin asetukset"
 msgid "Mail Accounts"
 msgstr "Sähköpostitilit"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
 msgid "Mail Preferences"
 msgstr "Sähköpostin asetukset"
 
@@ -14498,15 +14029,15 @@ msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution tuo vanhoja Elm-sähköpostejasi"
 
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:226
+#: mail/importers/evolution-mbox-importer.c:221
+#: mail/importers/evolution-outlook-importer.c:255
 #: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Tuodaan..."
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:222
-#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/evolution-mbox-importer.c:223
+#: mail/importers/evolution-outlook-importer.c:257
 #: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Odota, ole hyvä"
@@ -14528,21 +14059,23 @@ msgid "Elm"
 msgstr "Elm"
 
 #: mail/importers/evolution-mbox-importer.c:116
+#: mail/importers/evolution-outlook-importer.c:130
 msgid "Destination folder:"
 msgstr "Kohdekansio:"
 
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder to import into"
 msgstr "Valitse kansio, johon tuodaan"
 
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:254
 #: mail/importers/mail-importer.c:226
 #, c-format
 msgid "Importing `%s'"
 msgstr "Tuodaan '%s'"
 
-#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/evolution-outlook-importer.c:301
 #: mail/importers/mail-importer.c:140
 msgid "Importing mailbox"
 msgstr "Tuodaan kansiota"
@@ -14704,15 +14237,15 @@ msgstr ""
 msgid "%s License Agreement"
 msgstr "Avaimen sopimus"
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
 msgid "_Host:"
 msgstr "_Isäntäpalvelin:"
 
-#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
 msgid "User_name:"
 msgstr "Käyttäjät_unnus:"
 
-#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
 msgid "_Path:"
 msgstr "_Polku:"
 
@@ -14775,34 +14308,34 @@ msgstr "%d yhteystietoa"
 msgid ", %d unread"
 msgstr ""
 
-#: mail/mail-component.c:653
+#: mail/mail-component.c:656
 msgid "New Mail Message"
 msgstr "Uusi viesti"
 
-#: mail/mail-component.c:654
+#: mail/mail-component.c:657
 msgid "_Mail Message"
 msgstr "_Lähetä viesti"
 
-#: mail/mail-component.c:655
+#: mail/mail-component.c:658
 msgid "Compose a new mail message"
 msgstr "Kirjoita uusi viesti"
 
-#: mail/mail-component.c:661
+#: mail/mail-component.c:664
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Uusi vKansio"
 
-#: mail/mail-component.c:662
+#: mail/mail-component.c:665
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Suodattimet"
 
-#: mail/mail-component.c:663
+#: mail/mail-component.c:666
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Luo uusi kalenteri"
 
-#: mail/mail-component.c:795
+#: mail/mail-component.c:798
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
@@ -14814,7 +14347,7 @@ msgstr "Tarkistetaan palvelua"
 msgid "Connecting to server..."
 msgstr "Yhdistetään palvelimeen..."
 
-#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Identiteetti"
 
@@ -14829,7 +14362,7 @@ msgstr ""
 "lähettämiisi sähköpostiviesteihin."
 
 #: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid "Receiving Mail"
 msgstr "Saapuva posti"
 
@@ -14846,7 +14379,7 @@ msgstr ""
 msgid "Please select among the following options"
 msgstr "Valitse joku seuraavista vaihtoehdoista"
 
-#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr "Lähtevä posti"
 
@@ -14859,7 +14392,7 @@ msgstr ""
 "asetuksista, kysy järjestelmäsi ylläpitäjältä tai Internet-"
 "palveluntarjoajaltasi."
 
-#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37
 msgid "Account Management"
 msgstr "Tilinhallinta"
 
@@ -14877,248 +14410,253 @@ msgstr ""
 "sähköpostitilille nimi alla olevaan kenttään. Tätä nimeäkäytetään ainoastaan "
 "ohjelman sisällä tilin näyttämiseen."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:2
 #, fuzzy
 msgid " Ch_eck for Supported Types "
 msgstr "Tar_kista tuetut tyypit"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "<b>Preview</b>"
 msgstr "Esikatselu"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "(SSL ei ole tuettu tässä Evolutionin käännöksessä)"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "<b>S_ignatures</b>"
 msgstr "<b>Tila:</b>"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "<b>_Languages</b>"
 msgstr "<b>Tila:</b>"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
+msgid "<small>This will make the the filter more reliable, but slower</small>"
+msgstr ""
+
+#: mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "<span weight=\"bold\">Checking for New Mail</span>"
 msgstr "Tarkastetaan onko uutta sähköpostia"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
 #, fuzzy
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr "<b>_Näytettävät sähköpostin otsakkeet</b>"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">General</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "Huomautus uudesta sähköpostista"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Security</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "Lähetetyt viestit ja luonnokset"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:34
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:35
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "_Salaa myös itselleni lähetettäessä salattua sähköpostia"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:36
 msgid "Account Editor"
 msgstr "Tilimuokkain"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:38
 #, fuzzy
 msgid "Add Ne_w Signature..."
 msgstr "Lisää uusi allekirjoitus..."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Add _Script"
 msgstr "Lisää _skripti"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:40
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "Salaa _aina myös itselle, kun lähetetään salattua sähköpostia"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Lähetä aina kopio (Cc) osoitteeseen:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Lähetä aina _piiloitettu kopio (Bcc) osoitteeseen:"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Always _sign outgoing messages when using this account"
 msgstr "Allekirjoita _aina lähtevät viestit käytettäessä tätä sähköpostitiliä"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Luota salattaessa aina avaimiin avainrenkaassani"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Attach original message"
 msgstr "Liitä alkuperäinen viesti"
 
-#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Liite"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:48
 #, fuzzy
 msgid "Automatically _insert smiley images"
 msgstr "_Lisää hymiöt kuvina automaattisesti"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Automatically check for _new mail every"
 msgstr "T_arkasta onko uutta postia joka"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "Baltic (ISO-8859-13)"
 msgstr "Balttilainen (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Baltic (ISO-8859-4)"
 msgstr "Balttilainen (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Beep w_hen new mail arrives"
 msgstr "_Piippaa kun uutta sähköpostia saapuu"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "C_haracter set:"
 msgstr "_Merkistö:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Ch_eck for Supported Types "
 msgstr "Tar_kista tuetut tyypit"
 
-#: mail/mail-config.glade.h:53
-msgid "Check _Incoming Mail"
-msgstr "Tarkista _saapuva viestit"
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Check _incoming mail for junk"
+msgstr "Etsi roskapostia saapuvista sähköposteista"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Check spelling while I _type"
 msgstr "Tarkista _oikeinkirjoitus kirjoitettaessa"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Etsi roskapostia saapuneiden viestien joukosta"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 msgid "Color for _misspelled words:"
 msgstr "_Väärin kirjoitettujen sanojen väri:"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Colors"
 msgstr "_Värit"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Confirm _when expunging a folder"
 msgstr "_Varmista poistettujen lopullinen poisto kansiosta"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -15134,260 +14672,265 @@ msgstr ""
 "\n"
 "Tallenna asetuksesi näpäyttämällä nappia \"Toteuta\""
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
 msgid "De_fault"
 msgstr "_Oletukset"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Default character e_ncoding:"
 msgstr "_Oletusmerkistö:"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 #, fuzzy
 msgid "Defaults"
 msgstr "_Oletukset"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 msgid "Do not quote original message"
 msgstr "Älä lainaa alkuperäistä viestiä"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "_Älä allekirjoita kokouskutsuja (Outlook yhteensopivuus)"
 
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Valmis"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Drafts _Folder:"
 msgstr "_Luonnoskansio:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:77
 msgid "Email Accounts"
 msgstr "Sähköpostitilit"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Email _Address:"
 msgstr "Sähköposti_osoite:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "Empty trash folders on e_xit"
 msgstr "Tyhj_ennä roskakorit lopetettaessa"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
 msgid "Encry_ption certificate:"
 msgstr "_Salausvarmenne:"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:81
 msgid "Evolution Account Assistant"
 msgstr "Evolutionin sähköpostitilien apulainen"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:82
 msgid "Execute Command..."
 msgstr "Suorita komento..."
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Fi_xed-width:"
 msgstr "_Tasalevyinen:"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 msgid "Font Properties"
 msgstr "Kirjasimen ominaisuudet"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 msgid "Format messages in _HTML"
 msgstr "Muotoile viestit HTML:nä"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "HTML Mail"
 msgstr "_Lähetä HTML-postia"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Headers"
 msgstr "Otsakkeet:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr "_Korosta lainaukset värillä"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
 #: mail/mail-config.glade.h:91
+#, fuzzy
+msgid "I_nclude remote tests"
+msgstr "Sisäistä:"
+
+#: mail/mail-config.glade.h:94
 msgid "Inline"
 msgstr "Sisäkkäisesti"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Kerberos "
 msgstr "Kerberos"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Mail Configuration"
 msgstr "Sähköpostiasetukset"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "Postilaatikon sijainti"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr "Viestin muokkain"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 "Huomio: salasanaa ei kysytä ennen kuin otat ensimmäistä kertaa yhteyttä"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Or_ganization:"
 msgstr "Organi_saatio:"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _avaimen ID:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "Play sound file when new mail arri_ves"
 msgstr "_Soita äänitiedosto uuden sähköpostin saapuessa"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "Vahvista viestin lähetys, jos ainoastaan Bcc vastaanottajia on määritelty"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Qmail maildir "
 msgstr "Qmail maildir"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr "Lainaa alkuperäinen viesti"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr "Lainattu"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Re_member password"
 msgstr "Muista salasana"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr "_Vastausosoite:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "Otetaan vastaan sähköpostia"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:120
 #, fuzzy
 msgid "Receiving Options"
 msgstr "Vastaanoton _asetukset"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
 #, fuzzy
 msgid "Remember _password"
 msgstr "Muista salasana"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
 #, fuzzy
 msgid "S_tandard Font:"
 msgstr "_Oletuskirjaisin:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 #, fuzzy
 msgid "Security"
 msgstr "Turvalli_suus"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font"
 msgstr "Valitse HTML-viestin tasalevyinen kirjasin"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:126
 msgid "Select HTML fixed width font for printing"
 msgstr "Valitse HTML-viestin tasalevyinen kirjasin tulostusta varten"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:127
 msgid "Select HTML variable width font"
 msgstr "Valite HTML-viestin vaihtuvalevyinen kirjasin"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:128
 msgid "Select HTML variable width font for printing"
 msgstr "Valitse HTML-viestin vaihtuvalevyinen kirjasin tulostusta varten"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:129
 #, fuzzy
 msgid "Select..."
 msgstr "_Valitse..."
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "Lähetetään sähköpostia"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Sent _Messages Folder:"
 msgstr "Lähetettyjen _viestien kansio:"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:134
 msgid "Ser_ver requires authentication"
 msgstr "P_alvelin vaati todennuksen"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:135
 msgid "Server _Type: "
 msgstr "Palvelintyyppi: "
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:136
 msgid "Si_gning certificate:"
 msgstr "_Allekirjoitusvarmenne:"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:137
 #, fuzzy
 msgid "Signat_ure:"
 msgstr "Allekirjoitus:"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "Signatures"
 msgstr "_allekirjoitukset"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr "Anna _tiedostonimi:"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "Spell Checking"
 msgstr "_Oikoluku"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:141
 msgid "Standard Unix mbox"
 msgstr "Normaali Unix-postilaatikko"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "T_erminal Font:"
 msgstr "_Päätekirjaisin:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "T_ype: "
 msgstr "Tyyppi:"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -15397,7 +14940,7 @@ msgstr ""
 "Nimi jonka valitset on käytössä ainoastaan tässä listassa\n"
 "näytettäessä."
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
@@ -15407,7 +14950,7 @@ msgstr ""
 "olevista kielistä riippuu ainoastaan siitä, mille kielille sinulla "
 "onsanastoja asennettuna."
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:149
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -15415,15 +14958,11 @@ msgstr ""
 "Anna nimi jolla haluaisit kutsua tätä sähköpostitiliä.\n"
 "Esimerkiksi \"Työ\" tai \"Henkilökohtaista\""
 
-#: mail/mail-config.glade.h:148
-msgid "Use _Daemon"
-msgstr "Käytä _daemonia"
-
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:152
 msgid "V_ariable-width:"
 msgstr "_Vaihtuva leveys:"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:153
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -15433,93 +14972,89 @@ msgstr ""
 "\n"
 "Näpäytä \"Eteenpäin\" aloittaaksesi."
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:158
 msgid "_Add Signature"
 msgstr "_Lisää allekirjoitus:"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Always load images from the Internet"
 msgstr "Lataa _aina kuvat verkosta"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Digitally sign outgoing messages (by default)"
 msgstr "_Allekirjoita digitaalisesti lähtevät viestit (oletuksena)"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:161
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Älä huomauta uuden sähköpostin saapumisesta"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:163
 msgid "_Enable"
 msgstr "_Käytä"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 msgid "_Encrypt outgoing messages (by default)"
 msgstr "_Salaa lähtevät viestit oletuksena"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:165
 msgid "_Forward style:"
 msgstr "_Välitä tyyli:"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:168
 msgid "_Load images if sender is in address book"
 msgstr "_Lataa kuvat, jos lähettäjä on osoitekirjassa"
 
-#: mail/mail-config.glade.h:167
-msgid "_Local Tests Only"
-msgstr "Vain _paikalliset testit"
-
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Make this my default account"
 msgstr "Tee tästä _oletustilini"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_Mark messages as read after"
 msgstr "_Merkitse viestit luetuiksi kun on kulunut"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Never load images from the Internet"
 msgstr "_Älä koskaan lataa kuvia verkosta"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "_Kysy vahvistus, kun lähetetään HTML-viestejä yhteystiedoille, jotka eivät "
 "niitä halua"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:175
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Kysy vahvistus, kun lähetetään viestejä tyhjälle Aihe-otsakkella"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:176
 msgid "_Reply style:"
 msgstr "_Vastaustyyli:"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:177
 msgid "_Script:"
 msgstr "_Komentotiedosto:"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:178
 msgid "_Show animated images"
 msgstr "_Näytä animoidut kuvat"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "_Use Secure Connection (SSL):"
 msgstr "_Käytä salattua yhteyttä (SSL):"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "_Use the same fonts as other applications"
 msgstr "Käytä samoja _kirjasimia kuin muut ohjelmat"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:181
 msgid "color"
 msgstr "väri "
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "kuvaus"
 
@@ -15696,7 +15231,7 @@ msgstr ""
 
 #. mail:camel-exception primary
 #: mail/mail-errors.xml.h:57
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgid "Your message with the subject \"{0}\" was not delivered."
 msgstr ""
 
 #. mail:camel-exception secondary
@@ -15762,11 +15297,6 @@ msgstr ""
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Hakemistoa %s ei voitu luoda: %s."
 
-#. mail:no-save-path secondary
-#: mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail:no-create-path primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
@@ -15788,12 +15318,6 @@ msgstr "Hakemistoa %s ei voitu luoda: %s."
 msgid "Cannot create temporary save directory."
 msgstr "Väliaikaishakemistoa ei voitu luoda: %s"
 
-#. mail:no-create-tmp-path secondary
-#: mail/mail-errors.xml.h:100 mail/mail-errors.xml.h:112
-#: widgets/misc/e-system-errors.xml.h:11 widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail:no-write-path-exists secondary
 #: mail/mail-errors.xml.h:104
 #, fuzzy
@@ -16072,29 +15596,25 @@ msgstr "Kirjoita yli"
 msgid "_Append"
 msgstr "Lähetä"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:785
 #, c-format
 msgid "Pinging %s"
 msgstr "Pingataan %s"
 
-#: mail/mail-mt.c:897
-msgid "Working"
-msgstr "Suoritetaan"
-
-#: mail/mail-ops.c:99
+#: mail/mail-ops.c:98
 msgid "Filtering Folder"
 msgstr "Suodatetaan kansiota"
 
-#: mail/mail-ops.c:260
+#: mail/mail-ops.c:259
 msgid "Fetching Mail"
 msgstr "Haetaan viestejä"
 
-#: mail/mail-ops.c:543
+#: mail/mail-ops.c:542
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Virhe käytettäessä lähtevän postin suodattimia: %s"
 
-#: mail/mail-ops.c:568
+#: mail/mail-ops.c:567
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -16103,115 +15623,115 @@ msgstr ""
 "Lisäys '%s':ään epäonnnistui: %s\n"
 "Lisätään paikalliseen 'Lähetetyt' kansioon."
 
-#: mail/mail-ops.c:577
+#: mail/mail-ops.c:576
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Viestin lisäys paikalliseen 'Lähetetyt'-kansioon epäonnistui: %s"
 
-#: mail/mail-ops.c:673
+#: mail/mail-ops.c:672
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Lähetetään viestiä %d / %d"
 
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:703
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Virhe viestin %d/%d kohdalla"
 
-#: mail/mail-ops.c:708
+#: mail/mail-ops.c:707
 msgid "Complete."
 msgstr "Valmis."
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:804
 msgid "Saving message to folder"
 msgstr "Tallennetaan viestiä kansioon"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Siirretään viestejä kohteeseen %s"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopioidaan viestejä kohteeseen %s"
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:1002
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Etsitään kansioita kohteessa \"%s\""
 
-#: mail/mail-ops.c:1116
+#: mail/mail-ops.c:1115
 msgid "Forwarded messages"
 msgstr "Välitetyt viestit"
 
-#: mail/mail-ops.c:1159
+#: mail/mail-ops.c:1158
 #, c-format
 msgid "Opening folder %s"
 msgstr "Avataan kansiota %s"
 
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1230
 #, c-format
 msgid "Opening store %s"
 msgstr "Avataan tallennustilaa %s"
 
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1308
 #, c-format
 msgid "Removing folder %s"
 msgstr "Poistetaan kansiota %s"
 
-#: mail/mail-ops.c:1403
+#: mail/mail-ops.c:1402
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Tallennetaan kansiota %s"
 
-#: mail/mail-ops.c:1468
+#: mail/mail-ops.c:1467
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Siivotaan ja tallennetaan tiliä '%s'"
 
-#: mail/mail-ops.c:1469
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Tallennetaan tiliä %s"
 
-#: mail/mail-ops.c:1524
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr "Virkistetään kansiota"
 
-#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
+#: mail/mail-ops.c:1559 mail/mail-ops.c:1610
 msgid "Expunging folder"
 msgstr "Poistetaan poistettuja kansiosta"
 
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1607
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Tyhjennetään roskakoria '%s'"
 
-#: mail/mail-ops.c:1609
+#: mail/mail-ops.c:1608
 msgid "Local Folders"
 msgstr "Paikalliset kansiot"
 
-#: mail/mail-ops.c:1692
+#: mail/mail-ops.c:1691
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Haetaan viestiä %s"
 
-#: mail/mail-ops.c:1764
+#: mail/mail-ops.c:1763
 #, fuzzy, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Haetaan %d viesti(ä)"
 msgstr[1] "Haetaan %d viesti(ä)"
 
-#: mail/mail-ops.c:1850
+#: mail/mail-ops.c:1849
 #, fuzzy, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Tallennetaan %d viesti(ä)"
 msgstr[1] "Tallennetaan %d viesti(ä)"
 
-#: mail/mail-ops.c:1900
+#: mail/mail-ops.c:1899
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -16220,7 +15740,7 @@ msgstr ""
 "Tulostiedoston luonti epäonnistui: %s\n"
 "%s"
 
-#: mail/mail-ops.c:1928
+#: mail/mail-ops.c:1927
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -16229,11 +15749,11 @@ msgstr ""
 "Virhe tallennettaessa viestejä: %s:\n"
 "%s"
 
-#: mail/mail-ops.c:1999
+#: mail/mail-ops.c:1998
 msgid "Saving attachment"
 msgstr "Tallennetaan liite"
 
-#: mail/mail-ops.c:2016
+#: mail/mail-ops.c:2015
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -16242,17 +15762,17 @@ msgstr ""
 "Tulostiedostoa ei voida luoda: %s:\n"
 "%s"
 
-#: mail/mail-ops.c:2046
+#: mail/mail-ops.c:2045
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Tietoa ei voitu kirjoittaa: %s"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Yhteyttä %s katkaistaan"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Otetaan uudelleen yhteyttää %s"
@@ -16316,24 +15836,24 @@ msgstr "Päivitetään..."
 msgid "Waiting..."
 msgstr "Odotetaan..."
 
-#: mail/mail-session.c:238
+#: mail/mail-session.c:239
 msgid "User canceled operation."
 msgstr "Käyttäjä keskeytti toimenpiteen"
 
-#: mail/mail-session.c:271
+#: mail/mail-session.c:272
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Anna salasana tunnukselle %s"
 
-#: mail/mail-session.c:273
+#: mail/mail-session.c:274
 msgid "Enter Password"
 msgstr "Anna salasana"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password"
 msgstr "_Muista tämä salasana"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:298
 msgid "_Remember this password for the remainder of this session"
 msgstr "Muista salasana tämän istunnon loppuun asti"
 
@@ -16388,79 +15908,79 @@ msgstr "Päivitetään vKansioita URI:lle: %s"
 msgid "Updating vFolders for '%s'"
 msgstr "Päivitetään vKansioita URI:lle: %s"
 
-#: mail/mail-vfolder.c:959
+#: mail/mail-vfolder.c:958
 msgid "vFolders"
 msgstr "vKansiot"
 
-#: mail/mail-vfolder.c:998
+#: mail/mail-vfolder.c:997
 msgid "Edit VFolder"
 msgstr "Muokkaa vKansiota"
 
-#: mail/mail-vfolder.c:1082
+#: mail/mail-vfolder.c:1081
 msgid "New VFolder"
 msgstr "Uusi vKansio"
 
-#: mail/message-list.c:946
+#: mail/message-list.c:948
 msgid "Unseen"
 msgstr "Nähty"
 
-#: mail/message-list.c:947
+#: mail/message-list.c:949
 msgid "Seen"
 msgstr "Näkemättä"
 
-#: mail/message-list.c:948
+#: mail/message-list.c:950
 msgid "Answered"
 msgstr "Vastattu"
 
-#: mail/message-list.c:949
+#: mail/message-list.c:951
 msgid "Multiple Unseen Messages"
 msgstr "Useita lukemattomia viestejä"
 
-#: mail/message-list.c:950
+#: mail/message-list.c:952
 msgid "Multiple Messages"
 msgstr "Useita viestejä"
 
-#: mail/message-list.c:954
+#: mail/message-list.c:956
 msgid "Lowest"
 msgstr "Matalin"
 
-#: mail/message-list.c:955
+#: mail/message-list.c:957
 msgid "Lower"
 msgstr "Matalampi"
 
-#: mail/message-list.c:959
+#: mail/message-list.c:961
 msgid "Higher"
 msgstr "Korkeampi"
 
-#: mail/message-list.c:960
+#: mail/message-list.c:962
 msgid "Highest"
 msgstr "Korkein"
 
-#: mail/message-list.c:1279
+#: mail/message-list.c:1285
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1286
+#: mail/message-list.c:1292
 msgid "Today %l:%M %p"
 msgstr "Tänään %l:%M %p"
 
-#: mail/message-list.c:1295
+#: mail/message-list.c:1301
 msgid "Yesterday %l:%M %p"
 msgstr "Eilen %l:%M %p"
 
-#: mail/message-list.c:1307
+#: mail/message-list.c:1313
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1315
+#: mail/message-list.c:1321
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1317
+#: mail/message-list.c:1323
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3300
+#: mail/message-list.c:3321
 msgid "Generating message list"
 msgstr "Luodaan viestiluetteloa"
 
@@ -16516,6 +16036,10 @@ msgstr "Välitä"
 msgid "No Response Necessary"
 msgstr "Vastaus ei välttämätön"
 
+#: mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Lue"
+
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Vastaa"
@@ -16617,44 +16141,48 @@ msgstr ""
 "käyttöön"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid "Toolbar is visible"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Whether Evolution should start up in offline mode"
 msgstr "Käynnistyykö Evolution yhteydettömässä tilassa"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Whether the toolbar should be visible."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
 msgid "Whether to skip the development warning dialog"
 msgstr "Hypätäänkö kehitysversiovaroituksen yli"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
+#: shell/apps_evolution_shell.schemas.in.in.h:14
 msgid "mail"
 msgstr "sähköposti"
 
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
-msgstr "Sinulle tuonut"
-
-#: shell/e-shell.c:545 shell/e-shell.c:546
+#: shell/e-shell.c:588 shell/e-shell.c:589
 #, fuzzy, c-format
 msgid "%ld KB"
 msgstr "%d %B"
 
-#: shell/e-shell.c:744
+#: shell/e-shell.c:786
 #, fuzzy
 msgid "Uknown system error."
 msgstr "Tuntematon virhe"
 
-#: shell/e-shell.c:1101
+#: shell/e-shell.c:1143
 msgid "Invalid arguments"
 msgstr "Virheelisiä argumentteja"
 
-#: shell/e-shell.c:1103
+#: shell/e-shell.c:1145
 msgid "Cannot register on OAF"
 msgstr "OAF:ia ei voidaan rekisteröidä"
 
-#: shell/e-shell.c:1105
+#: shell/e-shell.c:1147
 msgid "Configuration Database not found"
 msgstr "Asetustietokantaa ei löytynyt"
 
-#: shell/e-shell.c:1107
+#: shell/e-shell.c:1149
 msgid "Generic error"
 msgstr "Yleinen virhe"
 
@@ -16713,7 +16241,7 @@ msgstr ""
 msgid "Select importer"
 msgstr "Valitse tuoja"
 
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1026
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
 #, c-format
 msgid "File %s does not exist"
 msgstr "Tiedostoa %s ei ole olemassa"
@@ -16741,31 +16269,32 @@ msgstr ""
 "Tuodaan %s\n"
 "Tuodaan ensimmäistä tietoa"
 
-#: shell/e-shell-importer.c:549
+#: shell/e-shell-importer.c:570
 msgid "Automatic"
 msgstr "Automaattinen"
 
-#: shell/e-shell-importer.c:598
-msgid "_Filename:"
-msgstr "_Tiedostonimi:"
+#: shell/e-shell-importer.c:626
+#, fuzzy
+msgid "F_ilename:"
+msgstr "Tiedostonimi:"
 
-#: shell/e-shell-importer.c:603
+#: shell/e-shell-importer.c:631
 msgid "Select a file"
 msgstr "Valitse tiedosto"
 
-#: shell/e-shell-importer.c:613
+#: shell/e-shell-importer.c:642
 msgid "File _type:"
 msgstr "Tiedoston _tyyppi:"
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:681
 msgid "Import data and settings from _older programs"
 msgstr "Tuodaan tietoja ja asetuksia _vanhemmista ohjelmista"
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:684
 msgid "Import a _single file"
 msgstr "Tuo _yksi tiedosto"
 
-#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -16773,25 +16302,25 @@ msgstr ""
 "Odota...\n"
 "Etsitään olemassaolevia asetuksia"
 
-#: shell/e-shell-importer.c:727
+#: shell/e-shell-importer.c:756
 msgid "Starting Intelligent Importers"
 msgstr "Älykkäät tuojat käynnistyvät"
 
-#: shell/e-shell-importer.c:853 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
 #, c-format
 msgid "From %s:"
 msgstr "Ohjelmasta %s:"
 
-#: shell/e-shell-importer.c:1044
+#: shell/e-shell-importer.c:1073
 #, c-format
 msgid "No importer available for file %s"
 msgstr "Tiedostolel '%s' ei ole käytettävissä tuojaa"
 
-#: shell/e-shell-importer.c:1056
+#: shell/e-shell-importer.c:1085
 msgid "Unable to execute importer"
 msgstr "Tuojan suoritus epäonnistui"
 
-#: shell/e-shell-importer.c:1169
+#: shell/e-shell-importer.c:1199
 msgid "_Import"
 msgstr "_Tuo"
 
@@ -16841,61 +16370,61 @@ msgstr "Kansion nimi ei voi sisältää merkkiä \"#\""
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' ja '..' ovat varattuja kansion nimiä"
 
-#: shell/e-shell-window.c:336
+#: shell/e-shell-window.c:337
 #, fuzzy
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution on nyt yhteydellisessä tilassa. Paina tästä siirtyäksesi "
 "yhteydettömään tilaan."
 
-#: shell/e-shell-window.c:343
+#: shell/e-shell-window.c:344
 #, fuzzy
 msgid "Evolution is in the process of going offline."
 msgstr "Ximian Evolution siirtyy yhteydettömään tilaan."
 
-#: shell/e-shell-window.c:349
+#: shell/e-shell-window.c:350
 #, fuzzy
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximin Evolution on yhteydettömässä tilassa. Paina tästä siirtyäksesi "
 "yhteydelliseen tilaan."
 
-#: shell/e-shell-window.c:621
+#: shell/e-shell-window.c:637
 #, fuzzy, c-format
 msgid "Switch to %s"
 msgstr "Viesti %s:lle"
 
-#: shell/e-shell-window-commands.c:64
+#: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Gnomen Pilot-työkalut eivät ole asennetuina tähän järjestelmään."
 
-#: shell/e-shell-window-commands.c:72
+#: shell/e-shell-window-commands.c:74
 #, c-format
 msgid "Error executing %s."
 msgstr "Virhe suoritettaessa %s."
 
-#: shell/e-shell-window-commands.c:121
+#: shell/e-shell-window-commands.c:123
 msgid "Bug buddy is not installed."
 msgstr "Bug buddya ei ole asennettu."
 
-#: shell/e-shell-window-commands.c:129
+#: shell/e-shell-window-commands.c:131
 msgid "Bug buddy could not be run."
 msgstr "Bug buddya ei voitu ajaa."
 
-#: shell/e-shell-window-commands.c:171
+#: shell/e-shell-window-commands.c:323
 #, fuzzy
-msgid "About Evolution"
-msgstr "Tietoja Ximian Evolutionista"
+msgid "Groupware Suite"
+msgstr "Ryhmä"
 
-#: shell/e-shell-window-commands.c:382
+#: shell/e-shell-window-commands.c:563
 msgid "_Work Online"
 msgstr "Työskentele _yhteydellisessä tilassa"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "_Yhteydetön tila"
 
-#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Työskentele poissa linjoilta"
 
@@ -16907,43 +16436,6 @@ msgstr "Checkbox"
 msgid "New"
 msgstr "Uusi"
 
-#: shell/evolution-shell-component-utils.c:115
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Tuntematon virhe."
-
-#: shell/evolution-shell-component-utils.c:118
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Virhe komponenttijärjestelmältä on :\n"
-"%s"
-
-#: shell/evolution-shell-component-utils.c:125
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Virhe aktivointijärjestelmältä on:\n"
-"%s"
-
 #: shell/evolution-test-component.c:140
 msgid "New Test"
 msgstr "Uusi testi"
@@ -17271,30 +16763,30 @@ msgid ""
 "Click help for details."
 msgstr ""
 
-#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:522
+#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
+#: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
 msgstr "Valitse tuotava varmenne..."
 
-#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:604
+#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
+#: smime/gui/certificate-manager.c:638
 msgid "Certificate Name"
 msgstr "Varmenteen nimi"
 
-#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
+#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
 msgid "Purposes"
 msgstr "Tarkoitukset"
 
-#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:517
+#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr "Sarjanumero"
 
-#: smime/gui/certificate-manager.c:267
+#: smime/gui/certificate-manager.c:271
 msgid "Expires"
 msgstr "Vanhenee"
 
-#: smime/gui/certificate-manager.c:417
+#: smime/gui/certificate-manager.c:446
 msgid "E-Mail Address"
 msgstr "Sähköpostiosoite"
 
@@ -17338,6 +16830,11 @@ msgstr ""
 "Myöntäjä:\n"
 " Käyttö: %s\n"
 
+#: smime/gui/e-cert-selector.c:169
+#, fuzzy
+msgid "Select certificate"
+msgstr "SSL-asiakkaan varmenne"
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr "<Ei varmenteen osa>"
@@ -17394,7 +16891,7 @@ msgstr ""
 "Ennen kuin luotat tähän CA:han missää tarkoituksessa, tulisi sinun tutkia "
 "varmenne tarkasti."
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
 msgid "Certificate"
 msgstr "Varmenne"
 
@@ -17414,19 +16911,23 @@ msgstr "Julkinen nimi (CN)"
 msgid "Contact Certificates"
 msgstr "Varmenteen yhteystiedot"
 
-#: smime/gui/smime-ui.glade.h:21
-#, no-c-format
-msgid "Do you want to trust \"%s\" for the following purposes?"
-msgstr "Haluatko luottaa \"%s\" seuraavissa käyttötarkoituksissa?"
+#: smime/gui/smime-ui.glade.h:20
+msgid "Do not trust the authenticity of this certificate"
+msgstr ""
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:21
 msgid "Dummy window only"
 msgstr "Vain tyhmä ikkuna"
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:22
 msgid "Edit"
 msgstr "Muokkaa"
 
+#: smime/gui/smime-ui.glade.h:23
+#, fuzzy
+msgid "Email Certificate Trust Settings"
+msgstr "Sähköpostivarmenneviranomainen"
+
 #: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr "Sähköpostin vastaanottajan varmenne"
@@ -17459,249 +16960,260 @@ msgstr "Organisaatioyksikkö (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 sormenjälki"
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr "SSL-asiakkaan varmenne"
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr "SSL-palvelimen varmenne"
 
 #: smime/gui/smime-ui.glade.h:37
+msgid "Trust the authenticity of this certificate"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
 msgid "Trust this CA to identify email users."
 msgstr "Luota tähän CA:han sähköpostikäyttäjien tunnistamisessa."
 
-#: smime/gui/smime-ui.glade.h:38
+#: smime/gui/smime-ui.glade.h:39
 msgid "Trust this CA to identify software developers."
 msgstr "Luota tähän CA:han ohjelmistokehittäjien tunnistamisessa."
 
-#: smime/gui/smime-ui.glade.h:39
+#: smime/gui/smime-ui.glade.h:40
 msgid "Trust this CA to identify web sites."
 msgstr "Luota tähän CA:han www-sivustojen tunnistamisessa."
 
-#: smime/gui/smime-ui.glade.h:40
+#: smime/gui/smime-ui.glade.h:41
 msgid "View"
 msgstr "Näytä"
 
-#: smime/gui/smime-ui.glade.h:41
-msgid "View Certificate"
-msgstr "Näytä varmenne"
-
 #: smime/gui/smime-ui.glade.h:42
-msgid "You have been asked to trust a new Certificate Authority (CA)."
-msgstr "Luottamustasi uuteen varmenneviranomaiseen (CA) kysytään."
-
-#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 "Seuraavista organisaatiosta olevista varmenteista sinut voidaan tunnistaa:"
 
-#: smime/gui/smime-ui.glade.h:44
+#: smime/gui/smime-ui.glade.h:43
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 "Seuraavat varmenneviranomaiset voidaa tunnistaa tallentamistasi varmenteista:"
 
-#: smime/gui/smime-ui.glade.h:45
+#: smime/gui/smime-ui.glade.h:44
 msgid "You have certificates on file that identify these people:"
 msgstr "Seuraavat henkilöt voidaan tunnistaa tallentamistasi varmenteista:"
 
-#: smime/gui/smime-ui.glade.h:46
+#: smime/gui/smime-ui.glade.h:45
 msgid "Your Certificates"
 msgstr "Varmenteesi"
 
-#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
+#: smime/gui/smime-ui.glade.h:46
+msgid "_Edit CA Trust"
+msgstr ""
+
+#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d.%m.%Y"
 
-#: smime/lib/e-cert.c:478
+#. x509 certificate usage types
+#: smime/lib/e-cert.c:424
+#, fuzzy
+msgid "Sign"
+msgstr "Allekirjoitus"
+
+#: smime/lib/e-cert.c:425
+#, fuzzy
+msgid "Encrypt"
+msgstr "Salattu"
+
+#: smime/lib/e-cert.c:530
 msgid "Version"
 msgstr "Versio"
 
-#: smime/lib/e-cert.c:493
+#: smime/lib/e-cert.c:545
 msgid "Version 1"
 msgstr "Versio 1"
 
-#: smime/lib/e-cert.c:496
+#: smime/lib/e-cert.c:548
 msgid "Version 2"
 msgstr "Versio 2"
 
-#: smime/lib/e-cert.c:499
+#: smime/lib/e-cert.c:551
 msgid "Version 3"
 msgstr "Versio 3"
 
-#: smime/lib/e-cert.c:581
+#: smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 RSA-salauksella"
 
-#: smime/lib/e-cert.c:584
+#: smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 RSA-salauksella"
 
-#: smime/lib/e-cert.c:587
+#: smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 RSA-salauksella"
 
-#: smime/lib/e-cert.c:590
+#: smime/lib/e-cert.c:642
 msgid "C"
 msgstr "C"
 
-#: smime/lib/e-cert.c:593
+#: smime/lib/e-cert.c:645
 msgid "CN"
 msgstr "CN"
 
-#: smime/lib/e-cert.c:596
+#: smime/lib/e-cert.c:648
 msgid "OU"
 msgstr "OU"
 
-#: smime/lib/e-cert.c:599
+#: smime/lib/e-cert.c:651
 msgid "O"
 msgstr "O"
 
-#: smime/lib/e-cert.c:602
+#: smime/lib/e-cert.c:654
 msgid "L"
 msgstr "L"
 
-#: smime/lib/e-cert.c:605
+#: smime/lib/e-cert.c:657
 msgid "DN"
 msgstr "DN"
 
-#: smime/lib/e-cert.c:608
+#: smime/lib/e-cert.c:660
 msgid "DC"
 msgstr "DC"
 
-#: smime/lib/e-cert.c:611
+#: smime/lib/e-cert.c:663
 msgid "ST"
 msgstr "ST"
 
-#: smime/lib/e-cert.c:614
+#: smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA-salaus"
 
-#: smime/lib/e-cert.c:617
+#: smime/lib/e-cert.c:669
 msgid "Certificate Key Usage"
 msgstr "Varmenneavaimen käyttö"
 
-#: smime/lib/e-cert.c:620
+#: smime/lib/e-cert.c:672
 msgid "Netscape Certificate Type"
 msgstr "Netscape-varmenteen tyyppi"
 
-#: smime/lib/e-cert.c:623
+#: smime/lib/e-cert.c:675
 msgid "Certificate Authority Key Identifier"
 msgstr "Varmenneviranomaisen avaintunniste"
 
-#: smime/lib/e-cert.c:626
+#: smime/lib/e-cert.c:678
 msgid "UID"
 msgstr "UID"
 
-#: smime/lib/e-cert.c:635
+#: smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Kohteen tunniste (%s)"
 
-#: smime/lib/e-cert.c:686
+#: smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
 msgstr "Algoritmin tunniste"
 
-#: smime/lib/e-cert.c:694
+#: smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
 msgstr "Algoritmin parametrit"
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:768
 msgid "Subject Public Key Info"
 msgstr "Aiheen julkisen avaimen tiedot"
 
-#: smime/lib/e-cert.c:721
+#: smime/lib/e-cert.c:773
 msgid "Subject Public Key Algorithm"
 msgstr "Aiheen julkisen avaimen algoritmi"
 
-#: smime/lib/e-cert.c:736
+#: smime/lib/e-cert.c:788
 msgid "Subject's Public Key"
 msgstr "Kohteen julkinen avain"
 
-#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
+#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
 msgid "Error: Unable to process extension"
 msgstr "Virhe: laajennosta ei voitu käsitellä"
 
-#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
+#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr "Kohteen allekirjoittaja"
 
-#: smime/lib/e-cert.c:782
+#: smime/lib/e-cert.c:834
 msgid "SSL Certificate Authority"
 msgstr "SSL varmenneviranomainen"
 
-#: smime/lib/e-cert.c:786
+#: smime/lib/e-cert.c:838
 msgid "Email Certificate Authority"
 msgstr "Sähköpostivarmenneviranomainen"
 
-#: smime/lib/e-cert.c:814
+#: smime/lib/e-cert.c:866
 msgid "Signing"
 msgstr "Allekirjoitus"
 
-#: smime/lib/e-cert.c:818
+#: smime/lib/e-cert.c:870
 msgid "Non-repudiation"
 msgstr "Kiistämättömyys"
 
-#: smime/lib/e-cert.c:822
+#: smime/lib/e-cert.c:874
 msgid "Key Encipherment"
 msgstr "Avaimen salakoodaus"
 
-#: smime/lib/e-cert.c:826
+#: smime/lib/e-cert.c:878
 msgid "Data Encipherment"
 msgstr "Tiedon salakoodaus"
 
-#: smime/lib/e-cert.c:830
+#: smime/lib/e-cert.c:882
 msgid "Key Agreement"
 msgstr "Avaimen sopimus"
 
-#: smime/lib/e-cert.c:834
+#: smime/lib/e-cert.c:886
 msgid "Certificate Signer"
 msgstr "Varmenteen allekirjoittaja"
 
-#: smime/lib/e-cert.c:838
+#: smime/lib/e-cert.c:890
 msgid "CRL Signer"
 msgstr "CRL allekirjoittaja"
 
-#: smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:938
 msgid "Critical"
 msgstr "Kriittinen"
 
-#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
+#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
 msgid "Not Critical"
 msgstr "Ei-kriittinen"
 
-#: smime/lib/e-cert.c:912
+#: smime/lib/e-cert.c:964
 msgid "Extensions"
 msgstr "Laajennokset"
 
-#: smime/lib/e-cert.c:983
+#: smime/lib/e-cert.c:1035
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
 msgid "Certificate Signature Algorithm"
 msgstr "Varmenteen allekirjoitusalgoritmi"
 
-#: smime/lib/e-cert.c:1048
+#: smime/lib/e-cert.c:1100
 msgid "Issuer"
 msgstr "Myöntäjä"
 
-#: smime/lib/e-cert.c:1102
+#: smime/lib/e-cert.c:1154
 msgid "Issuer Unique ID"
 msgstr "Myöntäjän yksilöllinen ID"
 
-#: smime/lib/e-cert.c:1121
+#: smime/lib/e-cert.c:1173
 msgid "Subject Unique ID"
 msgstr "Kohteen yksilöllinen tunniste"
 
-#: smime/lib/e-cert.c:1164
+#: smime/lib/e-cert.c:1216
 msgid "Certificate Signature Value"
 msgstr "Varmenteen allekirjoituksen arvo"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
+#: smime/lib/e-cert-db.c:608
 msgid "Certificate already exists"
 msgstr "Varmenne on jo olemassa"
 
@@ -17847,7 +17359,7 @@ msgstr "Katsele nykyistä yhteystietoa"
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "T_oiminnot"
 
@@ -18010,7 +17522,7 @@ msgstr "_Sulje"
 #: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:3
+#: ui/evolution.xml.h:4
 msgid "Close"
 msgstr "Sulje"
 
@@ -18023,7 +17535,7 @@ msgid "Delete this item"
 msgstr "Poista tämä kohta"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr "Päätyökalupalkki"
 
@@ -18066,7 +17578,7 @@ msgstr "Tallenna tämä levylle"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:44
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "_File"
 msgstr "_Tiedosto"
 
@@ -18325,13 +17837,13 @@ msgstr "_Käännä valinta"
 msgid "_Threaded Message List"
 msgstr "Säikeis_tetty viesti-ikkuna"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Sulje tämä ikkuna"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "_Close"
 msgstr "_Sulje"
 
@@ -18730,7 +18242,7 @@ msgstr "_Edellinen viesti"
 msgid "_Quoted"
 msgstr "_Lainattu"
 
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
 msgid "_Tools"
 msgstr "T_yökalut"
 
@@ -19027,109 +18539,123 @@ msgid "_Open Task"
 msgstr "Avaa _tehtävä"
 
 #: ui/evolution.xml.h:1
-msgid "About Ximian Evolution..."
-msgstr "Tietoja Ximian Evolutionista..."
+#, fuzzy
+msgid "About Evolution..."
+msgstr "Tietoja Ximian Evolutionista"
 
 #: ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
 msgstr "Muuta Evolutionin asetuksia"
 
-#: ui/evolution.xml.h:5
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the visibility of the toolbar"
+msgstr "Vaihda tämän kansion ominaisuuksia"
+
+#: ui/evolution.xml.h:6
 #, fuzzy
 msgid "Create a new window displaying this folder"
 msgstr "Luo uusi kalenteri"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "_Poistu"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Ximian Evolutionin _FAQ"
+
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Poistu ohjelmasta"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:10
 msgid "Forget _Passwords"
 msgstr "_Unohda salasanat"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:11
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 "Unohda muistetut salasanat siten, että ne kysytään tarvittaessa uudestaan"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:12
 msgid "Import data from other programs"
 msgstr "Tuo tietoja muista ohjelmista"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:14
 #, fuzzy
 msgid "New _Window"
 msgstr "_Ikkuna"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Pi_lot Settings..."
 msgstr "_Pilotin asetukset..."
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Send / Receive"
 msgstr "Lähetä / Vastaanota"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Send queued items and retrieve new items"
 msgstr "Lähetä jonossa olevat viestit ja hae uudet viestit"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Set up Pilot configuration"
 msgstr "Muokkaa Pilotin asetuksia"
 
-#: ui/evolution.xml.h:17
-msgid "Show information about Ximian Evolution"
+#: ui/evolution.xml.h:19
+#, fuzzy
+msgid "Show information about Evolution"
 msgstr "Näytä tietoja Ximian Evolutionista"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:20
 msgid "Submit Bug Report"
 msgstr "Lähetä virheraportti"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:21
 msgid "Submit _Bug Report"
 msgstr "Lähetä _virheraportti"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Lähetä virheraportti käyttäen Bug Buddy:a"
 
-#: ui/evolution.xml.h:21
-msgid "Toggle whether we are working offline."
-msgstr "Määritä, työskennelläänkö poissa linjoilta."
-
 #: ui/evolution.xml.h:23
-msgid "Ximian Evolution _FAQ"
-msgstr "Ximian Evolutionin _FAQ"
+#, fuzzy
+msgid "T_oolbar"
+msgstr "Päätyökalupalkki"
 
 #: ui/evolution.xml.h:24
-msgid "_About Ximian Evolution..."
-msgstr "_Tietoja Evolutionista..."
+msgid "Toggle whether we are working offline."
+msgstr "Määritä, työskennelläänkö poissa linjoilta."
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "_About Evolution..."
+msgstr "Tietoja Ximian Evolutionista"
+
+#: ui/evolution.xml.h:30
 msgid "_Help"
 msgstr "_Ohje"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "_Import..."
 msgstr "_Tuo..."
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "_New"
 msgstr "_Uusi"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "_Quick Reference"
 msgstr "_Pikaopas"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_Send / Receive"
 msgstr "_Lähetä / Vastaanota"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 #, fuzzy
 msgid "_Window"
 msgstr "_Ikkuna"
@@ -19202,7 +18728,7 @@ msgid "With _Status"
 msgstr "Aseta tila"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:626
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:635
 msgid "UTC"
 msgstr "UTC"
 
@@ -19359,29 +18885,29 @@ msgstr "Muut..."
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
-#: widgets/misc/e-error.c:121
+#: widgets/misc/e-error.c:79 widgets/misc/e-error.c:80
+#: widgets/misc/e-error.c:122
 msgid "Evolution Error"
 msgstr "Evolutionin virhe"
 
-#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
-#: widgets/misc/e-error.c:119
+#: widgets/misc/e-error.c:81 widgets/misc/e-error.c:82
+#: widgets/misc/e-error.c:120
 #, fuzzy
 msgid "Evolution Warning"
 msgstr "Evolution sähköposti"
 
-#: widgets/misc/e-error.c:118
+#: widgets/misc/e-error.c:119
 #, fuzzy
 msgid "Evolution Information"
 msgstr "Kokouksen tiedot"
 
-#: widgets/misc/e-error.c:120
+#: widgets/misc/e-error.c:121
 #, fuzzy
 msgid "Evolution Query"
 msgstr "Evolution testi"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:410
+#: widgets/misc/e-error.c:415
 #, fuzzy, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -19530,16 +19056,534 @@ msgstr ""
 "Tallentaminen ei onnistu \"%s\"\n"
 "%s"
 
-#: widgets/misc/e-task-widget.c:211
+#: widgets/misc/e-task-widget.c:212
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: widgets/misc/e-task-widget.c:216
+#: widgets/misc/e-task-widget.c:217
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% valmiina)"
 
+#~ msgid "Failed to connect to LDAP server"
+#~ msgstr "Yhdistäminen LDAP-palvelimeen epäonnistui"
+
+#~ msgid "Failed to authenticate with LDAP server"
+#~ msgstr "Kirjautuminen LDAP-palvelimelle epäonnistui"
+
+#~ msgid "Could not perform query on Root DSE"
+#~ msgstr "Kyselyä Juuri-DSE:lle ei voitu suorittaa"
+
+#~ msgid "The server responded with no supported search bases"
+#~ msgstr "Palvelin ei palauttanut tuettuja hakupohjia"
+
+#~ msgid "This server does not support LDAPv3 schema information"
+#~ msgstr "Tämä palvelin ei tue LDAPv3 skeemooja"
+
+#~ msgid "Error retrieving schema information"
+#~ msgstr "Virhe haettaessa skeeman tietoja"
+
+#~ msgid "Server did not respond with valid schema information"
+#~ msgstr "Palvelin ei vastannut kelvollisella skeematiedolla"
+
+#~ msgid "  S_how Supported Bases "
+#~ msgstr " Tar_kista tuetut kannat "
+
+#~ msgid "1:00"
+#~ msgstr "1:00"
+
+#~ msgid "5:00"
+#~ msgstr "5:00"
+
+#~ msgid "Connecting"
+#~ msgstr "Yhdistetään"
+
+#~ msgid "Distinguished _name:"
+#~ msgstr "Yksikäsitteinen _nimi:"
+
+#~ msgid "Email address:"
+#~ msgstr "Sähköpostiosoite:"
+
+#~ msgid "Evolution will use this DN to authenticate you with the server"
+#~ msgstr ""
+#~ "Evolution käyttää tätä yksikäsitteistä nimeä sinun todentamiseksesi "
+#~ "palvelimelle"
+
+#~ msgid "One"
+#~ msgstr "Yksi"
+
+#~ msgid "S_earch scope: "
+#~ msgstr "_Hakualue:"
+
+#~ msgid "Searching"
+#~ msgstr "Etsitään"
+
+#~ msgid "Sub"
+#~ msgstr "Ali"
+
+#~ msgid "This option controls how long a search will be run."
+#~ msgstr "Asettaa hakujen suoritukseen käytetyn ajan."
+
+#~ msgid "U_se SSL/TLS:"
+#~ msgstr "Käytä SSL/TLS-salausta:"
+
+#~ msgid "_Display name:"
+#~ msgstr "Näytettävä _nimi:"
+
+#~ msgid "_Port number:"
+#~ msgstr "_Portin numero:"
+
+#~ msgid "_Search base:"
+#~ msgstr "_Hakupohja:"
+
+#~ msgid "_Server name:"
+#~ msgstr "Palvelimen _nimi: "
+
+#~ msgid "_Timeout (minutes):"
+#~ msgstr "_Aikakatkaisu (minuuttia):"
+
+#~ msgid "connecting-tab"
+#~ msgstr "yhdistetään-tab"
+
+#~ msgid "general-tab"
+#~ msgstr "yleistä-tab"
+
+#~ msgid "searching-tab"
+#~ msgstr "haetaan-tab"
+
+#, fuzzy
+#~ msgid "Job title:"
+#~ msgstr "_Tehtävänimike:"
+
+#, fuzzy
+#~ msgid "Webcam:"
+#~ msgstr "WWW-sivu:"
+
+#~ msgid "Category editor not available."
+#~ msgstr "Luokkien muokkain ei ole käytettävissä."
+
+#, fuzzy
+#~ msgid ""
+#~ "The following entries are invalid:\n"
+#~ "\n"
+#~ msgstr "Seuraavat yhteydet ovat tällä hetkellä auki:"
+
+#~ msgid "Could not find widget for a field: `%s'"
+#~ msgstr "Kentälle ei voitu löytää widgettiä: '%s'"
+
+#~ msgid "Do you want to save changes?"
+#~ msgstr "Haluatko tallentaa muutokset?"
+
+#~ msgid "Error saving %s: %s"
+#~ msgstr "Virhe tallennettaessa %s: %s"
+
+#~ msgid ""
+#~ "The addressbook backend for\n"
+#~ "%s\n"
+#~ "has crashed. You will have to restart Evolution in order to use it again"
+#~ msgstr ""
+#~ "Osoitekirjan taustajärjestelmä\n"
+#~ "%s:lle\n"
+#~ "on kaatunut. Sinun täytyy käynnistää Evolution uudestaan käyttääksesi "
+#~ "sitä uudestaan"
+
+#~ msgid "Can not load URI"
+#~ msgstr "URI:a ei voida ladata"
+
+#~ msgid "Calendar Properties"
+#~ msgstr "Kalenterin ominaisuudet"
+
+#~ msgid "Remote"
+#~ msgstr "Etä"
+
+#~ msgid "Task List Properties"
+#~ msgstr "Tehtävälistan ominaisuudet"
+
+#~ msgid "_Refresh Interval:"
+#~ msgstr "_Virkistysväli:"
+
+#~ msgid "_Source URL:"
+#~ msgstr "_Lähde-URL:"
+
+#~ msgid ""
+#~ "The event being deleted is a meeting, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "Poistettava tapahtuma on kokous, haluatko lähettää perumisilmoituksen?"
+
+#~ msgid "Are you sure you want to cancel and delete this meeting?"
+#~ msgstr "Haluatko varmasti peruuttaa ja poistaa tämän tapaamisen?"
+
+#~ msgid ""
+#~ "The task being deleted is assigned, would you like to send a cancellation "
+#~ "notice?"
+#~ msgstr ""
+#~ "Poistettava tehtävä on annettu tehtäväksi, haluatko lähettää "
+#~ "perumisilmoituksen?"
+
+#~ msgid "Are you sure you want to cancel and delete this task?"
+#~ msgstr "Haluatko todella peruuttaa ja poistaa tämän tehtävän?"
+
+#~ msgid ""
+#~ "The journal entry being deleted is published, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "Poistettava päiväkirjamerkintä on julkaistu, haluatko lähettää "
+#~ "perumisilmoituksen?"
+
+#~ msgid "Are you sure you want to cancel and delete this journal entry?"
+#~ msgstr "Haluatko varmasti peruuttaa ja poistaa tämän päiväkirjamerkinnän?"
+
+#~ msgid "Are you sure you want to delete the appointment `%s'?"
+#~ msgstr "Haluatko todella poistaa tapaamisen '%s'?"
+
+#~ msgid "Are you sure you want to delete this untitled appointment?"
+#~ msgstr "Haluatko todella poistaa tämän nimettömän tapaamisen?"
+
+#~ msgid "Are you sure you want to delete the task `%s'?"
+#~ msgstr "Haluatko todella poistaa tehtävän '%s'?"
+
+#~ msgid "Are you sure you want to delete this untitled task?"
+#~ msgstr "Haluatko todella poistaa tämän nimettömän tehtävän?"
+
+#~ msgid "Are you sure you want to delete the journal entry `%s'?"
+#~ msgstr "Haluatko varmasti poistaa päiväkirjamerkinnän '%s'?"
+
+#~ msgid "Are you sure want to delete this untitled journal entry?"
+#~ msgstr "Haluatko varmasti poistaa tämän nimeämättömän päiväkirjamerkinnän?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d appointment?"
+#~ msgid_plural "Are you sure you want to delete %d appointments?"
+#~ msgstr[0] "Haluatko todella poistaa %d tapaamiset?"
+#~ msgstr[1] "Haluatko todella poistaa %d tapaamiset?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d task?"
+#~ msgid_plural "Are you sure you want to delete %d tasks?"
+#~ msgstr[0] "Haluatko todella poistaa %d tehtävää?"
+#~ msgstr[1] "Haluatko todella poistaa %d tehtävää?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d journal entry?"
+#~ msgid_plural "Are you sure you want to delete %d journal entries?"
+#~ msgstr[0] "Haluatko varmasti poistaa %d päiväkirjamerkintää?"
+#~ msgstr[1] "Haluatko varmasti poistaa %d päiväkirjamerkintää?"
+
+#~ msgid "_Invite Others..."
+#~ msgstr "_Kutsu muita..."
+
+#~ msgid ""
+#~ "This event has been changed, but has not been saved.\n"
+#~ "\n"
+#~ "Do you wish to save your changes?"
+#~ msgstr ""
+#~ "Tätä tapahtumaa on muutettu, mutta sitä ei ole tallennettu.\n"
+#~ "\n"
+#~ "Haluatko tallentaa muutokset?"
+
+#~ msgid "_Discard Changes"
+#~ msgstr "_Hylkää muutokset"
+
+#~ msgid "Save Event"
+#~ msgstr "Tallenna tapahtuma"
+
+#~ msgid "The meeting information has been created. Send it?"
+#~ msgstr "Kokouskutsu on luotu. Lähetetäänkö se?"
+
+#~ msgid "The meeting information has changed. Send an updated version?"
+#~ msgstr "Kokouskutsua on muutettu. Lähetetäänkö päivitetty versio?"
+
+#~ msgid "The task assignment information has been created. Send it?"
+#~ msgstr "Tehtävän toimeksinto on luotu. Lähetetäänkö se?"
+
+#~ msgid "The task information has changed. Send an updated version?"
+#~ msgstr "Tehtävän toimeksiantoa on muutettu. Lähetetäänkö päivitetty versio?"
+
+#, fuzzy
+#~ msgid "The task backend for '%s' has crashed."
+#~ msgstr ""
+#~ "Tehtävien taustajärjestelmä\n"
+#~ "%s\n"
+#~ "on kaatunut."
+
+#, fuzzy
+#~ msgid "The calendar backend for '%s' has crashed."
+#~ msgstr ""
+#~ "Kalenterin taustajärjestelmä\n"
+#~ "%s\n"
+#~ "on kaatunut."
+
+#~ msgid "Could not get article %s from NNTP server"
+#~ msgstr "Artikkelin %s luku NNTP-palvelimelta epäonnistui"
+
+#~ msgid "Posting not allowed by news server"
+#~ msgstr "News-palvelin ei salli viestien lähettämistä"
+
+#~ msgid "Failed to send newsgroups header: %s: message not posted"
+#~ msgstr "Uutisryhmän otsakkeen lähetys epäonnistu: %s: viestiä ei lähetetty"
+
+#~ msgid "Error posting to newsgroup: %s: message not posted"
+#~ msgstr "Uutisryhmään kirjoittaminen epäonnistui: %s: viestiä ei lähetetty"
+
+#~ msgid "Error reading response to posted message: message not posted"
+#~ msgstr ""
+#~ "Virhe luettaessa vastausta lähetettyyn viestii: viestiä ei lähetetty"
+
+#~ msgid "Error posting message: %s: message not posted"
+#~ msgstr "Virhe lähetettäessä viestiä: %s: viestiä ei lähetetty"
+
+#~ msgid "Stream error"
+#~ msgstr "Virhe virrassa"
+
+#~ msgid "Connection error: %s"
+#~ msgstr "Yhteysvirhe: %s"
+
+#~ msgid "Could not get group: %s"
+#~ msgstr "Ryhmää ei voitu hakea: %s"
+
+#, fuzzy
+#~ msgid "Could not get messages: unspecified error"
+#~ msgstr "Viestejä ei voitu hakea: tuntematon virhe"
+
+#~ msgid "Unknown server response: %s"
+#~ msgstr "Tuntematon palvelimen vastaus: %s"
+
+#~ msgid "Adjust Score"
+#~ msgstr "Säädä pistemäärää"
+
+#~ msgid "Assign Color"
+#~ msgstr "Aseta väri"
+
+#~ msgid "Assign Score"
+#~ msgstr "Aseta pistemäärä"
+
+#~ msgid "Attachments"
+#~ msgstr "Liitteet"
+
+#~ msgid "Beep"
+#~ msgstr "Piippaus"
+
+#~ msgid "contains"
+#~ msgstr "sisältää"
+
+#~ msgid "Copy to Folder"
+#~ msgstr "Kopioi kansioon"
+
+#~ msgid "Date received"
+#~ msgstr "Otettu vastaan"
+
+#~ msgid "Date sent"
+#~ msgstr "Lähetetty"
+
+#~ msgid "Deleted"
+#~ msgstr "Poistettu"
+
+#~ msgid "does not contain"
+#~ msgstr "ei sisällä"
+
+#~ msgid "does not end with"
+#~ msgstr "ei lopu merkkijonoon"
+
+#~ msgid "does not exist"
+#~ msgstr "ei ole olemassa"
+
+#~ msgid "does not return"
+#~ msgstr "ei palauta"
+
+#~ msgid "does not sound like"
+#~ msgstr "ei kuulosta samalta kuin"
+
+#~ msgid "does not start with"
+#~ msgstr "ei ala merkkijonolla"
+
+#~ msgid "Do Not Exist"
+#~ msgstr "Ei ole olemassa"
+
+#~ msgid "Draft"
+#~ msgstr "Luonnos"
+
+#~ msgid "ends with"
+#~ msgstr "loppuu merkkijonoon"
+
+#~ msgid "Exist"
+#~ msgstr "On olemassa"
+
+#~ msgid "exists"
+#~ msgstr "on olemassa"
+
+#~ msgid "Expression"
+#~ msgstr "Lauseke"
+
+#~ msgid "Follow Up"
+#~ msgstr "Vastine"
+
+#~ msgid "is"
+#~ msgstr "on"
+
+#~ msgid "is after"
+#~ msgstr "on jälkeen"
+
+#~ msgid "is before"
+#~ msgstr "on ennen"
+
+#~ msgid "is Flagged"
+#~ msgstr "On merkitty"
+
+#~ msgid "is greater than"
+#~ msgstr "on suurempi kuin"
+
+#~ msgid "is less than"
+#~ msgstr "on pienempi kuin"
+
+#~ msgid "is not"
+#~ msgstr "ei ole"
+
+#~ msgid "is not Flagged"
+#~ msgstr "ei ole merkitty"
+
+#~ msgid "Junk Test"
+#~ msgstr "Roskapostitesti"
+
+#~ msgid "Mailing list"
+#~ msgstr "Postituslista"
+
+#~ msgid "Message Body"
+#~ msgstr "Viestin runko"
+
+#~ msgid "Message Header"
+#~ msgstr "Viestin otsikko"
+
+#~ msgid "Message is Junk"
+#~ msgstr "Viesti on roskapostia"
+
+#~ msgid "Message is not Junk"
+#~ msgstr "Viesti ei ole roskapostia"
+
+#~ msgid "Move to Folder"
+#~ msgstr "Siirrä kansioon"
+
+#, fuzzy
+#~ msgid "Pipe to Program"
+#~ msgstr "Poistu ohjelmasta"
+
+#~ msgid "Play Sound"
+#~ msgstr "Soita ääni"
+
+#~ msgid "Recipients"
+#~ msgstr "Vastaanottajat"
+
+#~ msgid "Regex Match"
+#~ msgstr "Säännöllisen lausekkeen osuma"
+
+#~ msgid "Replied to"
+#~ msgstr "Vastattu osoitteeseen"
+
+#~ msgid "returns"
+#~ msgstr "palauttaa"
+
+#~ msgid "returns greater than"
+#~ msgstr "palauttaa suuremman kuin"
+
+#~ msgid "returns less than"
+#~ msgstr "palauttaa pienemmän kuin"
+
+#, fuzzy
+#~ msgid "Run Program"
+#~ msgstr "Suorita ohjelma:"
+
+#~ msgid "Sender"
+#~ msgstr "Lähettäjä"
+
+#~ msgid "Set Status"
+#~ msgstr "Aseta tila"
+
+#~ msgid "Size (kB)"
+#~ msgstr "Koko (kt)"
+
+#~ msgid "sounds like"
+#~ msgstr "kuulostaa samalta kuin"
+
+#~ msgid "Source Account"
+#~ msgstr "Lähdetili"
+
+#~ msgid "Specific header"
+#~ msgstr "Määritelty otsake"
+
+#~ msgid "starts with"
+#~ msgstr "alkaa merkkijonolla"
+
+#~ msgid "Stop Processing"
+#~ msgstr "Lopeta käsittely"
+
+#~ msgid "Unset Status"
+#~ msgstr "Poista tila"
+
+#~ msgid "Check _Incoming Mail"
+#~ msgstr "Tarkista _saapuva viestit"
+
+#~ msgid "Use _Daemon"
+#~ msgstr "Käytä _daemonia"
+
+#~ msgid "_Local Tests Only"
+#~ msgstr "Vain _paikalliset testit"
+
+#~ msgid "Working"
+#~ msgstr "Suoritetaan"
+
+#~ msgid "Brought to you by"
+#~ msgstr "Sinulle tuonut"
+
+#~ msgid "_Filename:"
+#~ msgstr "_Tiedostonimi:"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "Unknown error."
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Tuntematon virhe."
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the component system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Virhe komponenttijärjestelmältä on :\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the activation system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Virhe aktivointijärjestelmältä on:\n"
+#~ "%s"
+
+#~ msgid "Do you want to trust \"%s\" for the following purposes?"
+#~ msgstr "Haluatko luottaa \"%s\" seuraavissa käyttötarkoituksissa?"
+
+#~ msgid "View Certificate"
+#~ msgstr "Näytä varmenne"
+
+#~ msgid "You have been asked to trust a new Certificate Authority (CA)."
+#~ msgstr "Luottamustasi uuteen varmenneviranomaiseen (CA) kysytään."
+
+#~ msgid "About Ximian Evolution..."
+#~ msgstr "Tietoja Ximian Evolutionista..."
+
+#~ msgid "_About Ximian Evolution..."
+#~ msgstr "_Tietoja Evolutionista..."
+
 #~ msgid "Evolution Addressbook folder viewer"
 #~ msgstr "Evolution osoitekirjan kansiokatselin"
 
@@ -19856,9 +19900,6 @@ msgstr "%s (%d%% valmiina)"
 #~ msgid "Primary _email:"
 #~ msgstr "Ensisijainen sähköposti:"
 
-#~ msgid "S_pouse:"
-#~ msgstr "Puoli_so:"
-
 #~ msgid "_Business:"
 #~ msgstr "_Työ:"
 
@@ -19874,9 +19915,6 @@ msgstr "%s (%d%% valmiina)"
 #~ msgid "_Mobile:"
 #~ msgstr "_Matkapuhelin:"
 
-#~ msgid "_Office:"
-#~ msgstr "_Asema:"
-
 #~ msgid "_Public Calendar URL:"
 #~ msgstr "_Julkisen kalenterin URL:"
 
@@ -20497,9 +20535,6 @@ msgstr "%s (%d%% valmiina)"
 #~ msgid "Failed on message %d of %d"
 #~ msgstr "Virhe viestin %d %d:stä kohdalla"
 
-#~ msgid "Changing junk status"
-#~ msgstr "Muutetaan roskapostitilaa"
-
 #~ msgid "Search"
 #~ msgstr "Etsi"
 
diff --git a/po/fr.po b/po/fr.po
index 0654a5a485..ee89bdbbcf 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -15,14 +15,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.5.8\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-26 22:51+0200\n"
+"POT-Creation-Date: 2004-06-03 11:14-0400\n"
 "PO-Revision-Date: 2004-05-26 21:42+0200\n"
 "Last-Translator: Christophe Merlet (RedFox) <redfox@redfoxcenter.org>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 "Plural-Forms: nplurals=2; plural=n>1;\n"
 
 #: a11y/addressbook/ea-addressbook-view.c:94
@@ -140,20 +140,16 @@ msgid "Migrating `%s':"
 msgstr "Migration de « %s » :"
 
 #. create the local source group
-#. On This Computer is always first and VFolders is always last
-#: addressbook/gui/component/addressbook-migrate.c:508
+#: addressbook/gui/component/addressbook-migrate.c:464
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
 #: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
-#: mail/mail-component.c:233 mail/mail-vfolder.c:218
+#: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr "Sur cet ordinateur"
 
 #. Create the default Person addressbook
-#. Create the default Person calendar
-#. Create the default Person task list
-#. orange
-#: addressbook/gui/component/addressbook-migrate.c:516
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
 #: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
 #: mail/mail-config.glade.h:109
@@ -161,19 +157,19 @@ msgid "Personal"
 msgstr "Personnel"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:524
+#: addressbook/gui/component/addressbook-migrate.c:480
 msgid "On LDAP Servers"
 msgstr "Sur les serveurs LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:652
+#: addressbook/gui/component/addressbook-migrate.c:608
 msgid "LDAP Servers"
 msgstr "Serveurs LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:772
+#: addressbook/gui/component/addressbook-migrate.c:728
 msgid "Autocompletion Settings"
 msgstr "Paramètres de complétion automatique"
 
-#: addressbook/gui/component/addressbook-migrate.c:1148
+#: addressbook/gui/component/addressbook-migrate.c:1104
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -185,7 +181,7 @@ msgstr ""
 "\n"
 "Veuillez être patient pendant qu'Evolution fait migrer vos dossiers..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1162
+#: addressbook/gui/component/addressbook-migrate.c:1118
 #, fuzzy
 msgid ""
 "The format of mailing list contacts has changed.\n"
@@ -197,7 +193,7 @@ msgstr ""
 "\n"
 "Veuillez être patient pendant qu'Evolution fait migrer vos dossiers..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1171
+#: addressbook/gui/component/addressbook-migrate.c:1127
 #, fuzzy
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
@@ -209,7 +205,7 @@ msgstr ""
 "\n"
 "Veuillez être patient pendant qu'Evolution fait migrer vos dossiers..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1181
+#: addressbook/gui/component/addressbook-migrate.c:1137
 #, fuzzy
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
@@ -221,12 +217,6 @@ msgstr ""
 "\n"
 "Veuillez être patient pendant qu'Evolution fait migrer vos dossiers..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1194
-msgid ""
-"Some fields are no longer representable in the contact editor. Please wait "
-"while Evolution copies those fields to the 'Notes' field..."
-msgstr ""
-
 #: addressbook/gui/component/addressbook-view.c:675
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
@@ -240,7 +230,7 @@ msgstr "Nouveau carnet d'adresses"
 
 #: addressbook/gui/component/addressbook-view.c:755
 #: addressbook/gui/widgets/e-addressbook-view.c:1088
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:365
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
 #: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
 #: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
@@ -249,7 +239,7 @@ msgid "Delete"
 msgstr "Supprimer"
 
 #: addressbook/gui/component/addressbook-view.c:756
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Propriétés..."
 
@@ -335,10 +325,6 @@ msgid "Manage your S/MIME certificates here"
 msgstr "Gérer votre certificats S/Mime ici"
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-msgid "  S_how Supported Bases "
-msgstr "  Affic_her les bases dupportées"
-
-#: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -360,198 +346,165 @@ msgstr "  Affic_her les bases dupportées"
 msgid "*"
 msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1:00"
-msgstr "1:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
-msgstr "5:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "Authentification SMTP"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
 #, fuzzy
 msgid "<b>Display</b>"
 msgstr "<b>Message électronique</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 #, fuzzy
 msgid "<b>Downloading</b>"
 msgstr "<b>Envoi des messages</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:10
 #, fuzzy
 msgid "<b>Searching</b>"
 msgstr "_Sélection :"
 
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
 msgid "<b>Server Information</b>"
 msgstr "Étape 2 : Informations sur le serveur"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
 msgid "<b>Type:</b>"
 msgstr "<b>Alors</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:13
 #, fuzzy
 msgid "Add Contacts Group"
 msgstr "_Groupe de contacts"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Address Book Properties"
 msgstr "Propriétés du carnet d'adresses"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:42
 msgid "Always"
 msgstr "Toujours"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr "Anonymement"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:17
 #: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Basique"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
-msgid "Connecting"
-msgstr "Connexion en cours"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 #: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Détails"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
-msgid "Distinguished _name:"
-msgstr "_Nom distinctif :"
-
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:19
 #, fuzzy
 msgid "Distinguished name"
 msgstr "_Nom distinctif :"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:20
 #, fuzzy
 msgid "Download limit:"
 msgstr "Limite de _téléchargement :"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Email address"
 msgstr "Adresse électronique :"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "Email address:"
-msgstr "Adresse électronique :"
-
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "Evolution will use this DN to authenticate you with the server"
-msgstr "Evolution utilisera ce DN pour vous authentifier sur le serveur."
-
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:22
+#, fuzzy
 msgid ""
-"Evolution will use this email address to authenticate you with the server"
+"Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "Evolution utilisera cette adresse électronique pour vous authentifier sur le "
 "serveur."
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:23
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Bases de recherche supportées"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:24
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Général"
 
-#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
+#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:102
 msgid "Never"
 msgstr "Jamais"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
-msgid "One"
-msgstr "Un"
-
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:35
-msgid "S_earch scope: "
-msgstr "Domain_e de recherche : "
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Search _base:"
+msgstr "Ba_se de la recherche :"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
 msgid "Search base only"
 msgstr "Ba_se de la recherche :"
 
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:29
 #, fuzzy
 msgid "Search base:"
 msgstr "Ba_se de la recherche :"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Search scope:"
 msgstr "Domain_e de recherche : "
 
-#: addressbook/gui/component/ldap-config.glade.h:39
-msgid "Searching"
-msgstr "Recherche"
-
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:31
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
-"server if\n"
-"your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL or TLS."
 msgstr ""
 "Sélectionner cette option signifie que Evolution se connectera au serveur "
 "LDAP\n"
 "uniquement si votre serveur LDAP supporte SSL et TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a \n"
-"insecure environment. For example, if you and your LDAP server are behind a "
-"firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection "
-"is already\n"
-"secure."
+"you are in a insecure environment. For example, if you and your LDAP server "
+"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
+"because your connection is already secure."
 msgstr ""
 "Sélectionner cette option signifie que Evolution essaiera d'utiliser SSL/TLS "
 "uniquement si\n"
@@ -560,13 +513,12 @@ msgstr ""
 "se trouve derrière un pare-feu, Evolution n'aura pas besoin d'utiliser \n"
 "SSL/TLS car votre connexion est déjà sécurisée."
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:33
+#, fuzzy
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
-"TLS.  This \n"
-"means that your connection will be insecure, and that you will be vulnerable "
-"to security\n"
-"exploits. "
+"TLS.  This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits. "
 msgstr ""
 "Sélectionner cette option signifie que votre serveur ne supporte ni SSL ni "
 "TLS. Cela\n"
@@ -574,24 +526,20 @@ msgstr ""
 "vulnérable aux\n"
 "problèmes de sécurité."
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Sub"
-msgstr "Sous"
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr "Bases de recherche supportées"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
-"searches will \n"
-"begin. If you leave this blank, the search will begin at the root of the "
-"directory tree."
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
 msgstr ""
 "La base de recherche est le nom distinctif (DN) de l'entrée où les "
 "recherches devront\n"
@@ -599,14 +547,13 @@ msgstr ""
 "racine de \n"
 "l'arborescence de l'annuaire."
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:37
+#, fuzzy
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
-"the \n"
-"directory tree. A search scope of \"sub\" will include all entries below "
-"your search base.\n"
-"A search scope of \"one\" will only include the entries one level beneath "
-"your base.\n"
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
 msgstr ""
 "Le domaine de recherche définit la portée de la recherche dans "
 "l'arborescence de\n"
@@ -616,7 +563,7 @@ msgstr ""
 "trouvant un niveau\n"
 "en dessous de la base.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:58
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -624,16 +571,16 @@ msgstr ""
 "Ceci représente le nom complet de votre serveur ldap. Par exemple, « ldap."
 "monentreprise.com »."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:39
+#, fuzzy
 msgid ""
-"This is the maximum number of entries to download. Setting this number to "
-"be \n"
+"This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr ""
 "Ceci représente le nombre maximum d'entrées à télécharger. Un nombre\n"
 "trop élevé ralentira l'accès à votre carnet d'adresses."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -643,142 +590,121 @@ msgstr ""
 "Notez que spécifier « Adresse électronique » implique l'accès anonyme au "
 "serveur."
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:41
+#, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
-"list.\n"
-"It is for display purposes only. "
+"list. It is for display purposes only. "
 msgstr ""
 "Ceci représente le nom du serveur tel qu'il apparaîtra dans la liste des "
 "dossiers d'Evolution\n"
 "(dans un but d'affichage uniquement)."
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:42
+#, fuzzy
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. "
-"A \n"
-"list of standard ports has been provided. Ask your system administrator\n"
-"what port you should specify."
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
 msgstr ""
 "Ceci représente le port sur le serveur LDAP auquel Evolution essaiera de se\n"
 "connecter. Une liste de ports standard est fournie. Demandez à votre "
 "administrateur\n"
 "système le port à utiliser."
 
-#: addressbook/gui/component/ldap-config.glade.h:67
-msgid "This option controls how long a search will be run."
-msgstr "Cette option indique le temps d'exécution d'une requête. "
-
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:43
 #, fuzzy
 msgid "Timeout:"
 msgstr "Format de date :"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
-msgid "U_se SSL/TLS:"
-msgstr "Utili_ser SSL/TLS :"
-
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr "En utilisant le nom distinctif (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr "En utilisant l'adresse électronique"
 
-#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
+#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr "Lorsque c'est possible"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:47
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "_Groupe de contacts"
 
-#: addressbook/gui/component/ldap-config.glade.h:74
-#: calendar/gui/dialogs/calendar-setup.glade.h:12
-msgid "_Display name:"
-msgstr "_Nom d'affichage :"
-
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr "Limite de _téléchargement :"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
 msgid "_Email address:"
 msgstr "Adresse électronique :"
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:50
+#, fuzzy
+msgid "_Find Possible Search Bases"
+msgstr "Bases de recherche supportées"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Log in method:"
 msgstr "_Méthode d'identification :"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:171
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "_Log in:"
+msgstr "Connexion"
+
+#: addressbook/gui/component/ldap-config.glade.h:53
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
 msgid "_Name:"
 msgstr "_Nom :"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
-msgid "_Port number:"
-msgstr "_Numéro de port :"
-
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "_Port:"
 msgstr "_Priorité :"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
-msgid "_Search base:"
-msgstr "Ba_se de la recherche :"
-
-#: addressbook/gui/component/ldap-config.glade.h:82
-msgid "_Server name:"
-msgstr "Nom du _serveur :"
+#: addressbook/gui/component/ldap-config.glade.h:55
+#, fuzzy
+msgid "_Search scope:"
+msgstr "Domain_e de recherche : "
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:56
 #, fuzzy
 msgid "_Server:"
 msgstr "S_erveur"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
-msgid "_Timeout (minutes):"
-msgstr "_Temps d'attente maximum (minutes) :"
+#: addressbook/gui/component/ldap-config.glade.h:57
+#, fuzzy
+msgid "_Timeout:"
+msgstr "Format de date :"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:58
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "_Utiliser une connexion sécurisée (SSL) :"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "cartes"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
-msgid "connecting-tab"
-msgstr "Connexion"
-
-#: addressbook/gui/component/ldap-config.glade.h:88
-msgid "general-tab"
-msgstr "Général"
-
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:60
 #: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
 #: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "minutes"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
-msgid "searching-tab"
-msgstr "Recherche"
-
-#: addressbook/gui/component/select-names/e-select-names.c:492
+#: addressbook/gui/component/select-names/e-select-names.c:503
 #: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid "Select Contacts from Address Book"
 msgstr "Sélectionnez les contacts dans le carnet d'adresses"
 
-#: addressbook/gui/component/select-names/e-select-names.c:691
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
@@ -884,8 +810,8 @@ msgstr "<b>Travail</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
 #: addressbook/gui/contact-editor/e-contact-editor.c:178
-#: addressbook/gui/widgets/eab-contact-display.c:342
-#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/widgets/eab-contact-display.c:334
+#: addressbook/gui/widgets/eab-contact-display.c:353
 msgid "AIM"
 msgstr "AIM"
 
@@ -920,7 +846,7 @@ msgstr "Société :"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: addressbook/gui/contact-editor/e-contact-editor.c:266
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
@@ -948,83 +874,81 @@ msgid "Full _Name..."
 msgstr "_Nom complet..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-msgid "Home"
-msgstr "Domicile"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #, fuzzy
 msgid "Home Page:"
 msgstr "Site internet"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-#: calendar/gui/e-itip-control.c:930
-msgid "Location:"
-msgstr "Lieu :"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "Messagerie MSN"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 #, fuzzy
 msgid "Mailing Address"
 msgstr "Adresse électronique"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "Manager:"
 msgstr "Directeur :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "Ni_ckname:"
 msgstr "_Surnom :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "Notes:"
 msgstr "Notes :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
-#: addressbook/gui/contact-editor/e-contact-editor.c:197
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-msgid "Other"
-msgstr "Autre"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#, fuzzy
+msgid "Office:"
+msgstr "_Bureau :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "PO Box:"
 msgstr "_Boîte postale :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "Personal Information"
 msgstr "Information personnelle"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "Profession:"
 msgstr "Profession :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#, fuzzy
+msgid "Spouse:"
+msgstr "_Conjoint(e) :"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "State/Province:"
 msgstr "État/Province :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
 #, fuzzy
 msgid "Title:"
 msgstr "_Titre :"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+msgid "Video Chat:"
+msgstr ""
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "Wants to receive HTML mail"
 msgstr "Préfère recevoir le courrier en HTML"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:42
-msgid "Webcam:"
-msgstr "Webcam :"
+#, fuzzy
+msgid "Web Log:"
+msgstr "Page Web :"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
@@ -1048,17 +972,10 @@ msgid "_File under:"
 msgstr "_Classer sous :"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "_Where:"
 msgstr "_Où :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
-msgid "item7"
-msgstr "item7"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
-msgid "item8"
-msgstr "item8"
-
 #: addressbook/gui/contact-editor/eab-editor.c:315
 msgid ""
 "Are you sure you want\n"
@@ -1076,8 +993,8 @@ msgstr ""
 "supprimer ce contact ?"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:351
-#: addressbook/gui/widgets/eab-contact-display.c:372
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Address"
 msgstr "Adresse"
 
@@ -1085,7 +1002,7 @@ msgstr "Adresse"
 #: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard.c:174
@@ -2065,27 +1982,27 @@ msgstr "Zimbabwe"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:179
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:337
+#: addressbook/gui/widgets/eab-contact-display.c:356
 msgid "Jabber"
 msgstr "Jabber"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:347
-#: addressbook/gui/widgets/eab-contact-display.c:366
+#: addressbook/gui/widgets/eab-contact-display.c:339
+#: addressbook/gui/widgets/eab-contact-display.c:358
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/widgets/eab-contact-display.c:338
+#: addressbook/gui/widgets/eab-contact-display.c:357
 msgid "MSN"
 msgstr "MSN"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:344
-#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#: addressbook/gui/widgets/eab-contact-display.c:355
 msgid "ICQ"
 msgstr "ICQ"
 
@@ -2093,6 +2010,16 @@ msgstr "ICQ"
 msgid "GroupWise"
 msgstr "GroupWise"
 
+#: addressbook/gui/contact-editor/e-contact-editor.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+msgid "Home"
+msgstr "Domicile"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+msgid "Other"
+msgstr "Autre"
+
 #: addressbook/gui/contact-editor/e-contact-editor.c:252
 msgid "Source Book"
 msgstr "Livre source"
@@ -2113,45 +2040,45 @@ msgstr "Champs modifiables"
 msgid "Changed"
 msgstr "Modifié"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2297
+#: addressbook/gui/contact-editor/e-contact-editor.c:2352
 msgid "This contact belongs to these categories:"
 msgstr "Ce contact appartient à ces catégories :"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2374
+#: addressbook/gui/contact-editor/e-contact-editor.c:2429
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Veuillez effectuer une sélection parmi les options suivantes."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2378
+#: addressbook/gui/contact-editor/e-contact-editor.c:2433
 #, fuzzy
 msgid "No image"
 msgstr "Niger"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2581
+#: addressbook/gui/contact-editor/e-contact-editor.c:2636
 #, fuzzy
 msgid ""
 "The contact data is invalid:\n"
 "\n"
 msgstr "La date de la récurrence est non valide"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2609
+#: addressbook/gui/contact-editor/e-contact-editor.c:2664
 #, fuzzy
 msgid "Invalid contact."
 msgstr "%d contact"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2668
+#: addressbook/gui/contact-editor/e-contact-editor.c:2723
 msgid ""
 "The contact cannot be saved to the selected address book. Do you want to "
 "discard changes?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2672
-#: addressbook/gui/contact-editor/e-contact-editor.c:2696
+#: addressbook/gui/contact-editor/e-contact-editor.c:2727
+#: addressbook/gui/contact-editor/e-contact-editor.c:2751
 msgid "_Discard"
 msgstr "_Abandonner"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2691
+#: addressbook/gui/contact-editor/e-contact-editor.c:2746
 msgid ""
 "You are moving the contact from one address book to another, but it cannot "
 "be removed from the source. Do you want to save a copy instead?"
@@ -2336,11 +2263,11 @@ msgstr ""
 "_Saisissez une adresse électronique ou déplacez un contact dans la liste ci-"
 "dessous :"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "contact-list-editor"
 msgstr "Éditeur de liste de contacts"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:153
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
 #: addressbook/gui/widgets/e-addressbook-view.c:217
@@ -2349,17 +2276,17 @@ msgstr "Éditeur de liste de contacts"
 msgid "Book"
 msgstr "Carnet"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
 msgid "Is New List"
 msgstr "Est une nouvelle liste"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:215
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
 msgid "Contact List Editor"
 msgstr "Éditeur de liste de contacts"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:438
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
 msgid "Save List as VCard"
 msgstr "Enregistrer la liste comme VCard"
 
@@ -2406,91 +2333,91 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Recherche avancée"
 
-#: addressbook/gui/widgets/eab-contact-display.c:129
-#: addressbook/gui/widgets/eab-contact-display.c:192
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
 msgid "(map)"
 msgstr "(carte)"
 
-#: addressbook/gui/widgets/eab-contact-display.c:139
-#: addressbook/gui/widgets/eab-contact-display.c:205
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
 msgid "map"
 msgstr "carte"
 
-#: addressbook/gui/widgets/eab-contact-display.c:257
-#: addressbook/gui/widgets/eab-contact-display.c:533
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:525
 msgid "List Members"
 msgstr "Membres de la liste"
 
-#: addressbook/gui/widgets/eab-contact-display.c:329
-#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/eab-contact-display.c:321
+#: addressbook/gui/widgets/eab-contact-display.c:323
 msgid "E-mail"
 msgstr "Courrier électronique"
 
-#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/eab-contact-display.c:332
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organisation"
 
-#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "Position"
 msgstr "Position"
 
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:354
 msgid "Groupwise"
 msgstr "Groupwise"
 
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:340
 msgid "Video Conferencing"
 msgstr "Vidéo conférence"
 
-#: addressbook/gui/widgets/eab-contact-display.c:349
-#: addressbook/gui/widgets/eab-contact-display.c:370
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Phone"
 msgstr "Téléphone"
 
-#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:342
 msgid "Fax"
 msgstr "Fax"
 
-#: addressbook/gui/widgets/eab-contact-display.c:354
+#: addressbook/gui/widgets/eab-contact-display.c:346
 msgid "work"
 msgstr "travail"
 
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:359
 msgid "WWW"
 msgstr "Web"
 
-#: addressbook/gui/widgets/eab-contact-display.c:368
-#: addressbook/gui/widgets/eab-contact-display.c:587
+#: addressbook/gui/widgets/eab-contact-display.c:360
+#: addressbook/gui/widgets/eab-contact-display.c:579
 msgid "Blog"
 msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/eab-contact-display.c:363
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Téléphone portable"
 
-#: addressbook/gui/widgets/eab-contact-display.c:375
+#: addressbook/gui/widgets/eab-contact-display.c:367
 msgid "personal"
 msgstr "personnel"
 
-#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/eab-contact-display.c:374
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Note"
 
-#: addressbook/gui/widgets/eab-contact-display.c:548
+#: addressbook/gui/widgets/eab-contact-display.c:540
 msgid "Job Title"
 msgstr "Fonction"
 
-#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/eab-contact-display.c:544
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:774
+#: smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "Courrier électronique"
 
-#: addressbook/gui/widgets/eab-contact-display.c:579
+#: addressbook/gui/widgets/eab-contact-display.c:571
 msgid "Home page"
 msgstr "Site internet"
 
@@ -2862,13 +2789,13 @@ msgid "Email begins with"
 msgstr "L'adresse commence par"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:165
-#: calendar/gui/cal-search-bar.c:57
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "La catégorie est"
 
 #. We attach subitems below
 #: addressbook/gui/widgets/e-addressbook-view.c:166
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Tout champ contient"
 
@@ -2880,7 +2807,7 @@ msgstr "Avancée..."
 #: addressbook/gui/widgets/e-addressbook-view.c:238
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:250
+#: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Type"
@@ -2959,7 +2886,7 @@ msgid "Cut"
 msgstr "Couper"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
@@ -2971,13 +2898,13 @@ msgid "Paste"
 msgstr "Coller"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1092
-#: calendar/gui/e-calendar-view.c:1277
+#: calendar/gui/e-calendar-view.c:1280
 msgid "Current View"
 msgstr "Vue courante"
 
 #. All, unmatched, separator
 #: addressbook/gui/widgets/e-addressbook-view.c:1665
-#: calendar/gui/cal-search-bar.c:362
+#: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Toute catégorie"
 
@@ -3083,7 +3010,7 @@ msgstr "Radio"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:257
+#: calendar/gui/e-meeting-list-view.c:234
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Rôle"
@@ -3191,17 +3118,17 @@ msgstr "Vue carte"
 msgid "GTK Tree View"
 msgstr "Affichage de l'arborescence GTK"
 
-#: addressbook/gui/widgets/test-reflow.c:119
+#: addressbook/gui/widgets/test-reflow.c:106
 msgid "Reflow Test"
 msgstr "Test de reformatage"
 
-#: addressbook/gui/widgets/test-reflow.c:120
+#: addressbook/gui/widgets/test-reflow.c:107
 #: addressbook/printing/test-contact-print-style-editor.c:54
 #: addressbook/printing/test-print.c:53
 msgid "Copyright (C) 2000, Ximian, Inc."
 msgstr "Copyright (C) 2000, Ximian, Inc."
 
-#: addressbook/gui/widgets/test-reflow.c:122
+#: addressbook/gui/widgets/test-reflow.c:109
 msgid "This should test the reflow canvas item"
 msgstr "Ceci devrait tester l'élément de reformatage du canvas"
 
@@ -3825,7 +3752,7 @@ msgstr "Purger les événements plus vieux que"
 
 #: calendar/gui/calendar-commands.c:363
 #: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:19 filter/filter.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
 msgid "days"
 msgstr "jours"
 
@@ -3835,10 +3762,6 @@ msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. %d = day of month, %b = abbreviated month name.
-#. You can change the order but don't change the
-#. specifiers or add anything.
 #: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
 #: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
 #: calendar/gui/e-week-view-main-item.c:329
@@ -3979,23 +3902,23 @@ msgstr "Vue hebdomadaire"
 msgid "Month View"
 msgstr "Vue mensuelle"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Le résumé contient"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "La description contient"
 
-#: calendar/gui/cal-search-bar.c:54
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Le commentaire contient"
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:53
 msgid "Location contains"
 msgstr "L'emplacement contient"
 
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:327
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
 msgid "Unmatched"
 msgstr "Différent"
 
@@ -4068,7 +3991,7 @@ msgstr "Envoyer à :"
 msgid "With these arguments:"
 msgstr "Avec ces arguments :"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
 msgid "dialog1"
 msgstr "dialog1"
 
@@ -4077,7 +4000,7 @@ msgid "extra times every"
 msgstr "toutes les"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:20 filter/filter.glade.h:16
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr "heures"
 
@@ -4123,7 +4046,7 @@ msgstr "Envoyer un courrier électronique"
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:921 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Résumé :"
 
@@ -4153,7 +4076,6 @@ msgid "hour(s)"
 msgstr "heure(s)"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:21
 msgid "minute(s)"
 msgstr "minute(s)"
 
@@ -4176,12 +4098,12 @@ msgstr "L'emplacement source « %s » n'est pas bien formé."
 msgid "The source location '%s' is not a webcal source."
 msgstr "L'emplacement source « %s » n'est pas une source webcal."
 
-#: calendar/gui/dialogs/calendar-setup.c:264
+#: calendar/gui/dialogs/calendar-setup.c:275
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr "Une source avec le nom « %s » existe déjà dans le groupe sélectionné"
 
-#: calendar/gui/dialogs/calendar-setup.c:277
+#: calendar/gui/dialogs/calendar-setup.c:288
 #, c-format
 msgid ""
 "The group '%s' is remote. You must specify a location to get the calendar "
@@ -4202,51 +4124,31 @@ msgstr "Ajouter un groupe de tâches"
 msgid "C_olor:"
 msgstr "C_ouleur :"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "Calendar Properties"
-msgstr "Propriétés du calendrier"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:110
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
 msgid "Pick a color"
 msgstr "Choisissez une couleur"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:8
-msgid "Remote"
-msgstr "Distant"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "Task List Properties"
-msgstr "Propriétés de la liste des tâches"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
 msgid "_Add Calendar"
 msgstr "A_jouter un calendrier"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
 msgid "_Add Group"
 msgstr "A_jouter un groupe"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-msgid "_Refresh Interval:"
-msgstr "Intervalle de _rafraîchissement :"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
 msgid "_Refresh:"
 msgstr "_Rafraîchir :"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-msgid "_Source URL:"
-msgstr "_Source URL :"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "_Type:"
 msgstr "_Type :"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
 msgid "_URL:"
 msgstr "_URL :"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
 msgid "weeks"
 msgstr "semaines"
 
@@ -4365,7 +4267,7 @@ msgstr "Publication _libre-occupé"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:557
+#: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Vendredi"
 
@@ -4379,7 +4281,7 @@ msgstr "Minutes"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:553
+#: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Lundi"
 
@@ -4389,7 +4291,7 @@ msgstr "_Dim"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Samedi"
 
@@ -4403,7 +4305,7 @@ msgstr "Afficher les _numéros de semaine dans le navigateur de dates"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:552
+#: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Dimanche"
 
@@ -4417,7 +4319,7 @@ msgstr "_Jeu"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:556
+#: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Jeudi"
 
@@ -4431,7 +4333,7 @@ msgstr "Format de date :"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:554
+#: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Mardi"
 
@@ -4441,7 +4343,7 @@ msgstr "La s_emaine débute :"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:555
+#: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Mercredi"
 
@@ -4606,7 +4508,7 @@ msgid "No summary"
 msgstr "Aucun résumé"
 
 #: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
 #: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Enregistrer sous..."
@@ -4843,13 +4745,8 @@ msgid "_Start time:"
 msgstr "Heure de _début :"
 
 #. an empty string is the same as 'None'
-#. add a "None" option to the stores menu
-#. Put the "None" and "UTC" entries at the top of the combo's list.
-#. When "None" is selected we want the field to be cleared.
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
 #: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:3
+#: calendar/gui/dialogs/meeting-page.glade.h:4
 #: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
 #: filter/filter-rule.c:877 mail/em-account-prefs.c:427
 #: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
@@ -4879,8 +4776,8 @@ msgstr "_Déléguer à..."
 #. FIXME: need to disable for undeletable folders
 #: calendar/gui/dialogs/meeting-page.c:655
 #: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1310 calendar/gui/e-calendar-view.c:1342
-#: mail/em-folder-tree.c:2537 mail/em-folder-view.c:919
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
+#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -4888,7 +4785,7 @@ msgid "_Delete"
 msgstr "_Supprimer"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:241
+#: calendar/gui/e-meeting-list-view.c:218
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Participant"
@@ -4924,14 +4821,14 @@ msgid "Member"
 msgstr "Membre"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1048 calendar/gui/e-meeting-list-view.c:264
+#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "Réponse S.V.P"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:271
+#: calendar/gui/e-meeting-list-view.c:248
 #: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "État"
@@ -4940,20 +4837,20 @@ msgstr "État"
 msgid "Add A_ttendee"
 msgstr "Ajouter un _participant"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "Add attendees from addressbook."
+msgstr "Ajouter l'expéditeur au _carnet d'adresses"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Organisateur :"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
+#: calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "_Change Organizer"
 msgstr "_Changer l'organisateur"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-#: calendar/gui/e-meeting-time-sel.c:417
-msgid "_Invite Others..."
-msgstr "_Inviter d'autres personnes..."
-
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
 msgstr "<b>Options du calendrier</b>"
@@ -5251,7 +5148,7 @@ msgstr "Con_fidentiel"
 
 #: calendar/gui/dialogs/task-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:976 calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Description :"
@@ -5417,7 +5314,7 @@ msgstr "Date d'échéance :"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:944
+#: calendar/gui/e-itip-control.c:943
 msgid "Status:"
 msgstr "État :"
 
@@ -5501,12 +5398,12 @@ msgstr "Occupé"
 msgid "Deleting selected objects"
 msgstr "Supprimer les objets sélectionnés"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
 msgid "Updating objects"
 msgstr "Mise à jour des objets"
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1370
+#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
 #: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Ouvrir"
@@ -5516,15 +5413,15 @@ msgid "Open _Web Page"
 msgstr "Ouvrir le _site internet"
 
 #: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1291 calendar/gui/e-calendar-view.c:1376
+#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
 #: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "Enregistrer _sous..."
 
 #: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1292
-#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
+#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
@@ -5532,15 +5429,15 @@ msgid "_Print..."
 msgstr "_Imprimer..."
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Co_uper"
 
 #: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1338
-#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2530
+#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
+#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
 #: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
@@ -5548,8 +5445,8 @@ msgid "_Copy"
 msgstr "_Copier"
 
 #: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1273 calendar/gui/e-calendar-view.c:1299
-#: calendar/gui/e-calendar-view.c:1372 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
+#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
@@ -5618,71 +5515,71 @@ msgstr "Résumé"
 msgid "Task sort"
 msgstr "Tri par tâche"
 
-#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
 msgid "New _Appointment..."
 msgstr "Nouveau _RDV..."
 
-#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
+#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
 msgid "New All Day _Event"
 msgstr "Nouvel événement journée _entière"
 
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
+#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
 msgid "New Meeting"
 msgstr "Nouvelle réunion"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
 msgid "New Task"
 msgstr "Nouvelle tâche"
 
-#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Sélectionner par _fil de discussion"
 
-#: calendar/gui/e-calendar-view.c:1280
+#: calendar/gui/e-calendar-view.c:1283
 #, fuzzy
 msgid "_Select Date..."
 msgstr "Sélectionner..."
 
-#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publier l'information Libre/Occupé"
 
-#: calendar/gui/e-calendar-view.c:1303
+#: calendar/gui/e-calendar-view.c:1306
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Copier vers le dossier..."
 
-#: calendar/gui/e-calendar-view.c:1304
+#: calendar/gui/e-calendar-view.c:1307
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "Déplacer _vers le dossier..."
 
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1308
 msgid "_Schedule Meeting..."
 msgstr "Planifier une _réunion..."
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1309
 msgid "_Forward as iCalendar..."
 msgstr "_Faire suivre comme iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
 msgid "Delete this _Occurrence"
 msgstr "Supprimer cette _occurrence"
 
-#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
 msgid "Delete _All Occurrences"
 msgstr "Supprimer _toutes les occurrences"
 
-#: calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1349
 msgid "Go to _Today"
 msgstr "Aller à _aujourd'hui"
 
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1351
 msgid "_Go to Date..."
 msgstr "A_ller à la date..."
 
-#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "_Paramétres..."
 
@@ -5697,9 +5594,9 @@ msgstr "Date de début"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:961 calendar/gui/e-itip-control.c:1163
-#: calendar/gui/e-meeting-list-view.c:145
-#: calendar/gui/e-meeting-list-view.c:159 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
 #: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
 #: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
 #: camel/camel-tcp-stream-openssl.c:631
@@ -5725,13 +5622,13 @@ msgid "Assigned"
 msgstr "Attribué"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr "Oui"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:170 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "Non"
 
@@ -5743,7 +5640,7 @@ msgstr "N"
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
 msgid "E"
 msgstr "E"
 
@@ -5762,20 +5659,12 @@ msgstr ""
 "45.436845,125.862501"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format.
 #: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
@@ -5806,10 +5695,6 @@ msgstr "pm"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#. strftime format %A = full weekday name, %d = day of
-#. month, %B = full month name. You can change the
-#. order but don't change the specifiers or add
-#. anything.
 #: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
@@ -5817,9 +5702,6 @@ msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#. strftime format %d = day of month, %b = abbreviated
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
 #: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
@@ -5830,101 +5712,102 @@ msgstr "%d %b"
 msgid "%02i minute divisions"
 msgstr "%02i divisions par minute"
 
-#: calendar/gui/e-itip-control.c:586
+#: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
 msgstr "Oui. (Récurrence complexe)"
 
-#: calendar/gui/e-itip-control.c:597
+#: calendar/gui/e-itip-control.c:596
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Tous les jours"
 msgstr[1] "Tous les %d jours"
 
-#: calendar/gui/e-itip-control.c:602
+#: calendar/gui/e-itip-control.c:601
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Toutes les semaines"
 msgstr[1] "Toutes les %d semaines"
 
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:603
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "Toutes les semaines le "
 msgstr[1] "Toutes les %d semaines le "
 
-#: calendar/gui/e-itip-control.c:612
+#: calendar/gui/e-itip-control.c:611
 msgid " and "
 msgstr " et "
 
-#: calendar/gui/e-itip-control.c:619
+#: calendar/gui/e-itip-control.c:618
 #, c-format
 msgid "The %s day of "
 msgstr "Le %s jour de"
 
-#: calendar/gui/e-itip-control.c:632
+#: calendar/gui/e-itip-control.c:631
 #, c-format
 msgid "The %s %s of "
 msgstr "Le %s %s de"
 
-#: calendar/gui/e-itip-control.c:639
+#: calendar/gui/e-itip-control.c:638
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "tous les mois"
 msgstr[1] "tous les %d mois"
 
-#: calendar/gui/e-itip-control.c:643
+#: calendar/gui/e-itip-control.c:642
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Tous les ans"
 msgstr[1] "Tous les %d ans"
 
-#: calendar/gui/e-itip-control.c:654
+#: calendar/gui/e-itip-control.c:653
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] " un total de %d fois"
 msgstr[1] " un total de %d fois"
 
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:662
 msgid ", ending on "
 msgstr ", finissant le"
 
-#: calendar/gui/e-itip-control.c:687
+#: calendar/gui/e-itip-control.c:686
 msgid "<b>Starts:</b> "
 msgstr "<b>Débute :</b> "
 
-#: calendar/gui/e-itip-control.c:697
+#: calendar/gui/e-itip-control.c:696
 msgid "<b>Ends:</b> "
 msgstr "<b>Finit :</b> "
 
-#: calendar/gui/e-itip-control.c:717
+#: calendar/gui/e-itip-control.c:716
 msgid "<b>Completed:</b> "
 msgstr "<b>Terminé :</b> "
 
-#: calendar/gui/e-itip-control.c:727
+#: calendar/gui/e-itip-control.c:726
 msgid "<b>Due:</b> "
 msgstr "<b>Échéance :</b> "
 
-#: calendar/gui/e-itip-control.c:765 calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
 msgid "iCalendar Information"
 msgstr "Information iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:781
 msgid "iCalendar Error"
 msgstr "Erreur iCalendar"
 
-#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
-#: calendar/gui/e-itip-control.c:880 calendar/gui/e-itip-control.c:897
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
 msgid "An unknown person"
 msgstr "Une personne inconnue"
 
-#: calendar/gui/e-itip-control.c:904
+#. Describe what the user can do
+#: calendar/gui/e-itip-control.c:903
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5933,308 +5816,312 @@ msgstr ""
 "action\n"
 "du menu ci-dessous."
 
-#: calendar/gui/e-itip-control.c:919
+#: calendar/gui/e-itip-control.c:918
 msgid "<i>None</i>"
 msgstr "<i>Aucun</i>"
 
-#: calendar/gui/e-itip-control.c:949 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:929
+msgid "Location:"
+msgstr "Lieu :"
+
+#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Accepté"
 
-#: calendar/gui/e-itip-control.c:953 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Accepté provisoirement"
 
-#: calendar/gui/e-itip-control.c:957 calendar/gui/e-meeting-list-view.c:182
+#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Refusé"
 
-#: calendar/gui/e-itip-control.c:1016 calendar/gui/e-itip-control.c:1044
-#: calendar/gui/e-itip-control.c:1070 calendar/gui/e-itip-control.c:1083
-#: calendar/gui/e-itip-control.c:1096 calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
 msgid "Choose an action:"
 msgstr "Sélectionner une action :"
 
-#: calendar/gui/e-itip-control.c:1017
+#: calendar/gui/e-itip-control.c:1016
 msgid "Update"
 msgstr "Mettre à jour"
 
-#: calendar/gui/e-itip-control.c:1018 calendar/gui/e-itip-control.c:1049
-#: calendar/gui/e-itip-control.c:1072 calendar/gui/e-itip-control.c:1085
-#: calendar/gui/e-itip-control.c:1098 calendar/gui/e-itip-control.c:1111
-#: shell/e-shell.c:1132 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
+#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Valider"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1044
 msgid "Accept"
 msgstr "Accepter"
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1045
 msgid "Tentatively accept"
 msgstr "Accepter provisoirement"
 
-#: calendar/gui/e-itip-control.c:1047
+#: calendar/gui/e-itip-control.c:1046
 msgid "Decline"
 msgstr "Refuser"
 
-#: calendar/gui/e-itip-control.c:1071
+#: calendar/gui/e-itip-control.c:1070
 msgid "Send Free/Busy Information"
 msgstr "Envoyer l'information Libre-Occupé"
 
-#: calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1083
 msgid "Update respondent status"
 msgstr "Mettre à jour le statut de l'interlocuteur"
 
-#: calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1096
 msgid "Send Latest Information"
 msgstr "Envoyer les dernières informations"
 
-#: calendar/gui/e-itip-control.c:1110 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Annuler"
 
-#: calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1185
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> a publié les informations de la réunion."
 
-#: calendar/gui/e-itip-control.c:1187
+#: calendar/gui/e-itip-control.c:1186
 msgid "Meeting Information"
 msgstr "Informations de la réunion"
 
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1191
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> demande la présence de %s à ce rendez-vous."
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1193
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> demande votre présence à cette réunion."
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1194
 msgid "Meeting Proposal"
 msgstr "Proposition de réunion"
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> souhaite être intégré à une réunion existante."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Update"
 msgstr "Mise à jour de la réunion"
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1203
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> souhaite recevoir les informations de la dernière réunion."
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1204
 msgid "Meeting Update Request"
 msgstr "Demande de mise à jour de la réunion"
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> a répondu à une demande de réunion."
 
-#: calendar/gui/e-itip-control.c:1213
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Reply"
 msgstr "Réponse à une réunion"
 
-#: calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1219
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> a annulé une réunion."
 
-#: calendar/gui/e-itip-control.c:1221
+#: calendar/gui/e-itip-control.c:1220
 msgid "Meeting Cancellation"
 msgstr "Annulation de réunion"
 
-#: calendar/gui/e-itip-control.c:1228 calendar/gui/e-itip-control.c:1296
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1330
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> a envoyé un message incompréhensible."
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1228
 msgid "Bad Meeting Message"
 msgstr "Mauvais message de réunion"
 
-#: calendar/gui/e-itip-control.c:1254
+#: calendar/gui/e-itip-control.c:1253
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> a publié les informations de la tâche."
 
-#: calendar/gui/e-itip-control.c:1255
+#: calendar/gui/e-itip-control.c:1254
 msgid "Task Information"
 msgstr "Informations de la tâche"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1259
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> demande à %s d'exécuter une tâche."
 
-#: calendar/gui/e-itip-control.c:1262
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> vous demande d'exécuter une tâche."
 
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1262
 msgid "Task Proposal"
 msgstr "Tâche proposée"
 
-#: calendar/gui/e-itip-control.c:1267
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> souhaite être intégré à une tâche existante."
 
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Update"
 msgstr "Mise à jour de tâche"
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1271
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> souhaite recevoir les informations de la dernière tâche."
 
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1272
 msgid "Task Update Request"
 msgstr "Demande de mise à jour de tâche"
 
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> a répondu à une assignation de tâche."
 
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Reply"
 msgstr "Réponse à une tâche"
 
-#: calendar/gui/e-itip-control.c:1288
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> a annulé une tâche."
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1288
 msgid "Task Cancellation"
 msgstr "Annulation de tâche"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1296
 msgid "Bad Task Message"
 msgstr "Mauvais message de tâche"
 
-#: calendar/gui/e-itip-control.c:1316
+#: calendar/gui/e-itip-control.c:1315
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> a publié une information Libre-Occupé."
 
-#: calendar/gui/e-itip-control.c:1317
+#: calendar/gui/e-itip-control.c:1316
 msgid "Free/Busy Information"
 msgstr "Information Libre-Occupé"
 
-#: calendar/gui/e-itip-control.c:1321
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> demande votre information Libre/Occupé."
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1321
 msgid "Free/Busy Request"
 msgstr "Demande Libre-Occupé"
 
-#: calendar/gui/e-itip-control.c:1326
+#: calendar/gui/e-itip-control.c:1325
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> a répondu à une demande Libre/Occupé."
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1326
 msgid "Free/Busy Reply"
 msgstr "Réponse Libre-Occupé"
 
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1331
 msgid "Bad Free/Busy Message"
 msgstr "Mauvais message Libre-Occupé"
 
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1406
 msgid "The message does not appear to be properly formed"
 msgstr "Le message ne semble pas être correctement rempli."
 
-#: calendar/gui/e-itip-control.c:1466
+#: calendar/gui/e-itip-control.c:1465
 msgid "The message contains only unsupported requests."
 msgstr "Le message ne contient que des requêtes non-supportées."
 
-#: calendar/gui/e-itip-control.c:1497
+#: calendar/gui/e-itip-control.c:1496
 msgid "The attachment does not contain a valid calendar message"
 msgstr "La pièce jointe ne contient pas d'information de calendrier valide."
 
-#: calendar/gui/e-itip-control.c:1529
+#: calendar/gui/e-itip-control.c:1528
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 "La pièce jointe ne contient pas d'information de calendrier visualisable."
 
-#: calendar/gui/e-itip-control.c:1763
+#: calendar/gui/e-itip-control.c:1762
 msgid "Update complete\n"
 msgstr "Mise à jour terminée\n"
 
-#: calendar/gui/e-itip-control.c:1793 calendar/gui/e-itip-control.c:1865
+#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Le statut du participant ne peut être mis à jour car l'entrée n'existe plus"
 
-#: calendar/gui/e-itip-control.c:1809 calendar/gui/e-itip-control.c:1847
+#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
 msgid "Object is invalid and cannot be updated\n"
 msgstr "L'objet n'est pas valide et ne peut être mis à jour\n"
 
-#: calendar/gui/e-itip-control.c:1819
+#: calendar/gui/e-itip-control.c:1818
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Cette réponse ne provient pas d'un participant. L'ajouter comme participant ?"
 
-#: calendar/gui/e-itip-control.c:1831
+#: calendar/gui/e-itip-control.c:1830
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Le statut du participant n'a pas pu être mis à jour à cause d'un statut non "
 "valide !\n"
 
-#: calendar/gui/e-itip-control.c:1850
+#: calendar/gui/e-itip-control.c:1849
 msgid "There was an error on the CORBA system\n"
 msgstr "Il y a eu une erreur dans le système CORBA.\n"
 
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1852
 msgid "Object could not be found\n"
 msgstr "Impossible de trouver l'objet.\n"
 
-#: calendar/gui/e-itip-control.c:1856
+#: calendar/gui/e-itip-control.c:1855
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr ""
 "Vous n'avez pas les permissions nécessaires pour mettre à jour le "
 "calendrier\n"
 
-#: calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1858
 msgid "Attendee status updated\n"
 msgstr "Statut du participant mis à jour\n"
 
-#: calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1861
 msgid "Attendee status could not be updated!\n"
 msgstr "Impossible de mettre à jour le statut du participant !\n"
 
-#: calendar/gui/e-itip-control.c:1893
+#: calendar/gui/e-itip-control.c:1892
 msgid "Removal Complete"
 msgstr "Effacement Terminé"
 
-#: calendar/gui/e-itip-control.c:1916 calendar/gui/e-itip-control.c:1964
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
 msgid "Item sent!\n"
 msgstr "Élément envoyé !\n"
 
-#: calendar/gui/e-itip-control.c:1918 calendar/gui/e-itip-control.c:1968
+#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
 msgid "The item could not be sent!\n"
 msgstr "Impossible d'envoyer l'élément !\n"
 
@@ -6275,74 +6162,74 @@ msgstr "date de fin"
 msgid "date-start"
 msgstr "date de début"
 
-#: calendar/gui/e-meeting-list-view.c:62
+#: calendar/gui/e-meeting-list-view.c:59
 msgid "Chair Persons"
 msgstr "Présidents"
 
-#: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:480
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
 msgid "Required Participants"
 msgstr "Participants attendus"
 
-#: calendar/gui/e-meeting-list-view.c:64
+#: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Participants optionnels"
 
-#: calendar/gui/e-meeting-list-view.c:65
+#: calendar/gui/e-meeting-list-view.c:62
 msgid "Resources"
 msgstr "Ressources"
 
-#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
 #: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr "Individuel"
 
-#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "Groupe"
 
-#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr "Ressource"
 
-#: calendar/gui/e-meeting-list-view.c:144 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr "Salle"
 
-#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr "Président"
 
-#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:127
 #: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
 msgid "Required Participant"
 msgstr "Participant attendu"
 
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr "Participant optionnel"
 
-#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr "Non participant"
 
-#: calendar/gui/e-meeting-list-view.c:180 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:177
 #: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
 msgid "Needs Action"
 msgstr "Nécessite une action."
 
-#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
 #: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "Provisoire"
 
-#: calendar/gui/e-meeting-list-view.c:184 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr "Délégué"
@@ -6359,20 +6246,28 @@ msgstr "Absent du bureau"
 msgid "No Information"
 msgstr "Aucune information"
 
+#: calendar/gui/e-meeting-time-sel.c:417
+#, fuzzy
+msgid "Add attendees from addressbook"
+msgstr "Ajouter l'expéditeur au _carnet d'adresses"
+
 #: calendar/gui/e-meeting-time-sel.c:440
 msgid "_Options"
 msgstr "_Options"
 
 #: calendar/gui/e-meeting-time-sel.c:457
-msgid "Show _Only Working Hours"
+#, fuzzy
+msgid "Show _only working hours"
 msgstr "Afficher _seulement les heures de travail"
 
 #: calendar/gui/e-meeting-time-sel.c:467
-msgid "Show _Zoomed Out"
+#, fuzzy
+msgid "Show _zoomed out"
 msgstr "Afficher _Zoomé arrière"
 
 #: calendar/gui/e-meeting-time-sel.c:482
-msgid "_Update Free/Busy"
+#, fuzzy
+msgid "_Update free/busy"
 msgstr "_Mettre à jour Libre/Occupé"
 
 #: calendar/gui/e-meeting-time-sel.c:497
@@ -6388,19 +6283,23 @@ msgid ">_>"
 msgstr ">_>"
 
 #: calendar/gui/e-meeting-time-sel.c:547
-msgid "_All People and Resources"
+#, fuzzy
+msgid "_All people and resources"
 msgstr "_Toutes les personnes et ressources"
 
 #: calendar/gui/e-meeting-time-sel.c:556
-msgid "All _People and One Resource"
+#, fuzzy
+msgid "All _people and one resource"
 msgstr "Toutes les _personnes et une ressource"
 
 #: calendar/gui/e-meeting-time-sel.c:565
-msgid "_Required People"
+#, fuzzy
+msgid "_Required people"
 msgstr "Personnes atte_ndues"
 
 #: calendar/gui/e-meeting-time-sel.c:574
-msgid "Required People and _One Resource"
+#, fuzzy
+msgid "Required people and _one resource"
 msgstr "Personnes attendues et _une ressource"
 
 #: calendar/gui/e-meeting-time-sel.c:593
@@ -6420,10 +6319,6 @@ msgstr "%A %d %B %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#. This is a strftime() format string %a = abbreviated weekday
-#. name, %m = month number, %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. strftime format of a weekday and a date.
 #: calendar/gui/e-meeting-time-sel.c:2093
 #: calendar/gui/e-meeting-time-sel-item.c:456 e-util/e-time-utils.c:203
 #: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
@@ -6432,10 +6327,6 @@ msgstr "%a %d/%m/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. This is the preferred date format for the locale.
-#. This is a strftime() format for a short date. %m = month,
-#. %d = day of month, %Y = year (all digits).
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
 #: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
 msgid "%m/%d/%Y"
@@ -6446,7 +6337,7 @@ msgstr "%d/%m/%Y"
 msgid "Enter the password for %s"
 msgstr "Saisissez le mot de passe pour %s"
 
-#: calendar/gui/e-tasks.c:585 calendar/gui/gnome-cal.c:2020
+#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6457,12 +6348,12 @@ msgstr ""
 
 #. FIXME Loading should be async
 #. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:680
+#: calendar/gui/e-tasks.c:801
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Ouverture des tâches à %s"
 
-#: calendar/gui/e-tasks.c:703
+#: calendar/gui/e-tasks.c:824
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6471,26 +6362,26 @@ msgstr ""
 "Erreur d'ouverture de %s :\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:724
+#: calendar/gui/e-tasks.c:845
 msgid "Loading tasks"
 msgstr "Chargement des tâches"
 
-#: calendar/gui/e-tasks.c:828
+#: calendar/gui/e-tasks.c:949
 msgid "Completing tasks..."
 msgstr "Achèvement des tâches..."
 
-#: calendar/gui/e-tasks.c:851
+#: calendar/gui/e-tasks.c:972
 msgid "Deleting selected objects..."
 msgstr "Suppression des objets sélectionnés..."
 
-#: calendar/gui/e-tasks.c:878
+#: calendar/gui/e-tasks.c:999
 msgid "Expunging"
 msgstr "Nettoyage"
 
-#: calendar/gui/e-tasks.c:954
+#: calendar/gui/e-tasks.c:1075
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
-#: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
+#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
+#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
 #: calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:705
 msgid "Tasks"
@@ -6712,7 +6603,7 @@ msgid "On The Web"
 msgstr "Sur internet"
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 
@@ -6723,7 +6614,7 @@ msgid "Unable to migrate calendar `%s'"
 msgstr "Impossible d'ouvrir le calendrier « %s »."
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:869
+#: calendar/gui/migration.c:889
 #, fuzzy, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Impossible d'ouvrir les tâches dans '%s'."
@@ -6959,73 +6850,73 @@ msgstr "Imprimer l'élément"
 msgid "Print Setup"
 msgstr "Configuration de l'impression"
 
-#: calendar/gui/tasks-component.c:303
+#: calendar/gui/tasks-component.c:313
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 "La liste de tâches « %s » va être supprimée. Êtes-vous sûr de vouloir "
 "continuer ?"
 
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:371
 msgid "New Task List"
 msgstr "Nouvelle liste de tâches"
 
-#: calendar/gui/tasks-component.c:398
+#: calendar/gui/tasks-component.c:408
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d tâche"
 msgstr[1] "%d tâches"
 
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:488
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", %d sélectionné"
 msgstr[1] ", %d sélectionnés"
 
-#: calendar/gui/tasks-component.c:447
+#: calendar/gui/tasks-component.c:457
 msgid "Failed upgrading tasks."
 msgstr "La mise à jour des tâches a échoué."
 
-#: calendar/gui/tasks-component.c:526
+#: calendar/gui/tasks-component.c:749
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 "Impossible d'ouvrir la liste de tâches « %s » pour créer des événements et "
 "des réunions"
 
-#: calendar/gui/tasks-component.c:538
+#: calendar/gui/tasks-component.c:761
 msgid "There is no calendar available for creating tasks"
 msgstr "Il n'y a pas de calendrier disponible pour créer des tâches"
 
-#: calendar/gui/tasks-component.c:576
+#: calendar/gui/tasks-component.c:799
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:804
+#: calendar/gui/tasks-component.c:1040
 msgid "New task"
 msgstr "Nouvelle tâche"
 
-#: calendar/gui/tasks-component.c:805
+#: calendar/gui/tasks-component.c:1041
 msgid "_Task"
 msgstr "_Tâche"
 
-#: calendar/gui/tasks-component.c:806
+#: calendar/gui/tasks-component.c:1042
 msgid "Create a new task"
 msgstr "Créer une nouvelle tâche"
 
-#: calendar/gui/tasks-component.c:812
+#: calendar/gui/tasks-component.c:1048
 msgid "New tasks group"
 msgstr "Nouveau groupe de tâches"
 
-#: calendar/gui/tasks-component.c:813
+#: calendar/gui/tasks-component.c:1049
 msgid "_Tasks Group"
 msgstr "_Groupe de tâches"
 
-#: calendar/gui/tasks-component.c:814
+#: calendar/gui/tasks-component.c:1050
 msgid "Create a new tasks group"
 msgstr "Créer un nouveau groupe de tâches"
 
@@ -8856,17 +8747,17 @@ msgstr ""
 msgid "(match-threads) requires a match type string"
 msgstr ""
 
-#: camel/camel-folder-search.c:785
+#: camel/camel-folder-search.c:784
 #, fuzzy
 msgid "(match-threads) expects an array result"
 msgstr "(compare tout) demande un unique résultat booléen."
 
-#: camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:790
 #, fuzzy
 msgid "(match-threads) requires the folder set"
 msgstr "(compare tout) demande un unique résultat booléen."
 
-#: camel/camel-folder-search.c:880
+#: camel/camel-folder-search.c:879
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Interrogation sur un en-tête inconnu : %s"
@@ -8901,7 +8792,8 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
 #: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:705
+#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Annulé."
@@ -9705,11 +9597,11 @@ msgstr "Impossible de supprimer le dossier : %s : opération non valide"
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Impossible de renommer le dossier : %s : opération non valide"
 
-#: camel/camel-store.c:809
+#: camel/camel-store.c:777
 msgid "Trash"
 msgstr "Corbeille"
 
-#: camel/camel-store.c:811 mail/mail-config.glade.h:95
+#: camel/camel-store.c:779 mail/mail-config.glade.h:95
 #: ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Spam"
@@ -10177,7 +10069,7 @@ msgstr "Service IMAP pour %s sur %s"
 #: camel/providers/imap/camel-imap-store.c:551
 #: camel/providers/imap/camel-imap-store.c:571
 #: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
+#: camel/providers/nntp/camel-nntp-store.c:209
 #: camel/providers/pop3/camel-pop3-store.c:175
 #: camel/providers/smtp/camel-smtp-transport.c:269
 #: camel/providers/smtp/camel-smtp-transport.c:285
@@ -10196,8 +10088,8 @@ msgstr "SSL non disponible"
 #: camel/providers/imap/camel-imap-store.c:568
 #: camel/providers/imap/camel-imap-store.c:845
 #: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:137
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
 #: camel/providers/pop3/camel-pop3-store.c:192
 msgid "Connection cancelled"
 msgstr "Connexion annulée"
@@ -10220,7 +10112,7 @@ msgstr "La connexion au serveur IMAP %s en mode sécurisé a échoué : %s"
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1142
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
@@ -10335,12 +10227,12 @@ msgstr "Serveur déconnecté de manière inattendue : %s"
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3197
+#: camel/providers/imap/camel-imap-store.c:3194
 msgid "Operation cancelled"
 msgstr "Opération annulée"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3200
+#: camel/providers/imap/camel-imap-store.c:3197
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Serveur déconnecté de manière inattendue : %s"
@@ -10421,7 +10313,7 @@ msgstr "Aucun message correspondant"
 
 #: camel/providers/imap/camel-imap-folder.c:2019
 #: camel/providers/imap/camel-imap-folder.c:2622
-#: camel/providers/nntp/camel-nntp-folder.c:238
+#: camel/providers/nntp/camel-nntp-folder.c:220
 msgid "This message is not currently available"
 msgstr "Ce message n'est pas disponible."
 
@@ -11133,7 +11025,7 @@ msgstr ""
 "Le dossier est peut-être corrompu, copie enregistrée dans « %s »"
 
 #: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:992
+#: camel/providers/nntp/camel-nntp-store.c:1126
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Veuillez saisir le mot de passe NNTP pour %s@%s"
@@ -11150,18 +11042,10 @@ msgstr "L'envoi du nom d'utilisateur au serveur a échoué"
 msgid "Server rejected username/password"
 msgstr "Le serveur a rejeté le nom d'utilisateur/mot de passe"
 
-#: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:263
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr "Opération annulée"
-
-#: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:259
-#: camel/providers/nntp/camel-nntp-folder.c:265
+#: camel/providers/nntp/camel-nntp-folder.c:147
+#: camel/providers/nntp/camel-nntp-folder.c:149
+#: camel/providers/nntp/camel-nntp-folder.c:158
+#: camel/providers/nntp/camel-nntp-folder.c:234
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11170,64 +11054,50 @@ msgstr "Opération annulée"
 msgid "Cannot get message %s: %s"
 msgstr "Impossible d'obtenir le message : %s : %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:188
-#: camel/providers/nntp/camel-nntp-folder.c:228
+#: camel/providers/nntp/camel-nntp-folder.c:156
+#: camel/providers/nntp/camel-nntp-folder.c:232
+#: camel/providers/nntp/camel-nntp-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+msgid "User cancelled"
+msgstr "Opération annulée"
+
+#: camel/providers/nntp/camel-nntp-folder.c:176
+#: camel/providers/nntp/camel-nntp-folder.c:208
 #, c-format
 msgid "Internal error: uid in invalid format: %s"
 msgstr "Erreur interne : format d'uid non valide : %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:201
-#, c-format
-msgid "Could not get article %s from NNTP server"
-msgstr "Impossible d'obtenir l'article %s du serveur NNTP"
-
-#: camel/providers/nntp/camel-nntp-folder.c:362
-msgid "Posting not allowed by news server"
-msgstr "Les publications ne sont pas autorisées par le serveur de nouvelles"
-
+#: camel/providers/nntp/camel-nntp-folder.c:328
+#: camel/providers/nntp/camel-nntp-folder.c:331
 #: camel/providers/nntp/camel-nntp-folder.c:373
-#, c-format
-msgid "Failed to send newsgroups header: %s: message not posted"
-msgstr ""
-"L'envoi des en-têtes de groupes de discussion a échoué : %s : message non "
-"posté"
-
-#: camel/providers/nntp/camel-nntp-folder.c:413
-#: camel/providers/nntp/camel-nntp-folder.c:426
-#, c-format
-msgid "Error posting to newsgroup: %s: message not posted"
-msgstr ""
-"Erreur lors de l'envoi au groupe de discussion : %s : message non posté"
-
-#: camel/providers/nntp/camel-nntp-folder.c:438
-msgid "Error reading response to posted message: message not posted"
-msgstr "Erreur de lecture de la réponse au message posté : message non posté"
-
-#: camel/providers/nntp/camel-nntp-folder.c:441
-#, c-format
-msgid "Error posting message: %s: message not posted"
-msgstr "Erreur lors de l'envoi du message : %s : message non posté"
+#: camel/providers/nntp/camel-nntp-folder.c:375
+#, fuzzy, c-format
+msgid "Posting failed: %s"
+msgstr "Opération échouée : %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:457
+#: camel/providers/nntp/camel-nntp-folder.c:393
 msgid "You cannot post NNTP messages while working offline!"
 msgstr ""
 "Vous ne pouver poster des messages NNTP pendant que vous êtes hors-ligne !"
 
-#: camel/providers/nntp/camel-nntp-folder.c:468
+#: camel/providers/nntp/camel-nntp-folder.c:404
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Vous ne pouvez copier des message à partir d'un dossier NNTP !"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:44
 msgid "Could not get group list from server."
 msgstr "Impossible d'obtenir la liste des groupes à partir du serveur."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#: camel/providers/nntp/camel-nntp-grouplist.c:97
+#: camel/providers/nntp/camel-nntp-grouplist.c:106
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "Impossible de charger la liste des groupes pour %s : %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#: camel/providers/nntp/camel-nntp-grouplist.c:157
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr ""
@@ -11263,26 +11133,29 @@ msgstr ""
 "Cette option utilisera un mot de passe en clair pour l'authentification au "
 "serveur NNTP."
 
-#: camel/providers/nntp/camel-nntp-store.c:158
+#: camel/providers/nntp/camel-nntp-store.c:118
+#: camel/providers/nntp/camel-nntp-store.c:1233
+#: camel/providers/nntp/camel-nntp-store.c:1331
+#, c-format
+msgid "NNTP Command failed: %s"
+msgstr "Échec de la commande NNTP : %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:227
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Impossible de lire les salutations de %s : %s."
 
-#: camel/providers/nntp/camel-nntp-store.c:170
+#: camel/providers/nntp/camel-nntp-store.c:239
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "Le serveur NNTP %s a retourné un code d'erreur %d : %s."
 
-#: camel/providers/nntp/camel-nntp-store.c:326
+#: camel/providers/nntp/camel-nntp-store.c:403
 #, c-format
 msgid "USENET News via %s"
 msgstr "Nouvelles USENET via %s."
 
-#: camel/providers/nntp/camel-nntp-store.c:635
-msgid "Stream error"
-msgstr "Erreur de flux"
-
-#: camel/providers/nntp/camel-nntp-store.c:638
+#: camel/providers/nntp/camel-nntp-store.c:777
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -11293,7 +11166,7 @@ msgstr ""
 "\n"
 " %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:730
+#: camel/providers/nntp/camel-nntp-store.c:872
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
@@ -11304,7 +11177,7 @@ msgstr ""
 "Groupe de discussion non trouvé. L'élément sélectionné est probablement un "
 "dossier parent."
 
-#: camel/providers/nntp/camel-nntp-store.c:762
+#: camel/providers/nntp/camel-nntp-store.c:904
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
@@ -11314,63 +11187,66 @@ msgstr ""
 "\n"
 "le groupe de discussion n'existe pas !"
 
-#: camel/providers/nntp/camel-nntp-store.c:787
+#: camel/providers/nntp/camel-nntp-store.c:929
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 "Impossible de créer un dossier dans un emplacement de nouvelles : abonnez-"
 "vous à la place."
 
-#: camel/providers/nntp/camel-nntp-store.c:795
+#: camel/providers/nntp/camel-nntp-store.c:937
 msgid "You cannot rename a folder in a News store."
 msgstr "Impossible de renommer un dossier dans un emplacement de nouvelles."
 
-#: camel/providers/nntp/camel-nntp-store.c:803
+#: camel/providers/nntp/camel-nntp-store.c:945
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 "Impossible de supprimer un dossier dans un emplacement de nouvelles : "
 "désabonnez-vous à la place."
 
-#: camel/providers/nntp/camel-nntp-summary.c:253
-#, c-format
-msgid "Connection error: %s"
-msgstr "Erreur de connexion : %s"
-
-#: camel/providers/nntp/camel-nntp-summary.c:262
-#, c-format
-msgid "No such folder: %s"
-msgstr "Dossier non trouvé : %s"
+#: camel/providers/nntp/camel-nntp-store.c:1118
+#, fuzzy
+msgid "Authentication requested but not username provided"
+msgstr "Authentification requise"
 
-#: camel/providers/nntp/camel-nntp-summary.c:268
-#, c-format
-msgid "Could not get group: %s"
-msgstr "Impossible d'obtenir le groupe : %s"
+#: camel/providers/nntp/camel-nntp-store.c:1146
+#, fuzzy, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr ""
+"Impossible de authentifier sur le serveur IMAP.\n"
+"%s\n"
+"\n"
 
-#: camel/providers/nntp/camel-nntp-summary.c:333
+#: camel/providers/nntp/camel-nntp-store.c:1262
 #, fuzzy
-msgid "Could not get messages: unspecified error"
-msgstr "Impossible de recevoir les messages : erreur non spécifiée"
+msgid "Not connected."
+msgstr "Aucun contact"
 
-#: camel/providers/nntp/camel-nntp-summary.c:378
+#: camel/providers/nntp/camel-nntp-store.c:1311
 #, c-format
-msgid "NNTP Command failed: %s"
-msgstr "Échec de la commande NNTP : %s"
+msgid "No such folder: %s"
+msgstr "Dossier non trouvé : %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:438
-#: camel/providers/nntp/camel-nntp-summary.c:543
+#: camel/providers/nntp/camel-nntp-summary.c:218
+#: camel/providers/nntp/camel-nntp-summary.c:314
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s : examen des nouveaux messages"
 
-#: camel/providers/nntp/camel-nntp-summary.c:558
-#, c-format
-msgid "Unknown server response: %s"
-msgstr "Réponse du serveur inconnue : %s"
+#: camel/providers/nntp/camel-nntp-summary.c:225
+#, fuzzy, c-format
+msgid "Unexpected server response from xover: %s"
+msgstr "Réponse inattendue du serveur IMAP : %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:328
+#, fuzzy, c-format
+msgid "Unexpected server response from head: %s"
+msgstr "Réponse inattendue de GnuPG : %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:605
+#: camel/providers/nntp/camel-nntp-summary.c:368
 msgid "Use cancel"
 msgstr "Utilisez annuler"
 
-#: camel/providers/nntp/camel-nntp-summary.c:607
+#: camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Opération échouée : %s"
@@ -12087,17 +11963,17 @@ msgstr "Joindre des fichiers"
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
+msgid "You cannot attach the file `{0}' to this message."
 msgstr "Joindre un fichier au message"
 
 #. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4
-msgid "${1}"
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
 msgstr ""
 
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
 
 #. mail-composer:attach-directory primary
@@ -12191,7 +12067,7 @@ msgstr "Impossible de créer le tube : %s."
 
 #. mail-composer:no-build-message secondary
 #: composer/mail-composer-errors.xml.h:34
-msgid "Because \"${0}\", you may need to select different mail options."
+msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
@@ -12201,8 +12077,10 @@ msgid "Could not read signature file \"{0}\"."
 msgstr "Impossible d'enregistrer le fichier de signature : %s."
 
 #. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38
-msgid "Because \"${1}\"."
+#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted primary
@@ -12368,16 +12246,12 @@ msgstr "Synchroniser les catégories"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
 #: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M:%p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
 #: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M"
@@ -12429,31 +12303,23 @@ msgid "%m/%d/%Y %H"
 msgstr "%d/%m/%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#. strftime format of a time in 12-hour format.
 #: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#. strftime format of a time in 24-hour format.
 #: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
 #: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
 #: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
 msgid "%H:%M"
@@ -12553,7 +12419,6 @@ msgid "Missing file name."
 msgstr "_Nom distinctif :"
 
 #. filter:no-file secondary
-#. filter:bad-file secondary
 #: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
 msgid "You must specify a file name."
 msgstr "Vous devez indiquer un nom de fichier."
@@ -12589,7 +12454,6 @@ msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
 #. filter:no-name primary
-#. filter:no-name-vfolder primary
 #: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
 #, fuzzy
 msgid "Missing name."
@@ -12622,6 +12486,7 @@ msgstr ""
 msgid "No sources selected."
 msgstr "Aucun serveur n'a été sélectionné."
 
+#. filter:vfolder-no-source secondary
 #: filter/filter-errors.xml.h:36
 msgid ""
 "You must specify at least one folder as a source.\n"
@@ -12904,13 +12769,13 @@ msgstr "Signatures"
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Message transféré --------"
 
-#: mail/em-composer-utils.c:1499
+#: mail/em-composer-utils.c:1495
 msgid "an unknown sender"
 msgstr "Un expéditeur inconnu"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1509
+#: mail/em-composer-utils.c:1505
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "Le %a, %d/%m/%Y à %H:%M %%+05d, %%s a écrit :"
 
@@ -12948,8 +12813,8 @@ msgstr "<cliquez ici pour sélectionner un dossier>"
 msgid "Create New Folder"
 msgstr "Créer un nouveau dossier"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2263
-#: mail/mail-component.c:692
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
+#: mail/mail-component.c:704
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Précisez où créer le dossier >"
@@ -12997,8 +12862,8 @@ msgstr "_Copier vers le dossier"
 msgid "_Move to Folder"
 msgstr "_Déplacer vers le dossier"
 
-#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2050
-#: mail/em-folder-tree.c:2531 mail/em-folder-view.c:798
+#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
+#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
 #: mail/message-list.c:1651
 msgid "_Move"
 msgstr "_Déplacer"
@@ -13008,56 +12873,56 @@ msgstr "_Déplacer"
 msgid "Cancel _Drag"
 msgstr "Annuler la tâche"
 
-#: mail/em-folder-tree.c:2037 mail/em-folder-tree.c:2050
+#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
 #: mail/em-folder-view.c:798 mail/em-folder-view.c:812
 #: mail/importers/evolution-mbox-importer.c:119
 #: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Sélectionnez un dossier"
 
-#: mail/em-folder-tree.c:2037 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
 #, fuzzy
 msgid "C_opy"
 msgstr "Copier"
 
-#: mail/em-folder-tree.c:2077
+#: mail/em-folder-tree.c:2088
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Stockage du dossier « %s »"
 
-#: mail/em-folder-tree.c:2263 mail/mail-component.c:692
+#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
 msgid "Create folder"
 msgstr "Créer un dossier"
 
-#: mail/em-folder-tree.c:2452
+#: mail/em-folder-tree.c:2463
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Renommer le dossier « %s » en :"
 
-#: mail/em-folder-tree.c:2454
+#: mail/em-folder-tree.c:2465
 msgid "Rename Folder"
 msgstr "Renommer le dossier"
 
-#: mail/em-folder-tree.c:2525 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "Afficha_ge"
 
-#: mail/em-folder-tree.c:2526
+#: mail/em-folder-tree.c:2537
 msgid "Open in _New Window"
 msgstr "Ouvrir dans une _nouvelle fenêtre"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2535
+#: mail/em-folder-tree.c:2546
 msgid "_New Folder..."
 msgstr "_Nouveau dossier..."
 
-#: mail/em-folder-tree.c:2538
+#: mail/em-folder-tree.c:2549
 msgid "_Rename"
 msgstr "_Renommer"
 
-#: mail/em-folder-tree.c:2541 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Propriétés..."
 
@@ -13082,8 +12947,8 @@ msgstr "Chargement..."
 
 #: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
 #: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:496
-#: mail/mail-component.c:542
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
+#: mail/mail-component.c:554
 msgid "Mail"
 msgstr "Courrier"
 
@@ -13264,7 +13129,7 @@ msgstr "Bcc"
 
 #: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
 #: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1079
+#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
 msgid "Subject"
 msgstr "Objet"
 
@@ -13473,7 +13338,7 @@ msgstr ""
 "vraiment difficile, pour un extérieur, de voir le contenu de ce message dans "
 "une période de temps raisonnable."
 
-#: mail/em-format-html-display.c:757
+#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
 msgid "_View Certificate"
 msgstr "_Voir le certificat"
 
@@ -14484,69 +14349,69 @@ msgstr "Liste de diffusion %s"
 msgid "Add Filter Rule"
 msgstr "Ajouter une règle de filtre"
 
-#: mail/mail-component.c:449
+#: mail/mail-component.c:461
 #, c-format
 msgid "%d deleted"
 msgstr "%d supprimé"
 
-#: mail/mail-component.c:451
+#: mail/mail-component.c:463
 #, c-format
 msgid "%d junk"
 msgstr ""
 
-#: mail/mail-component.c:474
+#: mail/mail-component.c:486
 #, fuzzy, c-format
 msgid "%d drafts"
 msgstr "%d jour"
 
-#: mail/mail-component.c:476
+#: mail/mail-component.c:488
 #, fuzzy, c-format
 msgid "%d sent"
 msgstr "%d seconde"
 
-#: mail/mail-component.c:478
+#: mail/mail-component.c:490
 #, fuzzy, c-format
 msgid "%d unsent"
 msgstr "%d seconde"
 
-#: mail/mail-component.c:482
+#: mail/mail-component.c:494
 #, fuzzy, c-format
 msgid "%d total"
 msgstr "%d contact"
 
-#: mail/mail-component.c:484
+#: mail/mail-component.c:496
 #, c-format
 msgid ", %d unread"
 msgstr ""
 
-#: mail/mail-component.c:644
+#: mail/mail-component.c:656
 msgid "New Mail Message"
 msgstr "Nouveau message"
 
-#: mail/mail-component.c:645
+#: mail/mail-component.c:657
 msgid "_Mail Message"
 msgstr "_Message"
 
-#: mail/mail-component.c:646
+#: mail/mail-component.c:658
 msgid "Compose a new mail message"
 msgstr "Composer un nouveau message"
 
-#: mail/mail-component.c:652
+#: mail/mail-component.c:664
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Nouveau dossier virtuel"
 
-#: mail/mail-component.c:653
+#: mail/mail-component.c:665
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Filtres de courrier"
 
-#: mail/mail-component.c:654
+#: mail/mail-component.c:666
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Créer un nouveau calendrier"
 
-#: mail/mail-component.c:786
+#: mail/mail-component.c:798
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
@@ -15296,6 +15161,7 @@ msgstr ""
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "Êtes-vous sûr de vouloir supprimer cette URL ?"
 
+#. mail:ask-send-html secondary
 #: mail/mail-errors.xml.h:12
 #, fuzzy
 msgid ""
@@ -15330,7 +15196,6 @@ msgid ""
 msgstr ""
 
 #. mail:ask-send-only-bcc-contact primary
-#. mail:ask-send-only-bcc primary
 #: mail/mail-errors.xml.h:22 mail/mail-errors.xml.h:29
 #, fuzzy
 msgid "Are you sure you want to send a message with only BCC recipients?"
@@ -15338,6 +15203,7 @@ msgstr ""
 "Demander lors de l'envoi de messages où seuls des destinataires sans To ou "
 "Cc définis."
 
+#. mail:ask-send-only-bcc-contact secondary
 #: mail/mail-errors.xml.h:24
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
@@ -15400,7 +15266,6 @@ msgid ""
 msgstr "Supprimer définitivement les messages effacés de ce dossier"
 
 #. mail:ask-expunge secondary
-#. mail:ask-empty-trash secondary
 #: mail/mail-errors.xml.h:45 mail/mail-errors.xml.h:50
 msgid "If you continue, you will not be able to recover these messages."
 msgstr ""
@@ -15442,6 +15307,7 @@ msgstr ""
 msgid "Your message with the subject \"{0}\" was not delivered."
 msgstr ""
 
+#. mail:camel-exception secondary
 #: mail/mail-errors.xml.h:59
 msgid ""
 "The message was sent via the \"sendmail\" external application.  Sendmail "
@@ -15477,13 +15343,6 @@ msgid "{0}."
 msgstr ""
 
 #. mail:session-message-info secondary
-#. mail:session-message-info-cancel secondary
-#. mail:session-message-warning secondary
-#. mail:session-message-warning-cancel secondary
-#. mail:session-message-error secondary
-#. mail:session-message-error-cancel secondary
-#. mail:ask-session-password secondary
-#. mail:filter-load-error secondary
 #: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
 #: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
 #: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
@@ -15511,14 +15370,7 @@ msgstr ""
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Impossible de créer le répertoire « %s » : %s."
 
-#. mail:no-save-path secondary
-#: mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail:no-create-path primary
-#. mail:no-write-path-exists primary
-#. mail:no-write-path-notfile primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
 #, fuzzy
@@ -15539,15 +15391,6 @@ msgstr "Impossible de créer le répertoire « %s » : %s."
 msgid "Cannot create temporary save directory."
 msgstr "Impossible de créer de répertoire temporaire : %s."
 
-#. mail:no-create-tmp-path secondary
-#. mail:no-delete-folder secondary
-#. system:no-save-file secondary
-#. system:no-load-file secondary
-#: mail/mail-errors.xml.h:100 mail/mail-errors.xml.h:112
-#: widgets/misc/e-system-errors.xml.h:11 widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail:no-write-path-exists secondary
 #: mail/mail-errors.xml.h:104
 #, fuzzy
@@ -15573,7 +15416,6 @@ msgid "Cannot delete system folder \"{0}\"."
 msgstr "Impossible de supprimer le dossier local « %s »."
 
 #. mail:no-delete-spethal-folder secondary
-#. mail:no-rename-spethal-folder secondary
 #: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
@@ -15606,13 +15448,11 @@ msgid ""
 msgstr ""
 
 #. mail:no-rename-folder-exists primary
-#. mail:no-rename-folder primary
 #: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr ""
 
 #. mail:no-rename-folder-exists secondary
-#. mail:vfolder-notunique secondary
 #: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
 #, fuzzy
 msgid "A folder named \"{1}\" already exists. Please use a different name."
@@ -15625,27 +15465,23 @@ msgid "Because \"{2}\"."
 msgstr ""
 
 #. mail:no-move-folder-nostore primary
-#. mail:no-move-folder-to-nostore primary
 #: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr ""
 
 #. mail:no-move-folder-nostore secondary
-#. mail:no-copy-folder-nostore secondary
 #: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
 #, fuzzy
 msgid "Cannot open source \"{2}\"."
 msgstr "Impossible d'ouvrir la source"
 
 #. mail:no-move-folder-to-nostore secondary
-#. mail:no-copy-folder-to-nostore secondary
 #: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
 #, fuzzy
 msgid "Cannot open target \"{2}\"."
 msgstr "Impossible d'ouvrir le message."
 
 #. mail:no-copy-folder-nostore primary
-#. mail:no-copy-folder-to-nostore primary
 #: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr ""
@@ -15663,7 +15499,6 @@ msgid "Cannot open source \"{1}\""
 msgstr "Impossible d'ouvrir la source"
 
 #. mail:account-incomplete primary
-#. mail:account-notunique primary
 #: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
 msgid "Cannot save changes to account."
 msgstr ""
@@ -15768,6 +15603,7 @@ msgstr ""
 msgid "vFolders automatically updated."
 msgstr ""
 
+#. mail:vfolder-updated secondary
 #: mail/mail-errors.xml.h:196
 #, fuzzy
 msgid ""
@@ -15787,6 +15623,7 @@ msgstr ""
 msgid "Mail filters automatically updated."
 msgstr ""
 
+#. mail:filter-updated secondary
 #: mail/mail-errors.xml.h:204
 #, fuzzy
 msgid ""
@@ -15806,6 +15643,7 @@ msgstr ""
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
+#. mail:ask-migrate-existing secondary
 #: mail/mail-errors.xml.h:212
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
@@ -16378,44 +16216,48 @@ msgstr ""
 "l'utilisation hors-ligne"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid "Toolbar is visible"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Whether Evolution should start up in offline mode"
 msgstr "Si Evolution doit démarrer dans le mode hors-ligne"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Whether the toolbar should be visible."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
 msgid "Whether to skip the development warning dialog"
 msgstr "S'il faut sauter les dialogues d'avertissement de développement"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
+#: shell/apps_evolution_shell.schemas.in.in.h:14
 msgid "mail"
 msgstr "courrier électronique"
 
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
-msgstr "Mis à votre disposition par"
-
-#: shell/e-shell.c:579 shell/e-shell.c:580
+#: shell/e-shell.c:588 shell/e-shell.c:589
 #, fuzzy, c-format
 msgid "%ld KB"
 msgstr "%d %B"
 
-#: shell/e-shell.c:777
+#: shell/e-shell.c:786
 #, fuzzy
 msgid "Uknown system error."
 msgstr "Erreur inconnue"
 
-#: shell/e-shell.c:1134
+#: shell/e-shell.c:1143
 msgid "Invalid arguments"
 msgstr "Arguments non valides"
 
-#: shell/e-shell.c:1136
+#: shell/e-shell.c:1145
 msgid "Cannot register on OAF"
 msgstr "Impossible d'enregistrer dans OAF."
 
-#: shell/e-shell.c:1138
+#: shell/e-shell.c:1147
 msgid "Configuration Database not found"
 msgstr "Base de données de configuration non trouvée"
 
-#: shell/e-shell.c:1140
+#: shell/e-shell.c:1149
 msgid "Generic error"
 msgstr "Erreur générique"
 
@@ -16474,7 +16316,7 @@ msgstr ""
 msgid "Select importer"
 msgstr "Sélectionnez un assistant d'importation."
 
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1027
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
 #, c-format
 msgid "File %s does not exist"
 msgstr "Le fichier %s n'existe pas."
@@ -16502,32 +16344,32 @@ msgstr ""
 "Importation de %s\n"
 "Importation de l'élément 1."
 
-#: shell/e-shell-importer.c:549
+#: shell/e-shell-importer.c:570
 msgid "Automatic"
 msgstr "Automatique"
 
-#: shell/e-shell-importer.c:598
+#: shell/e-shell-importer.c:626
 #, fuzzy
 msgid "F_ilename:"
 msgstr "Nom du fichier :"
 
-#: shell/e-shell-importer.c:603
+#: shell/e-shell-importer.c:631
 msgid "Select a file"
 msgstr "Sélectionnez un fichier"
 
-#: shell/e-shell-importer.c:614
+#: shell/e-shell-importer.c:642
 msgid "File _type:"
 msgstr "_Type de fichier :"
 
-#: shell/e-shell-importer.c:653
+#: shell/e-shell-importer.c:681
 msgid "Import data and settings from _older programs"
 msgstr "Importer les données et paramètres d'_anciens programmes"
 
-#: shell/e-shell-importer.c:656
+#: shell/e-shell-importer.c:684
 msgid "Import a _single file"
 msgstr "Importer un _seul fichier"
 
-#: shell/e-shell-importer.c:724 shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -16535,25 +16377,25 @@ msgstr ""
 "Veuillez patienter...\n"
 "Recherche des paramétrages existants"
 
-#: shell/e-shell-importer.c:728
+#: shell/e-shell-importer.c:756
 msgid "Starting Intelligent Importers"
 msgstr "Lancement des assistants intelligents d'importation"
 
-#: shell/e-shell-importer.c:854 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
 #, c-format
 msgid "From %s:"
 msgstr "De %s :"
 
-#: shell/e-shell-importer.c:1045
+#: shell/e-shell-importer.c:1073
 #, c-format
 msgid "No importer available for file %s"
 msgstr "Aucun importateur disponible pour le fichier « %s »"
 
-#: shell/e-shell-importer.c:1057
+#: shell/e-shell-importer.c:1085
 msgid "Unable to execute importer"
 msgstr "Impossible d'exécuter l'importateur"
 
-#: shell/e-shell-importer.c:1170
+#: shell/e-shell-importer.c:1199
 msgid "_Import"
 msgstr "_Importer"
 
@@ -16603,61 +16445,61 @@ msgstr "Un nom de dossier ne peut pas contenir le caractère « # »"
 msgid "'.' and '..' are reserved folder names."
 msgstr " « . » et  « .. » sont réservés aux noms de dossiers."
 
-#: shell/e-shell-window.c:336
+#: shell/e-shell-window.c:337
 #, fuzzy
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution est en ligne. Cliquez sur ce bouton pour travailler hors "
 "ligne."
 
-#: shell/e-shell-window.c:343
+#: shell/e-shell-window.c:344
 #, fuzzy
 msgid "Evolution is in the process of going offline."
 msgstr "Ximian Evolution est en train de passer hors ligne."
 
-#: shell/e-shell-window.c:349
+#: shell/e-shell-window.c:350
 #, fuzzy
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution est hors ligne. Cliquez sur ce bouton pour travailler en "
 "ligne."
 
-#: shell/e-shell-window.c:621
+#: shell/e-shell-window.c:637
 #, fuzzy, c-format
 msgid "Switch to %s"
 msgstr "Courrier à %s"
 
-#: shell/e-shell-window-commands.c:64
+#: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Les outils du Gnome-Pilot ne semblent pas installés sur ce système."
 
-#: shell/e-shell-window-commands.c:72
+#: shell/e-shell-window-commands.c:74
 #, c-format
 msgid "Error executing %s."
 msgstr "Erreur à l'exécution de %s"
 
-#: shell/e-shell-window-commands.c:121
+#: shell/e-shell-window-commands.c:123
 msgid "Bug buddy is not installed."
 msgstr "Bug buddy n'est pas installé."
 
-#: shell/e-shell-window-commands.c:129
+#: shell/e-shell-window-commands.c:131
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy ne peut être exécuté."
 
-#: shell/e-shell-window-commands.c:171
+#: shell/e-shell-window-commands.c:323
 #, fuzzy
-msgid "About Evolution"
-msgstr "À propos de Ximian Evolution"
+msgid "Groupware Suite"
+msgstr "Groupwise"
 
-#: shell/e-shell-window-commands.c:382
+#: shell/e-shell-window-commands.c:563
 msgid "_Work Online"
 msgstr "Travail _en ligne"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "Travail _hors ligne"
 
-#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Travail hors ligne"
 
@@ -16843,8 +16685,9 @@ msgstr "Ne plus me demander"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution peut importer des données depuis les fichiers suivants :"
 
+#. Preview/Alpha/Beta version warning message
 #: shell/main.c:231
-#, fuzzy, c-format
+#, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
@@ -16935,6 +16778,7 @@ msgstr ""
 msgid "Insufficient disk space for upgrade."
 msgstr ""
 
+#. shell:upgrade-nospace secondary
 #: shell/shell-errors.xml.h:4
 msgid ""
 "Upgrading your data and settings will require upto {0} of disk space, but "
@@ -16944,12 +16788,14 @@ msgid ""
 "can continue."
 msgstr ""
 
+#. shell:upgrade-failed primary
 #: shell/shell-errors.xml.h:8
 msgid ""
 "Upgrade from previous version failed:\n"
 "{0}"
 msgstr ""
 
+#. shell:upgrade-failed secondary
 #: shell/shell-errors.xml.h:11
 msgid ""
 "{1}\n"
@@ -16964,19 +16810,18 @@ msgid "Continue"
 msgstr "Connexion en cours"
 
 #. shell:noshell title
-#. shell:noshell-reason title
 #: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
 #, fuzzy
 msgid "Cannot start Evolution"
 msgstr "Impossible d'accéder au shell de Ximian Evolution."
 
 #. shell:noshell primary
-#. shell:noshell-reason primary
 #: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
 #, fuzzy
 msgid "Evolution can not start."
 msgstr "Assistant de compte d'Evolution"
 
+#. shell:noshell secondary
 #: shell/shell-errors.xml.h:21
 msgid ""
 "Your system configuration does not match your Evolution configuration.\n"
@@ -16984,6 +16829,7 @@ msgid ""
 "Click help for details"
 msgstr ""
 
+#. shell:noshell-reason secondary
 #: shell/shell-errors.xml.h:29
 msgid ""
 "Your system configuration does not match your Evolution configuration:\n"
@@ -16993,30 +16839,30 @@ msgid ""
 "Click help for details."
 msgstr ""
 
-#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:522
+#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
+#: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
 msgstr "Sélectionnez un certificat à importer..."
 
-#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:604
+#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
+#: smime/gui/certificate-manager.c:638
 msgid "Certificate Name"
 msgstr "Nom de certificat"
 
-#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
+#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
 msgid "Purposes"
 msgstr "Sujets"
 
-#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:517
+#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr "Numéro de série"
 
-#: smime/gui/certificate-manager.c:267
+#: smime/gui/certificate-manager.c:271
 msgid "Expires"
 msgstr "Expire"
 
-#: smime/gui/certificate-manager.c:417
+#: smime/gui/certificate-manager.c:446
 msgid "E-Mail Address"
 msgstr "Adresse électronique"
 
@@ -17122,7 +16968,7 @@ msgstr ""
 "vous devriez vérifie son certificat et sa politique est ses procédures (si "
 "elles sont disponibles)."
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
 msgid "Certificate"
 msgstr "Certificat"
 
@@ -17142,19 +16988,23 @@ msgstr "Nom courant (NC)"
 msgid "Contact Certificates"
 msgstr "Contact des certicats"
 
-#: smime/gui/smime-ui.glade.h:21
-#, no-c-format
-msgid "Do you want to trust \"%s\" for the following purposes?"
-msgstr "Voulez-vous faire confiance à « %s » pour les besoins suivants ?"
+#: smime/gui/smime-ui.glade.h:20
+msgid "Do not trust the authenticity of this certificate"
+msgstr ""
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:21
 msgid "Dummy window only"
 msgstr "Fenêtre factice seulement"
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:22
 msgid "Edit"
 msgstr "Éditer"
 
+#: smime/gui/smime-ui.glade.h:23
+#, fuzzy
+msgid "Email Certificate Trust Settings"
+msgstr "Autorité de certification d'adresses électroniques"
+
 #: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr "Certificat du destinataire du courrier électronique"
@@ -17187,247 +17037,257 @@ msgstr "Unité d'organisation (UO)"
 msgid "SHA1 Fingerprint"
 msgstr "Empreinte numérique SHA1"
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr "Certificat SSL du client"
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr "Certificat SSL du serveur"
 
 #: smime/gui/smime-ui.glade.h:37
+msgid "Trust the authenticity of this certificate"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
 msgid "Trust this CA to identify email users."
 msgstr ""
 "Faire confiance à ce CA pour identifier les utilisateurs de courrier "
 "électronique."
 
-#: smime/gui/smime-ui.glade.h:38
+#: smime/gui/smime-ui.glade.h:39
 msgid "Trust this CA to identify software developers."
 msgstr "Faire confiance à ce CA pour identifier les développeurs de logiciel."
 
-#: smime/gui/smime-ui.glade.h:39
+#: smime/gui/smime-ui.glade.h:40
 msgid "Trust this CA to identify web sites."
 msgstr "Faire confiance à ce CA pour identifier les sites web."
 
-#: smime/gui/smime-ui.glade.h:40
+#: smime/gui/smime-ui.glade.h:41
 msgid "View"
 msgstr "Affichage"
 
-#: smime/gui/smime-ui.glade.h:41
-msgid "View Certificate"
-msgstr "Afficher le certificat"
-
 #: smime/gui/smime-ui.glade.h:42
-msgid "You have been asked to trust a new Certificate Authority (CA)."
-msgstr ""
-"On vous demande d'autoriser une nouvelle autoritée de certification (AC)."
-
-#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr "Vous avez des certificats de ces organisations qui vous identifient :"
 
-#: smime/gui/smime-ui.glade.h:44
+#: smime/gui/smime-ui.glade.h:43
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 "Vous avez des fichiers certificats qui identifient ces autoritées de "
 "certification :"
 
-#: smime/gui/smime-ui.glade.h:45
+#: smime/gui/smime-ui.glade.h:44
 msgid "You have certificates on file that identify these people:"
 msgstr "Vous avez des fichiers de certificats qui identifient ces personnes :"
 
-#: smime/gui/smime-ui.glade.h:46
+#: smime/gui/smime-ui.glade.h:45
 msgid "Your Certificates"
 msgstr "Vos certificats"
 
-#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
+#: smime/gui/smime-ui.glade.h:46
+msgid "_Edit CA Trust"
+msgstr ""
+
+#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
-#: smime/lib/e-cert.c:478
+#. x509 certificate usage types
+#: smime/lib/e-cert.c:424
+#, fuzzy
+msgid "Sign"
+msgstr "Signature"
+
+#: smime/lib/e-cert.c:425
+#, fuzzy
+msgid "Encrypt"
+msgstr "Chiffré"
+
+#: smime/lib/e-cert.c:530
 msgid "Version"
 msgstr "Version"
 
-#: smime/lib/e-cert.c:493
+#: smime/lib/e-cert.c:545
 msgid "Version 1"
 msgstr "Version 1"
 
-#: smime/lib/e-cert.c:496
+#: smime/lib/e-cert.c:548
 msgid "Version 2"
 msgstr "Version 2"
 
-#: smime/lib/e-cert.c:499
+#: smime/lib/e-cert.c:551
 msgid "Version 3"
 msgstr "Version 3"
 
-#: smime/lib/e-cert.c:581
+#: smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 avec chiffrage RSA"
 
-#: smime/lib/e-cert.c:584
+#: smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 avec chiffrage RSA"
 
-#: smime/lib/e-cert.c:587
+#: smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 avec chiffrage RSA"
 
-#: smime/lib/e-cert.c:590
+#: smime/lib/e-cert.c:642
 msgid "C"
 msgstr "C"
 
-#: smime/lib/e-cert.c:593
+#: smime/lib/e-cert.c:645
 msgid "CN"
 msgstr "CN"
 
-#: smime/lib/e-cert.c:596
+#: smime/lib/e-cert.c:648
 msgid "OU"
 msgstr "OU"
 
-#: smime/lib/e-cert.c:599
+#: smime/lib/e-cert.c:651
 msgid "O"
 msgstr "O"
 
-#: smime/lib/e-cert.c:602
+#: smime/lib/e-cert.c:654
 msgid "L"
 msgstr "L"
 
-#: smime/lib/e-cert.c:605
+#: smime/lib/e-cert.c:657
 msgid "DN"
 msgstr "DN"
 
-#: smime/lib/e-cert.c:608
+#: smime/lib/e-cert.c:660
 msgid "DC"
 msgstr "DC"
 
-#: smime/lib/e-cert.c:611
+#: smime/lib/e-cert.c:663
 msgid "ST"
 msgstr "ST"
 
-#: smime/lib/e-cert.c:614
+#: smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 chiffrage RSA"
 
-#: smime/lib/e-cert.c:617
+#: smime/lib/e-cert.c:669
 msgid "Certificate Key Usage"
 msgstr "Usage de la clé de certificat"
 
-#: smime/lib/e-cert.c:620
+#: smime/lib/e-cert.c:672
 msgid "Netscape Certificate Type"
 msgstr "Type de certification de Netscape"
 
-#: smime/lib/e-cert.c:623
+#: smime/lib/e-cert.c:675
 msgid "Certificate Authority Key Identifier"
 msgstr "Identifiant de la clé d'autoritée de certicat"
 
-#: smime/lib/e-cert.c:626
+#: smime/lib/e-cert.c:678
 msgid "UID"
 msgstr "UID"
 
-#: smime/lib/e-cert.c:635
+#: smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Identifiant de l'object (%s)"
 
-#: smime/lib/e-cert.c:686
+#: smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
 msgstr "Identifiant de l'algorithme"
 
-#: smime/lib/e-cert.c:694
+#: smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
 msgstr "Paramètres de l'algorithme"
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:768
 msgid "Subject Public Key Info"
 msgstr "Info sur la clé publique du sujet"
 
-#: smime/lib/e-cert.c:721
+#: smime/lib/e-cert.c:773
 msgid "Subject Public Key Algorithm"
 msgstr "Algorithme de la clé publique du sujet"
 
-#: smime/lib/e-cert.c:736
+#: smime/lib/e-cert.c:788
 msgid "Subject's Public Key"
 msgstr "L'objet de la clé publique"
 
-#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
+#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
 msgid "Error: Unable to process extension"
 msgstr "Erreur : Impossible de traiter l'extension"
 
-#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
+#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr "Signataire de l'objet"
 
-#: smime/lib/e-cert.c:782
+#: smime/lib/e-cert.c:834
 msgid "SSL Certificate Authority"
 msgstr "Autorité de certification SSL"
 
-#: smime/lib/e-cert.c:786
+#: smime/lib/e-cert.c:838
 msgid "Email Certificate Authority"
 msgstr "Autorité de certification d'adresses électroniques"
 
-#: smime/lib/e-cert.c:814
+#: smime/lib/e-cert.c:866
 msgid "Signing"
 msgstr "Signature"
 
-#: smime/lib/e-cert.c:818
+#: smime/lib/e-cert.c:870
 msgid "Non-repudiation"
 msgstr "Non-répudiation"
 
-#: smime/lib/e-cert.c:822
+#: smime/lib/e-cert.c:874
 msgid "Key Encipherment"
 msgstr "Clé de cryptage"
 
-#: smime/lib/e-cert.c:826
+#: smime/lib/e-cert.c:878
 msgid "Data Encipherment"
 msgstr "Cryptage des données"
 
-#: smime/lib/e-cert.c:830
+#: smime/lib/e-cert.c:882
 msgid "Key Agreement"
 msgstr "Accord de clé"
 
-#: smime/lib/e-cert.c:834
+#: smime/lib/e-cert.c:886
 msgid "Certificate Signer"
 msgstr "Signataire du certificat"
 
-#: smime/lib/e-cert.c:838
+#: smime/lib/e-cert.c:890
 msgid "CRL Signer"
 msgstr "Signataire de la liste de révocations de certificat"
 
-#: smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:938
 msgid "Critical"
 msgstr "Critique"
 
-#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
+#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
 msgid "Not Critical"
 msgstr "Non critique"
 
-#: smime/lib/e-cert.c:912
+#: smime/lib/e-cert.c:964
 msgid "Extensions"
 msgstr "Extensions"
 
-#: smime/lib/e-cert.c:983
+#: smime/lib/e-cert.c:1035
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
 msgid "Certificate Signature Algorithm"
 msgstr "Algorithme de signature de certificat"
 
-#: smime/lib/e-cert.c:1048
+#: smime/lib/e-cert.c:1100
 msgid "Issuer"
 msgstr "Émetteur"
 
-#: smime/lib/e-cert.c:1102
+#: smime/lib/e-cert.c:1154
 msgid "Issuer Unique ID"
 msgstr "ID unique de l'émetteur"
 
-#: smime/lib/e-cert.c:1121
+#: smime/lib/e-cert.c:1173
 msgid "Subject Unique ID"
 msgstr "ID unique de l'objet"
 
-#: smime/lib/e-cert.c:1164
+#: smime/lib/e-cert.c:1216
 msgid "Certificate Signature Value"
 msgstr "Valeur de la signature du certificat"
 
@@ -17579,7 +17439,7 @@ msgstr "Voir le contact actif"
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "_Actions"
 
@@ -17742,7 +17602,7 @@ msgstr "_Fermer"
 #: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:3
+#: ui/evolution.xml.h:4
 msgid "Close"
 msgstr "Fermer"
 
@@ -17755,7 +17615,7 @@ msgid "Delete this item"
 msgstr "Supprimer cet élément"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr "Barre d'outils principale"
 
@@ -17798,7 +17658,7 @@ msgstr "Enregistrer cet élément sur le disque"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:44
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "_File"
 msgstr "_Fichier"
 
@@ -18057,13 +17917,13 @@ msgstr "_Inverser la sélection"
 msgid "_Threaded Message List"
 msgstr "_Liste des messages par fil de discussion"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Ferme cette fenetre"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "_Close"
 msgstr "_Fermer"
 
@@ -18464,7 +18324,7 @@ msgstr "Message _précédent"
 msgid "_Quoted"
 msgstr "_Cité"
 
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
 msgid "_Tools"
 msgstr "_Outils"
 
@@ -18761,108 +18621,122 @@ msgid "_Open Task"
 msgstr "_Ouvrir une tâche"
 
 #: ui/evolution.xml.h:1
-msgid "About Ximian Evolution..."
-msgstr "À propos de Ximian Evolution..."
+#, fuzzy
+msgid "About Evolution..."
+msgstr "À propos de Ximian Evolution"
 
 #: ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
 msgstr "Changer les paramètres d'Evolution"
 
-#: ui/evolution.xml.h:5
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the visibility of the toolbar"
+msgstr "Modifier les propriétés de ce dossier"
+
+#: ui/evolution.xml.h:6
 #, fuzzy
 msgid "Create a new window displaying this folder"
 msgstr "Créer un nouveau calendrier"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "_Quitter"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "_FAQ Ximian Evolution"
+
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Quitte le programme"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:10
 msgid "Forget _Passwords"
 msgstr "Oublier les _mots de passe"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:11
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Oublier les mots de passe mémorisés, ils seront demandés à nouveau"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:12
 msgid "Import data from other programs"
 msgstr "Importer les données d'autres programmes"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:14
 #, fuzzy
 msgid "New _Window"
 msgstr "_Fenêtre"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Pi_lot Settings..."
 msgstr "Paramètres du Pi_lot..."
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Send / Receive"
 msgstr "Envoyer / Recevoir"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Send queued items and retrieve new items"
 msgstr "Envoyer les éléments en attente et récupérer les nouveaux"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Set up Pilot configuration"
 msgstr "Configuration du Pilot"
 
-#: ui/evolution.xml.h:17
-msgid "Show information about Ximian Evolution"
+#: ui/evolution.xml.h:19
+#, fuzzy
+msgid "Show information about Evolution"
 msgstr "Afficher les informations concernant Ximian Evolution"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:20
 msgid "Submit Bug Report"
 msgstr "Soumettre un rapport d'anomalies"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:21
 msgid "Submit _Bug Report"
 msgstr "Soumettre un _rapport d'anomalies"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Soumettre un rapport d'anomalies en utilisant Bug Buddy."
 
-#: ui/evolution.xml.h:21
-msgid "Toggle whether we are working offline."
-msgstr "Commuter si travail Hors ligne"
-
 #: ui/evolution.xml.h:23
-msgid "Ximian Evolution _FAQ"
-msgstr "_FAQ Ximian Evolution"
+#, fuzzy
+msgid "T_oolbar"
+msgstr "Barre d'outils principale"
 
 #: ui/evolution.xml.h:24
-msgid "_About Ximian Evolution..."
-msgstr "À _propos de Ximian Evolution..."
+msgid "Toggle whether we are working offline."
+msgstr "Commuter si travail Hors ligne"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "_About Evolution..."
+msgstr "À propos de Ximian Evolution"
+
+#: ui/evolution.xml.h:30
 msgid "_Help"
 msgstr "_Aide"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "_Import..."
 msgstr "_Importer..."
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "_New"
 msgstr "_Nouveau"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "_Quick Reference"
 msgstr "_Référence rapide"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_Send / Receive"
 msgstr "_Envoyer / recevoir"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 #, fuzzy
 msgid "_Window"
 msgstr "_Fenêtre"
@@ -19276,6 +19150,153 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% effectué)"
 
+#~ msgid "  S_how Supported Bases "
+#~ msgstr "  Affic_her les bases dupportées"
+
+#~ msgid "1:00"
+#~ msgstr "1:00"
+
+#~ msgid "5:00"
+#~ msgstr "5:00"
+
+#~ msgid "Connecting"
+#~ msgstr "Connexion en cours"
+
+#~ msgid "Distinguished _name:"
+#~ msgstr "_Nom distinctif :"
+
+#~ msgid "Email address:"
+#~ msgstr "Adresse électronique :"
+
+#~ msgid "Evolution will use this DN to authenticate you with the server"
+#~ msgstr "Evolution utilisera ce DN pour vous authentifier sur le serveur."
+
+#~ msgid "One"
+#~ msgstr "Un"
+
+#~ msgid "S_earch scope: "
+#~ msgstr "Domain_e de recherche : "
+
+#~ msgid "Searching"
+#~ msgstr "Recherche"
+
+#~ msgid "Sub"
+#~ msgstr "Sous"
+
+#~ msgid "This option controls how long a search will be run."
+#~ msgstr "Cette option indique le temps d'exécution d'une requête. "
+
+#~ msgid "U_se SSL/TLS:"
+#~ msgstr "Utili_ser SSL/TLS :"
+
+#~ msgid "_Display name:"
+#~ msgstr "_Nom d'affichage :"
+
+#~ msgid "_Port number:"
+#~ msgstr "_Numéro de port :"
+
+#~ msgid "_Search base:"
+#~ msgstr "Ba_se de la recherche :"
+
+#~ msgid "_Server name:"
+#~ msgstr "Nom du _serveur :"
+
+#~ msgid "_Timeout (minutes):"
+#~ msgstr "_Temps d'attente maximum (minutes) :"
+
+#~ msgid "connecting-tab"
+#~ msgstr "Connexion"
+
+#~ msgid "general-tab"
+#~ msgstr "Général"
+
+#~ msgid "searching-tab"
+#~ msgstr "Recherche"
+
+#~ msgid "Webcam:"
+#~ msgstr "Webcam :"
+
+#~ msgid "item7"
+#~ msgstr "item7"
+
+#~ msgid "item8"
+#~ msgstr "item8"
+
+#~ msgid "Calendar Properties"
+#~ msgstr "Propriétés du calendrier"
+
+#~ msgid "Remote"
+#~ msgstr "Distant"
+
+#~ msgid "Task List Properties"
+#~ msgstr "Propriétés de la liste des tâches"
+
+#~ msgid "_Refresh Interval:"
+#~ msgstr "Intervalle de _rafraîchissement :"
+
+#~ msgid "_Source URL:"
+#~ msgstr "_Source URL :"
+
+#~ msgid "_Invite Others..."
+#~ msgstr "_Inviter d'autres personnes..."
+
+#~ msgid "Could not get article %s from NNTP server"
+#~ msgstr "Impossible d'obtenir l'article %s du serveur NNTP"
+
+#~ msgid "Posting not allowed by news server"
+#~ msgstr "Les publications ne sont pas autorisées par le serveur de nouvelles"
+
+#~ msgid "Failed to send newsgroups header: %s: message not posted"
+#~ msgstr ""
+#~ "L'envoi des en-têtes de groupes de discussion a échoué : %s : message non "
+#~ "posté"
+
+#~ msgid "Error posting to newsgroup: %s: message not posted"
+#~ msgstr ""
+#~ "Erreur lors de l'envoi au groupe de discussion : %s : message non posté"
+
+#~ msgid "Error reading response to posted message: message not posted"
+#~ msgstr ""
+#~ "Erreur de lecture de la réponse au message posté : message non posté"
+
+#~ msgid "Error posting message: %s: message not posted"
+#~ msgstr "Erreur lors de l'envoi du message : %s : message non posté"
+
+#~ msgid "Stream error"
+#~ msgstr "Erreur de flux"
+
+#~ msgid "Connection error: %s"
+#~ msgstr "Erreur de connexion : %s"
+
+#~ msgid "Could not get group: %s"
+#~ msgstr "Impossible d'obtenir le groupe : %s"
+
+#, fuzzy
+#~ msgid "Could not get messages: unspecified error"
+#~ msgstr "Impossible de recevoir les messages : erreur non spécifiée"
+
+#~ msgid "Unknown server response: %s"
+#~ msgstr "Réponse du serveur inconnue : %s"
+
+#~ msgid "Brought to you by"
+#~ msgstr "Mis à votre disposition par"
+
+#~ msgid "Do you want to trust \"%s\" for the following purposes?"
+#~ msgstr "Voulez-vous faire confiance à « %s » pour les besoins suivants ?"
+
+#~ msgid "View Certificate"
+#~ msgstr "Afficher le certificat"
+
+#~ msgid "You have been asked to trust a new Certificate Authority (CA)."
+#~ msgstr ""
+#~ "On vous demande d'autoriser une nouvelle autoritée de certification (AC)."
+
+#~ msgid "About Ximian Evolution..."
+#~ msgstr "À propos de Ximian Evolution..."
+
+#~ msgid "_About Ximian Evolution..."
+#~ msgstr "À _propos de Ximian Evolution..."
+
 #~ msgid "Failed to connect to LDAP server"
 #~ msgstr "La connexion au serveur LDAP a échoué"
 
@@ -20142,9 +20163,6 @@ msgstr "%s (%d%% effectué)"
 #~ msgid "Primary _email:"
 #~ msgstr "Adresse él_ectronique principale :"
 
-#~ msgid "S_pouse:"
-#~ msgstr "_Conjoint(e) :"
-
 #~ msgid "_Business:"
 #~ msgstr "Tra_vail :"
 
@@ -20160,9 +20178,6 @@ msgstr "%s (%d%% effectué)"
 #~ msgid "_Mobile:"
 #~ msgstr "_Portable :"
 
-#~ msgid "_Office:"
-#~ msgstr "_Bureau :"
-
 #~ msgid "_Public Calendar URL:"
 #~ msgstr "URL du calendrier _public :"
 
diff --git a/po/ga.po b/po/ga.po
index 45263b950c..62031ca29c 100755
--- a/po/ga.po
+++ b/po/ga.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution HEAD\n"
-"POT-Creation-Date: 2004-05-19 14:00-0400\n"
+"POT-Creation-Date: 2004-06-03 11:14-0400\n"
 "PO-Revision-Date: 2004-03-21 21:56+0000\n"
 "Last-Translator: Alastair McKinstry <mckinstry@computer.org>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
@@ -61,13 +61,13 @@ msgstr "1 carta"
 msgid "Default Sync Address:"
 msgstr "Seoladh Shionc. Loicthe:"
 
-#: addressbook/conduit/address-conduit.c:1150
 #: addressbook/conduit/address-conduit.c:1151
+#: addressbook/conduit/address-conduit.c:1152
 msgid "Could not load addressbook"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:1219
-#: addressbook/conduit/address-conduit.c:1222
+#: addressbook/conduit/address-conduit.c:1220
+#: addressbook/conduit/address-conduit.c:1223
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
@@ -75,13 +75,13 @@ msgstr ""
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
 msgid "Failed to authenticate.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sPasfhocal do %s, le do thoil (úsáideoir %s)"
@@ -125,51 +125,23 @@ msgstr "_Tadhallaí"
 msgid "Create a new contacts group"
 msgstr "Cruthaigh tadhall nua"
 
-#: addressbook/gui/component/addressbook-component.c:182
+#: addressbook/gui/component/addressbook-component.c:184
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:483
-msgid "Failed to connect to LDAP server"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:507
-msgid "Failed to authenticate with LDAP server"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:535
-msgid "Could not perform query on Root DSE"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:840
-msgid "The server responded with no supported search bases"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1245
-msgid "This server does not support LDAPv3 schema information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1266
-msgid "Error retrieving schema information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1274
-msgid "Server did not respond with valid schema information"
-msgstr ""
-
 #: addressbook/gui/component/addressbook-migrate.c:68
-#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1160
 msgid "Migrating..."
 msgstr ""
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1201
 #, c-format
 msgid "Migrating `%s':"
 msgstr ""
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:438
+#: addressbook/gui/component/addressbook-migrate.c:464
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
 #: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
@@ -177,28 +149,28 @@ msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:446
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
-#: mail/mail-config.glade.h:106
+#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
+#: mail/mail-config.glade.h:109
 msgid "Personal"
 msgstr ""
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:454
+#: addressbook/gui/component/addressbook-migrate.c:480
 msgid "On LDAP Servers"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:582
+#: addressbook/gui/component/addressbook-migrate.c:608
 msgid "LDAP Servers"
 msgstr "Freastalaí LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:702
+#: addressbook/gui/component/addressbook-migrate.c:728
 msgid "Autocompletion Settings"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1076
+#: addressbook/gui/component/addressbook-migrate.c:1104
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -206,60 +178,55 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1090
+#: addressbook/gui/component/addressbook-migrate.c:1118
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1099
+#: addressbook/gui/component/addressbook-migrate.c:1127
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1109
+#: addressbook/gui/component/addressbook-migrate.c:1137
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:674
+#: addressbook/gui/component/addressbook-view.c:675
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:761
+#: addressbook/gui/component/addressbook-view.c:754
 #, fuzzy
 msgid "New Address Book"
 msgstr "Leabhar Seoladh Nua"
 
-#: addressbook/gui/component/addressbook-view.c:762
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
+#: addressbook/gui/component/addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Dealaigh"
 
-#: addressbook/gui/component/addressbook-view.c:763
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-view.c:756
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Álbachtaí..."
 
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/addressbook-view.c:1002
+#. Create the contacts group
+#: addressbook/gui/component/addressbook-view.c:995
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
 #: calendar/gui/migration.c:373
 msgid "Contacts"
 msgstr "Tadhallaí"
@@ -336,10 +303,6 @@ msgid "Manage your S/MIME certificates here"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-msgid "  S_how Supported Bases "
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -354,77 +317,69 @@ msgstr ""
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1:00"
-msgstr "1:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
-msgstr "5:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "Údarú"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
 #, fuzzy
 msgid "<b>Display</b>"
 msgstr "Taispeán"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 #, fuzzy
 msgid "<b>Downloading</b>"
 msgstr "<b>_Áit</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:10
 #, fuzzy
 msgid "<b>Searching</b>"
 msgstr "<b>Am</b> "
 
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
 msgid "<b>Server Information</b>"
 msgstr "Ceim 2: Eolas Freastalaí"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
 msgid "<b>Type:</b>"
 msgstr "<b>Am</b> "
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:13
 #, fuzzy
 msgid "Add Contacts Group"
 msgstr "_Tadhallaí"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:14
 #, fuzzy
 msgid "Address Book Properties"
 msgstr "Roghnachais na Leabhar Sheoladh"
@@ -434,312 +389,250 @@ msgstr "Roghnachais na Leabhar Sheoladh"
 # ## 	The 'msgid' names and spellings for languages are those listed
 # ##     in iso-639.def from glibc
 # aa 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
-#: mail/mail-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
+#: mail/mail-config.glade.h:42
 msgid "Always"
 msgstr "i gCónaí"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr "Gan ainm"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:17
 #: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Gnáth"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
-msgid "Connecting"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 #: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Sonraí"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
-msgid "Distinguished _name:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Email address"
 msgstr "Seoladh Rphost:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "Email address:"
-msgstr "Seoladh Rphost:"
-
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "Evolution will use this DN to authenticate you with the server"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid ""
-"Evolution will use this email address to authenticate you with the server"
+"Evolution will use this email address to authenticate you with the server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Find Possible Search Bases"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:31
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:24
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
+#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Gnáth"
 
-#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
-#: mail/mail-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
+#: mail/mail-config.glade.h:102
 msgid "Never"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:33
-msgid "One"
-msgstr "Aon"
-
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:35
-msgid "S_earch scope: "
-msgstr ""
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Search _base:"
+msgstr "Cuardaigh"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
 msgid "Search base only"
 msgstr "Cuardaigh"
 
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:29
 #, fuzzy
 msgid "Search base:"
 msgstr "Cuardaigh"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Search scope:"
 msgstr "Cuardaigh"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
-msgid "Searching"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:31
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
-"server if\n"
-"your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL or TLS."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a \n"
-"insecure environment. For example, if you and your LDAP server are behind a "
-"firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection "
-"is already\n"
-"secure."
+"you are in a insecure environment. For example, if you and your LDAP server "
+"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
+"because your connection is already secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
-"TLS.  This \n"
-"means that your connection will be insecure, and that you will be vulnerable "
-"to security\n"
-"exploits. "
+"TLS.  This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Sub"
-msgstr "Fó"
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
-"searches will \n"
-"begin. If you leave this blank, the search will begin at the root of the "
-"directory tree."
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
-"the \n"
-"directory tree. A search scope of \"sub\" will include all entries below "
-"your search base.\n"
-"A search scope of \"one\" will only include the entries one level beneath "
-"your base.\n"
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:58
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
-"This is the maximum number of entries to download. Setting this number to "
-"be \n"
+"This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:41
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
-"list.\n"
-"It is for display purposes only. "
+"list. It is for display purposes only. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. "
-"A \n"
-"list of standard ports has been provided. Ask your system administrator\n"
-"what port you should specify."
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:67
-msgid "This option controls how long a search will be run."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:43
 #, fuzzy
 msgid "Timeout:"
 msgstr "Am"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
-msgid "U_se SSL/TLS:"
-msgstr "Ú_sáid SSL/TLS:"
-
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr "Ag Úsáid seoladh r-post:"
 
-#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
-#: mail/mail-config.glade.h:154
+#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
+#: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:47
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "_Tadhallaí"
 
-#: addressbook/gui/component/ldap-config.glade.h:74
-#: calendar/gui/dialogs/calendar-setup.glade.h:12
-msgid "_Display name:"
-msgstr "Ainm _taispeáint:"
-
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
 msgid "_Email address:"
 msgstr "Seoladh Rphost:"
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:50
+msgid "_Find Possible Search Bases"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "_Log in:"
+msgstr "Logann"
+
+#: addressbook/gui/component/ldap-config.glade.h:53
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
 msgid "_Name:"
 msgstr "_Ainm:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
-msgid "_Port number:"
-msgstr "Uimhir _Poirt:"
-
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "_Port:"
 msgstr "Tosaíocht:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
-msgid "_Search base:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:82
-msgid "_Server name:"
-msgstr "Ainm _Freastalaí:"
+#: addressbook/gui/component/ldap-config.glade.h:55
+#, fuzzy
+msgid "_Search scope:"
+msgstr "Cuardaigh"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:56
 #, fuzzy
 msgid "_Server:"
 msgstr "_Freastalaí:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
-msgid "_Timeout (minutes):"
-msgstr ""
+#: addressbook/gui/component/ldap-config.glade.h:57
+#, fuzzy
+msgid "_Timeout:"
+msgstr "Am"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:58
 msgid "_Use secure connection:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "cartaí"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
-msgid "connecting-tab"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:88
-msgid "general-tab"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:60
 #: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
-#: mail/mail-config.glade.h:182
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "noimeaíd"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
-msgid "searching-tab"
-msgstr ""
-
-#: addressbook/gui/component/select-names/e-select-names.c:497
+#: addressbook/gui/component/select-names/e-select-names.c:503
 #: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid "Select Contacts from Address Book"
 msgstr "Roghnaigh Tadhallaí o Leabhar Seoladh"
 
-#: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
@@ -780,7 +673,7 @@ msgstr ""
 # Avoid; either use KR or KP
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:222
+#: addressbook/gui/widgets/e-addressbook-view.c:224
 msgid "Source"
 msgstr "Foinse"
 
@@ -853,9 +746,9 @@ msgid "<b>Work</b>"
 msgstr "<b>Seachtain Oibre</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
-#: addressbook/gui/widgets/eab-contact-display.c:342
-#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/widgets/eab-contact-display.c:334
+#: addressbook/gui/widgets/eab-contact-display.c:353
 msgid "AIM"
 msgstr ""
 
@@ -894,15 +787,15 @@ msgid "Company:"
 msgstr "Teoranta"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:271
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
+#: addressbook/gui/contact-editor/e-contact-editor.c:266
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
 msgstr "Tadhall"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1527
+#: addressbook/gui/contact-editor/e-contact-editor.c:520
 msgid "Contact Editor"
 msgstr ""
 
@@ -926,98 +819,95 @@ msgid "Full _Name..."
 msgstr "Ainm _Fhada..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:202
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-msgid "Home"
-msgstr "Baile"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #, fuzzy
 msgid "Home Page:"
 msgstr "Leathanach Baile"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-#, fuzzy
-msgid "Job title:"
-msgstr "Tideal _Post:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/e-itip-control.c:936
-msgid "Location:"
-msgstr "Áit:"
-
 # mt
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 #, fuzzy
 msgid "Mailing Address"
 msgstr "Seoladh R-Post:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 #, fuzzy
 msgid "Manager:"
 msgstr "Bainisteoir"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "_Leasainm:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Notes:"
 msgstr "_Notaí:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
-#: addressbook/gui/contact-editor/e-contact-editor.c:203
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-msgid "Other"
-msgstr "Eile"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#, fuzzy
+msgid "Office:"
+msgstr "_Oifig:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "PO Box:"
 msgstr "Bosca _Phoist:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 #, fuzzy
 msgid "Personal Information"
 msgstr "Gan Eolas"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 #, fuzzy
 msgid "Profession:"
 msgstr "_Dearbhú:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#, fuzzy
+msgid "Spouse:"
+msgstr "_Céile:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "State/Province:"
 msgstr "Seirbhís"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#, fuzzy
+msgid "Title:"
+msgstr "_Tidéal:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+msgid "Video Chat:"
+msgstr ""
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "Wants to receive HTML mail"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:42
 #, fuzzy
-msgid "Webcam:"
-msgstr "Leathanach Lín:"
+msgid "Web Log:"
+msgstr "Leathanach _Lín:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
-#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
-#: mail/mail-config.glade.h:155
+#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
+#: mail/mail-config.glade.h:157
 msgid "Work"
 msgstr "Obair"
 
@@ -1040,41 +930,34 @@ msgid "_File under:"
 msgstr "Ainm chomhaid:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 #, fuzzy
 msgid "_Where:"
 msgstr "_Freastalaí:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
-msgid "item7"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
-msgid "item8"
-msgstr ""
-
-#: addressbook/gui/contact-editor/eab-editor.c:316
+#: addressbook/gui/contact-editor/eab-editor.c:315
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/eab-editor.c:319
+#: addressbook/gui/contact-editor/eab-editor.c:318
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:351
-#: addressbook/gui/widgets/eab-contact-display.c:372
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Address"
 msgstr "Seoladh"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:292
+#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard.c:174
@@ -2265,88 +2148,111 @@ msgstr "An tSaimbia"
 msgid "Zimbabwe"
 msgstr "An tSiombáib"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/contact-editor/e-contact-editor.c:179
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:337
+#: addressbook/gui/widgets/eab-contact-display.c:356
 msgid "Jabber"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:347
-#: addressbook/gui/widgets/eab-contact-display.c:366
+#: addressbook/gui/contact-editor/e-contact-editor.c:180
+#: addressbook/gui/widgets/eab-contact-display.c:339
+#: addressbook/gui/widgets/eab-contact-display.c:358
 msgid "Yahoo"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: addressbook/gui/widgets/eab-contact-display.c:338
+#: addressbook/gui/widgets/eab-contact-display.c:357
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:344
-#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#: addressbook/gui/widgets/eab-contact-display.c:355
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/contact-editor/e-contact-editor.c:183
 #, fuzzy
 msgid "GroupWise"
 msgstr "Grupa"
 
+#: addressbook/gui/contact-editor/e-contact-editor.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+msgid "Home"
+msgstr "Baile"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+msgid "Other"
+msgstr "Eile"
+
 # Avoid; either use KR or KP
-#: addressbook/gui/contact-editor/e-contact-editor.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
 msgid "Source Book"
 msgstr "Leabhar Foinse"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:264
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:278
+#: addressbook/gui/contact-editor/e-contact-editor.c:273
 msgid "Is New Contact"
 msgstr "Is Tadhall Nua"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:285
+#: addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Writable Fields"
 msgstr ""
 
 # FR
-#: addressbook/gui/contact-editor/e-contact-editor.c:299
+#: addressbook/gui/contact-editor/e-contact-editor.c:294
 msgid "Changed"
 msgstr "Athraithe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
-msgid "Category editor not available."
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:2352
 msgid "This contact belongs to these categories:"
 msgstr ""
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#: addressbook/gui/contact-editor/e-contact-editor.c:2429
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Dealaigh na tadhallaí roghnaithe"
 
 # NE
-#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#: addressbook/gui/contact-editor/e-contact-editor.c:2433
 #, fuzzy
 msgid "No image"
 msgstr "An Nígir"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#: addressbook/gui/contact-editor/e-contact-editor.c:2636
 msgid ""
-"The following entries are invalid:\n"
+"The contact data is invalid:\n"
 "\n"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2738
-#, c-format
-msgid "Could not find widget for a field: `%s'"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#, fuzzy
+msgid "Invalid contact."
+msgstr "%d Tadhallaí"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+msgid ""
+"The contact cannot be saved to the selected address book. Do you want to "
+"discard changes?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2727
+#: addressbook/gui/contact-editor/e-contact-editor.c:2751
+msgid "_Discard"
+msgstr "_Caith uait"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+msgid ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:62
@@ -2380,7 +2286,7 @@ msgid "_Edit Full"
 msgstr "_Eagar Ainm Fhada"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:166
 msgid "_Full Name:"
 msgstr "Ainm _Fhada:"
 
@@ -2528,30 +2434,30 @@ msgstr "Ainm _Líosta:"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "contact-list-editor"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:153
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:215
+#: addressbook/gui/widgets/e-addressbook-view.c:217
 #: addressbook/gui/widgets/e-minicard-view.c:460
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Leabhar"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
 msgid "Is New List"
 msgstr "Is Líosta Nua"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:215
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
 msgid "Contact List Editor"
 msgstr "Eagarthôir Líosta Tadhall"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:438
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
 msgid "Save List as VCard"
 msgstr "Sábháil Lîosta mar VCard"
 
@@ -2594,126 +2500,126 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Cuardach Ardmód"
 
-#: addressbook/gui/widgets/eab-contact-display.c:129
-#: addressbook/gui/widgets/eab-contact-display.c:192
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:139
-#: addressbook/gui/widgets/eab-contact-display.c:205
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:257
-#: addressbook/gui/widgets/eab-contact-display.c:533
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:525
 msgid "List Members"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:329
-#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/eab-contact-display.c:321
+#: addressbook/gui/widgets/eab-contact-display.c:323
 msgid "E-mail"
 msgstr "R-phost"
 
-#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/eab-contact-display.c:332
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Eagrú"
 
-#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:333
 #, fuzzy
 msgid "Position"
 msgstr "sonraí"
 
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:354
 #, fuzzy
 msgid "Groupwise"
 msgstr "Grupa"
 
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:340
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:349
-#: addressbook/gui/widgets/eab-contact-display.c:370
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:362
 #, fuzzy
 msgid "Phone"
 msgstr "Fón Char"
 
-#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:342
 #, fuzzy
 msgid "Fax"
 msgstr "Facs Ghnó"
 
-#: addressbook/gui/widgets/eab-contact-display.c:354
+#: addressbook/gui/widgets/eab-contact-display.c:346
 #, fuzzy
 msgid "work"
 msgstr "Obair"
 
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:359
 msgid "WWW"
 msgstr ""
 
 # PE
-#: addressbook/gui/widgets/eab-contact-display.c:368
-#: addressbook/gui/widgets/eab-contact-display.c:587
+#: addressbook/gui/widgets/eab-contact-display.c:360
+#: addressbook/gui/widgets/eab-contact-display.c:579
 msgid "Blog"
 msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/eab-contact-display.c:363
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Fón Phóca"
 
-#: addressbook/gui/widgets/eab-contact-display.c:375
+#: addressbook/gui/widgets/eab-contact-display.c:367
 #, fuzzy
 msgid "personal"
 msgstr "Leagan"
 
-#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/eab-contact-display.c:374
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Nota"
 
-#: addressbook/gui/widgets/eab-contact-display.c:548
+#: addressbook/gui/widgets/eab-contact-display.c:540
 msgid "Job Title"
 msgstr "Tideal Post"
 
 # ta
-#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/eab-contact-display.c:544
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:774
+#: smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "Rpost"
 
-#: addressbook/gui/widgets/eab-contact-display.c:579
+#: addressbook/gui/widgets/eab-contact-display.c:571
 msgid "Home page"
 msgstr "Leathanach Baile"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 msgid "Success"
 msgstr ""
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Backend busy"
 msgstr ""
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Repository offline"
 msgstr ""
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 #, fuzzy
 msgid "Address Book does not exist"
 msgstr "Roghnachais na Leabhar Sheoladh"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 #, fuzzy
 msgid "No Self Contact defined"
 msgstr "Líosta Tadhall Nua"
@@ -2721,27 +2627,27 @@ msgstr "Líosta Tadhall Nua"
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Permission denied"
 msgstr ""
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Contact not found"
 msgstr ""
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Contact ID already exists"
 msgstr ""
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Protocol not supported"
 msgstr ""
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:60
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:233
 #: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
@@ -2754,68 +2660,64 @@ msgid "Cancelled"
 msgstr "Ceangailte"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:61
 #, fuzzy
 msgid "Could not cancel"
 msgstr "Teip ag oscailt '%s': %s"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Authentication Failed"
 msgstr ""
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Authentication Required"
 msgstr ""
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:66
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "TLS not Available"
 msgstr ""
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#: addressbook/gui/widgets/eab-gui-util.c:66
 #, fuzzy
 msgid "No such source"
 msgstr "Níl aon fillteán: %s"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:69
+#: addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Other error"
 msgstr "Earraidh Eile"
 
-#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:90
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:110
+#: addressbook/gui/widgets/eab-gui-util.c:97
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:102
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution you must compile the program from the CVS "
-"sources after retrieving OpenLDAP from the link below."
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:109
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "Unable to open addressbook"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:162
+#: addressbook/gui/widgets/eab-gui-util.c:129
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2823,7 +2725,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:168
+#: addressbook/gui/widgets/eab-gui-util.c:135
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -2831,110 +2733,97 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:174
+#: addressbook/gui/widgets/eab-gui-util.c:141
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:177
+#: addressbook/gui/widgets/eab-gui-util.c:144
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:147
 msgid "This query did not complete successfully."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
-msgid "Do you want to save changes?"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:208
-msgid "_Discard"
-msgstr "_Caith uait"
-
-#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:169
 msgid "Error adding list"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:229
-#: addressbook/gui/widgets/eab-gui-util.c:652
+#: addressbook/gui/widgets/eab-gui-util.c:169
+#: addressbook/gui/widgets/eab-gui-util.c:580
 msgid "Error adding contact"
 msgstr "Earraidh ag suimigh tadhall"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying list"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying contact"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:192
 msgid "Error removing list"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
-#: addressbook/gui/widgets/eab-gui-util.c:610
+#: addressbook/gui/widgets/eab-gui-util.c:192
+#: addressbook/gui/widgets/eab-gui-util.c:538
 msgid "Error removing contact"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:334
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:360
+#: addressbook/gui/widgets/eab-gui-util.c:300
 #, c-format
 msgid ""
 "%s already exists\n"
 "Do you want to overwrite it?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:364
+#: addressbook/gui/widgets/eab-gui-util.c:304
 msgid "Overwrite"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:400
-#, c-format
-msgid "Error saving %s: %s"
-msgstr "Earráid ag sábhháil %s: %s"
-
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:437
+#: addressbook/gui/widgets/eab-gui-util.c:365
 msgid "card.vcf"
 msgstr "carta.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:571
+#: addressbook/gui/widgets/eab-gui-util.c:499
 msgid "list"
 msgstr "líosta"
 
-#: addressbook/gui/widgets/eab-gui-util.c:706
+#: addressbook/gui/widgets/eab-gui-util.c:634
 msgid "Move contact to"
 msgstr "Bog tadhall go"
 
-#: addressbook/gui/widgets/eab-gui-util.c:708
+#: addressbook/gui/widgets/eab-gui-util.c:636
 msgid "Copy contact to"
 msgstr "Cóip tadhall go"
 
-#: addressbook/gui/widgets/eab-gui-util.c:711
+#: addressbook/gui/widgets/eab-gui-util.c:639
 msgid "Move contacts to"
 msgstr "Bog tadhallaí go"
 
-#: addressbook/gui/widgets/eab-gui-util.c:713
+#: addressbook/gui/widgets/eab-gui-util.c:641
 msgid "Copy contacts to"
 msgstr "Cóip tadhallaî go"
 
-#: addressbook/gui/widgets/eab-gui-util.c:716
+#: addressbook/gui/widgets/eab-gui-util.c:644
 #, fuzzy
 msgid "Select target addressbook."
 msgstr "Roghnaigh Tadhallaí o Leabhar Seoladh"
 
-#: addressbook/gui/widgets/eab-gui-util.c:939
+#: addressbook/gui/widgets/eab-gui-util.c:867
 msgid "Multiple VCards"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:942
+#: addressbook/gui/widgets/eab-gui-util.c:870
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard do %s"
@@ -3023,7 +2912,7 @@ msgstr[1] "%d Tadhallaí"
 # DE
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:229
+#: addressbook/gui/widgets/e-addressbook-view.c:231
 #: addressbook/gui/widgets/e-minicard-view.c:467
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
@@ -3041,144 +2930,136 @@ msgstr "Samhail"
 msgid "Error modifying card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:163
 msgid "Name begins with"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:164
 msgid "Email begins with"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:57
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr ""
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-#: calendar/gui/cal-search-bar.c:50
+#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+#: addressbook/gui/widgets/e-addressbook-view.c:172
 msgid "Advanced..."
 msgstr "Ardmód..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:236
+#: addressbook/gui/widgets/e-addressbook-view.c:238
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:249
+#: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Saghas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:506
+#: addressbook/gui/widgets/e-addressbook-view.c:508
 #, fuzzy
 msgid "Address Book"
 msgstr "Leabhar Seoladh:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2076
+#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:2080
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
 msgstr "Sábháil mar VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 msgid "New Contact..."
 msgstr "Tadhall Nua..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "New Contact List..."
 msgstr "Líosta Tadhall Nua..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Go to Folder..."
 msgstr "Téigh go dtí Fillteán..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Import..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1066
 msgid "Search for Contacts..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Leabhar Seoladh..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1069
 msgid "Pilot Settings..."
 msgstr "Albachtaí 'Pilot'..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
 msgid "Send Message to Contact"
 msgstr ""
 
 # fa 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Priontáil"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
+#: addressbook/gui/widgets/e-addressbook-view.c:1077
 msgid "Print Envelope"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
+#: addressbook/gui/widgets/e-addressbook-view.c:1081
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Leabhar Seoladh..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1080
+#: addressbook/gui/widgets/e-addressbook-view.c:1082
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Leabhar Seoladh..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Gearr"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Cóip"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1087
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Greamaigh"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:1092
+#: calendar/gui/e-calendar-view.c:1280
 msgid "Current View"
 msgstr "Amharc Reatha"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1309
-#, c-format
-msgid ""
-"The addressbook backend for\n"
-"%s\n"
-"has crashed. You will have to restart Evolution in order to use it again"
-msgstr ""
-
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1667
-#: calendar/gui/cal-search-bar.c:362
+#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr ""
 
@@ -3285,7 +3166,7 @@ msgstr "Raidio"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-list-view.c:234
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr ""
@@ -3424,12 +3305,12 @@ msgstr "Amharcóir Féilire Evolution"
 msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.c:998
+#: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr "Priontáil an tadhallaí seo"
 
-#: addressbook/printing/e-contact-print.c:1064
-#: addressbook/printing/e-contact-print.c:1091
+#: addressbook/printing/e-contact-print.c:1066
+#: addressbook/printing/e-contact-print.c:1093
 msgid "Print contact"
 msgstr "Priontáil an tadhall seo"
 
@@ -3676,14 +3557,19 @@ msgstr ""
 msgid "Impossible internal error."
 msgstr ""
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:629
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
 msgid "Can not open file"
 msgstr ""
 
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-msgid "Can not load URI"
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "Leabhar Sheoladh Evolution"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+msgid "failed to open book"
 msgstr ""
 
 #: addressbook/tools/evolution-addressbook-import.c:46
@@ -3702,7 +3588,7 @@ msgstr ""
 msgid "Unnamed List"
 msgstr "Líosta gan ainm"
 
-#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Pasfhocal, le do thoil"
@@ -3968,10 +3854,10 @@ msgid "Whether to show week numbers in date navigator"
 msgstr ""
 
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:88
-#: calendar/gui/gnome-cal.c:1703
-#: camel/providers/groupwise/camel-gw-listener.c:304
-#: camel/providers/groupwise/camel-gw-listener.c:327
+#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/gnome-cal.c:1705
+#: camel/providers/groupwise/camel-gw-listener.c:311
+#: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
 msgstr "Féilire"
 
@@ -3988,7 +3874,7 @@ msgstr ""
 
 #: calendar/gui/calendar-commands.c:363
 #: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:19 filter/filter.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
 msgid "days"
 msgstr "lae"
 
@@ -4133,24 +4019,24 @@ msgstr "Amharc Seachtain"
 msgid "Month View"
 msgstr "Amharc Mí"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:54
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:53
 #, fuzzy
 msgid "Location contains"
 msgstr "Áit"
 
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
 msgid "Unmatched"
 msgstr ""
 
@@ -4171,23 +4057,23 @@ msgstr ""
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/dialogs/alarm-options.c:466
+#: calendar/gui/dialogs/alarm-options.c:467
 msgid "Audio Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:475
+#: calendar/gui/dialogs/alarm-options.c:476
 msgid "Message Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:484
+#: calendar/gui/dialogs/alarm-options.c:485
 msgid "Email Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:493
+#: calendar/gui/dialogs/alarm-options.c:494
 msgid "Program Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:510
 msgid "Unknown Alarm Options"
 msgstr ""
 
@@ -4223,7 +4109,7 @@ msgstr ""
 msgid "With these arguments:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
 msgid "dialog1"
 msgstr ""
 
@@ -4233,7 +4119,7 @@ msgstr ""
 
 # xh
 #: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:20 filter/filter.glade.h:16
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr "uair"
 
@@ -4280,7 +4166,7 @@ msgstr "Post ríomhphost"
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Coimriú:"
 
@@ -4310,7 +4196,6 @@ msgid "hour(s)"
 msgstr "uair"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:21
 msgid "minute(s)"
 msgstr "noimea(i)d"
 
@@ -4318,26 +4203,26 @@ msgstr "noimea(i)d"
 msgid "start of appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:170
+#: calendar/gui/dialogs/calendar-setup.c:172
 msgid "You must specify a location to get the calendar from."
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:178
+#: calendar/gui/dialogs/calendar-setup.c:180
 #, c-format
 msgid "The source location '%s' is not well-formed."
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:193
+#: calendar/gui/dialogs/calendar-setup.c:195
 #, c-format
 msgid "The source location '%s' is not a webcal source."
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:265
+#: calendar/gui/dialogs/calendar-setup.c:275
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:278
+#: calendar/gui/dialogs/calendar-setup.c:288
 #, c-format
 msgid ""
 "The group '%s' is remote. You must specify a location to get the calendar "
@@ -4359,56 +4244,35 @@ msgstr "Grupa na Líosta Tasc"
 msgid "C_olor:"
 msgstr "_Dathanna"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "Calendar Properties"
-msgstr "Roghnachais na Fheilire"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
 msgid "Pick a color"
 msgstr "Roghnaigh dath"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:8
-msgid "Remote"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "Task List Properties"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
 #, fuzzy
 msgid "_Add Calendar"
 msgstr "Suimigh Féilire Nua"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
 #, fuzzy
 msgid "_Add Group"
 msgstr "_Cuir Grúpa Leis..."
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-msgid "_Refresh Interval:"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
 msgid "_Refresh:"
 msgstr ""
 
-# Avoid; either use KR or KP
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-msgid "_Source URL:"
-msgstr "URL _Fhoinse:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
 #, fuzzy
 msgid "_Type:"
 msgstr "Saghas:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
 msgid "_URL:"
 msgstr "_URL:"
 
 # el 
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
 msgid "weeks"
 msgstr "seachtanna"
 
@@ -4515,7 +4379,7 @@ msgid "Display"
 msgstr "_Taispeaín"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:76
 msgid "E_nable"
 msgstr "_Cumasach"
 
@@ -4526,7 +4390,7 @@ msgstr "Eolas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:563
+#: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Aoine"
 
@@ -4540,7 +4404,7 @@ msgstr "Noimeaíd"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:559
+#: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Luain"
 
@@ -4550,7 +4414,7 @@ msgstr "_Dom"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:564
+#: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Sathairn"
 
@@ -4564,7 +4428,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Domhnaigh"
 
@@ -4578,7 +4442,7 @@ msgstr "D_ea"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:562
+#: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Deardaoin"
 
@@ -4592,7 +4456,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:560
+#: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Mairt"
 
@@ -4602,7 +4466,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:561
+#: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Ceádaoin"
 
@@ -4635,7 +4499,7 @@ msgid "_Day begins:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
-#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:43
@@ -4684,76 +4548,46 @@ msgstr "_Cea"
 msgid "before every appointment"
 msgstr "roimh gach coinne"
 
-#: calendar/gui/dialogs/cancel-comp.c:57
-msgid ""
-"The event being deleted is a meeting, would you like to send a cancellation "
-"notice?"
-msgstr ""
-
-#: calendar/gui/dialogs/cancel-comp.c:60
-msgid "Are you sure you want to cancel and delete this meeting?"
-msgstr ""
-
-#: calendar/gui/dialogs/cancel-comp.c:66
-msgid ""
-"The task being deleted is assigned, would you like to send a cancellation "
-"notice?"
-msgstr ""
-
-#: calendar/gui/dialogs/cancel-comp.c:69
-msgid "Are you sure you want to cancel and delete this task?"
-msgstr ""
-
-#: calendar/gui/dialogs/cancel-comp.c:75
-msgid ""
-"The journal entry being deleted is published, would you like to send a "
-"cancellation notice?"
-msgstr ""
-
-#: calendar/gui/dialogs/cancel-comp.c:78
-msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr ""
-
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:68
 msgid "This journal entry has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:75
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:82
+#: calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:92
 msgid "This journal entry has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:99
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
@@ -4791,7 +4625,7 @@ msgid "No summary"
 msgstr "Gan coimriú"
 
 #: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
 #: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Sábháil mar..."
@@ -4845,99 +4679,51 @@ msgstr "Teip ag oscailt fillteán: %s: %s"
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:95
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:98
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:104
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:107
-msgid "Are you sure you want to delete this untitled task?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:113
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:116
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:131
-#, c-format
-msgid "Are you sure you want to delete %d appointment?"
-msgid_plural "Are you sure you want to delete %d appointments?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: calendar/gui/dialogs/delete-comp.c:138
-#, c-format
-msgid "Are you sure you want to delete %d task?"
-msgid_plural "Are you sure you want to delete %d tasks?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: calendar/gui/dialogs/delete-comp.c:145
-#, c-format
-msgid "Are you sure you want to delete %d journal entry?"
-msgid_plural "Are you sure you want to delete %d journal entries?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: calendar/gui/dialogs/delete-error.c:52
+#: calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:55
+#: calendar/gui/dialogs/delete-error.c:57
 msgid "The task could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:58
+#: calendar/gui/dialogs/delete-error.c:60
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:61
+#: calendar/gui/dialogs/delete-error.c:63
 msgid "The item could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:68
+#: calendar/gui/dialogs/delete-error.c:70
 msgid "The event could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:71
+#: calendar/gui/dialogs/delete-error.c:73
 msgid "The task could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:74
+#: calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:77
+#: calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:84
+#: calendar/gui/dialogs/delete-error.c:86
 msgid "The event could not be deleted due to an error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:87
+#: calendar/gui/dialogs/delete-error.c:89
 msgid "The task could not be deleted due to an error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:90
+#: calendar/gui/dialogs/delete-error.c:92
 msgid "The journal entry could not be deleted due to an error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:93
+#: calendar/gui/dialogs/delete-error.c:95
 msgid "The item could not be deleted due to an error"
 msgstr ""
 
@@ -5075,11 +4861,11 @@ msgstr ""
 
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:3
+#: calendar/gui/dialogs/meeting-page.glade.h:4
 #: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
 #: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1559
-#: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:100
+#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
+#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
@@ -5105,8 +4891,8 @@ msgstr ""
 #. FIXME: need to disable for undeletable folders
 #: calendar/gui/dialogs/meeting-page.c:655
 #: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1310 calendar/gui/e-calendar-view.c:1342
-#: mail/em-folder-tree.c:2557 mail/em-folder-view.c:919
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
+#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -5114,7 +4900,7 @@ msgid "_Delete"
 msgstr "_Dealaigh"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:240
+#: calendar/gui/e-meeting-list-view.c:218
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr ""
@@ -5150,16 +4936,15 @@ msgid "Member"
 msgstr "Ball"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
-#: mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-list-view.c:248
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Stádas"
 
@@ -5167,18 +4952,18 @@ msgstr "Stádas"
 msgid "Add A_ttendee"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr ""
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "Add attendees from addressbook."
+msgstr "_Suim do Leabhar Seoladh"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "_Change Organizer"
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.glade.h:6
-#: calendar/gui/e-meeting-time-sel.c:417
-msgid "_Invite Others..."
+msgid "_Change Organizer"
 msgstr ""
 
 #: calendar/gui/dialogs/new-calendar.glade.h:2
@@ -5330,7 +5115,7 @@ msgid "_No recurrence"
 msgstr ""
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:450
+#: composer/e-msg-composer-attachment-bar.c:453
 msgid "_Remove"
 msgstr "_Scríos"
 
@@ -5363,51 +5148,20 @@ msgstr "Seachta(i)n"
 msgid "year(s)"
 msgstr "blia(i)n"
 
-#: calendar/gui/dialogs/save-comp.c:53
-msgid ""
-"This event has been changed, but has not been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-
-#: calendar/gui/dialogs/save-comp.c:57
-msgid "_Discard Changes"
-msgstr ""
-
-#: calendar/gui/dialogs/save-comp.c:62
-msgid "Save Event"
-msgstr ""
-
-#: calendar/gui/dialogs/select-source-dialog.c:65
+#: calendar/gui/dialogs/select-source-dialog.c:69
 #, fuzzy
 msgid "Select destination"
 msgstr "Teip ag oscailt fillteán: %s: %s"
 
-#: calendar/gui/dialogs/select-source-dialog.c:86
+#: calendar/gui/dialogs/select-source-dialog.c:90
 #, fuzzy
 msgid "_Destination"
 msgstr "Ag socraigh ffilteán: %s"
 
-#: calendar/gui/dialogs/select-source-dialog.c:88
+#: calendar/gui/dialogs/select-source-dialog.c:92
 msgid "Task List"
 msgstr "Líosta Tasc"
 
-#: calendar/gui/dialogs/send-comp.c:57
-msgid "The meeting information has been created. Send it?"
-msgstr ""
-
-#: calendar/gui/dialogs/send-comp.c:60
-msgid "The meeting information has changed. Send an updated version?"
-msgstr ""
-
-#: calendar/gui/dialogs/send-comp.c:67
-msgid "The task assignment information has been created. Send it?"
-msgstr ""
-
-#: calendar/gui/dialogs/send-comp.c:71
-msgid "The task information has changed. Send an updated version?"
-msgstr ""
-
 #: calendar/gui/dialogs/task-details-page.c:406
 msgid "Completed date is wrong"
 msgstr ""
@@ -5427,7 +5181,7 @@ msgstr "Críochnaithe"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #: calendar/gui/e-cal-component-preview.c:249
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:960
 msgid "High"
 msgstr "Ard"
 
@@ -5441,14 +5195,14 @@ msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:253
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:958
 msgid "Low"
 msgstr "Bun"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:251
 #: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:957
+#: mail/message-list.c:959
 msgid "Normal"
 msgstr "Gnáth"
 
@@ -5507,8 +5261,8 @@ msgstr ""
 
 #: calendar/gui/dialogs/task-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
+#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Tuarascail:"
 
@@ -5681,7 +5435,7 @@ msgstr "Dáta:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:950
+#: calendar/gui/e-itip-control.c:943
 msgid "Status:"
 msgstr "Stádas:"
 
@@ -5766,12 +5520,12 @@ msgstr ""
 msgid "Deleting selected objects"
 msgstr "Scríos an sceal seo"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
 msgid "Updating objects"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1370
+#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
 #: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Oscail"
@@ -5781,15 +5535,15 @@ msgid "Open _Web Page"
 msgstr "_Oscail Leathanach _Lín"
 
 #: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1291 calendar/gui/e-calendar-view.c:1376
-#: mail/em-folder-view.c:896 mail/em-popup.c:690 mail/em-popup.c:806
+#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
+#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "_Sábháil Mar..."
 
 #: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1292
-#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
+#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
@@ -5797,16 +5551,16 @@ msgid "_Print..."
 msgstr "_Priontáil..."
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "G_earr"
 
 #: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1338
-#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2550
-#: mail/message-list.c:1644 ui/evolution-addressbook.xml.h:31
+#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
+#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
+#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
 msgid "_Copy"
@@ -5814,8 +5568,8 @@ msgstr "_Cóip"
 
 # PS
 #: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1273 calendar/gui/e-calendar-view.c:1299
-#: calendar/gui/e-calendar-view.c:1372 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
+#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
@@ -5885,71 +5639,71 @@ msgstr "Coimriú"
 msgid "Task sort"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
 msgid "New _Appointment..."
 msgstr "_Coinne Nua..."
 
-#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
+#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
+#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
 msgid "New Meeting"
 msgstr "Cruinniú Nua"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
 msgid "New Task"
 msgstr "Tasc Nua"
 
-#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Roghnaigh fillteán"
 
-#: calendar/gui/e-calendar-view.c:1280
+#: calendar/gui/e-calendar-view.c:1283
 #, fuzzy
 msgid "_Select Date..."
 msgstr "_Roghnaigh..."
 
-#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1303
+#: calendar/gui/e-calendar-view.c:1306
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Cóip do Fillteán..."
 
-#: calendar/gui/e-calendar-view.c:1304
+#: calendar/gui/e-calendar-view.c:1307
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "_Bog go Fillteán..."
 
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1308
 msgid "_Schedule Meeting..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1309
 msgid "_Forward as iCalendar..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1349
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1351
 msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "_Álbachtaí..."
 
@@ -5964,9 +5718,9 @@ msgstr ""
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:967 calendar/gui/e-itip-control.c:1169
-#: calendar/gui/e-meeting-list-view.c:144
-#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
 #: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
 #: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
 #: camel/camel-tcp-stream-openssl.c:631
@@ -5992,13 +5746,13 @@ msgid "Assigned"
 msgstr ""
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr "Tá"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "Níl"
 
@@ -6010,7 +5764,7 @@ msgstr "T"
 msgid "S"
 msgstr "D"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
 msgid "E"
 msgstr ""
 
@@ -6076,403 +5830,407 @@ msgstr "%d %b"
 msgid "%02i minute divisions"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:592
+#: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:596
 #, fuzzy, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Gach lá"
 msgstr[1] "Gach lá"
 
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:601
 #, fuzzy, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Gach seachtain"
 msgstr[1] "Gach seachtain"
 
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:603
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:618
+#: calendar/gui/e-itip-control.c:611
 msgid " and "
 msgstr " agus "
 
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:618
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:631
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:645
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "gach mí"
 msgstr[1] "gach mí"
 
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:642
 #, fuzzy, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Gach bliain"
 msgstr[1] "Gach bliain"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:653
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:669
+#: calendar/gui/e-itip-control.c:662
 msgid ", ending on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:686
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:696
 msgid "<b>Ends:</b> "
 msgstr "<b>Ag Críochnú:</b> "
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:716
 msgid "<b>Completed:</b> "
 msgstr "<b>Críochnaithe:</b> "
 
-#: calendar/gui/e-itip-control.c:733
+#: calendar/gui/e-itip-control.c:726
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:771 calendar/gui/e-itip-control.c:827
+#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
 msgid "iCalendar Information"
 msgstr "Eolas iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:788
+#: calendar/gui/e-itip-control.c:781
 msgid "iCalendar Error"
 msgstr "Féilire"
 
-#: calendar/gui/e-itip-control.c:859 calendar/gui/e-itip-control.c:875
-#: calendar/gui/e-itip-control.c:886 calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
 msgid "An unknown person"
 msgstr "Duine anaithnid"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:910
+#: calendar/gui/e-itip-control.c:903
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:925
+#: calendar/gui/e-itip-control.c:918
 msgid "<i>None</i>"
 msgstr "<i>Ar bith</i>"
 
-#: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:929
+msgid "Location:"
+msgstr "Áit:"
+
+#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:959 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:963 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.c:1050
-#: calendar/gui/e-itip-control.c:1076 calendar/gui/e-itip-control.c:1089
-#: calendar/gui/e-itip-control.c:1102 calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
 msgid "Choose an action:"
 msgstr "Roghnaigh gníomh:"
 
-#: calendar/gui/e-itip-control.c:1023
+#: calendar/gui/e-itip-control.c:1016
 msgid "Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1024 calendar/gui/e-itip-control.c:1055
-#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1091
-#: calendar/gui/e-itip-control.c:1104 calendar/gui/e-itip-control.c:1117
-#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
+#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Ceart go Leor"
 
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1044
 msgid "Accept"
 msgstr "Glac Leis"
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1045
 msgid "Tentatively accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1046
 msgid "Decline"
 msgstr "Diúltaigh Dó"
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1070
 msgid "Send Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1090
+#: calendar/gui/e-itip-control.c:1083
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1103
+#: calendar/gui/e-itip-control.c:1096
 msgid "Send Latest Information"
 msgstr ""
 
 # FR
-#: calendar/gui/e-itip-control.c:1116 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cealaigh"
 
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1185
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1193
+#: calendar/gui/e-itip-control.c:1186
 msgid "Meeting Information"
 msgstr "Eolas cruinniú"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1191
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1193
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1201
+#: calendar/gui/e-itip-control.c:1194
 msgid "Meeting Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1206
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1203
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1204
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1218
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Reply"
 msgstr "Freagra Cruinniú"
 
-#: calendar/gui/e-itip-control.c:1226
+#: calendar/gui/e-itip-control.c:1219
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1227
+#: calendar/gui/e-itip-control.c:1220
 msgid "Meeting Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1234 calendar/gui/e-itip-control.c:1302
-#: calendar/gui/e-itip-control.c:1337
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1330
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1228
 msgid "Bad Meeting Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1253
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1254
 msgid "Task Information"
 msgstr "Eolas Thasc"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1259
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1262
 msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1278
+#: calendar/gui/e-itip-control.c:1271
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1272
 msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1286
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1294
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1288
 msgid "Task Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1303
+#: calendar/gui/e-itip-control.c:1296
 msgid "Bad Task Message"
 msgstr "Droch Scéal Tasc"
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1315
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1323
+#: calendar/gui/e-itip-control.c:1316
 msgid "Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1321
 msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1325
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1326
 msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1331
 msgid "Bad Free/Busy Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1413
+#: calendar/gui/e-itip-control.c:1406
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1472
+#: calendar/gui/e-itip-control.c:1465
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1503
+#: calendar/gui/e-itip-control.c:1496
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1535
+#: calendar/gui/e-itip-control.c:1528
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1769
+#: calendar/gui/e-itip-control.c:1762
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
+#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1825
+#: calendar/gui/e-itip-control.c:1818
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1837
+#: calendar/gui/e-itip-control.c:1830
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1856
+#: calendar/gui/e-itip-control.c:1849
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1852
 msgid "Object could not be found\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1855
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1865
+#: calendar/gui/e-itip-control.c:1858
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1861
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1892
 msgid "Removal Complete"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
 msgid "Item sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
+#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
 msgid "The item could not be sent!\n"
 msgstr ""
 
@@ -6515,76 +6273,76 @@ msgid "date-start"
 msgstr ""
 
 # FIXME (Plural)
-#: calendar/gui/e-meeting-list-view.c:62
+#: calendar/gui/e-meeting-list-view.c:59
 msgid "Chair Persons"
 msgstr "Cathlaoirlaigh"
 
-#: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:479
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
 msgid "Required Participants"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:64
+#: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:65
+#: calendar/gui/e-meeting-list-view.c:62
 msgid "Resources"
 msgstr "Acmhainn"
 
 # IN 
-#: calendar/gui/e-meeting-list-view.c:140 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
 #: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr "Pearsanta"
 
-#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "Grupa"
 
-#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr "Goireas"
 
-#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr "Seomra"
 
 # th
-#: calendar/gui/e-meeting-list-view.c:154 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr "Cathaoir"
 
-#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:127
 #: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
 msgid "Required Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:179 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:177
 #: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
 msgid "Needs Action"
 msgstr "Freagra"
 
-#: calendar/gui/e-meeting-list-view.c:182 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
 #: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr ""
@@ -6601,20 +6359,26 @@ msgstr "As an Oifig"
 msgid "No Information"
 msgstr "Gan Eolas"
 
+#: calendar/gui/e-meeting-time-sel.c:417
+#, fuzzy
+msgid "Add attendees from addressbook"
+msgstr "_Suim do Leabhar Seoladh"
+
 #: calendar/gui/e-meeting-time-sel.c:440
 msgid "_Options"
 msgstr "_Roghanna"
 
 #: calendar/gui/e-meeting-time-sel.c:457
-msgid "Show _Only Working Hours"
+msgid "Show _only working hours"
 msgstr ""
 
 #: calendar/gui/e-meeting-time-sel.c:467
-msgid "Show _Zoomed Out"
-msgstr ""
+#, fuzzy
+msgid "Show _zoomed out"
+msgstr "Taispeáin aon mhí"
 
 #: calendar/gui/e-meeting-time-sel.c:482
-msgid "_Update Free/Busy"
+msgid "_Update free/busy"
 msgstr ""
 
 #: calendar/gui/e-meeting-time-sel.c:497
@@ -6630,19 +6394,19 @@ msgid ">_>"
 msgstr ">_>"
 
 #: calendar/gui/e-meeting-time-sel.c:547
-msgid "_All People and Resources"
+msgid "_All people and resources"
 msgstr ""
 
 #: calendar/gui/e-meeting-time-sel.c:556
-msgid "All _People and One Resource"
+msgid "All _people and one resource"
 msgstr ""
 
 #: calendar/gui/e-meeting-time-sel.c:565
-msgid "_Required People"
+msgid "_Required people"
 msgstr ""
 
 #: calendar/gui/e-meeting-time-sel.c:574
-msgid "Required People and _One Resource"
+msgid "Required people and _one resource"
 msgstr ""
 
 #: calendar/gui/e-meeting-time-sel.c:593
@@ -6680,7 +6444,7 @@ msgstr "%d/%m/%Y"
 msgid "Enter the password for %s"
 msgstr "Pasfhocal do %s, le do thoil"
 
-#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6689,19 +6453,14 @@ msgstr ""
 " Earráid le %s:\n"
 "  %s"
 
-#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-
 #. FIXME Loading should be async
 #. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:686
+#: calendar/gui/e-tasks.c:801
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Ag oscailt tascanna as %s"
 
-#: calendar/gui/e-tasks.c:709
+#: calendar/gui/e-tasks.c:824
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6710,55 +6469,50 @@ msgstr ""
 " Earráid le %s:\n"
 "  %s"
 
-#: calendar/gui/e-tasks.c:730
+#: calendar/gui/e-tasks.c:845
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Ag Lódáil íomhanna"
 
-#: calendar/gui/e-tasks.c:834
+#: calendar/gui/e-tasks.c:949
 msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:857
+#: calendar/gui/e-tasks.c:972
 msgid "Deleting selected objects..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:884
+#: calendar/gui/e-tasks.c:999
 msgid "Expunging"
 msgstr ""
 
 # tg
-#: calendar/gui/e-tasks.c:960
+#: calendar/gui/e-tasks.c:1075
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
-#: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
+#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
+#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
 #: calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:705
 msgid "Tasks"
 msgstr "Tascanna"
 
-#: calendar/gui/gnome-cal.c:1876
+#: calendar/gui/gnome-cal.c:1878
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Gan coinní."
 
-#: calendar/gui/gnome-cal.c:1895
+#: calendar/gui/gnome-cal.c:1897
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Ag Lódáil íomhanna"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1920
 #, c-format
 msgid "Opening %s"
 msgstr "Ag Oscailt %s"
 
-#: calendar/gui/gnome-cal.c:2048
-#, c-format
-msgid "The calendar backend for '%s' has crashed."
-msgstr ""
-
 # tr
-#: calendar/gui/gnome-cal.c:2894
+#: calendar/gui/gnome-cal.c:2906
 msgid "Purging"
 msgstr ""
 
@@ -6954,7 +6708,7 @@ msgid "On The Web"
 msgstr ""
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 
@@ -6965,7 +6719,7 @@ msgid "Unable to migrate calendar `%s'"
 msgstr ""
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:869
+#: calendar/gui/migration.c:889
 #, fuzzy, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr ""
@@ -7205,72 +6959,72 @@ msgstr ""
 msgid "Print Setup"
 msgstr "Socraigh Priontáil "
 
-#: calendar/gui/tasks-component.c:303
+#: calendar/gui/tasks-component.c:313
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:371
 msgid "New Task List"
 msgstr "Líosta Tasc Nua"
 
-#: calendar/gui/tasks-component.c:398
+#: calendar/gui/tasks-component.c:408
 #, fuzzy, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "Gan Tascanna"
 msgstr[1] "Gan Tascanna"
 
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] "Scrioste"
 msgstr[1] "Scrioste"
 
-#: calendar/gui/tasks-component.c:447
+#: calendar/gui/tasks-component.c:457
 #, fuzzy
 msgid "Failed upgrading tasks."
 msgstr "Ag Lódáil íomhanna"
 
-#: calendar/gui/tasks-component.c:526
+#: calendar/gui/tasks-component.c:749
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:538
+#: calendar/gui/tasks-component.c:761
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:576
+#: calendar/gui/tasks-component.c:799
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:804
+#: calendar/gui/tasks-component.c:1040
 msgid "New task"
 msgstr "Tasc nua"
 
-#: calendar/gui/tasks-component.c:805
+#: calendar/gui/tasks-component.c:1041
 msgid "_Task"
 msgstr "_Tasc"
 
-#: calendar/gui/tasks-component.c:806
+#: calendar/gui/tasks-component.c:1042
 msgid "Create a new task"
 msgstr "Cruthaigh tasc nua"
 
-#: calendar/gui/tasks-component.c:812
+#: calendar/gui/tasks-component.c:1048
 #, fuzzy
 msgid "New tasks group"
 msgstr "Tasc nua"
 
-#: calendar/gui/tasks-component.c:813
+#: calendar/gui/tasks-component.c:1049
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Grupa na Líosta Tasc"
 
-#: calendar/gui/tasks-component.c:814
+#: calendar/gui/tasks-component.c:1050
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Cruthaigh tasc nua"
@@ -9052,12 +8806,12 @@ msgstr ""
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1259
+#: camel/camel-folder.c:1262
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1299
+#: camel/camel-folder.c:1302
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
@@ -9070,11 +8824,16 @@ msgstr "Ag bogadh scéaltaí"
 msgid "Copying messages"
 msgstr ""
 
-#: camel/camel-folder.c:1666
-msgid "Learning junk and/or non junk message(s)"
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Rabhadh"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
 msgstr ""
 
-#: camel/camel-folder.c:1695
+#: camel/camel-folder.c:1701
 msgid "Filtering new message(s)"
 msgstr ""
 
@@ -9104,15 +8863,15 @@ msgstr ""
 msgid "(match-threads) requires a match type string"
 msgstr ""
 
-#: camel/camel-folder-search.c:785
+#: camel/camel-folder-search.c:784
 msgid "(match-threads) expects an array result"
 msgstr ""
 
-#: camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:790
 msgid "(match-threads) requires the folder set"
 msgstr ""
 
-#: camel/camel-folder-search.c:880
+#: camel/camel-folder-search.c:879
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr ""
@@ -9142,7 +8901,8 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
 #: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:706
+#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Ceangailte."
@@ -9498,7 +9258,7 @@ msgstr ""
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1212
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -9868,41 +9628,41 @@ msgstr ""
 msgid "export keys: unimplemented"
 msgstr ""
 
-#: camel/camel-store.c:214
+#: camel/camel-store.c:213
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-store.c:244
+#: camel/camel-store.c:243
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr "Teip ag cruthaigh fillteán %s: %s"
 
-#: camel/camel-store.c:295
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-store.c:323
+#: camel/camel-store.c:325
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Teip ag cruthaigh fillteán %s: %s"
 
-#: camel/camel-store.c:387 camel/camel-vee-store.c:354
+#: camel/camel-store.c:389 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr ""
 
-#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#: camel/camel-store.c:439 camel/camel-vee-store.c:387
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr ""
 
-#: camel/camel-store.c:811
+#: camel/camel-store.c:777
 msgid "Trash"
 msgstr "Bruscar"
 
 # GN
-#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
-#: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/mail-config.glade.h:95
+#: ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Bruscar"
 
@@ -10109,12 +9869,12 @@ msgstr ""
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:374
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr ""
 
-#: camel/camel-vee-store.c:398
+#: camel/camel-vee-store.c:395
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr ""
@@ -10156,31 +9916,31 @@ msgstr "Leabhar Seoladh:"
 msgid "Post Office Agent SOAP Port:"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:80
+#: camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "Novell GroupWise"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:82
+#: camel/providers/groupwise/camel-groupwise-provider.c:85
 msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: camel/providers/groupwise/camel-groupwise-provider.c:100
 #: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
 msgid "Password"
 msgstr "Pasfhocal"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:99
+#: camel/providers/groupwise/camel-groupwise-provider.c:102
 #: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/groupwise/camel-gw-listener.c:305
-#: camel/providers/groupwise/camel-gw-listener.c:328
+#: camel/providers/groupwise/camel-gw-listener.c:312
+#: camel/providers/groupwise/camel-gw-listener.c:335
 #, fuzzy
 msgid "Checklist"
 msgstr "líosta"
@@ -10309,13 +10069,13 @@ msgid ""
 msgstr ""
 
 #: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:429
+#: camel/providers/imap/camel-imap-store.c:428
 #, c-format
 msgid "IMAP server %s"
 msgstr "Freastalaí IMAP %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:431
+#: camel/providers/imap/camel-imap-store.c:430
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "Seirbhís IMAP do %s as %s"
@@ -10325,7 +10085,7 @@ msgstr "Seirbhís IMAP do %s as %s"
 #: camel/providers/imap/camel-imap-store.c:551
 #: camel/providers/imap/camel-imap-store.c:571
 #: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
+#: camel/providers/nntp/camel-nntp-store.c:209
 #: camel/providers/pop3/camel-pop3-store.c:175
 #: camel/providers/smtp/camel-smtp-transport.c:269
 #: camel/providers/smtp/camel-smtp-transport.c:285
@@ -10342,10 +10102,10 @@ msgstr ""
 
 #: camel/providers/imap4/camel-imap4-store.c:222
 #: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:815
+#: camel/providers/imap/camel-imap-store.c:845
 #: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:137
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
 #: camel/providers/pop3/camel-pop3-store.c:192
 msgid "Connection cancelled"
 msgstr ""
@@ -10358,8 +10118,8 @@ msgid ""
 msgstr ""
 
 #: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:649
-#: camel/providers/imap/camel-imap-store.c:680
+#: camel/providers/imap/camel-imap-store.c:679
+#: camel/providers/imap/camel-imap-store.c:710
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
@@ -10368,7 +10128,7 @@ msgstr ""
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1109
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
 msgid "Unknown error"
 msgstr "Earraidh gan fhois"
 
@@ -10394,8 +10154,8 @@ msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr "Teip ag cruthaigh fillteán %s: %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1857
-#: camel/providers/imap/camel-imap-store.c:2235
+#: camel/providers/imap/camel-imap-store.c:1885
+#: camel/providers/imap/camel-imap-store.c:2263
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -10474,12 +10234,12 @@ msgstr ""
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3168
+#: camel/providers/imap/camel-imap-store.c:3194
 msgid "Operation cancelled"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3171
+#: camel/providers/imap/camel-imap-store.c:3197
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
@@ -10541,13 +10301,6 @@ msgid "Unable to retrieve message: %s"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:219
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -10555,15 +10308,15 @@ msgid ""
 msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-mbox-folder.c:418
+#: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:2019
-#: camel/providers/imap/camel-imap-folder.c:2621
-#: camel/providers/nntp/camel-nntp-folder.c:238
+#: camel/providers/imap/camel-imap-folder.c:2622
+#: camel/providers/nntp/camel-nntp-folder.c:220
 msgid "This message is not currently available"
 msgstr ""
 
@@ -10572,7 +10325,23 @@ msgstr ""
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2659
+#: camel/providers/imap/camel-imap-folder.c:2463
+#, c-format
+msgid "Incomplete server response: no information provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2471
+#, c-format
+msgid "Incomplete server response: no UID provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2484
+#, c-format
+msgid ""
+"Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2660
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -10632,43 +10401,43 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/imap/camel-imap-store.c:680
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:711
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:818
+#: camel/providers/imap/camel-imap-store.c:848
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1242
+#: camel/providers/imap/camel-imap-store.c:1272
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1252
+#: camel/providers/imap/camel-imap-store.c:1282
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1305
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1289
+#: camel/providers/imap/camel-imap-store.c:1319
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1318
+#: camel/providers/imap/camel-imap-store.c:1348
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10676,18 +10445,18 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1839
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:1867
+#: camel/providers/imap/camel-imap-store.c:2057
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1915
-#: camel/providers/imap/camel-imap-store.c:2296
+#: camel/providers/imap/camel-imap-store.c:1943
+#: camel/providers/imap/camel-imap-store.c:2324
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1970
+#: camel/providers/imap/camel-imap-store.c:1998
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10695,7 +10464,7 @@ msgstr ""
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Teip ag cruthaigh fillteán %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:2274
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr ""
@@ -10727,20 +10496,20 @@ msgid "Index message body data"
 msgstr ""
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:388
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:393
-#: camel/providers/local/camel-local-folder.c:396
+#: camel/providers/local/camel-local-folder.c:392
+#: camel/providers/local/camel-local-folder.c:395
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr ""
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:400
+#: camel/providers/local/camel-local-folder.c:399
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -10796,7 +10565,7 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:142
 #: camel/providers/local/camel-local-store.c:253
-#: camel/providers/local/camel-mbox-store.c:356
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10869,8 +10638,23 @@ msgstr ""
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:226
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mbox-folder.c:417
+#: camel/providers/local/camel-mbox-folder.c:436
+#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:475
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-mh-folder.c:221
+#, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-folder.c:236
 msgid "Invalid message contents"
 msgstr ""
 
@@ -10911,9 +10695,9 @@ msgstr ""
 msgid "not a maildir directory"
 msgstr "níl eolaire maildir ann"
 
-#: camel/providers/local/camel-maildir-store.c:341
-#: camel/providers/local/camel-spool-store.c:286
-#: camel/providers/local/camel-spool-store.c:316
+#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-spool-store.c:284
+#: camel/providers/local/camel-spool-store.c:314
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr ""
@@ -10960,25 +10744,17 @@ msgstr ""
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:435
-#: camel/providers/local/camel-mbox-folder.c:466
-#: camel/providers/local/camel-mbox-folder.c:474
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:468
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:475
-msgid "Message construction failed: Corrupt mailbox?"
+#: camel/providers/local/camel-mbox-folder.c:476
+#: camel/providers/local/camel-mh-folder.c:222
+msgid "Message construction failed."
 msgstr ""
 
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:362
+#: camel/providers/local/camel-mbox-store.c:361
 msgid "Cannot create a folder by this name."
 msgstr ""
 
@@ -11006,30 +10782,30 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:375
+#: camel/providers/local/camel-mbox-store.c:374
 #, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Teip ag cruthaigh eolaire '%s': %s."
 
-#: camel/providers/local/camel-mbox-store.c:389
+#: camel/providers/local/camel-mbox-store.c:388
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Teip ag cruthaigh fillteán %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:391
+#: camel/providers/local/camel-mbox-store.c:390
 msgid "Folder already exists"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:473
+#: camel/providers/local/camel-mbox-store.c:472
 msgid "The new folder name is illegal."
 msgstr "Is ainm fillteán nua neamhdhlíthe."
 
-#: camel/providers/local/camel-mbox-store.c:486
+#: camel/providers/local/camel-mbox-store.c:485
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Teip ag athainmigh '%s': %s"
 
-#: camel/providers/local/camel-mbox-store.c:561
+#: camel/providers/local/camel-mbox-store.c:560
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Teip ag athainmigh '%s': %s"
@@ -11218,7 +10994,7 @@ msgid ""
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:997
+#: camel/providers/nntp/camel-nntp-store.c:1126
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Pasfhocal NNTP do %s@%s, le do thoil"
@@ -11235,18 +11011,10 @@ msgstr ""
 msgid "Server rejected username/password"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:263
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:259
-#: camel/providers/nntp/camel-nntp-folder.c:265
+#: camel/providers/nntp/camel-nntp-folder.c:147
+#: camel/providers/nntp/camel-nntp-folder.c:149
+#: camel/providers/nntp/camel-nntp-folder.c:158
+#: camel/providers/nntp/camel-nntp-folder.c:234
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11255,62 +11023,49 @@ msgstr ""
 msgid "Cannot get message %s: %s"
 msgstr "Níl an scéal %s ar fáil: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:188
-#: camel/providers/nntp/camel-nntp-folder.c:228
-#, c-format
-msgid "Internal error: uid in invalid format: %s"
+#: camel/providers/nntp/camel-nntp-folder.c:156
+#: camel/providers/nntp/camel-nntp-folder.c:232
+#: camel/providers/nntp/camel-nntp-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+msgid "User cancelled"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:201
+#: camel/providers/nntp/camel-nntp-folder.c:176
+#: camel/providers/nntp/camel-nntp-folder.c:208
 #, c-format
-msgid "Could not get article %s from NNTP server"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:362
-msgid "Posting not allowed by news server"
+msgid "Internal error: uid in invalid format: %s"
 msgstr ""
 
+#: camel/providers/nntp/camel-nntp-folder.c:328
+#: camel/providers/nntp/camel-nntp-folder.c:331
 #: camel/providers/nntp/camel-nntp-folder.c:373
-#, c-format
-msgid "Failed to send newsgroups header: %s: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:413
-#: camel/providers/nntp/camel-nntp-folder.c:426
-#, c-format
-msgid "Error posting to newsgroup: %s: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:438
-msgid "Error reading response to posted message: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:441
+#: camel/providers/nntp/camel-nntp-folder.c:375
 #, fuzzy, c-format
-msgid "Error posting message: %s: message not posted"
-msgstr ""
-"Earraidh ag sábhháil scéal: %s\n"
-" %s"
+msgid "Posting failed: %s"
+msgstr "Teip oraithe NNTP: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:457
+#: camel/providers/nntp/camel-nntp-folder.c:393
 msgid "You cannot post NNTP messages while working offline!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:468
+#: camel/providers/nntp/camel-nntp-folder.c:404
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:44
 msgid "Could not get group list from server."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#: camel/providers/nntp/camel-nntp-grouplist.c:97
+#: camel/providers/nntp/camel-nntp-grouplist.c:106
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#: camel/providers/nntp/camel-nntp-grouplist.c:157
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr ""
@@ -11338,27 +11093,29 @@ msgid ""
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:158
+#: camel/providers/nntp/camel-nntp-store.c:118
+#: camel/providers/nntp/camel-nntp-store.c:1233
+#: camel/providers/nntp/camel-nntp-store.c:1331
+#, c-format
+msgid "NNTP Command failed: %s"
+msgstr "Teip oraithe NNTP: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:227
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:170
+#: camel/providers/nntp/camel-nntp-store.c:239
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:326
+#: camel/providers/nntp/camel-nntp-store.c:403
 #, c-format
 msgid "USENET News via %s"
 msgstr "Nuachtain USENET via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:640
-#, fuzzy
-msgid "Stream error"
-msgstr "Earraidh Eile"
-
-#: camel/providers/nntp/camel-nntp-store.c:643
+#: camel/providers/nntp/camel-nntp-store.c:777
 #, fuzzy, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -11368,74 +11125,73 @@ msgstr ""
 "Earraidh ag sábhháil scéalaí  do: %s\n"
 " %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:735
+#: camel/providers/nntp/camel-nntp-store.c:872
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
 "No such newsgroup. The selected item is a probably a parent folder."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:767
+#: camel/providers/nntp/camel-nntp-store.c:904
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
 "newsgroup does not exist!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:792
+#: camel/providers/nntp/camel-nntp-store.c:929
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:800
+#: camel/providers/nntp/camel-nntp-store.c:937
 msgid "You cannot rename a folder in a News store."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:808
+#: camel/providers/nntp/camel-nntp-store.c:945
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:253
+#: camel/providers/nntp/camel-nntp-store.c:1118
+msgid "Authentication requested but not username provided"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:1146
 #, fuzzy, c-format
-msgid "Connection error: %s"
-msgstr "Earraidh gan fhois: %s"
+msgid "Cannot authenticate to server: %s"
+msgstr "Teip ag cruthaigh fillteán %s: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:262
+#: camel/providers/nntp/camel-nntp-store.c:1262
+#, fuzzy
+msgid "Not connected."
+msgstr "Gan Tadhallaí"
+
+#: camel/providers/nntp/camel-nntp-store.c:1311
 #, c-format
 msgid "No such folder: %s"
 msgstr "Níl aon fillteán: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:268
-#, c-format
-msgid "Could not get group: %s"
-msgstr "Ní raibh an grúpa ar fáil: %s"
-
-#: camel/providers/nntp/camel-nntp-summary.c:333
-#, fuzzy
-msgid "Could not get messages: unspecified error"
-msgstr "Níl an scéal %s ar fáil: %s"
-
-#: camel/providers/nntp/camel-nntp-summary.c:378
+#: camel/providers/nntp/camel-nntp-summary.c:218
+#: camel/providers/nntp/camel-nntp-summary.c:314
 #, c-format
-msgid "NNTP Command failed: %s"
-msgstr "Teip oraithe NNTP: %s"
+msgid "%s: Scanning new messages"
+msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:438
-#: camel/providers/nntp/camel-nntp-summary.c:543
+#: camel/providers/nntp/camel-nntp-summary.c:225
 #, c-format
-msgid "%s: Scanning new messages"
+msgid "Unexpected server response from xover: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:558
+#: camel/providers/nntp/camel-nntp-summary.c:328
 #, c-format
-msgid "Unknown server response: %s"
+msgid "Unexpected server response from head: %s"
 msgstr ""
 
 # FR
-#: camel/providers/nntp/camel-nntp-summary.c:605
+#: camel/providers/nntp/camel-nntp-summary.c:368
 msgid "Use cancel"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:607
+#: camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
 msgid "Operation failed: %s"
 msgstr ""
@@ -11483,7 +11239,7 @@ msgstr "Scrios indiath %s la(e)"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107
 msgid "POP"
 msgstr "POP"
 
@@ -11563,7 +11319,7 @@ msgid "No such folder `%s'."
 msgstr "Níl aon eolaire `%s' ann."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:132
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -11615,7 +11371,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:119
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11902,19 +11658,19 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
+#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:408
 msgid "attachment"
 msgstr "ceangaltáin"
 
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:454
 msgid "Remove selected items from the attachment list"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:491
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Add attachment..."
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:495
 msgid "Attach a file to the message"
 msgstr "Ceangal comhad ar an scéal"
 
@@ -11976,7 +11732,7 @@ msgstr "(Scéal gan tideál)"
 msgid "Open file"
 msgstr "Oscail Comhad"
 
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
 msgid "Autogenerated"
 msgstr "Uathcruthach"
 
@@ -12114,17 +11870,17 @@ msgstr ""
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
+msgid "You cannot attach the file `{0}' to this message."
 msgstr "Ceangal comhad ar an scéal"
 
 #. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4
-msgid "${1}"
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
 msgstr ""
 
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
 
 #. mail-composer:attach-directory primary
@@ -12217,7 +11973,7 @@ msgstr ""
 
 #. mail-composer:no-build-message secondary
 #: composer/mail-composer-errors.xml.h:34
-msgid "Because \"${0}\", you may need to select different mail options."
+msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
@@ -12227,8 +11983,10 @@ msgid "Could not read signature file \"{0}\"."
 msgstr "Teip ag sábháil comhad siniú: %s"
 
 #. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38
-msgid "Because \"${1}\"."
+#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted primary
@@ -12629,11 +12387,11 @@ msgid "<b>Then</b>"
 msgstr "<b>Am</b> "
 
 #: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1335
+#: mail/mail-account-gui.c:1347
 msgid "Select Folder"
 msgstr "Roghnaigh Fillteán"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
 msgid "    "
 msgstr "      "
 
@@ -12685,7 +12443,7 @@ msgstr ""
 msgid "months"
 msgstr ""
 
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
 msgid "seconds"
 msgstr "soicind"
 
@@ -12718,20 +12476,20 @@ msgid "years"
 msgstr "bliana"
 
 # IR
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:916
-#: mail/mail-config.c:76 mail/mail-config.glade.h:90
+#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
+#: mail/mail-config.glade.h:93
 msgid "Important"
 msgstr ""
 
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:919 mail/mail-config.c:79
-#: mail/mail-config.glade.h:145
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: mail/mail-config.glade.h:148
 msgid "To Do"
 msgstr ""
 
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:920 mail/mail-config.c:80
-#: mail/mail-config.glade.h:94
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: mail/mail-config.glade.h:97
 msgid "Later"
 msgstr ""
 
@@ -12788,262 +12546,6 @@ msgstr ""
 msgid "outgoing"
 msgstr ""
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Adjust Score"
-msgstr ""
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Color"
-msgstr ""
-
-#: filter/libfilter-i18n.h:4
-msgid "Assign Score"
-msgstr ""
-
-#: filter/libfilter-i18n.h:5
-msgid "Attachments"
-msgstr "Ceangaltáin"
-
-# BE
-#: filter/libfilter-i18n.h:6
-msgid "Beep"
-msgstr ""
-
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr ""
-
-#: filter/libfilter-i18n.h:8
-msgid "Copy to Folder"
-msgstr ""
-
-#: filter/libfilter-i18n.h:9
-msgid "Date received"
-msgstr ""
-
-# mt
-#: filter/libfilter-i18n.h:10
-msgid "Date sent"
-msgstr ""
-
-#: filter/libfilter-i18n.h:12
-msgid "Deleted"
-msgstr "Scrioste"
-
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr ""
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr ""
-
-#: filter/libfilter-i18n.h:16
-msgid "does not return"
-msgstr ""
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr ""
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
-msgstr ""
-
-#: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr ""
-
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr ""
-
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr ""
-
-#: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr ""
-
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr ""
-
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr ""
-
-#: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr ""
-
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr ""
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr ""
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr ""
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr ""
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr ""
-
-#: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr ""
-
-# GN
-#: filter/libfilter-i18n.h:36
-msgid "Junk Test"
-msgstr ""
-
-# PE
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
-#: widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Lipéid"
-
-#: filter/libfilter-i18n.h:38
-msgid "Mailing list"
-msgstr ""
-
-#: filter/libfilter-i18n.h:39
-msgid "Message Body"
-msgstr ""
-
-#: filter/libfilter-i18n.h:40
-msgid "Message Header"
-msgstr ""
-
-# as 
-#: filter/libfilter-i18n.h:41
-msgid "Message is Junk"
-msgstr ""
-
-#: filter/libfilter-i18n.h:42
-msgid "Message is not Junk"
-msgstr ""
-
-#: filter/libfilter-i18n.h:43
-msgid "Move to Folder"
-msgstr ""
-
-#: filter/libfilter-i18n.h:44
-#, fuzzy
-msgid "Pipe to Program"
-msgstr "Éirigh as an ríomhchlár"
-
-# PL
-#: filter/libfilter-i18n.h:45
-msgid "Play Sound"
-msgstr ""
-
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
-msgid "Read"
-msgstr ""
-
-#: filter/libfilter-i18n.h:47
-msgid "Recipients"
-msgstr ""
-
-#: filter/libfilter-i18n.h:48
-msgid "Regex Match"
-msgstr ""
-
-#: filter/libfilter-i18n.h:49
-msgid "Replied to"
-msgstr ""
-
-#: filter/libfilter-i18n.h:50
-msgid "returns"
-msgstr ""
-
-#: filter/libfilter-i18n.h:51
-msgid "returns greater than"
-msgstr ""
-
-#: filter/libfilter-i18n.h:52
-msgid "returns less than"
-msgstr ""
-
-#: filter/libfilter-i18n.h:53
-#, fuzzy
-msgid "Run Program"
-msgstr "Rith roghchlár"
-
-# Avoid; either use KR or KP
-#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Scór"
-
-#: filter/libfilter-i18n.h:55
-msgid "Sender"
-msgstr ""
-
-#: filter/libfilter-i18n.h:56
-msgid "Set Status"
-msgstr ""
-
-#: filter/libfilter-i18n.h:57
-msgid "Size (kB)"
-msgstr "Méid (kB)"
-
-#: filter/libfilter-i18n.h:58
-msgid "sounds like"
-msgstr ""
-
-#: filter/libfilter-i18n.h:59
-msgid "Source Account"
-msgstr "Cuntáis foinse"
-
-#: filter/libfilter-i18n.h:60
-msgid "Specific header"
-msgstr ""
-
-#: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:63
-msgid "Stop Processing"
-msgstr ""
-
-#: filter/libfilter-i18n.h:64 mail/em-format.c:755 mail/em-format-html.c:1519
-#: mail/em-format-quote.c:302 mail/em-mailer-prefs.c:87
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
-#: smime/lib/e-cert.c:1079
-msgid "Subject"
-msgstr "Ábhar"
-
-# US
-#: filter/libfilter-i18n.h:65
-msgid "Unset Status"
-msgstr ""
-
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr ""
@@ -13061,6 +12563,12 @@ msgstr ""
 msgid "_Score Rules"
 msgstr ""
 
+# Avoid; either use KR or KP
+#: filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Scór"
+
 #: filter/searchtypes.xml.h:1
 msgid "Body contains"
 msgstr ""
@@ -13141,13 +12649,13 @@ msgstr ""
 msgid "-------- Forwarded Message --------"
 msgstr ""
 
-#: mail/em-composer-utils.c:1499
+#: mail/em-composer-utils.c:1495
 msgid "an unknown sender"
 msgstr ""
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1509
+#: mail/em-composer-utils.c:1505
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "Dé %a, %Y-%m-%d ag %H:%M %%+05d, scríobh %%s:"
 
@@ -13187,8 +12695,8 @@ msgstr ""
 msgid "Create New Folder"
 msgstr "Cruthaigh Fillteán Nua"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
-#: mail/mail-component.c:701
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
+#: mail/mail-component.c:704
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr ""
@@ -13203,107 +12711,108 @@ msgstr "Cruthaigh fillteán"
 msgid "Folder _name:"
 msgstr "Ai_nm Fillteán:"
 
-#: mail/em-folder-tree.c:839
+#: mail/em-folder-tree.c:833
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Ag dealaigh fillteán %s"
 
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree.c:835
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: mail/em-folder-tree.c:848 mail/message-list.c:1555
+#: mail/em-folder-tree.c:842 mail/message-list.c:1561
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr ""
 "Earraidh ag sábhháil scéalaí  do: %s\n"
 " %s"
 
-#: mail/em-folder-tree.c:850 mail/message-list.c:1557
+#: mail/em-folder-tree.c:844 mail/message-list.c:1563
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr ""
 "Earraidh ag sábhháil scéalaí  do: %s\n"
 " %s"
 
-#: mail/em-folder-tree.c:866
+#: mail/em-folder-tree.c:860
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 
-#: mail/em-folder-tree.c:956 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Cóip go Fillteán"
 
-#: mail/em-folder-tree.c:957 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Bog go Fillteán"
 
-#: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2069
-#: mail/em-folder-tree.c:2551 mail/em-folder-view.c:798
-#: mail/message-list.c:1645
+#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
+#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
+#: mail/message-list.c:1651
 msgid "_Move"
 msgstr "_Bog"
 
-#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#: mail/em-folder-tree.c:955 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "Cealaigh Tasc"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
 #: mail/em-folder-view.c:798 mail/em-folder-view.c:812
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Roghnaigh fillteán"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
 #, fuzzy
 msgid "C_opy"
 msgstr "Cóip"
 
-#: mail/em-folder-tree.c:2096
+#: mail/em-folder-tree.c:2088
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
+#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
 msgid "Create folder"
 msgstr "Cruthaigh fillteán"
 
-#: mail/em-folder-tree.c:2474
+#: mail/em-folder-tree.c:2463
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr ""
 
-#: mail/em-folder-tree.c:2476
+#: mail/em-folder-tree.c:2465
 msgid "Rename Folder"
 msgstr "Athainmigh Fillteán"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Feach"
 
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2537
 msgid "Open in _New Window"
 msgstr "Oscail 'san Fhuinneog _Nua"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2555
+#: mail/em-folder-tree.c:2546
 msgid "_New Folder..."
 msgstr "Fillteán _Nua..."
 
-#: mail/em-folder-tree.c:2558
+#: mail/em-folder-tree.c:2549
 msgid "_Rename"
 msgstr "_Athainmigh"
 
-#: mail/em-folder-tree.c:2561 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Roghanna..."
 
 #: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:889
+#: mail/mail-vfolder.c:888
 msgid "VFolders"
 msgstr "FFilteáin"
 
@@ -13317,19 +12826,19 @@ msgstr ""
 msgid "Inbox"
 msgstr "Imbosca"
 
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
 msgid "Loading..."
 msgstr "Ag Lódáil..."
 
 #: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
 #: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
 #: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:551
+#: mail/mail-component.c:554
 msgid "Mail"
 msgstr "Post"
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Eagar mar Scéal Nua..."
@@ -13342,17 +12851,17 @@ msgstr "_Priontáil"
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:810
+#: mail/em-folder-view.c:901 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Freagrair do Líosta"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:811
+#: mail/em-folder-view.c:902 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Freagrair do _Gach rud"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: mail/em-folder-view.c:903 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Seol ar aghaidh"
@@ -13405,6 +12914,11 @@ msgstr "_Bog go Fillteán..."
 msgid "_Copy to Folder..."
 msgstr "_Cóip do Fillteán..."
 
+# PE
+#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Lipéid"
+
 #: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr ""
@@ -13454,12 +12968,12 @@ msgid "Filter on _Mailing List"
 msgstr ""
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
-#: mail/mail-config.glade.h:66
+#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Gnáth"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1796
 msgid "Print Message"
 msgstr "Priontáil Scéal"
 
@@ -13498,12 +13012,18 @@ msgstr "Cc"
 msgid "Bcc"
 msgstr "Bcc"
 
+#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
+#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Ábhar"
+
 #: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
 #: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Dáta"
 
-#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
+#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
 msgid "Newsgroups"
 msgstr ""
 
@@ -13685,7 +13205,7 @@ msgid ""
 "practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:757
+#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
 msgid "_View Certificate"
 msgstr "_Feach Teastas"
 
@@ -13742,7 +13262,7 @@ msgstr "Aon _seachtain"
 msgid "Once per month"
 msgstr "Aon _mhí"
 
-#: mail/em-migrate.c:1072
+#: mail/em-migrate.c:1168
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13750,91 +13270,91 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1506
+#: mail/em-migrate.c:1602
 #, fuzzy, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Teip ag cruthaigh fillteán %s: %s"
 
-#: mail/em-migrate.c:1532
+#: mail/em-migrate.c:1628
 #, fuzzy, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr ""
 "Téip ag cruthaigh comhad aschur: %s\n"
 "%s"
 
-#: mail/em-migrate.c:1715
+#: mail/em-migrate.c:1811
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:1919
+#: mail/em-migrate.c:2015
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:1933
+#: mail/em-migrate.c:2029
 #, fuzzy, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr ""
 "Teip ag cruthaigh eolaire '%s':\n"
 "%s"
 
-#: mail/em-migrate.c:1962
+#: mail/em-migrate.c:2058
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#: mail/em-migrate.c:2413 mail/em-migrate.c:2425
 #, fuzzy, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr ""
 "Teip ag cruthaigh eolaire '%s':\n"
 "%s"
 
-#: mail/em-migrate.c:2480
+#: mail/em-migrate.c:2576
 #, fuzzy, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr ""
 "Téip ag cruthaigh comhad aschur: %s\n"
 "%s"
 
-#: mail/em-migrate.c:2498
+#: mail/em-migrate.c:2594
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 msgstr ""
 
-#: mail/em-popup.c:699
+#: mail/em-popup.c:700
 msgid "Save As..."
 msgstr "Sábháil Mar..."
 
 # US
-#: mail/em-popup.c:717
+#: mail/em-popup.c:718
 #, c-format
 msgid "untitled_image.%s"
 msgstr "íomhá_gan_tideál.%s"
 
-#: mail/em-popup.c:807
+#: mail/em-popup.c:808
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:809
+#: mail/em-popup.c:810
 msgid "_Reply to sender"
 msgstr ""
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:859
 msgid "_Open Link in Browser"
 msgstr ""
 
-#: mail/em-popup.c:859
+#: mail/em-popup.c:860
 msgid "Se_nd message to..."
 msgstr ""
 
-#: mail/em-popup.c:860
+#: mail/em-popup.c:861
 msgid "_Add to Addressbook"
 msgstr "_Suim do Leabhar Seoladh"
 
-#: mail/em-popup.c:966
+#: mail/em-popup.c:967
 #, c-format
 msgid "Open in %s..."
 msgstr "Oscail san %s..."
@@ -14390,7 +13910,7 @@ msgstr ""
 msgid "Mail Accounts"
 msgstr "Cuntasaí Phoist"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
 msgid "Mail Preferences"
 msgstr "Roghnachais Phoist"
 
@@ -14403,15 +13923,15 @@ msgid "Evolution is importing your old Elm mail"
 msgstr ""
 
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:226
+#: mail/importers/evolution-mbox-importer.c:221
+#: mail/importers/evolution-outlook-importer.c:255
 #: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr ""
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:222
-#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/evolution-mbox-importer.c:223
+#: mail/importers/evolution-outlook-importer.c:257
 #: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Fán le do thoil"
@@ -14431,23 +13951,25 @@ msgid "Elm"
 msgstr "Elm"
 
 #: mail/importers/evolution-mbox-importer.c:116
+#: mail/importers/evolution-outlook-importer.c:130
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Ag socraigh ffilteán: %s"
 
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 #, fuzzy
 msgid "Select folder to import into"
 msgstr "Roghnaigh fillteán"
 
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:254
 #: mail/importers/mail-importer.c:226
 #, c-format
 msgid "Importing `%s'"
 msgstr ""
 
-#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/evolution-outlook-importer.c:301
 #: mail/importers/mail-importer.c:140
 #, fuzzy
 msgid "Importing mailbox"
@@ -14588,15 +14110,15 @@ msgstr ""
 msgid "%s License Agreement"
 msgstr ""
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
 msgid "_Host:"
 msgstr "_Óst:"
 
-#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
 msgid "User_name:"
 msgstr "Ainm _Úsaideoir:"
 
-#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
 msgid "_Path:"
 msgstr "_Slí:"
 
@@ -14659,35 +14181,35 @@ msgstr "%d íomlán"
 msgid ", %d unread"
 msgstr ""
 
-#: mail/mail-component.c:653
+#: mail/mail-component.c:656
 msgid "New Mail Message"
 msgstr "Scéal Post Nua"
 
 # mt
-#: mail/mail-component.c:654
+#: mail/mail-component.c:657
 msgid "_Mail Message"
 msgstr "_Scéal Ríomhphost"
 
-#: mail/mail-component.c:655
+#: mail/mail-component.c:658
 msgid "Compose a new mail message"
 msgstr "Cruthaigh scéal phost nua"
 
-#: mail/mail-component.c:661
+#: mail/mail-component.c:664
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Fillteán Nua"
 
-#: mail/mail-component.c:662
+#: mail/mail-component.c:665
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "_Fillteán"
 
-#: mail/mail-component.c:663
+#: mail/mail-component.c:666
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Cruthaigh féilire nua"
 
-#: mail/mail-component.c:795
+#: mail/mail-component.c:798
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
@@ -14699,7 +14221,7 @@ msgstr ""
 msgid "Connecting to server..."
 msgstr ""
 
-#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr ""
 
@@ -14711,7 +14233,7 @@ msgid ""
 msgstr ""
 
 #: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid "Receiving Mail"
 msgstr ""
 
@@ -14725,7 +14247,7 @@ msgstr ""
 msgid "Please select among the following options"
 msgstr ""
 
-#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr ""
 
@@ -14735,7 +14257,7 @@ msgid ""
 "sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37
 msgid "Account Management"
 msgstr "Bainisteoireacht Chuntas"
 
@@ -14748,232 +14270,237 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:2
 msgid " Ch_eck for Supported Types "
 msgstr ""
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
 msgid "<b>Preview</b>"
 msgstr "<b>Reamhthaispeáintas</b>"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr ""
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "<b>S_ignatures</b>"
 msgstr "<b>Stádas:</b>"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "<b>_Languages</b>"
 msgstr "_Teanga:"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
+msgid "<small>This will make the the filter more reliable, but slower</small>"
+msgstr ""
+
+#: mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Checking for New Mail</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">General</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Security</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:34
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:35
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:36
 msgid "Account Editor"
 msgstr "Eagarthóir Chuntas"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:38
 #, fuzzy
 msgid "Add Ne_w Signature..."
 msgstr "Suimigh Siniú"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Add _Script"
 msgstr "_Slándáil"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:40
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:44
 msgid "Always _sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Attach original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Ceangaltán"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:48
 msgid "Automatically _insert smiley images"
 msgstr ""
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Automatically check for _new mail every"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltach (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltach (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Beep w_hen new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "C_haracter set:"
 msgstr ""
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 msgid "Ch_eck for Supported Types "
 msgstr ""
 
-#: mail/mail-config.glade.h:53
-msgid "Check _Incoming Mail"
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Check _incoming mail for junk"
 msgstr "Post ríomhphost"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 msgid "Color for _misspelled words:"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Colors"
 msgstr "_Dathanna"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 msgid "Confirm _when expunging a folder"
 msgstr ""
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14983,369 +14510,365 @@ msgid ""
 "Click \"Apply\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
 msgid "De_fault"
 msgstr "_Gnáth"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 msgid "Default character e_ncoding:"
 msgstr ""
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 #, fuzzy
 msgid "Defaults"
 msgstr "Gnáth"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 msgid "Do not quote original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Críochnaithe"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Drafts _Folder:"
 msgstr "_Fillteaín:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:77
 msgid "Email Accounts"
 msgstr "Cuntasaí Rphoist"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Email _Address:"
 msgstr "_Seoladh R-phost:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:79
 msgid "Empty trash folders on e_xit"
 msgstr ""
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
 msgid "Encry_ption certificate:"
 msgstr ""
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:81
 msgid "Evolution Account Assistant"
 msgstr ""
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:82
 msgid "Execute Command..."
 msgstr ""
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:83
 msgid "Fi_xed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 msgid "Font Properties"
 msgstr "Álbachtaí Clófhoireann"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 msgid "Format messages in _HTML"
 msgstr ""
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "HTML Mail"
 msgstr "Post _HTML"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Headers"
 msgstr "_Aimsir"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr ""
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-# ie
 #: mail/mail-config.glade.h:91
+msgid "I_nclude remote tests"
+msgstr ""
+
+# ie
+#: mail/mail-config.glade.h:94
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Mail Configuration"
 msgstr "Socrú Post"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "Áit do Bosca Phoist"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr "Scríobhóir Scéal"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Or_ganization:"
 msgstr "_Eagrú:"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "PGP/GPG _Key ID:"
 msgstr "ID _Eochar PGP:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Play sound file when new mail arri_ves"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr ""
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Re_member password"
 msgstr "Pasfhocal, le do thoil"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr "_Freagrair-Do"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:120
 #, fuzzy
 msgid "Receiving Options"
 msgstr "Cumraigh do %s"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
 #, fuzzy
 msgid "Remember _password"
 msgstr "Pasfhocal, le do thoil"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
 msgid "S_tandard Font:"
 msgstr ""
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 #, fuzzy
 msgid "Security"
 msgstr "_Slándáil"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:126
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:127
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:128
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:129
 #, fuzzy
 msgid "Select..."
 msgstr "_Roghnaigh..."
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Sent _Messages Folder:"
 msgstr "Roghnaigh Fillteán Tascanna"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:134
 msgid "Ser_ver requires authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:135
 msgid "Server _Type: "
 msgstr "_Saghas Freastalaî: "
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:136
 msgid "Si_gning certificate:"
 msgstr ""
 
 # SG
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:137
 #, fuzzy
 msgid "Signat_ure:"
 msgstr "Siniú:"
 
 # SG
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "Signatures"
 msgstr "Siniú:"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr ""
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:140
 msgid "Spell Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:141
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:142
 msgid "T_erminal Font:"
 msgstr ""
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "T_ype: "
 msgstr "Saghas:"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:149
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:148
-msgid "Use _Daemon"
-msgstr ""
-
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:152
 msgid "V_ariable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:153
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Forward\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:158
 msgid "_Add Signature"
 msgstr "_Suimigh Siniú"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:159
 msgid "_Always load images from the Internet"
 msgstr ""
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:160
 msgid "_Digitally sign outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:161
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:163
 msgid "_Enable"
 msgstr "Chumasach"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:165
 msgid "_Forward style:"
 msgstr ""
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:168
 msgid "_Load images if sender is in address book"
 msgstr ""
 
-#: mail/mail-config.glade.h:167
-msgid "_Local Tests Only"
-msgstr ""
-
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_Mark messages as read after"
 msgstr ""
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 msgid "_Never load images from the Internet"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:175
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:176
 msgid "_Reply style:"
 msgstr ""
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:177
 msgid "_Script:"
 msgstr ""
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:178
 msgid "_Show animated images"
 msgstr ""
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 msgid "_Use Secure Connection (SSL):"
 msgstr ""
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:181
 msgid "color"
 msgstr "dath"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "sonraí"
 
@@ -15503,7 +15026,7 @@ msgstr ""
 
 #. mail:camel-exception primary
 #: mail/mail-errors.xml.h:57
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgid "Your message with the subject \"{0}\" was not delivered."
 msgstr ""
 
 #. mail:camel-exception secondary
@@ -15561,11 +15084,6 @@ msgstr "Earraidh ag lódáil leabharsheoladh loicead."
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Teip ag cruthaigh eolaire '%s': %s."
 
-#. mail:no-save-path secondary
-#: mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail:no-create-path primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
@@ -15590,12 +15108,6 @@ msgstr ""
 msgid "Cannot create temporary save directory."
 msgstr "Teip ag cruthaigh eolaire '%s': %s."
 
-#. mail:no-create-tmp-path secondary
-#: mail/mail-errors.xml.h:100 mail/mail-errors.xml.h:112
-#: widgets/misc/e-system-errors.xml.h:11 widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail:no-write-path-exists secondary
 #: mail/mail-errors.xml.h:104
 msgid "File exists but cannot overwrite it."
@@ -15858,144 +15370,140 @@ msgstr ""
 msgid "_Append"
 msgstr "Post"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:785
 #, c-format
 msgid "Pinging %s"
 msgstr ""
 
-#: mail/mail-mt.c:897
-msgid "Working"
-msgstr "Ag Obair"
-
-#: mail/mail-ops.c:99
+#: mail/mail-ops.c:98
 msgid "Filtering Folder"
 msgstr ""
 
-#: mail/mail-ops.c:260
+#: mail/mail-ops.c:259
 msgid "Fetching Mail"
 msgstr ""
 
-#: mail/mail-ops.c:543
+#: mail/mail-ops.c:542
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr ""
 
-#: mail/mail-ops.c:568
+#: mail/mail-ops.c:567
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:577
+#: mail/mail-ops.c:576
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr ""
 
-#: mail/mail-ops.c:673
+#: mail/mail-ops.c:672
 #, c-format
 msgid "Sending message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:703
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr ""
 
-#: mail/mail-ops.c:708
+#: mail/mail-ops.c:707
 msgid "Complete."
 msgstr "Críochnaithe."
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:804
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:1002
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1116
+#: mail/mail-ops.c:1115
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1159
+#: mail/mail-ops.c:1158
 #, c-format
 msgid "Opening folder %s"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1230
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1308
 #, c-format
 msgid "Removing folder %s"
 msgstr "Ag dealaigh fillteán %s"
 
-#: mail/mail-ops.c:1403
+#: mail/mail-ops.c:1402
 #, c-format
 msgid "Storing folder '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1468
+#: mail/mail-ops.c:1467
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1469
+#: mail/mail-ops.c:1468
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Líosta do cuntasaí"
 
-#: mail/mail-ops.c:1524
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr ""
 
-#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
+#: mail/mail-ops.c:1559 mail/mail-ops.c:1610
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1607
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1609
+#: mail/mail-ops.c:1608
 msgid "Local Folders"
 msgstr "Fillteáin Áitiúl"
 
-#: mail/mail-ops.c:1692
+#: mail/mail-ops.c:1691
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1764
+#: mail/mail-ops.c:1763
 #, fuzzy, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Ag Sábháil %d scéal(aí)"
 msgstr[1] "Ag Sábháil %d scéal(aí)"
 
-#: mail/mail-ops.c:1850
+#: mail/mail-ops.c:1849
 #, fuzzy, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Ag Sábháil %d scéal(aí)"
 msgstr[1] "Ag Sábháil %d scéal(aí)"
 
-#: mail/mail-ops.c:1900
+#: mail/mail-ops.c:1899
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -16004,7 +15512,7 @@ msgstr ""
 "Téip ag cruthaigh comhad aschur: %s\n"
 "%s"
 
-#: mail/mail-ops.c:1928
+#: mail/mail-ops.c:1927
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -16013,11 +15521,11 @@ msgstr ""
 "Earraidh ag sábhháil scéalaí  do: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1999
+#: mail/mail-ops.c:1998
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:2016
+#: mail/mail-ops.c:2015
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -16026,17 +15534,17 @@ msgstr ""
 "Teip ag cruthaigh comhad aschur: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2046
+#: mail/mail-ops.c:2045
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Cumraigh do %s"
@@ -16100,24 +15608,24 @@ msgstr ""
 msgid "Waiting..."
 msgstr "Ag Fanacht..."
 
-#: mail/mail-session.c:238
+#: mail/mail-session.c:239
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-session.c:271
+#: mail/mail-session.c:272
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Pasfhocal do %s, le do thoil"
 
-#: mail/mail-session.c:273
+#: mail/mail-session.c:274
 msgid "Enter Password"
 msgstr "Pasfhocal, le do thoil"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password"
 msgstr ""
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:298
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
@@ -16175,79 +15683,79 @@ msgstr "Ag oscailt an t-eolaire %s"
 msgid "Updating vFolders for '%s'"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: mail/mail-vfolder.c:959
+#: mail/mail-vfolder.c:958
 msgid "vFolders"
 msgstr "fFillteáin"
 
-#: mail/mail-vfolder.c:998
+#: mail/mail-vfolder.c:997
 msgid "Edit VFolder"
 msgstr "Eagar FFilteán"
 
-#: mail/mail-vfolder.c:1082
+#: mail/mail-vfolder.c:1081
 msgid "New VFolder"
 msgstr "Fillteán Nua"
 
-#: mail/message-list.c:946
+#: mail/message-list.c:948
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:947
+#: mail/message-list.c:949
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:948
+#: mail/message-list.c:950
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:949
+#: mail/message-list.c:951
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:950
+#: mail/message-list.c:952
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:954
+#: mail/message-list.c:956
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:955
+#: mail/message-list.c:957
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:959
+#: mail/message-list.c:961
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:960
+#: mail/message-list.c:962
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:1279
+#: mail/message-list.c:1285
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1286
+#: mail/message-list.c:1292
 msgid "Today %l:%M %p"
 msgstr "Inniú %l:%M %p"
 
-#: mail/message-list.c:1295
+#: mail/message-list.c:1301
 msgid "Yesterday %l:%M %p"
 msgstr "Inné %l:%M %p"
 
-#: mail/message-list.c:1307
+#: mail/message-list.c:1313
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %"
 
-#: mail/message-list.c:1315
+#: mail/message-list.c:1321
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1317
+#: mail/message-list.c:1323
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3300
+#: mail/message-list.c:3321
 msgid "Generating message list"
 msgstr ""
 
@@ -16304,6 +15812,10 @@ msgstr ""
 msgid "No Response Necessary"
 msgstr ""
 
+#: mail/message-tag-followup.c:79
+msgid "Read"
+msgstr ""
+
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Freagrair"
@@ -16400,45 +15912,49 @@ msgid ""
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:10
-msgid "Whether Evolution should start up in offline mode"
+msgid "Toolbar is visible"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid "Whether Evolution should start up in offline mode"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Whether the toolbar should be visible."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
 msgid "Whether to skip the development warning dialog"
 msgstr ""
 
 # ta
-#: shell/apps_evolution_shell.schemas.in.in.h:12
+#: shell/apps_evolution_shell.schemas.in.in.h:14
 msgid "mail"
 msgstr "post"
 
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
-msgstr ""
-
-#: shell/e-shell.c:545 shell/e-shell.c:546
+#: shell/e-shell.c:588 shell/e-shell.c:589
 #, fuzzy, c-format
 msgid "%ld KB"
 msgstr "%d %B"
 
-#: shell/e-shell.c:744
+#: shell/e-shell.c:786
 #, fuzzy
 msgid "Uknown system error."
 msgstr "Earraidh gan fhois"
 
-#: shell/e-shell.c:1101
+#: shell/e-shell.c:1143
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:1103
+#: shell/e-shell.c:1145
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:1105
+#: shell/e-shell.c:1147
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:1107
+#: shell/e-shell.c:1149
 msgid "Generic error"
 msgstr ""
 
@@ -16486,7 +16002,7 @@ msgstr ""
 msgid "Select importer"
 msgstr ""
 
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1026
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
 #, c-format
 msgid "File %s does not exist"
 msgstr ""
@@ -16512,55 +16028,57 @@ msgid ""
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:549
+#: shell/e-shell-importer.c:570
 msgid "Automatic"
 msgstr "Uathoibríoch"
 
-#: shell/e-shell-importer.c:598
-msgid "_Filename:"
-msgstr "_Ainm Chomad:"
+# vi
+#: shell/e-shell-importer.c:626
+#, fuzzy
+msgid "F_ilename:"
+msgstr "Ainm chomhaid:"
 
-#: shell/e-shell-importer.c:603
+#: shell/e-shell-importer.c:631
 msgid "Select a file"
 msgstr "Roghnaigh Comhad"
 
-#: shell/e-shell-importer.c:613
+#: shell/e-shell-importer.c:642
 msgid "File _type:"
 msgstr "_Saghas comhad:"
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:681
 msgid "Import data and settings from _older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:684
 msgid "Import a _single file"
 msgstr ""
 
-#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:727
+#: shell/e-shell-importer.c:756
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:853 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
 #, c-format
 msgid "From %s:"
 msgstr "Ó %s:"
 
-#: shell/e-shell-importer.c:1044
+#: shell/e-shell-importer.c:1073
 #, c-format
 msgid "No importer available for file %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:1056
+#: shell/e-shell-importer.c:1085
 msgid "Unable to execute importer"
 msgstr ""
 
-#: shell/e-shell-importer.c:1169
+#: shell/e-shell-importer.c:1199
 msgid "_Import"
 msgstr ""
 
@@ -16605,54 +16123,54 @@ msgstr ""
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: shell/e-shell-window.c:336
+#: shell/e-shell-window.c:337
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-window.c:343
+#: shell/e-shell-window.c:344
 msgid "Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-window.c:349
+#: shell/e-shell-window.c:350
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell-window.c:621
+#: shell/e-shell-window.c:637
 #, fuzzy, c-format
 msgid "Switch to %s"
 msgstr "Post do %s"
 
-#: shell/e-shell-window-commands.c:64
+#: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: shell/e-shell-window-commands.c:72
+#: shell/e-shell-window-commands.c:74
 #, c-format
 msgid "Error executing %s."
 msgstr ""
 
-#: shell/e-shell-window-commands.c:121
+#: shell/e-shell-window-commands.c:123
 msgid "Bug buddy is not installed."
 msgstr ""
 
-#: shell/e-shell-window-commands.c:129
+#: shell/e-shell-window-commands.c:131
 msgid "Bug buddy could not be run."
 msgstr ""
 
-#: shell/e-shell-window-commands.c:171
+#: shell/e-shell-window-commands.c:323
 #, fuzzy
-msgid "About Evolution"
-msgstr "Faoi Ximian Evolution"
+msgid "Groupware Suite"
+msgstr "Grupa"
 
-#: shell/e-shell-window-commands.c:382
+#: shell/e-shell-window-commands.c:563
 msgid "_Work Online"
 msgstr ""
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr ""
 
-#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr ""
 
@@ -16664,35 +16182,6 @@ msgstr ""
 msgid "New"
 msgstr "Nua"
 
-#: shell/evolution-shell-component-utils.c:115
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Earraidh gan fhois."
-
-#: shell/evolution-shell-component-utils.c:118
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-
-#: shell/evolution-shell-component-utils.c:125
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-
 #: shell/evolution-test-component.c:140
 #, fuzzy
 msgid "New Test"
@@ -17003,30 +16492,30 @@ msgid ""
 "Click help for details."
 msgstr ""
 
-#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:522
+#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
+#: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
 msgstr ""
 
-#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:604
+#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
+#: smime/gui/certificate-manager.c:638
 msgid "Certificate Name"
 msgstr "Ainm Teastas"
 
-#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
+#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
 msgid "Purposes"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:517
+#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:267
+#: smime/gui/certificate-manager.c:271
 msgid "Expires"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:417
+#: smime/gui/certificate-manager.c:446
 msgid "E-Mail Address"
 msgstr "Seoladh R-Post:"
 
@@ -17066,6 +16555,11 @@ msgid ""
 "  Subject: %s\n"
 msgstr ""
 
+#: smime/gui/e-cert-selector.c:169
+#, fuzzy
+msgid "Select certificate"
+msgstr "Roghnaigh Comhad"
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -17120,7 +16614,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
 msgid "Certificate"
 msgstr "Teastas"
 
@@ -17140,19 +16634,23 @@ msgstr ""
 msgid "Contact Certificates"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:21
-#, no-c-format
-msgid "Do you want to trust \"%s\" for the following purposes?"
+#: smime/gui/smime-ui.glade.h:20
+msgid "Do not trust the authenticity of this certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:21
 msgid "Dummy window only"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:22
 msgid "Edit"
 msgstr "Eagar"
 
+#: smime/gui/smime-ui.glade.h:23
+#, fuzzy
+msgid "Email Certificate Trust Settings"
+msgstr "Sonraí Theastas"
+
 #: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr ""
@@ -17185,248 +16683,261 @@ msgstr ""
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:37
-msgid "Trust this CA to identify email users."
+msgid "Trust the authenticity of this certificate"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:38
-msgid "Trust this CA to identify software developers."
+msgid "Trust this CA to identify email users."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:39
-msgid "Trust this CA to identify web sites."
+msgid "Trust this CA to identify software developers."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:40
-msgid "View"
-msgstr "Feach"
+msgid "Trust this CA to identify web sites."
+msgstr ""
 
 #: smime/gui/smime-ui.glade.h:41
-msgid "View Certificate"
-msgstr "Feach Teastas"
+msgid "View"
+msgstr "Feach"
 
 #: smime/gui/smime-ui.glade.h:42
-msgid "You have been asked to trust a new Certificate Authority (CA)."
+msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:43
-msgid "You have certificates from these organizations that identify you:"
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:44
-msgid ""
-"You have certificates on file that identify these certificate authorities:"
+msgid "You have certificates on file that identify these people:"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:45
-msgid "You have certificates on file that identify these people:"
+msgid "Your Certificates"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:46
-msgid "Your Certificates"
+msgid "_Edit CA Trust"
 msgstr ""
 
-#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
+#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
-#: smime/lib/e-cert.c:478
+# ES
+#. x509 certificate usage types
+#: smime/lib/e-cert.c:424
+#, fuzzy
+msgid "Sign"
+msgstr "An Spáinn"
+
+# EG
+#: smime/lib/e-cert.c:425
+#, fuzzy
+msgid "Encrypt"
+msgstr "An Éigipt"
+
+#: smime/lib/e-cert.c:530
 msgid "Version"
 msgstr "Leagan"
 
-#: smime/lib/e-cert.c:493
+#: smime/lib/e-cert.c:545
 msgid "Version 1"
 msgstr "Leagan 1"
 
-#: smime/lib/e-cert.c:496
+#: smime/lib/e-cert.c:548
 msgid "Version 2"
 msgstr "Leagan 2"
 
-#: smime/lib/e-cert.c:499
+#: smime/lib/e-cert.c:551
 msgid "Version 3"
 msgstr "Leagan 3"
 
-#: smime/lib/e-cert.c:581
+#: smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:584
+#: smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:587
+#: smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:590
+#: smime/lib/e-cert.c:642
 msgid "C"
 msgstr "C"
 
-#: smime/lib/e-cert.c:593
+#: smime/lib/e-cert.c:645
 msgid "CN"
 msgstr "CN"
 
-#: smime/lib/e-cert.c:596
+#: smime/lib/e-cert.c:648
 msgid "OU"
 msgstr ""
 
-#: smime/lib/e-cert.c:599
+#: smime/lib/e-cert.c:651
 msgid "O"
 msgstr "O"
 
-#: smime/lib/e-cert.c:602
+#: smime/lib/e-cert.c:654
 msgid "L"
 msgstr ""
 
-#: smime/lib/e-cert.c:605
+#: smime/lib/e-cert.c:657
 msgid "DN"
 msgstr ""
 
-#: smime/lib/e-cert.c:608
+#: smime/lib/e-cert.c:660
 msgid "DC"
 msgstr ""
 
-#: smime/lib/e-cert.c:611
+#: smime/lib/e-cert.c:663
 msgid "ST"
 msgstr ""
 
-#: smime/lib/e-cert.c:614
+#: smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:617
+#: smime/lib/e-cert.c:669
 msgid "Certificate Key Usage"
 msgstr ""
 
-#: smime/lib/e-cert.c:620
+#: smime/lib/e-cert.c:672
 msgid "Netscape Certificate Type"
 msgstr ""
 
-#: smime/lib/e-cert.c:623
+#: smime/lib/e-cert.c:675
 msgid "Certificate Authority Key Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:626
+#: smime/lib/e-cert.c:678
 msgid "UID"
 msgstr ""
 
-#: smime/lib/e-cert.c:635
+#: smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr ""
 
-#: smime/lib/e-cert.c:686
+#: smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:694
+#: smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
 msgstr ""
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:768
 msgid "Subject Public Key Info"
 msgstr ""
 
-#: smime/lib/e-cert.c:721
+#: smime/lib/e-cert.c:773
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:736
+#: smime/lib/e-cert.c:788
 msgid "Subject's Public Key"
 msgstr ""
 
-#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
+#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
 msgid "Error: Unable to process extension"
 msgstr ""
 
-#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
+#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:782
+#: smime/lib/e-cert.c:834
 msgid "SSL Certificate Authority"
 msgstr ""
 
-#: smime/lib/e-cert.c:786
+#: smime/lib/e-cert.c:838
 msgid "Email Certificate Authority"
 msgstr ""
 
-#: smime/lib/e-cert.c:814
+#: smime/lib/e-cert.c:866
 msgid "Signing"
 msgstr ""
 
-#: smime/lib/e-cert.c:818
+#: smime/lib/e-cert.c:870
 msgid "Non-repudiation"
 msgstr ""
 
-#: smime/lib/e-cert.c:822
+#: smime/lib/e-cert.c:874
 msgid "Key Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:826
+#: smime/lib/e-cert.c:878
 msgid "Data Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:830
+#: smime/lib/e-cert.c:882
 msgid "Key Agreement"
 msgstr ""
 
-#: smime/lib/e-cert.c:834
+#: smime/lib/e-cert.c:886
 msgid "Certificate Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:838
+#: smime/lib/e-cert.c:890
 msgid "CRL Signer"
 msgstr ""
 
 # PK
-#: smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:938
 msgid "Critical"
 msgstr ""
 
-#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
+#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
 msgid "Not Critical"
 msgstr ""
 
-#: smime/lib/e-cert.c:912
+#: smime/lib/e-cert.c:964
 msgid "Extensions"
 msgstr ""
 
-#: smime/lib/e-cert.c:983
+#: smime/lib/e-cert.c:1035
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
 msgid "Certificate Signature Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:1048
+#: smime/lib/e-cert.c:1100
 msgid "Issuer"
 msgstr ""
 
-#: smime/lib/e-cert.c:1102
+#: smime/lib/e-cert.c:1154
 msgid "Issuer Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1121
+#: smime/lib/e-cert.c:1173
 msgid "Subject Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1164
+#: smime/lib/e-cert.c:1216
 msgid "Certificate Signature Value"
 msgstr ""
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
+#: smime/lib/e-cert-db.c:608
 msgid "Certificate already exists"
 msgstr ""
 
@@ -17573,7 +17084,7 @@ msgstr ""
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "_Gníomhartha"
 
@@ -17736,7 +17247,7 @@ msgstr "_Dún"
 #: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:3
+#: ui/evolution.xml.h:4
 msgid "Close"
 msgstr "Dún"
 
@@ -17749,7 +17260,7 @@ msgid "Delete this item"
 msgstr ""
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr ""
 
@@ -17792,7 +17303,7 @@ msgstr ""
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:44
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "_File"
 msgstr "_Comhad"
 
@@ -18049,13 +17560,13 @@ msgstr ""
 msgid "_Threaded Message List"
 msgstr ""
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Dún an fhuinneog seo"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "_Close"
 msgstr "_Dún"
 
@@ -18458,7 +17969,7 @@ msgstr ""
 msgid "_Quoted"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
 msgid "_Tools"
 msgstr "Uir_lisí"
 
@@ -18756,109 +18267,121 @@ msgid "_Open Task"
 msgstr "_Oscail Tasc"
 
 #: ui/evolution.xml.h:1
-msgid "About Ximian Evolution..."
-msgstr "Faoi Ximian Evolution..."
+#, fuzzy
+msgid "About Evolution..."
+msgstr "Faoi Ximian Evolution"
 
 #: ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
 msgstr ""
 
-#: ui/evolution.xml.h:5
+#: ui/evolution.xml.h:3
+msgid "Change the visibility of the toolbar"
+msgstr ""
+
+#: ui/evolution.xml.h:6
 #, fuzzy
 msgid "Create a new window displaying this folder"
 msgstr "Cruthaigh féilire nua"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "_Ealu"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Ximian Evolution _FAQ"
+
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Éirigh as an ríomhchlár"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:10
 msgid "Forget _Passwords"
 msgstr ""
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:11
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:12
 msgid "Import data from other programs"
 msgstr ""
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:14
 #, fuzzy
 msgid "New _Window"
 msgstr "_Fuinneog"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Pi_lot Settings..."
 msgstr "Albachtaí Pi_lot..."
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Send / Receive"
 msgstr ""
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Send queued items and retrieve new items"
 msgstr ""
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Set up Pilot configuration"
 msgstr "Socrú cumraíocht Pilot"
 
-#: ui/evolution.xml.h:17
-msgid "Show information about Ximian Evolution"
+#: ui/evolution.xml.h:19
+#, fuzzy
+msgid "Show information about Evolution"
 msgstr "Taispeán eolas faoi Ximian Evolution"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:20
 msgid "Submit Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:21
 msgid "Submit _Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Submit a bug report using Bug Buddy"
 msgstr ""
 
-#: ui/evolution.xml.h:21
-msgid "Toggle whether we are working offline."
-msgstr ""
-
 #: ui/evolution.xml.h:23
-msgid "Ximian Evolution _FAQ"
-msgstr "Ximian Evolution _FAQ"
+msgid "T_oolbar"
+msgstr ""
 
 #: ui/evolution.xml.h:24
-msgid "_About Ximian Evolution..."
-msgstr "_Faoi Ximian Evolution..."
+msgid "Toggle whether we are working offline."
+msgstr ""
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "_About Evolution..."
+msgstr "Faoi Ximian Evolution"
+
+#: ui/evolution.xml.h:30
 msgid "_Help"
 msgstr "Cab_hair"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "_Import..."
 msgstr ""
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "_New"
 msgstr "_Nua"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 #, fuzzy
 msgid "_Quick Reference"
 msgstr "Roghnachais Phoist"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_Send / Receive"
 msgstr ""
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 #, fuzzy
 msgid "_Window"
 msgstr "_Fuinneog"
@@ -18932,7 +18455,7 @@ msgid "With _Status"
 msgstr "_Stádas:"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:626
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:635
 msgid "UTC"
 msgstr "UTC"
 
@@ -19092,29 +18615,29 @@ msgstr "Eile..."
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
-#: widgets/misc/e-error.c:121
+#: widgets/misc/e-error.c:79 widgets/misc/e-error.c:80
+#: widgets/misc/e-error.c:122
 msgid "Evolution Error"
 msgstr "Earráid Evolution"
 
-#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
-#: widgets/misc/e-error.c:119
+#: widgets/misc/e-error.c:81 widgets/misc/e-error.c:82
+#: widgets/misc/e-error.c:120
 #, fuzzy
 msgid "Evolution Warning"
 msgstr "Post Evolution"
 
-#: widgets/misc/e-error.c:118
+#: widgets/misc/e-error.c:119
 #, fuzzy
 msgid "Evolution Information"
 msgstr "Eolas cruinniú"
 
-#: widgets/misc/e-error.c:120
+#: widgets/misc/e-error.c:121
 #, fuzzy
 msgid "Evolution Query"
 msgstr "Evolution"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:410
+#: widgets/misc/e-error.c:415
 #, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -19260,16 +18783,126 @@ msgstr ""
 " Ní féidir sábháil go `%s'\n"
 "  %s"
 
-#: widgets/misc/e-task-widget.c:211
+#: widgets/misc/e-task-widget.c:212
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: widgets/misc/e-task-widget.c:216
+#: widgets/misc/e-task-widget.c:217
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% Rinneadh)"
 
+#~ msgid "1:00"
+#~ msgstr "1:00"
+
+#~ msgid "5:00"
+#~ msgstr "5:00"
+
+#~ msgid "Email address:"
+#~ msgstr "Seoladh Rphost:"
+
+#~ msgid "One"
+#~ msgstr "Aon"
+
+#~ msgid "Sub"
+#~ msgstr "Fó"
+
+#~ msgid "U_se SSL/TLS:"
+#~ msgstr "Ú_sáid SSL/TLS:"
+
+#~ msgid "_Display name:"
+#~ msgstr "Ainm _taispeáint:"
+
+#~ msgid "_Port number:"
+#~ msgstr "Uimhir _Poirt:"
+
+#~ msgid "_Server name:"
+#~ msgstr "Ainm _Freastalaí:"
+
+#, fuzzy
+#~ msgid "Job title:"
+#~ msgstr "Tideal _Post:"
+
+#, fuzzy
+#~ msgid "Webcam:"
+#~ msgstr "Leathanach Lín:"
+
+#~ msgid "Error saving %s: %s"
+#~ msgstr "Earráid ag sábhháil %s: %s"
+
+#~ msgid "Calendar Properties"
+#~ msgstr "Roghnachais na Fheilire"
+
+# Avoid; either use KR or KP
+#~ msgid "_Source URL:"
+#~ msgstr "URL _Fhoinse:"
+
+#, fuzzy
+#~ msgid "Error posting message: %s: message not posted"
+#~ msgstr ""
+#~ "Earraidh ag sábhháil scéal: %s\n"
+#~ " %s"
+
+#, fuzzy
+#~ msgid "Stream error"
+#~ msgstr "Earraidh Eile"
+
+#, fuzzy
+#~ msgid "Connection error: %s"
+#~ msgstr "Earraidh gan fhois: %s"
+
+#~ msgid "Could not get group: %s"
+#~ msgstr "Ní raibh an grúpa ar fáil: %s"
+
+#, fuzzy
+#~ msgid "Could not get messages: unspecified error"
+#~ msgstr "Níl an scéal %s ar fáil: %s"
+
+#~ msgid "Attachments"
+#~ msgstr "Ceangaltáin"
+
+#~ msgid "Deleted"
+#~ msgstr "Scrioste"
+
+#, fuzzy
+#~ msgid "Pipe to Program"
+#~ msgstr "Éirigh as an ríomhchlár"
+
+#, fuzzy
+#~ msgid "Run Program"
+#~ msgstr "Rith roghchlár"
+
+#~ msgid "Size (kB)"
+#~ msgstr "Méid (kB)"
+
+#~ msgid "Source Account"
+#~ msgstr "Cuntáis foinse"
+
+#~ msgid "Working"
+#~ msgstr "Ag Obair"
+
+#~ msgid "_Filename:"
+#~ msgstr "_Ainm Chomad:"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "Unknown error."
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Earraidh gan fhois."
+
+#~ msgid "View Certificate"
+#~ msgstr "Feach Teastas"
+
+#~ msgid "About Ximian Evolution..."
+#~ msgstr "Faoi Ximian Evolution..."
+
+#~ msgid "_About Ximian Evolution..."
+#~ msgstr "_Faoi Ximian Evolution..."
+
 #, fuzzy
 #~ msgid "Address 2:"
 #~ msgstr "Seoladh _2:"
@@ -19349,9 +18982,6 @@ msgstr "%s (%d%% Rinneadh)"
 #~ msgid "Primary _email:"
 #~ msgstr "R-Phost Thósaiocht"
 
-#~ msgid "S_pouse:"
-#~ msgstr "_Céile:"
-
 #~ msgid "_Business:"
 #~ msgstr "_Gnó:"
 
@@ -19364,9 +18994,6 @@ msgstr "%s (%d%% Rinneadh)"
 #~ msgid "_Mobile:"
 #~ msgstr "Fón _Póca:"
 
-#~ msgid "_Office:"
-#~ msgstr "_Oifig:"
-
 #~ msgid "_Public Calendar URL:"
 #~ msgstr "URL do Féilire Poiblí:"
 
diff --git a/po/gl.po b/po/gl.po
index 4fd703ee14..a3f70aa8e3 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2004-05-19 14:00-0400\n"
+"POT-Creation-Date: 2004-06-03 11:14-0400\n"
 "PO-Revision-Date: 2001-09-17 15:10+0200\n"
 "Last-Translator: Manuel A. Fernández Montecelo <manuel@sindominio.net>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -68,14 +68,14 @@ msgstr "1 tarxeta"
 msgid "Default Sync Address:"
 msgstr "Enderezo de Correo:"
 
-#: addressbook/conduit/address-conduit.c:1150
 #: addressbook/conduit/address-conduit.c:1151
+#: addressbook/conduit/address-conduit.c:1152
 #, fuzzy
 msgid "Could not load addressbook"
 msgstr "Non foi posible cargar %s: %s"
 
-#: addressbook/conduit/address-conduit.c:1219
-#: addressbook/conduit/address-conduit.c:1222
+#: addressbook/conduit/address-conduit.c:1220
+#: addressbook/conduit/address-conduit.c:1223
 msgid "Could not read pilot's Address application block"
 msgstr "Non foi posible ler o bloque de aplicación Enderezo do pilot"
 
@@ -83,8 +83,8 @@ msgstr "Non foi posible ler o bloque de aplicación Enderezo do pilot"
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
 #, fuzzy
 msgid "Failed to authenticate.\n"
 msgstr ""
@@ -92,8 +92,8 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
 #, fuzzy, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "Introduza o seu contrasinal para %s"
@@ -141,65 +141,24 @@ msgstr "Co_ntactos:"
 msgid "Create a new contacts group"
 msgstr "Crear un novo grupo de atallos"
 
-#: addressbook/gui/component/addressbook-component.c:182
+#: addressbook/gui/component/addressbook-component.c:184
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:483
-#, fuzzy
-msgid "Failed to connect to LDAP server"
-msgstr ""
-"Non foi posible autenticarse co servidor IMAP.\n"
-"%s\n"
-"\n"
-
-#: addressbook/gui/component/addressbook-config.c:507
-#, fuzzy
-msgid "Failed to authenticate with LDAP server"
-msgstr ""
-"Non foi posible autenticarse co servidor IMAP.\n"
-"%s\n"
-"\n"
-
-#: addressbook/gui/component/addressbook-config.c:535
-msgid "Could not perform query on Root DSE"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:840
-msgid "The server responded with no supported search bases"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1245
-#, fuzzy
-msgid "This server does not support LDAPv3 schema information"
-msgstr "A resposta do servidor IMAP non contiña información sobre %s"
-
-#: addressbook/gui/component/addressbook-config.c:1266
-#, fuzzy
-msgid "Error retrieving schema information"
-msgstr ""
-"Erro ao cargar a información do filtro:\n"
-"%s"
-
-#: addressbook/gui/component/addressbook-config.c:1274
-#, fuzzy
-msgid "Server did not respond with valid schema information"
-msgstr "A resposta do servidor IMAP non contiña información sobre %s"
-
 #: addressbook/gui/component/addressbook-migrate.c:68
-#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1160
 #, fuzzy
 msgid "Migrating..."
 msgstr "Agardando..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1201
 #, fuzzy, c-format
 msgid "Migrating `%s':"
 msgstr "Examinando %s"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:438
+#: addressbook/gui/component/addressbook-migrate.c:464
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
 #: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
@@ -207,31 +166,31 @@ msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:446
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
-#: mail/mail-config.glade.h:106
+#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
+#: mail/mail-config.glade.h:109
 msgid "Personal"
 msgstr ""
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:454
+#: addressbook/gui/component/addressbook-migrate.c:480
 #, fuzzy
 msgid "On LDAP Servers"
 msgstr "Servidor NNTP:"
 
-#: addressbook/gui/component/addressbook-migrate.c:582
+#: addressbook/gui/component/addressbook-migrate.c:608
 #, fuzzy
 msgid "LDAP Servers"
 msgstr "Servidor NNTP:"
 
-#: addressbook/gui/component/addressbook-migrate.c:702
+#: addressbook/gui/component/addressbook-migrate.c:728
 #, fuzzy
 msgid "Autocompletion Settings"
 msgstr "Data na que se completa"
 
-#: addressbook/gui/component/addressbook-migrate.c:1076
+#: addressbook/gui/component/addressbook-migrate.c:1104
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -239,60 +198,55 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1090
+#: addressbook/gui/component/addressbook-migrate.c:1118
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1099
+#: addressbook/gui/component/addressbook-migrate.c:1127
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1109
+#: addressbook/gui/component/addressbook-migrate.c:1137
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:674
+#: addressbook/gui/component/addressbook-view.c:675
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:761
+#: addressbook/gui/component/addressbook-view.c:754
 #, fuzzy
 msgid "New Address Book"
 msgstr "Libro de Enderezos"
 
-#: addressbook/gui/component/addressbook-view.c:762
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
+#: addressbook/gui/component/addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Eliminar"
 
-#: addressbook/gui/component/addressbook-view.c:763
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-view.c:756
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Propiedades..."
 
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/addressbook-view.c:1002
+#. Create the contacts group
+#: addressbook/gui/component/addressbook-view.c:995
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
 #: calendar/gui/migration.c:373
 msgid "Contacts"
 msgstr "Contactos"
@@ -379,11 +333,6 @@ msgid "Manage your S/MIME certificates here"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-#, fuzzy
-msgid "  S_how Supported Bases "
-msgstr "Dete_ctar tipos soportados "
-
-#: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -398,416 +347,334 @@ msgstr "Dete_ctar tipos soportados "
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:4
-#, fuzzy
-msgid "1:00"
-msgstr "100%"
-
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "Autenticación"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
 #, fuzzy
 msgid "<b>Display</b>"
 msgstr "<b>Descrición:</b> %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 #, fuzzy
 msgid "<b>Downloading</b>"
 msgstr ""
 "\n"
 "Localización Xeográfica: "
 
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:10
 #, fuzzy
 msgid "<b>Searching</b>"
 msgstr "Buscar M_ensaxe..."
 
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
 msgid "<b>Server Information</b>"
 msgstr "Información da Fonte"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
 msgid "<b>Type:</b>"
 msgstr "<b>Descrición:</b> %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:13
 #, fuzzy
 msgid "Add Contacts Group"
 msgstr "Co_ntactos:"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:14
 #, fuzzy
 msgid "Address Book Properties"
 msgstr "Fontes do Libro de Enderezos"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
-#: mail/mail-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Always"
 msgstr "Alarmas"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:16
 #, fuzzy
 msgid "Anonymously"
 msgstr "Anónimo"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:17
 #: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Básico"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
-#, fuzzy
-msgid "Connecting"
-msgstr "Desconectando de %s"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 #: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Detalles"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
-#, fuzzy
-msgid "Distinguished _name:"
-msgstr "_Nome da lista:"
-
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:19
 #, fuzzy
 msgid "Distinguished name"
 msgstr "_Nome da lista:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:20
 #, fuzzy
 msgid "Download limit:"
 msgstr "Cargar _Imaxes"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Email address"
 msgstr "Enderezo de Correo:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-#, fuzzy
-msgid "Email address:"
-msgstr "Enderezo de Correo:"
-
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "Evolution will use this DN to authenticate you with the server"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid ""
-"Evolution will use this email address to authenticate you with the server"
+"Evolution will use this email address to authenticate you with the server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:23
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Armacenar busca como CartafolV"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:24
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
+#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Xeral"
 
-#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
-#: mail/mail-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "Never"
 msgstr "Cada"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
-msgid "One"
-msgstr "Único"
-
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:27
 #, fuzzy
-msgid "S_earch scope: "
-msgstr "Ámbito da busca:"
+msgid "Search _base:"
+msgstr "_Base da busca:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
 msgid "Search base only"
 msgstr "_Base da busca:"
 
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:29
 #, fuzzy
 msgid "Search base:"
 msgstr "_Base da busca:"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Search scope:"
 msgstr "Ámbito da busca:"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
-#, fuzzy
-msgid "Searching"
-msgstr "Buscar M_ensaxe..."
-
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:31
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
-"server if\n"
-"your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL or TLS."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a \n"
-"insecure environment. For example, if you and your LDAP server are behind a "
-"firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection "
-"is already\n"
-"secure."
+"you are in a insecure environment. For example, if you and your LDAP server "
+"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
+"because your connection is already secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
-"TLS.  This \n"
-"means that your connection will be insecure, and that you will be vulnerable "
-"to security\n"
-"exploits. "
+"TLS.  This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Sub"
-msgstr "Sub"
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:35
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "Armacenar busca como CartafolV"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
-"searches will \n"
-"begin. If you leave this blank, the search will begin at the root of the "
-"directory tree."
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
-"the \n"
-"directory tree. A search scope of \"sub\" will include all entries below "
-"your search base.\n"
-"A search scope of \"one\" will only include the entries one level beneath "
-"your base.\n"
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:58
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
-"This is the maximum number of entries to download. Setting this number to "
-"be \n"
+"This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:41
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
-"list.\n"
-"It is for display purposes only. "
+"list. It is for display purposes only. "
 msgstr ""
 "Este nome hase empregar para identifica-la conta. Só se empregará para "
 "amosar."
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. "
-"A \n"
-"list of standard ports has been provided. Ask your system administrator\n"
-"what port you should specify."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:67
-msgid "This option controls how long a search will be run."
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:43
 #, fuzzy
 msgid "Timeout:"
 msgstr "Formato da hora:"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
-msgid "U_se SSL/TLS:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:45
 #, fuzzy
 msgid "Using email address"
 msgstr "_Este é o enderezo de correo"
 
-#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
-#: mail/mail-config.glade.h:154
+#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
+#: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:47
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "Co_ntactos:"
 
-#: addressbook/gui/component/ldap-config.glade.h:74
-#: calendar/gui/dialogs/calendar-setup.glade.h:12
-#, fuzzy
-msgid "_Display name:"
-msgstr "_Amosar"
-
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
 msgid "_Email address:"
 msgstr "Enderezo de Correo:"
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:50
+#, fuzzy
+msgid "_Find Possible Search Bases"
+msgstr "Armacenar busca como CartafolV"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "_Log in:"
+msgstr "Login de NT"
+
+#: addressbook/gui/component/ldap-config.glade.h:53
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
-#, fuzzy
-msgid "_Port number:"
-msgstr "_Porto:"
-
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "_Port:"
 msgstr "_Prioridade:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:55
 #, fuzzy
-msgid "_Search base:"
-msgstr "_Base da busca:"
-
-#: addressbook/gui/component/ldap-config.glade.h:82
-msgid "_Server name:"
-msgstr "Nome do _Servidor:"
+msgid "_Search scope:"
+msgstr "Ámbito da busca:"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:56
 #, fuzzy
 msgid "_Server:"
 msgstr "Nome do _Servidor:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:57
 #, fuzzy
-msgid "_Timeout (minutes):"
-msgstr "Tempo de adiamento (minutos)"
+msgid "_Timeout:"
+msgstr "Formato da hora:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:58
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "Usar conexión segura (_SSL)"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:59
 #, fuzzy
 msgid "cards"
 msgstr "Sen tarxetas"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
-#, fuzzy
-msgid "connecting-tab"
-msgstr "Desconectando de %s"
-
-#: addressbook/gui/component/ldap-config.glade.h:88
-#, fuzzy
-msgid "general-tab"
-msgstr "Xeral"
-
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:60
 #: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
-#: mail/mail-config.glade.h:182
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "minutos"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
-#, fuzzy
-msgid "searching-tab"
-msgstr "Buscar M_ensaxe..."
-
-#: addressbook/gui/component/select-names/e-select-names.c:497
+#: addressbook/gui/component/select-names/e-select-names.c:503
 #: addressbook/gui/component/select-names/select-names.glade.h:6
 #, fuzzy
 msgid "Select Contacts from Address Book"
 msgstr "Seleccionar Contactos do Libro de Enderezos"
 
-#: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
@@ -849,7 +716,7 @@ msgstr "Contacto Sen Nome"
 
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:222
+#: addressbook/gui/widgets/e-addressbook-view.c:224
 msgid "Source"
 msgstr "Fonte"
 
@@ -929,9 +796,9 @@ msgid "<b>Work</b>"
 msgstr "Semana Laboral"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
-#: addressbook/gui/widgets/eab-contact-display.c:342
-#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/widgets/eab-contact-display.c:334
+#: addressbook/gui/widgets/eab-contact-display.c:353
 msgid "AIM"
 msgstr ""
 
@@ -972,8 +839,8 @@ msgid "Company:"
 msgstr "Compañía"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:271
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
+#: addressbook/gui/contact-editor/e-contact-editor.c:266
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
 #, fuzzy
@@ -981,7 +848,7 @@ msgid "Contact"
 msgstr "Contactos"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1527
+#: addressbook/gui/contact-editor/e-contact-editor.c:520
 msgid "Contact Editor"
 msgstr "Editor de Contactos"
 
@@ -1006,86 +873,80 @@ msgid "Full _Name..."
 msgstr "Nome _Completo..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:202
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-msgid "Home"
-msgstr "Particular"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #, fuzzy
 msgid "Home Page:"
 msgstr "Fax Particular"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-#, fuzzy
-msgid "Job title:"
-msgstr "_Posto de traballo:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/e-itip-control.c:936
-#, fuzzy
-msgid "Location:"
-msgstr ""
-"\n"
-"Localización Xeográfica: "
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 #, fuzzy
 msgid "MSN Messenger"
 msgstr "Enviar _Mensaxe"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 #, fuzzy
 msgid "Mailing Address"
 msgstr "Enderezo de Correo:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 #, fuzzy
 msgid "Manager:"
 msgstr "Xestor"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "_Alcume:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Notes:"
 msgstr "No_tas:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
-#: addressbook/gui/contact-editor/e-contact-editor.c:203
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-msgid "Other"
-msgstr "Outro"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#, fuzzy
+msgid "Office:"
+msgstr "_Oficina:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "PO Box:"
 msgstr "_Apdo. de Correos:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 #, fuzzy
 msgid "Personal Information"
 msgstr "Información Opcional"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 #, fuzzy
 msgid "Profession:"
 msgstr "_Profesión:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#, fuzzy
+msgid "Spouse:"
+msgstr "_Cónxuxe:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "State/Province:"
 msgstr "E_stado/Provincia:"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#, fuzzy
+msgid "Title:"
+msgstr "_Tratamento:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+msgid "Video Chat:"
+msgstr ""
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:41
 #, fuzzy
 msgid "Wants to receive HTML mail"
@@ -1093,15 +954,15 @@ msgstr "Quere recibir correo en _HTML"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:42
 #, fuzzy
-msgid "Webcam:"
-msgstr "Páxina"
+msgid "Web Log:"
+msgstr "Enderezo da páxina _Web:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
-#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
-#: mail/mail-config.glade.h:155
+#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
+#: mail/mail-config.glade.h:157
 #, fuzzy
 msgid "Work"
 msgstr "Traballando"
@@ -1124,19 +985,12 @@ msgid "_File under:"
 msgstr "Nome do ficheiro:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 #, fuzzy
 msgid "_Where:"
 msgstr "Nome do _Servidor:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
-msgid "item7"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
-msgid "item8"
-msgstr ""
-
-#: addressbook/gui/contact-editor/eab-editor.c:316
+#: addressbook/gui/contact-editor/eab-editor.c:315
 #, fuzzy
 msgid ""
 "Are you sure you want\n"
@@ -1145,7 +999,7 @@ msgstr ""
 "¿Está seguro de que quere\n"
 "borrar este contacto?"
 
-#: addressbook/gui/contact-editor/eab-editor.c:319
+#: addressbook/gui/contact-editor/eab-editor.c:318
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -1154,17 +1008,17 @@ msgstr ""
 "borrar este contacto?"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:351
-#: addressbook/gui/widgets/eab-contact-display.c:372
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:364
 #, fuzzy
 msgid "Address"
 msgstr "_Enderezo:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:292
+#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard.c:174
@@ -2157,94 +2011,117 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Cimbabue"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/contact-editor/e-contact-editor.c:179
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:337
+#: addressbook/gui/widgets/eab-contact-display.c:356
 #, fuzzy
 msgid "Jabber"
 msgstr "Contacto Sen Nome"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:347
-#: addressbook/gui/widgets/eab-contact-display.c:366
+#: addressbook/gui/contact-editor/e-contact-editor.c:180
+#: addressbook/gui/widgets/eab-contact-display.c:339
+#: addressbook/gui/widgets/eab-contact-display.c:358
 #, fuzzy
 msgid "Yahoo"
 msgstr "India"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: addressbook/gui/widgets/eab-contact-display.c:338
+#: addressbook/gui/widgets/eab-contact-display.c:357
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:344
-#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#: addressbook/gui/widgets/eab-contact-display.c:355
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/contact-editor/e-contact-editor.c:183
 #, fuzzy
 msgid "GroupWise"
 msgstr "Grupo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+msgid "Home"
+msgstr "Particular"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+msgid "Other"
+msgstr "Outro"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
 #, fuzzy
 msgid "Source Book"
 msgstr "Fonte"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:264
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:278
+#: addressbook/gui/contact-editor/e-contact-editor.c:273
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Novo Contacto"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:285
+#: addressbook/gui/contact-editor/e-contact-editor.c:280
 #, fuzzy
 msgid "Writable Fields"
 msgstr "Campo _Desde"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:299
+#: addressbook/gui/contact-editor/e-contact-editor.c:294
 #, fuzzy
 msgid "Changed"
 msgstr "Chad"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
-#, fuzzy
-msgid "Category editor not available."
-msgstr "Non hai unha descrición dispoñible."
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:2352
 msgid "This contact belongs to these categories:"
 msgstr "Este contacto pertence a estas categorías:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#: addressbook/gui/contact-editor/e-contact-editor.c:2429
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Escolla unha das seguintes opcións"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#: addressbook/gui/contact-editor/e-contact-editor.c:2433
 #, fuzzy
 msgid "No image"
 msgstr "Nome:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#: addressbook/gui/contact-editor/e-contact-editor.c:2636
 #, fuzzy
 msgid ""
-"The following entries are invalid:\n"
+"The contact data is invalid:\n"
 "\n"
 msgstr "As seguintes conexións están activas nestes intres:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2738
-#, c-format
-msgid "Could not find widget for a field: `%s'"
-msgstr "Non se puido atopa-lo control dun campo: `%s'"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#, fuzzy
+msgid "Invalid contact."
+msgstr "Argumentos non válidos"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+msgid ""
+"The contact cannot be saved to the selected address book. Do you want to "
+"discard changes?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2727
+#: addressbook/gui/contact-editor/e-contact-editor.c:2751
+#, fuzzy
+msgid "_Discard"
+msgstr "Imprimir tarxeta"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+msgid ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
+msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:62
 #, fuzzy
@@ -2284,7 +2161,7 @@ msgid "_Edit Full"
 msgstr "Editar Completo"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Full Name:"
 msgstr "_Nome Completo:"
@@ -2444,32 +2321,32 @@ msgid "_Type an email address or drag a contact into the list below:"
 msgstr ""
 "Escriba un enderezo de correo ou arraste un contacto á lista de abaixo:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "contact-list-editor"
 msgstr "editor-de-contactos"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:153
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:215
+#: addressbook/gui/widgets/e-addressbook-view.c:217
 #: addressbook/gui/widgets/e-minicard-view.c:460
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
 #, fuzzy
 msgid "Book"
 msgstr "Corpo"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
 #, fuzzy
 msgid "Is New List"
 msgstr "Nova Lista"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:215
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
 msgid "Contact List Editor"
 msgstr "Editor de Listas de Contactos"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:438
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
 #, fuzzy
 msgid "Save List as VCard"
 msgstr "Gardar como VCard"
@@ -2517,127 +2394,127 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Busca Avanzada"
 
-#: addressbook/gui/widgets/eab-contact-display.c:129
-#: addressbook/gui/widgets/eab-contact-display.c:192
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:139
-#: addressbook/gui/widgets/eab-contact-display.c:205
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:257
-#: addressbook/gui/widgets/eab-contact-display.c:533
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:525
 #, fuzzy
 msgid "List Members"
 msgstr "Membros"
 
-#: addressbook/gui/widgets/eab-contact-display.c:329
-#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/eab-contact-display.c:321
+#: addressbook/gui/widgets/eab-contact-display.c:323
 msgid "E-mail"
 msgstr "Correo Electrónico"
 
-#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/eab-contact-display.c:332
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organización"
 
-#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:333
 #, fuzzy
 msgid "Position"
 msgstr "Estonia"
 
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:354
 #, fuzzy
 msgid "Groupwise"
 msgstr "Grupo"
 
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:340
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:349
-#: addressbook/gui/widgets/eab-contact-display.c:370
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:362
 #, fuzzy
 msgid "Phone"
 msgstr "Nada"
 
-#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:342
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:354
+#: addressbook/gui/widgets/eab-contact-display.c:346
 #, fuzzy
 msgid "work"
 msgstr "Traballando"
 
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:359
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:368
-#: addressbook/gui/widgets/eab-contact-display.c:587
+#: addressbook/gui/widgets/eab-contact-display.c:360
+#: addressbook/gui/widgets/eab-contact-display.c:579
 #, fuzzy
 msgid "Blog"
 msgstr "para sempre"
 
-#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/eab-contact-display.c:363
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Teléfono Móbil"
 
-#: addressbook/gui/widgets/eab-contact-display.c:375
+#: addressbook/gui/widgets/eab-contact-display.c:367
 #, fuzzy
 msgid "personal"
 msgstr "Xeral"
 
-#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/eab-contact-display.c:374
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Nota"
 
-#: addressbook/gui/widgets/eab-contact-display.c:548
+#: addressbook/gui/widgets/eab-contact-display.c:540
 #, fuzzy
 msgid "Job Title"
 msgstr "_Posto de traballo:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/eab-contact-display.c:544
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:774
+#: smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "Correo Electrónico"
 
-#: addressbook/gui/widgets/eab-contact-display.c:579
+#: addressbook/gui/widgets/eab-contact-display.c:571
 #, fuzzy
 msgid "Home page"
 msgstr "Fax Particular"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 msgid "Success"
 msgstr "Éxito"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Backend busy"
 msgstr ""
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Repository offline"
 msgstr "Repositorio desconectado"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 #, fuzzy
 msgid "Address Book does not exist"
 msgstr "O cartafol `%s' non existe."
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 #, fuzzy
 msgid "No Self Contact defined"
 msgstr "Nova Lista de Contactos"
@@ -2645,29 +2522,29 @@ msgstr "Nova Lista de Contactos"
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:57
 #, fuzzy
 msgid "Contact not found"
 msgstr "Tarxeta non atopada"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: addressbook/gui/widgets/eab-gui-util.c:58
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "O ID da Tarxeta xa existe"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Protocol not supported"
 msgstr "Protocolo non soportado"
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:60
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:233
 #: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
@@ -2680,41 +2557,41 @@ msgid "Cancelled"
 msgstr "Cancelada"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:61
 #, fuzzy
 msgid "Could not cancel"
 msgstr "Non foi posible renomear o cartafol: %s"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:62
 #, fuzzy
 msgid "Authentication Failed"
 msgstr "A autenticación fallou."
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: addressbook/gui/widgets/eab-gui-util.c:63
 #, fuzzy
 msgid "Authentication Required"
 msgstr "Autenticación requirida"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:66
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "TLS not Available"
 msgstr ""
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#: addressbook/gui/widgets/eab-gui-util.c:66
 #, fuzzy
 msgid "No such source"
 msgstr "Non existe a mensaxe"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:69
+#: addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Other error"
 msgstr "Outro erro"
 
-#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:90
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
@@ -2723,7 +2600,7 @@ msgstr ""
 "Non foi posible abrir este libro de enderezos. Por favor, comprobe\n"
 "que a ruta existe e que ten permisos para acceder a ela."
 
-#: addressbook/gui/widgets/eab-gui-util.c:110
+#: addressbook/gui/widgets/eab-gui-util.c:97
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -2733,19 +2610,19 @@ msgstr ""
 "que introduciu un URI incorrecto ou que o servidor LDAP está\n"
 "fóra de servicio"
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:102
 #, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution you must compile the program from the CVS "
-"sources after retrieving OpenLDAP from the link below."
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
 msgstr ""
 "Esta versión de Evolution non ten soporte LDAP\n"
 "compilado nela. Se quere usar LDAP en Evolution\n"
 "debe compilar o programa desde as fontes do CVS\n"
 "logo de obter OpenLDAP desde o enlace de abaixo.\n"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:109
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -2755,11 +2632,7 @@ msgstr ""
 "que introduciu un URI incorrecto ou que o servidor LDAP está\n"
 "fóra de servicio"
 
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "Unable to open addressbook"
-msgstr "Non se pode abrir o libro de enderezos"
-
-#: addressbook/gui/widgets/eab-gui-util.c:162
+#: addressbook/gui/widgets/eab-gui-util.c:129
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2767,7 +2640,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:168
+#: addressbook/gui/widgets/eab-gui-util.c:135
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -2775,64 +2648,55 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:174
+#: addressbook/gui/widgets/eab-gui-util.c:141
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:177
+#: addressbook/gui/widgets/eab-gui-util.c:144
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:147
 msgid "This query did not complete successfully."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
-msgid "Do you want to save changes?"
-msgstr "¿Quere gardar os cambios?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:208
-#, fuzzy
-msgid "_Discard"
-msgstr "Imprimir tarxeta"
-
-#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:169
 msgid "Error adding list"
 msgstr "Erro ao engadi-la lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:229
-#: addressbook/gui/widgets/eab-gui-util.c:652
+#: addressbook/gui/widgets/eab-gui-util.c:169
+#: addressbook/gui/widgets/eab-gui-util.c:580
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Erro ao engadi-la tarxeta"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying list"
 msgstr "Erro ao modifica-la lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Erro ao modifica-la tarxeta"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:192
 msgid "Error removing list"
 msgstr "Erro ao elimina-la lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
-#: addressbook/gui/widgets/eab-gui-util.c:610
+#: addressbook/gui/widgets/eab-gui-util.c:192
+#: addressbook/gui/widgets/eab-gui-util.c:538
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Erro ao elimina-la tarxeta"
 
-#: addressbook/gui/widgets/eab-gui-util.c:334
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:360
+#: addressbook/gui/widgets/eab-gui-util.c:300
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2841,56 +2705,51 @@ msgstr ""
 "%s xa existe\n"
 "¿Quere sobrescribilo?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:364
+#: addressbook/gui/widgets/eab-gui-util.c:304
 #, fuzzy
 msgid "Overwrite"
 msgstr "¿Sobrescribir ficheiro?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:400
-#, fuzzy, c-format
-msgid "Error saving %s: %s"
-msgstr "Erro ao gardar o ficheiro: %s"
-
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:437
+#: addressbook/gui/widgets/eab-gui-util.c:365
 msgid "card.vcf"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:571
+#: addressbook/gui/widgets/eab-gui-util.c:499
 #, fuzzy
 msgid "list"
 msgstr "Brétema"
 
-#: addressbook/gui/widgets/eab-gui-util.c:706
+#: addressbook/gui/widgets/eab-gui-util.c:634
 #, fuzzy
 msgid "Move contact to"
 msgstr "Sen tarxetas"
 
-#: addressbook/gui/widgets/eab-gui-util.c:708
+#: addressbook/gui/widgets/eab-gui-util.c:636
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Sen tarxetas"
 
-#: addressbook/gui/widgets/eab-gui-util.c:711
+#: addressbook/gui/widgets/eab-gui-util.c:639
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Sen tarxetas"
 
-#: addressbook/gui/widgets/eab-gui-util.c:713
+#: addressbook/gui/widgets/eab-gui-util.c:641
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Sen tarxetas"
 
-#: addressbook/gui/widgets/eab-gui-util.c:716
+#: addressbook/gui/widgets/eab-gui-util.c:644
 #, fuzzy
 msgid "Select target addressbook."
 msgstr "Seleccionar Contactos do Libro de Enderezos"
 
-#: addressbook/gui/widgets/eab-gui-util.c:939
+#: addressbook/gui/widgets/eab-gui-util.c:867
 msgid "Multiple VCards"
 msgstr "Varias VCards"
 
-#: addressbook/gui/widgets/eab-gui-util.c:942
+#: addressbook/gui/widgets/eab-gui-util.c:870
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard de %s"
@@ -2981,7 +2840,7 @@ msgstr[1] "Contactos"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:229
+#: addressbook/gui/widgets/e-addressbook-view.c:231
 #: addressbook/gui/widgets/e-minicard-view.c:467
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
 #, fuzzy
@@ -3002,152 +2861,144 @@ msgstr "Móbil"
 msgid "Error modifying card"
 msgstr "Erro ao modifica-la tarxeta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:163
 #, fuzzy
 msgid "Name begins with"
 msgstr "remata en"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:164
 #, fuzzy
 msgid "Email begins with"
 msgstr "remata en"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:57
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "A categoría é"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-#: calendar/gui/cal-search-bar.c:50
+#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Calquera campo contén"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+#: addressbook/gui/widgets/e-addressbook-view.c:172
 msgid "Advanced..."
 msgstr "Avanzado..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:236
+#: addressbook/gui/widgets/e-addressbook-view.c:238
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:249
+#: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Tipo:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:506
+#: addressbook/gui/widgets/e-addressbook-view.c:508
 #, fuzzy
 msgid "Address Book"
 msgstr "Libro de Enderezos"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2076
+#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:2080
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
 msgstr "Gardar como VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 #, fuzzy
 msgid "New Contact..."
 msgstr "Novo Contacto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Nova Lista de Contactos"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "_Ir ó Cartafol..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 #, fuzzy
 msgid "Import..."
 msgstr "Importando..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1066
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_Buscar Contactos"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "_Fontes do Libro de Enderezos..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1069
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "_Preferencias de Correo..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Remitir Contacto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
 msgid "Send Message to Contact"
 msgstr "Enviar unha Mensaxe a un Contacto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Imprimir"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
+#: addressbook/gui/widgets/e-addressbook-view.c:1077
 msgid "Print Envelope"
 msgstr "Imprimir Sobre"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
+#: addressbook/gui/widgets/e-addressbook-view.c:1081
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Libro de Enderezos..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1080
+#: addressbook/gui/widgets/e-addressbook-view.c:1082
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Libro de Enderezos..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Cortar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Copiar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1087
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Pegar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:1092
+#: calendar/gui/e-calendar-view.c:1280
 #, fuzzy
 msgid "Current View"
 msgstr "_Vista Actual"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1309
-#, c-format
-msgid ""
-"The addressbook backend for\n"
-"%s\n"
-"has crashed. You will have to restart Evolution in order to use it again"
-msgstr ""
-
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1667
-#: calendar/gui/cal-search-bar.c:362
+#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Calquera Categoría"
 
@@ -3257,7 +3108,7 @@ msgstr "Radio"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-list-view.c:234
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Papel"
@@ -3418,13 +3269,13 @@ msgstr "Compositor de correo de Evolution."
 msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.c:998
+#: addressbook/printing/e-contact-print.c:1000
 #, fuzzy
 msgid "Print contacts"
 msgstr "Imprimi-los contactos seleccionados"
 
-#: addressbook/printing/e-contact-print.c:1064
-#: addressbook/printing/e-contact-print.c:1091
+#: addressbook/printing/e-contact-print.c:1066
+#: addressbook/printing/e-contact-print.c:1093
 #, fuzzy
 msgid "Print contact"
 msgstr "Imprimi-los contactos seleccionados"
@@ -3678,17 +3529,22 @@ msgstr ""
 msgid "Impossible internal error."
 msgstr "Outro erro"
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:629
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
 #, fuzzy
 msgid "Can not open file"
 msgstr "Non se pode abrir a mensaxe"
 
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
 #, fuzzy
-msgid "Can not load URI"
-msgstr "Tarxeta non atopada"
+msgid "Couldn't get list of addressbooks"
+msgstr "Non foi posible cargar %s: %s"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Non se pode abrir o libro de enderezos"
 
 #: addressbook/tools/evolution-addressbook-import.c:46
 #, fuzzy
@@ -3710,7 +3566,7 @@ msgstr "Non se especificou un nome de cartafol"
 msgid "Unnamed List"
 msgstr "Contacto Sen Nome"
 
-#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 #, fuzzy
 msgid "Enter password"
@@ -3990,10 +3846,10 @@ msgid "Whether to show week numbers in date navigator"
 msgstr "Amosa-los _números das semanas no navegador de datas"
 
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:88
-#: calendar/gui/gnome-cal.c:1703
-#: camel/providers/groupwise/camel-gw-listener.c:304
-#: camel/providers/groupwise/camel-gw-listener.c:327
+#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/gnome-cal.c:1705
+#: camel/providers/groupwise/camel-gw-listener.c:311
+#: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
 msgstr "Axenda"
 
@@ -4016,7 +3872,7 @@ msgstr "é menor que"
 
 #: calendar/gui/calendar-commands.c:363
 #: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:19 filter/filter.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
 msgid "days"
 msgstr "días"
 
@@ -4173,24 +4029,24 @@ msgstr "Vista Semanal"
 msgid "Month View"
 msgstr "Vista Mensual"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "O resumo contén"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "A descrición contén"
 
-#: calendar/gui/cal-search-bar.c:54
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "O comentario contén"
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:53
 #, fuzzy
 msgid "Location contains"
 msgstr "A descrición contén"
 
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
 msgid "Unmatched"
 msgstr "Non concorda"
 
@@ -4213,24 +4069,24 @@ msgstr "Permiso denegado"
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:466
+#: calendar/gui/dialogs/alarm-options.c:467
 msgid "Audio Alarm Options"
 msgstr "Opcións das Alarmas Sonoras"
 
-#: calendar/gui/dialogs/alarm-options.c:475
+#: calendar/gui/dialogs/alarm-options.c:476
 msgid "Message Alarm Options"
 msgstr "Opcións das Alarmas de Mensaxes"
 
-#: calendar/gui/dialogs/alarm-options.c:484
+#: calendar/gui/dialogs/alarm-options.c:485
 #, fuzzy
 msgid "Email Alarm Options"
 msgstr "Opcións das Alarmas de Correo"
 
-#: calendar/gui/dialogs/alarm-options.c:493
+#: calendar/gui/dialogs/alarm-options.c:494
 msgid "Program Alarm Options"
 msgstr "Opcións de Alarma do Programa"
 
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:510
 msgid "Unknown Alarm Options"
 msgstr "Opcións de Alarma Descoñecidas"
 
@@ -4270,7 +4126,7 @@ msgstr "Enviar como:"
 msgid "With these arguments:"
 msgstr "Con estes argumentos:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
 #, fuzzy
 msgid "dialog1"
 msgstr "Amosar un diálogo"
@@ -4280,7 +4136,7 @@ msgid "extra times every"
 msgstr "veces cada"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:20 filter/filter.glade.h:16
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr "horas"
 
@@ -4327,7 +4183,7 @@ msgstr "Enviar unha mensaxe"
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Resumo:"
 
@@ -4357,7 +4213,6 @@ msgid "hour(s)"
 msgstr "hora(s)"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:21
 msgid "minute(s)"
 msgstr "minutos"
 
@@ -4365,27 +4220,27 @@ msgstr "minutos"
 msgid "start of appointment"
 msgstr "comezo da cita"
 
-#: calendar/gui/dialogs/calendar-setup.c:170
+#: calendar/gui/dialogs/calendar-setup.c:172
 #, fuzzy
 msgid "You must specify a location to get the calendar from."
 msgstr "Nome do estilo:"
 
-#: calendar/gui/dialogs/calendar-setup.c:178
+#: calendar/gui/dialogs/calendar-setup.c:180
 #, fuzzy, c-format
 msgid "The source location '%s' is not well-formed."
 msgstr "O método requirido para cargar `%s' non está soportado"
 
-#: calendar/gui/dialogs/calendar-setup.c:193
+#: calendar/gui/dialogs/calendar-setup.c:195
 #, c-format
 msgid "The source location '%s' is not a webcal source."
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:265
+#: calendar/gui/dialogs/calendar-setup.c:275
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:278
+#: calendar/gui/dialogs/calendar-setup.c:288
 #, c-format
 msgid ""
 "The group '%s' is remote. You must specify a location to get the calendar "
@@ -4407,61 +4262,36 @@ msgstr "Lista de _Tarefas"
 msgid "C_olor:"
 msgstr "P_echar"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-#, fuzzy
-msgid "Calendar Properties"
-msgstr "Axenda"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
 msgid "Pick a color"
 msgstr "Escoller unha cor"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:8
-#, fuzzy
-msgid "Remote"
-msgstr "Eliminar"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-#, fuzzy
-msgid "Task List Properties"
-msgstr "Lista de _Tarefas"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
 #, fuzzy
 msgid "_Add Calendar"
 msgstr "Engadir á Axenda"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
 #, fuzzy
 msgid "_Add Group"
 msgstr "_Novo Grupo..."
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-#, fuzzy
-msgid "_Refresh Interval:"
-msgstr "_Actualizar Lista "
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
 #, fuzzy
 msgid "_Refresh:"
 msgstr "Actualizar Lista"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-#, fuzzy
-msgid "_Source URL:"
-msgstr "URI da Fonte POP"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
 #, fuzzy
 msgid "_Type:"
 msgstr "Tipo:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
 #, fuzzy
 msgid "_URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
 msgid "weeks"
 msgstr "semanas"
 
@@ -4571,7 +4401,7 @@ msgid "Display"
 msgstr "_Amosar"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:76
 msgid "E_nable"
 msgstr "A_ctivar"
 
@@ -4582,7 +4412,7 @@ msgstr "Petición de Libre/Ocupado"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:563
+#: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Venres"
 
@@ -4596,7 +4426,7 @@ msgstr "Minutos"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:559
+#: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Luns"
 
@@ -4607,7 +4437,7 @@ msgstr "_Dom"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:564
+#: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Sábado"
 
@@ -4621,7 +4451,7 @@ msgstr "Amosa-los _números das semanas no navegador de datas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Domingo"
 
@@ -4636,7 +4466,7 @@ msgstr "_Xov"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:562
+#: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Xoves"
 
@@ -4650,7 +4480,7 @@ msgstr "Formato da hora:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:560
+#: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Martes"
 
@@ -4660,7 +4490,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:561
+#: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Mércores"
 
@@ -4695,7 +4525,7 @@ msgid "_Day begins:"
 msgstr "_Amosar estacións:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
-#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:43
@@ -4749,76 +4579,46 @@ msgstr "Mé_r"
 msgid "before every appointment"
 msgstr "antes da fin da cita"
 
-#: calendar/gui/dialogs/cancel-comp.c:57
-msgid ""
-"The event being deleted is a meeting, would you like to send a cancellation "
-"notice?"
-msgstr ""
-
-#: calendar/gui/dialogs/cancel-comp.c:60
-msgid "Are you sure you want to cancel and delete this meeting?"
-msgstr "¿Está seguro de que quere cancelar e borrar esta cita?"
-
-#: calendar/gui/dialogs/cancel-comp.c:66
-msgid ""
-"The task being deleted is assigned, would you like to send a cancellation "
-"notice?"
-msgstr ""
-
-#: calendar/gui/dialogs/cancel-comp.c:69
-msgid "Are you sure you want to cancel and delete this task?"
-msgstr "¿Está seguro de que quere cancelar e borrar esta tarefa?"
-
-#: calendar/gui/dialogs/cancel-comp.c:75
-msgid ""
-"The journal entry being deleted is published, would you like to send a "
-"cancellation notice?"
-msgstr ""
-
-#: calendar/gui/dialogs/cancel-comp.c:78
-msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr "¿Está seguro de que quere cancelar e borrar esta entrada de diario?"
-
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Este evento foi eliminado."
 
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "Esta tarefa foi eliminada."
 
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:68
 msgid "This journal entry has been deleted."
 msgstr "Esta entrada de diario foi eliminada"
 
-#: calendar/gui/dialogs/changed-comp.c:75
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  Fixo cambios. ¿Quere esquecer estes cambios e pechar o editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s Non fixo cambios, ¿quere pechar o editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:82
+#: calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "Este evento foi modificado."
 
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "Esta tarefa foi modificada."
 
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:92
 msgid "This journal entry has been changed."
 msgstr "Esta entrada de diario foi modificada."
 
-#: calendar/gui/dialogs/changed-comp.c:99
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  Fixo cambios. ¿Quere esquecer estes cambios e actualizar o editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Non fixo cambios, ¿quere actualizar o editor?"
@@ -4857,7 +4657,7 @@ msgid "No summary"
 msgstr "Sen resumo"
 
 #: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
 #: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Gardar como..."
@@ -4912,103 +4712,55 @@ msgstr "Cancelar Operación"
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:95
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "¿Está seguro de que quere borrar a cita `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:98
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "¿Está seguro de que quere borrar esta cita sen título?"
-
-#: calendar/gui/dialogs/delete-comp.c:104
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "¿Está seguro de que quere borrar a tarefa `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:107
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "¿Está seguro de que quere borrar esta tarefa sen título?"
-
-#: calendar/gui/dialogs/delete-comp.c:113
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "¿Está seguro de que quere borrar a entrada de diario `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:116
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "¿Está seguro de que quere borrar esta entrada de diario sen título?"
-
-#: calendar/gui/dialogs/delete-comp.c:131
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d appointment?"
-msgid_plural "Are you sure you want to delete %d appointments?"
-msgstr[0] "¿Está seguro de que quere borrar %d citas?"
-msgstr[1] "¿Está seguro de que quere borrar %d citas?"
-
-#: calendar/gui/dialogs/delete-comp.c:138
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d task?"
-msgid_plural "Are you sure you want to delete %d tasks?"
-msgstr[0] "¿Está seguro de que quere borrar %d tarefas?"
-msgstr[1] "¿Está seguro de que quere borrar %d tarefas?"
-
-#: calendar/gui/dialogs/delete-comp.c:145
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d journal entry?"
-msgid_plural "Are you sure you want to delete %d journal entries?"
-msgstr[0] "¿Está seguro de que quere borrar %d entradas de diario?"
-msgstr[1] "¿Está seguro de que quere borrar %d entradas de diario?"
-
-#: calendar/gui/dialogs/delete-error.c:52
+#: calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:55
+#: calendar/gui/dialogs/delete-error.c:57
 msgid "The task could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:58
+#: calendar/gui/dialogs/delete-error.c:60
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:61
+#: calendar/gui/dialogs/delete-error.c:63
 #, fuzzy
 msgid "The item could not be deleted due to a corba error"
 msgstr "¡Non se puido envia-lo elemento!\n"
 
-#: calendar/gui/dialogs/delete-error.c:68
+#: calendar/gui/dialogs/delete-error.c:70
 msgid "The event could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:71
+#: calendar/gui/dialogs/delete-error.c:73
 msgid "The task could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:74
+#: calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:77
+#: calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:84
+#: calendar/gui/dialogs/delete-error.c:86
 #, fuzzy
 msgid "The event could not be deleted due to an error"
 msgstr "¡Non se puido envia-lo elemento!\n"
 
-#: calendar/gui/dialogs/delete-error.c:87
+#: calendar/gui/dialogs/delete-error.c:89
 #, fuzzy
 msgid "The task could not be deleted due to an error"
 msgstr "¡Non se puido envia-lo elemento!\n"
 
-#: calendar/gui/dialogs/delete-error.c:90
+#: calendar/gui/dialogs/delete-error.c:92
 #, fuzzy
 msgid "The journal entry could not be deleted due to an error"
 msgstr "¡Non se puido envia-lo elemento!\n"
 
-#: calendar/gui/dialogs/delete-error.c:93
+#: calendar/gui/dialogs/delete-error.c:95
 #, fuzzy
 msgid "The item could not be deleted due to an error"
 msgstr "¡Non se puido envia-lo elemento!\n"
@@ -5151,11 +4903,11 @@ msgstr "Hora de _comezo:"
 
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:3
+#: calendar/gui/dialogs/meeting-page.glade.h:4
 #: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
 #: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1559
-#: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:100
+#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
+#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
@@ -5182,8 +4934,8 @@ msgstr "_Delegar En..."
 #. FIXME: need to disable for undeletable folders
 #: calendar/gui/dialogs/meeting-page.c:655
 #: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1310 calendar/gui/e-calendar-view.c:1342
-#: mail/em-folder-tree.c:2557 mail/em-folder-view.c:919
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
+#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -5191,7 +4943,7 @@ msgid "_Delete"
 msgstr "_Borrar"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:240
+#: calendar/gui/e-meeting-list-view.c:218
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Asistente"
@@ -5227,16 +4979,15 @@ msgid "Member"
 msgstr "Membro"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
-#: mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-list-view.c:248
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Estado"
 
@@ -5245,20 +4996,20 @@ msgstr "Estado"
 msgid "Add A_ttendee"
 msgstr "Tódolos Asistentes"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "Add attendees from addressbook."
+msgstr "Engadir o Autor ao Libro de Enderezos"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Organizador:"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
+#: calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "_Change Organizer"
 msgstr "_Cambiar Organizador"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-#: calendar/gui/e-meeting-time-sel.c:417
-msgid "_Invite Others..."
-msgstr "_Convidar Outros..."
-
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 #, fuzzy
 msgid "<b>Calendar options</b>"
@@ -5426,7 +5177,7 @@ msgid "_No recurrence"
 msgstr "Se_n recorrencia"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:450
+#: composer/e-msg-composer-attachment-bar.c:453
 msgid "_Remove"
 msgstr "Elimina_r"
 
@@ -5458,59 +5209,21 @@ msgstr "semana(s)"
 msgid "year(s)"
 msgstr "ano(s)"
 
-#: calendar/gui/dialogs/save-comp.c:53
-#, fuzzy
-msgid ""
-"This event has been changed, but has not been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Esta sinatura cambiou, pero non se gravou.\n"
-"\n"
-"¿Desexa gardar os cambios?"
-
-#: calendar/gui/dialogs/save-comp.c:57
-msgid "_Discard Changes"
-msgstr ""
-
-#: calendar/gui/dialogs/save-comp.c:62
-#, fuzzy
-msgid "Save Event"
-msgstr "Mensaxe da Axenda"
-
-#: calendar/gui/dialogs/select-source-dialog.c:65
+#: calendar/gui/dialogs/select-source-dialog.c:69
 #, fuzzy
 msgid "Select destination"
 msgstr "Escolla un cartafol de destino para importar estes datos"
 
-#: calendar/gui/dialogs/select-source-dialog.c:86
+#: calendar/gui/dialogs/select-source-dialog.c:90
 #, fuzzy
 msgid "_Destination"
 msgstr "Borrar este cartafol"
 
-#: calendar/gui/dialogs/select-source-dialog.c:88
+#: calendar/gui/dialogs/select-source-dialog.c:92
 #, fuzzy
 msgid "Task List"
 msgstr "Lista de _Tarefas"
 
-#: calendar/gui/dialogs/send-comp.c:57
-#, fuzzy
-msgid "The meeting information has been created. Send it?"
-msgstr "A información da xuntanza cambiou. ¿Enviar unha versión actualizada?"
-
-#: calendar/gui/dialogs/send-comp.c:60
-msgid "The meeting information has changed. Send an updated version?"
-msgstr "A información da xuntanza cambiou. ¿Enviar unha versión actualizada?"
-
-#: calendar/gui/dialogs/send-comp.c:67
-#, fuzzy
-msgid "The task assignment information has been created. Send it?"
-msgstr "A información da tarefa cambiou. ¿Enviar unha versión actualizada?"
-
-#: calendar/gui/dialogs/send-comp.c:71
-msgid "The task information has changed. Send an updated version?"
-msgstr "A información da tarefa cambiou. ¿Enviar unha versión actualizada?"
-
 #: calendar/gui/dialogs/task-details-page.c:406
 #, fuzzy
 msgid "Completed date is wrong"
@@ -5531,7 +5244,7 @@ msgstr "Completada"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #: calendar/gui/e-cal-component-preview.c:249
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:960
 msgid "High"
 msgstr "Alta"
 
@@ -5545,14 +5258,14 @@ msgstr "En Progreso"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:253
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:958
 msgid "Low"
 msgstr "Baixa"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:251
 #: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:957
+#: mail/message-list.c:959
 msgid "Normal"
 msgstr "Normal"
 
@@ -5612,8 +5325,8 @@ msgstr "Con_fidencial"
 
 #: calendar/gui/dialogs/task-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
+#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Descrición:"
 
@@ -5789,7 +5502,7 @@ msgstr "_Data Límite"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:950
+#: calendar/gui/e-itip-control.c:943
 #, fuzzy
 msgid "Status:"
 msgstr "E_stado:"
@@ -5878,12 +5591,12 @@ msgstr "Ocupado"
 msgid "Deleting selected objects"
 msgstr "Elimina-los contactos seleccionados"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
 msgid "Updating objects"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1370
+#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
 #: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Abrir"
@@ -5894,15 +5607,15 @@ msgid "Open _Web Page"
 msgstr "_Abrir Mensaxe"
 
 #: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1291 calendar/gui/e-calendar-view.c:1376
-#: mail/em-folder-view.c:896 mail/em-popup.c:690 mail/em-popup.c:806
+#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
+#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "Gardar _Como..."
 
 #: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1292
-#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
+#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
@@ -5910,24 +5623,24 @@ msgid "_Print..."
 msgstr "_Imprimir..."
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Co_rtar"
 
 #: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1338
-#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2550
-#: mail/message-list.c:1644 ui/evolution-addressbook.xml.h:31
+#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
+#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
+#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Copiar"
 
 #: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1273 calendar/gui/e-calendar-view.c:1299
-#: calendar/gui/e-calendar-view.c:1372 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
+#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
@@ -5999,74 +5712,74 @@ msgstr "Resumo"
 msgid "Task sort"
 msgstr "Ordeamento das tarefas"
 
-#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
 msgid "New _Appointment..."
 msgstr "Nova _Cita..."
 
-#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
+#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
 msgid "New All Day _Event"
 msgstr "Novo _Evento de Día Completo"
 
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
+#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
 #, fuzzy
 msgid "New Meeting"
 msgstr "Xuntanza"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
 msgid "New Task"
 msgstr "Nova Tarefa"
 
-#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Seleccionar _Fío"
 
-#: calendar/gui/e-calendar-view.c:1280
+#: calendar/gui/e-calendar-view.c:1283
 #, fuzzy
 msgid "_Select Date..."
 msgstr "Eliminar..."
 
-#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publicar Información de Libre/Ocupado"
 
-#: calendar/gui/e-calendar-view.c:1303
+#: calendar/gui/e-calendar-view.c:1306
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "_Copiar a un Cartafol..."
 
-#: calendar/gui/e-calendar-view.c:1304
+#: calendar/gui/e-calendar-view.c:1307
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "_Mover ó Cartafol.."
 
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1308
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "_Programar Xuntanza"
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1309
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Remitir como i_Calendar"
 
-#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
 msgid "Delete this _Occurrence"
 msgstr "Borrar esta _Ocorrencia"
 
-#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
 msgid "Delete _All Occurrences"
 msgstr "Borrar _Tódalas Ocorrencias"
 
-#: calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1349
 msgid "Go to _Today"
 msgstr "Ir a _Hoxe"
 
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1351
 msgid "_Go to Date..."
 msgstr "_Ir á Data..."
 
-#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
 #, fuzzy
 msgid "_Settings..."
 msgstr "_Preferencias de Correo..."
@@ -6081,9 +5794,9 @@ msgstr "Data de _Inicio:"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:967 calendar/gui/e-itip-control.c:1169
-#: calendar/gui/e-meeting-list-view.c:144
-#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
 #: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
 #: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
 #: camel/camel-tcp-stream-openssl.c:631
@@ -6109,13 +5822,13 @@ msgid "Assigned"
 msgstr "Asignada"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr "Si"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "Non"
 
@@ -6127,7 +5840,7 @@ msgstr "N"
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
 msgid "E"
 msgstr "E"
 
@@ -6199,110 +5912,110 @@ msgstr "%d de %b"
 msgid "%02i minute divisions"
 msgstr "%02i divisións de minuto"
 
-#: calendar/gui/e-itip-control.c:592
+#: calendar/gui/e-itip-control.c:585
 #, fuzzy
 msgid "Yes. (Complex Recurrence)"
 msgstr "Recorrencia _simple"
 
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:596
 #, fuzzy, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Cada"
 msgstr[1] "Cada"
 
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:601
 #, fuzzy, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Cada"
 msgstr[1] "Cada"
 
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:603
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:618
+#: calendar/gui/e-itip-control.c:611
 #, fuzzy
 msgid " and "
 msgstr "Area"
 
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:618
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:631
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:645
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "Un m_es"
 msgstr[1] "Un m_es"
 
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:642
 #, fuzzy, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Cada"
 msgstr[1] "Cada"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:653
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:669
+#: calendar/gui/e-itip-control.c:662
 msgid ", ending on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:686
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:696
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "Hora do _final da reunión:"
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:716
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Completada "
 
-#: calendar/gui/e-itip-control.c:733
+#: calendar/gui/e-itip-control.c:726
 #, fuzzy
 msgid "<b>Due:</b> "
 msgstr "<b>Descrición:</b> %s"
 
-#: calendar/gui/e-itip-control.c:771 calendar/gui/e-itip-control.c:827
+#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
 #, fuzzy
 msgid "iCalendar Information"
 msgstr "información de axenda"
 
 #. Title
-#: calendar/gui/e-itip-control.c:788
+#: calendar/gui/e-itip-control.c:781
 #, fuzzy
 msgid "iCalendar Error"
 msgstr "Axenda"
 
-#: calendar/gui/e-itip-control.c:859 calendar/gui/e-itip-control.c:875
-#: calendar/gui/e-itip-control.c:886 calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
 #, fuzzy
 msgid "An unknown person"
 msgstr "un remitente descoñecido"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:910
+#: calendar/gui/e-itip-control.c:903
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -6310,316 +6023,323 @@ msgstr ""
 "<br> Por favor, olle a seguinte información, e escolla unha acción do menú "
 "de embaixo."
 
-#: calendar/gui/e-itip-control.c:925
+#: calendar/gui/e-itip-control.c:918
 msgid "<i>None</i>"
 msgstr "<i>Ningunha</i>"
 
-#: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:929
+#, fuzzy
+msgid "Location:"
+msgstr ""
+"\n"
+"Localización Xeográfica: "
+
+#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Aceptado"
 
-#: calendar/gui/e-itip-control.c:959 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr " Tentativa "
 
-#: calendar/gui/e-itip-control.c:963 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Rexeitado"
 
-#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.c:1050
-#: calendar/gui/e-itip-control.c:1076 calendar/gui/e-itip-control.c:1089
-#: calendar/gui/e-itip-control.c:1102 calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
 #, fuzzy
 msgid "Choose an action:"
 msgstr "Escolla unha Acción"
 
-#: calendar/gui/e-itip-control.c:1023
+#: calendar/gui/e-itip-control.c:1016
 #, fuzzy
 msgid "Update"
 msgstr "Actualización de Tarefa"
 
-#: calendar/gui/e-itip-control.c:1024 calendar/gui/e-itip-control.c:1055
-#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1091
-#: calendar/gui/e-itip-control.c:1104 calendar/gui/e-itip-control.c:1117
-#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
+#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Aceptar"
 
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1044
 #, fuzzy
 msgid "Accept"
 msgstr "Aceptado"
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1045
 #, fuzzy
 msgid "Tentatively accept"
 msgstr " Tentativa "
 
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1046
 #, fuzzy
 msgid "Decline"
 msgstr "Rexeitado"
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1070
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "Información de Libre/Ocupado"
 
-#: calendar/gui/e-itip-control.c:1090
+#: calendar/gui/e-itip-control.c:1083
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1103
+#: calendar/gui/e-itip-control.c:1096
 #, fuzzy
 msgid "Send Latest Information"
 msgstr "Información da Tarefa"
 
-#: calendar/gui/e-itip-control.c:1116 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1185
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> publicou información sobre unha reunión."
 
-#: calendar/gui/e-itip-control.c:1193
+#: calendar/gui/e-itip-control.c:1186
 msgid "Meeting Information"
 msgstr "Información da Xuntanza"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1191
 #, fuzzy, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> require a súa presencia nunha reunión."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1193
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> require a súa presencia nunha reunión."
 
-#: calendar/gui/e-itip-control.c:1201
+#: calendar/gui/e-itip-control.c:1194
 msgid "Meeting Proposal"
 msgstr "Proposta de Xuntanza"
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> desexa asistir a unha reunión existente."
 
-#: calendar/gui/e-itip-control.c:1206
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Update"
 msgstr "Actualización da Xuntanza"
 
-#: calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1203
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> desexa recibir a última información sobre a reunión."
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1204
 msgid "Meeting Update Request"
 msgstr "_Solicitude de Actualización de Xuntanza"
 
-#: calendar/gui/e-itip-control.c:1218
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> respostou a unha petición de xuntanza."
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Reply"
 msgstr "Resposta de Xuntanza"
 
-#: calendar/gui/e-itip-control.c:1226
+#: calendar/gui/e-itip-control.c:1219
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> cancelou unha reunión."
 
-#: calendar/gui/e-itip-control.c:1227
+#: calendar/gui/e-itip-control.c:1220
 msgid "Meeting Cancellation"
 msgstr "Cancelación da Xuntanza"
 
-#: calendar/gui/e-itip-control.c:1234 calendar/gui/e-itip-control.c:1302
-#: calendar/gui/e-itip-control.c:1337
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1330
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> enviou unha mensaxe inintelixible."
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1228
 msgid "Bad Meeting Message"
 msgstr "Mensaxe Incorrecta sobre a Xuntanza"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1253
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> publicou información sobre tarefa."
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1254
 msgid "Task Information"
 msgstr "Información da Tarefa"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1259
 #, fuzzy, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> require que se encargue dunha tarefa."
 
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> require que se encargue dunha tarefa."
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1262
 msgid "Task Proposal"
 msgstr "Proposta de Tarefas"
 
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> desexa asistir a unha tarefa existente."
 
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Update"
 msgstr "Actualización de Tarefa"
 
-#: calendar/gui/e-itip-control.c:1278
+#: calendar/gui/e-itip-control.c:1271
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> desexa recibir a última información sobre a tarefa."
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1272
 msgid "Task Update Request"
 msgstr "Petición de Actualización de Tarefa"
 
-#: calendar/gui/e-itip-control.c:1286
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> respostou a unha asignación de tarefa."
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Reply"
 msgstr "Resposta á Tarefa"
 
-#: calendar/gui/e-itip-control.c:1294
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> cancelou unha tarefa."
 
-#: calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1288
 msgid "Task Cancellation"
 msgstr "Cancelación de Tarefa"
 
-#: calendar/gui/e-itip-control.c:1303
+#: calendar/gui/e-itip-control.c:1296
 msgid "Bad Task Message"
 msgstr "Mensaxe Incorrecta sobre a Tarefa"
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1315
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> publicou información de libre/ocupado."
 
-#: calendar/gui/e-itip-control.c:1323
+#: calendar/gui/e-itip-control.c:1316
 msgid "Free/Busy Information"
 msgstr "Información de Libre/Ocupado"
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> require a súa información libre/ocupado."
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1321
 msgid "Free/Busy Request"
 msgstr "Petición de Libre/Ocupado"
 
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1325
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> respostou a unha petición de libre/ocupado."
 
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1326
 msgid "Free/Busy Reply"
 msgstr "Resposta de Libre/Ocupado"
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1331
 msgid "Bad Free/Busy Message"
 msgstr "Mensaxe de Libre/Ocupado Incorrecta"
 
-#: calendar/gui/e-itip-control.c:1413
+#: calendar/gui/e-itip-control.c:1406
 #, fuzzy
 msgid "The message does not appear to be properly formed"
 msgstr "O cartafol parece estar corrompido sen recuperación posible."
 
-#: calendar/gui/e-itip-control.c:1472
+#: calendar/gui/e-itip-control.c:1465
 #, fuzzy
 msgid "The message contains only unsupported requests."
 msgstr "Esta mensaxe só contén destinatarios Bcc."
 
-#: calendar/gui/e-itip-control.c:1503
+#: calendar/gui/e-itip-control.c:1496
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1535
+#: calendar/gui/e-itip-control.c:1528
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1769
+#: calendar/gui/e-itip-control.c:1762
 msgid "Update complete\n"
 msgstr "Actualización completada\n"
 
-#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
+#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1825
+#: calendar/gui/e-itip-control.c:1818
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1837
+#: calendar/gui/e-itip-control.c:1830
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1856
+#: calendar/gui/e-itip-control.c:1849
 #, fuzzy
 msgid "There was an error on the CORBA system\n"
 msgstr "Houbo un erro ao descarga-la fonte de novas"
 
-#: calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1852
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "¡Non se puido envia-lo elemento!\n"
 
-#: calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1855
 #, fuzzy
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Non foi posible abrir o cartafol en `%s'"
 
-#: calendar/gui/e-itip-control.c:1865
+#: calendar/gui/e-itip-control.c:1858
 #, fuzzy
 msgid "Attendee status updated\n"
 msgstr "Enderezo do asistente"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1861
 #, fuzzy
 msgid "Attendee status could not be updated!\n"
 msgstr "Enderezo do asistente"
 
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1892
 msgid "Removal Complete"
 msgstr "Eliminación Completa"
 
-#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
 msgid "Item sent!\n"
 msgstr "¡Elemento enviado!\n"
 
-#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
+#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
 msgid "The item could not be sent!\n"
 msgstr "¡Non se puido envia-lo elemento!\n"
 
@@ -6660,75 +6380,75 @@ msgstr "data-finalización"
 msgid "date-start"
 msgstr "data-comezo"
 
-#: calendar/gui/e-meeting-list-view.c:62
+#: calendar/gui/e-meeting-list-view.c:59
 msgid "Chair Persons"
 msgstr "Presidentes"
 
-#: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:479
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
 msgid "Required Participants"
 msgstr "Participantes Requiridos"
 
-#: calendar/gui/e-meeting-list-view.c:64
+#: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Participantes Opcionais"
 
-#: calendar/gui/e-meeting-list-view.c:65
+#: calendar/gui/e-meeting-list-view.c:62
 #, fuzzy
 msgid "Resources"
 msgstr "Recurso"
 
-#: calendar/gui/e-meeting-list-view.c:140 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
 #: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr "Individual"
 
-#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "Grupo"
 
-#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr "Recurso"
 
-#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr "Cuarto"
 
-#: calendar/gui/e-meeting-list-view.c:154 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr "Presidencia"
 
-#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:127
 #: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
 msgid "Required Participant"
 msgstr "Participantes Requiridos"
 
-#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr "Participante Opcional"
 
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr "Non-Participante"
 
-#: calendar/gui/e-meeting-list-view.c:179 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:177
 #: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
 msgid "Needs Action"
 msgstr "Precisa dunha Acción"
 
-#: calendar/gui/e-meeting-list-view.c:182 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
 #: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "Tentativa"
 
-#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr "Delegado"
@@ -6745,20 +6465,28 @@ msgstr "Fóra da Oficina"
 msgid "No Information"
 msgstr "Sen Información"
 
+#: calendar/gui/e-meeting-time-sel.c:417
+#, fuzzy
+msgid "Add attendees from addressbook"
+msgstr "Engadir o Autor ao Libro de Enderezos"
+
 #: calendar/gui/e-meeting-time-sel.c:440
 msgid "_Options"
 msgstr "_Opcións"
 
 #: calendar/gui/e-meeting-time-sel.c:457
-msgid "Show _Only Working Hours"
+#, fuzzy
+msgid "Show _only working hours"
 msgstr "Amosar _Só as Horas de Traballo"
 
 #: calendar/gui/e-meeting-time-sel.c:467
-msgid "Show _Zoomed Out"
+#, fuzzy
+msgid "Show _zoomed out"
 msgstr "Amozar sen _Zoom"
 
 #: calendar/gui/e-meeting-time-sel.c:482
-msgid "_Update Free/Busy"
+#, fuzzy
+msgid "_Update free/busy"
 msgstr "_Actualizar Libres/Ocupadas"
 
 #: calendar/gui/e-meeting-time-sel.c:497
@@ -6774,19 +6502,23 @@ msgid ">_>"
 msgstr ">_>"
 
 #: calendar/gui/e-meeting-time-sel.c:547
-msgid "_All People and Resources"
+#, fuzzy
+msgid "_All people and resources"
 msgstr "_Tódalas Persoas e Recursos"
 
 #: calendar/gui/e-meeting-time-sel.c:556
-msgid "All _People and One Resource"
+#, fuzzy
+msgid "All _people and one resource"
 msgstr "Tódalas _Persoas e Un Recurso"
 
 #: calendar/gui/e-meeting-time-sel.c:565
-msgid "_Required People"
+#, fuzzy
+msgid "_Required people"
 msgstr "Persoas _Requiridas"
 
 #: calendar/gui/e-meeting-time-sel.c:574
-msgid "Required People and _One Resource"
+#, fuzzy
+msgid "Required people and _one resource"
 msgstr "Persoas Requiridas e _Un Recurso"
 
 #: calendar/gui/e-meeting-time-sel.c:593
@@ -6824,82 +6556,72 @@ msgstr "%d/%m/%Y"
 msgid "Enter the password for %s"
 msgstr "Introduza o seu contrasinal para %s"
 
-#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr "Erro ao iniciar %s"
 
-#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-
 #. FIXME Loading should be async
 #. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:686
+#: calendar/gui/e-tasks.c:801
 #, fuzzy, c-format
 msgid "Opening tasks at %s"
 msgstr "Abrindo armacenamento %s"
 
-#: calendar/gui/e-tasks.c:709
+#: calendar/gui/e-tasks.c:824
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
 "%s"
 msgstr "Erro ao iniciar %s"
 
-#: calendar/gui/e-tasks.c:730
+#: calendar/gui/e-tasks.c:845
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Cargar _Imaxes"
 
-#: calendar/gui/e-tasks.c:834
+#: calendar/gui/e-tasks.c:949
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Data na que se completa"
 
-#: calendar/gui/e-tasks.c:857
+#: calendar/gui/e-tasks.c:972
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Elimina-los contactos seleccionados"
 
-#: calendar/gui/e-tasks.c:884
+#: calendar/gui/e-tasks.c:999
 #, fuzzy
 msgid "Expunging"
 msgstr "Limpar"
 
-#: calendar/gui/e-tasks.c:960
+#: calendar/gui/e-tasks.c:1075
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
-#: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
+#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
+#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
 #: calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:705
 msgid "Tasks"
 msgstr "Tarefas"
 
-#: calendar/gui/gnome-cal.c:1876
+#: calendar/gui/gnome-cal.c:1878
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Non hai citas"
 
-#: calendar/gui/gnome-cal.c:1895
+#: calendar/gui/gnome-cal.c:1897
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Cargar _Imaxes"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1920
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Abrir en %s..."
 
-#: calendar/gui/gnome-cal.c:2048
-#, c-format
-msgid "The calendar backend for '%s' has crashed."
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:2894
+#: calendar/gui/gnome-cal.c:2906
 #, fuzzy
 msgid "Purging"
 msgstr "Turco"
@@ -7108,7 +6830,7 @@ msgid "On The Web"
 msgstr ""
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 
@@ -7119,7 +6841,7 @@ msgid "Unable to migrate calendar `%s'"
 msgstr "Permiso denegado"
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:869
+#: calendar/gui/migration.c:889
 #, fuzzy, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Non se pode abrir o libro de enderezos"
@@ -7359,74 +7081,74 @@ msgstr "Imprimir Elemento"
 msgid "Print Setup"
 msgstr "Configuración da Impresión"
 
-#: calendar/gui/tasks-component.c:303
+#: calendar/gui/tasks-component.c:313
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:371
 #, fuzzy
 msgid "New Task List"
 msgstr "Lista de _Tarefas"
 
-#: calendar/gui/tasks-component.c:398
+#: calendar/gui/tasks-component.c:408
 #, fuzzy, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "Non hai tarefas"
 msgstr[1] "Non hai tarefas"
 
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] "%d seleccionada(s)"
 msgstr[1] "%d seleccionada(s)"
 
-#: calendar/gui/tasks-component.c:447
+#: calendar/gui/tasks-component.c:457
 #, fuzzy
 msgid "Failed upgrading tasks."
 msgstr "Cargar _Imaxes"
 
-#: calendar/gui/tasks-component.c:526
+#: calendar/gui/tasks-component.c:749
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:538
+#: calendar/gui/tasks-component.c:761
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:576
+#: calendar/gui/tasks-component.c:799
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:804
+#: calendar/gui/tasks-component.c:1040
 #, fuzzy
 msgid "New task"
 msgstr "Nova Tarefa"
 
-#: calendar/gui/tasks-component.c:805
+#: calendar/gui/tasks-component.c:1041
 msgid "_Task"
 msgstr "_Tarefa"
 
-#: calendar/gui/tasks-component.c:806
+#: calendar/gui/tasks-component.c:1042
 msgid "Create a new task"
 msgstr "Crear unha nova tarefa"
 
-#: calendar/gui/tasks-component.c:812
+#: calendar/gui/tasks-component.c:1048
 #, fuzzy
 msgid "New tasks group"
 msgstr "Nova Tarefa"
 
-#: calendar/gui/tasks-component.c:813
+#: calendar/gui/tasks-component.c:1049
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Lista de _Tarefas"
 
-#: calendar/gui/tasks-component.c:814
+#: calendar/gui/tasks-component.c:1050
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Crear unha nova tarefa"
@@ -9317,14 +9039,14 @@ msgstr "Erro ao executar a busca por filtro: %s: %s"
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1259
+#: camel/camel-folder.c:1262
 #, fuzzy, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 "Erro ao executar a expresión de busca: %s:\n"
 "%s"
 
-#: camel/camel-folder.c:1299
+#: camel/camel-folder.c:1302
 #, fuzzy, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
@@ -9341,11 +9063,16 @@ msgstr "Copiando as mensaxes"
 msgid "Copying messages"
 msgstr "Copiando as mensaxes a %s"
 
-#: camel/camel-folder.c:1666
-msgid "Learning junk and/or non junk message(s)"
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Advertencia"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
 msgstr ""
 
-#: camel/camel-folder.c:1695
+#: camel/camel-folder.c:1701
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "Recibindo %d mensaxe(s)"
@@ -9380,17 +9107,17 @@ msgstr ""
 msgid "(match-threads) requires a match type string"
 msgstr ""
 
-#: camel/camel-folder-search.c:785
+#: camel/camel-folder-search.c:784
 #, fuzzy
 msgid "(match-threads) expects an array result"
 msgstr "(coinciden-todas) require un único resultado booleano"
 
-#: camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:790
 #, fuzzy
 msgid "(match-threads) requires the folder set"
 msgstr "(coinciden-todas) require un único resultado booleano"
 
-#: camel/camel-folder-search.c:880
+#: camel/camel-folder-search.c:879
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Efectuando petición sobre a cabeceira descoñecida: %s"
@@ -9420,7 +9147,8 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
 #: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:706
+#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Cancelado."
@@ -9795,7 +9523,7 @@ msgstr ""
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1212
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Mala resposta de autenticación do servidor."
 
@@ -10188,44 +9916,44 @@ msgstr "Comando non implementado"
 msgid "export keys: unimplemented"
 msgstr ""
 
-#: camel/camel-store.c:214
+#: camel/camel-store.c:213
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Non se pode crear bloqueo de cartafol en %s: %s"
 
-#: camel/camel-store.c:244
+#: camel/camel-store.c:243
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr "Non é posible obter o cartafol: %s: %s"
 
-#: camel/camel-store.c:295
+#: camel/camel-store.c:297
 #, fuzzy
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Non se pode crear bloqueo de cartafol en %s: %s"
 
-#: camel/camel-store.c:323
+#: camel/camel-store.c:325
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Non é posible obter o cartafol: %s: %s"
 
-#: camel/camel-store.c:387 camel/camel-vee-store.c:354
+#: camel/camel-store.c:389 camel/camel-vee-store.c:351
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr ""
 "Non foi posible borrar o cartafol:\n"
 "%s"
 
-#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#: camel/camel-store.c:439 camel/camel-vee-store.c:387
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Non foi posible renomear o cartafol: %s"
 
-#: camel/camel-store.c:811
+#: camel/camel-store.c:777
 msgid "Trash"
 msgstr "Lixo"
 
-#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
-#: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/mail-config.glade.h:95
+#: ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
 msgstr "xuño"
@@ -10455,14 +10183,14 @@ msgstr "Non existe a mensaxe %s en %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Comprobar as novas mensaxes en tódolos cartafoles"
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:374
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr ""
 "Non foi posible borrar o cartafol:\n"
 "%s"
 
-#: camel/camel-vee-store.c:398
+#: camel/camel-vee-store.c:395
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Non foi posible renomear o cartafol %s a %s: %s"
@@ -10508,32 +10236,32 @@ msgstr "Libro de Enderezos"
 msgid "Post Office Agent SOAP Port:"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:80
+#: camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "Novell GroupWise"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:82
+#: camel/providers/groupwise/camel-groupwise-provider.c:85
 msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: camel/providers/groupwise/camel-groupwise-provider.c:100
 #: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
 msgid "Password"
 msgstr "Contrasinal"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:99
+#: camel/providers/groupwise/camel-groupwise-provider.c:102
 #: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Esta opción conectarase ó servidor IMAP usando un contrasinal sen cifrar."
 
-#: camel/providers/groupwise/camel-gw-listener.c:305
-#: camel/providers/groupwise/camel-gw-listener.c:328
+#: camel/providers/groupwise/camel-gw-listener.c:312
+#: camel/providers/groupwise/camel-gw-listener.c:335
 #, fuzzy
 msgid "Checklist"
 msgstr "Brétema espesa"
@@ -10679,13 +10407,13 @@ msgstr ""
 "Esta opción conectarase ó servidor IMAP usando un contrasinal sen cifrar."
 
 #: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:429
+#: camel/providers/imap/camel-imap-store.c:428
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "Servidor de SMTP %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:431
+#: camel/providers/imap/camel-imap-store.c:430
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "Servicio %s para %s en %s"
@@ -10695,7 +10423,7 @@ msgstr "Servicio %s para %s en %s"
 #: camel/providers/imap/camel-imap-store.c:551
 #: camel/providers/imap/camel-imap-store.c:571
 #: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
+#: camel/providers/nntp/camel-nntp-store.c:209
 #: camel/providers/pop3/camel-pop3-store.c:175
 #: camel/providers/smtp/camel-smtp-transport.c:269
 #: camel/providers/smtp/camel-smtp-transport.c:285
@@ -10712,10 +10440,10 @@ msgstr ""
 
 #: camel/providers/imap4/camel-imap4-store.c:222
 #: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:815
+#: camel/providers/imap/camel-imap-store.c:845
 #: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:137
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
 #: camel/providers/pop3/camel-pop3-store.c:192
 msgid "Connection cancelled"
 msgstr "Conexión cancelada"
@@ -10730,8 +10458,8 @@ msgstr ""
 "Erro enviando o nome de usuario: %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:649
-#: camel/providers/imap/camel-imap-store.c:680
+#: camel/providers/imap/camel-imap-store.c:679
+#: camel/providers/imap/camel-imap-store.c:710
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
@@ -10742,7 +10470,7 @@ msgstr ""
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1109
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
 msgid "Unknown error"
 msgstr "Erro descoñecido"
 
@@ -10770,8 +10498,8 @@ msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr "Non é posible obter o cartafol: %s: %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1857
-#: camel/providers/imap/camel-imap-store.c:2235
+#: camel/providers/imap/camel-imap-store.c:1885
+#: camel/providers/imap/camel-imap-store.c:2263
 #, fuzzy, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -10858,12 +10586,12 @@ msgstr "O servidor desconectou inesperadamente"
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3168
+#: camel/providers/imap/camel-imap-store.c:3194
 msgid "Operation cancelled"
 msgstr "Operación cancelada"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3171
+#: camel/providers/imap/camel-imap-store.c:3197
 #, fuzzy, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "O servidor desconectou inesperadamente"
@@ -10925,13 +10653,6 @@ msgid "Unable to retrieve message: %s"
 msgstr "Non se puido descodifica-la mensaxe."
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:219
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -10941,15 +10662,15 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-mbox-folder.c:418
+#: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
 msgstr "Non existe a mensaxe"
 
 #: camel/providers/imap/camel-imap-folder.c:2019
-#: camel/providers/imap/camel-imap-folder.c:2621
-#: camel/providers/nntp/camel-nntp-folder.c:238
+#: camel/providers/imap/camel-imap-folder.c:2622
+#: camel/providers/nntp/camel-nntp-folder.c:220
 msgid "This message is not currently available"
 msgstr "Esta mensaxe non está dispoñible actualmente."
 
@@ -10958,7 +10679,23 @@ msgstr "Esta mensaxe non está dispoñible actualmente."
 msgid "Fetching summary information for new messages"
 msgstr "Recollendo información de resumo para as mensaxes novas"
 
-#: camel/providers/imap/camel-imap-folder.c:2659
+#: camel/providers/imap/camel-imap-folder.c:2463
+#, c-format
+msgid "Incomplete server response: no information provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2471
+#, c-format
+msgid "Incomplete server response: no UID provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2484
+#, c-format
+msgid ""
+"Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2660
 msgid "Could not find message body in FETCH response."
 msgstr "Non foi posible atopar o corpo da mensaxe na resposta FETCH."
 
@@ -11025,45 +10762,45 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Para ler e almacenar correo en servidores IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/imap/camel-imap-store.c:680
 #: camel/providers/pop3/camel-pop3-store.c:228
 #, fuzzy
 msgid "SSL/TLS extension not supported."
 msgstr "Operación non soportada"
 
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:711
 #: camel/providers/pop3/camel-pop3-store.c:269
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "A autenticación fallou."
 
-#: camel/providers/imap/camel-imap-store.c:818
+#: camel/providers/imap/camel-imap-store.c:848
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Non foi posible conectarse ó servidor: %s."
 
-#: camel/providers/imap/camel-imap-store.c:1242
+#: camel/providers/imap/camel-imap-store.c:1272
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "O servidor IMAP %s non soporta o tipo de autenticación %s solicitado."
 
-#: camel/providers/imap/camel-imap-store.c:1252
+#: camel/providers/imap/camel-imap-store.c:1282
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Non hai soporte para o tipo de autenticación %s"
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1305
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sIntroduza o contrasinal IMAP para %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1289
+#: camel/providers/imap/camel-imap-store.c:1319
 msgid "You didn't enter a password."
 msgstr "Non introduciu un contrasinal."
 
-#: camel/providers/imap/camel-imap-store.c:1318
+#: camel/providers/imap/camel-imap-store.c:1348
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -11074,18 +10811,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1839
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:1867
+#: camel/providers/imap/camel-imap-store.c:2057
 #, c-format
 msgid "No such folder %s"
 msgstr "Non existe o cartafol %s"
 
-#: camel/providers/imap/camel-imap-store.c:1915
-#: camel/providers/imap/camel-imap-store.c:2296
+#: camel/providers/imap/camel-imap-store.c:1943
+#: camel/providers/imap/camel-imap-store.c:2324
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Non se lle permite ao cartafol pai conter subcartafoles"
 
-#: camel/providers/imap/camel-imap-store.c:1970
+#: camel/providers/imap/camel-imap-store.c:1998
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -11093,7 +10830,7 @@ msgstr "Non se lle permite ao cartafol pai conter subcartafoles"
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Non é posible obter o cartafol: %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:2274
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Erro descoñecido: %s"
@@ -11127,20 +10864,20 @@ msgid "Index message body data"
 msgstr "Enviar mensaxe a un contacto"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:388
 #, fuzzy, c-format
 msgid "~%s (%s)"
 msgstr "%s (%d)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:393
-#: camel/providers/local/camel-local-folder.c:396
+#: camel/providers/local/camel-local-folder.c:392
+#: camel/providers/local/camel-local-folder.c:395
 #, fuzzy, c-format
 msgid "mailbox:%s (%s)"
 msgstr "Non se pode abri-la caixa do correo: %s: %s\n"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:400
+#: camel/providers/local/camel-local-folder.c:399
 #, fuzzy, c-format
 msgid "%s (%s)"
 msgstr "%s (%d)"
@@ -11203,7 +10940,7 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:142
 #: camel/providers/local/camel-local-store.c:253
-#: camel/providers/local/camel-mbox-store.c:356
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -11277,8 +11014,25 @@ msgstr "Fallo na mensaxe %d"
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Non se pode engadir a mensaxe ao cartafol maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:226
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mbox-folder.c:417
+#: camel/providers/local/camel-mbox-folder.c:436
+#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:475
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-mh-folder.c:221
+#, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+"Non é posible obter a mensaxe: %s do cartafol %s\n"
+"  %s"
+
+#: camel/providers/local/camel-maildir-folder.c:236
 msgid "Invalid message contents"
 msgstr "Contido da mensaxe non válido"
 
@@ -11319,9 +11073,9 @@ msgstr "Non foi posible borrar o cartafol `%s': %s"
 msgid "not a maildir directory"
 msgstr "non é un directorio maildir."
 
-#: camel/providers/local/camel-maildir-store.c:341
-#: camel/providers/local/camel-spool-store.c:286
-#: camel/providers/local/camel-spool-store.c:316
+#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-spool-store.c:284
+#: camel/providers/local/camel-spool-store.c:314
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Non foi posible examina-lo cartafol `%s': %s"
@@ -11372,27 +11126,18 @@ msgstr "Operación cancelada"
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Non se pode engadir a mensaxe ao ficheiro mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:435
-#: camel/providers/local/camel-mbox-folder.c:466
-#: camel/providers/local/camel-mbox-folder.c:474
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"Non é posible obter a mensaxe: %s do cartafol %s\n"
-"  %s"
-
-#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:468
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "O cartafol parece estar corrompido sen recuperación posible."
 
-#: camel/providers/local/camel-mbox-folder.c:475
-msgid "Message construction failed: Corrupt mailbox?"
+#: camel/providers/local/camel-mbox-folder.c:476
+#: camel/providers/local/camel-mh-folder.c:222
+#, fuzzy
+msgid "Message construction failed."
 msgstr "Contrucción da mensaxe fallida: ¿mailbox corrompido?"
 
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:362
+#: camel/providers/local/camel-mbox-store.c:361
 #, fuzzy
 msgid "Cannot create a folder by this name."
 msgstr "Non se pode crear bloqueo de cartafol en %s: %s"
@@ -11423,32 +11168,32 @@ msgstr "`%s' non é un ficheiro normal."
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "O cartafol `%s' non está baleiro. Non borrado."
 
-#: camel/providers/local/camel-mbox-store.c:375
+#: camel/providers/local/camel-mbox-store.c:374
 #, fuzzy, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Non foi posible crear o directorio %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:389
+#: camel/providers/local/camel-mbox-store.c:388
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Non é posible obter o cartafol: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:391
+#: camel/providers/local/camel-mbox-store.c:390
 #, fuzzy
 msgid "Folder already exists"
 msgstr "O ID da Tarxeta xa existe"
 
-#: camel/providers/local/camel-mbox-store.c:473
+#: camel/providers/local/camel-mbox-store.c:472
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "O nome de cartafol indicado non é válido: %s"
 
-#: camel/providers/local/camel-mbox-store.c:486
+#: camel/providers/local/camel-mbox-store.c:485
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Non foi posible renomear o cartafol: %s"
 
-#: camel/providers/local/camel-mbox-store.c:561
+#: camel/providers/local/camel-mbox-store.c:560
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Non foi posible renomear o cartafol %s a %s: %s"
@@ -11647,7 +11392,7 @@ msgstr ""
 "O cartafol pode estar corrupto, copia gardada en `%s'"
 
 #: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:997
+#: camel/providers/nntp/camel-nntp-store.c:1126
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Introduza o contrasinal NNTP para %s@%s"
@@ -11664,19 +11409,10 @@ msgstr "Non se puido enviar o nome de usuario ao servidor"
 msgid "Server rejected username/password"
 msgstr "O servidor rexeitou o nome de usuario/contrasinal"
 
-#: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:263
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-#, fuzzy
-msgid "User cancelled"
-msgstr "Operación cancelada"
-
-#: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:259
-#: camel/providers/nntp/camel-nntp-folder.c:265
+#: camel/providers/nntp/camel-nntp-folder.c:147
+#: camel/providers/nntp/camel-nntp-folder.c:149
+#: camel/providers/nntp/camel-nntp-folder.c:158
+#: camel/providers/nntp/camel-nntp-folder.c:234
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11687,64 +11423,52 @@ msgstr ""
 "Non é posible obter a mensaxe: %s\n"
 "  %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:188
-#: camel/providers/nntp/camel-nntp-folder.c:228
+#: camel/providers/nntp/camel-nntp-folder.c:156
+#: camel/providers/nntp/camel-nntp-folder.c:232
+#: camel/providers/nntp/camel-nntp-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+#, fuzzy
+msgid "User cancelled"
+msgstr "Operación cancelada"
+
+#: camel/providers/nntp/camel-nntp-folder.c:176
+#: camel/providers/nntp/camel-nntp-folder.c:208
 #, c-format
 msgid "Internal error: uid in invalid format: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:201
-#, fuzzy, c-format
-msgid "Could not get article %s from NNTP server"
-msgstr "Non foi posible recibir a lista de grupos do servidor."
-
-#: camel/providers/nntp/camel-nntp-folder.c:362
-msgid "Posting not allowed by news server"
-msgstr ""
-
+#: camel/providers/nntp/camel-nntp-folder.c:328
+#: camel/providers/nntp/camel-nntp-folder.c:331
 #: camel/providers/nntp/camel-nntp-folder.c:373
-#, c-format
-msgid "Failed to send newsgroups header: %s: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:413
-#: camel/providers/nntp/camel-nntp-folder.c:426
-#, c-format
-msgid "Error posting to newsgroup: %s: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:438
-msgid "Error reading response to posted message: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:441
+#: camel/providers/nntp/camel-nntp-folder.c:375
 #, fuzzy, c-format
-msgid "Error posting message: %s: message not posted"
-msgstr ""
-"Erro ao autogardar a mensaxe: %s:\n"
-" %s"
+msgid "Posting failed: %s"
+msgstr "Operación cancelada"
 
-#: camel/providers/nntp/camel-nntp-folder.c:457
+#: camel/providers/nntp/camel-nntp-folder.c:393
 #, fuzzy
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "Non pode copiar mensaxes deste cartafol de lixo."
 
-#: camel/providers/nntp/camel-nntp-folder.c:468
+#: camel/providers/nntp/camel-nntp-folder.c:404
 #, fuzzy
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Non pode copiar mensaxes deste cartafol de lixo."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:44
 msgid "Could not get group list from server."
 msgstr "Non foi posible recibir a lista de grupos do servidor."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#: camel/providers/nntp/camel-nntp-grouplist.c:97
+#: camel/providers/nntp/camel-nntp-grouplist.c:106
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "Incapaz de cargar o ficheiro grouplist para %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#: camel/providers/nntp/camel-nntp-grouplist.c:157
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Incapaz de gardar o ficheiro grouplist para %s: %s"
@@ -11773,27 +11497,29 @@ msgid ""
 msgstr ""
 "Esta opción autenticarase co servidor NNTP usando un contrasinal sen cifrar."
 
-#: camel/providers/nntp/camel-nntp-store.c:158
+#: camel/providers/nntp/camel-nntp-store.c:118
+#: camel/providers/nntp/camel-nntp-store.c:1233
+#: camel/providers/nntp/camel-nntp-store.c:1331
+#, fuzzy, c-format
+msgid "NNTP Command failed: %s"
+msgstr "O comando IMAP fallou: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:227
 #, fuzzy, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Non foi posible crear o directorio %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:170
+#: camel/providers/nntp/camel-nntp-store.c:239
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:326
+#: camel/providers/nntp/camel-nntp-store.c:403
 #, c-format
 msgid "USENET News via %s"
 msgstr "Novas USENET via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:640
-#, fuzzy
-msgid "Stream error"
-msgstr "Outro erro"
-
-#: camel/providers/nntp/camel-nntp-store.c:643
+#: camel/providers/nntp/camel-nntp-store.c:777
 #, fuzzy, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -11803,76 +11529,76 @@ msgstr ""
 "Erro ao gardar as mensaxes en: %s:\n"
 " %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:735
+#: camel/providers/nntp/camel-nntp-store.c:872
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
 "No such newsgroup. The selected item is a probably a parent folder."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:767
+#: camel/providers/nntp/camel-nntp-store.c:904
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
 "newsgroup does not exist!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:792
+#: camel/providers/nntp/camel-nntp-store.c:929
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:800
+#: camel/providers/nntp/camel-nntp-store.c:937
 #, fuzzy
 msgid "You cannot rename a folder in a News store."
 msgstr "Non foi posible renomear o cartafol %s a %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:808
+#: camel/providers/nntp/camel-nntp-store.c:945
 #, fuzzy
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "Non se pode mover un cartafol a un dos seus descendentes"
 
-#: camel/providers/nntp/camel-nntp-summary.c:253
-#, fuzzy, c-format
-msgid "Connection error: %s"
-msgstr "Erro descoñecido: %s"
-
-#: camel/providers/nntp/camel-nntp-summary.c:262
-#, fuzzy, c-format
-msgid "No such folder: %s"
-msgstr "Non existe o cartafol %s"
+#: camel/providers/nntp/camel-nntp-store.c:1118
+#, fuzzy
+msgid "Authentication requested but not username provided"
+msgstr "Autenticación requirida"
 
-#: camel/providers/nntp/camel-nntp-summary.c:268
+#: camel/providers/nntp/camel-nntp-store.c:1146
 #, fuzzy, c-format
-msgid "Could not get group: %s"
-msgstr "Non foi posible crear unha canalización: %s"
+msgid "Cannot authenticate to server: %s"
+msgstr "Non foi posible autenticarse co servidor KPOP: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:333
+#: camel/providers/nntp/camel-nntp-store.c:1262
 #, fuzzy
-msgid "Could not get messages: unspecified error"
-msgstr "Non foi posible recoller a mensaxe: %s"
+msgid "Not connected."
+msgstr "Contactos"
 
-#: camel/providers/nntp/camel-nntp-summary.c:378
+#: camel/providers/nntp/camel-nntp-store.c:1311
 #, fuzzy, c-format
-msgid "NNTP Command failed: %s"
-msgstr "O comando IMAP fallou: %s"
+msgid "No such folder: %s"
+msgstr "Non existe o cartafol %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:438
-#: camel/providers/nntp/camel-nntp-summary.c:543
+#: camel/providers/nntp/camel-nntp-summary.c:218
+#: camel/providers/nntp/camel-nntp-summary.c:314
 #, fuzzy, c-format
 msgid "%s: Scanning new messages"
 msgstr "Buscando mensaxes novas"
 
-#: camel/providers/nntp/camel-nntp-summary.c:558
+#: camel/providers/nntp/camel-nntp-summary.c:225
 #, fuzzy, c-format
-msgid "Unknown server response: %s"
-msgstr "Erro descoñecido: %s"
+msgid "Unexpected server response from xover: %s"
+msgstr "Resposta inesperada do servidor IMAP: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:328
+#, fuzzy, c-format
+msgid "Unexpected server response from head: %s"
+msgstr "Resposta inesperada do servidor IMAP: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:605
+#: camel/providers/nntp/camel-nntp-summary.c:368
 #, fuzzy
 msgid "Use cancel"
 msgstr "Cancelar"
 
-#: camel/providers/nntp/camel-nntp-summary.c:607
+#: camel/providers/nntp/camel-nntp-summary.c:370
 #, fuzzy, c-format
 msgid "Operation failed: %s"
 msgstr "Operación cancelada"
@@ -11921,7 +11647,7 @@ msgstr "Borrar despois de %s día(s)"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107
 msgid "POP"
 msgstr "POP"
 
@@ -12012,7 +11738,7 @@ msgid "No such folder `%s'."
 msgstr "Non existe o cartafol `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:132
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -12068,7 +11794,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Entrega de correo a través do programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:119
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -12373,19 +12099,19 @@ msgstr "%.1fM"
 msgid "%.0fG"
 msgstr "%.1fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
+#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:408
 msgid "attachment"
 msgstr "anexo"
 
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:454
 msgid "Remove selected items from the attachment list"
 msgstr "Eliminar os elementos seleccionados da lista de anexos"
 
-#: composer/e-msg-composer-attachment-bar.c:491
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Add attachment..."
 msgstr "Engadir anexo..."
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:495
 msgid "Attach a file to the message"
 msgstr "Anexar un ficheiro á mensaxe"
 
@@ -12449,7 +12175,7 @@ msgstr "(Mensaxe Sen Título)"
 msgid "Open file"
 msgstr "Abrir ficheiro"
 
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
 msgid "Autogenerated"
 msgstr ""
 
@@ -12598,17 +12324,17 @@ msgstr "Anexar un ficheiro"
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
+msgid "You cannot attach the file `{0}' to this message."
 msgstr "Anexar un ficheiro á mensaxe"
 
 #. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4
-msgid "${1}"
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
 msgstr ""
 
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
 
 #. mail-composer:attach-directory primary
@@ -12706,7 +12432,7 @@ msgstr "Non foi posible crear unha canalización: %s"
 
 #. mail-composer:no-build-message secondary
 #: composer/mail-composer-errors.xml.h:34
-msgid "Because \"${0}\", you may need to select different mail options."
+msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
@@ -12718,8 +12444,10 @@ msgstr ""
 "%s"
 
 #. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38
-msgid "Because \"${1}\"."
+#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted primary
@@ -13159,11 +12887,11 @@ msgid "<b>Then</b>"
 msgstr "<b>Descrición:</b> %s"
 
 #: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1335
+#: mail/mail-account-gui.c:1347
 msgid "Select Folder"
 msgstr "Seleccionar Cartafol"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
 msgid "    "
 msgstr ""
 
@@ -13225,7 +12953,7 @@ msgstr "atrás"
 msgid "months"
 msgstr "meses"
 
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
 msgid "seconds"
 msgstr "segundos"
 
@@ -13258,21 +12986,21 @@ msgstr "con todos os cartafoles locais"
 msgid "years"
 msgstr "anos"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:916
-#: mail/mail-config.c:76 mail/mail-config.glade.h:90
+#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
+#: mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Importante"
 
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:919 mail/mail-config.c:79
-#: mail/mail-config.glade.h:145
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: mail/mail-config.glade.h:148
 #, fuzzy
 msgid "To Do"
 msgstr "Togo"
 
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:920 mail/mail-config.c:80
-#: mail/mail-config.glade.h:94
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Later"
 msgstr "despois"
@@ -13332,269 +13060,6 @@ msgstr "entrante"
 msgid "outgoing"
 msgstr "saínte"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-#, fuzzy
-msgid "Adjust Score"
-msgstr "Asignar Puntuación"
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Color"
-msgstr "Asignar Cor"
-
-#: filter/libfilter-i18n.h:4
-msgid "Assign Score"
-msgstr "Asignar Puntuación"
-
-#: filter/libfilter-i18n.h:5
-msgid "Attachments"
-msgstr "Anexos"
-
-#: filter/libfilter-i18n.h:6
-#, fuzzy
-msgid "Beep"
-msgstr "Belice"
-
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "contén"
-
-#: filter/libfilter-i18n.h:8
-msgid "Copy to Folder"
-msgstr "Copiar ó Cartafol"
-
-#: filter/libfilter-i18n.h:9
-msgid "Date received"
-msgstr "Data de recepción"
-
-#: filter/libfilter-i18n.h:10
-msgid "Date sent"
-msgstr "Data de envío"
-
-#: filter/libfilter-i18n.h:12
-msgid "Deleted"
-msgstr "Eliminada"
-
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "non contén"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "non remata en"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "non existe"
-
-#: filter/libfilter-i18n.h:16
-#, fuzzy
-msgid "does not return"
-msgstr "non existe"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "non soa como"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "non comeza por"
-
-#: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
-msgstr "Non Existe"
-
-#: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr "Borrador"
-
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "remata en"
-
-#: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr "Existe"
-
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "existe"
-
-#: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr "Expresión"
-
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr ""
-
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "é"
-
-#: filter/libfilter-i18n.h:28
-#, fuzzy
-msgid "is after"
-msgstr "foi posterior a"
-
-#: filter/libfilter-i18n.h:29
-#, fuzzy
-msgid "is before"
-msgstr "foi anterior a"
-
-#: filter/libfilter-i18n.h:30
-#, fuzzy
-msgid "is Flagged"
-msgstr "Marcada"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "é maior que"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "é menor que"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "non é"
-
-#: filter/libfilter-i18n.h:34
-#, fuzzy
-msgid "is not Flagged"
-msgstr "Marcada"
-
-#: filter/libfilter-i18n.h:36
-#, fuzzy
-msgid "Junk Test"
-msgstr "xuño"
-
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
-#: widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr ""
-
-#: filter/libfilter-i18n.h:38
-msgid "Mailing list"
-msgstr "Lista de Correo"
-
-#: filter/libfilter-i18n.h:39
-msgid "Message Body"
-msgstr "Corpo da Mensaxe"
-
-#: filter/libfilter-i18n.h:40
-msgid "Message Header"
-msgstr "Cabeceira da Mensaxe"
-
-#: filter/libfilter-i18n.h:41
-#, fuzzy
-msgid "Message is Junk"
-msgstr "Enviouse a mensaxe"
-
-#: filter/libfilter-i18n.h:42
-#, fuzzy
-msgid "Message is not Junk"
-msgstr "Mensaxe %s non atopada."
-
-#: filter/libfilter-i18n.h:43
-msgid "Move to Folder"
-msgstr "Mover a un Cartafol"
-
-#: filter/libfilter-i18n.h:44
-#, fuzzy
-msgid "Pipe to Program"
-msgstr "Saír do programa"
-
-#: filter/libfilter-i18n.h:45
-#, fuzzy
-msgid "Play Sound"
-msgstr "Tocar un son:"
-
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Ler"
-
-#: filter/libfilter-i18n.h:47
-msgid "Recipients"
-msgstr "Destinatarios"
-
-#: filter/libfilter-i18n.h:48
-msgid "Regex Match"
-msgstr "Busca por Expresión Regular"
-
-#: filter/libfilter-i18n.h:49
-msgid "Replied to"
-msgstr "Respondido a"
-
-#: filter/libfilter-i18n.h:50
-#, fuzzy
-msgid "returns"
-msgstr "Ocupado"
-
-#: filter/libfilter-i18n.h:51
-#, fuzzy
-msgid "returns greater than"
-msgstr "é maior que"
-
-#: filter/libfilter-i18n.h:52
-#, fuzzy
-msgid "returns less than"
-msgstr "é menor que"
-
-#: filter/libfilter-i18n.h:53
-#, fuzzy
-msgid "Run Program"
-msgstr "Executar un programa:"
-
-#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Puntuación"
-
-#: filter/libfilter-i18n.h:55
-msgid "Sender"
-msgstr "Autor"
-
-#: filter/libfilter-i18n.h:56
-msgid "Set Status"
-msgstr "Establecer Estado"
-
-#: filter/libfilter-i18n.h:57
-msgid "Size (kB)"
-msgstr "Tamaño (kB)"
-
-#: filter/libfilter-i18n.h:58
-msgid "sounds like"
-msgstr "soa como"
-
-#: filter/libfilter-i18n.h:59
-msgid "Source Account"
-msgstr "Conta Fonte"
-
-#: filter/libfilter-i18n.h:60
-msgid "Specific header"
-msgstr "Cabeceira específica"
-
-#: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "comeza por"
-
-#: filter/libfilter-i18n.h:63
-msgid "Stop Processing"
-msgstr "Parar o Procesamento"
-
-#: filter/libfilter-i18n.h:64 mail/em-format.c:755 mail/em-format-html.c:1519
-#: mail/em-format-quote.c:302 mail/em-mailer-prefs.c:87
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
-#: smime/lib/e-cert.c:1079
-msgid "Subject"
-msgstr "Asunto"
-
-#: filter/libfilter-i18n.h:65
-#, fuzzy
-msgid "Unset Status"
-msgstr "Establecer Estado"
-
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Engadir Regra"
@@ -13613,6 +13078,11 @@ msgstr "Nome da regra: "
 msgid "_Score Rules"
 msgstr "Regras de Puntuación"
 
+#: filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Puntuación"
+
 #: filter/searchtypes.xml.h:1
 msgid "Body contains"
 msgstr "O corpo contén"
@@ -13701,13 +13171,13 @@ msgstr "Sinatura _HTML:"
 msgid "-------- Forwarded Message --------"
 msgstr "Mensaxe Remitida"
 
-#: mail/em-composer-utils.c:1499
+#: mail/em-composer-utils.c:1495
 msgid "an unknown sender"
 msgstr "un remitente descoñecido"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1509
+#: mail/em-composer-utils.c:1505
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "O %a, %Y-%m-%d ás %H:%M, %%s escribiu:"
@@ -13752,8 +13222,8 @@ msgstr "<prema aquí para seleccionar un cartafol>"
 msgid "Create New Folder"
 msgstr "Crear un _Novo Cartafol..."
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
-#: mail/mail-component.c:701
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
+#: mail/mail-component.c:704
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Especifica ónde crear o cartafol:"
@@ -13769,109 +13239,110 @@ msgstr "Previsualizar"
 msgid "Folder _name:"
 msgstr "Nome do cartafol:"
 
-#: mail/em-folder-tree.c:839
+#: mail/em-folder-tree.c:833
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Eliminando o cartafol %s"
 
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree.c:835
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Abrindo cartafol %s"
 
-#: mail/em-folder-tree.c:848 mail/message-list.c:1555
+#: mail/em-folder-tree.c:842 mail/message-list.c:1561
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Movendo mensaxes a %s"
 
-#: mail/em-folder-tree.c:850 mail/message-list.c:1557
+#: mail/em-folder-tree.c:844 mail/message-list.c:1563
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copiando as mensaxes a %s"
 
-#: mail/em-folder-tree.c:866
+#: mail/em-folder-tree.c:860
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Comprobar as novas mensaxes en tódolos cartafoles"
 
-#: mail/em-folder-tree.c:956 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Copiar ó Cartafol"
 
-#: mail/em-folder-tree.c:957 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Mover ó Cartafol"
 
-#: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2069
-#: mail/em-folder-tree.c:2551 mail/em-folder-view.c:798
-#: mail/message-list.c:1645
+#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
+#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
+#: mail/message-list.c:1651
 #, fuzzy
 msgid "_Move"
 msgstr "Mover"
 
-#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#: mail/em-folder-tree.c:955 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "Cancelar Tarefa"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
 #: mail/em-folder-view.c:798 mail/em-folder-view.c:812
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Seleccionar cartafol"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
 #, fuzzy
 msgid "C_opy"
 msgstr "Copiar"
 
-#: mail/em-folder-tree.c:2096
+#: mail/em-folder-tree.c:2088
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Creando o cartafol %s"
 
-#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
+#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
 #, fuzzy
 msgid "Create folder"
 msgstr "Crear un novo cartafol"
 
-#: mail/em-folder-tree.c:2474
+#: mail/em-folder-tree.c:2463
 #, fuzzy, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Renomea-lo cartafol '%s'"
 
-#: mail/em-folder-tree.c:2476
+#: mail/em-folder-tree.c:2465
 #, fuzzy
 msgid "Rename Folder"
 msgstr "Renomea-lo cartafol '%s'"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Vista"
 
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2537
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Abrir nunha Nova Fiestra"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2555
+#: mail/em-folder-tree.c:2546
 #, fuzzy
 msgid "_New Folder..."
 msgstr "_Novo Cartafol"
 
-#: mail/em-folder-tree.c:2558
+#: mail/em-folder-tree.c:2549
 msgid "_Rename"
 msgstr "_Renomear"
 
-#: mail/em-folder-tree.c:2561 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Propiedades..."
 
 #: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:889
+#: mail/mail-vfolder.c:888
 msgid "VFolders"
 msgstr "CartafolesV"
 
@@ -13885,7 +13356,7 @@ msgstr ""
 msgid "Inbox"
 msgstr "Entrada"
 
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
 #, fuzzy
 msgid "Loading..."
 msgstr "Agardando..."
@@ -13893,12 +13364,12 @@ msgstr "Agardando..."
 #: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
 #: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
 #: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:551
+#: mail/mail-component.c:554
 msgid "Mail"
 msgstr "Correo"
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Editar coma unha Nova Mensaxe"
@@ -13911,17 +13382,17 @@ msgstr "_Imprimir"
 msgid "_Reply to Sender"
 msgstr "_Responder ó Autor"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:810
+#: mail/em-folder-view.c:901 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Responder á _Lista"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:811
+#: mail/em-folder-view.c:902 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Responder a _Todos"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: mail/em-folder-view.c:903 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Remitir"
@@ -13982,6 +13453,10 @@ msgstr "_Mover ó Cartafol.."
 msgid "_Copy to Folder..."
 msgstr "_Copiar a un Cartafol..."
 
+#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr ""
+
 #: mail/em-folder-view.c:932
 #, fuzzy
 msgid "Add Sender to Address_book"
@@ -14035,13 +13510,13 @@ msgid "Filter on _Mailing List"
 msgstr "Filtrar pola Lista de _Correo"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
-#: mail/mail-config.glade.h:66
+#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/mail-config.glade.h:68
 #, fuzzy
 msgid "Default"
 msgstr "Por de_fecto"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1796
 msgid "Print Message"
 msgstr "Imprimir Mensaxe"
 
@@ -14082,12 +13557,18 @@ msgstr "Cc"
 msgid "Bcc"
 msgstr "Bcc:"
 
+#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
+#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Asunto"
+
 #: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
 #: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Data"
 
-#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
+#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
 msgid "Newsgroups"
 msgstr ""
 
@@ -14287,7 +13768,7 @@ msgid ""
 "practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:757
+#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
 #, fuzzy
 msgid "_View Certificate"
 msgstr "ID do certificado:"
@@ -14351,7 +13832,7 @@ msgstr "Unha sema_na"
 msgid "Once per month"
 msgstr "Un m_es"
 
-#: mail/em-migrate.c:1072
+#: mail/em-migrate.c:1168
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -14359,91 +13840,91 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1506
+#: mail/em-migrate.c:1602
 #, fuzzy, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Non é posible obter o cartafol: %s: %s"
 
-#: mail/em-migrate.c:1532
+#: mail/em-migrate.c:1628
 #, fuzzy, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr ""
 "Non é posible desprazarse no ficheiro: %s\n"
 "%s"
 
-#: mail/em-migrate.c:1715
+#: mail/em-migrate.c:1811
 #, fuzzy, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Incapaz de gardar o ficheiro grouplist para %s: %s"
 
-#: mail/em-migrate.c:1919
+#: mail/em-migrate.c:2015
 #, fuzzy, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Non foi posible abrir ou crear o ficheiro .newsrc para %s: %s"
 
-#: mail/em-migrate.c:1933
+#: mail/em-migrate.c:2029
 #, fuzzy, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: mail/em-migrate.c:1962
+#: mail/em-migrate.c:2058
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#: mail/em-migrate.c:2413 mail/em-migrate.c:2425
 #, fuzzy, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: mail/em-migrate.c:2480
+#: mail/em-migrate.c:2576
 #, fuzzy, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr ""
 "Non foi posible crear o ficheiro de saída: %s\n"
 " %s"
 
-#: mail/em-migrate.c:2498
+#: mail/em-migrate.c:2594
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 msgstr ""
 
-#: mail/em-popup.c:699
+#: mail/em-popup.c:700
 msgid "Save As..."
 msgstr "Gardar Como..."
 
-#: mail/em-popup.c:717
+#: mail/em-popup.c:718
 #, fuzzy, c-format
 msgid "untitled_image.%s"
 msgstr "Mensaxes Sen Título"
 
-#: mail/em-popup.c:807
+#: mail/em-popup.c:808
 #, fuzzy
 msgid "Set as _Background"
 msgstr "Fondo:"
 
-#: mail/em-popup.c:809
+#: mail/em-popup.c:810
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "Responder ó autor"
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:859
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Abrir Ligazón no Navegador"
 
-#: mail/em-popup.c:859
+#: mail/em-popup.c:860
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Enviar unha _mensaxe á lista..."
 
-#: mail/em-popup.c:860
+#: mail/em-popup.c:861
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Engadir Libro de Enderezos"
 
-#: mail/em-popup.c:966
+#: mail/em-popup.c:967
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir en %s..."
@@ -15051,7 +14532,7 @@ msgstr "Compoñente de resumo executivo do correo de Evolution."
 msgid "Mail Accounts"
 msgstr "Contas"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
 #, fuzzy
 msgid "Mail Preferences"
 msgstr "Preferencias da Axenda"
@@ -15065,15 +14546,15 @@ msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution está importando o seu correo de Elm antigo"
 
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:226
+#: mail/importers/evolution-mbox-importer.c:221
+#: mail/importers/evolution-outlook-importer.c:255
 #: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Importando..."
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:222
-#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/evolution-mbox-importer.c:223
+#: mail/importers/evolution-outlook-importer.c:257
 #: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Agarde, por favor"
@@ -15096,23 +14577,25 @@ msgid "Elm"
 msgstr ""
 
 #: mail/importers/evolution-mbox-importer.c:116
+#: mail/importers/evolution-outlook-importer.c:130
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Borrar este cartafol"
 
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 #, fuzzy
 msgid "Select folder to import into"
 msgstr "Seleccionar Cartafol"
 
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:254
 #: mail/importers/mail-importer.c:226
 #, fuzzy, c-format
 msgid "Importing `%s'"
 msgstr "Importando"
 
-#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/evolution-outlook-importer.c:301
 #: mail/importers/mail-importer.c:140
 #, fuzzy
 msgid "Importing mailbox"
@@ -15264,16 +14747,16 @@ msgstr ""
 msgid "%s License Agreement"
 msgstr ""
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
 msgid "_Host:"
 msgstr "_Servidor:"
 
-#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
 #, fuzzy
 msgid "User_name:"
 msgstr "Nome de _Usuario:"
 
-#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
 msgid "_Path:"
 msgstr "_Ruta:"
 
@@ -15336,35 +14819,35 @@ msgstr "%d total"
 msgid ", %d unread"
 msgstr "%d sen enviar"
 
-#: mail/mail-component.c:653
+#: mail/mail-component.c:656
 msgid "New Mail Message"
 msgstr "Nova Mensaxe de Correo"
 
-#: mail/mail-component.c:654
+#: mail/mail-component.c:657
 msgid "_Mail Message"
 msgstr "Enviar _Mensaxe"
 
-#: mail/mail-component.c:655
+#: mail/mail-component.c:658
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Compoñer unha mensaxe"
 
-#: mail/mail-component.c:661
+#: mail/mail-component.c:664
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Novo CartafolV"
 
-#: mail/mail-component.c:662
+#: mail/mail-component.c:665
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Editar Filtros"
 
-#: mail/mail-component.c:663
+#: mail/mail-component.c:666
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Crear unha nova mensaxe"
 
-#: mail/mail-component.c:795
+#: mail/mail-component.c:798
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
@@ -15376,7 +14859,7 @@ msgstr "Comprobando Servicio"
 msgid "Connecting to server..."
 msgstr "Conectando ao servidor..."
 
-#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Identidade"
 
@@ -15392,7 +14875,7 @@ msgstr ""
 "a menos que queira incluír esta información no correo que envíe."
 
 #: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 #, fuzzy
 msgid "Receiving Mail"
 msgstr "Recepción de Correo"
@@ -15411,7 +14894,7 @@ msgstr ""
 msgid "Please select among the following options"
 msgstr "Escolla unha das seguintes opcións"
 
-#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131
 #, fuzzy
 msgid "Sending Mail"
 msgstr "Enviando Correo"
@@ -15426,7 +14909,7 @@ msgstr ""
 "está seguro, pregunte ao\n"
 "seu administrador de sistemas ou fornecedor de acceso a Internet."
 
-#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37
 msgid "Account Management"
 msgstr "Xestión de Contas"
 
@@ -15447,252 +14930,256 @@ msgstr ""
 "embaixo.\n"
 "Este nome só se emprega para amosalo."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:2
 #, fuzzy
 msgid " Ch_eck for Supported Types "
 msgstr "Dete_ctar tipos soportados "
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "<b>Preview</b>"
 msgstr "Previsualizar"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "(SSL non está soportado nesta versión de evolution)"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "<b>S_ignatures</b>"
 msgstr "<b>Descrición:</b> %s"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "<b>_Languages</b>"
 msgstr "Idioma"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
+msgid "<small>This will make the the filter more reliable, but slower</small>"
+msgstr ""
+
+#: mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "<span weight=\"bold\">Checking for New Mail</span>"
 msgstr "Comprobando o novo correo"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">General</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
 #, fuzzy
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "Mensaxe a Amosar"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "Configuración do Correo"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Security</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "Mensaxes Enviadas e Borradores"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:34
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:35
 #, fuzzy
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "Sempre cifrarme a min mesmo cando se envíe correo cifrado"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:36
 #, fuzzy
 msgid "Account Editor"
 msgstr "Conta"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:38
 #, fuzzy
 msgid "Add Ne_w Signature..."
 msgstr "Gravar sinatura"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Add _Script"
 msgstr "Engadir criterio"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "Sempre cifrarme a min mesmo cando se envíe correo cifrado"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Always _sign outgoing messages when using this account"
 msgstr "Asinar sempre as mensaxes saíntes cando se use esta conta"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Attach original message"
 msgstr "Anexar un ficheiro á mensaxe"
 
-#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Anexo"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:48
 #, fuzzy
 msgid "Automatically _insert smiley images"
 msgstr "Comprobar _automaticamente se hai correo novo cada"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Automatically check for _new mail every"
 msgstr "Comprobar _automaticamente se hai correo novo cada"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Beep w_hen new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Xogo de caracteres descoñecido: %s"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Ch_eck for Supported Types "
 msgstr "Dete_ctar tipos soportados "
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 #, fuzzy
-msgid "Check _Incoming Mail"
+msgid "Check _incoming mail for junk"
 msgstr "Comprobando o novo correo"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Cor para tarefas para hoxe"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Colors"
 msgstr "P_echar"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Confirm _when expunging a folder"
 msgstr "Limpando o cartafol"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 #, fuzzy
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
@@ -15709,302 +15196,303 @@ msgstr ""
 "\n"
 "Prema \"Finalizar\" para gardar a nova configuración."
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
 msgid "De_fault"
 msgstr "Por de_fecto"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Default character e_ncoding:"
 msgstr "Codificación de caracteres por defecto: "
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 #, fuzzy
 msgid "Defaults"
 msgstr "Opcións por defecto"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Non se pode abrir a mensaxe"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Feito"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Drafts _Folder:"
 msgstr "Cartafol de borradores:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Email Accounts"
 msgstr "Enderezo contén"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Email _Address:"
 msgstr "Enderezo de Correo:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "Empty trash folders on e_xit"
 msgstr "_Baleirar os cartafoles de lixo ao sair"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "ID do certificado:"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:81
 msgid "Evolution Account Assistant"
 msgstr "Asistente de Contas de Evolution"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:82
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Executar accións"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Fi_xed-width:"
 msgstr "remata en"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Font Properties"
 msgstr "Propiedades"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Mensaxes remitidas"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "HTML Mail"
 msgstr "En correo HTML"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Headers"
 msgstr "Cabeceira"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "_Resaltar as citas con "
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
 #: mail/mail-config.glade.h:91
+#, fuzzy
+msgid "I_nclude remote tests"
+msgstr "Incluír:"
+
+#: mail/mail-config.glade.h:94
 msgid "Inline"
 msgstr "Inline"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Mail Configuration"
 msgstr "Configuración do Correo"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "Localización da caixa do correo"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "Message Composer"
 msgstr "Cabeceira da Mensaxe"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organi_zación:"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "ID da Clave PGP:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Play sound file when new mail arri_ves"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Avisar cando se envíen mensaxes con só destinatarios _Bcc definidos"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Qmail maildir "
 msgstr "Maildir de Qmail "
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "Quote original message"
 msgstr "Non se pode abrir a mensaxe"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr "Citado"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Re_member password"
 msgstr "Lembrar este contrasinal"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Responder-A:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "Recepción de Correo"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:120
 #, fuzzy
 msgid "Receiving Options"
 msgstr "Opcións de Recepción"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
 #, fuzzy
 msgid "Remember _password"
 msgstr "Lembrar este contrasinal"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
 #, fuzzy
 msgid "S_tandard Font:"
 msgstr "San Marino"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 #, fuzzy
 msgid "Security"
 msgstr "_Seguridade"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:126
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:127
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:128
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:129
 #, fuzzy
 msgid "Select..."
 msgstr "Eliminar..."
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "Enviando Correo"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Sent _Messages Folder:"
 msgstr "Cartafol de mensaxes enviadas:"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "Ser_ver requires authentication"
 msgstr "O servidor require _autenticación"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:135
 #, fuzzy
 msgid "Server _Type: "
 msgstr "Tipo de Servidor: "
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Non se atopou a Base de Datos de configuracións"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:137
 #, fuzzy
 msgid "Signat_ure:"
 msgstr "Gravar sinatura"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "Signatures"
 msgstr "Sinatura _HTML:"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:139
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Nome do estilo:"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:140
 msgid "Spell Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:141
 msgid "Standard Unix mbox"
 msgstr "mbox estándar de Unix"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "T_erminal Font:"
 msgstr "Contacto Orixinal:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "T_ype: "
 msgstr "Tipo:"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:149
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:148
-msgid "Use _Daemon"
-msgstr ""
-
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:152
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Variable"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
@@ -16015,103 +15503,99 @@ msgstr ""
 "\n"
 "Prema en \"Seguinte\" para comezar. "
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Add Signature"
 msgstr "Sinatura _HTML:"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Always load images from the Internet"
 msgstr "Cargar _sempre as mensaxes da rede"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Digitally sign outgoing messages (by default)"
 msgstr "Asinar sempre as mensaxes saíntes cando se use esta conta"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:161
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:163
 #, fuzzy
 msgid "_Enable"
 msgstr "Activado"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:165
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Remitir Coma"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Load images if sender is in address book"
 msgstr "_Cargar imaxes se o autor está no libro de enderezos"
 
-#: mail/mail-config.glade.h:167
-msgid "_Local Tests Only"
-msgstr ""
-
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Facer esta a miña conta por _defecto"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_Marcar mensaxes como Lidas despois de"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Never load images from the Internet"
 msgstr "_Nunca cargar as imaxes da rede"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Avisar cando se envíen mensaxes cun asunto baleiro"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Avisar cando se envíen mensaxes cun asunto baleiro"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Responder a Todos"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_Script:"
 msgstr "_Seguridade"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Amosa-lo Tempo Coma"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "_Use Secure Connection (SSL):"
 msgstr "Usar conexión segura (_SSL)"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:181
 #, fuzzy
 msgid "color"
 msgstr " cor"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "descrición"
 
@@ -16282,7 +15766,7 @@ msgstr ""
 
 #. mail:camel-exception primary
 #: mail/mail-errors.xml.h:57
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgid "Your message with the subject \"{0}\" was not delivered."
 msgstr ""
 
 #. mail:camel-exception secondary
@@ -16348,11 +15832,6 @@ msgstr ""
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Non foi posible crear o directorio %s: %s"
 
-#. mail:no-save-path secondary
-#: mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail:no-create-path primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
@@ -16377,12 +15856,6 @@ msgstr ""
 msgid "Cannot create temporary save directory."
 msgstr "Non foi posible crear o directorio temporal: %s"
 
-#. mail:no-create-tmp-path secondary
-#: mail/mail-errors.xml.h:100 mail/mail-errors.xml.h:112
-#: widgets/misc/e-system-errors.xml.h:11 widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail:no-write-path-exists secondary
 #: mail/mail-errors.xml.h:104
 #, fuzzy
@@ -16657,144 +16130,140 @@ msgstr "¿Sobrescribir ficheiro?"
 msgid "_Append"
 msgstr "Abrir"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:785
 #, fuzzy, c-format
 msgid "Pinging %s"
 msgstr "Examinando %s"
 
-#: mail/mail-mt.c:897
-msgid "Working"
-msgstr "Traballando"
-
-#: mail/mail-ops.c:99
+#: mail/mail-ops.c:98
 msgid "Filtering Folder"
 msgstr "Filtrando o Cartafol"
 
-#: mail/mail-ops.c:260
+#: mail/mail-ops.c:259
 msgid "Fetching Mail"
 msgstr "Recibindo Correo"
 
-#: mail/mail-ops.c:543
+#: mail/mail-ops.c:542
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Non se puido armacenar o correo no ficheiro temporal %s: %s"
 
-#: mail/mail-ops.c:568
+#: mail/mail-ops.c:567
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:577
+#: mail/mail-ops.c:576
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Non se puido armacenar o correo no ficheiro temporal %s: %s"
 
-#: mail/mail-ops.c:673
+#: mail/mail-ops.c:672
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando a mensaxe %d de %d"
 
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:703
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: mail/mail-ops.c:708
+#: mail/mail-ops.c:707
 msgid "Complete."
 msgstr "Completado."
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:804
 msgid "Saving message to folder"
 msgstr "Gardando a mensaxe no cartafol"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Movendo mensaxes a %s"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiando as mensaxes a %s"
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:1002
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Examinando os cartafoles en \"%s\""
 
-#: mail/mail-ops.c:1116
+#: mail/mail-ops.c:1115
 msgid "Forwarded messages"
 msgstr "Mensaxes remitidas"
 
-#: mail/mail-ops.c:1159
+#: mail/mail-ops.c:1158
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abrindo cartafol %s"
 
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1230
 #, c-format
 msgid "Opening store %s"
 msgstr "Abrindo armacenamento %s"
 
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1308
 #, c-format
 msgid "Removing folder %s"
 msgstr "Eliminando o cartafol %s"
 
-#: mail/mail-ops.c:1403
+#: mail/mail-ops.c:1402
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "Creando o cartafol %s"
 
-#: mail/mail-ops.c:1468
+#: mail/mail-ops.c:1467
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1469
+#: mail/mail-ops.c:1468
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Creando o cartafol %s"
 
-#: mail/mail-ops.c:1524
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr "Refrescando o cartafol"
 
-#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
+#: mail/mail-ops.c:1559 mail/mail-ops.c:1610
 msgid "Expunging folder"
 msgstr "Limpando o cartafol"
 
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1607
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Importando %s coma %s"
 
-#: mail/mail-ops.c:1609
+#: mail/mail-ops.c:1608
 msgid "Local Folders"
 msgstr "Cartafoles Locais"
 
-#: mail/mail-ops.c:1692
+#: mail/mail-ops.c:1691
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Recibindo a mensaxe %s"
 
-#: mail/mail-ops.c:1764
+#: mail/mail-ops.c:1763
 #, fuzzy, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Recibindo %d mensaxe(s)"
 msgstr[1] "Recibindo %d mensaxe(s)"
 
-#: mail/mail-ops.c:1850
+#: mail/mail-ops.c:1849
 #, fuzzy, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Gardando %d mensaxe(s)"
 msgstr[1] "Gardando %d mensaxe(s)"
 
-#: mail/mail-ops.c:1900
+#: mail/mail-ops.c:1899
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -16803,7 +16272,7 @@ msgstr ""
 "Non foi posible crear o ficheiro de saída: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1928
+#: mail/mail-ops.c:1927
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -16812,11 +16281,11 @@ msgstr ""
 "Erro ao gardar as mensaxes en: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1999
+#: mail/mail-ops.c:1998
 msgid "Saving attachment"
 msgstr "Gardando anexo"
 
-#: mail/mail-ops.c:2016
+#: mail/mail-ops.c:2015
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -16825,17 +16294,17 @@ msgstr ""
 "Non é posible crear ficheiro de saída: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2046
+#: mail/mail-ops.c:2045
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Non foi posible escribir os datos: %s"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Desconectando de %s"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "Desconectando de %s"
@@ -16902,25 +16371,25 @@ msgstr "Actualizando..."
 msgid "Waiting..."
 msgstr "Agardando..."
 
-#: mail/mail-session.c:238
+#: mail/mail-session.c:239
 msgid "User canceled operation."
 msgstr "O usuario cancelou a operación."
 
-#: mail/mail-session.c:271
+#: mail/mail-session.c:272
 #, fuzzy, c-format
 msgid "Enter Password for %s"
 msgstr "Introduza o seu contrasinal para %s"
 
-#: mail/mail-session.c:273
+#: mail/mail-session.c:274
 #, fuzzy
 msgid "Enter Password"
 msgstr "Contrasinal"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password"
 msgstr "_Lembrar este contrasinal"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:298
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
@@ -16979,81 +16448,81 @@ msgstr "Examinando os cartafoles en \"%s\""
 msgid "Updating vFolders for '%s'"
 msgstr "Examinando os cartafoles en \"%s\""
 
-#: mail/mail-vfolder.c:959
+#: mail/mail-vfolder.c:958
 #, fuzzy
 msgid "vFolders"
 msgstr "Cartafoles"
 
-#: mail/mail-vfolder.c:998
+#: mail/mail-vfolder.c:997
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "Editar CartafolesV"
 
-#: mail/mail-vfolder.c:1082
+#: mail/mail-vfolder.c:1081
 msgid "New VFolder"
 msgstr "Novo CartafolV"
 
-#: mail/message-list.c:946
+#: mail/message-list.c:948
 msgid "Unseen"
 msgstr "Non vista"
 
-#: mail/message-list.c:947
+#: mail/message-list.c:949
 msgid "Seen"
 msgstr "Vista"
 
-#: mail/message-list.c:948
+#: mail/message-list.c:950
 msgid "Answered"
 msgstr "Respondida"
 
-#: mail/message-list.c:949
+#: mail/message-list.c:951
 msgid "Multiple Unseen Messages"
 msgstr "Múltiples Mensaxes Non Vistas"
 
-#: mail/message-list.c:950
+#: mail/message-list.c:952
 msgid "Multiple Messages"
 msgstr "Múltiples Mensaxes"
 
-#: mail/message-list.c:954
+#: mail/message-list.c:956
 msgid "Lowest"
 msgstr "A máis baixa"
 
-#: mail/message-list.c:955
+#: mail/message-list.c:957
 msgid "Lower"
 msgstr "Máis baixa"
 
-#: mail/message-list.c:959
+#: mail/message-list.c:961
 msgid "Higher"
 msgstr "Máis alta"
 
-#: mail/message-list.c:960
+#: mail/message-list.c:962
 msgid "Highest"
 msgstr "A máis alta"
 
-#: mail/message-list.c:1279
+#: mail/message-list.c:1285
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1286
+#: mail/message-list.c:1292
 msgid "Today %l:%M %p"
 msgstr "Hoxe ás %k:%M"
 
-#: mail/message-list.c:1295
+#: mail/message-list.c:1301
 msgid "Yesterday %l:%M %p"
 msgstr "Onte ás %k:%M"
 
-#: mail/message-list.c:1307
+#: mail/message-list.c:1313
 msgid "%a %l:%M %p"
 msgstr "O %A ás %k:%M"
 
-#: mail/message-list.c:1315
+#: mail/message-list.c:1321
 msgid "%b %d %l:%M %p"
 msgstr "O %d de %B ás %k:%M"
 
-#: mail/message-list.c:1317
+#: mail/message-list.c:1323
 msgid "%b %d %Y"
 msgstr "%d de %B de %Y"
 
-#: mail/message-list.c:3300
+#: mail/message-list.c:3321
 msgid "Generating message list"
 msgstr "Xerando a lista de mensaxes"
 
@@ -17115,6 +16584,10 @@ msgstr "Remitir"
 msgid "No Response Necessary"
 msgstr ""
 
+#: mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Ler"
+
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Responder"
@@ -17223,45 +16696,49 @@ msgid ""
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:10
-msgid "Whether Evolution should start up in offline mode"
+msgid "Toolbar is visible"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:11
-msgid "Whether to skip the development warning dialog"
+msgid "Whether Evolution should start up in offline mode"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Whether the toolbar should be visible."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:14
 #, fuzzy
 msgid "mail"
 msgstr "Correo Electrónico"
 
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
-msgstr ""
-
-#: shell/e-shell.c:545 shell/e-shell.c:546
+#: shell/e-shell.c:588 shell/e-shell.c:589
 #, fuzzy, c-format
 msgid "%ld KB"
 msgstr "%d de %b"
 
-#: shell/e-shell.c:744
+#: shell/e-shell.c:786
 #, fuzzy
 msgid "Uknown system error."
 msgstr "Erro descoñecido"
 
-#: shell/e-shell.c:1101
+#: shell/e-shell.c:1143
 msgid "Invalid arguments"
 msgstr "Argumentos non válidos"
 
-#: shell/e-shell.c:1103
+#: shell/e-shell.c:1145
 msgid "Cannot register on OAF"
 msgstr "Non se pode rexistrar en OAF"
 
-#: shell/e-shell.c:1105
+#: shell/e-shell.c:1147
 msgid "Configuration Database not found"
 msgstr "Non se atopou a Base de Datos de configuracións"
 
-#: shell/e-shell.c:1107
+#: shell/e-shell.c:1149
 msgid "Generic error"
 msgstr "Erro xenérico"
 
@@ -17318,7 +16795,7 @@ msgstr ""
 msgid "Select importer"
 msgstr "Seleccionar Cartafol"
 
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1026
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
 #, fuzzy, c-format
 msgid "File %s does not exist"
 msgstr "O cartafol `%s' non existe."
@@ -17346,34 +16823,34 @@ msgstr ""
 "Importando %s\n"
 "Importando elemento 1."
 
-#: shell/e-shell-importer.c:549
+#: shell/e-shell-importer.c:570
 msgid "Automatic"
 msgstr "Automático"
 
-#: shell/e-shell-importer.c:598
+#: shell/e-shell-importer.c:626
 #, fuzzy
-msgid "_Filename:"
+msgid "F_ilename:"
 msgstr "Nome do ficheiro:"
 
-#: shell/e-shell-importer.c:603
+#: shell/e-shell-importer.c:631
 msgid "Select a file"
 msgstr "Seleccionar un ficheiro"
 
-#: shell/e-shell-importer.c:613
+#: shell/e-shell-importer.c:642
 #, fuzzy
 msgid "File _type:"
 msgstr "Tipo de ficheiro:"
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:681
 msgid "Import data and settings from _older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:684
 #, fuzzy
 msgid "Import a _single file"
 msgstr "Importar un formato de ficheiro externo"
 
-#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -17381,26 +16858,26 @@ msgstr ""
 "Agarde...\n"
 "Buscando configuracións existentes"
 
-#: shell/e-shell-importer.c:727
+#: shell/e-shell-importer.c:756
 msgid "Starting Intelligent Importers"
 msgstr "Iniciando os Importadores Intelixentes"
 
-#: shell/e-shell-importer.c:853 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
 #, fuzzy, c-format
 msgid "From %s:"
 msgstr "De:"
 
-#: shell/e-shell-importer.c:1044
+#: shell/e-shell-importer.c:1073
 #, fuzzy, c-format
 msgid "No importer available for file %s"
 msgstr "Non hai ningún fornecedor dispoñible para o protocolo `%s'"
 
-#: shell/e-shell-importer.c:1056
+#: shell/e-shell-importer.c:1085
 #, fuzzy
 msgid "Unable to execute importer"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: shell/e-shell-importer.c:1169
+#: shell/e-shell-importer.c:1199
 #, fuzzy
 msgid "_Import"
 msgstr "Importar"
@@ -17449,59 +16926,59 @@ msgstr "O nome do cartafol non pode conter o carácter Return."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' e '..' son nomes de cartafol reservados."
 
-#: shell/e-shell-window.c:336
+#: shell/e-shell-window.c:337
 #, fuzzy
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr "Evolucion está conectado. Prema neste botón para desconectar."
 
-#: shell/e-shell-window.c:343
+#: shell/e-shell-window.c:344
 #, fuzzy
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution está desconectándose"
 
-#: shell/e-shell-window.c:349
+#: shell/e-shell-window.c:350
 #, fuzzy
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr "Evolution está desconectado. Prema neste botón para conectar."
 
-#: shell/e-shell-window.c:621
+#: shell/e-shell-window.c:637
 #, fuzzy, c-format
 msgid "Switch to %s"
 msgstr "Mensaxe para %s"
 
-#: shell/e-shell-window-commands.c:64
+#: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: shell/e-shell-window-commands.c:72
+#: shell/e-shell-window-commands.c:74
 #, fuzzy, c-format
 msgid "Error executing %s."
 msgstr "Erro ao executar o filtro: %s: %s"
 
-#: shell/e-shell-window-commands.c:121
+#: shell/e-shell-window-commands.c:123
 #, fuzzy
 msgid "Bug buddy is not installed."
 msgstr "Non foi posible executar o Bug buddy."
 
-#: shell/e-shell-window-commands.c:129
+#: shell/e-shell-window-commands.c:131
 msgid "Bug buddy could not be run."
 msgstr "Non foi posible executar o Bug buddy."
 
-#: shell/e-shell-window-commands.c:171
+#: shell/e-shell-window-commands.c:323
 #, fuzzy
-msgid "About Evolution"
-msgstr "Acerca de Evolution..."
+msgid "Groupware Suite"
+msgstr "Grupo"
 
-#: shell/e-shell-window-commands.c:382
+#: shell/e-shell-window-commands.c:563
 #, fuzzy
 msgid "_Work Online"
 msgstr "Traballar Conectado"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "_Traballar Desconectado"
 
-#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Traballar Desconectado"
 
@@ -17514,32 +16991,6 @@ msgstr "Chile"
 msgid "New"
 msgstr "Novo"
 
-#: shell/evolution-shell-component-utils.c:115
-#, fuzzy, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr "Erro descoñecido"
-
-#: shell/evolution-shell-component-utils.c:118
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-
-#: shell/evolution-shell-component-utils.c:125
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-
 #: shell/evolution-test-component.c:140
 #, fuzzy
 msgid "New Test"
@@ -17879,34 +17330,34 @@ msgid ""
 "Click help for details."
 msgstr ""
 
-#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:522
+#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
+#: smime/gui/certificate-manager.c:556
 #, fuzzy
 msgid "Select a cert to import..."
 msgstr "Seleccionar Cartafol"
 
-#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:604
+#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
+#: smime/gui/certificate-manager.c:638
 #, fuzzy
 msgid "Certificate Name"
 msgstr "ID do certificado:"
 
-#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
+#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
 #, fuzzy
 msgid "Purposes"
 msgstr "En Progreso"
 
-#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:517
+#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:267
+#: smime/gui/certificate-manager.c:271
 #, fuzzy
 msgid "Expires"
 msgstr "Expresión"
 
-#: smime/gui/certificate-manager.c:417
+#: smime/gui/certificate-manager.c:446
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "Enderezo de Correo:"
@@ -17951,6 +17402,11 @@ msgstr ""
 "Expendedor: %s\n"
 "Asunto: %s"
 
+#: smime/gui/e-cert-selector.c:169
+#, fuzzy
+msgid "Select certificate"
+msgstr "Ir á data especificada"
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -18011,7 +17467,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
 #, fuzzy
 msgid "Certificate"
 msgstr "ID do certificado:"
@@ -18036,20 +17492,24 @@ msgstr "Nome Común"
 msgid "Contact Certificates"
 msgstr "ID do certificado:"
 
-#: smime/gui/smime-ui.glade.h:21
-#, no-c-format
-msgid "Do you want to trust \"%s\" for the following purposes?"
+#: smime/gui/smime-ui.glade.h:20
+msgid "Do not trust the authenticity of this certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:21
 msgid "Dummy window only"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:22
 #, fuzzy
 msgid "Edit"
 msgstr "_Editar"
 
+#: smime/gui/smime-ui.glade.h:23
+#, fuzzy
+msgid "Email Certificate Trust Settings"
+msgstr "Non se puido verifica-los certificados."
+
 #: smime/gui/smime-ui.glade.h:24
 #, fuzzy
 msgid "Email Recipient Certificate"
@@ -18087,281 +17547,292 @@ msgstr "Organización"
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:37
-msgid "Trust this CA to identify email users."
+msgid "Trust the authenticity of this certificate"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:38
-msgid "Trust this CA to identify software developers."
+msgid "Trust this CA to identify email users."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:39
-msgid "Trust this CA to identify web sites."
+msgid "Trust this CA to identify software developers."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:40
-#, fuzzy
-msgid "View"
-msgstr "_Vista"
+msgid "Trust this CA to identify web sites."
+msgstr ""
 
 #: smime/gui/smime-ui.glade.h:41
 #, fuzzy
-msgid "View Certificate"
-msgstr "ID do certificado:"
+msgid "View"
+msgstr "_Vista"
 
 #: smime/gui/smime-ui.glade.h:42
-msgid "You have been asked to trust a new Certificate Authority (CA)."
-msgstr ""
-
-#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:44
+#: smime/gui/smime-ui.glade.h:43
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:45
+#: smime/gui/smime-ui.glade.h:44
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:46
+#: smime/gui/smime-ui.glade.h:45
 #, fuzzy
 msgid "Your Certificates"
 msgstr "ID do certificado:"
 
-#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
+#: smime/gui/smime-ui.glade.h:46
+#, fuzzy
+msgid "_Edit CA Trust"
+msgstr "Editar Tarefa"
+
+#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
-#: smime/lib/e-cert.c:478
+#. x509 certificate usage types
+#: smime/lib/e-cert.c:424
+#, fuzzy
+msgid "Sign"
+msgstr "Opcións"
+
+#: smime/lib/e-cert.c:425
+#, fuzzy
+msgid "Encrypt"
+msgstr "Cifrar con PGP"
+
+#: smime/lib/e-cert.c:530
 #, fuzzy
 msgid "Version"
 msgstr "mes"
 
-#: smime/lib/e-cert.c:493
+#: smime/lib/e-cert.c:545
 #, fuzzy
 msgid "Version 1"
 msgstr "mes"
 
-#: smime/lib/e-cert.c:496
+#: smime/lib/e-cert.c:548
 #, fuzzy
 msgid "Version 2"
 msgstr "mes"
 
-#: smime/lib/e-cert.c:499
+#: smime/lib/e-cert.c:551
 #, fuzzy
 msgid "Version 3"
 msgstr "mes"
 
-#: smime/lib/e-cert.c:581
+#: smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:584
+#: smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:587
+#: smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:590
+#: smime/lib/e-cert.c:642
 #, fuzzy
 msgid "C"
 msgstr ", "
 
-#: smime/lib/e-cert.c:593
+#: smime/lib/e-cert.c:645
 #, fuzzy
 msgid "CN"
 msgstr "N"
 
-#: smime/lib/e-cert.c:596
+#: smime/lib/e-cert.c:648
 msgid "OU"
 msgstr ""
 
-#: smime/lib/e-cert.c:599
+#: smime/lib/e-cert.c:651
 #, fuzzy
 msgid "O"
 msgstr "Aceptar"
 
-#: smime/lib/e-cert.c:602
+#: smime/lib/e-cert.c:654
 msgid "L"
 msgstr ""
 
-#: smime/lib/e-cert.c:605
+#: smime/lib/e-cert.c:657
 #, fuzzy
 msgid "DN"
 msgstr "N"
 
-#: smime/lib/e-cert.c:608
+#: smime/lib/e-cert.c:660
 msgid "DC"
 msgstr ""
 
-#: smime/lib/e-cert.c:611
+#: smime/lib/e-cert.c:663
 #, fuzzy
 msgid "ST"
 msgstr "SMTP"
 
-#: smime/lib/e-cert.c:614
+#: smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:617
+#: smime/lib/e-cert.c:669
 #, fuzzy
 msgid "Certificate Key Usage"
 msgstr "ID do certificado:"
 
-#: smime/lib/e-cert.c:620
+#: smime/lib/e-cert.c:672
 #, fuzzy
 msgid "Netscape Certificate Type"
 msgstr "ID do certificado:"
 
-#: smime/lib/e-cert.c:623
+#: smime/lib/e-cert.c:675
 #, fuzzy
 msgid "Certificate Authority Key Identifier"
 msgstr "ID do certificado:"
 
-#: smime/lib/e-cert.c:626
+#: smime/lib/e-cert.c:678
 #, fuzzy
 msgid "UID"
 msgstr "I"
 
-#: smime/lib/e-cert.c:635
+#: smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr ""
 
-#: smime/lib/e-cert.c:686
+#: smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:694
+#: smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
 msgstr ""
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:768
 #, fuzzy
 msgid "Subject Public Key Info"
 msgstr ""
 "\n"
 "Clave Pública: "
 
-#: smime/lib/e-cert.c:721
+#: smime/lib/e-cert.c:773
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:736
+#: smime/lib/e-cert.c:788
 #, fuzzy
 msgid "Subject's Public Key"
 msgstr "O asunto é %s"
 
-#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
+#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
 #, fuzzy
 msgid "Error: Unable to process extension"
 msgstr "Incapaz de procesar o cartafol spool"
 
-#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
+#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:782
+#: smime/lib/e-cert.c:834
 #, fuzzy
 msgid "SSL Certificate Authority"
 msgstr "ID do certificado:"
 
-#: smime/lib/e-cert.c:786
+#: smime/lib/e-cert.c:838
 #, fuzzy
 msgid "Email Certificate Authority"
 msgstr "Non se puido verifica-los certificados."
 
-#: smime/lib/e-cert.c:814
+#: smime/lib/e-cert.c:866
 #, fuzzy
 msgid "Signing"
 msgstr "Opcións"
 
-#: smime/lib/e-cert.c:818
+#: smime/lib/e-cert.c:870
 #, fuzzy
 msgid "Non-repudiation"
 msgstr "Sen Información"
 
-#: smime/lib/e-cert.c:822
+#: smime/lib/e-cert.c:874
 msgid "Key Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:826
+#: smime/lib/e-cert.c:878
 #, fuzzy
 msgid "Data Encipherment"
 msgstr "anexo"
 
-#: smime/lib/e-cert.c:830
+#: smime/lib/e-cert.c:882
 msgid "Key Agreement"
 msgstr ""
 
-#: smime/lib/e-cert.c:834
+#: smime/lib/e-cert.c:886
 #, fuzzy
 msgid "Certificate Signer"
 msgstr "ID do certificado:"
 
-#: smime/lib/e-cert.c:838
+#: smime/lib/e-cert.c:890
 msgid "CRL Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:938
 #, fuzzy
 msgid "Critical"
 msgstr "Croacia"
 
-#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
+#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
 #, fuzzy
 msgid "Not Critical"
 msgstr "Croacia"
 
-#: smime/lib/e-cert.c:912
+#: smime/lib/e-cert.c:964
 #, fuzzy
 msgid "Extensions"
 msgstr "Expresión"
 
-#: smime/lib/e-cert.c:983
+#: smime/lib/e-cert.c:1035
 #, fuzzy, c-format
 msgid "%s = %s"
 msgstr "Servidor %s %s"
 
-#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
 #, fuzzy
 msgid "Certificate Signature Algorithm"
 msgstr "Ficheiro de sinatura:"
 
-#: smime/lib/e-cert.c:1048
+#: smime/lib/e-cert.c:1100
 #, fuzzy
 msgid "Issuer"
 msgstr "_Inserir"
 
-#: smime/lib/e-cert.c:1102
+#: smime/lib/e-cert.c:1154
 msgid "Issuer Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1121
+#: smime/lib/e-cert.c:1173
 #, fuzzy
 msgid "Subject Unique ID"
 msgstr "O asunto é %s"
 
-#: smime/lib/e-cert.c:1164
+#: smime/lib/e-cert.c:1216
 #, fuzzy
 msgid "Certificate Signature Value"
 msgstr "Ficheiro de sinatura:"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
+#: smime/lib/e-cert-db.c:608
 #, fuzzy
 msgid "Certificate already exists"
 msgstr "O ID da Tarxeta xa existe"
@@ -18519,7 +17990,7 @@ msgstr "a hora actual"
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "_Accións"
 
@@ -18692,7 +18163,7 @@ msgstr "P_echar"
 #: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:3
+#: ui/evolution.xml.h:4
 msgid "Close"
 msgstr "Pechar"
 
@@ -18705,7 +18176,7 @@ msgid "Delete this item"
 msgstr "Borrar este elemento"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr "Barra de ferramentas principal"
 
@@ -18749,7 +18220,7 @@ msgstr "Gravar este elemento no disco"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:44
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "_File"
 msgstr "_Ficheiro"
 
@@ -19023,13 +18494,13 @@ msgstr "_Inverter Selección"
 msgid "_Threaded Message List"
 msgstr "Lis_ta de Mensaxes por Fíos"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Pechar esta fiestra"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "_Close"
 msgstr "_Pechar"
 
@@ -19462,7 +18933,7 @@ msgstr "Anterior Mensaxe"
 msgid "_Quoted"
 msgstr "Citado"
 
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
 msgid "_Tools"
 msgstr "_Ferramentas"
 
@@ -19776,7 +19247,7 @@ msgstr "_Tarefa"
 
 #: ui/evolution.xml.h:1
 #, fuzzy
-msgid "About Ximian Evolution..."
+msgid "About Evolution..."
 msgstr "Acerca de Evolution..."
 
 #: ui/evolution.xml.h:2
@@ -19784,109 +19255,119 @@ msgstr "Acerca de Evolution..."
 msgid "Change Evolution's settings"
 msgstr "Evolution"
 
-#: ui/evolution.xml.h:5
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the visibility of the toolbar"
+msgstr "Cambiar as propiedades deste cartafol"
+
+#: ui/evolution.xml.h:6
 #, fuzzy
 msgid "Create a new window displaying this folder"
 msgstr "Crear un novo cartafol"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "_Saír"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "_FAQ de Evolution"
+
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Saír do programa"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:10
 msgid "Forget _Passwords"
 msgstr "Esquecer _Contrasinais"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:11
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Esquecer tódalas claves, de maneira que se lle volven pedir."
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:12
 msgid "Import data from other programs"
 msgstr ""
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:14
 #, fuzzy
 msgid "New _Window"
 msgstr "Buscar Agora"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 #, fuzzy
 msgid "Pi_lot Settings..."
 msgstr "_Preferencias de Correo..."
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Send / Receive"
 msgstr "Enviar / Recibir"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Enviar o correo na cola e recibir o correo novo"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 #, fuzzy
 msgid "Set up Pilot configuration"
 msgstr "Configuración do Correo"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:19
 #, fuzzy
-msgid "Show information about Ximian Evolution"
+msgid "Show information about Evolution"
 msgstr "Amosar información sobre Evolution"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:20
 msgid "Submit Bug Report"
 msgstr "Enviar un Informe de Erro"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:21
 msgid "Submit _Bug Report"
 msgstr "_Enviar un Informe de Erro"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Enviar un informe de erro usando o Bug Buddy"
 
-#: ui/evolution.xml.h:21
-msgid "Toggle whether we are working offline."
-msgstr "Trocar entre traballo conectado e desconectado"
-
 #: ui/evolution.xml.h:23
 #, fuzzy
-msgid "Ximian Evolution _FAQ"
-msgstr "_FAQ de Evolution"
+msgid "T_oolbar"
+msgstr "Barra de ferramentas principal"
 
 #: ui/evolution.xml.h:24
+msgid "Toggle whether we are working offline."
+msgstr "Trocar entre traballo conectado e desconectado"
+
+#: ui/evolution.xml.h:26
 #, fuzzy
-msgid "_About Ximian Evolution..."
-msgstr "_Acerca de Evolution..."
+msgid "_About Evolution..."
+msgstr "Acerca de Evolution..."
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "_Help"
 msgstr "A_xuda"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 #, fuzzy
 msgid "_Import..."
 msgstr "Importando..."
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "_New"
 msgstr "_Novo"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 #, fuzzy
 msgid "_Quick Reference"
 msgstr "Preferencias da Axenda"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_Send / Receive"
 msgstr "_Enviar / Recibir"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 #, fuzzy
 msgid "_Window"
 msgstr "Buscar Agora"
@@ -19971,7 +19452,7 @@ msgid "With _Status"
 msgstr "Establecer Estado"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:626
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:635
 msgid "UTC"
 msgstr ""
 
@@ -20135,30 +19616,30 @@ msgstr "Outro..."
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
-#: widgets/misc/e-error.c:121
+#: widgets/misc/e-error.c:79 widgets/misc/e-error.c:80
+#: widgets/misc/e-error.c:122
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Evolution"
 
-#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
-#: widgets/misc/e-error.c:119
+#: widgets/misc/e-error.c:81 widgets/misc/e-error.c:82
+#: widgets/misc/e-error.c:120
 #, fuzzy
 msgid "Evolution Warning"
 msgstr "Evolution"
 
-#: widgets/misc/e-error.c:118
+#: widgets/misc/e-error.c:119
 #, fuzzy
 msgid "Evolution Information"
 msgstr "Información da Xuntanza"
 
-#: widgets/misc/e-error.c:120
+#: widgets/misc/e-error.c:121
 #, fuzzy
 msgid "Evolution Query"
 msgstr "Compositor de correo de Evolution."
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:410
+#: widgets/misc/e-error.c:415
 #, fuzzy, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -20318,17 +19799,472 @@ msgstr ""
 "Non é posible obter a mensaxe: %s\n"
 "  %s"
 
-#: widgets/misc/e-task-widget.c:211
+#: widgets/misc/e-task-widget.c:212
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: widgets/misc/e-task-widget.c:216
+#: widgets/misc/e-task-widget.c:217
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% completa)"
 
 #, fuzzy
+#~ msgid "Failed to connect to LDAP server"
+#~ msgstr ""
+#~ "Non foi posible autenticarse co servidor IMAP.\n"
+#~ "%s\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid "Failed to authenticate with LDAP server"
+#~ msgstr ""
+#~ "Non foi posible autenticarse co servidor IMAP.\n"
+#~ "%s\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid "This server does not support LDAPv3 schema information"
+#~ msgstr "A resposta do servidor IMAP non contiña información sobre %s"
+
+#, fuzzy
+#~ msgid "Error retrieving schema information"
+#~ msgstr ""
+#~ "Erro ao cargar a información do filtro:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Server did not respond with valid schema information"
+#~ msgstr "A resposta do servidor IMAP non contiña información sobre %s"
+
+#, fuzzy
+#~ msgid "  S_how Supported Bases "
+#~ msgstr "Dete_ctar tipos soportados "
+
+#, fuzzy
+#~ msgid "1:00"
+#~ msgstr "100%"
+
+#, fuzzy
+#~ msgid "Connecting"
+#~ msgstr "Desconectando de %s"
+
+#, fuzzy
+#~ msgid "Distinguished _name:"
+#~ msgstr "_Nome da lista:"
+
+#, fuzzy
+#~ msgid "Email address:"
+#~ msgstr "Enderezo de Correo:"
+
+#~ msgid "One"
+#~ msgstr "Único"
+
+#, fuzzy
+#~ msgid "S_earch scope: "
+#~ msgstr "Ámbito da busca:"
+
+#, fuzzy
+#~ msgid "Searching"
+#~ msgstr "Buscar M_ensaxe..."
+
+#~ msgid "Sub"
+#~ msgstr "Sub"
+
+#, fuzzy
+#~ msgid "_Display name:"
+#~ msgstr "_Amosar"
+
+#, fuzzy
+#~ msgid "_Port number:"
+#~ msgstr "_Porto:"
+
+#, fuzzy
+#~ msgid "_Search base:"
+#~ msgstr "_Base da busca:"
+
+#~ msgid "_Server name:"
+#~ msgstr "Nome do _Servidor:"
+
+#, fuzzy
+#~ msgid "_Timeout (minutes):"
+#~ msgstr "Tempo de adiamento (minutos)"
+
+#, fuzzy
+#~ msgid "connecting-tab"
+#~ msgstr "Desconectando de %s"
+
+#, fuzzy
+#~ msgid "general-tab"
+#~ msgstr "Xeral"
+
+#, fuzzy
+#~ msgid "searching-tab"
+#~ msgstr "Buscar M_ensaxe..."
+
+#, fuzzy
+#~ msgid "Job title:"
+#~ msgstr "_Posto de traballo:"
+
+#, fuzzy
+#~ msgid "Webcam:"
+#~ msgstr "Páxina"
+
+#, fuzzy
+#~ msgid "Category editor not available."
+#~ msgstr "Non hai unha descrición dispoñible."
+
+#~ msgid "Could not find widget for a field: `%s'"
+#~ msgstr "Non se puido atopa-lo control dun campo: `%s'"
+
+#~ msgid "Do you want to save changes?"
+#~ msgstr "¿Quere gardar os cambios?"
+
+#, fuzzy
+#~ msgid "Error saving %s: %s"
+#~ msgstr "Erro ao gardar o ficheiro: %s"
+
+#, fuzzy
+#~ msgid "Can not load URI"
+#~ msgstr "Tarxeta non atopada"
+
+#, fuzzy
+#~ msgid "Calendar Properties"
+#~ msgstr "Axenda"
+
+#, fuzzy
+#~ msgid "Remote"
+#~ msgstr "Eliminar"
+
+#, fuzzy
+#~ msgid "Task List Properties"
+#~ msgstr "Lista de _Tarefas"
+
+#, fuzzy
+#~ msgid "_Refresh Interval:"
+#~ msgstr "_Actualizar Lista "
+
+#, fuzzy
+#~ msgid "_Source URL:"
+#~ msgstr "URI da Fonte POP"
+
+#~ msgid "Are you sure you want to cancel and delete this meeting?"
+#~ msgstr "¿Está seguro de que quere cancelar e borrar esta cita?"
+
+#~ msgid "Are you sure you want to cancel and delete this task?"
+#~ msgstr "¿Está seguro de que quere cancelar e borrar esta tarefa?"
+
+#~ msgid "Are you sure you want to cancel and delete this journal entry?"
+#~ msgstr "¿Está seguro de que quere cancelar e borrar esta entrada de diario?"
+
+#~ msgid "Are you sure you want to delete the appointment `%s'?"
+#~ msgstr "¿Está seguro de que quere borrar a cita `%s'?"
+
+#~ msgid "Are you sure you want to delete this untitled appointment?"
+#~ msgstr "¿Está seguro de que quere borrar esta cita sen título?"
+
+#~ msgid "Are you sure you want to delete the task `%s'?"
+#~ msgstr "¿Está seguro de que quere borrar a tarefa `%s'?"
+
+#~ msgid "Are you sure you want to delete this untitled task?"
+#~ msgstr "¿Está seguro de que quere borrar esta tarefa sen título?"
+
+#~ msgid "Are you sure you want to delete the journal entry `%s'?"
+#~ msgstr "¿Está seguro de que quere borrar a entrada de diario `%s'?"
+
+#~ msgid "Are you sure want to delete this untitled journal entry?"
+#~ msgstr "¿Está seguro de que quere borrar esta entrada de diario sen título?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d appointment?"
+#~ msgid_plural "Are you sure you want to delete %d appointments?"
+#~ msgstr[0] "¿Está seguro de que quere borrar %d citas?"
+#~ msgstr[1] "¿Está seguro de que quere borrar %d citas?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d task?"
+#~ msgid_plural "Are you sure you want to delete %d tasks?"
+#~ msgstr[0] "¿Está seguro de que quere borrar %d tarefas?"
+#~ msgstr[1] "¿Está seguro de que quere borrar %d tarefas?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d journal entry?"
+#~ msgid_plural "Are you sure you want to delete %d journal entries?"
+#~ msgstr[0] "¿Está seguro de que quere borrar %d entradas de diario?"
+#~ msgstr[1] "¿Está seguro de que quere borrar %d entradas de diario?"
+
+#~ msgid "_Invite Others..."
+#~ msgstr "_Convidar Outros..."
+
+#, fuzzy
+#~ msgid ""
+#~ "This event has been changed, but has not been saved.\n"
+#~ "\n"
+#~ "Do you wish to save your changes?"
+#~ msgstr ""
+#~ "Esta sinatura cambiou, pero non se gravou.\n"
+#~ "\n"
+#~ "¿Desexa gardar os cambios?"
+
+#, fuzzy
+#~ msgid "Save Event"
+#~ msgstr "Mensaxe da Axenda"
+
+#, fuzzy
+#~ msgid "The meeting information has been created. Send it?"
+#~ msgstr ""
+#~ "A información da xuntanza cambiou. ¿Enviar unha versión actualizada?"
+
+#~ msgid "The meeting information has changed. Send an updated version?"
+#~ msgstr ""
+#~ "A información da xuntanza cambiou. ¿Enviar unha versión actualizada?"
+
+#, fuzzy
+#~ msgid "The task assignment information has been created. Send it?"
+#~ msgstr "A información da tarefa cambiou. ¿Enviar unha versión actualizada?"
+
+#~ msgid "The task information has changed. Send an updated version?"
+#~ msgstr "A información da tarefa cambiou. ¿Enviar unha versión actualizada?"
+
+#, fuzzy
+#~ msgid "Could not get article %s from NNTP server"
+#~ msgstr "Non foi posible recibir a lista de grupos do servidor."
+
+#, fuzzy
+#~ msgid "Error posting message: %s: message not posted"
+#~ msgstr ""
+#~ "Erro ao autogardar a mensaxe: %s:\n"
+#~ " %s"
+
+#, fuzzy
+#~ msgid "Stream error"
+#~ msgstr "Outro erro"
+
+#, fuzzy
+#~ msgid "Connection error: %s"
+#~ msgstr "Erro descoñecido: %s"
+
+#, fuzzy
+#~ msgid "Could not get group: %s"
+#~ msgstr "Non foi posible crear unha canalización: %s"
+
+#, fuzzy
+#~ msgid "Could not get messages: unspecified error"
+#~ msgstr "Non foi posible recoller a mensaxe: %s"
+
+#, fuzzy
+#~ msgid "Unknown server response: %s"
+#~ msgstr "Erro descoñecido: %s"
+
+#, fuzzy
+#~ msgid "Adjust Score"
+#~ msgstr "Asignar Puntuación"
+
+#~ msgid "Assign Color"
+#~ msgstr "Asignar Cor"
+
+#~ msgid "Assign Score"
+#~ msgstr "Asignar Puntuación"
+
+#~ msgid "Attachments"
+#~ msgstr "Anexos"
+
+#, fuzzy
+#~ msgid "Beep"
+#~ msgstr "Belice"
+
+#~ msgid "contains"
+#~ msgstr "contén"
+
+#~ msgid "Copy to Folder"
+#~ msgstr "Copiar ó Cartafol"
+
+#~ msgid "Date received"
+#~ msgstr "Data de recepción"
+
+#~ msgid "Date sent"
+#~ msgstr "Data de envío"
+
+#~ msgid "Deleted"
+#~ msgstr "Eliminada"
+
+#~ msgid "does not contain"
+#~ msgstr "non contén"
+
+#~ msgid "does not end with"
+#~ msgstr "non remata en"
+
+#~ msgid "does not exist"
+#~ msgstr "non existe"
+
+#, fuzzy
+#~ msgid "does not return"
+#~ msgstr "non existe"
+
+#~ msgid "does not sound like"
+#~ msgstr "non soa como"
+
+#~ msgid "does not start with"
+#~ msgstr "non comeza por"
+
+#~ msgid "Do Not Exist"
+#~ msgstr "Non Existe"
+
+#~ msgid "Draft"
+#~ msgstr "Borrador"
+
+#~ msgid "ends with"
+#~ msgstr "remata en"
+
+#~ msgid "Exist"
+#~ msgstr "Existe"
+
+#~ msgid "exists"
+#~ msgstr "existe"
+
+#~ msgid "Expression"
+#~ msgstr "Expresión"
+
+#~ msgid "is"
+#~ msgstr "é"
+
+#, fuzzy
+#~ msgid "is after"
+#~ msgstr "foi posterior a"
+
+#, fuzzy
+#~ msgid "is before"
+#~ msgstr "foi anterior a"
+
+#, fuzzy
+#~ msgid "is Flagged"
+#~ msgstr "Marcada"
+
+#~ msgid "is greater than"
+#~ msgstr "é maior que"
+
+#~ msgid "is less than"
+#~ msgstr "é menor que"
+
+#~ msgid "is not"
+#~ msgstr "non é"
+
+#, fuzzy
+#~ msgid "is not Flagged"
+#~ msgstr "Marcada"
+
+#, fuzzy
+#~ msgid "Junk Test"
+#~ msgstr "xuño"
+
+#~ msgid "Mailing list"
+#~ msgstr "Lista de Correo"
+
+#~ msgid "Message Body"
+#~ msgstr "Corpo da Mensaxe"
+
+#~ msgid "Message Header"
+#~ msgstr "Cabeceira da Mensaxe"
+
+#, fuzzy
+#~ msgid "Message is Junk"
+#~ msgstr "Enviouse a mensaxe"
+
+#, fuzzy
+#~ msgid "Message is not Junk"
+#~ msgstr "Mensaxe %s non atopada."
+
+#~ msgid "Move to Folder"
+#~ msgstr "Mover a un Cartafol"
+
+#, fuzzy
+#~ msgid "Pipe to Program"
+#~ msgstr "Saír do programa"
+
+#, fuzzy
+#~ msgid "Play Sound"
+#~ msgstr "Tocar un son:"
+
+#~ msgid "Recipients"
+#~ msgstr "Destinatarios"
+
+#~ msgid "Regex Match"
+#~ msgstr "Busca por Expresión Regular"
+
+#~ msgid "Replied to"
+#~ msgstr "Respondido a"
+
+#, fuzzy
+#~ msgid "returns"
+#~ msgstr "Ocupado"
+
+#, fuzzy
+#~ msgid "returns greater than"
+#~ msgstr "é maior que"
+
+#, fuzzy
+#~ msgid "returns less than"
+#~ msgstr "é menor que"
+
+#, fuzzy
+#~ msgid "Run Program"
+#~ msgstr "Executar un programa:"
+
+#~ msgid "Sender"
+#~ msgstr "Autor"
+
+#~ msgid "Set Status"
+#~ msgstr "Establecer Estado"
+
+#~ msgid "Size (kB)"
+#~ msgstr "Tamaño (kB)"
+
+#~ msgid "sounds like"
+#~ msgstr "soa como"
+
+#~ msgid "Source Account"
+#~ msgstr "Conta Fonte"
+
+#~ msgid "Specific header"
+#~ msgstr "Cabeceira específica"
+
+#~ msgid "starts with"
+#~ msgstr "comeza por"
+
+#~ msgid "Stop Processing"
+#~ msgstr "Parar o Procesamento"
+
+#, fuzzy
+#~ msgid "Unset Status"
+#~ msgstr "Establecer Estado"
+
+#~ msgid "Working"
+#~ msgstr "Traballando"
+
+#, fuzzy
+#~ msgid "_Filename:"
+#~ msgstr "Nome do ficheiro:"
+
+#, fuzzy
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "Unknown error."
+#~ msgstr "Erro descoñecido"
+
+#, fuzzy
+#~ msgid "View Certificate"
+#~ msgstr "ID do certificado:"
+
+#, fuzzy
+#~ msgid "About Ximian Evolution..."
+#~ msgstr "Acerca de Evolution..."
+
+#, fuzzy
+#~ msgid "_About Ximian Evolution..."
+#~ msgstr "_Acerca de Evolution..."
+
+#, fuzzy
 #~ msgid "Evolution Addressbook folder viewer"
 #~ msgstr "Visor de minitarxetas do Libro de Enderezos de Evolution"
 
@@ -20539,10 +20475,6 @@ msgstr "%s (%d%% completa)"
 #~ msgstr "Correo Electrónico Principal"
 
 #, fuzzy
-#~ msgid "S_pouse:"
-#~ msgstr "_Cónxuxe:"
-
-#, fuzzy
 #~ msgid "_Business:"
 #~ msgstr "_Traballo"
 
@@ -20562,9 +20494,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "_Mobile:"
 #~ msgstr "_Móbil"
 
-#~ msgid "_Office:"
-#~ msgstr "_Oficina:"
-
 #, fuzzy
 #~ msgid "_Public Calendar URL:"
 #~ msgstr "Imprimir Axenda"
@@ -22007,10 +21936,6 @@ msgstr "%s (%d%% completa)"
 #~ msgstr "¡Non se puido envia-lo elemento!\n"
 
 #, fuzzy
-#~ msgid "Invalid object"
-#~ msgstr "Argumentos non válidos"
-
-#, fuzzy
 #~ msgid "URI not loaded"
 #~ msgstr "EBook non cargado\n"
 
@@ -24516,10 +24441,6 @@ msgstr "%s (%d%% completa)"
 #~ msgstr "Líbano"
 
 #, fuzzy
-#~ msgid "Lansing"
-#~ msgstr "Advertencia"
-
-#, fuzzy
 #~ msgid "Laredo"
 #~ msgstr "Buscapersoas"
 
@@ -29839,9 +29760,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "minutes before they occur."
 #~ msgstr "minutos antes de que ocorran."
 
-#~ msgid "Edit Task"
-#~ msgstr "Editar Tarefa"
-
 #~ msgid "Transparency"
 #~ msgstr "Transparencia"
 
diff --git a/po/hr.po b/po/hr.po
index e7f4320e8b..b97a39e22d 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0\n"
-"POT-Creation-Date: 2004-05-19 14:00-0400\n"
+"POT-Creation-Date: 2004-06-03 11:14-0400\n"
 "PO-Revision-Date: 2004-03-29 00:45+CEST\n"
 "Last-Translator: auto\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -53,13 +53,13 @@ msgstr ""
 msgid "Default Sync Address:"
 msgstr "Uobičajena adresa za sinhroniziranje:"
 
-#: addressbook/conduit/address-conduit.c:1150
 #: addressbook/conduit/address-conduit.c:1151
+#: addressbook/conduit/address-conduit.c:1152
 msgid "Could not load addressbook"
 msgstr "Ne mogu učitati adresar"
 
-#: addressbook/conduit/address-conduit.c:1219
-#: addressbook/conduit/address-conduit.c:1222
+#: addressbook/conduit/address-conduit.c:1220
+#: addressbook/conduit/address-conduit.c:1223
 msgid "Could not read pilot's Address application block"
 msgstr "Nisam mogao pročitati programski blok adresa pilota"
 
@@ -67,13 +67,13 @@ msgstr "Nisam mogao pročitati programski blok adresa pilota"
 msgid "Accessing LDAP Server anonymously"
 msgstr "Anonimno pristupam LDAP serveru"
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
 msgid "Failed to authenticate.\n"
 msgstr "Neuspjela prijava.\n"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sUnesite zaporku za %s (korisnik %s)"
@@ -117,51 +117,23 @@ msgstr "_Kontakti:"
 msgid "Create a new contacts group"
 msgstr "Unesi novi kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:182
+#: addressbook/gui/component/addressbook-component.c:184
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:483
-msgid "Failed to connect to LDAP server"
-msgstr "Neuspešno povezivanje sa LDAP serverom"
-
-#: addressbook/gui/component/addressbook-config.c:507
-msgid "Failed to authenticate with LDAP server"
-msgstr "Neuspjela prijava na LDAP server"
-
-#: addressbook/gui/component/addressbook-config.c:535
-msgid "Could not perform query on Root DSE"
-msgstr "Nisam mogao obaviti upit na Root DSE"
-
-#: addressbook/gui/component/addressbook-config.c:840
-msgid "The server responded with no supported search bases"
-msgstr "Server je odgovorio nepodržanim bazama za pretragu"
-
-#: addressbook/gui/component/addressbook-config.c:1245
-msgid "This server does not support LDAPv3 schema information"
-msgstr "Ovaj poslužitelj ne podržava LDAPv3 informacije o shemi"
-
-#: addressbook/gui/component/addressbook-config.c:1266
-msgid "Error retrieving schema information"
-msgstr "Greška kod čitanja podataka sheme"
-
-#: addressbook/gui/component/addressbook-config.c:1274
-msgid "Server did not respond with valid schema information"
-msgstr "Poslužitelj nije odgovorio sa ispravnim podacima sheme"
-
 #: addressbook/gui/component/addressbook-migrate.c:68
-#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1160
 msgid "Migrating..."
 msgstr "Migriranje..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1201
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Migriram `%s':"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:438
+#: addressbook/gui/component/addressbook-migrate.c:464
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
 #: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
@@ -169,28 +141,28 @@ msgid "On This Computer"
 msgstr "Na ovom računalu"
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:446
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
-#: mail/mail-config.glade.h:106
+#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
+#: mail/mail-config.glade.h:109
 msgid "Personal"
 msgstr "Osobni podaci"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:454
+#: addressbook/gui/component/addressbook-migrate.c:480
 msgid "On LDAP Servers"
 msgstr "Na LDAP poslužiteljima"
 
-#: addressbook/gui/component/addressbook-migrate.c:582
+#: addressbook/gui/component/addressbook-migrate.c:608
 msgid "LDAP Servers"
 msgstr "Mijenjaj LDAP poslužitelje"
 
-#: addressbook/gui/component/addressbook-migrate.c:702
+#: addressbook/gui/component/addressbook-migrate.c:728
 msgid "Autocompletion Settings"
 msgstr "Postavke automatskog dopunjavanja"
 
-#: addressbook/gui/component/addressbook-migrate.c:1076
+#: addressbook/gui/component/addressbook-migrate.c:1104
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -202,7 +174,7 @@ msgstr ""
 "\n"
 "Molim pričekajte dok Evolution ne migrira vaše mape..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1090
+#: addressbook/gui/component/addressbook-migrate.c:1118
 #, fuzzy
 msgid ""
 "The format of mailing list contacts has changed.\n"
@@ -214,7 +186,7 @@ msgstr ""
 "\n"
 "Molim pričekajte dok Evolution ne migrira vaše mape..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1099
+#: addressbook/gui/component/addressbook-migrate.c:1127
 #, fuzzy
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
@@ -226,7 +198,7 @@ msgstr ""
 "\n"
 "Molim pričekajte dok Evolution ne migrira vaše mape..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1109
+#: addressbook/gui/component/addressbook-migrate.c:1137
 #, fuzzy
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
@@ -238,38 +210,33 @@ msgstr ""
 "\n"
 "Molim pričekajte dok Evolution ne migrira vaše mape..."
 
-#: addressbook/gui/component/addressbook-view.c:674
+#: addressbook/gui/component/addressbook-view.c:675
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr "Adresar '%s' će biti uklonjen. Jeste li sigurni da želite nastaviti?"
 
-#: addressbook/gui/component/addressbook-view.c:761
+#: addressbook/gui/component/addressbook-view.c:754
 msgid "New Address Book"
 msgstr "Novi adresar"
 
-#: addressbook/gui/component/addressbook-view.c:762
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
+#: addressbook/gui/component/addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Obriši"
 
-#: addressbook/gui/component/addressbook-view.c:763
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-view.c:756
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Postavke..."
 
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/addressbook-view.c:1002
+#. Create the contacts group
+#: addressbook/gui/component/addressbook-view.c:995
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
 #: calendar/gui/migration.c:373
 msgid "Contacts"
 msgstr "Kontakti"
@@ -350,10 +317,6 @@ msgid "Manage your S/MIME certificates here"
 msgstr "Upravljanje vašim S/Mime certifikatima"
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-msgid "  S_how Supported Bases "
-msgstr " P_rikaži podržane baze "
-
-#: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -368,203 +331,170 @@ msgstr " P_rikaži podržane baze "
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1:00"
-msgstr "1:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
-msgstr "5:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "SMTP prijava"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
 #, fuzzy
 msgid "<b>Display</b>"
 msgstr "_Zaslon"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 #, fuzzy
 msgid "<b>Downloading</b>"
 msgstr "<b>Šaljem poštu:</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:10
 #, fuzzy
 msgid "<b>Searching</b>"
 msgstr "Pretraživanje"
 
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
 msgid "<b>Server Information</b>"
 msgstr "Korak 2: Poslužitelj podataka"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
 msgid "<b>Type:</b>"
 msgstr "<b>Tada</b> "
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:13
 #, fuzzy
 msgid "Add Contacts Group"
 msgstr "_Kontakti:"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Address Book Properties"
 msgstr "Postavke knjige adresara"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
-#: mail/mail-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
+#: mail/mail-config.glade.h:42
 msgid "Always"
 msgstr "Uvijek"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr "Anonimno"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:17
 #: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Osnovno"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
-msgid "Connecting"
-msgstr "Povezivanje"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 #: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Detalji"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
-msgid "Distinguished _name:"
-msgstr "Posebno _ime:"
-
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:19
 #, fuzzy
 msgid "Distinguished name"
 msgstr "Posebno _ime:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:20
 #, fuzzy
 msgid "Download limit:"
 msgstr "Limit za _preuzimanje:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Email address"
 msgstr "Poštanska adresa"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "Email address:"
-msgstr "Poštanska adresa"
-
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "Evolution will use this DN to authenticate you with the server"
-msgstr "Evolution će koristiti ovaj DN za prijavljivanje na server"
-
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:22
+#, fuzzy
 msgid ""
-"Evolution will use this email address to authenticate you with the server"
+"Evolution will use this email address to authenticate you with the server."
 msgstr "Evolution će koristiti ovu adresu e-pošte za prijavljivanje na server"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:23
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Podržane baze za pretragu"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:24
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
+#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Općenito"
 
-#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
-#: mail/mail-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
+#: mail/mail-config.glade.h:102
 msgid "Never"
 msgstr "Nikada"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
-msgid "One"
-msgstr "Jedan"
-
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:35
-msgid "S_earch scope: "
-msgstr "Ops_eg pretrage:"
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Search _base:"
+msgstr "Baza _pretrage:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
 msgid "Search base only"
 msgstr "Baza _pretrage:"
 
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:29
 #, fuzzy
 msgid "Search base:"
 msgstr "Baza _pretrage:"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Search scope:"
 msgstr "Ops_eg pretrage:"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
-msgid "Searching"
-msgstr "Pretraživanje"
-
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:31
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
-"server if\n"
-"your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL or TLS."
 msgstr ""
 "Odabir ove opcije znači da će se Evolution povezati na vaš LDAP server samo "
 "akoi\n"
 "on podržava SSL ili TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a \n"
-"insecure environment. For example, if you and your LDAP server are behind a "
-"firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection "
-"is already\n"
-"secure."
+"you are in a insecure environment. For example, if you and your LDAP server "
+"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
+"because your connection is already secure."
 msgstr ""
 "Odabiranje ove opcije znači da će Evolution pokušati da koristi samo SSL/TLS "
 "ako okruženje \n"
@@ -572,71 +502,65 @@ msgstr ""
 "onda nema potrebe da Evolution koristi SSL/TLS jer je vaša veza već\n"
 "sigurna."
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:33
+#, fuzzy
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
-"TLS.  This \n"
-"means that your connection will be insecure, and that you will be vulnerable "
-"to security\n"
-"exploits. "
+"TLS.  This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits. "
 msgstr ""
 "Odabiranje ove opcije znači da vaš ne podržava ni SSL ni  TLS.  To \n"
 "znači da će vaša baza biti nesigurna, i da ćete biti ranjivi na sigurnosne\n"
 "napade. "
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Sub"
-msgstr "Pod"
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr "Podržane baze za pretragu"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
-"searches will \n"
-"begin. If you leave this blank, the search will begin at the root of the "
-"directory tree."
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
 msgstr ""
 "Baza za pretragu je posebno ime (DN) unosa odakle će vaša pretraga\n"
 "početi. Ako ovo ostavite prazno, pretraga će početi iz korijena stabla "
 "direktorija."
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:37
+#, fuzzy
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
-"the \n"
-"directory tree. A search scope of \"sub\" will include all entries below "
-"your search base.\n"
-"A search scope of \"one\" will only include the entries one level beneath "
-"your base.\n"
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
 msgstr ""
 "Opseg pretrage određuje dubinu pretrage po stablu direktorija. Opseg "
 "pretrage \n"
 "\"sub\" će uključiti sve unose ispod vaše baze za pretragu.\n"
 "Opseg pretrage \"one\" će uključiti samo unose jedan nivo ispod vaše baze.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:58
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "Puno ime vašeg LDAP servera. Na primjer, \"ldap.mojafirma.com\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:39
+#, fuzzy
 msgid ""
-"This is the maximum number of entries to download. Setting this number to "
-"be \n"
+"This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr ""
 "Najveći broj unosa za preuzimanje. Ako unesete preveliki \n"
 "broj, vaš će se adresar usporiti."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -645,139 +569,118 @@ msgstr ""
 "Metoda koju će Evolution koristiti za vašu prijavu.Postavka \"Email Address"
 "\" zahtijeva anonimni pristup na vaš LDAP poslužitelj."
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:41
+#, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
-"list.\n"
-"It is for display purposes only. "
+"list. It is for display purposes only. "
 msgstr ""
 "Ime poslužitelja koje će se pojaviti u popisu mapa Evolutiona.\n"
 "Služi samo za potrebe prikazivanja."
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:42
+#, fuzzy
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. "
-"A \n"
-"list of standard ports has been provided. Ask your system administrator\n"
-"what port you should specify."
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
 msgstr ""
 "Port LDAP poslužitelja na koji će se Evolution pokušati povezati.\n"
 "Ponuđen je popis standardnih portova. Pitajte svog administratora\n"
 "koji port da odaberete."
 
-#: addressbook/gui/component/ldap-config.glade.h:67
-msgid "This option controls how long a search will be run."
-msgstr "Ova opcija određuje koliko će pretraga trajati."
-
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:43
 #, fuzzy
 msgid "Timeout:"
 msgstr "Oblik vremena:"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
-msgid "U_se SSL/TLS:"
-msgstr "K_oristi SSL/TLS:"
-
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr "Koristim posebno ime (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr "Koristim adresu elektronske pošte"
 
-#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
-#: mail/mail-config.glade.h:154
+#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
+#: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr "Kada je moguće"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:47
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "_Kontakti:"
 
-#: addressbook/gui/component/ldap-config.glade.h:74
-#: calendar/gui/dialogs/calendar-setup.glade.h:12
-msgid "_Display name:"
-msgstr "_Ime:"
-
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr "Limit za _preuzimanje:"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
 msgid "_Email address:"
 msgstr "Poštanska adresa"
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:50
+#, fuzzy
+msgid "_Find Possible Search Bases"
+msgstr "Podržane baze za pretragu"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Log in method:"
 msgstr "Metoda _prijave: "
 
-#: addressbook/gui/component/ldap-config.glade.h:78
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "_Log in:"
+msgstr "Korisnička oznaka"
+
+#: addressbook/gui/component/ldap-config.glade.h:53
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
 msgid "_Name:"
 msgstr "_Ime:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
-msgid "_Port number:"
-msgstr "Broj _porta:"
-
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "_Port:"
 msgstr "_Prioritet:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
-msgid "_Search base:"
-msgstr "Baza _pretrage:"
-
-#: addressbook/gui/component/ldap-config.glade.h:82
-msgid "_Server name:"
-msgstr "_Ime poslužitelja:"
+#: addressbook/gui/component/ldap-config.glade.h:55
+#, fuzzy
+msgid "_Search scope:"
+msgstr "Ops_eg pretrage:"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:56
 #, fuzzy
 msgid "_Server:"
 msgstr "_Poslužitelj:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
-msgid "_Timeout (minutes):"
-msgstr "_Odziv (minute):"
+#: addressbook/gui/component/ldap-config.glade.h:57
+#, fuzzy
+msgid "_Timeout:"
+msgstr "Oblik vremena:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:58
 msgid "_Use secure connection:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "karte"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
-msgid "connecting-tab"
-msgstr "tab za vezu"
-
-#: addressbook/gui/component/ldap-config.glade.h:88
-msgid "general-tab"
-msgstr "tab za opće podatke"
-
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:60
 #: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
-#: mail/mail-config.glade.h:182
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "minute"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
-msgid "searching-tab"
-msgstr "tab za pretragu"
-
-#: addressbook/gui/component/select-names/e-select-names.c:497
+#: addressbook/gui/component/select-names/e-select-names.c:503
 #: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid "Select Contacts from Address Book"
 msgstr "Odabir kontakata iz adresara"
 
-#: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
@@ -817,7 +720,7 @@ msgstr "&Novi kontakt"
 
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:222
+#: addressbook/gui/widgets/e-addressbook-view.c:224
 msgid "Source"
 msgstr "Izvor"
 
@@ -890,9 +793,9 @@ msgid "<b>Work</b>"
 msgstr "<b>Ako</b> "
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
-#: addressbook/gui/widgets/eab-contact-display.c:342
-#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/widgets/eab-contact-display.c:334
+#: addressbook/gui/widgets/eab-contact-display.c:353
 msgid "AIM"
 msgstr "AIM"
 
@@ -932,15 +835,15 @@ msgid "Company:"
 msgstr "Naredba:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:271
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
+#: addressbook/gui/contact-editor/e-contact-editor.c:266
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
 msgstr "Kontakt"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1527
+#: addressbook/gui/contact-editor/e-contact-editor.c:520
 msgid "Contact Editor"
 msgstr "Sva polja"
 
@@ -964,82 +867,79 @@ msgid "Full _Name..."
 msgstr "Pu_no ime..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:202
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-msgid "Home"
-msgstr "Polazno"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #, fuzzy
 msgid "Home Page:"
 msgstr "Početna stranica"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-#, fuzzy
-msgid "Job title:"
-msgstr "_Poslovna titula: "
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/e-itip-control.c:936
-msgid "Location:"
-msgstr "Lokacija:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 #, fuzzy
 msgid "Mailing Address"
 msgstr "Adresa e-pošte"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 #, fuzzy
 msgid "Manager:"
 msgstr "Upravitelj"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "_Nadimak:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Notes:"
 msgstr "_Bilješke:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
-#: addressbook/gui/contact-editor/e-contact-editor.c:203
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-msgid "Other"
-msgstr "Ostalo"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#, fuzzy
+msgid "Office:"
+msgstr "_Ured: "
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "PO Box:"
 msgstr "_Poštanski broj:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 #, fuzzy
 msgid "Personal Information"
 msgstr "Informacije o dnevniku"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 #, fuzzy
 msgid "Profession:"
 msgstr "Z_animanje:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#, fuzzy
+msgid "Spouse:"
+msgstr "Su_pružnik:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "State/Province:"
 msgstr "_Država/pokrajina:"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#, fuzzy
+msgid "Title:"
+msgstr "_Naslov:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+msgid "Video Chat:"
+msgstr ""
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:41
 #, fuzzy
 msgid "Wants to receive HTML mail"
@@ -1047,15 +947,15 @@ msgstr "Želi primati _HTML poruke"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:42
 #, fuzzy
-msgid "Webcam:"
-msgstr "Internet stranica"
+msgid "Web Log:"
+msgstr "_Web stranica:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
-#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
-#: mail/mail-config.glade.h:155
+#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
+#: mail/mail-config.glade.h:157
 msgid "Work"
 msgstr "Posao"
 
@@ -1075,19 +975,12 @@ msgid "_File under:"
 msgstr "Ime trake:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 #, fuzzy
 msgid "_Where:"
 msgstr "_Poslužitelj:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
-msgid "item7"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
-msgid "item8"
-msgstr ""
-
-#: addressbook/gui/contact-editor/eab-editor.c:316
+#: addressbook/gui/contact-editor/eab-editor.c:315
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -1095,7 +988,7 @@ msgstr ""
 "Sigurni ste da želite\n"
 "obrisati ove kontakte?"
 
-#: addressbook/gui/contact-editor/eab-editor.c:319
+#: addressbook/gui/contact-editor/eab-editor.c:318
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -1104,16 +997,16 @@ msgstr ""
 "obrisati ovaj kontakt?"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:351
-#: addressbook/gui/widgets/eab-contact-display.c:372
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Address"
 msgstr "Adresa"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:292
+#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard.c:174
@@ -2091,86 +1984,109 @@ msgstr "Zambija"
 msgid "Zimbabwe"
 msgstr "Zimbabve"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/contact-editor/e-contact-editor.c:179
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:337
+#: addressbook/gui/widgets/eab-contact-display.c:356
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:347
-#: addressbook/gui/widgets/eab-contact-display.c:366
+#: addressbook/gui/contact-editor/e-contact-editor.c:180
+#: addressbook/gui/widgets/eab-contact-display.c:339
+#: addressbook/gui/widgets/eab-contact-display.c:358
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: addressbook/gui/widgets/eab-contact-display.c:338
+#: addressbook/gui/widgets/eab-contact-display.c:357
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:344
-#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#: addressbook/gui/widgets/eab-contact-display.c:355
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/contact-editor/e-contact-editor.c:183
 msgid "GroupWise"
 msgstr "Grupa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+msgid "Home"
+msgstr "Polazno"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+msgid "Other"
+msgstr "Ostalo"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
 msgid "Source Book"
 msgstr "Izvorišna knjiga"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:264
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Target Book"
 msgstr "Odredišna knjiga"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:278
+#: addressbook/gui/contact-editor/e-contact-editor.c:273
 msgid "Is New Contact"
 msgstr "Je novi kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:285
+#: addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Writable Fields"
 msgstr "Upisna polja"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:299
+#: addressbook/gui/contact-editor/e-contact-editor.c:294
 msgid "Changed"
 msgstr "Promijenjen"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
-msgid "Category editor not available."
-msgstr "Uređivač kategorija nije dostupan."
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:2352
 msgid "This contact belongs to these categories:"
 msgstr "Ovaj kontakt pripada sljedećim kategorijama:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#: addressbook/gui/contact-editor/e-contact-editor.c:2429
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Molim odaberite neku od slijedećih opcija"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#: addressbook/gui/contact-editor/e-contact-editor.c:2433
 #, fuzzy
 msgid "No image"
 msgstr "Niger"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#: addressbook/gui/contact-editor/e-contact-editor.c:2636
 #, fuzzy
 msgid ""
-"The following entries are invalid:\n"
+"The contact data is invalid:\n"
 "\n"
-msgstr "Sljedeće veze su trenutno aktivne:"
+msgstr "Datum povratka nije ispravan"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2738
-#, c-format
-msgid "Could not find widget for a field: `%s'"
-msgstr "Nisam mogao pronać element za polje: `%s'"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#, fuzzy
+msgid "Invalid contact."
+msgstr "Neispravni potpis"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+msgid ""
+"The contact cannot be saved to the selected address book. Do you want to "
+"discard changes?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2727
+#: addressbook/gui/contact-editor/e-contact-editor.c:2751
+msgid "_Discard"
+msgstr "_Odbaci"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+msgid ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
+msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:62
 msgid "AOL Instant Messenger"
@@ -2203,7 +2119,7 @@ msgid "_Edit Full"
 msgstr "_Uredi potpuno"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:166
 msgid "_Full Name:"
 msgstr "_Puno ime:"
 
@@ -2348,30 +2264,30 @@ msgstr "Ime _liste:"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Unesite elektronsku adresu ili prevucite kontakt u donji popis:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "contact-list-editor"
 msgstr "urednik-kontakt-liste"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:153
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:215
+#: addressbook/gui/widgets/e-addressbook-view.c:217
 #: addressbook/gui/widgets/e-minicard-view.c:460
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Knjiga"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
 msgid "Is New List"
 msgstr "Je li novi popis"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:215
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
 msgid "Contact List Editor"
 msgstr "Urednik kontakt liste"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:438
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
 msgid "Save List as VCard"
 msgstr "Spremi popis kao VCard"
 
@@ -2418,117 +2334,117 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Napredna pretraga"
 
-#: addressbook/gui/widgets/eab-contact-display.c:129
-#: addressbook/gui/widgets/eab-contact-display.c:192
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
 msgid "(map)"
 msgstr "(map)"
 
-#: addressbook/gui/widgets/eab-contact-display.c:139
-#: addressbook/gui/widgets/eab-contact-display.c:205
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
 msgid "map"
 msgstr "karta"
 
-#: addressbook/gui/widgets/eab-contact-display.c:257
-#: addressbook/gui/widgets/eab-contact-display.c:533
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:525
 msgid "List Members"
 msgstr "Popis članova"
 
-#: addressbook/gui/widgets/eab-contact-display.c:329
-#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/eab-contact-display.c:321
+#: addressbook/gui/widgets/eab-contact-display.c:323
 msgid "E-mail"
 msgstr "E-pošta"
 
-#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/eab-contact-display.c:332
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organizacija"
 
-#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "Position"
 msgstr "Položaj"
 
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:354
 msgid "Groupwise"
 msgstr "Grupa"
 
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:340
 msgid "Video Conferencing"
 msgstr "Video savjetovanje"
 
-#: addressbook/gui/widgets/eab-contact-display.c:349
-#: addressbook/gui/widgets/eab-contact-display.c:370
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Phone"
 msgstr "Telefon"
 
-#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:342
 msgid "Fax"
 msgstr "Fax"
 
-#: addressbook/gui/widgets/eab-contact-display.c:354
+#: addressbook/gui/widgets/eab-contact-display.c:346
 msgid "work"
 msgstr "posao"
 
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:359
 msgid "WWW"
 msgstr "WWW"
 
-#: addressbook/gui/widgets/eab-contact-display.c:368
-#: addressbook/gui/widgets/eab-contact-display.c:587
+#: addressbook/gui/widgets/eab-contact-display.c:360
+#: addressbook/gui/widgets/eab-contact-display.c:579
 msgid "Blog"
 msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/eab-contact-display.c:363
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Mobilni telefon"
 
-#: addressbook/gui/widgets/eab-contact-display.c:375
+#: addressbook/gui/widgets/eab-contact-display.c:367
 msgid "personal"
 msgstr "osobno"
 
-#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/eab-contact-display.c:374
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Bilješka"
 
-#: addressbook/gui/widgets/eab-contact-display.c:548
+#: addressbook/gui/widgets/eab-contact-display.c:540
 msgid "Job Title"
 msgstr "Poslovna titula"
 
-#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/eab-contact-display.c:544
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:774
+#: smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "E-pošta"
 
-#: addressbook/gui/widgets/eab-contact-display.c:579
+#: addressbook/gui/widgets/eab-contact-display.c:571
 msgid "Home page"
 msgstr "Početna stranica"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 msgid "Success"
 msgstr "Uspjeh"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Backend busy"
 msgstr ""
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Repository offline"
 msgstr "Arhiva nije na mreži"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Address Book does not exist"
 msgstr "Adresar ne postoji"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 #, fuzzy
 msgid "No Self Contact defined"
 msgstr "Nova lista kontakata"
@@ -2536,27 +2452,27 @@ msgstr "Nova lista kontakata"
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Permission denied"
 msgstr "Pristup odbijen"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Contact not found"
 msgstr "Kontakt nije nađen"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Contact ID already exists"
 msgstr "Identifikator kontakta već postoji"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Protocol not supported"
 msgstr "Protokol nije podržan"
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:60
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:233
 #: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
@@ -2569,39 +2485,39 @@ msgid "Cancelled"
 msgstr "Otkazano"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:61
 #, fuzzy
 msgid "Could not cancel"
 msgstr "Ne mogu otvoriti izvor"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Authentication Failed"
 msgstr "Provjera vjerodostojnosti neuspješna"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Authentication Required"
 msgstr "Zahtijev za autentifikaciju obavezan"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:66
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "TLS not Available"
 msgstr "TLS nije dostupan"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#: addressbook/gui/widgets/eab-gui-util.c:66
 #, fuzzy
 msgid "No such source"
 msgstr "Nema takve poruke"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:69
+#: addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Other error"
 msgstr "Druga greška"
 
-#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:90
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
@@ -2609,7 +2525,7 @@ msgstr ""
 "Ne mogu otvoriti adresar. Molim provjerite postoji li putanja i imate li "
 "dozvole pristupiti joj."
 
-#: addressbook/gui/widgets/eab-gui-util.c:110
+#: addressbook/gui/widgets/eab-gui-util.c:97
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -2617,17 +2533,18 @@ msgstr ""
 "Ne mogu otvoriti adresar. To znači da ste, vjerovatno, unijeli neispravni "
 "URI, ili je LDAP poslužitelj nedostupan."
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:102
+#, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution you must compile the program from the CVS "
-"sources after retrieving OpenLDAP from the link below."
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
 msgstr ""
 "Ova verzija Evolutiona nema ugrađenu podršku za LDAP. Ako LDAP ipak želite "
 "koristiti u Evolutionu, morate kompajlirati program iz CVS izvornih kodova "
 "nakon što skinete OpenLDAP sa donjeg linka."
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:109
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -2635,11 +2552,7 @@ msgstr ""
 "Ne mogu otvoriti adresar. To znači da ste, vjerovatno, unijeli neispravni "
 "URI, ili je poslužitelj nedostupan"
 
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "Unable to open addressbook"
-msgstr "Ne mogu otvoriti adresar"
-
-#: addressbook/gui/widgets/eab-gui-util.c:162
+#: addressbook/gui/widgets/eab-gui-util.c:129
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2651,7 +2564,7 @@ msgstr ""
 "Molim da preciznije oblikujete upit ili povećate limit\n"
 "broja rezultata u podešavanjima adresara za server direktorija."
 
-#: addressbook/gui/widgets/eab-gui-util.c:168
+#: addressbook/gui/widgets/eab-gui-util.c:135
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -2665,53 +2578,45 @@ msgstr ""
 "direktorija\n"
 "za ovaj adresar."
 
-#: addressbook/gui/widgets/eab-gui-util.c:174
+#: addressbook/gui/widgets/eab-gui-util.c:141
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "Osnovni proces ovog adresara nije mogao da obradi upit."
 
-#: addressbook/gui/widgets/eab-gui-util.c:177
+#: addressbook/gui/widgets/eab-gui-util.c:144
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Osnovni proces ovog adresara je odbio da obradi ovaj upit."
 
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:147
 msgid "This query did not complete successfully."
 msgstr "Ovaj upit nije uspješno završen."
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
-msgid "Do you want to save changes?"
-msgstr "Želite li spremiti promjene?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:208
-msgid "_Discard"
-msgstr "_Odbaci"
-
-#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:169
 msgid "Error adding list"
 msgstr "Greška kod dodavanja popisa"
 
-#: addressbook/gui/widgets/eab-gui-util.c:229
-#: addressbook/gui/widgets/eab-gui-util.c:652
+#: addressbook/gui/widgets/eab-gui-util.c:169
+#: addressbook/gui/widgets/eab-gui-util.c:580
 msgid "Error adding contact"
 msgstr "Greška prilikom dodavanja kontakta"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying list"
 msgstr "Greška kod izmjene popisa"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying contact"
 msgstr "Greška prilikom mijenjanja kontakta"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:192
 msgid "Error removing list"
 msgstr "Greška kod uklanjanja popisa"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
-#: addressbook/gui/widgets/eab-gui-util.c:610
+#: addressbook/gui/widgets/eab-gui-util.c:192
+#: addressbook/gui/widgets/eab-gui-util.c:538
 msgid "Error removing contact"
 msgstr "Greška pri uklanjanju kontakta"
 
-#: addressbook/gui/widgets/eab-gui-util.c:334
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2720,7 +2625,7 @@ msgstr ""
 "Otvaranje %d kontakata će otvoriti %d novih prozora.\n"
 "Da li doista želite prikazati sve ove kontakte?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:360
+#: addressbook/gui/widgets/eab-gui-util.c:300
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2729,49 +2634,44 @@ msgstr ""
 "%s već postoji\n"
 "Želite li  prepisati preko njega?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:364
+#: addressbook/gui/widgets/eab-gui-util.c:304
 msgid "Overwrite"
 msgstr "Prebriši"
 
-#: addressbook/gui/widgets/eab-gui-util.c:400
-#, c-format
-msgid "Error saving %s: %s"
-msgstr "Greška kod spremanja %s: %s"
-
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:437
+#: addressbook/gui/widgets/eab-gui-util.c:365
 msgid "card.vcf"
 msgstr "karta.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:571
+#: addressbook/gui/widgets/eab-gui-util.c:499
 msgid "list"
 msgstr "popis"
 
-#: addressbook/gui/widgets/eab-gui-util.c:706
+#: addressbook/gui/widgets/eab-gui-util.c:634
 msgid "Move contact to"
 msgstr "Premjesti kontakt u"
 
-#: addressbook/gui/widgets/eab-gui-util.c:708
+#: addressbook/gui/widgets/eab-gui-util.c:636
 msgid "Copy contact to"
 msgstr "Kopiraj kontakt u "
 
-#: addressbook/gui/widgets/eab-gui-util.c:711
+#: addressbook/gui/widgets/eab-gui-util.c:639
 msgid "Move contacts to"
 msgstr "Premjesti kontakte u"
 
-#: addressbook/gui/widgets/eab-gui-util.c:713
+#: addressbook/gui/widgets/eab-gui-util.c:641
 msgid "Copy contacts to"
 msgstr "Kopiraj kontakte u "
 
-#: addressbook/gui/widgets/eab-gui-util.c:716
+#: addressbook/gui/widgets/eab-gui-util.c:644
 msgid "Select target addressbook."
 msgstr "Odaberite odredišni adresar."
 
-#: addressbook/gui/widgets/eab-gui-util.c:939
+#: addressbook/gui/widgets/eab-gui-util.c:867
 msgid "Multiple VCards"
 msgstr "Višestruke VCards"
 
-#: addressbook/gui/widgets/eab-gui-util.c:942
+#: addressbook/gui/widgets/eab-gui-util.c:870
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard za %s"
@@ -2858,7 +2758,7 @@ msgstr[1] ""
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:229
+#: addressbook/gui/widgets/e-addressbook-view.c:231
 #: addressbook/gui/widgets/e-minicard-view.c:467
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
@@ -2876,143 +2776,131 @@ msgstr "Model"
 msgid "Error modifying card"
 msgstr "Greška kod promijene karte"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:163
 msgid "Name begins with"
 msgstr "Ime počinje sa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:164
 msgid "Email begins with"
 msgstr "Poruka počinje sa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:57
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Kategorija je"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-#: calendar/gui/cal-search-bar.c:50
+#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Polje koje sadrži"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+#: addressbook/gui/widgets/e-addressbook-view.c:172
 msgid "Advanced..."
 msgstr "Napredno..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:236
+#: addressbook/gui/widgets/e-addressbook-view.c:238
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:249
+#: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Tip"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:506
+#: addressbook/gui/widgets/e-addressbook-view.c:508
 msgid "Address Book"
 msgstr "Adresar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2076
+#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:2080
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
 msgstr "Spremi kao VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 msgid "New Contact..."
 msgstr "Novi kontakt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "New Contact List..."
 msgstr "Nova lista kontakata..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Go to Folder..."
 msgstr "Idi u mapu..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Import..."
 msgstr "Uvezi..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1066
 msgid "Search for Contacts..."
 msgstr "Tražim kontakte..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 msgid "Address Book Sources..."
 msgstr "Izvori adresara..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1069
 msgid "Pilot Settings..."
 msgstr "Podešavanja pilota..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Prosljedi kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
 msgid "Send Message to Contact"
 msgstr "Pošalji kontaktu poruku"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Ispis"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
+#: addressbook/gui/widgets/e-addressbook-view.c:1077
 msgid "Print Envelope"
 msgstr "Ispiši omotnicu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
+#: addressbook/gui/widgets/e-addressbook-view.c:1081
 msgid "Copy to Address Book..."
 msgstr "Kopiraj u adresar..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1080
+#: addressbook/gui/widgets/e-addressbook-view.c:1082
 msgid "Move to Address Book..."
 msgstr "Premjesti u adresar..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Izreži"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopiraj"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1087
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Umetni"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:1092
+#: calendar/gui/e-calendar-view.c:1280
 msgid "Current View"
 msgstr "Trenutačni pogled"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1309
-#, c-format
-msgid ""
-"The addressbook backend for\n"
-"%s\n"
-"has crashed. You will have to restart Evolution in order to use it again"
-msgstr ""
-"Osnovni proces adresara za\n"
-"%s\n"
-"je pao. Morat ćete ponovo pokreneti Evolution kako bi nastavilida je "
-"koristite"
-
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1667
-#: calendar/gui/cal-search-bar.c:362
+#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Bilo koja kategorija"
 
@@ -3118,7 +3006,7 @@ msgstr "Radio"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-list-view.c:234
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Uloga"
@@ -3260,12 +3148,12 @@ msgstr "Evolucija VCard uvoznik"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: addressbook/printing/e-contact-print.c:998
+#: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr "Ispiši kontakte"
 
-#: addressbook/printing/e-contact-print.c:1064
-#: addressbook/printing/e-contact-print.c:1091
+#: addressbook/printing/e-contact-print.c:1066
+#: addressbook/printing/e-contact-print.c:1093
 msgid "Print contact"
 msgstr "Ispiši kontakt"
 
@@ -3516,15 +3404,21 @@ msgstr "U normalnom načinu rada, ne treba postojati postavka veličine."
 msgid "Impossible internal error."
 msgstr "Nemoguća interna greška."
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:629
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
 msgid "Can not open file"
 msgstr "Ne mogu otvoriti datoteku"
 
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-msgid "Can not load URI"
-msgstr "Ne mogu učitati URI"
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "Ne mogu učitati adresar"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Ne mogu otvoriti adresar"
 
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
@@ -3542,7 +3436,7 @@ msgstr "Ime datoteke nije dano"
 msgid "Unnamed List"
 msgstr "Lista bez imena"
 
-#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Upišite lozinku"
@@ -3819,10 +3713,10 @@ msgid "Whether to show week numbers in date navigator"
 msgstr "Treba li prikazivati brojeve tjedana u navigatoru datumima"
 
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:88
-#: calendar/gui/gnome-cal.c:1703
-#: camel/providers/groupwise/camel-gw-listener.c:304
-#: camel/providers/groupwise/camel-gw-listener.c:327
+#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/gnome-cal.c:1705
+#: camel/providers/groupwise/camel-gw-listener.c:311
+#: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
 msgstr "Kalendar"
 
@@ -3841,7 +3735,7 @@ msgstr "Izbriši događaje starije od"
 
 #: calendar/gui/calendar-commands.c:363
 #: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:19 filter/filter.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
 msgid "days"
 msgstr "dana"
 
@@ -3986,23 +3880,23 @@ msgstr "Tjedni pregled"
 msgid "Month View"
 msgstr "Mjesečni pregled"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Sažetak sadrži"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Opis sadrži"
 
-#: calendar/gui/cal-search-bar.c:54
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Komentar sadrži"
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:53
 msgid "Location contains"
 msgstr "Mjesto sadrži"
 
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
 msgid "Unmatched"
 msgstr "Neupariv"
 
@@ -4023,23 +3917,23 @@ msgstr "Zabranjen pristup kalendaru"
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/dialogs/alarm-options.c:466
+#: calendar/gui/dialogs/alarm-options.c:467
 msgid "Audio Alarm Options"
 msgstr "Opcije za zvučni alarm"
 
-#: calendar/gui/dialogs/alarm-options.c:475
+#: calendar/gui/dialogs/alarm-options.c:476
 msgid "Message Alarm Options"
 msgstr "Opcije za alarm poruke"
 
-#: calendar/gui/dialogs/alarm-options.c:484
+#: calendar/gui/dialogs/alarm-options.c:485
 msgid "Email Alarm Options"
 msgstr "Opcije alarma preko e-maila"
 
-#: calendar/gui/dialogs/alarm-options.c:493
+#: calendar/gui/dialogs/alarm-options.c:494
 msgid "Program Alarm Options"
 msgstr "Opcije za program alarma"
 
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:510
 msgid "Unknown Alarm Options"
 msgstr "Nepoznate opcije za alarm"
 
@@ -4075,7 +3969,7 @@ msgstr "Za:"
 msgid "With these arguments:"
 msgstr "Sa ovim argumentima:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
 msgid "dialog1"
 msgstr "dialog1"
 
@@ -4084,7 +3978,7 @@ msgid "extra times every"
 msgstr "pokaži još na svakih"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:20 filter/filter.glade.h:16
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr "sati"
 
@@ -4130,7 +4024,7 @@ msgstr "Pošalji e-poštu"
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Sažetak:"
 
@@ -4160,7 +4054,6 @@ msgid "hour(s)"
 msgstr "sat(i)"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:21
 msgid "minute(s)"
 msgstr "minuta(e)"
 
@@ -4168,26 +4061,26 @@ msgstr "minuta(e)"
 msgid "start of appointment"
 msgstr "početak zakazanog sastanka"
 
-#: calendar/gui/dialogs/calendar-setup.c:170
+#: calendar/gui/dialogs/calendar-setup.c:172
 msgid "You must specify a location to get the calendar from."
 msgstr "Morate navesti lokaciju iz koje ćete dohvatiti kalendar."
 
-#: calendar/gui/dialogs/calendar-setup.c:178
+#: calendar/gui/dialogs/calendar-setup.c:180
 #, c-format
 msgid "The source location '%s' is not well-formed."
 msgstr "Lokacija izvora '%s' nije dobro formirana."
 
-#: calendar/gui/dialogs/calendar-setup.c:193
+#: calendar/gui/dialogs/calendar-setup.c:195
 #, c-format
 msgid "The source location '%s' is not a webcal source."
 msgstr "Lokacija izvora '%s' nije webcal izvor."
 
-#: calendar/gui/dialogs/calendar-setup.c:265
+#: calendar/gui/dialogs/calendar-setup.c:275
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr "Datoteka s kodom '%s' već postoji u odabranoj grupi"
 
-#: calendar/gui/dialogs/calendar-setup.c:278
+#: calendar/gui/dialogs/calendar-setup.c:288
 #, c-format
 msgid ""
 "The group '%s' is remote. You must specify a location to get the calendar "
@@ -4211,56 +4104,36 @@ msgstr "Grupa popisa zadataka"
 msgid "C_olor:"
 msgstr "boja"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "Calendar Properties"
-msgstr "Svojstva kalendara"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
 msgid "Pick a color"
 msgstr "Odabir boje"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:8
-msgid "Remote"
-msgstr "Udaljeno"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "Task List Properties"
-msgstr "Osobine popisa zadataka"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
 #, fuzzy
 msgid "_Add Calendar"
 msgstr "Dodaj novi kalendar"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
 #, fuzzy
 msgid "_Add Group"
 msgstr "Grupa"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-msgid "_Refresh Interval:"
-msgstr "Interval osvježavanja:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
 #, fuzzy
 msgid "_Refresh:"
 msgstr "Osvježi"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-msgid "_Source URL:"
-msgstr "Izvorni URL:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
 #, fuzzy
 msgid "_Type:"
 msgstr "Tip:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
 #, fuzzy
 msgid "_URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
 msgid "weeks"
 msgstr "tjedni"
 
@@ -4368,7 +4241,7 @@ msgid "Display"
 msgstr "_Zaslon"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:76
 msgid "E_nable"
 msgstr "_Omogući"
 
@@ -4379,7 +4252,7 @@ msgstr "Slobodan/zauzet zahtjev"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:563
+#: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Petak"
 
@@ -4393,7 +4266,7 @@ msgstr "Minuta"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:559
+#: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Ponedjeljak"
 
@@ -4403,7 +4276,7 @@ msgstr "_Ned"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:564
+#: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Subota"
 
@@ -4417,7 +4290,7 @@ msgstr "Pokaži _brojeve tjedana u navigatoru datuma"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Nedjelja"
 
@@ -4431,7 +4304,7 @@ msgstr "_Čet"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:562
+#: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Četvrtak"
 
@@ -4445,7 +4318,7 @@ msgstr "Oblik vremena:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:560
+#: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Utorak"
 
@@ -4455,7 +4328,7 @@ msgstr "Početak t_jedna:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:561
+#: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Srijeda"
 
@@ -4488,7 +4361,7 @@ msgid "_Day begins:"
 msgstr "Početak _dana:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
-#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:43
@@ -4537,81 +4410,46 @@ msgstr "_Sri"
 msgid "before every appointment"
 msgstr "prije svakog zakazanog sastanka"
 
-#: calendar/gui/dialogs/cancel-comp.c:57
-msgid ""
-"The event being deleted is a meeting, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"Obrisani događaj je sastanak, želite li da pošaljete poruku za njegovo "
-"otkazivanje?"
-
-#: calendar/gui/dialogs/cancel-comp.c:60
-msgid "Are you sure you want to cancel and delete this meeting?"
-msgstr "Sigurno želite poništiti i obrisati ovaj sastanak?"
-
-#: calendar/gui/dialogs/cancel-comp.c:66
-msgid ""
-"The task being deleted is assigned, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"Obrisani zadataka je pridjeljen, želite li poslati poruku za  otkazivanje?"
-
-#: calendar/gui/dialogs/cancel-comp.c:69
-msgid "Are you sure you want to cancel and delete this task?"
-msgstr "Sigurno želite poništiti i obrisati ovo zaduženje?"
-
-#: calendar/gui/dialogs/cancel-comp.c:75
-msgid ""
-"The journal entry being deleted is published, would you like to send a "
-"cancellation notice?"
-msgstr ""
-"Obrisani unos iz dnevnika je objavljen, želite li da pošaljete poruku za "
-"njegovo otkazivanje?"
-
-#: calendar/gui/dialogs/cancel-comp.c:78
-msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr "Sigurno želite poništiti i obrisati ovaj unos u dnevnik?"
-
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Ovaj događaj je obrisan."
 
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "Ovaj zadatak je obrisan."
 
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:68
 msgid "This journal entry has been deleted."
 msgstr "Ovaj unos u dnevnik je obrisan."
 
-#: calendar/gui/dialogs/changed-comp.c:75
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  Napravili ste izmjene. Odbaciti te izmjene i zatvoriti uređivač?"
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Niste napravili nikakve izmjene. Zatvoriti uređivač?"
 
-#: calendar/gui/dialogs/changed-comp.c:82
+#: calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "Ovaj događaj je mijenjan."
 
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "Ovaj zadatak je mijenjan."
 
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:92
 msgid "This journal entry has been changed."
 msgstr "Ovaj unos u dnevnik je mijenjan."
 
-#: calendar/gui/dialogs/changed-comp.c:99
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  Napravili ste izmjene. Odbaciti te izmjene i ažurirati uređivač?"
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Niste napravili nikakve izmjene. Ažurirati uređivač?"
@@ -4649,7 +4487,7 @@ msgid "No summary"
 msgstr "Nema sažetka"
 
 #: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
 #: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Spremi kao..."
@@ -4702,99 +4540,51 @@ msgstr "Ne mogu otvoriti odredište"
 msgid "Destination is read only"
 msgstr "Odredište je samo za čitanje"
 
-#: calendar/gui/dialogs/delete-comp.c:95
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "Sigurno želite izbrisati ovaj zakazani sastanak `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:98
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "Sigurni ste da želite obrisati ovaj nenaslovljeni sastanak?"
-
-#: calendar/gui/dialogs/delete-comp.c:104
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "Sigurni ste da želite obrisati zadatak `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:107
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "Sigurni ste da želite obrisati ovaj nenaslovljeni zadatak?"
-
-#: calendar/gui/dialogs/delete-comp.c:113
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "Sigurno želite izbrisati ovaj unos u dnevnik `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:116
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "Sigurno želite izbrisati ovaj neimenovani unos u dnevnik?"
-
-#: calendar/gui/dialogs/delete-comp.c:131
-#, c-format
-msgid "Are you sure you want to delete %d appointment?"
-msgid_plural "Are you sure you want to delete %d appointments?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: calendar/gui/dialogs/delete-comp.c:138
-#, c-format
-msgid "Are you sure you want to delete %d task?"
-msgid_plural "Are you sure you want to delete %d tasks?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: calendar/gui/dialogs/delete-comp.c:145
-#, c-format
-msgid "Are you sure you want to delete %d journal entry?"
-msgid_plural "Are you sure you want to delete %d journal entries?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: calendar/gui/dialogs/delete-error.c:52
+#: calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "Događaj nije mogao biti obrisan zbog corba greške"
 
-#: calendar/gui/dialogs/delete-error.c:55
+#: calendar/gui/dialogs/delete-error.c:57
 msgid "The task could not be deleted due to a corba error"
 msgstr "Zadatak se ne može obrisati zbog corba greške"
 
-#: calendar/gui/dialogs/delete-error.c:58
+#: calendar/gui/dialogs/delete-error.c:60
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr "Unos u dnevniku nije mogao biti obrisan zbog corba greške"
 
-#: calendar/gui/dialogs/delete-error.c:61
+#: calendar/gui/dialogs/delete-error.c:63
 msgid "The item could not be deleted due to a corba error"
 msgstr "Unos nije mogao biti obrisan zbog corba greške"
 
-#: calendar/gui/dialogs/delete-error.c:68
+#: calendar/gui/dialogs/delete-error.c:70
 msgid "The event could not be deleted because permission was denied"
 msgstr "Događaj nije mogao biti obrisan zbog nemogućnosti pristupa"
 
-#: calendar/gui/dialogs/delete-error.c:71
+#: calendar/gui/dialogs/delete-error.c:73
 msgid "The task could not be deleted because permission was denied"
 msgstr "Zadatak se ne može obrisati jer nemate potrebne ovlasti"
 
-#: calendar/gui/dialogs/delete-error.c:74
+#: calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr "Unos u dnevniku nije mogao biti obrisan zbog nemogućnosti pristupa"
 
-#: calendar/gui/dialogs/delete-error.c:77
+#: calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
 msgstr "Unos nije mogao biti obrisan zbog nemogućnosti pristupa"
 
-#: calendar/gui/dialogs/delete-error.c:84
+#: calendar/gui/dialogs/delete-error.c:86
 msgid "The event could not be deleted due to an error"
 msgstr "Događaj se ne može obrisati zbog greške"
 
-#: calendar/gui/dialogs/delete-error.c:87
+#: calendar/gui/dialogs/delete-error.c:89
 msgid "The task could not be deleted due to an error"
 msgstr "Zbog greške je zadatak nemoguće izbrisati"
 
-#: calendar/gui/dialogs/delete-error.c:90
+#: calendar/gui/dialogs/delete-error.c:92
 msgid "The journal entry could not be deleted due to an error"
 msgstr "Zbog greške je nemoguće obrisati stavku dnevnika"
 
-#: calendar/gui/dialogs/delete-error.c:93
+#: calendar/gui/dialogs/delete-error.c:95
 msgid "The item could not be deleted due to an error"
 msgstr "Zbog greške je stavku nemoguće obrisati"
 
@@ -4927,11 +4717,11 @@ msgstr "_Početno vrijeme:"
 
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:3
+#: calendar/gui/dialogs/meeting-page.glade.h:4
 #: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
 #: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1559
-#: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:100
+#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
+#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
@@ -4957,8 +4747,8 @@ msgstr "_Delegiraj za..."
 #. FIXME: need to disable for undeletable folders
 #: calendar/gui/dialogs/meeting-page.c:655
 #: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1310 calendar/gui/e-calendar-view.c:1342
-#: mail/em-folder-tree.c:2557 mail/em-folder-view.c:919
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
+#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -4966,7 +4756,7 @@ msgid "_Delete"
 msgstr "_Obriši"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:240
+#: calendar/gui/e-meeting-list-view.c:218
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Sudionik"
@@ -5002,16 +4792,15 @@ msgid "Member"
 msgstr "Član"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
-#: mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-list-view.c:248
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
 
@@ -5019,20 +4808,20 @@ msgstr "Status"
 msgid "Add A_ttendee"
 msgstr "Dodaj sudionika"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "Add attendees from addressbook."
+msgstr "Dodaj pošiljaoca u adresa_r"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Organizator:"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
+#: calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "_Change Organizer"
 msgstr "_Promijeni organizatora"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-#: calendar/gui/e-meeting-time-sel.c:417
-msgid "_Invite Others..."
-msgstr "_Pozovi druge..."
-
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
 msgstr "<b>Postavke kalendara</b>"
@@ -5180,7 +4969,7 @@ msgid "_No recurrence"
 msgstr "_Bez ponavljanja"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:450
+#: composer/e-msg-composer-attachment-bar.c:453
 msgid "_Remove"
 msgstr "_Ukloni"
 
@@ -5212,55 +5001,20 @@ msgstr "tjedan(a)"
 msgid "year(s)"
 msgstr "godina(e)"
 
-#: calendar/gui/dialogs/save-comp.c:53
-msgid ""
-"This event has been changed, but has not been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Ovaj je događaj mijenjan, ali nije spremljen.\n"
-"\n"
-"Želite li spremiti izmjene?"
-
-#: calendar/gui/dialogs/save-comp.c:57
-msgid "_Discard Changes"
-msgstr "_Zanemari promjene"
-
-#: calendar/gui/dialogs/save-comp.c:62
-msgid "Save Event"
-msgstr "Spremi događaj"
-
-#: calendar/gui/dialogs/select-source-dialog.c:65
+#: calendar/gui/dialogs/select-source-dialog.c:69
 #, fuzzy
 msgid "Select destination"
 msgstr "Odaberite odredište %s"
 
-#: calendar/gui/dialogs/select-source-dialog.c:86
+#: calendar/gui/dialogs/select-source-dialog.c:90
 #, fuzzy
 msgid "_Destination"
 msgstr "Odredišni direktorij:"
 
-#: calendar/gui/dialogs/select-source-dialog.c:88
+#: calendar/gui/dialogs/select-source-dialog.c:92
 msgid "Task List"
 msgstr "Lista zadataka"
 
-#: calendar/gui/dialogs/send-comp.c:57
-msgid "The meeting information has been created. Send it?"
-msgstr "Informacija o sastanku je napravljena. Da je pošaljem?"
-
-#: calendar/gui/dialogs/send-comp.c:60
-msgid "The meeting information has changed. Send an updated version?"
-msgstr "Informacija o sastanku je izmjenjena. Da pošaljem noviju verziju?"
-
-#: calendar/gui/dialogs/send-comp.c:67
-msgid "The task assignment information has been created. Send it?"
-msgstr "Informacija o primljenom zadatku je sačinjena. Poslati ju?"
-
-#: calendar/gui/dialogs/send-comp.c:71
-msgid "The task information has changed. Send an updated version?"
-msgstr ""
-"Informacija o zadatku je promijenjena. Želite li poslati ažuriranu inačicu?"
-
 #: calendar/gui/dialogs/task-details-page.c:406
 msgid "Completed date is wrong"
 msgstr "Datum završetka je pogrešan"
@@ -5280,7 +5034,7 @@ msgstr "Završeno"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #: calendar/gui/e-cal-component-preview.c:249
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:960
 msgid "High"
 msgstr "Visok"
 
@@ -5294,14 +5048,14 @@ msgstr "Izvodi se"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:253
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:958
 msgid "Low"
 msgstr "Nisko"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:251
 #: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:957
+#: mail/message-list.c:959
 msgid "Normal"
 msgstr "Obično"
 
@@ -5358,8 +5112,8 @@ msgstr "_Povjerljivo"
 
 #: calendar/gui/dialogs/task-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
+#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Opis:"
 
@@ -5522,7 +5276,7 @@ msgstr "Datum krajnjeg roka:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:950
+#: calendar/gui/e-itip-control.c:943
 msgid "Status:"
 msgstr "Stanje:"
 
@@ -5607,12 +5361,12 @@ msgstr "Zauzeto"
 msgid "Deleting selected objects"
 msgstr "Brišem odabrane objekte"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
 msgid "Updating objects"
 msgstr "Unosim promene u objekte"
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1370
+#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
 #: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Otvori"
@@ -5622,15 +5376,15 @@ msgid "Open _Web Page"
 msgstr "Otvori _web stranicu"
 
 #: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1291 calendar/gui/e-calendar-view.c:1376
-#: mail/em-folder-view.c:896 mail/em-popup.c:690 mail/em-popup.c:806
+#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
+#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "_Spremi Kao..."
 
 #: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1292
-#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
+#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
@@ -5638,24 +5392,24 @@ msgid "_Print..."
 msgstr "_Ispis..."
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "I_zreži"
 
 #: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1338
-#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2550
-#: mail/message-list.c:1644 ui/evolution-addressbook.xml.h:31
+#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
+#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
+#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Kopiraj"
 
 #: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1273 calendar/gui/e-calendar-view.c:1299
-#: calendar/gui/e-calendar-view.c:1372 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
+#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
@@ -5721,71 +5475,71 @@ msgstr "Sažetak"
 msgid "Task sort"
 msgstr "Razvrstani zadaci"
 
-#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
 msgid "New _Appointment..."
 msgstr "Novi S_astanak..."
 
-#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
+#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
 msgid "New All Day _Event"
 msgstr "Novi cjelodnevni _događaj"
 
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
+#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
 msgid "New Meeting"
 msgstr "Novi sastanak"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
 msgid "New Task"
 msgstr "Novi zadatak"
 
-#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Odaberi _nit"
 
-#: calendar/gui/e-calendar-view.c:1280
+#: calendar/gui/e-calendar-view.c:1283
 #, fuzzy
 msgid "_Select Date..."
 msgstr "_Obriši..."
 
-#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Objavi slobodnu/zauzetu informaciju"
 
-#: calendar/gui/e-calendar-view.c:1303
+#: calendar/gui/e-calendar-view.c:1306
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Kopiraj u mapu..."
 
-#: calendar/gui/e-calendar-view.c:1304
+#: calendar/gui/e-calendar-view.c:1307
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "_Premjesti u mapu..."
 
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1308
 msgid "_Schedule Meeting..."
 msgstr "_Zakaži sastanak..."
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1309
 msgid "_Forward as iCalendar..."
 msgstr "_Proslijedi kao iCalendar... "
 
-#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
 msgid "Delete this _Occurrence"
 msgstr "Obriši ovu _pojavu"
 
-#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
 msgid "Delete _All Occurrences"
 msgstr "Obriši _sve pojave"
 
-#: calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1349
 msgid "Go to _Today"
 msgstr "_Idi na Danas"
 
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1351
 msgid "_Go to Date..."
 msgstr "_Idi na datum..."
 
-#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "_Postavke..."
 
@@ -5799,9 +5553,9 @@ msgstr "Datum početka"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:967 calendar/gui/e-itip-control.c:1169
-#: calendar/gui/e-meeting-list-view.c:144
-#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
 #: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
 #: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
 #: camel/camel-tcp-stream-openssl.c:631
@@ -5827,13 +5581,13 @@ msgid "Assigned"
 msgstr "Dodijeljeno"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr "Da"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "Ne"
 
@@ -5845,7 +5599,7 @@ msgstr "N"
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
 msgid "E"
 msgstr "E"
 
@@ -5917,404 +5671,408 @@ msgstr "%d %b"
 msgid "%02i minute divisions"
 msgstr "razmaci od %02i minuta"
 
-#: calendar/gui/e-itip-control.c:592
+#: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
 msgstr "Da. (Složeni povratak)"
 
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:596
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:601
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:603
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:618
+#: calendar/gui/e-itip-control.c:611
 msgid " and "
 msgstr " i"
 
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:618
 #, c-format
 msgid "The %s day of "
 msgstr "%s dan "
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:631
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s "
 
-#: calendar/gui/e-itip-control.c:645
+#: calendar/gui/e-itip-control.c:638
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:642
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:653
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:669
+#: calendar/gui/e-itip-control.c:662
 msgid ", ending on "
 msgstr ", završavajući sa "
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:686
 msgid "<b>Starts:</b> "
 msgstr "<b>Početak:</b> "
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:696
 msgid "<b>Ends:</b> "
 msgstr "<b>Kraj:</b> "
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:716
 msgid "<b>Completed:</b> "
 msgstr "<b>Završeno:</b> "
 
-#: calendar/gui/e-itip-control.c:733
+#: calendar/gui/e-itip-control.c:726
 msgid "<b>Due:</b> "
 msgstr "<b>Do:</b> "
 
-#: calendar/gui/e-itip-control.c:771 calendar/gui/e-itip-control.c:827
+#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
 msgid "iCalendar Information"
 msgstr "iCalendar informacije"
 
 #. Title
-#: calendar/gui/e-itip-control.c:788
+#: calendar/gui/e-itip-control.c:781
 msgid "iCalendar Error"
 msgstr "Greška iCalendara"
 
-#: calendar/gui/e-itip-control.c:859 calendar/gui/e-itip-control.c:875
-#: calendar/gui/e-itip-control.c:886 calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
 msgid "An unknown person"
 msgstr "Nepoznata osoba"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:910
+#: calendar/gui/e-itip-control.c:903
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 "<br> Molim provjerite ove podatke, te odaberite akciju iz donjeg izbornika."
 
-#: calendar/gui/e-itip-control.c:925
+#: calendar/gui/e-itip-control.c:918
 msgid "<i>None</i>"
 msgstr "<i>Ništa</i>"
 
-#: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:929
+msgid "Location:"
+msgstr "Lokacija:"
+
+#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Prihvaćeno"
 
-#: calendar/gui/e-itip-control.c:959 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Prihvaćeno s rezervom"
 
-#: calendar/gui/e-itip-control.c:963 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Odbijeno"
 
-#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.c:1050
-#: calendar/gui/e-itip-control.c:1076 calendar/gui/e-itip-control.c:1089
-#: calendar/gui/e-itip-control.c:1102 calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
 msgid "Choose an action:"
 msgstr "Odaberite akciju:"
 
-#: calendar/gui/e-itip-control.c:1023
+#: calendar/gui/e-itip-control.c:1016
 msgid "Update"
 msgstr "Ažuriraj"
 
-#: calendar/gui/e-itip-control.c:1024 calendar/gui/e-itip-control.c:1055
-#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1091
-#: calendar/gui/e-itip-control.c:1104 calendar/gui/e-itip-control.c:1117
-#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
+#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "U redu"
 
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1044
 msgid "Accept"
 msgstr "Prihvati"
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1045
 msgid "Tentatively accept"
 msgstr "Prihvati sa rezervom"
 
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1046
 msgid "Decline"
 msgstr "Odbijanje"
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1070
 msgid "Send Free/Busy Information"
 msgstr "Pošalji slobodan/zauzet informaciju"
 
-#: calendar/gui/e-itip-control.c:1090
+#: calendar/gui/e-itip-control.c:1083
 msgid "Update respondent status"
 msgstr "Ažuriraj stanje stranke"
 
-#: calendar/gui/e-itip-control.c:1103
+#: calendar/gui/e-itip-control.c:1096
 msgid "Send Latest Information"
 msgstr "Pošalji najnoviju informaciju"
 
-#: calendar/gui/e-itip-control.c:1116 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Odustani"
 
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1185
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> je objavio podatke o sastanku."
 
-#: calendar/gui/e-itip-control.c:1193
+#: calendar/gui/e-itip-control.c:1186
 msgid "Meeting Information"
 msgstr "Informacije o sastanku"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1191
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> traži da %s bude prisutan na sastanku."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1193
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> traži da budete prisutni na sastanku."
 
-#: calendar/gui/e-itip-control.c:1201
+#: calendar/gui/e-itip-control.c:1194
 msgid "Meeting Proposal"
 msgstr "Prijedlog za sastanak"
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> želi dodati postojećem sastanku."
 
-#: calendar/gui/e-itip-control.c:1206
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Update"
 msgstr "Ažuriranje sastanka"
 
-#: calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1203
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> želi dobiti posljednje podatke o sastanku."
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1204
 msgid "Meeting Update Request"
 msgstr "Zahtjev za nove podatke o sastanku"
 
-#: calendar/gui/e-itip-control.c:1218
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> je odgovorio na zahtjev o sastanku."
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Reply"
 msgstr "Odgovor za sastanak"
 
-#: calendar/gui/e-itip-control.c:1226
+#: calendar/gui/e-itip-control.c:1219
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> je otkazo sastanak."
 
-#: calendar/gui/e-itip-control.c:1227
+#: calendar/gui/e-itip-control.c:1220
 msgid "Meeting Cancellation"
 msgstr "Otkaz sastanka"
 
-#: calendar/gui/e-itip-control.c:1234 calendar/gui/e-itip-control.c:1302
-#: calendar/gui/e-itip-control.c:1337
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1330
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> je poslao nerazumljivu poruku."
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1228
 msgid "Bad Meeting Message"
 msgstr "Neispravna poruka o sastanku"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1253
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> je objavio podatke o zadatku."
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1254
 msgid "Task Information"
 msgstr "Informacija o zadatku"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1259
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> traži obavljanje zadatka od %s."
 
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> traži da izvršite zadatak."
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1262
 msgid "Task Proposal"
 msgstr "Prijedlog zadatka"
 
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> želi dodati postojećem zadatku."
 
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Update"
 msgstr "Ažuriranje zadatka"
 
-#: calendar/gui/e-itip-control.c:1278
+#: calendar/gui/e-itip-control.c:1271
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> želi dobiti posljednje podatke o zadatku."
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1272
 msgid "Task Update Request"
 msgstr "Zahtjev za osvježenje zadatka"
 
-#: calendar/gui/e-itip-control.c:1286
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> je odgovorio na dodijeljeni zadatak."
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Reply"
 msgstr "Odgovor na zadatak"
 
-#: calendar/gui/e-itip-control.c:1294
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> je otkazao zadatak."
 
-#: calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1288
 msgid "Task Cancellation"
 msgstr "Otkazivanje zadatka"
 
-#: calendar/gui/e-itip-control.c:1303
+#: calendar/gui/e-itip-control.c:1296
 msgid "Bad Task Message"
 msgstr "Neispravna poruka o zadatku"
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1315
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> je objavio podatke o dostupnosti."
 
-#: calendar/gui/e-itip-control.c:1323
+#: calendar/gui/e-itip-control.c:1316
 msgid "Free/Busy Information"
 msgstr "Informacija slobodno/zauzeto"
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> traži vaše podatke o dostupnosti."
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1321
 msgid "Free/Busy Request"
 msgstr "Slobodan/zauzet zahtjev"
 
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1325
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> je odgovorio na zahtjev o dostupnosti."
 
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1326
 msgid "Free/Busy Reply"
 msgstr "Slobodan/zauzet odgovor"
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1331
 msgid "Bad Free/Busy Message"
 msgstr "Neispravna poruka o dostupnosti"
 
-#: calendar/gui/e-itip-control.c:1413
+#: calendar/gui/e-itip-control.c:1406
 msgid "The message does not appear to be properly formed"
 msgstr "Čini se da poruka nije ispravno sačinjena"
 
-#: calendar/gui/e-itip-control.c:1472
+#: calendar/gui/e-itip-control.c:1465
 msgid "The message contains only unsupported requests."
 msgstr "Poruka sadrži samo nepodržane zahtjeve."
 
-#: calendar/gui/e-itip-control.c:1503
+#: calendar/gui/e-itip-control.c:1496
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Prilog ne sadrži ispravnu poruku za kalendar"
 
-#: calendar/gui/e-itip-control.c:1535
+#: calendar/gui/e-itip-control.c:1528
 msgid "The attachment has no viewable calendar items"
 msgstr "Prilog nema dijelove kalendara koji se mogu pregledati"
 
-#: calendar/gui/e-itip-control.c:1769
+#: calendar/gui/e-itip-control.c:1762
 msgid "Update complete\n"
 msgstr "Ažuriranje završeno\n"
 
-#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
+#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Stanje prisutne osobe ne može biti osvježeno jer unos više ne postoji"
 
-#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objekt je neispravan i ne može biti ažuriran\n"
 
-#: calendar/gui/e-itip-control.c:1825
+#: calendar/gui/e-itip-control.c:1818
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Ovaj odgovor nije poslao trenutni sudionik. Dodati ga u sudionike?"
 
-#: calendar/gui/e-itip-control.c:1837
+#: calendar/gui/e-itip-control.c:1830
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Stanje prisutne osobe nije moglo biti osvježeno zbog neispravnog stanja!\n"
 
-#: calendar/gui/e-itip-control.c:1856
+#: calendar/gui/e-itip-control.c:1849
 msgid "There was an error on the CORBA system\n"
 msgstr "Nastala je greška u CORBA sustavu\n"
 
-#: calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1852
 msgid "Object could not be found\n"
 msgstr "Objekt se ne može naći\n"
 
-#: calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1855
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Nemate prave dozvole za ažuriranje kalendara\n"
 
-#: calendar/gui/e-itip-control.c:1865
+#: calendar/gui/e-itip-control.c:1858
 msgid "Attendee status updated\n"
 msgstr "Osvježeno stanje prisutne osobe\n"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1861
 msgid "Attendee status could not be updated!\n"
 msgstr "Stanje prisutne osobe nije moglo biti osvježeno!\n"
 
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1892
 msgid "Removal Complete"
 msgstr "Uklanjanje završeno"
 
-#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
 msgid "Item sent!\n"
 msgstr "Stavka poslana!\n"
 
-#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
+#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
 msgid "The item could not be sent!\n"
 msgstr "Unos nije mogao biti poslan!\n"
 
@@ -6355,74 +6113,74 @@ msgstr "krajnji-datum"
 msgid "date-start"
 msgstr "početni-datum"
 
-#: calendar/gui/e-meeting-list-view.c:62
+#: calendar/gui/e-meeting-list-view.c:59
 msgid "Chair Persons"
 msgstr "Predsjedništvo"
 
-#: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:479
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
 msgid "Required Participants"
 msgstr "Obavezni sudionici"
 
-#: calendar/gui/e-meeting-list-view.c:64
+#: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Slobodno prisustvo"
 
-#: calendar/gui/e-meeting-list-view.c:65
+#: calendar/gui/e-meeting-list-view.c:62
 msgid "Resources"
 msgstr "Resursi"
 
-#: calendar/gui/e-meeting-list-view.c:140 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
 #: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr "Pojedinac"
 
-#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "Grupa"
 
-#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr "Resurs"
 
-#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr "Soba"
 
-#: calendar/gui/e-meeting-list-view.c:154 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr "Mjesto"
 
-#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:127
 #: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
 msgid "Required Participant"
 msgstr "Obavezan sudionik"
 
-#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr "Slobodan učesnik"
 
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr "Ne-učesnik"
 
-#: calendar/gui/e-meeting-list-view.c:179 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:177
 #: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
 msgid "Needs Action"
 msgstr "Zahtjeva akciju"
 
-#: calendar/gui/e-meeting-list-view.c:182 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
 #: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "Okvirno"
 
-#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr "Delegirano"
@@ -6439,20 +6197,28 @@ msgstr "Odsutan..."
 msgid "No Information"
 msgstr "Nema podataka"
 
+#: calendar/gui/e-meeting-time-sel.c:417
+#, fuzzy
+msgid "Add attendees from addressbook"
+msgstr "Dodaj pošiljaoca u adresa_r"
+
 #: calendar/gui/e-meeting-time-sel.c:440
 msgid "_Options"
 msgstr "_Odrednice"
 
 #: calendar/gui/e-meeting-time-sel.c:457
-msgid "Show _Only Working Hours"
+#, fuzzy
+msgid "Show _only working hours"
 msgstr "Pokaži _samo radne sate"
 
 #: calendar/gui/e-meeting-time-sel.c:467
-msgid "Show _Zoomed Out"
+#, fuzzy
+msgid "Show _zoomed out"
 msgstr "Pokaži _umanjeno"
 
 #: calendar/gui/e-meeting-time-sel.c:482
-msgid "_Update Free/Busy"
+#, fuzzy
+msgid "_Update free/busy"
 msgstr "Ažuriraj slobodan/zauzet"
 
 #: calendar/gui/e-meeting-time-sel.c:497
@@ -6468,19 +6234,23 @@ msgid ">_>"
 msgstr "_>>"
 
 #: calendar/gui/e-meeting-time-sel.c:547
-msgid "_All People and Resources"
+#, fuzzy
+msgid "_All people and resources"
 msgstr "_Sve osobe i svi izvori"
 
 #: calendar/gui/e-meeting-time-sel.c:556
-msgid "All _People and One Resource"
+#, fuzzy
+msgid "All _people and one resource"
 msgstr "Sve _osobe i jedan izvor"
 
 #: calendar/gui/e-meeting-time-sel.c:565
-msgid "_Required People"
+#, fuzzy
+msgid "_Required people"
 msgstr "_Obavezne osobe"
 
 #: calendar/gui/e-meeting-time-sel.c:574
-msgid "Required People and _One Resource"
+#, fuzzy
+msgid "Required people and _one resource"
 msgstr "_Obavezni sudionici i jedan izvor"
 
 #: calendar/gui/e-meeting-time-sel.c:593
@@ -6518,7 +6288,7 @@ msgstr "%m/%d/%Y"
 msgid "Enter the password for %s"
 msgstr "Unesite lozinku za %s"
 
-#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6527,19 +6297,14 @@ msgstr ""
 "Greška na %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-
 #. FIXME Loading should be async
 #. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:686
+#: calendar/gui/e-tasks.c:801
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Otvaram zaduženja u %s"
 
-#: calendar/gui/e-tasks.c:709
+#: calendar/gui/e-tasks.c:824
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6548,52 +6313,47 @@ msgstr ""
 "Greška pri otvaranju %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:730
+#: calendar/gui/e-tasks.c:845
 msgid "Loading tasks"
 msgstr "Učitavanje zadataka"
 
-#: calendar/gui/e-tasks.c:834
+#: calendar/gui/e-tasks.c:949
 msgid "Completing tasks..."
 msgstr "Završavam zadatke..."
 
-#: calendar/gui/e-tasks.c:857
+#: calendar/gui/e-tasks.c:972
 msgid "Deleting selected objects..."
 msgstr "Brišem odabrane objekte..."
 
-#: calendar/gui/e-tasks.c:884
+#: calendar/gui/e-tasks.c:999
 msgid "Expunging"
 msgstr "Izbacujem"
 
-#: calendar/gui/e-tasks.c:960
+#: calendar/gui/e-tasks.c:1075
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
-#: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
+#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
+#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
 #: calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:705
 msgid "Tasks"
 msgstr "Zadaci"
 
-#: calendar/gui/gnome-cal.c:1876
+#: calendar/gui/gnome-cal.c:1878
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Učitavam sastanke kod %s"
 
-#: calendar/gui/gnome-cal.c:1895
+#: calendar/gui/gnome-cal.c:1897
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Učitavam zadatke kod %s"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1920
 #, c-format
 msgid "Opening %s"
 msgstr "Otvaram %s"
 
-#: calendar/gui/gnome-cal.c:2048
-#, c-format
-msgid "The calendar backend for '%s' has crashed."
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:2894
+#: calendar/gui/gnome-cal.c:2906
 msgid "Purging"
 msgstr "Brisanje"
 
@@ -6793,7 +6553,7 @@ msgid "On The Web"
 msgstr "Na webu"
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 
@@ -6804,7 +6564,7 @@ msgid "Unable to migrate calendar `%s'"
 msgstr "Nije moguće otvoriti kalendar '%s'."
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:869
+#: calendar/gui/migration.c:889
 #, fuzzy, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Nije moguće otvaranje zadataka u '%s'."
@@ -7040,17 +6800,17 @@ msgstr "Ispiši stavku"
 msgid "Print Setup"
 msgstr "Podešavanje ispisa"
 
-#: calendar/gui/tasks-component.c:303
+#: calendar/gui/tasks-component.c:313
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 "Popis zadataka '%s' će biti uklonjen. Jeste li sigurni da želite nastaviti?"
 
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:371
 msgid "New Task List"
 msgstr "Novi popis zadataka"
 
-#: calendar/gui/tasks-component.c:398
+#: calendar/gui/tasks-component.c:408
 #, fuzzy, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -7058,7 +6818,7 @@ msgstr[0] "Novi zadatak"
 msgstr[1] "Novi zadatak"
 msgstr[2] "Novi zadatak"
 
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -7066,50 +6826,50 @@ msgstr[0] "Obrisano"
 msgstr[1] "Obrisano"
 msgstr[2] "Obrisano"
 
-#: calendar/gui/tasks-component.c:447
+#: calendar/gui/tasks-component.c:457
 #, fuzzy
 msgid "Failed upgrading tasks."
 msgstr "Učitavanje zadataka"
 
-#: calendar/gui/tasks-component.c:526
+#: calendar/gui/tasks-component.c:749
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 "Nije moguće otvoriti listu zadataka '%s' fa kreiranje događaja i sastanaka"
 
-#: calendar/gui/tasks-component.c:538
+#: calendar/gui/tasks-component.c:761
 msgid "There is no calendar available for creating tasks"
 msgstr "Ne postoji kalendar dostupan za stvaranje zadataka"
 
-#: calendar/gui/tasks-component.c:576
+#: calendar/gui/tasks-component.c:799
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:804
+#: calendar/gui/tasks-component.c:1040
 msgid "New task"
 msgstr "Novi zadatak"
 
-#: calendar/gui/tasks-component.c:805
+#: calendar/gui/tasks-component.c:1041
 msgid "_Task"
 msgstr "_Zadatak"
 
-#: calendar/gui/tasks-component.c:806
+#: calendar/gui/tasks-component.c:1042
 msgid "Create a new task"
 msgstr "Unesi novi zadatak"
 
-#: calendar/gui/tasks-component.c:812
+#: calendar/gui/tasks-component.c:1048
 #, fuzzy
 msgid "New tasks group"
 msgstr "Interesne grupe"
 
-#: calendar/gui/tasks-component.c:813
+#: calendar/gui/tasks-component.c:1049
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Grupa popisa zadataka"
 
-#: calendar/gui/tasks-component.c:814
+#: calendar/gui/tasks-component.c:1050
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Unesi novi zadatak"
@@ -8876,12 +8636,12 @@ msgstr "Greška kod primjene filtera pretrage: %s: %s"
 msgid "Unsupported operation: append message: for %s"
 msgstr "Nepodržana operacija: priključena poruka: za %s"
 
-#: camel/camel-folder.c:1259
+#: camel/camel-folder.c:1262
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Nepodržana operacija: pretraga po izrazu: za %s"
 
-#: camel/camel-folder.c:1299
+#: camel/camel-folder.c:1302
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Nepodržana operacija: pretraga po uid-u: za %s"
@@ -8894,11 +8654,16 @@ msgstr "Premještam poruke"
 msgid "Copying messages"
 msgstr "Kopiram poruke"
 
-#: camel/camel-folder.c:1666
-msgid "Learning junk and/or non junk message(s)"
-msgstr "Učim koje su poruke neželjena pošta."
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Upozorenje"
 
-#: camel/camel-folder.c:1695
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr ""
+
+#: camel/camel-folder.c:1701
 msgid "Filtering new message(s)"
 msgstr "Filtriranje novih poruka"
 
@@ -8932,17 +8697,17 @@ msgstr ""
 msgid "(match-threads) requires a match type string"
 msgstr ""
 
-#: camel/camel-folder-search.c:785
+#: camel/camel-folder-search.c:784
 #, fuzzy
 msgid "(match-threads) expects an array result"
 msgstr "(match-all) zahtijeva samo jedan logički (boolean) rezultat"
 
-#: camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:790
 #, fuzzy
 msgid "(match-threads) requires the folder set"
 msgstr "(match-all) zahtijeva samo jedan logički (boolean) rezultat"
 
-#: camel/camel-folder-search.c:880
+#: camel/camel-folder-search.c:879
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Izvršavam pretragu na nepoznatom zaglavlju: %s"
@@ -8977,7 +8742,8 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
 #: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:706
+#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Poništeno."
@@ -9356,7 +9122,7 @@ msgstr "Važenje traženih uverenja je isteklo."
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1212
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Neispravan odgovor autentifikacije od servera."
 
@@ -9733,40 +9499,40 @@ msgstr "Naredba nije ostvarena"
 msgid "export keys: unimplemented"
 msgstr ""
 
-#: camel/camel-store.c:214
+#: camel/camel-store.c:213
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Ne mogu dobiti mapu: neispravna operacija"
 
-#: camel/camel-store.c:244
+#: camel/camel-store.c:243
 #, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr "Ne mogu stvoriti mapu: `%s': mapa postoji"
 
-#: camel/camel-store.c:295
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Ne mogu napraviti mapu: neispravna operacija"
 
-#: camel/camel-store.c:323
+#: camel/camel-store.c:325
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Ne mogu stvoriti mapu: `%s': mapa postoji"
 
-#: camel/camel-store.c:387 camel/camel-vee-store.c:354
+#: camel/camel-store.c:389 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Ne mogu obrisati mapu: %s: neispravna operacija"
 
-#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#: camel/camel-store.c:439 camel/camel-vee-store.c:387
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Ne mogu preimenovati mapu: %s: neispravna operacija"
 
-#: camel/camel-store.c:811
+#: camel/camel-store.c:777
 msgid "Trash"
 msgstr "Smeće"
 
-#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
-#: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/mail-config.glade.h:95
+#: ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Smeće"
 
@@ -9997,12 +9763,12 @@ msgstr "Nema takve poruke %s u %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Ne mogu kopirati ili premjestiti poruke u Virtualnu Mapu"
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:374
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Ne mogu obrisati mapu: %s: nema takve mape"
 
-#: camel/camel-vee-store.c:398
+#: camel/camel-vee-store.c:395
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Ne mogu preimenovati mapu: %s: nema takve mape"
@@ -10043,31 +9809,31 @@ msgstr ""
 msgid "Post Office Agent SOAP Port:"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:80
+#: camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "Novell GroupWise"
 msgstr "Novell GroupWise"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:82
+#: camel/providers/groupwise/camel-groupwise-provider.c:85
 msgid "For accessing Novell Groupwise servers"
 msgstr "Za pristupanje Novell Groupwise serverima"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: camel/providers/groupwise/camel-groupwise-provider.c:100
 #: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
 msgid "Password"
 msgstr "Lozinka"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:99
+#: camel/providers/groupwise/camel-groupwise-provider.c:102
 #: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Spajanje na IMAP poslužitelje korištenjem lozinke u čistom tekstu."
 
-#: camel/providers/groupwise/camel-gw-listener.c:305
-#: camel/providers/groupwise/camel-gw-listener.c:328
+#: camel/providers/groupwise/camel-gw-listener.c:312
+#: camel/providers/groupwise/camel-gw-listener.c:335
 msgid "Checklist"
 msgstr "Kontrolni popis"
 
@@ -10209,13 +9975,13 @@ msgid ""
 msgstr "Spajanje na IMAP poslužitelje korištenjem lozinke u čistom tekstu."
 
 #: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:429
+#: camel/providers/imap/camel-imap-store.c:428
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP poslužitelj %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:431
+#: camel/providers/imap/camel-imap-store.c:430
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP servis za %s na %s"
@@ -10225,7 +9991,7 @@ msgstr "IMAP servis za %s na %s"
 #: camel/providers/imap/camel-imap-store.c:551
 #: camel/providers/imap/camel-imap-store.c:571
 #: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
+#: camel/providers/nntp/camel-nntp-store.c:209
 #: camel/providers/pop3/camel-pop3-store.c:175
 #: camel/providers/smtp/camel-smtp-transport.c:269
 #: camel/providers/smtp/camel-smtp-transport.c:285
@@ -10242,10 +10008,10 @@ msgstr "SSL nedostupan"
 
 #: camel/providers/imap4/camel-imap4-store.c:222
 #: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:815
+#: camel/providers/imap/camel-imap-store.c:845
 #: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:137
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
 #: camel/providers/pop3/camel-pop3-store.c:192
 msgid "Connection cancelled"
 msgstr "Povezivanje poništeno"
@@ -10259,8 +10025,8 @@ msgstr ""
 "Nisam se mogao povezati na IMAP server %s u sigurnosnom načinu rada: %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:649
-#: camel/providers/imap/camel-imap-store.c:680
+#: camel/providers/imap/camel-imap-store.c:679
+#: camel/providers/imap/camel-imap-store.c:710
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
@@ -10270,7 +10036,7 @@ msgstr ""
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1109
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
 msgid "Unknown error"
 msgstr "Nepoznata greška"
 
@@ -10298,8 +10064,8 @@ msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr "Ne mogu dohvatiti mapu: `%s': %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1857
-#: camel/providers/imap/camel-imap-store.c:2235
+#: camel/providers/imap/camel-imap-store.c:1885
+#: camel/providers/imap/camel-imap-store.c:2263
 #, fuzzy, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -10377,12 +10143,12 @@ msgstr "Veza s poslužiteljom je neočekivano prekinuta: %s"
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3168
+#: camel/providers/imap/camel-imap-store.c:3194
 msgid "Operation cancelled"
 msgstr "Operacija je opozvana"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3171
+#: camel/providers/imap/camel-imap-store.c:3197
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Veza s poslužiteljom je neočekivano prekinuta: %s"
@@ -10446,13 +10212,6 @@ msgid "Unable to retrieve message: %s"
 msgstr "Ne mogu da pokupim poruku: %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:219
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -10462,15 +10221,15 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-mbox-folder.c:418
+#: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
 msgstr "Nema takve poruke"
 
 #: camel/providers/imap/camel-imap-folder.c:2019
-#: camel/providers/imap/camel-imap-folder.c:2621
-#: camel/providers/nntp/camel-nntp-folder.c:238
+#: camel/providers/imap/camel-imap-folder.c:2622
+#: camel/providers/nntp/camel-nntp-folder.c:220
 msgid "This message is not currently available"
 msgstr "Ova poruka je trenutno nedostupna"
 
@@ -10479,7 +10238,23 @@ msgstr "Ova poruka je trenutno nedostupna"
 msgid "Fetching summary information for new messages"
 msgstr "Prikupljam sažetu informaciju za nove poruke"
 
-#: camel/providers/imap/camel-imap-folder.c:2659
+#: camel/providers/imap/camel-imap-folder.c:2463
+#, c-format
+msgid "Incomplete server response: no information provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2471
+#, c-format
+msgid "Incomplete server response: no UID provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2484
+#, c-format
+msgid ""
+"Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2660
 msgid "Could not find message body in FETCH response."
 msgstr "Nisam mogao pronaći tekst poruke u FETCH odgovoru."
 
@@ -10540,43 +10315,43 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Za čitanje i spremanje pošte na IMAP servere."
 
-#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/imap/camel-imap-store.c:680
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS dodatak nije podržan."
 
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:711
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL pregovori nisu uspjeli"
 
-#: camel/providers/imap/camel-imap-store.c:818
+#: camel/providers/imap/camel-imap-store.c:848
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Ne mogu se spojiti s naredbom \"%s\": %s"
 
-#: camel/providers/imap/camel-imap-store.c:1242
+#: camel/providers/imap/camel-imap-store.c:1272
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP poslužitelj %s ne podržava traženi tip prijave  %s"
 
-#: camel/providers/imap/camel-imap-store.c:1252
+#: camel/providers/imap/camel-imap-store.c:1282
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Nema podrške za tip autentifikacije  %s"
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1305
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sMolim unesite IMAP zaporku za %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1289
+#: camel/providers/imap/camel-imap-store.c:1319
 msgid "You didn't enter a password."
 msgstr "Niste unijeli lozinku."
 
-#: camel/providers/imap/camel-imap-store.c:1318
+#: camel/providers/imap/camel-imap-store.c:1348
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10587,18 +10362,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1839
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:1867
+#: camel/providers/imap/camel-imap-store.c:2057
 #, c-format
 msgid "No such folder %s"
 msgstr "Nema takve mape %s"
 
-#: camel/providers/imap/camel-imap-store.c:1915
-#: camel/providers/imap/camel-imap-store.c:2296
+#: camel/providers/imap/camel-imap-store.c:1943
+#: camel/providers/imap/camel-imap-store.c:2324
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Glavni direktorij ne smije sadržati direktorije "
 
-#: camel/providers/imap/camel-imap-store.c:1970
+#: camel/providers/imap/camel-imap-store.c:1998
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10606,7 +10381,7 @@ msgstr "Glavni direktorij ne smije sadržati direktorije "
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Ne mogu stvoriti mapu: `%s': mapa postoji."
 
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:2274
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Nepoznata glavna mapa: %s"
@@ -10643,20 +10418,20 @@ msgid "Index message body data"
 msgstr "Indeksiranje sadržaja poruka"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:388
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:393
-#: camel/providers/local/camel-local-folder.c:396
+#: camel/providers/local/camel-local-folder.c:392
+#: camel/providers/local/camel-local-folder.c:395
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "sandučić:%s (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:400
+#: camel/providers/local/camel-local-folder.c:399
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -10718,7 +10493,7 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:142
 #: camel/providers/local/camel-local-store.c:253
-#: camel/providers/local/camel-mbox-store.c:356
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10791,8 +10566,25 @@ msgstr "Dodata Maildir poruka otkazana"
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Ne mogu dodati poruku u maildir mapu: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:226
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mbox-folder.c:417
+#: camel/providers/local/camel-mbox-folder.c:436
+#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:475
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-mh-folder.c:221
+#, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+"Ne mogu dobiti poruku: %s iz mape %s\n"
+"  %s"
+
+#: camel/providers/local/camel-maildir-folder.c:236
 msgid "Invalid message contents"
 msgstr "Neispravan sadržaj poruke"
 
@@ -10833,9 +10625,9 @@ msgstr "Nisam mogao obrisati direktorij `%s': %s"
 msgid "not a maildir directory"
 msgstr "nije maildir direktorij"
 
-#: camel/providers/local/camel-maildir-store.c:341
-#: camel/providers/local/camel-spool-store.c:286
-#: camel/providers/local/camel-spool-store.c:316
+#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-spool-store.c:284
+#: camel/providers/local/camel-spool-store.c:314
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Nisam mogao skenirati direktorij `%s': %s"
@@ -10882,27 +10674,18 @@ msgstr "Dodavanje pošte otkazano"
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Ne mogu dodati poruku u mbox datoteku: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:435
-#: camel/providers/local/camel-mbox-folder.c:466
-#: camel/providers/local/camel-mbox-folder.c:474
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"Ne mogu dobiti poruku: %s iz mape %s\n"
-"  %s"
-
-#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:468
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Mapa izgleda nepopravljivo oštećena."
 
-#: camel/providers/local/camel-mbox-folder.c:475
-msgid "Message construction failed: Corrupt mailbox?"
+#: camel/providers/local/camel-mbox-folder.c:476
+#: camel/providers/local/camel-mh-folder.c:222
+#, fuzzy
+msgid "Message construction failed."
 msgstr "Sastavljanje poruke neuspjelo: Oštećeno sandučić?"
 
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:362
+#: camel/providers/local/camel-mbox-store.c:361
 msgid "Cannot create a folder by this name."
 msgstr "Ne mogu stvoriti mapu s ovim imenom."
 
@@ -10932,30 +10715,30 @@ msgstr "`%s' nije regularna datoteka."
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Mapa `%s' nije prazna. Nije obrisana."
 
-#: camel/providers/local/camel-mbox-store.c:375
+#: camel/providers/local/camel-mbox-store.c:374
 #, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Ne mogu otvoriti direktorij  `%s': %s."
 
-#: camel/providers/local/camel-mbox-store.c:389
+#: camel/providers/local/camel-mbox-store.c:388
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Ne mogu stvoriti mapu: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:391
+#: camel/providers/local/camel-mbox-store.c:390
 msgid "Folder already exists"
 msgstr "Mapa već postoji"
 
-#: camel/providers/local/camel-mbox-store.c:473
+#: camel/providers/local/camel-mbox-store.c:472
 msgid "The new folder name is illegal."
 msgstr "Ime nove mape je neispravno."
 
-#: camel/providers/local/camel-mbox-store.c:486
+#: camel/providers/local/camel-mbox-store.c:485
 #, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Ne mogu preimenovati `%s': `%s': %s"
 
-#: camel/providers/local/camel-mbox-store.c:561
+#: camel/providers/local/camel-mbox-store.c:560
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Ne mogu preimenovati  '%s' u %s: %s"
@@ -11146,7 +10929,7 @@ msgstr ""
 "Direktorij je možda oštećen, kopirajte sačuvano u `%s'"
 
 #: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:997
+#: camel/providers/nntp/camel-nntp-store.c:1126
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Molim unesite NNTP lozinku za %s@%s"
@@ -11163,18 +10946,10 @@ msgstr "Nisam uspio poslati korisničko ime poslužitelju"
 msgid "Server rejected username/password"
 msgstr "Poslužitelj je odbio Vaše korisničko ime/lozinku"
 
-#: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:263
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr "Korisnik poništen"
-
-#: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:259
-#: camel/providers/nntp/camel-nntp-folder.c:265
+#: camel/providers/nntp/camel-nntp-folder.c:147
+#: camel/providers/nntp/camel-nntp-folder.c:149
+#: camel/providers/nntp/camel-nntp-folder.c:158
+#: camel/providers/nntp/camel-nntp-folder.c:234
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11183,60 +10958,49 @@ msgstr "Korisnik poništen"
 msgid "Cannot get message %s: %s"
 msgstr "Ne mogu dobiti poruku %s: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:188
-#: camel/providers/nntp/camel-nntp-folder.c:228
+#: camel/providers/nntp/camel-nntp-folder.c:156
+#: camel/providers/nntp/camel-nntp-folder.c:232
+#: camel/providers/nntp/camel-nntp-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+msgid "User cancelled"
+msgstr "Korisnik poništen"
+
+#: camel/providers/nntp/camel-nntp-folder.c:176
+#: camel/providers/nntp/camel-nntp-folder.c:208
 #, c-format
 msgid "Internal error: uid in invalid format: %s"
 msgstr "Interna greška: uid je u neispravnom formatu: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:201
-#, c-format
-msgid "Could not get article %s from NNTP server"
-msgstr "Ne mogu dohvatiti članak %s s NNTP poslužitelja"
-
-#: camel/providers/nntp/camel-nntp-folder.c:362
-msgid "Posting not allowed by news server"
-msgstr "News poslužitelj ne dozvoljava slanje"
-
+#: camel/providers/nntp/camel-nntp-folder.c:328
+#: camel/providers/nntp/camel-nntp-folder.c:331
 #: camel/providers/nntp/camel-nntp-folder.c:373
-#, c-format
-msgid "Failed to send newsgroups header: %s: message not posted"
-msgstr "Nisam uspio poslati zaglavlje interesne grupe: %s: poruka nije poslana"
-
-#: camel/providers/nntp/camel-nntp-folder.c:413
-#: camel/providers/nntp/camel-nntp-folder.c:426
-#, c-format
-msgid "Error posting to newsgroup: %s: message not posted"
-msgstr "Greška pri slanju poruke na interesnu grupu: %s: poruka nije poslana"
-
-#: camel/providers/nntp/camel-nntp-folder.c:438
-msgid "Error reading response to posted message: message not posted"
-msgstr "Greška pri čitanju odgovora na poslanu poruku: poruka nije poslana"
-
-#: camel/providers/nntp/camel-nntp-folder.c:441
-#, c-format
-msgid "Error posting message: %s: message not posted"
-msgstr "Greška prilikom slanja poruke: %s: poruka nije poslana"
+#: camel/providers/nntp/camel-nntp-folder.c:375
+#, fuzzy, c-format
+msgid "Posting failed: %s"
+msgstr "Neuspjela operacija: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:457
+#: camel/providers/nntp/camel-nntp-folder.c:393
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "Ne možete slati NNTP poruke prilikom neumreženog rada!"
 
-#: camel/providers/nntp/camel-nntp-folder.c:468
+#: camel/providers/nntp/camel-nntp-folder.c:404
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Ne možete kopirati poruke iz NNTP mape!"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:44
 msgid "Could not get group list from server."
 msgstr "Ne mogu dohvatiti popis grupa sa poslužitelja."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#: camel/providers/nntp/camel-nntp-grouplist.c:97
+#: camel/providers/nntp/camel-nntp-grouplist.c:106
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "Nije se mogla učitati datoteka sa listom grupa za %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#: camel/providers/nntp/camel-nntp-grouplist.c:157
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Nije se mogla snimiti datoteka sa listom grupa za %s: %s"
@@ -11265,26 +11029,29 @@ msgid ""
 "password."
 msgstr "Prijava na NNTP server korištenjem lozinke u čistom tekstu."
 
-#: camel/providers/nntp/camel-nntp-store.c:158
+#: camel/providers/nntp/camel-nntp-store.c:118
+#: camel/providers/nntp/camel-nntp-store.c:1233
+#: camel/providers/nntp/camel-nntp-store.c:1331
+#, c-format
+msgid "NNTP Command failed: %s"
+msgstr "NNTP komanda nije uspjela: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:227
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Nisam mogao pročitati pozdrav od %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:170
+#: camel/providers/nntp/camel-nntp-store.c:239
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP server %s je uzvratio kodom o grešci %d: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:326
+#: camel/providers/nntp/camel-nntp-store.c:403
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET vijesti preko %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:640
-msgid "Stream error"
-msgstr "Greška u nizu podataka"
-
-#: camel/providers/nntp/camel-nntp-store.c:643
+#: camel/providers/nntp/camel-nntp-store.c:777
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -11295,7 +11062,7 @@ msgstr ""
 "\n"
 " %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:735
+#: camel/providers/nntp/camel-nntp-store.c:872
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
@@ -11305,7 +11072,7 @@ msgstr ""
 "\n"
 "Ta grupa ne postoji. Odabrana stavka je vjerojatno nadređena mapa."
 
-#: camel/providers/nntp/camel-nntp-store.c:767
+#: camel/providers/nntp/camel-nntp-store.c:904
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
@@ -11315,63 +11082,63 @@ msgstr ""
 "\n"
 "grupa ne postoji!"
 
-#: camel/providers/nntp/camel-nntp-store.c:792
+#: camel/providers/nntp/camel-nntp-store.c:929
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 "Ne možete stvoriti mapu u pohrani USENET poruka: umjesto toga otkažite "
 "pretplatu."
 
-#: camel/providers/nntp/camel-nntp-store.c:800
+#: camel/providers/nntp/camel-nntp-store.c:937
 msgid "You cannot rename a folder in a News store."
 msgstr "Ne možete ukloniti mapu u spremištu USENET poruka."
 
-#: camel/providers/nntp/camel-nntp-store.c:808
+#: camel/providers/nntp/camel-nntp-store.c:945
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 "Ne možete ukloniti mapu u spremištu USENET poruka: otkažite pretplatu "
 "umjesto toga."
 
-#: camel/providers/nntp/camel-nntp-summary.c:253
-#, c-format
-msgid "Connection error: %s"
-msgstr "Greška u spajanju: %s"
-
-#: camel/providers/nntp/camel-nntp-summary.c:262
-#, c-format
-msgid "No such folder: %s"
-msgstr "Nema takve mape: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1118
+#, fuzzy
+msgid "Authentication requested but not username provided"
+msgstr "Zahtijev za autentifikaciju obavezan"
 
-#: camel/providers/nntp/camel-nntp-summary.c:268
-#, c-format
-msgid "Could not get group: %s"
-msgstr "Ne mogu dobiti grupu: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1146
+#, fuzzy, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr "Nisam se mogao prijaviti na POP server %s: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:333
+#: camel/providers/nntp/camel-nntp-store.c:1262
 #, fuzzy
-msgid "Could not get messages: unspecified error"
-msgstr "Ne mogu dohvatiti poruke: nenavedena greška"
+msgid "Not connected."
+msgstr "Nema kontakata"
 
-#: camel/providers/nntp/camel-nntp-summary.c:378
+#: camel/providers/nntp/camel-nntp-store.c:1311
 #, c-format
-msgid "NNTP Command failed: %s"
-msgstr "NNTP komanda nije uspjela: %s"
+msgid "No such folder: %s"
+msgstr "Nema takve mape: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:438
-#: camel/providers/nntp/camel-nntp-summary.c:543
+#: camel/providers/nntp/camel-nntp-summary.c:218
+#: camel/providers/nntp/camel-nntp-summary.c:314
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Tražim nove poruke"
 
-#: camel/providers/nntp/camel-nntp-summary.c:558
-#, c-format
-msgid "Unknown server response: %s"
-msgstr "Nepoznat odgovor poslužitelja: %s"
+#: camel/providers/nntp/camel-nntp-summary.c:225
+#, fuzzy, c-format
+msgid "Unexpected server response from xover: %s"
+msgstr "Neočekivan odgovor od IMAP poslužitelja: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:605
+#: camel/providers/nntp/camel-nntp-summary.c:328
+#, fuzzy, c-format
+msgid "Unexpected server response from head: %s"
+msgstr "Neočekivan odgovor od GnuPG: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:368
 msgid "Use cancel"
 msgstr "Koristite poništi"
 
-#: camel/providers/nntp/camel-nntp-summary.c:607
+#: camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Neuspjela operacija: %s"
@@ -11419,7 +11186,7 @@ msgstr "Obriši nakon %s dana"
 msgid "Disable support for all POP3 extensions"
 msgstr "Onemogući podršku za sva POP3 proširenja"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107
 msgid "POP"
 msgstr "POP"
 
@@ -11508,7 +11275,7 @@ msgid "No such folder `%s'."
 msgstr "Nema takve mape `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:132
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -11561,7 +11328,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Dostava pošte preko programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:119
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11846,19 +11613,19 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
+#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:408
 msgid "attachment"
 msgstr "prilog"
 
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:454
 msgid "Remove selected items from the attachment list"
 msgstr "Ukloni odabrane predmete sa liste priloga"
 
-#: composer/e-msg-composer-attachment-bar.c:491
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Add attachment..."
 msgstr "Dodaj prilog..."
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:495
 msgid "Attach a file to the message"
 msgstr "Dodaj datoteku poruci"
 
@@ -11924,7 +11691,7 @@ msgstr "Neimenovana poruka"
 msgid "Open file"
 msgstr "Otvori datoteku"
 
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
 msgid "Autogenerated"
 msgstr "Automatski stvoren"
 
@@ -12072,17 +11839,17 @@ msgstr "Priloži datoteku(e)"
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
+msgid "You cannot attach the file `{0}' to this message."
 msgstr "Dodaj datoteku poruci"
 
 #. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4
-msgid "${1}"
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
 msgstr ""
 
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
 
 #. mail-composer:attach-directory primary
@@ -12176,7 +11943,7 @@ msgstr "Nisam mogao napraviti cjevovod: %s"
 
 #. mail-composer:no-build-message secondary
 #: composer/mail-composer-errors.xml.h:34
-msgid "Because \"${0}\", you may need to select different mail options."
+msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
@@ -12186,8 +11953,10 @@ msgid "Could not read signature file \"{0}\"."
 msgstr "Nisam mogao sačuvati datoteku sa potpisom: %s"
 
 #. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38
-msgid "Because \"${1}\"."
+#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted primary
@@ -12614,11 +12383,11 @@ msgid "<b>Then</b>"
 msgstr "<b>Tada</b> "
 
 #: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1335
+#: mail/mail-account-gui.c:1347
 msgid "Select Folder"
 msgstr "Označi mapu"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
 msgid "    "
 msgstr "    "
 
@@ -12674,7 +12443,7 @@ msgstr "prije"
 msgid "months"
 msgstr "mjeseci"
 
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
 msgid "seconds"
 msgstr "sekunde"
 
@@ -12706,20 +12475,20 @@ msgstr "sa svim lokalnim mapama"
 msgid "years"
 msgstr "godine"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:916
-#: mail/mail-config.c:76 mail/mail-config.glade.h:90
+#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
+#: mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Važno"
 
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:919 mail/mail-config.c:79
-#: mail/mail-config.glade.h:145
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: mail/mail-config.glade.h:148
 msgid "To Do"
 msgstr "Za napraviti"
 
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:920 mail/mail-config.c:80
-#: mail/mail-config.glade.h:94
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: mail/mail-config.glade.h:97
 msgid "Later"
 msgstr "Kasnije"
 
@@ -12775,252 +12544,6 @@ msgstr "dolazeći"
 msgid "outgoing"
 msgstr "odlazeći"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Adjust Score"
-msgstr "Preračunaj"
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Color"
-msgstr "Dodijeli boju"
-
-#: filter/libfilter-i18n.h:4
-msgid "Assign Score"
-msgstr "Dodijeli bodovanje"
-
-#: filter/libfilter-i18n.h:5
-msgid "Attachments"
-msgstr "Privici"
-
-#: filter/libfilter-i18n.h:6
-msgid "Beep"
-msgstr "Zvučni signal"
-
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "sadrži"
-
-#: filter/libfilter-i18n.h:8
-msgid "Copy to Folder"
-msgstr "Kopiraj u mapu"
-
-#: filter/libfilter-i18n.h:9
-msgid "Date received"
-msgstr "Datum primanja"
-
-#: filter/libfilter-i18n.h:10
-msgid "Date sent"
-msgstr "Datum slanja"
-
-#: filter/libfilter-i18n.h:12
-msgid "Deleted"
-msgstr "Obrisano"
-
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "ne sadrži"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "ne završava sa"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "ne postoji"
-
-#: filter/libfilter-i18n.h:16
-msgid "does not return"
-msgstr "ne vraća"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "ne zvuči kao"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "ne počinje sa"
-
-#: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
-msgstr "Ne postoji"
-
-#: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr "Nacrt"
-
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "završava sa"
-
-#: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr "Postoji"
-
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "postoji"
-
-#: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr "Izraz"
-
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr "Sljedi"
-
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "je"
-
-#: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr "Prenosim podatke sa %1$S\r"
-
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr "Šaljem zahtjev na %1$S\r"
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr "je označen"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "je veće od"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "je manje od"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "nije"
-
-#: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr "nije označen"
-
-#: filter/libfilter-i18n.h:36
-msgid "Junk Test"
-msgstr "Testiranje pošte smeća"
-
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
-#: widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Oznaka"
-
-#: filter/libfilter-i18n.h:38
-msgid "Mailing list"
-msgstr "Dopisna lista"
-
-#: filter/libfilter-i18n.h:39
-msgid "Message Body"
-msgstr "Tijelo poruke"
-
-#: filter/libfilter-i18n.h:40
-msgid "Message Header"
-msgstr "Zaglavlje poruke"
-
-#: filter/libfilter-i18n.h:41
-msgid "Message is Junk"
-msgstr "Poruka je smeće"
-
-#: filter/libfilter-i18n.h:42
-msgid "Message is not Junk"
-msgstr "Poruka nije smeće"
-
-#: filter/libfilter-i18n.h:43
-msgid "Move to Folder"
-msgstr "Premjesti u mapu"
-
-#: filter/libfilter-i18n.h:44
-msgid "Pipe to Program"
-msgstr ""
-
-#: filter/libfilter-i18n.h:45
-msgid "Play Sound"
-msgstr "Pusti zvuk"
-
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Čitaj"
-
-#: filter/libfilter-i18n.h:47
-msgid "Recipients"
-msgstr "Primatelji"
-
-#: filter/libfilter-i18n.h:48
-msgid "Regex Match"
-msgstr "Reg. izraz pretraga"
-
-#: filter/libfilter-i18n.h:49
-msgid "Replied to"
-msgstr "Odgovoreno na"
-
-#: filter/libfilter-i18n.h:50
-msgid "returns"
-msgstr "vraća"
-
-#: filter/libfilter-i18n.h:51
-msgid "returns greater than"
-msgstr "vraća više od"
-
-#: filter/libfilter-i18n.h:52
-msgid "returns less than"
-msgstr "vraća manje od"
-
-#: filter/libfilter-i18n.h:53
-msgid "Run Program"
-msgstr ""
-
-#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Rezultat"
-
-#: filter/libfilter-i18n.h:55
-msgid "Sender"
-msgstr "Pošiljatelj"
-
-#: filter/libfilter-i18n.h:56
-msgid "Set Status"
-msgstr "Postavi status"
-
-#: filter/libfilter-i18n.h:57
-msgid "Size (kB)"
-msgstr "Veličina (kB)"
-
-#: filter/libfilter-i18n.h:58
-msgid "sounds like"
-msgstr "zvuči kao\r"
-
-#: filter/libfilter-i18n.h:59
-msgid "Source Account"
-msgstr "Izvorni izvještaj"
-
-#: filter/libfilter-i18n.h:60
-msgid "Specific header"
-msgstr "Određeno zaglavlje"
-
-#: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "počinje sa"
-
-#: filter/libfilter-i18n.h:63
-msgid "Stop Processing"
-msgstr "Prekini sa obradom"
-
-#: filter/libfilter-i18n.h:64 mail/em-format.c:755 mail/em-format-html.c:1519
-#: mail/em-format-quote.c:302 mail/em-mailer-prefs.c:87
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
-#: smime/lib/e-cert.c:1079
-msgid "Subject"
-msgstr "Subjekt"
-
-#: filter/libfilter-i18n.h:65
-msgid "Unset Status"
-msgstr "Nedodeljen status"
-
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Dodaj pravilo"
@@ -13038,6 +12561,11 @@ msgstr "Ime pravila"
 msgid "_Score Rules"
 msgstr "Pravila rezultata"
 
+#: filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Rezultat"
+
 #: filter/searchtypes.xml.h:1
 msgid "Body contains"
 msgstr "Tijelo sadrži"
@@ -13118,13 +12646,13 @@ msgstr "Potpis(i)"
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Proslijeđena poruka --------"
 
-#: mail/em-composer-utils.c:1499
+#: mail/em-composer-utils.c:1495
 msgid "an unknown sender"
 msgstr "nepoznati pošiljatelj"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1509
+#: mail/em-composer-utils.c:1505
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "Na %a, %Y-%m-%d u %H:%M %%+05d, %%s napisao:"
 
@@ -13162,8 +12690,8 @@ msgstr "<kliknite ovdje za odabir mape>"
 msgid "Create New Folder"
 msgstr "Napravi novi direktorij"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
-#: mail/mail-component.c:701
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
+#: mail/mail-component.c:704
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Navedite gdje napraviti mapu:"
@@ -13178,103 +12706,104 @@ msgstr "Napravi mapu"
 msgid "Folder _name:"
 msgstr "_Ime mape:"
 
-#: mail/em-folder-tree.c:839
+#: mail/em-folder-tree.c:833
 #, c-format
 msgid "Moving folder %s"
 msgstr "Premještam mapu %s"
 
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree.c:835
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopiram mapu %s"
 
-#: mail/em-folder-tree.c:848 mail/message-list.c:1555
+#: mail/em-folder-tree.c:842 mail/message-list.c:1561
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Premještam poruke u mapu %s"
 
-#: mail/em-folder-tree.c:850 mail/message-list.c:1557
+#: mail/em-folder-tree.c:844 mail/message-list.c:1563
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopiram poruke u mapu %s"
 
-#: mail/em-folder-tree.c:866
+#: mail/em-folder-tree.c:860
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Ne mogu ispustiti poruke u spremište najviše razine"
 
-#: mail/em-folder-tree.c:956 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Kopiraj u mapu"
 
-#: mail/em-folder-tree.c:957 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Premjesti u mapu"
 
-#: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2069
-#: mail/em-folder-tree.c:2551 mail/em-folder-view.c:798
-#: mail/message-list.c:1645
+#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
+#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
+#: mail/message-list.c:1651
 msgid "_Move"
 msgstr "_Pomakni"
 
-#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#: mail/em-folder-tree.c:955 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "Otkaži zadatak"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
 #: mail/em-folder-view.c:798 mail/em-folder-view.c:812
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Izaberite direktorij"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
 #, fuzzy
 msgid "C_opy"
 msgstr "Kopiraj"
 
-#: mail/em-folder-tree.c:2096
+#: mail/em-folder-tree.c:2088
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Stvaram mapu \"%s\""
 
-#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
+#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
 msgid "Create folder"
 msgstr "Napravi mapu"
 
-#: mail/em-folder-tree.c:2474
+#: mail/em-folder-tree.c:2463
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Preimenuj mapu \"%s\" u:"
 
-#: mail/em-folder-tree.c:2476
+#: mail/em-folder-tree.c:2465
 msgid "Rename Folder"
 msgstr "Preimenuj mapu"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "P_ogled"
 
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2537
 msgid "Open in _New Window"
 msgstr "_Otvori u novom prozoru"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2555
+#: mail/em-folder-tree.c:2546
 msgid "_New Folder..."
 msgstr "_Novi direktorij..."
 
-#: mail/em-folder-tree.c:2558
+#: mail/em-folder-tree.c:2549
 msgid "_Rename"
 msgstr "_Promijeni ime"
 
-#: mail/em-folder-tree.c:2561 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Postavke..."
 
 #: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:889
+#: mail/mail-vfolder.c:888
 msgid "VFolders"
 msgstr "VFolder-i"
 
@@ -13288,19 +12817,19 @@ msgstr "Neupariv"
 msgid "Inbox"
 msgstr "Dolazna pošta"
 
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
 msgid "Loading..."
 msgstr "Učitavam..."
 
 #: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
 #: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
 #: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:551
+#: mail/mail-component.c:554
 msgid "Mail"
 msgstr "Pošta"
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Uredi kao novu poruku..."
@@ -13313,17 +12842,17 @@ msgstr "_Ispis"
 msgid "_Reply to Sender"
 msgstr "_Odgovori pošiljatelju"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:810
+#: mail/em-folder-view.c:901 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Odgovori na _popis"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:811
+#: mail/em-folder-view.c:902 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "_Odgovori svima"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: mail/em-folder-view.c:903 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Naprijed"
@@ -13376,6 +12905,10 @@ msgstr "_Premjesti u mapu..."
 msgid "_Copy to Folder..."
 msgstr "_Kopiraj u mapu..."
 
+#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Oznaka"
+
 #: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Dodaj pošiljaoca u adresa_r"
@@ -13425,12 +12958,12 @@ msgid "Filter on _Mailing List"
 msgstr "Filter na _Dopisni popis"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
-#: mail/mail-config.glade.h:66
+#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Uobičajeno"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1796
 msgid "Print Message"
 msgstr "Ispiši poruku"
 
@@ -13469,12 +13002,18 @@ msgstr "Cc (kopija)"
 msgid "Bcc"
 msgstr "Bcc (nevidljiva kopija)"
 
+#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
+#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Subjekt"
+
 #: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
 #: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Datum"
 
-#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
+#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
 msgid "Newsgroups"
 msgstr "Interesne grupe"
 
@@ -13669,7 +13208,7 @@ msgstr ""
 "Ova poruka je kriptirana jakim enkripcijskim algoritmom. Bilo bi vrlo teško "
 "stranoj osobi vidjeti sadržaj poruke u razumno kratkom vremenu."
 
-#: mail/em-format-html-display.c:757
+#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
 msgid "_View Certificate"
 msgstr "Po_gledaj certifikat"
 
@@ -13722,7 +13261,7 @@ msgstr "Tjedno"
 msgid "Once per month"
 msgstr "Mjesečno"
 
-#: mail/em-migrate.c:1072
+#: mail/em-migrate.c:1168
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13734,86 +13273,86 @@ msgstr ""
 "\n"
 "Molim pričekajte dok Evolution ne migrira vaše mape..."
 
-#: mail/em-migrate.c:1506
+#: mail/em-migrate.c:1602
 #, fuzzy, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Ne mogu stvoriti mapu: `%s': %s"
 
-#: mail/em-migrate.c:1532
+#: mail/em-migrate.c:1628
 #, fuzzy, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr ""
 "Ne mogu kopirati opis datoteke: %s\n"
 "%s"
 
-#: mail/em-migrate.c:1715
+#: mail/em-migrate.c:1811
 #, fuzzy, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Nije se mogla snimiti datoteka sa listom grupa za %s: %s"
 
-#: mail/em-migrate.c:1919
+#: mail/em-migrate.c:2015
 #, fuzzy, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Nisam se mogao prijaviti na POP server %s: %s"
 
-#: mail/em-migrate.c:1933
+#: mail/em-migrate.c:2029
 #, fuzzy, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Nije uspjelo stvaranje direktorija `%s': %s"
 
-#: mail/em-migrate.c:1962
+#: mail/em-migrate.c:2058
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#: mail/em-migrate.c:2413 mail/em-migrate.c:2425
 #, fuzzy, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Nije uspjelo stvaranje direktorija `%s': %s"
 
-#: mail/em-migrate.c:2480
+#: mail/em-migrate.c:2576
 #, fuzzy, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr ""
 "Ne mogu napraviti izlaznu datoteku: %s\n"
 " %s"
 
-#: mail/em-migrate.c:2498
+#: mail/em-migrate.c:2594
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 msgstr ""
 
-#: mail/em-popup.c:699
+#: mail/em-popup.c:700
 msgid "Save As..."
 msgstr "Snimi kao..."
 
-#: mail/em-popup.c:717
+#: mail/em-popup.c:718
 #, c-format
 msgid "untitled_image.%s"
 msgstr "nenaslovljena_slika.%s"
 
-#: mail/em-popup.c:807
+#: mail/em-popup.c:808
 msgid "Set as _Background"
 msgstr "Postavi kao _pozadinu"
 
-#: mail/em-popup.c:809
+#: mail/em-popup.c:810
 msgid "_Reply to sender"
 msgstr "_Odgovori pošiljatelju"
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:859
 msgid "_Open Link in Browser"
 msgstr "_Otvori vezu u pregledniku"
 
-#: mail/em-popup.c:859
+#: mail/em-popup.c:860
 msgid "Se_nd message to..."
 msgstr "Pošalji poruku na..."
 
-#: mail/em-popup.c:860
+#: mail/em-popup.c:861
 msgid "_Add to Addressbook"
 msgstr "_Dodaj u adresar"
 
-#: mail/em-popup.c:966
+#: mail/em-popup.c:967
 #, c-format
 msgid "Open in %s..."
 msgstr "Otvori u %s..."
@@ -14398,7 +13937,7 @@ msgstr "Kontrola osobina Evolucija pošte"
 msgid "Mail Accounts"
 msgstr "Poštanski račun"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
 msgid "Mail Preferences"
 msgstr "Osobine pošte"
 
@@ -14412,15 +13951,15 @@ msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution uvozi vašu staru Elm poštu"
 
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:226
+#: mail/importers/evolution-mbox-importer.c:221
+#: mail/importers/evolution-outlook-importer.c:255
 #: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Obrađujem"
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:222
-#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/evolution-mbox-importer.c:223
+#: mail/importers/evolution-outlook-importer.c:257
 #: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Molim pričekajte"
@@ -14442,21 +13981,23 @@ msgid "Elm"
 msgstr "Elm"
 
 #: mail/importers/evolution-mbox-importer.c:116
+#: mail/importers/evolution-outlook-importer.c:130
 msgid "Destination folder:"
 msgstr "Odredišni direktorij:"
 
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder to import into"
 msgstr "Izaberite mapu za uvoz u"
 
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:254
 #: mail/importers/mail-importer.c:226
 #, c-format
 msgid "Importing `%s'"
 msgstr "Uvoz `%s'"
 
-#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/evolution-outlook-importer.c:301
 #: mail/importers/mail-importer.c:140
 msgid "Importing mailbox"
 msgstr "Uvoz sandučića"
@@ -14618,15 +14159,15 @@ msgstr ""
 msgid "%s License Agreement"
 msgstr "Ključni dogovor"
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
 msgid "_Host:"
 msgstr "_Računalo:"
 
-#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
 msgid "User_name:"
 msgstr "_Korisničko ime:"
 
-#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
 msgid "_Path:"
 msgstr "_Putanja:"
 
@@ -14689,31 +14230,31 @@ msgstr ""
 msgid ", %d unread"
 msgstr ""
 
-#: mail/mail-component.c:653
+#: mail/mail-component.c:656
 msgid "New Mail Message"
 msgstr "Nova poruka poštom"
 
-#: mail/mail-component.c:654
+#: mail/mail-component.c:657
 msgid "_Mail Message"
 msgstr "_Poruka"
 
-#: mail/mail-component.c:655
+#: mail/mail-component.c:658
 msgid "Compose a new mail message"
 msgstr "Sastavi novu poruku"
 
-#: mail/mail-component.c:661
+#: mail/mail-component.c:664
 msgid "New Mail Folder"
 msgstr "Nova mapa za poštu"
 
-#: mail/mail-component.c:662
+#: mail/mail-component.c:665
 msgid "Mail _Folder"
 msgstr "_Mapa pošte"
 
-#: mail/mail-component.c:663
+#: mail/mail-component.c:666
 msgid "Create a new mail folder"
 msgstr "Stvori novu mapu e-pošte"
 
-#: mail/mail-component.c:795
+#: mail/mail-component.c:798
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
@@ -14725,7 +14266,7 @@ msgstr "Provjeravam servis"
 msgid "Connecting to server..."
 msgstr "Spajam se na server...\r"
 
-#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Identitet"
 
@@ -14740,7 +14281,7 @@ msgstr ""
 "koje šaljete."
 
 #: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid "Receiving Mail"
 msgstr "Primanje pošte"
 
@@ -14756,7 +14297,7 @@ msgstr ""
 msgid "Please select among the following options"
 msgstr "Molim odaberite neku od slijedećih opcija"
 
-#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr "Slanje pošte"
 
@@ -14768,7 +14309,7 @@ msgstr ""
 "Molim unesite podatke o načinu na koji želite slati poštu. Ako niste "
 "sigurni, pitajte sustav administratora ili davatelja Internet usluga."
 
-#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37
 msgid "Account Management"
 msgstr "Upravljanje računima"
 
@@ -14786,227 +14327,232 @@ msgstr ""
 "korisnički račun. Ime će biti korištenosamo za potrebe prikazivanja na "
 "zaslonu."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:2
 msgid " Ch_eck for Supported Types "
 msgstr ""
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
 msgid "<b>Preview</b>"
 msgstr "<b>Pregled</b>"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr ""
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "<b>S_ignatures</b>"
 msgstr ""
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "<b>_Languages</b>"
 msgstr ""
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
+msgid "<small>This will make the the filter more reliable, but slower</small>"
+msgstr ""
+
+#: mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Checking for New Mail</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">General</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Security</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:34
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:35
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "A_lso kriptiranje sebi prilikom slanja kriptirane pošte"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:36
 msgid "Account Editor"
 msgstr "Urednik računa"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:38
 msgid "Add Ne_w Signature..."
 msgstr ""
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "Add _Script"
 msgstr ""
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:40
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "Uvij_ek šifriraj na mene kod slanja šifrirane pošte"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:44
 msgid "Always _sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Uvijek _vjeruj ključevima u mojoj vezi kada šifriraš"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Attach original message"
 msgstr "Pridruži izvornu poruku"
 
-#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Privitak"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:48
 msgid "Automatically _insert smiley images"
 msgstr ""
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Automatically check for _new mail every"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltički (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltički (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Beep w_hen new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "C_haracter set:"
 msgstr "Kodna stranica:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 msgid "Ch_eck for Supported Types "
 msgstr ""
 
-#: mail/mail-config.glade.h:53
-msgid "Check _Incoming Mail"
-msgstr "Provjera _dolazne pošte"
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Check _incoming mail for junk"
+msgstr "Provjera _dolazne pošte koja je prepoznata kao smeće"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Check spelling while I _type"
 msgstr "Provjeri pravopis dok kucam"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Provjera _dolazne pošte koja je prepoznata kao smeće"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 msgid "Color for _misspelled words:"
 msgstr "Boja pogrešno napisanih riječi:"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 msgid "Colors"
 msgstr ""
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 msgid "Confirm _when expunging a folder"
 msgstr ""
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -15022,239 +14568,244 @@ msgstr ""
 "\n"
 "Pritisnite \"Primjeni\" da sačuvate podešavanja."
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
 msgid "De_fault"
 msgstr "_Uobičajeno"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 msgid "Default character e_ncoding:"
 msgstr ""
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 msgid "Defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 msgid "Do not quote original message"
 msgstr "Ne citiraj originalnu poruku"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Ne potpisuj zahtjeve za s_astancima (za kompatibilnost sa Outlook-om)"
 
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Gotovo"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
 msgid "Drafts _Folder:"
 msgstr ""
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:77
 msgid "Email Accounts"
 msgstr "Korisnički računi za e-mail"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 msgid "Email _Address:"
 msgstr ""
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:79
 msgid "Empty trash folders on e_xit"
 msgstr ""
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
 msgid "Encry_ption certificate:"
 msgstr "_Potvrda kriptiranja:"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:81
 msgid "Evolution Account Assistant"
 msgstr "Pomoćnik Evolution računa"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:82
 msgid "Execute Command..."
 msgstr "Izvrši zapovijed..."
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Fi_xed-width:"
 msgstr "Fik_sirana -širina:"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 msgid "Font Properties"
 msgstr "Osobine pisma"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 msgid "Format messages in _HTML"
 msgstr "Formatiranje poruka u H_TML-u"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:87
 msgid "HTML Mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:88
 msgid "Headers"
 msgstr ""
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr "Naglasi _citate sa"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
 #: mail/mail-config.glade.h:91
+#, fuzzy
+msgid "I_nclude remote tests"
+msgstr "Uključi:"
+
+#: mail/mail-config.glade.h:94
 msgid "Inline"
 msgstr "Inline"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Mail Configuration"
 msgstr "Podešavanje pošte"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "Lokacija sandučića"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr "Sastavljač poruke"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "Napomena: biti ćete upitani za lozinku dok se ne spojite prvi put"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Or_ganization:"
 msgstr "_Organizacija:"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG osobna karta _ključa:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Play sound file when new mail arri_ves"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "Up_ozori prilikom slanja poruke kod koje su definirani samo Bcc primatelji"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Qmail maildir "
 msgstr "Qmail maildir"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr "Citiraj originalnu poruku"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr "kao citate"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 msgid "Re_member password"
 msgstr ""
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr "_Odgovor na:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "Primanje pošte"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:120
 msgid "Receiving Options"
 msgstr ""
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
 msgid "Remember _password"
 msgstr ""
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
 msgid "S_tandard Font:"
 msgstr ""
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 msgid "Security"
 msgstr ""
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font"
 msgstr "Odaberite pismo utvrđene širine za HTML"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:126
 msgid "Select HTML fixed width font for printing"
 msgstr "Odaberite pismo utvrđene širine za HTML radi ispisa"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:127
 msgid "Select HTML variable width font"
 msgstr "Odaberite pismo promjenjljive širine za HTML"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:128
 msgid "Select HTML variable width font for printing"
 msgstr "Odaberite pismo promjenjljive širine za HTML radi ispisa"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:129
 msgid "Select..."
 msgstr ""
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "Slanje pošte"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:133
 msgid "Sent _Messages Folder:"
 msgstr ""
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:134
 msgid "Ser_ver requires authentication"
 msgstr "Pos_lužitelj zahtijeva autentifikaciju"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:135
 msgid "Server _Type: "
 msgstr "_Tip poslužitelja:"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:136
 msgid "Si_gning certificate:"
 msgstr "Potpisivanje certifikata:"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:137
 msgid "Signat_ure:"
 msgstr ""
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:138
 msgid "Signatures"
 msgstr ""
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr "Odredi ime _datoteke:"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:140
 msgid "Spell Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:141
 msgid "Standard Unix mbox"
 msgstr "Standardni Unix mbox"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:142
 msgid "T_erminal Font:"
 msgstr ""
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:143
 msgid "T_ype: "
 msgstr ""
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -15264,7 +14815,7 @@ msgstr ""
 "potpis. Ime koje ste dali će biti korišteno\n"
 "samo za svrhu prikazivanja na zaslonu."
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
@@ -15273,7 +14824,7 @@ msgstr ""
 "Ovdje možete podesiti provjeru pravopisa i jezik. U popisu se nalaze samo "
 "jezici za koje imate instaliran rječnik."
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:149
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -15281,15 +14832,11 @@ msgstr ""
 "Unesite ime po kome želite da nazovete ovaj korisnički račun.\n"
 "Na primjer: \"Poslovni\" ili \"Osobni\""
 
-#: mail/mail-config.glade.h:148
-msgid "Use _Daemon"
-msgstr "Koristi _daemon"
-
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:152
 msgid "V_ariable-width:"
 msgstr "V_arijabilna širina:"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:153
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -15299,87 +14846,83 @@ msgstr ""
 "\n"
 "Pritisnite \"Naprijed\" za početak. "
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:158
 msgid "_Add Signature"
 msgstr "Dod_aj potpis"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:159
 msgid "_Always load images from the Internet"
 msgstr ""
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:160
 msgid "_Digitally sign outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:161
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Nemoj me obavještavati kada stigne nova pošta"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:163
 msgid "_Enable"
 msgstr "Omogući"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 msgid "_Encrypt outgoing messages (by default)"
 msgstr "_Kriptiranje izlaznih poruka (uobičajeno)"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:165
 msgid "_Forward style:"
 msgstr "Stil _prosljeđivanja "
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:168
 msgid "_Load images if sender is in address book"
 msgstr "_Učitavanje slika ako je pošiljatelj u adresaru"
 
-#: mail/mail-config.glade.h:167
-msgid "_Local Tests Only"
-msgstr "_Samo lokalni testovi"
-
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Make this my default account"
 msgstr "_Neka je ovo moj glavni korisnički račun "
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_Mark messages as read after"
 msgstr "_Označi poruke kao pročitane poslije "
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 msgid "_Never load images from the Internet"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "_Upozori kada šalješ HTML poruke onima koji ih ne žele"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:175
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Upozori kada šalješ poruke bez naslova"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:176
 msgid "_Reply style:"
 msgstr "_Stil odgovora:"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:177
 msgid "_Script:"
 msgstr "_Skripta:"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:178
 msgid "_Show animated images"
 msgstr "_Pokaži animirane slike"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 msgid "_Use Secure Connection (SSL):"
 msgstr ""
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "_Use the same fonts as other applications"
 msgstr "_Koristi ista pisma kao drugi programi"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:181
 msgid "color"
 msgstr "boja"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "opis"
 
@@ -15552,7 +15095,7 @@ msgstr ""
 
 #. mail:camel-exception primary
 #: mail/mail-errors.xml.h:57
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgid "Your message with the subject \"{0}\" was not delivered."
 msgstr ""
 
 #. mail:camel-exception secondary
@@ -15618,11 +15161,6 @@ msgstr ""
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Ne mogu otvoriti direktorij  `%s': %s."
 
-#. mail:no-save-path secondary
-#: mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail:no-create-path primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
@@ -15644,12 +15182,6 @@ msgstr "Ne mogu otvoriti direktorij  `%s': %s."
 msgid "Cannot create temporary save directory."
 msgstr "Nisam mogao napraviti privremeni direktorij: %s"
 
-#. mail:no-create-tmp-path secondary
-#: mail/mail-errors.xml.h:100 mail/mail-errors.xml.h:112
-#: widgets/misc/e-system-errors.xml.h:11 widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail:no-write-path-exists secondary
 #: mail/mail-errors.xml.h:104
 #, fuzzy
@@ -15924,29 +15456,25 @@ msgstr "Prebriši"
 msgid "_Append"
 msgstr "Pošalji"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:785
 #, c-format
 msgid "Pinging %s"
 msgstr "Pingam %s"
 
-#: mail/mail-mt.c:897
-msgid "Working"
-msgstr "Radim"
-
-#: mail/mail-ops.c:99
+#: mail/mail-ops.c:98
 msgid "Filtering Folder"
 msgstr "Filtriram direktorij"
 
-#: mail/mail-ops.c:260
+#: mail/mail-ops.c:259
 msgid "Fetching Mail"
 msgstr "Prikupljam poštu"
 
-#: mail/mail-ops.c:543
+#: mail/mail-ops.c:542
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Nisam mogao primjeniti odlazne filtere: %s"
 
-#: mail/mail-ops.c:568
+#: mail/mail-ops.c:567
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -15955,115 +15483,115 @@ msgstr ""
 "Nisam mogao dodati u %s: %s\n"
 "Umjesto toga dodajem u lokalnu mapu \"Poslano\"."
 
-#: mail/mail-ops.c:577
+#: mail/mail-ops.c:576
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Nisam mogao smjestiti poštu u lokalnu mapu \"Poslano\": %s"
 
-#: mail/mail-ops.c:673
+#: mail/mail-ops.c:672
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Šaljem poruku %d od %d"
 
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:703
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Greška kod slanja %d od %d poruka"
 
-#: mail/mail-ops.c:708
+#: mail/mail-ops.c:707
 msgid "Complete."
 msgstr "Gotovo."
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:804
 msgid "Saving message to folder"
 msgstr "Spremam poruku u mapu"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Premještam poruke u %s"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopiram poruke u %s"
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:1002
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Pretražujem direktorije u \"%s\""
 
-#: mail/mail-ops.c:1116
+#: mail/mail-ops.c:1115
 msgid "Forwarded messages"
 msgstr "Prosljeđene poruke"
 
-#: mail/mail-ops.c:1159
+#: mail/mail-ops.c:1158
 #, c-format
 msgid "Opening folder %s"
 msgstr "Otvaram mapu %s"
 
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1230
 #, c-format
 msgid "Opening store %s"
 msgstr "Otvaram smočnica %s"
 
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1308
 #, c-format
 msgid "Removing folder %s"
 msgstr "Uklanjam mapu %s"
 
-#: mail/mail-ops.c:1403
+#: mail/mail-ops.c:1402
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Smeštam direktorij '%s'"
 
-#: mail/mail-ops.c:1468
+#: mail/mail-ops.c:1467
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Čistim i spreman korisnički račun \"%s\""
 
-#: mail/mail-ops.c:1469
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Spremam korisnički račun '%s'"
 
-#: mail/mail-ops.c:1524
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr "Osvježavam mapu"
 
-#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
+#: mail/mail-ops.c:1559 mail/mail-ops.c:1610
 msgid "Expunging folder"
 msgstr "Izbacujem mapu"
 
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1607
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Praznim smeće u '%s'"
 
-#: mail/mail-ops.c:1609
+#: mail/mail-ops.c:1608
 msgid "Local Folders"
 msgstr "Direktoriji"
 
-#: mail/mail-ops.c:1692
+#: mail/mail-ops.c:1691
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Učitavam poruku %s"
 
-#: mail/mail-ops.c:1764
+#: mail/mail-ops.c:1763
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: mail/mail-ops.c:1850
+#: mail/mail-ops.c:1849
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: mail/mail-ops.c:1900
+#: mail/mail-ops.c:1899
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -16072,7 +15600,7 @@ msgstr ""
 "Ne mogu napraviti izlaznu datoteku: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1928
+#: mail/mail-ops.c:1927
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -16081,11 +15609,11 @@ msgstr ""
 "Greška kod spremanja poruka u: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1999
+#: mail/mail-ops.c:1998
 msgid "Saving attachment"
 msgstr "Spremam prilog"
 
-#: mail/mail-ops.c:2016
+#: mail/mail-ops.c:2015
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -16094,17 +15622,17 @@ msgstr ""
 "Ne mogu napraviti izlaznu datoteku: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2046
+#: mail/mail-ops.c:2045
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nisam mogao da upišem: %s"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Prekidam vezu sa %s"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Ponovo se povezujem na %s"
@@ -16168,24 +15696,24 @@ msgstr "Ažuriram..."
 msgid "Waiting..."
 msgstr "Pričekajte..."
 
-#: mail/mail-session.c:238
+#: mail/mail-session.c:239
 msgid "User canceled operation."
 msgstr "Korisnik je poništio operaciju."
 
-#: mail/mail-session.c:271
+#: mail/mail-session.c:272
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Unesite lozinku za %s"
 
-#: mail/mail-session.c:273
+#: mail/mail-session.c:274
 msgid "Enter Password"
 msgstr "Upišite šifru"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password"
 msgstr "_Zapamti ovu lozinku"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:298
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Zapamti ovu lozinku do kraja ovog postupka"
 
@@ -16241,79 +15769,79 @@ msgstr "Osvežavam vfolder-e za uri: %s"
 msgid "Updating vFolders for '%s'"
 msgstr "Osvežavam vfolder-e za uri: %s"
 
-#: mail/mail-vfolder.c:959
+#: mail/mail-vfolder.c:958
 msgid "vFolders"
 msgstr "vFolders-i"
 
-#: mail/mail-vfolder.c:998
+#: mail/mail-vfolder.c:997
 msgid "Edit VFolder"
 msgstr "Promjeni VMape"
 
-#: mail/mail-vfolder.c:1082
+#: mail/mail-vfolder.c:1081
 msgid "New VFolder"
 msgstr "New VFolder"
 
-#: mail/message-list.c:946
+#: mail/message-list.c:948
 msgid "Unseen"
 msgstr "Neviđeno"
 
-#: mail/message-list.c:947
+#: mail/message-list.c:949
 msgid "Seen"
 msgstr "Viđeno"
 
-#: mail/message-list.c:948
+#: mail/message-list.c:950
 msgid "Answered"
 msgstr "Odgovoreno"
 
-#: mail/message-list.c:949
+#: mail/message-list.c:951
 msgid "Multiple Unseen Messages"
 msgstr "Višestruke neviđene poruke"
 
-#: mail/message-list.c:950
+#: mail/message-list.c:952
 msgid "Multiple Messages"
 msgstr "Višestruke poruke"
 
-#: mail/message-list.c:954
+#: mail/message-list.c:956
 msgid "Lowest"
 msgstr "Najniže"
 
-#: mail/message-list.c:955
+#: mail/message-list.c:957
 msgid "Lower"
 msgstr "Niže"
 
-#: mail/message-list.c:959
+#: mail/message-list.c:961
 msgid "Higher"
 msgstr "Viši"
 
-#: mail/message-list.c:960
+#: mail/message-list.c:962
 msgid "Highest"
 msgstr "Najviši"
 
-#: mail/message-list.c:1279
+#: mail/message-list.c:1285
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1286
+#: mail/message-list.c:1292
 msgid "Today %l:%M %p"
 msgstr "Danas %k:%M %p"
 
-#: mail/message-list.c:1295
+#: mail/message-list.c:1301
 msgid "Yesterday %l:%M %p"
 msgstr "Jučer %l:%M %p"
 
-#: mail/message-list.c:1307
+#: mail/message-list.c:1313
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1315
+#: mail/message-list.c:1321
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1317
+#: mail/message-list.c:1323
 msgid "%b %d %Y"
 msgstr "%d. %b %Y"
 
-#: mail/message-list.c:3300
+#: mail/message-list.c:3321
 msgid "Generating message list"
 msgstr "Radim popis poruka"
 
@@ -16369,6 +15897,10 @@ msgstr "Naprijed"
 msgid "No Response Necessary"
 msgstr "Nije nužan odgovor"
 
+#: mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Čitaj"
+
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Odgovori"
@@ -16474,44 +16006,48 @@ msgstr ""
 "Popis putanja za mape koje se sinhroniziraju s diskom za neumreženu uporabu"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid "Toolbar is visible"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Whether Evolution should start up in offline mode"
 msgstr "Treba li Evolution započeti u neumreženom načinu rada"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Whether the toolbar should be visible."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
 msgid "Whether to skip the development warning dialog"
 msgstr "Treba li preskočiti dijalog s upozorenjem o razvojnoj inačici"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
+#: shell/apps_evolution_shell.schemas.in.in.h:14
 msgid "mail"
 msgstr "oklop"
 
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
-msgstr "Za vas su napravili"
-
-#: shell/e-shell.c:545 shell/e-shell.c:546
+#: shell/e-shell.c:588 shell/e-shell.c:589
 #, fuzzy, c-format
 msgid "%ld KB"
 msgstr "%d %B"
 
-#: shell/e-shell.c:744
+#: shell/e-shell.c:786
 #, fuzzy
 msgid "Uknown system error."
 msgstr "Nepoznata greška"
 
-#: shell/e-shell.c:1101
+#: shell/e-shell.c:1143
 msgid "Invalid arguments"
 msgstr "Neispravni argumenti"
 
-#: shell/e-shell.c:1103
+#: shell/e-shell.c:1145
 msgid "Cannot register on OAF"
 msgstr "Ne mogu se registrirati na OAF"
 
-#: shell/e-shell.c:1105
+#: shell/e-shell.c:1147
 msgid "Configuration Database not found"
 msgstr "Baza sa postavkama nije pronađena"
 
-#: shell/e-shell.c:1107
+#: shell/e-shell.c:1149
 msgid "Generic error"
 msgstr "Generička greška"
 
@@ -16570,7 +16106,7 @@ msgstr ""
 msgid "Select importer"
 msgstr "Odaberite uvoznika"
 
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1026
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
 #, c-format
 msgid "File %s does not exist"
 msgstr "Datoteka %s ne postoji"
@@ -16598,31 +16134,32 @@ msgstr ""
 "Uvozim %s\n"
 "Uvozim 1. stavku."
 
-#: shell/e-shell-importer.c:549
+#: shell/e-shell-importer.c:570
 msgid "Automatic"
 msgstr "Automatski"
 
-#: shell/e-shell-importer.c:598
-msgid "_Filename:"
-msgstr "_Ime datoteke:"
+#: shell/e-shell-importer.c:626
+#, fuzzy
+msgid "F_ilename:"
+msgstr "Ime trake:"
 
-#: shell/e-shell-importer.c:603
+#: shell/e-shell-importer.c:631
 msgid "Select a file"
 msgstr "Odaberite datoteku"
 
-#: shell/e-shell-importer.c:613
+#: shell/e-shell-importer.c:642
 msgid "File _type:"
 msgstr "_Vrsta datoteke:"
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:681
 msgid "Import data and settings from _older programs"
 msgstr "_Uvezi podatke i postavke iz starijih programa"
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:684
 msgid "Import a _single file"
 msgstr "_Uvezi jednu datoteku"
 
-#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -16630,25 +16167,25 @@ msgstr ""
 "Molim pričekajte...\n"
 "Tražim postojeća podešavanja"
 
-#: shell/e-shell-importer.c:727
+#: shell/e-shell-importer.c:756
 msgid "Starting Intelligent Importers"
 msgstr "Pokrećem inteligentne uvoznike"
 
-#: shell/e-shell-importer.c:853 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
 #, c-format
 msgid "From %s:"
 msgstr "Od %s:"
 
-#: shell/e-shell-importer.c:1044
+#: shell/e-shell-importer.c:1073
 #, c-format
 msgid "No importer available for file %s"
 msgstr "Nema dostupnog uvoznika za datoteku %s"
 
-#: shell/e-shell-importer.c:1056
+#: shell/e-shell-importer.c:1085
 msgid "Unable to execute importer"
 msgstr "Nisam mogao izvršiti uvoznika"
 
-#: shell/e-shell-importer.c:1169
+#: shell/e-shell-importer.c:1199
 msgid "_Import"
 msgstr "_Uvoz"
 
@@ -16698,61 +16235,61 @@ msgstr "Ime mape ne može sadržavati znak \"#\"."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' i '..' su rezervirana imena mapa."
 
-#: shell/e-shell-window.c:336
+#: shell/e-shell-window.c:337
 #, fuzzy
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution je trenutno na mreži. Pritisnite ovaj gumb da radite bez "
 "mreže."
 
-#: shell/e-shell-window.c:343
+#: shell/e-shell-window.c:344
 #, fuzzy
 msgid "Evolution is in the process of going offline."
 msgstr "Ximian Evolution je u procesu odlaska u rad bez mreže."
 
-#: shell/e-shell-window.c:349
+#: shell/e-shell-window.c:350
 #, fuzzy
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution nije trenutno na mreži. Pritisnite ovaj gumb za rad na "
 "mreži."
 
-#: shell/e-shell-window.c:621
+#: shell/e-shell-window.c:637
 #, fuzzy, c-format
 msgid "Switch to %s"
 msgstr "Pošta za %s"
 
-#: shell/e-shell-window-commands.c:64
+#: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Čini se da GNOME Pilot alati nisu instalirani na ovaj sistem."
 
-#: shell/e-shell-window-commands.c:72
+#: shell/e-shell-window-commands.c:74
 #, c-format
 msgid "Error executing %s."
 msgstr "Greška kod pokretanja %s."
 
-#: shell/e-shell-window-commands.c:121
+#: shell/e-shell-window-commands.c:123
 msgid "Bug buddy is not installed."
 msgstr "Bug buddy nije instaliran."
 
-#: shell/e-shell-window-commands.c:129
+#: shell/e-shell-window-commands.c:131
 msgid "Bug buddy could not be run."
 msgstr "Ne mogu pokrenuti Bug buddy."
 
-#: shell/e-shell-window-commands.c:171
+#: shell/e-shell-window-commands.c:323
 #, fuzzy
-msgid "About Evolution"
-msgstr "O Ximian Evolutionu"
+msgid "Groupware Suite"
+msgstr "Grupa"
 
-#: shell/e-shell-window-commands.c:382
+#: shell/e-shell-window-commands.c:563
 msgid "_Work Online"
 msgstr "_Na mreži"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "_Neumreženi rad"
 
-#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Neumreženi rad"
 
@@ -16764,43 +16301,6 @@ msgstr "Kvadratić"
 msgid "New"
 msgstr "Novi"
 
-#: shell/evolution-shell-component-utils.c:115
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Nepoznata greška."
-
-#: shell/evolution-shell-component-utils.c:118
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Greška koju je poslao sustav komponente:\n"
-"%s"
-
-#: shell/evolution-shell-component-utils.c:125
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Greška koju je poslao sustav za pokretanje:\n"
-"%s"
-
 #: shell/evolution-test-component.c:140
 msgid "New Test"
 msgstr "Novi test"
@@ -17127,30 +16627,30 @@ msgid ""
 "Click help for details."
 msgstr ""
 
-#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:522
+#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
+#: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
 msgstr "Izaberi certifikat za uvoz"
 
-#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:604
+#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
+#: smime/gui/certificate-manager.c:638
 msgid "Certificate Name"
 msgstr "Certificate Name"
 
-#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
+#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
 msgid "Purposes"
 msgstr "Purpose"
 
-#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:517
+#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr "Serial Number"
 
-#: smime/gui/certificate-manager.c:267
+#: smime/gui/certificate-manager.c:271
 msgid "Expires"
 msgstr "Istječe"
 
-#: smime/gui/certificate-manager.c:417
+#: smime/gui/certificate-manager.c:446
 msgid "E-Mail Address"
 msgstr "Adresa e-pošte"
 
@@ -17192,6 +16692,11 @@ msgstr ""
 "Izdano od\n"
 "  Naslov: %s\n"
 
+#: smime/gui/e-cert-selector.c:169
+#, fuzzy
+msgid "Select certificate"
+msgstr "SSL certifikat klijenta"
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr "<Nije dio certifikata>"
@@ -17248,7 +16753,7 @@ msgstr ""
 "Prije pružanja povjerenja CA-u u bilo koju svrhu, trebate pregledati njegov "
 "certifikat, politiku postupanja i procedure (ako je dostupno)."
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
 msgid "Certificate"
 msgstr "Potvrda"
 
@@ -17268,19 +16773,23 @@ msgstr "Common Name (CN)"
 msgid "Contact Certificates"
 msgstr "Certifikati kontakata"
 
-#: smime/gui/smime-ui.glade.h:21
-#, no-c-format
-msgid "Do you want to trust \"%s\" for the following purposes?"
-msgstr "Želite li vjerovati \"%s\" u sljedećim prigodama?"
+#: smime/gui/smime-ui.glade.h:20
+msgid "Do not trust the authenticity of this certificate"
+msgstr ""
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:21
 msgid "Dummy window only"
 msgstr "Samo obični prozor"
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:22
 msgid "Edit"
 msgstr "Uređivanje"
 
+#: smime/gui/smime-ui.glade.h:23
+#, fuzzy
+msgid "Email Certificate Trust Settings"
+msgstr "Ovlasti certifikata elektronske pošte"
+
 #: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr "Certifikat elektronske pošte primatelja"
@@ -17313,248 +16822,259 @@ msgstr "Organizational Unit (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 Fingerprint"
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr "SSL certifikat klijenta"
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr "SSL certifikat poslužitelja"
 
 #: smime/gui/smime-ui.glade.h:37
+msgid "Trust the authenticity of this certificate"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
 msgid "Trust this CA to identify email users."
 msgstr "Trust this CA to identify email users."
 
-#: smime/gui/smime-ui.glade.h:38
+#: smime/gui/smime-ui.glade.h:39
 msgid "Trust this CA to identify software developers."
 msgstr "Trust this CA to identify software developers."
 
-#: smime/gui/smime-ui.glade.h:39
+#: smime/gui/smime-ui.glade.h:40
 msgid "Trust this CA to identify web sites."
 msgstr "Trust this CA to identify web sites."
 
-#: smime/gui/smime-ui.glade.h:40
+#: smime/gui/smime-ui.glade.h:41
 msgid "View"
 msgstr "Pogled"
 
-#: smime/gui/smime-ui.glade.h:41
-msgid "View Certificate"
-msgstr "View Certificate"
-
 #: smime/gui/smime-ui.glade.h:42
-msgid "You have been asked to trust a new Certificate Authority (CA)."
-msgstr "You have been asked to trust a new Certificate Authority (CA)."
-
-#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr "You have certificates from these organizations that identify you:"
 
-#: smime/gui/smime-ui.glade.h:44
+#: smime/gui/smime-ui.glade.h:43
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 "You have certificates on file that identify these certificate authorities:"
 
-#: smime/gui/smime-ui.glade.h:45
+#: smime/gui/smime-ui.glade.h:44
 msgid "You have certificates on file that identify these people:"
 msgstr "You have certificates on file that identify these people:"
 
-#: smime/gui/smime-ui.glade.h:46
+#: smime/gui/smime-ui.glade.h:45
 msgid "Your Certificates"
 msgstr "Vaše potvrde"
 
-#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
+#: smime/gui/smime-ui.glade.h:46
+msgid "_Edit CA Trust"
+msgstr ""
+
+#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
-#: smime/lib/e-cert.c:478
+#. x509 certificate usage types
+#: smime/lib/e-cert.c:424
+#, fuzzy
+msgid "Sign"
+msgstr "Potpisujem"
+
+#: smime/lib/e-cert.c:425
+#, fuzzy
+msgid "Encrypt"
+msgstr "Šifrirano"
+
+#: smime/lib/e-cert.c:530
 msgid "Version"
 msgstr "Inačica"
 
-#: smime/lib/e-cert.c:493
+#: smime/lib/e-cert.c:545
 msgid "Version 1"
 msgstr "Inačica 1"
 
-#: smime/lib/e-cert.c:496
+#: smime/lib/e-cert.c:548
 msgid "Version 2"
 msgstr "Inačica 2"
 
-#: smime/lib/e-cert.c:499
+#: smime/lib/e-cert.c:551
 msgid "Version 3"
 msgstr "Inačica 3"
 
-#: smime/lib/e-cert.c:581
+#: smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 s RSA enkripcijom"
 
-#: smime/lib/e-cert.c:584
+#: smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 s RSA enkripcijom"
 
-#: smime/lib/e-cert.c:587
+#: smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 s RSA enkripcijom"
 
-#: smime/lib/e-cert.c:590
+#: smime/lib/e-cert.c:642
 msgid "C"
 msgstr "C"
 
-#: smime/lib/e-cert.c:593
+#: smime/lib/e-cert.c:645
 msgid "CN"
 msgstr "CN"
 
-#: smime/lib/e-cert.c:596
+#: smime/lib/e-cert.c:648
 msgid "OU"
 msgstr "OU"
 
-#: smime/lib/e-cert.c:599
+#: smime/lib/e-cert.c:651
 msgid "O"
 msgstr "O"
 
-#: smime/lib/e-cert.c:602
+#: smime/lib/e-cert.c:654
 msgid "L"
 msgstr "L"
 
-#: smime/lib/e-cert.c:605
+#: smime/lib/e-cert.c:657
 msgid "DN"
 msgstr "DN"
 
-#: smime/lib/e-cert.c:608
+#: smime/lib/e-cert.c:660
 msgid "DC"
 msgstr "DC"
 
-#: smime/lib/e-cert.c:611
+#: smime/lib/e-cert.c:663
 msgid "ST"
 msgstr "ST"
 
-#: smime/lib/e-cert.c:614
+#: smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA enkripcija"
 
-#: smime/lib/e-cert.c:617
+#: smime/lib/e-cert.c:669
 msgid "Certificate Key Usage"
 msgstr "Upotreba ključeva certifikata"
 
-#: smime/lib/e-cert.c:620
+#: smime/lib/e-cert.c:672
 msgid "Netscape Certificate Type"
 msgstr "Vrsta Netscape uvjerenja"
 
-#: smime/lib/e-cert.c:623
+#: smime/lib/e-cert.c:675
 msgid "Certificate Authority Key Identifier"
 msgstr "Identifikator ključeva izdavača certifikata"
 
-#: smime/lib/e-cert.c:626
+#: smime/lib/e-cert.c:678
 msgid "UID"
 msgstr "UID"
 
-#: smime/lib/e-cert.c:635
+#: smime/lib/e-cert.c:687
 #, fuzzy, c-format
 msgid "Object Identifier (%s)"
 msgstr "Identifikator objekta (%S)"
 
-#: smime/lib/e-cert.c:686
+#: smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
 msgstr "Identifikator algoritma"
 
-#: smime/lib/e-cert.c:694
+#: smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
 msgstr "Parametri algoritma"
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:768
 msgid "Subject Public Key Info"
 msgstr "Podaci o subject algoritmu javnog  ključa"
 
-#: smime/lib/e-cert.c:721
+#: smime/lib/e-cert.c:773
 msgid "Subject Public Key Algorithm"
 msgstr "Subject Algoritam javnog ključa"
 
-#: smime/lib/e-cert.c:736
+#: smime/lib/e-cert.c:788
 msgid "Subject's Public Key"
 msgstr "Subjektov javni ključ"
 
-#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
+#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
 msgid "Error: Unable to process extension"
 msgstr "Greška: obrađivanje ekstenzije nije moguće"
 
-#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
+#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr "Potpisnik objekta"
 
-#: smime/lib/e-cert.c:782
+#: smime/lib/e-cert.c:834
 msgid "SSL Certificate Authority"
 msgstr "Izdavač SSL certifikata"
 
-#: smime/lib/e-cert.c:786
+#: smime/lib/e-cert.c:838
 msgid "Email Certificate Authority"
 msgstr "Ovlasti certifikata elektronske pošte"
 
-#: smime/lib/e-cert.c:814
+#: smime/lib/e-cert.c:866
 msgid "Signing"
 msgstr "Potpisujem"
 
-#: smime/lib/e-cert.c:818
+#: smime/lib/e-cert.c:870
 msgid "Non-repudiation"
 msgstr "Prihvaćanje"
 
-#: smime/lib/e-cert.c:822
+#: smime/lib/e-cert.c:874
 msgid "Key Encipherment"
 msgstr "Ključ šifriranja"
 
-#: smime/lib/e-cert.c:826
+#: smime/lib/e-cert.c:878
 msgid "Data Encipherment"
 msgstr "Šifriranje podataka"
 
-#: smime/lib/e-cert.c:830
+#: smime/lib/e-cert.c:882
 msgid "Key Agreement"
 msgstr "Ključni dogovor"
 
-#: smime/lib/e-cert.c:834
+#: smime/lib/e-cert.c:886
 msgid "Certificate Signer"
 msgstr "Potpisnik uvjerenja"
 
-#: smime/lib/e-cert.c:838
+#: smime/lib/e-cert.c:890
 msgid "CRL Signer"
 msgstr "CRL Potpisnik"
 
-#: smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:938
 msgid "Critical"
 msgstr "Kritično"
 
-#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
+#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
 msgid "Not Critical"
 msgstr "Nije kritično"
 
-#: smime/lib/e-cert.c:912
+#: smime/lib/e-cert.c:964
 msgid "Extensions"
 msgstr "Nastavci"
 
-#: smime/lib/e-cert.c:983
+#: smime/lib/e-cert.c:1035
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
 msgid "Certificate Signature Algorithm"
 msgstr "Algoritam potpisa certifikata"
 
-#: smime/lib/e-cert.c:1048
+#: smime/lib/e-cert.c:1100
 msgid "Issuer"
 msgstr "Izdavatelj"
 
-#: smime/lib/e-cert.c:1102
+#: smime/lib/e-cert.c:1154
 msgid "Issuer Unique ID"
 msgstr "Jedinstveni ID Izdavatelja"
 
-#: smime/lib/e-cert.c:1121
+#: smime/lib/e-cert.c:1173
 msgid "Subject Unique ID"
 msgstr "Jedinstveni ID subjekta"
 
-#: smime/lib/e-cert.c:1164
+#: smime/lib/e-cert.c:1216
 msgid "Certificate Signature Value"
 msgstr "Vrijednost potpisa uvjerenja"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
+#: smime/lib/e-cert-db.c:608
 msgid "Certificate already exists"
 msgstr "Certifikat već postoji"
 
@@ -17700,7 +17220,7 @@ msgstr "Pregledaj tekući kontakt"
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "_Akcije"
 
@@ -17863,7 +17383,7 @@ msgstr "_Zatvori"
 #: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:3
+#: ui/evolution.xml.h:4
 msgid "Close"
 msgstr "Zatvori"
 
@@ -17876,7 +17396,7 @@ msgid "Delete this item"
 msgstr "Obriši ovu stavku"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr "Glavna traka s alatima"
 
@@ -17919,7 +17439,7 @@ msgstr "Spremi ovu stavku na disk"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:44
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "_File"
 msgstr "_Datoteka"
 
@@ -18176,13 +17696,13 @@ msgstr "_Inverzni odabir"
 msgid "_Threaded Message List"
 msgstr "Lista poruka prema _niti razgovora"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Zatvori ovaj prozor"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "_Close"
 msgstr "_Zatvori"
 
@@ -18579,7 +18099,7 @@ msgstr "_Prethodna poruka"
 msgid "_Quoted"
 msgstr "_kao citate"
 
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
 msgid "_Tools"
 msgstr "_Alati"
 
@@ -18876,108 +18396,122 @@ msgid "_Open Task"
 msgstr "_Otvori zadatak"
 
 #: ui/evolution.xml.h:1
-msgid "About Ximian Evolution..."
-msgstr "O Ximian Evolutionu..."
+#, fuzzy
+msgid "About Evolution..."
+msgstr "O Ximian Evolutionu"
 
 #: ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
 msgstr "Promijeni postavke Evolutiona"
 
-#: ui/evolution.xml.h:5
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the visibility of the toolbar"
+msgstr "Promijeni svojstva ove mape"
+
+#: ui/evolution.xml.h:6
 #, fuzzy
 msgid "Create a new window displaying this folder"
 msgstr "Stvori novu mapu e-pošte"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "_Izlaz"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "_Česta pitanja u vezi Evolutiona"
+
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Izlaz iz programa"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:10
 msgid "Forget _Passwords"
 msgstr "Zaboravi _lozinke"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:11
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Zaboravi zapamćene lozinke kako bi ponovo bili upitani za iste"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:12
 msgid "Import data from other programs"
 msgstr "Uvezi podatke iz drugih programa"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:14
 #, fuzzy
 msgid "New _Window"
 msgstr "_Prozor"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Pi_lot Settings..."
 msgstr "Podešavanja Pi_lota..."
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Send / Receive"
 msgstr "Slanje / primanje"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Send queued items and retrieve new items"
 msgstr "Pošalji zakazane i dobavi nove stavke"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Set up Pilot configuration"
 msgstr "Podesi postavke Pilota"
 
-#: ui/evolution.xml.h:17
-msgid "Show information about Ximian Evolution"
+#: ui/evolution.xml.h:19
+#, fuzzy
+msgid "Show information about Evolution"
 msgstr "Prikaži informacije o Ximian Evolution"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:20
 msgid "Submit Bug Report"
 msgstr "Prijavi grešku"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:21
 msgid "Submit _Bug Report"
 msgstr "_Prijavi grešku"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Pošalji izveštaj o grešcci pomoću Bug Buddy"
 
-#: ui/evolution.xml.h:21
-msgid "Toggle whether we are working offline."
-msgstr "Rad na mreži ili ne."
-
 #: ui/evolution.xml.h:23
-msgid "Ximian Evolution _FAQ"
-msgstr "_Česta pitanja u vezi Evolutiona"
+#, fuzzy
+msgid "T_oolbar"
+msgstr "Glavna traka s alatima"
 
 #: ui/evolution.xml.h:24
-msgid "_About Ximian Evolution..."
-msgstr "_O Ximian Evolution..."
+msgid "Toggle whether we are working offline."
+msgstr "Rad na mreži ili ne."
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "_About Evolution..."
+msgstr "O Ximian Evolutionu"
+
+#: ui/evolution.xml.h:30
 msgid "_Help"
 msgstr "_Pomoć"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "_Import..."
 msgstr "_Uvezi..."
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "_New"
 msgstr "_Novi"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "_Quick Reference"
 msgstr "_Brza referenca"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_Send / Receive"
 msgstr "_Pošalji / Primi"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 #, fuzzy
 msgid "_Window"
 msgstr "_Prozor"
@@ -19050,7 +18584,7 @@ msgid "With _Status"
 msgstr "Postavi status"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:626
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:635
 msgid "UTC"
 msgstr "UTC"
 
@@ -19206,30 +18740,30 @@ msgstr "Ostalo..."
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
-#: widgets/misc/e-error.c:121
+#: widgets/misc/e-error.c:79 widgets/misc/e-error.c:80
+#: widgets/misc/e-error.c:122
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Evolution"
 
-#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
-#: widgets/misc/e-error.c:119
+#: widgets/misc/e-error.c:81 widgets/misc/e-error.c:82
+#: widgets/misc/e-error.c:120
 #, fuzzy
 msgid "Evolution Warning"
 msgstr "Evolucija pošta"
 
-#: widgets/misc/e-error.c:118
+#: widgets/misc/e-error.c:119
 #, fuzzy
 msgid "Evolution Information"
 msgstr "Informacije o sastanku"
 
-#: widgets/misc/e-error.c:120
+#: widgets/misc/e-error.c:121
 #, fuzzy
 msgid "Evolution Query"
 msgstr "Evolution Test"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:410
+#: widgets/misc/e-error.c:415
 #, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -19378,16 +18912,498 @@ msgstr ""
 "Ne mogu spremiti u `%s'\n"
 " %s"
 
-#: widgets/misc/e-task-widget.c:211
+#: widgets/misc/e-task-widget.c:212
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: widgets/misc/e-task-widget.c:216
+#: widgets/misc/e-task-widget.c:217
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% dovršeno)"
 
+#~ msgid "Failed to connect to LDAP server"
+#~ msgstr "Neuspešno povezivanje sa LDAP serverom"
+
+#~ msgid "Failed to authenticate with LDAP server"
+#~ msgstr "Neuspjela prijava na LDAP server"
+
+#~ msgid "Could not perform query on Root DSE"
+#~ msgstr "Nisam mogao obaviti upit na Root DSE"
+
+#~ msgid "The server responded with no supported search bases"
+#~ msgstr "Server je odgovorio nepodržanim bazama za pretragu"
+
+#~ msgid "This server does not support LDAPv3 schema information"
+#~ msgstr "Ovaj poslužitelj ne podržava LDAPv3 informacije o shemi"
+
+#~ msgid "Error retrieving schema information"
+#~ msgstr "Greška kod čitanja podataka sheme"
+
+#~ msgid "Server did not respond with valid schema information"
+#~ msgstr "Poslužitelj nije odgovorio sa ispravnim podacima sheme"
+
+#~ msgid "  S_how Supported Bases "
+#~ msgstr " P_rikaži podržane baze "
+
+#~ msgid "1:00"
+#~ msgstr "1:00"
+
+#~ msgid "5:00"
+#~ msgstr "5:00"
+
+#~ msgid "Connecting"
+#~ msgstr "Povezivanje"
+
+#~ msgid "Distinguished _name:"
+#~ msgstr "Posebno _ime:"
+
+#~ msgid "Email address:"
+#~ msgstr "Poštanska adresa"
+
+#~ msgid "Evolution will use this DN to authenticate you with the server"
+#~ msgstr "Evolution će koristiti ovaj DN za prijavljivanje na server"
+
+#~ msgid "One"
+#~ msgstr "Jedan"
+
+#~ msgid "S_earch scope: "
+#~ msgstr "Ops_eg pretrage:"
+
+#~ msgid "Searching"
+#~ msgstr "Pretraživanje"
+
+#~ msgid "Sub"
+#~ msgstr "Pod"
+
+#~ msgid "This option controls how long a search will be run."
+#~ msgstr "Ova opcija određuje koliko će pretraga trajati."
+
+#~ msgid "U_se SSL/TLS:"
+#~ msgstr "K_oristi SSL/TLS:"
+
+#~ msgid "_Display name:"
+#~ msgstr "_Ime:"
+
+#~ msgid "_Port number:"
+#~ msgstr "Broj _porta:"
+
+#~ msgid "_Search base:"
+#~ msgstr "Baza _pretrage:"
+
+#~ msgid "_Server name:"
+#~ msgstr "_Ime poslužitelja:"
+
+#~ msgid "_Timeout (minutes):"
+#~ msgstr "_Odziv (minute):"
+
+#~ msgid "connecting-tab"
+#~ msgstr "tab za vezu"
+
+#~ msgid "general-tab"
+#~ msgstr "tab za opće podatke"
+
+#~ msgid "searching-tab"
+#~ msgstr "tab za pretragu"
+
+#, fuzzy
+#~ msgid "Job title:"
+#~ msgstr "_Poslovna titula: "
+
+#, fuzzy
+#~ msgid "Webcam:"
+#~ msgstr "Internet stranica"
+
+#~ msgid "Category editor not available."
+#~ msgstr "Uređivač kategorija nije dostupan."
+
+#, fuzzy
+#~ msgid ""
+#~ "The following entries are invalid:\n"
+#~ "\n"
+#~ msgstr "Sljedeće veze su trenutno aktivne:"
+
+#~ msgid "Could not find widget for a field: `%s'"
+#~ msgstr "Nisam mogao pronać element za polje: `%s'"
+
+#~ msgid "Do you want to save changes?"
+#~ msgstr "Želite li spremiti promjene?"
+
+#~ msgid "Error saving %s: %s"
+#~ msgstr "Greška kod spremanja %s: %s"
+
+#~ msgid ""
+#~ "The addressbook backend for\n"
+#~ "%s\n"
+#~ "has crashed. You will have to restart Evolution in order to use it again"
+#~ msgstr ""
+#~ "Osnovni proces adresara za\n"
+#~ "%s\n"
+#~ "je pao. Morat ćete ponovo pokreneti Evolution kako bi nastavilida je "
+#~ "koristite"
+
+#~ msgid "Can not load URI"
+#~ msgstr "Ne mogu učitati URI"
+
+#~ msgid "Calendar Properties"
+#~ msgstr "Svojstva kalendara"
+
+#~ msgid "Remote"
+#~ msgstr "Udaljeno"
+
+#~ msgid "Task List Properties"
+#~ msgstr "Osobine popisa zadataka"
+
+#~ msgid "_Refresh Interval:"
+#~ msgstr "Interval osvježavanja:"
+
+#~ msgid "_Source URL:"
+#~ msgstr "Izvorni URL:"
+
+#~ msgid ""
+#~ "The event being deleted is a meeting, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "Obrisani događaj je sastanak, želite li da pošaljete poruku za njegovo "
+#~ "otkazivanje?"
+
+#~ msgid "Are you sure you want to cancel and delete this meeting?"
+#~ msgstr "Sigurno želite poništiti i obrisati ovaj sastanak?"
+
+#~ msgid ""
+#~ "The task being deleted is assigned, would you like to send a cancellation "
+#~ "notice?"
+#~ msgstr ""
+#~ "Obrisani zadataka je pridjeljen, želite li poslati poruku za  otkazivanje?"
+
+#~ msgid "Are you sure you want to cancel and delete this task?"
+#~ msgstr "Sigurno želite poništiti i obrisati ovo zaduženje?"
+
+#~ msgid ""
+#~ "The journal entry being deleted is published, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "Obrisani unos iz dnevnika je objavljen, želite li da pošaljete poruku za "
+#~ "njegovo otkazivanje?"
+
+#~ msgid "Are you sure you want to cancel and delete this journal entry?"
+#~ msgstr "Sigurno želite poništiti i obrisati ovaj unos u dnevnik?"
+
+#~ msgid "Are you sure you want to delete the appointment `%s'?"
+#~ msgstr "Sigurno želite izbrisati ovaj zakazani sastanak `%s'?"
+
+#~ msgid "Are you sure you want to delete this untitled appointment?"
+#~ msgstr "Sigurni ste da želite obrisati ovaj nenaslovljeni sastanak?"
+
+#~ msgid "Are you sure you want to delete the task `%s'?"
+#~ msgstr "Sigurni ste da želite obrisati zadatak `%s'?"
+
+#~ msgid "Are you sure you want to delete this untitled task?"
+#~ msgstr "Sigurni ste da želite obrisati ovaj nenaslovljeni zadatak?"
+
+#~ msgid "Are you sure you want to delete the journal entry `%s'?"
+#~ msgstr "Sigurno želite izbrisati ovaj unos u dnevnik `%s'?"
+
+#~ msgid "Are you sure want to delete this untitled journal entry?"
+#~ msgstr "Sigurno želite izbrisati ovaj neimenovani unos u dnevnik?"
+
+#~ msgid "_Invite Others..."
+#~ msgstr "_Pozovi druge..."
+
+#~ msgid ""
+#~ "This event has been changed, but has not been saved.\n"
+#~ "\n"
+#~ "Do you wish to save your changes?"
+#~ msgstr ""
+#~ "Ovaj je događaj mijenjan, ali nije spremljen.\n"
+#~ "\n"
+#~ "Želite li spremiti izmjene?"
+
+#~ msgid "_Discard Changes"
+#~ msgstr "_Zanemari promjene"
+
+#~ msgid "Save Event"
+#~ msgstr "Spremi događaj"
+
+#~ msgid "The meeting information has been created. Send it?"
+#~ msgstr "Informacija o sastanku je napravljena. Da je pošaljem?"
+
+#~ msgid "The meeting information has changed. Send an updated version?"
+#~ msgstr "Informacija o sastanku je izmjenjena. Da pošaljem noviju verziju?"
+
+#~ msgid "The task assignment information has been created. Send it?"
+#~ msgstr "Informacija o primljenom zadatku je sačinjena. Poslati ju?"
+
+#~ msgid "The task information has changed. Send an updated version?"
+#~ msgstr ""
+#~ "Informacija o zadatku je promijenjena. Želite li poslati ažuriranu "
+#~ "inačicu?"
+
+#~ msgid "Learning junk and/or non junk message(s)"
+#~ msgstr "Učim koje su poruke neželjena pošta."
+
+#~ msgid "Could not get article %s from NNTP server"
+#~ msgstr "Ne mogu dohvatiti članak %s s NNTP poslužitelja"
+
+#~ msgid "Posting not allowed by news server"
+#~ msgstr "News poslužitelj ne dozvoljava slanje"
+
+#~ msgid "Failed to send newsgroups header: %s: message not posted"
+#~ msgstr ""
+#~ "Nisam uspio poslati zaglavlje interesne grupe: %s: poruka nije poslana"
+
+#~ msgid "Error posting to newsgroup: %s: message not posted"
+#~ msgstr ""
+#~ "Greška pri slanju poruke na interesnu grupu: %s: poruka nije poslana"
+
+#~ msgid "Error reading response to posted message: message not posted"
+#~ msgstr "Greška pri čitanju odgovora na poslanu poruku: poruka nije poslana"
+
+#~ msgid "Error posting message: %s: message not posted"
+#~ msgstr "Greška prilikom slanja poruke: %s: poruka nije poslana"
+
+#~ msgid "Stream error"
+#~ msgstr "Greška u nizu podataka"
+
+#~ msgid "Connection error: %s"
+#~ msgstr "Greška u spajanju: %s"
+
+#~ msgid "Could not get group: %s"
+#~ msgstr "Ne mogu dobiti grupu: %s"
+
+#, fuzzy
+#~ msgid "Could not get messages: unspecified error"
+#~ msgstr "Ne mogu dohvatiti poruke: nenavedena greška"
+
+#~ msgid "Unknown server response: %s"
+#~ msgstr "Nepoznat odgovor poslužitelja: %s"
+
+#~ msgid "Adjust Score"
+#~ msgstr "Preračunaj"
+
+#~ msgid "Assign Color"
+#~ msgstr "Dodijeli boju"
+
+#~ msgid "Assign Score"
+#~ msgstr "Dodijeli bodovanje"
+
+#~ msgid "Attachments"
+#~ msgstr "Privici"
+
+#~ msgid "Beep"
+#~ msgstr "Zvučni signal"
+
+#~ msgid "contains"
+#~ msgstr "sadrži"
+
+#~ msgid "Copy to Folder"
+#~ msgstr "Kopiraj u mapu"
+
+#~ msgid "Date received"
+#~ msgstr "Datum primanja"
+
+#~ msgid "Date sent"
+#~ msgstr "Datum slanja"
+
+#~ msgid "Deleted"
+#~ msgstr "Obrisano"
+
+#~ msgid "does not contain"
+#~ msgstr "ne sadrži"
+
+#~ msgid "does not end with"
+#~ msgstr "ne završava sa"
+
+#~ msgid "does not exist"
+#~ msgstr "ne postoji"
+
+#~ msgid "does not return"
+#~ msgstr "ne vraća"
+
+#~ msgid "does not sound like"
+#~ msgstr "ne zvuči kao"
+
+#~ msgid "does not start with"
+#~ msgstr "ne počinje sa"
+
+#~ msgid "Do Not Exist"
+#~ msgstr "Ne postoji"
+
+#~ msgid "Draft"
+#~ msgstr "Nacrt"
+
+#~ msgid "ends with"
+#~ msgstr "završava sa"
+
+#~ msgid "Exist"
+#~ msgstr "Postoji"
+
+#~ msgid "exists"
+#~ msgstr "postoji"
+
+#~ msgid "Expression"
+#~ msgstr "Izraz"
+
+#~ msgid "Follow Up"
+#~ msgstr "Sljedi"
+
+#~ msgid "is"
+#~ msgstr "je"
+
+#~ msgid "is after"
+#~ msgstr "Prenosim podatke sa %1$S\r"
+
+#~ msgid "is before"
+#~ msgstr "Šaljem zahtjev na %1$S\r"
+
+#~ msgid "is Flagged"
+#~ msgstr "je označen"
+
+#~ msgid "is greater than"
+#~ msgstr "je veće od"
+
+#~ msgid "is less than"
+#~ msgstr "je manje od"
+
+#~ msgid "is not"
+#~ msgstr "nije"
+
+#~ msgid "is not Flagged"
+#~ msgstr "nije označen"
+
+#~ msgid "Junk Test"
+#~ msgstr "Testiranje pošte smeća"
+
+#~ msgid "Mailing list"
+#~ msgstr "Dopisna lista"
+
+#~ msgid "Message Body"
+#~ msgstr "Tijelo poruke"
+
+#~ msgid "Message Header"
+#~ msgstr "Zaglavlje poruke"
+
+#~ msgid "Message is Junk"
+#~ msgstr "Poruka je smeće"
+
+#~ msgid "Message is not Junk"
+#~ msgstr "Poruka nije smeće"
+
+#~ msgid "Move to Folder"
+#~ msgstr "Premjesti u mapu"
+
+#~ msgid "Play Sound"
+#~ msgstr "Pusti zvuk"
+
+#~ msgid "Recipients"
+#~ msgstr "Primatelji"
+
+#~ msgid "Regex Match"
+#~ msgstr "Reg. izraz pretraga"
+
+#~ msgid "Replied to"
+#~ msgstr "Odgovoreno na"
+
+#~ msgid "returns"
+#~ msgstr "vraća"
+
+#~ msgid "returns greater than"
+#~ msgstr "vraća više od"
+
+#~ msgid "returns less than"
+#~ msgstr "vraća manje od"
+
+#~ msgid "Sender"
+#~ msgstr "Pošiljatelj"
+
+#~ msgid "Set Status"
+#~ msgstr "Postavi status"
+
+#~ msgid "Size (kB)"
+#~ msgstr "Veličina (kB)"
+
+#~ msgid "sounds like"
+#~ msgstr "zvuči kao\r"
+
+#~ msgid "Source Account"
+#~ msgstr "Izvorni izvještaj"
+
+#~ msgid "Specific header"
+#~ msgstr "Određeno zaglavlje"
+
+#~ msgid "starts with"
+#~ msgstr "počinje sa"
+
+#~ msgid "Stop Processing"
+#~ msgstr "Prekini sa obradom"
+
+#~ msgid "Unset Status"
+#~ msgstr "Nedodeljen status"
+
+#~ msgid "Check _Incoming Mail"
+#~ msgstr "Provjera _dolazne pošte"
+
+#~ msgid "Use _Daemon"
+#~ msgstr "Koristi _daemon"
+
+#~ msgid "_Local Tests Only"
+#~ msgstr "_Samo lokalni testovi"
+
+#~ msgid "Working"
+#~ msgstr "Radim"
+
+#~ msgid "Brought to you by"
+#~ msgstr "Za vas su napravili"
+
+#~ msgid "_Filename:"
+#~ msgstr "_Ime datoteke:"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "Unknown error."
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Nepoznata greška."
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the component system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Greška koju je poslao sustav komponente:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the activation system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Greška koju je poslao sustav za pokretanje:\n"
+#~ "%s"
+
+#~ msgid "Do you want to trust \"%s\" for the following purposes?"
+#~ msgstr "Želite li vjerovati \"%s\" u sljedećim prigodama?"
+
+#~ msgid "View Certificate"
+#~ msgstr "View Certificate"
+
+#~ msgid "You have been asked to trust a new Certificate Authority (CA)."
+#~ msgstr "You have been asked to trust a new Certificate Authority (CA)."
+
+#~ msgid "About Ximian Evolution..."
+#~ msgstr "O Ximian Evolutionu..."
+
+#~ msgid "_About Ximian Evolution..."
+#~ msgstr "_O Ximian Evolution..."
+
 #~ msgid "Evolution Addressbook folder viewer"
 #~ msgstr "Preglednik direktorija Evolution adresara"
 
@@ -19698,9 +19714,6 @@ msgstr "%s (%d%% dovršeno)"
 #~ msgid "Primary _email:"
 #~ msgstr "Osnovna adresa _elektronske pošte:"
 
-#~ msgid "S_pouse:"
-#~ msgstr "Su_pružnik:"
-
 #~ msgid "_Business:"
 #~ msgstr "_Posao:"
 
@@ -19716,9 +19729,6 @@ msgstr "%s (%d%% dovršeno)"
 #~ msgid "_Mobile:"
 #~ msgstr "_Mobilni:"
 
-#~ msgid "_Office:"
-#~ msgstr "_Ured: "
-
 #~ msgid "_Public Calendar URL:"
 #~ msgstr "URL za _javni kalendar:"
 
diff --git a/po/hu.po b/po/hu.po
index f577fcb1a3..dd484bad62 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.4.1\n"
-"POT-Creation-Date: 2004-05-19 14:00-0400\n"
+"POT-Creation-Date: 2004-06-03 11:14-0400\n"
 "PO-Revision-Date: 2003-09-13 00:45+0200\n"
 "Last-Translator: Andras Timar <timar@gnome.hu>\n"
 "Language-Team: Hungarian <hu@gnome.hu>\n"
@@ -61,14 +61,14 @@ msgstr "1 kártya"
 msgid "Default Sync Address:"
 msgstr "Alapértelmezett szinkronizálási cím:"
 
-#: addressbook/conduit/address-conduit.c:1150
 #: addressbook/conduit/address-conduit.c:1151
+#: addressbook/conduit/address-conduit.c:1152
 #, fuzzy
 msgid "Could not load addressbook"
 msgstr "%s betöltése sikertelen: %s"
 
-#: addressbook/conduit/address-conduit.c:1219
-#: addressbook/conduit/address-conduit.c:1222
+#: addressbook/conduit/address-conduit.c:1220
+#: addressbook/conduit/address-conduit.c:1223
 msgid "Could not read pilot's Address application block"
 msgstr "Nem sikerült a pilot Address application blokkját olvasni"
 
@@ -76,13 +76,13 @@ msgstr "Nem sikerült a pilot Address application blokkját olvasni"
 msgid "Accessing LDAP Server anonymously"
 msgstr "Csatlakozás az LDAP-kiszolgálóhoz névtelenül"
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
 msgid "Failed to authenticate.\n"
 msgstr "Sikertelen hitelesítés.\n"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sÍrd be %s jelszavát (%s felhasználó)"
@@ -126,52 +126,24 @@ msgstr "_Névjegyek:"
 msgid "Create a new contacts group"
 msgstr "Új indítócsoport létrehozása"
 
-#: addressbook/gui/component/addressbook-component.c:182
+#: addressbook/gui/component/addressbook-component.c:184
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:483
-msgid "Failed to connect to LDAP server"
-msgstr "Nem sikerült kapcsolatba lépni az LDAP-kiszolgálóval."
-
-#: addressbook/gui/component/addressbook-config.c:507
-msgid "Failed to authenticate with LDAP server"
-msgstr "Nem sikerült bejelentkezni az LDAP-kiszolgálóra."
-
-#: addressbook/gui/component/addressbook-config.c:535
-msgid "Could not perform query on Root DSE"
-msgstr "A lekérdezést nem lehet elvégezni a DSE gyökérkönyvtárban."
-
-#: addressbook/gui/component/addressbook-config.c:840
-msgid "The server responded with no supported search bases"
-msgstr "A kiszolgáló nem támogatott keresési alapokkal válaszolt"
-
-#: addressbook/gui/component/addressbook-config.c:1245
-msgid "This server does not support LDAPv3 schema information"
-msgstr "Ez a kiszolgáló nem támogatja az LDAPv3 mintájú információkat"
-
-#: addressbook/gui/component/addressbook-config.c:1266
-msgid "Error retrieving schema information"
-msgstr "Hiba a sémainformációk betöltése közben"
-
-#: addressbook/gui/component/addressbook-config.c:1274
-msgid "Server did not respond with valid schema information"
-msgstr "A kiszolgáló nem válaszolt érvényes sémainformációval."
-
 #: addressbook/gui/component/addressbook-migrate.c:68
-#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1160
 #, fuzzy
 msgid "Migrating..."
 msgstr "Várakozás..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1201
 #, fuzzy, c-format
 msgid "Migrating `%s':"
 msgstr "%s pingelése"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:438
+#: addressbook/gui/component/addressbook-migrate.c:464
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
 #: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
@@ -179,31 +151,31 @@ msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:446
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
-#: mail/mail-config.glade.h:106
+#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
+#: mail/mail-config.glade.h:109
 msgid "Personal"
 msgstr "Személyes"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:454
+#: addressbook/gui/component/addressbook-migrate.c:480
 #, fuzzy
 msgid "On LDAP Servers"
 msgstr "LDAP-kiszolgáló"
 
-#: addressbook/gui/component/addressbook-migrate.c:582
+#: addressbook/gui/component/addressbook-migrate.c:608
 #, fuzzy
 msgid "LDAP Servers"
 msgstr "LDAP-kiszolgáló"
 
-#: addressbook/gui/component/addressbook-migrate.c:702
+#: addressbook/gui/component/addressbook-migrate.c:728
 #, fuzzy
 msgid "Autocompletion Settings"
 msgstr "Névkiegészítési mappák"
 
-#: addressbook/gui/component/addressbook-migrate.c:1076
+#: addressbook/gui/component/addressbook-migrate.c:1104
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -211,60 +183,55 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1090
+#: addressbook/gui/component/addressbook-migrate.c:1118
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1099
+#: addressbook/gui/component/addressbook-migrate.c:1127
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1109
+#: addressbook/gui/component/addressbook-migrate.c:1137
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:674
+#: addressbook/gui/component/addressbook-view.c:675
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:761
+#: addressbook/gui/component/addressbook-view.c:754
 #, fuzzy
 msgid "New Address Book"
 msgstr "Címjegyzék"
 
-#: addressbook/gui/component/addressbook-view.c:762
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
+#: addressbook/gui/component/addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Törlés"
 
-#: addressbook/gui/component/addressbook-view.c:763
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-view.c:756
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Tulajdonságok..."
 
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/addressbook-view.c:1002
+#. Create the contacts group
+#: addressbook/gui/component/addressbook-view.c:995
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
 #: calendar/gui/migration.c:373
 msgid "Contacts"
 msgstr "Névjegyek"
@@ -345,10 +312,6 @@ msgid "Manage your S/MIME certificates here"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-msgid "  S_how Supported Bases "
-msgstr "  _Támogatott típusok lekérdezése"
-
-#: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -363,207 +326,172 @@ msgstr "  _Támogatott típusok lekérdezése"
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1:00"
-msgstr "1:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
-msgstr "5:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "Hitelesítés"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
 #, fuzzy
 msgid "<b>Display</b>"
 msgstr "_Megjelenítés"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 #, fuzzy
 msgid "<b>Downloading</b>"
 msgstr "<b>Levél küldése</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:10
 #, fuzzy
 msgid "<b>Searching</b>"
 msgstr "Keresés"
 
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
 msgid "<b>Server Information</b>"
 msgstr "1. lépés: Kiszolgáló adatai"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
 msgid "<b>Type:</b>"
 msgstr "<b>Határidő:</b> "
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:13
 #, fuzzy
 msgid "Add Contacts Group"
 msgstr "_Névjegyek:"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:14
 #, fuzzy
 msgid "Address Book Properties"
 msgstr "Címjegyzék forrásai"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
-#: mail/mail-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
+#: mail/mail-config.glade.h:42
 msgid "Always"
 msgstr "Mindig"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr "Névtelenül"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:17
 #: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Alap"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
-msgid "Connecting"
-msgstr "Kapcsolódás"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 #: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Részletek"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
-msgid "Distinguished _name:"
-msgstr "Megkülönböztető _név:"
-
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:19
 #, fuzzy
 msgid "Distinguished name"
 msgstr "Megkülönböztető _név:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:20
 #, fuzzy
 msgid "Download limit:"
 msgstr "_Letöltési korlát:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Email address"
 msgstr "E-mail cím:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "Email address:"
-msgstr "E-mail cím:"
-
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "Evolution will use this DN to authenticate you with the server"
-msgstr ""
-"Az Evolution ezt a megkülönböztető nevet használja majd hitelesítéshez a "
-"kiszolgálón"
-
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:22
+#, fuzzy
 msgid ""
-"Evolution will use this email address to authenticate you with the server"
+"Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "Az Evolution ezt az e-mail címet használja majd hitelesítéshez a kiszolgálón"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:23
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Támogatott keresési típusok"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:24
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
+#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Általános"
 
-#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
-#: mail/mail-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
+#: mail/mail-config.glade.h:102
 msgid "Never"
 msgstr "Soha"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
-msgid "One"
-msgstr "Egy"
-
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:35
-msgid "S_earch scope: "
-msgstr "Keresés _hatóköre: "
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Search _base:"
+msgstr "Keresés _kiindulópontja:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
 msgid "Search base only"
 msgstr "Keresés _kiindulópontja:"
 
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:29
 #, fuzzy
 msgid "Search base:"
 msgstr "Keresés _kiindulópontja:"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Search scope:"
 msgstr "Keresés _hatóköre: "
 
-#: addressbook/gui/component/ldap-config.glade.h:39
-msgid "Searching"
-msgstr "Keresés"
-
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:31
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
-"server if\n"
-"your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL or TLS."
 msgstr ""
 "Ha engedélyezed ezt a beállítást, akkor az Evolution csak akkor "
 "csatlakozik \n"
 "az LDAP-kiszolgálóhoz, ha az támogatja az SSL vagy TLS protokollt."
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a \n"
-"insecure environment. For example, if you and your LDAP server are behind a "
-"firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection "
-"is already\n"
-"secure."
+"you are in a insecure environment. For example, if you and your LDAP server "
+"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
+"because your connection is already secure."
 msgstr ""
 "Ha engedélyezed ezt a beállítást, az Evolution csak SSL/TLS protokollt "
 "próbál használni, ha \n"
@@ -573,13 +501,12 @@ msgstr ""
 "kapcsolat\n"
 "már eleve biztonságos."
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:33
+#, fuzzy
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
-"TLS.  This \n"
-"means that your connection will be insecure, and that you will be vulnerable "
-"to security\n"
-"exploits. "
+"TLS.  This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits. "
 msgstr ""
 "Ez a beállítás azt jelenti, hogy a kiszolgáló nem támogatja sem az SSL, sem "
 "a TSL \n"
@@ -587,37 +514,32 @@ msgstr ""
 "sebezhetővé \n"
 "válik a külső támadásokkal szemben."
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Sub"
-msgstr "Al"
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr "Támogatott keresési típusok"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
-"searches will \n"
-"begin. If you leave this blank, the search will begin at the root of the "
-"directory tree."
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
 msgstr ""
 "A keresési alap a Megkülönbözető névnek az bejegyzése, ahol a keresés "
 "kezdődik majd. Amennyiben\n"
 "üresen hagyod, a keresés a gyökérkönyvtárban fog kezdődni."
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:37
+#, fuzzy
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
-"the \n"
-"directory tree. A search scope of \"sub\" will include all entries below "
-"your search base.\n"
-"A search scope of \"one\" will only include the entries one level beneath "
-"your base.\n"
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
 msgstr ""
 "A keresési terület meghatározza, milyen mélységben szeretnél keresni lefelé "
 "a\n"
@@ -626,24 +548,23 @@ msgstr ""
 "alaptól lefelé. Egy \"one\" keresési területe csak egy szinttel fog a "
 "keresési alap alá menni.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:58
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "Ez az LDAP-kiszolgáló teljes neve. Például \"ldap.encegem.hu\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:39
 #, fuzzy
 msgid ""
-"This is the maximum number of entries to download. Setting this number to "
-"be \n"
+"This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr ""
 "Itt határozhatod meg az egyszerre letölthető bejegyzések maximális számát. "
 "Ha túl\n"
 "magasra állítod ezt az értéket, jelentős mértékben lelassul a címjegyzéked."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -654,141 +575,120 @@ msgstr ""
 "beállítás, igényli az azonosító nélküli bejelentkezési lehetőséget az LDAP-"
 "kiszolgálón."
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:41
+#, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
-"list.\n"
-"It is for display purposes only. "
+"list. It is for display purposes only. "
 msgstr ""
 "Ez a név jelenik majd meg az Evolution mappalistájában.\n"
 "Csak a megjelenítésben van szerepe."
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:42
+#, fuzzy
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. "
-"A \n"
-"list of standard ports has been provided. Ask your system administrator\n"
-"what port you should specify."
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
 msgstr ""
 "Itt kell megadnod azt a portot, amelyen az Evolution kapcsolódik majd az \n"
 "LDAP-kiszolgálóhoz. Az általános portok megtalálhatók a listában. Kérdezd \n"
 "meg a rendszergazdát, hogy melyik portot kell beállítanod."
 
-#: addressbook/gui/component/ldap-config.glade.h:67
-msgid "This option controls how long a search will be run."
-msgstr "Itt határozhatod meg, hogy mennyi ideig tartson egy keresés."
-
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:43
 #, fuzzy
 msgid "Timeout:"
 msgstr "Időformátum:"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
-msgid "U_se SSL/TLS:"
-msgstr "_SSL/TLS használata:"
-
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr "Megkülönböztető névvel (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr "E-mail cím használatával"
 
-#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
-#: mail/mail-config.glade.h:154
+#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
+#: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr "Amikor csak lehetséges"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:47
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "_Névjegyek:"
 
-#: addressbook/gui/component/ldap-config.glade.h:74
-#: calendar/gui/dialogs/calendar-setup.glade.h:12
-msgid "_Display name:"
-msgstr "_Megjelenítendő név:"
-
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr "_Letöltési korlát:"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
 msgid "_Email address:"
 msgstr "E-mail cím:"
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:50
+#, fuzzy
+msgid "_Find Possible Search Bases"
+msgstr "Támogatott keresési típusok"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Log in method:"
 msgstr "_Bejelentkezési mód:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "_Log in:"
+msgstr "Bejelentkezés"
+
+#: addressbook/gui/component/ldap-config.glade.h:53
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
 msgid "_Name:"
 msgstr "_Név:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
-msgid "_Port number:"
-msgstr "_Portszám:"
-
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "_Port:"
 msgstr "_Prioritás:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
-msgid "_Search base:"
-msgstr "Keresés _kiindulópontja:"
-
-#: addressbook/gui/component/ldap-config.glade.h:82
-msgid "_Server name:"
-msgstr "_Kiszolgáló neve:"
+#: addressbook/gui/component/ldap-config.glade.h:55
+#, fuzzy
+msgid "_Search scope:"
+msgstr "Keresés _hatóköre: "
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:56
 #, fuzzy
 msgid "_Server:"
 msgstr "_Kiszolgáló:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
-msgid "_Timeout (minutes):"
-msgstr "_Szundi idő (percek)"
+#: addressbook/gui/component/ldap-config.glade.h:57
+#, fuzzy
+msgid "_Timeout:"
+msgstr "Időformátum:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:58
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "_Biztonságos kapcsolat használata (SSL):"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "kártya"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
-msgid "connecting-tab"
-msgstr "connecting-tab"
-
-#: addressbook/gui/component/ldap-config.glade.h:88
-msgid "general-tab"
-msgstr "general-tab"
-
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:60
 #: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
-#: mail/mail-config.glade.h:182
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "percenként"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
-msgid "searching-tab"
-msgstr "searching-tab"
-
-#: addressbook/gui/component/select-names/e-select-names.c:497
+#: addressbook/gui/component/select-names/e-select-names.c:503
 #: addressbook/gui/component/select-names/select-names.glade.h:6
 #, fuzzy
 msgid "Select Contacts from Address Book"
 msgstr "Névjegyek kijelölése a címjegyzékből"
 
-#: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
@@ -828,7 +728,7 @@ msgstr "Névtelen névjegy"
 
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:222
+#: addressbook/gui/widgets/e-addressbook-view.c:224
 msgid "Source"
 msgstr "Forrás"
 
@@ -906,9 +806,9 @@ msgid "<b>Work</b>"
 msgstr "<b>Határidő:</b> "
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
-#: addressbook/gui/widgets/eab-contact-display.c:342
-#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/widgets/eab-contact-display.c:334
+#: addressbook/gui/widgets/eab-contact-display.c:353
 msgid "AIM"
 msgstr ""
 
@@ -949,15 +849,15 @@ msgid "Company:"
 msgstr "Vállalat"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:271
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
+#: addressbook/gui/contact-editor/e-contact-editor.c:266
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
 msgstr "Névjegy"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1527
+#: addressbook/gui/contact-editor/e-contact-editor.c:520
 msgid "Contact Editor"
 msgstr "Névjegyszerkesztő"
 
@@ -981,83 +881,80 @@ msgid "Full _Name..."
 msgstr "_Teljes név..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:202
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-msgid "Home"
-msgstr "Otthoni"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #, fuzzy
 msgid "Home Page:"
 msgstr "Otthoni fax"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-#, fuzzy
-msgid "Job title:"
-msgstr "_Beosztás"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/e-itip-control.c:936
-msgid "Location:"
-msgstr "Hely:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 #, fuzzy
 msgid "MSN Messenger"
 msgstr "_Levél"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 #, fuzzy
 msgid "Mailing Address"
 msgstr "E-mail cím összefésülése"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 #, fuzzy
 msgid "Manager:"
 msgstr "Főnök"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "Be_cenév:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Notes:"
 msgstr "Felje_gyzések:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
-#: addressbook/gui/contact-editor/e-contact-editor.c:203
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-msgid "Other"
-msgstr "Egyéb"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#, fuzzy
+msgid "Office:"
+msgstr "_Hivatal:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "PO Box:"
 msgstr "_Postafiók:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 #, fuzzy
 msgid "Personal Information"
 msgstr "Egyéb információ"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 #, fuzzy
 msgid "Profession:"
 msgstr "_Foglalkozás:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#, fuzzy
+msgid "Spouse:"
+msgstr "Háza_stárs:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "State/Province:"
 msgstr "Á_llam/Helytartóság:"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#, fuzzy
+msgid "Title:"
+msgstr "_Megszólítás:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+msgid "Video Chat:"
+msgstr ""
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:41
 #, fuzzy
 msgid "Wants to receive HTML mail"
@@ -1065,15 +962,15 @@ msgstr "Tud fogadni _HTML levelet"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:42
 #, fuzzy
-msgid "Webcam:"
-msgstr "Oldal"
+msgid "Web Log:"
+msgstr "_Weblap címe:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
-#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
-#: mail/mail-config.glade.h:155
+#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
+#: mail/mail-config.glade.h:157
 msgid "Work"
 msgstr "Munka"
 
@@ -1093,19 +990,12 @@ msgid "_File under:"
 msgstr "Fájlnév:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 #, fuzzy
 msgid "_Where:"
 msgstr "_Kiszolgáló:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
-msgid "item7"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
-msgid "item8"
-msgstr ""
-
-#: addressbook/gui/contact-editor/eab-editor.c:316
+#: addressbook/gui/contact-editor/eab-editor.c:315
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -1113,7 +1003,7 @@ msgstr ""
 "Biztos vagy benne, hogy eltávolítod\n"
 "ezeket a névjegyeket?"
 
-#: addressbook/gui/contact-editor/eab-editor.c:319
+#: addressbook/gui/contact-editor/eab-editor.c:318
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -1122,16 +1012,16 @@ msgstr ""
 "eltávolítod ezt a névjegyet?"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:351
-#: addressbook/gui/widgets/eab-contact-display.c:372
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Address"
 msgstr "Cím"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:292
+#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard.c:174
@@ -2116,90 +2006,113 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/contact-editor/e-contact-editor.c:179
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:337
+#: addressbook/gui/widgets/eab-contact-display.c:356
 msgid "Jabber"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:347
-#: addressbook/gui/widgets/eab-contact-display.c:366
+#: addressbook/gui/contact-editor/e-contact-editor.c:180
+#: addressbook/gui/widgets/eab-contact-display.c:339
+#: addressbook/gui/widgets/eab-contact-display.c:358
 #, fuzzy
 msgid "Yahoo"
 msgstr "Yoro"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: addressbook/gui/widgets/eab-contact-display.c:338
+#: addressbook/gui/widgets/eab-contact-display.c:357
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:344
-#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#: addressbook/gui/widgets/eab-contact-display.c:355
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/contact-editor/e-contact-editor.c:183
 #, fuzzy
 msgid "GroupWise"
 msgstr "Csoport"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+msgid "Home"
+msgstr "Otthoni"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+msgid "Other"
+msgstr "Egyéb"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
 #, fuzzy
 msgid "Source Book"
 msgstr "Forrás"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:264
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:278
+#: addressbook/gui/contact-editor/e-contact-editor.c:273
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Új névjegy"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:285
+#: addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Writable Fields"
 msgstr "Írható mező"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:299
+#: addressbook/gui/contact-editor/e-contact-editor.c:294
 msgid "Changed"
 msgstr "Megváltoztatva"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
-msgid "Category editor not available."
-msgstr "A kategóriaszerkesztő nem elérhető."
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:2352
 msgid "This contact belongs to these categories:"
 msgstr "Ez a névjegy az alábbi kategóriákhoz tartozik:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#: addressbook/gui/contact-editor/e-contact-editor.c:2429
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Válassz az alábbi lehetőségek közül"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#: addressbook/gui/contact-editor/e-contact-editor.c:2433
 #, fuzzy
 msgid "No image"
 msgstr "Nome"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#: addressbook/gui/contact-editor/e-contact-editor.c:2636
 #, fuzzy
 msgid ""
-"The following entries are invalid:\n"
+"The contact data is invalid:\n"
 "\n"
-msgstr "Pillanatnyilag a következő kapcsolatok aktívak:"
+msgstr "Érvénytelen ismétlődési dátum"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2738
-#, c-format
-msgid "Could not find widget for a field: `%s'"
-msgstr "Nem található widget a mezőhöz: `%s'"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#, fuzzy
+msgid "Invalid contact."
+msgstr "Névjegyek"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+msgid ""
+"The contact cannot be saved to the selected address book. Do you want to "
+"discard changes?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2727
+#: addressbook/gui/contact-editor/e-contact-editor.c:2751
+msgid "_Discard"
+msgstr "_Elvetés"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+msgid ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
+msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:62
 msgid "AOL Instant Messenger"
@@ -2235,7 +2148,7 @@ msgid "_Edit Full"
 msgstr "_Részletes szerkesztés"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:166
 msgid "_Full Name:"
 msgstr "_Teljes név:"
 
@@ -2384,30 +2297,30 @@ msgstr "_Listanév:"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "Í_rj be egy e-mail címet, vagy húzz egy névjegyet az alábbi listába:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "contact-list-editor"
 msgstr "contact-list-editor"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:153
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:215
+#: addressbook/gui/widgets/e-addressbook-view.c:217
 #: addressbook/gui/widgets/e-minicard-view.c:460
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Címjegyzék"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
 msgid "Is New List"
 msgstr "Új lista"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:215
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
 msgid "Contact List Editor"
 msgstr "Címlista-szerkesztő"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:438
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
 msgid "Save List as VCard"
 msgstr "Lista mentése VCard-ként"
 
@@ -2454,128 +2367,128 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Haladó keresés"
 
-#: addressbook/gui/widgets/eab-contact-display.c:129
-#: addressbook/gui/widgets/eab-contact-display.c:192
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:139
-#: addressbook/gui/widgets/eab-contact-display.c:205
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:257
-#: addressbook/gui/widgets/eab-contact-display.c:533
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:525
 #, fuzzy
 msgid "List Members"
 msgstr "Tagok"
 
-#: addressbook/gui/widgets/eab-contact-display.c:329
-#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/eab-contact-display.c:321
+#: addressbook/gui/widgets/eab-contact-display.c:323
 #, fuzzy
 msgid "E-mail"
 msgstr "E-mail"
 
-#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/eab-contact-display.c:332
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Szervezet"
 
-#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:333
 #, fuzzy
 msgid "Position"
 msgstr "Boston"
 
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:354
 #, fuzzy
 msgid "Groupwise"
 msgstr "Csoport"
 
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:340
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:349
-#: addressbook/gui/widgets/eab-contact-display.c:370
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:362
 #, fuzzy
 msgid "Phone"
 msgstr "Ponce"
 
-#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:342
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:354
+#: addressbook/gui/widgets/eab-contact-display.c:346
 #, fuzzy
 msgid "work"
 msgstr "Munka"
 
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:359
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:368
-#: addressbook/gui/widgets/eab-contact-display.c:587
+#: addressbook/gui/widgets/eab-contact-display.c:360
+#: addressbook/gui/widgets/eab-contact-display.c:579
 #, fuzzy
 msgid "Blog"
 msgstr "Bologna"
 
-#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/eab-contact-display.c:363
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: addressbook/gui/widgets/eab-contact-display.c:375
+#: addressbook/gui/widgets/eab-contact-display.c:367
 #, fuzzy
 msgid "personal"
 msgstr "Személyes"
 
-#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/eab-contact-display.c:374
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Megjegyzés"
 
-#: addressbook/gui/widgets/eab-contact-display.c:548
+#: addressbook/gui/widgets/eab-contact-display.c:540
 #, fuzzy
 msgid "Job Title"
 msgstr "_Beosztás"
 
-#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/eab-contact-display.c:544
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:774
+#: smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "E-mail"
 
-#: addressbook/gui/widgets/eab-contact-display.c:579
+#: addressbook/gui/widgets/eab-contact-display.c:571
 #, fuzzy
 msgid "Home page"
 msgstr "Otthoni fax"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 msgid "Success"
 msgstr "Sikerült"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Backend busy"
 msgstr ""
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Repository offline"
 msgstr "Kapcsolat nélküli tároló"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 #, fuzzy
 msgid "Address Book does not exist"
 msgstr "A címjegyzék nem létezik"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 #, fuzzy
 msgid "No Self Contact defined"
 msgstr "Új címlista"
@@ -2583,29 +2496,29 @@ msgstr "Új címlista"
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Permission denied"
 msgstr "Hozzáférés megtagadva"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:57
 #, fuzzy
 msgid "Contact not found"
 msgstr "A kártya nem található"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: addressbook/gui/widgets/eab-gui-util.c:58
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "A kártyaazonosító már létezik"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Protocol not supported"
 msgstr "A protokoll nem támogatott"
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:60
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:233
 #: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
@@ -2618,39 +2531,39 @@ msgid "Cancelled"
 msgstr "Megszakítva"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:61
 #, fuzzy
 msgid "Could not cancel"
 msgstr "Az átnevezés nem sikerült '%s': %s"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Authentication Failed"
 msgstr "Hitelesítés sikertelen"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Authentication Required"
 msgstr "Hitelesítés szükséges"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:66
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "TLS not Available"
 msgstr "TLS nem elérhető"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#: addressbook/gui/widgets/eab-gui-util.c:66
 #, fuzzy
 msgid "No such source"
 msgstr "Nincs ilyen levél"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:69
+#: addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Other error"
 msgstr "Egyéb hiba"
 
-#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:90
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
@@ -2659,7 +2572,7 @@ msgstr ""
 "Nem sikerült megnyitni a címjegyzéket. Ellenőrizd, hogy az útvonal\n"
 "létezik-e, és van-e jogod az eléréséhez."
 
-#: addressbook/gui/widgets/eab-gui-util.c:110
+#: addressbook/gui/widgets/eab-gui-util.c:97
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -2669,19 +2582,19 @@ msgstr ""
 "azt jelenti, hogy helytelen URI-t adtál meg, vagy \n"
 "az LDAP-kiszolgáló nem működik."
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:102
 #, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution you must compile the program from the CVS "
-"sources after retrieving OpenLDAP from the link below."
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
 msgstr ""
 "Ez az Evolution-változat nem támogatja az LDAP-t, mert nem\n"
 "fordították bele. Ha szeretnél LDAP-t használni az Evolutionben,\n"
 "a CVS forrásból kell lefordítanod a programot, miután letöltötted\n"
 "az OpenLDAP-t az alábbi helyről.\n"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:109
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -2691,11 +2604,7 @@ msgstr ""
 "azt jelenti, hogy helytelen URI-t adtál meg, vagy \n"
 "a kiszolgáló nem működik."
 
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "Unable to open addressbook"
-msgstr "Nem sikerült megnyitni a címjegyzéket"
-
-#: addressbook/gui/widgets/eab-gui-util.c:162
+#: addressbook/gui/widgets/eab-gui-util.c:129
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2708,7 +2617,7 @@ msgstr ""
 "a keresési feltételeket, vagy emeld meg az eredmények maximális \n"
 "számát a címtárkiszolgáló beállításainál ehhez a címjegyzékhez."
 
-#: addressbook/gui/widgets/eab-gui-util.c:168
+#: addressbook/gui/widgets/eab-gui-util.c:135
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -2720,57 +2629,49 @@ msgstr ""
 "feltételeket, vagy emeld meg az ehhez a címjegyzékhez tartozó\n"
 "időkorlátot a címtárkiszolgálón."
 
-#: addressbook/gui/widgets/eab-gui-util.c:174
+#: addressbook/gui/widgets/eab-gui-util.c:141
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 "A háttér ehhez a címjegyzékhez alkalmatlan volt a lekérdezés elemzéséhez."
 
-#: addressbook/gui/widgets/eab-gui-util.c:177
+#: addressbook/gui/widgets/eab-gui-util.c:144
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "A háttér ehhez a kereséshez elutasította a lekérdezés elvégzését."
 
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:147
 msgid "This query did not complete successfully."
 msgstr "Ez a keresés nem volt sikeres."
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
-msgid "Do you want to save changes?"
-msgstr "Mented a változtatásokat?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:208
-msgid "_Discard"
-msgstr "_Elvetés"
-
-#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:169
 msgid "Error adding list"
 msgstr "Hiba a lista hozzáadásakor"
 
-#: addressbook/gui/widgets/eab-gui-util.c:229
-#: addressbook/gui/widgets/eab-gui-util.c:652
+#: addressbook/gui/widgets/eab-gui-util.c:169
+#: addressbook/gui/widgets/eab-gui-util.c:580
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Hiba a kártya hozzáadásakor"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying list"
 msgstr "Hiba a lista módosításakor"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Hiba a kártya módosításakor"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:192
 msgid "Error removing list"
 msgstr "Hiba a lista törlésekor"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
-#: addressbook/gui/widgets/eab-gui-util.c:610
+#: addressbook/gui/widgets/eab-gui-util.c:192
+#: addressbook/gui/widgets/eab-gui-util.c:538
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Hiba a kártya törlésekor"
 
-#: addressbook/gui/widgets/eab-gui-util.c:334
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, fuzzy, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2780,7 +2681,7 @@ msgstr ""
 "kerül egy %d új ablak is.\n"
 "Valóban meg szeretnéd jeleníteni az összes ilyen címkártyát?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:360
+#: addressbook/gui/widgets/eab-gui-util.c:300
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2789,54 +2690,49 @@ msgstr ""
 "%s már létezik\n"
 "Szeretnéd felülírni?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:364
+#: addressbook/gui/widgets/eab-gui-util.c:304
 msgid "Overwrite"
 msgstr "Felülírás"
 
-#: addressbook/gui/widgets/eab-gui-util.c:400
-#, c-format
-msgid "Error saving %s: %s"
-msgstr "Fájlmentési hiba %s: %s"
-
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:437
+#: addressbook/gui/widgets/eab-gui-util.c:365
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:571
+#: addressbook/gui/widgets/eab-gui-util.c:499
 msgid "list"
 msgstr "lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:706
+#: addressbook/gui/widgets/eab-gui-util.c:634
 #, fuzzy
 msgid "Move contact to"
 msgstr "Névjegy áthelyezése"
 
-#: addressbook/gui/widgets/eab-gui-util.c:708
+#: addressbook/gui/widgets/eab-gui-util.c:636
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Névkártya másolása a következő helyre"
 
-#: addressbook/gui/widgets/eab-gui-util.c:711
+#: addressbook/gui/widgets/eab-gui-util.c:639
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Névjegyek áthelyezése"
 
-#: addressbook/gui/widgets/eab-gui-util.c:713
+#: addressbook/gui/widgets/eab-gui-util.c:641
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Névjegyek másolása"
 
-#: addressbook/gui/widgets/eab-gui-util.c:716
+#: addressbook/gui/widgets/eab-gui-util.c:644
 #, fuzzy
 msgid "Select target addressbook."
 msgstr "Névjegyek kijelölése a címjegyzékből"
 
-#: addressbook/gui/widgets/eab-gui-util.c:939
+#: addressbook/gui/widgets/eab-gui-util.c:867
 msgid "Multiple VCards"
 msgstr "Több VKártya"
 
-#: addressbook/gui/widgets/eab-gui-util.c:942
+#: addressbook/gui/widgets/eab-gui-util.c:870
 #, c-format
 msgid "VCard for %s"
 msgstr "%s VKártyája"
@@ -2927,7 +2823,7 @@ msgstr[1] "Névjegyek"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:229
+#: addressbook/gui/widgets/e-addressbook-view.c:231
 #: addressbook/gui/widgets/e-minicard-view.c:467
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
@@ -2945,147 +2841,135 @@ msgstr "Modell"
 msgid "Error modifying card"
 msgstr "Hiba a kártya módosításakor"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:163
 msgid "Name begins with"
 msgstr "Név ezzel kezdődik"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:164
 msgid "Email begins with"
 msgstr "E-mail ezzel kezdődik"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:57
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Kategória"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-#: calendar/gui/cal-search-bar.c:50
+#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Bármely mező tartalmazza"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+#: addressbook/gui/widgets/e-addressbook-view.c:172
 msgid "Advanced..."
 msgstr "Haladó..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:236
+#: addressbook/gui/widgets/e-addressbook-view.c:238
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:249
+#: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Típus"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:506
+#: addressbook/gui/widgets/e-addressbook-view.c:508
 #, fuzzy
 msgid "Address Book"
 msgstr "Címjegyzék"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2076
+#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:2080
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
 msgstr "Mentés VCard-ként"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 msgid "New Contact..."
 msgstr "Új névjegy..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "New Contact List..."
 msgstr "Új címlista..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Go to Folder..."
 msgstr "Mappára ugrás..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Import..."
 msgstr "Importálás..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1066
 msgid "Search for Contacts..."
 msgstr "Névjegyek keresése..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Címjegyzék forrásai..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1069
 msgid "Pilot Settings..."
 msgstr "Pilot beállításai..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Névjegy továbbítása"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
 msgid "Send Message to Contact"
 msgstr "Levél küldése ennek a személynek"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Nyomtatás"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
+#: addressbook/gui/widgets/e-addressbook-view.c:1077
 msgid "Print Envelope"
 msgstr "Boríték nyomtatása"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
+#: addressbook/gui/widgets/e-addressbook-view.c:1081
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Címjegyzék..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1080
+#: addressbook/gui/widgets/e-addressbook-view.c:1082
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Címjegyzék..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Kivágás"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Másolás"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1087
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Beillesztés"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:1092
+#: calendar/gui/e-calendar-view.c:1280
 msgid "Current View"
 msgstr "Aktuális nézet"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1309
-#, c-format
-msgid ""
-"The addressbook backend for\n"
-"%s\n"
-"has crashed. You will have to restart Evolution in order to use it again"
-msgstr ""
-"A %s-hez\n"
-"kapcsolódó címjegyzék háttér\n"
-"leállt. Újra kell indítanod az Evolution-t, hogy használni tudd ezt a "
-"felületet"
-
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1667
-#: calendar/gui/cal-search-bar.c:362
+#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Bármelyik kategória"
 
@@ -3194,7 +3078,7 @@ msgstr "Rádió"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-list-view.c:234
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Szerep"
@@ -3338,13 +3222,13 @@ msgstr "Evolution VCard-importáló"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: addressbook/printing/e-contact-print.c:998
+#: addressbook/printing/e-contact-print.c:1000
 #, fuzzy
 msgid "Print contacts"
 msgstr "Kijelölt névjegyek nyomtatása"
 
-#: addressbook/printing/e-contact-print.c:1064
-#: addressbook/printing/e-contact-print.c:1091
+#: addressbook/printing/e-contact-print.c:1066
+#: addressbook/printing/e-contact-print.c:1093
 #, fuzzy
 msgid "Print contact"
 msgstr "Kijelölt névjegyek nyomtatása"
@@ -3597,17 +3481,22 @@ msgstr ""
 msgid "Impossible internal error."
 msgstr "Belső hiba"
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:629
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
 #, fuzzy
 msgid "Can not open file"
 msgstr "Nem lehet megnyitni a levelet"
 
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
 #, fuzzy
-msgid "Can not load URI"
-msgstr "A kártya nem található"
+msgid "Couldn't get list of addressbooks"
+msgstr "%s betöltése sikertelen: %s"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Nem sikerült megnyitni a címjegyzéket"
 
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
@@ -3625,7 +3514,7 @@ msgstr "Nincs fájlnév megadva."
 msgid "Unnamed List"
 msgstr "Névtelen lista"
 
-#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 #, fuzzy
 msgid "Enter password"
@@ -3907,10 +3796,10 @@ msgid "Whether to show week numbers in date navigator"
 msgstr "Hét _számának megjelenítése a dátumnavigátorban"
 
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:88
-#: calendar/gui/gnome-cal.c:1703
-#: camel/providers/groupwise/camel-gw-listener.c:304
-#: camel/providers/groupwise/camel-gw-listener.c:327
+#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/gnome-cal.c:1705
+#: camel/providers/groupwise/camel-gw-listener.c:311
+#: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
 msgstr "Naptár"
 
@@ -3933,7 +3822,7 @@ msgstr "visszatér kisebb mint"
 
 #: calendar/gui/calendar-commands.c:363
 #: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:19 filter/filter.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
 msgid "days"
 msgstr "naponként"
 
@@ -4084,24 +3973,24 @@ msgstr "Hétnézet"
 msgid "Month View"
 msgstr "Hónapnézet"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Összefoglaló tartalmazza"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Leírás tartalmazza"
 
-#: calendar/gui/cal-search-bar.c:54
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Megjegyzés tartalmazza"
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:53
 #, fuzzy
 msgid "Location contains"
 msgstr "Leírás tartalmazza"
 
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
 msgid "Unmatched"
 msgstr "Ki nem válogatott"
 
@@ -4122,23 +4011,23 @@ msgstr "Hozzáférés megtagadva a naptár megnyitásához"
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:466
+#: calendar/gui/dialogs/alarm-options.c:467
 msgid "Audio Alarm Options"
 msgstr "Hangos riasztás beállításai"
 
-#: calendar/gui/dialogs/alarm-options.c:475
+#: calendar/gui/dialogs/alarm-options.c:476
 msgid "Message Alarm Options"
 msgstr "Riasztóüzenet beállításai"
 
-#: calendar/gui/dialogs/alarm-options.c:484
+#: calendar/gui/dialogs/alarm-options.c:485
 msgid "Email Alarm Options"
 msgstr "Riasztólevél beállításai"
 
-#: calendar/gui/dialogs/alarm-options.c:493
+#: calendar/gui/dialogs/alarm-options.c:494
 msgid "Program Alarm Options"
 msgstr "Riasztóprogram beállításai"
 
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:510
 msgid "Unknown Alarm Options"
 msgstr "Ismeretlen típusú riasztás beállításai"
 
@@ -4174,7 +4063,7 @@ msgstr "Címzett:"
 msgid "With these arguments:"
 msgstr "Ezekkel az argumentumokkal:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
 msgid "dialog1"
 msgstr "dialog1"
 
@@ -4183,7 +4072,7 @@ msgid "extra times every"
 msgstr "-szer minden"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:20 filter/filter.glade.h:16
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr "óránként"
 
@@ -4229,7 +4118,7 @@ msgstr "Levél küldése"
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Összefoglaló:"
 
@@ -4259,7 +4148,6 @@ msgid "hour(s)"
 msgstr "óra"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:21
 msgid "minute(s)"
 msgstr "perc"
 
@@ -4267,27 +4155,27 @@ msgstr "perc"
 msgid "start of appointment"
 msgstr "találkozó kezdete"
 
-#: calendar/gui/dialogs/calendar-setup.c:170
+#: calendar/gui/dialogs/calendar-setup.c:172
 #, fuzzy
 msgid "You must specify a location to get the calendar from."
 msgstr "Meg kell adnod egy fájlnevet."
 
-#: calendar/gui/dialogs/calendar-setup.c:178
+#: calendar/gui/dialogs/calendar-setup.c:180
 #, fuzzy, c-format
 msgid "The source location '%s' is not well-formed."
 msgstr "'%s' betöltéséhez szükséges eljárás nem támogatott"
 
-#: calendar/gui/dialogs/calendar-setup.c:193
+#: calendar/gui/dialogs/calendar-setup.c:195
 #, c-format
 msgid "The source location '%s' is not a webcal source."
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:265
+#: calendar/gui/dialogs/calendar-setup.c:275
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:278
+#: calendar/gui/dialogs/calendar-setup.c:288
 #, c-format
 msgid ""
 "The group '%s' is remote. You must specify a location to get the calendar "
@@ -4309,60 +4197,35 @@ msgstr "Feladatlista"
 msgid "C_olor:"
 msgstr "S_zínek"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-#, fuzzy
-msgid "Calendar Properties"
-msgstr "iCalendar hiba"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
 msgid "Pick a color"
 msgstr "Szín kiválasztása"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:8
-#, fuzzy
-msgid "Remote"
-msgstr "Eltávolítás"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-#, fuzzy
-msgid "Task List Properties"
-msgstr "Betűk beállításai"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
 #, fuzzy
 msgid "_Add Calendar"
 msgstr "Új-Kaledónia"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
 #, fuzzy
 msgid "_Add Group"
 msgstr "Csoport _hozzáadása..."
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-#, fuzzy
-msgid "_Refresh Interval:"
-msgstr "Lista frissítése"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
 #, fuzzy
 msgid "_Refresh:"
 msgstr "Frissítés"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-#, fuzzy
-msgid "_Source URL:"
-msgstr "POP forrás-URI"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
 #, fuzzy
 msgid "_Type:"
 msgstr "Típus:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
 msgid "_URL:"
 msgstr "_URL:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
 msgid "weeks"
 msgstr "hét"
 
@@ -4472,7 +4335,7 @@ msgid "Display"
 msgstr "_Megjelenítés"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:76
 msgid "E_nable"
 msgstr "E_ngedélyezés"
 
@@ -4483,7 +4346,7 @@ msgstr "Szabad/foglalt kérés"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:563
+#: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Péntek"
 
@@ -4497,7 +4360,7 @@ msgstr "perccel"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:559
+#: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Hétfő"
 
@@ -4507,7 +4370,7 @@ msgstr "_V"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:564
+#: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Szombat"
 
@@ -4521,7 +4384,7 @@ msgstr "Hét _számának megjelenítése a dátumnavigátorban"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Vasárnap"
 
@@ -4535,7 +4398,7 @@ msgstr "_Cs"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:562
+#: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Csütörtök"
 
@@ -4549,7 +4412,7 @@ msgstr "Időformátum:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:560
+#: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Kedd"
 
@@ -4559,7 +4422,7 @@ msgstr "_Hét kezdete:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:561
+#: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Szerda"
 
@@ -4593,7 +4456,7 @@ msgid "_Day begins:"
 msgstr "_Nap kezdete:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
-#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:43
@@ -4642,82 +4505,46 @@ msgstr "_Sze"
 msgid "before every appointment"
 msgstr "minden találkozó előtt"
 
-#: calendar/gui/dialogs/cancel-comp.c:57
-msgid ""
-"The event being deleted is a meeting, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"Az esemény, amit törlésre jelöltél, egy találkozó. Szeretnél küldeni egy "
-"lemondási értesítést?"
-
-#: calendar/gui/dialogs/cancel-comp.c:60
-msgid "Are you sure you want to cancel and delete this meeting?"
-msgstr "Tényleg törölni akarod ezt az értekezletet?"
-
-#: calendar/gui/dialogs/cancel-comp.c:66
-msgid ""
-"The task being deleted is assigned, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"A törlésre jelölt feladat elvégzésében más is részt vesz. Szeretnél küldeni "
-"egy törlési értesítést?"
-
-#: calendar/gui/dialogs/cancel-comp.c:69
-msgid "Are you sure you want to cancel and delete this task?"
-msgstr "Tényleg törölni akarod ezt a feladatot?"
-
-#: calendar/gui/dialogs/cancel-comp.c:75
-msgid ""
-"The journal entry being deleted is published, would you like to send a "
-"cancellation notice?"
-msgstr ""
-"A kitörlésre jelölt naplóbejegyzés publikus. Szeretnél küldeni egy "
-"érvénytelenítő értesítést?"
-
-#: calendar/gui/dialogs/cancel-comp.c:78
-msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr "Tényleg törölni akarod ezt a naplóbejegyzést?"
-
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Az esemény törlődött."
 
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "A feladat törlődött."
 
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:68
 msgid "This journal entry has been deleted."
 msgstr "A naplóbejegyzés törlődött."
 
-#: calendar/gui/dialogs/changed-comp.c:75
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  Változtattál. Elveted a változtatásokat, és bezárod a szerkesztőt?"
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Nem változtattál, bezárod a szerkesztőt?"
 
-#: calendar/gui/dialogs/changed-comp.c:82
+#: calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "Az esemény megváltozott."
 
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "A feladat megváltozott."
 
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:92
 msgid "This journal entry has been changed."
 msgstr "A naplóbejegyzés megváltozott."
 
-#: calendar/gui/dialogs/changed-comp.c:99
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  Változtattál. Elveted a változásokat, és frissíted a szerkesztőt?"
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Nem változtattál, frissíted a szerkesztőt?"
@@ -4755,7 +4582,7 @@ msgid "No summary"
 msgstr "Nincs összegzés"
 
 #: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
 #: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Mentés másként..."
@@ -4812,103 +4639,55 @@ msgstr "Címzett címe"
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:95
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "Tényleg törölni akarod ezt a találkozót: '%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:98
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "Tényleg törölni akarod ezt a névtelen találkozót?"
-
-#: calendar/gui/dialogs/delete-comp.c:104
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "Tényleg törölni akarod ezt a feladatot: '%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:107
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "Tényleg törölni akarod ezt a névtelen feladatot?"
-
-#: calendar/gui/dialogs/delete-comp.c:113
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "Tényleg törölni akarod ezt a naplóbejegyzést: '%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:116
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "Tényleg törölni akarod ezt a névtelen naplóbejegyzést?"
-
-#: calendar/gui/dialogs/delete-comp.c:131
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d appointment?"
-msgid_plural "Are you sure you want to delete %d appointments?"
-msgstr[0] "Tényleg törölni akarsz %d találkozót?"
-msgstr[1] "Tényleg törölni akarsz %d találkozót?"
-
-#: calendar/gui/dialogs/delete-comp.c:138
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d task?"
-msgid_plural "Are you sure you want to delete %d tasks?"
-msgstr[0] "Tényleg törölni akarsz %d feladatot?"
-msgstr[1] "Tényleg törölni akarsz %d feladatot?"
-
-#: calendar/gui/dialogs/delete-comp.c:145
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d journal entry?"
-msgid_plural "Are you sure you want to delete %d journal entries?"
-msgstr[0] "Tényleg törölni akarsz %d naplóbejegyzést?"
-msgstr[1] "Tényleg törölni akarsz %d naplóbejegyzést?"
-
-#: calendar/gui/dialogs/delete-error.c:52
+#: calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "Az eseményt nem sikerült törölni CORBA-hiba miatt."
 
-#: calendar/gui/dialogs/delete-error.c:55
+#: calendar/gui/dialogs/delete-error.c:57
 msgid "The task could not be deleted due to a corba error"
 msgstr "A feladatot nem sikerült törölni CORBA-hiba miatt."
 
-#: calendar/gui/dialogs/delete-error.c:58
+#: calendar/gui/dialogs/delete-error.c:60
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr "A naplóbejegyzést nem sikerült törölni CORBA-hiba miatt."
 
-#: calendar/gui/dialogs/delete-error.c:61
+#: calendar/gui/dialogs/delete-error.c:63
 msgid "The item could not be deleted due to a corba error"
 msgstr "Az elemet nem sikerült törölni CORBA-hiba miatt."
 
-#: calendar/gui/dialogs/delete-error.c:68
+#: calendar/gui/dialogs/delete-error.c:70
 msgid "The event could not be deleted because permission was denied"
 msgstr "Az eseményt nem sikerült törölni, mert a hozzáférés meg lett tagadva."
 
-#: calendar/gui/dialogs/delete-error.c:71
+#: calendar/gui/dialogs/delete-error.c:73
 msgid "The task could not be deleted because permission was denied"
 msgstr "A feladatot nem sikerült törölni, mert a hozzáférés meg lett tagadva."
 
-#: calendar/gui/dialogs/delete-error.c:74
+#: calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr ""
 "A naplóbejegyzést nem sikerült törölni, mert a hozzáférés meg lett tagadva."
 
-#: calendar/gui/dialogs/delete-error.c:77
+#: calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
 msgstr "Az elemet nem sikerült törölni, mert a hozzáférés meg lett tagadva."
 
-#: calendar/gui/dialogs/delete-error.c:84
+#: calendar/gui/dialogs/delete-error.c:86
 #, fuzzy
 msgid "The event could not be deleted due to an error"
 msgstr "Az eseményt nem sikerült törölni CORBA-hiba miatt."
 
-#: calendar/gui/dialogs/delete-error.c:87
+#: calendar/gui/dialogs/delete-error.c:89
 #, fuzzy
 msgid "The task could not be deleted due to an error"
 msgstr "A feladatot nem sikerült törölni CORBA-hiba miatt."
 
-#: calendar/gui/dialogs/delete-error.c:90
+#: calendar/gui/dialogs/delete-error.c:92
 #, fuzzy
 msgid "The journal entry could not be deleted due to an error"
 msgstr "A naplóbejegyzést nem sikerült törölni CORBA-hiba miatt."
 
-#: calendar/gui/dialogs/delete-error.c:93
+#: calendar/gui/dialogs/delete-error.c:95
 #, fuzzy
 msgid "The item could not be deleted due to an error"
 msgstr "Az elemet nem sikerült törölni CORBA-hiba miatt."
@@ -5043,11 +4822,11 @@ msgstr "_Kezdés időpontja:"
 
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:3
+#: calendar/gui/dialogs/meeting-page.glade.h:4
 #: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
 #: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1559
-#: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:100
+#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
+#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
@@ -5073,8 +4852,8 @@ msgstr "_Feladatkiadás..."
 #. FIXME: need to disable for undeletable folders
 #: calendar/gui/dialogs/meeting-page.c:655
 #: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1310 calendar/gui/e-calendar-view.c:1342
-#: mail/em-folder-tree.c:2557 mail/em-folder-view.c:919
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
+#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -5082,7 +4861,7 @@ msgid "_Delete"
 msgstr "_Törlés"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:240
+#: calendar/gui/e-meeting-list-view.c:218
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Résztvevő"
@@ -5118,16 +4897,15 @@ msgid "Member"
 msgstr "Tag"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
-#: mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-list-view.c:248
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Állapot"
 
@@ -5136,20 +4914,20 @@ msgstr "Állapot"
 msgid "Add A_ttendee"
 msgstr "Résztvevő"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "Add attendees from addressbook."
+msgstr "_Feladó hozzáadása a címjegyzékhez"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Szervező:"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
+#: calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "_Change Organizer"
 msgstr "_Szervező megváltoztatása"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-#: calendar/gui/e-meeting-time-sel.c:417
-msgid "_Invite Others..."
-msgstr "_Mások meghívása..."
-
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 #, fuzzy
 msgid "<b>Calendar options</b>"
@@ -5308,7 +5086,7 @@ msgid "_No recurrence"
 msgstr "_Nincs ismétlődés"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:450
+#: composer/e-msg-composer-attachment-bar.c:453
 msgid "_Remove"
 msgstr "_Eltávolítás"
 
@@ -5340,54 +5118,20 @@ msgstr "héten"
 msgid "year(s)"
 msgstr "évben"
 
-#: calendar/gui/dialogs/save-comp.c:53
-msgid ""
-"This event has been changed, but has not been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Az esemény megváltozott, de nem lett mentve.\n"
-"\n"
-"Akarod menteni a változásaidat?"
-
-#: calendar/gui/dialogs/save-comp.c:57
-msgid "_Discard Changes"
-msgstr "_Változások elvetése"
-
-#: calendar/gui/dialogs/save-comp.c:62
-msgid "Save Event"
-msgstr "Esemény mentése"
-
-#: calendar/gui/dialogs/select-source-dialog.c:65
+#: calendar/gui/dialogs/select-source-dialog.c:69
 #, fuzzy
 msgid "Select destination"
 msgstr "Címzett címe"
 
-#: calendar/gui/dialogs/select-source-dialog.c:86
+#: calendar/gui/dialogs/select-source-dialog.c:90
 #, fuzzy
 msgid "_Destination"
 msgstr "Mappa törlése"
 
-#: calendar/gui/dialogs/select-source-dialog.c:88
+#: calendar/gui/dialogs/select-source-dialog.c:92
 msgid "Task List"
 msgstr "Feladatlista"
 
-#: calendar/gui/dialogs/send-comp.c:57
-msgid "The meeting information has been created. Send it?"
-msgstr "Az értekezlet adatai létrejöttek. Elküldöd?"
-
-#: calendar/gui/dialogs/send-comp.c:60
-msgid "The meeting information has changed. Send an updated version?"
-msgstr "Az értekezlet adatai megváltoztak. Küldesz egy frissített változatot?"
-
-#: calendar/gui/dialogs/send-comp.c:67
-msgid "The task assignment information has been created. Send it?"
-msgstr "A feladat adatai létrejöttek. Elküldöd?"
-
-#: calendar/gui/dialogs/send-comp.c:71
-msgid "The task information has changed. Send an updated version?"
-msgstr "A feladat adatai megváltoztak. Küldesz egy frissített változatot?"
-
 #: calendar/gui/dialogs/task-details-page.c:406
 msgid "Completed date is wrong"
 msgstr "Helytelen befejezési dátum"
@@ -5407,7 +5151,7 @@ msgstr "Befejezve"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #: calendar/gui/e-cal-component-preview.c:249
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:960
 msgid "High"
 msgstr "Magas"
 
@@ -5421,14 +5165,14 @@ msgstr "Folyamatban"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:253
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:958
 msgid "Low"
 msgstr "Alacsony"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:251
 #: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:957
+#: mail/message-list.c:959
 msgid "Normal"
 msgstr "Normál"
 
@@ -5487,8 +5231,8 @@ msgstr "Bi_zalmas"
 
 #: calendar/gui/dialogs/task-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
+#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Leírás:"
 
@@ -5664,7 +5408,7 @@ msgstr "Le_járat:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:950
+#: calendar/gui/e-itip-control.c:943
 msgid "Status:"
 msgstr "Állapot:"
 
@@ -5750,12 +5494,12 @@ msgstr "Foglalt"
 msgid "Deleting selected objects"
 msgstr "Kijelölt objektumok törlése"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
 msgid "Updating objects"
 msgstr "Objektumok frissítése"
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1370
+#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
 #: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Megnyitás"
@@ -5766,15 +5510,15 @@ msgid "Open _Web Page"
 msgstr "Levél _megnyitása"
 
 #: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1291 calendar/gui/e-calendar-view.c:1376
-#: mail/em-folder-view.c:896 mail/em-popup.c:690 mail/em-popup.c:806
+#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
+#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "M_entés másként..."
 
 #: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1292
-#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
+#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
@@ -5782,24 +5526,24 @@ msgid "_Print..."
 msgstr "_Nyomtatás..."
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Kivágás"
 
 #: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1338
-#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2550
-#: mail/message-list.c:1644 ui/evolution-addressbook.xml.h:31
+#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
+#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
+#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Másolás"
 
 #: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1273 calendar/gui/e-calendar-view.c:1299
-#: calendar/gui/e-calendar-view.c:1372 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
+#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
@@ -5868,71 +5612,71 @@ msgstr "Összefoglaló"
 msgid "Task sort"
 msgstr "Feladatrendezés"
 
-#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
 msgid "New _Appointment..."
 msgstr "Új _találkozó..."
 
-#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
+#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
 msgid "New All Day _Event"
 msgstr "Ú_j egész napos esemény"
 
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
+#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
 msgid "New Meeting"
 msgstr "Új értekezlet"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
 msgid "New Task"
 msgstr "Új feladat"
 
-#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "_Szál kijelölése"
 
-#: calendar/gui/e-calendar-view.c:1280
+#: calendar/gui/e-calendar-view.c:1283
 #, fuzzy
 msgid "_Select Date..."
 msgstr "Törlés..."
 
-#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "Szabad/foglalt információ _közzététele"
 
-#: calendar/gui/e-calendar-view.c:1303
+#: calendar/gui/e-calendar-view.c:1306
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Mappába másolás..."
 
-#: calendar/gui/e-calendar-view.c:1304
+#: calendar/gui/e-calendar-view.c:1307
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "Á_thelyezés mappába..."
 
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1308
 msgid "_Schedule Meeting..."
 msgstr "Értekezlet _tervezése..."
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1309
 msgid "_Forward as iCalendar..."
 msgstr "_Továbbítás iCalendarként..."
 
-#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
 msgid "Delete this _Occurrence"
 msgstr "Az _előfordulás törlése"
 
-#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
 msgid "Delete _All Occurrences"
 msgstr "Az ö_sszes előfordulás törlése"
 
-#: calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1349
 msgid "Go to _Today"
 msgstr "Ugrás a _mai napra"
 
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1351
 msgid "_Go to Date..."
 msgstr "_Ugrás dátumra..."
 
-#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "_Beállítások..."
 
@@ -5946,9 +5690,9 @@ msgstr "Kezdés dátuma"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:967 calendar/gui/e-itip-control.c:1169
-#: calendar/gui/e-meeting-list-view.c:144
-#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
 #: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
 #: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
 #: camel/camel-tcp-stream-openssl.c:631
@@ -5974,13 +5718,13 @@ msgid "Assigned"
 msgstr "Hozzárendelve"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr "Igen"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "Nem"
 
@@ -5992,7 +5736,7 @@ msgstr "É"
 msgid "S"
 msgstr "D"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
 msgid "E"
 msgstr "K"
 
@@ -6064,406 +5808,410 @@ msgstr "%b %d"
 msgid "%02i minute divisions"
 msgstr "%02i perces osztás"
 
-#: calendar/gui/e-itip-control.c:592
+#: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
 msgstr "Igen. (Összetett ismétlődés)"
 
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:596
 #, fuzzy, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Minden nap"
 msgstr[1] "Minden nap"
 
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:601
 #, fuzzy, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Minden héten"
 msgstr[1] "Minden héten"
 
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:603
 #, fuzzy, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "Minden héten ekkor"
 msgstr[1] "Minden héten ekkor"
 
-#: calendar/gui/e-itip-control.c:618
+#: calendar/gui/e-itip-control.c:611
 msgid " and "
 msgstr " és "
 
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:618
 #, c-format
 msgid "The %s day of "
 msgstr "%s napján"
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:631
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s napján"
 
-#: calendar/gui/e-itip-control.c:645
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "minden hónapban"
 msgstr[1] "minden hónapban"
 
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:642
 #, fuzzy, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Minden évben"
 msgstr[1] "Minden évben"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:653
 #, fuzzy, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] "összesen ennyiszer: %d"
 msgstr[1] "összesen ennyiszer: %d"
 
-#: calendar/gui/e-itip-control.c:669
+#: calendar/gui/e-itip-control.c:662
 msgid ", ending on "
 msgstr ", véget ér"
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:686
 msgid "<b>Starts:</b> "
 msgstr "<b>Kezdődik:</b> "
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:696
 msgid "<b>Ends:</b> "
 msgstr "<b>Vége:</b> "
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:716
 msgid "<b>Completed:</b> "
 msgstr "<b>Befejezve:</b> "
 
-#: calendar/gui/e-itip-control.c:733
+#: calendar/gui/e-itip-control.c:726
 msgid "<b>Due:</b> "
 msgstr "<b>Határidő:</b> "
 
-#: calendar/gui/e-itip-control.c:771 calendar/gui/e-itip-control.c:827
+#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
 msgid "iCalendar Information"
 msgstr "iCalendar információ"
 
 #. Title
-#: calendar/gui/e-itip-control.c:788
+#: calendar/gui/e-itip-control.c:781
 msgid "iCalendar Error"
 msgstr "iCalendar hiba"
 
-#: calendar/gui/e-itip-control.c:859 calendar/gui/e-itip-control.c:875
-#: calendar/gui/e-itip-control.c:886 calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
 msgid "An unknown person"
 msgstr "Ismeretlen személy"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:910
+#: calendar/gui/e-itip-control.c:903
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 "<br> Olvasd el a következőket, és válassz ki egy műveletet az alábbi menüből."
 
-#: calendar/gui/e-itip-control.c:925
+#: calendar/gui/e-itip-control.c:918
 msgid "<i>None</i>"
 msgstr "<i>Nincs</i>"
 
-#: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:929
+msgid "Location:"
+msgstr "Hely:"
+
+#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Elfogadva"
 
-#: calendar/gui/e-itip-control.c:959 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Kísérletileg elfogadva"
 
-#: calendar/gui/e-itip-control.c:963 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Elutasítva"
 
-#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.c:1050
-#: calendar/gui/e-itip-control.c:1076 calendar/gui/e-itip-control.c:1089
-#: calendar/gui/e-itip-control.c:1102 calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
 msgid "Choose an action:"
 msgstr "Válassz egy műveletet:"
 
-#: calendar/gui/e-itip-control.c:1023
+#: calendar/gui/e-itip-control.c:1016
 msgid "Update"
 msgstr "Frissítés"
 
-#: calendar/gui/e-itip-control.c:1024 calendar/gui/e-itip-control.c:1055
-#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1091
-#: calendar/gui/e-itip-control.c:1104 calendar/gui/e-itip-control.c:1117
-#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
+#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1044
 msgid "Accept"
 msgstr "Elfogadva"
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1045
 msgid "Tentatively accept"
 msgstr "Kísérletileg elfogadva"
 
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1046
 msgid "Decline"
 msgstr "Elutasítva"
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1070
 msgid "Send Free/Busy Information"
 msgstr "Szabad/foglalt információ küldése"
 
-#: calendar/gui/e-itip-control.c:1090
+#: calendar/gui/e-itip-control.c:1083
 msgid "Update respondent status"
 msgstr "Válaszoló állapotának frissítése"
 
-#: calendar/gui/e-itip-control.c:1103
+#: calendar/gui/e-itip-control.c:1096
 msgid "Send Latest Information"
 msgstr "Legutóbbi információ küldése"
 
-#: calendar/gui/e-itip-control.c:1116 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Mégsem"
 
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1185
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> információt tett közzé az értekezletről."
 
-#: calendar/gui/e-itip-control.c:1193
+#: calendar/gui/e-itip-control.c:1186
 msgid "Meeting Information"
 msgstr "Információ az értekezletről"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1191
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> arra kér, hogy vegyél részt a(z) %s értekezleten."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1193
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> arra kér, hogy vegyél részt az értekezleten."
 
-#: calendar/gui/e-itip-control.c:1201
+#: calendar/gui/e-itip-control.c:1194
 msgid "Meeting Proposal"
 msgstr "Javaslat értekezletre"
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> szeretne hozzátenni egy létező értekezlethez."
 
-#: calendar/gui/e-itip-control.c:1206
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Update"
 msgstr "Értekezlet frissítése"
 
-#: calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1203
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> szeretné megkapni a legújabb adatokat az értekezletről."
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1204
 msgid "Meeting Update Request"
 msgstr "Értekezletfrissítési kérés"
 
-#: calendar/gui/e-itip-control.c:1218
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> válaszolt egy értekezlet-összehívási kérésre."
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Reply"
 msgstr "Válasz az értekezletre"
 
-#: calendar/gui/e-itip-control.c:1226
+#: calendar/gui/e-itip-control.c:1219
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> lemondta az értekezletet."
 
-#: calendar/gui/e-itip-control.c:1227
+#: calendar/gui/e-itip-control.c:1220
 msgid "Meeting Cancellation"
 msgstr "Értekezlet lemondása"
 
-#: calendar/gui/e-itip-control.c:1234 calendar/gui/e-itip-control.c:1302
-#: calendar/gui/e-itip-control.c:1337
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1330
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> egy értelmetlen levelet küldött."
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1228
 msgid "Bad Meeting Message"
 msgstr "Rossz értekezletfelhívás"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1253
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> feladatinformációt tett közzé."
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1254
 msgid "Task Information"
 msgstr "Feladatinformáció"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1259
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> arra kér, %s hogy végezz el egy feladatot."
 
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> arra kér, hogy hajts végre egy feladatot."
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1262
 msgid "Task Proposal"
 msgstr "Feladatjavaslat"
 
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> szeretne hozzátenni egy létező feladathoz."
 
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Update"
 msgstr "Feladat frissítése"
 
-#: calendar/gui/e-itip-control.c:1278
+#: calendar/gui/e-itip-control.c:1271
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> szeretné megkapni a legújabb adatokat a feladatról."
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1272
 msgid "Task Update Request"
 msgstr "Feladatfrissítési felhívás"
 
-#: calendar/gui/e-itip-control.c:1286
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> válaszolt egy feladatfelkérésre."
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Reply"
 msgstr "Válasz feladatra"
 
-#: calendar/gui/e-itip-control.c:1294
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> törölte a feladatot."
 
-#: calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1288
 msgid "Task Cancellation"
 msgstr "Feladat lemondása"
 
-#: calendar/gui/e-itip-control.c:1303
+#: calendar/gui/e-itip-control.c:1296
 msgid "Bad Task Message"
 msgstr "Rossz feladatüzenet"
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1315
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> szabad/foglalt információt tett közzé."
 
-#: calendar/gui/e-itip-control.c:1323
+#: calendar/gui/e-itip-control.c:1316
 msgid "Free/Busy Information"
 msgstr "Szabad/foglalt információ"
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> kéri a szabad/foglalt adataidat."
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1321
 msgid "Free/Busy Request"
 msgstr "Szabad/foglalt kérés"
 
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1325
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> válaszolt egy szabad/foglalt kérésre."
 
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1326
 msgid "Free/Busy Reply"
 msgstr "Szabad/foglalt válasz"
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1331
 msgid "Bad Free/Busy Message"
 msgstr "Rossz szabad/foglalt üzenet"
 
-#: calendar/gui/e-itip-control.c:1413
+#: calendar/gui/e-itip-control.c:1406
 msgid "The message does not appear to be properly formed"
 msgstr "A levél úgy tűnik, nem megfelelően formázott"
 
-#: calendar/gui/e-itip-control.c:1472
+#: calendar/gui/e-itip-control.c:1465
 msgid "The message contains only unsupported requests."
 msgstr "A levél csak nem támogatott kéréseket tartalmaz."
 
-#: calendar/gui/e-itip-control.c:1503
+#: calendar/gui/e-itip-control.c:1496
 msgid "The attachment does not contain a valid calendar message"
 msgstr "A melléklet nem tartalmaz érvényes naptárüzenetet"
 
-#: calendar/gui/e-itip-control.c:1535
+#: calendar/gui/e-itip-control.c:1528
 msgid "The attachment has no viewable calendar items"
 msgstr "A melléklet nem tartalmaz megnézhető naptárelemet"
 
-#: calendar/gui/e-itip-control.c:1769
+#: calendar/gui/e-itip-control.c:1762
 msgid "Update complete\n"
 msgstr "Frissítés kész\n"
 
-#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
+#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "A résztvevő állapotát nem lehetett frissíteni, mert az elem nem létezik többé"
 
-#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Az objektum érvénytelen és nem lehet frissíteni\n"
 
-#: calendar/gui/e-itip-control.c:1825
+#: calendar/gui/e-itip-control.c:1818
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "A válasz oylantól érkezett, aki nem résztvevő. Hozzáadod a résztvevőkhöz?"
 
-#: calendar/gui/e-itip-control.c:1837
+#: calendar/gui/e-itip-control.c:1830
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "A résztvevő állapotát nem lehetett frissíteni, mert az állapot érvénytelen!\n"
 
-#: calendar/gui/e-itip-control.c:1856
+#: calendar/gui/e-itip-control.c:1849
 msgid "There was an error on the CORBA system\n"
 msgstr "Hiba történt a CORBA-rendszerben\n"
 
-#: calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1852
 msgid "Object could not be found\n"
 msgstr "Az elem nem található\n"
 
-#: calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1855
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Nincsenek megfelelő jogosultságaid a naptár frissítéséhez\n"
 
-#: calendar/gui/e-itip-control.c:1865
+#: calendar/gui/e-itip-control.c:1858
 msgid "Attendee status updated\n"
 msgstr "A résztvevő állapota frissítve\n"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1861
 msgid "Attendee status could not be updated!\n"
 msgstr "A résztvevő állapotát nem lehetett frissíteni!\n"
 
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1892
 msgid "Removal Complete"
 msgstr "Törlés befejezve"
 
-#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
 msgid "Item sent!\n"
 msgstr "Elküldve!\n"
 
-#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
+#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
 msgid "The item could not be sent!\n"
 msgstr "Az elemet nem lehetett elküldeni!\n"
 
@@ -6504,74 +6252,74 @@ msgstr "date-end"
 msgid "date-start"
 msgstr "date-start"
 
-#: calendar/gui/e-meeting-list-view.c:62
+#: calendar/gui/e-meeting-list-view.c:59
 msgid "Chair Persons"
 msgstr "Elnök"
 
-#: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:479
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
 msgid "Required Participants"
 msgstr "Szükséges résztvevők"
 
-#: calendar/gui/e-meeting-list-view.c:64
+#: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Esetleges résztvevők"
 
-#: calendar/gui/e-meeting-list-view.c:65
+#: calendar/gui/e-meeting-list-view.c:62
 msgid "Resources"
 msgstr "Erőforrások"
 
-#: calendar/gui/e-meeting-list-view.c:140 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
 #: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr "Egyén"
 
-#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "Csoport"
 
-#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr "Erőforrás"
 
-#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr "Szoba"
 
-#: calendar/gui/e-meeting-list-view.c:154 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr "Levezető"
 
-#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:127
 #: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
 msgid "Required Participant"
 msgstr "Szükséges résztvevők"
 
-#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr "Esetleges résztvevő"
 
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr "Nem vesz részt"
 
-#: calendar/gui/e-meeting-list-view.c:179 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:177
 #: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
 msgid "Needs Action"
 msgstr "Beavatkozás szükséges"
 
-#: calendar/gui/e-meeting-list-view.c:182 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
 #: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "Kísérleti"
 
-#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr "Delegált"
@@ -6588,20 +6336,28 @@ msgstr "Nincs bent"
 msgid "No Information"
 msgstr "Nincs információ"
 
+#: calendar/gui/e-meeting-time-sel.c:417
+#, fuzzy
+msgid "Add attendees from addressbook"
+msgstr "_Feladó hozzáadása a címjegyzékhez"
+
 #: calendar/gui/e-meeting-time-sel.c:440
 msgid "_Options"
 msgstr "_Beállítások"
 
 #: calendar/gui/e-meeting-time-sel.c:457
-msgid "Show _Only Working Hours"
+#, fuzzy
+msgid "Show _only working hours"
 msgstr "Csak a _munkaórák megjelenítése"
 
 #: calendar/gui/e-meeting-time-sel.c:467
-msgid "Show _Zoomed Out"
+#, fuzzy
+msgid "Show _zoomed out"
 msgstr "_Megjelenítés nagyítva"
 
 #: calendar/gui/e-meeting-time-sel.c:482
-msgid "_Update Free/Busy"
+#, fuzzy
+msgid "_Update free/busy"
 msgstr "_Szabad/foglalt frissítése"
 
 #: calendar/gui/e-meeting-time-sel.c:497
@@ -6617,19 +6373,23 @@ msgid ">_>"
 msgstr ">_>"
 
 #: calendar/gui/e-meeting-time-sel.c:547
-msgid "_All People and Resources"
+#, fuzzy
+msgid "_All people and resources"
 msgstr "_Minden ember és erőforrás"
 
 #: calendar/gui/e-meeting-time-sel.c:556
-msgid "All _People and One Resource"
+#, fuzzy
+msgid "All _people and one resource"
 msgstr "Minden _ember és egy erőforrás"
 
 #: calendar/gui/e-meeting-time-sel.c:565
-msgid "_Required People"
+#, fuzzy
+msgid "_Required people"
 msgstr "_A kért emberek"
 
 #: calendar/gui/e-meeting-time-sel.c:574
-msgid "Required People and _One Resource"
+#, fuzzy
+msgid "Required people and _one resource"
 msgstr "A kért emberek és egy e_rőforrás"
 
 #: calendar/gui/e-meeting-time-sel.c:593
@@ -6667,7 +6427,7 @@ msgstr "%Y/%m/%d"
 msgid "Enter the password for %s"
 msgstr "Írd be %s jelszavát"
 
-#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6676,19 +6436,14 @@ msgstr ""
 "Hiba a következőben %s:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-
 #. FIXME Loading should be async
 #. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:686
+#: calendar/gui/e-tasks.c:801
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Feladatok megnyitása %s-kor"
 
-#: calendar/gui/e-tasks.c:709
+#: calendar/gui/e-tasks.c:824
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6697,53 +6452,48 @@ msgstr ""
 "Hiba a következőben %s:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:730
+#: calendar/gui/e-tasks.c:845
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Képek betöltése"
 
-#: calendar/gui/e-tasks.c:834
+#: calendar/gui/e-tasks.c:949
 msgid "Completing tasks..."
 msgstr "Feladatok befejezése..."
 
-#: calendar/gui/e-tasks.c:857
+#: calendar/gui/e-tasks.c:972
 msgid "Deleting selected objects..."
 msgstr "Kijelölt objektumok törlése..."
 
-#: calendar/gui/e-tasks.c:884
+#: calendar/gui/e-tasks.c:999
 msgid "Expunging"
 msgstr "Tisztítás"
 
-#: calendar/gui/e-tasks.c:960
+#: calendar/gui/e-tasks.c:1075
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
-#: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
+#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
+#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
 #: calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:705
 msgid "Tasks"
 msgstr "Feladatok"
 
-#: calendar/gui/gnome-cal.c:1876
+#: calendar/gui/gnome-cal.c:1878
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Nincsenek találkozók."
 
-#: calendar/gui/gnome-cal.c:1895
+#: calendar/gui/gnome-cal.c:1897
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Képek betöltése"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1920
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Megnyitás ezzel: %s..."
 
-#: calendar/gui/gnome-cal.c:2048
-#, c-format
-msgid "The calendar backend for '%s' has crashed."
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:2894
+#: calendar/gui/gnome-cal.c:2906
 #, fuzzy
 msgid "Purging"
 msgstr "Turin"
@@ -6938,7 +6688,7 @@ msgid "On The Web"
 msgstr ""
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 
@@ -6949,7 +6699,7 @@ msgid "Unable to migrate calendar `%s'"
 msgstr "Hozzáférés megtagadva a naptár megnyitásához"
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:869
+#: calendar/gui/migration.c:889
 #, fuzzy, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Nem sikerült megnyitni a címjegyzéket"
@@ -7185,73 +6935,73 @@ msgstr "Elem nyomtatása"
 msgid "Print Setup"
 msgstr "Nyomtatás beállítása"
 
-#: calendar/gui/tasks-component.c:303
+#: calendar/gui/tasks-component.c:313
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:371
 #, fuzzy
 msgid "New Task List"
 msgstr "Feladatlista"
 
-#: calendar/gui/tasks-component.c:398
+#: calendar/gui/tasks-component.c:408
 #, fuzzy, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "Nincsenek feladatok"
 msgstr[1] "Nincsenek feladatok"
 
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] "%d kijelölve"
 msgstr[1] "%d kijelölve"
 
-#: calendar/gui/tasks-component.c:447
+#: calendar/gui/tasks-component.c:457
 #, fuzzy
 msgid "Failed upgrading tasks."
 msgstr "Képek betöltése"
 
-#: calendar/gui/tasks-component.c:526
+#: calendar/gui/tasks-component.c:749
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:538
+#: calendar/gui/tasks-component.c:761
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:576
+#: calendar/gui/tasks-component.c:799
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:804
+#: calendar/gui/tasks-component.c:1040
 msgid "New task"
 msgstr "Új feladat"
 
-#: calendar/gui/tasks-component.c:805
+#: calendar/gui/tasks-component.c:1041
 msgid "_Task"
 msgstr "_Feladat"
 
-#: calendar/gui/tasks-component.c:806
+#: calendar/gui/tasks-component.c:1042
 msgid "Create a new task"
 msgstr "Új feladat létrehozása"
 
-#: calendar/gui/tasks-component.c:812
+#: calendar/gui/tasks-component.c:1048
 #, fuzzy
 msgid "New tasks group"
 msgstr "Új feladat"
 
-#: calendar/gui/tasks-component.c:813
+#: calendar/gui/tasks-component.c:1049
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Feladatlista"
 
-#: calendar/gui/tasks-component.c:814
+#: calendar/gui/tasks-component.c:1050
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Új feladat létrehozása"
@@ -9019,12 +8769,12 @@ msgstr "Hiba a szűrt keresés végrehajtása közben: %s: %s"
 msgid "Unsupported operation: append message: for %s"
 msgstr "Nem támogatott művelet: levél hozzáfűzése: %s"
 
-#: camel/camel-folder.c:1259
+#: camel/camel-folder.c:1262
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Nem támogatott művelet: keresés kifejezés szerint: %s"
 
-#: camel/camel-folder.c:1299
+#: camel/camel-folder.c:1302
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Nem támogatott művelet: keresés uid szerint: %s"
@@ -9037,11 +8787,16 @@ msgstr "Levelek áthelyzése"
 msgid "Copying messages"
 msgstr "Levelek másolása"
 
-#: camel/camel-folder.c:1666
-msgid "Learning junk and/or non junk message(s)"
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Lansing"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
 msgstr ""
 
-#: camel/camel-folder.c:1695
+#: camel/camel-folder.c:1701
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "%d levél letöltése"
@@ -9076,17 +8831,17 @@ msgstr ""
 msgid "(match-threads) requires a match type string"
 msgstr ""
 
-#: camel/camel-folder-search.c:785
+#: camel/camel-folder-search.c:784
 #, fuzzy
 msgid "(match-threads) expects an array result"
 msgstr "a (match-all) egy darab logikai eredményt vár"
 
-#: camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:790
 #, fuzzy
 msgid "(match-threads) requires the folder set"
 msgstr "a (match-all) egy darab logikai eredményt vár"
 
-#: camel/camel-folder-search.c:880
+#: camel/camel-folder-search.c:879
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Lekérdezés futtatása ismeretlen fejlécen: %s"
@@ -9121,7 +8876,8 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
 #: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:706
+#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Megszakítva"
@@ -9513,7 +9269,7 @@ msgstr "A hivatkozott azonosító adatok lejártak."
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1212
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Rossz hitelesítési válasz a kiszolgálótól"
 
@@ -9898,42 +9654,42 @@ msgstr "A parancs nincs megvalósítva"
 msgid "export keys: unimplemented"
 msgstr ""
 
-#: camel/camel-store.c:214
+#: camel/camel-store.c:213
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr ""
 "Nem sikerült megnyitni a könyvtárat: Érvénytelen művelet ezen a tárolón"
 
-#: camel/camel-store.c:244
+#: camel/camel-store.c:243
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr "Nem sikerült betölteni a mappát: %s: %s"
 
-#: camel/camel-store.c:295
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 "Nem sikerült létrehozni a könyvtárat: Érvénytelen művelet ezen a tárolón"
 
-#: camel/camel-store.c:323
+#: camel/camel-store.c:325
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Nem sikerült betölteni a mappát: %s: %s"
 
-#: camel/camel-store.c:387 camel/camel-vee-store.c:354
+#: camel/camel-store.c:389 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Nem sikerült törölni a mappát: %s: Érvénytelen művelet"
 
-#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#: camel/camel-store.c:439 camel/camel-vee-store.c:387
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Nem sikerült átnevezni a mappát: %s: Érvénytelen művelet"
 
-#: camel/camel-store.c:811
+#: camel/camel-store.c:777
 msgid "Trash"
 msgstr "Kuka"
 
-#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
-#: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/mail-config.glade.h:95
+#: ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
 msgstr "június"
@@ -10167,12 +9923,12 @@ msgstr "Nincs ilyen levél (%s) ezen a helyen: %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Nem lehetséges másolni vagy áthelyezni leveleket egy virtuális mappába"
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:374
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Nem sikerült törölni a mappát: %s: Nincs ilyen mappa"
 
-#: camel/camel-vee-store.c:398
+#: camel/camel-vee-store.c:395
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Nem sikerült átnevezni a mappát: %s: Nincs ilyen mappa"
@@ -10218,24 +9974,24 @@ msgstr "Címjegyzék"
 msgid "Post Office Agent SOAP Port:"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:80
+#: camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "Novell GroupWise"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:82
+#: camel/providers/groupwise/camel-groupwise-provider.c:85
 msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: camel/providers/groupwise/camel-groupwise-provider.c:100
 #: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
 msgid "Password"
 msgstr "Jelszó"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:99
+#: camel/providers/groupwise/camel-groupwise-provider.c:102
 #: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
@@ -10243,8 +9999,8 @@ msgstr ""
 "Ez a beállítás sima szöveges jelszóval létesít kapcsolatot az IMAP-"
 "kiszolgálóval."
 
-#: camel/providers/groupwise/camel-gw-listener.c:305
-#: camel/providers/groupwise/camel-gw-listener.c:328
+#: camel/providers/groupwise/camel-gw-listener.c:312
+#: camel/providers/groupwise/camel-gw-listener.c:335
 #, fuzzy
 msgid "Checklist"
 msgstr "Sűrű köd"
@@ -10389,13 +10145,13 @@ msgstr ""
 "kiszolgálóval."
 
 #: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:429
+#: camel/providers/imap/camel-imap-store.c:428
 #, c-format
 msgid "IMAP server %s"
 msgstr "%s IMAP-kiszolgáló"
 
 #: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:431
+#: camel/providers/imap/camel-imap-store.c:430
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP-szolgáltatás a következőnek %s, ezen a címen: %s"
@@ -10405,7 +10161,7 @@ msgstr "IMAP-szolgáltatás a következőnek %s, ezen a címen: %s"
 #: camel/providers/imap/camel-imap-store.c:551
 #: camel/providers/imap/camel-imap-store.c:571
 #: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
+#: camel/providers/nntp/camel-nntp-store.c:209
 #: camel/providers/pop3/camel-pop3-store.c:175
 #: camel/providers/smtp/camel-smtp-transport.c:269
 #: camel/providers/smtp/camel-smtp-transport.c:285
@@ -10423,10 +10179,10 @@ msgstr "TLS nem elérhető"
 
 #: camel/providers/imap4/camel-imap4-store.c:222
 #: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:815
+#: camel/providers/imap/camel-imap-store.c:845
 #: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:137
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
 #: camel/providers/pop3/camel-pop3-store.c:192
 msgid "Connection cancelled"
 msgstr "Kapcsolat megszakítva"
@@ -10441,8 +10197,8 @@ msgstr ""
 "kiszolgálóhoz: %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:649
-#: camel/providers/imap/camel-imap-store.c:680
+#: camel/providers/imap/camel-imap-store.c:679
+#: camel/providers/imap/camel-imap-store.c:710
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
@@ -10453,7 +10209,7 @@ msgstr ""
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1109
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
 msgid "Unknown error"
 msgstr "Ismeretlen hiba"
 
@@ -10481,8 +10237,8 @@ msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr "Nem sikerült betölteni a mappát: %s: %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1857
-#: camel/providers/imap/camel-imap-store.c:2235
+#: camel/providers/imap/camel-imap-store.c:1885
+#: camel/providers/imap/camel-imap-store.c:2263
 #, fuzzy, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -10561,12 +10317,12 @@ msgstr "A kiszolgáló váratlanul szétkapcsolt: %s"
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3168
+#: camel/providers/imap/camel-imap-store.c:3194
 msgid "Operation cancelled"
 msgstr "A művelet leállítva"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3171
+#: camel/providers/imap/camel-imap-store.c:3197
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "A kiszolgáló váratlanul szétkapcsolt: %s"
@@ -10630,13 +10386,6 @@ msgid "Unable to retrieve message: %s"
 msgstr "Nem lehet elhozni a levelet: %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:219
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -10646,15 +10395,15 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-mbox-folder.c:418
+#: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
 msgstr "Nincs ilyen levél"
 
 #: camel/providers/imap/camel-imap-folder.c:2019
-#: camel/providers/imap/camel-imap-folder.c:2621
-#: camel/providers/nntp/camel-nntp-folder.c:238
+#: camel/providers/imap/camel-imap-folder.c:2622
+#: camel/providers/nntp/camel-nntp-folder.c:220
 msgid "This message is not currently available"
 msgstr "Ez a levél jelenleg nem elérhető"
 
@@ -10663,7 +10412,23 @@ msgstr "Ez a levél jelenleg nem elérhető"
 msgid "Fetching summary information for new messages"
 msgstr "Összefoglaló adatok letöltése az új levelekhez."
 
-#: camel/providers/imap/camel-imap-folder.c:2659
+#: camel/providers/imap/camel-imap-folder.c:2463
+#, c-format
+msgid "Incomplete server response: no information provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2471
+#, c-format
+msgid "Incomplete server response: no UID provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2484
+#, c-format
+msgid ""
+"Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2660
 msgid "Could not find message body in FETCH response."
 msgstr "Nem található a levéltörzs a FETCH válaszban."
 
@@ -10727,43 +10492,43 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Levélolvasás és -tárolás IMAP-kiszolgálókon."
 
-#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/imap/camel-imap-store.c:680
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS kiterjesztés nem támogatott"
 
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:711
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL-tárgyalás sikertelen"
 
-#: camel/providers/imap/camel-imap-store.c:818
+#: camel/providers/imap/camel-imap-store.c:848
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Nem sikerült csatlakozni %s %d portjához: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1242
+#: camel/providers/imap/camel-imap-store.c:1272
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "%s IMAP-kiszolgáló nem támogatja a kért %s hitelesítési típust"
 
-#: camel/providers/imap/camel-imap-store.c:1252
+#: camel/providers/imap/camel-imap-store.c:1282
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "%s hitelesítési típus nem támogatott"
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1305
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sAdd meg %s@%s IMAP-jelszavát!"
 
-#: camel/providers/imap/camel-imap-store.c:1289
+#: camel/providers/imap/camel-imap-store.c:1319
 msgid "You didn't enter a password."
 msgstr "Nem adtál meg jelszót."
 
-#: camel/providers/imap/camel-imap-store.c:1318
+#: camel/providers/imap/camel-imap-store.c:1348
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10774,18 +10539,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1839
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:1867
+#: camel/providers/imap/camel-imap-store.c:2057
 #, c-format
 msgid "No such folder %s"
 msgstr "Nincs %s mappa."
 
-#: camel/providers/imap/camel-imap-store.c:1915
-#: camel/providers/imap/camel-imap-store.c:2296
+#: camel/providers/imap/camel-imap-store.c:1943
+#: camel/providers/imap/camel-imap-store.c:2324
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "A szülőmappa nem tartalmazhat almappákat"
 
-#: camel/providers/imap/camel-imap-store.c:1970
+#: camel/providers/imap/camel-imap-store.c:1998
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10793,7 +10558,7 @@ msgstr "A szülőmappa nem tartalmazhat almappákat"
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Nem sikerült betölteni a mappát: %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:2274
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Ismeretlen szülőmappa: %s"
@@ -10827,20 +10592,20 @@ msgid "Index message body data"
 msgstr "Levél küldése ennek a személynek"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:388
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:393
-#: camel/providers/local/camel-local-folder.c:396
+#: camel/providers/local/camel-local-folder.c:392
+#: camel/providers/local/camel-local-folder.c:395
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "postaláda:%s (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:400
+#: camel/providers/local/camel-local-folder.c:399
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -10901,7 +10666,7 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:142
 #: camel/providers/local/camel-local-store.c:253
-#: camel/providers/local/camel-mbox-store.c:356
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10974,8 +10739,25 @@ msgstr "Maildir levél hozzáfűzése megszakítva"
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Nem lehet a levelet a maildir mappához fűzni: %s: %s "
 
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:226
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mbox-folder.c:417
+#: camel/providers/local/camel-mbox-folder.c:436
+#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:475
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-mh-folder.c:221
+#, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+"Nem sikerült betölteni a(z) %s levelet a(z) %s mappából.\n"
+"  %s"
+
+#: camel/providers/local/camel-maildir-folder.c:236
 msgid "Invalid message contents"
 msgstr "A levél tartalma érvénytelen"
 
@@ -11016,9 +10798,9 @@ msgstr "Nem sikerült törölni a mappát: `%s': %s"
 msgid "not a maildir directory"
 msgstr "nem maildir könyvtár"
 
-#: camel/providers/local/camel-maildir-store.c:341
-#: camel/providers/local/camel-spool-store.c:286
-#: camel/providers/local/camel-spool-store.c:316
+#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-spool-store.c:284
+#: camel/providers/local/camel-spool-store.c:314
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Nem sikerült pásztázni a mappát: `%s': %s"
@@ -11065,27 +10847,18 @@ msgstr "Levél hozzáfűzése megszakítva"
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Nem sikerült a levelet az mbox fájlhoz hozzáfűzni: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:435
-#: camel/providers/local/camel-mbox-folder.c:466
-#: camel/providers/local/camel-mbox-folder.c:474
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"Nem sikerült betölteni a(z) %s levelet a(z) %s mappából.\n"
-"  %s"
-
-#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:468
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "A mappa javíthatatlanul sérültnek néz ki."
 
-#: camel/providers/local/camel-mbox-folder.c:475
-msgid "Message construction failed: Corrupt mailbox?"
+#: camel/providers/local/camel-mbox-folder.c:476
+#: camel/providers/local/camel-mh-folder.c:222
+#, fuzzy
+msgid "Message construction failed."
 msgstr "Levélírás sikertelen: sérült postafiók?"
 
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:362
+#: camel/providers/local/camel-mbox-store.c:361
 #, fuzzy
 msgid "Cannot create a folder by this name."
 msgstr "Nem könyvtárat létrehozni ezen a néven"
@@ -11116,32 +10889,32 @@ msgstr "`%s' nem közönséges fájl."
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "`%s' mappa nem üres. Nem törölhető."
 
-#: camel/providers/local/camel-mbox-store.c:375
+#: camel/providers/local/camel-mbox-store.c:374
 #, fuzzy, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Nem sikerült létrehozni %s könyvtárat: %s"
 
-#: camel/providers/local/camel-mbox-store.c:389
+#: camel/providers/local/camel-mbox-store.c:388
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Nem sikerült betölteni a mappát: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:391
+#: camel/providers/local/camel-mbox-store.c:390
 #, fuzzy
 msgid "Folder already exists"
 msgstr "A kártyaazonosító már létezik"
 
-#: camel/providers/local/camel-mbox-store.c:473
+#: camel/providers/local/camel-mbox-store.c:472
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "A megadott mappanév nem jó: %s"
 
-#: camel/providers/local/camel-mbox-store.c:486
+#: camel/providers/local/camel-mbox-store.c:485
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Az átnevezés nem sikerült '%s': %s"
 
-#: camel/providers/local/camel-mbox-store.c:561
+#: camel/providers/local/camel-mbox-store.c:560
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Nem sikerült %s mappát %s névre átnevezni: %s"
@@ -11334,7 +11107,7 @@ msgstr ""
 "A mappa valószínűleg sérült, másolat mentve `%s' néven"
 
 #: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:997
+#: camel/providers/nntp/camel-nntp-store.c:1126
 #, fuzzy, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "%sAdd meg %s@%s SMTP-jelszavát"
@@ -11352,18 +11125,10 @@ msgstr "Nem sikerült kapcsolatba lépni az LDAP-kiszolgálóval."
 msgid "Server rejected username/password"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:263
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr "Felhasználó megszakította"
-
-#: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:259
-#: camel/providers/nntp/camel-nntp-folder.c:265
+#: camel/providers/nntp/camel-nntp-folder.c:147
+#: camel/providers/nntp/camel-nntp-folder.c:149
+#: camel/providers/nntp/camel-nntp-folder.c:158
+#: camel/providers/nntp/camel-nntp-folder.c:234
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11372,66 +11137,53 @@ msgstr "Felhasználó megszakította"
 msgid "Cannot get message %s: %s"
 msgstr "Nem sikerült betölteni a levelet: %s:  %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:188
-#: camel/providers/nntp/camel-nntp-folder.c:228
+#: camel/providers/nntp/camel-nntp-folder.c:156
+#: camel/providers/nntp/camel-nntp-folder.c:232
+#: camel/providers/nntp/camel-nntp-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+msgid "User cancelled"
+msgstr "Felhasználó megszakította"
+
+#: camel/providers/nntp/camel-nntp-folder.c:176
+#: camel/providers/nntp/camel-nntp-folder.c:208
 #, c-format
 msgid "Internal error: uid in invalid format: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:201
-#, fuzzy, c-format
-msgid "Could not get article %s from NNTP server"
-msgstr "Nem sikerült elindítani a wombat kiszolgálót"
-
-#: camel/providers/nntp/camel-nntp-folder.c:362
-msgid "Posting not allowed by news server"
-msgstr ""
-
+#: camel/providers/nntp/camel-nntp-folder.c:328
+#: camel/providers/nntp/camel-nntp-folder.c:331
 #: camel/providers/nntp/camel-nntp-folder.c:373
-#, c-format
-msgid "Failed to send newsgroups header: %s: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:413
-#: camel/providers/nntp/camel-nntp-folder.c:426
-#, c-format
-msgid "Error posting to newsgroup: %s: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:438
-msgid "Error reading response to posted message: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:441
+#: camel/providers/nntp/camel-nntp-folder.c:375
 #, fuzzy, c-format
-msgid "Error posting message: %s: message not posted"
-msgstr ""
-"Hiba a levelek automatikus mentése közben: %s\n"
-" %s"
+msgid "Posting failed: %s"
+msgstr "Művelet sikertelen: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:457
+#: camel/providers/nntp/camel-nntp-folder.c:393
 msgid "You cannot post NNTP messages while working offline!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:468
+#: camel/providers/nntp/camel-nntp-folder.c:404
 #, fuzzy
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Nem lehetséges másolni vagy áthelyezni leveleket egy virtuális mappába"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:44
 #, fuzzy
 msgid "Could not get group list from server."
 msgstr "Nem sikerült a csoportot letölteni: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#: camel/providers/nntp/camel-nntp-grouplist.c:97
+#: camel/providers/nntp/camel-nntp-grouplist.c:106
 #, fuzzy, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr ""
 "Nem sikerült létrehozni a kimeneti fájlt: %s\n"
 " %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#: camel/providers/nntp/camel-nntp-grouplist.c:157
 #, fuzzy, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr ""
@@ -11461,27 +11213,29 @@ msgid ""
 "password."
 msgstr "Ez a beállítás sima szöveges jelszót használ az NNTP-kiszolgálóhoz."
 
-#: camel/providers/nntp/camel-nntp-store.c:158
+#: camel/providers/nntp/camel-nntp-store.c:118
+#: camel/providers/nntp/camel-nntp-store.c:1233
+#: camel/providers/nntp/camel-nntp-store.c:1331
+#, c-format
+msgid "NNTP Command failed: %s"
+msgstr "Az NNTP-parancs sikertelen: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:227
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Nem sikerült az üdvözlést elolvasni innen: %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:170
+#: camel/providers/nntp/camel-nntp-store.c:239
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "A(z) %s NNTP-kiszolgáló %d hibakódot adott vissza: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:326
+#: camel/providers/nntp/camel-nntp-store.c:403
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET hírcsoportok innen: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:640
-#, fuzzy
-msgid "Stream error"
-msgstr "értelmezési hiba"
-
-#: camel/providers/nntp/camel-nntp-store.c:643
+#: camel/providers/nntp/camel-nntp-store.c:777
 #, fuzzy, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -11491,75 +11245,75 @@ msgstr ""
 "Hiba a levelek mentése közben: %s\n"
 " %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:735
+#: camel/providers/nntp/camel-nntp-store.c:872
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
 "No such newsgroup. The selected item is a probably a parent folder."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:767
+#: camel/providers/nntp/camel-nntp-store.c:904
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
 "newsgroup does not exist!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:792
+#: camel/providers/nntp/camel-nntp-store.c:929
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:800
+#: camel/providers/nntp/camel-nntp-store.c:937
 #, fuzzy
 msgid "You cannot rename a folder in a News store."
 msgstr "Nem sikerült %s mappát %s névre átnevezni: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:808
+#: camel/providers/nntp/camel-nntp-store.c:945
 #, fuzzy
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "Nem lehet a mappát a saját almappájába áthelyezni."
 
-#: camel/providers/nntp/camel-nntp-summary.c:253
-#, fuzzy, c-format
-msgid "Connection error: %s"
-msgstr "Ismeretlen hiba: %s"
-
-#: camel/providers/nntp/camel-nntp-summary.c:262
-#, c-format
-msgid "No such folder: %s"
-msgstr "Nincs ilyen mappa: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1118
+#, fuzzy
+msgid "Authentication requested but not username provided"
+msgstr "Hitelesítés szükséges"
 
-#: camel/providers/nntp/camel-nntp-summary.c:268
-#, c-format
-msgid "Could not get group: %s"
-msgstr "Nem sikerült a csoportot letölteni: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1146
+#, fuzzy, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr "Sikertelen hitelesítés a(z) %s POP-kiszolgálón: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:333
+#: camel/providers/nntp/camel-nntp-store.c:1262
 #, fuzzy
-msgid "Could not get messages: unspecified error"
-msgstr "Nem sikerült elküldeni a levelet: %s"
+msgid "Not connected."
+msgstr "Névjegyek megjelenítése"
 
-#: camel/providers/nntp/camel-nntp-summary.c:378
+#: camel/providers/nntp/camel-nntp-store.c:1311
 #, c-format
-msgid "NNTP Command failed: %s"
-msgstr "Az NNTP-parancs sikertelen: %s"
+msgid "No such folder: %s"
+msgstr "Nincs ilyen mappa: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:438
-#: camel/providers/nntp/camel-nntp-summary.c:543
+#: camel/providers/nntp/camel-nntp-summary.c:218
+#: camel/providers/nntp/camel-nntp-summary.c:314
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Új üzenetek keresése"
 
-#: camel/providers/nntp/camel-nntp-summary.c:558
-#, c-format
-msgid "Unknown server response: %s"
-msgstr "Ismeretlen válasz a kiszolgálótól: %s"
+#: camel/providers/nntp/camel-nntp-summary.c:225
+#, fuzzy, c-format
+msgid "Unexpected server response from xover: %s"
+msgstr "Váratlan válasz az IMAP-kiszolgálótól: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:605
+#: camel/providers/nntp/camel-nntp-summary.c:328
+#, fuzzy, c-format
+msgid "Unexpected server response from head: %s"
+msgstr "Nem várt válasz a GnuPG részéről: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:368
 msgid "Use cancel"
 msgstr "Felhasználó megszakította"
 
-#: camel/providers/nntp/camel-nntp-summary.c:607
+#: camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Művelet sikertelen: %s"
@@ -11607,7 +11361,7 @@ msgstr "Törlés a kiszolgálóról %s nap múlva"
 msgid "Disable support for all POP3 extensions"
 msgstr "Az összes POP3-kiterjesztés tiltása"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107
 msgid "POP"
 msgstr "POP"
 
@@ -11699,7 +11453,7 @@ msgid "No such folder `%s'."
 msgstr "Nincs `%s' mappa."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:132
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -11752,7 +11506,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Levélküldés a sendmail programon keresztül"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:119
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -12045,19 +11799,19 @@ msgstr "%.0f M"
 msgid "%.0fG"
 msgstr "%.0f G"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
+#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:408
 msgid "attachment"
 msgstr "melléklet"
 
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:454
 msgid "Remove selected items from the attachment list"
 msgstr "Eltávolítja a kiválasztott elemeket a mellékletlistáról"
 
-#: composer/e-msg-composer-attachment-bar.c:491
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Add attachment..."
 msgstr "Csatolás..."
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:495
 msgid "Attach a file to the message"
 msgstr "Fájl csatolása a levélhez"
 
@@ -12120,7 +11874,7 @@ msgstr "(Névtelen levél)"
 msgid "Open file"
 msgstr "Fájl megnyitása"
 
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
 msgid "Autogenerated"
 msgstr "Automatikusan létrehozott"
 
@@ -12269,17 +12023,17 @@ msgstr "Fájl csatolása"
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
+msgid "You cannot attach the file `{0}' to this message."
 msgstr "Fájl csatolása a levélhez"
 
 #. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4
-msgid "${1}"
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
 msgstr ""
 
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
 
 #. mail-composer:attach-directory primary
@@ -12374,7 +12128,7 @@ msgstr "Nem sikerült csővezetéket létrehozni: %s"
 
 #. mail-composer:no-build-message secondary
 #: composer/mail-composer-errors.xml.h:34
-msgid "Because \"${0}\", you may need to select different mail options."
+msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
@@ -12384,8 +12138,10 @@ msgid "Could not read signature file \"{0}\"."
 msgstr "Nem sikerült menteni az aláírásfájlt: %s"
 
 #. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38
-msgid "Because \"${1}\"."
+#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted primary
@@ -12810,11 +12566,11 @@ msgid "<b>Then</b>"
 msgstr "<b>Határidő:</b> "
 
 #: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1335
+#: mail/mail-account-gui.c:1347
 msgid "Select Folder"
 msgstr "Mappa kiválasztása"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
 #, fuzzy
 msgid "    "
 msgstr "      "
@@ -12873,7 +12629,7 @@ msgstr "óta"
 msgid "months"
 msgstr "hónap"
 
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
 msgid "seconds"
 msgstr "másodperc"
 
@@ -12905,20 +12661,20 @@ msgstr "az összes helyi mappával"
 msgid "years"
 msgstr "év"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:916
-#: mail/mail-config.c:76 mail/mail-config.glade.h:90
+#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
+#: mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Fontos"
 
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:919 mail/mail-config.c:79
-#: mail/mail-config.glade.h:145
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: mail/mail-config.glade.h:148
 msgid "To Do"
 msgstr "Teendő"
 
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:920 mail/mail-config.c:80
-#: mail/mail-config.glade.h:94
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: mail/mail-config.glade.h:97
 msgid "Later"
 msgstr "Később"
 
@@ -12976,257 +12732,6 @@ msgstr "bejövő"
 msgid "outgoing"
 msgstr "kimenő"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Adjust Score"
-msgstr "Pontszám beállítása"
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Color"
-msgstr "Szín hozzárendelése"
-
-#: filter/libfilter-i18n.h:4
-msgid "Assign Score"
-msgstr "Pontszám hozzárendelése"
-
-#: filter/libfilter-i18n.h:5
-msgid "Attachments"
-msgstr "Mellékletek"
-
-#: filter/libfilter-i18n.h:6
-msgid "Beep"
-msgstr "Hangjelzés"
-
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "tartalmazza"
-
-#: filter/libfilter-i18n.h:8
-msgid "Copy to Folder"
-msgstr "Mappába másolás"
-
-#: filter/libfilter-i18n.h:9
-msgid "Date received"
-msgstr "Fogadás dátuma"
-
-#: filter/libfilter-i18n.h:10
-msgid "Date sent"
-msgstr "Küldés dátuma"
-
-#: filter/libfilter-i18n.h:12
-msgid "Deleted"
-msgstr "Törölt"
-
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "nem tartalmazza"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "nem végződik"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "nem létezik"
-
-#: filter/libfilter-i18n.h:16
-msgid "does not return"
-msgstr "nem tér vissza"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "nem úgy hangzik, mint"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "nincs az elején"
-
-#: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
-msgstr "Nem létezik"
-
-#: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr "Piszkozat"
-
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "végződik"
-
-#: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr "Létezik"
-
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "létezik"
-
-#: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr "Kifejezés"
-
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr "Nyomon követés"
-
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "="
-
-#: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr "után volt"
-
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr "előtte volt"
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr "megjelölt"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "nagyobb mint"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "kisebb mint"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "nem"
-
-#: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr "nem megjelölt"
-
-#: filter/libfilter-i18n.h:36
-#, fuzzy
-msgid "Junk Test"
-msgstr "június"
-
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
-#: widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Címke"
-
-#: filter/libfilter-i18n.h:38
-msgid "Mailing list"
-msgstr "Levelezőlista"
-
-#: filter/libfilter-i18n.h:39
-msgid "Message Body"
-msgstr "Levéltörzs"
-
-#: filter/libfilter-i18n.h:40
-msgid "Message Header"
-msgstr "Levél fejléce"
-
-#: filter/libfilter-i18n.h:41
-#, fuzzy
-msgid "Message is Junk"
-msgstr "Üzenetek"
-
-#: filter/libfilter-i18n.h:42
-#, fuzzy
-msgid "Message is not Junk"
-msgstr "Küldendő üzenet"
-
-#: filter/libfilter-i18n.h:43
-msgid "Move to Folder"
-msgstr "Áthelyezés mappába"
-
-#: filter/libfilter-i18n.h:44
-#, fuzzy
-msgid "Pipe to Program"
-msgstr "Kilépés a programból"
-
-#: filter/libfilter-i18n.h:45
-msgid "Play Sound"
-msgstr "Hangjelzés"
-
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Olvasott"
-
-#: filter/libfilter-i18n.h:47
-msgid "Recipients"
-msgstr "Címzettek"
-
-#: filter/libfilter-i18n.h:48
-msgid "Regex Match"
-msgstr "Regex illeszkedés"
-
-#: filter/libfilter-i18n.h:49
-msgid "Replied to"
-msgstr "Válasz"
-
-#: filter/libfilter-i18n.h:50
-msgid "returns"
-msgstr "visszatér"
-
-#: filter/libfilter-i18n.h:51
-msgid "returns greater than"
-msgstr "visszatér nagyobb mint"
-
-#: filter/libfilter-i18n.h:52
-msgid "returns less than"
-msgstr "visszatér kisebb mint"
-
-#: filter/libfilter-i18n.h:53
-#, fuzzy
-msgid "Run Program"
-msgstr "Program futtatása:"
-
-#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Pontszám"
-
-#: filter/libfilter-i18n.h:55
-msgid "Sender"
-msgstr "Feladó"
-
-#: filter/libfilter-i18n.h:56
-msgid "Set Status"
-msgstr "Állapot beállítása"
-
-#: filter/libfilter-i18n.h:57
-msgid "Size (kB)"
-msgstr "Méret (kB)"
-
-#: filter/libfilter-i18n.h:58
-msgid "sounds like"
-msgstr "úgy hangzik, mint"
-
-#: filter/libfilter-i18n.h:59
-msgid "Source Account"
-msgstr "Forráspostafiók"
-
-#: filter/libfilter-i18n.h:60
-msgid "Specific header"
-msgstr "Adott fejléc"
-
-#: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "kezdete"
-
-#: filter/libfilter-i18n.h:63
-msgid "Stop Processing"
-msgstr "Feldolgozás leállítása"
-
-#: filter/libfilter-i18n.h:64 mail/em-format.c:755 mail/em-format-html.c:1519
-#: mail/em-format-quote.c:302 mail/em-mailer-prefs.c:87
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
-#: smime/lib/e-cert.c:1079
-msgid "Subject"
-msgstr "Tárgy"
-
-#: filter/libfilter-i18n.h:65
-msgid "Unset Status"
-msgstr "Állapot nincs beállítva"
-
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Szabály hozzáadása"
@@ -13244,6 +12749,11 @@ msgstr "Szabály neve"
 msgid "_Score Rules"
 msgstr "Pontszámszabályok"
 
+#: filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Pontszám"
+
 #: filter/searchtypes.xml.h:1
 msgid "Body contains"
 msgstr "A szövegtörzs tartalmazza"
@@ -13325,13 +12835,13 @@ msgstr "Aláírás(ok)"
 msgid "-------- Forwarded Message --------"
 msgstr "Továbbított levél"
 
-#: mail/em-composer-utils.c:1499
+#: mail/em-composer-utils.c:1495
 msgid "an unknown sender"
 msgstr "ismeretlen feladó"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1509
+#: mail/em-composer-utils.c:1505
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "%Y-%m-%d, %a keltezéssel %H:%M-kor %%s ezt írta:"
@@ -13374,8 +12884,8 @@ msgstr "<kattints ide a mappa kiválasztásához>"
 msgid "Create New Folder"
 msgstr "Új mappa létrehozása"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
-#: mail/mail-component.c:701
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
+#: mail/mail-component.c:704
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Add meg, hogy hol hozod létre a mappát."
@@ -13390,107 +12900,108 @@ msgstr "Crestview"
 msgid "Folder _name:"
 msgstr "_Mappanév:"
 
-#: mail/em-folder-tree.c:839
+#: mail/em-folder-tree.c:833
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "%s mappa eltávolítása"
 
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree.c:835
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "%s mappa megnyitása"
 
-#: mail/em-folder-tree.c:848 mail/message-list.c:1555
+#: mail/em-folder-tree.c:842 mail/message-list.c:1561
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Levelek áthelyezése %s-be"
 
-#: mail/em-folder-tree.c:850 mail/message-list.c:1557
+#: mail/em-folder-tree.c:844 mail/message-list.c:1563
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Levelek másolása %s-be"
 
-#: mail/em-folder-tree.c:866
+#: mail/em-folder-tree.c:860
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Nem lehetséges másolni vagy áthelyezni leveleket egy virtuális mappába"
 
-#: mail/em-folder-tree.c:956 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Másolás mappába"
 
-#: mail/em-folder-tree.c:957 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "Á_thelyezés mappába"
 
-#: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2069
-#: mail/em-folder-tree.c:2551 mail/em-folder-view.c:798
-#: mail/message-list.c:1645
+#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
+#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
+#: mail/message-list.c:1651
 #, fuzzy
 msgid "_Move"
 msgstr "Áthelyezés"
 
-#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#: mail/em-folder-tree.c:955 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "A feladat lemondása"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
 #: mail/em-folder-view.c:798 mail/em-folder-view.c:812
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Válassz mappát"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
 #, fuzzy
 msgid "C_opy"
 msgstr "Másolás"
 
-#: mail/em-folder-tree.c:2096
+#: mail/em-folder-tree.c:2088
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "%s mappa tárolása"
 
-#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
+#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
 #, fuzzy
 msgid "Create folder"
 msgstr "Új mappa létrehozása"
 
-#: mail/em-folder-tree.c:2474
+#: mail/em-folder-tree.c:2463
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "\"%s\" mappa átnevezése erre:"
 
-#: mail/em-folder-tree.c:2476
+#: mail/em-folder-tree.c:2465
 msgid "Rename Folder"
 msgstr "Mappa átnevezése"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Nézet"
 
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2537
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Megnyitás új ablakban"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2555
+#: mail/em-folder-tree.c:2546
 msgid "_New Folder..."
 msgstr "Új _mappa..."
 
-#: mail/em-folder-tree.c:2558
+#: mail/em-folder-tree.c:2549
 msgid "_Rename"
 msgstr "Á_tnevezés"
 
-#: mail/em-folder-tree.c:2561 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Tulajdonságok..."
 
 #: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:889
+#: mail/mail-vfolder.c:888
 msgid "VFolders"
 msgstr "VMappák"
 
@@ -13504,19 +13015,19 @@ msgstr ""
 msgid "Inbox"
 msgstr "Beérkezett levelek"
 
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
 msgid "Loading..."
 msgstr "Betöltés..."
 
 #: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
 #: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
 #: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:551
+#: mail/mail-component.c:554
 msgid "Mail"
 msgstr "Levél"
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "S_zerkesztés új levélként..."
@@ -13529,17 +13040,17 @@ msgstr "_Nyomtatás"
 msgid "_Reply to Sender"
 msgstr "_Válasz a feladónak"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:810
+#: mail/em-folder-view.c:901 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Válasz a _listának"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:811
+#: mail/em-folder-view.c:902 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Válasz _mindenkinek"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: mail/em-folder-view.c:903 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "Továbbítás"
@@ -13594,6 +13105,10 @@ msgstr "Á_thelyezés mappába..."
 msgid "_Copy to Folder..."
 msgstr "_Másolás mappába..."
 
+#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Címke"
+
 #: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "_Feladó hozzáadása a címjegyzékhez"
@@ -13644,12 +13159,12 @@ msgid "Filter on _Mailing List"
 msgstr "Szűrő a _levelezőlistára"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
-#: mail/mail-config.glade.h:66
+#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Alapértelmezett"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1796
 msgid "Print Message"
 msgstr "Levél nyomtatása"
 
@@ -13689,12 +13204,18 @@ msgstr "Másolat"
 msgid "Bcc"
 msgstr "Rejtett másolat"
 
+#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
+#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Tárgy"
+
 #: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
 #: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Dátum"
 
-#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
+#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
 msgid "Newsgroups"
 msgstr ""
 
@@ -13888,7 +13409,7 @@ msgid ""
 "practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:757
+#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
 #, fuzzy
 msgid "_View Certificate"
 msgstr "_Tanúsítványazonosító:"
@@ -13950,7 +13471,7 @@ msgstr "Egy _hét"
 msgid "Once per month"
 msgstr "Egy hón_ap"
 
-#: mail/em-migrate.c:1072
+#: mail/em-migrate.c:1168
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13958,92 +13479,92 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1506
+#: mail/em-migrate.c:1602
 #, fuzzy, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Nem sikerült betölteni a mappát: %s: %s"
 
-#: mail/em-migrate.c:1532
+#: mail/em-migrate.c:1628
 #, fuzzy, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr ""
 "Nem sikerült másolni a fájlleírót: %s\n"
 " %s"
 
-#: mail/em-migrate.c:1715
+#: mail/em-migrate.c:1811
 #, fuzzy, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr ""
 "Nem sikerült létrehozni a kimeneti fájlt: %s\n"
 " %s"
 
-#: mail/em-migrate.c:1919
+#: mail/em-migrate.c:2015
 #, fuzzy, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Sikertelen hitelesítés a(z) %s POP-kiszolgálón: %s"
 
-#: mail/em-migrate.c:1933
+#: mail/em-migrate.c:2029
 #, fuzzy, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Nem sikerült csővezetéket létrehozni: '%s': %s"
 
-#: mail/em-migrate.c:1962
+#: mail/em-migrate.c:2058
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#: mail/em-migrate.c:2413 mail/em-migrate.c:2425
 #, fuzzy, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Nem sikerült csővezetéket létrehozni: '%s': %s"
 
-#: mail/em-migrate.c:2480
+#: mail/em-migrate.c:2576
 #, fuzzy, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr ""
 "Nem sikerült létrehozni a kimeneti fájlt: %s\n"
 " %s"
 
-#: mail/em-migrate.c:2498
+#: mail/em-migrate.c:2594
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 msgstr ""
 
-#: mail/em-popup.c:699
+#: mail/em-popup.c:700
 msgid "Save As..."
 msgstr "Mentés másként..."
 
-#: mail/em-popup.c:717
+#: mail/em-popup.c:718
 #, fuzzy, c-format
 msgid "untitled_image.%s"
 msgstr "Névtelen levél"
 
-#: mail/em-popup.c:807
+#: mail/em-popup.c:808
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:809
+#: mail/em-popup.c:810
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "_Válasz a feladónak"
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:859
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Hivatkozás megnyitása böngészőben"
 
-#: mail/em-popup.c:859
+#: mail/em-popup.c:860
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Ü_zenet küldése a listának..."
 
-#: mail/em-popup.c:860
+#: mail/em-popup.c:861
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Feladó hozzáadása a címjegyzékhez"
 
-#: mail/em-popup.c:966
+#: mail/em-popup.c:967
 #, c-format
 msgid "Open in %s..."
 msgstr "Megnyitás ezzel: %s..."
@@ -14641,7 +14162,7 @@ msgstr "Evolution Levelező beállító kontroll"
 msgid "Mail Accounts"
 msgstr "Postafiókok"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
 msgid "Mail Preferences"
 msgstr "Levelezés beállításai"
 
@@ -14655,15 +14176,15 @@ msgid "Evolution is importing your old Elm mail"
 msgstr "Az Evolution importálja a régi Elm-leveleket."
 
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:226
+#: mail/importers/evolution-mbox-importer.c:221
+#: mail/importers/evolution-outlook-importer.c:255
 #: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Importálás folyamatban..."
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:222
-#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/evolution-mbox-importer.c:223
+#: mail/importers/evolution-outlook-importer.c:257
 #: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Várj"
@@ -14686,23 +14207,25 @@ msgid "Elm"
 msgstr "Elm"
 
 #: mail/importers/evolution-mbox-importer.c:116
+#: mail/importers/evolution-outlook-importer.c:130
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Mappa törlése"
 
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 #, fuzzy
 msgid "Select folder to import into"
 msgstr "Válassz importálót"
 
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:254
 #: mail/importers/mail-importer.c:226
 #, fuzzy, c-format
 msgid "Importing `%s'"
 msgstr "Importálás folyamatban"
 
-#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/evolution-outlook-importer.c:301
 #: mail/importers/mail-importer.c:140
 #, fuzzy
 msgid "Importing mailbox"
@@ -14868,15 +14391,15 @@ msgstr ""
 msgid "%s License Agreement"
 msgstr ""
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
 msgid "_Host:"
 msgstr "_Gép:"
 
-#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
 msgid "User_name:"
 msgstr "_Felhasználónév:"
 
-#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
 msgid "_Path:"
 msgstr "Ú_tvonal:"
 
@@ -14939,34 +14462,34 @@ msgstr "összesen %d"
 msgid ", %d unread"
 msgstr "%d postázandó"
 
-#: mail/mail-component.c:653
+#: mail/mail-component.c:656
 msgid "New Mail Message"
 msgstr "Új levél"
 
-#: mail/mail-component.c:654
+#: mail/mail-component.c:657
 msgid "_Mail Message"
 msgstr "_Levél"
 
-#: mail/mail-component.c:655
+#: mail/mail-component.c:658
 msgid "Compose a new mail message"
 msgstr "Új levél írása"
 
-#: mail/mail-component.c:661
+#: mail/mail-component.c:664
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Új VMappa"
 
-#: mail/mail-component.c:662
+#: mail/mail-component.c:665
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Levélszűrők"
 
-#: mail/mail-component.c:663
+#: mail/mail-component.c:666
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Új mappa létrehozása"
 
-#: mail/mail-component.c:795
+#: mail/mail-component.c:798
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
@@ -14978,7 +14501,7 @@ msgstr "Szolgáltatás ellenőrzése"
 msgid "Connecting to server..."
 msgstr "Kapcsolódás a kiszolgálóhoz..."
 
-#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Azonosító"
 
@@ -14993,7 +14516,7 @@ msgstr ""
 "leveleidben."
 
 #: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid "Receiving Mail"
 msgstr "Levelek fogadása"
 
@@ -15010,7 +14533,7 @@ msgstr ""
 msgid "Please select among the following options"
 msgstr "Válassz az alábbi lehetőségek közül"
 
-#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr "Levelek küldése"
 
@@ -15023,7 +14546,7 @@ msgstr ""
 "nem tudod, hogy milyen protokollt kell használnod, kérdezd meg a "
 "rendszergazdát vagy az internetszolgáltatót."
 
-#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37
 msgid "Account Management"
 msgstr "Postafiók-kezelés"
 
@@ -15040,249 +14563,253 @@ msgstr ""
 "alkotja az Evolution postafiókot. Add meg lent a postafiók nevét. Ez a név "
 "csak az Evolution programban jelenik meg."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:2
 #, fuzzy
 msgid " Ch_eck for Supported Types "
 msgstr "_Támogatott típusok lekérdezése"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "<b>Preview</b>"
 msgstr "Előnézet"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "(Ez az Evolution-változat nem támogatja az SSL-t)"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "<b>S_ignatures</b>"
 msgstr "<b>Állapot:</b>"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "<b>_Languages</b>"
 msgstr "<b>Állapot:</b>"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
+msgid "<small>This will make the the filter more reliable, but slower</small>"
+msgstr ""
+
+#: mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "<span weight=\"bold\">Checking for New Mail</span>"
 msgstr "Új levelek keresése"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">General</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "Értesítés új levélről"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Security</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "Elküldött levelek és piszkozatok"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:34
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:35
 #, fuzzy
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "_Mindig titkosít nekem is, ha titkosított levelet küldök"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:36
 msgid "Account Editor"
 msgstr "Postafiók-szerkesztő"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:38
 #, fuzzy
 msgid "Add Ne_w Signature..."
 msgstr "Új aláírás hozzáadása..."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Add _Script"
 msgstr "_Parancsfájl hozzáadása"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:40
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "_Mindig titkosít nekem is, ha titkosított levelet küldök"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Mindig küldjön másolatot (Cc) ide:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Mindig küldjön rejtett másolatot (Bcc) ide:"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Always _sign outgoing messages when using this account"
 msgstr "M_indig írja alá az ebből a postafiókból kimenő leveleket"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "_Titkosításkor mindig megbízom a kulcskarikámon található kulcsokban."
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Attach original message"
 msgstr "Eredeti levél csatolása"
 
-#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Melléklet"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:48
 #, fuzzy
 msgid "Automatically _insert smiley images"
 msgstr "_Hangulatjelek képeinek automatikus beillesztése"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Automatically check for _new mail every"
 msgstr "Az új _levelek automatikus lekérdezése"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "Baltic (ISO-8859-13)"
 msgstr "Balti (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Baltic (ISO-8859-4)"
 msgstr "Balti (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Beep w_hen new mail arrives"
 msgstr "_Hangjelzés új levél beérkezésekor"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "C_haracter set:"
 msgstr "_Karakterkészlet:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Ch_eck for Supported Types "
 msgstr "_Támogatott típusok lekérdezése"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 #, fuzzy
-msgid "Check _Incoming Mail"
+msgid "Check _incoming mail for junk"
 msgstr "Új levelek keresése"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Check spelling while I _type"
 msgstr "Helyesírás-ellenőrzés _beírás közben"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 msgid "Color for _misspelled words:"
 msgstr "Ro_sszul írt szavak színe:"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Colors"
 msgstr "S_zínek"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Confirm _when expunging a folder"
 msgstr "_Megerősítés a mappa tisztításakor"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -15298,117 +14825,122 @@ msgstr ""
 "\n"
 "Kattints az \"Alkalmaz\" gombra a beállítások mentéséhez."
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
 msgid "De_fault"
 msgstr "_Alapértelmezett"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Default character e_ncoding:"
 msgstr "_Alapértelmezett karakterkódolás: "
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 #, fuzzy
 msgid "Defaults"
 msgstr "_Alapértékek"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 msgid "Do not quote original message"
 msgstr "Ne idézze az eredeti levelet"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 "Ne írja alá az értekezlet-összehívási kérést (Outlook-kompatibilitás esetén)"
 
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Kész"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Drafts _Folder:"
 msgstr "_Piszkozatok mappa:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:77
 msgid "Email Accounts"
 msgstr "Postafiókok"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Email _Address:"
 msgstr "E-mail _cím:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "Empty trash folders on e_xit"
 msgstr "_Kuka ürítése kilépéskor"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "_Tanúsítványazonosító:"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:81
 msgid "Evolution Account Assistant"
 msgstr "Evolution Postafiók varázsló"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:82
 msgid "Execute Command..."
 msgstr "Parancs végrehajtása..."
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Fi_xed-width:"
 msgstr "_Fix szélességű:"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 msgid "Font Properties"
 msgstr "Betűk beállításai"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 msgid "Format messages in _HTML"
 msgstr "Üzenetek _HTML formázása"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "HTML Mail"
 msgstr "_HTML-levél"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Headers"
 msgstr "Élőfej"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr "_Idézetek kiemelése"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
 #: mail/mail-config.glade.h:91
+#, fuzzy
+msgid "I_nclude remote tests"
+msgstr "Beleértve:"
+
+#: mail/mail-config.glade.h:94
 msgid "Inline"
 msgstr "Beágyazott"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Mail Configuration"
 msgstr "Levelezés beállítása"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "Postafiók helye"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr "Levélszerkesztő"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
@@ -15416,145 +14948,145 @@ msgstr ""
 "Megjegyzés: az első bejelentkezésig nem kapsz semmilyen figyelmeztetést a "
 "jelszó megadására."
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Or_ganization:"
 msgstr "S_zervezet:"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _kulcs azonosítója:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "Play sound file when new mail arri_ves"
 msgstr "_Hangfájl lejátszása új üzenet beérkezésekor"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Kérdez, ha csak _rejtett másolat szerepel a címzettek között"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr "Eredeti levél idézése"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr "Idézet"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Re_member password"
 msgstr "Jelszó megjegyzése"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr "Vá_laszcím:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "Levelek fogadása"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:120
 #, fuzzy
 msgid "Receiving Options"
 msgstr "_Fogadás beállításai"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
 #, fuzzy
 msgid "Remember _password"
 msgstr "Jelszó megjegyzése"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
 #, fuzzy
 msgid "S_tandard Font:"
 msgstr "_Standard betűkészlet:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 #, fuzzy
 msgid "Security"
 msgstr "_Biztonság"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font"
 msgstr "Fix szélességű betűkészlet választása a HTML-hez"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:126
 msgid "Select HTML fixed width font for printing"
 msgstr "Fix szélességű betűkészlet választása a HTML nyomtatásához"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:127
 msgid "Select HTML variable width font"
 msgstr "Változó szélességű betűkészlet választása a HTML-hez"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:128
 msgid "Select HTML variable width font for printing"
 msgstr "Változó szélességű betűkészlet választása a HTML nyomtatásához"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:129
 #, fuzzy
 msgid "Select..."
 msgstr "Törlés..."
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "Levél küldése"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Sent _Messages Folder:"
 msgstr "El_küldött levelek mappája"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:134
 msgid "Ser_ver requires authentication"
 msgstr "A kiszolgáló megköveteli a _hitelesítést"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:135
 msgid "Server _Type: "
 msgstr "Kiszolgáló _típusa: "
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "_Tanúsítványazonosító:"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:137
 #, fuzzy
 msgid "Signat_ure:"
 msgstr "Aláírás:"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "Signatures"
 msgstr "_Aláírás"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr "_Fájlnév megadása:"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "Spell Checking"
 msgstr "_Helyesírás-ellenőrzés"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:141
 msgid "Standard Unix mbox"
 msgstr "Szabványos Unix mbox"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "T_erminal Font:"
 msgstr "_Terminál betűkészlete:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "T_ype: "
 msgstr "Típus:"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -15563,7 +15095,7 @@ msgstr ""
 "Ennek a parancsfájlnak a kimenete lesz az aláírásod.\n"
 "Az itt megadott név csak megjelenítés célját szolgálja."
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
@@ -15573,7 +15105,7 @@ msgstr ""
 "azok a nyelvek vannak felsorolva, amelyekhez van telepítve helyesírás-"
 "ellenőrző szótár."
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:149
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -15581,15 +15113,11 @@ msgstr ""
 "Írd be azt a nevet, amellyel hivatkozni szeretnél erre a postafiókra.\n"
 "Például: \"Munka\" vagy \"Otthon\""
 
-#: mail/mail-config.glade.h:148
-msgid "Use _Daemon"
-msgstr ""
-
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:152
 msgid "V_ariable-width:"
 msgstr "Vá_ltozó szélességű:"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:153
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -15599,92 +15127,88 @@ msgstr ""
 "\n"
 "A folytatáshoz kattints a \"Következő\" gombra."
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:158
 msgid "_Add Signature"
 msgstr "_Aláírás hozzáadása"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Always load images from the Internet"
 msgstr "_Mindig töltse le a képeket a hálózatról"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Digitally sign outgoing messages (by default)"
 msgstr "M_indig írja alá az ebből a postafiókból kimenő leveleket"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:161
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Ne értesítsen, ha új levél érkezik"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:163
 msgid "_Enable"
 msgstr "_Engedélyezés"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:165
 msgid "_Forward style:"
 msgstr "_Továbbítás stílusa:"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Load images if sender is in address book"
 msgstr "_Képek betöltése, ha a feladó szerepel a címjegyzékben"
 
-#: mail/mail-config.glade.h:167
-msgid "_Local Tests Only"
-msgstr ""
-
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Make this my default account"
 msgstr "L_egyen ez az alapértelmezett postafiók"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_Mark messages as read after"
 msgstr "_Várakozás a levél olvasottként megjelölése előtt:"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Never load images from the Internet"
 msgstr "_Soha ne töltse le a képeket a hálózatról"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "_Kérdez, ha HTML levelet küldesz olyan címre, aki nem akar ilyet kapni"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:175
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Kérdez, ha ü_res tárggyal akarod elküldeni a levelet"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:176
 msgid "_Reply style:"
 msgstr "_Válasz stílusa:"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:177
 msgid "_Script:"
 msgstr "_Parancsfájl:"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:178
 msgid "_Show animated images"
 msgstr "Animált képek megjelenítése"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "_Use Secure Connection (SSL):"
 msgstr "_Biztonságos kapcsolat használata (SSL):"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "_Use the same fonts as other applications"
 msgstr "_A többi alkalmazás által használt betűkészlet használata"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:181
 msgid "color"
 msgstr "szín"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "leírás"
 
@@ -15856,7 +15380,7 @@ msgstr ""
 
 #. mail:camel-exception primary
 #: mail/mail-errors.xml.h:57
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgid "Your message with the subject \"{0}\" was not delivered."
 msgstr ""
 
 #. mail:camel-exception secondary
@@ -15922,11 +15446,6 @@ msgstr ""
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Nem sikerült létrehozni %s könyvtárat: %s"
 
-#. mail:no-save-path secondary
-#: mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail:no-create-path primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
@@ -15951,12 +15470,6 @@ msgstr ""
 msgid "Cannot create temporary save directory."
 msgstr "Nem sikerült létrehozni az ideiglenes könyvtárat: %s"
 
-#. mail:no-create-tmp-path secondary
-#: mail/mail-errors.xml.h:100 mail/mail-errors.xml.h:112
-#: widgets/misc/e-system-errors.xml.h:11 widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail:no-write-path-exists secondary
 #: mail/mail-errors.xml.h:104
 #, fuzzy
@@ -16235,29 +15748,25 @@ msgstr "Felülírás"
 msgid "_Append"
 msgstr "Aspen"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:785
 #, c-format
 msgid "Pinging %s"
 msgstr "%s pingelése"
 
-#: mail/mail-mt.c:897
-msgid "Working"
-msgstr "Várj"
-
-#: mail/mail-ops.c:99
+#: mail/mail-ops.c:98
 msgid "Filtering Folder"
 msgstr "Mappa szűrése"
 
-#: mail/mail-ops.c:260
+#: mail/mail-ops.c:259
 msgid "Fetching Mail"
 msgstr "Levelek fogadása"
 
-#: mail/mail-ops.c:543
+#: mail/mail-ops.c:542
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Nem sikerült alkalmazni a kimenő szűrőket: %s"
 
-#: mail/mail-ops.c:568
+#: mail/mail-ops.c:567
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -16266,115 +15775,115 @@ msgstr ""
 "Nem sikerült hozzáírni a következőhöz: %s: %s\n"
 "A helyi `Elküldött elemek' mappához lesz hozzáírva."
 
-#: mail/mail-ops.c:577
+#: mail/mail-ops.c:576
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Nem sikerült hozzáírni a helyi `Elküldött elemek' mappához: %s"
 
-#: mail/mail-ops.c:673
+#: mail/mail-ops.c:672
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%d / %d üzenet küldése"
 
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:703
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "A levél dekódolása sikertelen."
 
-#: mail/mail-ops.c:708
+#: mail/mail-ops.c:707
 msgid "Complete."
 msgstr "Kész."
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:804
 msgid "Saving message to folder"
 msgstr "Levél mentése a mappába"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Levelek áthelyezése %s-be"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Levelek másolása %s-be"
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:1002
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Mappák pásztázása \"%s\"-ben"
 
-#: mail/mail-ops.c:1116
+#: mail/mail-ops.c:1115
 msgid "Forwarded messages"
 msgstr "Továbbított levelek"
 
-#: mail/mail-ops.c:1159
+#: mail/mail-ops.c:1158
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s mappa megnyitása"
 
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1230
 #, c-format
 msgid "Opening store %s"
 msgstr "%s tároló megnyitása"
 
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1308
 #, c-format
 msgid "Removing folder %s"
 msgstr "%s mappa eltávolítása"
 
-#: mail/mail-ops.c:1403
+#: mail/mail-ops.c:1402
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "%s mappa tárolása"
 
-#: mail/mail-ops.c:1468
+#: mail/mail-ops.c:1467
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1469
+#: mail/mail-ops.c:1468
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "%s mappa tárolása"
 
-#: mail/mail-ops.c:1524
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr "Mappa frissítése"
 
-#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
+#: mail/mail-ops.c:1559 mail/mail-ops.c:1610
 msgid "Expunging folder"
 msgstr "Mappa tisztítása"
 
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1607
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Kuka ürítése: '%s'"
 
-#: mail/mail-ops.c:1609
+#: mail/mail-ops.c:1608
 msgid "Local Folders"
 msgstr "Helyi mappák"
 
-#: mail/mail-ops.c:1692
+#: mail/mail-ops.c:1691
 #, c-format
 msgid "Retrieving message %s"
 msgstr "%s levél letöltése"
 
-#: mail/mail-ops.c:1764
+#: mail/mail-ops.c:1763
 #, fuzzy, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "%d levél letöltése"
 msgstr[1] "%d levél letöltése"
 
-#: mail/mail-ops.c:1850
+#: mail/mail-ops.c:1849
 #, fuzzy, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "%d levél mentése"
 msgstr[1] "%d levél mentése"
 
-#: mail/mail-ops.c:1900
+#: mail/mail-ops.c:1899
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -16383,7 +15892,7 @@ msgstr ""
 "Nem sikerült létrehozni a kimeneti fájlt: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1928
+#: mail/mail-ops.c:1927
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -16392,11 +15901,11 @@ msgstr ""
 "Hiba a levelek mentése közben: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1999
+#: mail/mail-ops.c:1998
 msgid "Saving attachment"
 msgstr "Melléklet mentése"
 
-#: mail/mail-ops.c:2016
+#: mail/mail-ops.c:2015
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -16405,17 +15914,17 @@ msgstr ""
 "Nem lehet létrehozni a kimeneti fájlt: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2046
+#: mail/mail-ops.c:2045
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nem sikerült az adatok kiírása: %s"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Szétkapcsolódás %s kiszolgálóval"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Újrakapcsolódás %s kiszolgálóhoz"
@@ -16480,24 +15989,24 @@ msgstr "Frissítés..."
 msgid "Waiting..."
 msgstr "Várakozás..."
 
-#: mail/mail-session.c:238
+#: mail/mail-session.c:239
 msgid "User canceled operation."
 msgstr "A felhasználó megszakította a műveletet."
 
-#: mail/mail-session.c:271
+#: mail/mail-session.c:272
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Írd be %s jelszavát"
 
-#: mail/mail-session.c:273
+#: mail/mail-session.c:274
 msgid "Enter Password"
 msgstr "Írd be a jelszót"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password"
 msgstr "_Jelszó megjegyzése"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:298
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Jelszó megjegyzése a munkafolyamat hátralevő részére"
 
@@ -16554,79 +16063,79 @@ msgstr "vMappák frissítése erre az uri-ra: %s"
 msgid "Updating vFolders for '%s'"
 msgstr "vMappák frissítése erre az uri-ra: %s"
 
-#: mail/mail-vfolder.c:959
+#: mail/mail-vfolder.c:958
 msgid "vFolders"
 msgstr "vMappák"
 
-#: mail/mail-vfolder.c:998
+#: mail/mail-vfolder.c:997
 msgid "Edit VFolder"
 msgstr "VMappa szerkesztése"
 
-#: mail/mail-vfolder.c:1082
+#: mail/mail-vfolder.c:1081
 msgid "New VFolder"
 msgstr "Új VMappa"
 
-#: mail/message-list.c:946
+#: mail/message-list.c:948
 msgid "Unseen"
 msgstr "Nem nézett"
 
-#: mail/message-list.c:947
+#: mail/message-list.c:949
 msgid "Seen"
 msgstr "Nézett"
 
-#: mail/message-list.c:948
+#: mail/message-list.c:950
 msgid "Answered"
 msgstr "Megválaszolt"
 
-#: mail/message-list.c:949
+#: mail/message-list.c:951
 msgid "Multiple Unseen Messages"
 msgstr "Több láthatatlan levél"
 
-#: mail/message-list.c:950
+#: mail/message-list.c:952
 msgid "Multiple Messages"
 msgstr "Több levél"
 
-#: mail/message-list.c:954
+#: mail/message-list.c:956
 msgid "Lowest"
 msgstr "Legalacsonyabb"
 
-#: mail/message-list.c:955
+#: mail/message-list.c:957
 msgid "Lower"
 msgstr "Alacsonyabb"
 
-#: mail/message-list.c:959
+#: mail/message-list.c:961
 msgid "Higher"
 msgstr "Magasabb"
 
-#: mail/message-list.c:960
+#: mail/message-list.c:962
 msgid "Highest"
 msgstr "Legmagasabb"
 
-#: mail/message-list.c:1279
+#: mail/message-list.c:1285
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1286
+#: mail/message-list.c:1292
 msgid "Today %l:%M %p"
 msgstr "Ma %l:%M %p"
 
-#: mail/message-list.c:1295
+#: mail/message-list.c:1301
 msgid "Yesterday %l:%M %p"
 msgstr "Tegnap %l:%M %p"
 
-#: mail/message-list.c:1307
+#: mail/message-list.c:1313
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1315
+#: mail/message-list.c:1321
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1317
+#: mail/message-list.c:1323
 msgid "%b %d %Y"
 msgstr "%Y %b %d"
 
-#: mail/message-list.c:3300
+#: mail/message-list.c:3321
 msgid "Generating message list"
 msgstr "Levéllista létrehozása"
 
@@ -16682,6 +16191,10 @@ msgstr "Továbbítás"
 msgid "No Response Necessary"
 msgstr "Nem szükséges válaszolni"
 
+#: mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Olvasott"
+
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Válasz"
@@ -16788,45 +16301,49 @@ msgid ""
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:10
-msgid "Whether Evolution should start up in offline mode"
+msgid "Toolbar is visible"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:11
-msgid "Whether to skip the development warning dialog"
+msgid "Whether Evolution should start up in offline mode"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Whether the toolbar should be visible."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:14
 #, fuzzy
 msgid "mail"
 msgstr "E-mail"
 
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
-msgstr "Készítették:"
-
-#: shell/e-shell.c:545 shell/e-shell.c:546
+#: shell/e-shell.c:588 shell/e-shell.c:589
 #, fuzzy, c-format
 msgid "%ld KB"
 msgstr "%B %d"
 
-#: shell/e-shell.c:744
+#: shell/e-shell.c:786
 #, fuzzy
 msgid "Uknown system error."
 msgstr "Ismeretlen hiba"
 
-#: shell/e-shell.c:1101
+#: shell/e-shell.c:1143
 msgid "Invalid arguments"
 msgstr "Érvénytelen argumentumok"
 
-#: shell/e-shell.c:1103
+#: shell/e-shell.c:1145
 msgid "Cannot register on OAF"
 msgstr "Nem sikerült regisztrálni az OAF-ban"
 
-#: shell/e-shell.c:1105
+#: shell/e-shell.c:1147
 msgid "Configuration Database not found"
 msgstr "A beállítások adatbázisa nem található"
 
-#: shell/e-shell.c:1107
+#: shell/e-shell.c:1149
 msgid "Generic error"
 msgstr "Általános hiba"
 
@@ -16886,7 +16403,7 @@ msgstr ""
 msgid "Select importer"
 msgstr "Válassz importálót"
 
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1026
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
 #, c-format
 msgid "File %s does not exist"
 msgstr "`%s' fájl nem létezik."
@@ -16914,35 +16431,35 @@ msgstr ""
 "%s importálása\n"
 "1. elem importálása."
 
-#: shell/e-shell-importer.c:549
+#: shell/e-shell-importer.c:570
 msgid "Automatic"
 msgstr "Automatikus"
 
-#: shell/e-shell-importer.c:598
+#: shell/e-shell-importer.c:626
 #, fuzzy
-msgid "_Filename:"
+msgid "F_ilename:"
 msgstr "Fájlnév:"
 
-#: shell/e-shell-importer.c:603
+#: shell/e-shell-importer.c:631
 msgid "Select a file"
 msgstr "Válassz egy fájlt"
 
-#: shell/e-shell-importer.c:613
+#: shell/e-shell-importer.c:642
 #, fuzzy
 msgid "File _type:"
 msgstr "Fájltípus:"
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:681
 #, fuzzy
 msgid "Import data and settings from _older programs"
 msgstr "Adatok és beállítások importálása korábbi programokból"
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:684
 #, fuzzy
 msgid "Import a _single file"
 msgstr "Egyetlen fájl importálása"
 
-#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -16950,26 +16467,26 @@ msgstr ""
 "Várj...\n"
 "Meglévő beállítások keresése"
 
-#: shell/e-shell-importer.c:727
+#: shell/e-shell-importer.c:756
 msgid "Starting Intelligent Importers"
 msgstr "Az okos importálók indítása"
 
-#: shell/e-shell-importer.c:853 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
 #, c-format
 msgid "From %s:"
 msgstr "Feladó %s:"
 
-#: shell/e-shell-importer.c:1044
+#: shell/e-shell-importer.c:1073
 #, fuzzy, c-format
 msgid "No importer available for file %s"
 msgstr "'%s' protokollhoz nincs támogatás"
 
-#: shell/e-shell-importer.c:1056
+#: shell/e-shell-importer.c:1085
 #, fuzzy
 msgid "Unable to execute importer"
 msgstr "A gpg végrehajtása sikertelen."
 
-#: shell/e-shell-importer.c:1169
+#: shell/e-shell-importer.c:1199
 #, fuzzy
 msgid "_Import"
 msgstr "Importálás"
@@ -17015,61 +16532,61 @@ msgstr "A mappanév nem tartalmazhatja a \"#\" karaktert."
 msgid "'.' and '..' are reserved folder names."
 msgstr "A '.' és a '..' fenntartott mappanevek."
 
-#: shell/e-shell-window.c:336
+#: shell/e-shell-window.c:337
 #, fuzzy
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "A Ximian Evolution a hálózatban van. Kattints erre a gombra a kapcsolat "
 "nélküli munkához."
 
-#: shell/e-shell-window.c:343
+#: shell/e-shell-window.c:344
 #, fuzzy
 msgid "Evolution is in the process of going offline."
 msgstr "A Ximian Evolution felkészül a kapcsolat nélküli munkára."
 
-#: shell/e-shell-window.c:349
+#: shell/e-shell-window.c:350
 #, fuzzy
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "A Ximian Evolution kapcsolat nélküli módban van. Kattints erre a gombra a "
 "hálózatra csatlakozáshoz."
 
-#: shell/e-shell-window.c:621
+#: shell/e-shell-window.c:637
 #, fuzzy, c-format
 msgid "Switch to %s"
 msgstr "A címzett %s"
 
-#: shell/e-shell-window-commands.c:64
+#: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Úgy tűnik, hogy nincsenek telepítve a rendszerre GNOME Pilot eszközök."
 
-#: shell/e-shell-window-commands.c:72
+#: shell/e-shell-window-commands.c:74
 #, c-format
 msgid "Error executing %s."
 msgstr "Hiba a %s végrehajtása közben."
 
-#: shell/e-shell-window-commands.c:121
+#: shell/e-shell-window-commands.c:123
 msgid "Bug buddy is not installed."
 msgstr "A Bug Buddy nincs telepítve."
 
-#: shell/e-shell-window-commands.c:129
+#: shell/e-shell-window-commands.c:131
 msgid "Bug buddy could not be run."
 msgstr "Nem sikerült futtatni a Bug buddy-t."
 
-#: shell/e-shell-window-commands.c:171
+#: shell/e-shell-window-commands.c:323
 #, fuzzy
-msgid "About Evolution"
-msgstr "A Ximian Evolution névjegye"
+msgid "Groupware Suite"
+msgstr "Csoport"
 
-#: shell/e-shell-window-commands.c:382
+#: shell/e-shell-window-commands.c:563
 msgid "_Work Online"
 msgstr "_Munka a hálózatban"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "K_apcsolat nélküli munka"
 
-#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Kapcsolat nélküli munka"
 
@@ -17081,43 +16598,6 @@ msgstr "Jelölőnégyzet"
 msgid "New"
 msgstr "Új"
 
-#: shell/evolution-shell-component-utils.c:115
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Ismeretlen hiba."
-
-#: shell/evolution-shell-component-utils.c:118
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"A komponensrendszer által adott hiba:\n"
-"%s"
-
-#: shell/evolution-shell-component-utils.c:125
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Az aktiválórendszer által adott hiba:\n"
-"%s"
-
 #: shell/evolution-test-component.c:140
 #, fuzzy
 msgid "New Test"
@@ -17454,34 +16934,34 @@ msgid ""
 "Click help for details."
 msgstr ""
 
-#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:522
+#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
+#: smime/gui/certificate-manager.c:556
 #, fuzzy
 msgid "Select a cert to import..."
 msgstr "Válassz importálót"
 
-#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:604
+#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
+#: smime/gui/certificate-manager.c:638
 #, fuzzy
 msgid "Certificate Name"
 msgstr "_Tanúsítványazonosító:"
 
-#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
+#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
 #, fuzzy
 msgid "Purposes"
 msgstr "Folyamatjelző"
 
-#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:517
+#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:267
+#: smime/gui/certificate-manager.c:271
 #, fuzzy
 msgid "Expires"
 msgstr "Kifejezés"
 
-#: smime/gui/certificate-manager.c:417
+#: smime/gui/certificate-manager.c:446
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "E-mail cím összefésülése"
@@ -17524,6 +17004,11 @@ msgid ""
 "  Subject: %s\n"
 msgstr ""
 
+#: smime/gui/e-cert-selector.c:169
+#, fuzzy
+msgid "Select certificate"
+msgstr "Ugrás adott dátumra"
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -17586,7 +17071,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
 #, fuzzy
 msgid "Certificate"
 msgstr "_Tanúsítványazonosító:"
@@ -17611,20 +17096,24 @@ msgstr "Közönséges név"
 msgid "Contact Certificates"
 msgstr "_Tanúsítványazonosító:"
 
-#: smime/gui/smime-ui.glade.h:21
-#, no-c-format
-msgid "Do you want to trust \"%s\" for the following purposes?"
+#: smime/gui/smime-ui.glade.h:20
+msgid "Do not trust the authenticity of this certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:21
 msgid "Dummy window only"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:22
 #, fuzzy
 msgid "Edit"
 msgstr "S_zerkesztés"
 
+#: smime/gui/smime-ui.glade.h:23
+#, fuzzy
+msgid "Email Certificate Trust Settings"
+msgstr "Érvénytelen hitelesítésszolgáltató (CA)"
+
 #: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr ""
@@ -17661,279 +17150,288 @@ msgstr "Szervezeti egység"
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:37
-msgid "Trust this CA to identify email users."
+msgid "Trust the authenticity of this certificate"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:38
-msgid "Trust this CA to identify software developers."
+msgid "Trust this CA to identify email users."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:39
-msgid "Trust this CA to identify web sites."
+msgid "Trust this CA to identify software developers."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:40
-#, fuzzy
-msgid "View"
-msgstr "_Nézet"
+msgid "Trust this CA to identify web sites."
+msgstr ""
 
 #: smime/gui/smime-ui.glade.h:41
 #, fuzzy
-msgid "View Certificate"
-msgstr "_Tanúsítványazonosító:"
+msgid "View"
+msgstr "_Nézet"
 
 #: smime/gui/smime-ui.glade.h:42
-#, fuzzy
-msgid "You have been asked to trust a new Certificate Authority (CA)."
-msgstr "Érvénytelen hitelesítésszolgáltató (CA)"
-
-#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:44
+#: smime/gui/smime-ui.glade.h:43
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:45
+#: smime/gui/smime-ui.glade.h:44
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:46
+#: smime/gui/smime-ui.glade.h:45
 #, fuzzy
 msgid "Your Certificates"
 msgstr "_Tanúsítványazonosító:"
 
-#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
+#: smime/gui/smime-ui.glade.h:46
+msgid "_Edit CA Trust"
+msgstr ""
+
+#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 #, fuzzy
 msgid "%d/%m/%Y"
 msgstr "%Y/%m/%d"
 
-#: smime/lib/e-cert.c:478
+#. x509 certificate usage types
+#: smime/lib/e-cert.c:424
+#, fuzzy
+msgid "Sign"
+msgstr "Stauning"
+
+#: smime/lib/e-cert.c:425
+#, fuzzy
+msgid "Encrypt"
+msgstr "PGP titkosítás"
+
+#: smime/lib/e-cert.c:530
 #, fuzzy
 msgid "Version"
 msgstr "Vermont"
 
-#: smime/lib/e-cert.c:493
+#: smime/lib/e-cert.c:545
 #, fuzzy
 msgid "Version 1"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:496
+#: smime/lib/e-cert.c:548
 #, fuzzy
 msgid "Version 2"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:499
+#: smime/lib/e-cert.c:551
 #, fuzzy
 msgid "Version 3"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:581
+#: smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:584
+#: smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:587
+#: smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:590
+#: smime/lib/e-cert.c:642
 #, fuzzy
 msgid "C"
 msgstr "°C"
 
-#: smime/lib/e-cert.c:593
+#: smime/lib/e-cert.c:645
 #, fuzzy
 msgid "CN"
 msgstr "É"
 
-#: smime/lib/e-cert.c:596
+#: smime/lib/e-cert.c:648
 msgid "OU"
 msgstr ""
 
-#: smime/lib/e-cert.c:599
+#: smime/lib/e-cert.c:651
 #, fuzzy
 msgid "O"
 msgstr "OK"
 
-#: smime/lib/e-cert.c:602
+#: smime/lib/e-cert.c:654
 msgid "L"
 msgstr ""
 
-#: smime/lib/e-cert.c:605
+#: smime/lib/e-cert.c:657
 #, fuzzy
 msgid "DN"
 msgstr "É"
 
-#: smime/lib/e-cert.c:608
+#: smime/lib/e-cert.c:660
 msgid "DC"
 msgstr ""
 
-#: smime/lib/e-cert.c:611
+#: smime/lib/e-cert.c:663
 #, fuzzy
 msgid "ST"
 msgstr "SMTP"
 
-#: smime/lib/e-cert.c:614
+#: smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:617
+#: smime/lib/e-cert.c:669
 #, fuzzy
 msgid "Certificate Key Usage"
 msgstr "Visszavont Tanúsítvány"
 
-#: smime/lib/e-cert.c:620
+#: smime/lib/e-cert.c:672
 msgid "Netscape Certificate Type"
 msgstr ""
 
-#: smime/lib/e-cert.c:623
+#: smime/lib/e-cert.c:675
 #, fuzzy
 msgid "Certificate Authority Key Identifier"
 msgstr "Nem megbízható tanúsítvány"
 
-#: smime/lib/e-cert.c:626
+#: smime/lib/e-cert.c:678
 #, fuzzy
 msgid "UID"
 msgstr "Azonosító"
 
-#: smime/lib/e-cert.c:635
+#: smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr ""
 
-#: smime/lib/e-cert.c:686
+#: smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:694
+#: smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
 msgstr ""
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:768
 msgid "Subject Public Key Info"
 msgstr ""
 
-#: smime/lib/e-cert.c:721
+#: smime/lib/e-cert.c:773
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:736
+#: smime/lib/e-cert.c:788
 #, fuzzy
 msgid "Subject's Public Key"
 msgstr "A téma %s"
 
-#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
+#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
 #, fuzzy
 msgid "Error: Unable to process extension"
 msgstr "Nem sikerült feldolgozni a spool mappát"
 
-#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
+#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:782
+#: smime/lib/e-cert.c:834
 #, fuzzy
 msgid "SSL Certificate Authority"
 msgstr "Érvénytelen hitelesítésszolgáltató (CA)"
 
-#: smime/lib/e-cert.c:786
+#: smime/lib/e-cert.c:838
 #, fuzzy
 msgid "Email Certificate Authority"
 msgstr "Érvénytelen hitelesítésszolgáltató (CA)"
 
-#: smime/lib/e-cert.c:814
+#: smime/lib/e-cert.c:866
 #, fuzzy
 msgid "Signing"
 msgstr "Stauning"
 
-#: smime/lib/e-cert.c:818
+#: smime/lib/e-cert.c:870
 #, fuzzy
 msgid "Non-repudiation"
 msgstr "Nincs információ"
 
-#: smime/lib/e-cert.c:822
+#: smime/lib/e-cert.c:874
 msgid "Key Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:826
+#: smime/lib/e-cert.c:878
 #, fuzzy
 msgid "Data Encipherment"
 msgstr "melléklet"
 
-#: smime/lib/e-cert.c:830
+#: smime/lib/e-cert.c:882
 msgid "Key Agreement"
 msgstr ""
 
-#: smime/lib/e-cert.c:834
+#: smime/lib/e-cert.c:886
 #, fuzzy
 msgid "Certificate Signer"
 msgstr "Tanúsítványaláírás-hiba"
 
-#: smime/lib/e-cert.c:838
+#: smime/lib/e-cert.c:890
 msgid "CRL Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:938
 #, fuzzy
 msgid "Critical"
 msgstr "Curitiba"
 
-#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
+#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
 #, fuzzy
 msgid "Not Critical"
 msgstr "Észak-Carolina"
 
-#: smime/lib/e-cert.c:912
+#: smime/lib/e-cert.c:964
 #, fuzzy
 msgid "Extensions"
 msgstr "Kifejezés"
 
-#: smime/lib/e-cert.c:983
+#: smime/lib/e-cert.c:1035
 #, fuzzy, c-format
 msgid "%s = %s"
 msgstr "%s %s-kor"
 
-#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
 #, fuzzy
 msgid "Certificate Signature Algorithm"
 msgstr "Tanúsítványaláírás-hiba"
 
-#: smime/lib/e-cert.c:1048
+#: smime/lib/e-cert.c:1100
 #, fuzzy
 msgid "Issuer"
 msgstr "_Beszúrás"
 
-#: smime/lib/e-cert.c:1102
+#: smime/lib/e-cert.c:1154
 msgid "Issuer Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1121
+#: smime/lib/e-cert.c:1173
 #, fuzzy
 msgid "Subject Unique ID"
 msgstr "A téma %s"
 
-#: smime/lib/e-cert.c:1164
+#: smime/lib/e-cert.c:1216
 #, fuzzy
 msgid "Certificate Signature Value"
 msgstr "Tanúsítványaláírás-hiba"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
+#: smime/lib/e-cert-db.c:608
 #, fuzzy
 msgid "Certificate already exists"
 msgstr "A kártyaazonosító már létezik"
@@ -18084,7 +17582,7 @@ msgstr "Az aktuális névjegy megtekintése"
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "_Műveletek"
 
@@ -18252,7 +17750,7 @@ msgstr "_Bezárás"
 #: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:3
+#: ui/evolution.xml.h:4
 msgid "Close"
 msgstr "Bezárás"
 
@@ -18265,7 +17763,7 @@ msgid "Delete this item"
 msgstr "Elem törlése"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr "Fő eszköztár"
 
@@ -18308,7 +17806,7 @@ msgstr "Elem mentése lemezre"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:44
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "_File"
 msgstr "_Fájl"
 
@@ -18571,13 +18069,13 @@ msgstr "Kijelölés meg_fordítása"
 msgid "_Threaded Message List"
 msgstr "_Téma szerinti levéllista"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Az aktuális ablak bezárása"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "_Close"
 msgstr "_Bezárás"
 
@@ -18987,7 +18485,7 @@ msgstr "_Előző levél"
 msgid "_Quoted"
 msgstr "_Idézetként"
 
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
 msgid "_Tools"
 msgstr "_Eszközök"
 
@@ -19290,108 +18788,122 @@ msgid "_Open Task"
 msgstr "Új feladat"
 
 #: ui/evolution.xml.h:1
-msgid "About Ximian Evolution..."
-msgstr "A Ximian Evolution névjegye..."
+#, fuzzy
+msgid "About Evolution..."
+msgstr "A Ximian Evolution névjegye"
 
 #: ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
 msgstr "Az Evolution beállításainak szerkesztése"
 
-#: ui/evolution.xml.h:5
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the visibility of the toolbar"
+msgstr "Mappa tulajdonságainak megváltoztatása"
+
+#: ui/evolution.xml.h:6
 msgid "Create a new window displaying this folder"
 msgstr "Új ablak megnyitása ehhez a mappához"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "_Kilépés"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Ximian Evolution _GYIK"
+
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Kilépés a programból"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:10
 msgid "Forget _Passwords"
 msgstr "_Jelszavak elfelejtése"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:11
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Elfelejti a megjegyzett jelszavakat, újra meg fogja kérdezni"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:12
 msgid "Import data from other programs"
 msgstr "Adatok importálása más programokból"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:14
 #, fuzzy
 msgid "New _Window"
 msgstr "_Keresés most"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Pi_lot Settings..."
 msgstr "_Pilot beállításai..."
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Send / Receive"
 msgstr "Küldés / Fogadás"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Send queued items and retrieve new items"
 msgstr "Várakozó elemek elküldése és az új elemek letöltése"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Set up Pilot configuration"
 msgstr "A Pilot beállítása"
 
-#: ui/evolution.xml.h:17
-msgid "Show information about Ximian Evolution"
+#: ui/evolution.xml.h:19
+#, fuzzy
+msgid "Show information about Evolution"
 msgstr "A Ximian Evolution névjegyének megjelenítése"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:20
 msgid "Submit Bug Report"
 msgstr "Hibajelentés beküldése"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:21
 msgid "Submit _Bug Report"
 msgstr "_Hibajelentés beküldése"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Hibajelentés beküldése a Bug Buddy segítségével."
 
-#: ui/evolution.xml.h:21
-msgid "Toggle whether we are working offline."
-msgstr "Váltás kapcsolat nélküli munkára"
-
 #: ui/evolution.xml.h:23
-msgid "Ximian Evolution _FAQ"
-msgstr "Ximian Evolution _GYIK"
+#, fuzzy
+msgid "T_oolbar"
+msgstr "Fő eszköztár"
 
 #: ui/evolution.xml.h:24
-msgid "_About Ximian Evolution..."
-msgstr "A Ximian Evolution _névjegye..."
+msgid "Toggle whether we are working offline."
+msgstr "Váltás kapcsolat nélküli munkára"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "_About Evolution..."
+msgstr "A Ximian Evolution névjegye"
+
+#: ui/evolution.xml.h:30
 msgid "_Help"
 msgstr "_Súgó"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "_Import..."
 msgstr "_Importálás..."
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "_New"
 msgstr "Ú_j"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 #, fuzzy
 msgid "_Quick Reference"
 msgstr "Levelezés beállításai"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_Send / Receive"
 msgstr "_Küldés / Fogadás"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 #, fuzzy
 msgid "_Window"
 msgstr "_Keresés most"
@@ -19470,7 +18982,7 @@ msgid "With _Status"
 msgstr "Állapot beállítása"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:626
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:635
 msgid "UTC"
 msgstr "UTC"
 
@@ -19627,29 +19139,29 @@ msgstr "Egyéb..."
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
-#: widgets/misc/e-error.c:121
+#: widgets/misc/e-error.c:79 widgets/misc/e-error.c:80
+#: widgets/misc/e-error.c:122
 msgid "Evolution Error"
 msgstr "Evolution hiba"
 
-#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
-#: widgets/misc/e-error.c:119
+#: widgets/misc/e-error.c:81 widgets/misc/e-error.c:82
+#: widgets/misc/e-error.c:120
 #, fuzzy
 msgid "Evolution Warning"
 msgstr "Evolution Levelező"
 
-#: widgets/misc/e-error.c:118
+#: widgets/misc/e-error.c:119
 #, fuzzy
 msgid "Evolution Information"
 msgstr "Információ az értekezletről"
 
-#: widgets/misc/e-error.c:120
+#: widgets/misc/e-error.c:121
 #, fuzzy
 msgid "Evolution Query"
 msgstr "Evolution"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:410
+#: widgets/misc/e-error.c:415
 #, fuzzy, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -19802,16 +19314,515 @@ msgstr ""
 "Nem sikerült menteni: `%s'\n"
 "  %s"
 
-#: widgets/misc/e-task-widget.c:211
+#: widgets/misc/e-task-widget.c:212
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: widgets/misc/e-task-widget.c:216
+#: widgets/misc/e-task-widget.c:217
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% kész)"
 
+#~ msgid "Failed to connect to LDAP server"
+#~ msgstr "Nem sikerült kapcsolatba lépni az LDAP-kiszolgálóval."
+
+#~ msgid "Failed to authenticate with LDAP server"
+#~ msgstr "Nem sikerült bejelentkezni az LDAP-kiszolgálóra."
+
+#~ msgid "Could not perform query on Root DSE"
+#~ msgstr "A lekérdezést nem lehet elvégezni a DSE gyökérkönyvtárban."
+
+#~ msgid "The server responded with no supported search bases"
+#~ msgstr "A kiszolgáló nem támogatott keresési alapokkal válaszolt"
+
+#~ msgid "This server does not support LDAPv3 schema information"
+#~ msgstr "Ez a kiszolgáló nem támogatja az LDAPv3 mintájú információkat"
+
+#~ msgid "Error retrieving schema information"
+#~ msgstr "Hiba a sémainformációk betöltése közben"
+
+#~ msgid "Server did not respond with valid schema information"
+#~ msgstr "A kiszolgáló nem válaszolt érvényes sémainformációval."
+
+#~ msgid "  S_how Supported Bases "
+#~ msgstr "  _Támogatott típusok lekérdezése"
+
+#~ msgid "1:00"
+#~ msgstr "1:00"
+
+#~ msgid "5:00"
+#~ msgstr "5:00"
+
+#~ msgid "Connecting"
+#~ msgstr "Kapcsolódás"
+
+#~ msgid "Distinguished _name:"
+#~ msgstr "Megkülönböztető _név:"
+
+#~ msgid "Email address:"
+#~ msgstr "E-mail cím:"
+
+#~ msgid "Evolution will use this DN to authenticate you with the server"
+#~ msgstr ""
+#~ "Az Evolution ezt a megkülönböztető nevet használja majd hitelesítéshez a "
+#~ "kiszolgálón"
+
+#~ msgid "One"
+#~ msgstr "Egy"
+
+#~ msgid "S_earch scope: "
+#~ msgstr "Keresés _hatóköre: "
+
+#~ msgid "Searching"
+#~ msgstr "Keresés"
+
+#~ msgid "Sub"
+#~ msgstr "Al"
+
+#~ msgid "This option controls how long a search will be run."
+#~ msgstr "Itt határozhatod meg, hogy mennyi ideig tartson egy keresés."
+
+#~ msgid "U_se SSL/TLS:"
+#~ msgstr "_SSL/TLS használata:"
+
+#~ msgid "_Display name:"
+#~ msgstr "_Megjelenítendő név:"
+
+#~ msgid "_Port number:"
+#~ msgstr "_Portszám:"
+
+#~ msgid "_Search base:"
+#~ msgstr "Keresés _kiindulópontja:"
+
+#~ msgid "_Server name:"
+#~ msgstr "_Kiszolgáló neve:"
+
+#~ msgid "_Timeout (minutes):"
+#~ msgstr "_Szundi idő (percek)"
+
+#~ msgid "connecting-tab"
+#~ msgstr "connecting-tab"
+
+#~ msgid "general-tab"
+#~ msgstr "general-tab"
+
+#~ msgid "searching-tab"
+#~ msgstr "searching-tab"
+
+#, fuzzy
+#~ msgid "Job title:"
+#~ msgstr "_Beosztás"
+
+#, fuzzy
+#~ msgid "Webcam:"
+#~ msgstr "Oldal"
+
+#~ msgid "Category editor not available."
+#~ msgstr "A kategóriaszerkesztő nem elérhető."
+
+#, fuzzy
+#~ msgid ""
+#~ "The following entries are invalid:\n"
+#~ "\n"
+#~ msgstr "Pillanatnyilag a következő kapcsolatok aktívak:"
+
+#~ msgid "Could not find widget for a field: `%s'"
+#~ msgstr "Nem található widget a mezőhöz: `%s'"
+
+#~ msgid "Do you want to save changes?"
+#~ msgstr "Mented a változtatásokat?"
+
+#~ msgid "Error saving %s: %s"
+#~ msgstr "Fájlmentési hiba %s: %s"
+
+#~ msgid ""
+#~ "The addressbook backend for\n"
+#~ "%s\n"
+#~ "has crashed. You will have to restart Evolution in order to use it again"
+#~ msgstr ""
+#~ "A %s-hez\n"
+#~ "kapcsolódó címjegyzék háttér\n"
+#~ "leállt. Újra kell indítanod az Evolution-t, hogy használni tudd ezt a "
+#~ "felületet"
+
+#, fuzzy
+#~ msgid "Can not load URI"
+#~ msgstr "A kártya nem található"
+
+#, fuzzy
+#~ msgid "Calendar Properties"
+#~ msgstr "iCalendar hiba"
+
+#, fuzzy
+#~ msgid "Remote"
+#~ msgstr "Eltávolítás"
+
+#, fuzzy
+#~ msgid "Task List Properties"
+#~ msgstr "Betűk beállításai"
+
+#, fuzzy
+#~ msgid "_Refresh Interval:"
+#~ msgstr "Lista frissítése"
+
+#, fuzzy
+#~ msgid "_Source URL:"
+#~ msgstr "POP forrás-URI"
+
+#~ msgid ""
+#~ "The event being deleted is a meeting, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "Az esemény, amit törlésre jelöltél, egy találkozó. Szeretnél küldeni egy "
+#~ "lemondási értesítést?"
+
+#~ msgid "Are you sure you want to cancel and delete this meeting?"
+#~ msgstr "Tényleg törölni akarod ezt az értekezletet?"
+
+#~ msgid ""
+#~ "The task being deleted is assigned, would you like to send a cancellation "
+#~ "notice?"
+#~ msgstr ""
+#~ "A törlésre jelölt feladat elvégzésében más is részt vesz. Szeretnél "
+#~ "küldeni egy törlési értesítést?"
+
+#~ msgid "Are you sure you want to cancel and delete this task?"
+#~ msgstr "Tényleg törölni akarod ezt a feladatot?"
+
+#~ msgid ""
+#~ "The journal entry being deleted is published, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "A kitörlésre jelölt naplóbejegyzés publikus. Szeretnél küldeni egy "
+#~ "érvénytelenítő értesítést?"
+
+#~ msgid "Are you sure you want to cancel and delete this journal entry?"
+#~ msgstr "Tényleg törölni akarod ezt a naplóbejegyzést?"
+
+#~ msgid "Are you sure you want to delete the appointment `%s'?"
+#~ msgstr "Tényleg törölni akarod ezt a találkozót: '%s'?"
+
+#~ msgid "Are you sure you want to delete this untitled appointment?"
+#~ msgstr "Tényleg törölni akarod ezt a névtelen találkozót?"
+
+#~ msgid "Are you sure you want to delete the task `%s'?"
+#~ msgstr "Tényleg törölni akarod ezt a feladatot: '%s'?"
+
+#~ msgid "Are you sure you want to delete this untitled task?"
+#~ msgstr "Tényleg törölni akarod ezt a névtelen feladatot?"
+
+#~ msgid "Are you sure you want to delete the journal entry `%s'?"
+#~ msgstr "Tényleg törölni akarod ezt a naplóbejegyzést: '%s'?"
+
+#~ msgid "Are you sure want to delete this untitled journal entry?"
+#~ msgstr "Tényleg törölni akarod ezt a névtelen naplóbejegyzést?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d appointment?"
+#~ msgid_plural "Are you sure you want to delete %d appointments?"
+#~ msgstr[0] "Tényleg törölni akarsz %d találkozót?"
+#~ msgstr[1] "Tényleg törölni akarsz %d találkozót?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d task?"
+#~ msgid_plural "Are you sure you want to delete %d tasks?"
+#~ msgstr[0] "Tényleg törölni akarsz %d feladatot?"
+#~ msgstr[1] "Tényleg törölni akarsz %d feladatot?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d journal entry?"
+#~ msgid_plural "Are you sure you want to delete %d journal entries?"
+#~ msgstr[0] "Tényleg törölni akarsz %d naplóbejegyzést?"
+#~ msgstr[1] "Tényleg törölni akarsz %d naplóbejegyzést?"
+
+#~ msgid "_Invite Others..."
+#~ msgstr "_Mások meghívása..."
+
+#~ msgid ""
+#~ "This event has been changed, but has not been saved.\n"
+#~ "\n"
+#~ "Do you wish to save your changes?"
+#~ msgstr ""
+#~ "Az esemény megváltozott, de nem lett mentve.\n"
+#~ "\n"
+#~ "Akarod menteni a változásaidat?"
+
+#~ msgid "_Discard Changes"
+#~ msgstr "_Változások elvetése"
+
+#~ msgid "Save Event"
+#~ msgstr "Esemény mentése"
+
+#~ msgid "The meeting information has been created. Send it?"
+#~ msgstr "Az értekezlet adatai létrejöttek. Elküldöd?"
+
+#~ msgid "The meeting information has changed. Send an updated version?"
+#~ msgstr ""
+#~ "Az értekezlet adatai megváltoztak. Küldesz egy frissített változatot?"
+
+#~ msgid "The task assignment information has been created. Send it?"
+#~ msgstr "A feladat adatai létrejöttek. Elküldöd?"
+
+#~ msgid "The task information has changed. Send an updated version?"
+#~ msgstr "A feladat adatai megváltoztak. Küldesz egy frissített változatot?"
+
+#, fuzzy
+#~ msgid "Could not get article %s from NNTP server"
+#~ msgstr "Nem sikerült elindítani a wombat kiszolgálót"
+
+#, fuzzy
+#~ msgid "Error posting message: %s: message not posted"
+#~ msgstr ""
+#~ "Hiba a levelek automatikus mentése közben: %s\n"
+#~ " %s"
+
+#, fuzzy
+#~ msgid "Stream error"
+#~ msgstr "értelmezési hiba"
+
+#, fuzzy
+#~ msgid "Connection error: %s"
+#~ msgstr "Ismeretlen hiba: %s"
+
+#~ msgid "Could not get group: %s"
+#~ msgstr "Nem sikerült a csoportot letölteni: %s"
+
+#, fuzzy
+#~ msgid "Could not get messages: unspecified error"
+#~ msgstr "Nem sikerült elküldeni a levelet: %s"
+
+#~ msgid "Unknown server response: %s"
+#~ msgstr "Ismeretlen válasz a kiszolgálótól: %s"
+
+#~ msgid "Adjust Score"
+#~ msgstr "Pontszám beállítása"
+
+#~ msgid "Assign Color"
+#~ msgstr "Szín hozzárendelése"
+
+#~ msgid "Assign Score"
+#~ msgstr "Pontszám hozzárendelése"
+
+#~ msgid "Attachments"
+#~ msgstr "Mellékletek"
+
+#~ msgid "Beep"
+#~ msgstr "Hangjelzés"
+
+#~ msgid "contains"
+#~ msgstr "tartalmazza"
+
+#~ msgid "Copy to Folder"
+#~ msgstr "Mappába másolás"
+
+#~ msgid "Date received"
+#~ msgstr "Fogadás dátuma"
+
+#~ msgid "Date sent"
+#~ msgstr "Küldés dátuma"
+
+#~ msgid "Deleted"
+#~ msgstr "Törölt"
+
+#~ msgid "does not contain"
+#~ msgstr "nem tartalmazza"
+
+#~ msgid "does not end with"
+#~ msgstr "nem végződik"
+
+#~ msgid "does not exist"
+#~ msgstr "nem létezik"
+
+#~ msgid "does not return"
+#~ msgstr "nem tér vissza"
+
+#~ msgid "does not sound like"
+#~ msgstr "nem úgy hangzik, mint"
+
+#~ msgid "does not start with"
+#~ msgstr "nincs az elején"
+
+#~ msgid "Do Not Exist"
+#~ msgstr "Nem létezik"
+
+#~ msgid "Draft"
+#~ msgstr "Piszkozat"
+
+#~ msgid "ends with"
+#~ msgstr "végződik"
+
+#~ msgid "Exist"
+#~ msgstr "Létezik"
+
+#~ msgid "exists"
+#~ msgstr "létezik"
+
+#~ msgid "Expression"
+#~ msgstr "Kifejezés"
+
+#~ msgid "Follow Up"
+#~ msgstr "Nyomon követés"
+
+#~ msgid "is"
+#~ msgstr "="
+
+#~ msgid "is after"
+#~ msgstr "után volt"
+
+#~ msgid "is before"
+#~ msgstr "előtte volt"
+
+#~ msgid "is Flagged"
+#~ msgstr "megjelölt"
+
+#~ msgid "is greater than"
+#~ msgstr "nagyobb mint"
+
+#~ msgid "is less than"
+#~ msgstr "kisebb mint"
+
+#~ msgid "is not"
+#~ msgstr "nem"
+
+#~ msgid "is not Flagged"
+#~ msgstr "nem megjelölt"
+
+#, fuzzy
+#~ msgid "Junk Test"
+#~ msgstr "június"
+
+#~ msgid "Mailing list"
+#~ msgstr "Levelezőlista"
+
+#~ msgid "Message Body"
+#~ msgstr "Levéltörzs"
+
+#~ msgid "Message Header"
+#~ msgstr "Levél fejléce"
+
+#, fuzzy
+#~ msgid "Message is Junk"
+#~ msgstr "Üzenetek"
+
+#, fuzzy
+#~ msgid "Message is not Junk"
+#~ msgstr "Küldendő üzenet"
+
+#~ msgid "Move to Folder"
+#~ msgstr "Áthelyezés mappába"
+
+#, fuzzy
+#~ msgid "Pipe to Program"
+#~ msgstr "Kilépés a programból"
+
+#~ msgid "Play Sound"
+#~ msgstr "Hangjelzés"
+
+#~ msgid "Recipients"
+#~ msgstr "Címzettek"
+
+#~ msgid "Regex Match"
+#~ msgstr "Regex illeszkedés"
+
+#~ msgid "Replied to"
+#~ msgstr "Válasz"
+
+#~ msgid "returns"
+#~ msgstr "visszatér"
+
+#~ msgid "returns greater than"
+#~ msgstr "visszatér nagyobb mint"
+
+#~ msgid "returns less than"
+#~ msgstr "visszatér kisebb mint"
+
+#, fuzzy
+#~ msgid "Run Program"
+#~ msgstr "Program futtatása:"
+
+#~ msgid "Sender"
+#~ msgstr "Feladó"
+
+#~ msgid "Set Status"
+#~ msgstr "Állapot beállítása"
+
+#~ msgid "Size (kB)"
+#~ msgstr "Méret (kB)"
+
+#~ msgid "sounds like"
+#~ msgstr "úgy hangzik, mint"
+
+#~ msgid "Source Account"
+#~ msgstr "Forráspostafiók"
+
+#~ msgid "Specific header"
+#~ msgstr "Adott fejléc"
+
+#~ msgid "starts with"
+#~ msgstr "kezdete"
+
+#~ msgid "Stop Processing"
+#~ msgstr "Feldolgozás leállítása"
+
+#~ msgid "Unset Status"
+#~ msgstr "Állapot nincs beállítva"
+
+#~ msgid "Working"
+#~ msgstr "Várj"
+
+#~ msgid "Brought to you by"
+#~ msgstr "Készítették:"
+
+#, fuzzy
+#~ msgid "_Filename:"
+#~ msgstr "Fájlnév:"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "Unknown error."
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Ismeretlen hiba."
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the component system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "A komponensrendszer által adott hiba:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the activation system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Az aktiválórendszer által adott hiba:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "View Certificate"
+#~ msgstr "_Tanúsítványazonosító:"
+
+#, fuzzy
+#~ msgid "You have been asked to trust a new Certificate Authority (CA)."
+#~ msgstr "Érvénytelen hitelesítésszolgáltató (CA)"
+
+#~ msgid "About Ximian Evolution..."
+#~ msgstr "A Ximian Evolution névjegye..."
+
+#~ msgid "_About Ximian Evolution..."
+#~ msgstr "A Ximian Evolution _névjegye..."
+
 #~ msgid "Evolution Addressbook folder viewer"
 #~ msgstr "Evolution Címjegyzék mappanéző"
 
@@ -20111,9 +20122,6 @@ msgstr "%s (%d%% kész)"
 #~ msgid "Primary _email:"
 #~ msgstr "Elsődleges _e-mail:"
 
-#~ msgid "S_pouse:"
-#~ msgstr "Háza_stárs:"
-
 #~ msgid "_Business:"
 #~ msgstr "Ü_zleti:"
 
@@ -20129,9 +20137,6 @@ msgstr "%s (%d%% kész)"
 #~ msgid "_Mobile:"
 #~ msgstr "_Mobil:"
 
-#~ msgid "_Office:"
-#~ msgstr "_Hivatal:"
-
 #~ msgid "_Public Calendar URL:"
 #~ msgstr "_Nyilvános naptár URL:"
 
@@ -25165,9 +25170,6 @@ msgstr "%s (%d%% kész)"
 #~ msgid "Lannion"
 #~ msgstr "Lannion"
 
-#~ msgid "Lansing"
-#~ msgstr "Lansing"
-
 #~ msgid "Lanzhou"
 #~ msgstr "Lanzhou"
 
diff --git a/po/is.po b/po/is.po
index 1f0089b0c0..9a710798ec 100644
--- a/po/is.po
+++ b/po/is.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2004-05-19 14:00-0400\n"
+"POT-Creation-Date: 2004-06-03 11:14-0400\n"
 "PO-Revision-Date: 2004-03-13 14:31-0000\n"
 "Last-Translator: helgi <helgi@trance.is>\n"
 "Language-Team: Icelandic <gnome@techattack.nu>\n"
@@ -54,13 +54,13 @@ msgstr ""
 msgid "Default Sync Address:"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:1150
 #: addressbook/conduit/address-conduit.c:1151
+#: addressbook/conduit/address-conduit.c:1152
 msgid "Could not load addressbook"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:1219
-#: addressbook/conduit/address-conduit.c:1222
+#: addressbook/conduit/address-conduit.c:1220
+#: addressbook/conduit/address-conduit.c:1223
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
@@ -68,13 +68,13 @@ msgstr ""
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
 msgid "Failed to authenticate.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sLykilorð fyrir %s (notandann %s)"
@@ -115,45 +115,17 @@ msgstr ""
 msgid "Create a new contacts group"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-component.c:182
+#: addressbook/gui/component/addressbook-component.c:184
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:483
-msgid "Failed to connect to LDAP server"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:507
-msgid "Failed to authenticate with LDAP server"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:535
-msgid "Could not perform query on Root DSE"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:840
-msgid "The server responded with no supported search bases"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1245
-msgid "This server does not support LDAPv3 schema information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1266
-msgid "Error retrieving schema information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1274
-msgid "Server did not respond with valid schema information"
-msgstr ""
-
 #: addressbook/gui/component/addressbook-migrate.c:68
-#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1160
 msgid "Migrating..."
 msgstr ""
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1201
 #, c-format
 msgid "Migrating `%s':"
 msgstr ""
@@ -161,7 +133,7 @@ msgstr ""
 #  create the local source group
 #  On This Computer is always first and VFolders is always last
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:438
+#: addressbook/gui/component/addressbook-migrate.c:464
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
 #: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
@@ -171,28 +143,28 @@ msgstr ""
 #  Create the default Person addressbook
 #  orange
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:446
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
-#: mail/mail-config.glade.h:106
+#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
+#: mail/mail-config.glade.h:109
 msgid "Personal"
 msgstr ""
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:454
+#: addressbook/gui/component/addressbook-migrate.c:480
 msgid "On LDAP Servers"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:582
+#: addressbook/gui/component/addressbook-migrate.c:608
 msgid "LDAP Servers"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:702
+#: addressbook/gui/component/addressbook-migrate.c:728
 msgid "Autocompletion Settings"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1076
+#: addressbook/gui/component/addressbook-migrate.c:1104
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -200,60 +172,55 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1090
+#: addressbook/gui/component/addressbook-migrate.c:1118
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1099
+#: addressbook/gui/component/addressbook-migrate.c:1127
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1109
+#: addressbook/gui/component/addressbook-migrate.c:1137
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:674
+#: addressbook/gui/component/addressbook-view.c:675
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:761
+#: addressbook/gui/component/addressbook-view.c:754
 #, fuzzy
 msgid "New Address Book"
 msgstr "_Heimilisfang:"
 
-#: addressbook/gui/component/addressbook-view.c:762
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
+#: addressbook/gui/component/addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Eyða"
 
-#: addressbook/gui/component/addressbook-view.c:763
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-view.c:756
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Stillingar..."
 
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/addressbook-view.c:1002
+#. Create the contacts group
+#: addressbook/gui/component/addressbook-view.c:995
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
 #: calendar/gui/migration.c:373
 msgid "Contacts"
 msgstr ""
@@ -329,10 +296,6 @@ msgid "Manage your S/MIME certificates here"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-msgid "  S_how Supported Bases "
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -347,378 +310,307 @@ msgstr ""
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1:00"
-msgstr "1:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
-msgstr "5:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "<b>Authentication</b>"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Display</b>"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "<b>Downloading</b>"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:10
 #, fuzzy
 msgid "<b>Searching</b>"
 msgstr "Leita"
 
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:11
 msgid "<b>Server Information</b>"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
 msgid "<b>Type:</b>"
 msgstr "Forsýn:"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add Contacts Group"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Address Book Properties"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
-#: mail/mail-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
+#: mail/mail-config.glade.h:42
 msgid "Always"
 msgstr "Ávallt"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:17
 #: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:21
-msgid "Connecting"
-msgstr "Tengist"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 #: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:23
-msgid "Distinguished _name:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Email address"
 msgstr "_Heimilisfang:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "Email address:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "Evolution will use this DN to authenticate you with the server"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid ""
-"Evolution will use this email address to authenticate you with the server"
+"Evolution will use this email address to authenticate you with the server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Find Possible Search Bases"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:31
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:24
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
+#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Almennt"
 
-#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
-#: mail/mail-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
+#: mail/mail-config.glade.h:102
 msgid "Never"
 msgstr "Aldrei"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
-msgid "One"
-msgstr "Einn"
-
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:35
-msgid "S_earch scope: "
-msgstr ""
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Search _base:"
+msgstr "_Leita"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:28
 msgid "Search base only"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:29
 #, fuzzy
 msgid "Search base:"
 msgstr "_Leita"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Search scope:"
 msgstr "_Leita"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
-msgid "Searching"
-msgstr "Leita"
-
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:31
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
-"server if\n"
-"your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL or TLS."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a \n"
-"insecure environment. For example, if you and your LDAP server are behind a "
-"firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection "
-"is already\n"
-"secure."
+"you are in a insecure environment. For example, if you and your LDAP server "
+"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
+"because your connection is already secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
-"TLS.  This \n"
-"means that your connection will be insecure, and that you will be vulnerable "
-"to security\n"
-"exploits. "
+"TLS.  This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Sub"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
-"searches will \n"
-"begin. If you leave this blank, the search will begin at the root of the "
-"directory tree."
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
-"the \n"
-"directory tree. A search scope of \"sub\" will include all entries below "
-"your search base.\n"
-"A search scope of \"one\" will only include the entries one level beneath "
-"your base.\n"
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:58
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
-"This is the maximum number of entries to download. Setting this number to "
-"be \n"
+"This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:41
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
-"list.\n"
-"It is for display purposes only. "
+"list. It is for display purposes only. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. "
-"A \n"
-"list of standard ports has been provided. Ask your system administrator\n"
-"what port you should specify."
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:67
-msgid "This option controls how long a search will be run."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:43
 #, fuzzy
 msgid "Timeout:"
 msgstr "Tími"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
-msgid "U_se SSL/TLS:"
-msgstr "_Nota SSL/TLS:"
-
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
-#: mail/mail-config.glade.h:154
+#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
+#: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:47
 msgid "_Add Contacts Group"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:74
-#: calendar/gui/dialogs/calendar-setup.glade.h:12
-msgid "_Display name:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
 msgid "_Email address:"
 msgstr "_Heimilisfang:"
 
-#: addressbook/gui/component/ldap-config.glade.h:77
-msgid "_Log in method:"
+#: addressbook/gui/component/ldap-config.glade.h:50
+msgid "_Find Possible Search Bases"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
-msgid "_Name:"
+#: addressbook/gui/component/ldap-config.glade.h:51
+msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:79
-msgid "_Port number:"
+#: addressbook/gui/component/ldap-config.glade.h:52
+msgid "_Log in:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
-msgid "_Port:"
+#: addressbook/gui/component/ldap-config.glade.h:53
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
+msgid "_Name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:81
-msgid "_Search base:"
+#: addressbook/gui/component/ldap-config.glade.h:54
+msgid "_Port:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:82
-msgid "_Server name:"
-msgstr ""
+#: addressbook/gui/component/ldap-config.glade.h:55
+#, fuzzy
+msgid "_Search scope:"
+msgstr "_Leita"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:56
 #, fuzzy
 msgid "_Server:"
 msgstr "Aldrei"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
-msgid "_Timeout (minutes):"
-msgstr ""
+#: addressbook/gui/component/ldap-config.glade.h:57
+#, fuzzy
+msgid "_Timeout:"
+msgstr "Tími"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:58
 msgid "_Use secure connection:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:87
-msgid "connecting-tab"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:88
-msgid "general-tab"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:60
 #: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
-#: mail/mail-config.glade.h:182
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "mínútur"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
-msgid "searching-tab"
-msgstr ""
-
-#: addressbook/gui/component/select-names/e-select-names.c:497
+#: addressbook/gui/component/select-names/e-select-names.c:503
 #: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid "Select Contacts from Address Book"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
@@ -758,7 +650,7 @@ msgstr ""
 
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:222
+#: addressbook/gui/widgets/e-addressbook-view.c:224
 msgid "Source"
 msgstr ""
 
@@ -827,9 +719,9 @@ msgid "<b>Work</b>"
 msgstr "Forsýn:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
-#: addressbook/gui/widgets/eab-contact-display.c:342
-#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/widgets/eab-contact-display.c:334
+#: addressbook/gui/widgets/eab-contact-display.c:353
 msgid "AIM"
 msgstr "AIM"
 
@@ -867,15 +759,15 @@ msgid "Company:"
 msgstr "Afrita"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:271
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
+#: addressbook/gui/contact-editor/e-contact-editor.c:266
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1527
+#: addressbook/gui/contact-editor/e-contact-editor.c:520
 msgid "Contact Editor"
 msgstr ""
 
@@ -897,72 +789,67 @@ msgid "Full _Name..."
 msgstr "Fullt _Nafn:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:202
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-msgid "Home"
+msgid "Home Page:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:26
-msgid "Home Page:"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
+msgid "MSN Messenger"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:27
 #, fuzzy
-msgid "Job title:"
-msgstr "Starfs Titill"
+msgid "Mailing Address"
+msgstr "_Heimilisfang:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/e-itip-control.c:936
-msgid "Location:"
+msgid "Manager:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:66
-msgid "MSN Messenger"
+msgid "Ni_ckname:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:30
-#, fuzzy
-msgid "Mailing Address"
-msgstr "_Heimilisfang:"
+msgid "Notes:"
+msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:31
-msgid "Manager:"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:63
+msgid "Novell Groupwise"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:32
-msgid "Ni_ckname:"
+msgid "Office:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:33
-msgid "Notes:"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:63
-msgid "Novell Groupwise"
+msgid "PO Box:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:35
-#: addressbook/gui/contact-editor/e-contact-editor.c:203
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-msgid "Other"
-msgstr "Annað"
+msgid "Personal Information"
+msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:36
-msgid "PO Box:"
+msgid "Profession:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+msgid "Spouse:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:38
-msgid "Personal Information"
+msgid "State/Province:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:39
-msgid "Profession:"
-msgstr ""
+#, fuzzy
+msgid "Title:"
+msgstr "Starfs Titill"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:40
-msgid "State/Province:"
+msgid "Video Chat:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:41
@@ -970,16 +857,17 @@ msgid "Wants to receive HTML mail"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:42
-msgid "Webcam:"
-msgstr ""
+#, fuzzy
+msgid "Web Log:"
+msgstr "Síða"
 
 #  red
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
-#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
-#: mail/mail-config.glade.h:155
+#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
+#: mail/mail-config.glade.h:157
 msgid "Work"
 msgstr "Vinna"
 
@@ -996,40 +884,33 @@ msgid "_File under:"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "_Where:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
-msgid "item7"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
-msgid "item8"
-msgstr ""
-
-#: addressbook/gui/contact-editor/eab-editor.c:316
+#: addressbook/gui/contact-editor/eab-editor.c:315
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/eab-editor.c:319
+#: addressbook/gui/contact-editor/eab-editor.c:318
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:351
-#: addressbook/gui/widgets/eab-contact-display.c:372
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Address"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:292
+#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard.c:174
@@ -2007,82 +1888,104 @@ msgstr ""
 msgid "Zimbabwe"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/contact-editor/e-contact-editor.c:179
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:337
+#: addressbook/gui/widgets/eab-contact-display.c:356
 msgid "Jabber"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:347
-#: addressbook/gui/widgets/eab-contact-display.c:366
+#: addressbook/gui/contact-editor/e-contact-editor.c:180
+#: addressbook/gui/widgets/eab-contact-display.c:339
+#: addressbook/gui/widgets/eab-contact-display.c:358
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: addressbook/gui/widgets/eab-contact-display.c:338
+#: addressbook/gui/widgets/eab-contact-display.c:357
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:344
-#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#: addressbook/gui/widgets/eab-contact-display.c:355
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/contact-editor/e-contact-editor.c:183
 msgid "GroupWise"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+msgid "Home"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+msgid "Other"
+msgstr "Annað"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
 msgid "Source Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:264
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:278
+#: addressbook/gui/contact-editor/e-contact-editor.c:273
 msgid "Is New Contact"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:285
+#: addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Writable Fields"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:299
+#: addressbook/gui/contact-editor/e-contact-editor.c:294
 msgid "Changed"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
-msgid "Category editor not available."
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:2352
 msgid "This contact belongs to these categories:"
 msgstr ""
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#: addressbook/gui/contact-editor/e-contact-editor.c:2429
 msgid "Please select an image for this contact"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#: addressbook/gui/contact-editor/e-contact-editor.c:2433
 msgid "No image"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#: addressbook/gui/contact-editor/e-contact-editor.c:2636
 msgid ""
-"The following entries are invalid:\n"
+"The contact data is invalid:\n"
 "\n"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2738
-#, c-format
-msgid "Could not find widget for a field: `%s'"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+msgid "Invalid contact."
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+msgid ""
+"The contact cannot be saved to the selected address book. Do you want to "
+"discard changes?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2727
+#: addressbook/gui/contact-editor/e-contact-editor.c:2751
+msgid "_Discard"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+msgid ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:62
@@ -2116,7 +2019,7 @@ msgid "_Edit Full"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:166
 msgid "_Full Name:"
 msgstr "_Fullt Nafn"
 
@@ -2261,30 +2164,30 @@ msgstr ""
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "contact-list-editor"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:153
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:215
+#: addressbook/gui/widgets/e-addressbook-view.c:217
 #: addressbook/gui/widgets/e-minicard-view.c:460
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Bók"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
 msgid "Is New List"
 msgstr ""
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:215
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
 msgid "Contact List Editor"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:438
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
 msgid "Save List as VCard"
 msgstr ""
 
@@ -2327,144 +2230,144 @@ msgstr ""
 msgid "Advanced Search"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:129
-#: addressbook/gui/widgets/eab-contact-display.c:192
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:139
-#: addressbook/gui/widgets/eab-contact-display.c:205
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:257
-#: addressbook/gui/widgets/eab-contact-display.c:533
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:525
 msgid "List Members"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:329
-#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/eab-contact-display.c:321
+#: addressbook/gui/widgets/eab-contact-display.c:323
 msgid "E-mail"
 msgstr "E-mail"
 
-#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/eab-contact-display.c:332
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "Position"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:354
 msgid "Groupwise"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:340
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:349
-#: addressbook/gui/widgets/eab-contact-display.c:370
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:342
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:354
+#: addressbook/gui/widgets/eab-contact-display.c:346
 msgid "work"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:359
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:368
-#: addressbook/gui/widgets/eab-contact-display.c:587
+#: addressbook/gui/widgets/eab-contact-display.c:360
+#: addressbook/gui/widgets/eab-contact-display.c:579
 msgid "Blog"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/eab-contact-display.c:363
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:375
+#: addressbook/gui/widgets/eab-contact-display.c:367
 msgid "personal"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/eab-contact-display.c:374
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:548
+#: addressbook/gui/widgets/eab-contact-display.c:540
 msgid "Job Title"
 msgstr "Starfs Titill"
 
-#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/eab-contact-display.c:544
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:774
+#: smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "Email"
 
-#: addressbook/gui/widgets/eab-contact-display.c:579
+#: addressbook/gui/widgets/eab-contact-display.c:571
 msgid "Home page"
 msgstr ""
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 msgid "Success"
 msgstr ""
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Backend busy"
 msgstr ""
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Repository offline"
 msgstr ""
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Address Book does not exist"
 msgstr ""
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "No Self Contact defined"
 msgstr ""
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Permission denied"
 msgstr ""
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Contact not found"
 msgstr ""
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Contact ID already exists"
 msgstr ""
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Protocol not supported"
 msgstr ""
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:60
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:233
 #: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
@@ -2477,66 +2380,62 @@ msgid "Cancelled"
 msgstr ""
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Could not cancel"
 msgstr ""
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Authentication Failed"
 msgstr ""
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Authentication Required"
 msgstr ""
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:66
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "TLS not Available"
 msgstr ""
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#: addressbook/gui/widgets/eab-gui-util.c:66
 msgid "No such source"
 msgstr ""
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:69
+#: addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Other error"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:90
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:110
+#: addressbook/gui/widgets/eab-gui-util.c:97
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:102
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution you must compile the program from the CVS "
-"sources after retrieving OpenLDAP from the link below."
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:109
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "Unable to open addressbook"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:162
+#: addressbook/gui/widgets/eab-gui-util.c:129
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2544,7 +2443,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:168
+#: addressbook/gui/widgets/eab-gui-util.c:135
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -2552,110 +2451,97 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:174
+#: addressbook/gui/widgets/eab-gui-util.c:141
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:177
+#: addressbook/gui/widgets/eab-gui-util.c:144
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:147
 msgid "This query did not complete successfully."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
-msgid "Do you want to save changes?"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:208
-msgid "_Discard"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:169
 msgid "Error adding list"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:229
-#: addressbook/gui/widgets/eab-gui-util.c:652
+#: addressbook/gui/widgets/eab-gui-util.c:169
+#: addressbook/gui/widgets/eab-gui-util.c:580
 msgid "Error adding contact"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying list"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying contact"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:192
 msgid "Error removing list"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
-#: addressbook/gui/widgets/eab-gui-util.c:610
+#: addressbook/gui/widgets/eab-gui-util.c:192
+#: addressbook/gui/widgets/eab-gui-util.c:538
 msgid "Error removing contact"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:334
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:360
+#: addressbook/gui/widgets/eab-gui-util.c:300
 #, c-format
 msgid ""
 "%s already exists\n"
 "Do you want to overwrite it?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:364
+#: addressbook/gui/widgets/eab-gui-util.c:304
 msgid "Overwrite"
 msgstr "Yfirskrifa"
 
-#: addressbook/gui/widgets/eab-gui-util.c:400
-#, c-format
-msgid "Error saving %s: %s"
-msgstr ""
-
 #  This is a filename. Translators take note.
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:437
+#: addressbook/gui/widgets/eab-gui-util.c:365
 msgid "card.vcf"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:571
+#: addressbook/gui/widgets/eab-gui-util.c:499
 msgid "list"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:706
+#: addressbook/gui/widgets/eab-gui-util.c:634
 msgid "Move contact to"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:708
+#: addressbook/gui/widgets/eab-gui-util.c:636
 msgid "Copy contact to"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:711
+#: addressbook/gui/widgets/eab-gui-util.c:639
 msgid "Move contacts to"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:713
+#: addressbook/gui/widgets/eab-gui-util.c:641
 msgid "Copy contacts to"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:716
+#: addressbook/gui/widgets/eab-gui-util.c:644
 msgid "Select target addressbook."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:939
+#: addressbook/gui/widgets/eab-gui-util.c:867
 msgid "Multiple VCards"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:942
+#: addressbook/gui/widgets/eab-gui-util.c:870
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard fyrir %s"
@@ -2742,7 +2628,7 @@ msgstr[1] ""
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:229
+#: addressbook/gui/widgets/e-addressbook-view.c:231
 #: addressbook/gui/widgets/e-minicard-view.c:467
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
@@ -2760,140 +2646,132 @@ msgstr ""
 msgid "Error modifying card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:163
 msgid "Name begins with"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:164
 msgid "Email begins with"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:57
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr ""
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-#: calendar/gui/cal-search-bar.c:50
+#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+#: addressbook/gui/widgets/e-addressbook-view.c:172
 msgid "Advanced..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:236
+#: addressbook/gui/widgets/e-addressbook-view.c:238
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:249
+#: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:506
+#: addressbook/gui/widgets/e-addressbook-view.c:508
 msgid "Address Book"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2076
+#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:2080
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
 msgstr "Vista sem..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 msgid "New Contact..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "New Contact List..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Go to Folder..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Import..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1066
 msgid "Search for Contacts..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 msgid "Address Book Sources..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1069
 msgid "Pilot Settings..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
 msgid "Send Message to Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Prenta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
+#: addressbook/gui/widgets/e-addressbook-view.c:1077
 msgid "Print Envelope"
 msgstr "Prenta Umslag"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
+#: addressbook/gui/widgets/e-addressbook-view.c:1081
 msgid "Copy to Address Book..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1080
+#: addressbook/gui/widgets/e-addressbook-view.c:1082
 msgid "Move to Address Book..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Klippa"
 
 #  create the dialog
-#: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Afrita"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1087
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Líma"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:1092
+#: calendar/gui/e-calendar-view.c:1280
 msgid "Current View"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1309
-#, c-format
-msgid ""
-"The addressbook backend for\n"
-"%s\n"
-"has crashed. You will have to restart Evolution in order to use it again"
-msgstr ""
-
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1667
-#: calendar/gui/cal-search-bar.c:362
+#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr ""
 
@@ -2999,7 +2877,7 @@ msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-list-view.c:234
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr ""
@@ -3133,12 +3011,12 @@ msgstr ""
 msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.c:998
+#: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.c:1064
-#: addressbook/printing/e-contact-print.c:1091
+#: addressbook/printing/e-contact-print.c:1066
+#: addressbook/printing/e-contact-print.c:1093
 msgid "Print contact"
 msgstr ""
 
@@ -3385,14 +3263,18 @@ msgstr ""
 msgid "Impossible internal error."
 msgstr ""
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:629
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
 msgid "Can not open file"
 msgstr ""
 
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-msgid "Can not load URI"
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+msgid "Couldn't get list of addressbooks"
+msgstr ""
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+msgid "failed to open book"
 msgstr ""
 
 #: addressbook/tools/evolution-addressbook-import.c:46
@@ -3411,7 +3293,7 @@ msgstr ""
 msgid "Unnamed List"
 msgstr ""
 
-#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
 msgstr ""
@@ -3672,10 +3554,10 @@ msgid "Whether to show week numbers in date navigator"
 msgstr ""
 
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:88
-#: calendar/gui/gnome-cal.c:1703
-#: camel/providers/groupwise/camel-gw-listener.c:304
-#: camel/providers/groupwise/camel-gw-listener.c:327
+#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/gnome-cal.c:1705
+#: camel/providers/groupwise/camel-gw-listener.c:311
+#: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
 msgstr "Dagatal"
 
@@ -3692,7 +3574,7 @@ msgstr ""
 
 #: calendar/gui/calendar-commands.c:363
 #: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:19 filter/filter.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
 msgid "days"
 msgstr "dagar"
 
@@ -3845,23 +3727,23 @@ msgstr ""
 msgid "Month View"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:54
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:53
 msgid "Location contains"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
 msgid "Unmatched"
 msgstr ""
 
@@ -3882,23 +3764,23 @@ msgstr ""
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:466
+#: calendar/gui/dialogs/alarm-options.c:467
 msgid "Audio Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:475
+#: calendar/gui/dialogs/alarm-options.c:476
 msgid "Message Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:484
+#: calendar/gui/dialogs/alarm-options.c:485
 msgid "Email Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:493
+#: calendar/gui/dialogs/alarm-options.c:494
 msgid "Program Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:510
 msgid "Unknown Alarm Options"
 msgstr ""
 
@@ -3934,7 +3816,7 @@ msgstr "Senda Til:"
 msgid "With these arguments:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
 msgid "dialog1"
 msgstr ""
 
@@ -3943,7 +3825,7 @@ msgid "extra times every"
 msgstr ""
 
 #: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:20 filter/filter.glade.h:16
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr "klukkustundir"
 
@@ -3989,7 +3871,7 @@ msgstr ""
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr ""
 
@@ -4019,7 +3901,6 @@ msgid "hour(s)"
 msgstr ""
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:21
 msgid "minute(s)"
 msgstr ""
 
@@ -4027,26 +3908,26 @@ msgstr ""
 msgid "start of appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:170
+#: calendar/gui/dialogs/calendar-setup.c:172
 msgid "You must specify a location to get the calendar from."
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:178
+#: calendar/gui/dialogs/calendar-setup.c:180
 #, c-format
 msgid "The source location '%s' is not well-formed."
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:193
+#: calendar/gui/dialogs/calendar-setup.c:195
 #, c-format
 msgid "The source location '%s' is not a webcal source."
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:265
+#: calendar/gui/dialogs/calendar-setup.c:275
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:278
+#: calendar/gui/dialogs/calendar-setup.c:288
 #, c-format
 msgid ""
 "The group '%s' is remote. You must specify a location to get the calendar "
@@ -4067,53 +3948,33 @@ msgstr ""
 msgid "C_olor:"
 msgstr "_Loka"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "Calendar Properties"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
 msgid "Pick a color"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:8
-msgid "Remote"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "Task List Properties"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
 #, fuzzy
 msgid "_Add Calendar"
 msgstr "Dagatal"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
 #, fuzzy
 msgid "_Add Group"
 msgstr "Hópur:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-msgid "_Refresh Interval:"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
 msgid "_Refresh:"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-msgid "_Source URL:"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "_Type:"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
 msgid "_URL:"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
 msgid "weeks"
 msgstr ""
 
@@ -4220,7 +4081,7 @@ msgid "Display"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:76
 msgid "E_nable"
 msgstr ""
 
@@ -4230,7 +4091,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:563
+#: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr ""
 
@@ -4244,7 +4105,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:559
+#: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Mánudagur"
 
@@ -4254,7 +4115,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:564
+#: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Laugardagur"
 
@@ -4268,7 +4129,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Sunnudagur"
 
@@ -4282,7 +4143,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:562
+#: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Fimmtudagur"
 
@@ -4296,7 +4157,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:560
+#: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Þriðjudagur"
 
@@ -4306,7 +4167,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:561
+#: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Miðvikudagur"
 
@@ -4339,7 +4200,7 @@ msgid "_Day begins:"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
-#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:43
@@ -4388,76 +4249,46 @@ msgstr ""
 msgid "before every appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:57
-msgid ""
-"The event being deleted is a meeting, would you like to send a cancellation "
-"notice?"
-msgstr ""
-
-#: calendar/gui/dialogs/cancel-comp.c:60
-msgid "Are you sure you want to cancel and delete this meeting?"
-msgstr ""
-
-#: calendar/gui/dialogs/cancel-comp.c:66
-msgid ""
-"The task being deleted is assigned, would you like to send a cancellation "
-"notice?"
-msgstr ""
-
-#: calendar/gui/dialogs/cancel-comp.c:69
-msgid "Are you sure you want to cancel and delete this task?"
-msgstr ""
-
-#: calendar/gui/dialogs/cancel-comp.c:75
-msgid ""
-"The journal entry being deleted is published, would you like to send a "
-"cancellation notice?"
-msgstr ""
-
-#: calendar/gui/dialogs/cancel-comp.c:78
-msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr ""
-
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:68
 msgid "This journal entry has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:75
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:82
+#: calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:92
 msgid "This journal entry has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:99
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
@@ -4495,7 +4326,7 @@ msgid "No summary"
 msgstr ""
 
 #: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
 #: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Vista sem..."
@@ -4547,99 +4378,51 @@ msgstr ""
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:95
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:98
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:104
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:107
-msgid "Are you sure you want to delete this untitled task?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:113
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:116
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:131
-#, c-format
-msgid "Are you sure you want to delete %d appointment?"
-msgid_plural "Are you sure you want to delete %d appointments?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: calendar/gui/dialogs/delete-comp.c:138
-#, c-format
-msgid "Are you sure you want to delete %d task?"
-msgid_plural "Are you sure you want to delete %d tasks?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: calendar/gui/dialogs/delete-comp.c:145
-#, c-format
-msgid "Are you sure you want to delete %d journal entry?"
-msgid_plural "Are you sure you want to delete %d journal entries?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: calendar/gui/dialogs/delete-error.c:52
+#: calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:55
+#: calendar/gui/dialogs/delete-error.c:57
 msgid "The task could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:58
+#: calendar/gui/dialogs/delete-error.c:60
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:61
+#: calendar/gui/dialogs/delete-error.c:63
 msgid "The item could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:68
+#: calendar/gui/dialogs/delete-error.c:70
 msgid "The event could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:71
+#: calendar/gui/dialogs/delete-error.c:73
 msgid "The task could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:74
+#: calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:77
+#: calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:84
+#: calendar/gui/dialogs/delete-error.c:86
 msgid "The event could not be deleted due to an error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:87
+#: calendar/gui/dialogs/delete-error.c:89
 msgid "The task could not be deleted due to an error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:90
+#: calendar/gui/dialogs/delete-error.c:92
 msgid "The journal entry could not be deleted due to an error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:93
+#: calendar/gui/dialogs/delete-error.c:95
 msgid "The item could not be deleted due to an error"
 msgstr ""
 
@@ -4778,11 +4561,11 @@ msgstr ""
 #  is not permitted.
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:3
+#: calendar/gui/dialogs/meeting-page.glade.h:4
 #: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
 #: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1559
-#: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:100
+#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
+#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
@@ -4808,8 +4591,8 @@ msgstr ""
 #. FIXME: need to disable for undeletable folders
 #: calendar/gui/dialogs/meeting-page.c:655
 #: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1310 calendar/gui/e-calendar-view.c:1342
-#: mail/em-folder-tree.c:2557 mail/em-folder-view.c:919
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
+#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -4817,7 +4600,7 @@ msgid "_Delete"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:240
+#: calendar/gui/e-meeting-list-view.c:218
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr ""
@@ -4853,16 +4636,15 @@ msgid "Member"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
-#: mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-list-view.c:248
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
 msgid "Status"
 msgstr ""
 
@@ -4870,18 +4652,17 @@ msgstr ""
 msgid "Add A_ttendee"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+msgid "Add attendees from addressbook."
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "_Change Organizer"
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.glade.h:6
-#: calendar/gui/e-meeting-time-sel.c:417
-msgid "_Invite Others..."
+msgid "_Change Organizer"
 msgstr ""
 
 #: calendar/gui/dialogs/new-calendar.glade.h:2
@@ -5030,7 +4811,7 @@ msgid "_No recurrence"
 msgstr ""
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:450
+#: composer/e-msg-composer-attachment-bar.c:453
 msgid "_Remove"
 msgstr ""
 
@@ -5062,50 +4843,19 @@ msgstr ""
 msgid "year(s)"
 msgstr ""
 
-#: calendar/gui/dialogs/save-comp.c:53
-msgid ""
-"This event has been changed, but has not been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-
-#: calendar/gui/dialogs/save-comp.c:57
-msgid "_Discard Changes"
-msgstr ""
-
-#: calendar/gui/dialogs/save-comp.c:62
-msgid "Save Event"
-msgstr ""
-
-#: calendar/gui/dialogs/select-source-dialog.c:65
+#: calendar/gui/dialogs/select-source-dialog.c:69
 #, fuzzy
 msgid "Select destination"
 msgstr "Valið:"
 
-#: calendar/gui/dialogs/select-source-dialog.c:86
+#: calendar/gui/dialogs/select-source-dialog.c:90
 msgid "_Destination"
 msgstr ""
 
-#: calendar/gui/dialogs/select-source-dialog.c:88
+#: calendar/gui/dialogs/select-source-dialog.c:92
 msgid "Task List"
 msgstr ""
 
-#: calendar/gui/dialogs/send-comp.c:57
-msgid "The meeting information has been created. Send it?"
-msgstr ""
-
-#: calendar/gui/dialogs/send-comp.c:60
-msgid "The meeting information has changed. Send an updated version?"
-msgstr ""
-
-#: calendar/gui/dialogs/send-comp.c:67
-msgid "The task assignment information has been created. Send it?"
-msgstr ""
-
-#: calendar/gui/dialogs/send-comp.c:71
-msgid "The task information has changed. Send an updated version?"
-msgstr ""
-
 #: calendar/gui/dialogs/task-details-page.c:406
 msgid "Completed date is wrong"
 msgstr ""
@@ -5125,7 +4875,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #: calendar/gui/e-cal-component-preview.c:249
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:960
 msgid "High"
 msgstr ""
 
@@ -5139,14 +4889,14 @@ msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:253
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:958
 msgid "Low"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:251
 #: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:957
+#: mail/message-list.c:959
 msgid "Normal"
 msgstr ""
 
@@ -5203,8 +4953,8 @@ msgstr ""
 
 #: calendar/gui/dialogs/task-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
+#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr ""
 
@@ -5369,7 +5119,7 @@ msgstr "_Fullt Nafn"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:950
+#: calendar/gui/e-itip-control.c:943
 msgid "Status:"
 msgstr ""
 
@@ -5454,12 +5204,12 @@ msgstr ""
 msgid "Deleting selected objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
 msgid "Updating objects"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1370
+#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
 #: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr ""
@@ -5469,15 +5219,15 @@ msgid "Open _Web Page"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1291 calendar/gui/e-calendar-view.c:1376
-#: mail/em-folder-view.c:896 mail/em-popup.c:690 mail/em-popup.c:806
+#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
+#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr ""
 
 #: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1292
-#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
+#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
@@ -5485,24 +5235,24 @@ msgid "_Print..."
 msgstr ""
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1338
-#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2550
-#: mail/message-list.c:1644 ui/evolution-addressbook.xml.h:31
+#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
+#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
+#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1273 calendar/gui/e-calendar-view.c:1299
-#: calendar/gui/e-calendar-view.c:1372 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
+#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
@@ -5568,70 +5318,70 @@ msgstr ""
 msgid "Task sort"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
 msgid "New _Appointment..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
+#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
+#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
 msgid "New Meeting"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
 msgid "New Task"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Valið:"
 
-#: calendar/gui/e-calendar-view.c:1280
+#: calendar/gui/e-calendar-view.c:1283
 msgid "_Select Date..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1303
+#: calendar/gui/e-calendar-view.c:1306
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "D_agatal:"
 
-#: calendar/gui/e-calendar-view.c:1304
+#: calendar/gui/e-calendar-view.c:1307
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "Nýtt dagatal"
 
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1308
 msgid "_Schedule Meeting..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1309
 msgid "_Forward as iCalendar..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1349
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1351
 msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr ""
 
@@ -5645,9 +5395,9 @@ msgstr ""
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:967 calendar/gui/e-itip-control.c:1169
-#: calendar/gui/e-meeting-list-view.c:144
-#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
 #: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
 #: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
 #: camel/camel-tcp-stream-openssl.c:631
@@ -5673,13 +5423,13 @@ msgid "Assigned"
 msgstr ""
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr ""
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr ""
 
@@ -5691,7 +5441,7 @@ msgstr ""
 msgid "S"
 msgstr ""
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
 msgid "E"
 msgstr ""
 
@@ -5757,402 +5507,406 @@ msgstr ""
 msgid "%02i minute divisions"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:592
+#: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:596
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:601
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:603
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:618
+#: calendar/gui/e-itip-control.c:611
 msgid " and "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:618
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:631
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:645
+#: calendar/gui/e-itip-control.c:638
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:642
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:653
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:669
+#: calendar/gui/e-itip-control.c:662
 msgid ", ending on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:686
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:696
 msgid "<b>Ends:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:716
 msgid "<b>Completed:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:733
+#: calendar/gui/e-itip-control.c:726
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:771 calendar/gui/e-itip-control.c:827
+#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
 msgid "iCalendar Information"
 msgstr ""
 
 #. Title
-#: calendar/gui/e-itip-control.c:788
+#: calendar/gui/e-itip-control.c:781
 msgid "iCalendar Error"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:859 calendar/gui/e-itip-control.c:875
-#: calendar/gui/e-itip-control.c:886 calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
 msgid "An unknown person"
 msgstr ""
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:910
+#: calendar/gui/e-itip-control.c:903
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:925
+#: calendar/gui/e-itip-control.c:918
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:929
+msgid "Location:"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:959 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:963 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.c:1050
-#: calendar/gui/e-itip-control.c:1076 calendar/gui/e-itip-control.c:1089
-#: calendar/gui/e-itip-control.c:1102 calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
 msgid "Choose an action:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1023
+#: calendar/gui/e-itip-control.c:1016
 msgid "Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1024 calendar/gui/e-itip-control.c:1055
-#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1091
-#: calendar/gui/e-itip-control.c:1104 calendar/gui/e-itip-control.c:1117
-#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
+#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1044
 msgid "Accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1045
 msgid "Tentatively accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1046
 msgid "Decline"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1070
 msgid "Send Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1090
+#: calendar/gui/e-itip-control.c:1083
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1103
+#: calendar/gui/e-itip-control.c:1096
 msgid "Send Latest Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1116 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1185
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1193
+#: calendar/gui/e-itip-control.c:1186
 msgid "Meeting Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1191
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1193
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1201
+#: calendar/gui/e-itip-control.c:1194
 msgid "Meeting Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1206
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1203
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1204
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1218
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1226
+#: calendar/gui/e-itip-control.c:1219
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1227
+#: calendar/gui/e-itip-control.c:1220
 msgid "Meeting Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1234 calendar/gui/e-itip-control.c:1302
-#: calendar/gui/e-itip-control.c:1337
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1330
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1228
 msgid "Bad Meeting Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1253
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1254
 msgid "Task Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1259
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1262
 msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1278
+#: calendar/gui/e-itip-control.c:1271
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1272
 msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1286
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1294
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1288
 msgid "Task Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1303
+#: calendar/gui/e-itip-control.c:1296
 msgid "Bad Task Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1315
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1323
+#: calendar/gui/e-itip-control.c:1316
 msgid "Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1321
 msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1325
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1326
 msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1331
 msgid "Bad Free/Busy Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1413
+#: calendar/gui/e-itip-control.c:1406
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1472
+#: calendar/gui/e-itip-control.c:1465
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1503
+#: calendar/gui/e-itip-control.c:1496
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1535
+#: calendar/gui/e-itip-control.c:1528
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1769
+#: calendar/gui/e-itip-control.c:1762
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
+#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1825
+#: calendar/gui/e-itip-control.c:1818
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1837
+#: calendar/gui/e-itip-control.c:1830
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1856
+#: calendar/gui/e-itip-control.c:1849
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1852
 msgid "Object could not be found\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1855
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1865
+#: calendar/gui/e-itip-control.c:1858
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1861
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1892
 msgid "Removal Complete"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
 msgid "Item sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
+#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
 msgid "The item could not be sent!\n"
 msgstr ""
 
@@ -6193,74 +5947,74 @@ msgstr ""
 msgid "date-start"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:62
+#: calendar/gui/e-meeting-list-view.c:59
 msgid "Chair Persons"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:479
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
 msgid "Required Participants"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:64
+#: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:65
+#: calendar/gui/e-meeting-list-view.c:62
 msgid "Resources"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:140 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
 #: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:154 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:127
 #: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
 msgid "Required Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:179 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:177
 #: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
 msgid "Needs Action"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:182 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
 #: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr ""
@@ -6277,20 +6031,24 @@ msgstr ""
 msgid "No Information"
 msgstr ""
 
+#: calendar/gui/e-meeting-time-sel.c:417
+msgid "Add attendees from addressbook"
+msgstr ""
+
 #: calendar/gui/e-meeting-time-sel.c:440
 msgid "_Options"
 msgstr ""
 
 #: calendar/gui/e-meeting-time-sel.c:457
-msgid "Show _Only Working Hours"
+msgid "Show _only working hours"
 msgstr ""
 
 #: calendar/gui/e-meeting-time-sel.c:467
-msgid "Show _Zoomed Out"
+msgid "Show _zoomed out"
 msgstr ""
 
 #: calendar/gui/e-meeting-time-sel.c:482
-msgid "_Update Free/Busy"
+msgid "_Update free/busy"
 msgstr ""
 
 #: calendar/gui/e-meeting-time-sel.c:497
@@ -6306,19 +6064,19 @@ msgid ">_>"
 msgstr ""
 
 #: calendar/gui/e-meeting-time-sel.c:547
-msgid "_All People and Resources"
+msgid "_All people and resources"
 msgstr ""
 
 #: calendar/gui/e-meeting-time-sel.c:556
-msgid "All _People and One Resource"
+msgid "All _people and one resource"
 msgstr ""
 
 #: calendar/gui/e-meeting-time-sel.c:565
-msgid "_Required People"
+msgid "_Required people"
 msgstr ""
 
 #: calendar/gui/e-meeting-time-sel.c:574
-msgid "Required People and _One Resource"
+msgid "Required people and _one resource"
 msgstr ""
 
 #: calendar/gui/e-meeting-time-sel.c:593
@@ -6356,78 +6114,68 @@ msgstr ""
 msgid "Enter the password for %s"
 msgstr "%sLykilorð fyrir %s (notandann %s)"
 
-#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
 #, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-
 #. FIXME Loading should be async
 #. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:686
+#: calendar/gui/e-tasks.c:801
 #, c-format
 msgid "Opening tasks at %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:709
+#: calendar/gui/e-tasks.c:824
 #, c-format
 msgid ""
 "Error opening %s:\n"
 "%s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:730
+#: calendar/gui/e-tasks.c:845
 msgid "Loading tasks"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:834
+#: calendar/gui/e-tasks.c:949
 msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:857
+#: calendar/gui/e-tasks.c:972
 msgid "Deleting selected objects..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:884
+#: calendar/gui/e-tasks.c:999
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:960
+#: calendar/gui/e-tasks.c:1075
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
-#: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
+#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
+#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
 #: calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:705
 msgid "Tasks"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1876
+#: calendar/gui/gnome-cal.c:1878
 #, c-format
 msgid "Loading appointments at %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1895
+#: calendar/gui/gnome-cal.c:1897
 #, c-format
 msgid "Loading tasks at %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1920
 #, c-format
 msgid "Opening %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2048
-#, c-format
-msgid "The calendar backend for '%s' has crashed."
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:2894
+#: calendar/gui/gnome-cal.c:2906
 msgid "Purging"
 msgstr ""
 
@@ -6619,7 +6367,7 @@ msgid "On The Web"
 msgstr ""
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 
@@ -6630,7 +6378,7 @@ msgid "Unable to migrate calendar `%s'"
 msgstr ""
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:869
+#: calendar/gui/migration.c:889
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr ""
@@ -6866,69 +6614,69 @@ msgstr ""
 msgid "Print Setup"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:303
+#: calendar/gui/tasks-component.c:313
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:371
 msgid "New Task List"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:398
+#: calendar/gui/tasks-component.c:408
 #, fuzzy, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "dagar"
 msgstr[1] "dagar"
 
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] "Eyða"
 msgstr[1] "Eyða"
 
-#: calendar/gui/tasks-component.c:447
+#: calendar/gui/tasks-component.c:457
 msgid "Failed upgrading tasks."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:526
+#: calendar/gui/tasks-component.c:749
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:538
+#: calendar/gui/tasks-component.c:761
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:576
+#: calendar/gui/tasks-component.c:799
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:804
+#: calendar/gui/tasks-component.c:1040
 msgid "New task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:805
+#: calendar/gui/tasks-component.c:1041
 msgid "_Task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:806
+#: calendar/gui/tasks-component.c:1042
 msgid "Create a new task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:812
+#: calendar/gui/tasks-component.c:1048
 msgid "New tasks group"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:813
+#: calendar/gui/tasks-component.c:1049
 msgid "_Tasks Group"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:814
+#: calendar/gui/tasks-component.c:1050
 msgid "Create a new tasks group"
 msgstr ""
 
@@ -8682,12 +8430,12 @@ msgstr ""
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1259
+#: camel/camel-folder.c:1262
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1299
+#: camel/camel-folder.c:1302
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
@@ -8700,11 +8448,16 @@ msgstr ""
 msgid "Copying messages"
 msgstr ""
 
-#: camel/camel-folder.c:1666
-msgid "Learning junk and/or non junk message(s)"
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Aðvörun"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
 msgstr ""
 
-#: camel/camel-folder.c:1695
+#: camel/camel-folder.c:1701
 msgid "Filtering new message(s)"
 msgstr ""
 
@@ -8734,15 +8487,15 @@ msgstr ""
 msgid "(match-threads) requires a match type string"
 msgstr ""
 
-#: camel/camel-folder-search.c:785
+#: camel/camel-folder-search.c:784
 msgid "(match-threads) expects an array result"
 msgstr ""
 
-#: camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:790
 msgid "(match-threads) requires the folder set"
 msgstr ""
 
-#: camel/camel-folder-search.c:880
+#: camel/camel-folder-search.c:879
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr ""
@@ -8772,7 +8525,8 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
 #: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:706
+#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr ""
@@ -9125,7 +8879,7 @@ msgstr ""
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1212
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -9478,40 +9232,40 @@ msgstr ""
 msgid "export keys: unimplemented"
 msgstr ""
 
-#: camel/camel-store.c:214
+#: camel/camel-store.c:213
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-store.c:244
+#: camel/camel-store.c:243
 #, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr ""
 
-#: camel/camel-store.c:295
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-store.c:323
+#: camel/camel-store.c:325
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr ""
 
-#: camel/camel-store.c:387 camel/camel-vee-store.c:354
+#: camel/camel-store.c:389 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr ""
 
-#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#: camel/camel-store.c:439 camel/camel-vee-store.c:387
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr ""
 
-#: camel/camel-store.c:811
+#: camel/camel-store.c:777
 msgid "Trash"
 msgstr ""
 
-#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
-#: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/mail-config.glade.h:95
+#: ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr ""
 
@@ -9718,12 +9472,12 @@ msgstr ""
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:374
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr ""
 
-#: camel/camel-vee-store.c:398
+#: camel/camel-vee-store.c:395
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr ""
@@ -9764,31 +9518,31 @@ msgstr ""
 msgid "Post Office Agent SOAP Port:"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:80
+#: camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "Novell GroupWise"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:82
+#: camel/providers/groupwise/camel-groupwise-provider.c:85
 msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: camel/providers/groupwise/camel-groupwise-provider.c:100
 #: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
 msgid "Password"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:99
+#: camel/providers/groupwise/camel-groupwise-provider.c:102
 #: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/groupwise/camel-gw-listener.c:305
-#: camel/providers/groupwise/camel-gw-listener.c:328
+#: camel/providers/groupwise/camel-gw-listener.c:312
+#: camel/providers/groupwise/camel-gw-listener.c:335
 msgid "Checklist"
 msgstr ""
 
@@ -9915,13 +9669,13 @@ msgid ""
 msgstr ""
 
 #: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:429
+#: camel/providers/imap/camel-imap-store.c:428
 #, c-format
 msgid "IMAP server %s"
 msgstr ""
 
 #: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:431
+#: camel/providers/imap/camel-imap-store.c:430
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr ""
@@ -9931,7 +9685,7 @@ msgstr ""
 #: camel/providers/imap/camel-imap-store.c:551
 #: camel/providers/imap/camel-imap-store.c:571
 #: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
+#: camel/providers/nntp/camel-nntp-store.c:209
 #: camel/providers/pop3/camel-pop3-store.c:175
 #: camel/providers/smtp/camel-smtp-transport.c:269
 #: camel/providers/smtp/camel-smtp-transport.c:285
@@ -9948,10 +9702,10 @@ msgstr ""
 
 #: camel/providers/imap4/camel-imap4-store.c:222
 #: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:815
+#: camel/providers/imap/camel-imap-store.c:845
 #: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:137
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
 #: camel/providers/pop3/camel-pop3-store.c:192
 msgid "Connection cancelled"
 msgstr ""
@@ -9964,8 +9718,8 @@ msgid ""
 msgstr ""
 
 #: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:649
-#: camel/providers/imap/camel-imap-store.c:680
+#: camel/providers/imap/camel-imap-store.c:679
+#: camel/providers/imap/camel-imap-store.c:710
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
@@ -9974,7 +9728,7 @@ msgstr ""
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1109
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
 msgid "Unknown error"
 msgstr "Óþekkt villa"
 
@@ -10000,8 +9754,8 @@ msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr ""
 
 #: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1857
-#: camel/providers/imap/camel-imap-store.c:2235
+#: camel/providers/imap/camel-imap-store.c:1885
+#: camel/providers/imap/camel-imap-store.c:2263
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -10078,12 +9832,12 @@ msgstr ""
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3168
+#: camel/providers/imap/camel-imap-store.c:3194
 msgid "Operation cancelled"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3171
+#: camel/providers/imap/camel-imap-store.c:3197
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
@@ -10145,13 +9899,6 @@ msgid "Unable to retrieve message: %s"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:219
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -10159,15 +9906,15 @@ msgid ""
 msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-mbox-folder.c:418
+#: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:2019
-#: camel/providers/imap/camel-imap-folder.c:2621
-#: camel/providers/nntp/camel-nntp-folder.c:238
+#: camel/providers/imap/camel-imap-folder.c:2622
+#: camel/providers/nntp/camel-nntp-folder.c:220
 msgid "This message is not currently available"
 msgstr ""
 
@@ -10176,7 +9923,23 @@ msgstr ""
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2659
+#: camel/providers/imap/camel-imap-folder.c:2463
+#, c-format
+msgid "Incomplete server response: no information provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2471
+#, c-format
+msgid "Incomplete server response: no UID provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2484
+#, c-format
+msgid ""
+"Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2660
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -10234,43 +9997,43 @@ msgstr ""
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/imap/camel-imap-store.c:680
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:711
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:818
+#: camel/providers/imap/camel-imap-store.c:848
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1242
+#: camel/providers/imap/camel-imap-store.c:1272
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1252
+#: camel/providers/imap/camel-imap-store.c:1282
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1305
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1289
+#: camel/providers/imap/camel-imap-store.c:1319
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1318
+#: camel/providers/imap/camel-imap-store.c:1348
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10278,18 +10041,18 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1839
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:1867
+#: camel/providers/imap/camel-imap-store.c:2057
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1915
-#: camel/providers/imap/camel-imap-store.c:2296
+#: camel/providers/imap/camel-imap-store.c:1943
+#: camel/providers/imap/camel-imap-store.c:2324
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1970
+#: camel/providers/imap/camel-imap-store.c:1998
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10297,7 +10060,7 @@ msgstr ""
 msgid "Cannot create folder `%s': folder exists."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:2274
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr ""
@@ -10329,20 +10092,20 @@ msgid "Index message body data"
 msgstr ""
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:388
 #, c-format
 msgid "~%s (%s)"
 msgstr ""
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:393
-#: camel/providers/local/camel-local-folder.c:396
+#: camel/providers/local/camel-local-folder.c:392
+#: camel/providers/local/camel-local-folder.c:395
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr ""
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:400
+#: camel/providers/local/camel-local-folder.c:399
 #, c-format
 msgid "%s (%s)"
 msgstr ""
@@ -10398,7 +10161,7 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:142
 #: camel/providers/local/camel-local-store.c:253
-#: camel/providers/local/camel-mbox-store.c:356
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10471,8 +10234,23 @@ msgstr ""
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:226
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mbox-folder.c:417
+#: camel/providers/local/camel-mbox-folder.c:436
+#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:475
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-mh-folder.c:221
+#, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-folder.c:236
 msgid "Invalid message contents"
 msgstr ""
 
@@ -10513,9 +10291,9 @@ msgstr ""
 msgid "not a maildir directory"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:341
-#: camel/providers/local/camel-spool-store.c:286
-#: camel/providers/local/camel-spool-store.c:316
+#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-spool-store.c:284
+#: camel/providers/local/camel-spool-store.c:314
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr ""
@@ -10562,25 +10340,17 @@ msgstr ""
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:435
-#: camel/providers/local/camel-mbox-folder.c:466
-#: camel/providers/local/camel-mbox-folder.c:474
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:468
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:475
-msgid "Message construction failed: Corrupt mailbox?"
+#: camel/providers/local/camel-mbox-folder.c:476
+#: camel/providers/local/camel-mh-folder.c:222
+msgid "Message construction failed."
 msgstr ""
 
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:362
+#: camel/providers/local/camel-mbox-store.c:361
 msgid "Cannot create a folder by this name."
 msgstr ""
 
@@ -10608,30 +10378,30 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:375
+#: camel/providers/local/camel-mbox-store.c:374
 #, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:389
+#: camel/providers/local/camel-mbox-store.c:388
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:391
+#: camel/providers/local/camel-mbox-store.c:390
 msgid "Folder already exists"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:473
+#: camel/providers/local/camel-mbox-store.c:472
 msgid "The new folder name is illegal."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:486
+#: camel/providers/local/camel-mbox-store.c:485
 #, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:561
+#: camel/providers/local/camel-mbox-store.c:560
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr ""
@@ -10816,7 +10586,7 @@ msgid ""
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:997
+#: camel/providers/nntp/camel-nntp-store.c:1126
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr ""
@@ -10833,18 +10603,10 @@ msgstr ""
 msgid "Server rejected username/password"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:263
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:259
-#: camel/providers/nntp/camel-nntp-folder.c:265
+#: camel/providers/nntp/camel-nntp-folder.c:147
+#: camel/providers/nntp/camel-nntp-folder.c:149
+#: camel/providers/nntp/camel-nntp-folder.c:158
+#: camel/providers/nntp/camel-nntp-folder.c:234
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -10853,60 +10615,49 @@ msgstr ""
 msgid "Cannot get message %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:188
-#: camel/providers/nntp/camel-nntp-folder.c:228
-#, c-format
-msgid "Internal error: uid in invalid format: %s"
+#: camel/providers/nntp/camel-nntp-folder.c:156
+#: camel/providers/nntp/camel-nntp-folder.c:232
+#: camel/providers/nntp/camel-nntp-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+msgid "User cancelled"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:201
+#: camel/providers/nntp/camel-nntp-folder.c:176
+#: camel/providers/nntp/camel-nntp-folder.c:208
 #, c-format
-msgid "Could not get article %s from NNTP server"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:362
-msgid "Posting not allowed by news server"
+msgid "Internal error: uid in invalid format: %s"
 msgstr ""
 
+#: camel/providers/nntp/camel-nntp-folder.c:328
+#: camel/providers/nntp/camel-nntp-folder.c:331
 #: camel/providers/nntp/camel-nntp-folder.c:373
-#, c-format
-msgid "Failed to send newsgroups header: %s: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:413
-#: camel/providers/nntp/camel-nntp-folder.c:426
-#, c-format
-msgid "Error posting to newsgroup: %s: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:438
-msgid "Error reading response to posted message: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:441
-#, c-format
-msgid "Error posting message: %s: message not posted"
-msgstr ""
+#: camel/providers/nntp/camel-nntp-folder.c:375
+#, fuzzy, c-format
+msgid "Posting failed: %s"
+msgstr "Vista í möppu..."
 
-#: camel/providers/nntp/camel-nntp-folder.c:457
+#: camel/providers/nntp/camel-nntp-folder.c:393
 msgid "You cannot post NNTP messages while working offline!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:468
+#: camel/providers/nntp/camel-nntp-folder.c:404
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:44
 msgid "Could not get group list from server."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#: camel/providers/nntp/camel-nntp-grouplist.c:97
+#: camel/providers/nntp/camel-nntp-grouplist.c:106
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#: camel/providers/nntp/camel-nntp-grouplist.c:157
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr ""
@@ -10934,26 +10685,29 @@ msgid ""
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:158
+#: camel/providers/nntp/camel-nntp-store.c:118
+#: camel/providers/nntp/camel-nntp-store.c:1233
+#: camel/providers/nntp/camel-nntp-store.c:1331
+#, c-format
+msgid "NNTP Command failed: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:227
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:170
+#: camel/providers/nntp/camel-nntp-store.c:239
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:326
+#: camel/providers/nntp/camel-nntp-store.c:403
 #, c-format
 msgid "USENET News via %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:640
-msgid "Stream error"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-store.c:643
+#: camel/providers/nntp/camel-nntp-store.c:777
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -10961,72 +10715,71 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:735
+#: camel/providers/nntp/camel-nntp-store.c:872
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
 "No such newsgroup. The selected item is a probably a parent folder."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:767
+#: camel/providers/nntp/camel-nntp-store.c:904
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
 "newsgroup does not exist!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:792
+#: camel/providers/nntp/camel-nntp-store.c:929
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:800
+#: camel/providers/nntp/camel-nntp-store.c:937
 msgid "You cannot rename a folder in a News store."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:808
+#: camel/providers/nntp/camel-nntp-store.c:945
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:253
-#, c-format
-msgid "Connection error: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1118
+msgid "Authentication requested but not username provided"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:262
+#: camel/providers/nntp/camel-nntp-store.c:1146
 #, c-format
-msgid "No such folder: %s"
+msgid "Cannot authenticate to server: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:268
-#, c-format
-msgid "Could not get group: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1262
+msgid "Not connected."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:333
-msgid "Could not get messages: unspecified error"
+#: camel/providers/nntp/camel-nntp-store.c:1311
+#, c-format
+msgid "No such folder: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:378
+#: camel/providers/nntp/camel-nntp-summary.c:218
+#: camel/providers/nntp/camel-nntp-summary.c:314
 #, c-format
-msgid "NNTP Command failed: %s"
+msgid "%s: Scanning new messages"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:438
-#: camel/providers/nntp/camel-nntp-summary.c:543
+#: camel/providers/nntp/camel-nntp-summary.c:225
 #, c-format
-msgid "%s: Scanning new messages"
+msgid "Unexpected server response from xover: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:558
+#: camel/providers/nntp/camel-nntp-summary.c:328
 #, c-format
-msgid "Unknown server response: %s"
+msgid "Unexpected server response from head: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:605
+#: camel/providers/nntp/camel-nntp-summary.c:368
 msgid "Use cancel"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:607
+#: camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
 msgid "Operation failed: %s"
 msgstr ""
@@ -11074,7 +10827,7 @@ msgstr ""
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107
 msgid "POP"
 msgstr ""
 
@@ -11154,7 +10907,7 @@ msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:132
 msgid "Sendmail"
 msgstr ""
 
@@ -11206,7 +10959,7 @@ msgstr ""
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:119
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122
 msgid "SMTP"
 msgstr ""
 
@@ -11487,19 +11240,19 @@ msgstr ""
 msgid "%.0fG"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
+#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:408
 msgid "attachment"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:454
 msgid "Remove selected items from the attachment list"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:491
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Add attachment..."
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:495
 msgid "Attach a file to the message"
 msgstr ""
 
@@ -11558,7 +11311,7 @@ msgstr ""
 msgid "Open file"
 msgstr ""
 
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
 msgid "Autogenerated"
 msgstr ""
 
@@ -11692,17 +11445,17 @@ msgstr ""
 
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
-msgid "You cannot attach the file `${0}' to this message."
+msgid "You cannot attach the file `{0}' to this message."
 msgstr ""
 
 #. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4
-msgid "${1}"
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
 msgstr ""
 
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
 
 #. mail-composer:attach-directory primary
@@ -11789,7 +11542,7 @@ msgstr ""
 
 #. mail-composer:no-build-message secondary
 #: composer/mail-composer-errors.xml.h:34
-msgid "Because \"${0}\", you may need to select different mail options."
+msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
@@ -11798,8 +11551,10 @@ msgid "Could not read signature file \"{0}\"."
 msgstr ""
 
 #. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38
-msgid "Because \"${1}\"."
+#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted primary
@@ -12197,11 +11952,11 @@ msgid "<b>Then</b>"
 msgstr ""
 
 #: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1335
+#: mail/mail-account-gui.c:1347
 msgid "Select Folder"
 msgstr ""
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
 msgid "    "
 msgstr ""
 
@@ -12251,7 +12006,7 @@ msgstr ""
 msgid "months"
 msgstr ""
 
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
 msgid "seconds"
 msgstr ""
 
@@ -12283,20 +12038,20 @@ msgstr ""
 msgid "years"
 msgstr ""
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:916
-#: mail/mail-config.c:76 mail/mail-config.glade.h:90
+#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
+#: mail/mail-config.glade.h:93
 msgid "Important"
 msgstr ""
 
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:919 mail/mail-config.c:79
-#: mail/mail-config.glade.h:145
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: mail/mail-config.glade.h:148
 msgid "To Do"
 msgstr ""
 
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:920 mail/mail-config.c:80
-#: mail/mail-config.glade.h:94
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: mail/mail-config.glade.h:97
 msgid "Later"
 msgstr ""
 
@@ -12349,252 +12104,6 @@ msgstr ""
 msgid "outgoing"
 msgstr ""
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Adjust Score"
-msgstr ""
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Color"
-msgstr ""
-
-#: filter/libfilter-i18n.h:4
-msgid "Assign Score"
-msgstr ""
-
-#: filter/libfilter-i18n.h:5
-msgid "Attachments"
-msgstr ""
-
-#: filter/libfilter-i18n.h:6
-msgid "Beep"
-msgstr ""
-
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr ""
-
-#: filter/libfilter-i18n.h:8
-msgid "Copy to Folder"
-msgstr ""
-
-#: filter/libfilter-i18n.h:9
-msgid "Date received"
-msgstr ""
-
-#: filter/libfilter-i18n.h:10
-msgid "Date sent"
-msgstr ""
-
-#: filter/libfilter-i18n.h:12
-msgid "Deleted"
-msgstr ""
-
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr ""
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr ""
-
-#: filter/libfilter-i18n.h:16
-msgid "does not return"
-msgstr ""
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr ""
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
-msgstr ""
-
-#: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr ""
-
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr ""
-
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr ""
-
-#: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr ""
-
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr ""
-
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr ""
-
-#: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr ""
-
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr ""
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr ""
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr ""
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr ""
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr ""
-
-#: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr ""
-
-#: filter/libfilter-i18n.h:36
-msgid "Junk Test"
-msgstr ""
-
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
-#: widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr ""
-
-#: filter/libfilter-i18n.h:38
-msgid "Mailing list"
-msgstr ""
-
-#: filter/libfilter-i18n.h:39
-msgid "Message Body"
-msgstr ""
-
-#: filter/libfilter-i18n.h:40
-msgid "Message Header"
-msgstr ""
-
-#: filter/libfilter-i18n.h:41
-msgid "Message is Junk"
-msgstr ""
-
-#: filter/libfilter-i18n.h:42
-msgid "Message is not Junk"
-msgstr ""
-
-#: filter/libfilter-i18n.h:43
-msgid "Move to Folder"
-msgstr ""
-
-#: filter/libfilter-i18n.h:44
-msgid "Pipe to Program"
-msgstr ""
-
-#: filter/libfilter-i18n.h:45
-msgid "Play Sound"
-msgstr ""
-
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
-msgid "Read"
-msgstr ""
-
-#: filter/libfilter-i18n.h:47
-msgid "Recipients"
-msgstr ""
-
-#: filter/libfilter-i18n.h:48
-msgid "Regex Match"
-msgstr ""
-
-#: filter/libfilter-i18n.h:49
-msgid "Replied to"
-msgstr ""
-
-#: filter/libfilter-i18n.h:50
-msgid "returns"
-msgstr ""
-
-#: filter/libfilter-i18n.h:51
-msgid "returns greater than"
-msgstr ""
-
-#: filter/libfilter-i18n.h:52
-msgid "returns less than"
-msgstr ""
-
-#: filter/libfilter-i18n.h:53
-msgid "Run Program"
-msgstr ""
-
-#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr ""
-
-#: filter/libfilter-i18n.h:55
-msgid "Sender"
-msgstr ""
-
-#: filter/libfilter-i18n.h:56
-msgid "Set Status"
-msgstr ""
-
-#: filter/libfilter-i18n.h:57
-msgid "Size (kB)"
-msgstr ""
-
-#: filter/libfilter-i18n.h:58
-msgid "sounds like"
-msgstr ""
-
-#: filter/libfilter-i18n.h:59
-msgid "Source Account"
-msgstr ""
-
-#: filter/libfilter-i18n.h:60
-msgid "Specific header"
-msgstr ""
-
-#: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:63
-msgid "Stop Processing"
-msgstr ""
-
-#: filter/libfilter-i18n.h:64 mail/em-format.c:755 mail/em-format-html.c:1519
-#: mail/em-format-quote.c:302 mail/em-mailer-prefs.c:87
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
-#: smime/lib/e-cert.c:1079
-msgid "Subject"
-msgstr ""
-
-#: filter/libfilter-i18n.h:65
-msgid "Unset Status"
-msgstr ""
-
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr ""
@@ -12611,6 +12120,11 @@ msgstr ""
 msgid "_Score Rules"
 msgstr ""
 
+#: filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr ""
+
 #: filter/searchtypes.xml.h:1
 msgid "Body contains"
 msgstr ""
@@ -12690,13 +12204,13 @@ msgstr ""
 msgid "-------- Forwarded Message --------"
 msgstr ""
 
-#: mail/em-composer-utils.c:1499
+#: mail/em-composer-utils.c:1495
 msgid "an unknown sender"
 msgstr ""
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1509
+#: mail/em-composer-utils.c:1505
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr ""
 
@@ -12734,8 +12248,8 @@ msgstr ""
 msgid "Create New Folder"
 msgstr ""
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
-#: mail/mail-component.c:701
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
+#: mail/mail-component.c:704
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr ""
@@ -12750,103 +12264,104 @@ msgstr "Króatía"
 msgid "Folder _name:"
 msgstr ""
 
-#: mail/em-folder-tree.c:839
+#: mail/em-folder-tree.c:833
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Vista í möppu..."
 
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree.c:835
 #, c-format
 msgid "Copying folder %s"
 msgstr ""
 
-#: mail/em-folder-tree.c:848 mail/message-list.c:1555
+#: mail/em-folder-tree.c:842 mail/message-list.c:1561
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr ""
 
-#: mail/em-folder-tree.c:850 mail/message-list.c:1557
+#: mail/em-folder-tree.c:844 mail/message-list.c:1563
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr ""
 
-#: mail/em-folder-tree.c:866
+#: mail/em-folder-tree.c:860
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 
-#: mail/em-folder-tree.c:956 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:957 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2069
-#: mail/em-folder-tree.c:2551 mail/em-folder-view.c:798
-#: mail/message-list.c:1645
+#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
+#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
+#: mail/message-list.c:1651
 msgid "_Move"
 msgstr ""
 
-#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#: mail/em-folder-tree.c:955 mail/message-list.c:1653
 msgid "Cancel _Drag"
 msgstr ""
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
 #: mail/em-folder-view.c:798 mail/em-folder-view.c:812
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr ""
 
 #  create the dialog
-#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
 #, fuzzy
 msgid "C_opy"
 msgstr "Afrita"
 
-#: mail/em-folder-tree.c:2096
+#: mail/em-folder-tree.c:2088
 #, c-format
 msgid "Creating folder `%s'"
 msgstr ""
 
-#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
+#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
 msgid "Create folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:2474
+#: mail/em-folder-tree.c:2463
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr ""
 
-#: mail/em-folder-tree.c:2476
+#: mail/em-folder-tree.c:2465
 msgid "Rename Folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:2545 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr ""
 
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2537
 msgid "Open in _New Window"
 msgstr ""
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2555
+#: mail/em-folder-tree.c:2546
 msgid "_New Folder..."
 msgstr ""
 
-#: mail/em-folder-tree.c:2558
+#: mail/em-folder-tree.c:2549
 msgid "_Rename"
 msgstr ""
 
-#: mail/em-folder-tree.c:2561 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr ""
 
 #: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:889
+#: mail/mail-vfolder.c:888
 msgid "VFolders"
 msgstr ""
 
@@ -12860,19 +12375,19 @@ msgstr ""
 msgid "Inbox"
 msgstr ""
 
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
 msgid "Loading..."
 msgstr ""
 
 #: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
 #: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
 #: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:551
+#: mail/mail-component.c:554
 msgid "Mail"
 msgstr ""
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr ""
@@ -12885,17 +12400,17 @@ msgstr ""
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:810
+#: mail/em-folder-view.c:901 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr ""
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:811
+#: mail/em-folder-view.c:902 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr ""
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: mail/em-folder-view.c:903 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr ""
@@ -12948,6 +12463,10 @@ msgstr ""
 msgid "_Copy to Folder..."
 msgstr ""
 
+#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr ""
+
 #: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr ""
@@ -12997,12 +12516,12 @@ msgid "Filter on _Mailing List"
 msgstr ""
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
-#: mail/mail-config.glade.h:66
+#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr ""
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1796
 msgid "Print Message"
 msgstr ""
 
@@ -13041,12 +12560,18 @@ msgstr ""
 msgid "Bcc"
 msgstr ""
 
+#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
+#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr ""
+
 #: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
 #: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr ""
 
-#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
+#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
 msgid "Newsgroups"
 msgstr ""
 
@@ -13225,7 +12750,7 @@ msgid ""
 "practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:757
+#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
 msgid "_View Certificate"
 msgstr ""
 
@@ -13278,7 +12803,7 @@ msgstr ""
 msgid "Once per month"
 msgstr ""
 
-#: mail/em-migrate.c:1072
+#: mail/em-migrate.c:1168
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13286,82 +12811,82 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1506
+#: mail/em-migrate.c:1602
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:1532
+#: mail/em-migrate.c:1628
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:1715
+#: mail/em-migrate.c:1811
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:1919
+#: mail/em-migrate.c:2015
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:1933
+#: mail/em-migrate.c:2029
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:1962
+#: mail/em-migrate.c:2058
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#: mail/em-migrate.c:2413 mail/em-migrate.c:2425
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2480
+#: mail/em-migrate.c:2576
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2498
+#: mail/em-migrate.c:2594
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 msgstr ""
 
-#: mail/em-popup.c:699
+#: mail/em-popup.c:700
 msgid "Save As..."
 msgstr ""
 
-#: mail/em-popup.c:717
+#: mail/em-popup.c:718
 #, c-format
 msgid "untitled_image.%s"
 msgstr ""
 
-#: mail/em-popup.c:807
+#: mail/em-popup.c:808
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:809
+#: mail/em-popup.c:810
 msgid "_Reply to sender"
 msgstr ""
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:859
 msgid "_Open Link in Browser"
 msgstr ""
 
-#: mail/em-popup.c:859
+#: mail/em-popup.c:860
 msgid "Se_nd message to..."
 msgstr ""
 
-#: mail/em-popup.c:860
+#: mail/em-popup.c:861
 msgid "_Add to Addressbook"
 msgstr ""
 
-#: mail/em-popup.c:966
+#: mail/em-popup.c:967
 #, c-format
 msgid "Open in %s..."
 msgstr ""
@@ -13913,7 +13438,7 @@ msgstr ""
 msgid "Mail Accounts"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
 msgid "Mail Preferences"
 msgstr ""
 
@@ -13927,15 +13452,15 @@ msgid "Evolution is importing your old Elm mail"
 msgstr ""
 
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:226
+#: mail/importers/evolution-mbox-importer.c:221
+#: mail/importers/evolution-outlook-importer.c:255
 #: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr ""
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:222
-#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/evolution-mbox-importer.c:223
+#: mail/importers/evolution-outlook-importer.c:257
 #: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr ""
@@ -13955,21 +13480,23 @@ msgid "Elm"
 msgstr ""
 
 #: mail/importers/evolution-mbox-importer.c:116
+#: mail/importers/evolution-outlook-importer.c:130
 msgid "Destination folder:"
 msgstr ""
 
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder to import into"
 msgstr ""
 
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:254
 #: mail/importers/mail-importer.c:226
 #, c-format
 msgid "Importing `%s'"
 msgstr ""
 
-#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/evolution-outlook-importer.c:301
 #: mail/importers/mail-importer.c:140
 msgid "Importing mailbox"
 msgstr ""
@@ -14107,15 +13634,15 @@ msgstr ""
 msgid "%s License Agreement"
 msgstr ""
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
 msgid "_Host:"
 msgstr ""
 
-#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
 msgid "User_name:"
 msgstr ""
 
-#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
 msgid "_Path:"
 msgstr ""
 
@@ -14178,31 +13705,31 @@ msgstr ""
 msgid ", %d unread"
 msgstr ""
 
-#: mail/mail-component.c:653
+#: mail/mail-component.c:656
 msgid "New Mail Message"
 msgstr ""
 
-#: mail/mail-component.c:654
+#: mail/mail-component.c:657
 msgid "_Mail Message"
 msgstr ""
 
-#: mail/mail-component.c:655
+#: mail/mail-component.c:658
 msgid "Compose a new mail message"
 msgstr ""
 
-#: mail/mail-component.c:661
+#: mail/mail-component.c:664
 msgid "New Mail Folder"
 msgstr ""
 
-#: mail/mail-component.c:662
+#: mail/mail-component.c:665
 msgid "Mail _Folder"
 msgstr ""
 
-#: mail/mail-component.c:663
+#: mail/mail-component.c:666
 msgid "Create a new mail folder"
 msgstr ""
 
-#: mail/mail-component.c:795
+#: mail/mail-component.c:798
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
@@ -14214,7 +13741,7 @@ msgstr ""
 msgid "Connecting to server..."
 msgstr ""
 
-#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr ""
 
@@ -14226,7 +13753,7 @@ msgid ""
 msgstr ""
 
 #: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid "Receiving Mail"
 msgstr ""
 
@@ -14240,7 +13767,7 @@ msgstr ""
 msgid "Please select among the following options"
 msgstr ""
 
-#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr ""
 
@@ -14250,7 +13777,7 @@ msgid ""
 "sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37
 msgid "Account Management"
 msgstr ""
 
@@ -14263,229 +13790,233 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:2
 msgid " Ch_eck for Supported Types "
 msgstr ""
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "<b>Preview</b>"
 msgstr "Forsýn:"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr ""
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "<b>S_ignatures</b>"
 msgstr ""
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "<b>_Languages</b>"
 msgstr ""
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
+msgid "<small>This will make the the filter more reliable, but slower</small>"
+msgstr ""
+
+#: mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Checking for New Mail</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">General</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Security</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:34
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:35
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:36
 msgid "Account Editor"
 msgstr ""
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:38
 msgid "Add Ne_w Signature..."
 msgstr ""
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "Add _Script"
 msgstr ""
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:40
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:44
 msgid "Always _sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Attach original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr ""
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:48
 msgid "Automatically _insert smiley images"
 msgstr ""
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Automatically check for _new mail every"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Beep w_hen new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "C_haracter set:"
 msgstr ""
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 msgid "Ch_eck for Supported Types "
 msgstr ""
 
-#: mail/mail-config.glade.h:53
-msgid "Check _Incoming Mail"
+#: mail/mail-config.glade.h:55
+msgid "Check _incoming mail for junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 msgid "Color for _misspelled words:"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Colors"
 msgstr "_Loka"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 msgid "Confirm _when expunging a folder"
 msgstr ""
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14495,355 +14026,351 @@ msgid ""
 "Click \"Apply\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
 msgid "De_fault"
 msgstr ""
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 msgid "Default character e_ncoding:"
 msgstr ""
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 msgid "Defaults"
 msgstr ""
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 msgid "Do not quote original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr ""
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
 msgid "Drafts _Folder:"
 msgstr ""
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:77
 msgid "Email Accounts"
 msgstr ""
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Email _Address:"
 msgstr "_Heimilisfang:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:79
 msgid "Empty trash folders on e_xit"
 msgstr ""
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
 msgid "Encry_ption certificate:"
 msgstr ""
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:81
 msgid "Evolution Account Assistant"
 msgstr ""
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:82
 msgid "Execute Command..."
 msgstr ""
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:83
 msgid "Fi_xed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 msgid "Font Properties"
 msgstr ""
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 msgid "Format messages in _HTML"
 msgstr ""
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "HTML Mail"
 msgstr "Senda HTML Póst?"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:88
 msgid "Headers"
 msgstr ""
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr ""
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 msgid "IMAPv4 "
 msgstr ""
 
 #: mail/mail-config.glade.h:91
+msgid "I_nclude remote tests"
+msgstr ""
+
+#: mail/mail-config.glade.h:94
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Kerberos "
 msgstr ""
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Mail Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr ""
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr ""
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Or_ganization:"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "PGP/GPG _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Play sound file when new mail arri_ves"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr ""
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 msgid "Re_member password"
 msgstr ""
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr ""
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:120
 msgid "Receiving Options"
 msgstr ""
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
 msgid "Remember _password"
 msgstr ""
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
 msgid "S_tandard Font:"
 msgstr ""
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 msgid "Security"
 msgstr ""
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:126
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:127
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:128
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:129
 #, fuzzy
 msgid "Select..."
 msgstr "Valið:"
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:133
 msgid "Sent _Messages Folder:"
 msgstr ""
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:134
 msgid "Ser_ver requires authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:135
 msgid "Server _Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:136
 msgid "Si_gning certificate:"
 msgstr ""
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:137
 msgid "Signat_ure:"
 msgstr ""
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:138
 msgid "Signatures"
 msgstr ""
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr ""
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:140
 msgid "Spell Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:141
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:142
 msgid "T_erminal Font:"
 msgstr ""
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:143
 msgid "T_ype: "
 msgstr ""
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:149
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:148
-msgid "Use _Daemon"
-msgstr ""
-
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:152
 msgid "V_ariable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:153
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Forward\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:158
 msgid "_Add Signature"
 msgstr ""
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:159
 msgid "_Always load images from the Internet"
 msgstr ""
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:160
 msgid "_Digitally sign outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:161
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:163
 msgid "_Enable"
 msgstr ""
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:165
 msgid "_Forward style:"
 msgstr ""
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:168
 msgid "_Load images if sender is in address book"
 msgstr ""
 
-#: mail/mail-config.glade.h:167
-msgid "_Local Tests Only"
-msgstr ""
-
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_Mark messages as read after"
 msgstr ""
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 msgid "_Never load images from the Internet"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:175
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:176
 msgid "_Reply style:"
 msgstr ""
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:177
 msgid "_Script:"
 msgstr ""
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:178
 msgid "_Show animated images"
 msgstr ""
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 msgid "_Use Secure Connection (SSL):"
 msgstr ""
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:181
 msgid "color"
 msgstr ""
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr ""
 
@@ -14998,7 +14525,7 @@ msgstr ""
 
 #. mail:camel-exception primary
 #: mail/mail-errors.xml.h:57
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgid "Your message with the subject \"{0}\" was not delivered."
 msgstr ""
 
 #. mail:camel-exception secondary
@@ -15053,11 +14580,6 @@ msgstr ""
 msgid "Cannot save to directory \"{0}\"."
 msgstr ""
 
-#. mail:no-save-path secondary
-#: mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail:no-create-path primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
@@ -15074,12 +14596,6 @@ msgstr ""
 msgid "Cannot create temporary save directory."
 msgstr ""
 
-#. mail:no-create-tmp-path secondary
-#: mail/mail-errors.xml.h:100 mail/mail-errors.xml.h:112
-#: widgets/misc/e-system-errors.xml.h:11 widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail:no-write-path-exists secondary
 #: mail/mail-errors.xml.h:104
 msgid "File exists but cannot overwrite it."
@@ -15323,179 +14839,175 @@ msgstr "Yfirskrifa"
 msgid "_Append"
 msgstr "Senda Til:"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:785
 #, c-format
 msgid "Pinging %s"
 msgstr ""
 
-#: mail/mail-mt.c:897
-msgid "Working"
-msgstr ""
-
-#: mail/mail-ops.c:99
+#: mail/mail-ops.c:98
 msgid "Filtering Folder"
 msgstr ""
 
-#: mail/mail-ops.c:260
+#: mail/mail-ops.c:259
 msgid "Fetching Mail"
 msgstr ""
 
-#: mail/mail-ops.c:543
+#: mail/mail-ops.c:542
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr ""
 
-#: mail/mail-ops.c:568
+#: mail/mail-ops.c:567
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:577
+#: mail/mail-ops.c:576
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr ""
 
-#: mail/mail-ops.c:673
+#: mail/mail-ops.c:672
 #, c-format
 msgid "Sending message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:703
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr ""
 
-#: mail/mail-ops.c:708
+#: mail/mail-ops.c:707
 msgid "Complete."
 msgstr ""
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:804
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:1002
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1116
+#: mail/mail-ops.c:1115
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1159
+#: mail/mail-ops.c:1158
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1230
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1308
 #, c-format
 msgid "Removing folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1403
+#: mail/mail-ops.c:1402
 #, c-format
 msgid "Storing folder '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1468
+#: mail/mail-ops.c:1467
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1469
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1524
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr ""
 
-#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
+#: mail/mail-ops.c:1559 mail/mail-ops.c:1610
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1607
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1609
+#: mail/mail-ops.c:1608
 msgid "Local Folders"
 msgstr ""
 
-#: mail/mail-ops.c:1692
+#: mail/mail-ops.c:1691
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1764
+#: mail/mail-ops.c:1763
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: mail/mail-ops.c:1850
+#: mail/mail-ops.c:1849
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: mail/mail-ops.c:1900
+#: mail/mail-ops.c:1899
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1928
+#: mail/mail-ops.c:1927
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1999
+#: mail/mail-ops.c:1998
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:2016
+#: mail/mail-ops.c:2015
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2046
+#: mail/mail-ops.c:2045
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Reconnecting to %s"
 msgstr ""
@@ -15559,24 +15071,24 @@ msgstr ""
 msgid "Waiting..."
 msgstr ""
 
-#: mail/mail-session.c:238
+#: mail/mail-session.c:239
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-session.c:271
+#: mail/mail-session.c:272
 #, c-format
 msgid "Enter Password for %s"
 msgstr ""
 
-#: mail/mail-session.c:273
+#: mail/mail-session.c:274
 msgid "Enter Password"
 msgstr ""
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password"
 msgstr ""
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:298
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
@@ -15631,79 +15143,79 @@ msgstr ""
 msgid "Updating vFolders for '%s'"
 msgstr ""
 
-#: mail/mail-vfolder.c:959
+#: mail/mail-vfolder.c:958
 msgid "vFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:998
+#: mail/mail-vfolder.c:997
 msgid "Edit VFolder"
 msgstr ""
 
-#: mail/mail-vfolder.c:1082
+#: mail/mail-vfolder.c:1081
 msgid "New VFolder"
 msgstr ""
 
-#: mail/message-list.c:946
+#: mail/message-list.c:948
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:947
+#: mail/message-list.c:949
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:948
+#: mail/message-list.c:950
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:949
+#: mail/message-list.c:951
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:950
+#: mail/message-list.c:952
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:954
+#: mail/message-list.c:956
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:955
+#: mail/message-list.c:957
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:959
+#: mail/message-list.c:961
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:960
+#: mail/message-list.c:962
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:1279
+#: mail/message-list.c:1285
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:1286
+#: mail/message-list.c:1292
 msgid "Today %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1295
+#: mail/message-list.c:1301
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1307
+#: mail/message-list.c:1313
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1315
+#: mail/message-list.c:1321
 msgid "%b %d %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1317
+#: mail/message-list.c:1323
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:3300
+#: mail/message-list.c:3321
 msgid "Generating message list"
 msgstr ""
 
@@ -15759,6 +15271,10 @@ msgstr ""
 msgid "No Response Necessary"
 msgstr ""
 
+#: mail/message-tag-followup.c:79
+msgid "Read"
+msgstr ""
+
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr ""
@@ -15855,47 +15371,51 @@ msgid ""
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:10
-msgid "Whether Evolution should start up in offline mode"
+msgid "Toolbar is visible"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:11
-msgid "Whether to skip the development warning dialog"
+msgid "Whether Evolution should start up in offline mode"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:12
-msgid "mail"
+msgid "Whether the toolbar should be visible."
 msgstr ""
 
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:14
+msgid "mail"
 msgstr ""
 
 #  strftime format %d = day of month, %B = full
 #  month name. You can change the order but don't
 #  change the specifiers or add anything.
-#: shell/e-shell.c:545 shell/e-shell.c:546
+#: shell/e-shell.c:588 shell/e-shell.c:589
 #, fuzzy, c-format
 msgid "%ld KB"
 msgstr "%d %B"
 
-#: shell/e-shell.c:744
+#: shell/e-shell.c:786
 #, fuzzy
 msgid "Uknown system error."
 msgstr "Óþekkt villa"
 
-#: shell/e-shell.c:1101
+#: shell/e-shell.c:1143
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:1103
+#: shell/e-shell.c:1145
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:1105
+#: shell/e-shell.c:1147
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:1107
+#: shell/e-shell.c:1149
 msgid "Generic error"
 msgstr ""
 
@@ -15943,7 +15463,7 @@ msgstr ""
 msgid "Select importer"
 msgstr ""
 
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1026
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
 #, c-format
 msgid "File %s does not exist"
 msgstr ""
@@ -15969,55 +15489,56 @@ msgid ""
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:549
+#: shell/e-shell-importer.c:570
 msgid "Automatic"
 msgstr ""
 
-#: shell/e-shell-importer.c:598
-msgid "_Filename:"
-msgstr ""
+#: shell/e-shell-importer.c:626
+#, fuzzy
+msgid "F_ilename:"
+msgstr "_Fullt Nafn"
 
-#: shell/e-shell-importer.c:603
+#: shell/e-shell-importer.c:631
 msgid "Select a file"
 msgstr ""
 
-#: shell/e-shell-importer.c:613
+#: shell/e-shell-importer.c:642
 msgid "File _type:"
 msgstr ""
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:681
 msgid "Import data and settings from _older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:684
 msgid "Import a _single file"
 msgstr ""
 
-#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:727
+#: shell/e-shell-importer.c:756
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:853 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
 #, c-format
 msgid "From %s:"
 msgstr ""
 
-#: shell/e-shell-importer.c:1044
+#: shell/e-shell-importer.c:1073
 #, c-format
 msgid "No importer available for file %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:1056
+#: shell/e-shell-importer.c:1085
 msgid "Unable to execute importer"
 msgstr ""
 
-#: shell/e-shell-importer.c:1169
+#: shell/e-shell-importer.c:1199
 msgid "_Import"
 msgstr ""
 
@@ -16062,54 +15583,53 @@ msgstr ""
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: shell/e-shell-window.c:336
+#: shell/e-shell-window.c:337
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-window.c:343
+#: shell/e-shell-window.c:344
 msgid "Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-window.c:349
+#: shell/e-shell-window.c:350
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell-window.c:621
+#: shell/e-shell-window.c:637
 #, c-format
 msgid "Switch to %s"
 msgstr ""
 
-#: shell/e-shell-window-commands.c:64
+#: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: shell/e-shell-window-commands.c:72
+#: shell/e-shell-window-commands.c:74
 #, c-format
 msgid "Error executing %s."
 msgstr ""
 
-#: shell/e-shell-window-commands.c:121
+#: shell/e-shell-window-commands.c:123
 msgid "Bug buddy is not installed."
 msgstr ""
 
-#: shell/e-shell-window-commands.c:129
+#: shell/e-shell-window-commands.c:131
 msgid "Bug buddy could not be run."
 msgstr ""
 
-#: shell/e-shell-window-commands.c:171
-#, fuzzy
-msgid "About Evolution"
-msgstr "_Um Ximian Evolution..."
+#: shell/e-shell-window-commands.c:323
+msgid "Groupware Suite"
+msgstr ""
 
-#: shell/e-shell-window-commands.c:382
+#: shell/e-shell-window-commands.c:563
 msgid "_Work Online"
 msgstr ""
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr ""
 
-#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr ""
 
@@ -16121,32 +15641,6 @@ msgstr ""
 msgid "New"
 msgstr ""
 
-#: shell/evolution-shell-component-utils.c:115
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-
-#: shell/evolution-shell-component-utils.c:118
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-
-#: shell/evolution-shell-component-utils.c:125
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-
 #: shell/evolution-test-component.c:140
 msgid "New Test"
 msgstr ""
@@ -16440,30 +15934,30 @@ msgid ""
 "Click help for details."
 msgstr ""
 
-#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:522
+#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
+#: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
 msgstr ""
 
-#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:604
+#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
+#: smime/gui/certificate-manager.c:638
 msgid "Certificate Name"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
+#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
 msgid "Purposes"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:517
+#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:267
+#: smime/gui/certificate-manager.c:271
 msgid "Expires"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:417
+#: smime/gui/certificate-manager.c:446
 msgid "E-Mail Address"
 msgstr ""
 
@@ -16502,6 +15996,11 @@ msgid ""
 "  Subject: %s\n"
 msgstr ""
 
+#: smime/gui/e-cert-selector.c:169
+#, fuzzy
+msgid "Select certificate"
+msgstr "Valið:"
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -16556,7 +16055,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
 msgid "Certificate"
 msgstr ""
 
@@ -16576,17 +16075,20 @@ msgstr ""
 msgid "Contact Certificates"
 msgstr ""
 
+#: smime/gui/smime-ui.glade.h:20
+msgid "Do not trust the authenticity of this certificate"
+msgstr ""
+
 #: smime/gui/smime-ui.glade.h:21
-#, no-c-format
-msgid "Do you want to trust \"%s\" for the following purposes?"
+msgid "Dummy window only"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:22
-msgid "Dummy window only"
+msgid "Edit"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:23
-msgid "Edit"
+msgid "Email Certificate Trust Settings"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:24
@@ -16621,247 +16123,258 @@ msgstr ""
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:37
-msgid "Trust this CA to identify email users."
+msgid "Trust the authenticity of this certificate"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:38
-msgid "Trust this CA to identify software developers."
+msgid "Trust this CA to identify email users."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:39
-msgid "Trust this CA to identify web sites."
+msgid "Trust this CA to identify software developers."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:40
-msgid "View"
+msgid "Trust this CA to identify web sites."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:41
-msgid "View Certificate"
+msgid "View"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:42
-msgid "You have been asked to trust a new Certificate Authority (CA)."
+msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:43
-msgid "You have certificates from these organizations that identify you:"
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:44
-msgid ""
-"You have certificates on file that identify these certificate authorities:"
+msgid "You have certificates on file that identify these people:"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:45
-msgid "You have certificates on file that identify these people:"
+msgid "Your Certificates"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:46
-msgid "Your Certificates"
+msgid "_Edit CA Trust"
 msgstr ""
 
-#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
+#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr ""
 
-#: smime/lib/e-cert.c:478
+#. x509 certificate usage types
+#: smime/lib/e-cert.c:424
+#, fuzzy
+msgid "Sign"
+msgstr "Spánn"
+
+#: smime/lib/e-cert.c:425
+#, fuzzy
+msgid "Encrypt"
+msgstr "Egyptaland"
+
+#: smime/lib/e-cert.c:530
 msgid "Version"
 msgstr ""
 
-#: smime/lib/e-cert.c:493
+#: smime/lib/e-cert.c:545
 msgid "Version 1"
 msgstr ""
 
-#: smime/lib/e-cert.c:496
+#: smime/lib/e-cert.c:548
 msgid "Version 2"
 msgstr ""
 
-#: smime/lib/e-cert.c:499
+#: smime/lib/e-cert.c:551
 msgid "Version 3"
 msgstr ""
 
-#: smime/lib/e-cert.c:581
+#: smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:584
+#: smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:587
+#: smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:590
+#: smime/lib/e-cert.c:642
 msgid "C"
 msgstr ""
 
-#: smime/lib/e-cert.c:593
+#: smime/lib/e-cert.c:645
 msgid "CN"
 msgstr ""
 
-#: smime/lib/e-cert.c:596
+#: smime/lib/e-cert.c:648
 msgid "OU"
 msgstr ""
 
-#: smime/lib/e-cert.c:599
+#: smime/lib/e-cert.c:651
 msgid "O"
 msgstr ""
 
-#: smime/lib/e-cert.c:602
+#: smime/lib/e-cert.c:654
 msgid "L"
 msgstr ""
 
-#: smime/lib/e-cert.c:605
+#: smime/lib/e-cert.c:657
 msgid "DN"
 msgstr ""
 
-#: smime/lib/e-cert.c:608
+#: smime/lib/e-cert.c:660
 msgid "DC"
 msgstr ""
 
-#: smime/lib/e-cert.c:611
+#: smime/lib/e-cert.c:663
 msgid "ST"
 msgstr ""
 
-#: smime/lib/e-cert.c:614
+#: smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:617
+#: smime/lib/e-cert.c:669
 msgid "Certificate Key Usage"
 msgstr ""
 
-#: smime/lib/e-cert.c:620
+#: smime/lib/e-cert.c:672
 msgid "Netscape Certificate Type"
 msgstr ""
 
-#: smime/lib/e-cert.c:623
+#: smime/lib/e-cert.c:675
 msgid "Certificate Authority Key Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:626
+#: smime/lib/e-cert.c:678
 msgid "UID"
 msgstr ""
 
-#: smime/lib/e-cert.c:635
+#: smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr ""
 
-#: smime/lib/e-cert.c:686
+#: smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:694
+#: smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
 msgstr ""
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:768
 msgid "Subject Public Key Info"
 msgstr ""
 
-#: smime/lib/e-cert.c:721
+#: smime/lib/e-cert.c:773
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:736
+#: smime/lib/e-cert.c:788
 msgid "Subject's Public Key"
 msgstr ""
 
-#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
+#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
 msgid "Error: Unable to process extension"
 msgstr ""
 
-#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
+#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:782
+#: smime/lib/e-cert.c:834
 msgid "SSL Certificate Authority"
 msgstr ""
 
-#: smime/lib/e-cert.c:786
+#: smime/lib/e-cert.c:838
 msgid "Email Certificate Authority"
 msgstr ""
 
-#: smime/lib/e-cert.c:814
+#: smime/lib/e-cert.c:866
 msgid "Signing"
 msgstr ""
 
-#: smime/lib/e-cert.c:818
+#: smime/lib/e-cert.c:870
 msgid "Non-repudiation"
 msgstr ""
 
-#: smime/lib/e-cert.c:822
+#: smime/lib/e-cert.c:874
 msgid "Key Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:826
+#: smime/lib/e-cert.c:878
 msgid "Data Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:830
+#: smime/lib/e-cert.c:882
 msgid "Key Agreement"
 msgstr ""
 
-#: smime/lib/e-cert.c:834
+#: smime/lib/e-cert.c:886
 msgid "Certificate Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:838
+#: smime/lib/e-cert.c:890
 msgid "CRL Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:938
 msgid "Critical"
 msgstr ""
 
-#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
+#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
 msgid "Not Critical"
 msgstr ""
 
-#: smime/lib/e-cert.c:912
+#: smime/lib/e-cert.c:964
 msgid "Extensions"
 msgstr ""
 
-#: smime/lib/e-cert.c:983
+#: smime/lib/e-cert.c:1035
 #, c-format
 msgid "%s = %s"
 msgstr ""
 
-#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
 msgid "Certificate Signature Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:1048
+#: smime/lib/e-cert.c:1100
 msgid "Issuer"
 msgstr ""
 
-#: smime/lib/e-cert.c:1102
+#: smime/lib/e-cert.c:1154
 msgid "Issuer Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1121
+#: smime/lib/e-cert.c:1173
 msgid "Subject Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1164
+#: smime/lib/e-cert.c:1216
 msgid "Certificate Signature Value"
 msgstr ""
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
+#: smime/lib/e-cert-db.c:608
 msgid "Certificate already exists"
 msgstr ""
 
@@ -17006,7 +16519,7 @@ msgstr ""
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr ""
 
@@ -17168,7 +16681,7 @@ msgstr ""
 #: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:3
+#: ui/evolution.xml.h:4
 msgid "Close"
 msgstr ""
 
@@ -17181,7 +16694,7 @@ msgid "Delete this item"
 msgstr ""
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr ""
 
@@ -17224,7 +16737,7 @@ msgstr ""
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:44
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "_File"
 msgstr ""
 
@@ -17481,13 +16994,13 @@ msgstr ""
 msgid "_Threaded Message List"
 msgstr ""
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Loka þessum glugga"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "_Close"
 msgstr "_Loka"
 
@@ -17883,7 +17396,7 @@ msgstr ""
 msgid "_Quoted"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
 msgid "_Tools"
 msgstr ""
 
@@ -18180,106 +17693,118 @@ msgid "_Open Task"
 msgstr ""
 
 #: ui/evolution.xml.h:1
-msgid "About Ximian Evolution..."
-msgstr ""
+#, fuzzy
+msgid "About Evolution..."
+msgstr "_Um Ximian Evolution..."
 
 #: ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
 msgstr ""
 
-#: ui/evolution.xml.h:5
-msgid "Create a new window displaying this folder"
+#: ui/evolution.xml.h:3
+msgid "Change the visibility of the toolbar"
 msgstr ""
 
 #: ui/evolution.xml.h:6
-msgid "E_xit"
+msgid "Create a new window displaying this folder"
 msgstr ""
 
 #: ui/evolution.xml.h:7
-msgid "Exit the program"
+msgid "E_xit"
 msgstr ""
 
 #: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Ximian Evolution _FAQ"
+
+#: ui/evolution.xml.h:9
+msgid "Exit the program"
+msgstr ""
+
+#: ui/evolution.xml.h:10
 msgid "Forget _Passwords"
 msgstr ""
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:11
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:12
 msgid "Import data from other programs"
 msgstr ""
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:14
 msgid "New _Window"
 msgstr ""
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Pi_lot Settings..."
 msgstr ""
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Send / Receive"
 msgstr "Senda / Sækja"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Send queued items and retrieve new items"
 msgstr ""
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Set up Pilot configuration"
 msgstr ""
 
-#: ui/evolution.xml.h:17
-msgid "Show information about Ximian Evolution"
+#: ui/evolution.xml.h:19
+#, fuzzy
+msgid "Show information about Evolution"
 msgstr "Sýna upplýsingar um Ximian Evolution"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:20
 msgid "Submit Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:21
 msgid "Submit _Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Submit a bug report using Bug Buddy"
 msgstr ""
 
-#: ui/evolution.xml.h:21
-msgid "Toggle whether we are working offline."
-msgstr ""
-
 #: ui/evolution.xml.h:23
-msgid "Ximian Evolution _FAQ"
-msgstr "Ximian Evolution _FAQ"
+msgid "T_oolbar"
+msgstr ""
 
 #: ui/evolution.xml.h:24
-msgid "_About Ximian Evolution..."
+msgid "Toggle whether we are working offline."
+msgstr ""
+
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "_About Evolution..."
 msgstr "_Um Ximian Evolution..."
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "_Help"
 msgstr "_Hjálp"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "_Import..."
 msgstr ""
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "_New"
 msgstr ""
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "_Quick Reference"
 msgstr ""
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_Send / Receive"
 msgstr "_Sækja / Senda"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 #, fuzzy
 msgid "_Window"
 msgstr "_Leita"
@@ -18350,7 +17875,7 @@ msgid "With _Status"
 msgstr "Bandaríkin"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:626
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:635
 msgid "UTC"
 msgstr "UTC"
 
@@ -18501,27 +18026,27 @@ msgstr "Annað..."
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
-#: widgets/misc/e-error.c:121
+#: widgets/misc/e-error.c:79 widgets/misc/e-error.c:80
+#: widgets/misc/e-error.c:122
 msgid "Evolution Error"
 msgstr ""
 
-#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
-#: widgets/misc/e-error.c:119
+#: widgets/misc/e-error.c:81 widgets/misc/e-error.c:82
+#: widgets/misc/e-error.c:120
 msgid "Evolution Warning"
 msgstr ""
 
-#: widgets/misc/e-error.c:118
+#: widgets/misc/e-error.c:119
 msgid "Evolution Information"
 msgstr ""
 
-#: widgets/misc/e-error.c:120
+#: widgets/misc/e-error.c:121
 #, fuzzy
 msgid "Evolution Query"
 msgstr "Ximian Evolution _FAQ"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:410
+#: widgets/misc/e-error.c:415
 #, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -18660,16 +18185,41 @@ msgstr ""
 msgid "Cannot open file \"{0}\"."
 msgstr ""
 
-#: widgets/misc/e-task-widget.c:211
+#: widgets/misc/e-task-widget.c:212
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: widgets/misc/e-task-widget.c:216
+#: widgets/misc/e-task-widget.c:217
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr ""
 
+#~ msgid "1:00"
+#~ msgstr "1:00"
+
+#~ msgid "5:00"
+#~ msgstr "5:00"
+
+#~ msgid "Connecting"
+#~ msgstr "Tengist"
+
+#~ msgid "One"
+#~ msgstr "Einn"
+
+#~ msgid "Searching"
+#~ msgstr "Leita"
+
+#~ msgid "U_se SSL/TLS:"
+#~ msgstr "_Nota SSL/TLS:"
+
+#, fuzzy
+#~ msgid "Job title:"
+#~ msgstr "Starfs Titill"
+
+#~ msgid "_About Ximian Evolution..."
+#~ msgstr "_Um Ximian Evolution..."
+
 #, fuzzy
 #~ msgid "Address 2:"
 #~ msgstr "_Heimilisfang:"
diff --git a/po/ja.po b/po/ja.po
index 38e70b8b10..017a201a63 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,14 +8,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-23 14:31+0900\n"
+"POT-Creation-Date: 2004-06-03 11:14-0400\n"
 "PO-Revision-Date: 2004-05-23 14:26+0900\n"
 "Last-Translator: Takeshi AIHANA <aihana@gnome.gr.jp>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: a11y/addressbook/ea-addressbook-view.c:94
@@ -70,13 +70,13 @@ msgstr "パイロットのアドレス・アプリケーション・ブロック
 msgid "Accessing LDAP Server anonymously"
 msgstr "匿名で LDAP サーバにアクセスします"
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
 msgid "Failed to authenticate.\n"
 msgstr "認証に失敗しました。\n"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%s%s (ユーザ %s) のパスワードを入力して下さい"
@@ -121,34 +121,6 @@ msgstr "新しい連絡先グループを作成します"
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr "アドレス帳の設定または関連フォルダのアップグレードに失敗しました"
 
-#: addressbook/gui/component/addressbook-config.c:483
-msgid "Failed to connect to LDAP server"
-msgstr "LDAP サーバへ接続できませんでした"
-
-#: addressbook/gui/component/addressbook-config.c:507
-msgid "Failed to authenticate with LDAP server"
-msgstr "LDAP サーバを使った認証に失敗しました"
-
-#: addressbook/gui/component/addressbook-config.c:535
-msgid "Could not perform query on Root DSE"
-msgstr "ルート DSE に問い合わせできませんでした"
-
-#: addressbook/gui/component/addressbook-config.c:840
-msgid "The server responded with no supported search bases"
-msgstr "サーバがサポートしていない検索ベースを返しました"
-
-#: addressbook/gui/component/addressbook-config.c:1245
-msgid "This server does not support LDAPv3 schema information"
-msgstr "このサーバは LDAPv3 スキーム情報をサポートしていません"
-
-#: addressbook/gui/component/addressbook-config.c:1266
-msgid "Error retrieving schema information"
-msgstr "スキーム情報の取得でエラーが発生しました"
-
-#: addressbook/gui/component/addressbook-config.c:1274
-msgid "Server did not respond with valid schema information"
-msgstr "サーバは正しいスキーム情報で応答しません"
-
 #: addressbook/gui/component/addressbook-migrate.c:68
 #: calendar/gui/migration.c:137 mail/em-migrate.c:1160
 msgid "Migrating..."
@@ -161,20 +133,16 @@ msgid "Migrating `%s':"
 msgstr "'%s' の移行中:"
 
 #. create the local source group
-#. On This Computer is always first and VFolders is always last
-#: addressbook/gui/component/addressbook-migrate.c:508
+#: addressbook/gui/component/addressbook-migrate.c:464
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
 #: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
-#: mail/mail-component.c:247 mail/mail-vfolder.c:218
+#: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr "このコンピュータ"
 
 #. Create the default Person addressbook
-#. Create the default Person calendar
-#. Create the default Person task list
-#. orange
-#: addressbook/gui/component/addressbook-migrate.c:516
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
 #: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
 #: mail/mail-config.glade.h:109
@@ -182,19 +150,19 @@ msgid "Personal"
 msgstr "プライベート"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:524
+#: addressbook/gui/component/addressbook-migrate.c:480
 msgid "On LDAP Servers"
 msgstr "LDAP サーバ"
 
-#: addressbook/gui/component/addressbook-migrate.c:652
+#: addressbook/gui/component/addressbook-migrate.c:608
 msgid "LDAP Servers"
 msgstr "LDAP サーバ"
 
-#: addressbook/gui/component/addressbook-migrate.c:772
+#: addressbook/gui/component/addressbook-migrate.c:728
 msgid "Autocompletion Settings"
 msgstr "自動補完の設定"
 
-#: addressbook/gui/component/addressbook-migrate.c:1148
+#: addressbook/gui/component/addressbook-migrate.c:1104
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -206,7 +174,7 @@ msgstr ""
 "\n"
 "Evolution がお使いのフォルダを移行している間、少々お待ち下さい..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1162
+#: addressbook/gui/component/addressbook-migrate.c:1118
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -216,7 +184,7 @@ msgstr ""
 "\n"
 "Evolution がお使いのフォルダを移行している間、少々お待ち下さい..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1171
+#: addressbook/gui/component/addressbook-migrate.c:1127
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -226,7 +194,7 @@ msgstr ""
 "\n"
 "Evolution がお使いのフォルダを移行している間、少々お待ち下さい..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1181
+#: addressbook/gui/component/addressbook-migrate.c:1137
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -236,47 +204,33 @@ msgstr ""
 "\n"
 "Evolution がお使いのパイロット同期データを移行している間、少々お待ち下さい..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1194
-msgid ""
-"Some fields are no longer representable in the contact editor. Please wait "
-"while Evolution copies those fields to the 'Notes' field..."
-msgstr ""
-"コンタクト・エディタにあるいくつかの項目は表示されなくなりました。Evolution "
-"がこれらの項目を 'メモ' の項目へ移行している間、しばらくお待ち下さい..."
-
-#: addressbook/gui/component/addressbook-view.c:674
+#: addressbook/gui/component/addressbook-view.c:675
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr "アドレス帳 '%s' を削除します。続行してもよろしいですか？"
 
-#: addressbook/gui/component/addressbook-view.c:761
+#: addressbook/gui/component/addressbook-view.c:754
 msgid "New Address Book"
 msgstr "新しいアドレス帳"
 
-#: addressbook/gui/component/addressbook-view.c:762
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
+#: addressbook/gui/component/addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "削除"
 
-#: addressbook/gui/component/addressbook-view.c:763
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-view.c:756
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "プロパティ..."
 
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
 #. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:1002
+#: addressbook/gui/component/addressbook-view.c:995
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
 #: calendar/gui/migration.c:373
 msgid "Contacts"
 msgstr "連絡先"
@@ -352,10 +306,6 @@ msgid "Manage your S/MIME certificates here"
 msgstr "ここでお使いの S/MIME 型の証明書を管理します"
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-msgid "  S_how Supported Bases "
-msgstr " サポートしている検索ベースの表示(_H) "
-
-#: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -377,183 +327,150 @@ msgstr " サポートしている検索ベースの表示(_H) "
 msgid "*"
 msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr "1"
 
-#: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1:00"
-msgstr "1:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr "398"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr "5"
 
-#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
-msgstr "5:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "<b>Authentication</b>"
 msgstr "<b>認証</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Display</b>"
 msgstr "<b>表示</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "<b>Downloading</b>"
 msgstr "<b>ダウンロード</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "<b>Searching</b>"
 msgstr "<b>検索</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:11
 msgid "<b>Server Information</b>"
 msgstr "<b>サーバの情報</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:12
 msgid "<b>Type:</b>"
 msgstr "<b>種類:</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add Contacts Group"
 msgstr "連絡先グループの追加"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Address Book Properties"
 msgstr "アドレス帳のプロパティ"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:42
 msgid "Always"
 msgstr "常に"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr "匿名"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:17
 #: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "基本"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
-msgid "Connecting"
-msgstr "接続"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 #: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "詳細"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
-msgid "Distinguished _name:"
-msgstr "識別名(_N):"
-
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished name"
 msgstr "識別名"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Download limit:"
 msgstr "ダウンロードの制限:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Email address"
 msgstr "E-メール・アドレス"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "Email address:"
-msgstr "E-メール・アドレス:"
-
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "Evolution will use this DN to authenticate you with the server"
-msgstr "Evolution はこの DN (識別名) を使ってサーバの認証を行います"
-
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:22
+#, fuzzy
 msgid ""
-"Evolution will use this email address to authenticate you with the server"
+"Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "Evolution はこの E-メール・アドレスを使ってサーバを利用した認証を行います"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Find Possible Search Bases"
 msgstr "利用可能な検索ベースを検索します"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:24
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "全般"
 
-#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
+#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:102
 msgid "Never"
 msgstr "しない"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
-msgid "One"
-msgstr "レベル１"
-
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Only locations within starting point"
 msgstr "開始ポイントの中にある場所のみ"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
-msgid "S_earch scope: "
-msgstr "検索範囲(_E): "
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Search _base:"
+msgstr "検索ベース:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:28
 msgid "Search base only"
 msgstr "検索ベースのみ"
 
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid "Search base:"
 msgstr "検索ベース:"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid "Search scope:"
 msgstr "検索範囲:"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
-msgid "Searching"
-msgstr "検索"
-
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:31
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
-"server if\n"
-"your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL or TLS."
 msgstr ""
 "このオプションを有効にすると、お使いの LDAP サーバが SSL/TLS をサポートしてい"
 "る場合にのみ、\n"
 "Evolution は LDAP サーバに接続します。"
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a \n"
-"insecure environment. For example, if you and your LDAP server are behind a "
-"firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection "
-"is already\n"
-"secure."
+"you are in a insecure environment. For example, if you and your LDAP server "
+"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
+"because your connection is already secure."
 msgstr ""
 "このオプションを有効にすると、セキュリティ保護されていない環境にいる場合にの"
 "み、\n"
@@ -561,13 +478,12 @@ msgstr ""
 "ファイヤーウォールの内側にある場合、Evolution は SSL/TLS を使いません。\n"
 "その理由は、既にセキュリティ保護された接続環境にあるからです。"
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:33
+#, fuzzy
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
-"TLS.  This \n"
-"means that your connection will be insecure, and that you will be vulnerable "
-"to security\n"
-"exploits. "
+"TLS.  This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits. "
 msgstr ""
 "このオプションを有効にすると、お使いのサーバが SSL と TLS をサポートしていな"
 "いことを\n"
@@ -575,36 +491,31 @@ msgstr ""
 "ティの恩恵を\n"
 "受けることができなくなることを意味します。"
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Starting point and locations within it"
 msgstr "開始ポイントとその中の場所"
 
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Sub"
-msgstr "サブ・ディレクトリ"
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr "サポートする検索ベース"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
-"searches will \n"
-"begin. If you leave this blank, the search will begin at the root of the "
-"directory tree."
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
 msgstr ""
 "検索ベースとは、検索を開始するエントリの識別名 (DN) です。\n"
 "空白のままにすると、ディレクトリ・ツリーのルートから検索を開始します。"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:37
+#, fuzzy
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
-"the \n"
-"directory tree. A search scope of \"sub\" will include all entries below "
-"your search base.\n"
-"A search scope of \"one\" will only include the entries one level beneath "
-"your base.\n"
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
 msgstr ""
 "ディレクトリ・ツリー下において、どれくらいの深さまで検索対象にするかを定義し"
 "ます。\n"
@@ -612,23 +523,23 @@ msgstr ""
 "す。\n"
 "検索範囲 \"レベル１\" には検索ベースの第一レベルのエントリのみ含まれます。\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:58
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 "これはお使いの LDAP サーバのフルパス名です。(例: \"ldap.mycompany.com\")"
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:39
+#, fuzzy
 msgid ""
-"This is the maximum number of entries to download. Setting this number to "
-"be \n"
+"This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr ""
 "これはダウンロードするエントリの最大数です。\n"
 "この数を大きくすると、アドレス帳を開く速度が遅くなります。"
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -637,134 +548,113 @@ msgstr ""
 "これは Evolution があなたを識別する方法です。\"E-メール・アドレス\" に対する"
 "この設定には、LDAP サーバに対する匿名アクセスが必要となります。"
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:41
+#, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
-"list.\n"
-"It is for display purposes only. "
+"list. It is for display purposes only. "
 msgstr ""
 "これはこのサーバの名前で、Evolution フォルダ一覧の中に表示されます。\n"
 "表示目的にのみ使用されます。"
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:42
+#, fuzzy
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. "
-"A \n"
-"list of standard ports has been provided. Ask your system administrator\n"
-"what port you should specify."
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
 msgstr ""
 "これは、Evolution が接続する先の LDAP サーバのポート番号です。\n"
 "標準ポートの一覧が提供されています。\n"
 "特別に指定する必要がある場合は、システム管理者にお尋ね下さい。"
 
-#: addressbook/gui/component/ldap-config.glade.h:67
-msgid "This option controls how long a search will be run."
-msgstr "このオプションは検索にかかる処理時間を指定します。"
-
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid "Timeout:"
 msgstr "タイムアウト:"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
-msgid "U_se SSL/TLS:"
-msgstr "SSL/TLS を使用する(_S):"
-
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr "使用する識別名 (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr "使用する E-メール・アドレス"
 
-#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
+#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr "可能ならば"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:47
 msgid "_Add Contacts Group"
 msgstr "連絡先グループ(_A)"
 
-#: addressbook/gui/component/ldap-config.glade.h:74
-#: calendar/gui/dialogs/calendar-setup.glade.h:12
-msgid "_Display name:"
-msgstr "表示名(_D):"
-
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr "ダウンロード制限(_D):"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Email address:"
 msgstr "E-メール・アドレス(_E):"
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:50
+#, fuzzy
+msgid "_Find Possible Search Bases"
+msgstr "利用可能な検索ベースを検索します"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Log in method:"
 msgstr "ログイン方式(_L):"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:171
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "_Log in:"
+msgstr "ログイン"
+
+#: addressbook/gui/component/ldap-config.glade.h:53
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
 msgid "_Name:"
 msgstr "名前(_N):"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
-msgid "_Port number:"
-msgstr "ポート番号(_P):"
-
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid "_Port:"
 msgstr "ポート番号(_P):"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
-msgid "_Search base:"
-msgstr "検索ベース(_S):"
-
-#: addressbook/gui/component/ldap-config.glade.h:82
-msgid "_Server name:"
-msgstr "サーバ名(_S):"
+#: addressbook/gui/component/ldap-config.glade.h:55
+#, fuzzy
+msgid "_Search scope:"
+msgstr "検索範囲:"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:56
 msgid "_Server:"
 msgstr "サーバ(_S):"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
-msgid "_Timeout (minutes):"
-msgstr "タイムアウト(分)(_T):"
+#: addressbook/gui/component/ldap-config.glade.h:57
+#, fuzzy
+msgid "_Timeout:"
+msgstr "タイムアウト:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:58
 msgid "_Use secure connection:"
 msgstr "セキュアな接続を利用する(_U):"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "カード"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
-msgid "connecting-tab"
-msgstr "接続タブ"
-
-#: addressbook/gui/component/ldap-config.glade.h:88
-msgid "general-tab"
-msgstr "全般タブ"
-
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:60
 #: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
 #: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "分"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
-msgid "searching-tab"
-msgstr "検索タブ"
-
-#: addressbook/gui/component/select-names/e-select-names.c:497
+#: addressbook/gui/component/select-names/e-select-names.c:503
 #: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid "Select Contacts from Address Book"
 msgstr "アドレス帳から連絡先の選択"
 
-#: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
@@ -804,7 +694,7 @@ msgstr "名前なしの連絡先"
 
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:222
+#: addressbook/gui/widgets/e-addressbook-view.c:224
 msgid "Source"
 msgstr "情報ソース"
 
@@ -869,9 +759,9 @@ msgid "<b>Work</b>"
 msgstr "<b>仕事</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:177
-#: addressbook/gui/widgets/eab-contact-display.c:342
-#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/widgets/eab-contact-display.c:334
+#: addressbook/gui/widgets/eab-contact-display.c:353
 msgid "AIM"
 msgstr "AIM"
 
@@ -905,15 +795,15 @@ msgid "Company:"
 msgstr "会社:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:265
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
+#: addressbook/gui/contact-editor/e-contact-editor.c:266
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
 msgstr "連絡先"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:519
+#: addressbook/gui/contact-editor/e-contact-editor.c:520
 msgid "Contact Editor"
 msgstr "連絡先エディタ"
 
@@ -934,83 +824,81 @@ msgid "Full _Name..."
 msgstr "氏名(_N)..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-msgid "Home"
-msgstr "自宅"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "Home Page:"
 msgstr "ホームページ:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-#: calendar/gui/e-itip-control.c:930
-msgid "Location:"
-msgstr "場所:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN メッセンジャ"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "Mailing Address"
 msgstr "メーリング・アドレス"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "Manager:"
 msgstr "マネージャ:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "Ni_ckname:"
 msgstr "あだ名(_C):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "Notes:"
 msgstr "メモ:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-msgid "Other"
-msgstr "その他"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#, fuzzy
+msgid "Office:"
+msgstr "事務所"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "PO Box:"
 msgstr "私書箱:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "Personal Information"
 msgstr "個人の情報"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "Profession:"
 msgstr "団体:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#, fuzzy
+msgid "Spouse:"
+msgstr "配偶者"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "State/Province:"
 msgstr "県/州:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "Title:"
 msgstr "役職:"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+msgid "Video Chat:"
+msgstr ""
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "Wants to receive HTML mail"
 msgstr "HTML メールの受信を許可する"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:42
-msgid "Webcam:"
-msgstr "ウェブカム:"
+#, fuzzy
+msgid "Web Log:"
+msgstr "ウェブ・ページ:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
+#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
 #: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
 #: mail/mail-config.glade.h:157
@@ -1030,17 +918,10 @@ msgid "_File under:"
 msgstr "ファイルのグループ(_F);"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "_Where:"
 msgstr "ファイルの場所(_W):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
-msgid "item7"
-msgstr "item7"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
-msgid "item8"
-msgstr "item8"
-
 #: addressbook/gui/contact-editor/eab-editor.c:315
 msgid ""
 "Are you sure you want\n"
@@ -1058,16 +939,16 @@ msgstr ""
 "本当に削除してもよろしいですか？"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:351
-#: addressbook/gui/widgets/eab-contact-display.c:372
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Address"
 msgstr "住所"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:286
+#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard.c:174
@@ -2045,84 +1926,80 @@ msgstr "ザンビア"
 msgid "Zimbabwe"
 msgstr "ジンバブエ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/contact-editor/e-contact-editor.c:179
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:337
+#: addressbook/gui/widgets/eab-contact-display.c:356
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
-#: addressbook/gui/widgets/eab-contact-display.c:347
-#: addressbook/gui/widgets/eab-contact-display.c:366
+#: addressbook/gui/contact-editor/e-contact-editor.c:180
+#: addressbook/gui/widgets/eab-contact-display.c:339
+#: addressbook/gui/widgets/eab-contact-display.c:358
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: addressbook/gui/widgets/eab-contact-display.c:338
+#: addressbook/gui/widgets/eab-contact-display.c:357
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:344
-#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#: addressbook/gui/widgets/eab-contact-display.c:355
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
+#: addressbook/gui/contact-editor/e-contact-editor.c:183
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:251
+#: addressbook/gui/contact-editor/e-contact-editor.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+msgid "Home"
+msgstr "自宅"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+msgid "Other"
+msgstr "その他"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
 msgid "Source Book"
 msgstr "元のアドレス帳"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:258
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Target Book"
 msgstr "対象のアドレス帳"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:272
+#: addressbook/gui/contact-editor/e-contact-editor.c:273
 msgid "Is New Contact"
 msgstr "新しい連絡先です"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:279
+#: addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Writable Fields"
 msgstr "書き込み可能な項目"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:293
+#: addressbook/gui/contact-editor/e-contact-editor.c:294
 msgid "Changed"
 msgstr "変更済"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2294
-msgid "Category editor not available."
-msgstr "カテゴリ・エディタが起動していません。"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2302
+#: addressbook/gui/contact-editor/e-contact-editor.c:2352
 msgid "This contact belongs to these categories:"
 msgstr "この連絡先が属しているカテゴリ:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2379
+#: addressbook/gui/contact-editor/e-contact-editor.c:2429
 msgid "Please select an image for this contact"
 msgstr "この連絡先の画像を選択して下さい"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2383
+#: addressbook/gui/contact-editor/e-contact-editor.c:2433
 msgid "No image"
 msgstr "画像なし"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2560
-#: addressbook/gui/contact-editor/e-contact-editor.c:2723
-msgid ""
-"You are moving the contact from one address book to another, but it cannot "
-"be removed from the source. Do you want to save a copy instead?"
-msgstr ""
-"コンタクトをあるアドレス帳から別のアドレス帳へ移動する際に、移動元からそのコ"
-"ンタクトを削除できませんでした。コンタクトを移動する代わりにコピーでよろしい"
-"ですか？"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2607
+#: addressbook/gui/contact-editor/e-contact-editor.c:2636
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2130,7 +2007,12 @@ msgstr ""
 "連絡先データが間違っています:\n"
 "\n"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2700
+#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#, fuzzy
+msgid "Invalid contact."
+msgstr "連絡先 %d個"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2723
 msgid ""
 "The contact cannot be saved to the selected address book. Do you want to "
 "discard changes?"
@@ -2138,12 +2020,20 @@ msgstr ""
 "選択したアドレス帳へ連絡先を保存できませんでした。変更を破棄してもよろしいで"
 "すか？"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2704
-#: addressbook/gui/contact-editor/e-contact-editor.c:2728
-#: addressbook/gui/widgets/eab-gui-util.c:208
+#: addressbook/gui/contact-editor/e-contact-editor.c:2727
+#: addressbook/gui/contact-editor/e-contact-editor.c:2751
 msgid "_Discard"
 msgstr "破棄(_D)"
 
+#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+msgid ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+"コンタクトをあるアドレス帳から別のアドレス帳へ移動する際に、移動元からそのコ"
+"ンタクトを削除できませんでした。コンタクトを移動する代わりにコピーでよろしい"
+"ですか？"
+
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:62
 msgid "AOL Instant Messenger"
 msgstr "AOL インスタント・メッセンジャ"
@@ -2321,30 +2211,30 @@ msgid "_Type an email address or drag a contact into the list below:"
 msgstr ""
 "E-メール・アドレスを入力するか、連絡先を下の一覧の中にドラッグして下さい:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "contact-list-editor"
 msgstr "連絡先一覧エディタ"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:153
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:215
+#: addressbook/gui/widgets/e-addressbook-view.c:217
 #: addressbook/gui/widgets/e-minicard-view.c:460
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "書籍"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
 msgid "Is New List"
 msgstr "新しい一覧です"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:215
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
 msgid "Contact List Editor"
 msgstr "連絡先一覧エディタ"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:438
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
 msgid "Save List as VCard"
 msgstr "一覧を vCard で保存"
 
@@ -2391,144 +2281,144 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "拡張検索"
 
-#: addressbook/gui/widgets/eab-contact-display.c:129
-#: addressbook/gui/widgets/eab-contact-display.c:192
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
 msgid "(map)"
 msgstr "(マップ)"
 
-#: addressbook/gui/widgets/eab-contact-display.c:139
-#: addressbook/gui/widgets/eab-contact-display.c:205
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
 msgid "map"
 msgstr "マップ"
 
-#: addressbook/gui/widgets/eab-contact-display.c:257
-#: addressbook/gui/widgets/eab-contact-display.c:533
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:525
 msgid "List Members"
 msgstr "メンバーのリスト化"
 
-#: addressbook/gui/widgets/eab-contact-display.c:329
-#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/eab-contact-display.c:321
+#: addressbook/gui/widgets/eab-contact-display.c:323
 msgid "E-mail"
 msgstr "E-メール"
 
-#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/eab-contact-display.c:332
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "組織"
 
-#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "Position"
 msgstr "役職"
 
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:354
 msgid "Groupwise"
 msgstr "Groupwise"
 
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:340
 msgid "Video Conferencing"
 msgstr "ビデオ会議"
 
-#: addressbook/gui/widgets/eab-contact-display.c:349
-#: addressbook/gui/widgets/eab-contact-display.c:370
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Phone"
 msgstr "電話"
 
-#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:342
 msgid "Fax"
 msgstr "FAX"
 
-#: addressbook/gui/widgets/eab-contact-display.c:354
+#: addressbook/gui/widgets/eab-contact-display.c:346
 msgid "work"
 msgstr "仕事"
 
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:359
 msgid "WWW"
 msgstr "ウェブ"
 
-#: addressbook/gui/widgets/eab-contact-display.c:368
-#: addressbook/gui/widgets/eab-contact-display.c:587
+#: addressbook/gui/widgets/eab-contact-display.c:360
+#: addressbook/gui/widgets/eab-contact-display.c:579
 msgid "Blog"
 msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/eab-contact-display.c:363
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "携帯電話"
 
-#: addressbook/gui/widgets/eab-contact-display.c:375
+#: addressbook/gui/widgets/eab-contact-display.c:367
 msgid "personal"
 msgstr "プライベート"
 
-#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/eab-contact-display.c:374
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "ノート"
 
-#: addressbook/gui/widgets/eab-contact-display.c:548
+#: addressbook/gui/widgets/eab-contact-display.c:540
 msgid "Job Title"
 msgstr "職業"
 
-#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/eab-contact-display.c:544
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:774
+#: smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "メール"
 
-#: addressbook/gui/widgets/eab-contact-display.c:579
+#: addressbook/gui/widgets/eab-contact-display.c:571
 msgid "Home page"
 msgstr "ホームページ"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 msgid "Success"
 msgstr "成功"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Backend busy"
 msgstr "バックエンドが動作中です"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Repository offline"
 msgstr "オフライン・リポジトリ"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Address Book does not exist"
 msgstr "アドレス帳がありません"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "No Self Contact defined"
 msgstr "自分の連絡先が定義されていません"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Permission denied"
 msgstr "権限がありません"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Contact not found"
 msgstr "連絡先が見つかりません"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Contact ID already exists"
 msgstr "既に連絡先 ID があります"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Protocol not supported"
 msgstr "プロトコルがサポートされていません"
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:60
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:233
 #: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
@@ -2541,37 +2431,37 @@ msgid "Cancelled"
 msgstr "キャンセル済み"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Could not cancel"
 msgstr "キャンセルできませんでした"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Authentication Failed"
 msgstr "認証に失敗しました"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Authentication Required"
 msgstr "認証を必要としています"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:66
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "TLS not Available"
 msgstr "TLS は無効です"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#: addressbook/gui/widgets/eab-gui-util.c:66
 msgid "No such source"
 msgstr "そのようなソースはありません"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:69
+#: addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Other error"
 msgstr "その他のエラー"
 
-#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:90
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
@@ -2579,7 +2469,7 @@ msgstr ""
 "このアドレス帳を開けませんでした。パスの存在とアクセス権をチェックして下さ"
 "い。"
 
-#: addressbook/gui/widgets/eab-gui-util.c:110
+#: addressbook/gui/widgets/eab-gui-util.c:97
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -2587,17 +2477,18 @@ msgstr ""
 "このアドレス帳を開けませんでした。これは誤った URI を指定したか、または LDAP "
 "サーバがダウンしていることをを意味します。"
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:102
+#, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution you must compile the program from the CVS "
-"sources after retrieving OpenLDAP from the link below."
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
 msgstr ""
 "このバージョンの Evolution は LDAP サポート無しでコンパイルされています。"
 "Evolution で LDAP を利用するには、下記のリンクから OpenLDAP を取得した後、"
 "CVS 版のソースを再ビルド・インストールする必要があります。"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:109
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -2605,11 +2496,7 @@ msgstr ""
 "このアドレス帳を開けませんでした。これは誤った URI を指定したか、またはサーバ"
 "がダウンしていることを意味します。"
 
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "Unable to open addressbook"
-msgstr "アドレス帳を開けません"
-
-#: addressbook/gui/widgets/eab-gui-util.c:162
+#: addressbook/gui/widgets/eab-gui-util.c:129
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2621,7 +2508,7 @@ msgstr ""
 "更にキーワードを指定して絞り込み検索するか、このアドレス帳の\n"
 "ディレクトリ・サーバの設定で検索結果の制限を上げて下さい。"
 
-#: addressbook/gui/widgets/eab-gui-util.c:168
+#: addressbook/gui/widgets/eab-gui-util.c:135
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -2633,49 +2520,45 @@ msgstr ""
 "更にキーワードを指定して絞り込み検索するか、このアドレス帳の\n"
 "ディレクトリ・サーバの設定で検索結果の制限を上げて下さい。"
 
-#: addressbook/gui/widgets/eab-gui-util.c:174
+#: addressbook/gui/widgets/eab-gui-util.c:141
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "このアドレス帳のバックエンドは、この問い合わせを解析できませんでした。"
 
-#: addressbook/gui/widgets/eab-gui-util.c:177
+#: addressbook/gui/widgets/eab-gui-util.c:144
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "このアドレス帳のバックエンドは、この問い合わせの実行を拒否しました。"
 
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:147
 msgid "This query did not complete successfully."
 msgstr "この問い合わせは完全に終了しませんでした。"
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
-msgid "Do you want to save changes?"
-msgstr "変更を保存しますか？"
-
-#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:169
 msgid "Error adding list"
 msgstr "一覧を追加する際にエラーが発生しました"
 
-#: addressbook/gui/widgets/eab-gui-util.c:229
-#: addressbook/gui/widgets/eab-gui-util.c:652
+#: addressbook/gui/widgets/eab-gui-util.c:169
+#: addressbook/gui/widgets/eab-gui-util.c:580
 msgid "Error adding contact"
 msgstr "連絡先を追加する際にエラーが発生しました"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying list"
 msgstr "一覧を修正する際にエラーが発生しました"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying contact"
 msgstr "連絡先を修正する際にエラーが発生しました"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:192
 msgid "Error removing list"
 msgstr "一覧を削除する際にエラーが発生しました"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
-#: addressbook/gui/widgets/eab-gui-util.c:610
+#: addressbook/gui/widgets/eab-gui-util.c:192
+#: addressbook/gui/widgets/eab-gui-util.c:538
 msgid "Error removing contact"
 msgstr "連絡先を削除する際にエラーが発生しました"
 
-#: addressbook/gui/widgets/eab-gui-util.c:334
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2684,7 +2567,7 @@ msgstr ""
 "%d 個の連絡先を %d 個の新しいウィンドウで開くことになります。\n"
 "本当に全ての連絡先を表示してもよろしいですか？"
 
-#: addressbook/gui/widgets/eab-gui-util.c:360
+#: addressbook/gui/widgets/eab-gui-util.c:300
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2693,49 +2576,44 @@ msgstr ""
 "既に %s があります。\n"
 "上書きしてもよろしいですか？"
 
-#: addressbook/gui/widgets/eab-gui-util.c:364
+#: addressbook/gui/widgets/eab-gui-util.c:304
 msgid "Overwrite"
 msgstr "上書き"
 
-#: addressbook/gui/widgets/eab-gui-util.c:400
-#, c-format
-msgid "Error saving %s: %s"
-msgstr "%s の保存中にエラーが発生しました: %s"
-
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:437
+#: addressbook/gui/widgets/eab-gui-util.c:365
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:571
+#: addressbook/gui/widgets/eab-gui-util.c:499
 msgid "list"
 msgstr "一覧"
 
-#: addressbook/gui/widgets/eab-gui-util.c:706
+#: addressbook/gui/widgets/eab-gui-util.c:634
 msgid "Move contact to"
 msgstr "連絡先の移動先"
 
-#: addressbook/gui/widgets/eab-gui-util.c:708
+#: addressbook/gui/widgets/eab-gui-util.c:636
 msgid "Copy contact to"
 msgstr "連絡先のコピー先"
 
-#: addressbook/gui/widgets/eab-gui-util.c:711
+#: addressbook/gui/widgets/eab-gui-util.c:639
 msgid "Move contacts to"
 msgstr "複数の連絡先の移動先"
 
-#: addressbook/gui/widgets/eab-gui-util.c:713
+#: addressbook/gui/widgets/eab-gui-util.c:641
 msgid "Copy contacts to"
 msgstr "複数の連絡先のコピー先"
 
-#: addressbook/gui/widgets/eab-gui-util.c:716
+#: addressbook/gui/widgets/eab-gui-util.c:644
 msgid "Select target addressbook."
 msgstr "アドレス帳の選択"
 
-#: addressbook/gui/widgets/eab-gui-util.c:939
+#: addressbook/gui/widgets/eab-gui-util.c:867
 msgid "Multiple VCards"
 msgstr "複数の vCard"
 
-#: addressbook/gui/widgets/eab-gui-util.c:942
+#: addressbook/gui/widgets/eab-gui-util.c:870
 #, c-format
 msgid "VCard for %s"
 msgstr "%s の vCard"
@@ -2822,7 +2700,7 @@ msgstr[1] "連絡先 %d個"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:229
+#: addressbook/gui/widgets/e-addressbook-view.c:231
 #: addressbook/gui/widgets/e-minicard-view.c:467
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
@@ -2840,141 +2718,130 @@ msgstr "モデル"
 msgid "Error modifying card"
 msgstr "カードの修正中にエラーが発生しました"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:163
 msgid "Name begins with"
 msgstr "名前が次のもので始まる"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:164
 msgid "Email begins with"
 msgstr "E-メールが次のもので始まる"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:57
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "カテゴリが次のものを含む"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-#: calendar/gui/cal-search-bar.c:50
+#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "項目が次のものを含む"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+#: addressbook/gui/widgets/e-addressbook-view.c:172
 msgid "Advanced..."
 msgstr "拡張..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:236
+#: addressbook/gui/widgets/e-addressbook-view.c:238
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:250
+#: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "種類"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:506
+#: addressbook/gui/widgets/e-addressbook-view.c:508
 msgid "Address Book"
 msgstr "アドレス帳"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
 #: addressbook/gui/widgets/e-addressbook-view.c:2080
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard..."
 msgstr "vCard 形式で保存..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 msgid "New Contact..."
 msgstr "新しい連絡先..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "New Contact List..."
 msgstr "新しい連絡先一覧..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Go to Folder..."
 msgstr "フォルダへ移動..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Import..."
 msgstr "インポート..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1066
 msgid "Search for Contacts..."
 msgstr "連絡先の検索..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 msgid "Address Book Sources..."
 msgstr "アドレス帳のソース..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1069
 msgid "Pilot Settings..."
 msgstr "パイロットの設定..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "この連絡先の転送"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
 msgid "Send Message to Contact"
 msgstr "この連絡先へメッセージの送信"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "印刷"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
+#: addressbook/gui/widgets/e-addressbook-view.c:1077
 msgid "Print Envelope"
 msgstr "宛名の印刷"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
+#: addressbook/gui/widgets/e-addressbook-view.c:1081
 msgid "Copy to Address Book..."
 msgstr "アドレス帳へコピー..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1080
+#: addressbook/gui/widgets/e-addressbook-view.c:1082
 msgid "Move to Address Book..."
 msgstr "アドレス帳へ移動..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "切り取り"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "コピー"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1087
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "貼り付け"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:1092
+#: calendar/gui/e-calendar-view.c:1280
 msgid "Current View"
 msgstr "現在の表示"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1309
-#, c-format
-msgid ""
-"The addressbook backend for\n"
-"%s\n"
-"has crashed. You will have to restart Evolution in order to use it again"
-msgstr ""
-"%s の\n"
-"アドレス帳バックエンドががクラッシュしました。\n"
-"再度利用する場合は Evolution を再起動して下さい。"
-
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1667
-#: calendar/gui/cal-search-bar.c:362
+#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "任意のカテゴリ"
 
@@ -3080,7 +2947,7 @@ msgstr "ラジオ"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:257
+#: calendar/gui/e-meeting-list-view.c:234
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "役割"
@@ -3188,17 +3055,17 @@ msgstr "カード表示"
 msgid "GTK Tree View"
 msgstr "GTK+ ツリー表示"
 
-#: addressbook/gui/widgets/test-reflow.c:119
+#: addressbook/gui/widgets/test-reflow.c:106
 msgid "Reflow Test"
 msgstr "Reflow のテスト"
 
-#: addressbook/gui/widgets/test-reflow.c:120
+#: addressbook/gui/widgets/test-reflow.c:107
 #: addressbook/printing/test-contact-print-style-editor.c:54
 #: addressbook/printing/test-print.c:53
 msgid "Copyright (C) 2000, Ximian, Inc."
 msgstr "Copyright (C) 2000, Ximian, Inc."
 
-#: addressbook/gui/widgets/test-reflow.c:122
+#: addressbook/gui/widgets/test-reflow.c:109
 msgid "This should test the reflow canvas item"
 msgstr "キャンバスのアイテムを Reflow するどうかをテストします"
 
@@ -3476,15 +3343,21 @@ msgstr "標準モードでは、サイズ・オプションを指定する必要
 msgid "Impossible internal error."
 msgstr "致命的な内部エラーです。"
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:629
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
 msgid "Can not open file"
 msgstr "ファイルを開けません"
 
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-msgid "Can not load URI"
-msgstr "URI を読み込めません"
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "アドレス帳を読み込めませんでした"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "アドレス帳を開けません"
 
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
@@ -3502,7 +3375,7 @@ msgstr "ファイル名が指定されていません。"
 msgid "Unnamed List"
 msgstr "名前なしの一覧"
 
-#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "パスワードの入力"
@@ -3777,10 +3650,10 @@ msgid "Whether to show week numbers in date navigator"
 msgstr "期日ナビゲータの中に週番号を表示するかどうか"
 
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:88
-#: calendar/gui/gnome-cal.c:1703
-#: camel/providers/groupwise/camel-gw-listener.c:304
-#: camel/providers/groupwise/camel-gw-listener.c:327
+#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/gnome-cal.c:1705
+#: camel/providers/groupwise/camel-gw-listener.c:311
+#: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
 msgstr "カレンダ"
 
@@ -3799,7 +3672,7 @@ msgstr "次より古いイベントを抹消する"
 
 #: calendar/gui/calendar-commands.c:363
 #: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:19 filter/filter.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
 msgid "days"
 msgstr "日"
 
@@ -3809,10 +3682,6 @@ msgstr "%Y年 %B %e日 %A"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. %d = day of month, %b = abbreviated month name.
-#. You can change the order but don't change the
-#. specifiers or add anything.
 #: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
 #: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
 #: calendar/gui/e-week-view-main-item.c:329
@@ -3949,23 +3818,23 @@ msgstr "週間表示"
 msgid "Month View"
 msgstr "月間表示"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "サマリが次のものを含む"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "説明が次のものを含む"
 
-#: calendar/gui/cal-search-bar.c:54
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "コメントが次のものを含む"
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:53
 msgid "Location contains"
 msgstr "場所が次のものを含む"
 
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
 msgid "Unmatched"
 msgstr "一致しない"
 
@@ -3986,23 +3855,23 @@ msgstr "カレンダをオープンする権限がありません"
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/dialogs/alarm-options.c:466
+#: calendar/gui/dialogs/alarm-options.c:467
 msgid "Audio Alarm Options"
 msgstr "オーディオ・アラームのオプション"
 
-#: calendar/gui/dialogs/alarm-options.c:475
+#: calendar/gui/dialogs/alarm-options.c:476
 msgid "Message Alarm Options"
 msgstr "メッセージ・アラームのオプション"
 
-#: calendar/gui/dialogs/alarm-options.c:484
+#: calendar/gui/dialogs/alarm-options.c:485
 msgid "Email Alarm Options"
 msgstr "E-メール・アラームのオプション"
 
-#: calendar/gui/dialogs/alarm-options.c:493
+#: calendar/gui/dialogs/alarm-options.c:494
 msgid "Program Alarm Options"
 msgstr "プログラム・アラームのオプション"
 
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:510
 msgid "Unknown Alarm Options"
 msgstr "不明なアラームのオプション"
 
@@ -4038,7 +3907,7 @@ msgstr "送信先:"
 msgid "With these arguments:"
 msgstr "引き渡す引数:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
 msgid "dialog1"
 msgstr "dialog1"
 
@@ -4047,7 +3916,7 @@ msgid "extra times every"
 msgstr "回 / "
 
 #: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:20 filter/filter.glade.h:16
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr "時間"
 
@@ -4093,7 +3962,7 @@ msgstr "E-メールを送信する"
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:921 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "サマリ:"
 
@@ -4123,7 +3992,6 @@ msgid "hour(s)"
 msgstr "時間"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:21
 msgid "minute(s)"
 msgstr "分"
 
@@ -4131,26 +3999,26 @@ msgstr "分"
 msgid "start of appointment"
 msgstr "予定を開始した時"
 
-#: calendar/gui/dialogs/calendar-setup.c:170
+#: calendar/gui/dialogs/calendar-setup.c:172
 msgid "You must specify a location to get the calendar from."
 msgstr "カレンダを取得する場所を指定して下さい。"
 
-#: calendar/gui/dialogs/calendar-setup.c:178
+#: calendar/gui/dialogs/calendar-setup.c:180
 #, c-format
 msgid "The source location '%s' is not well-formed."
 msgstr "ソースの格納場所 '%s' は well-formed ではありません。"
 
-#: calendar/gui/dialogs/calendar-setup.c:193
+#: calendar/gui/dialogs/calendar-setup.c:195
 #, c-format
 msgid "The source location '%s' is not a webcal source."
 msgstr "ソースの格納場所 '%s' は webcal のソースではありません。"
 
-#: calendar/gui/dialogs/calendar-setup.c:265
+#: calendar/gui/dialogs/calendar-setup.c:275
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr "既に '%s' というソースが指定したグループの中にあります"
 
-#: calendar/gui/dialogs/calendar-setup.c:278
+#: calendar/gui/dialogs/calendar-setup.c:288
 #, c-format
 msgid ""
 "The group '%s' is remote. You must specify a location to get the calendar "
@@ -4169,51 +4037,31 @@ msgstr "タスク・グループの追加"
 msgid "C_olor:"
 msgstr "色(_O):"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "Calendar Properties"
-msgstr "カレンダのプロパティ"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:110
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
 msgid "Pick a color"
 msgstr "色の選択"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:8
-msgid "Remote"
-msgstr "リモート"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "Task List Properties"
-msgstr "タスク一覧のプロパティ"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
 msgid "_Add Calendar"
 msgstr "カレンダの追加(_A)"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
 msgid "_Add Group"
 msgstr "グループの追加(_A)"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-msgid "_Refresh Interval:"
-msgstr "更新間隔(_R):"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
 msgid "_Refresh:"
 msgstr "更新(_R):"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-msgid "_Source URL:"
-msgstr "ソース URL(_S):"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "_Type:"
 msgstr "種類(_T):"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
 msgid "_URL:"
 msgstr "_URL:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
 msgid "weeks"
 msgstr "週"
 
@@ -4325,7 +4173,7 @@ msgstr "予定の有無の公開"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:557
+#: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "金曜日"
 
@@ -4339,7 +4187,7 @@ msgstr "分"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:553
+#: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "月曜日"
 
@@ -4349,7 +4197,7 @@ msgstr "日(_U)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "土曜日"
 
@@ -4363,7 +4211,7 @@ msgstr "期日ナビゲータの中に週番号を表示する(_N)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:552
+#: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "日曜日"
 
@@ -4377,7 +4225,7 @@ msgstr "木(_H)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:556
+#: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "木曜日"
 
@@ -4391,7 +4239,7 @@ msgstr "時刻の書式:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:554
+#: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "火曜日"
 
@@ -4401,7 +4249,7 @@ msgstr "週の開始(_E):"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:555
+#: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "水曜日"
 
@@ -4483,77 +4331,46 @@ msgstr "水(_W)"
 msgid "before every appointment"
 msgstr "前に表示する"
 
-#: calendar/gui/dialogs/cancel-comp.c:57
-msgid ""
-"The event being deleted is a meeting, would you like to send a cancellation "
-"notice?"
-msgstr "削除されたイベントが会議でした。取り消し通知を送付しますか？"
-
-#: calendar/gui/dialogs/cancel-comp.c:60
-msgid "Are you sure you want to cancel and delete this meeting?"
-msgstr "本当にこの会議をキャンセルして削除してもよろしいですか？"
-
-#: calendar/gui/dialogs/cancel-comp.c:66
-msgid ""
-"The task being deleted is assigned, would you like to send a cancellation "
-"notice?"
-msgstr "削除されたタスクが割り当て済みです。取り消し通知を送付しますか？"
-
-#: calendar/gui/dialogs/cancel-comp.c:69
-msgid "Are you sure you want to cancel and delete this task?"
-msgstr "本当にこのタスクを取り消して削除してもよろしいですか？"
-
-#: calendar/gui/dialogs/cancel-comp.c:75
-msgid ""
-"The journal entry being deleted is published, would you like to send a "
-"cancellation notice?"
-msgstr ""
-"削除されたジャーナル・エントリが公開中です。取り消し通知を送付しますか？"
-
-#: calendar/gui/dialogs/cancel-comp.c:78
-msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr "本当にこのジャーナル・エントリを取り消して削除してもよろしいですか？"
-
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "このイベントは削除されました。"
 
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "このタスクは削除されました。"
 
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:68
 msgid "This journal entry has been deleted."
 msgstr "このジャーナルエントリは削除されました。"
 
-#: calendar/gui/dialogs/changed-comp.c:75
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  変更しました。これらの変更を無視してエディタを閉じますか？"
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  何も変更していませんが、エディタを閉じますか？"
 
-#: calendar/gui/dialogs/changed-comp.c:82
+#: calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "このイベントは変更されました。"
 
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "このタスクは変更されました。"
 
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:92
 msgid "This journal entry has been changed."
 msgstr "このジャーナル・エントリは変更されました。"
 
-#: calendar/gui/dialogs/changed-comp.c:99
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  変更しました。この変更を無視してエディタを更新しますか？"
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  何も変更していませんが、エディタを更新しますか？"
@@ -4591,7 +4408,7 @@ msgid "No summary"
 msgstr "サマリ無し"
 
 #: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
 #: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "別名で保存..."
@@ -4643,99 +4460,51 @@ msgstr "転送先ソースを開けませんでした"
 msgid "Destination is read only"
 msgstr "転送先は読み込み専用"
 
-#: calendar/gui/dialogs/delete-comp.c:95
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "本当に予定 '%s' を削除してもよろしいですか？"
-
-#: calendar/gui/dialogs/delete-comp.c:98
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "本当にタイトルなしの予定を削除してもよろしいですか？"
-
-#: calendar/gui/dialogs/delete-comp.c:104
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "本当にタスク '%s' を削除してもよろしいですか？"
-
-#: calendar/gui/dialogs/delete-comp.c:107
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "本当にタイトルなしのタスクを削除してもよろしいですか？"
-
-#: calendar/gui/dialogs/delete-comp.c:113
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "本当に仕訳記入 '%s' を削除してもよろしいですか？"
-
-#: calendar/gui/dialogs/delete-comp.c:116
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "本当にタイトルなしの仕訳記入を削除してもよろしいですか？"
-
-#: calendar/gui/dialogs/delete-comp.c:131
-#, c-format
-msgid "Are you sure you want to delete %d appointment?"
-msgid_plural "Are you sure you want to delete %d appointments?"
-msgstr[0] "本当に %d 個の予定を削除してもよろしいですか？"
-msgstr[1] "本当に %d 個の予定を削除してもよろしいですか？"
-
-#: calendar/gui/dialogs/delete-comp.c:138
-#, c-format
-msgid "Are you sure you want to delete %d task?"
-msgid_plural "Are you sure you want to delete %d tasks?"
-msgstr[0] "本当に %d 個のタスクを削除してもよろしいですか？"
-msgstr[1] "本当に %d 個のタスクを削除してもよろしいですか？"
-
-#: calendar/gui/dialogs/delete-comp.c:145
-#, c-format
-msgid "Are you sure you want to delete %d journal entry?"
-msgid_plural "Are you sure you want to delete %d journal entries?"
-msgstr[0] "本当に %d 個の仕訳記入を削除してもよろしいですか？"
-msgstr[1] "本当に %d 個の仕訳記入を削除してもよろしいですか？"
-
-#: calendar/gui/dialogs/delete-error.c:52
+#: calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "CORBA エラーのためイベントを削除できませんでした"
 
-#: calendar/gui/dialogs/delete-error.c:55
+#: calendar/gui/dialogs/delete-error.c:57
 msgid "The task could not be deleted due to a corba error"
 msgstr "CORBA エラーのためタスクを削除できませんでした"
 
-#: calendar/gui/dialogs/delete-error.c:58
+#: calendar/gui/dialogs/delete-error.c:60
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr "CORBA エラーのためジャーナル・エントリを削除できませんでした"
 
-#: calendar/gui/dialogs/delete-error.c:61
+#: calendar/gui/dialogs/delete-error.c:63
 msgid "The item could not be deleted due to a corba error"
 msgstr "CORBA エラーのためアイテムを削除できませんでした"
 
-#: calendar/gui/dialogs/delete-error.c:68
+#: calendar/gui/dialogs/delete-error.c:70
 msgid "The event could not be deleted because permission was denied"
 msgstr "権限がないのでイベントを削除できませんでした"
 
-#: calendar/gui/dialogs/delete-error.c:71
+#: calendar/gui/dialogs/delete-error.c:73
 msgid "The task could not be deleted because permission was denied"
 msgstr "権限がないのでタスクを削除できませんでした"
 
-#: calendar/gui/dialogs/delete-error.c:74
+#: calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr "権限がないのでジャーナル・エントリを削除できませんでした"
 
-#: calendar/gui/dialogs/delete-error.c:77
+#: calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
 msgstr "権限がないのでアイテムを削除できませんでした"
 
-#: calendar/gui/dialogs/delete-error.c:84
+#: calendar/gui/dialogs/delete-error.c:86
 msgid "The event could not be deleted due to an error"
 msgstr "エラーのためイベントを削除できませんでした"
 
-#: calendar/gui/dialogs/delete-error.c:87
+#: calendar/gui/dialogs/delete-error.c:89
 msgid "The task could not be deleted due to an error"
 msgstr "エラーのためタスクを削除できませんでした"
 
-#: calendar/gui/dialogs/delete-error.c:90
+#: calendar/gui/dialogs/delete-error.c:92
 msgid "The journal entry could not be deleted due to an error"
 msgstr "エラーのためジャーナル・エントリを削除できませんでした"
 
-#: calendar/gui/dialogs/delete-error.c:93
+#: calendar/gui/dialogs/delete-error.c:95
 msgid "The item could not be deleted due to an error"
 msgstr "エラーのためアイテムを削除できませんでした"
 
@@ -4867,17 +4636,12 @@ msgid "_Start time:"
 msgstr "開始時刻(_S):"
 
 #. an empty string is the same as 'None'
-#. add a "None" option to the stores menu
-#. Put the "None" and "UTC" entries at the top of the combo's list.
-#. When "None" is selected we want the field to be cleared.
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
 #: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:3
+#: calendar/gui/dialogs/meeting-page.glade.h:4
 #: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
 #: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1559
-#: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:103
+#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
+#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
@@ -4903,8 +4667,8 @@ msgstr "委任先(_D)..."
 #. FIXME: need to disable for undeletable folders
 #: calendar/gui/dialogs/meeting-page.c:655
 #: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1310 calendar/gui/e-calendar-view.c:1342
-#: mail/em-folder-tree.c:2562 mail/em-folder-view.c:919
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
+#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -4912,7 +4676,7 @@ msgid "_Delete"
 msgstr "削除(_D)"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:241
+#: calendar/gui/e-meeting-list-view.c:218
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "出席者"
@@ -4948,16 +4712,15 @@ msgid "Member"
 msgstr "メンバー"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1048 calendar/gui/e-meeting-list-view.c:264
+#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "返信の有無"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:271
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
-#: mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-list-view.c:248
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "ステータス"
 
@@ -4965,20 +4728,20 @@ msgstr "ステータス"
 msgid "Add A_ttendee"
 msgstr "出席者の追加(_T)"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "Add attendees from addressbook."
+msgstr "差出人をアドレス帳に追加"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "主催者:"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
+#: calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "_Change Organizer"
 msgstr "主催者の変更(_C)"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-#: calendar/gui/e-meeting-time-sel.c:417
-msgid "_Invite Others..."
-msgstr "他の人を招待する(_I)..."
-
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
 msgstr "<b>カレンダのオプション</b>"
@@ -5125,7 +4888,7 @@ msgid "_No recurrence"
 msgstr "繰り返さない(_N)"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:450
+#: composer/e-msg-composer-attachment-bar.c:453
 msgid "_Remove"
 msgstr "削除(_R)"
 
@@ -5157,52 +4920,18 @@ msgstr "週"
 msgid "year(s)"
 msgstr "年"
 
-#: calendar/gui/dialogs/save-comp.c:53
-msgid ""
-"This event has been changed, but has not been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"このイベントは変更されていますが保存されていません。\n"
-"\n"
-"その変更を保存しますか？"
-
-#: calendar/gui/dialogs/save-comp.c:57
-msgid "_Discard Changes"
-msgstr "変更の破棄(_D)"
-
-#: calendar/gui/dialogs/save-comp.c:62
-msgid "Save Event"
-msgstr "イベントの保存"
-
-#: calendar/gui/dialogs/select-source-dialog.c:65
+#: calendar/gui/dialogs/select-source-dialog.c:69
 msgid "Select destination"
 msgstr "転送先の選択"
 
-#: calendar/gui/dialogs/select-source-dialog.c:86
+#: calendar/gui/dialogs/select-source-dialog.c:90
 msgid "_Destination"
 msgstr "転送先(_D)"
 
-#: calendar/gui/dialogs/select-source-dialog.c:88
+#: calendar/gui/dialogs/select-source-dialog.c:92
 msgid "Task List"
 msgstr "タスク一覧"
 
-#: calendar/gui/dialogs/send-comp.c:57
-msgid "The meeting information has been created. Send it?"
-msgstr "会議の情報が生成されました。この召集通知を送信しますか？"
-
-#: calendar/gui/dialogs/send-comp.c:60
-msgid "The meeting information has changed. Send an updated version?"
-msgstr "会議の情報が変更されました。更新されたバージョンを送信しますか？"
-
-#: calendar/gui/dialogs/send-comp.c:67
-msgid "The task assignment information has been created. Send it?"
-msgstr "タスク情報が生成されました。この情報を送信しますか？"
-
-#: calendar/gui/dialogs/send-comp.c:71
-msgid "The task information has changed. Send an updated version?"
-msgstr "タスク情報が変更されました。更新されたバージョンを送信しますか？"
-
 #: calendar/gui/dialogs/task-details-page.c:406
 msgid "Completed date is wrong"
 msgstr "完了日が間違っています"
@@ -5300,7 +5029,7 @@ msgstr "極秘(_F)"
 
 #: calendar/gui/dialogs/task-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:976 calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "説明:"
@@ -5464,7 +5193,7 @@ msgstr "期日:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:944
+#: calendar/gui/e-itip-control.c:943
 msgid "Status:"
 msgstr "ステータス:"
 
@@ -5548,12 +5277,12 @@ msgstr "予定あり"
 msgid "Deleting selected objects"
 msgstr "指定したオブジェクトを削除します"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
 msgid "Updating objects"
 msgstr "オブジェクトの更新"
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1370
+#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
 #: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "開く(_O)"
@@ -5563,15 +5292,15 @@ msgid "Open _Web Page"
 msgstr "ウェブ・ページを開く(_W)"
 
 #: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1291 calendar/gui/e-calendar-view.c:1376
-#: mail/em-folder-view.c:896 mail/em-popup.c:690 mail/em-popup.c:806
+#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
+#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "別名で保存(_S)..."
 
 #: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1292
-#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
+#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
@@ -5579,15 +5308,15 @@ msgid "_Print..."
 msgstr "印刷(_P)..."
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "切り取り(_U)"
 
 #: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1338
-#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2555
+#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
+#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
 #: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
@@ -5595,8 +5324,8 @@ msgid "_Copy"
 msgstr "コピー(_C)"
 
 #: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1273 calendar/gui/e-calendar-view.c:1299
-#: calendar/gui/e-calendar-view.c:1372 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
+#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
@@ -5662,67 +5391,67 @@ msgstr "サマリ"
 msgid "Task sort"
 msgstr "タスクの並び替え"
 
-#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
 msgid "New _Appointment..."
 msgstr "新しい予定(_A)..."
 
-#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
+#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
 msgid "New All Day _Event"
 msgstr "新しい終日のイベント(_E)"
 
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
+#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
 msgid "New Meeting"
 msgstr "新しい会議"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
 msgid "New Task"
 msgstr "新しいタスク"
 
-#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "今日にする(_T)"
 
-#: calendar/gui/e-calendar-view.c:1280
+#: calendar/gui/e-calendar-view.c:1283
 msgid "_Select Date..."
 msgstr "日付の選択(_S)..."
 
-#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "予定の有無の公開(_P)"
 
-#: calendar/gui/e-calendar-view.c:1303
+#: calendar/gui/e-calendar-view.c:1306
 msgid "Cop_y to Calendar..."
 msgstr "カレンダへコピー(_Y)..."
 
-#: calendar/gui/e-calendar-view.c:1304
+#: calendar/gui/e-calendar-view.c:1307
 msgid "Mo_ve to Calendar..."
 msgstr "カレンダへ移動(_V)..."
 
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1308
 msgid "_Schedule Meeting..."
 msgstr "会議のスケジュール(_S)..."
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1309
 msgid "_Forward as iCalendar..."
 msgstr "iCalender 形式で転送(_F)..."
 
-#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
 msgid "Delete this _Occurrence"
 msgstr "このイベントの削除(_O)"
 
-#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
 msgid "Delete _All Occurrences"
 msgstr "全てのイベントの削除(_A)"
 
-#: calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1349
 msgid "Go to _Today"
 msgstr "今日へ移動(_T)"
 
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1351
 msgid "_Go to Date..."
 msgstr "指定日へ移動(_G)..."
 
-#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "設定(_S)..."
 
@@ -5736,9 +5465,9 @@ msgstr "開始日"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:961 calendar/gui/e-itip-control.c:1163
-#: calendar/gui/e-meeting-list-view.c:145
-#: calendar/gui/e-meeting-list-view.c:159 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
 #: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
 #: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
 #: camel/camel-tcp-stream-openssl.c:631
@@ -5764,13 +5493,13 @@ msgid "Assigned"
 msgstr "割当て済み"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr "はい"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:170 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "いいえ"
 
@@ -5782,7 +5511,7 @@ msgstr "北"
 msgid "S"
 msgstr "南"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
 msgid "E"
 msgstr "東"
 
@@ -5801,20 +5530,12 @@ msgstr ""
 "45.436845,125.862501"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%Y/%m/%d (%a) %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format.
 #: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
@@ -5845,10 +5566,6 @@ msgstr "午後"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#. strftime format %A = full weekday name, %d = day of
-#. month, %B = full month name. You can change the
-#. order but don't change the specifiers or add
-#. anything.
 #: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
@@ -5856,9 +5573,6 @@ msgstr "%B%e日 %A"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#. strftime format %d = day of month, %b = abbreviated
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
 #: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
@@ -5869,102 +5583,102 @@ msgstr "%B%e日"
 msgid "%02i minute divisions"
 msgstr "%02i 分分割"
 
-#: calendar/gui/e-itip-control.c:586
+#: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
 msgstr "はい (複合的な繰り返し)"
 
-#: calendar/gui/e-itip-control.c:597
+#: calendar/gui/e-itip-control.c:596
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "毎日"
 msgstr[1] "%d 日間毎"
 
-#: calendar/gui/e-itip-control.c:602
+#: calendar/gui/e-itip-control.c:601
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "毎週"
 msgstr[1] "%d 週間毎"
 
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:603
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "次の毎週 "
 msgstr[1] "次の %d 週間毎 "
 
-#: calendar/gui/e-itip-control.c:612
+#: calendar/gui/e-itip-control.c:611
 msgid " and "
 msgstr " と "
 
-#: calendar/gui/e-itip-control.c:619
+#: calendar/gui/e-itip-control.c:618
 #, c-format
 msgid "The %s day of "
 msgstr "次の %s 日 "
 
-#: calendar/gui/e-itip-control.c:632
+#: calendar/gui/e-itip-control.c:631
 #, c-format
 msgid "The %s %s of "
 msgstr "次の %s %s "
 
-#: calendar/gui/e-itip-control.c:639
+#: calendar/gui/e-itip-control.c:638
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "毎月"
 msgstr[1] "%d ヶ月毎"
 
-#: calendar/gui/e-itip-control.c:643
+#: calendar/gui/e-itip-control.c:642
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "毎年"
 msgstr[1] "%d 年毎"
 
-#: calendar/gui/e-itip-control.c:654
+#: calendar/gui/e-itip-control.c:653
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] " %d 回の合計"
 msgstr[1] " %d 回の合計"
 
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:662
 msgid ", ending on "
 msgstr ", 次の終わり "
 
-#: calendar/gui/e-itip-control.c:687
+#: calendar/gui/e-itip-control.c:686
 msgid "<b>Starts:</b> "
 msgstr "<b>開始日:</b> "
 
-#: calendar/gui/e-itip-control.c:697
+#: calendar/gui/e-itip-control.c:696
 msgid "<b>Ends:</b> "
 msgstr "<b>終了日:<b> "
 
-#: calendar/gui/e-itip-control.c:717
+#: calendar/gui/e-itip-control.c:716
 msgid "<b>Completed:</b> "
 msgstr "<b>完了日:</b> "
 
-#: calendar/gui/e-itip-control.c:727
+#: calendar/gui/e-itip-control.c:726
 msgid "<b>Due:</b> "
 msgstr "<b>期日:</b> "
 
-#: calendar/gui/e-itip-control.c:765 calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
 msgid "iCalendar Information"
 msgstr "iCalendar 情報"
 
 #. Title
-#: calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:781
 msgid "iCalendar Error"
 msgstr "iCalendar エラー"
 
-#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
-#: calendar/gui/e-itip-control.c:880 calendar/gui/e-itip-control.c:897
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
 msgid "An unknown person"
 msgstr "身元不明な人"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:904
+#: calendar/gui/e-itip-control.c:903
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5972,301 +5686,305 @@ msgstr ""
 "<br> 次の情報を再表示して下さい。それから下にあるメニューから行動を選択して下"
 "さい。"
 
-#: calendar/gui/e-itip-control.c:919
+#: calendar/gui/e-itip-control.c:918
 msgid "<i>None</i>"
 msgstr "<i>なし</i>"
 
-#: calendar/gui/e-itip-control.c:949 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:929
+msgid "Location:"
+msgstr "場所:"
+
+#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "受諾済"
 
-#: calendar/gui/e-itip-control.c:953 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "暫定的に受諾済"
 
-#: calendar/gui/e-itip-control.c:957 calendar/gui/e-meeting-list-view.c:182
+#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "辞退済"
 
-#: calendar/gui/e-itip-control.c:1016 calendar/gui/e-itip-control.c:1044
-#: calendar/gui/e-itip-control.c:1070 calendar/gui/e-itip-control.c:1083
-#: calendar/gui/e-itip-control.c:1096 calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
 msgid "Choose an action:"
 msgstr "アクションの選択:"
 
-#: calendar/gui/e-itip-control.c:1017
+#: calendar/gui/e-itip-control.c:1016
 msgid "Update"
 msgstr "更新"
 
-#: calendar/gui/e-itip-control.c:1018 calendar/gui/e-itip-control.c:1049
-#: calendar/gui/e-itip-control.c:1072 calendar/gui/e-itip-control.c:1085
-#: calendar/gui/e-itip-control.c:1098 calendar/gui/e-itip-control.c:1111
-#: shell/e-shell.c:1098 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
+#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1044
 msgid "Accept"
 msgstr "受諾"
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1045
 msgid "Tentatively accept"
 msgstr "暫定的に受諾"
 
-#: calendar/gui/e-itip-control.c:1047
+#: calendar/gui/e-itip-control.c:1046
 msgid "Decline"
 msgstr "辞退"
 
-#: calendar/gui/e-itip-control.c:1071
+#: calendar/gui/e-itip-control.c:1070
 msgid "Send Free/Busy Information"
 msgstr "予定の有無の送信"
 
-#: calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1083
 msgid "Update respondent status"
 msgstr "応答者ステータスの更新"
 
-#: calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1096
 msgid "Send Latest Information"
 msgstr "最新情報の送信"
 
-#: calendar/gui/e-itip-control.c:1110 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1185
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> さんが会議の情報を公開しました。"
 
-#: calendar/gui/e-itip-control.c:1187
+#: calendar/gui/e-itip-control.c:1186
 msgid "Meeting Information"
 msgstr "会議の情報"
 
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1191
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> さんが %s の会議への出席を要求してきました。"
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1193
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> さんが貴方の会議への出席を要求してきました。"
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1194
 msgid "Meeting Proposal"
 msgstr "会議の提案"
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> さんは既存の会議への参加を希望しています。"
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Update"
 msgstr "会議の更新"
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1203
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> さんは会議の最新情報を希望しています。"
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1204
 msgid "Meeting Update Request"
 msgstr "会議の更新要求"
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> さんが会議開催要求に対して返信してきました。"
 
-#: calendar/gui/e-itip-control.c:1213
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Reply"
 msgstr "会議への返信"
 
-#: calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1219
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> さんが会議をキャンセルしました。"
 
-#: calendar/gui/e-itip-control.c:1221
+#: calendar/gui/e-itip-control.c:1220
 msgid "Meeting Cancellation"
 msgstr "会議のキャンセル"
 
-#: calendar/gui/e-itip-control.c:1228 calendar/gui/e-itip-control.c:1296
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1330
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> さんが意味不明なメッセージを送信してきました。"
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1228
 msgid "Bad Meeting Message"
 msgstr "おかしな会議メッセージ"
 
-#: calendar/gui/e-itip-control.c:1254
+#: calendar/gui/e-itip-control.c:1253
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> さんがタスク情報を公開しました。"
 
-#: calendar/gui/e-itip-control.c:1255
+#: calendar/gui/e-itip-control.c:1254
 msgid "Task Information"
 msgstr "タスク情報"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1259
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> さんが %s のタスクを実行に移すよう要求してきました。"
 
-#: calendar/gui/e-itip-control.c:1262
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> さんがタスクを実行に移すよう要求してきました。"
 
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1262
 msgid "Task Proposal"
 msgstr "タスクの提案"
 
-#: calendar/gui/e-itip-control.c:1267
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> さんは既存のタスクへの追加を希望しています。"
 
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Update"
 msgstr "タスクの更新"
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1271
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> さんはタスクの最新情報を希望しています。"
 
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1272
 msgid "Task Update Request"
 msgstr "タスクの更新要求"
 
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> さんはタスクの割り当てに対して返信してきました。"
 
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Reply"
 msgstr "タスクへの返信"
 
-#: calendar/gui/e-itip-control.c:1288
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> さんはタスクをキャンセルしました。"
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1288
 msgid "Task Cancellation"
 msgstr "タスクの取り消し"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1296
 msgid "Bad Task Message"
 msgstr "おかしなタスクメッセージ"
 
-#: calendar/gui/e-itip-control.c:1316
+#: calendar/gui/e-itip-control.c:1315
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> さんが予定を公開しました。"
 
-#: calendar/gui/e-itip-control.c:1317
+#: calendar/gui/e-itip-control.c:1316
 msgid "Free/Busy Information"
 msgstr "予定の有無"
 
-#: calendar/gui/e-itip-control.c:1321
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> さんが予定を要求してきました。"
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1321
 msgid "Free/Busy Request"
 msgstr "予定の有無の要求"
 
-#: calendar/gui/e-itip-control.c:1326
+#: calendar/gui/e-itip-control.c:1325
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "予定の有無の要求に対して <b>%s</s> さんが返信してきました。"
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1326
 msgid "Free/Busy Reply"
 msgstr "予定の有無の返信"
 
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1331
 msgid "Bad Free/Busy Message"
 msgstr "予定の有無のメッセージが間違っています"
 
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1406
 msgid "The message does not appear to be properly formed"
 msgstr "メッセージが正しい形式になっていません"
 
-#: calendar/gui/e-itip-control.c:1466
+#: calendar/gui/e-itip-control.c:1465
 msgid "The message contains only unsupported requests."
 msgstr "メッセージの中に未サポートの要求だけあります。"
 
-#: calendar/gui/e-itip-control.c:1497
+#: calendar/gui/e-itip-control.c:1496
 msgid "The attachment does not contain a valid calendar message"
 msgstr "添付した内容に含まれるカレンダ・メッセージは正しくありません"
 
-#: calendar/gui/e-itip-control.c:1529
+#: calendar/gui/e-itip-control.c:1528
 msgid "The attachment has no viewable calendar items"
 msgstr "添付した内容には表示可能なカレンダ情報がありません"
 
-#: calendar/gui/e-itip-control.c:1763
+#: calendar/gui/e-itip-control.c:1762
 msgid "Update complete\n"
 msgstr "更新が完了しました\n"
 
-#: calendar/gui/e-itip-control.c:1793 calendar/gui/e-itip-control.c:1865
+#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "アイテムがまだ存在していないので出席状況を更新できませんでした"
 
-#: calendar/gui/e-itip-control.c:1809 calendar/gui/e-itip-control.c:1847
+#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
 msgid "Object is invalid and cannot be updated\n"
 msgstr "オブジェクトが不正なので更新できません\n"
 
-#: calendar/gui/e-itip-control.c:1819
+#: calendar/gui/e-itip-control.c:1818
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "これは現在の出席者からの応答ではありません。出席者として追加しますか？"
 
-#: calendar/gui/e-itip-control.c:1831
+#: calendar/gui/e-itip-control.c:1830
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "不正なステータスのため出席状況が更新できませんでした！\n"
 
-#: calendar/gui/e-itip-control.c:1850
+#: calendar/gui/e-itip-control.c:1849
 msgid "There was an error on the CORBA system\n"
 msgstr "CORBA システムでエラーが見つかりました\n"
 
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1852
 msgid "Object could not be found\n"
 msgstr "オブジェクトが見つかりませんでした\n"
 
-#: calendar/gui/e-itip-control.c:1856
+#: calendar/gui/e-itip-control.c:1855
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "カレンダを更新する権限がありません\n"
 
-#: calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1858
 msgid "Attendee status updated\n"
 msgstr "出席状況が更新されました\n"
 
-#: calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1861
 msgid "Attendee status could not be updated!\n"
 msgstr "出席状況を更新できませんでした！\n"
 
-#: calendar/gui/e-itip-control.c:1893
+#: calendar/gui/e-itip-control.c:1892
 msgid "Removal Complete"
 msgstr "削除が完了しました"
 
-#: calendar/gui/e-itip-control.c:1916 calendar/gui/e-itip-control.c:1964
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
 msgid "Item sent!\n"
 msgstr "アイテムが送信されました！\n"
 
-#: calendar/gui/e-itip-control.c:1918 calendar/gui/e-itip-control.c:1968
+#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
 msgid "The item could not be sent!\n"
 msgstr "そのアイテムは送信できませんでした！\n"
 
@@ -6307,74 +6025,74 @@ msgstr "終了日"
 msgid "date-start"
 msgstr "開始日"
 
-#: calendar/gui/e-meeting-list-view.c:62
+#: calendar/gui/e-meeting-list-view.c:59
 msgid "Chair Persons"
 msgstr "議長"
 
-#: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:480
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
 msgid "Required Participants"
 msgstr "必須の参加者"
 
-#: calendar/gui/e-meeting-list-view.c:64
+#: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "任意の参加者"
 
-#: calendar/gui/e-meeting-list-view.c:65
+#: calendar/gui/e-meeting-list-view.c:62
 msgid "Resources"
 msgstr "リソース"
 
-#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
 #: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr "個人"
 
-#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "グループ"
 
-#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr "リソース"
 
-#: calendar/gui/e-meeting-list-view.c:144 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr "ルーム"
 
-#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr "議長"
 
-#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:127
 #: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
 msgid "Required Participant"
 msgstr "必須の参加者"
 
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr "任意の参加者"
 
-#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr "不参加者"
 
-#: calendar/gui/e-meeting-list-view.c:180 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:177
 #: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
 msgid "Needs Action"
 msgstr "要アクション"
 
-#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
 #: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "暫定"
 
-#: calendar/gui/e-meeting-list-view.c:184 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr "委任済"
@@ -6391,20 +6109,28 @@ msgstr "外出中"
 msgid "No Information"
 msgstr "情報なし"
 
+#: calendar/gui/e-meeting-time-sel.c:417
+#, fuzzy
+msgid "Add attendees from addressbook"
+msgstr "差出人をアドレス帳に追加"
+
 #: calendar/gui/e-meeting-time-sel.c:440
 msgid "_Options"
 msgstr "オプション(_O)"
 
 #: calendar/gui/e-meeting-time-sel.c:457
-msgid "Show _Only Working Hours"
+#, fuzzy
+msgid "Show _only working hours"
 msgstr "仕事中の時間だけ表示する(_O)"
 
 #: calendar/gui/e-meeting-time-sel.c:467
-msgid "Show _Zoomed Out"
+#, fuzzy
+msgid "Show _zoomed out"
 msgstr "縮小して表示する(_Z)"
 
 #: calendar/gui/e-meeting-time-sel.c:482
-msgid "_Update Free/Busy"
+#, fuzzy
+msgid "_Update free/busy"
 msgstr "予定の有無の更新(_U)"
 
 #: calendar/gui/e-meeting-time-sel.c:497
@@ -6420,19 +6146,23 @@ msgid ">_>"
 msgstr ">>(_>)"
 
 #: calendar/gui/e-meeting-time-sel.c:547
-msgid "_All People and Resources"
+#, fuzzy
+msgid "_All people and resources"
 msgstr "全ての人達とリソース(_A)"
 
 #: calendar/gui/e-meeting-time-sel.c:556
-msgid "All _People and One Resource"
+#, fuzzy
+msgid "All _people and one resource"
 msgstr "全ての人達とひとつのリソース(_P)"
 
 #: calendar/gui/e-meeting-time-sel.c:565
-msgid "_Required People"
+#, fuzzy
+msgid "_Required people"
 msgstr "必要な人達(_R)"
 
 #: calendar/gui/e-meeting-time-sel.c:574
-msgid "Required People and _One Resource"
+#, fuzzy
+msgid "Required people and _one resource"
 msgstr "必要な人達とひとつのリソース(_O)"
 
 #: calendar/gui/e-meeting-time-sel.c:593
@@ -6452,10 +6182,6 @@ msgstr "%Y年 %B %e日 %A"
 
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#. This is a strftime() format string %a = abbreviated weekday
-#. name, %m = month number, %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. strftime format of a weekday and a date.
 #: calendar/gui/e-meeting-time-sel.c:2093
 #: calendar/gui/e-meeting-time-sel-item.c:456 e-util/e-time-utils.c:203
 #: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
@@ -6464,10 +6190,6 @@ msgstr "%Y/%m/%d (%a)"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. This is the preferred date format for the locale.
-#. This is a strftime() format for a short date. %m = month,
-#. %d = day of month, %Y = year (all digits).
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
 #: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
 msgid "%m/%d/%Y"
@@ -6478,7 +6200,7 @@ msgstr "%Y/%m/%d"
 msgid "Enter the password for %s"
 msgstr "%s のパスワードを入力して下さい"
 
-#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6487,19 +6209,14 @@ msgstr ""
 "%s でエラー:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr "'%s' 用のタスク・バックエンドがクラッシュしました。"
-
 #. FIXME Loading should be async
 #. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:686
+#: calendar/gui/e-tasks.c:801
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%s のタスクを開きます"
 
-#: calendar/gui/e-tasks.c:709
+#: calendar/gui/e-tasks.c:824
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6508,52 +6225,47 @@ msgstr ""
 "%s を開く際にエラー:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:730
+#: calendar/gui/e-tasks.c:845
 msgid "Loading tasks"
 msgstr "タスクの読み込み"
 
-#: calendar/gui/e-tasks.c:834
+#: calendar/gui/e-tasks.c:949
 msgid "Completing tasks..."
 msgstr "タスクの完了..."
 
-#: calendar/gui/e-tasks.c:857
+#: calendar/gui/e-tasks.c:972
 msgid "Deleting selected objects..."
 msgstr "指定したオブジェクトの削除..."
 
-#: calendar/gui/e-tasks.c:884
+#: calendar/gui/e-tasks.c:999
 msgid "Expunging"
 msgstr "抹消"
 
-#: calendar/gui/e-tasks.c:960
+#: calendar/gui/e-tasks.c:1075
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
-#: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
+#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
+#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
 #: calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:705
 msgid "Tasks"
 msgstr "タスク"
 
-#: calendar/gui/gnome-cal.c:1876
+#: calendar/gui/gnome-cal.c:1878
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "%s の予定の読み込み"
 
-#: calendar/gui/gnome-cal.c:1895
+#: calendar/gui/gnome-cal.c:1897
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "%s のタスクの読み込み"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1920
 #, c-format
 msgid "Opening %s"
 msgstr "%s を開きます"
 
-#: calendar/gui/gnome-cal.c:2048
-#, c-format
-msgid "The calendar backend for '%s' has crashed."
-msgstr "'%s' 用のカレンダ・バックエンドがクラッシュしました。"
-
-#: calendar/gui/gnome-cal.c:2894
+#: calendar/gui/gnome-cal.c:2906
 msgid "Purging"
 msgstr "抹消中"
 
@@ -6750,7 +6462,7 @@ msgid "On The Web"
 msgstr "ウェブ"
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "${HOME}/evolution/config.xmldb から古い設定を移行できません"
 
@@ -6761,7 +6473,7 @@ msgid "Unable to migrate calendar `%s'"
 msgstr "カレンダ '%s' を移行できません"
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:869
+#: calendar/gui/migration.c:889
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "タスク '%s' を移行できません"
@@ -6997,43 +6709,43 @@ msgstr "アイテムの印刷"
 msgid "Print Setup"
 msgstr "プリンタの設定"
 
-#: calendar/gui/tasks-component.c:303
+#: calendar/gui/tasks-component.c:313
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr "タスク一覧 '%s' を削除します。続行してもよろしいですか？"
 
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:371
 msgid "New Task List"
 msgstr "新しいタスク一覧"
 
-#: calendar/gui/tasks-component.c:398
+#: calendar/gui/tasks-component.c:408
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d 個のタスク"
 msgstr[1] "%d 個のタスク"
 
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:502
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", 選択済 %d 個"
 msgstr[1] ", 選択済 %d 個"
 
-#: calendar/gui/tasks-component.c:447
+#: calendar/gui/tasks-component.c:457
 msgid "Failed upgrading tasks."
 msgstr "タスクの移行に失敗しました。"
 
-#: calendar/gui/tasks-component.c:526
+#: calendar/gui/tasks-component.c:749
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "イベントと会議の作成に必要なタスク一覧 '%s' を開けません"
 
-#: calendar/gui/tasks-component.c:538
+#: calendar/gui/tasks-component.c:761
 msgid "There is no calendar available for creating tasks"
 msgstr "タスクを作成できるカレンダがありません"
 
-#: calendar/gui/tasks-component.c:576
+#: calendar/gui/tasks-component.c:799
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
@@ -7041,27 +6753,27 @@ msgstr ""
 "指定したタスク一覧は読み込み専用なのでイベントを作成できません。読み込み/書き"
 "込みモードのカレンダを指定して下さい。"
 
-#: calendar/gui/tasks-component.c:804
+#: calendar/gui/tasks-component.c:1040
 msgid "New task"
 msgstr "新規のタスク"
 
-#: calendar/gui/tasks-component.c:805
+#: calendar/gui/tasks-component.c:1041
 msgid "_Task"
 msgstr "タスク(_T)"
 
-#: calendar/gui/tasks-component.c:806
+#: calendar/gui/tasks-component.c:1042
 msgid "Create a new task"
 msgstr "新しいタスクを作成します"
 
-#: calendar/gui/tasks-component.c:812
+#: calendar/gui/tasks-component.c:1048
 msgid "New tasks group"
 msgstr "新しいタスク・グループ"
 
-#: calendar/gui/tasks-component.c:813
+#: calendar/gui/tasks-component.c:1049
 msgid "_Tasks Group"
 msgstr "タスク・グループ(_T)"
 
-#: calendar/gui/tasks-component.c:814
+#: calendar/gui/tasks-component.c:1050
 msgid "Create a new tasks group"
 msgstr "新しいタスク・グループを作成します"
 
@@ -8888,15 +8600,15 @@ msgstr "(match-threads) は match-all 内では実行できません。"
 msgid "(match-threads) requires a match type string"
 msgstr "(match-threads) には一致する文字列を一つ必要とします。"
 
-#: camel/camel-folder-search.c:785
+#: camel/camel-folder-search.c:784
 msgid "(match-threads) expects an array result"
 msgstr "(match-threads) は配列の結果を期待します"
 
-#: camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:790
 msgid "(match-threads) requires the folder set"
 msgstr "(match-threads) にはフォルダの組を必要とします"
 
-#: camel/camel-folder-search.c:880
+#: camel/camel-folder-search.c:879
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "特定できないヘッダでクエリを実行しています: %s"
@@ -8931,7 +8643,8 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
 #: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:705
+#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "キャンセルしました"
@@ -9312,7 +9025,7 @@ msgstr "参照している証明書の期限が過ぎています。"
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1243
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "サーバから間違った認証応答がありました。"
 
@@ -9671,40 +9384,40 @@ msgstr "鍵のインポート: 未だ実装されていません"
 msgid "export keys: unimplemented"
 msgstr "鍵のエキスポート: 未だ実装されていません"
 
-#: camel/camel-store.c:215
+#: camel/camel-store.c:213
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "フォルダを取得できません: この格納場所で不正な操作です"
 
-#: camel/camel-store.c:245
+#: camel/camel-store.c:243
 #, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr "フォルダ '%s' を作成できません: フォルダが存在します"
 
-#: camel/camel-store.c:299
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "フォルダを作成できません: この格納場所で不正な操作です"
 
-#: camel/camel-store.c:327
+#: camel/camel-store.c:325
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "フォルダを作成できません: %s: フォルダが存在します"
 
-#: camel/camel-store.c:391 camel/camel-vee-store.c:354
+#: camel/camel-store.c:389 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "フォルダを削除できません: %s: 不正な操作です"
 
-#: camel/camel-store.c:441 camel/camel-vee-store.c:390
+#: camel/camel-store.c:439 camel/camel-vee-store.c:387
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "フォルダ名を変更できません: %s: 不正な操作です"
 
-#: camel/camel-store.c:813
+#: camel/camel-store.c:777
 msgid "Trash"
 msgstr "ゴミ箱"
 
-#: camel/camel-store.c:815 filter/libfilter-i18n.h:35
-#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/mail-config.glade.h:95
+#: ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "ジャンク"
 
@@ -9935,12 +9648,12 @@ msgstr "%s に %s のようなメッセージはありません"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "メッセージの仮想フォルダへのコピーまたは移動ができません"
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:374
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "フォルダを削除できません: %s: そのようなフォルダはありません"
 
-#: camel/camel-vee-store.c:398
+#: camel/camel-vee-store.c:395
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "フォルダ名を変更できません: %s: そのようなフォルダはありません"
@@ -9981,15 +9694,15 @@ msgstr "アドレス帳とカレンダ"
 msgid "Post Office Agent SOAP Port:"
 msgstr "ポスト・オフィス・エージェントの SOAP ポート:"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:80
+#: camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "Novell GroupWise"
 msgstr "Novell GroupWise"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:82
+#: camel/providers/groupwise/camel-groupwise-provider.c:85
 msgid "For accessing Novell Groupwise servers"
 msgstr "Novell Groupwise サーバ・アクセス用です"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: camel/providers/groupwise/camel-groupwise-provider.c:100
 #: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
@@ -9998,7 +9711,7 @@ msgstr "Novell Groupwise サーバ・アクセス用です"
 msgid "Password"
 msgstr "パスワード"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:99
+#: camel/providers/groupwise/camel-groupwise-provider.c:102
 #: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
@@ -10006,8 +9719,8 @@ msgstr ""
 "このオプションはプレイン・テキストのパスワードを使って IMAP サーバに接続しま"
 "す"
 
-#: camel/providers/groupwise/camel-gw-listener.c:305
-#: camel/providers/groupwise/camel-gw-listener.c:328
+#: camel/providers/groupwise/camel-gw-listener.c:312
+#: camel/providers/groupwise/camel-gw-listener.c:335
 msgid "Checklist"
 msgstr "チェックリスト"
 
@@ -10146,23 +9859,23 @@ msgstr ""
 "続します"
 
 #: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:429
+#: camel/providers/imap/camel-imap-store.c:428
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP サーバ %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:431
+#: camel/providers/imap/camel-imap-store.c:430
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s の %s にある IMAP サービス"
 
 #: camel/providers/imap4/camel-imap4-store.c:208
 #: camel/providers/imap4/camel-imap4-store.c:225
-#: camel/providers/imap/camel-imap-store.c:552
-#: camel/providers/imap/camel-imap-store.c:572
+#: camel/providers/imap/camel-imap-store.c:551
+#: camel/providers/imap/camel-imap-store.c:571
 #: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
+#: camel/providers/nntp/camel-nntp-store.c:209
 #: camel/providers/pop3/camel-pop3-store.c:175
 #: camel/providers/smtp/camel-smtp-transport.c:269
 #: camel/providers/smtp/camel-smtp-transport.c:285
@@ -10171,18 +9884,18 @@ msgid "Could not connect to %s (port %d): %s"
 msgstr "%s (ポート %d) へ接続できませんでした: %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:210
-#: camel/providers/imap/camel-imap-store.c:554
+#: camel/providers/imap/camel-imap-store.c:553
 #: camel/providers/pop3/camel-pop3-store.c:177
 #: camel/providers/smtp/camel-smtp-transport.c:271
 msgid "SSL unavailable"
 msgstr "SSL は無効です"
 
 #: camel/providers/imap4/camel-imap4-store.c:222
-#: camel/providers/imap/camel-imap-store.c:569
-#: camel/providers/imap/camel-imap-store.c:846
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/imap/camel-imap-store.c:845
 #: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:137
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
 #: camel/providers/pop3/camel-pop3-store.c:192
 msgid "Connection cancelled"
 msgstr "接続をキャンセルしました"
@@ -10197,8 +9910,8 @@ msgstr ""
 "は STARTTLS をサポートしていません"
 
 #: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:680
-#: camel/providers/imap/camel-imap-store.c:711
+#: camel/providers/imap/camel-imap-store.c:679
+#: camel/providers/imap/camel-imap-store.c:710
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
@@ -10208,7 +9921,7 @@ msgstr ""
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1108
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
 msgid "Unknown error"
 msgstr "特定できないエラー"
 
@@ -10234,8 +9947,8 @@ msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr "フォルダ '%s' を IMAP サーバ %s から取得できません: 不明なエラー"
 
 #: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1888
-#: camel/providers/imap/camel-imap-store.c:2266
+#: camel/providers/imap/camel-imap-store.c:1885
+#: camel/providers/imap/camel-imap-store.c:2263
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -10313,12 +10026,12 @@ msgstr "突然 IMAP サーバ %s が接続を切りました: %s"
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3199
+#: camel/providers/imap/camel-imap-store.c:3194
 msgid "Operation cancelled"
 msgstr "操作はキャンセルされました"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3202
+#: camel/providers/imap/camel-imap-store.c:3197
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "突然サーバが接続を切りました: %s"
@@ -10399,7 +10112,7 @@ msgstr "そのようなメッセージはありません"
 
 #: camel/providers/imap/camel-imap-folder.c:2019
 #: camel/providers/imap/camel-imap-folder.c:2622
-#: camel/providers/nntp/camel-nntp-folder.c:238
+#: camel/providers/nntp/camel-nntp-folder.c:220
 msgid "This message is not currently available"
 msgstr "現在このメッセージは有効ではありません"
 
@@ -10483,43 +10196,43 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "IMAP サーバのメールを読んだり大切なメールを保存します"
 
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:680
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS 拡張がサポートされていません。"
 
-#: camel/providers/imap/camel-imap-store.c:712
+#: camel/providers/imap/camel-imap-store.c:711
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL 接続に失敗しました"
 
-#: camel/providers/imap/camel-imap-store.c:849
+#: camel/providers/imap/camel-imap-store.c:848
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "コマンド \"%s\" で接続できませんでした: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1273
+#: camel/providers/imap/camel-imap-store.c:1272
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP サーバ %s は要求した認証タイプ %s をサポートしていません"
 
-#: camel/providers/imap/camel-imap-store.c:1283
+#: camel/providers/imap/camel-imap-store.c:1282
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "認証タイプ %s をサポートしていません"
 
-#: camel/providers/imap/camel-imap-store.c:1306
+#: camel/providers/imap/camel-imap-store.c:1305
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%s %s@%s の IMAP パスワードを入力して下さい"
 
-#: camel/providers/imap/camel-imap-store.c:1320
+#: camel/providers/imap/camel-imap-store.c:1319
 msgid "You didn't enter a password."
 msgstr "パスワードを入力していません"
 
-#: camel/providers/imap/camel-imap-store.c:1349
+#: camel/providers/imap/camel-imap-store.c:1348
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10530,18 +10243,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1870
-#: camel/providers/imap/camel-imap-store.c:2060
+#: camel/providers/imap/camel-imap-store.c:1867
+#: camel/providers/imap/camel-imap-store.c:2057
 #, c-format
 msgid "No such folder %s"
 msgstr "そのようなフォルダ %s はありません"
 
-#: camel/providers/imap/camel-imap-store.c:1946
-#: camel/providers/imap/camel-imap-store.c:2327
+#: camel/providers/imap/camel-imap-store.c:1943
+#: camel/providers/imap/camel-imap-store.c:2324
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "親フォルダには複数のサブフォルダを含めることはできません"
 
-#: camel/providers/imap/camel-imap-store.c:2001
+#: camel/providers/imap/camel-imap-store.c:1998
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10549,7 +10262,7 @@ msgstr "親フォルダには複数のサブフォルダを含めることはで
 msgid "Cannot create folder `%s': folder exists."
 msgstr "フォルダ '%s' を作成できません: フォルダが存在します"
 
-#: camel/providers/imap/camel-imap-store.c:2277
+#: camel/providers/imap/camel-imap-store.c:2274
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "親フォルダを特定できません: %s"
@@ -10586,20 +10299,20 @@ msgid "Index message body data"
 msgstr "メッセージ本体のデータの目録を作成する"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:388
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:393
-#: camel/providers/local/camel-local-folder.c:396
+#: camel/providers/local/camel-local-folder.c:392
+#: camel/providers/local/camel-local-folder.c:395
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "mailbox: %s (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:400
+#: camel/providers/local/camel-local-folder.c:399
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -10660,7 +10373,7 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:142
 #: camel/providers/local/camel-local-store.c:253
-#: camel/providers/local/camel-mbox-store.c:356
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10792,9 +10505,9 @@ msgstr "フォルダ '%s' を削除できませんでした: %s"
 msgid "not a maildir directory"
 msgstr "maildir 形式のフォルダではありません"
 
-#: camel/providers/local/camel-maildir-store.c:341
-#: camel/providers/local/camel-spool-store.c:286
-#: camel/providers/local/camel-spool-store.c:316
+#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-spool-store.c:284
+#: camel/providers/local/camel-spool-store.c:314
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "フォルダ '%s' をスキャンできませんでした: %s"
@@ -10851,7 +10564,7 @@ msgid "Message construction failed."
 msgstr "メッセージの構築に失敗しました。"
 
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:362
+#: camel/providers/local/camel-mbox-store.c:361
 msgid "Cannot create a folder by this name."
 msgstr "そのような名前でフォルダを作成できません。"
 
@@ -10881,30 +10594,30 @@ msgstr "'%s' は通常のファイルではありません"
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "フォルダ '%s' は空ではありません。削除しません。"
 
-#: camel/providers/local/camel-mbox-store.c:375
+#: camel/providers/local/camel-mbox-store.c:374
 #, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "フォルダ '%s' を作成できません: %s"
 
-#: camel/providers/local/camel-mbox-store.c:389
+#: camel/providers/local/camel-mbox-store.c:388
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "フォルダを作成できません: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:391
+#: camel/providers/local/camel-mbox-store.c:390
 msgid "Folder already exists"
 msgstr "既にフォルダがあります"
 
-#: camel/providers/local/camel-mbox-store.c:473
+#: camel/providers/local/camel-mbox-store.c:472
 msgid "The new folder name is illegal."
 msgstr "新しいフォルダの名前は正しくありません。"
 
-#: camel/providers/local/camel-mbox-store.c:486
+#: camel/providers/local/camel-mbox-store.c:485
 #, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "'%s' の名前を変更できませんでした: '%s': %s"
 
-#: camel/providers/local/camel-mbox-store.c:561
+#: camel/providers/local/camel-mbox-store.c:560
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "'%s' から %s へ名前を変更できませんでした: %s"
@@ -11095,7 +10808,7 @@ msgstr ""
 "フォルダが壊れている可能性があります。コピーを '%s' に保存しました。"
 
 #: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:997
+#: camel/providers/nntp/camel-nntp-store.c:1126
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "%s@%s の NNTP パスワードを入力して下さい"
@@ -11112,18 +10825,10 @@ msgstr "サーバへユーザ名の送信に失敗しました"
 msgid "Server rejected username/password"
 msgstr "サーバはユーザ名/パスワードを拒否しました"
 
-#: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:263
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr "ユーザが取り消しました"
-
-#: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:259
-#: camel/providers/nntp/camel-nntp-folder.c:265
+#: camel/providers/nntp/camel-nntp-folder.c:147
+#: camel/providers/nntp/camel-nntp-folder.c:149
+#: camel/providers/nntp/camel-nntp-folder.c:158
+#: camel/providers/nntp/camel-nntp-folder.c:234
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11132,65 +10837,49 @@ msgstr "ユーザが取り消しました"
 msgid "Cannot get message %s: %s"
 msgstr "メッセージ %s を取得できません: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:188
-#: camel/providers/nntp/camel-nntp-folder.c:228
+#: camel/providers/nntp/camel-nntp-folder.c:156
+#: camel/providers/nntp/camel-nntp-folder.c:232
+#: camel/providers/nntp/camel-nntp-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+msgid "User cancelled"
+msgstr "ユーザが取り消しました"
+
+#: camel/providers/nntp/camel-nntp-folder.c:176
+#: camel/providers/nntp/camel-nntp-folder.c:208
 #, c-format
 msgid "Internal error: uid in invalid format: %s"
 msgstr "内部エラー: UID の書式が不正です: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:201
-#, c-format
-msgid "Could not get article %s from NNTP server"
-msgstr "NNTP サーバから記事 %s を取得できませんでした"
-
-#: camel/providers/nntp/camel-nntp-folder.c:362
-msgid "Posting not allowed by news server"
-msgstr "ニュース・サーバは投稿を許可していません"
-
+#: camel/providers/nntp/camel-nntp-folder.c:328
+#: camel/providers/nntp/camel-nntp-folder.c:331
 #: camel/providers/nntp/camel-nntp-folder.c:373
-#, c-format
-msgid "Failed to send newsgroups header: %s: message not posted"
-msgstr ""
-"ニュースグループのヘッダの送信に失敗しました: %s: メッセージは投稿されません"
-
-#: camel/providers/nntp/camel-nntp-folder.c:413
-#: camel/providers/nntp/camel-nntp-folder.c:426
-#, c-format
-msgid "Error posting to newsgroup: %s: message not posted"
-msgstr ""
-"ニュースグループへの投稿でエラーが発生しました: %s: メッセージは投稿されませ"
-"ん"
-
-#: camel/providers/nntp/camel-nntp-folder.c:438
-msgid "Error reading response to posted message: message not posted"
-msgstr ""
-"投稿したメッセージに対する応答でエラーが発生しました: メッセージは投稿されま"
-"せん"
-
-#: camel/providers/nntp/camel-nntp-folder.c:441
-#, c-format
-msgid "Error posting message: %s: message not posted"
-msgstr "メッセージの投稿でエラーが発生しました: %s: メッセージは投稿されません"
+#: camel/providers/nntp/camel-nntp-folder.c:375
+#, fuzzy, c-format
+msgid "Posting failed: %s"
+msgstr "操作が失敗しました: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:457
+#: camel/providers/nntp/camel-nntp-folder.c:393
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "オフライン状態の間は NNTP メッセージを投稿できません！"
 
-#: camel/providers/nntp/camel-nntp-folder.c:468
+#: camel/providers/nntp/camel-nntp-folder.c:404
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "NNTP フォルダからメッセージのコピーはできません！"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:44
 msgid "Could not get group list from server."
 msgstr "サーバからグループ一覧を取得できませんでした。"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#: camel/providers/nntp/camel-nntp-grouplist.c:97
+#: camel/providers/nntp/camel-nntp-grouplist.c:106
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "%s のグループ一覧ファイルを読み込めません: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#: camel/providers/nntp/camel-nntp-grouplist.c:157
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "%s のグループ一覧ファイルを保存できません: %s"
@@ -11220,26 +10909,29 @@ msgstr ""
 "このオプションはプレイン・テキストのパスワードを使って NNTP サーバで認証しま"
 "す。"
 
-#: camel/providers/nntp/camel-nntp-store.c:158
+#: camel/providers/nntp/camel-nntp-store.c:118
+#: camel/providers/nntp/camel-nntp-store.c:1233
+#: camel/providers/nntp/camel-nntp-store.c:1331
+#, c-format
+msgid "NNTP Command failed: %s"
+msgstr "NNTP コマンドが失敗しました: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:227
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "%s からの挨拶を読むことができませんでした: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:170
+#: camel/providers/nntp/camel-nntp-store.c:239
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP サーバ %s がエラーコード %d を返しました: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:326
+#: camel/providers/nntp/camel-nntp-store.c:403
 #, c-format
 msgid "USENET News via %s"
 msgstr "%s 経由の USENET ニュース"
 
-#: camel/providers/nntp/camel-nntp-store.c:640
-msgid "Stream error"
-msgstr "ストリーム・エラー"
-
-#: camel/providers/nntp/camel-nntp-store.c:643
+#: camel/providers/nntp/camel-nntp-store.c:777
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -11250,7 +10942,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/providers/nntp/camel-nntp-store.c:735
+#: camel/providers/nntp/camel-nntp-store.c:872
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
@@ -11261,7 +10953,7 @@ msgstr ""
 "そのようなニュースグループはありません。選択したアイテムは親フォルダのものか"
 "もしれません。"
 
-#: camel/providers/nntp/camel-nntp-store.c:767
+#: camel/providers/nntp/camel-nntp-store.c:904
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
@@ -11271,60 +10963,61 @@ msgstr ""
 "\n"
 "ニュースグループがありません！"
 
-#: camel/providers/nntp/camel-nntp-store.c:792
+#: camel/providers/nntp/camel-nntp-store.c:929
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 "ニュース・ストアにフォルダを生成できません: 代わりに購読を申請して下さい。"
 
-#: camel/providers/nntp/camel-nntp-store.c:800
+#: camel/providers/nntp/camel-nntp-store.c:937
 msgid "You cannot rename a folder in a News store."
 msgstr "ニュース格納場所のフォルダ名を変更できません。"
 
-#: camel/providers/nntp/camel-nntp-store.c:808
+#: camel/providers/nntp/camel-nntp-store.c:945
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 "ニュース格納場所のフォルダを削除できません: 代わりに購読を停止して下さい。"
 
-#: camel/providers/nntp/camel-nntp-summary.c:253
-#, c-format
-msgid "Connection error: %s"
-msgstr "接続エラー: %s"
-
-#: camel/providers/nntp/camel-nntp-summary.c:262
-#, c-format
-msgid "No such folder: %s"
-msgstr "そのようなフォルダはありません: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1118
+#, fuzzy
+msgid "Authentication requested but not username provided"
+msgstr "認証を必要としています"
 
-#: camel/providers/nntp/camel-nntp-summary.c:268
-#, c-format
-msgid "Could not get group: %s"
-msgstr "グループを取得できませんでした: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1146
+#, fuzzy, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr "IMAP サーバ %s で %s を使った認証を行えません"
 
-#: camel/providers/nntp/camel-nntp-summary.c:333
-msgid "Could not get messages: unspecified error"
-msgstr "メッセージを取得できませんでした: エラーを特定できません"
+#: camel/providers/nntp/camel-nntp-store.c:1262
+#, fuzzy
+msgid "Not connected."
+msgstr "連絡先なし"
 
-#: camel/providers/nntp/camel-nntp-summary.c:378
+#: camel/providers/nntp/camel-nntp-store.c:1311
 #, c-format
-msgid "NNTP Command failed: %s"
-msgstr "NNTP コマンドが失敗しました: %s"
+msgid "No such folder: %s"
+msgstr "そのようなフォルダはありません: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:438
-#: camel/providers/nntp/camel-nntp-summary.c:543
+#: camel/providers/nntp/camel-nntp-summary.c:218
+#: camel/providers/nntp/camel-nntp-summary.c:314
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: 新しいメッセージの解析中"
 
-#: camel/providers/nntp/camel-nntp-summary.c:558
-#, c-format
-msgid "Unknown server response: %s"
-msgstr "サーバ応答を特定できません: %s"
+#: camel/providers/nntp/camel-nntp-summary.c:225
+#, fuzzy, c-format
+msgid "Unexpected server response from xover: %s"
+msgstr "IMAP サーバから予期しない応答がありました: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:328
+#, fuzzy, c-format
+msgid "Unexpected server response from head: %s"
+msgstr "GnuPG から予期しない応答がありました: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:605
+#: camel/providers/nntp/camel-nntp-summary.c:368
 msgid "Use cancel"
 msgstr "キャンセルを利用する"
 
-#: camel/providers/nntp/camel-nntp-summary.c:607
+#: camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
 msgid "Operation failed: %s"
 msgstr "操作が失敗しました: %s"
@@ -11799,19 +11492,19 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
+#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:408
 msgid "attachment"
 msgstr "添付"
 
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:454
 msgid "Remove selected items from the attachment list"
 msgstr "添付した内容の一覧から指定したアイテムを削除します"
 
-#: composer/e-msg-composer-attachment-bar.c:491
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Add attachment..."
 msgstr "添付の追加..."
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:495
 msgid "Attach a file to the message"
 msgstr "メッセージへファイルを添付します"
 
@@ -11874,7 +11567,7 @@ msgstr "タイトルなしのメッセージ"
 msgid "Open file"
 msgstr "ファイルを開く"
 
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
 msgid "Autogenerated"
 msgstr "自動生成"
 
@@ -12020,17 +11713,19 @@ msgstr "ファイルの添付"
 
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
-msgid "You cannot attach the file `${0}' to this message."
+#, fuzzy
+msgid "You cannot attach the file `{0}' to this message."
 msgstr "このメッセージにファイル `${0}' を添付できません"
 
 #. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4
-msgid "${1}"
-msgstr "${1}"
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr "{1}"
 
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+#, fuzzy
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
 "ファイル `${0}' は通常のファイルではないのでメッセージに添付して送信できませ"
 "ん。"
@@ -12124,7 +11819,8 @@ msgstr "メッセージを作成できませんでした。"
 
 #. mail-composer:no-build-message secondary
 #: composer/mail-composer-errors.xml.h:34
-msgid "Because \"${0}\", you may need to select different mail options."
+#, fuzzy
+msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 "\"${0}\" のため、別のメール・オプションを選択した方が良いかもしれません。"
 
@@ -12134,9 +11830,11 @@ msgid "Could not read signature file \"{0}\"."
 msgstr "署名ファイル \"{0}\" を読み込めませんでした。"
 
 #. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38
-msgid "Because \"${1}\"."
-msgstr "理由は \"${1}\" です。"
+#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr "理由は \"{1}\" です。"
 
 #. mail-composer:all-accounts-deleted primary
 #: composer/mail-composer-errors.xml.h:40
@@ -12297,16 +11995,12 @@ msgstr "カテゴリの同期:"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
 #: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%Y/%m/%d (%a) %p %I:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
 #: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%Y/%m/%d (%a) %H:%M"
@@ -12358,31 +12052,23 @@ msgid "%m/%d/%Y %H"
 msgstr "%Y/%m/%d %H時"
 
 #. strptime format for a time of day, in 12-hour format.
-#. strftime format of a time in 12-hour format.
 #: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
 msgstr "%p %I時%M分%S秒"
 
 #. strptime format for a time of day, in 24-hour format.
-#. strftime format of a time in 24-hour format.
 #: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr "%H時%M分%S秒"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
 #: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%I:%M %p"
 msgstr "%p %I時%M分"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
 #: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
 msgid "%H:%M"
@@ -12479,7 +12165,6 @@ msgid "Missing file name."
 msgstr "ファイル名がありません。"
 
 #. filter:no-file secondary
-#. filter:bad-file secondary
 #: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
 msgid "You must specify a file name."
 msgstr "ファイル名を指定して下さい。"
@@ -12511,7 +12196,6 @@ msgid "Could not compile regular expression \"{1}\"."
 msgstr "正規表現 \"{1}\" を展開できませんでした。"
 
 #. filter:no-name primary
-#. filter:no-name-vfolder primary
 #: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
 msgid "Missing name."
 msgstr "名前がありません。"
@@ -12563,7 +12247,7 @@ msgid "<b>Then</b>"
 msgstr "<b>アクション</b> "
 
 #: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1335
+#: mail/mail-account-gui.c:1347
 msgid "Select Folder"
 msgstr "フォルダの選択"
 
@@ -12655,8 +12339,8 @@ msgstr "全てのローカル・フォルダ"
 msgid "years"
 msgstr "年"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:1011
-#: mail/mail-config.c:76 mail/mail-config.glade.h:93
+#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
+#: mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "重要"
 
@@ -12720,252 +12404,6 @@ msgstr "入力"
 msgid "outgoing"
 msgstr "出力"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Adjust Score"
-msgstr "スコアの調整"
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Color"
-msgstr "色の割り当て"
-
-#: filter/libfilter-i18n.h:4
-msgid "Assign Score"
-msgstr "スコアの割り当て"
-
-#: filter/libfilter-i18n.h:5
-msgid "Attachments"
-msgstr "添付"
-
-#: filter/libfilter-i18n.h:6
-msgid "Beep"
-msgstr "ビープ音"
-
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "が次のものを含む"
-
-#: filter/libfilter-i18n.h:8
-msgid "Copy to Folder"
-msgstr "フォルダへコピー"
-
-#: filter/libfilter-i18n.h:9
-msgid "Date received"
-msgstr "受信日"
-
-#: filter/libfilter-i18n.h:10
-msgid "Date sent"
-msgstr "送信日"
-
-#: filter/libfilter-i18n.h:12
-msgid "Deleted"
-msgstr "削除する"
-
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "が次のものを含まない"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "が次のもので終らない"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "がない"
-
-#: filter/libfilter-i18n.h:16
-msgid "does not return"
-msgstr "が返らない"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "が次のもののようでない"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "が次のもので始まらない"
-
-#: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
-msgstr "がない"
-
-#: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr "草案"
-
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "が次のもので終わる"
-
-#: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr "がある"
-
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "がある"
-
-#: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr "表現"
-
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr "上に従う"
-
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "が次のものと一致する"
-
-#: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr "が次のものより後"
-
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr "が次のものより前"
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr "フラグが付いている"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "が次のものより大きい"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "が次のものより小さい"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "が次のものと一致しない"
-
-#: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr "にフラグがない"
-
-#: filter/libfilter-i18n.h:36
-msgid "Junk Test"
-msgstr "ジャンクのテスト"
-
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
-#: widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "ラベル"
-
-#: filter/libfilter-i18n.h:38
-msgid "Mailing list"
-msgstr "メーリング・リスト"
-
-#: filter/libfilter-i18n.h:39
-msgid "Message Body"
-msgstr "メッセージ本体"
-
-#: filter/libfilter-i18n.h:40
-msgid "Message Header"
-msgstr "メッセージのヘッダ"
-
-#: filter/libfilter-i18n.h:41
-msgid "Message is Junk"
-msgstr "メッセージはジャンクに該当します"
-
-#: filter/libfilter-i18n.h:42
-msgid "Message is not Junk"
-msgstr "メッセージはジャンクに該当しません"
-
-#: filter/libfilter-i18n.h:43
-msgid "Move to Folder"
-msgstr "フォルダへ移動"
-
-#: filter/libfilter-i18n.h:44
-msgid "Pipe to Program"
-msgstr "プログラムへ引き渡す"
-
-#: filter/libfilter-i18n.h:45
-msgid "Play Sound"
-msgstr "サウンドの再生"
-
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "既読"
-
-#: filter/libfilter-i18n.h:47
-msgid "Recipients"
-msgstr "宛先"
-
-#: filter/libfilter-i18n.h:48
-msgid "Regex Match"
-msgstr "正規表現と一致"
-
-#: filter/libfilter-i18n.h:49
-msgid "Replied to"
-msgstr "返信先"
-
-#: filter/libfilter-i18n.h:50
-msgid "returns"
-msgstr "返す"
-
-#: filter/libfilter-i18n.h:51
-msgid "returns greater than"
-msgstr "次のものより大きいものを返す"
-
-#: filter/libfilter-i18n.h:52
-msgid "returns less than"
-msgstr "次のものより小さいものを返す"
-
-#: filter/libfilter-i18n.h:53
-msgid "Run Program"
-msgstr "プログラム実行"
-
-#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "スコア"
-
-#: filter/libfilter-i18n.h:55
-msgid "Sender"
-msgstr "差出人"
-
-#: filter/libfilter-i18n.h:56
-msgid "Set Status"
-msgstr "ステータスの設定"
-
-#: filter/libfilter-i18n.h:57
-msgid "Size (kB)"
-msgstr "サイズ (Kバイト)"
-
-#: filter/libfilter-i18n.h:58
-msgid "sounds like"
-msgstr "が次のもののように見える"
-
-#: filter/libfilter-i18n.h:59
-msgid "Source Account"
-msgstr "ソースのアカウント"
-
-#: filter/libfilter-i18n.h:60
-msgid "Specific header"
-msgstr "指定したヘッダ"
-
-#: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "が次のもので始まる"
-
-#: filter/libfilter-i18n.h:63
-msgid "Stop Processing"
-msgstr "処理停止"
-
-#: filter/libfilter-i18n.h:64 mail/em-format.c:755 mail/em-format-html.c:1519
-#: mail/em-format-quote.c:302 mail/em-mailer-prefs.c:87
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
-#: smime/lib/e-cert.c:1079
-msgid "Subject"
-msgstr "件名"
-
-#: filter/libfilter-i18n.h:65
-msgid "Unset Status"
-msgstr "ステータスの解除"
-
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "ルールの追加"
@@ -12982,6 +12420,11 @@ msgstr "ルール名"
 msgid "_Score Rules"
 msgstr "ルールのスコア(_S)"
 
+#: filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "スコア"
+
 #: filter/searchtypes.xml.h:1
 msgid "Body contains"
 msgstr "本文が次のものを含む"
@@ -13060,13 +12503,13 @@ msgstr "署名"
 msgid "-------- Forwarded Message --------"
 msgstr "-------- 転送するメッセージ --------"
 
-#: mail/em-composer-utils.c:1499
+#: mail/em-composer-utils.c:1495
 msgid "an unknown sender"
 msgstr "差出人が不明"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1509
+#: mail/em-composer-utils.c:1505
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "%Y/%m/%d (%a) %H:%M %%+05d に %%s さんは書きました:"
 
@@ -13104,8 +12547,8 @@ msgstr "<ここをクリックしてフォルダを選択して下さい>"
 msgid "Create New Folder"
 msgstr "新規フォルダの作成"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
-#: mail/mail-component.c:706
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
+#: mail/mail-component.c:704
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "フォルダを作成する場所を指定して下さい:"
@@ -13119,96 +12562,97 @@ msgstr "作成"
 msgid "Folder _name:"
 msgstr "フォルダ名(_N):"
 
-#: mail/em-folder-tree.c:839
+#: mail/em-folder-tree.c:833
 #, c-format
 msgid "Moving folder %s"
 msgstr "フォルダ %s の移動中"
 
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree.c:835
 #, c-format
 msgid "Copying folder %s"
 msgstr "フォルダ %s のコピー中"
 
-#: mail/em-folder-tree.c:848 mail/message-list.c:1561
+#: mail/em-folder-tree.c:842 mail/message-list.c:1561
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "フォルダ %s へメッセージの移動中"
 
-#: mail/em-folder-tree.c:850 mail/message-list.c:1563
+#: mail/em-folder-tree.c:844 mail/message-list.c:1563
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "フォルダ %s へメッセージのコピー中"
 
-#: mail/em-folder-tree.c:866
+#: mail/em-folder-tree.c:860
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "メッセージをトップレベルの中に移せません"
 
-#: mail/em-folder-tree.c:956 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "フォルダへコピー(_C)"
 
-#: mail/em-folder-tree.c:957 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "フォルダへ移動(_M)"
 
-#: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2069
-#: mail/em-folder-tree.c:2556 mail/em-folder-view.c:798
+#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
+#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
 #: mail/message-list.c:1651
 msgid "_Move"
 msgstr "移動(_M)"
 
-#: mail/em-folder-tree.c:961 mail/message-list.c:1653
+#: mail/em-folder-tree.c:955 mail/message-list.c:1653
 msgid "Cancel _Drag"
 msgstr "ドラッグのキャンセル(_D)"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
 #: mail/em-folder-view.c:798 mail/em-folder-view.c:812
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "フォルダの選択"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
 msgid "C_opy"
 msgstr "コピー(_O)"
 
-#: mail/em-folder-tree.c:2096
+#: mail/em-folder-tree.c:2088
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "フォルダ '%s' の作成中"
 
-#: mail/em-folder-tree.c:2282 mail/mail-component.c:706
+#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
 msgid "Create folder"
 msgstr "フォルダの作成"
 
-#: mail/em-folder-tree.c:2477
+#: mail/em-folder-tree.c:2463
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "フォルダ \"%s\" の変更先:"
 
-#: mail/em-folder-tree.c:2479
+#: mail/em-folder-tree.c:2465
 msgid "Rename Folder"
 msgstr "フォルダ名の変更"
 
-#: mail/em-folder-tree.c:2550 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "表示(_V)"
 
-#: mail/em-folder-tree.c:2551
+#: mail/em-folder-tree.c:2537
 msgid "Open in _New Window"
 msgstr "新しいウィンドウで開く(_N)"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2560
+#: mail/em-folder-tree.c:2546
 msgid "_New Folder..."
 msgstr "新しいフォルダ(_N)"
 
-#: mail/em-folder-tree.c:2563
+#: mail/em-folder-tree.c:2549
 msgid "_Rename"
 msgstr "名前の変更(_R)"
 
-#: mail/em-folder-tree.c:2566 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "プロパティ(_P)..."
 
@@ -13227,19 +12671,19 @@ msgstr "一致しないもの"
 msgid "Inbox"
 msgstr "受信箱"
 
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
 msgid "Loading..."
 msgstr "読み込み中..."
 
 #: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
 #: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:510
-#: mail/mail-component.c:556
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
+#: mail/mail-component.c:554
 msgid "Mail"
 msgstr "メール"
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "新規のメッセージとして編集(_E)..."
@@ -13252,17 +12696,17 @@ msgstr "印刷(_P)"
 msgid "_Reply to Sender"
 msgstr "差出人へ返信(_R)"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:810
+#: mail/em-folder-view.c:901 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "メーリング・リストへ返信(_L)"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:811
+#: mail/em-folder-view.c:902 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "全員へ返信(_A)"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: mail/em-folder-view.c:903 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "転送(_F)"
@@ -13315,6 +12759,10 @@ msgstr "フォルダへ移動(_V)..."
 msgid "_Copy to Folder..."
 msgstr "フォルダへコピー(_C)..."
 
+#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "ラベル"
+
 #: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "差出人をアドレス帳に追加"
@@ -13364,12 +12812,12 @@ msgid "Filter on _Mailing List"
 msgstr "メーリング・リストのフィルタ(_M)"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
+#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
 #: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "デフォルト"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1796
 msgid "Print Message"
 msgstr "メッセージの印刷"
 
@@ -13408,12 +12856,18 @@ msgstr "Cc"
 msgid "Bcc"
 msgstr "Bcc"
 
+#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
+#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "件名"
+
 #: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
 #: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "日付"
 
-#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
+#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
 msgid "Newsgroups"
 msgstr "ニュースグループ"
 
@@ -13606,7 +13060,7 @@ msgstr ""
 "このメッセージは強力なアルゴリズムで暗号化されています。現実的に、外部の者が"
 "このメッセージの内容を閲覧することは非常に困難と思われます。"
 
-#: mail/em-format-html-display.c:757
+#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
 msgid "_View Certificate"
 msgstr "証明書の表示(_V)"
 
@@ -13719,36 +13173,36 @@ msgstr ""
 "Evolution の以前の設定を読み込むことができません。'${HOME}/evolution/config."
 "xmldb' が存在しないかデータが壊れています。"
 
-#: mail/em-popup.c:699
+#: mail/em-popup.c:700
 msgid "Save As..."
 msgstr "別名で保存..."
 
-#: mail/em-popup.c:717
+#: mail/em-popup.c:718
 #, c-format
 msgid "untitled_image.%s"
 msgstr "untitled_image.%s"
 
-#: mail/em-popup.c:807
+#: mail/em-popup.c:808
 msgid "Set as _Background"
 msgstr "壁紙にセットする(_B)"
 
-#: mail/em-popup.c:809
+#: mail/em-popup.c:810
 msgid "_Reply to sender"
 msgstr "差出人へ返信(_R)"
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:859
 msgid "_Open Link in Browser"
 msgstr "リンクをブラウザで開く(_O)"
 
-#: mail/em-popup.c:859
+#: mail/em-popup.c:860
 msgid "Se_nd message to..."
 msgstr "メッセージの送信(_N)..."
 
-#: mail/em-popup.c:860
+#: mail/em-popup.c:861
 msgid "_Add to Addressbook"
 msgstr "アドレス帳に追加(_A)"
 
-#: mail/em-popup.c:966
+#: mail/em-popup.c:967
 #, c-format
 msgid "Open in %s..."
 msgstr "%s の中を開きます..."
@@ -14336,15 +13790,15 @@ msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution は古い Elm 形式メールをインポート中です"
 
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:226
+#: mail/importers/evolution-mbox-importer.c:221
+#: mail/importers/evolution-outlook-importer.c:255
 #: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "インポート中..."
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:222
-#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/evolution-mbox-importer.c:223
+#: mail/importers/evolution-outlook-importer.c:257
 #: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "少々お待ち下さい"
@@ -14366,21 +13820,23 @@ msgid "Elm"
 msgstr "Elm"
 
 #: mail/importers/evolution-mbox-importer.c:116
+#: mail/importers/evolution-outlook-importer.c:130
 msgid "Destination folder:"
 msgstr "転送先フォルダ:"
 
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder to import into"
 msgstr "インポート先フォルダの選択"
 
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:254
 #: mail/importers/mail-importer.c:226
 #, c-format
 msgid "Importing `%s'"
 msgstr "'%s' のインポート"
 
-#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/evolution-outlook-importer.c:301
 #: mail/importers/mail-importer.c:140
 msgid "Importing mailbox"
 msgstr "mailbox のインポート"
@@ -14545,15 +14001,15 @@ msgstr ""
 msgid "%s License Agreement"
 msgstr "%s のライセンス同意書"
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:167
+#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
 msgid "_Host:"
 msgstr "ホスト(_H):"
 
-#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:151
+#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
 msgid "User_name:"
 msgstr "ユーザ名:"
 
-#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:173
+#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
 msgid "_Path:"
 msgstr "パス(_P):"
 
@@ -14581,66 +14037,66 @@ msgstr "%s メーリング・リスト"
 msgid "Add Filter Rule"
 msgstr "フィルタ・ルールの追加"
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:461
 #, c-format
 msgid "%d deleted"
 msgstr "削除済 %d 通"
 
-#: mail/mail-component.c:465
+#: mail/mail-component.c:463
 #, c-format
 msgid "%d junk"
 msgstr "ジャンク %d 通"
 
-#: mail/mail-component.c:488
+#: mail/mail-component.c:486
 #, c-format
 msgid "%d drafts"
 msgstr "草案 %d 通"
 
-#: mail/mail-component.c:490
+#: mail/mail-component.c:488
 #, c-format
 msgid "%d sent"
 msgstr "送信済 %d 通"
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:490
 #, c-format
 msgid "%d unsent"
 msgstr "未送信 %d 通"
 
-#: mail/mail-component.c:496
+#: mail/mail-component.c:494
 #, c-format
 msgid "%d total"
 msgstr "合計 %d 通"
 
-#: mail/mail-component.c:498
+#: mail/mail-component.c:496
 #, c-format
 msgid ", %d unread"
 msgstr ", 未読 %d 通"
 
-#: mail/mail-component.c:658
+#: mail/mail-component.c:656
 msgid "New Mail Message"
 msgstr "新しいメッセージ"
 
-#: mail/mail-component.c:659
+#: mail/mail-component.c:657
 msgid "_Mail Message"
 msgstr "メッセージ(_M)"
 
-#: mail/mail-component.c:660
+#: mail/mail-component.c:658
 msgid "Compose a new mail message"
 msgstr "新しいメッセージを作成します"
 
-#: mail/mail-component.c:666
+#: mail/mail-component.c:664
 msgid "New Mail Folder"
 msgstr "新しいメール・フォルダ"
 
-#: mail/mail-component.c:667
+#: mail/mail-component.c:665
 msgid "Mail _Folder"
 msgstr "メールのフォルダ(_F)"
 
-#: mail/mail-component.c:668
+#: mail/mail-component.c:666
 msgid "Create a new mail folder"
 msgstr "新しいメール・フォルダを作成します"
 
-#: mail/mail-component.c:800
+#: mail/mail-component.c:798
 msgid "Failed upgrading Mail settings or folders."
 msgstr "メールの設定または関連フォルダのアップグレードに失敗しました。"
 
@@ -15372,7 +14828,6 @@ msgstr ""
 "やすくなります。"
 
 #. mail:ask-send-only-bcc-contact primary
-#. mail:ask-send-only-bcc primary
 #: mail/mail-errors.xml.h:22 mail/mail-errors.xml.h:29
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "BCC のみ付与してメッセージを送信してもよろしいですか？"
@@ -15450,7 +14905,6 @@ msgstr ""
 "よろしいですか？"
 
 #. mail:ask-expunge secondary
-#. mail:ask-empty-trash secondary
 #: mail/mail-errors.xml.h:45 mail/mail-errors.xml.h:50
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "続行すると、これらのメッセージを復旧することができなくなります。"
@@ -15487,7 +14941,8 @@ msgstr ""
 
 #. mail:camel-exception primary
 #: mail/mail-errors.xml.h:57
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+#, fuzzy
+msgid "Your message with the subject \"{0}\" was not delivered."
 msgstr "件名 \"{0}\" のメッセージは配送されませんでした。"
 
 #. mail:camel-exception secondary
@@ -15524,13 +14979,6 @@ msgid "{0}."
 msgstr "{0}。"
 
 #. mail:session-message-info secondary
-#. mail:session-message-info-cancel secondary
-#. mail:session-message-warning secondary
-#. mail:session-message-warning-cancel secondary
-#. mail:session-message-error secondary
-#. mail:session-message-error-cancel secondary
-#. mail:ask-session-password secondary
-#. mail:filter-load-error secondary
 #: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
 #: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
 #: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
@@ -15553,14 +15001,7 @@ msgstr "フィルタ定義を読み込む際にエラーが発生しました。
 msgid "Cannot save to directory \"{0}\"."
 msgstr "フォルダ \"{0}\" へ保存できません。"
 
-#. mail:no-save-path secondary
-#: mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr "{1}"
-
 #. mail:no-create-path primary
-#. mail:no-write-path-exists primary
-#. mail:no-write-path-notfile primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
 msgid "Cannot save to file \"{0}\"."
@@ -15576,15 +15017,6 @@ msgstr "保存フォルダを作成できません。理由は \"{1}\""
 msgid "Cannot create temporary save directory."
 msgstr "作業フォルダを作成できません。"
 
-#. mail:no-create-tmp-path secondary
-#. mail:no-delete-folder secondary
-#. system:no-save-file secondary
-#. system:no-load-file secondary
-#: mail/mail-errors.xml.h:100 mail/mail-errors.xml.h:112
-#: widgets/misc/e-system-errors.xml.h:11 widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr "理由は \"{1}\" です。"
-
 #. mail:no-write-path-exists secondary
 #: mail/mail-errors.xml.h:104
 msgid "File exists but cannot overwrite it."
@@ -15606,7 +15038,6 @@ msgid "Cannot delete system folder \"{0}\"."
 msgstr "システム・フォルダ \"{0}\" を削除できません。"
 
 #. mail:no-delete-spethal-folder secondary
-#. mail:no-rename-spethal-folder secondary
 #: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
@@ -15640,13 +15071,11 @@ msgstr ""
 "永久に削除されることになります。"
 
 #. mail:no-rename-folder-exists primary
-#. mail:no-rename-folder primary
 #: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "\"{0}\" から \"{1}\" へ名前を変更できません。"
 
 #. mail:no-rename-folder-exists secondary
-#. mail:vfolder-notunique secondary
 #: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr "既に同名のフォルダ \"{1}\" があります。別の名前を使用して下さい。"
@@ -15657,25 +15086,21 @@ msgid "Because \"{2}\"."
 msgstr "理由は \"{2}\" です。"
 
 #. mail:no-move-folder-nostore primary
-#. mail:no-move-folder-to-nostore primary
 #: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "フォルダ \"{0}\" を \"{1}\" へ移動できません。"
 
 #. mail:no-move-folder-nostore secondary
-#. mail:no-copy-folder-nostore secondary
 #: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
 msgid "Cannot open source \"{2}\"."
 msgstr "操作の対象先 \"{2}\" を開けません。"
 
 #. mail:no-move-folder-to-nostore secondary
-#. mail:no-copy-folder-to-nostore secondary
 #: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
 msgid "Cannot open target \"{2}\"."
 msgstr "操作の対象元 \"{2}\" を開けません。"
 
 #. mail:no-copy-folder-nostore primary
-#. mail:no-copy-folder-to-nostore primary
 #: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "フォルダ \"{0}\" を \"{1}\" へコピーできません。"
@@ -15691,7 +15116,6 @@ msgid "Cannot open source \"{1}\""
 msgstr "ソース \"{1}\" を開けません。"
 
 #. mail:account-incomplete primary
-#. mail:account-notunique primary
 #: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
 msgid "Cannot save changes to account."
 msgstr "アカウントの変更点を保存できません。"
@@ -15853,7 +15277,7 @@ msgstr "上書きする(_O)"
 msgid "_Append"
 msgstr "追加する(_A)"
 
-#: mail/mail-folder-cache.c:791
+#: mail/mail-folder-cache.c:785
 #, c-format
 msgid "Pinging %s"
 msgstr "%s への ping 中に"
@@ -16293,6 +15717,10 @@ msgstr "転送"
 msgid "No Response Necessary"
 msgstr "返信の必要なし"
 
+#: mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "既読"
+
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "返信"
@@ -16395,43 +15823,47 @@ msgid ""
 msgstr "オフライン時にローカル・ディスクと同期するフォルダへのパスのリスト"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid "Toolbar is visible"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Whether Evolution should start up in offline mode"
 msgstr "Evolution をオフライン・モードで起動するかどうか"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Whether the toolbar should be visible."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
 msgid "Whether to skip the development warning dialog"
 msgstr "開発版を警告するダイアログをスキップするかどうか"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
+#: shell/apps_evolution_shell.schemas.in.in.h:14
 msgid "mail"
 msgstr "メール"
 
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
-msgstr "開発に携わった方々"
-
-#: shell/e-shell.c:545 shell/e-shell.c:546
+#: shell/e-shell.c:588 shell/e-shell.c:589
 #, c-format
 msgid "%ld KB"
 msgstr "%ld Kバイト"
 
-#: shell/e-shell.c:743
+#: shell/e-shell.c:786
 msgid "Uknown system error."
 msgstr "特定できないシステム・エラーです。"
 
-#: shell/e-shell.c:1100
+#: shell/e-shell.c:1143
 msgid "Invalid arguments"
 msgstr "不正な引数"
 
-#: shell/e-shell.c:1102
+#: shell/e-shell.c:1145
 msgid "Cannot register on OAF"
 msgstr "OAF に登録できません"
 
-#: shell/e-shell.c:1104
+#: shell/e-shell.c:1147
 msgid "Configuration Database not found"
 msgstr "データベースの設定がありません"
 
-#: shell/e-shell.c:1106
+#: shell/e-shell.c:1149
 msgid "Generic error"
 msgstr "一般的なエラー"
 
@@ -16489,7 +15921,7 @@ msgstr ""
 msgid "Select importer"
 msgstr "インポーターの選択"
 
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1026
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
 #, c-format
 msgid "File %s does not exist"
 msgstr "ファイル %s がありません"
@@ -16517,31 +15949,32 @@ msgstr ""
 "%s をインポート中\n"
 "アイテム 1 をインポート中"
 
-#: shell/e-shell-importer.c:549
+#: shell/e-shell-importer.c:570
 msgid "Automatic"
 msgstr "自動"
 
-#: shell/e-shell-importer.c:598
-msgid "_Filename:"
-msgstr "ファイル名(_F):"
+#: shell/e-shell-importer.c:626
+#, fuzzy
+msgid "F_ilename:"
+msgstr "ファイル名:"
 
-#: shell/e-shell-importer.c:603
+#: shell/e-shell-importer.c:631
 msgid "Select a file"
 msgstr "ファイルの選択"
 
-#: shell/e-shell-importer.c:613
+#: shell/e-shell-importer.c:642
 msgid "File _type:"
 msgstr "ファイルの種類(_T):"
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:681
 msgid "Import data and settings from _older programs"
 msgstr "以前のバージョンからデータとその設定をインポートする(_O)"
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:684
 msgid "Import a _single file"
 msgstr "ファイル単体をインポートする(_S)"
 
-#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -16549,25 +15982,25 @@ msgstr ""
 "少々お待ち下さい...\n"
 "既存の設定を読み込んでいます。"
 
-#: shell/e-shell-importer.c:727
+#: shell/e-shell-importer.c:756
 msgid "Starting Intelligent Importers"
 msgstr "インテリジェント・インポーターの起動"
 
-#: shell/e-shell-importer.c:853 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
 #, c-format
 msgid "From %s:"
 msgstr "差出人 %s:"
 
-#: shell/e-shell-importer.c:1044
+#: shell/e-shell-importer.c:1073
 #, c-format
 msgid "No importer available for file %s"
 msgstr "ファイル %s で利用できるインポータがありません"
 
-#: shell/e-shell-importer.c:1056
+#: shell/e-shell-importer.c:1085
 msgid "Unable to execute importer"
 msgstr "インポータを実行できません"
 
-#: shell/e-shell-importer.c:1169
+#: shell/e-shell-importer.c:1199
 msgid "_Import"
 msgstr "インポート(_I)"
 
@@ -16617,58 +16050,59 @@ msgstr "フォルダ名には文字 \"#\" を含めることはできません�
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' と '..' はフォルダ名として予約済みです。"
 
-#: shell/e-shell-window.c:336
+#: shell/e-shell-window.c:337
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "現在 Evolution はオンラインです (オフラインにする場合はこのボタンをクリックし"
 "て下さい)"
 
-#: shell/e-shell-window.c:343
+#: shell/e-shell-window.c:344
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution はオフラインのままで処理します"
 
-#: shell/e-shell-window.c:349
+#: shell/e-shell-window.c:350
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "現在 Evolution はオフラインです (オンラインにする場合はこのボタンをクリックし"
 "て下さい)"
 
-#: shell/e-shell-window.c:621
+#: shell/e-shell-window.c:637
 #, c-format
 msgid "Switch to %s"
 msgstr "\"%s\" へ切り替えます"
 
-#: shell/e-shell-window-commands.c:64
+#: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 "このシステム上に GNOME パイロット・ツールがインストールされていないようです。"
 
-#: shell/e-shell-window-commands.c:72
+#: shell/e-shell-window-commands.c:74
 #, c-format
 msgid "Error executing %s."
 msgstr "%s 実行中にエラーが発生しました。"
 
-#: shell/e-shell-window-commands.c:121
+#: shell/e-shell-window-commands.c:123
 msgid "Bug buddy is not installed."
 msgstr "Bug buddy がインストールされていません。"
 
-#: shell/e-shell-window-commands.c:129
+#: shell/e-shell-window-commands.c:131
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy は実行できませんでした"
 
-#: shell/e-shell-window-commands.c:171
-msgid "About Evolution"
-msgstr "Evolution について"
+#: shell/e-shell-window-commands.c:323
+#, fuzzy
+msgid "Groupware Suite"
+msgstr "Groupwise"
 
-#: shell/e-shell-window-commands.c:382
+#: shell/e-shell-window-commands.c:563
 msgid "_Work Online"
 msgstr "オンライン作業(_W)"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "オフライン作業(_W)"
 
-#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "オフライン作業"
 
@@ -16983,13 +16417,11 @@ msgid "Continue"
 msgstr "続行する"
 
 #. shell:noshell title
-#. shell:noshell-reason title
 #: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
 msgid "Cannot start Evolution"
 msgstr "Evolution シェルを起動できません。"
 
 #. shell:noshell primary
-#. shell:noshell-reason primary
 #: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
 msgid "Evolution can not start."
 msgstr "Evolution を起動できません。"
@@ -17020,30 +16452,30 @@ msgstr ""
 "\n"
 "詳細はヘルプをご覧下さい。"
 
-#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:522
+#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
+#: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
 msgstr "インポートする証明書の選択..."
 
-#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:604
+#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
+#: smime/gui/certificate-manager.c:638
 msgid "Certificate Name"
 msgstr "証明書の名前"
 
-#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
+#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
 msgid "Purposes"
 msgstr "利用の目的"
 
-#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:517
+#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr "シリアル番号"
 
-#: smime/gui/certificate-manager.c:267
+#: smime/gui/certificate-manager.c:271
 msgid "Expires"
 msgstr "有効期限"
 
-#: smime/gui/certificate-manager.c:417
+#: smime/gui/certificate-manager.c:446
 msgid "E-Mail Address"
 msgstr "E-メール・アドレス"
 
@@ -17145,7 +16577,7 @@ msgstr ""
 "認証局 (CA) を信用する前に、(可能であれば) その証明書やポリシー、そして手続き"
 "をよく調べる必要があります。"
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
 msgid "Certificate"
 msgstr "証明書"
 
@@ -17165,19 +16597,23 @@ msgstr "Common Name (CN)"
 msgid "Contact Certificates"
 msgstr "連絡先の証明書"
 
-#: smime/gui/smime-ui.glade.h:21
-#, no-c-format
-msgid "Do you want to trust \"%s\" for the following purposes?"
-msgstr "次の目的に対して \"%s\" を信用しますか？"
+#: smime/gui/smime-ui.glade.h:20
+msgid "Do not trust the authenticity of this certificate"
+msgstr ""
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:21
 msgid "Dummy window only"
 msgstr "ダミーのウィンドウのみ"
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:22
 msgid "Edit"
 msgstr "編集"
 
+#: smime/gui/smime-ui.glade.h:23
+#, fuzzy
+msgid "Email Certificate Trust Settings"
+msgstr "E-メール認証局"
+
 #: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr "E-メール受信人証明書"
@@ -17210,242 +16646,253 @@ msgstr "組織の単位 (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 指紋"
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr "SSL クライアント証明書"
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr "SSL サーバ証明書"
 
 #: smime/gui/smime-ui.glade.h:37
+msgid "Trust the authenticity of this certificate"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
 msgid "Trust this CA to identify email users."
 msgstr "この認証局を E-メールのユーザを識別するために信用します"
 
-#: smime/gui/smime-ui.glade.h:38
+#: smime/gui/smime-ui.glade.h:39
 msgid "Trust this CA to identify software developers."
 msgstr "この認証局をソフトウェア開発者を識別するために信用します"
 
-#: smime/gui/smime-ui.glade.h:39
+#: smime/gui/smime-ui.glade.h:40
 msgid "Trust this CA to identify web sites."
 msgstr "この認証局をウェブ・サイトを識別するために信用します"
 
-#: smime/gui/smime-ui.glade.h:40
+#: smime/gui/smime-ui.glade.h:41
 msgid "View"
 msgstr "表示"
 
-#: smime/gui/smime-ui.glade.h:41
-msgid "View Certificate"
-msgstr "証明書の表示"
-
 #: smime/gui/smime-ui.glade.h:42
-msgid "You have been asked to trust a new Certificate Authority (CA)."
-msgstr "新しい認証局 (CA) を信用するために問い合わせ済みです。"
-
-#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr "次の組織からあなたの身元を確認できる証明書があります:"
 
-#: smime/gui/smime-ui.glade.h:44
+#: smime/gui/smime-ui.glade.h:43
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr "次の認証局を確認できる証明書 (ファイル) があります:"
 
-#: smime/gui/smime-ui.glade.h:45
+#: smime/gui/smime-ui.glade.h:44
 msgid "You have certificates on file that identify these people:"
 msgstr "次の人達の身元を確認できる証明書 (ファイル) があります:"
 
-#: smime/gui/smime-ui.glade.h:46
+#: smime/gui/smime-ui.glade.h:45
 msgid "Your Certificates"
 msgstr "ユーザの証明書"
 
-#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
+#: smime/gui/smime-ui.glade.h:46
+msgid "_Edit CA Trust"
+msgstr ""
+
+#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%Y/%m/%d"
 
-#: smime/lib/e-cert.c:478
+#. x509 certificate usage types
+#: smime/lib/e-cert.c:424
+#, fuzzy
+msgid "Sign"
+msgstr "署名中"
+
+#: smime/lib/e-cert.c:425
+#, fuzzy
+msgid "Encrypt"
+msgstr "暗号化済み"
+
+#: smime/lib/e-cert.c:530
 msgid "Version"
 msgstr "バージョン"
 
-#: smime/lib/e-cert.c:493
+#: smime/lib/e-cert.c:545
 msgid "Version 1"
 msgstr "バージョン１"
 
-#: smime/lib/e-cert.c:496
+#: smime/lib/e-cert.c:548
 msgid "Version 2"
 msgstr "バージョン２"
 
-#: smime/lib/e-cert.c:499
+#: smime/lib/e-cert.c:551
 msgid "Version 3"
 msgstr "バージョン３"
 
-#: smime/lib/e-cert.c:581
+#: smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "RSA で暗号化された PKCS #1 MD2"
 
-#: smime/lib/e-cert.c:584
+#: smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "RSA で暗号化された PKCS #1 MD5"
 
-#: smime/lib/e-cert.c:587
+#: smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "RSA で暗号化された PKCS #1 SHA-1"
 
-#: smime/lib/e-cert.c:590
+#: smime/lib/e-cert.c:642
 msgid "C"
 msgstr "C"
 
-#: smime/lib/e-cert.c:593
+#: smime/lib/e-cert.c:645
 msgid "CN"
 msgstr "CN"
 
-#: smime/lib/e-cert.c:596
+#: smime/lib/e-cert.c:648
 msgid "OU"
 msgstr "OU"
 
-#: smime/lib/e-cert.c:599
+#: smime/lib/e-cert.c:651
 msgid "O"
 msgstr "O"
 
-#: smime/lib/e-cert.c:602
+#: smime/lib/e-cert.c:654
 msgid "L"
 msgstr "L"
 
-#: smime/lib/e-cert.c:605
+#: smime/lib/e-cert.c:657
 msgid "DN"
 msgstr "DN"
 
-#: smime/lib/e-cert.c:608
+#: smime/lib/e-cert.c:660
 msgid "DC"
 msgstr "DC"
 
-#: smime/lib/e-cert.c:611
+#: smime/lib/e-cert.c:663
 msgid "ST"
 msgstr "ST"
 
-#: smime/lib/e-cert.c:614
+#: smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA 暗号化"
 
-#: smime/lib/e-cert.c:617
+#: smime/lib/e-cert.c:669
 msgid "Certificate Key Usage"
 msgstr "認証の鍵の用法"
 
-#: smime/lib/e-cert.c:620
+#: smime/lib/e-cert.c:672
 msgid "Netscape Certificate Type"
 msgstr "Netscape 証明書の種類"
 
-#: smime/lib/e-cert.c:623
+#: smime/lib/e-cert.c:675
 msgid "Certificate Authority Key Identifier"
 msgstr "認証局の鍵の識別子"
 
-#: smime/lib/e-cert.c:626
+#: smime/lib/e-cert.c:678
 msgid "UID"
 msgstr "UID"
 
-#: smime/lib/e-cert.c:635
+#: smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "オブジェクトの識別子 (%s)"
 
-#: smime/lib/e-cert.c:686
+#: smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
 msgstr "アルゴリズムの識別子"
 
-#: smime/lib/e-cert.c:694
+#: smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
 msgstr "アルゴリズムの引数"
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:768
 msgid "Subject Public Key Info"
 msgstr "主体者公開鍵情報"
 
-#: smime/lib/e-cert.c:721
+#: smime/lib/e-cert.c:773
 msgid "Subject Public Key Algorithm"
 msgstr "主体者公開鍵のアルゴリズム"
 
-#: smime/lib/e-cert.c:736
+#: smime/lib/e-cert.c:788
 msgid "Subject's Public Key"
 msgstr "主体者公開鍵"
 
-#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
+#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
 msgid "Error: Unable to process extension"
 msgstr "エラー: 拡張処理できません"
 
-#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
+#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr "オブジェクトの署名者"
 
-#: smime/lib/e-cert.c:782
+#: smime/lib/e-cert.c:834
 msgid "SSL Certificate Authority"
 msgstr "SSL 認証局"
 
-#: smime/lib/e-cert.c:786
+#: smime/lib/e-cert.c:838
 msgid "Email Certificate Authority"
 msgstr "E-メール認証局"
 
-#: smime/lib/e-cert.c:814
+#: smime/lib/e-cert.c:866
 msgid "Signing"
 msgstr "署名中"
 
-#: smime/lib/e-cert.c:818
+#: smime/lib/e-cert.c:870
 msgid "Non-repudiation"
 msgstr "容認"
 
-#: smime/lib/e-cert.c:822
+#: smime/lib/e-cert.c:874
 msgid "Key Encipherment"
 msgstr "鍵の暗号化"
 
-#: smime/lib/e-cert.c:826
+#: smime/lib/e-cert.c:878
 msgid "Data Encipherment"
 msgstr "データの暗号化"
 
-#: smime/lib/e-cert.c:830
+#: smime/lib/e-cert.c:882
 msgid "Key Agreement"
 msgstr "鍵の約款"
 
-#: smime/lib/e-cert.c:834
+#: smime/lib/e-cert.c:886
 msgid "Certificate Signer"
 msgstr "証明書の署名者"
 
-#: smime/lib/e-cert.c:838
+#: smime/lib/e-cert.c:890
 msgid "CRL Signer"
 msgstr "CRL の署名者"
 
-#: smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:938
 msgid "Critical"
 msgstr "危険"
 
-#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
+#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
 msgid "Not Critical"
 msgstr "危険ではない"
 
-#: smime/lib/e-cert.c:912
+#: smime/lib/e-cert.c:964
 msgid "Extensions"
 msgstr "拡張"
 
-#: smime/lib/e-cert.c:983
+#: smime/lib/e-cert.c:1035
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
 msgid "Certificate Signature Algorithm"
 msgstr "証明書の署名アルゴリズム"
 
-#: smime/lib/e-cert.c:1048
+#: smime/lib/e-cert.c:1100
 msgid "Issuer"
 msgstr "発行者"
 
-#: smime/lib/e-cert.c:1102
+#: smime/lib/e-cert.c:1154
 msgid "Issuer Unique ID"
 msgstr "発行者の重複しない ID"
 
-#: smime/lib/e-cert.c:1121
+#: smime/lib/e-cert.c:1173
 msgid "Subject Unique ID"
 msgstr "件名の重複しない ID"
 
-#: smime/lib/e-cert.c:1164
+#: smime/lib/e-cert.c:1216
 msgid "Certificate Signature Value"
 msgstr "証明書の署名の値"
 
@@ -17595,7 +17042,7 @@ msgstr "現在の連絡先の表示"
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "アクション(_A)"
 
@@ -17754,7 +17201,7 @@ msgstr "閉じる(_L)"
 #: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:3
+#: ui/evolution.xml.h:4
 msgid "Close"
 msgstr "閉じる"
 
@@ -17767,7 +17214,7 @@ msgid "Delete this item"
 msgstr "このアイテムを削除します"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr "メイン・ツールバー"
 
@@ -17810,7 +17257,7 @@ msgstr "このアイテムをディスクに保存します"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:44
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "_File"
 msgstr "ファイル(_F)"
 
@@ -18067,13 +17514,13 @@ msgstr "選択の反転(_I)"
 msgid "_Threaded Message List"
 msgstr "メッセージ一覧のスレッド化(_T)"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "このウィンドウを閉じます"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "_Close"
 msgstr "閉じる(_C)"
 
@@ -18469,7 +17916,7 @@ msgstr "前のメッセージへ(_P)"
 msgid "_Quoted"
 msgstr "引用する(_Q)"
 
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
 msgid "_Tools"
 msgstr "ツール(_T)"
 
@@ -18766,106 +18213,120 @@ msgid "_Open Task"
 msgstr "タスクを開く(_O)"
 
 #: ui/evolution.xml.h:1
-msgid "About Ximian Evolution..."
-msgstr "Ximian Evolution について..."
+#, fuzzy
+msgid "About Evolution..."
+msgstr "Evolution について"
 
 #: ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
 msgstr "Evolution の設定を変更します"
 
-#: ui/evolution.xml.h:5
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the visibility of the toolbar"
+msgstr "このフォルダの設定を変更します"
+
+#: ui/evolution.xml.h:6
 msgid "Create a new window displaying this folder"
 msgstr "このフォルダを表示する新しいウィンドウを作成します"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "終了(_X)"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Ximian Evolution FAQ(_F)"
+
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "プログラムを終了します"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:10
 msgid "Forget _Passwords"
 msgstr "パスワードの紛失(_P)"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:11
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "記憶したパスワードを忘れた場合に再び表示します"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:12
 msgid "Import data from other programs"
 msgstr "他のプログラムからデータを取り込みます"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:14
 msgid "New _Window"
 msgstr "新しいウィンドウ(_W)"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Pi_lot Settings..."
 msgstr "パイロットの設定(_L)..."
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Send / Receive"
 msgstr "送受信"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Send queued items and retrieve new items"
 msgstr "キューにあるメールを送信して新着メールを受信します"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Set up Pilot configuration"
 msgstr "GNOME パイロットを設定します"
 
-#: ui/evolution.xml.h:17
-msgid "Show information about Ximian Evolution"
+#: ui/evolution.xml.h:19
+#, fuzzy
+msgid "Show information about Evolution"
 msgstr "Ximian Evolution についての情報を表示します"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:20
 msgid "Submit Bug Report"
 msgstr "Bug 報告の提出"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:21
 msgid "Submit _Bug Report"
 msgstr "Bug 報告の提出(_B)"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Bug Buddy を使ってバグを報告します"
 
-#: ui/evolution.xml.h:21
-msgid "Toggle whether we are working offline."
-msgstr "オフライン作業かどうかを切替えます"
-
 #: ui/evolution.xml.h:23
-msgid "Ximian Evolution _FAQ"
-msgstr "Ximian Evolution FAQ(_F)"
+#, fuzzy
+msgid "T_oolbar"
+msgstr "メイン・ツールバー"
 
 #: ui/evolution.xml.h:24
-msgid "_About Ximian Evolution..."
-msgstr "Ximian Evolution について(_A)..."
+msgid "Toggle whether we are working offline."
+msgstr "オフライン作業かどうかを切替えます"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "_About Evolution..."
+msgstr "Evolution について"
+
+#: ui/evolution.xml.h:30
 msgid "_Help"
 msgstr "ヘルプ(_H)"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "_Import..."
 msgstr "インポート(_I)..."
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "_New"
 msgstr "新規(_N)"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "_Quick Reference"
 msgstr "クィック・リファレンス(_Q)"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_Send / Receive"
 msgstr "送受信(_S)"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 msgid "_Window"
 msgstr "ウィンドウ(_W)"
 
@@ -19257,3 +18718,470 @@ msgstr "%s (...)"
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% 完了)"
+
+#~ msgid "Failed to connect to LDAP server"
+#~ msgstr "LDAP サーバへ接続できませんでした"
+
+#~ msgid "Failed to authenticate with LDAP server"
+#~ msgstr "LDAP サーバを使った認証に失敗しました"
+
+#~ msgid "Could not perform query on Root DSE"
+#~ msgstr "ルート DSE に問い合わせできませんでした"
+
+#~ msgid "The server responded with no supported search bases"
+#~ msgstr "サーバがサポートしていない検索ベースを返しました"
+
+#~ msgid "This server does not support LDAPv3 schema information"
+#~ msgstr "このサーバは LDAPv3 スキーム情報をサポートしていません"
+
+#~ msgid "Error retrieving schema information"
+#~ msgstr "スキーム情報の取得でエラーが発生しました"
+
+#~ msgid "Server did not respond with valid schema information"
+#~ msgstr "サーバは正しいスキーム情報で応答しません"
+
+#~ msgid ""
+#~ "Some fields are no longer representable in the contact editor. Please "
+#~ "wait while Evolution copies those fields to the 'Notes' field..."
+#~ msgstr ""
+#~ "コンタクト・エディタにあるいくつかの項目は表示されなくなりました。"
+#~ "Evolution がこれらの項目を 'メモ' の項目へ移行している間、しばらくお待ち下"
+#~ "さい..."
+
+#~ msgid "  S_how Supported Bases "
+#~ msgstr " サポートしている検索ベースの表示(_H) "
+
+#~ msgid "1:00"
+#~ msgstr "1:00"
+
+#~ msgid "5:00"
+#~ msgstr "5:00"
+
+#~ msgid "Connecting"
+#~ msgstr "接続"
+
+#~ msgid "Distinguished _name:"
+#~ msgstr "識別名(_N):"
+
+#~ msgid "Email address:"
+#~ msgstr "E-メール・アドレス:"
+
+#~ msgid "Evolution will use this DN to authenticate you with the server"
+#~ msgstr "Evolution はこの DN (識別名) を使ってサーバの認証を行います"
+
+#~ msgid "One"
+#~ msgstr "レベル１"
+
+#~ msgid "S_earch scope: "
+#~ msgstr "検索範囲(_E): "
+
+#~ msgid "Searching"
+#~ msgstr "検索"
+
+#~ msgid "Sub"
+#~ msgstr "サブ・ディレクトリ"
+
+#~ msgid "This option controls how long a search will be run."
+#~ msgstr "このオプションは検索にかかる処理時間を指定します。"
+
+#~ msgid "U_se SSL/TLS:"
+#~ msgstr "SSL/TLS を使用する(_S):"
+
+#~ msgid "_Display name:"
+#~ msgstr "表示名(_D):"
+
+#~ msgid "_Port number:"
+#~ msgstr "ポート番号(_P):"
+
+#~ msgid "_Search base:"
+#~ msgstr "検索ベース(_S):"
+
+#~ msgid "_Server name:"
+#~ msgstr "サーバ名(_S):"
+
+#~ msgid "_Timeout (minutes):"
+#~ msgstr "タイムアウト(分)(_T):"
+
+#~ msgid "connecting-tab"
+#~ msgstr "接続タブ"
+
+#~ msgid "general-tab"
+#~ msgstr "全般タブ"
+
+#~ msgid "searching-tab"
+#~ msgstr "検索タブ"
+
+#~ msgid "Webcam:"
+#~ msgstr "ウェブカム:"
+
+#~ msgid "item7"
+#~ msgstr "item7"
+
+#~ msgid "item8"
+#~ msgstr "item8"
+
+#~ msgid "Category editor not available."
+#~ msgstr "カテゴリ・エディタが起動していません。"
+
+#~ msgid "Do you want to save changes?"
+#~ msgstr "変更を保存しますか？"
+
+#~ msgid "Error saving %s: %s"
+#~ msgstr "%s の保存中にエラーが発生しました: %s"
+
+#~ msgid ""
+#~ "The addressbook backend for\n"
+#~ "%s\n"
+#~ "has crashed. You will have to restart Evolution in order to use it again"
+#~ msgstr ""
+#~ "%s の\n"
+#~ "アドレス帳バックエンドががクラッシュしました。\n"
+#~ "再度利用する場合は Evolution を再起動して下さい。"
+
+#~ msgid "Can not load URI"
+#~ msgstr "URI を読み込めません"
+
+#~ msgid "Calendar Properties"
+#~ msgstr "カレンダのプロパティ"
+
+#~ msgid "Remote"
+#~ msgstr "リモート"
+
+#~ msgid "Task List Properties"
+#~ msgstr "タスク一覧のプロパティ"
+
+#~ msgid "_Refresh Interval:"
+#~ msgstr "更新間隔(_R):"
+
+#~ msgid "_Source URL:"
+#~ msgstr "ソース URL(_S):"
+
+#~ msgid ""
+#~ "The event being deleted is a meeting, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr "削除されたイベントが会議でした。取り消し通知を送付しますか？"
+
+#~ msgid "Are you sure you want to cancel and delete this meeting?"
+#~ msgstr "本当にこの会議をキャンセルして削除してもよろしいですか？"
+
+#~ msgid ""
+#~ "The task being deleted is assigned, would you like to send a cancellation "
+#~ "notice?"
+#~ msgstr "削除されたタスクが割り当て済みです。取り消し通知を送付しますか？"
+
+#~ msgid "Are you sure you want to cancel and delete this task?"
+#~ msgstr "本当にこのタスクを取り消して削除してもよろしいですか？"
+
+#~ msgid ""
+#~ "The journal entry being deleted is published, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "削除されたジャーナル・エントリが公開中です。取り消し通知を送付しますか？"
+
+#~ msgid "Are you sure you want to cancel and delete this journal entry?"
+#~ msgstr ""
+#~ "本当にこのジャーナル・エントリを取り消して削除してもよろしいですか？"
+
+#~ msgid "Are you sure you want to delete the appointment `%s'?"
+#~ msgstr "本当に予定 '%s' を削除してもよろしいですか？"
+
+#~ msgid "Are you sure you want to delete this untitled appointment?"
+#~ msgstr "本当にタイトルなしの予定を削除してもよろしいですか？"
+
+#~ msgid "Are you sure you want to delete the task `%s'?"
+#~ msgstr "本当にタスク '%s' を削除してもよろしいですか？"
+
+#~ msgid "Are you sure you want to delete this untitled task?"
+#~ msgstr "本当にタイトルなしのタスクを削除してもよろしいですか？"
+
+#~ msgid "Are you sure you want to delete the journal entry `%s'?"
+#~ msgstr "本当に仕訳記入 '%s' を削除してもよろしいですか？"
+
+#~ msgid "Are you sure want to delete this untitled journal entry?"
+#~ msgstr "本当にタイトルなしの仕訳記入を削除してもよろしいですか？"
+
+#~ msgid "Are you sure you want to delete %d appointment?"
+#~ msgid_plural "Are you sure you want to delete %d appointments?"
+#~ msgstr[0] "本当に %d 個の予定を削除してもよろしいですか？"
+#~ msgstr[1] "本当に %d 個の予定を削除してもよろしいですか？"
+
+#~ msgid "Are you sure you want to delete %d task?"
+#~ msgid_plural "Are you sure you want to delete %d tasks?"
+#~ msgstr[0] "本当に %d 個のタスクを削除してもよろしいですか？"
+#~ msgstr[1] "本当に %d 個のタスクを削除してもよろしいですか？"
+
+#~ msgid "Are you sure you want to delete %d journal entry?"
+#~ msgid_plural "Are you sure you want to delete %d journal entries?"
+#~ msgstr[0] "本当に %d 個の仕訳記入を削除してもよろしいですか？"
+#~ msgstr[1] "本当に %d 個の仕訳記入を削除してもよろしいですか？"
+
+#~ msgid "_Invite Others..."
+#~ msgstr "他の人を招待する(_I)..."
+
+#~ msgid ""
+#~ "This event has been changed, but has not been saved.\n"
+#~ "\n"
+#~ "Do you wish to save your changes?"
+#~ msgstr ""
+#~ "このイベントは変更されていますが保存されていません。\n"
+#~ "\n"
+#~ "その変更を保存しますか？"
+
+#~ msgid "_Discard Changes"
+#~ msgstr "変更の破棄(_D)"
+
+#~ msgid "Save Event"
+#~ msgstr "イベントの保存"
+
+#~ msgid "The meeting information has been created. Send it?"
+#~ msgstr "会議の情報が生成されました。この召集通知を送信しますか？"
+
+#~ msgid "The meeting information has changed. Send an updated version?"
+#~ msgstr "会議の情報が変更されました。更新されたバージョンを送信しますか？"
+
+#~ msgid "The task assignment information has been created. Send it?"
+#~ msgstr "タスク情報が生成されました。この情報を送信しますか？"
+
+#~ msgid "The task information has changed. Send an updated version?"
+#~ msgstr "タスク情報が変更されました。更新されたバージョンを送信しますか？"
+
+#~ msgid "The task backend for '%s' has crashed."
+#~ msgstr "'%s' 用のタスク・バックエンドがクラッシュしました。"
+
+#~ msgid "The calendar backend for '%s' has crashed."
+#~ msgstr "'%s' 用のカレンダ・バックエンドがクラッシュしました。"
+
+#~ msgid "Could not get article %s from NNTP server"
+#~ msgstr "NNTP サーバから記事 %s を取得できませんでした"
+
+#~ msgid "Posting not allowed by news server"
+#~ msgstr "ニュース・サーバは投稿を許可していません"
+
+#~ msgid "Failed to send newsgroups header: %s: message not posted"
+#~ msgstr ""
+#~ "ニュースグループのヘッダの送信に失敗しました: %s: メッセージは投稿されませ"
+#~ "ん"
+
+#~ msgid "Error posting to newsgroup: %s: message not posted"
+#~ msgstr ""
+#~ "ニュースグループへの投稿でエラーが発生しました: %s: メッセージは投稿されま"
+#~ "せん"
+
+#~ msgid "Error reading response to posted message: message not posted"
+#~ msgstr ""
+#~ "投稿したメッセージに対する応答でエラーが発生しました: メッセージは投稿され"
+#~ "ません"
+
+#~ msgid "Error posting message: %s: message not posted"
+#~ msgstr ""
+#~ "メッセージの投稿でエラーが発生しました: %s: メッセージは投稿されません"
+
+#~ msgid "Stream error"
+#~ msgstr "ストリーム・エラー"
+
+#~ msgid "Connection error: %s"
+#~ msgstr "接続エラー: %s"
+
+#~ msgid "Could not get group: %s"
+#~ msgstr "グループを取得できませんでした: %s"
+
+#~ msgid "Could not get messages: unspecified error"
+#~ msgstr "メッセージを取得できませんでした: エラーを特定できません"
+
+#~ msgid "Unknown server response: %s"
+#~ msgstr "サーバ応答を特定できません: %s"
+
+#~ msgid "${1}"
+#~ msgstr "${1}"
+
+#~ msgid "Because \"${1}\"."
+#~ msgstr "理由は \"${1}\" です。"
+
+#~ msgid "Adjust Score"
+#~ msgstr "スコアの調整"
+
+#~ msgid "Assign Color"
+#~ msgstr "色の割り当て"
+
+#~ msgid "Assign Score"
+#~ msgstr "スコアの割り当て"
+
+#~ msgid "Attachments"
+#~ msgstr "添付"
+
+#~ msgid "Beep"
+#~ msgstr "ビープ音"
+
+#~ msgid "contains"
+#~ msgstr "が次のものを含む"
+
+#~ msgid "Copy to Folder"
+#~ msgstr "フォルダへコピー"
+
+#~ msgid "Date received"
+#~ msgstr "受信日"
+
+#~ msgid "Date sent"
+#~ msgstr "送信日"
+
+#~ msgid "Deleted"
+#~ msgstr "削除する"
+
+#~ msgid "does not contain"
+#~ msgstr "が次のものを含まない"
+
+#~ msgid "does not end with"
+#~ msgstr "が次のもので終らない"
+
+#~ msgid "does not exist"
+#~ msgstr "がない"
+
+#~ msgid "does not return"
+#~ msgstr "が返らない"
+
+#~ msgid "does not sound like"
+#~ msgstr "が次のもののようでない"
+
+#~ msgid "does not start with"
+#~ msgstr "が次のもので始まらない"
+
+#~ msgid "Do Not Exist"
+#~ msgstr "がない"
+
+#~ msgid "Draft"
+#~ msgstr "草案"
+
+#~ msgid "ends with"
+#~ msgstr "が次のもので終わる"
+
+#~ msgid "Exist"
+#~ msgstr "がある"
+
+#~ msgid "exists"
+#~ msgstr "がある"
+
+#~ msgid "Expression"
+#~ msgstr "表現"
+
+#~ msgid "Follow Up"
+#~ msgstr "上に従う"
+
+#~ msgid "is"
+#~ msgstr "が次のものと一致する"
+
+#~ msgid "is after"
+#~ msgstr "が次のものより後"
+
+#~ msgid "is before"
+#~ msgstr "が次のものより前"
+
+#~ msgid "is Flagged"
+#~ msgstr "フラグが付いている"
+
+#~ msgid "is greater than"
+#~ msgstr "が次のものより大きい"
+
+#~ msgid "is less than"
+#~ msgstr "が次のものより小さい"
+
+#~ msgid "is not"
+#~ msgstr "が次のものと一致しない"
+
+#~ msgid "is not Flagged"
+#~ msgstr "にフラグがない"
+
+#~ msgid "Junk Test"
+#~ msgstr "ジャンクのテスト"
+
+#~ msgid "Mailing list"
+#~ msgstr "メーリング・リスト"
+
+#~ msgid "Message Body"
+#~ msgstr "メッセージ本体"
+
+#~ msgid "Message Header"
+#~ msgstr "メッセージのヘッダ"
+
+#~ msgid "Message is Junk"
+#~ msgstr "メッセージはジャンクに該当します"
+
+#~ msgid "Message is not Junk"
+#~ msgstr "メッセージはジャンクに該当しません"
+
+#~ msgid "Move to Folder"
+#~ msgstr "フォルダへ移動"
+
+#~ msgid "Pipe to Program"
+#~ msgstr "プログラムへ引き渡す"
+
+#~ msgid "Play Sound"
+#~ msgstr "サウンドの再生"
+
+#~ msgid "Recipients"
+#~ msgstr "宛先"
+
+#~ msgid "Regex Match"
+#~ msgstr "正規表現と一致"
+
+#~ msgid "Replied to"
+#~ msgstr "返信先"
+
+#~ msgid "returns"
+#~ msgstr "返す"
+
+#~ msgid "returns greater than"
+#~ msgstr "次のものより大きいものを返す"
+
+#~ msgid "returns less than"
+#~ msgstr "次のものより小さいものを返す"
+
+#~ msgid "Run Program"
+#~ msgstr "プログラム実行"
+
+#~ msgid "Sender"
+#~ msgstr "差出人"
+
+#~ msgid "Set Status"
+#~ msgstr "ステータスの設定"
+
+#~ msgid "Size (kB)"
+#~ msgstr "サイズ (Kバイト)"
+
+#~ msgid "sounds like"
+#~ msgstr "が次のもののように見える"
+
+#~ msgid "Source Account"
+#~ msgstr "ソースのアカウント"
+
+#~ msgid "Specific header"
+#~ msgstr "指定したヘッダ"
+
+#~ msgid "starts with"
+#~ msgstr "が次のもので始まる"
+
+#~ msgid "Stop Processing"
+#~ msgstr "処理停止"
+
+#~ msgid "Unset Status"
+#~ msgstr "ステータスの解除"
+
+#~ msgid "Brought to you by"
+#~ msgstr "開発に携わった方々"
+
+#~ msgid "_Filename:"
+#~ msgstr "ファイル名(_F):"
+
+#~ msgid "Do you want to trust \"%s\" for the following purposes?"
+#~ msgstr "次の目的に対して \"%s\" を信用しますか？"
+
+#~ msgid "View Certificate"
+#~ msgstr "証明書の表示"
+
+#~ msgid "You have been asked to trust a new Certificate Authority (CA)."
+#~ msgstr "新しい認証局 (CA) を信用するために問い合わせ済みです。"
+
+#~ msgid "About Ximian Evolution..."
+#~ msgstr "Ximian Evolution について..."
+
+#~ msgid "_About Ximian Evolution..."
+#~ msgstr "Ximian Evolution について(_A)..."
diff --git a/po/ko.po b/po/ko.po
index 0d76aaf7e5..de2e871dde 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.5.3\n"
-"POT-Creation-Date: 2004-05-19 14:00-0400\n"
+"POT-Creation-Date: 2004-06-03 11:14-0400\n"
 "PO-Revision-Date: 2004-04-21 02:15+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: GNOME Korea <gnome-kr-hackers@lists.kldp.net>\n"
@@ -61,13 +61,13 @@ msgstr "카드"
 msgid "Default Sync Address:"
 msgstr "기본 동기화 주소:"
 
-#: addressbook/conduit/address-conduit.c:1150
 #: addressbook/conduit/address-conduit.c:1151
+#: addressbook/conduit/address-conduit.c:1152
 msgid "Could not load addressbook"
 msgstr "주소록을 읽어들일 수 없습니다"
 
-#: addressbook/conduit/address-conduit.c:1219
-#: addressbook/conduit/address-conduit.c:1222
+#: addressbook/conduit/address-conduit.c:1220
+#: addressbook/conduit/address-conduit.c:1223
 msgid "Could not read pilot's Address application block"
 msgstr "파일롯의 Address 프로그램 블록을 읽을 수 없습니다"
 
@@ -75,13 +75,13 @@ msgstr "파일롯의 Address 프로그램 블록을 읽을 수 없습니다"
 msgid "Accessing LDAP Server anonymously"
 msgstr "익명으로 LDAP 서버 사용"
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
 msgid "Failed to authenticate.\n"
 msgstr "인증하는 데 실패했습니다.\n"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%s%s(사용자 %s)의 열쇠글을 입력하십시오"
@@ -125,51 +125,23 @@ msgstr "연락처(_C):"
 msgid "Create a new contacts group"
 msgstr "새로운 연락처를 만듭니다"
 
-#: addressbook/gui/component/addressbook-component.c:182
+#: addressbook/gui/component/addressbook-component.c:184
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:483
-msgid "Failed to connect to LDAP server"
-msgstr "LDAP 서버에 연결 실패"
-
-#: addressbook/gui/component/addressbook-config.c:507
-msgid "Failed to authenticate with LDAP server"
-msgstr "LDAP 서버에서 인증 실패"
-
-#: addressbook/gui/component/addressbook-config.c:535
-msgid "Could not perform query on Root DSE"
-msgstr "루트 DSE에 질의를 수행할 수 없습니다"
-
-#: addressbook/gui/component/addressbook-config.c:840
-msgid "The server responded with no supported search bases"
-msgstr "서버가 지원하는 찾기 기준으로 응답하지 않았습니다"
-
-#: addressbook/gui/component/addressbook-config.c:1245
-msgid "This server does not support LDAPv3 schema information"
-msgstr "이 서버는 LDAPv3 스키마 정보를 지원하지 않습니다"
-
-#: addressbook/gui/component/addressbook-config.c:1266
-msgid "Error retrieving schema information"
-msgstr "스키마 정보를 가져오는 데 오류가 발생했습니다"
-
-#: addressbook/gui/component/addressbook-config.c:1274
-msgid "Server did not respond with valid schema information"
-msgstr "서버가 올바른 스키마 정보가 들어 있는 응답을 하지 않았습니다"
-
 #: addressbook/gui/component/addressbook-migrate.c:68
-#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1160
 msgid "Migrating..."
 msgstr "옮기는 중..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1201
 #, c-format
 msgid "Migrating `%s':"
 msgstr "`%s' 옮기는 중:"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:438
+#: addressbook/gui/component/addressbook-migrate.c:464
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
 #: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
@@ -177,28 +149,28 @@ msgid "On This Computer"
 msgstr "이 컴퓨터"
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:446
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
-#: mail/mail-config.glade.h:106
+#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
+#: mail/mail-config.glade.h:109
 msgid "Personal"
 msgstr "개인"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:454
+#: addressbook/gui/component/addressbook-migrate.c:480
 msgid "On LDAP Servers"
 msgstr "LDAP 서버"
 
-#: addressbook/gui/component/addressbook-migrate.c:582
+#: addressbook/gui/component/addressbook-migrate.c:608
 msgid "LDAP Servers"
 msgstr "LDAP 서버"
 
-#: addressbook/gui/component/addressbook-migrate.c:702
+#: addressbook/gui/component/addressbook-migrate.c:728
 msgid "Autocompletion Settings"
 msgstr "자동 완성 설정"
 
-#: addressbook/gui/component/addressbook-migrate.c:1076
+#: addressbook/gui/component/addressbook-migrate.c:1104
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -209,7 +181,7 @@ msgstr ""
 "\n"
 "폴더를 옮기는 동안 잠시 기다리십시오..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1090
+#: addressbook/gui/component/addressbook-migrate.c:1118
 #, fuzzy
 msgid ""
 "The format of mailing list contacts has changed.\n"
@@ -220,7 +192,7 @@ msgstr ""
 "\n"
 "폴더를 옮기는 동안 잠시 기다리십시오..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1099
+#: addressbook/gui/component/addressbook-migrate.c:1127
 #, fuzzy
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
@@ -231,7 +203,7 @@ msgstr ""
 "\n"
 "폴더를 옮기는 동안 잠시 기다리십시오..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1109
+#: addressbook/gui/component/addressbook-migrate.c:1137
 #, fuzzy
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
@@ -242,38 +214,33 @@ msgstr ""
 "\n"
 "폴더를 옮기는 동안 잠시 기다리십시오..."
 
-#: addressbook/gui/component/addressbook-view.c:674
+#: addressbook/gui/component/addressbook-view.c:675
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr "'%s' 주소록을 지우게 됩니다. 정말로 계속 하시겠습니까?"
 
-#: addressbook/gui/component/addressbook-view.c:761
+#: addressbook/gui/component/addressbook-view.c:754
 msgid "New Address Book"
 msgstr "새 주소록"
 
-#: addressbook/gui/component/addressbook-view.c:762
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
+#: addressbook/gui/component/addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "지우기"
 
-#: addressbook/gui/component/addressbook-view.c:763
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-view.c:756
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "등록 정보..."
 
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/addressbook-view.c:1002
+#. Create the contacts group
+#: addressbook/gui/component/addressbook-view.c:995
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
 #: calendar/gui/migration.c:373
 msgid "Contacts"
 msgstr "연락처"
@@ -352,10 +319,6 @@ msgid "Manage your S/MIME certificates here"
 msgstr "여기서 s/MIME 인증서를 관리합니다"
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-msgid "  S_how Supported Bases "
-msgstr " 지원하는 기준 보기(_H) "
-
-#: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -370,202 +333,169 @@ msgstr " 지원하는 기준 보기(_H) "
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1:00"
-msgstr "1:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
-msgstr "5:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "SMTP 인증"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
 #, fuzzy
 msgid "<b>Display</b>"
 msgstr "<b>메일 보내는 중:</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 #, fuzzy
 msgid "<b>Downloading</b>"
 msgstr "<b>메일 보내는 중:</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:10
 #, fuzzy
 msgid "<b>Searching</b>"
 msgstr "선택(_S):"
 
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
 msgid "<b>Server Information</b>"
 msgstr "단계 2: 서버 정보"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
 msgid "<b>Type:</b>"
 msgstr "<b>기한:</b> "
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:13
 #, fuzzy
 msgid "Add Contacts Group"
 msgstr "연락처(_C):"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Address Book Properties"
 msgstr "주소록 등록 정보"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
-#: mail/mail-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
+#: mail/mail-config.glade.h:42
 msgid "Always"
 msgstr "항상"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr "익명으로"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:17
 #: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "기본"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
-msgid "Connecting"
-msgstr "연결중"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 #: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "자세히"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
-msgid "Distinguished _name:"
-msgstr "구별되는 이름(_N):"
-
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:19
 #, fuzzy
 msgid "Distinguished name"
 msgstr "구별되는 이름(_N):"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:20
 #, fuzzy
 msgid "Download limit:"
 msgstr "다운로드 제한(_D):"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Email address"
 msgstr "전자메일 주소:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "Email address:"
-msgstr "전자메일 주소:"
-
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "Evolution will use this DN to authenticate you with the server"
-msgstr "Evolution은 이 DN으로 서버에 인증할 때 사용합니다"
-
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:22
+#, fuzzy
 msgid ""
-"Evolution will use this email address to authenticate you with the server"
+"Evolution will use this email address to authenticate you with the server."
 msgstr "Evolution은 이 메일 주소로 서버에 인증할 때 사용합니다"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:23
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "지원하는 찾기 기준"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:24
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
+#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "일반"
 
-#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
-#: mail/mail-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
+#: mail/mail-config.glade.h:102
 msgid "Never"
 msgstr "항상 사용 않음"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
-msgid "One"
-msgstr "한 단계"
-
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:35
-msgid "S_earch scope: "
-msgstr "찾기 범위(_E): "
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Search _base:"
+msgstr "찾기 기준(_S):"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
 msgid "Search base only"
 msgstr "찾기 기준(_S):"
 
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:29
 #, fuzzy
 msgid "Search base:"
 msgstr "찾기 기준(_S):"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Search scope:"
 msgstr "찾기 범위(_E): "
 
-#: addressbook/gui/component/ldap-config.glade.h:39
-msgid "Searching"
-msgstr "찾는 중"
-
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:31
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
-"server if\n"
-"your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL or TLS."
 msgstr ""
 "이 옵션을 선택하면 LDAP 서버가 SSL이나 TLS를 지원하는 경우에만 Evolution에서 "
 "연결합니다."
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a \n"
-"insecure environment. For example, if you and your LDAP server are behind a "
-"firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection "
-"is already\n"
-"secure."
+"you are in a insecure environment. For example, if you and your LDAP server "
+"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
+"because your connection is already secure."
 msgstr ""
 "이 옵션을 선택하면 안전하지 못한 환경에 있을 경우에만 Evolution에서 SSL/TLS"
 "를 사용합니다.\n"
@@ -573,69 +503,63 @@ msgstr ""
 "전하므로\n"
 "Evolution에서 SSL/TLS를 사용할 필요가 없습니다."
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:33
+#, fuzzy
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
-"TLS.  This \n"
-"means that your connection will be insecure, and that you will be vulnerable "
-"to security\n"
-"exploits. "
+"TLS.  This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits. "
 msgstr ""
 "이 옵션을 선택하면 서버에서 SSL이나 TLS를 지원하지 않는다는 의미입니다.\n"
 "연결이 안전하지 않을 수도 있고, 보안상의 침투에 취약할 수 있습니다."
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Sub"
-msgstr "아래"
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr "지원하는 찾기 기준"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
-"searches will \n"
-"begin. If you leave this blank, the search will begin at the root of the "
-"directory tree."
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
 msgstr ""
 "찾기 기준은 찾기를 시작할 엔트리의 고유 이름(distinguished name, DN)입니다.\n"
 "찾기 기준을 비워두면, 디렉토리 트리의 맨 위 폴더부터 찾기 시작합니다."
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:37
+#, fuzzy
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
-"the \n"
-"directory tree. A search scope of \"sub\" will include all entries below "
-"your search base.\n"
-"A search scope of \"one\" will only include the entries one level beneath "
-"your base.\n"
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
 msgstr ""
 "찾기 범위는 디렉토리 트리 아래로 얼마나 깊이 찾을 지 정의합니다.\n"
 "\"아래\"의 찾기 범위는 찾기 기준 아래의 모든 엔트리에 대해서 찾게 됩니다.\n"
 "찾기 범위가 \"한 단계\"이면 찾기 기준에서 한 단계 아래의 엔트리만 포함합니"
 "다.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:58
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "LDAP 서버의 완전한 이름입니다. 예를 들어 \"ldap.mycompany.com\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:39
+#, fuzzy
 msgid ""
-"This is the maximum number of entries to download. Setting this number to "
-"be \n"
+"This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr ""
 "내려 받을 항목의 최대 개수입니다. 이 숫자를 너무 크게 하면\n"
 "주소록의 속도가 느려집니다."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -644,139 +568,118 @@ msgstr ""
 "인증하는 방법입니다. \"전자메일 주소\"로 설정하면 반드시 LDAP 서버에 익명 접"
 "근이 가능해야 합니다."
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:41
+#, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
-"list.\n"
-"It is for display purposes only. "
+"list. It is for display purposes only. "
 msgstr ""
 "Evolution 폴더 목록에 나타날 이 서버의 이름입니다.\n"
 "표시하는 목적으로만 쓰입니다. "
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:42
+#, fuzzy
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. "
-"A \n"
-"list of standard ports has been provided. Ask your system administrator\n"
-"what port you should specify."
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
 msgstr ""
 "Evolution에서 연결할 LDAP 서버의 포트 번호입니다. 표준 포트 번호 목록이 제공"
 "됩니다. 어떤 포트를 지정해야 할 지는 시스템 관리자에게 물어보십시오."
 
-#: addressbook/gui/component/ldap-config.glade.h:67
-msgid "This option controls how long a search will be run."
-msgstr "찾기를 얼마나 오래동안 실행할 지 조정하는 옵션입니다."
-
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:43
 #, fuzzy
 msgid "Timeout:"
 msgstr "시간 형식:"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
-msgid "U_se SSL/TLS:"
-msgstr "SSL/TLS 사용(_S):"
-
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr "구별되는 이름 (Distinguished Name, DN) 사용해서"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr "전자메일 주소 사용해서"
 
-#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
-#: mail/mail-config.glade.h:154
+#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
+#: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr "가능하면 언제나"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:47
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "연락처(_C):"
 
-#: addressbook/gui/component/ldap-config.glade.h:74
-#: calendar/gui/dialogs/calendar-setup.glade.h:12
-msgid "_Display name:"
-msgstr "표시 이름(_D):"
-
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr "다운로드 제한(_D):"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
 msgid "_Email address:"
 msgstr "전자메일 주소:"
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:50
+#, fuzzy
+msgid "_Find Possible Search Bases"
+msgstr "지원하는 찾기 기준"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Log in method:"
 msgstr "로그인 방법(_L):"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "_Log in:"
+msgstr "로그인"
+
+#: addressbook/gui/component/ldap-config.glade.h:53
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
 msgid "_Name:"
 msgstr "이름(_N):"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
-msgid "_Port number:"
-msgstr "포트 번호(_P):"
-
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "_Port:"
 msgstr "우선순위(_P):"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
-msgid "_Search base:"
-msgstr "찾기 기준(_S):"
-
-#: addressbook/gui/component/ldap-config.glade.h:82
-msgid "_Server name:"
-msgstr "서버 이름(_S):"
+#: addressbook/gui/component/ldap-config.glade.h:55
+#, fuzzy
+msgid "_Search scope:"
+msgstr "찾기 범위(_E): "
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:56
 #, fuzzy
 msgid "_Server:"
 msgstr "서버(_E):"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
-msgid "_Timeout (minutes):"
-msgstr "제한 시간(분)(_T):"
+#: addressbook/gui/component/ldap-config.glade.h:57
+#, fuzzy
+msgid "_Timeout:"
+msgstr "시간 형식:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:58
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "보안 연결(SSL) 사용(_U):"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "카드"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
-msgid "connecting-tab"
-msgstr "연결-탭"
-
-#: addressbook/gui/component/ldap-config.glade.h:88
-msgid "general-tab"
-msgstr "일반-탭"
-
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:60
 #: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
-#: mail/mail-config.glade.h:182
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "분"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
-msgid "searching-tab"
-msgstr "찾기-탭"
-
-#: addressbook/gui/component/select-names/e-select-names.c:497
+#: addressbook/gui/component/select-names/e-select-names.c:503
 #: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid "Select Contacts from Address Book"
 msgstr "주소록에서 연락처를 선택하십시오"
 
-#: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
@@ -817,7 +720,7 @@ msgstr "이름 없는 연락처"
 # FIXME - 무슨 뜻?
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:222
+#: addressbook/gui/widgets/e-addressbook-view.c:224
 msgid "Source"
 msgstr "원본"
 
@@ -889,9 +792,9 @@ msgid "<b>Work</b>"
 msgstr "<b>기한:</b> "
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
-#: addressbook/gui/widgets/eab-contact-display.c:342
-#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/widgets/eab-contact-display.c:334
+#: addressbook/gui/widgets/eab-contact-display.c:353
 msgid "AIM"
 msgstr "AIM"
 
@@ -931,15 +834,15 @@ msgid "Company:"
 msgstr "명령:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:271
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
+#: addressbook/gui/contact-editor/e-contact-editor.c:266
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
 msgstr "연락처"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1527
+#: addressbook/gui/contact-editor/e-contact-editor.c:520
 msgid "Contact Editor"
 msgstr "연락처 편집기"
 
@@ -960,80 +863,78 @@ msgid "Full _Name..."
 msgstr "전체 이름(_N)..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:202
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-msgid "Home"
-msgstr "집"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #, fuzzy
 msgid "Home Page:"
 msgstr "홈페이지"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-msgid "Job title:"
-msgstr "직함:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/e-itip-control.c:936
-msgid "Location:"
-msgstr "위치:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN 메신저"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 #, fuzzy
 msgid "Mailing Address"
 msgstr "전자메일 주소"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 #, fuzzy
 msgid "Manager:"
 msgstr "관리자"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "Ni_ckname:"
 msgstr "별명(_C):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "Notes:"
 msgstr "메모:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
-#: addressbook/gui/contact-editor/e-contact-editor.c:203
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-msgid "Other"
-msgstr "기타"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#, fuzzy
+msgid "Office:"
+msgstr "사무실(_O):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "PO Box:"
 msgstr "사서함(_P):"
 
 # journal -> 일지, Microsoft Office XP 참고
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 #, fuzzy
 msgid "Personal Information"
 msgstr "일지 정보"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 #, fuzzy
 msgid "Profession:"
 msgstr "직업(_R):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#, fuzzy
+msgid "Spouse:"
+msgstr "배우자(_P):"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "State/Province:"
 msgstr "시/도(_S):"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#, fuzzy
+msgid "Title:"
+msgstr "제목(_T):"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+msgid "Video Chat:"
+msgstr ""
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:41
 #, fuzzy
 msgid "Wants to receive HTML mail"
@@ -1041,15 +942,15 @@ msgstr "HTML형식 메일 사용(_H)"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:42
 #, fuzzy
-msgid "Webcam:"
-msgstr "웹 페이지:"
+msgid "Web Log:"
+msgstr "웹 페이지(_W):"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
-#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
-#: mail/mail-config.glade.h:155
+#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
+#: mail/mail-config.glade.h:157
 msgid "Work"
 msgstr "업무"
 
@@ -1069,21 +970,12 @@ msgid "_File under:"
 msgstr "파일 이름:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 #, fuzzy
 msgid "_Where:"
 msgstr "서버(_E):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
-#, fuzzy
-msgid "item7"
-msgstr "제목"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
-#, fuzzy
-msgid "item8"
-msgstr "제목"
-
-#: addressbook/gui/contact-editor/eab-editor.c:316
+#: addressbook/gui/contact-editor/eab-editor.c:315
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -1091,7 +983,7 @@ msgstr ""
 "정말로 이 계정을\n"
 "지우시겠습니까?"
 
-#: addressbook/gui/contact-editor/eab-editor.c:319
+#: addressbook/gui/contact-editor/eab-editor.c:318
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -1100,16 +992,16 @@ msgstr ""
 "지우시겠습니까?"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:351
-#: addressbook/gui/widgets/eab-contact-display.c:372
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Address"
 msgstr "주소"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:292
+#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard.c:174
@@ -2087,87 +1979,109 @@ msgstr "잠비아"
 msgid "Zimbabwe"
 msgstr "짐바브웨"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/contact-editor/e-contact-editor.c:179
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:337
+#: addressbook/gui/widgets/eab-contact-display.c:356
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:347
-#: addressbook/gui/widgets/eab-contact-display.c:366
+#: addressbook/gui/contact-editor/e-contact-editor.c:180
+#: addressbook/gui/widgets/eab-contact-display.c:339
+#: addressbook/gui/widgets/eab-contact-display.c:358
 msgid "Yahoo"
 msgstr "야후"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: addressbook/gui/widgets/eab-contact-display.c:338
+#: addressbook/gui/widgets/eab-contact-display.c:357
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:344
-#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#: addressbook/gui/widgets/eab-contact-display.c:355
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/contact-editor/e-contact-editor.c:183
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+msgid "Home"
+msgstr "집"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+msgid "Other"
+msgstr "기타"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
 msgid "Source Book"
 msgstr "원본 주소록"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:264
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Target Book"
 msgstr "대상 주소록"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:278
+#: addressbook/gui/contact-editor/e-contact-editor.c:273
 msgid "Is New Contact"
 msgstr "새 연락처"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:285
+#: addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Writable Fields"
 msgstr "쓰기 가능한 필드"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:299
+#: addressbook/gui/contact-editor/e-contact-editor.c:294
 msgid "Changed"
 msgstr "바뀜"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
-msgid "Category editor not available."
-msgstr "분류 편집기를 사용할 수 없습니다."
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:2352
 msgid "This contact belongs to these categories:"
 msgstr "이 연락처는 다음 분류에 속합니다:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#: addressbook/gui/contact-editor/e-contact-editor.c:2429
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "다음 옵션 중에 하나를 선택하십시오"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#: addressbook/gui/contact-editor/e-contact-editor.c:2433
 #, fuzzy
 msgid "No image"
 msgstr "니제르"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#: addressbook/gui/contact-editor/e-contact-editor.c:2636
 #, fuzzy
 msgid ""
-"The following entries are invalid:\n"
+"The contact data is invalid:\n"
 "\n"
-msgstr "다음 거르게 규칙:\n"
+msgstr "되풀이되는 날짜가 잘못되었습니다"
 
-# 일어나지 않을 것 같은 오류 메세지
-#: addressbook/gui/contact-editor/e-contact-editor.c:2738
-#, c-format
-msgid "Could not find widget for a field: `%s'"
-msgstr "필드에 대한 위젯을 찾을 수 없습니다: `%s'"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#, fuzzy
+msgid "Invalid contact."
+msgstr "연락처 %d개"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+msgid ""
+"The contact cannot be saved to the selected address book. Do you want to "
+"discard changes?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2727
+#: addressbook/gui/contact-editor/e-contact-editor.c:2751
+msgid "_Discard"
+msgstr "버리기(_D)"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+msgid ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
+msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:62
 msgid "AOL Instant Messenger"
@@ -2200,7 +2114,7 @@ msgid "_Edit Full"
 msgstr "정식 이름 편집(_E)"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:166
 msgid "_Full Name:"
 msgstr "전체 이름(_F):"
 
@@ -2346,30 +2260,30 @@ msgstr "목록 이름(_N):"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "메일주소를 입력하거나 연락처를 아래의 목록으로 끌어 당기십시오(_T):"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "contact-list-editor"
 msgstr "연락처 목록 편집기"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:153
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:215
+#: addressbook/gui/widgets/e-addressbook-view.c:217
 #: addressbook/gui/widgets/e-minicard-view.c:460
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "북"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
 msgid "Is New List"
 msgstr "새 목록"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:215
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
 msgid "Contact List Editor"
 msgstr "연락처 목록 편집기"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:438
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
 msgid "Save List as VCard"
 msgstr "VCard로 목록 저장"
 
@@ -2416,118 +2330,118 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "고급 찾기"
 
-#: addressbook/gui/widgets/eab-contact-display.c:129
-#: addressbook/gui/widgets/eab-contact-display.c:192
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
 msgid "(map)"
 msgstr "(지도)"
 
-#: addressbook/gui/widgets/eab-contact-display.c:139
-#: addressbook/gui/widgets/eab-contact-display.c:205
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
 msgid "map"
 msgstr "지도"
 
 # List는 여기서 Mailing List를 말한다
-#: addressbook/gui/widgets/eab-contact-display.c:257
-#: addressbook/gui/widgets/eab-contact-display.c:533
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:525
 msgid "List Members"
 msgstr "리스트 구성원"
 
-#: addressbook/gui/widgets/eab-contact-display.c:329
-#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/eab-contact-display.c:321
+#: addressbook/gui/widgets/eab-contact-display.c:323
 msgid "E-mail"
 msgstr "전자메일"
 
-#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/eab-contact-display.c:332
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "조직"
 
-#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "Position"
 msgstr "직위"
 
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:354
 msgid "Groupwise"
 msgstr "Groupwise"
 
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:340
 msgid "Video Conferencing"
 msgstr "화상 회의"
 
-#: addressbook/gui/widgets/eab-contact-display.c:349
-#: addressbook/gui/widgets/eab-contact-display.c:370
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Phone"
 msgstr "전화"
 
-#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:342
 msgid "Fax"
 msgstr "팩스"
 
-#: addressbook/gui/widgets/eab-contact-display.c:354
+#: addressbook/gui/widgets/eab-contact-display.c:346
 msgid "work"
 msgstr "업무"
 
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:359
 msgid "WWW"
 msgstr "WWW"
 
-#: addressbook/gui/widgets/eab-contact-display.c:368
-#: addressbook/gui/widgets/eab-contact-display.c:587
+#: addressbook/gui/widgets/eab-contact-display.c:360
+#: addressbook/gui/widgets/eab-contact-display.c:579
 msgid "Blog"
 msgstr "블로그"
 
-#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/eab-contact-display.c:363
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "휴대 전화"
 
-#: addressbook/gui/widgets/eab-contact-display.c:375
+#: addressbook/gui/widgets/eab-contact-display.c:367
 msgid "personal"
 msgstr "개인"
 
-#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/eab-contact-display.c:374
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "메모"
 
-#: addressbook/gui/widgets/eab-contact-display.c:548
+#: addressbook/gui/widgets/eab-contact-display.c:540
 msgid "Job Title"
 msgstr "직함"
 
-#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/eab-contact-display.c:544
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:774
+#: smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "전자메일"
 
-#: addressbook/gui/widgets/eab-contact-display.c:579
+#: addressbook/gui/widgets/eab-contact-display.c:571
 msgid "Home page"
 msgstr "홈페이지"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 msgid "Success"
 msgstr "성공했습니다"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Backend busy"
 msgstr ""
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Repository offline"
 msgstr "저장고가 연결되지 않았습니다"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Address Book does not exist"
 msgstr "주소록이 없습니다"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 #, fuzzy
 msgid "No Self Contact defined"
 msgstr "새 연락처 목록"
@@ -2535,27 +2449,27 @@ msgstr "새 연락처 목록"
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Permission denied"
 msgstr "권한이 거부되었습니다"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Contact not found"
 msgstr "연락처를 찾을 수 없습니다"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Contact ID already exists"
 msgstr "연락처 ID가 이미 있습니다"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Protocol not supported"
 msgstr "프로토콜이 지원되지 않습니다"
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:60
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:233
 #: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
@@ -2568,39 +2482,39 @@ msgid "Cancelled"
 msgstr "취소됨"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:61
 #, fuzzy
 msgid "Could not cancel"
 msgstr "소스를 열 수 없습니다"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Authentication Failed"
 msgstr "인증이 실패했습니다"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Authentication Required"
 msgstr "인증이 필요합니다"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:66
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "TLS not Available"
 msgstr "TLS를 사용할 수 없습니다"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#: addressbook/gui/widgets/eab-gui-util.c:66
 #, fuzzy
 msgid "No such source"
 msgstr "그런 메세지 없음"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:69
+#: addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Other error"
 msgstr "다른 오류"
 
-#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:90
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
@@ -2608,7 +2522,7 @@ msgstr ""
 "이 주소록을 열 수 없습니다.  해당 경로가 있고 그 경로에 접근할 권한이 있는 "
 "지 확인하십시오."
 
-#: addressbook/gui/widgets/eab-gui-util.c:110
+#: addressbook/gui/widgets/eab-gui-util.c:97
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -2616,17 +2530,18 @@ msgstr ""
 "이 주소록을 열 수 없습니다.  잘못된 URI를 입력했거나, 해당 LDAP 서버에 연결"
 "할 수 없습니다."
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:102
+#, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution you must compile the program from the CVS "
-"sources after retrieving OpenLDAP from the link below."
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
 msgstr ""
 "이 Evolution 버전에는 LDAP 지원 기능을 컴파일하지 않았습니다.  LDAP를 사용하"
 "려면 아래의 바로가기에서 OpenLDAP를 받아 온 다음에 CVS 소스에서 프로그램을 컴"
 "파일해야 합니다."
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:109
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -2634,11 +2549,7 @@ msgstr ""
 "이 주소록을 열 수 없습니다.  잘못된 URI를 입력했거나, 해당 서버에 연결할 수 "
 "없습니다."
 
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "Unable to open addressbook"
-msgstr "주소록을 열 수 없습니다"
-
-#: addressbook/gui/widgets/eab-gui-util.c:162
+#: addressbook/gui/widgets/eab-gui-util.c:129
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2650,7 +2561,7 @@ msgstr ""
 "좀 더 구체적으로 찾거나 주소록의 디렉토리 서버 기본 설정에서 \n"
 "결과의 한계치를 지정해 주십시오."
 
-#: addressbook/gui/widgets/eab-gui-util.c:168
+#: addressbook/gui/widgets/eab-gui-util.c:135
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -2661,53 +2572,45 @@ msgstr ""
 "넘었습니다.  좀 더 구체적으로 찾거나 주소록의 디렉토리 서버 기본 설정에서\n"
 "결과의 한계치를 지정해 주십시오."
 
-#: addressbook/gui/widgets/eab-gui-util.c:174
+#: addressbook/gui/widgets/eab-gui-util.c:141
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "이 주소록의 벡엔드에서 이 질의를 파싱할 수 없습니다."
 
-#: addressbook/gui/widgets/eab-gui-util.c:177
+#: addressbook/gui/widgets/eab-gui-util.c:144
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "이 주소록의 벡엔드에서 이 질의를 수행하길 거부했습니다."
 
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:147
 msgid "This query did not complete successfully."
 msgstr "이 질의가 성공적으로 끝나지 않았습니다."
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
-msgid "Do you want to save changes?"
-msgstr "바뀐 부분을 저장하시겠습니까?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:208
-msgid "_Discard"
-msgstr "버리기(_D)"
-
-#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:169
 msgid "Error adding list"
 msgstr "목록을 더하는 중 오류가 발생했습니다"
 
-#: addressbook/gui/widgets/eab-gui-util.c:229
-#: addressbook/gui/widgets/eab-gui-util.c:652
+#: addressbook/gui/widgets/eab-gui-util.c:169
+#: addressbook/gui/widgets/eab-gui-util.c:580
 msgid "Error adding contact"
 msgstr "연락처를 더하는 중 오류가 발생했습니다"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying list"
 msgstr "목록을 고치는 중 오류가 발생했습니다"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying contact"
 msgstr "연락처를 고치는 중 오류가 발생했습니다"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:192
 msgid "Error removing list"
 msgstr "목록을 지우는 중 오류가 발생했습니다"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
-#: addressbook/gui/widgets/eab-gui-util.c:610
+#: addressbook/gui/widgets/eab-gui-util.c:192
+#: addressbook/gui/widgets/eab-gui-util.c:538
 msgid "Error removing contact"
 msgstr "연락처를 지우는 중 오류가 발생했습니다"
 
-#: addressbook/gui/widgets/eab-gui-util.c:334
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2716,7 +2619,7 @@ msgstr ""
 "연락처 %d개를 열면 %d개의 새 창을 열게 됩니다.\n"
 "정말로 이 연락처를 전부 여시겠습니까?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:360
+#: addressbook/gui/widgets/eab-gui-util.c:300
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2725,51 +2628,46 @@ msgstr ""
 "%s이(가) 이미 존재합니다\n"
 "이 파일을 덮어 쓰시겠습니까?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:364
+#: addressbook/gui/widgets/eab-gui-util.c:304
 msgid "Overwrite"
 msgstr "덮어 쓰기"
 
-#: addressbook/gui/widgets/eab-gui-util.c:400
-#, c-format
-msgid "Error saving %s: %s"
-msgstr "%s을(를) 저장하는 데 오류가 발생했습니다: %s"
-
 # 파일 이름
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:437
+#: addressbook/gui/widgets/eab-gui-util.c:365
 msgid "card.vcf"
 msgstr "카드.vcf"
 
 # 파일 이름
-#: addressbook/gui/widgets/eab-gui-util.c:571
+#: addressbook/gui/widgets/eab-gui-util.c:499
 msgid "list"
 msgstr "목록"
 
-#: addressbook/gui/widgets/eab-gui-util.c:706
+#: addressbook/gui/widgets/eab-gui-util.c:634
 msgid "Move contact to"
 msgstr "연락처 이동"
 
-#: addressbook/gui/widgets/eab-gui-util.c:708
+#: addressbook/gui/widgets/eab-gui-util.c:636
 msgid "Copy contact to"
 msgstr "연락처 복사"
 
-#: addressbook/gui/widgets/eab-gui-util.c:711
+#: addressbook/gui/widgets/eab-gui-util.c:639
 msgid "Move contacts to"
 msgstr "연락처 이동"
 
-#: addressbook/gui/widgets/eab-gui-util.c:713
+#: addressbook/gui/widgets/eab-gui-util.c:641
 msgid "Copy contacts to"
 msgstr "연락처 복사"
 
-#: addressbook/gui/widgets/eab-gui-util.c:716
+#: addressbook/gui/widgets/eab-gui-util.c:644
 msgid "Select target addressbook."
 msgstr "어디로 갈지 주소록을 선택하십시오."
 
-#: addressbook/gui/widgets/eab-gui-util.c:939
+#: addressbook/gui/widgets/eab-gui-util.c:867
 msgid "Multiple VCards"
 msgstr "여러 개 VCard"
 
-#: addressbook/gui/widgets/eab-gui-util.c:942
+#: addressbook/gui/widgets/eab-gui-util.c:870
 #, c-format
 msgid "VCard for %s"
 msgstr "%s에 대한 VCard"
@@ -2854,7 +2752,7 @@ msgstr[0] "연락처 %d개"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:229
+#: addressbook/gui/widgets/e-addressbook-view.c:231
 #: addressbook/gui/widgets/e-minicard-view.c:467
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
@@ -2872,142 +2770,131 @@ msgstr "모델"
 msgid "Error modifying card"
 msgstr "카드를 바꾸는 데 오류가 발생했습니다"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:163
 msgid "Name begins with"
 msgstr "이름 시작"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:164
 msgid "Email begins with"
 msgstr "전자메일 시작"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:57
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "분류"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-#: calendar/gui/cal-search-bar.c:50
+#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "필드에 포함"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+#: addressbook/gui/widgets/e-addressbook-view.c:172
 msgid "Advanced..."
 msgstr "고급..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:236
+#: addressbook/gui/widgets/e-addressbook-view.c:238
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:249
+#: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "형태"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:506
+#: addressbook/gui/widgets/e-addressbook-view.c:508
 msgid "Address Book"
 msgstr "주소록"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2076
+#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:2080
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
 msgstr "VCard로 저장"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 msgid "New Contact..."
 msgstr "새 연락처..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "New Contact List..."
 msgstr "새 연락처 목록..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Go to Folder..."
 msgstr "폴더로 가기..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Import..."
 msgstr "가져오기..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1066
 msgid "Search for Contacts..."
 msgstr "연락처 찾기..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 msgid "Address Book Sources..."
 msgstr "주소록 원본..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1069
 msgid "Pilot Settings..."
 msgstr "파일롯 설정..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "주소 전달"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
 msgid "Send Message to Contact"
 msgstr "연락처로 메세지 보내기"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "인쇄"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
+#: addressbook/gui/widgets/e-addressbook-view.c:1077
 msgid "Print Envelope"
 msgstr "봉투 인쇄"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
+#: addressbook/gui/widgets/e-addressbook-view.c:1081
 msgid "Copy to Address Book..."
 msgstr "주소록으로 복사..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1080
+#: addressbook/gui/widgets/e-addressbook-view.c:1082
 msgid "Move to Address Book..."
 msgstr "주소록으로 옮기기..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "잘라내기"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "복사"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1087
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "붙여 넣기"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:1092
+#: calendar/gui/e-calendar-view.c:1280
 msgid "Current View"
 msgstr "현재 보기"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1309
-#, c-format
-msgid ""
-"The addressbook backend for\n"
-"%s\n"
-"has crashed. You will have to restart Evolution in order to use it again"
-msgstr ""
-"다음에 대한 주소록 벡엔드가 비정상적으로 죽었습니다:\n"
-"%s\n"
-"다시 사용하려면 Evolution을 다시 시작해야 합니다."
-
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1667
-#: calendar/gui/cal-search-bar.c:362
+#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "모든 분류"
 
@@ -3114,7 +3001,7 @@ msgstr "무선"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-list-view.c:234
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "역할"
@@ -3261,12 +3148,12 @@ msgstr "Evolution VCard 가져오기"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "vcard (.vcf, .gcrd)"
 
-#: addressbook/printing/e-contact-print.c:998
+#: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr "연락처 인쇄"
 
-#: addressbook/printing/e-contact-print.c:1064
-#: addressbook/printing/e-contact-print.c:1091
+#: addressbook/printing/e-contact-print.c:1066
+#: addressbook/printing/e-contact-print.c:1093
 msgid "Print contact"
 msgstr "연락처 인쇄"
 
@@ -3516,15 +3403,21 @@ msgstr "일반 모드에서는, 크기 옵션이 필요 없습니다."
 msgid "Impossible internal error."
 msgstr "일어날 수 없는 내부 오류."
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:629
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
 msgid "Can not open file"
 msgstr "파일을 열 수 없습니다"
 
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-msgid "Can not load URI"
-msgstr "URI를 읽어들일 수 없습니다"
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "주소록을 읽어들일 수 없습니다"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "주소록을 열 수 없습니다"
 
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
@@ -3542,7 +3435,7 @@ msgstr "파일이름이 주어지지 않았습니다."
 msgid "Unnamed List"
 msgstr "이름 없는 목록"
 
-#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "열쇠글을 입력하십시오"
@@ -3831,10 +3724,10 @@ msgid "Whether to show week numbers in date navigator"
 msgstr "날짜 선택할 때 몇 번째 주인지 표시할 지 여부"
 
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:88
-#: calendar/gui/gnome-cal.c:1703
-#: camel/providers/groupwise/camel-gw-listener.c:304
-#: camel/providers/groupwise/camel-gw-listener.c:327
+#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/gnome-cal.c:1705
+#: camel/providers/groupwise/camel-gw-listener.c:311
+#: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
 msgstr "달력"
 
@@ -3857,7 +3750,7 @@ msgstr "다음보다 오래된 행사 지우기:"
 # FIXME - hard to translate UI + string based on English grammar
 #: calendar/gui/calendar-commands.c:363
 #: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:19 filter/filter.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
 msgid "days"
 msgstr "일"
 
@@ -4004,23 +3897,23 @@ msgstr "주별 보기"
 msgid "Month View"
 msgstr "월별 보기"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "요약에 포함"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "설명에 포함"
 
-#: calendar/gui/cal-search-bar.c:54
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "주석에 포함"
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:53
 msgid "Location contains"
 msgstr "위치에 포함"
 
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
 msgid "Unmatched"
 msgstr "맞지 않음"
 
@@ -4042,27 +3935,27 @@ msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
 # Alarm -> 알림, Microsoft Office XP 참고
-#: calendar/gui/dialogs/alarm-options.c:466
+#: calendar/gui/dialogs/alarm-options.c:467
 msgid "Audio Alarm Options"
 msgstr "오디오 알림 옵션"
 
 # Alarm -> 알림, Microsoft Office XP 참고
-#: calendar/gui/dialogs/alarm-options.c:475
+#: calendar/gui/dialogs/alarm-options.c:476
 msgid "Message Alarm Options"
 msgstr "메세지 알림 옵션"
 
 # Alarm -> 알림, Microsoft Office XP 참고
-#: calendar/gui/dialogs/alarm-options.c:484
+#: calendar/gui/dialogs/alarm-options.c:485
 msgid "Email Alarm Options"
 msgstr "전자메일 알림 옵션"
 
 # Alarm -> 알림, Microsoft Office XP 참고
-#: calendar/gui/dialogs/alarm-options.c:493
+#: calendar/gui/dialogs/alarm-options.c:494
 msgid "Program Alarm Options"
 msgstr "프로그램 알림 옵션"
 
 # Alarm -> 알림, Microsoft Office XP 참고
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:510
 msgid "Unknown Alarm Options"
 msgstr "알 수 없는 알림 옵션"
 
@@ -4099,7 +3992,7 @@ msgstr "보낼 사람:"
 msgid "With these arguments:"
 msgstr "인자:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
 msgid "dialog1"
 msgstr "dialog1"
 
@@ -4108,7 +4001,7 @@ msgid "extra times every"
 msgstr "번, 주기:"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:20 filter/filter.glade.h:16
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr "시간"
 
@@ -4155,7 +4048,7 @@ msgstr "전자메일 보내기"
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "요약:"
 
@@ -4185,7 +4078,6 @@ msgid "hour(s)"
 msgstr "시간"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:21
 msgid "minute(s)"
 msgstr "분"
 
@@ -4193,26 +4085,26 @@ msgstr "분"
 msgid "start of appointment"
 msgstr "약속의 시작"
 
-#: calendar/gui/dialogs/calendar-setup.c:170
+#: calendar/gui/dialogs/calendar-setup.c:172
 msgid "You must specify a location to get the calendar from."
 msgstr "달력을 가져올 위치를 지정해야 합니다."
 
-#: calendar/gui/dialogs/calendar-setup.c:178
+#: calendar/gui/dialogs/calendar-setup.c:180
 #, c-format
 msgid "The source location '%s' is not well-formed."
 msgstr "원본 위치 '%s'이(가) 잘 구성된 형식이 아닙니다."
 
-#: calendar/gui/dialogs/calendar-setup.c:193
+#: calendar/gui/dialogs/calendar-setup.c:195
 #, c-format
 msgid "The source location '%s' is not a webcal source."
 msgstr "원본 위치 '%s'이(가) webcal 원본이 아닙니다."
 
-#: calendar/gui/dialogs/calendar-setup.c:265
+#: calendar/gui/dialogs/calendar-setup.c:275
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr "이름이 '%s'인 원본이 이미 선택한 그룹에 있습니다"
 
-#: calendar/gui/dialogs/calendar-setup.c:278
+#: calendar/gui/dialogs/calendar-setup.c:288
 #, c-format
 msgid ""
 "The group '%s' is remote. You must specify a location to get the calendar "
@@ -4232,56 +4124,36 @@ msgstr "작업 목록 그룹"
 msgid "C_olor:"
 msgstr "색(_O):"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "Calendar Properties"
-msgstr "달력 등록 정보"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
 msgid "Pick a color"
 msgstr "색을 고르십시오"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:8
-msgid "Remote"
-msgstr "원격"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "Task List Properties"
-msgstr "작업 목록 등록 정보"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
 #, fuzzy
 msgid "_Add Calendar"
 msgstr "새 달력 더하기"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
 #, fuzzy
 msgid "_Add Group"
 msgstr "그룹"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-msgid "_Refresh Interval:"
-msgstr "다시 읽기 간격(_R):"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
 #, fuzzy
 msgid "_Refresh:"
 msgstr "새로 고침"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-msgid "_Source URL:"
-msgstr "원본 URI(_S):"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
 #, fuzzy
 msgid "_Type:"
 msgstr "형태:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
 #, fuzzy
 msgid "_URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
 msgid "weeks"
 msgstr "주"
 
@@ -4389,7 +4261,7 @@ msgid "Display"
 msgstr "표시(_D)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:76
 msgid "E_nable"
 msgstr "사용(_N)"
 
@@ -4401,7 +4273,7 @@ msgstr "약속 있음/없음 게시(_F)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:563
+#: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "금요일"
 
@@ -4415,7 +4287,7 @@ msgstr "분"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:559
+#: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "월요일"
 
@@ -4425,7 +4297,7 @@ msgstr "일(_U)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:564
+#: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "토요일"
 
@@ -4441,7 +4313,7 @@ msgstr "날짜 선택할 때 몇 번째 주인지 표시(_N)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "일요일"
 
@@ -4455,7 +4327,7 @@ msgstr "목(_H)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:562
+#: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "목요일"
 
@@ -4469,7 +4341,7 @@ msgstr "시간 형식:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:560
+#: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "화요일"
 
@@ -4479,7 +4351,7 @@ msgstr "시작 요일(_E):"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:561
+#: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "수요일"
 
@@ -4512,7 +4384,7 @@ msgid "_Day begins:"
 msgstr "하루의 시작(_D):"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
-#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:43
@@ -4564,85 +4436,53 @@ msgid "before every appointment"
 msgstr "전에 미리 알려주기"
 
 # event -> 행사, Microsoft Office XP 참고
-#: calendar/gui/dialogs/cancel-comp.c:57
-msgid ""
-"The event being deleted is a meeting, would you like to send a cancellation "
-"notice?"
-msgstr "지금 지우는 행사는 회의입니다. 취소를 공지하시겠습니까?"
-
-#: calendar/gui/dialogs/cancel-comp.c:60
-msgid "Are you sure you want to cancel and delete this meeting?"
-msgstr "정말로 이 회의를 취소하고 지우시겠습니까?"
-
-#: calendar/gui/dialogs/cancel-comp.c:66
-msgid ""
-"The task being deleted is assigned, would you like to send a cancellation "
-"notice?"
-msgstr "지금 지우는 작업은 할당되어 있습니다. 취소를 공지하시겠습니까?"
-
-#: calendar/gui/dialogs/cancel-comp.c:69
-msgid "Are you sure you want to cancel and delete this task?"
-msgstr "정말로 이 일지를 취소하고 지우시겠습니까?"
-
-# journal -> 일지, Microsoft Office XP 참고
-#: calendar/gui/dialogs/cancel-comp.c:75
-msgid ""
-"The journal entry being deleted is published, would you like to send a "
-"cancellation notice?"
-msgstr "지금 지우는 일지 항목은 게시되었습니다. 취소를 공지하시겠습니까?"
-
-#: calendar/gui/dialogs/cancel-comp.c:78
-msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr "정말로 이 일지 항목을 취소하고 지우시겠습니까?"
-
-# event -> 행사, Microsoft Office XP 참고
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "이 행사는 지워졌습니다."
 
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "이 작업은 지워졌습니다."
 
 # journal -> 일지, Microsoft Office XP 참고
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:68
 msgid "This journal entry has been deleted."
 msgstr "이 일지 항목은 지워졌습니다."
 
-#: calendar/gui/dialogs/changed-comp.c:75
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  바뀐 사항이 있습니다. 이 바뀐 사항을 버리고 편집기를 닫으시겠습니까?"
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  바뀐 사항이 있습니다. 편집기를 닫으시겠습니까?"
 
 # event -> 행사, Microsoft Office XP 참고
-#: calendar/gui/dialogs/changed-comp.c:82
+#: calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "이 행사는 바뀌었습니다."
 
 # event -> 행사, Microsoft Office XP 참고
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "이 작업은 바뀌었습니다."
 
 # journal -> 일지, Microsoft Office XP 참고
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:92
 msgid "This journal entry has been changed."
 msgstr "이 일지 항목은 바뀌었습니다."
 
-#: calendar/gui/dialogs/changed-comp.c:99
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  바뀐 사항이 있습니다. 이 바뀐 사항을 버리고 편집기를 업데이트하시겠습니"
 "까?"
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  바뀐 사항이 없습니다. 편집기를 업데이트하시겠습니까?"
@@ -4681,7 +4521,7 @@ msgid "No summary"
 msgstr "요약 없음"
 
 #: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
 #: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "다른 이름으로 저장..."
@@ -4738,106 +4578,58 @@ msgstr "받을 곳을 열 수 없습니다"
 msgid "Destination is read only"
 msgstr "받을 곳이 읽기 전용입니다"
 
-#: calendar/gui/dialogs/delete-comp.c:95
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "정말로 약속 `%s'을(를) 지우시겠습니까?"
-
-#: calendar/gui/dialogs/delete-comp.c:98
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "정말로 이 제목없는 약속을 지우시겠습니까?"
-
-#: calendar/gui/dialogs/delete-comp.c:104
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "정말로 작업 `%s'을(를) 지우시겠습니까?"
-
-#: calendar/gui/dialogs/delete-comp.c:107
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "정말로 이 제목없는 작업을 지우시겠습니까?"
-
-# journal -> 일지, Microsoft Office XP 참고
-#: calendar/gui/dialogs/delete-comp.c:113
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "정말로 일지 항목 `%s'을(를) 지우시겠습니까?"
-
-# journal -> 일지, Microsoft Office XP 참고
-#: calendar/gui/dialogs/delete-comp.c:116
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "정말로 이 제목없는 일지 항목 지우시겠습니까?"
-
-#: calendar/gui/dialogs/delete-comp.c:131
-#, c-format
-msgid "Are you sure you want to delete %d appointment?"
-msgid_plural "Are you sure you want to delete %d appointments?"
-msgstr[0] "정말 약속 %d개를 지우시겠습니까?"
-
-#: calendar/gui/dialogs/delete-comp.c:138
-#, c-format
-msgid "Are you sure you want to delete %d task?"
-msgid_plural "Are you sure you want to delete %d tasks?"
-msgstr[0] "정말 작업 %d개를 지우시겠습니까?"
-
-# journal -> 일지, Microsoft Office XP 참고
-#: calendar/gui/dialogs/delete-comp.c:145
-#, c-format
-msgid "Are you sure you want to delete %d journal entry?"
-msgid_plural "Are you sure you want to delete %d journal entries?"
-msgstr[0] "정말 일지 항목 %d개를 지우시겠습니까?"
-
 # event -> 행사, Microsoft Office XP 참고
-#: calendar/gui/dialogs/delete-error.c:52
+#: calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "CORBA 오류때문에 이 행사를 지울 수 없습니다"
 
 # event -> 행사, Microsoft Office XP 참고
-#: calendar/gui/dialogs/delete-error.c:55
+#: calendar/gui/dialogs/delete-error.c:57
 msgid "The task could not be deleted due to a corba error"
 msgstr "CORBA 오류때문에 이 작업을 지울 수 없습니다"
 
 # journal -> 일지, Microsoft Office XP 참고
-#: calendar/gui/dialogs/delete-error.c:58
+#: calendar/gui/dialogs/delete-error.c:60
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr "CORBA 오류때문에 이 일지 항목을 지울 수 없습니다"
 
-#: calendar/gui/dialogs/delete-error.c:61
+#: calendar/gui/dialogs/delete-error.c:63
 msgid "The item could not be deleted due to a corba error"
 msgstr "CORBA 오류때문에 이 항목을 지울 수 없습니다"
 
 # event -> 행사, Microsoft Office XP 참고
-#: calendar/gui/dialogs/delete-error.c:68
+#: calendar/gui/dialogs/delete-error.c:70
 msgid "The event could not be deleted because permission was denied"
 msgstr "권한이 거부되어 이 행사를 지울 수 없습니다"
 
-#: calendar/gui/dialogs/delete-error.c:71
+#: calendar/gui/dialogs/delete-error.c:73
 msgid "The task could not be deleted because permission was denied"
 msgstr "권한이 거부되어 이 작업을 지울 수 없습니다"
 
 # journal -> 일지, Microsoft Office XP 참고
-#: calendar/gui/dialogs/delete-error.c:74
+#: calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr "권한이 거부되어 이 일지 항목을 지울 수 없습니다"
 
-#: calendar/gui/dialogs/delete-error.c:77
+#: calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
 msgstr "권한이 거부되어 이 항목을 지울 수 없습니다"
 
 # event -> 행사, Microsoft Office XP 참고
-#: calendar/gui/dialogs/delete-error.c:84
+#: calendar/gui/dialogs/delete-error.c:86
 msgid "The event could not be deleted due to an error"
 msgstr "오류때문에 이 행사를 지울 수 없습니다"
 
-#: calendar/gui/dialogs/delete-error.c:87
+#: calendar/gui/dialogs/delete-error.c:89
 msgid "The task could not be deleted due to an error"
 msgstr "오류때문에 이 작업을 지울 수 없습니다"
 
 # journal -> 일지, Microsoft Office XP 참고
-#: calendar/gui/dialogs/delete-error.c:90
+#: calendar/gui/dialogs/delete-error.c:92
 msgid "The journal entry could not be deleted due to an error"
 msgstr "오류때문에 이 일지 항목을 지울 수 없습니다"
 
-#: calendar/gui/dialogs/delete-error.c:93
+#: calendar/gui/dialogs/delete-error.c:95
 msgid "The item could not be deleted due to an error"
 msgstr "오류때문에 이 항목을 지울 수 없습니다"
 
@@ -4971,11 +4763,11 @@ msgstr "시작 시각(_S):"
 
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:3
+#: calendar/gui/dialogs/meeting-page.glade.h:4
 #: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
 #: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1559
-#: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:100
+#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
+#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
@@ -5001,8 +4793,8 @@ msgstr "대리인(_D)..."
 #. FIXME: need to disable for undeletable folders
 #: calendar/gui/dialogs/meeting-page.c:655
 #: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1310 calendar/gui/e-calendar-view.c:1342
-#: mail/em-folder-tree.c:2557 mail/em-folder-view.c:919
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
+#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -5010,7 +4802,7 @@ msgid "_Delete"
 msgstr "지우기(_D)"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:240
+#: calendar/gui/e-meeting-list-view.c:218
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "참석자"
@@ -5046,16 +4838,15 @@ msgid "Member"
 msgstr "구성원"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "초대장"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
-#: mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-list-view.c:248
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "상태"
 
@@ -5063,20 +4854,20 @@ msgstr "상태"
 msgid "Add A_ttendee"
 msgstr "참석자 더하기(_T)"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "Add attendees from addressbook."
+msgstr "보낸 사람을 주소록에 더하기"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "주최자:"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
+#: calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "_Change Organizer"
 msgstr "주최자 바꾸기(_C):"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-#: calendar/gui/e-meeting-time-sel.c:417
-msgid "_Invite Others..."
-msgstr "다른 이들을 초대(_I)..."
-
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
 msgstr "<b>달력 옵션</b>"
@@ -5229,7 +5020,7 @@ msgid "_No recurrence"
 msgstr "반복 없음(_N)"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:450
+#: composer/e-msg-composer-attachment-bar.c:453
 msgid "_Remove"
 msgstr "지우기(_R)"
 
@@ -5261,56 +5052,20 @@ msgstr "주"
 msgid "year(s)"
 msgstr "년"
 
-# event -> 행사, Microsoft Office XP 참고
-#: calendar/gui/dialogs/save-comp.c:53
-msgid ""
-"This event has been changed, but has not been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"이 행사를 바꾸었지만 저장하지 않았습니다.\n"
-"\n"
-"바뀐 내용을 저장하시겠습니까?"
-
-#: calendar/gui/dialogs/save-comp.c:57
-msgid "_Discard Changes"
-msgstr "바뀐 내용 버리기(_D)"
-
-# event -> 행사, Microsoft Office XP 참고
-#: calendar/gui/dialogs/save-comp.c:62
-msgid "Save Event"
-msgstr "행사 저장"
-
-#: calendar/gui/dialogs/select-source-dialog.c:65
+#: calendar/gui/dialogs/select-source-dialog.c:69
 #, fuzzy
 msgid "Select destination"
 msgstr "받을 %s을 선택하십시오"
 
-#: calendar/gui/dialogs/select-source-dialog.c:86
+#: calendar/gui/dialogs/select-source-dialog.c:90
 #, fuzzy
 msgid "_Destination"
 msgstr "대상 폴더:"
 
-#: calendar/gui/dialogs/select-source-dialog.c:88
+#: calendar/gui/dialogs/select-source-dialog.c:92
 msgid "Task List"
 msgstr "작업 목록"
 
-#: calendar/gui/dialogs/send-comp.c:57
-msgid "The meeting information has been created. Send it?"
-msgstr "회의 정보를 만들었습니다. 보내시겠습니까?"
-
-#: calendar/gui/dialogs/send-comp.c:60
-msgid "The meeting information has changed. Send an updated version?"
-msgstr "회의 정보가 바뀌었습니다. 업데이트된 버전을 보내시겠습니까?"
-
-#: calendar/gui/dialogs/send-comp.c:67
-msgid "The task assignment information has been created. Send it?"
-msgstr "작업 할당을 만들었습니다. 보내시겠습니까?"
-
-#: calendar/gui/dialogs/send-comp.c:71
-msgid "The task information has changed. Send an updated version?"
-msgstr "작업 정보가 바뀌었습니다. 업데이트된 버전을 보내시겠습니까?"
-
 #: calendar/gui/dialogs/task-details-page.c:406
 msgid "Completed date is wrong"
 msgstr "완료 날짜가 잘못되었습니다"
@@ -5330,7 +5085,7 @@ msgstr "완료됨"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #: calendar/gui/e-cal-component-preview.c:249
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:960
 msgid "High"
 msgstr "높음"
 
@@ -5344,14 +5099,14 @@ msgstr "진행중"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:253
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:958
 msgid "Low"
 msgstr "낮음"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:251
 #: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:957
+#: mail/message-list.c:959
 msgid "Normal"
 msgstr "보통"
 
@@ -5409,8 +5164,8 @@ msgstr "비밀(_F)"
 
 #: calendar/gui/dialogs/task-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
+#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "설명:"
 
@@ -5571,7 +5326,7 @@ msgstr "마감 날짜:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:950
+#: calendar/gui/e-itip-control.c:943
 msgid "Status:"
 msgstr "상태:"
 
@@ -5656,12 +5411,12 @@ msgstr "약속 있음"
 msgid "Deleting selected objects"
 msgstr "선택한 오브젝트를 지우는 중입니다"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
 msgid "Updating objects"
 msgstr "오브젝트를 업데이트하는 중입니다"
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1370
+#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
 #: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "열기(_O)"
@@ -5671,15 +5426,15 @@ msgid "Open _Web Page"
 msgstr "웹 페이지 열기(_W)"
 
 #: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1291 calendar/gui/e-calendar-view.c:1376
-#: mail/em-folder-view.c:896 mail/em-popup.c:690 mail/em-popup.c:806
+#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
+#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "다른 이름으로 저장(_S)..."
 
 #: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1292
-#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
+#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
@@ -5687,24 +5442,24 @@ msgid "_Print..."
 msgstr "인쇄(_P)..."
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "잘라내기(_U)"
 
 #: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1338
-#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2550
-#: mail/message-list.c:1644 ui/evolution-addressbook.xml.h:31
+#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
+#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
+#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "복사(_C)"
 
 #: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1273 calendar/gui/e-calendar-view.c:1299
-#: calendar/gui/e-calendar-view.c:1372 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
+#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
@@ -5770,72 +5525,72 @@ msgstr "요약"
 msgid "Task sort"
 msgstr "작업 정렬"
 
-#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
 msgid "New _Appointment..."
 msgstr "새 약속(_A)..."
 
 # event -> 행사, Microsoft Office XP 참고
-#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
+#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
 msgid "New All Day _Event"
 msgstr "새 하루 종일 행사(_E)"
 
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
+#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
 msgid "New Meeting"
 msgstr "새 모임"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
 msgid "New Task"
 msgstr "새 작업"
 
-#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "글타래 선택(_T)"
 
-#: calendar/gui/e-calendar-view.c:1280
+#: calendar/gui/e-calendar-view.c:1283
 msgid "_Select Date..."
 msgstr "날짜 선택(_S)..."
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "약속 있음/없음 정보 게시(_P)"
 
-#: calendar/gui/e-calendar-view.c:1303
+#: calendar/gui/e-calendar-view.c:1306
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "폴더로 복사..."
 
-#: calendar/gui/e-calendar-view.c:1304
+#: calendar/gui/e-calendar-view.c:1307
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "폴더로 옮기기(_V)..."
 
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1308
 msgid "_Schedule Meeting..."
 msgstr "모임 일정(_S)..."
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1309
 msgid "_Forward as iCalendar..."
 msgstr "iCalendar로 전달(_F)..."
 
-#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
 msgid "Delete this _Occurrence"
 msgstr "이 경우를 지웁니다(_O)"
 
-#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
 msgid "Delete _All Occurrences"
 msgstr "모든 경우를 지웁니다(_A)"
 
-#: calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1349
 msgid "Go to _Today"
 msgstr "오늘로 이동(_T)"
 
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1351
 msgid "_Go to Date..."
 msgstr "날짜로 이동(_G)..."
 
-#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "설정(_S)..."
 
@@ -5850,9 +5605,9 @@ msgstr "시작 날짜"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:967 calendar/gui/e-itip-control.c:1169
-#: calendar/gui/e-meeting-list-view.c:144
-#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
 #: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
 #: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
 #: camel/camel-tcp-stream-openssl.c:631
@@ -5878,13 +5633,13 @@ msgid "Assigned"
 msgstr "예약됨"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr "예"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "아니오"
 
@@ -5896,7 +5651,7 @@ msgstr "북"
 msgid "S"
 msgstr "남"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
 msgid "E"
 msgstr "동"
 
@@ -5968,103 +5723,103 @@ msgstr "%m %d"
 msgid "%02i minute divisions"
 msgstr "%02i분 단위"
 
-#: calendar/gui/e-itip-control.c:592
+#: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
 msgstr "예. (복잡한 반복)"
 
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:596
 #, fuzzy, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "매일"
 
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:601
 #, fuzzy, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "매주"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:603
 #, fuzzy, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "매주 "
 
 # FIXME - hard to translate UI + string based on English grammar
-#: calendar/gui/e-itip-control.c:618
+#: calendar/gui/e-itip-control.c:611
 msgid " and "
 msgstr " 그리고 "
 
 # FIXME - hard to translate UI + string based on English grammar
 # "The <monthday> day of " (like The 28th day of June)
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:618
 #, c-format
 msgid "The %s day of "
 msgstr "%s "
 
 # FIXME - hard to translate UI + string based on English grammar
 # "The <dayofmonth> <dayofweek> of" (like The 13th Friday)
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:631
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s, "
 
-#: calendar/gui/e-itip-control.c:645
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "매달"
 
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:642
 #, fuzzy, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "매년"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:653
 #, fuzzy, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] " 전체 %d번"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: calendar/gui/e-itip-control.c:669
+#: calendar/gui/e-itip-control.c:662
 msgid ", ending on "
 msgstr ", 끝: "
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:686
 msgid "<b>Starts:</b> "
 msgstr "<b>시작:</b> "
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:696
 msgid "<b>Ends:</b> "
 msgstr "<b>끝:</b> "
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:716
 msgid "<b>Completed:</b> "
 msgstr "<b>완료됨:</b> "
 
-#: calendar/gui/e-itip-control.c:733
+#: calendar/gui/e-itip-control.c:726
 msgid "<b>Due:</b> "
 msgstr "<b>기한:</b> "
 
-#: calendar/gui/e-itip-control.c:771 calendar/gui/e-itip-control.c:827
+#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
 msgid "iCalendar Information"
 msgstr "iCalendar 정보"
 
 #. Title
-#: calendar/gui/e-itip-control.c:788
+#: calendar/gui/e-itip-control.c:781
 msgid "iCalendar Error"
 msgstr "iCalendar 오류"
 
-#: calendar/gui/e-itip-control.c:859 calendar/gui/e-itip-control.c:875
-#: calendar/gui/e-itip-control.c:886 calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
 msgid "An unknown person"
 msgstr "모르는 사람"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:910
+#: calendar/gui/e-itip-control.c:903
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -6072,309 +5827,313 @@ msgstr ""
 "<br> 다음 정보를 다시 확인하시고, 아래의 메뉴에서 어떤 동작을 할 지 선택하십"
 "시오."
 
-#: calendar/gui/e-itip-control.c:925
+#: calendar/gui/e-itip-control.c:918
 msgid "<i>None</i>"
 msgstr "<i>없음</i>"
 
-#: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:929
+msgid "Location:"
+msgstr "위치:"
+
+#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "수락"
 
-#: calendar/gui/e-itip-control.c:959 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "잠정적으로 수락"
 
-#: calendar/gui/e-itip-control.c:963 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "거부"
 
-#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.c:1050
-#: calendar/gui/e-itip-control.c:1076 calendar/gui/e-itip-control.c:1089
-#: calendar/gui/e-itip-control.c:1102 calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
 msgid "Choose an action:"
 msgstr "동작을 고르십시오:"
 
-#: calendar/gui/e-itip-control.c:1023
+#: calendar/gui/e-itip-control.c:1016
 msgid "Update"
 msgstr "업데이트"
 
-#: calendar/gui/e-itip-control.c:1024 calendar/gui/e-itip-control.c:1055
-#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1091
-#: calendar/gui/e-itip-control.c:1104 calendar/gui/e-itip-control.c:1117
-#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
+#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "확인"
 
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1044
 msgid "Accept"
 msgstr "수락"
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1045
 msgid "Tentatively accept"
 msgstr "잠정적으로 수락"
 
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1046
 msgid "Decline"
 msgstr "거부"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1070
 msgid "Send Free/Busy Information"
 msgstr "약속 있음/없음 정보 보내기"
 
-#: calendar/gui/e-itip-control.c:1090
+#: calendar/gui/e-itip-control.c:1083
 msgid "Update respondent status"
 msgstr "업데이트 응답 상태"
 
-#: calendar/gui/e-itip-control.c:1103
+#: calendar/gui/e-itip-control.c:1096
 msgid "Send Latest Information"
 msgstr "가장 최근 정보 보내기"
 
-#: calendar/gui/e-itip-control.c:1116 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "취소"
 
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1185
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b>님이 회의 정보를 게시했습니다."
 
-#: calendar/gui/e-itip-control.c:1193
+#: calendar/gui/e-itip-control.c:1186
 msgid "Meeting Information"
 msgstr "모임 정보"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1191
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b>님이 회의에 %s님의 참석을 요청했습니다."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1193
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b>님이 회의에 참석하시기를 요청했습니다."
 
-#: calendar/gui/e-itip-control.c:1201
+#: calendar/gui/e-itip-control.c:1194
 msgid "Meeting Proposal"
 msgstr "모임 제안"
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b>님이 기존 회의에 참석하고 싶어합니다."
 
-#: calendar/gui/e-itip-control.c:1206
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Update"
 msgstr "모임 업데이트"
 
-#: calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1203
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b>님이 가장 최근의 회의 정보를 받고 싶어합니다."
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1204
 msgid "Meeting Update Request"
 msgstr "모임 업데이트 요청"
 
-#: calendar/gui/e-itip-control.c:1218
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b>님이 회의 요청에 회신했습니다."
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Reply"
 msgstr "모임 회신"
 
-#: calendar/gui/e-itip-control.c:1226
+#: calendar/gui/e-itip-control.c:1219
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b>님이 회의를 취소했습니다."
 
-#: calendar/gui/e-itip-control.c:1227
+#: calendar/gui/e-itip-control.c:1220
 msgid "Meeting Cancellation"
 msgstr "모임 취소"
 
-#: calendar/gui/e-itip-control.c:1234 calendar/gui/e-itip-control.c:1302
-#: calendar/gui/e-itip-control.c:1337
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1330
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b>님이 이해하기 어려운 메세지를 보냈습니다."
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1228
 msgid "Bad Meeting Message"
 msgstr "잘못된 회의 메세지"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1253
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b>님이 작업 정보를 게시했습니다."
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1254
 msgid "Task Information"
 msgstr "작업 정보"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1259
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b>님이 %s님에게 작업을 수행하길 요청하셨습니다."
 
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b>님이 작업을 수행하길 요청하셨습니다."
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1262
 msgid "Task Proposal"
 msgstr "작업 제안"
 
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b>님이 기존 작업에 참여하고 싶어합니다."
 
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Update"
 msgstr "작업 업데이트"
 
-#: calendar/gui/e-itip-control.c:1278
+#: calendar/gui/e-itip-control.c:1271
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b>님이 가장 최근의 작업 정보를 받고 싶어합니다."
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1272
 msgid "Task Update Request"
 msgstr "작업 업데이트 요청"
 
-#: calendar/gui/e-itip-control.c:1286
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b>님이 작업 할당에 회신했습니다."
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Reply"
 msgstr "작업 회신"
 
-#: calendar/gui/e-itip-control.c:1294
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b>님이 작업을 취소했습니다."
 
-#: calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1288
 msgid "Task Cancellation"
 msgstr "작업 취소"
 
-#: calendar/gui/e-itip-control.c:1303
+#: calendar/gui/e-itip-control.c:1296
 msgid "Bad Task Message"
 msgstr "잘못된 작업 메세지"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1315
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b>이(가) 약속 있음/없음 정보를 게시했습니다."
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: calendar/gui/e-itip-control.c:1323
+#: calendar/gui/e-itip-control.c:1316
 msgid "Free/Busy Information"
 msgstr "약속 있음/없음 정보"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b>이(가) 약속 있음/없음 정보를 요청했습니다."
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1321
 msgid "Free/Busy Request"
 msgstr "약속 있음/없음 요청"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1325
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b>이(가) 약속 있음/없음 요청에 회신했습니다."
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1326
 msgid "Free/Busy Reply"
 msgstr "약속 있음/없음 회신"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1331
 msgid "Bad Free/Busy Message"
 msgstr "틀린 약속 있음/없음 메세지"
 
-#: calendar/gui/e-itip-control.c:1413
+#: calendar/gui/e-itip-control.c:1406
 msgid "The message does not appear to be properly formed"
 msgstr "메세지의 형식이 올바르지 않은 것으로 보입니다"
 
-#: calendar/gui/e-itip-control.c:1472
+#: calendar/gui/e-itip-control.c:1465
 msgid "The message contains only unsupported requests."
 msgstr "이 메세지에는 지원하지 않는 요청만 들어 있습니다."
 
-#: calendar/gui/e-itip-control.c:1503
+#: calendar/gui/e-itip-control.c:1496
 msgid "The attachment does not contain a valid calendar message"
 msgstr "첨부에 올바른 달력 메세지가 없습니다"
 
-#: calendar/gui/e-itip-control.c:1535
+#: calendar/gui/e-itip-control.c:1528
 msgid "The attachment has no viewable calendar items"
 msgstr "이 첨부를 볼 수 있는 달력 아이템이 없습니다"
 
-#: calendar/gui/e-itip-control.c:1769
+#: calendar/gui/e-itip-control.c:1762
 msgid "Update complete\n"
 msgstr "업데이트 마침\n"
 
-#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
+#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "이 항목이 더 이상 없기 때문에 참석자 상태를 업데이트할 수 없습니다"
 
-#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
 msgid "Object is invalid and cannot be updated\n"
 msgstr "오브젝트가 잘못되었고 업데이트할 수 없습니다\n"
 
-#: calendar/gui/e-itip-control.c:1825
+#: calendar/gui/e-itip-control.c:1818
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "현재 참석자가 아닌 사람이 이 회신을 했습니다. 참석자로 더하시겠습니까?"
 
-#: calendar/gui/e-itip-control.c:1837
+#: calendar/gui/e-itip-control.c:1830
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "잘못된 상태때문에 참석자 상태를 업데이트할 수 없습니다!\n"
 
-#: calendar/gui/e-itip-control.c:1856
+#: calendar/gui/e-itip-control.c:1849
 msgid "There was an error on the CORBA system\n"
 msgstr "CORBA 시스템에 오류가 있습니다\n"
 
-#: calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1852
 msgid "Object could not be found\n"
 msgstr "오브젝트를 찾을 수 없습니다\n"
 
-#: calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1855
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "달력을 업데이트할 올바른 권한이 없습니다\n"
 
-#: calendar/gui/e-itip-control.c:1865
+#: calendar/gui/e-itip-control.c:1858
 msgid "Attendee status updated\n"
 msgstr "참석자의 상태 업데이트되었습니다\n"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1861
 msgid "Attendee status could not be updated!\n"
 msgstr "참석자 상태를 업데이트할 수 없습니다!\n"
 
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1892
 msgid "Removal Complete"
 msgstr "지우기를 끝마쳤습니다"
 
-#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
 msgid "Item sent!\n"
 msgstr "항목을 보냈습니다!\n"
 
-#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
+#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
 msgid "The item could not be sent!\n"
 msgstr "항목을 보낼 수 없습니다!\n"
 
@@ -6417,74 +6176,74 @@ msgstr "끝-날짜"
 msgid "date-start"
 msgstr "시작-날짜"
 
-#: calendar/gui/e-meeting-list-view.c:62
+#: calendar/gui/e-meeting-list-view.c:59
 msgid "Chair Persons"
 msgstr "의장"
 
-#: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:479
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
 msgid "Required Participants"
 msgstr "필수 참석자"
 
-#: calendar/gui/e-meeting-list-view.c:64
+#: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "선택 참석자"
 
-#: calendar/gui/e-meeting-list-view.c:65
+#: calendar/gui/e-meeting-list-view.c:62
 msgid "Resources"
 msgstr "자원"
 
-#: calendar/gui/e-meeting-list-view.c:140 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
 #: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr "개인"
 
-#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "그룹"
 
-#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr "자원"
 
-#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr "방"
 
-#: calendar/gui/e-meeting-list-view.c:154 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr "의장"
 
-#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:127
 #: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
 msgid "Required Participant"
 msgstr "필수 참석자"
 
-#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr "선택 참석자"
 
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr "불참자"
 
-#: calendar/gui/e-meeting-list-view.c:179 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:177
 #: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
 msgid "Needs Action"
 msgstr "동작 필요"
 
-#: calendar/gui/e-meeting-list-view.c:182 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
 #: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "잠정적"
 
-#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr "대리"
@@ -6501,21 +6260,29 @@ msgstr "부재 중"
 msgid "No Information"
 msgstr "정보 없음"
 
+#: calendar/gui/e-meeting-time-sel.c:417
+#, fuzzy
+msgid "Add attendees from addressbook"
+msgstr "보낸 사람을 주소록에 더하기"
+
 #: calendar/gui/e-meeting-time-sel.c:440
 msgid "_Options"
 msgstr "옵션(_O)"
 
 #: calendar/gui/e-meeting-time-sel.c:457
-msgid "Show _Only Working Hours"
+#, fuzzy
+msgid "Show _only working hours"
 msgstr "근무 시간만 보기(_O)"
 
 #: calendar/gui/e-meeting-time-sel.c:467
-msgid "Show _Zoomed Out"
+#, fuzzy
+msgid "Show _zoomed out"
 msgstr "축소해서 보기(_Z)"
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
 #: calendar/gui/e-meeting-time-sel.c:482
-msgid "_Update Free/Busy"
+#, fuzzy
+msgid "_Update free/busy"
 msgstr "약속 있음/없음 업데이트(_U)"
 
 #: calendar/gui/e-meeting-time-sel.c:497
@@ -6532,19 +6299,23 @@ msgid ">_>"
 msgstr ">_>"
 
 #: calendar/gui/e-meeting-time-sel.c:547
-msgid "_All People and Resources"
+#, fuzzy
+msgid "_All people and resources"
 msgstr "모든 사람과 자원(_A)"
 
 #: calendar/gui/e-meeting-time-sel.c:556
-msgid "All _People and One Resource"
+#, fuzzy
+msgid "All _people and one resource"
 msgstr "모든 사람과 자원 한 개(_P)"
 
 #: calendar/gui/e-meeting-time-sel.c:565
-msgid "_Required People"
+#, fuzzy
+msgid "_Required people"
 msgstr "필요한 사람(_R)"
 
 #: calendar/gui/e-meeting-time-sel.c:574
-msgid "Required People and _One Resource"
+#, fuzzy
+msgid "Required people and _one resource"
 msgstr "필요한 사람과 자원 한 개(_O)"
 
 #: calendar/gui/e-meeting-time-sel.c:593
@@ -6582,7 +6353,7 @@ msgstr "%Y/%m/%d"
 msgid "Enter the password for %s"
 msgstr "%s의 열쇠글을 입력하십시오"
 
-#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6591,21 +6362,14 @@ msgstr ""
 "%s에서 오류 발생:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
-#, fuzzy, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-"다음에 대한 작업 벡엔드가 비정상적으로 죽었습니다:\n"
-"%s"
-
 #. FIXME Loading should be async
 #. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:686
+#: calendar/gui/e-tasks.c:801
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%s에 있는 작업을 여는 중입니다"
 
-#: calendar/gui/e-tasks.c:709
+#: calendar/gui/e-tasks.c:824
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6614,54 +6378,47 @@ msgstr ""
 "%s 여는 데 오류가 밝생했습니다:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:730
+#: calendar/gui/e-tasks.c:845
 msgid "Loading tasks"
 msgstr "작업을 읽어들이는 중입니다"
 
-#: calendar/gui/e-tasks.c:834
+#: calendar/gui/e-tasks.c:949
 msgid "Completing tasks..."
 msgstr "작업을 완료하는 중입니다..."
 
-#: calendar/gui/e-tasks.c:857
+#: calendar/gui/e-tasks.c:972
 msgid "Deleting selected objects..."
 msgstr "선택한 오브젝트를 지웁니다..."
 
-#: calendar/gui/e-tasks.c:884
+#: calendar/gui/e-tasks.c:999
 msgid "Expunging"
 msgstr "지운 메세지 비우는 중"
 
-#: calendar/gui/e-tasks.c:960
+#: calendar/gui/e-tasks.c:1075
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
-#: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
+#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
+#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
 #: calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:705
 msgid "Tasks"
 msgstr "작업"
 
-#: calendar/gui/gnome-cal.c:1876
+#: calendar/gui/gnome-cal.c:1878
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "%s의 약속을 읽어들이는 중입니다"
 
-#: calendar/gui/gnome-cal.c:1895
+#: calendar/gui/gnome-cal.c:1897
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "%s의 작업을 읽어들이는 중입니다"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1920
 #, c-format
 msgid "Opening %s"
 msgstr "%s 여는 중입니다"
 
-#: calendar/gui/gnome-cal.c:2048
-#, fuzzy, c-format
-msgid "The calendar backend for '%s' has crashed."
-msgstr ""
-"다음에 대한 달력 벡엔드가 비정상적으로 죽었습니다:\n"
-"%s"
-
-#: calendar/gui/gnome-cal.c:2894
+#: calendar/gui/gnome-cal.c:2906
 msgid "Purging"
 msgstr "비우는 중"
 
@@ -6864,7 +6621,7 @@ msgid "On The Web"
 msgstr "웹"
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 
@@ -6875,7 +6632,7 @@ msgid "Unable to migrate calendar `%s'"
 msgstr "달력 '%s'을(를) 열 수 없습니다."
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:869
+#: calendar/gui/migration.c:889
 #, fuzzy, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "'%s'의 작업을 열 수 없습니다."
@@ -7111,71 +6868,71 @@ msgstr "항목 인쇄"
 msgid "Print Setup"
 msgstr "인쇄 설정"
 
-#: calendar/gui/tasks-component.c:303
+#: calendar/gui/tasks-component.c:313
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr "작업 목록 '%s'을(를) 지웁니다. 정말로 계속하시겠습니까?"
 
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:371
 msgid "New Task List"
 msgstr "새 작업 목록"
 
-#: calendar/gui/tasks-component.c:398
+#: calendar/gui/tasks-component.c:408
 #, fuzzy, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "연락처 %d개"
 
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] "지워짐"
 
-#: calendar/gui/tasks-component.c:447
+#: calendar/gui/tasks-component.c:457
 #, fuzzy
 msgid "Failed upgrading tasks."
 msgstr "작업을 읽어들이는 중입니다"
 
 # event -> 행사, Microsoft Office XP 참고
-#: calendar/gui/tasks-component.c:526
+#: calendar/gui/tasks-component.c:749
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "행사와 회의를 만드는 데 쓸 작업 목록 '%s'을(를) 열 수 없습니다"
 
-#: calendar/gui/tasks-component.c:538
+#: calendar/gui/tasks-component.c:761
 msgid "There is no calendar available for creating tasks"
 msgstr "작업을 만들 때 쓸 수 있는 달력이 없습니다"
 
-#: calendar/gui/tasks-component.c:576
+#: calendar/gui/tasks-component.c:799
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:804
+#: calendar/gui/tasks-component.c:1040
 msgid "New task"
 msgstr "새 작업"
 
-#: calendar/gui/tasks-component.c:805
+#: calendar/gui/tasks-component.c:1041
 msgid "_Task"
 msgstr "작업(_T)"
 
-#: calendar/gui/tasks-component.c:806
+#: calendar/gui/tasks-component.c:1042
 msgid "Create a new task"
 msgstr "새 작업을 만듭니다"
 
-#: calendar/gui/tasks-component.c:812
+#: calendar/gui/tasks-component.c:1048
 #, fuzzy
 msgid "New tasks group"
 msgstr "뉴스그룹"
 
-#: calendar/gui/tasks-component.c:813
+#: calendar/gui/tasks-component.c:1049
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "작업 목록 그룹"
 
-#: calendar/gui/tasks-component.c:814
+#: calendar/gui/tasks-component.c:1050
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "새 작업을 만듭니다"
@@ -8946,12 +8703,12 @@ msgstr "거르게 찾기 실행 중 오류: %s: %s"
 msgid "Unsupported operation: append message: for %s"
 msgstr "지원하지 않는 동작: 메세지 추가: %s"
 
-#: camel/camel-folder.c:1259
+#: camel/camel-folder.c:1262
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "지원되지 않는 동작: 표현식으로 찾기: %s"
 
-#: camel/camel-folder.c:1299
+#: camel/camel-folder.c:1302
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "지원되지 않는 동작: uid로 찾기: %s"
@@ -8964,11 +8721,16 @@ msgstr "메세지 옮기는 중입니다"
 msgid "Copying messages"
 msgstr "메시지 복사하는 중입니다"
 
-#: camel/camel-folder.c:1666
-msgid "Learning junk and/or non junk message(s)"
-msgstr "정크메일과 정크메일이 아닌 메세지를 학습합니다"
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "경고"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr ""
 
-#: camel/camel-folder.c:1695
+#: camel/camel-folder.c:1701
 msgid "Filtering new message(s)"
 msgstr "새 메세지 거르는 중입니다"
 
@@ -9002,17 +8764,17 @@ msgstr ""
 msgid "(match-threads) requires a match type string"
 msgstr ""
 
-#: camel/camel-folder-search.c:785
+#: camel/camel-folder-search.c:784
 #, fuzzy
 msgid "(match-threads) expects an array result"
 msgstr "(match-all)은 한 개의 불리언 결과가 필요합니다"
 
-#: camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:790
 #, fuzzy
 msgid "(match-threads) requires the folder set"
 msgstr "(match-all)은 한 개의 불리언 결과가 필요합니다"
 
-#: camel/camel-folder-search.c:880
+#: camel/camel-folder-search.c:879
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "알 수 없는 헤더에 대해 질의를 수행하는 중입니다: %s"
@@ -9047,7 +8809,8 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
 #: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:706
+#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "취소됨."
@@ -9424,7 +9187,7 @@ msgstr "참조한 증명서가 만료된 증명서입니다."
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1212
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "서버에서 보낸 인증 응답이 틀렸습니다."
 
@@ -9800,40 +9563,40 @@ msgstr "명령이 구현되지 않았습니다"
 msgid "export keys: unimplemented"
 msgstr ""
 
-#: camel/camel-store.c:214
+#: camel/camel-store.c:213
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "폴더를 얻을 수 없습니다: 이 저장고에 잘못된 동작입니다"
 
-#: camel/camel-store.c:244
+#: camel/camel-store.c:243
 #, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr "`%s' 폴더를 만들 수 없습니다: 폴더가 이미 있습니다"
 
-#: camel/camel-store.c:295
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "폴더를 만들 수 없습니다: 이 저장고에 잘못된 동작입니다"
 
-#: camel/camel-store.c:323
+#: camel/camel-store.c:325
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "`%s' 폴더를 만들 수 없습니다: 폴더가 이미 있습니다"
 
-#: camel/camel-store.c:387 camel/camel-vee-store.c:354
+#: camel/camel-store.c:389 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "폴더를 지울 수 없습니다: %s: 잘못된 동작"
 
-#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#: camel/camel-store.c:439 camel/camel-vee-store.c:387
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "폴더 이름을 바꿀 수 없습니다: %s: 잘못된 동작"
 
-#: camel/camel-store.c:811
+#: camel/camel-store.c:777
 msgid "Trash"
 msgstr "휴지통"
 
-#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
-#: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/mail-config.glade.h:95
+#: ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "정크메일"
 
@@ -10064,12 +9827,12 @@ msgstr "%2$s에 %1$s(이)라는 메세지는 없습니다"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "메세지를 가상 폴더에 복사할/옮길 수 없습니다"
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:374
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "폴더를 지울 수 없습니다: %s: 그런 폴더가 없습니다"
 
-#: camel/camel-vee-store.c:398
+#: camel/camel-vee-store.c:395
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "폴더 이름을 바꿀 수 없습니다: %s: 그런 폴더가 없습니다"
@@ -10111,31 +9874,31 @@ msgstr "주소록"
 msgid "Post Office Agent SOAP Port:"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:80
+#: camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "Novell GroupWise"
 msgstr "Novell GroupWise"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:82
+#: camel/providers/groupwise/camel-groupwise-provider.c:85
 msgid "For accessing Novell Groupwise servers"
 msgstr "Novell GroupWise 서버에 접근하는 용도"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: camel/providers/groupwise/camel-groupwise-provider.c:100
 #: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
 msgid "Password"
 msgstr "열쇠글"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:99
+#: camel/providers/groupwise/camel-groupwise-provider.c:102
 #: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "이 옵션을 켜면 일반 텍스트 열쇠글을 이용해 IMAP 서버에 연결합니다."
 
-#: camel/providers/groupwise/camel-gw-listener.c:305
-#: camel/providers/groupwise/camel-gw-listener.c:328
+#: camel/providers/groupwise/camel-gw-listener.c:312
+#: camel/providers/groupwise/camel-gw-listener.c:335
 msgid "Checklist"
 msgstr "확인목록"
 
@@ -10279,13 +10042,13 @@ msgid ""
 msgstr "이 옵션을 켜면 일반 텍스트 열쇠글을 이용해 IMAP 서버에 연결합니다."
 
 #: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:429
+#: camel/providers/imap/camel-imap-store.c:428
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP 서버 %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:431
+#: camel/providers/imap/camel-imap-store.c:430
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP 서비스 (사용자: %s, 위치: %s)"
@@ -10295,7 +10058,7 @@ msgstr "IMAP 서비스 (사용자: %s, 위치: %s)"
 #: camel/providers/imap/camel-imap-store.c:551
 #: camel/providers/imap/camel-imap-store.c:571
 #: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
+#: camel/providers/nntp/camel-nntp-store.c:209
 #: camel/providers/pop3/camel-pop3-store.c:175
 #: camel/providers/smtp/camel-smtp-transport.c:269
 #: camel/providers/smtp/camel-smtp-transport.c:285
@@ -10312,10 +10075,10 @@ msgstr "SSL을 사용할 수 없습니다"
 
 #: camel/providers/imap4/camel-imap4-store.c:222
 #: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:815
+#: camel/providers/imap/camel-imap-store.c:845
 #: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:137
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
 #: camel/providers/pop3/camel-pop3-store.c:192
 msgid "Connection cancelled"
 msgstr "연결이 취소됨"
@@ -10328,8 +10091,8 @@ msgid ""
 msgstr "보안 모드로 IMAP 서버 %s에 연결하는 데 실패했습니다: %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:649
-#: camel/providers/imap/camel-imap-store.c:680
+#: camel/providers/imap/camel-imap-store.c:679
+#: camel/providers/imap/camel-imap-store.c:710
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "보안 모드로 IMAP 서버 %s에 연결하는 데 실패했습니다: %s"
@@ -10338,7 +10101,7 @@ msgstr "보안 모드로 IMAP 서버 %s에 연결하는 데 실패했습니다:
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1109
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
 msgid "Unknown error"
 msgstr "알 수 없는 오류가 발생했습니다"
 
@@ -10365,8 +10128,8 @@ msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr "`%s' 폴더를 얻을 수 없습니다: %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1857
-#: camel/providers/imap/camel-imap-store.c:2235
+#: camel/providers/imap/camel-imap-store.c:1885
+#: camel/providers/imap/camel-imap-store.c:2263
 #, fuzzy, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -10445,12 +10208,12 @@ msgstr "예기치 않게 서버의 연결이 끊겼습니다: %s"
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3168
+#: camel/providers/imap/camel-imap-store.c:3194
 msgid "Operation cancelled"
 msgstr "작업이 취소되었습니다"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3171
+#: camel/providers/imap/camel-imap-store.c:3197
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "예기치 않게 서버의 연결이 끊겼습니다: %s"
@@ -10514,13 +10277,6 @@ msgid "Unable to retrieve message: %s"
 msgstr "메세지를 가져올 수 없습니다: %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:219
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -10530,15 +10286,15 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-mbox-folder.c:418
+#: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
 msgstr "그런 메세지 없음"
 
 #: camel/providers/imap/camel-imap-folder.c:2019
-#: camel/providers/imap/camel-imap-folder.c:2621
-#: camel/providers/nntp/camel-nntp-folder.c:238
+#: camel/providers/imap/camel-imap-folder.c:2622
+#: camel/providers/nntp/camel-nntp-folder.c:220
 msgid "This message is not currently available"
 msgstr "이 메시지는 현재 보여줄 수가 없습니다"
 
@@ -10547,7 +10303,23 @@ msgstr "이 메시지는 현재 보여줄 수가 없습니다"
 msgid "Fetching summary information for new messages"
 msgstr "새 메세지의 목록 정보를 가져오는 중입니다"
 
-#: camel/providers/imap/camel-imap-folder.c:2659
+#: camel/providers/imap/camel-imap-folder.c:2463
+#, c-format
+msgid "Incomplete server response: no information provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2471
+#, c-format
+msgid "Incomplete server response: no UID provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2484
+#, c-format
+msgid ""
+"Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2660
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH 응답에서 메세지 본문을 찾을 수 없습니다."
 
@@ -10606,43 +10378,43 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "IMAP서버에 메일을 읽고 저장."
 
-#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/imap/camel-imap-store.c:680
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS 확장 기능을 지원하지 않습니다."
 
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:711
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL 협상이 실패했습니다"
 
-#: camel/providers/imap/camel-imap-store.c:818
+#: camel/providers/imap/camel-imap-store.c:848
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "\"%s\" 명령으로 연결할 수 없습니다: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1242
+#: camel/providers/imap/camel-imap-store.c:1272
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP 서버 %s은(는) 요청한 인증형식 %s을(를) 지원하지 않습니다"
 
-#: camel/providers/imap/camel-imap-store.c:1252
+#: camel/providers/imap/camel-imap-store.c:1282
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "%s 인증 형식을 지원하지 않습니다"
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1305
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%s %s@%s에 대한 IMAP 열쇠글을 입력하십시오"
 
-#: camel/providers/imap/camel-imap-store.c:1289
+#: camel/providers/imap/camel-imap-store.c:1319
 msgid "You didn't enter a password."
 msgstr "열쇠글을 입력하지 않았습니다."
 
-#: camel/providers/imap/camel-imap-store.c:1318
+#: camel/providers/imap/camel-imap-store.c:1348
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10653,18 +10425,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1839
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:1867
+#: camel/providers/imap/camel-imap-store.c:2057
 #, c-format
 msgid "No such folder %s"
 msgstr "%s(이)라는 폴더가 없습니다"
 
-#: camel/providers/imap/camel-imap-store.c:1915
-#: camel/providers/imap/camel-imap-store.c:2296
+#: camel/providers/imap/camel-imap-store.c:1943
+#: camel/providers/imap/camel-imap-store.c:2324
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "해당 상위 폴더에는 하위 폴더를 포함할 수 없습니다"
 
-#: camel/providers/imap/camel-imap-store.c:1970
+#: camel/providers/imap/camel-imap-store.c:1998
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10672,7 +10444,7 @@ msgstr "해당 상위 폴더에는 하위 폴더를 포함할 수 없습니다"
 msgid "Cannot create folder `%s': folder exists."
 msgstr "`%s' 폴더를 만들 수 없습니다: 폴더가 이미 있습니다."
 
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:2274
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "상위 폴더를 알 수 없습니다: %s"
@@ -10708,20 +10480,20 @@ msgid "Index message body data"
 msgstr "색인 메세지 본문 데이터"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:388
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:393
-#: camel/providers/local/camel-local-folder.c:396
+#: camel/providers/local/camel-local-folder.c:392
+#: camel/providers/local/camel-local-folder.c:395
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "메일함:%s (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:400
+#: camel/providers/local/camel-local-folder.c:399
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -10781,7 +10553,7 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:142
 #: camel/providers/local/camel-local-store.c:253
-#: camel/providers/local/camel-mbox-store.c:356
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10854,8 +10626,25 @@ msgstr "메일폴더에 메세지 덧붙이기가 취소되었습니다"
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "메일폴더에 메세지를 덧붙일 수 없습니다: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:226
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mbox-folder.c:417
+#: camel/providers/local/camel-mbox-folder.c:436
+#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:475
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-mh-folder.c:221
+#, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+"메세지를 얻을 수 없음: %2$s 폴더에서 %1$s\n"
+"  %3$s"
+
+#: camel/providers/local/camel-maildir-folder.c:236
 msgid "Invalid message contents"
 msgstr "잘못된 메세지 내용"
 
@@ -10896,9 +10685,9 @@ msgstr "폴더 `%s'을(를) 지울 수 없습니다: %s"
 msgid "not a maildir directory"
 msgstr "메일폴더 디렉토리가 아닙니다"
 
-#: camel/providers/local/camel-maildir-store.c:341
-#: camel/providers/local/camel-spool-store.c:286
-#: camel/providers/local/camel-spool-store.c:316
+#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-spool-store.c:284
+#: camel/providers/local/camel-spool-store.c:314
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "`%s' 폴더를 검사할 수 없습니다: %s"
@@ -10945,27 +10734,18 @@ msgstr "메일 덧붙이기가 취소되었습니다"
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "메일함에 메세지를 덧붙일 수 없습니다: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:435
-#: camel/providers/local/camel-mbox-folder.c:466
-#: camel/providers/local/camel-mbox-folder.c:474
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"메세지를 얻을 수 없음: %2$s 폴더에서 %1$s\n"
-"  %3$s"
-
-#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:468
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "폴더가 복구 불능 상태로 손상된 것으로 보입니다."
 
-#: camel/providers/local/camel-mbox-folder.c:475
-msgid "Message construction failed: Corrupt mailbox?"
+#: camel/providers/local/camel-mbox-folder.c:476
+#: camel/providers/local/camel-mh-folder.c:222
+#, fuzzy
+msgid "Message construction failed."
 msgstr "메세지 만들기가 실패했습니다: 메일함이 깨졌습니다?"
 
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:362
+#: camel/providers/local/camel-mbox-store.c:361
 msgid "Cannot create a folder by this name."
 msgstr "이 이름의 폴더를 만들 수 없습니다."
 
@@ -10995,30 +10775,30 @@ msgstr "`%s'이(가) 일반 파일이 아닙니다."
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "폴더 `%s'이(가) 비어 있지 않습니다. 지우지 않습니다."
 
-#: camel/providers/local/camel-mbox-store.c:375
+#: camel/providers/local/camel-mbox-store.c:374
 #, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "'%s' 디렉토리를 만들 수 없습니다: %s."
 
-#: camel/providers/local/camel-mbox-store.c:389
+#: camel/providers/local/camel-mbox-store.c:388
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "폴더를 만들 수 없습니다: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:391
+#: camel/providers/local/camel-mbox-store.c:390
 msgid "Folder already exists"
 msgstr "폴더가 이미 있습니다"
 
-#: camel/providers/local/camel-mbox-store.c:473
+#: camel/providers/local/camel-mbox-store.c:472
 msgid "The new folder name is illegal."
 msgstr "새 폴더의 이름이 올바르지 않습니다."
 
-#: camel/providers/local/camel-mbox-store.c:486
+#: camel/providers/local/camel-mbox-store.c:485
 #, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "`%s'의 이름을 바꿀 수 없습니다: `%s': %s"
 
-#: camel/providers/local/camel-mbox-store.c:561
+#: camel/providers/local/camel-mbox-store.c:560
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "'%s'을(를) %s(으)로 이름을 바꿀 수 없습니다: %s"
@@ -11209,7 +10989,7 @@ msgstr ""
 "폴더가 망가졌을 것입니다. `%s'에 사본을 저장합니다"
 
 #: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:997
+#: camel/providers/nntp/camel-nntp-store.c:1126
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "%s@%s에 대한 NNTP 열쇠글을 입력하십시오"
@@ -11226,18 +11006,10 @@ msgstr "사용자 이름을 서버에 보내는 데 실패했습니다"
 msgid "Server rejected username/password"
 msgstr "서버에서 사용자 이름과 열쇠글을 거부했습니다"
 
-#: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:263
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr "사용자 취소되었습니다"
-
-#: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:259
-#: camel/providers/nntp/camel-nntp-folder.c:265
+#: camel/providers/nntp/camel-nntp-folder.c:147
+#: camel/providers/nntp/camel-nntp-folder.c:149
+#: camel/providers/nntp/camel-nntp-folder.c:158
+#: camel/providers/nntp/camel-nntp-folder.c:234
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11246,63 +11018,49 @@ msgstr "사용자 취소되었습니다"
 msgid "Cannot get message %s: %s"
 msgstr "%s 메세지를 얻을 수 없습니다: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:188
-#: camel/providers/nntp/camel-nntp-folder.c:228
+#: camel/providers/nntp/camel-nntp-folder.c:156
+#: camel/providers/nntp/camel-nntp-folder.c:232
+#: camel/providers/nntp/camel-nntp-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+msgid "User cancelled"
+msgstr "사용자 취소되었습니다"
+
+#: camel/providers/nntp/camel-nntp-folder.c:176
+#: camel/providers/nntp/camel-nntp-folder.c:208
 #, c-format
 msgid "Internal error: uid in invalid format: %s"
 msgstr "내부 오류: uid 형식이 잘못되었습니다: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:201
-#, c-format
-msgid "Could not get article %s from NNTP server"
-msgstr "NNTP 서버에서 글 \"%s\"을(를) 가져올 수 없습니다."
-
-#: camel/providers/nntp/camel-nntp-folder.c:362
-msgid "Posting not allowed by news server"
-msgstr "뉴스 서버에서 게시를 허용하지 않습니다"
-
+#: camel/providers/nntp/camel-nntp-folder.c:328
+#: camel/providers/nntp/camel-nntp-folder.c:331
 #: camel/providers/nntp/camel-nntp-folder.c:373
-#, c-format
-msgid "Failed to send newsgroups header: %s: message not posted"
-msgstr "뉴스그룹 헤더를 보내는 데 실패했습니다: %s: 메세지를 올리지 않았습니다"
-
-#: camel/providers/nntp/camel-nntp-folder.c:413
-#: camel/providers/nntp/camel-nntp-folder.c:426
-#, c-format
-msgid "Error posting to newsgroup: %s: message not posted"
-msgstr ""
-"뉴스그룹에 올리는 데 오류가 발생했습니다: %s: 메세지를 올리지 않았습니다"
-
-#: camel/providers/nntp/camel-nntp-folder.c:438
-msgid "Error reading response to posted message: message not posted"
-msgstr ""
-"올린 메세지에 대한 응답을 읽는 데 오류가 발생했습니다: 메세지를 올리지 않았습"
-"니다"
-
-#: camel/providers/nntp/camel-nntp-folder.c:441
-#, c-format
-msgid "Error posting message: %s: message not posted"
-msgstr "메세지를 올리는 데 오류가 발생했습니다: %s: 메세지를 올리지 않았습니다"
+#: camel/providers/nntp/camel-nntp-folder.c:375
+#, fuzzy, c-format
+msgid "Posting failed: %s"
+msgstr "작업이 실패했습니다: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:457
+#: camel/providers/nntp/camel-nntp-folder.c:393
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "오프라인으로 작업하는 중에는 NNTP 메세지를 올릴 수 없습니다!"
 
-#: camel/providers/nntp/camel-nntp-folder.c:468
+#: camel/providers/nntp/camel-nntp-folder.c:404
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "NNTP 폴더에서 메세지를 복사할 수 없습니다!"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:44
 msgid "Could not get group list from server."
 msgstr "서버에서 그룹 목록을 가져올 수 없습니다."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#: camel/providers/nntp/camel-nntp-grouplist.c:97
+#: camel/providers/nntp/camel-nntp-grouplist.c:106
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "%s에 대한 그룹 목록 파일을 읽어들일 수 없습니다: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#: camel/providers/nntp/camel-nntp-grouplist.c:157
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "%s에 대한 그룹 목록 파일을 저장할 수 없습니다: %s"
@@ -11331,26 +11089,29 @@ msgid ""
 "password."
 msgstr "이 옵션을 켜면 일반 텍스트 열쇠글을 이용해 NNTP 서버에 인증합니다."
 
-#: camel/providers/nntp/camel-nntp-store.c:158
+#: camel/providers/nntp/camel-nntp-store.c:118
+#: camel/providers/nntp/camel-nntp-store.c:1233
+#: camel/providers/nntp/camel-nntp-store.c:1331
+#, c-format
+msgid "NNTP Command failed: %s"
+msgstr "NNTP 명령이 실패했습니다: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:227
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "%s에서 초기 메세지를 읽을 수 없습니다: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:170
+#: camel/providers/nntp/camel-nntp-store.c:239
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP 서버 %s에서 오류 코드 %d을(를) 리턴했습니다: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:326
+#: camel/providers/nntp/camel-nntp-store.c:403
 #, c-format
 msgid "USENET News via %s"
 msgstr "%s 서버를 통한 USENET 뉴스"
 
-#: camel/providers/nntp/camel-nntp-store.c:640
-msgid "Stream error"
-msgstr "스트림 오류"
-
-#: camel/providers/nntp/camel-nntp-store.c:643
+#: camel/providers/nntp/camel-nntp-store.c:777
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -11361,7 +11122,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/providers/nntp/camel-nntp-store.c:735
+#: camel/providers/nntp/camel-nntp-store.c:872
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
@@ -11371,7 +11132,7 @@ msgstr ""
 "\n"
 "그런 뉴스그룹이 없습니다. 선택한 항목이 상위 폴더일 것입니다."
 
-#: camel/providers/nntp/camel-nntp-store.c:767
+#: camel/providers/nntp/camel-nntp-store.c:904
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
@@ -11381,59 +11142,59 @@ msgstr ""
 "\n"
 "뉴스그룹이 없습니다!"
 
-#: camel/providers/nntp/camel-nntp-store.c:792
+#: camel/providers/nntp/camel-nntp-store.c:929
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr "뉴스 저장고에 폴더를 만들 수 없습니다: 대신에 구독하십시오."
 
-#: camel/providers/nntp/camel-nntp-store.c:800
+#: camel/providers/nntp/camel-nntp-store.c:937
 msgid "You cannot rename a folder in a News store."
 msgstr "뉴스 저장고의 폴더의 이름을 바꿀 수 없습니다."
 
-#: camel/providers/nntp/camel-nntp-store.c:808
+#: camel/providers/nntp/camel-nntp-store.c:945
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "뉴스 저장고의 폴더를 지울 수 없습니다: 대신에 구독 해제하십시오."
 
-#: camel/providers/nntp/camel-nntp-summary.c:253
-#, c-format
-msgid "Connection error: %s"
-msgstr "연결 오류: %s"
-
-#: camel/providers/nntp/camel-nntp-summary.c:262
-#, c-format
-msgid "No such folder: %s"
-msgstr "그런 폴더가 없습니다: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1118
+#, fuzzy
+msgid "Authentication requested but not username provided"
+msgstr "인증이 필요합니다"
 
-#: camel/providers/nntp/camel-nntp-summary.c:268
-#, c-format
-msgid "Could not get group: %s"
-msgstr "그룹을 받아 올 수 없습니다: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1146
+#, fuzzy, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr "POP 서버 %s에 인증하는 데 실패했습니다: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:333
+#: camel/providers/nntp/camel-nntp-store.c:1262
 #, fuzzy
-msgid "Could not get messages: unspecified error"
-msgstr "메세지를 가져올 수 없습니다: 지정하지 않은 오류"
+msgid "Not connected."
+msgstr "연락처 없음"
 
-#: camel/providers/nntp/camel-nntp-summary.c:378
+#: camel/providers/nntp/camel-nntp-store.c:1311
 #, c-format
-msgid "NNTP Command failed: %s"
-msgstr "NNTP 명령이 실패했습니다: %s"
+msgid "No such folder: %s"
+msgstr "그런 폴더가 없습니다: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:438
-#: camel/providers/nntp/camel-nntp-summary.c:543
+#: camel/providers/nntp/camel-nntp-summary.c:218
+#: camel/providers/nntp/camel-nntp-summary.c:314
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: 새 메시지를 검사하는 중입니다"
 
-#: camel/providers/nntp/camel-nntp-summary.c:558
-#, c-format
-msgid "Unknown server response: %s"
-msgstr "알 수 없는 서버 응답: %s"
+#: camel/providers/nntp/camel-nntp-summary.c:225
+#, fuzzy, c-format
+msgid "Unexpected server response from xover: %s"
+msgstr "IMAP server로부터 예상치못한 답변: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:605
+#: camel/providers/nntp/camel-nntp-summary.c:328
+#, fuzzy, c-format
+msgid "Unexpected server response from head: %s"
+msgstr "GnuPG로부터 예상치못한 답변: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:368
 msgid "Use cancel"
 msgstr "사용자 취소"
 
-#: camel/providers/nntp/camel-nntp-summary.c:607
+#: camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
 msgid "Operation failed: %s"
 msgstr "작업이 실패했습니다: %s"
@@ -11481,7 +11242,7 @@ msgstr "%s일 뒤에 지우기"
 msgid "Disable support for all POP3 extensions"
 msgstr "POP3 확장 기능을 모두 끕니다"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107
 msgid "POP"
 msgstr "POP"
 
@@ -11569,7 +11330,7 @@ msgid "No such folder `%s'."
 msgstr "`%s'(이)라는 폴더가 없습니다."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:132
 msgid "Sendmail"
 msgstr "센드메일"
 
@@ -11621,7 +11382,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "sendmail을 통한 메일 배달"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:119
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11906,19 +11667,19 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
+#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:408
 msgid "attachment"
 msgstr "첨부"
 
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:454
 msgid "Remove selected items from the attachment list"
 msgstr "첨부파일 목록에서 선택한 항목을 지웁니다"
 
-#: composer/e-msg-composer-attachment-bar.c:491
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Add attachment..."
 msgstr "첨부파일 더하기..."
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:495
 msgid "Attach a file to the message"
 msgstr "메세지에 파일을 첨부합니다"
 
@@ -11984,7 +11745,7 @@ msgstr "제목 없는 메세지"
 msgid "Open file"
 msgstr "파일 열기"
 
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
 msgid "Autogenerated"
 msgstr "자동으로 만들기"
 
@@ -12132,17 +11893,17 @@ msgstr "파일 첨부"
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
+msgid "You cannot attach the file `{0}' to this message."
 msgstr "메세지에 파일을 첨부합니다"
 
 #. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4
-msgid "${1}"
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
 msgstr ""
 
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
 
 #. mail-composer:attach-directory primary
@@ -12236,7 +11997,7 @@ msgstr "파이프를 만들 수 없습니다: %s"
 
 #. mail-composer:no-build-message secondary
 #: composer/mail-composer-errors.xml.h:34
-msgid "Because \"${0}\", you may need to select different mail options."
+msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
@@ -12246,8 +12007,10 @@ msgid "Could not read signature file \"{0}\"."
 msgstr "서명 파일을 저장할 수 없습니다: %s"
 
 #. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38
-msgid "Because \"${1}\"."
+#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted primary
@@ -12667,11 +12430,11 @@ msgid "<b>Then</b>"
 msgstr "<b>기한:</b> "
 
 #: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1335
+#: mail/mail-account-gui.c:1347
 msgid "Select Folder"
 msgstr "폴더 선택"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
 msgid "    "
 msgstr "    "
 
@@ -12728,7 +12491,7 @@ msgstr "전에"
 msgid "months"
 msgstr "달"
 
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
 msgid "seconds"
 msgstr "초"
 
@@ -12760,20 +12523,20 @@ msgstr "모든 로컬 폴더에"
 msgid "years"
 msgstr "연도"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:916
-#: mail/mail-config.c:76 mail/mail-config.glade.h:90
+#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
+#: mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "중요"
 
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:919 mail/mail-config.c:79
-#: mail/mail-config.glade.h:145
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: mail/mail-config.glade.h:148
 msgid "To Do"
 msgstr "할 일"
 
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:920 mail/mail-config.c:80
-#: mail/mail-config.glade.h:94
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: mail/mail-config.glade.h:97
 msgid "Later"
 msgstr "나중에"
 
@@ -12830,275 +12593,6 @@ msgstr "받는 메일"
 msgid "outgoing"
 msgstr "보내는 메일"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Adjust Score"
-msgstr "점수 조정"
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Color"
-msgstr "색 지정"
-
-#: filter/libfilter-i18n.h:4
-msgid "Assign Score"
-msgstr "점수 지정"
-
-#: filter/libfilter-i18n.h:5
-msgid "Attachments"
-msgstr "첨부"
-
-#: filter/libfilter-i18n.h:6
-msgid "Beep"
-msgstr "삑 소리"
-
-# FIXME - hard to translate UI + string based on English grammar
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "포함"
-
-#: filter/libfilter-i18n.h:8
-msgid "Copy to Folder"
-msgstr "폴더로 복사"
-
-#: filter/libfilter-i18n.h:9
-msgid "Date received"
-msgstr "받은 날짜"
-
-#: filter/libfilter-i18n.h:10
-msgid "Date sent"
-msgstr "보낸 날짜"
-
-#: filter/libfilter-i18n.h:12
-msgid "Deleted"
-msgstr "지워짐"
-
-# FIXME - hard to translate UI + string based on English grammar
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "포함하지 않음"
-
-# FIXME - hard to translate UI + string based on English grammar
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "끝나지 않음"
-
-# FIXME - hard to translate UI + string based on English grammar
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "없음"
-
-# FIXME - hard to translate UI + string based on English grammar
-#: filter/libfilter-i18n.h:16
-msgid "does not return"
-msgstr "리턴하지 않음"
-
-# FIXME - hard to translate UI + string based on English grammar
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "비슷한 소리 아님"
-
-# FIXME - hard to translate UI + string based on English grammar
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "시작하지 않음"
-
-#: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
-msgstr "존재하지 않음"
-
-#: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr "임시 보관함"
-
-# FIXME - hard to translate UI + string based on English grammar
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "끝남"
-
-#: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr "존재함"
-
-# FIXME - hard to translate UI + string based on English grammar
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "존재함"
-
-#: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr "표현"
-
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr "추가 작업"
-
-# FIXME - hard to translate UI + string based on English grammar
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "같음"
-
-# FIXME - hard to translate UI + string based on English grammar
-#: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr "뒤 날짜"
-
-# FIXME - hard to translate UI + string based on English grammar
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr "앞 날짜"
-
-# FIXME - hard to translate UI + string based on English grammar
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr "플래그 지정"
-
-# FIXME - hard to translate UI + string based on English grammar
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "보다 큼"
-
-# FIXME - hard to translate UI + string based on English grammar
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "보다 적음"
-
-# FIXME - hard to translate UI + string based on English grammar
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "다름"
-
-# FIXME - hard to translate UI + string based on English grammar
-#: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr "플래그 지정 아님"
-
-#: filter/libfilter-i18n.h:36
-msgid "Junk Test"
-msgstr "정크메일 테스트"
-
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
-#: widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "꼬리표"
-
-#: filter/libfilter-i18n.h:38
-msgid "Mailing list"
-msgstr "메일링 리스트"
-
-#: filter/libfilter-i18n.h:39
-msgid "Message Body"
-msgstr "메세지 본문"
-
-#: filter/libfilter-i18n.h:40
-msgid "Message Header"
-msgstr "메세지 머리말"
-
-#: filter/libfilter-i18n.h:41
-msgid "Message is Junk"
-msgstr "메세지가 정크메일"
-
-#: filter/libfilter-i18n.h:42
-msgid "Message is not Junk"
-msgstr "메세지가 정크메일 아님"
-
-#: filter/libfilter-i18n.h:43
-msgid "Move to Folder"
-msgstr "폴더로 이동"
-
-#: filter/libfilter-i18n.h:44
-#, fuzzy
-msgid "Pipe to Program"
-msgstr "프로그램을 끝냅니다"
-
-#: filter/libfilter-i18n.h:45
-msgid "Play Sound"
-msgstr "소리 연주"
-
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "읽음"
-
-#: filter/libfilter-i18n.h:47
-msgid "Recipients"
-msgstr "받는 사람"
-
-#: filter/libfilter-i18n.h:48
-msgid "Regex Match"
-msgstr "정규식"
-
-#: filter/libfilter-i18n.h:49
-msgid "Replied to"
-msgstr "회신"
-
-# FIXME - hard to translate UI + string based on English grammar
-#: filter/libfilter-i18n.h:50
-msgid "returns"
-msgstr "리턴"
-
-# FIXME - hard to translate UI + string based on English grammar
-#: filter/libfilter-i18n.h:51
-msgid "returns greater than"
-msgstr "더 큰 값 리턴"
-
-# FIXME - hard to translate UI + string based on English grammar
-#: filter/libfilter-i18n.h:52
-msgid "returns less than"
-msgstr "더 작은 값 리턴"
-
-#: filter/libfilter-i18n.h:53
-msgid "Run Program"
-msgstr "프로그램 실행"
-
-#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "점수"
-
-#: filter/libfilter-i18n.h:55
-msgid "Sender"
-msgstr "보낸 사람"
-
-#: filter/libfilter-i18n.h:56
-msgid "Set Status"
-msgstr "상태 설정"
-
-#: filter/libfilter-i18n.h:57
-msgid "Size (kB)"
-msgstr "크기 (kB)"
-
-# FIXME - hard to translate UI + string based on English grammar
-#: filter/libfilter-i18n.h:58
-msgid "sounds like"
-msgstr "비슷한 소리"
-
-#: filter/libfilter-i18n.h:59
-msgid "Source Account"
-msgstr "메일 온 계정"
-
-#: filter/libfilter-i18n.h:60
-msgid "Specific header"
-msgstr "특정 헤더"
-
-# FIXME - hard to translate UI + string based on English grammar
-#: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "시작함"
-
-#: filter/libfilter-i18n.h:63
-msgid "Stop Processing"
-msgstr "처리 중지"
-
-#: filter/libfilter-i18n.h:64 mail/em-format.c:755 mail/em-format-html.c:1519
-#: mail/em-format-quote.c:302 mail/em-mailer-prefs.c:87
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
-#: smime/lib/e-cert.c:1079
-msgid "Subject"
-msgstr "제목"
-
-#: filter/libfilter-i18n.h:65
-msgid "Unset Status"
-msgstr "상태 설정 없애기"
-
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "규칙 더하기"
@@ -13115,6 +12609,11 @@ msgstr "규칙 이름"
 msgid "_Score Rules"
 msgstr "점수 규칙(_S)"
 
+#: filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "점수"
+
 # FIXME - hard to translate UI + string based on English grammar
 #: filter/searchtypes.xml.h:1
 msgid "Body contains"
@@ -13198,13 +12697,13 @@ msgstr "서명"
 msgid "-------- Forwarded Message --------"
 msgstr "-------- 전달된 메시지 --------"
 
-#: mail/em-composer-utils.c:1499
+#: mail/em-composer-utils.c:1495
 msgid "an unknown sender"
 msgstr "알 수 없는 보낸 이"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1509
+#: mail/em-composer-utils.c:1505
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "%Y-%m-%d (%a) %H:%M %%+05d에, %%s 쓰기를:"
 
@@ -13242,8 +12741,8 @@ msgstr "<폴더를 고를려면 여기를 누르십시오>"
 msgid "Create New Folder"
 msgstr "새 폴더 만들기"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
-#: mail/mail-component.c:701
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
+#: mail/mail-component.c:704
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "폴더 만들 곳을 지정하십시오:"
@@ -13258,103 +12757,104 @@ msgstr "폴더를 만듭니다"
 msgid "Folder _name:"
 msgstr "폴더 이름(_N):"
 
-#: mail/em-folder-tree.c:839
+#: mail/em-folder-tree.c:833
 #, c-format
 msgid "Moving folder %s"
 msgstr "%s 폴더를 옮기는 중"
 
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree.c:835
 #, c-format
 msgid "Copying folder %s"
 msgstr "%s 폴더를 복사하는 중"
 
-#: mail/em-folder-tree.c:848 mail/message-list.c:1555
+#: mail/em-folder-tree.c:842 mail/message-list.c:1561
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "메시지를 %s 폴더로 옮기는 중"
 
-#: mail/em-folder-tree.c:850 mail/message-list.c:1557
+#: mail/em-folder-tree.c:844 mail/message-list.c:1563
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "메시지를 %s 폴더로 복사하는 중"
 
-#: mail/em-folder-tree.c:866
+#: mail/em-folder-tree.c:860
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "메세지를 맨 위의 저장고에 넣을 수 없습니다"
 
-#: mail/em-folder-tree.c:956 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "폴더로 복사(_C)"
 
-#: mail/em-folder-tree.c:957 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "폴더로 이동(_M)"
 
-#: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2069
-#: mail/em-folder-tree.c:2551 mail/em-folder-view.c:798
-#: mail/message-list.c:1645
+#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
+#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
+#: mail/message-list.c:1651
 msgid "_Move"
 msgstr "이동(_N)"
 
-#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#: mail/em-folder-tree.c:955 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "작업 취소"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
 #: mail/em-folder-view.c:798 mail/em-folder-view.c:812
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "폴더 선택"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
 #, fuzzy
 msgid "C_opy"
 msgstr "복사"
 
-#: mail/em-folder-tree.c:2096
+#: mail/em-folder-tree.c:2088
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "`%s' 폴더를 만드는 중입니다"
 
-#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
+#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
 msgid "Create folder"
 msgstr "폴더를 만듭니다"
 
-#: mail/em-folder-tree.c:2474
+#: mail/em-folder-tree.c:2463
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "\"%s\" 폴더 이름 바꾸기:"
 
-#: mail/em-folder-tree.c:2476
+#: mail/em-folder-tree.c:2465
 msgid "Rename Folder"
 msgstr "폴더 이름 바꾸기"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "보기(_V)"
 
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2537
 msgid "Open in _New Window"
 msgstr "새 창에서 열기(_N)"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2555
+#: mail/em-folder-tree.c:2546
 msgid "_New Folder..."
 msgstr "새 폴더(_N)..."
 
-#: mail/em-folder-tree.c:2558
+#: mail/em-folder-tree.c:2549
 msgid "_Rename"
 msgstr "이름 바꾸기(_R)"
 
-#: mail/em-folder-tree.c:2561 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "등록 정보(_P)..."
 
 #: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:889
+#: mail/mail-vfolder.c:888
 msgid "VFolders"
 msgstr "가상 폴더"
 
@@ -13369,19 +12869,19 @@ msgstr "해당 없음"
 msgid "Inbox"
 msgstr "받은 편지함"
 
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
 msgid "Loading..."
 msgstr "읽어들이는 중..."
 
 #: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
 #: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
 #: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:551
+#: mail/mail-component.c:554
 msgid "Mail"
 msgstr "메일"
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "새 메세지로 고침(_E)..."
@@ -13395,17 +12895,17 @@ msgid "_Reply to Sender"
 msgstr "보낸 사람에게 회신(_R)"
 
 # List는 메일링 리스트를 말함.
-#: mail/em-folder-view.c:901 mail/em-popup.c:810
+#: mail/em-folder-view.c:901 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "리스트에 회신(_L)"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:811
+#: mail/em-folder-view.c:902 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "전체에 회신(_A)"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: mail/em-folder-view.c:903 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "전달(_F)"
@@ -13458,6 +12958,10 @@ msgstr "폴더로 옮기기(_V)..."
 msgid "_Copy to Folder..."
 msgstr "폴더로 복사(_C)..."
 
+#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "꼬리표"
+
 #: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "보낸 사람을 주소록에 더하기"
@@ -13507,12 +13011,12 @@ msgid "Filter on _Mailing List"
 msgstr "메일링 리스트에 대한 거르게(_M)"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
-#: mail/mail-config.glade.h:66
+#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "기본값"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1796
 msgid "Print Message"
 msgstr "메세지 인쇄"
 
@@ -13551,12 +13055,18 @@ msgstr "참조"
 msgid "Bcc"
 msgstr "숨은 참조"
 
+#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
+#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "제목"
+
 #: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
 #: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "날짜"
 
-#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
+#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
 msgid "Newsgroups"
 msgstr "뉴스그룹"
 
@@ -13754,7 +13264,7 @@ msgstr ""
 "메세지가 암호화되어 있지만, 약한 암호화 알고리즘으로 암호화되었습니다.  현실"
 "적인 시간 내에 다른 사람이 이 메세지의 내용을 알아 내는 건 매우 어렵습니다."
 
-#: mail/em-format-html-display.c:757
+#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
 msgid "_View Certificate"
 msgstr "인증서 보기(_V)"
 
@@ -13808,7 +13318,7 @@ msgstr ""
 msgid "Once per month"
 msgstr ""
 
-#: mail/em-migrate.c:1072
+#: mail/em-migrate.c:1168
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13819,86 +13329,86 @@ msgstr ""
 "\n"
 "폴더를 옮기는 동안 잠시 기다리십시오..."
 
-#: mail/em-migrate.c:1506
+#: mail/em-migrate.c:1602
 #, fuzzy, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "`%s' 폴더를 만들 수 없습니다: %s"
 
-#: mail/em-migrate.c:1532
+#: mail/em-migrate.c:1628
 #, fuzzy, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr ""
 "파일 디스크립터를 복사할 수가 없습니다: %s\n"
 " %s"
 
-#: mail/em-migrate.c:1715
+#: mail/em-migrate.c:1811
 #, fuzzy, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "%s에 대한 그룹 목록 파일을 저장할 수 없습니다: %s"
 
-#: mail/em-migrate.c:1919
+#: mail/em-migrate.c:2015
 #, fuzzy, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "POP 서버 %s에 인증하는 데 실패했습니다: %s"
 
-#: mail/em-migrate.c:1933
+#: mail/em-migrate.c:2029
 #, fuzzy, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "`%s' 디렉토리를 만들 수 없습니다: %s"
 
-#: mail/em-migrate.c:1962
+#: mail/em-migrate.c:2058
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#: mail/em-migrate.c:2413 mail/em-migrate.c:2425
 #, fuzzy, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "`%s' 디렉토리를 만들 수 없습니다: %s"
 
-#: mail/em-migrate.c:2480
+#: mail/em-migrate.c:2576
 #, fuzzy, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr ""
 "출력파일을 만들 수가 없습니다: %s\n"
 " %s"
 
-#: mail/em-migrate.c:2498
+#: mail/em-migrate.c:2594
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 msgstr ""
 
-#: mail/em-popup.c:699
+#: mail/em-popup.c:700
 msgid "Save As..."
 msgstr "다른 이름으로 저장..."
 
-#: mail/em-popup.c:717
+#: mail/em-popup.c:718
 #, c-format
 msgid "untitled_image.%s"
 msgstr "이름없는_그림.%s"
 
-#: mail/em-popup.c:807
+#: mail/em-popup.c:808
 msgid "Set as _Background"
 msgstr "바탕 화면으로 설정(_B)"
 
-#: mail/em-popup.c:809
+#: mail/em-popup.c:810
 msgid "_Reply to sender"
 msgstr "보낸 이에게 회신(_R)"
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:859
 msgid "_Open Link in Browser"
 msgstr "브라우저에서 링크 열기(_O)"
 
-#: mail/em-popup.c:859
+#: mail/em-popup.c:860
 msgid "Se_nd message to..."
 msgstr "메세지 보내기(_N)..."
 
-#: mail/em-popup.c:860
+#: mail/em-popup.c:861
 msgid "_Add to Addressbook"
 msgstr "주소록에 더하기(_A)"
 
-#: mail/em-popup.c:966
+#: mail/em-popup.c:967
 #, c-format
 msgid "Open in %s..."
 msgstr "%s에서 열기..."
@@ -14477,7 +13987,7 @@ msgstr "Evolution 메일 기본 설정 컨트롤"
 msgid "Mail Accounts"
 msgstr "메일 계정"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
 msgid "Mail Preferences"
 msgstr "메일 기본 설정"
 
@@ -14491,15 +14001,15 @@ msgid "Evolution is importing your old Elm mail"
 msgstr "Elm 메일을 Evolution에 가져오는 중입니다"
 
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:226
+#: mail/importers/evolution-mbox-importer.c:221
+#: mail/importers/evolution-outlook-importer.c:255
 #: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "가져오는 중..."
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:222
-#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/evolution-mbox-importer.c:223
+#: mail/importers/evolution-outlook-importer.c:257
 #: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "잠시 기다리십시오"
@@ -14521,21 +14031,23 @@ msgid "Elm"
 msgstr "Elm"
 
 #: mail/importers/evolution-mbox-importer.c:116
+#: mail/importers/evolution-outlook-importer.c:130
 msgid "Destination folder:"
 msgstr "대상 폴더:"
 
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder to import into"
 msgstr "어느 폴더로 가져올 지 선택하십시오"
 
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:254
 #: mail/importers/mail-importer.c:226
 #, c-format
 msgid "Importing `%s'"
 msgstr "%s 가져오는 중입니다"
 
-#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/evolution-outlook-importer.c:301
 #: mail/importers/mail-importer.c:140
 msgid "Importing mailbox"
 msgstr "메일함 가져오기"
@@ -14695,15 +14207,15 @@ msgstr ""
 msgid "%s License Agreement"
 msgstr "키 계약"
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
 msgid "_Host:"
 msgstr "호스트(_H):"
 
-#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
 msgid "User_name:"
 msgstr "사용자이름(_N):"
 
-#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
 msgid "_Path:"
 msgstr "경로(_P):"
 
@@ -14766,31 +14278,31 @@ msgstr "연락처 %d개"
 msgid ", %d unread"
 msgstr "전체 %d개, %d개 안 읽음"
 
-#: mail/mail-component.c:653
+#: mail/mail-component.c:656
 msgid "New Mail Message"
 msgstr "새 메일 메세지"
 
-#: mail/mail-component.c:654
+#: mail/mail-component.c:657
 msgid "_Mail Message"
 msgstr "메일 만들기(_M)"
 
-#: mail/mail-component.c:655
+#: mail/mail-component.c:658
 msgid "Compose a new mail message"
 msgstr "메일 메세지를 새로 작성합니다"
 
-#: mail/mail-component.c:661
+#: mail/mail-component.c:664
 msgid "New Mail Folder"
 msgstr "새 메일 폴더"
 
-#: mail/mail-component.c:662
+#: mail/mail-component.c:665
 msgid "Mail _Folder"
 msgstr "메일 폴더(_F)"
 
-#: mail/mail-component.c:663
+#: mail/mail-component.c:666
 msgid "Create a new mail folder"
 msgstr "새 메일 폴더를 만듭니다"
 
-#: mail/mail-component.c:795
+#: mail/mail-component.c:798
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
@@ -14802,7 +14314,7 @@ msgstr "서비스 확인중"
 msgid "Connecting to server..."
 msgstr "서버에 연결중..."
 
-#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "신원"
 
@@ -14816,7 +14328,7 @@ msgstr ""
 "을 보낼 때 정보를 더하지 않고 싶으면 채우지 않아도 됩니다."
 
 #: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid "Receiving Mail"
 msgstr "메일 받기"
 
@@ -14832,7 +14344,7 @@ msgstr ""
 msgid "Please select among the following options"
 msgstr "다음 옵션 중에 하나를 선택하십시오"
 
-#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr "메일 보내기"
 
@@ -14844,7 +14356,7 @@ msgstr ""
 "메일을 보낼 방법에 대해 정보를 입력하십시오. 잘 모르겠으면, 시스템 관리자나 "
 "인터넷 서비스 제공자에게 물어 보십시오."
 
-#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37
 msgid "Account Management"
 msgstr "계정 관리"
 
@@ -14861,248 +14373,253 @@ msgstr ""
 "니다. 이 계정의 이름을 아래의 빈 칸에 입력하십시오. 이 이름은 표시할 목적으로"
 "만 사용됩니다."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:2
 #, fuzzy
 msgid " Ch_eck for Supported Types "
 msgstr "지원하는 형식인지 확인(_C) "
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
 msgid "<b>Preview</b>"
 msgstr "<b>미리 보기</b>"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "<b>이 evolution 빌드는 SSL을 지원하지 않습니다</b>"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "<b>S_ignatures</b>"
 msgstr "<b>상태:<b>"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "<b>_Languages</b>"
 msgstr "<b>언어(_L)<b>"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
+msgid "<small>This will make the the filter more reliable, but slower</small>"
+msgstr ""
+
+#: mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">계정 정보</span>"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "<span weight=\"bold\">Checking for New Mail</span>"
 msgstr "새 메일 검사"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
 #, fuzzy
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr "<b>표시할 메일 헤더(_D)</b>"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">General</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "새 메일 알림"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 #, fuzzy
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">보안 MIME (S/MIME)</span>"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">보안</span>"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "임시 보관함의 메세지를 보냅니다"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:34
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:35
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "암호화된 메일을 보낼 때 자신에 대해서도 암호화(_L)"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:36
 msgid "Account Editor"
 msgstr "계정 편집기"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:38
 #, fuzzy
 msgid "Add Ne_w Signature..."
 msgstr "새 서명 더하기..."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Add _Script"
 msgstr "스크립트 더하기(_R)"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:40
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "암호화된 메일을 보낼 때 언제나 자신에 대해서 암호화(_W)"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "항상 참조(_C):"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "항상 숨은 참조(_B):"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Always _sign outgoing messages when using this account"
 msgstr "이 계정을 사용하면 보내는 메세지에 항상 사인합니다(_A)"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "키 모음에 들어 있는 키는 암호화할 때 언제나 신뢰합니다(_T)"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Attach original message"
 msgstr "원래 메세지 첨부"
 
-#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "첨부"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:48
 #, fuzzy
 msgid "Automatically _insert smiley images"
 msgstr "자동으로 이모티콘 그림 넣기(_A)"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Automatically check for _new mail every"
 msgstr "새 메일을 자동으로 확인(_A), 매"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "Baltic (ISO-8859-13)"
 msgstr "발트어 (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Baltic (ISO-8859-4)"
 msgstr "발트어 (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Beep w_hen new mail arrives"
 msgstr "새 메일이 도착하면 삑 소리냄(_B)"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "C_haracter set:"
 msgstr "글자셋(_H):"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Ch_eck for Supported Types "
 msgstr "지원하는 형식인지 확인(_C) "
 
-#: mail/mail-config.glade.h:53
-msgid "Check _Incoming Mail"
-msgstr "새 메일 확인(_I)"
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Check _incoming mail for junk"
+msgstr "쓰레기 메일 검사"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Check spelling while I _type"
 msgstr "입력할 때 맞춤법 검사(_T)"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Checks incoming mail messages to be Junk"
 msgstr "받는 메일이 정크메일인 지 검사합니다"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 msgid "Color for _misspelled words:"
 msgstr "맞춤법이 틀린 글자의 색상(_M):"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Colors"
 msgstr "색(_O)"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Confirm _when expunging a folder"
 msgstr "폴더를 지울 때 확인(_C)"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -15118,258 +14635,263 @@ msgstr ""
 "\n"
 "설정을 저장하려면 \"적용\"을 누르십시오."
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
 msgid "De_fault"
 msgstr "기본값(_F)"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Default character e_ncoding:"
 msgstr "기본 글자 인코딩(_E):"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 #, fuzzy
 msgid "Defaults"
 msgstr "기본값(_D)"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 msgid "Do not quote original message"
 msgstr "원래 메세지를 인용하지 않음"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "회의 요청에 대해 서명하지 않습니다 (Outlook 호환)(_M)"
 
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "완료"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Drafts _Folder:"
 msgstr "임시 보관함 폴더(_F):"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:77
 msgid "Email Accounts"
 msgstr "메일 계정"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Email _Address:"
 msgstr "전자메일 주소(_A):"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "Empty trash folders on e_xit"
 msgstr "끝날 때 휴지통 폴더 비우기(_T)"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
 msgid "Encry_ption certificate:"
 msgstr "암호화 인증서(_P):"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:81
 msgid "Evolution Account Assistant"
 msgstr "Evolution 계정 도우미"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:82
 msgid "Execute Command..."
 msgstr "명령 실행..."
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Fi_xed-width:"
 msgstr "고정폭(_X):"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 msgid "Font Properties"
 msgstr "글꼴 등록 정보"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 msgid "Format messages in _HTML"
 msgstr "HTML 형식 메세지(_H)"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "HTML Mail"
 msgstr "HTML 메일(_H)"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Headers"
 msgstr "머리말(_E):"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr "인용문은 다음 색깔로 강조(_Q):"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
 #: mail/mail-config.glade.h:91
+#, fuzzy
+msgid "I_nclude remote tests"
+msgstr "포함:"
+
+#: mail/mail-config.glade.h:94
 msgid "Inline"
 msgstr "포함"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Mail Configuration"
 msgstr "메일 설정"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "메일함 위치"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr "메세지 작성기"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "알림: 처음 연결하면 열쇠글을 물어보는 창이 뜰 것입니다"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Or_ganization:"
 msgstr "조직(_G):"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG 키 ID(_K):"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "Play sound file when new mail arri_ves"
 msgstr "새 메일이 도착하면 소리 연주(_P)"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "숨은 참조로만 메세지를 보내려 할 때 확인(_O)"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Qmail maildir "
 msgstr "Qmail 메일 디렉토리 "
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr "원래 메세지를 인용"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr "인용"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Re_member password"
 msgstr "열쇠글 기억"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr "회신 주소(_P):"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "메일을 받음"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:120
 #, fuzzy
 msgid "Receiving Options"
 msgstr "받기 옵션(_O)"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
 #, fuzzy
 msgid "Remember _password"
 msgstr "열쇠글 기억"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
 #, fuzzy
 msgid "S_tandard Font:"
 msgstr "보통 글꼴(_S):"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 #, fuzzy
 msgid "Security"
 msgstr "보안(_S)"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font"
 msgstr "HTML 고정폭 글꼴을 선택하십시오"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:126
 msgid "Select HTML fixed width font for printing"
 msgstr "인쇄에 사용할 HTML 고정폭 글꼴을 선택하십시오"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:127
 msgid "Select HTML variable width font"
 msgstr "HTML 가변폭 글꼴을 선택하십시오"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:128
 msgid "Select HTML variable width font for printing"
 msgstr "인쇄에 사용할 HTML 가변폭 글꼴을 선택하십시오"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:129
 #, fuzzy
 msgid "Select..."
 msgstr "선택(_S)..."
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "메일을 보냄"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Sent _Messages Folder:"
 msgstr "보낸 편지함 메세지 폴더(_M):"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:134
 msgid "Ser_ver requires authentication"
 msgstr "서버가 인증을 요구합니다(_V)"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:135
 msgid "Server _Type: "
 msgstr "서버 종류(_T): "
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:136
 msgid "Si_gning certificate:"
 msgstr "서명 인증서(_G):"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:137
 #, fuzzy
 msgid "Signat_ure:"
 msgstr "서명:"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "Signatures"
 msgstr "서명(_S)"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr "파일 이름 지정(_F):"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "Spell Checking"
 msgstr "맞춤법 검사(_C)"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:141
 msgid "Standard Unix mbox"
 msgstr "표준 유닉스 mbox"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "T_erminal Font:"
 msgstr "터미널 글꼴(_T):"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "T_ype: "
 msgstr "형태:"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -15378,7 +14900,7 @@ msgstr ""
 "다음 스크립트의 출력물이 서명으로 사용됩니다. \"이름\"은 표시 목적으로만 이용"
 "됩니다."
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
@@ -15387,7 +14909,7 @@ msgstr ""
 "이 페이지에서 맞춤법 검사 방법과 검사할 언어를 설정할 수 있습니다. 사전을 설"
 "치한 언어만 여기 언어 목록에 보입니다."
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:149
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -15395,15 +14917,11 @@ msgstr ""
 "이 계정에 쓸 이름을 입력하십시오.\n"
 "예: \"작업용\" 또는 \"개인용\""
 
-#: mail/mail-config.glade.h:148
-msgid "Use _Daemon"
-msgstr "데몬 사용(_D)"
-
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:152
 msgid "V_ariable-width:"
 msgstr "가변폭(_A):"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:153
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -15413,93 +14931,89 @@ msgstr ""
 "\n"
 "시작하려면 \"다음\"을 누르십시오. "
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:158
 msgid "_Add Signature"
 msgstr "서명 더하기(_A)"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Always load images from the Internet"
 msgstr "항상 네트워크에서 그림 읽어들이기(_A)"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Digitally sign outgoing messages (by default)"
 msgstr "나가는 메세지에 항상 디지탈 서명함(_S)"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:161
 msgid "_Do not notify me when new mail arrives"
 msgstr "새 메일이 도착해도 알리지 않음(_D)"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:163
 msgid "_Enable"
 msgstr "사용(_E)"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 msgid "_Encrypt outgoing messages (by default)"
 msgstr "보내는 메세지 암호화 (기본값으로)(_E)"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:165
 msgid "_Forward style:"
 msgstr "전달 모양(_F):"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:168
 msgid "_Load images if sender is in address book"
 msgstr "보낸 사람이 주소록에 있으면 그림 읽어들이기(_L)"
 
-#: mail/mail-config.glade.h:167
-msgid "_Local Tests Only"
-msgstr "로컬 검사만 사용(_L)"
-
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Make this my default account"
 msgstr "내 기본 계정으로 하기(_M)"
 
 # FIXME - hard to translate UI + string based on English grammar
 # "Mark messages as read after <seconds> seconds"
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_Mark messages as read after"
 msgstr "다음 시간이 지나면 읽은 것으로 표시(_M):"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Never load images from the Internet"
 msgstr "그림을 네트워크에서 읽어들이지 않기(_N)"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "HTML 메세지를 원하지 않는 사람한테 보내려 할 때 확인(_P)"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:175
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "빈 제목으로 메세지를 보내려 할 때 확인(_P)"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:176
 msgid "_Reply style:"
 msgstr "회신 모양(_R):"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:177
 msgid "_Script:"
 msgstr "스크립트(_S):"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:178
 msgid "_Show animated images"
 msgstr "그림 움직임 보이기(_S)"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "_Use Secure Connection (SSL):"
 msgstr "보안 연결(SSL) 사용(_U):"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "_Use the same fonts as other applications"
 msgstr "다른 프로그램과 같은 글꼴 쓰기(_U)"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:181
 msgid "color"
 msgstr "색상"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "설명"
 
@@ -15672,7 +15186,7 @@ msgstr ""
 
 #. mail:camel-exception primary
 #: mail/mail-errors.xml.h:57
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgid "Your message with the subject \"{0}\" was not delivered."
 msgstr ""
 
 #. mail:camel-exception secondary
@@ -15738,11 +15252,6 @@ msgstr ""
 msgid "Cannot save to directory \"{0}\"."
 msgstr "'%s' 디렉토리를 만들 수 없습니다: %s."
 
-#. mail:no-save-path secondary
-#: mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail:no-create-path primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
@@ -15764,12 +15273,6 @@ msgstr "'%s' 디렉토리를 만들 수 없습니다: %s."
 msgid "Cannot create temporary save directory."
 msgstr "임시 디렉토리를 만들 수가 없습니다: %s"
 
-#. mail:no-create-tmp-path secondary
-#: mail/mail-errors.xml.h:100 mail/mail-errors.xml.h:112
-#: widgets/misc/e-system-errors.xml.h:11 widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail:no-write-path-exists secondary
 #: mail/mail-errors.xml.h:104
 #, fuzzy
@@ -16044,29 +15547,25 @@ msgstr "덮어 쓰기"
 msgid "_Append"
 msgstr "보내기"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:785
 #, c-format
 msgid "Pinging %s"
 msgstr "\"%s\" 연결을 확인하는 중입니다"
 
-#: mail/mail-mt.c:897
-msgid "Working"
-msgstr "작업 중"
-
-#: mail/mail-ops.c:99
+#: mail/mail-ops.c:98
 msgid "Filtering Folder"
 msgstr "폴더 거르는 중"
 
-#: mail/mail-ops.c:260
+#: mail/mail-ops.c:259
 msgid "Fetching Mail"
 msgstr "메일 가져오는 중"
 
-#: mail/mail-ops.c:543
+#: mail/mail-ops.c:542
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "나가는 거르게를 적용하는 데 실패했습니다: %s"
 
-#: mail/mail-ops.c:568
+#: mail/mail-ops.c:567
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -16075,113 +15574,113 @@ msgstr ""
 "%s에 추가하는 데 실패했습니다: %s\n"
 "대신에 로컬의 `보낸 편지함'에 추가합니다."
 
-#: mail/mail-ops.c:577
+#: mail/mail-ops.c:576
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "로컬의 '보낸 편지함' 폴더에 추가하는 데 실패했습니다: %s"
 
-#: mail/mail-ops.c:673
+#: mail/mail-ops.c:672
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%2$d개 중에서 %1$d번째 메세지를 보내는 중입니다"
 
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:703
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "%2$d개 메세지 중에서 %1$d번째를 보내는 데 실패했습니다"
 
-#: mail/mail-ops.c:708
+#: mail/mail-ops.c:707
 msgid "Complete."
 msgstr "완료."
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:804
 msgid "Saving message to folder"
 msgstr "메세지를 폴더로 저장하는 중"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Moving messages to %s"
 msgstr "메시지들을 %s(으)로 옮기는 중"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Copying messages to %s"
 msgstr "메시지들을 %s(으)로 복사하는 중"
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:1002
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\"의 폴더를 찾는 중"
 
-#: mail/mail-ops.c:1116
+#: mail/mail-ops.c:1115
 msgid "Forwarded messages"
 msgstr "전달된 메시지"
 
-#: mail/mail-ops.c:1159
+#: mail/mail-ops.c:1158
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s 폴더를 열기"
 
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1230
 #, c-format
 msgid "Opening store %s"
 msgstr "저장고 %s을(를) 여는 중입니다"
 
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1308
 #, c-format
 msgid "Removing folder %s"
 msgstr "%s 폴더를 지우는 중입니다"
 
-#: mail/mail-ops.c:1403
+#: mail/mail-ops.c:1402
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "%s 폴더를 저장하는 중입니다"
 
-#: mail/mail-ops.c:1468
+#: mail/mail-ops.c:1467
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "계정 '%s'의 지운 메세지를 비우고 내용을 저장하는 중입니다"
 
-#: mail/mail-ops.c:1469
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Storing account '%s'"
 msgstr "%s 계정을 저장하는 중입니다"
 
-#: mail/mail-ops.c:1524
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr "폴더 다시 읽는 중입니다"
 
-#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
+#: mail/mail-ops.c:1559 mail/mail-ops.c:1610
 msgid "Expunging folder"
 msgstr "지운 메세지를 비우는 중입니다"
 
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1607
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "'%s' 안의 휴지통을 비우는 중입니다"
 
-#: mail/mail-ops.c:1609
+#: mail/mail-ops.c:1608
 msgid "Local Folders"
 msgstr "로컬 폴더"
 
-#: mail/mail-ops.c:1692
+#: mail/mail-ops.c:1691
 #, c-format
 msgid "Retrieving message %s"
 msgstr "메세지 %s을(를) 가져오기"
 
-#: mail/mail-ops.c:1764
+#: mail/mail-ops.c:1763
 #, fuzzy, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "메세지 %d개 가져오는중"
 
-#: mail/mail-ops.c:1850
+#: mail/mail-ops.c:1849
 #, fuzzy, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "메시지 %d개 저장중"
 
-#: mail/mail-ops.c:1900
+#: mail/mail-ops.c:1899
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -16190,7 +15689,7 @@ msgstr ""
 "출력파일을 만들 수가 없습니다: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1928
+#: mail/mail-ops.c:1927
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -16199,11 +15698,11 @@ msgstr ""
 "%s(으)로 메시지 저장 중 오류 발생:\n"
 " %s"
 
-#: mail/mail-ops.c:1999
+#: mail/mail-ops.c:1998
 msgid "Saving attachment"
 msgstr "첨부 저장"
 
-#: mail/mail-ops.c:2016
+#: mail/mail-ops.c:2015
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -16212,17 +15711,17 @@ msgstr ""
 "출력 파일을 만들 수 없음: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2046
+#: mail/mail-ops.c:2045
 #, c-format
 msgid "Could not write data: %s"
 msgstr "데이터를 쓸 수가 없습니다: %s"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s에서 연결 끊는 중"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s(으)로 다시 연결중"
@@ -16286,24 +15785,24 @@ msgstr "업데이트 중..."
 msgid "Waiting..."
 msgstr "기다리는 중..."
 
-#: mail/mail-session.c:238
+#: mail/mail-session.c:239
 msgid "User canceled operation."
 msgstr "사용자가 취소한 동작."
 
-#: mail/mail-session.c:271
+#: mail/mail-session.c:272
 #, c-format
 msgid "Enter Password for %s"
 msgstr "%s의 열쇠글을 입력하십시오"
 
-#: mail/mail-session.c:273
+#: mail/mail-session.c:274
 msgid "Enter Password"
 msgstr "열쇠글 입력"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password"
 msgstr "이 열쇠글 기억(_R)"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:298
 msgid "_Remember this password for the remainder of this session"
 msgstr "이 세션에서 이 열쇠글을 기억합니다(_R)"
 
@@ -16358,80 +15857,80 @@ msgstr "가상폴더의 uri 새로 고침: %s"
 msgid "Updating vFolders for '%s'"
 msgstr "가상폴더의 uri 새로 고침: %s"
 
-#: mail/mail-vfolder.c:959
+#: mail/mail-vfolder.c:958
 msgid "vFolders"
 msgstr "가상 폴더"
 
-#: mail/mail-vfolder.c:998
+#: mail/mail-vfolder.c:997
 msgid "Edit VFolder"
 msgstr "가상폴더 편집"
 
-#: mail/mail-vfolder.c:1082
+#: mail/mail-vfolder.c:1081
 msgid "New VFolder"
 msgstr "새 가상폴더"
 
-#: mail/message-list.c:946
+#: mail/message-list.c:948
 msgid "Unseen"
 msgstr "보지않았음"
 
-#: mail/message-list.c:947
+#: mail/message-list.c:949
 msgid "Seen"
 msgstr "봤음"
 
-#: mail/message-list.c:948
+#: mail/message-list.c:950
 msgid "Answered"
 msgstr "응답함"
 
-#: mail/message-list.c:949
+#: mail/message-list.c:951
 msgid "Multiple Unseen Messages"
 msgstr "여러개의 보지않은 메세지"
 
-#: mail/message-list.c:950
+#: mail/message-list.c:952
 msgid "Multiple Messages"
 msgstr "여러 메세지"
 
-#: mail/message-list.c:954
+#: mail/message-list.c:956
 msgid "Lowest"
 msgstr "가장 낮음"
 
-#: mail/message-list.c:955
+#: mail/message-list.c:957
 msgid "Lower"
 msgstr "낮음"
 
-#: mail/message-list.c:959
+#: mail/message-list.c:961
 msgid "Higher"
 msgstr "높음"
 
-#: mail/message-list.c:960
+#: mail/message-list.c:962
 msgid "Highest"
 msgstr "가장 높음"
 
 # ???
-#: mail/message-list.c:1279
+#: mail/message-list.c:1285
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1286
+#: mail/message-list.c:1292
 msgid "Today %l:%M %p"
 msgstr "오늘 %p %l:%M"
 
-#: mail/message-list.c:1295
+#: mail/message-list.c:1301
 msgid "Yesterday %l:%M %p"
 msgstr "어제 %p %l:%M "
 
-#: mail/message-list.c:1307
+#: mail/message-list.c:1313
 msgid "%a %l:%M %p"
 msgstr "(%a) %p %l:%M"
 
-#: mail/message-list.c:1315
+#: mail/message-list.c:1321
 msgid "%b %d %l:%M %p"
 msgstr "%b %e일 %p %l:%M"
 
-#: mail/message-list.c:1317
+#: mail/message-list.c:1323
 msgid "%b %d %Y"
 msgstr "%Y년 %b %e일"
 
-#: mail/message-list.c:3300
+#: mail/message-list.c:3321
 msgid "Generating message list"
 msgstr "메세지 목록 작성중"
 
@@ -16487,6 +15986,10 @@ msgstr "전달"
 msgid "No Response Necessary"
 msgstr "회신이 필요 없음"
 
+#: mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "읽음"
+
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "회신"
@@ -16586,44 +16089,48 @@ msgid ""
 msgstr "오프라인에서 사용할 때 동기화할 폴더의 경로 목록"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid "Toolbar is visible"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Whether Evolution should start up in offline mode"
 msgstr "Evolution을 오프라인 모드로 시작할 지 여부"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Whether the toolbar should be visible."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
 msgid "Whether to skip the development warning dialog"
 msgstr "개발 버전 경고를 건너 뛸지 여부"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
+#: shell/apps_evolution_shell.schemas.in.in.h:14
 msgid "mail"
 msgstr "메일"
 
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
-msgstr "다음 사람들 덕분에 여기까지 왔습니다"
-
-#: shell/e-shell.c:545 shell/e-shell.c:546
+#: shell/e-shell.c:588 shell/e-shell.c:589
 #, fuzzy, c-format
 msgid "%ld KB"
 msgstr "%b %e일"
 
-#: shell/e-shell.c:744
+#: shell/e-shell.c:786
 #, fuzzy
 msgid "Uknown system error."
 msgstr "알 수 없는 오류가 발생했습니다"
 
-#: shell/e-shell.c:1101
+#: shell/e-shell.c:1143
 msgid "Invalid arguments"
 msgstr "인자가 잘못되었습니다"
 
-#: shell/e-shell.c:1103
+#: shell/e-shell.c:1145
 msgid "Cannot register on OAF"
 msgstr "OAF에 등록할 수 없습니다"
 
-#: shell/e-shell.c:1105
+#: shell/e-shell.c:1147
 msgid "Configuration Database not found"
 msgstr "설정 데이터베이스를 찾을 수 없습니다"
 
-#: shell/e-shell.c:1107
+#: shell/e-shell.c:1149
 msgid "Generic error"
 msgstr "일반 오류"
 
@@ -16681,7 +16188,7 @@ msgstr ""
 msgid "Select importer"
 msgstr "가져오기 선택"
 
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1026
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
 #, c-format
 msgid "File %s does not exist"
 msgstr "파일 %s은(는) 없습니다."
@@ -16709,31 +16216,32 @@ msgstr ""
 "%s을(를) 가져오는 중\n"
 "아이템 1을 가져옴."
 
-#: shell/e-shell-importer.c:549
+#: shell/e-shell-importer.c:570
 msgid "Automatic"
 msgstr "자동"
 
-#: shell/e-shell-importer.c:598
-msgid "_Filename:"
-msgstr "파일 이름(_F):"
+#: shell/e-shell-importer.c:626
+#, fuzzy
+msgid "F_ilename:"
+msgstr "파일 이름:"
 
-#: shell/e-shell-importer.c:603
+#: shell/e-shell-importer.c:631
 msgid "Select a file"
 msgstr "파일을 고르십시오"
 
-#: shell/e-shell-importer.c:613
+#: shell/e-shell-importer.c:642
 msgid "File _type:"
 msgstr "파일 종류(_T):"
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:681
 msgid "Import data and settings from _older programs"
 msgstr "과거에 쓰던 프로그램에서 데이터 및 설정 사항 가져오기(_O)"
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:684
 msgid "Import a _single file"
 msgstr "파일 한 개 가져오기(_S)"
 
-#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -16741,25 +16249,25 @@ msgstr ""
 "잠시 기다려 주십시오...\n"
 "현재 설정을 검사중입니다"
 
-#: shell/e-shell-importer.c:727
+#: shell/e-shell-importer.c:756
 msgid "Starting Intelligent Importers"
 msgstr "똑똑한 가져오기를 시작하는 중입니다"
 
-#: shell/e-shell-importer.c:853 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
 #, c-format
 msgid "From %s:"
 msgstr "%s에서:"
 
-#: shell/e-shell-importer.c:1044
+#: shell/e-shell-importer.c:1073
 #, c-format
 msgid "No importer available for file %s"
 msgstr "%s 파일에 사용할 수 있는 가져오기 기능이 없습니다"
 
-#: shell/e-shell-importer.c:1056
+#: shell/e-shell-importer.c:1085
 msgid "Unable to execute importer"
 msgstr "가져오기 기능을 실행할 수 없습니다"
 
-#: shell/e-shell-importer.c:1169
+#: shell/e-shell-importer.c:1199
 msgid "_Import"
 msgstr "가져오기(_I)"
 
@@ -16808,61 +16316,61 @@ msgstr "폴더 이름에 \"#\" 문자가 들어갈 수 없습니다."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' 과 '..'는 쓸 수 없는 폴더 이름입니다."
 
-#: shell/e-shell-window.c:336
+#: shell/e-shell-window.c:337
 #, fuzzy
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution은 온라인 상태입니다.  오프라인 상태로 작업하려면 이 단추를 "
 "누르십시오."
 
-#: shell/e-shell-window.c:343
+#: shell/e-shell-window.c:344
 #, fuzzy
 msgid "Evolution is in the process of going offline."
 msgstr "Ximian Evolution은 오프라인 상태로 가는 중입니다."
 
-#: shell/e-shell-window.c:349
+#: shell/e-shell-window.c:350
 #, fuzzy
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution은 오프라인 상태입니다.  온라인 상태로 작업하려면 이 단추를 "
 "누르십시오."
 
-#: shell/e-shell-window.c:621
+#: shell/e-shell-window.c:637
 #, fuzzy, c-format
 msgid "Switch to %s"
 msgstr "%s에 보내는 메일"
 
-#: shell/e-shell-window-commands.c:64
+#: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "이 시스템에 그놈 파일럿 툴이 설치되지 않았습니다."
 
-#: shell/e-shell-window-commands.c:72
+#: shell/e-shell-window-commands.c:74
 #, c-format
 msgid "Error executing %s."
 msgstr "%s 실행 중 오류가 발생했습니다."
 
-#: shell/e-shell-window-commands.c:121
+#: shell/e-shell-window-commands.c:123
 msgid "Bug buddy is not installed."
 msgstr "Bug buddy가 설치되지 않았습니다."
 
-#: shell/e-shell-window-commands.c:129
+#: shell/e-shell-window-commands.c:131
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy를 실행할 수 없습니다."
 
-#: shell/e-shell-window-commands.c:171
+#: shell/e-shell-window-commands.c:323
 #, fuzzy
-msgid "About Evolution"
-msgstr "Ximian Evolution 정보"
+msgid "Groupware Suite"
+msgstr "Groupwise"
 
-#: shell/e-shell-window-commands.c:382
+#: shell/e-shell-window-commands.c:563
 msgid "_Work Online"
 msgstr "온라인 작업(_W)"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "오프라인 작업(_W)"
 
-#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "오프라인에서 작업"
 
@@ -16875,43 +16383,6 @@ msgstr "확인란"
 msgid "New"
 msgstr "새로 만들기"
 
-#: shell/evolution-shell-component-utils.c:115
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"알 수 없는 오류."
-
-#: shell/evolution-shell-component-utils.c:118
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"컴포넌트 시스템의 오류는:\n"
-"%s"
-
-#: shell/evolution-shell-component-utils.c:125
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"액티베이션 시스템의 오류는:\n"
-"%s"
-
 #: shell/evolution-test-component.c:140
 msgid "New Test"
 msgstr "새 테스트"
@@ -17236,30 +16707,30 @@ msgid ""
 "Click help for details."
 msgstr ""
 
-#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:522
+#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
+#: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
 msgstr "가져올 인증서를 선택하십시오..."
 
-#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:604
+#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
+#: smime/gui/certificate-manager.c:638
 msgid "Certificate Name"
 msgstr "인증서 이름"
 
-#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
+#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
 msgid "Purposes"
 msgstr "목적"
 
-#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:517
+#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr "일련 번호"
 
-#: smime/gui/certificate-manager.c:267
+#: smime/gui/certificate-manager.c:271
 msgid "Expires"
 msgstr "만료"
 
-#: smime/gui/certificate-manager.c:417
+#: smime/gui/certificate-manager.c:446
 msgid "E-Mail Address"
 msgstr "전자메일 주소"
 
@@ -17303,6 +16774,11 @@ msgstr ""
 "발급자:\n"
 "  소유자:  %s\n"
 
+#: smime/gui/e-cert-selector.c:169
+#, fuzzy
+msgid "Select certificate"
+msgstr "SSL 클라이언트 인증서"
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr "<인증서에 없습니다>"
@@ -17359,7 +16835,7 @@ msgstr ""
 "어떤 목적이든 이 인증기관을 신뢰하기 전에, 그 인증서와 정책과 (있다면) 프로시"
 "저를 확인해야 합니다."
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
 msgid "Certificate"
 msgstr "인증서"
 
@@ -17379,20 +16855,24 @@ msgstr "공통 이름 (CN)"
 msgid "Contact Certificates"
 msgstr "연락처 인증서"
 
-#: smime/gui/smime-ui.glade.h:21
-#, no-c-format
-msgid "Do you want to trust \"%s\" for the following purposes?"
-msgstr "다음 목적에 대하여 \"%s\"을(를) 신뢰하시겠습니까?"
+#: smime/gui/smime-ui.glade.h:20
+msgid "Do not trust the authenticity of this certificate"
+msgstr ""
 
 # FIXME - ?
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:21
 msgid "Dummy window only"
 msgstr "가짜 창 전용"
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:22
 msgid "Edit"
 msgstr "편집"
 
+#: smime/gui/smime-ui.glade.h:23
+#, fuzzy
+msgid "Email Certificate Trust Settings"
+msgstr "전자메일 인증 기관"
+
 #: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr "전자메일 받는 사람 인증서"
@@ -17425,247 +16905,258 @@ msgstr "소속 구분 (Organizational Unit, OU)"
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 핑거프린트"
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr "SSL 클라이언트 인증서"
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr "SSL 서버 인증서"
 
 #: smime/gui/smime-ui.glade.h:37
+msgid "Trust the authenticity of this certificate"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
 msgid "Trust this CA to identify email users."
 msgstr "전자메일 사용자를 확인할 때 이 인증기관을 신뢰합니다."
 
-#: smime/gui/smime-ui.glade.h:38
+#: smime/gui/smime-ui.glade.h:39
 msgid "Trust this CA to identify software developers."
 msgstr "소프트웨어 개발자를 확인할 때 이 인증기관을 신뢰합니다."
 
-#: smime/gui/smime-ui.glade.h:39
+#: smime/gui/smime-ui.glade.h:40
 msgid "Trust this CA to identify web sites."
 msgstr "웹 사이트를 확인할 때 이 인증기관을 신뢰합니다."
 
-#: smime/gui/smime-ui.glade.h:40
+#: smime/gui/smime-ui.glade.h:41
 msgid "View"
 msgstr "보기"
 
-#: smime/gui/smime-ui.glade.h:41
-msgid "View Certificate"
-msgstr "인증서 보기"
-
 #: smime/gui/smime-ui.glade.h:42
-msgid "You have been asked to trust a new Certificate Authority (CA)."
-msgstr "새 인증 기관(CA)을 신뢰할 것인지 질문을 받았습니다."
-
-#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr "다음 기관에서 나를 확인할 수 있는 인증서가 있습니다:"
 
-#: smime/gui/smime-ui.glade.h:44
+#: smime/gui/smime-ui.glade.h:43
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr "다음 인증 기관은 확인할 수 있는 인증서가 있습니다:"
 
-#: smime/gui/smime-ui.glade.h:45
+#: smime/gui/smime-ui.glade.h:44
 msgid "You have certificates on file that identify these people:"
 msgstr "다음 사람들은 확인할 수 있는 인증서가 있습니다:"
 
-#: smime/gui/smime-ui.glade.h:46
+#: smime/gui/smime-ui.glade.h:45
 msgid "Your Certificates"
 msgstr "내 인증서"
 
-#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
+#: smime/gui/smime-ui.glade.h:46
+msgid "_Edit CA Trust"
+msgstr ""
+
+#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%Y/%m/%d"
 
-#: smime/lib/e-cert.c:478
+#. x509 certificate usage types
+#: smime/lib/e-cert.c:424
+#, fuzzy
+msgid "Sign"
+msgstr "서명"
+
+#: smime/lib/e-cert.c:425
+#, fuzzy
+msgid "Encrypt"
+msgstr "암호화됨"
+
+#: smime/lib/e-cert.c:530
 msgid "Version"
 msgstr "버전"
 
-#: smime/lib/e-cert.c:493
+#: smime/lib/e-cert.c:545
 msgid "Version 1"
 msgstr "버전 1"
 
-#: smime/lib/e-cert.c:496
+#: smime/lib/e-cert.c:548
 msgid "Version 2"
 msgstr "버전 2"
 
-#: smime/lib/e-cert.c:499
+#: smime/lib/e-cert.c:551
 msgid "Version 3"
 msgstr "버전 3"
 
-#: smime/lib/e-cert.c:581
+#: smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2, RSA 암호화"
 
-#: smime/lib/e-cert.c:584
+#: smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5, RSA 암호화"
 
-#: smime/lib/e-cert.c:587
+#: smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1, RSA 암호화"
 
-#: smime/lib/e-cert.c:590
+#: smime/lib/e-cert.c:642
 msgid "C"
 msgstr "C"
 
-#: smime/lib/e-cert.c:593
+#: smime/lib/e-cert.c:645
 msgid "CN"
 msgstr "CN"
 
-#: smime/lib/e-cert.c:596
+#: smime/lib/e-cert.c:648
 msgid "OU"
 msgstr "OU"
 
-#: smime/lib/e-cert.c:599
+#: smime/lib/e-cert.c:651
 msgid "O"
 msgstr "O"
 
-#: smime/lib/e-cert.c:602
+#: smime/lib/e-cert.c:654
 msgid "L"
 msgstr "L"
 
-#: smime/lib/e-cert.c:605
+#: smime/lib/e-cert.c:657
 msgid "DN"
 msgstr "DN"
 
-#: smime/lib/e-cert.c:608
+#: smime/lib/e-cert.c:660
 msgid "DC"
 msgstr "DC"
 
-#: smime/lib/e-cert.c:611
+#: smime/lib/e-cert.c:663
 msgid "ST"
 msgstr "ST"
 
-#: smime/lib/e-cert.c:614
+#: smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA 암호화"
 
-#: smime/lib/e-cert.c:617
+#: smime/lib/e-cert.c:669
 msgid "Certificate Key Usage"
 msgstr "인증서 키 용도"
 
-#: smime/lib/e-cert.c:620
+#: smime/lib/e-cert.c:672
 msgid "Netscape Certificate Type"
 msgstr "넷스케이프 인증서 타입"
 
-#: smime/lib/e-cert.c:623
+#: smime/lib/e-cert.c:675
 msgid "Certificate Authority Key Identifier"
 msgstr "인증 기관 키 ID"
 
-#: smime/lib/e-cert.c:626
+#: smime/lib/e-cert.c:678
 msgid "UID"
 msgstr "UID"
 
-#: smime/lib/e-cert.c:635
+#: smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "오브젝트 ID (%s)"
 
-#: smime/lib/e-cert.c:686
+#: smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
 msgstr "알고리즘 ID"
 
-#: smime/lib/e-cert.c:694
+#: smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
 msgstr "알고리즘 인수"
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:768
 msgid "Subject Public Key Info"
 msgstr "소유자 공개 키 정보"
 
-#: smime/lib/e-cert.c:721
+#: smime/lib/e-cert.c:773
 msgid "Subject Public Key Algorithm"
 msgstr "소유자 공개 키 알고리즘"
 
-#: smime/lib/e-cert.c:736
+#: smime/lib/e-cert.c:788
 msgid "Subject's Public Key"
 msgstr "소유자의 공개 키"
 
-#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
+#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
 msgid "Error: Unable to process extension"
 msgstr "오류: 추가 항목을 처리할 수 없습니다"
 
-#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
+#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr "오브젝트 서명자"
 
-#: smime/lib/e-cert.c:782
+#: smime/lib/e-cert.c:834
 msgid "SSL Certificate Authority"
 msgstr "SSL 인증 기관"
 
-#: smime/lib/e-cert.c:786
+#: smime/lib/e-cert.c:838
 msgid "Email Certificate Authority"
 msgstr "전자메일 인증 기관"
 
-#: smime/lib/e-cert.c:814
+#: smime/lib/e-cert.c:866
 msgid "Signing"
 msgstr "서명"
 
-#: smime/lib/e-cert.c:818
+#: smime/lib/e-cert.c:870
 msgid "Non-repudiation"
 msgstr "거부할 수 없음"
 
-#: smime/lib/e-cert.c:822
+#: smime/lib/e-cert.c:874
 msgid "Key Encipherment"
 msgstr "키 암호화"
 
-#: smime/lib/e-cert.c:826
+#: smime/lib/e-cert.c:878
 msgid "Data Encipherment"
 msgstr "데이터 암호화"
 
-#: smime/lib/e-cert.c:830
+#: smime/lib/e-cert.c:882
 msgid "Key Agreement"
 msgstr "키 계약"
 
-#: smime/lib/e-cert.c:834
+#: smime/lib/e-cert.c:886
 msgid "Certificate Signer"
 msgstr "인증서 서명자"
 
-#: smime/lib/e-cert.c:838
+#: smime/lib/e-cert.c:890
 msgid "CRL Signer"
 msgstr "CRL 서명자"
 
-#: smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:938
 msgid "Critical"
 msgstr "중요함"
 
-#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
+#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
 msgid "Not Critical"
 msgstr "중요하지 않음"
 
-#: smime/lib/e-cert.c:912
+#: smime/lib/e-cert.c:964
 msgid "Extensions"
 msgstr "확장 기능"
 
-#: smime/lib/e-cert.c:983
+#: smime/lib/e-cert.c:1035
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
 msgid "Certificate Signature Algorithm"
 msgstr "인증서 서명 알고리즘"
 
-#: smime/lib/e-cert.c:1048
+#: smime/lib/e-cert.c:1100
 msgid "Issuer"
 msgstr "발급자"
 
-#: smime/lib/e-cert.c:1102
+#: smime/lib/e-cert.c:1154
 msgid "Issuer Unique ID"
 msgstr "발급자 고유 ID"
 
-#: smime/lib/e-cert.c:1121
+#: smime/lib/e-cert.c:1173
 msgid "Subject Unique ID"
 msgstr "소유자 고유 ID"
 
-#: smime/lib/e-cert.c:1164
+#: smime/lib/e-cert.c:1216
 msgid "Certificate Signature Value"
 msgstr "인증서 서명 값"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
+#: smime/lib/e-cert-db.c:608
 msgid "Certificate already exists"
 msgstr "인증서가 이미 있습니다"
 
@@ -17811,7 +17302,7 @@ msgstr "현재 연락처를 봅니다"
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "실행(_A)"
 
@@ -17975,7 +17466,7 @@ msgstr "닫기(_L)"
 #: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:3
+#: ui/evolution.xml.h:4
 msgid "Close"
 msgstr "닫기"
 
@@ -17988,7 +17479,7 @@ msgid "Delete this item"
 msgstr "이 항목를 지웁니다"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr "기본 도구 모음"
 
@@ -18031,7 +17522,7 @@ msgstr "이 항목을 디스크에 저장합니다"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:44
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "_File"
 msgstr "파일(_F)"
 
@@ -18291,13 +17782,13 @@ msgstr "선택 반전(_I)"
 msgid "_Threaded Message List"
 msgstr "연관된 메세지 목록(_T)"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "이 창을 닫습니다"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "_Close"
 msgstr "닫기(_C)"
 
@@ -18697,7 +18188,7 @@ msgstr "이전 메세지(_P)"
 msgid "_Quoted"
 msgstr "인용(_Q)"
 
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
 msgid "_Tools"
 msgstr "도구(_T)"
 
@@ -18994,108 +18485,122 @@ msgid "_Open Task"
 msgstr "작업 열기(_O)"
 
 #: ui/evolution.xml.h:1
-msgid "About Ximian Evolution..."
-msgstr "Ximian Evolution 정보..."
+#, fuzzy
+msgid "About Evolution..."
+msgstr "Ximian Evolution 정보"
 
 #: ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
 msgstr "Evolution설정을 바꿉니다"
 
-#: ui/evolution.xml.h:5
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the visibility of the toolbar"
+msgstr "이 폴더의 등록 정보를 바꿉니다"
+
+#: ui/evolution.xml.h:6
 #, fuzzy
 msgid "Create a new window displaying this folder"
 msgstr "새 메일 폴더를 만듭니다"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "끝내기(_X)"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Ximian Evolution 잦은 질문들"
+
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "프로그램을 끝냅니다"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:10
 msgid "Forget _Passwords"
 msgstr "기억한 열쇠글 버리기(_P)"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:11
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "기억한 열쇠글을 버리고 다음에 다시 물어보게 합니다"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:12
 msgid "Import data from other programs"
 msgstr "다른 프로그램에서 데이터를 가져옵니다"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:14
 #, fuzzy
 msgid "New _Window"
 msgstr "창(_W)"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Pi_lot Settings..."
 msgstr "파일롯 설정(_L)..."
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Send / Receive"
 msgstr "보내고 받기"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Send queued items and retrieve new items"
 msgstr "밀린 메일을 보내고 새 메일을 받습니다"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Set up Pilot configuration"
 msgstr "파일럿을 설정합니다"
 
-#: ui/evolution.xml.h:17
-msgid "Show information about Ximian Evolution"
+#: ui/evolution.xml.h:19
+#, fuzzy
+msgid "Show information about Evolution"
 msgstr "Ximian Evolution에 대한 정보를 보여줍니다"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:20
 msgid "Submit Bug Report"
 msgstr "버그 제보"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:21
 msgid "Submit _Bug Report"
 msgstr "버그 제보(_B)"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Bug Buddy로 버그제보를 합니다"
 
-#: ui/evolution.xml.h:21
-msgid "Toggle whether we are working offline."
-msgstr "오프라인 작업으로 할 것인지 토글합니다."
-
 #: ui/evolution.xml.h:23
-msgid "Ximian Evolution _FAQ"
-msgstr "Ximian Evolution 잦은 질문들"
+#, fuzzy
+msgid "T_oolbar"
+msgstr "기본 도구 모음"
 
 #: ui/evolution.xml.h:24
-msgid "_About Ximian Evolution..."
-msgstr "Ximian Evolution 정보(_A)..."
+msgid "Toggle whether we are working offline."
+msgstr "오프라인 작업으로 할 것인지 토글합니다."
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "_About Evolution..."
+msgstr "Ximian Evolution 정보"
+
+#: ui/evolution.xml.h:30
 msgid "_Help"
 msgstr "도움말(_H)"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "_Import..."
 msgstr "가져오기(_I)..."
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "_New"
 msgstr "새로 만들기(_N)"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "_Quick Reference"
 msgstr "간단한 참조 문서(_Q)"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_Send / Receive"
 msgstr "보내고 받기(_S)"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 #, fuzzy
 msgid "_Window"
 msgstr "창(_W)"
@@ -19168,7 +18673,7 @@ msgid "With _Status"
 msgstr "상태 설정"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:626
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:635
 msgid "UTC"
 msgstr "UTC"
 
@@ -19324,30 +18829,30 @@ msgstr "그 외..."
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
-#: widgets/misc/e-error.c:121
+#: widgets/misc/e-error.c:79 widgets/misc/e-error.c:80
+#: widgets/misc/e-error.c:122
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Evolution"
 
-#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
-#: widgets/misc/e-error.c:119
+#: widgets/misc/e-error.c:81 widgets/misc/e-error.c:82
+#: widgets/misc/e-error.c:120
 #, fuzzy
 msgid "Evolution Warning"
 msgstr "Evolution 메일"
 
-#: widgets/misc/e-error.c:118
+#: widgets/misc/e-error.c:119
 #, fuzzy
 msgid "Evolution Information"
 msgstr "모임 정보"
 
-#: widgets/misc/e-error.c:120
+#: widgets/misc/e-error.c:121
 #, fuzzy
 msgid "Evolution Query"
 msgstr "Evolution 테스트"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:410
+#: widgets/misc/e-error.c:415
 #, fuzzy, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -19495,16 +19000,561 @@ msgstr ""
 "`%s'에 저장할 수 없습니다\n"
 " %s"
 
-#: widgets/misc/e-task-widget.c:211
+#: widgets/misc/e-task-widget.c:212
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: widgets/misc/e-task-widget.c:216
+#: widgets/misc/e-task-widget.c:217
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% 완료)"
 
+#~ msgid "Failed to connect to LDAP server"
+#~ msgstr "LDAP 서버에 연결 실패"
+
+#~ msgid "Failed to authenticate with LDAP server"
+#~ msgstr "LDAP 서버에서 인증 실패"
+
+#~ msgid "Could not perform query on Root DSE"
+#~ msgstr "루트 DSE에 질의를 수행할 수 없습니다"
+
+#~ msgid "The server responded with no supported search bases"
+#~ msgstr "서버가 지원하는 찾기 기준으로 응답하지 않았습니다"
+
+#~ msgid "This server does not support LDAPv3 schema information"
+#~ msgstr "이 서버는 LDAPv3 스키마 정보를 지원하지 않습니다"
+
+#~ msgid "Error retrieving schema information"
+#~ msgstr "스키마 정보를 가져오는 데 오류가 발생했습니다"
+
+#~ msgid "Server did not respond with valid schema information"
+#~ msgstr "서버가 올바른 스키마 정보가 들어 있는 응답을 하지 않았습니다"
+
+#~ msgid "  S_how Supported Bases "
+#~ msgstr " 지원하는 기준 보기(_H) "
+
+#~ msgid "1:00"
+#~ msgstr "1:00"
+
+#~ msgid "5:00"
+#~ msgstr "5:00"
+
+#~ msgid "Connecting"
+#~ msgstr "연결중"
+
+#~ msgid "Distinguished _name:"
+#~ msgstr "구별되는 이름(_N):"
+
+#~ msgid "Email address:"
+#~ msgstr "전자메일 주소:"
+
+#~ msgid "Evolution will use this DN to authenticate you with the server"
+#~ msgstr "Evolution은 이 DN으로 서버에 인증할 때 사용합니다"
+
+#~ msgid "One"
+#~ msgstr "한 단계"
+
+#~ msgid "S_earch scope: "
+#~ msgstr "찾기 범위(_E): "
+
+#~ msgid "Searching"
+#~ msgstr "찾는 중"
+
+#~ msgid "Sub"
+#~ msgstr "아래"
+
+#~ msgid "This option controls how long a search will be run."
+#~ msgstr "찾기를 얼마나 오래동안 실행할 지 조정하는 옵션입니다."
+
+#~ msgid "U_se SSL/TLS:"
+#~ msgstr "SSL/TLS 사용(_S):"
+
+#~ msgid "_Display name:"
+#~ msgstr "표시 이름(_D):"
+
+#~ msgid "_Port number:"
+#~ msgstr "포트 번호(_P):"
+
+#~ msgid "_Search base:"
+#~ msgstr "찾기 기준(_S):"
+
+#~ msgid "_Server name:"
+#~ msgstr "서버 이름(_S):"
+
+#~ msgid "_Timeout (minutes):"
+#~ msgstr "제한 시간(분)(_T):"
+
+#~ msgid "connecting-tab"
+#~ msgstr "연결-탭"
+
+#~ msgid "general-tab"
+#~ msgstr "일반-탭"
+
+#~ msgid "searching-tab"
+#~ msgstr "찾기-탭"
+
+#~ msgid "Job title:"
+#~ msgstr "직함:"
+
+#, fuzzy
+#~ msgid "Webcam:"
+#~ msgstr "웹 페이지:"
+
+#, fuzzy
+#~ msgid "item7"
+#~ msgstr "제목"
+
+#, fuzzy
+#~ msgid "item8"
+#~ msgstr "제목"
+
+#~ msgid "Category editor not available."
+#~ msgstr "분류 편집기를 사용할 수 없습니다."
+
+#, fuzzy
+#~ msgid ""
+#~ "The following entries are invalid:\n"
+#~ "\n"
+#~ msgstr "다음 거르게 규칙:\n"
+
+# 일어나지 않을 것 같은 오류 메세지
+#~ msgid "Could not find widget for a field: `%s'"
+#~ msgstr "필드에 대한 위젯을 찾을 수 없습니다: `%s'"
+
+#~ msgid "Do you want to save changes?"
+#~ msgstr "바뀐 부분을 저장하시겠습니까?"
+
+#~ msgid "Error saving %s: %s"
+#~ msgstr "%s을(를) 저장하는 데 오류가 발생했습니다: %s"
+
+#~ msgid ""
+#~ "The addressbook backend for\n"
+#~ "%s\n"
+#~ "has crashed. You will have to restart Evolution in order to use it again"
+#~ msgstr ""
+#~ "다음에 대한 주소록 벡엔드가 비정상적으로 죽었습니다:\n"
+#~ "%s\n"
+#~ "다시 사용하려면 Evolution을 다시 시작해야 합니다."
+
+#~ msgid "Can not load URI"
+#~ msgstr "URI를 읽어들일 수 없습니다"
+
+#~ msgid "Calendar Properties"
+#~ msgstr "달력 등록 정보"
+
+#~ msgid "Remote"
+#~ msgstr "원격"
+
+#~ msgid "Task List Properties"
+#~ msgstr "작업 목록 등록 정보"
+
+#~ msgid "_Refresh Interval:"
+#~ msgstr "다시 읽기 간격(_R):"
+
+#~ msgid "_Source URL:"
+#~ msgstr "원본 URI(_S):"
+
+# event -> 행사, Microsoft Office XP 참고
+#~ msgid ""
+#~ "The event being deleted is a meeting, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr "지금 지우는 행사는 회의입니다. 취소를 공지하시겠습니까?"
+
+#~ msgid "Are you sure you want to cancel and delete this meeting?"
+#~ msgstr "정말로 이 회의를 취소하고 지우시겠습니까?"
+
+#~ msgid ""
+#~ "The task being deleted is assigned, would you like to send a cancellation "
+#~ "notice?"
+#~ msgstr "지금 지우는 작업은 할당되어 있습니다. 취소를 공지하시겠습니까?"
+
+#~ msgid "Are you sure you want to cancel and delete this task?"
+#~ msgstr "정말로 이 일지를 취소하고 지우시겠습니까?"
+
+# journal -> 일지, Microsoft Office XP 참고
+#~ msgid ""
+#~ "The journal entry being deleted is published, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr "지금 지우는 일지 항목은 게시되었습니다. 취소를 공지하시겠습니까?"
+
+#~ msgid "Are you sure you want to cancel and delete this journal entry?"
+#~ msgstr "정말로 이 일지 항목을 취소하고 지우시겠습니까?"
+
+#~ msgid "Are you sure you want to delete the appointment `%s'?"
+#~ msgstr "정말로 약속 `%s'을(를) 지우시겠습니까?"
+
+#~ msgid "Are you sure you want to delete this untitled appointment?"
+#~ msgstr "정말로 이 제목없는 약속을 지우시겠습니까?"
+
+#~ msgid "Are you sure you want to delete the task `%s'?"
+#~ msgstr "정말로 작업 `%s'을(를) 지우시겠습니까?"
+
+#~ msgid "Are you sure you want to delete this untitled task?"
+#~ msgstr "정말로 이 제목없는 작업을 지우시겠습니까?"
+
+# journal -> 일지, Microsoft Office XP 참고
+#~ msgid "Are you sure you want to delete the journal entry `%s'?"
+#~ msgstr "정말로 일지 항목 `%s'을(를) 지우시겠습니까?"
+
+# journal -> 일지, Microsoft Office XP 참고
+#~ msgid "Are you sure want to delete this untitled journal entry?"
+#~ msgstr "정말로 이 제목없는 일지 항목 지우시겠습니까?"
+
+#~ msgid "Are you sure you want to delete %d appointment?"
+#~ msgid_plural "Are you sure you want to delete %d appointments?"
+#~ msgstr[0] "정말 약속 %d개를 지우시겠습니까?"
+
+#~ msgid "Are you sure you want to delete %d task?"
+#~ msgid_plural "Are you sure you want to delete %d tasks?"
+#~ msgstr[0] "정말 작업 %d개를 지우시겠습니까?"
+
+# journal -> 일지, Microsoft Office XP 참고
+#~ msgid "Are you sure you want to delete %d journal entry?"
+#~ msgid_plural "Are you sure you want to delete %d journal entries?"
+#~ msgstr[0] "정말 일지 항목 %d개를 지우시겠습니까?"
+
+#~ msgid "_Invite Others..."
+#~ msgstr "다른 이들을 초대(_I)..."
+
+# event -> 행사, Microsoft Office XP 참고
+#~ msgid ""
+#~ "This event has been changed, but has not been saved.\n"
+#~ "\n"
+#~ "Do you wish to save your changes?"
+#~ msgstr ""
+#~ "이 행사를 바꾸었지만 저장하지 않았습니다.\n"
+#~ "\n"
+#~ "바뀐 내용을 저장하시겠습니까?"
+
+#~ msgid "_Discard Changes"
+#~ msgstr "바뀐 내용 버리기(_D)"
+
+# event -> 행사, Microsoft Office XP 참고
+#~ msgid "Save Event"
+#~ msgstr "행사 저장"
+
+#~ msgid "The meeting information has been created. Send it?"
+#~ msgstr "회의 정보를 만들었습니다. 보내시겠습니까?"
+
+#~ msgid "The meeting information has changed. Send an updated version?"
+#~ msgstr "회의 정보가 바뀌었습니다. 업데이트된 버전을 보내시겠습니까?"
+
+#~ msgid "The task assignment information has been created. Send it?"
+#~ msgstr "작업 할당을 만들었습니다. 보내시겠습니까?"
+
+#~ msgid "The task information has changed. Send an updated version?"
+#~ msgstr "작업 정보가 바뀌었습니다. 업데이트된 버전을 보내시겠습니까?"
+
+#, fuzzy
+#~ msgid "The task backend for '%s' has crashed."
+#~ msgstr ""
+#~ "다음에 대한 작업 벡엔드가 비정상적으로 죽었습니다:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "The calendar backend for '%s' has crashed."
+#~ msgstr ""
+#~ "다음에 대한 달력 벡엔드가 비정상적으로 죽었습니다:\n"
+#~ "%s"
+
+#~ msgid "Learning junk and/or non junk message(s)"
+#~ msgstr "정크메일과 정크메일이 아닌 메세지를 학습합니다"
+
+#~ msgid "Could not get article %s from NNTP server"
+#~ msgstr "NNTP 서버에서 글 \"%s\"을(를) 가져올 수 없습니다."
+
+#~ msgid "Posting not allowed by news server"
+#~ msgstr "뉴스 서버에서 게시를 허용하지 않습니다"
+
+#~ msgid "Failed to send newsgroups header: %s: message not posted"
+#~ msgstr ""
+#~ "뉴스그룹 헤더를 보내는 데 실패했습니다: %s: 메세지를 올리지 않았습니다"
+
+#~ msgid "Error posting to newsgroup: %s: message not posted"
+#~ msgstr ""
+#~ "뉴스그룹에 올리는 데 오류가 발생했습니다: %s: 메세지를 올리지 않았습니다"
+
+#~ msgid "Error reading response to posted message: message not posted"
+#~ msgstr ""
+#~ "올린 메세지에 대한 응답을 읽는 데 오류가 발생했습니다: 메세지를 올리지 않"
+#~ "았습니다"
+
+#~ msgid "Error posting message: %s: message not posted"
+#~ msgstr ""
+#~ "메세지를 올리는 데 오류가 발생했습니다: %s: 메세지를 올리지 않았습니다"
+
+#~ msgid "Stream error"
+#~ msgstr "스트림 오류"
+
+#~ msgid "Connection error: %s"
+#~ msgstr "연결 오류: %s"
+
+#~ msgid "Could not get group: %s"
+#~ msgstr "그룹을 받아 올 수 없습니다: %s"
+
+#, fuzzy
+#~ msgid "Could not get messages: unspecified error"
+#~ msgstr "메세지를 가져올 수 없습니다: 지정하지 않은 오류"
+
+#~ msgid "Unknown server response: %s"
+#~ msgstr "알 수 없는 서버 응답: %s"
+
+#~ msgid "Adjust Score"
+#~ msgstr "점수 조정"
+
+#~ msgid "Assign Color"
+#~ msgstr "색 지정"
+
+#~ msgid "Assign Score"
+#~ msgstr "점수 지정"
+
+#~ msgid "Attachments"
+#~ msgstr "첨부"
+
+#~ msgid "Beep"
+#~ msgstr "삑 소리"
+
+# FIXME - hard to translate UI + string based on English grammar
+#~ msgid "contains"
+#~ msgstr "포함"
+
+#~ msgid "Copy to Folder"
+#~ msgstr "폴더로 복사"
+
+#~ msgid "Date received"
+#~ msgstr "받은 날짜"
+
+#~ msgid "Date sent"
+#~ msgstr "보낸 날짜"
+
+#~ msgid "Deleted"
+#~ msgstr "지워짐"
+
+# FIXME - hard to translate UI + string based on English grammar
+#~ msgid "does not contain"
+#~ msgstr "포함하지 않음"
+
+# FIXME - hard to translate UI + string based on English grammar
+#~ msgid "does not end with"
+#~ msgstr "끝나지 않음"
+
+# FIXME - hard to translate UI + string based on English grammar
+#~ msgid "does not exist"
+#~ msgstr "없음"
+
+# FIXME - hard to translate UI + string based on English grammar
+#~ msgid "does not return"
+#~ msgstr "리턴하지 않음"
+
+# FIXME - hard to translate UI + string based on English grammar
+#~ msgid "does not sound like"
+#~ msgstr "비슷한 소리 아님"
+
+# FIXME - hard to translate UI + string based on English grammar
+#~ msgid "does not start with"
+#~ msgstr "시작하지 않음"
+
+#~ msgid "Do Not Exist"
+#~ msgstr "존재하지 않음"
+
+#~ msgid "Draft"
+#~ msgstr "임시 보관함"
+
+# FIXME - hard to translate UI + string based on English grammar
+#~ msgid "ends with"
+#~ msgstr "끝남"
+
+#~ msgid "Exist"
+#~ msgstr "존재함"
+
+# FIXME - hard to translate UI + string based on English grammar
+#~ msgid "exists"
+#~ msgstr "존재함"
+
+#~ msgid "Expression"
+#~ msgstr "표현"
+
+#~ msgid "Follow Up"
+#~ msgstr "추가 작업"
+
+# FIXME - hard to translate UI + string based on English grammar
+#~ msgid "is"
+#~ msgstr "같음"
+
+# FIXME - hard to translate UI + string based on English grammar
+#~ msgid "is after"
+#~ msgstr "뒤 날짜"
+
+# FIXME - hard to translate UI + string based on English grammar
+#~ msgid "is before"
+#~ msgstr "앞 날짜"
+
+# FIXME - hard to translate UI + string based on English grammar
+#~ msgid "is Flagged"
+#~ msgstr "플래그 지정"
+
+# FIXME - hard to translate UI + string based on English grammar
+#~ msgid "is greater than"
+#~ msgstr "보다 큼"
+
+# FIXME - hard to translate UI + string based on English grammar
+#~ msgid "is less than"
+#~ msgstr "보다 적음"
+
+# FIXME - hard to translate UI + string based on English grammar
+#~ msgid "is not"
+#~ msgstr "다름"
+
+# FIXME - hard to translate UI + string based on English grammar
+#~ msgid "is not Flagged"
+#~ msgstr "플래그 지정 아님"
+
+#~ msgid "Junk Test"
+#~ msgstr "정크메일 테스트"
+
+#~ msgid "Mailing list"
+#~ msgstr "메일링 리스트"
+
+#~ msgid "Message Body"
+#~ msgstr "메세지 본문"
+
+#~ msgid "Message Header"
+#~ msgstr "메세지 머리말"
+
+#~ msgid "Message is Junk"
+#~ msgstr "메세지가 정크메일"
+
+#~ msgid "Message is not Junk"
+#~ msgstr "메세지가 정크메일 아님"
+
+#~ msgid "Move to Folder"
+#~ msgstr "폴더로 이동"
+
+#, fuzzy
+#~ msgid "Pipe to Program"
+#~ msgstr "프로그램을 끝냅니다"
+
+#~ msgid "Play Sound"
+#~ msgstr "소리 연주"
+
+#~ msgid "Recipients"
+#~ msgstr "받는 사람"
+
+#~ msgid "Regex Match"
+#~ msgstr "정규식"
+
+#~ msgid "Replied to"
+#~ msgstr "회신"
+
+# FIXME - hard to translate UI + string based on English grammar
+#~ msgid "returns"
+#~ msgstr "리턴"
+
+# FIXME - hard to translate UI + string based on English grammar
+#~ msgid "returns greater than"
+#~ msgstr "더 큰 값 리턴"
+
+# FIXME - hard to translate UI + string based on English grammar
+#~ msgid "returns less than"
+#~ msgstr "더 작은 값 리턴"
+
+#~ msgid "Run Program"
+#~ msgstr "프로그램 실행"
+
+#~ msgid "Sender"
+#~ msgstr "보낸 사람"
+
+#~ msgid "Set Status"
+#~ msgstr "상태 설정"
+
+#~ msgid "Size (kB)"
+#~ msgstr "크기 (kB)"
+
+# FIXME - hard to translate UI + string based on English grammar
+#~ msgid "sounds like"
+#~ msgstr "비슷한 소리"
+
+#~ msgid "Source Account"
+#~ msgstr "메일 온 계정"
+
+#~ msgid "Specific header"
+#~ msgstr "특정 헤더"
+
+# FIXME - hard to translate UI + string based on English grammar
+#~ msgid "starts with"
+#~ msgstr "시작함"
+
+#~ msgid "Stop Processing"
+#~ msgstr "처리 중지"
+
+#~ msgid "Unset Status"
+#~ msgstr "상태 설정 없애기"
+
+#~ msgid "Check _Incoming Mail"
+#~ msgstr "새 메일 확인(_I)"
+
+#~ msgid "Use _Daemon"
+#~ msgstr "데몬 사용(_D)"
+
+#~ msgid "_Local Tests Only"
+#~ msgstr "로컬 검사만 사용(_L)"
+
+#~ msgid "Working"
+#~ msgstr "작업 중"
+
+#~ msgid "Brought to you by"
+#~ msgstr "다음 사람들 덕분에 여기까지 왔습니다"
+
+#~ msgid "_Filename:"
+#~ msgstr "파일 이름(_F):"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "Unknown error."
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "알 수 없는 오류."
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the component system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "컴포넌트 시스템의 오류는:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the activation system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "액티베이션 시스템의 오류는:\n"
+#~ "%s"
+
+#~ msgid "Do you want to trust \"%s\" for the following purposes?"
+#~ msgstr "다음 목적에 대하여 \"%s\"을(를) 신뢰하시겠습니까?"
+
+#~ msgid "View Certificate"
+#~ msgstr "인증서 보기"
+
+#~ msgid "You have been asked to trust a new Certificate Authority (CA)."
+#~ msgstr "새 인증 기관(CA)을 신뢰할 것인지 질문을 받았습니다."
+
+#~ msgid "About Ximian Evolution..."
+#~ msgstr "Ximian Evolution 정보..."
+
+#~ msgid "_About Ximian Evolution..."
+#~ msgstr "Ximian Evolution 정보(_A)..."
+
 #~ msgid "Evolution Addressbook folder viewer"
 #~ msgstr "Evolution 주소록 폴더 뷰"
 
@@ -19989,18 +20039,12 @@ msgstr "%s (%d%% 완료)"
 #~ msgid "Primary _email:"
 #~ msgstr "주요 전자메일(_E):"
 
-#~ msgid "S_pouse:"
-#~ msgstr "배우자(_P):"
-
 #~ msgid "_Categories..."
 #~ msgstr "분류(_C)..."
 
 #~ msgid "_Manager's name:"
 #~ msgstr "관리자 이름(_M):"
 
-#~ msgid "_Office:"
-#~ msgstr "사무실(_O):"
-
 # public -> 공용, Microsoft Office XP 참고
 #~ msgid "_Public Calendar URL:"
 #~ msgstr "공용 달력 URL:"
diff --git a/po/lt.po b/po/lt.po
index 2ca66a2cc6..db67988850 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution HEAD\n"
-"POT-Creation-Date: 2004-05-19 14:00-0400\n"
+"POT-Creation-Date: 2004-06-03 11:14-0400\n"
 "PO-Revision-Date: 2004-01-13 11:05+0200\n"
 "Last-Translator: Žygimantas Beručka <uid0@tuxfamily.org>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -63,13 +63,13 @@ msgstr "kortelės"
 msgid "Default Sync Address:"
 msgstr "Įprastas Sinchronizavimo Adresas:"
 
-#: addressbook/conduit/address-conduit.c:1150
 #: addressbook/conduit/address-conduit.c:1151
+#: addressbook/conduit/address-conduit.c:1152
 msgid "Could not load addressbook"
 msgstr "Nepavyko įkelti adresų knygos"
 
-#: addressbook/conduit/address-conduit.c:1219
-#: addressbook/conduit/address-conduit.c:1222
+#: addressbook/conduit/address-conduit.c:1220
+#: addressbook/conduit/address-conduit.c:1223
 msgid "Could not read pilot's Address application block"
 msgstr "Nepavyko perskaityti piloto Address programos bloko"
 
@@ -77,13 +77,13 @@ msgstr "Nepavyko perskaityti piloto Address programos bloko"
 msgid "Accessing LDAP Server anonymously"
 msgstr "Susisiekiama su LDAP serveriu anonimiškai"
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
 msgid "Failed to authenticate.\n"
 msgstr "Autorizacija nepavyko.\n"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sĮveskite %s slaptažodį (vartotojo vardas %s)"
@@ -127,51 +127,23 @@ msgstr "_Kontaktai:"
 msgid "Create a new contacts group"
 msgstr "Sukurti naują trumpių grupę"
 
-#: addressbook/gui/component/addressbook-component.c:182
+#: addressbook/gui/component/addressbook-component.c:184
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:483
-msgid "Failed to connect to LDAP server"
-msgstr "Nepavyko susisiekti su LDAP serveriu"
-
-#: addressbook/gui/component/addressbook-config.c:507
-msgid "Failed to authenticate with LDAP server"
-msgstr "Nepavyko autentifikavimasis su LDAP serverių"
-
-#: addressbook/gui/component/addressbook-config.c:535
-msgid "Could not perform query on Root DSE"
-msgstr "Negalima daryti užklausos tarp pagrindinio DSE"
-
-#: addressbook/gui/component/addressbook-config.c:840
-msgid "The server responded with no supported search bases"
-msgstr "Serveris nepateikė tinkamų paieškos platformų"
-
-#: addressbook/gui/component/addressbook-config.c:1245
-msgid "This server does not support LDAPv3 schema information"
-msgstr "Šis serveris nepalaiko LDAPv3 schemų informacijos"
-
-#: addressbook/gui/component/addressbook-config.c:1266
-msgid "Error retrieving schema information"
-msgstr "Klaida gaunant schemų informaciją"
-
-#: addressbook/gui/component/addressbook-config.c:1274
-msgid "Server did not respond with valid schema information"
-msgstr "Serveris nepateikė tvarkingos schemų informacijos"
-
 #: addressbook/gui/component/addressbook-migrate.c:68
-#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1160
 msgid "Migrating..."
 msgstr "Perkeliama..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1201
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Perkeliamas „%s“:"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:438
+#: addressbook/gui/component/addressbook-migrate.c:464
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
 #: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
@@ -179,29 +151,29 @@ msgid "On This Computer"
 msgstr "Šiame Kompiuteryje"
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:446
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
-#: mail/mail-config.glade.h:106
+#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
+#: mail/mail-config.glade.h:109
 msgid "Personal"
 msgstr "Asmeninis"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:454
+#: addressbook/gui/component/addressbook-migrate.c:480
 msgid "On LDAP Servers"
 msgstr "Tarp LDAP Serverių"
 
-#: addressbook/gui/component/addressbook-migrate.c:582
+#: addressbook/gui/component/addressbook-migrate.c:608
 msgid "LDAP Servers"
 msgstr "LDAP Serveriai"
 
-#: addressbook/gui/component/addressbook-migrate.c:702
+#: addressbook/gui/component/addressbook-migrate.c:728
 #, fuzzy
 msgid "Autocompletion Settings"
 msgstr "Savaiminis pabaigimas"
 
-#: addressbook/gui/component/addressbook-migrate.c:1076
+#: addressbook/gui/component/addressbook-migrate.c:1104
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -213,7 +185,7 @@ msgstr ""
 "\n"
 "Palaukite kol Evolution perkels Jūsų ankstesnius aplankus..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1090
+#: addressbook/gui/component/addressbook-migrate.c:1118
 #, fuzzy
 msgid ""
 "The format of mailing list contacts has changed.\n"
@@ -225,7 +197,7 @@ msgstr ""
 "\n"
 "Palaukite kol Evolution perkels Jūsų ankstesnius aplankus..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1099
+#: addressbook/gui/component/addressbook-migrate.c:1127
 #, fuzzy
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
@@ -237,7 +209,7 @@ msgstr ""
 "\n"
 "Palaukite kol Evolution perkels Jūsų ankstesnius aplankus..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1109
+#: addressbook/gui/component/addressbook-migrate.c:1137
 #, fuzzy
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
@@ -249,40 +221,35 @@ msgstr ""
 "\n"
 "Palaukite kol Evolution perkels Jūsų ankstesnius aplankus..."
 
-#: addressbook/gui/component/addressbook-view.c:674
+#: addressbook/gui/component/addressbook-view.c:675
 #, fuzzy, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 "Adresų knygutė „%s“ bus pašalinta. Ar Jūs tikrai norite taip pasielgti?"
 
-#: addressbook/gui/component/addressbook-view.c:761
+#: addressbook/gui/component/addressbook-view.c:754
 #, fuzzy
 msgid "New Address Book"
 msgstr "Nauja Adresų Knyga"
 
-#: addressbook/gui/component/addressbook-view.c:762
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
+#: addressbook/gui/component/addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Ištrinti"
 
-#: addressbook/gui/component/addressbook-view.c:763
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-view.c:756
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Savybės..."
 
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/addressbook-view.c:1002
+#. Create the contacts group
+#: addressbook/gui/component/addressbook-view.c:995
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
 #: calendar/gui/migration.c:373
 msgid "Contacts"
 msgstr "Kontaktai"
@@ -364,10 +331,6 @@ msgid "Manage your S/MIME certificates here"
 msgstr "Valdykite Jūsų S/Mime sertifikatus čia"
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-msgid "  S_how Supported Bases "
-msgstr "  _Rodyti Palaikomas Bazes "
-
-#: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -382,205 +345,171 @@ msgstr "  _Rodyti Palaikomas Bazes "
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1:00"
-msgstr "1:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
-msgstr "5:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "Autentikacija"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
 #, fuzzy
 msgid "<b>Display</b>"
 msgstr "<b>Pagrindai</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 #, fuzzy
 msgid "<b>Downloading</b>"
 msgstr "<b>_Vieta</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:10
 #, fuzzy
 msgid "<b>Searching</b>"
 msgstr "Ieškoma"
 
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
 msgid "<b>Server Information</b>"
 msgstr "2-as žingsnis: Serverio Informacija"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
 msgid "<b>Type:</b>"
 msgstr "<b>Laikas</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:13
 #, fuzzy
 msgid "Add Contacts Group"
 msgstr "_Kontaktai:"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:14
 #, fuzzy
 msgid "Address Book Properties"
 msgstr "Adresų knygelės savybės"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
-#: mail/mail-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
+#: mail/mail-config.glade.h:42
 msgid "Always"
 msgstr "Visada"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr "Anonimiškai"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:17
 #: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Esmė"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
-msgid "Connecting"
-msgstr "Jungiamasi"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 #: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Detalės"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
-msgid "Distinguished _name:"
-msgstr "Skirtinis _vardas:"
-
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:19
 #, fuzzy
 msgid "Distinguished name"
 msgstr "Skirtinis _vardas:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:20
 #, fuzzy
 msgid "Download limit:"
 msgstr "_Leistinas atsiuntimo greitis:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Email address"
 msgstr "El. pašto adresas:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "Email address:"
-msgstr "El. pašto adresas:"
-
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "Evolution will use this DN to authenticate you with the server"
-msgstr ""
-"Evolution naudos šį skirtinį vardą (DN) autentifikacijos su serveriu metu"
-
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:22
+#, fuzzy
 msgid ""
-"Evolution will use this email address to authenticate you with the server"
+"Evolution will use this email address to authenticate you with the server."
 msgstr "Evolution naudos šį el. pašto adresą autentikuotis į pašto serverį"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:23
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Palaikomos Paieškos Bazės"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:24
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
+#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Esmė"
 
-#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
-#: mail/mail-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
+#: mail/mail-config.glade.h:102
 msgid "Never"
 msgstr "Niekada"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
-msgid "One"
-msgstr "One"
-
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:35
-msgid "S_earch scope: "
-msgstr "Pai_eškos sritis:"
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Search _base:"
+msgstr "_Paieškos sritis:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
 msgid "Search base only"
 msgstr "_Paieškos sritis:"
 
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:29
 #, fuzzy
 msgid "Search base:"
 msgstr "_Paieškos sritis:"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Search scope:"
 msgstr "Pai_eškos sritis:"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
-msgid "Searching"
-msgstr "Ieškoma"
-
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:31
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
-"server if\n"
-"your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL or TLS."
 msgstr ""
 "Šios opcijos nustatymas reiškia, kad Evolution jungsis prie Jūsų LDAP "
 "serverio tik tuo atveju,\n"
 "jei LDAP serveris palaikys SSL arba TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a \n"
-"insecure environment. For example, if you and your LDAP server are behind a "
-"firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection "
-"is already\n"
-"secure."
+"you are in a insecure environment. For example, if you and your LDAP server "
+"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
+"because your connection is already secure."
 msgstr ""
 "Įjungus šį nustatymą Evolution bandys panaudoti SSL/TLS kodavimą tik tuo "
 "atveju, jei \n"
@@ -590,51 +519,45 @@ msgstr ""
 "nes Jūsų jungtis\n"
 "yra apsaugota nuo išorinių įsilaužėlių."
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:33
+#, fuzzy
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
-"TLS.  This \n"
-"means that your connection will be insecure, and that you will be vulnerable "
-"to security\n"
-"exploits. "
+"TLS.  This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits. "
 msgstr ""
 "Šios opcijos įjungimas reiškia, kad Jūsų serveris nepalaiko nei SSL, nei "
 "TLS. Tai reiškia, \n"
 "kad Jūsų jungtis nebus apsaugota ir Jums gresia duomenų ar jungties "
 "perėmimas. "
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Sub"
-msgstr "Sub"
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr "Palaikomos Paieškos Bazės"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
-"searches will \n"
-"begin. If you leave this blank, the search will begin at the root of the "
-"directory tree."
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
 msgstr ""
 "Paieškos bazė yra skirtinis vardas (DN), kuris lemia nuo kurios vietos yra "
 "vykdomos Jūsų \n"
 "paieškos. Neužpildžius šios reikšmės paieška bus vykdoma nuo katalogo "
 "pradžios."
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:37
+#, fuzzy
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
-"the \n"
-"directory tree. A search scope of \"sub\" will include all entries below "
-"your search base.\n"
-"A search scope of \"one\" will only include the entries one level beneath "
-"your base.\n"
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
 msgstr ""
 "Paieškos sritis lemia, kaip giliai Jūsų vykdomos paieškos naršys po "
 "katalogą. Paieškos\n"
@@ -642,7 +565,7 @@ msgstr ""
 "sritis „one“\n"
 "pateiks tik pirmame paieškos bazės lygyje esančius įrašus.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:58
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -650,17 +573,16 @@ msgstr ""
 "Čia nurodomas pilnas Jūsų LDAP serverio vardas. Pavyzdžiui „ldap.example."
 "com“."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:39
 #, fuzzy
 msgid ""
-"This is the maximum number of entries to download. Setting this number to "
-"be \n"
+"This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr ""
 "Čia yra nurodomas didžiasias atsiunčiamų įrašų kiekis. Nustačius per didelę\n"
 "reikšmę gali sulėtėti Jūsų adresų knygos darbas."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -670,140 +592,119 @@ msgstr ""
 "pasinaudoti „El. pašto adreso“ metodu būtinas anoniminis prisijungimas prie "
 "Jūsų LDAP serverio."
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:41
+#, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
-"list.\n"
-"It is for display purposes only. "
+"list. It is for display purposes only. "
 msgstr ""
 "Šis vardas bus priskirtas serveriui Evolution aplankų sąraše.\n"
 "Jis skirtas tiktai vaizdavimui."
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:42
+#, fuzzy
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. "
-"A \n"
-"list of standard ports has been provided. Ask your system administrator\n"
-"what port you should specify."
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
 msgstr ""
 "Čia nurodomas LDAP serverio prievadas prie kurio Evolution bandys jungtis. \n"
 "Standartinių prievadų sąrašas yra pateiktas. Pasiteiraukite savo sistemos \n"
 "administratoriaus, jei nežinote, kurį prievadą reikia pasirinkti."
 
-#: addressbook/gui/component/ldap-config.glade.h:67
-msgid "This option controls how long a search will be run."
-msgstr "Šis nustatymas valdo didžiausią galimą paieškos trukmę."
-
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:43
 #, fuzzy
 msgid "Timeout:"
 msgstr "Laiko formatas:"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
-msgid "U_se SSL/TLS:"
-msgstr "Naudoti _SSL/TLS:"
-
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr "Naudojamas skirtinis vardas (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr "Naudojamas el. pašto adresas"
 
-#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
-#: mail/mail-config.glade.h:154
+#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
+#: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr "Kai tik imanoma"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:47
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "_Kontaktai:"
 
-#: addressbook/gui/component/ldap-config.glade.h:74
-#: calendar/gui/dialogs/calendar-setup.glade.h:12
-msgid "_Display name:"
-msgstr "Ro_domas vardas:"
-
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr "_Leistinas atsiuntimo greitis:"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
 msgid "_Email address:"
 msgstr "El. pašto adresas:"
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:50
+#, fuzzy
+msgid "_Find Possible Search Bases"
+msgstr "Palaikomos Paieškos Bazės"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Log in method:"
 msgstr "_Prisijungimo metodas"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "_Log in:"
+msgstr "Prisijungti"
+
+#: addressbook/gui/component/ldap-config.glade.h:53
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
 msgid "_Name:"
 msgstr "_Vardas:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
-msgid "_Port number:"
-msgstr "_Prievadas:"
-
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "_Port:"
 msgstr "_Svarbumas:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
-msgid "_Search base:"
-msgstr "_Paieškos sritis:"
-
-#: addressbook/gui/component/ldap-config.glade.h:82
-msgid "_Server name:"
-msgstr "_Serverio vardas:"
+#: addressbook/gui/component/ldap-config.glade.h:55
+#, fuzzy
+msgid "_Search scope:"
+msgstr "Pai_eškos sritis:"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:56
 #, fuzzy
 msgid "_Server:"
 msgstr "S_erveris:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
-msgid "_Timeout (minutes):"
-msgstr "_Pauzės riba (minutėmis):"
+#: addressbook/gui/component/ldap-config.glade.h:57
+#, fuzzy
+msgid "_Timeout:"
+msgstr "Laiko formatas:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:58
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "Na_udoti saugią jungtį (SSL):"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "kortelės"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
-msgid "connecting-tab"
-msgstr "jungties-kortelė"
-
-#: addressbook/gui/component/ldap-config.glade.h:88
-msgid "general-tab"
-msgstr "bendrinė-kortelė"
-
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:60
 #: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
-#: mail/mail-config.glade.h:182
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "minučių"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
-msgid "searching-tab"
-msgstr "paieškos-kortelė"
-
-#: addressbook/gui/component/select-names/e-select-names.c:497
+#: addressbook/gui/component/select-names/e-select-names.c:503
 #: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid "Select Contacts from Address Book"
 msgstr "Pasirinkti Kontaktus iš Adresų Knygos"
 
-#: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
@@ -843,7 +744,7 @@ msgstr "Bevardis kontaktas"
 
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:222
+#: addressbook/gui/widgets/e-addressbook-view.c:224
 msgid "Source"
 msgstr "Šaltinis"
 
@@ -917,9 +818,9 @@ msgid "<b>Work</b>"
 msgstr "<b>Darbo Savaitė</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
-#: addressbook/gui/widgets/eab-contact-display.c:342
-#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/widgets/eab-contact-display.c:334
+#: addressbook/gui/widgets/eab-contact-display.c:353
 msgid "AIM"
 msgstr "AIM"
 
@@ -959,15 +860,15 @@ msgid "Company:"
 msgstr "Komanda:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:271
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
+#: addressbook/gui/contact-editor/e-contact-editor.c:266
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
 msgstr "Kontaktas"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1527
+#: addressbook/gui/contact-editor/e-contact-editor.c:520
 msgid "Contact Editor"
 msgstr "Kontaktų redaktorius"
 
@@ -991,84 +892,81 @@ msgid "Full _Name..."
 msgstr "Pil_nas vardas..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:202
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-msgid "Home"
-msgstr "Namų"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #, fuzzy
 msgid "Home Page:"
 msgstr "Namų puslapis"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-#, fuzzy
-msgid "Job title:"
-msgstr "_Pareigos:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/e-itip-control.c:936
-msgid "Location:"
-msgstr "Vieta:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 #, fuzzy
 msgid "MSN Messenger"
 msgstr "_Pašto laiškas"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 #, fuzzy
 msgid "Mailing Address"
 msgstr "El. pašto adresas"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 #, fuzzy
 msgid "Manager:"
 msgstr "Vadybininkas"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "_Slapyvardis:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Notes:"
 msgstr "Pas_tabos:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 #, fuzzy
 msgid "Novell Groupwise"
 msgstr "Novell GroupWise"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
-#: addressbook/gui/contact-editor/e-contact-editor.c:203
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-msgid "Other"
-msgstr "Kitas"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#, fuzzy
+msgid "Office:"
+msgstr "_Ofisas:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "PO Box:"
 msgstr "_PO Box:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 #, fuzzy
 msgid "Personal Information"
 msgstr "Nebūtina informacija"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 #, fuzzy
 msgid "Profession:"
 msgstr "P_rofesija:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#, fuzzy
+msgid "Spouse:"
+msgstr "S_utuoktinis:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "State/Province:"
 msgstr "_Valstija/Provincija:"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#, fuzzy
+msgid "Title:"
+msgstr "_Titulas:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+msgid "Video Chat:"
+msgstr ""
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:41
 #, fuzzy
 msgid "Wants to receive HTML mail"
@@ -1076,15 +974,15 @@ msgstr "Nori gauti _HTML laiškus"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:42
 #, fuzzy
-msgid "Webcam:"
-msgstr "Tinklalapis:"
+msgid "Web Log:"
+msgstr "_Tinklalapis:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
-#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
-#: mail/mail-config.glade.h:155
+#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
+#: mail/mail-config.glade.h:157
 msgid "Work"
 msgstr "Darbinis"
 
@@ -1104,19 +1002,12 @@ msgid "_File under:"
 msgstr "Bylos vardas:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 #, fuzzy
 msgid "_Where:"
 msgstr "S_erveris:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
-msgid "item7"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
-msgid "item8"
-msgstr ""
-
-#: addressbook/gui/contact-editor/eab-editor.c:316
+#: addressbook/gui/contact-editor/eab-editor.c:315
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -1124,7 +1015,7 @@ msgstr ""
 "Ar Jūs tikrai norite\n"
 "ištrinti šiuos kontaktus?"
 
-#: addressbook/gui/contact-editor/eab-editor.c:319
+#: addressbook/gui/contact-editor/eab-editor.c:318
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -1133,16 +1024,16 @@ msgstr ""
 "ištrinti šį kontaktą?"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:351
-#: addressbook/gui/widgets/eab-contact-display.c:372
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Address"
 msgstr "Adresas"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:292
+#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard.c:174
@@ -2120,87 +2011,110 @@ msgstr "Zambija"
 msgid "Zimbabwe"
 msgstr "Zimbabvė"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/contact-editor/e-contact-editor.c:179
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:337
+#: addressbook/gui/widgets/eab-contact-display.c:356
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:347
-#: addressbook/gui/widgets/eab-contact-display.c:366
+#: addressbook/gui/contact-editor/e-contact-editor.c:180
+#: addressbook/gui/widgets/eab-contact-display.c:339
+#: addressbook/gui/widgets/eab-contact-display.c:358
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: addressbook/gui/widgets/eab-contact-display.c:338
+#: addressbook/gui/widgets/eab-contact-display.c:357
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:344
-#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#: addressbook/gui/widgets/eab-contact-display.c:355
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/contact-editor/e-contact-editor.c:183
 #, fuzzy
 msgid "GroupWise"
 msgstr "Novell GroupWise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+msgid "Home"
+msgstr "Namų"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+msgid "Other"
+msgstr "Kitas"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
 msgid "Source Book"
 msgstr "Pradinė Knyga"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:264
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Target Book"
 msgstr "Tikslinė Knyga"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:278
+#: addressbook/gui/contact-editor/e-contact-editor.c:273
 msgid "Is New Contact"
 msgstr "Tai Naujas Kontaktas"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:285
+#: addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Writable Fields"
 msgstr "Keičiami Laukai"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:299
+#: addressbook/gui/contact-editor/e-contact-editor.c:294
 msgid "Changed"
 msgstr "Pakeista"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
-msgid "Category editor not available."
-msgstr "Kategorijų redaktorius nepasiekiamas."
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:2352
 msgid "This contact belongs to these categories:"
 msgstr "Šis kontaktas priklauso šioms kategorijoms:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#: addressbook/gui/contact-editor/e-contact-editor.c:2429
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Prašom pasirinkti iš žemiau esančių parinkčių"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#: addressbook/gui/contact-editor/e-contact-editor.c:2433
 #, fuzzy
 msgid "No image"
 msgstr "Nigeris"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#: addressbook/gui/contact-editor/e-contact-editor.c:2636
 #, fuzzy
 msgid ""
-"The following entries are invalid:\n"
+"The contact data is invalid:\n"
 "\n"
-msgstr "Žemiau nurodytos jungtys šiuo metu yra aktyvios:"
+msgstr "Pasikartojimo data klaidinga"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2738
-#, c-format
-msgid "Could not find widget for a field: `%s'"
-msgstr "Nepavyko rasti lauko objekto: „%s“"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#, fuzzy
+msgid "Invalid contact."
+msgstr "%d kontaktai"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+msgid ""
+"The contact cannot be saved to the selected address book. Do you want to "
+"discard changes?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2727
+#: addressbook/gui/contact-editor/e-contact-editor.c:2751
+msgid "_Discard"
+msgstr "_Atsikratyti"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+msgid ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
+msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:62
 #, fuzzy
@@ -2236,7 +2150,7 @@ msgid "_Edit Full"
 msgstr "_Taisyti Pilną"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:166
 msgid "_Full Name:"
 msgstr "_Pilnas vardas:"
 
@@ -2386,30 +2300,30 @@ msgid "_Type an email address or drag a contact into the list below:"
 msgstr ""
 "Įrašyki_te el. pašto adresą arba nutempkite kontaktą į žemiau esantį sąrašą:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "contact-list-editor"
 msgstr "contact-list-editor"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:153
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:215
+#: addressbook/gui/widgets/e-addressbook-view.c:217
 #: addressbook/gui/widgets/e-minicard-view.c:460
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Knyga"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
 msgid "Is New List"
 msgstr "Tai Naujas Sąrašas"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:215
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
 msgid "Contact List Editor"
 msgstr "Kontaktų sąrašo redaktorius"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:438
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
 msgid "Save List as VCard"
 msgstr "Išsaugoti Sąrašą tarp VCard"
 
@@ -2456,125 +2370,125 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Išsami paieška"
 
-#: addressbook/gui/widgets/eab-contact-display.c:129
-#: addressbook/gui/widgets/eab-contact-display.c:192
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:139
-#: addressbook/gui/widgets/eab-contact-display.c:205
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:257
-#: addressbook/gui/widgets/eab-contact-display.c:533
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:525
 msgid "List Members"
 msgstr "Parodyti Sąrašą"
 
-#: addressbook/gui/widgets/eab-contact-display.c:329
-#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/eab-contact-display.c:321
+#: addressbook/gui/widgets/eab-contact-display.c:323
 #, fuzzy
 msgid "E-mail"
 msgstr "El. paštas"
 
-#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/eab-contact-display.c:332
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organizacija"
 
-#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:333
 #, fuzzy
 msgid "Position"
 msgstr "Aprašymas"
 
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:354
 #, fuzzy
 msgid "Groupwise"
 msgstr "Grupė"
 
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:340
 #, fuzzy
 msgid "Video Conferencing"
 msgstr "_Vaizdo Konferencijų Adresas:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:349
-#: addressbook/gui/widgets/eab-contact-display.c:370
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:362
 #, fuzzy
 msgid "Phone"
 msgstr "Automobilio telefonas"
 
-#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:342
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:354
+#: addressbook/gui/widgets/eab-contact-display.c:346
 #, fuzzy
 msgid "work"
 msgstr "Darbinis"
 
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:359
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:368
-#: addressbook/gui/widgets/eab-contact-display.c:587
+#: addressbook/gui/widgets/eab-contact-display.c:360
+#: addressbook/gui/widgets/eab-contact-display.c:579
 msgid "Blog"
 msgstr "Žurnalas"
 
-#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/eab-contact-display.c:363
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Mobilus telefonas"
 
-#: addressbook/gui/widgets/eab-contact-display.c:375
+#: addressbook/gui/widgets/eab-contact-display.c:367
 #, fuzzy
 msgid "personal"
 msgstr "Asmeninis"
 
-#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/eab-contact-display.c:374
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Pastaba"
 
-#: addressbook/gui/widgets/eab-contact-display.c:548
+#: addressbook/gui/widgets/eab-contact-display.c:540
 msgid "Job Title"
 msgstr "Pareigos"
 
-#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/eab-contact-display.c:544
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:774
+#: smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "El. paštas"
 
-#: addressbook/gui/widgets/eab-contact-display.c:579
+#: addressbook/gui/widgets/eab-contact-display.c:571
 msgid "Home page"
 msgstr "Namų puslapis"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 msgid "Success"
 msgstr "Sėkmė"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Backend busy"
 msgstr ""
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Repository offline"
 msgstr "Saugykla atsijungta"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 #, fuzzy
 msgid "Address Book does not exist"
 msgstr "Adresų Knyga neegzistuoja"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 #, fuzzy
 msgid "No Self Contact defined"
 msgstr "Naujas kontaktų sąrašas"
@@ -2582,27 +2496,27 @@ msgstr "Naujas kontaktų sąrašas"
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Permission denied"
 msgstr "Priėjimas uždraustas"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Contact not found"
 msgstr "Kontaktas nerastas"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Contact ID already exists"
 msgstr "Toks kontakto ID jau naudojamas"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Protocol not supported"
 msgstr "Protokolas nepalaikomas"
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:60
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:233
 #: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
@@ -2615,39 +2529,39 @@ msgid "Cancelled"
 msgstr "Nutraukta"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:61
 #, fuzzy
 msgid "Could not cancel"
 msgstr "Nepavyko atidaryti „%s“: %s"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Authentication Failed"
 msgstr "Autentikacija Nepavyko"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Authentication Required"
 msgstr "Būtina Autentifikacija"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:66
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "TLS not Available"
 msgstr "TLS Negalimas"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#: addressbook/gui/widgets/eab-gui-util.c:66
 #, fuzzy
 msgid "No such source"
 msgstr "Nėra tokio laiško"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:69
+#: addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Other error"
 msgstr "Kita klaida"
 
-#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:90
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
@@ -2655,7 +2569,7 @@ msgstr ""
 "Nepavyko atidaryti šios adresų knygelės. Patikrinkite, ar kelias egzistuoja "
 "ir ar Jūs turite teises jį pasiekti."
 
-#: addressbook/gui/widgets/eab-gui-util.c:110
+#: addressbook/gui/widgets/eab-gui-util.c:97
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -2663,17 +2577,18 @@ msgstr ""
 "Nepavyko atidaryti šios adresų knygos. Tai reiškia, kad Jūs įvedėte "
 "neteisingą adresą arba nurodytas LDAP serveris yra nepasiekiamas."
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:102
+#, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution you must compile the program from the CVS "
-"sources after retrieving OpenLDAP from the link below."
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
 msgstr ""
 "Ši Evolution versija neturi įkompiliuoto LDAP palaikymo. Jei Jūs norite "
 "naudoti LDAP su Evolution, Jums teks sukompiliuoti programą iš pradinių "
 "tekstų prieš tai įdiegus OpenLDAP iš žemiau esančio adreso."
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:109
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -2681,11 +2596,7 @@ msgstr ""
 "Nepavyko atidaryti šios adresų knygos. Tai reiškia, kad Jūs įvedėte "
 "neteisingą adresą arba nurodytas serveris yra nepasiekiamas."
 
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "Unable to open addressbook"
-msgstr "Negaliu atidaryti adresų knygelės"
-
-#: addressbook/gui/widgets/eab-gui-util.c:162
+#: addressbook/gui/widgets/eab-gui-util.c:129
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2697,7 +2608,7 @@ msgstr ""
 "padidinkite išvedamų atsakymų kiekio apribojimus tarp šios\n"
 "adresų knygos katalogo serverio nustatymų."
 
-#: addressbook/gui/widgets/eab-gui-util.c:168
+#: addressbook/gui/widgets/eab-gui-util.c:135
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -2709,53 +2620,45 @@ msgstr ""
 "padidinkite laiko ribas nustatytas šios adresų knygos katalogo\n"
 "serverio nustatymuose."
 
-#: addressbook/gui/widgets/eab-gui-util.c:174
+#: addressbook/gui/widgets/eab-gui-util.c:141
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "Šios adresų knygos posistemė negali apdoroti pateiktos užklausos."
 
-#: addressbook/gui/widgets/eab-gui-util.c:177
+#: addressbook/gui/widgets/eab-gui-util.c:144
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Šios adresų knygos posistemė atsisakė apdoroti pateiktą užklausą."
 
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:147
 msgid "This query did not complete successfully."
 msgstr "Ši užklausa nesibaigė sėkmingai."
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
-msgid "Do you want to save changes?"
-msgstr "Ar nori išsaugoti pakeitimus?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:208
-msgid "_Discard"
-msgstr "_Atsikratyti"
-
-#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:169
 msgid "Error adding list"
 msgstr "Klaida pridedant sąrašą"
 
-#: addressbook/gui/widgets/eab-gui-util.c:229
-#: addressbook/gui/widgets/eab-gui-util.c:652
+#: addressbook/gui/widgets/eab-gui-util.c:169
+#: addressbook/gui/widgets/eab-gui-util.c:580
 msgid "Error adding contact"
 msgstr "Klaida įtraukiant kontaktą"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying list"
 msgstr "Klaida modifikuojant sąrašą"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying contact"
 msgstr "Klaida keičiant kontaktą"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:192
 msgid "Error removing list"
 msgstr "Klaida pašalinant sąrašą"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
-#: addressbook/gui/widgets/eab-gui-util.c:610
+#: addressbook/gui/widgets/eab-gui-util.c:192
+#: addressbook/gui/widgets/eab-gui-util.c:538
 msgid "Error removing contact"
 msgstr "Klaida šalinant kontaktą"
 
-#: addressbook/gui/widgets/eab-gui-util.c:334
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2764,7 +2667,7 @@ msgstr ""
 "Bandymas atverti %d kontaktus sukurs %d naujų langų.\n"
 "Ar Jūs tikrai norite peržiūrėti visus šiuos kontaktus vienu metu?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:360
+#: addressbook/gui/widgets/eab-gui-util.c:300
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2773,50 +2676,45 @@ msgstr ""
 "%s jau egzistuoja.\n"
 "Ar nori įrašyti vietoj jo?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:364
+#: addressbook/gui/widgets/eab-gui-util.c:304
 msgid "Overwrite"
 msgstr "Perrašyti"
 
-#: addressbook/gui/widgets/eab-gui-util.c:400
-#, c-format
-msgid "Error saving %s: %s"
-msgstr "Klaida saugant %s: %s"
-
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:437
+#: addressbook/gui/widgets/eab-gui-util.c:365
 msgid "card.vcf"
 msgstr "kortele.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:571
+#: addressbook/gui/widgets/eab-gui-util.c:499
 msgid "list"
 msgstr "sąrašas"
 
-#: addressbook/gui/widgets/eab-gui-util.c:706
+#: addressbook/gui/widgets/eab-gui-util.c:634
 msgid "Move contact to"
 msgstr "Perkelti kontaktą į"
 
-#: addressbook/gui/widgets/eab-gui-util.c:708
+#: addressbook/gui/widgets/eab-gui-util.c:636
 msgid "Copy contact to"
 msgstr "Nukopijuoti kontaktą į"
 
-#: addressbook/gui/widgets/eab-gui-util.c:711
+#: addressbook/gui/widgets/eab-gui-util.c:639
 msgid "Move contacts to"
 msgstr "Perkelti kontaktus į"
 
-#: addressbook/gui/widgets/eab-gui-util.c:713
+#: addressbook/gui/widgets/eab-gui-util.c:641
 msgid "Copy contacts to"
 msgstr "Nukopijuoti kontaktus į"
 
-#: addressbook/gui/widgets/eab-gui-util.c:716
+#: addressbook/gui/widgets/eab-gui-util.c:644
 #, fuzzy
 msgid "Select target addressbook."
 msgstr "Pasirinkti Kontaktus iš Adresų Knygos"
 
-#: addressbook/gui/widgets/eab-gui-util.c:939
+#: addressbook/gui/widgets/eab-gui-util.c:867
 msgid "Multiple VCards"
 msgstr "Keletas VCard kortelių"
 
-#: addressbook/gui/widgets/eab-gui-util.c:942
+#: addressbook/gui/widgets/eab-gui-util.c:870
 #, c-format
 msgid "VCard for %s"
 msgstr "%s VCard"
@@ -2906,7 +2804,7 @@ msgstr[2] "%d kontaktai"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:229
+#: addressbook/gui/widgets/e-addressbook-view.c:231
 #: addressbook/gui/widgets/e-minicard-view.c:467
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
@@ -2924,146 +2822,135 @@ msgstr "Modelis"
 msgid "Error modifying card"
 msgstr "Klaida modifikuojant kortelę"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:163
 msgid "Name begins with"
 msgstr "Vardas prasideda"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:164
 msgid "Email begins with"
 msgstr "El. paštas prasideda"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:57
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Kategorija yra"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-#: calendar/gui/cal-search-bar.c:50
+#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Bet kuris laukas turi savyje"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+#: addressbook/gui/widgets/e-addressbook-view.c:172
 msgid "Advanced..."
 msgstr "Išsami..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:236
+#: addressbook/gui/widgets/e-addressbook-view.c:238
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:249
+#: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Tipas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:506
+#: addressbook/gui/widgets/e-addressbook-view.c:508
 #, fuzzy
 msgid "Address Book"
 msgstr "Adresų _Knyga:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2076
+#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:2080
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
 msgstr "Išsaugoti kaip VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 msgid "New Contact..."
 msgstr "Naujas Kontaktas..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "New Contact List..."
 msgstr "Naujas Kontaktų Sąrašas..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Go to Folder..."
 msgstr "Eiti į Aplanką..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Import..."
 msgstr "Importuoti..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1066
 msgid "Search for Contacts..."
 msgstr "Ieškoti Kontaktų..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Adresų Knygos Šaltiniai..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1069
 msgid "Pilot Settings..."
 msgstr "Pilot Nustatymai..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Persiųsti kontaktą"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
 msgid "Send Message to Contact"
 msgstr "Siųsti laišką kontaktui"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Spausdinti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
+#: addressbook/gui/widgets/e-addressbook-view.c:1077
 msgid "Print Envelope"
 msgstr "Spausdinti voką"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
+#: addressbook/gui/widgets/e-addressbook-view.c:1081
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Adresų knygelė..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1080
+#: addressbook/gui/widgets/e-addressbook-view.c:1082
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Adresų knygelė..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Iškirpti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopijuoti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1087
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Įdėti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:1092
+#: calendar/gui/e-calendar-view.c:1280
 msgid "Current View"
 msgstr "Esamas vaizdas"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1309
-#, c-format
-msgid ""
-"The addressbook backend for\n"
-"%s\n"
-"has crashed. You will have to restart Evolution in order to use it again"
-msgstr ""
-"Sutriko adresų knygos posistemės\n"
-"%s\n"
-"darbas. Jums teks paleisti Evolution iš naujo tam, kad pasinaudoti ja vėl"
-
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1667
-#: calendar/gui/cal-search-bar.c:362
+#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Bet kuri kategorija"
 
@@ -3169,7 +3056,7 @@ msgstr "Radio"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-list-view.c:234
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Rolė"
@@ -3314,12 +3201,12 @@ msgstr "Evolution vCalendar importas"
 msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.c:998
+#: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr "Spausdinti kontaktus"
 
-#: addressbook/printing/e-contact-print.c:1064
-#: addressbook/printing/e-contact-print.c:1091
+#: addressbook/printing/e-contact-print.c:1066
+#: addressbook/printing/e-contact-print.c:1093
 msgid "Print contact"
 msgstr "Spausdinti kontaktą"
 
@@ -3571,15 +3458,21 @@ msgstr "Normaliam režimui nėra būtinas dydžio parametras."
 msgid "Impossible internal error."
 msgstr "Nenumatyta vidinė klaida."
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:629
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
 msgid "Can not open file"
 msgstr "Nepavyko atidaryti bylos"
 
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-msgid "Can not load URI"
-msgstr "Nepavyko atverti adreso"
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "Nepavyko įkelti adresų knygos"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Negaliu atidaryti adresų knygelės"
 
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
@@ -3597,7 +3490,7 @@ msgstr "Nenurodytas bylos vardas."
 msgid "Unnamed List"
 msgstr "Bevardis Sąrašas"
 
-#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Įveskite slaptažodį"
@@ -3878,10 +3771,10 @@ msgid "Whether to show week numbers in date navigator"
 msgstr "Ar rodyti savaičių numerius datos navigatoriuje"
 
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:88
-#: calendar/gui/gnome-cal.c:1703
-#: camel/providers/groupwise/camel-gw-listener.c:304
-#: camel/providers/groupwise/camel-gw-listener.c:327
+#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/gnome-cal.c:1705
+#: camel/providers/groupwise/camel-gw-listener.c:311
+#: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
 msgstr "Kalendorius"
 
@@ -3900,7 +3793,7 @@ msgstr "Ištrinti įvykius senesnius nei"
 
 #: calendar/gui/calendar-commands.c:363
 #: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:19 filter/filter.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
 msgid "days"
 msgstr "dienų"
 
@@ -4045,24 +3938,24 @@ msgstr "Savaitės rodinys"
 msgid "Month View"
 msgstr "Mėnesio rodinys"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Santrauka turi savyje"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Aprašymas turi savyje"
 
-#: calendar/gui/cal-search-bar.c:54
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Komentaras turi savyje"
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:53
 #, fuzzy
 msgid "Location contains"
 msgstr "Aprašymas turi savyje"
 
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
 msgid "Unmatched"
 msgstr "Netinkantys"
 
@@ -4083,23 +3976,23 @@ msgstr "Turimos priėjimo teisės neleidžia atidaryti kalendoriaus"
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/dialogs/alarm-options.c:466
+#: calendar/gui/dialogs/alarm-options.c:467
 msgid "Audio Alarm Options"
 msgstr "Perspėjimų garsu parinktys"
 
-#: calendar/gui/dialogs/alarm-options.c:475
+#: calendar/gui/dialogs/alarm-options.c:476
 msgid "Message Alarm Options"
 msgstr "Perspėjimų pranešimu parinktys"
 
-#: calendar/gui/dialogs/alarm-options.c:484
+#: calendar/gui/dialogs/alarm-options.c:485
 msgid "Email Alarm Options"
 msgstr "El. pašto Aliarmų Nuostatos"
 
-#: calendar/gui/dialogs/alarm-options.c:493
+#: calendar/gui/dialogs/alarm-options.c:494
 msgid "Program Alarm Options"
 msgstr "Perspėjimų programa parinktys"
 
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:510
 msgid "Unknown Alarm Options"
 msgstr "Nežinomų perspėjimų parinktys"
 
@@ -4135,7 +4028,7 @@ msgstr "Siųsti Kam:"
 msgid "With these arguments:"
 msgstr "Su tokiais argumentais:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
 msgid "dialog1"
 msgstr "dialogas1"
 
@@ -4144,7 +4037,7 @@ msgid "extra times every"
 msgstr "papildomai kiekvieną"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:20 filter/filter.glade.h:16
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr "valandų"
 
@@ -4190,7 +4083,7 @@ msgstr "Pasiųsti laišką"
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Apžvalga:"
 
@@ -4220,7 +4113,6 @@ msgid "hour(s)"
 msgstr "valandą(as)"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:21
 msgid "minute(s)"
 msgstr "minutę(es)"
 
@@ -4228,26 +4120,26 @@ msgstr "minutę(es)"
 msgid "start of appointment"
 msgstr "įvykio pradžią"
 
-#: calendar/gui/dialogs/calendar-setup.c:170
+#: calendar/gui/dialogs/calendar-setup.c:172
 msgid "You must specify a location to get the calendar from."
 msgstr "Jūs turite nurodyti vietą, iš kurios reikia paimti kalendorių."
 
-#: calendar/gui/dialogs/calendar-setup.c:178
+#: calendar/gui/dialogs/calendar-setup.c:180
 #, c-format
 msgid "The source location '%s' is not well-formed."
 msgstr "Šaltinio adreso „%s“ formatas yra nepriimtinas."
 
-#: calendar/gui/dialogs/calendar-setup.c:193
+#: calendar/gui/dialogs/calendar-setup.c:195
 #, c-format
 msgid "The source location '%s' is not a webcal source."
 msgstr "Pateiktas šaltinis „%s“ nėra webcal formate."
 
-#: calendar/gui/dialogs/calendar-setup.c:265
+#: calendar/gui/dialogs/calendar-setup.c:275
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr "Šaltinis pavadintas „%s“ jau yra tarp pasirinktos grupės"
 
-#: calendar/gui/dialogs/calendar-setup.c:278
+#: calendar/gui/dialogs/calendar-setup.c:288
 #, c-format
 msgid ""
 "The group '%s' is remote. You must specify a location to get the calendar "
@@ -4271,56 +4163,36 @@ msgstr "Užduočių Sąrašo Grupė"
 msgid "C_olor:"
 msgstr "Spalv_os"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "Calendar Properties"
-msgstr "Kalendoriaus Savybės"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
 msgid "Pick a color"
 msgstr "Pasirink spalvą"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:8
-msgid "Remote"
-msgstr "Nutolęs"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "Task List Properties"
-msgstr "Užduočių Sąrašo Savybės"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
 #, fuzzy
 msgid "_Add Calendar"
 msgstr "Sukurti Naują Kalendorių"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
 #, fuzzy
 msgid "_Add Group"
 msgstr "_Pridėti Grupę..."
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-msgid "_Refresh Interval:"
-msgstr "Atnaujinimo Intervalas:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
 #, fuzzy
 msgid "_Refresh:"
 msgstr "Atnaujinti"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-msgid "_Source URL:"
-msgstr "Pradini_s adresas:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
 #, fuzzy
 msgid "_Type:"
 msgstr "Tipas:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
 #, fuzzy
 msgid "_URL:"
 msgstr "URL"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
 msgid "weeks"
 msgstr "savaičių"
 
@@ -4428,7 +4300,7 @@ msgid "Display"
 msgstr "Vaiz_davimas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:76
 msgid "E_nable"
 msgstr "Įju_ngti"
 
@@ -4439,7 +4311,7 @@ msgstr "Laisvas/užsiėmęs informacija"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:563
+#: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Penktadienis"
 
@@ -4453,7 +4325,7 @@ msgstr "Minučių"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:559
+#: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Pirmadienis"
 
@@ -4463,7 +4335,7 @@ msgstr "S_ek"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:564
+#: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Šeštadienis"
 
@@ -4477,7 +4349,7 @@ msgstr "Rodyti savaičių _numerius datos navigatoriuje"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Sekmadienis"
 
@@ -4491,7 +4363,7 @@ msgstr "_Ket"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:562
+#: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Ketvirtadienis"
 
@@ -4505,7 +4377,7 @@ msgstr "Laiko formatas:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:560
+#: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Antradienis"
 
@@ -4515,7 +4387,7 @@ msgstr "Savaitė prasideda:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:561
+#: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Trečiadienis"
 
@@ -4548,7 +4420,7 @@ msgid "_Day begins:"
 msgstr "_Diena prasideda:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
-#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:43
@@ -4597,82 +4469,48 @@ msgstr "_Tre"
 msgid "before every appointment"
 msgstr "prieš kiekvieną paskyrimą"
 
-#: calendar/gui/dialogs/cancel-comp.c:57
-msgid ""
-"The event being deleted is a meeting, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"Trinamas įvykis yra susitikimas. Ar Jūs norite pasiųsti atšaukimo pranešimą?"
-
-#: calendar/gui/dialogs/cancel-comp.c:60
-msgid "Are you sure you want to cancel and delete this meeting?"
-msgstr "Ar tu tikrai nori atšaukti ir ištrinti šį susitikimą?"
-
-#: calendar/gui/dialogs/cancel-comp.c:66
-msgid ""
-"The task being deleted is assigned, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"Trinama užduotis yra priskirta. Ar Jūs norite pasiųsti atšaukimo pranešimą?"
-
-#: calendar/gui/dialogs/cancel-comp.c:69
-msgid "Are you sure you want to cancel and delete this task?"
-msgstr "Ar tu tikrai nori atšaukti ir ištrinti šią užduotį?"
-
-#: calendar/gui/dialogs/cancel-comp.c:75
-msgid ""
-"The journal entry being deleted is published, would you like to send a "
-"cancellation notice?"
-msgstr ""
-"Trinamas žurnalo įrašas yra viešai paskelbtas. Ar norite pasiųsti atšaukimo "
-"pranešimą?"
-
-#: calendar/gui/dialogs/cancel-comp.c:78
-msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr "Ar tu tikrai nori atšaukti ir ištrinti šį žurnalo įrašą?"
-
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Šis įvykis buvo ištrintas."
 
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "Ši užduotis buvo ištrinta."
 
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:68
 msgid "This journal entry has been deleted."
 msgstr "Šis žurnalo įrašas buvo ištrintas."
 
-#: calendar/gui/dialogs/changed-comp.c:75
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  Tu kažką pakeitei. Užmiršti tuos pakeitimus ir uždaryti redaktorių?"
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Tu nieko nepakeitei, uždaryti redaktorių?"
 
-#: calendar/gui/dialogs/changed-comp.c:82
+#: calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "Šis įvykis buvo pakeistas."
 
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "Ši užduotis buvo pakeista."
 
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:92
 msgid "This journal entry has been changed."
 msgstr "Šis žurnalo įrašas buvo pakeistas."
 
-#: calendar/gui/dialogs/changed-comp.c:99
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Tu kažką pakeitei. Užmiršti tuos pakeitimus ir atnaujinti redaktorių?"
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Tu nieko nepakeitei, atnaujinti redaktorių?"
@@ -4710,7 +4548,7 @@ msgid "No summary"
 msgstr "Nėra apžvalgos"
 
 #: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
 #: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Išsaugoti kaip..."
@@ -4765,102 +4603,51 @@ msgstr "Paskirties vieta"
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:95
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "Ar tu tikrai nori ištrinti įvykį „%s“?"
-
-#: calendar/gui/dialogs/delete-comp.c:98
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "Ar tu tikrai nori ištrinti šį bevardį įvykį?"
-
-#: calendar/gui/dialogs/delete-comp.c:104
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "Ar tu tikrai nori ištrinti užduotį „%s“?"
-
-#: calendar/gui/dialogs/delete-comp.c:107
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "Ar tu tikrai nori ištrinti šią bevardę užduotį?"
-
-#: calendar/gui/dialogs/delete-comp.c:113
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "Ar tu tikrai nori ištrinti žurnalo įrašą „%s“?"
-
-#: calendar/gui/dialogs/delete-comp.c:116
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "Ar tu tikrai nori ištrinti šį bevardį žurnalo įrašą?"
-
-#: calendar/gui/dialogs/delete-comp.c:131
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d appointment?"
-msgid_plural "Are you sure you want to delete %d appointments?"
-msgstr[0] "Ar tu tikrai nori ištrinti %d įvykių?"
-msgstr[1] "Ar tu tikrai nori ištrinti %d įvykių?"
-msgstr[2] "Ar tu tikrai nori ištrinti %d įvykių?"
-
-#: calendar/gui/dialogs/delete-comp.c:138
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d task?"
-msgid_plural "Are you sure you want to delete %d tasks?"
-msgstr[0] "Ar tu tikrai nori ištrinti %d užduočių?"
-msgstr[1] "Ar tu tikrai nori ištrinti %d užduočių?"
-msgstr[2] "Ar tu tikrai nori ištrinti %d užduočių?"
-
-#: calendar/gui/dialogs/delete-comp.c:145
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d journal entry?"
-msgid_plural "Are you sure you want to delete %d journal entries?"
-msgstr[0] "Ar tu tikrai nori ištrinti %d žurnalo įrašų?"
-msgstr[1] "Ar tu tikrai nori ištrinti %d žurnalo įrašų?"
-msgstr[2] "Ar tu tikrai nori ištrinti %d žurnalo įrašų?"
-
-#: calendar/gui/dialogs/delete-error.c:52
+#: calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "Dėl corba klaidos nepavyko ištrinti įvykio"
 
-#: calendar/gui/dialogs/delete-error.c:55
+#: calendar/gui/dialogs/delete-error.c:57
 msgid "The task could not be deleted due to a corba error"
 msgstr "Dėl corba klaidos nepavyko ištrinti užduoties"
 
-#: calendar/gui/dialogs/delete-error.c:58
+#: calendar/gui/dialogs/delete-error.c:60
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr "Dėl corba klaidos nepavyko ištrinti žurnalo įrašo"
 
-#: calendar/gui/dialogs/delete-error.c:61
+#: calendar/gui/dialogs/delete-error.c:63
 msgid "The item could not be deleted due to a corba error"
 msgstr "Corba klaida neleido ištrinti elemento"
 
-#: calendar/gui/dialogs/delete-error.c:68
+#: calendar/gui/dialogs/delete-error.c:70
 msgid "The event could not be deleted because permission was denied"
 msgstr "Įvykis negali būti ištrintas, kadangi nepakanta turimų teisių"
 
-#: calendar/gui/dialogs/delete-error.c:71
+#: calendar/gui/dialogs/delete-error.c:73
 msgid "The task could not be deleted because permission was denied"
 msgstr "Užduotis negali būti ištrinta, nes nepakanka turimų teisių"
 
-#: calendar/gui/dialogs/delete-error.c:74
+#: calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr "Žurnalo įrašas negali būti ištrintas, nes nepakanka turimų teisių"
 
-#: calendar/gui/dialogs/delete-error.c:77
+#: calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
 msgstr "Punktas negali būti ištrintas, nes nepakanka turimų teisių"
 
-#: calendar/gui/dialogs/delete-error.c:84
+#: calendar/gui/dialogs/delete-error.c:86
 msgid "The event could not be deleted due to an error"
 msgstr "Klaida neleido ištrinti įvykio"
 
-#: calendar/gui/dialogs/delete-error.c:87
+#: calendar/gui/dialogs/delete-error.c:89
 msgid "The task could not be deleted due to an error"
 msgstr "Klaida neleido ištrinti užduoties"
 
-#: calendar/gui/dialogs/delete-error.c:90
+#: calendar/gui/dialogs/delete-error.c:92
 msgid "The journal entry could not be deleted due to an error"
 msgstr "Klaida neleido ištrinti žurnalo įrašo"
 
-#: calendar/gui/dialogs/delete-error.c:93
+#: calendar/gui/dialogs/delete-error.c:95
 msgid "The item could not be deleted due to an error"
 msgstr "Klaida neleido ištrinti elemento"
 
@@ -4994,11 +4781,11 @@ msgstr "_Pradžios laikas:"
 
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:3
+#: calendar/gui/dialogs/meeting-page.glade.h:4
 #: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
 #: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1559
-#: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:100
+#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
+#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
@@ -5024,8 +4811,8 @@ msgstr "_Pavesti kam..."
 #. FIXME: need to disable for undeletable folders
 #: calendar/gui/dialogs/meeting-page.c:655
 #: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1310 calendar/gui/e-calendar-view.c:1342
-#: mail/em-folder-tree.c:2557 mail/em-folder-view.c:919
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
+#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -5033,7 +4820,7 @@ msgid "_Delete"
 msgstr "_Ištrinti"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:240
+#: calendar/gui/e-meeting-list-view.c:218
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Dalyvis"
@@ -5069,16 +4856,15 @@ msgid "Member"
 msgstr "Narys"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
-#: mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-list-view.c:248
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Būsena"
 
@@ -5086,20 +4872,20 @@ msgstr "Būsena"
 msgid "Add A_ttendee"
 msgstr "Pridė_ti Dalyvį"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "Add attendees from addressbook."
+msgstr "Įtraukti Siuntėją į Adresų _Knygą"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Organizatorius:"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
+#: calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "_Change Organizer"
 msgstr "_Keisti organizatorių:"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-#: calendar/gui/e-meeting-time-sel.c:417
-msgid "_Invite Others..."
-msgstr "Pakv_iesti kitus..."
-
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
 msgstr "<b>Kalendoriaus Nuostatos</b>"
@@ -5246,7 +5032,7 @@ msgid "_No recurrence"
 msgstr "_Jokio pakartojimo"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:450
+#: composer/e-msg-composer-attachment-bar.c:453
 msgid "_Remove"
 msgstr "_Pašalinti"
 
@@ -5278,54 +5064,20 @@ msgstr "savaitę(es)"
 msgid "year(s)"
 msgstr "metus"
 
-#: calendar/gui/dialogs/save-comp.c:53
-msgid ""
-"This event has been changed, but has not been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Šis įvykis buvo pakeistas, tačiau neišsaugotas.\n"
-"\n"
-"Ar norėtumėte išsaugoti pakeitimus?"
-
-#: calendar/gui/dialogs/save-comp.c:57
-msgid "_Discard Changes"
-msgstr "_Atsikratyti Pakeitimų"
-
-#: calendar/gui/dialogs/save-comp.c:62
-msgid "Save Event"
-msgstr "Išsaugoti Įvykį"
-
-#: calendar/gui/dialogs/select-source-dialog.c:65
+#: calendar/gui/dialogs/select-source-dialog.c:69
 #, fuzzy
 msgid "Select destination"
 msgstr "Nurodykite galutinį dokumentą"
 
-#: calendar/gui/dialogs/select-source-dialog.c:86
+#: calendar/gui/dialogs/select-source-dialog.c:90
 #, fuzzy
 msgid "_Destination"
 msgstr "Juodraščių _aplankas:"
 
-#: calendar/gui/dialogs/select-source-dialog.c:88
+#: calendar/gui/dialogs/select-source-dialog.c:92
 msgid "Task List"
 msgstr "Užduočių sąrašas"
 
-#: calendar/gui/dialogs/send-comp.c:57
-msgid "The meeting information has been created. Send it?"
-msgstr "Susitikimo informacija buvo sukurta. Ar ją išsiųsti?"
-
-#: calendar/gui/dialogs/send-comp.c:60
-msgid "The meeting information has changed. Send an updated version?"
-msgstr "Susitikimo informacija buvo pakeista. Siųsti atnaujintą informaciją?"
-
-#: calendar/gui/dialogs/send-comp.c:67
-msgid "The task assignment information has been created. Send it?"
-msgstr "Užduoties priskyrimas buvo sukurtas. Ar išsiųsti informaciją?"
-
-#: calendar/gui/dialogs/send-comp.c:71
-msgid "The task information has changed. Send an updated version?"
-msgstr "Užduoties informacija buvo pakeista. Siųsti atnaujintą informaciją?"
-
 #: calendar/gui/dialogs/task-details-page.c:406
 msgid "Completed date is wrong"
 msgstr "Pabaigos data klaidinga"
@@ -5345,7 +5097,7 @@ msgstr "Užbaigta"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #: calendar/gui/e-cal-component-preview.c:249
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:960
 msgid "High"
 msgstr "Aukštas"
 
@@ -5359,14 +5111,14 @@ msgstr "Vykdoma"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:253
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:958
 msgid "Low"
 msgstr "Žemas"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:251
 #: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:957
+#: mail/message-list.c:959
 msgid "Normal"
 msgstr "Normalus"
 
@@ -5424,8 +5176,8 @@ msgstr "S_laptas"
 
 #: calendar/gui/dialogs/task-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
+#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Aprašymas:"
 
@@ -5604,7 +5356,7 @@ msgstr "Kada reikia:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:950
+#: calendar/gui/e-itip-control.c:943
 msgid "Status:"
 msgstr "Būsena:"
 
@@ -5689,12 +5441,12 @@ msgstr "Užimtas"
 msgid "Deleting selected objects"
 msgstr "Trinami pasirinkti objektai"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
 msgid "Updating objects"
 msgstr "Atnaujinami objektai"
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1370
+#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
 #: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "Ati_daryti"
@@ -5704,15 +5456,15 @@ msgid "Open _Web Page"
 msgstr "Atverti Tinklapį"
 
 #: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1291 calendar/gui/e-calendar-view.c:1376
-#: mail/em-folder-view.c:896 mail/em-popup.c:690 mail/em-popup.c:806
+#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
+#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "Iš_saugoti kaip..."
 
 #: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1292
-#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
+#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
@@ -5720,24 +5472,24 @@ msgid "_Print..."
 msgstr "S_pausdinti..."
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Iškirpti"
 
 #: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1338
-#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2550
-#: mail/message-list.c:1644 ui/evolution-addressbook.xml.h:31
+#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
+#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
+#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Kopijuoti"
 
 #: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1273 calendar/gui/e-calendar-view.c:1299
-#: calendar/gui/e-calendar-view.c:1372 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
+#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
@@ -5806,71 +5558,71 @@ msgstr "Apžvalga"
 msgid "Task sort"
 msgstr "Užduočių rikiavimas"
 
-#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
 msgid "New _Appointment..."
 msgstr "Naujas į_vykis..."
 
-#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
+#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
 msgid "New All Day _Event"
 msgstr "Naujas visos _dienos įvykis"
 
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
+#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
 msgid "New Meeting"
 msgstr "Naujas Susitikimas"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
 msgid "New Task"
 msgstr "Nauja užduotis"
 
-#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Pažymėti _giją"
 
-#: calendar/gui/e-calendar-view.c:1280
+#: calendar/gui/e-calendar-view.c:1283
 #, fuzzy
 msgid "_Select Date..."
 msgstr "Pa_srinkite..."
 
-#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Skelbti laisvas/užimtas informaciją"
 
-#: calendar/gui/e-calendar-view.c:1303
+#: calendar/gui/e-calendar-view.c:1306
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Kopijuoti į aplanką..."
 
-#: calendar/gui/e-calendar-view.c:1304
+#: calendar/gui/e-calendar-view.c:1307
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "Perkelti į Aplanką..."
 
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1308
 msgid "_Schedule Meeting..."
 msgstr "_Suplanuoti Susitikimą..."
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1309
 msgid "_Forward as iCalendar..."
 msgstr "_Persiųsti kaip iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
 msgid "Delete this _Occurrence"
 msgstr "Ištrinti šį _pasitaikymą"
 
-#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
 msgid "Delete _All Occurrences"
 msgstr "Ištrinti _visus pasitaikymus"
 
-#: calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1349
 msgid "Go to _Today"
 msgstr "Eiti į šia_ndieną"
 
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1351
 msgid "_Go to Date..."
 msgstr "_Eiti į datą..."
 
-#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "Nuo_statos..."
 
@@ -5885,9 +5637,9 @@ msgstr "Pradžios data"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:967 calendar/gui/e-itip-control.c:1169
-#: calendar/gui/e-meeting-list-view.c:144
-#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
 #: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
 #: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
 #: camel/camel-tcp-stream-openssl.c:631
@@ -5913,13 +5665,13 @@ msgid "Assigned"
 msgstr "Priskirtas"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr "Taip"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "Ne"
 
@@ -5931,7 +5683,7 @@ msgstr "Š"
 msgid "S"
 msgstr "P"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
 msgid "E"
 msgstr "R"
 
@@ -6003,11 +5755,11 @@ msgstr "%b %d"
 msgid "%02i minute divisions"
 msgstr "%02i minučių padalos"
 
-#: calendar/gui/e-itip-control.c:592
+#: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
 msgstr "Taip. (Sudėtingas Pasikartojimas)"
 
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:596
 #, fuzzy, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
@@ -6015,7 +5767,7 @@ msgstr[0] "Kasdien"
 msgstr[1] "Kasdien"
 msgstr[2] "Kasdien"
 
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:601
 #, fuzzy, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
@@ -6023,7 +5775,7 @@ msgstr[0] "Kiekvieną savaitę"
 msgstr[1] "Kiekvieną savaitę"
 msgstr[2] "Kiekvieną savaitę"
 
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:603
 #, fuzzy, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -6031,21 +5783,21 @@ msgstr[0] "Kiekvienos savaitės dieną"
 msgstr[1] "Kiekvienos savaitės dieną"
 msgstr[2] "Kiekvienos savaitės dieną"
 
-#: calendar/gui/e-itip-control.c:618
+#: calendar/gui/e-itip-control.c:611
 msgid " and "
 msgstr " ir "
 
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:618
 #, c-format
 msgid "The %s day of "
 msgstr "%s dieną iš  "
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:631
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s iš "
 
-#: calendar/gui/e-itip-control.c:645
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy, c-format
 msgid "every month"
 msgid_plural "every %d months"
@@ -6053,7 +5805,7 @@ msgstr[0] "kiekvieną mėnesį"
 msgstr[1] "kiekvieną mėnesį"
 msgstr[2] "kiekvieną mėnesį"
 
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:642
 #, fuzzy, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
@@ -6061,7 +5813,7 @@ msgstr[0] "Kasmet"
 msgstr[1] "Kasmet"
 msgstr[2] "Kasmet"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:653
 #, fuzzy, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
@@ -6069,42 +5821,42 @@ msgstr[0] " bendrai %d kartų"
 msgstr[1] " bendrai %d kartų"
 msgstr[2] " bendrai %d kartų"
 
-#: calendar/gui/e-itip-control.c:669
+#: calendar/gui/e-itip-control.c:662
 msgid ", ending on "
 msgstr ", pabaigiant "
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:686
 msgid "<b>Starts:</b> "
 msgstr "<b>Pradžia:</b> "
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:696
 msgid "<b>Ends:</b> "
 msgstr "<b>Pabaiga:</b> "
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:716
 msgid "<b>Completed:</b> "
 msgstr "<b>Baigta:</b> "
 
-#: calendar/gui/e-itip-control.c:733
+#: calendar/gui/e-itip-control.c:726
 msgid "<b>Due:</b> "
 msgstr "<b>Iki:</b> "
 
-#: calendar/gui/e-itip-control.c:771 calendar/gui/e-itip-control.c:827
+#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
 msgid "iCalendar Information"
 msgstr "iCalendar Informacija"
 
 #. Title
-#: calendar/gui/e-itip-control.c:788
+#: calendar/gui/e-itip-control.c:781
 msgid "iCalendar Error"
 msgstr "iCalendar Klaida"
 
-#: calendar/gui/e-itip-control.c:859 calendar/gui/e-itip-control.c:875
-#: calendar/gui/e-itip-control.c:886 calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
 msgid "An unknown person"
 msgstr "Nežinomas asmuo"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:910
+#: calendar/gui/e-itip-control.c:903
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -6112,307 +5864,311 @@ msgstr ""
 "<br> Peržiūrėkite žemiau esančią informaciją ir tada pasirinkite reikiamą "
 "apatinio meniu punktą."
 
-#: calendar/gui/e-itip-control.c:925
+#: calendar/gui/e-itip-control.c:918
 msgid "<i>None</i>"
 msgstr "<i>Joks</i>"
 
-#: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:929
+msgid "Location:"
+msgstr "Vieta:"
+
+#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Priimtas"
 
-#: calendar/gui/e-itip-control.c:959 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Negalutinis Sutikimas"
 
-#: calendar/gui/e-itip-control.c:963 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Atmestas"
 
-#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.c:1050
-#: calendar/gui/e-itip-control.c:1076 calendar/gui/e-itip-control.c:1089
-#: calendar/gui/e-itip-control.c:1102 calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
 msgid "Choose an action:"
 msgstr "Pasirinkti veiksmą:"
 
-#: calendar/gui/e-itip-control.c:1023
+#: calendar/gui/e-itip-control.c:1016
 msgid "Update"
 msgstr "Atnaujinti"
 
-#: calendar/gui/e-itip-control.c:1024 calendar/gui/e-itip-control.c:1055
-#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1091
-#: calendar/gui/e-itip-control.c:1104 calendar/gui/e-itip-control.c:1117
-#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
+#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Gerai"
 
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1044
 msgid "Accept"
 msgstr "Priimti"
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1045
 msgid "Tentatively accept"
 msgstr "Sutikti, bet negarantuoti"
 
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1046
 msgid "Decline"
 msgstr " Atmesti "
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1070
 msgid "Send Free/Busy Information"
 msgstr "Siųsti Laisvas/Užimtas Informaciją"
 
-#: calendar/gui/e-itip-control.c:1090
+#: calendar/gui/e-itip-control.c:1083
 msgid "Update respondent status"
 msgstr "Atnaujinti gavėjų statusą"
 
-#: calendar/gui/e-itip-control.c:1103
+#: calendar/gui/e-itip-control.c:1096
 msgid "Send Latest Information"
 msgstr "Nusiųsti Paskutinę Informaciją"
 
-#: calendar/gui/e-itip-control.c:1116 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Nutraukti"
 
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1185
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> paskelbė susitikimo informaciją."
 
-#: calendar/gui/e-itip-control.c:1193
+#: calendar/gui/e-itip-control.c:1186
 msgid "Meeting Information"
 msgstr "Susitikimo informacija"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1191
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> norėtų, kad %s dalyvautų susitikime."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1193
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> norėtų, kad Jūs dalyvautumėte susitikime."
 
-#: calendar/gui/e-itip-control.c:1201
+#: calendar/gui/e-itip-control.c:1194
 msgid "Meeting Proposal"
 msgstr "Susitikimo Pasiūlymas"
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> nori papildyti esamą susitikimą."
 
-#: calendar/gui/e-itip-control.c:1206
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Update"
 msgstr "Susitikimo Atnaujinimas"
 
-#: calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1203
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> norėtų gauti paskutinę informaciją apie susitikimą."
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1204
 msgid "Meeting Update Request"
 msgstr "Prašymas Pakeisti Susitikimo Informaciją"
 
-#: calendar/gui/e-itip-control.c:1218
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> atsakė į susitikimo užklausą."
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Reply"
 msgstr "Susitikimo Atsakas"
 
-#: calendar/gui/e-itip-control.c:1226
+#: calendar/gui/e-itip-control.c:1219
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> atšaukė susitikimą."
 
-#: calendar/gui/e-itip-control.c:1227
+#: calendar/gui/e-itip-control.c:1220
 msgid "Meeting Cancellation"
 msgstr "Susitikimo Atšaukimas"
 
-#: calendar/gui/e-itip-control.c:1234 calendar/gui/e-itip-control.c:1302
-#: calendar/gui/e-itip-control.c:1337
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1330
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> atsiuntė nesuprantamą atsakymą į užklausimą."
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1228
 msgid "Bad Meeting Message"
 msgstr "Blogas Susitikimo Pranešimas"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1253
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> paskelbė užduoties informaciją."
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1254
 msgid "Task Information"
 msgstr "Užduoties informacija"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1259
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> prašo %s atlikti šią užduotį."
 
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> prašo Jus atlikti užduotį."
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1262
 msgid "Task Proposal"
 msgstr "Užduoties Pasiūlymas"
 
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> nori papildyti esamą užduotį."
 
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Update"
 msgstr "Užduoties Atnaujinimas"
 
-#: calendar/gui/e-itip-control.c:1278
+#: calendar/gui/e-itip-control.c:1271
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> nori gauti paskutinę užduoties informaciją."
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1272
 msgid "Task Update Request"
 msgstr "Užduoties Atnaujinimo Užklausa"
 
-#: calendar/gui/e-itip-control.c:1286
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> atsakė į užduoties priskyrimą."
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Reply"
 msgstr "Užduoties Atsakas"
 
-#: calendar/gui/e-itip-control.c:1294
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> atšaukė užduotį."
 
-#: calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1288
 msgid "Task Cancellation"
 msgstr "Užduoties Atšaukimas"
 
-#: calendar/gui/e-itip-control.c:1303
+#: calendar/gui/e-itip-control.c:1296
 msgid "Bad Task Message"
 msgstr "Blogas Užduoties Pranešimas"
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1315
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> paskelbė laisvas/užimtas informaciją."
 
-#: calendar/gui/e-itip-control.c:1323
+#: calendar/gui/e-itip-control.c:1316
 msgid "Free/Busy Information"
 msgstr "Laisvas/Užimtas Informacija"
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> paprašė Jūsų pateikti laisvas/užimtas informaciją."
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1321
 msgid "Free/Busy Request"
 msgstr "Laisvas/Užimtas Prašymas"
 
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1325
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> atsakė į laisvas/užimtas prašymą."
 
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1326
 msgid "Free/Busy Reply"
 msgstr "Laisvas/Užimtas Atsakas"
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1331
 msgid "Bad Free/Busy Message"
 msgstr "Blogas Laisvas/Užimtas Pranešimas"
 
-#: calendar/gui/e-itip-control.c:1413
+#: calendar/gui/e-itip-control.c:1406
 msgid "The message does not appear to be properly formed"
 msgstr "Pranešimas nėra teisingai suformuotas"
 
-#: calendar/gui/e-itip-control.c:1472
+#: calendar/gui/e-itip-control.c:1465
 msgid "The message contains only unsupported requests."
 msgstr "Pranešime yra išvardinti tik nepalaikomi prašymai."
 
-#: calendar/gui/e-itip-control.c:1503
+#: calendar/gui/e-itip-control.c:1496
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Priede nėra tvarkingo kalendoriaus pranešimo"
 
-#: calendar/gui/e-itip-control.c:1535
+#: calendar/gui/e-itip-control.c:1528
 msgid "The attachment has no viewable calendar items"
 msgstr "Priede nėra peržiūrimų kalendoriaus elementų"
 
-#: calendar/gui/e-itip-control.c:1769
+#: calendar/gui/e-itip-control.c:1762
 msgid "Update complete\n"
 msgstr "Atnaujinimas užbaigtas\n"
 
-#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
+#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Dalyvio statusas negali būti atnaujintas, nes pasirinktas elementas "
 "nebeegzistuoja"
 
-#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objektas yra nepriimtinas ir negali būti atnaujintas\n"
 
-#: calendar/gui/e-itip-control.c:1825
+#: calendar/gui/e-itip-control.c:1818
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Šis atsakymas yra ne nuo esamo dalyvio. Ar įtraukti siuntėją į dalyvių "
 "sąrašą?"
 
-#: calendar/gui/e-itip-control.c:1837
+#: calendar/gui/e-itip-control.c:1830
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Dalyvio statusas negali būti atnaujintas, nes nurodytas neteisingas "
 "statusas!\n"
 
-#: calendar/gui/e-itip-control.c:1856
+#: calendar/gui/e-itip-control.c:1849
 msgid "There was an error on the CORBA system\n"
 msgstr "Įvyko CORBA sistemos klaida\n"
 
-#: calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1852
 msgid "Object could not be found\n"
 msgstr "Objektas nerastas\n"
 
-#: calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1855
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Jūs neturite teisių, būtinų atnaujinti kalendoriaus informaciją\n"
 
-#: calendar/gui/e-itip-control.c:1865
+#: calendar/gui/e-itip-control.c:1858
 msgid "Attendee status updated\n"
 msgstr "Dalyvio būsena atnaujinta\n"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1861
 msgid "Attendee status could not be updated!\n"
 msgstr "Dalyvio būsena negali būti atnaujinta!\n"
 
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1892
 msgid "Removal Complete"
 msgstr "Pašalinimas užbaigtas"
 
-#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
 msgid "Item sent!\n"
 msgstr "Elementas išsiųstas!\n"
 
-#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
+#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
 msgid "The item could not be sent!\n"
 msgstr "Elementas negalėjo būti išsiųstas!\n"
 
@@ -6453,74 +6209,74 @@ msgstr "pabaigos-data"
 msgid "date-start"
 msgstr "pradžios-data"
 
-#: calendar/gui/e-meeting-list-view.c:62
+#: calendar/gui/e-meeting-list-view.c:59
 msgid "Chair Persons"
 msgstr "Pirmininkaujantys asmenys"
 
-#: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:479
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
 msgid "Required Participants"
 msgstr "Būtini dalyviai"
 
-#: calendar/gui/e-meeting-list-view.c:64
+#: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Nebūtini dalyviai"
 
-#: calendar/gui/e-meeting-list-view.c:65
+#: calendar/gui/e-meeting-list-view.c:62
 msgid "Resources"
 msgstr "Resursai"
 
-#: calendar/gui/e-meeting-list-view.c:140 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
 #: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr "Individas"
 
-#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "Grupė"
 
-#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr "Resursas"
 
-#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr "Kambarys"
 
-#: calendar/gui/e-meeting-list-view.c:154 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr "Pirmininkas"
 
-#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:127
 #: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
 msgid "Required Participant"
 msgstr "Būtinas dalyvis"
 
-#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr "Nebūtinas dalyvis"
 
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr "Ne dalyvis"
 
-#: calendar/gui/e-meeting-list-view.c:179 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:177
 #: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
 msgid "Needs Action"
 msgstr "Reikalauja veiksmo"
 
-#: calendar/gui/e-meeting-list-view.c:182 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
 #: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "Negalutinis"
 
-#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr "Pavestas"
@@ -6537,20 +6293,28 @@ msgstr "Nesu darbe"
 msgid "No Information"
 msgstr "Nėra informacijos"
 
+#: calendar/gui/e-meeting-time-sel.c:417
+#, fuzzy
+msgid "Add attendees from addressbook"
+msgstr "Įtraukti Siuntėją į Adresų _Knygą"
+
 #: calendar/gui/e-meeting-time-sel.c:440
 msgid "_Options"
 msgstr "_Parinktys"
 
 #: calendar/gui/e-meeting-time-sel.c:457
-msgid "Show _Only Working Hours"
+#, fuzzy
+msgid "Show _only working hours"
 msgstr "Rodyti tik _darbo valandas"
 
 #: calendar/gui/e-meeting-time-sel.c:467
-msgid "Show _Zoomed Out"
+#, fuzzy
+msgid "Show _zoomed out"
 msgstr "Rodyti _atitrauktą"
 
 #: calendar/gui/e-meeting-time-sel.c:482
-msgid "_Update Free/Busy"
+#, fuzzy
+msgid "_Update free/busy"
 msgstr "_Atnaujinti Laisvas/Užimtas"
 
 #: calendar/gui/e-meeting-time-sel.c:497
@@ -6566,19 +6330,23 @@ msgid ">_>"
 msgstr ">_>"
 
 #: calendar/gui/e-meeting-time-sel.c:547
-msgid "_All People and Resources"
+#, fuzzy
+msgid "_All people and resources"
 msgstr "_Visi žmonės ir resursai"
 
 #: calendar/gui/e-meeting-time-sel.c:556
-msgid "All _People and One Resource"
+#, fuzzy
+msgid "All _people and one resource"
 msgstr "Visi ž_monės ir vienas resursas"
 
 #: calendar/gui/e-meeting-time-sel.c:565
-msgid "_Required People"
+#, fuzzy
+msgid "_Required people"
 msgstr "_Būtini žmonės"
 
 #: calendar/gui/e-meeting-time-sel.c:574
-msgid "Required People and _One Resource"
+#, fuzzy
+msgid "Required people and _one resource"
 msgstr "Būtini žmonės ir _vienas resursas"
 
 #: calendar/gui/e-meeting-time-sel.c:593
@@ -6616,7 +6384,7 @@ msgstr "%Y-%m-%d"
 msgid "Enter the password for %s"
 msgstr "Įveskite „%s“ slaptažodį"
 
-#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6625,19 +6393,14 @@ msgstr ""
 "Klaida tarp %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-
 #. FIXME Loading should be async
 #. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:686
+#: calendar/gui/e-tasks.c:801
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Atidaromos užduotys tarp %s"
 
-#: calendar/gui/e-tasks.c:709
+#: calendar/gui/e-tasks.c:824
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6646,52 +6409,47 @@ msgstr ""
 "Klaida atidarant %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:730
+#: calendar/gui/e-tasks.c:845
 msgid "Loading tasks"
 msgstr "Įkeliamos užduotys"
 
-#: calendar/gui/e-tasks.c:834
+#: calendar/gui/e-tasks.c:949
 msgid "Completing tasks..."
 msgstr "Užbaigiamos užduotys..."
 
-#: calendar/gui/e-tasks.c:857
+#: calendar/gui/e-tasks.c:972
 msgid "Deleting selected objects..."
 msgstr "Trinami pasirinkti objektai..."
 
-#: calendar/gui/e-tasks.c:884
+#: calendar/gui/e-tasks.c:999
 msgid "Expunging"
 msgstr "Išvaloma"
 
-#: calendar/gui/e-tasks.c:960
+#: calendar/gui/e-tasks.c:1075
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
-#: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
+#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
+#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
 #: calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:705
 msgid "Tasks"
 msgstr "Užduotys"
 
-#: calendar/gui/gnome-cal.c:1876
+#: calendar/gui/gnome-cal.c:1878
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Įvykis -- %s"
 
-#: calendar/gui/gnome-cal.c:1895
+#: calendar/gui/gnome-cal.c:1897
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Įkeliamos užduotys"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1920
 #, c-format
 msgid "Opening %s"
 msgstr "Atidaroma %s"
 
-#: calendar/gui/gnome-cal.c:2048
-#, c-format
-msgid "The calendar backend for '%s' has crashed."
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:2894
+#: calendar/gui/gnome-cal.c:2906
 msgid "Purging"
 msgstr "Trinama"
 
@@ -6894,7 +6652,7 @@ msgid "On The Web"
 msgstr "Tinkle"
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 
@@ -6905,7 +6663,7 @@ msgid "Unable to migrate calendar `%s'"
 msgstr "Nepavyko atidaryti kalendoriaus „%s“."
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:869
+#: calendar/gui/migration.c:889
 #, fuzzy, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Nepavyko atverti „%s“ užduočių."
@@ -7141,17 +6899,17 @@ msgstr "Spausdinti elementą"
 msgid "Print Setup"
 msgstr "Spausdinimo nuostatos"
 
-#: calendar/gui/tasks-component.c:303
+#: calendar/gui/tasks-component.c:313
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 "Bus pašalintas Užduočių Sąrašas „%s“. Ar Jūs tikrai norite taip pasielgti?"
 
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:371
 msgid "New Task List"
 msgstr "Naujas Užduočių sąrašas"
 
-#: calendar/gui/tasks-component.c:398
+#: calendar/gui/tasks-component.c:408
 #, fuzzy, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -7159,7 +6917,7 @@ msgstr[0] "%d kontaktai"
 msgstr[1] "%d kontaktai"
 msgstr[2] "%d kontaktai"
 
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -7167,49 +6925,49 @@ msgstr[0] "Ištrintas"
 msgstr[1] "Ištrintas"
 msgstr[2] "Ištrintas"
 
-#: calendar/gui/tasks-component.c:447
+#: calendar/gui/tasks-component.c:457
 #, fuzzy
 msgid "Failed upgrading tasks."
 msgstr "Įkeliamos užduotys"
 
-#: calendar/gui/tasks-component.c:526
+#: calendar/gui/tasks-component.c:749
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "Nepavyko atverti užduočių sąrašo „%s“ įvykių ir susitikimų kūrimui"
 
-#: calendar/gui/tasks-component.c:538
+#: calendar/gui/tasks-component.c:761
 msgid "There is no calendar available for creating tasks"
 msgstr "Nėra kalendoriaus, kuriame galima būtų kurti užduotis"
 
-#: calendar/gui/tasks-component.c:576
+#: calendar/gui/tasks-component.c:799
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:804
+#: calendar/gui/tasks-component.c:1040
 msgid "New task"
 msgstr "Nauja užduotis"
 
-#: calendar/gui/tasks-component.c:805
+#: calendar/gui/tasks-component.c:1041
 msgid "_Task"
 msgstr "_Užduotis"
 
-#: calendar/gui/tasks-component.c:806
+#: calendar/gui/tasks-component.c:1042
 msgid "Create a new task"
 msgstr "Sukurti naują užduotį"
 
-#: calendar/gui/tasks-component.c:812
+#: calendar/gui/tasks-component.c:1048
 #, fuzzy
 msgid "New tasks group"
 msgstr "Nauja užduotis"
 
-#: calendar/gui/tasks-component.c:813
+#: calendar/gui/tasks-component.c:1049
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Užduočių Sąrašo Grupė"
 
-#: calendar/gui/tasks-component.c:814
+#: calendar/gui/tasks-component.c:1050
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Sukurti naują užduotį"
@@ -8977,12 +8735,12 @@ msgstr "Klaida vykdant filtro paiešką: %s: %s"
 msgid "Unsupported operation: append message: for %s"
 msgstr "Nepalaikoma operacija: įterpti laišką: dėl %s"
 
-#: camel/camel-folder.c:1259
+#: camel/camel-folder.c:1262
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Nepalaikoma operacija: paieška pagal išraiška: skirta %s"
 
-#: camel/camel-folder.c:1299
+#: camel/camel-folder.c:1302
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Nepalaikoma operacija: paieška pagal uid: skirta %s"
@@ -8995,11 +8753,16 @@ msgstr "Perkeliami laiškai"
 msgid "Copying messages"
 msgstr "Kopijuojami pranešimai"
 
-#: camel/camel-folder.c:1666
-msgid "Learning junk and/or non junk message(s)"
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Keičiama šiukšlių žymė"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
 msgstr ""
 
-#: camel/camel-folder.c:1695
+#: camel/camel-folder.c:1701
 msgid "Filtering new message(s)"
 msgstr "Filtruojami nauji pranešimai"
 
@@ -9033,17 +8796,17 @@ msgstr ""
 msgid "(match-threads) requires a match type string"
 msgstr ""
 
-#: camel/camel-folder-search.c:785
+#: camel/camel-folder-search.c:784
 #, fuzzy
 msgid "(match-threads) expects an array result"
 msgstr "(match-all) reikalauja vienintelio loginio rezultato"
 
-#: camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:790
 #, fuzzy
 msgid "(match-threads) requires the folder set"
 msgstr "(match-all) reikalauja vienintelio loginio rezultato"
 
-#: camel/camel-folder-search.c:880
+#: camel/camel-folder-search.c:879
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Vykdoma užklausa nežinomai antraštei: %s"
@@ -9078,7 +8841,8 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
 #: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:706
+#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Nutraukta."
@@ -9458,7 +9222,7 @@ msgstr "Pateiktas mandatas yra pasenęs."
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1212
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Blogas autentikacijos atsakymas iš serverio."
 
@@ -9839,40 +9603,40 @@ msgstr "Komanda neįgyvendinta"
 msgid "export keys: unimplemented"
 msgstr ""
 
-#: camel/camel-store.c:214
+#: camel/camel-store.c:213
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Nepavyko pasiekti aplanko: Neleistina šios saugyklos operacija"
 
-#: camel/camel-store.c:244
+#: camel/camel-store.c:243
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr "Negalima sukurti aplanko: %s: %s"
 
-#: camel/camel-store.c:295
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Nepavyko sukurti aplanko: Neleistina šios saugyklos operacija"
 
-#: camel/camel-store.c:323
+#: camel/camel-store.c:325
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Negalima sukurti aplanko: %s: %s"
 
-#: camel/camel-store.c:387 camel/camel-vee-store.c:354
+#: camel/camel-store.c:389 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Negaliu ištrinti aplanko: %s: Bloga operacija"
 
-#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#: camel/camel-store.c:439 camel/camel-vee-store.c:387
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Negaliu pervadinti aplanko: %s: Bloga operacija"
 
-#: camel/camel-store.c:811
+#: camel/camel-store.c:777
 msgid "Trash"
 msgstr "Šiukšlės"
 
-#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
-#: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/mail-config.glade.h:95
+#: ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Šiukšlės"
 
@@ -10103,12 +9867,12 @@ msgstr "Nėra tokio laiško %s aplanke %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Negalima kopijuoti arba perkelti laiškų į Virtualų Aplanką"
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:374
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Negaliu ištrinti aplanko: %s: Nėra tokio aplanko"
 
-#: camel/camel-vee-store.c:398
+#: camel/camel-vee-store.c:395
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Negaliu pervadinti aplanko: %s: Nėra tokio aplanko"
@@ -10152,25 +9916,25 @@ msgstr "Adresų _Knyga:"
 msgid "Post Office Agent SOAP Port:"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:80
+#: camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "Novell GroupWise"
 msgstr "Novell GroupWise"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:82
+#: camel/providers/groupwise/camel-groupwise-provider.c:85
 #, fuzzy
 msgid "For accessing Novell Groupwise servers"
 msgstr "Skirtas pasiekti Novel Groupwise serverius"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: camel/providers/groupwise/camel-groupwise-provider.c:100
 #: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
 msgid "Password"
 msgstr "Slaptažodis"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:99
+#: camel/providers/groupwise/camel-groupwise-provider.c:102
 #: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
@@ -10178,8 +9942,8 @@ msgstr ""
 "Su šia parinktimi jungiantis prie IMAP serverio bus naudojamas paprasto "
 "teksto slaptažodis."
 
-#: camel/providers/groupwise/camel-gw-listener.c:305
-#: camel/providers/groupwise/camel-gw-listener.c:328
+#: camel/providers/groupwise/camel-gw-listener.c:312
+#: camel/providers/groupwise/camel-gw-listener.c:335
 #, fuzzy
 msgid "Checklist"
 msgstr "sąrašas"
@@ -10324,13 +10088,13 @@ msgstr ""
 "teksto slaptažodis."
 
 #: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:429
+#: camel/providers/imap/camel-imap-store.c:428
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP serveris %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:431
+#: camel/providers/imap/camel-imap-store.c:430
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP tarnyba, skirta %s tarp %s"
@@ -10340,7 +10104,7 @@ msgstr "IMAP tarnyba, skirta %s tarp %s"
 #: camel/providers/imap/camel-imap-store.c:551
 #: camel/providers/imap/camel-imap-store.c:571
 #: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
+#: camel/providers/nntp/camel-nntp-store.c:209
 #: camel/providers/pop3/camel-pop3-store.c:175
 #: camel/providers/smtp/camel-smtp-transport.c:269
 #: camel/providers/smtp/camel-smtp-transport.c:285
@@ -10357,10 +10121,10 @@ msgstr "SSL nepasiekiamas"
 
 #: camel/providers/imap4/camel-imap4-store.c:222
 #: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:815
+#: camel/providers/imap/camel-imap-store.c:845
 #: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:137
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
 #: camel/providers/pop3/camel-pop3-store.c:192
 msgid "Connection cancelled"
 msgstr "Jungtis nutraukta"
@@ -10373,8 +10137,8 @@ msgid ""
 msgstr "Nepavyko prisijungti prie IMAP serverio %s saugiu režimu: %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:649
-#: camel/providers/imap/camel-imap-store.c:680
+#: camel/providers/imap/camel-imap-store.c:679
+#: camel/providers/imap/camel-imap-store.c:710
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Nepavyko prisijungti prie IMAP serverio %s saugiu režimu: %s"
@@ -10383,7 +10147,7 @@ msgstr "Nepavyko prisijungti prie IMAP serverio %s saugiu režimu: %s"
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1109
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
 msgid "Unknown error"
 msgstr "Nežinoma klaida"
 
@@ -10411,8 +10175,8 @@ msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr "Negalėjau gauti aplanko „%s“: %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1857
-#: camel/providers/imap/camel-imap-store.c:2235
+#: camel/providers/imap/camel-imap-store.c:1885
+#: camel/providers/imap/camel-imap-store.c:2263
 #, fuzzy, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -10491,12 +10255,12 @@ msgstr "Serveris netikėtai atsijungė: %s"
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3168
+#: camel/providers/imap/camel-imap-store.c:3194
 msgid "Operation cancelled"
 msgstr "Veiksmas nutrauktas"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3171
+#: camel/providers/imap/camel-imap-store.c:3197
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Serveris netikėtai atsijungė: %s"
@@ -10560,13 +10324,6 @@ msgid "Unable to retrieve message: %s"
 msgstr "Nepavyko gauti laiško: %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:219
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -10576,15 +10333,15 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-mbox-folder.c:418
+#: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
 msgstr "Nėra tokio laiško"
 
 #: camel/providers/imap/camel-imap-folder.c:2019
-#: camel/providers/imap/camel-imap-folder.c:2621
-#: camel/providers/nntp/camel-nntp-folder.c:238
+#: camel/providers/imap/camel-imap-folder.c:2622
+#: camel/providers/nntp/camel-nntp-folder.c:220
 msgid "This message is not currently available"
 msgstr "Šis laiškas šiuo metu nepasiekiamas"
 
@@ -10593,7 +10350,23 @@ msgstr "Šis laiškas šiuo metu nepasiekiamas"
 msgid "Fetching summary information for new messages"
 msgstr "Atsiunčiama naujų laiškų santrauka"
 
-#: camel/providers/imap/camel-imap-folder.c:2659
+#: camel/providers/imap/camel-imap-folder.c:2463
+#, c-format
+msgid "Incomplete server response: no information provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2471
+#, c-format
+msgid "Incomplete server response: no UID provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2484
+#, c-format
+msgid ""
+"Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2660
 msgid "Could not find message body in FETCH response."
 msgstr "Negalėjau rasti laiško teksto FETCH atsakyme"
 
@@ -10654,43 +10427,43 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Pašto skaitymui ir rašymui IMAP serveriuose."
 
-#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/imap/camel-imap-store.c:680
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS išplėtimas nepalaikomas."
 
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:711
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL komunikacijų klaida"
 
-#: camel/providers/imap/camel-imap-store.c:818
+#: camel/providers/imap/camel-imap-store.c:848
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Nepavyko prisijungti naudojant komandą „%s“: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1242
+#: camel/providers/imap/camel-imap-store.c:1272
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP serveris %s nepalaiko prašyto autentikacijos tipo %s"
 
-#: camel/providers/imap/camel-imap-store.c:1252
+#: camel/providers/imap/camel-imap-store.c:1282
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Nepalaikoma %s tipo autentikacija"
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1305
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sPrašom įvesti IMAP slaptažodį dėl %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1289
+#: camel/providers/imap/camel-imap-store.c:1319
 msgid "You didn't enter a password."
 msgstr "Tu neįvedei slaptažodžio."
 
-#: camel/providers/imap/camel-imap-store.c:1318
+#: camel/providers/imap/camel-imap-store.c:1348
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10700,18 +10473,18 @@ msgstr ""
 "Negalėjau autentikuotis į IMAP serverį.\n"
 "%s\n"
 
-#: camel/providers/imap/camel-imap-store.c:1839
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:1867
+#: camel/providers/imap/camel-imap-store.c:2057
 #, c-format
 msgid "No such folder %s"
 msgstr "Nėra tokio aplanko %s"
 
-#: camel/providers/imap/camel-imap-store.c:1915
-#: camel/providers/imap/camel-imap-store.c:2296
+#: camel/providers/imap/camel-imap-store.c:1943
+#: camel/providers/imap/camel-imap-store.c:2324
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Tėvinis aplankas negali turėti vaikinių aplankų"
 
-#: camel/providers/imap/camel-imap-store.c:1970
+#: camel/providers/imap/camel-imap-store.c:1998
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10719,7 +10492,7 @@ msgstr "Tėvinis aplankas negali turėti vaikinių aplankų"
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Negalima sukurti aplanko: %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:2274
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Nežinomas aukštesnysis aplankas: %s"
@@ -10756,20 +10529,20 @@ msgid "Index message body data"
 msgstr "Suindeksuoti žinutės teksto duomenis"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:388
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:393
-#: camel/providers/local/camel-local-folder.c:396
+#: camel/providers/local/camel-local-folder.c:392
+#: camel/providers/local/camel-local-folder.c:395
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "dėžutė:%s (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:400
+#: camel/providers/local/camel-local-folder.c:399
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -10831,7 +10604,7 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:142
 #: camel/providers/local/camel-local-store.c:253
-#: camel/providers/local/camel-mbox-store.c:356
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10904,8 +10677,25 @@ msgstr "Laiško patalpinimas tarp maildir atšauktas"
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Negalėjau pridurti laiško prie maildir aplanko: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:226
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mbox-folder.c:417
+#: camel/providers/local/camel-mbox-folder.c:436
+#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:475
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-mh-folder.c:221
+#, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+"Negaliu gauti laiško: %s iš aplanko %s\n"
+"  %s"
+
+#: camel/providers/local/camel-maildir-folder.c:236
 msgid "Invalid message contents"
 msgstr "Blogas laiško turinys"
 
@@ -10946,9 +10736,9 @@ msgstr "Negalėjau ištrinti aplanko „%s“: %s"
 msgid "not a maildir directory"
 msgstr "ne maildir katalogas"
 
-#: camel/providers/local/camel-maildir-store.c:341
-#: camel/providers/local/camel-spool-store.c:286
-#: camel/providers/local/camel-spool-store.c:316
+#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-spool-store.c:284
+#: camel/providers/local/camel-spool-store.c:314
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Nepavyko peržiūrėti aplanko „%s“: %s"
@@ -10995,27 +10785,18 @@ msgstr "Laiško įterpimas atšauktas"
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Negaliu pridurti laiško prie mbox bylos: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:435
-#: camel/providers/local/camel-mbox-folder.c:466
-#: camel/providers/local/camel-mbox-folder.c:474
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"Negaliu gauti laiško: %s iš aplanko %s\n"
-"  %s"
-
-#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:468
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Atrodo, jog aplankas yra neatkuriamai sugadintas."
 
-#: camel/providers/local/camel-mbox-folder.c:475
-msgid "Message construction failed: Corrupt mailbox?"
+#: camel/providers/local/camel-mbox-folder.c:476
+#: camel/providers/local/camel-mh-folder.c:222
+#, fuzzy
+msgid "Message construction failed."
 msgstr "Nepavyko sukurti laiško: Sugadinta pašto dėžutė?"
 
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:362
+#: camel/providers/local/camel-mbox-store.c:361
 msgid "Cannot create a folder by this name."
 msgstr "Negalima sukurti aplanko su tokiu vardu"
 
@@ -11045,30 +10826,30 @@ msgstr "„%s“ nėra paprasta byla."
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Aplankas „%s“ nėra tuščias. Neištryniau."
 
-#: camel/providers/local/camel-mbox-store.c:375
+#: camel/providers/local/camel-mbox-store.c:374
 #, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Negaliu sukurti katalogo „%s“: %s."
 
-#: camel/providers/local/camel-mbox-store.c:389
+#: camel/providers/local/camel-mbox-store.c:388
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Negalima sukurti aplanko: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:391
+#: camel/providers/local/camel-mbox-store.c:390
 msgid "Folder already exists"
 msgstr "Toks aplankas jau yra"
 
-#: camel/providers/local/camel-mbox-store.c:473
+#: camel/providers/local/camel-mbox-store.c:472
 msgid "The new folder name is illegal."
 msgstr "Naujasis aplanko vardas yra neleistinas."
 
-#: camel/providers/local/camel-mbox-store.c:486
+#: camel/providers/local/camel-mbox-store.c:485
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Nepavyko pervardinti „%s“: %s"
 
-#: camel/providers/local/camel-mbox-store.c:561
+#: camel/providers/local/camel-mbox-store.c:560
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Negalima pervardinti %s į %s: %s"
@@ -11261,7 +11042,7 @@ msgstr ""
 "Aplankas gali būti apgadintas. Kopija išsaugota tarp „%s“"
 
 #: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:997
+#: camel/providers/nntp/camel-nntp-store.c:1126
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Prašom įvesti NNTP slaptažodį vartotojui %s@%s"
@@ -11278,18 +11059,10 @@ msgstr "Nepavyko serveriui nusiųsti vartotojo vardo"
 msgid "Server rejected username/password"
 msgstr "Serveris atmetė vartotojo vardą/slaptažodį"
 
-#: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:263
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr "Operacija nutraukta"
-
-#: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:259
-#: camel/providers/nntp/camel-nntp-folder.c:265
+#: camel/providers/nntp/camel-nntp-folder.c:147
+#: camel/providers/nntp/camel-nntp-folder.c:149
+#: camel/providers/nntp/camel-nntp-folder.c:158
+#: camel/providers/nntp/camel-nntp-folder.c:234
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11298,60 +11071,49 @@ msgstr "Operacija nutraukta"
 msgid "Cannot get message %s: %s"
 msgstr "Nepavyko gauti laiško %s: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:188
-#: camel/providers/nntp/camel-nntp-folder.c:228
+#: camel/providers/nntp/camel-nntp-folder.c:156
+#: camel/providers/nntp/camel-nntp-folder.c:232
+#: camel/providers/nntp/camel-nntp-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+msgid "User cancelled"
+msgstr "Operacija nutraukta"
+
+#: camel/providers/nntp/camel-nntp-folder.c:176
+#: camel/providers/nntp/camel-nntp-folder.c:208
 #, c-format
 msgid "Internal error: uid in invalid format: %s"
 msgstr "Vidinė klaida: uid yra netinkamame formate: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:201
-#, c-format
-msgid "Could not get article %s from NNTP server"
-msgstr "Negalėjau gauti straipsnio %s iš NNTP serverio"
-
-#: camel/providers/nntp/camel-nntp-folder.c:362
-msgid "Posting not allowed by news server"
-msgstr ""
-
+#: camel/providers/nntp/camel-nntp-folder.c:328
+#: camel/providers/nntp/camel-nntp-folder.c:331
 #: camel/providers/nntp/camel-nntp-folder.c:373
-#, c-format
-msgid "Failed to send newsgroups header: %s: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:413
-#: camel/providers/nntp/camel-nntp-folder.c:426
-#, c-format
-msgid "Error posting to newsgroup: %s: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:438
-msgid "Error reading response to posted message: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:441
-#, c-format
-msgid "Error posting message: %s: message not posted"
-msgstr ""
+#: camel/providers/nntp/camel-nntp-folder.c:375
+#, fuzzy, c-format
+msgid "Posting failed: %s"
+msgstr "Operacijos klaida: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:457
+#: camel/providers/nntp/camel-nntp-folder.c:393
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "Jūs negalit siųsti NNTP žinučių  kol dirbate atsijungęs!"
 
-#: camel/providers/nntp/camel-nntp-folder.c:468
+#: camel/providers/nntp/camel-nntp-folder.c:404
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:44
 msgid "Could not get group list from server."
 msgstr "Negalėjau gauti grupių sąrašo iš serverio."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#: camel/providers/nntp/camel-nntp-grouplist.c:97
+#: camel/providers/nntp/camel-nntp-grouplist.c:106
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "Negaliu įkelti grupių sąrašo bylos dėl %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#: camel/providers/nntp/camel-nntp-grouplist.c:157
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Negaliu išsaugoti grupių sąrašo bylos dėl %s: %s"
@@ -11382,26 +11144,29 @@ msgstr ""
 "Su šia parinktimi NNTP serveryje bus autentikuojamasi paprasto teksto "
 "slaptažodžiu."
 
-#: camel/providers/nntp/camel-nntp-store.c:158
+#: camel/providers/nntp/camel-nntp-store.c:118
+#: camel/providers/nntp/camel-nntp-store.c:1233
+#: camel/providers/nntp/camel-nntp-store.c:1331
+#, c-format
+msgid "NNTP Command failed: %s"
+msgstr "NNTP komandos klaida: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:227
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Nepavyko perskaityti %s pasisveikinimo: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:170
+#: camel/providers/nntp/camel-nntp-store.c:239
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP serveris %s grąžino klaidos kodą %d: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:326
+#: camel/providers/nntp/camel-nntp-store.c:403
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET naujienos per %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:640
-msgid "Stream error"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-store.c:643
+#: camel/providers/nntp/camel-nntp-store.c:777
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -11412,73 +11177,73 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/providers/nntp/camel-nntp-store.c:735
+#: camel/providers/nntp/camel-nntp-store.c:872
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
 "No such newsgroup. The selected item is a probably a parent folder."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:767
+#: camel/providers/nntp/camel-nntp-store.c:904
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
 "newsgroup does not exist!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:792
+#: camel/providers/nntp/camel-nntp-store.c:929
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:800
+#: camel/providers/nntp/camel-nntp-store.c:937
 msgid "You cannot rename a folder in a News store."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:808
+#: camel/providers/nntp/camel-nntp-store.c:945
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:253
-#, c-format
-msgid "Connection error: %s"
-msgstr "Jungimosi klaida: %s"
-
-#: camel/providers/nntp/camel-nntp-summary.c:262
-#, c-format
-msgid "No such folder: %s"
-msgstr "Nėra tokio aplanko: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1118
+#, fuzzy
+msgid "Authentication requested but not username provided"
+msgstr "Autentikacija būtina"
 
-#: camel/providers/nntp/camel-nntp-summary.c:268
-#, c-format
-msgid "Could not get group: %s"
-msgstr "Nepavyko gauti grupės: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1146
+#, fuzzy, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr "Autentifikacija su POP serveriu %s nepavyko: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:333
+#: camel/providers/nntp/camel-nntp-store.c:1262
 #, fuzzy
-msgid "Could not get messages: unspecified error"
-msgstr "Negalėjau išsiųsti laiško: %s"
+msgid "Not connected."
+msgstr "Nėra kontaktų"
 
-#: camel/providers/nntp/camel-nntp-summary.c:378
+#: camel/providers/nntp/camel-nntp-store.c:1311
 #, c-format
-msgid "NNTP Command failed: %s"
-msgstr "NNTP komandos klaida: %s"
+msgid "No such folder: %s"
+msgstr "Nėra tokio aplanko: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:438
-#: camel/providers/nntp/camel-nntp-summary.c:543
+#: camel/providers/nntp/camel-nntp-summary.c:218
+#: camel/providers/nntp/camel-nntp-summary.c:314
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Ieškoma naujų laiškų"
 
-#: camel/providers/nntp/camel-nntp-summary.c:558
-#, c-format
-msgid "Unknown server response: %s"
-msgstr "Nežinomas serverio atsakymas: %s"
+#: camel/providers/nntp/camel-nntp-summary.c:225
+#, fuzzy, c-format
+msgid "Unexpected server response from xover: %s"
+msgstr "Netikėtas atsakymas iš IMAP serverio: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:605
+#: camel/providers/nntp/camel-nntp-summary.c:328
+#, fuzzy, c-format
+msgid "Unexpected server response from head: %s"
+msgstr "Netikėtas atsakymas iš GnuPG: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:368
 msgid "Use cancel"
 msgstr "Naudoti atšaukimą"
 
-#: camel/providers/nntp/camel-nntp-summary.c:607
+#: camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Operacijos klaida: %s"
@@ -11526,7 +11291,7 @@ msgstr "Ištrinti po %s dienos(ų)"
 msgid "Disable support for all POP3 extensions"
 msgstr "Atjungti visų POP3 išplėtimų palaikimą"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107
 msgid "POP"
 msgstr "POP"
 
@@ -11616,7 +11381,7 @@ msgid "No such folder `%s'."
 msgstr "Nėra tokio aplanko „%s“."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:132
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -11669,7 +11434,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Pašto siuntimas per sendmail programą"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:119
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11963,19 +11728,19 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
+#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:408
 msgid "attachment"
 msgstr "priedas"
 
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:454
 msgid "Remove selected items from the attachment list"
 msgstr "Pašalinti pažymėtus elementus iš priedų sąrašo"
 
-#: composer/e-msg-composer-attachment-bar.c:491
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Add attachment..."
 msgstr "Prisegti priedą..."
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:495
 msgid "Attach a file to the message"
 msgstr "Prisegti bylą prie šio laiško"
 
@@ -12042,7 +11807,7 @@ msgstr "Keletas laiškų"
 msgid "Open file"
 msgstr "Atidaryti bylą"
 
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
 msgid "Autogenerated"
 msgstr "Autogeneruotas"
 
@@ -12189,17 +11954,17 @@ msgstr "Prisegti bylą(as)"
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
+msgid "You cannot attach the file `{0}' to this message."
 msgstr "Prisegti bylą prie šio laiško"
 
 #. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4
-msgid "${1}"
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
 msgstr ""
 
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
 
 #. mail-composer:attach-directory primary
@@ -12294,7 +12059,7 @@ msgstr "Negalėjau sukurti pipe: %s"
 
 #. mail-composer:no-build-message secondary
 #: composer/mail-composer-errors.xml.h:34
-msgid "Because \"${0}\", you may need to select different mail options."
+msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
@@ -12304,8 +12069,10 @@ msgid "Could not read signature file \"{0}\"."
 msgstr "Nepavyko išsaugoti parašo bylos: %s"
 
 #. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38
-msgid "Because \"${1}\"."
+#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted primary
@@ -12734,11 +12501,11 @@ msgid "<b>Then</b>"
 msgstr "<b>Laikas</b>"
 
 #: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1335
+#: mail/mail-account-gui.c:1347
 msgid "Select Folder"
 msgstr "Pasirink aplanką"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
 msgid "    "
 msgstr "    "
 
@@ -12796,7 +12563,7 @@ msgstr " "
 msgid "months"
 msgstr "mėnesių"
 
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
 msgid "seconds"
 msgstr "sekundžių"
 
@@ -12828,20 +12595,20 @@ msgstr "su visais vietiniais aplankais"
 msgid "years"
 msgstr "metų"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:916
-#: mail/mail-config.c:76 mail/mail-config.glade.h:90
+#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
+#: mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Svarbus"
 
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:919 mail/mail-config.c:79
-#: mail/mail-config.glade.h:145
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: mail/mail-config.glade.h:148
 msgid "To Do"
 msgstr "Darbai"
 
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:920 mail/mail-config.c:80
-#: mail/mail-config.glade.h:94
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: mail/mail-config.glade.h:97
 msgid "Later"
 msgstr "Vėliau"
 
@@ -12899,257 +12666,6 @@ msgstr "gaunamas"
 msgid "outgoing"
 msgstr "siunčiamas"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Adjust Score"
-msgstr "Adjust Score"
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Color"
-msgstr "Priskirti spalvą"
-
-#: filter/libfilter-i18n.h:4
-msgid "Assign Score"
-msgstr "Priskirti įvertį"
-
-#: filter/libfilter-i18n.h:5
-msgid "Attachments"
-msgstr "Priedai"
-
-#: filter/libfilter-i18n.h:6
-msgid "Beep"
-msgstr "Signalas"
-
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "turi savyje"
-
-#: filter/libfilter-i18n.h:8
-msgid "Copy to Folder"
-msgstr "Kopijuoti į aplanką"
-
-#: filter/libfilter-i18n.h:9
-msgid "Date received"
-msgstr "Gavimo data"
-
-#: filter/libfilter-i18n.h:10
-msgid "Date sent"
-msgstr "Siuntimo data"
-
-#: filter/libfilter-i18n.h:12
-msgid "Deleted"
-msgstr "Ištrintas"
-
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "neturi savyje"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "nesibaigia"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "neegzistuoja"
-
-#: filter/libfilter-i18n.h:16
-msgid "does not return"
-msgstr "negražina"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "neskamba panašiai į"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "neprasideda su"
-
-#: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
-msgstr "neegzistuoja"
-
-#: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr "Juodraštis"
-
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "baigiasi su"
-
-#: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr "Egzistuoja"
-
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "egzistuoja"
-
-#: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr "Išraiška"
-
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr "Tęsinys"
-
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "yra"
-
-#: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr "yra po"
-
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr "yra prieš"
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr "yra pažymėtas"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "yra didesnis už"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "yra mažesnis už"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "nėra"
-
-#: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr "nėra pažymėtas"
-
-#: filter/libfilter-i18n.h:36
-#, fuzzy
-msgid "Junk Test"
-msgstr "Birželis"
-
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
-#: widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Užrašas"
-
-#: filter/libfilter-i18n.h:38
-msgid "Mailing list"
-msgstr "Konferencija"
-
-#: filter/libfilter-i18n.h:39
-msgid "Message Body"
-msgstr "Laiško tekstas"
-
-#: filter/libfilter-i18n.h:40
-msgid "Message Header"
-msgstr "Laiško antraštė"
-
-#: filter/libfilter-i18n.h:41
-#, fuzzy
-msgid "Message is Junk"
-msgstr "_Laiškai"
-
-#: filter/libfilter-i18n.h:42
-#, fuzzy
-msgid "Message is not Junk"
-msgstr "Atšaukti Šiukšlės _Pažymėjimą"
-
-#: filter/libfilter-i18n.h:43
-msgid "Move to Folder"
-msgstr "Perkelti į aplanką"
-
-#: filter/libfilter-i18n.h:44
-#, fuzzy
-msgid "Pipe to Program"
-msgstr "Išeiti iš programos"
-
-#: filter/libfilter-i18n.h:45
-msgid "Play Sound"
-msgstr "Groti garsą"
-
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Skaitytas"
-
-#: filter/libfilter-i18n.h:47
-msgid "Recipients"
-msgstr "Gavėjai"
-
-#: filter/libfilter-i18n.h:48
-msgid "Regex Match"
-msgstr "Regex tenkina"
-
-#: filter/libfilter-i18n.h:49
-msgid "Replied to"
-msgstr "Atsakytas"
-
-#: filter/libfilter-i18n.h:50
-msgid "returns"
-msgstr "gražina"
-
-#: filter/libfilter-i18n.h:51
-msgid "returns greater than"
-msgstr "gražina reikšmę didesnę už"
-
-#: filter/libfilter-i18n.h:52
-msgid "returns less than"
-msgstr "gražina reikšmę mažesnę už"
-
-#: filter/libfilter-i18n.h:53
-#, fuzzy
-msgid "Run Program"
-msgstr "Paleisti programą:"
-
-#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Įvertis"
-
-#: filter/libfilter-i18n.h:55
-msgid "Sender"
-msgstr "Siuntėjas"
-
-#: filter/libfilter-i18n.h:56
-msgid "Set Status"
-msgstr "Priskirti būseną"
-
-#: filter/libfilter-i18n.h:57
-msgid "Size (kB)"
-msgstr "Dydis (kB)"
-
-#: filter/libfilter-i18n.h:58
-msgid "sounds like"
-msgstr "skamba panašiai į"
-
-#: filter/libfilter-i18n.h:59
-msgid "Source Account"
-msgstr "Šaltinio sąskaita"
-
-#: filter/libfilter-i18n.h:60
-msgid "Specific header"
-msgstr "Savita antraštė"
-
-#: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "prasideda su"
-
-#: filter/libfilter-i18n.h:63
-msgid "Stop Processing"
-msgstr "Sustabdyti vykdymą"
-
-#: filter/libfilter-i18n.h:64 mail/em-format.c:755 mail/em-format-html.c:1519
-#: mail/em-format-quote.c:302 mail/em-mailer-prefs.c:87
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
-#: smime/lib/e-cert.c:1079
-msgid "Subject"
-msgstr "Tema"
-
-#: filter/libfilter-i18n.h:65
-msgid "Unset Status"
-msgstr "Atšaukti Būseną"
-
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Pridėti taisyklę"
@@ -13167,6 +12683,11 @@ msgstr "Taisyklės pavadinimas"
 msgid "_Score Rules"
 msgstr "Įverčio taisyklės"
 
+#: filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Įvertis"
+
 #: filter/searchtypes.xml.h:1
 msgid "Body contains"
 msgstr "Laiške yra"
@@ -13247,13 +12768,13 @@ msgstr "Parašas(ai)"
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Persiųstas Laiškas --------"
 
-#: mail/em-composer-utils.c:1499
+#: mail/em-composer-utils.c:1495
 msgid "an unknown sender"
 msgstr "nežinomas siuntėjas"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1509
+#: mail/em-composer-utils.c:1505
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "%Y %m %d %H:%M %%+05d, %%s rašė:"
 
@@ -13291,8 +12812,8 @@ msgstr "<spausk čia, kad pasirinktum aplanką>"
 msgid "Create New Folder"
 msgstr "Sukurti Naują Aplanką"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
-#: mail/mail-component.c:701
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
+#: mail/mail-component.c:704
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Nurodyk, kur sukurti aplanką:"
@@ -13307,104 +12828,105 @@ msgstr "Sukurti aplanką"
 msgid "Folder _name:"
 msgstr "Aplanko _vardas:"
 
-#: mail/em-folder-tree.c:839
+#: mail/em-folder-tree.c:833
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Trinamas aplankas %s"
 
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree.c:835
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Atidaromas aplankas %s"
 
-#: mail/em-folder-tree.c:848 mail/message-list.c:1555
+#: mail/em-folder-tree.c:842 mail/message-list.c:1561
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Laiškai perkeliami į %s"
 
-#: mail/em-folder-tree.c:850 mail/message-list.c:1557
+#: mail/em-folder-tree.c:844 mail/message-list.c:1563
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Laiškai kopijuojami į %s"
 
-#: mail/em-folder-tree.c:866
+#: mail/em-folder-tree.c:860
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Negalima kopijuoti arba perkelti laiškų į Virtualų Aplanką"
 
-#: mail/em-folder-tree.c:956 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Kopijuoti į aplanką"
 
-#: mail/em-folder-tree.c:957 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Perkelti į aplanką"
 
-#: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2069
-#: mail/em-folder-tree.c:2551 mail/em-folder-view.c:798
-#: mail/message-list.c:1645
+#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
+#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
+#: mail/message-list.c:1651
 msgid "_Move"
 msgstr "_Perkelti"
 
-#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#: mail/em-folder-tree.c:955 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "Atšaukti užduotį"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
 #: mail/em-folder-view.c:798 mail/em-folder-view.c:812
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Pasirink aplanką"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
 #, fuzzy
 msgid "C_opy"
 msgstr "Kopijuoti"
 
-#: mail/em-folder-tree.c:2096
+#: mail/em-folder-tree.c:2088
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Įrašomas aplankas '%s'"
 
-#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
+#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
 msgid "Create folder"
 msgstr "Sukurti aplanką"
 
-#: mail/em-folder-tree.c:2474
+#: mail/em-folder-tree.c:2463
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Pervadinti aplanką „%s“ į:"
 
-#: mail/em-folder-tree.c:2476
+#: mail/em-folder-tree.c:2465
 msgid "Rename Folder"
 msgstr "Pervadinti Aplanką"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Rodyti"
 
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2537
 msgid "Open in _New Window"
 msgstr "Atidaryti _Naujame Lange"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2555
+#: mail/em-folder-tree.c:2546
 msgid "_New Folder..."
 msgstr "_Naujas Aplankas..."
 
-#: mail/em-folder-tree.c:2558
+#: mail/em-folder-tree.c:2549
 msgid "_Rename"
 msgstr "Pe_rvadinti"
 
-#: mail/em-folder-tree.c:2561 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Savybės..."
 
 #: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:889
+#: mail/mail-vfolder.c:888
 msgid "VFolders"
 msgstr "vAplankai"
 
@@ -13418,19 +12940,19 @@ msgstr ""
 msgid "Inbox"
 msgstr "Gauti laiškai"
 
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
 msgid "Loading..."
 msgstr "Įkeliama..."
 
 #: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
 #: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
 #: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:551
+#: mail/mail-component.c:554
 msgid "Mail"
 msgstr "Paštas"
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Taisyti kaip naują laišką..."
@@ -13443,17 +12965,17 @@ msgstr "S_pausdinti"
 msgid "_Reply to Sender"
 msgstr "_Atsakyti siuntėjui"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:810
+#: mail/em-folder-view.c:901 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Atsakyti į _konferenciją"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:811
+#: mail/em-folder-view.c:902 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Atsakyti _visiems"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: mail/em-folder-view.c:903 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "P_ersiųsti"
@@ -13506,6 +13028,10 @@ msgstr "Perkelti į Aplanką..."
 msgid "_Copy to Folder..."
 msgstr "K_opijuoti į aplanką..."
 
+#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Užrašas"
+
 #: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Įtraukti Siuntėją į Adresų _Knygą"
@@ -13556,12 +13082,12 @@ msgid "Filter on _Mailing List"
 msgstr "Filtras pagal K_onferenciją"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
-#: mail/mail-config.glade.h:66
+#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Įprastas"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1796
 msgid "Print Message"
 msgstr "Spausdinti laišką"
 
@@ -13600,12 +13126,18 @@ msgstr "Cc"
 msgid "Bcc"
 msgstr "Bcc"
 
+#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
+#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Tema"
+
 #: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
 #: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Data"
 
-#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
+#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
 msgid "Newsgroups"
 msgstr ""
 
@@ -13806,7 +13338,7 @@ msgstr ""
 "Įsilaužėliui yra labai sunku atkoduoti tokį laišką naudojant šiuo metu "
 "prieinamas priemones."
 
-#: mail/em-format-html-display.c:757
+#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
 msgid "_View Certificate"
 msgstr "_Peržiūrėti Sertifikatą"
 
@@ -13864,7 +13396,7 @@ msgstr "Kiekvieną savaitę"
 msgid "Once per month"
 msgstr "kiekvieną mėnesį"
 
-#: mail/em-migrate.c:1072
+#: mail/em-migrate.c:1168
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13876,86 +13408,86 @@ msgstr ""
 "\n"
 "Palaukite kol Evolution perkels Jūsų ankstesnius aplankus..."
 
-#: mail/em-migrate.c:1506
+#: mail/em-migrate.c:1602
 #, fuzzy, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Negalima sukurti aplanko: %s: %s"
 
-#: mail/em-migrate.c:1532
+#: mail/em-migrate.c:1628
 #, fuzzy, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr ""
 "Nepavyko nukopijuoti bylos rodiklio: %s\n"
 "%s"
 
-#: mail/em-migrate.c:1715
+#: mail/em-migrate.c:1811
 #, fuzzy, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Negaliu išsaugoti grupių sąrašo bylos dėl %s: %s"
 
-#: mail/em-migrate.c:1919
+#: mail/em-migrate.c:2015
 #, fuzzy, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Autentifikacija su POP serveriu %s nepavyko: %s"
 
-#: mail/em-migrate.c:1933
+#: mail/em-migrate.c:2029
 #, fuzzy, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Nepavyko sukurti katalogo „%s“: %s"
 
-#: mail/em-migrate.c:1962
+#: mail/em-migrate.c:2058
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#: mail/em-migrate.c:2413 mail/em-migrate.c:2425
 #, fuzzy, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Nepavyko sukurti katalogo „%s“: %s"
 
-#: mail/em-migrate.c:2480
+#: mail/em-migrate.c:2576
 #, fuzzy, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr ""
 "Negaliu sukurti išvesties bylos: %s\n"
 " %s"
 
-#: mail/em-migrate.c:2498
+#: mail/em-migrate.c:2594
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 msgstr ""
 
-#: mail/em-popup.c:699
+#: mail/em-popup.c:700
 msgid "Save As..."
 msgstr "Išsaugoti kaip..."
 
-#: mail/em-popup.c:717
+#: mail/em-popup.c:718
 #, c-format
 msgid "untitled_image.%s"
 msgstr "neįvardintas_paveikslėlis.%s"
 
-#: mail/em-popup.c:807
+#: mail/em-popup.c:808
 msgid "Set as _Background"
 msgstr "Nustatyti kaip _foną"
 
-#: mail/em-popup.c:809
+#: mail/em-popup.c:810
 msgid "_Reply to sender"
 msgstr "_Atsakyti siuntėjui"
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:859
 msgid "_Open Link in Browser"
 msgstr "Atverti Nu_orodą Naršyklėje"
 
-#: mail/em-popup.c:859
+#: mail/em-popup.c:860
 msgid "Se_nd message to..."
 msgstr "Siųsti laišką _kitam..."
 
-#: mail/em-popup.c:860
+#: mail/em-popup.c:861
 msgid "_Add to Addressbook"
 msgstr "Įtraukti į Adresų Knygą"
 
-#: mail/em-popup.c:966
+#: mail/em-popup.c:967
 #, c-format
 msgid "Open in %s..."
 msgstr "Atidaryti su %s..."
@@ -14547,7 +14079,7 @@ msgstr "Evolution Pašto nustatymų valdymas"
 msgid "Mail Accounts"
 msgstr "Pašto Sąskaitos"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
 msgid "Mail Preferences"
 msgstr "Pašto Nustatymai"
 
@@ -14561,15 +14093,15 @@ msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importuoja tavo seną Elm paštą"
 
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:226
+#: mail/importers/evolution-mbox-importer.c:221
+#: mail/importers/evolution-outlook-importer.c:255
 #: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Importuojama..."
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:222
-#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/evolution-mbox-importer.c:223
+#: mail/importers/evolution-outlook-importer.c:257
 #: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Prašome palaukti"
@@ -14592,23 +14124,25 @@ msgid "Elm"
 msgstr "Elm"
 
 #: mail/importers/evolution-mbox-importer.c:116
+#: mail/importers/evolution-outlook-importer.c:130
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Juodraščių _aplankas:"
 
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 #, fuzzy
 msgid "Select folder to import into"
 msgstr "Pasirinkti įkeliamą sertifikatą..."
 
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:254
 #: mail/importers/mail-importer.c:226
 #, fuzzy, c-format
 msgid "Importing `%s'"
 msgstr "Importuojama"
 
-#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/evolution-outlook-importer.c:301
 #: mail/importers/mail-importer.c:140
 #, fuzzy
 msgid "Importing mailbox"
@@ -14772,15 +14306,15 @@ msgstr ""
 msgid "%s License Agreement"
 msgstr "Rakto Sutartis"
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
 msgid "_Host:"
 msgstr "_Hostas:"
 
-#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
 msgid "User_name:"
 msgstr "Vartotojo _vardas:"
 
-#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
 msgid "_Path:"
 msgstr "_Kelias:"
 
@@ -14843,34 +14377,34 @@ msgstr "%d kontaktai"
 msgid ", %d unread"
 msgstr ""
 
-#: mail/mail-component.c:653
+#: mail/mail-component.c:656
 msgid "New Mail Message"
 msgstr "Naujas pašto laiškas"
 
-#: mail/mail-component.c:654
+#: mail/mail-component.c:657
 msgid "_Mail Message"
 msgstr "_Pašto laiškas"
 
-#: mail/mail-component.c:655
+#: mail/mail-component.c:658
 msgid "Compose a new mail message"
 msgstr "Rašyti naują laišką"
 
-#: mail/mail-component.c:661
+#: mail/mail-component.c:664
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Naujas vAplankas"
 
-#: mail/mail-component.c:662
+#: mail/mail-component.c:665
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Pašto Filtrai"
 
-#: mail/mail-component.c:663
+#: mail/mail-component.c:666
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Sukurti naują kalendorių"
 
-#: mail/mail-component.c:795
+#: mail/mail-component.c:798
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
@@ -14882,7 +14416,7 @@ msgstr "Tikrinama paslauga"
 msgid "Connecting to server..."
 msgstr "Jungiamasi prie serverio..."
 
-#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Asmenybė"
 
@@ -14897,7 +14431,7 @@ msgstr ""
 "Jūsų siunčiamame pašte."
 
 #: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid "Receiving Mail"
 msgstr "Pašto gavimas"
 
@@ -14914,7 +14448,7 @@ msgstr ""
 msgid "Please select among the following options"
 msgstr "Prašom pasirinkti iš žemiau esančių parinkčių"
 
-#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr "Pašto siuntimas"
 
@@ -14927,7 +14461,7 @@ msgstr ""
 "gerai nežinote, paklauskite savo sistemos administratoriaus arba interneto "
 "paslaugų tiekėjo."
 
-#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37
 msgid "Account Management"
 msgstr "Sąskaitos tvarkymas"
 
@@ -14944,248 +14478,253 @@ msgstr ""
 "sąskaitą. Prašome įvesti šios sąskaitos pavadinimą žemiau esančiame "
 "laukelyje. Šis pavadinimas bus naudojamas tik vaizdavimui."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:2
 #, fuzzy
 msgid " Ch_eck for Supported Types "
 msgstr " _Patikrinti, kokie tipai palaikomi"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
 msgid "<b>Preview</b>"
 msgstr "<b>Peržiūra</b>"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "(SSL yra nepalaikomas šiame Evolution variante)"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "<b>S_ignatures</b>"
 msgstr "<b>Būklė:</b>"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "<b>_Languages</b>"
 msgstr "<b>Būklė:</b>"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
+msgid "<small>This will make the the filter more reliable, but slower</small>"
+msgstr ""
+
+#: mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "<span weight=\"bold\">Checking for New Mail</span>"
 msgstr "Tikrinama, ar yra naujų laiškų"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
 #, fuzzy
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr "<b>Išve_damos Pašto Antraštės</b>"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">General</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
 #, fuzzy
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "<b>Rodomas Pranešimas</b>"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "Naujų Laiškų Perspėjimai"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Security</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "Išsiųsti laiškai ir juodraščiai"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:34
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:35
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "Siunči_ant koduotus laiškus koduoti juos ir sau"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:36
 msgid "Account Editor"
 msgstr "Sąskaitų Tvarkyklė"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:38
 #, fuzzy
 msgid "Add Ne_w Signature..."
 msgstr "Pridėti naują parašą..."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Add _Script"
 msgstr "P_ridėti Scenarijų"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:40
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "_Visada koduoti laiškus sau, kai jie yra siunčiami koduoti"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Visada siųsti kopija (_Cc) adresu:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Visada siųsti slaptą kopiją (_Bcc) adresu:"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Always _sign outgoing messages when using this account"
 msgstr "Visad_a pasirašyti siunčiamus laiškus, kai naudojama ši sąskaita"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Visada koduojant pasi_tikėti raktais tarp turimo raktų rinkinio"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Attach original message"
 msgstr "Pridėti originalų laišką"
 
-#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Priedas"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:48
 #, fuzzy
 msgid "Automatically _insert smiley images"
 msgstr "_Automatiškai įterpti šypsiukų paveikslėlius"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Automatically check for _new mail every"
 msgstr "Automatiškai tikrinti paštą kas"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltų (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltų (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Beep w_hen new mail arrives"
 msgstr "_Įspėti gavus naują laišką"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "C_haracter set:"
 msgstr "_Koduotė:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Ch_eck for Supported Types "
 msgstr " _Patikrinti, kokie tipai palaikomi"
 
-#: mail/mail-config.glade.h:53
-msgid "Check _Incoming Mail"
-msgstr "Pat_ikrinti Gautą Paštą"
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Check _incoming mail for junk"
+msgstr "Tikrinti ateinančius laiškus dėl galimų šiukšlių"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Check spelling while I _type"
 msgstr "_Tikrinti žinučių rašybą rašymo metu"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Tikrinti gaunamus laiškus dėl galimų šiukšlių"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 msgid "Color for _misspelled words:"
 msgstr "_Klaidingų žodžių spalva:"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Colors"
 msgstr "Spalv_os"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Confirm _when expunging a folder"
 msgstr "Patvirtinti kai išvalomas aplankas"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -15200,258 +14739,263 @@ msgstr ""
 "\n"
 "Paspauskite „Baigti“, kad išsaugotumėte Jūsų nustatymus."
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
 msgid "De_fault"
 msgstr "Įp_rastas"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Default character e_ncoding:"
 msgstr "Įprasta simbolių _koduotė:"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 #, fuzzy
 msgid "Defaults"
 msgstr "_Įprastos reikšmės"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 msgid "Do not quote original message"
 msgstr "Necituoti pradinio laiško"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Nepasirašyti susitiki_mų užklausimų (dėl suderinamumo su Outlook)"
 
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Baigta"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Drafts _Folder:"
 msgstr "Juodraščių _aplankas:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:77
 msgid "Email Accounts"
 msgstr "Pašto Sąskaitos"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Email _Address:"
 msgstr "El. pašto _adresas:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "Empty trash folders on e_xit"
 msgstr "Iš_tuštinti šiukšlių aplankus išeinant"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
 msgid "Encry_ption certificate:"
 msgstr "Kodavimo sertifikatas:"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:81
 msgid "Evolution Account Assistant"
 msgstr "Evolution sąskaitų padėjėjas"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:82
 msgid "Execute Command..."
 msgstr "Paleisti Komandą..."
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Fi_xed-width:"
 msgstr "Fi_ksuotas-plotis:"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 msgid "Font Properties"
 msgstr "Šrifto Savybės"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 msgid "Format messages in _HTML"
 msgstr "Rašyti laišką _HTML formatu"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "HTML Mail"
 msgstr "_HTML Paštas"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Headers"
 msgstr "_Antraštės"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr "Paryškinti _citatas su "
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
 #: mail/mail-config.glade.h:91
+#, fuzzy
+msgid "I_nclude remote tests"
+msgstr "Įtraukti:"
+
+#: mail/mail-config.glade.h:94
 msgid "Inline"
 msgstr "Viduje"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Mail Configuration"
 msgstr "Pašto nustatymas"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "Pašto dėžutės vieta"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr "Laiškų Rašymas"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "Pastaba: Jungiantis pirmą kartą Jus paprašys įvesti slaptažodį"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Or_ganization:"
 msgstr "Or_ganizacija:"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG Ra_kto ID:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "Play sound file when new mail arri_ves"
 msgstr "_Groti garsus, kai pasirodo nauji laiškai"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Paklausti prieš siunčiant laiškus vien tik su _Bcc gavėjais"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr "Cituoti originalų laišką"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr "Cituojant"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Re_member password"
 msgstr "Prisiminti šį slaptažodį"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr "A_tsakyti-Kam:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "Pašto gavimas"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:120
 #, fuzzy
 msgid "Receiving Options"
 msgstr "Gavimo Nu_ostatos"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
 #, fuzzy
 msgid "Remember _password"
 msgstr "Prisiminti šį slaptažodį"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
 #, fuzzy
 msgid "S_tandard Font:"
 msgstr "Įpra_stas Šriftas"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 #, fuzzy
 msgid "Security"
 msgstr "_Saugumas"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font"
 msgstr "Pasirinkti HTML fiksuoto pločio šriftą"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:126
 msgid "Select HTML fixed width font for printing"
 msgstr "Pasirinkti HTML fiksuoti pločio šriftą naudojamą spausdinant"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:127
 msgid "Select HTML variable width font"
 msgstr "Pasirinkti HTML kintamo pločio šriftą"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:128
 msgid "Select HTML variable width font for printing"
 msgstr "Pasirinkti HTML kintamo pločio šriftą spausdinimui"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:129
 #, fuzzy
 msgid "Select..."
 msgstr "Pa_srinkite..."
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "Pašto siuntimas"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Sent _Messages Folder:"
 msgstr "Išsiųstų _laiškų aplankas:"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:134
 msgid "Ser_ver requires authentication"
 msgstr "Ser_veris reikalauja autentikacijos"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:135
 msgid "Server _Type: "
 msgstr "Serverio _tipas:"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:136
 msgid "Si_gning certificate:"
 msgstr "Parašo sertifikatas:"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:137
 #, fuzzy
 msgid "Signat_ure:"
 msgstr "Parašas:"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "Signatures"
 msgstr "_Parašai"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr "Nurodyti _bylą:"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "Spell Checking"
 msgstr "Rašybos _Tikrinimas"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:141
 msgid "Standard Unix mbox"
 msgstr "Standartinė Unix mbox"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "T_erminal Font:"
 msgstr "_Terminalo Šriftas"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "T_ype: "
 msgstr "Tipas:"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -15461,7 +15005,7 @@ msgstr ""
 "parašas. Nurodytas vardas bus naudojamas tik atvaizdavimo\n"
 "tikslais. "
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
@@ -15470,7 +15014,7 @@ msgstr ""
 "Šis puslapis leidžia Jums nustatyti rašybos tikrinimo elgseną ir kalbą. "
 "Pateiktas kalbų sąrašas galioja tik toms kalboms, kurių žodynai yra įdiegti."
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:149
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -15478,15 +15022,11 @@ msgstr ""
 "Pasirinkite pavadinimą, kuriuo norėtumėte vadinti šią sąskaitą.\n"
 "Pavyzdžiui, „Darbas“ ar „Asmeninė“."
 
-#: mail/mail-config.glade.h:148
-msgid "Use _Daemon"
-msgstr "Naudoti _Tarnybą"
-
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:152
 msgid "V_ariable-width:"
 msgstr "Kint_amas-plotis:"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:153
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -15496,93 +15036,89 @@ msgstr ""
 "\n"
 "Spausk „Tolyn“, kad pradėtumėte. "
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:158
 msgid "_Add Signature"
 msgstr "_Pridėti Parašą"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Always load images from the Internet"
 msgstr "Vis_ada įkelti paveikslėlius iš tinklo"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Digitally sign outgoing messages (by default)"
 msgstr "Vi_sada skaitmeniniu būdu pasirašyti siunčiamus laiškus"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:161
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Neinformuoti apie naujų laiškų atsiradimą"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:163
 msgid "_Enable"
 msgstr "_Įjungti"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 msgid "_Encrypt outgoing messages (by default)"
 msgstr "_Visada koduoti išsiunčiamus laiškus"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:165
 msgid "_Forward style:"
 msgstr "Pe_rsiuntimo stilius:"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:168
 msgid "_Load images if sender is in address book"
 msgstr "Įke_lti paveikslėlius, jei siuntėjas yra adresų knygoje"
 
-#: mail/mail-config.glade.h:167
-msgid "_Local Tests Only"
-msgstr "_Tik Vietiniai Testai"
-
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Make this my default account"
 msgstr "_Padaryti šią sąskaitą įprastine"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_Mark messages as read after"
 msgstr "Pažy_mėti laiškus skaitytais po"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Never load images from the Internet"
 msgstr "_Niekada neįkelti paveikslėlių iš tinklo"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "_Paklausti, kai siunčiamas HTML laiškas adresatams, kurie nenori gauti HTML "
 "laiškų"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:175
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Paklausti prieš siunčiant laiškus nenurodžius _temos"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:176
 msgid "_Reply style:"
 msgstr "_Atsakymų stilius:"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:177
 msgid "_Script:"
 msgstr "_Scenarijus:"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:178
 msgid "_Show animated images"
 msgstr "Rodyti judančius paveik_slėlius"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "_Use Secure Connection (SSL):"
 msgstr "Na_udoti saugią jungtį (SSL):"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "_Use the same fonts as other applications"
 msgstr "Na_udoti sisteminius šriftų nustatymus"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:181
 msgid "color"
 msgstr "spalva"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "aprašymas"
 
@@ -15756,7 +15292,7 @@ msgstr ""
 
 #. mail:camel-exception primary
 #: mail/mail-errors.xml.h:57
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgid "Your message with the subject \"{0}\" was not delivered."
 msgstr ""
 
 #. mail:camel-exception secondary
@@ -15822,11 +15358,6 @@ msgstr ""
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Negaliu sukurti katalogo „%s“: %s."
 
-#. mail:no-save-path secondary
-#: mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail:no-create-path primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
@@ -15848,12 +15379,6 @@ msgstr "Negaliu sukurti katalogo „%s“: %s."
 msgid "Cannot create temporary save directory."
 msgstr "Negalėjau sukurti laikino katalogo: %s"
 
-#. mail:no-create-tmp-path secondary
-#: mail/mail-errors.xml.h:100 mail/mail-errors.xml.h:112
-#: widgets/misc/e-system-errors.xml.h:11 widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail:no-write-path-exists secondary
 #: mail/mail-errors.xml.h:104
 #, fuzzy
@@ -16133,29 +15658,25 @@ msgstr "Perrašyti"
 msgid "_Append"
 msgstr "Siųsti"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:785
 #, c-format
 msgid "Pinging %s"
 msgstr "Tikrinamas %s"
 
-#: mail/mail-mt.c:897
-msgid "Working"
-msgstr "Dirbama"
-
-#: mail/mail-ops.c:99
+#: mail/mail-ops.c:98
 msgid "Filtering Folder"
 msgstr "Filtruojamas aplankas"
 
-#: mail/mail-ops.c:260
+#: mail/mail-ops.c:259
 msgid "Fetching Mail"
 msgstr "Gaunamas paštas"
 
-#: mail/mail-ops.c:543
+#: mail/mail-ops.c:542
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Nepavyko pritaikyti išeinančių filtrų: %s"
 
-#: mail/mail-ops.c:568
+#: mail/mail-ops.c:567
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -16164,101 +15685,101 @@ msgstr ""
 "Nepavyko įterpti į %s: %s\n"
 "Įterpiama į vietinį „Išsiųstų laiškų“ aplanką."
 
-#: mail/mail-ops.c:577
+#: mail/mail-ops.c:576
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Nepavyko įrašyti laiško į „Išsiųstų“ aplanką: %s"
 
-#: mail/mail-ops.c:673
+#: mail/mail-ops.c:672
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Siunčiamas laiškas %d iš %d"
 
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:703
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Nesėkmė ties laišku %d iš %d"
 
-#: mail/mail-ops.c:708
+#: mail/mail-ops.c:707
 msgid "Complete."
 msgstr "Užbaigta."
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:804
 msgid "Saving message to folder"
 msgstr "Laiškas išsaugomas į aplanką"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Laiškai perkeliami į %s"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Laiškai kopijuojami į %s"
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:1002
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanuojami aplankas, esantys „%s“"
 
-#: mail/mail-ops.c:1116
+#: mail/mail-ops.c:1115
 msgid "Forwarded messages"
 msgstr "Persiųsti laiškai"
 
-#: mail/mail-ops.c:1159
+#: mail/mail-ops.c:1158
 #, c-format
 msgid "Opening folder %s"
 msgstr "Atidaromas aplankas %s"
 
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1230
 #, c-format
 msgid "Opening store %s"
 msgstr "Atidaroma saugykla %s"
 
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1308
 #, c-format
 msgid "Removing folder %s"
 msgstr "Trinamas aplankas %s"
 
-#: mail/mail-ops.c:1403
+#: mail/mail-ops.c:1402
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Įrašomas aplankas '%s'"
 
-#: mail/mail-ops.c:1468
+#: mail/mail-ops.c:1467
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1469
+#: mail/mail-ops.c:1468
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Įrašomas aplankas '%s'"
 
-#: mail/mail-ops.c:1524
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr "Atnaujinamas aplankas"
 
-#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
+#: mail/mail-ops.c:1559 mail/mail-ops.c:1610
 msgid "Expunging folder"
 msgstr "Išvalomas aplankas"
 
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1607
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Išvaloma šiukšlinė tarp „%s“"
 
-#: mail/mail-ops.c:1609
+#: mail/mail-ops.c:1608
 msgid "Local Folders"
 msgstr "Vietiniai Aplankai"
 
-#: mail/mail-ops.c:1692
+#: mail/mail-ops.c:1691
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Gaunamas laiškas %s"
 
-#: mail/mail-ops.c:1764
+#: mail/mail-ops.c:1763
 #, fuzzy, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
@@ -16266,7 +15787,7 @@ msgstr[0] "Gaunami %d laiškai"
 msgstr[1] "Gaunami %d laiškai"
 msgstr[2] "Gaunami %d laiškai"
 
-#: mail/mail-ops.c:1850
+#: mail/mail-ops.c:1849
 #, fuzzy, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
@@ -16274,7 +15795,7 @@ msgstr[0] "Išsaugomi %d laiškai"
 msgstr[1] "Išsaugomi %d laiškai"
 msgstr[2] "Išsaugomi %d laiškai"
 
-#: mail/mail-ops.c:1900
+#: mail/mail-ops.c:1899
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -16283,7 +15804,7 @@ msgstr ""
 "Negaliu sukurti išvesties bylos: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1928
+#: mail/mail-ops.c:1927
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -16292,11 +15813,11 @@ msgstr ""
 "Klaida išsaugant laiškus į: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1999
+#: mail/mail-ops.c:1998
 msgid "Saving attachment"
 msgstr "Išsaugomas priedas"
 
-#: mail/mail-ops.c:2016
+#: mail/mail-ops.c:2015
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -16305,17 +15826,17 @@ msgstr ""
 "Negaliu sukurti išvesties bylos: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2046
+#: mail/mail-ops.c:2045
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Negalėjau įrašyti duomenų: %s"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Atsijungiama nuo %s"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Vėl jungiamasi prie %s"
@@ -16379,24 +15900,24 @@ msgstr "Atnaujinama..."
 msgid "Waiting..."
 msgstr "Laukiama..."
 
-#: mail/mail-session.c:238
+#: mail/mail-session.c:239
 msgid "User canceled operation."
 msgstr "Vartotojas nutraukė veiksmą."
 
-#: mail/mail-session.c:271
+#: mail/mail-session.c:272
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Įvesk %s slaptažodį"
 
-#: mail/mail-session.c:273
+#: mail/mail-session.c:274
 msgid "Enter Password"
 msgstr "Įvesk slaptažodį"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password"
 msgstr "_Prisiminti šį slaptažodį"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:298
 msgid "_Remember this password for the remainder of this session"
 msgstr "P_risiminti šį slaptažodį iki šios sesijos galo"
 
@@ -16453,79 +15974,79 @@ msgstr "Atnaujinami vAplankai pagal uri: %s"
 msgid "Updating vFolders for '%s'"
 msgstr "Atnaujinami vAplankai pagal uri: %s"
 
-#: mail/mail-vfolder.c:959
+#: mail/mail-vfolder.c:958
 msgid "vFolders"
 msgstr "vAplankai"
 
-#: mail/mail-vfolder.c:998
+#: mail/mail-vfolder.c:997
 msgid "Edit VFolder"
 msgstr "Keisti vAplanką"
 
-#: mail/mail-vfolder.c:1082
+#: mail/mail-vfolder.c:1081
 msgid "New VFolder"
 msgstr "Naujas vAplankas"
 
-#: mail/message-list.c:946
+#: mail/message-list.c:948
 msgid "Unseen"
 msgstr "Nematytas"
 
-#: mail/message-list.c:947
+#: mail/message-list.c:949
 msgid "Seen"
 msgstr "Matytas"
 
-#: mail/message-list.c:948
+#: mail/message-list.c:950
 msgid "Answered"
 msgstr "Atsakytas"
 
-#: mail/message-list.c:949
+#: mail/message-list.c:951
 msgid "Multiple Unseen Messages"
 msgstr "Keletas nematytų laiškų"
 
-#: mail/message-list.c:950
+#: mail/message-list.c:952
 msgid "Multiple Messages"
 msgstr "Keletas laiškų"
 
-#: mail/message-list.c:954
+#: mail/message-list.c:956
 msgid "Lowest"
 msgstr "Žemiausias"
 
-#: mail/message-list.c:955
+#: mail/message-list.c:957
 msgid "Lower"
 msgstr "Žemesnis"
 
-#: mail/message-list.c:959
+#: mail/message-list.c:961
 msgid "Higher"
 msgstr "Aukštesnis"
 
-#: mail/message-list.c:960
+#: mail/message-list.c:962
 msgid "Highest"
 msgstr "Aukščiausias"
 
-#: mail/message-list.c:1279
+#: mail/message-list.c:1285
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1286
+#: mail/message-list.c:1292
 msgid "Today %l:%M %p"
 msgstr "Šiandien %H:%M"
 
-#: mail/message-list.c:1295
+#: mail/message-list.c:1301
 msgid "Yesterday %l:%M %p"
 msgstr "Vakar %H:%M"
 
-#: mail/message-list.c:1307
+#: mail/message-list.c:1313
 msgid "%a %l:%M %p"
 msgstr "%a %H:%M"
 
-#: mail/message-list.c:1315
+#: mail/message-list.c:1321
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %H:%M"
 
-#: mail/message-list.c:1317
+#: mail/message-list.c:1323
 msgid "%b %d %Y"
 msgstr "%Y %b %d"
 
-#: mail/message-list.c:3300
+#: mail/message-list.c:3321
 msgid "Generating message list"
 msgstr "Generuojamas laiškų sąrašas"
 
@@ -16581,6 +16102,10 @@ msgstr "Persiųsti"
 msgid "No Response Necessary"
 msgstr "Atsakymas Nebūtinas"
 
+#: mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Skaitytas"
+
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Atsakyti"
@@ -16684,44 +16209,48 @@ msgid ""
 msgstr "Aplankų, kurie turi būti sulyginti atsijungusiam režimui, sąrašas"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid "Toolbar is visible"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Whether Evolution should start up in offline mode"
 msgstr "Ar Evolution turi pasileisti neprisijungusiame režime"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Whether the toolbar should be visible."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
 msgid "Whether to skip the development warning dialog"
 msgstr "Ar nerodyti bandomosios versijos perspėjimų lango"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
+#: shell/apps_evolution_shell.schemas.in.in.h:14
 msgid "mail"
 msgstr "paštas"
 
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
-msgstr "Produktą sukūrė"
-
-#: shell/e-shell.c:545 shell/e-shell.c:546
+#: shell/e-shell.c:588 shell/e-shell.c:589
 #, fuzzy, c-format
 msgid "%ld KB"
 msgstr "%B %d"
 
-#: shell/e-shell.c:744
+#: shell/e-shell.c:786
 #, fuzzy
 msgid "Uknown system error."
 msgstr "Nežinoma klaida"
 
-#: shell/e-shell.c:1101
+#: shell/e-shell.c:1143
 msgid "Invalid arguments"
 msgstr "Blogi argumentai"
 
-#: shell/e-shell.c:1103
+#: shell/e-shell.c:1145
 msgid "Cannot register on OAF"
 msgstr "Negaliu užsiregistruoti OAF"
 
-#: shell/e-shell.c:1105
+#: shell/e-shell.c:1147
 msgid "Configuration Database not found"
 msgstr "Konfigūracijos duombazė nerasta"
 
-#: shell/e-shell.c:1107
+#: shell/e-shell.c:1149
 msgid "Generic error"
 msgstr "Bendroji klaida"
 
@@ -16781,7 +16310,7 @@ msgstr ""
 msgid "Select importer"
 msgstr "Pasirink importavimo komponentą"
 
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1026
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
 #, c-format
 msgid "File %s does not exist"
 msgstr "Nėra tokios bylos %s"
@@ -16809,31 +16338,32 @@ msgstr ""
 "Importuojama %s\n"
 "Importuojamas elementas 1."
 
-#: shell/e-shell-importer.c:549
+#: shell/e-shell-importer.c:570
 msgid "Automatic"
 msgstr "Automatiškas"
 
-#: shell/e-shell-importer.c:598
-msgid "_Filename:"
-msgstr "_Bylos vardas:"
+#: shell/e-shell-importer.c:626
+#, fuzzy
+msgid "F_ilename:"
+msgstr "Bylos vardas:"
 
-#: shell/e-shell-importer.c:603
+#: shell/e-shell-importer.c:631
 msgid "Select a file"
 msgstr "Pasirink bylą"
 
-#: shell/e-shell-importer.c:613
+#: shell/e-shell-importer.c:642
 msgid "File _type:"
 msgstr "Bylos _tipas:"
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:681
 msgid "Import data and settings from _older programs"
 msgstr "Importuoti duomenis ir nuostatas iš senesnių programų"
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:684
 msgid "Import a _single file"
 msgstr "Įkelti _vieną bylą"
 
-#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -16841,26 +16371,26 @@ msgstr ""
 "Prašome palaukti...\n"
 "Ieškoma esamų nustatymų"
 
-#: shell/e-shell-importer.c:727
+#: shell/e-shell-importer.c:756
 msgid "Starting Intelligent Importers"
 msgstr "Paleidžiami inteligentiški importeriai"
 
-#: shell/e-shell-importer.c:853 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
 #, c-format
 msgid "From %s:"
 msgstr "Nuo %s:"
 
-#: shell/e-shell-importer.c:1044
+#: shell/e-shell-importer.c:1073
 #, fuzzy, c-format
 msgid "No importer available for file %s"
 msgstr "Protokolui „%s“ nėra tiekėjo."
 
-#: shell/e-shell-importer.c:1056
+#: shell/e-shell-importer.c:1085
 #, fuzzy
 msgid "Unable to execute importer"
 msgstr "Nepavyko paleisti gpg programos."
 
-#: shell/e-shell-importer.c:1169
+#: shell/e-shell-importer.c:1199
 msgid "_Import"
 msgstr "_Importuoti"
 
@@ -16910,61 +16440,61 @@ msgstr "Aplanko varde negali būti simbolio „#“."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' ir '..' yra rezervuoti katalogų vardai."
 
-#: shell/e-shell-window.c:336
+#: shell/e-shell-window.c:337
 #, fuzzy
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution dabar yra prisijungusi.  Paspausk šį mygtuką, kad dirbtum "
 "atsijungus."
 
-#: shell/e-shell-window.c:343
+#: shell/e-shell-window.c:344
 #, fuzzy
 msgid "Evolution is in the process of going offline."
 msgstr "Ximian Evolution dabar yra atsijungimo procese."
 
-#: shell/e-shell-window.c:349
+#: shell/e-shell-window.c:350
 #, fuzzy
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution dabar yra atsijungusi.  Paspausk šį mygtuką, kad dirbtum "
 "prisijungus."
 
-#: shell/e-shell-window.c:621
+#: shell/e-shell-window.c:637
 #, fuzzy, c-format
 msgid "Switch to %s"
 msgstr "Laiškai į %s"
 
-#: shell/e-shell-window-commands.c:64
+#: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Atrodo, kad GNOME Pilot įrankiai nėra įdiegti į šią sistemą"
 
-#: shell/e-shell-window-commands.c:72
+#: shell/e-shell-window-commands.c:74
 #, c-format
 msgid "Error executing %s."
 msgstr "Klaida vykdant %s."
 
-#: shell/e-shell-window-commands.c:121
+#: shell/e-shell-window-commands.c:123
 msgid "Bug buddy is not installed."
 msgstr "Bug buddy neįdiegtas."
 
-#: shell/e-shell-window-commands.c:129
+#: shell/e-shell-window-commands.c:131
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy negalėjo būti paleistas."
 
-#: shell/e-shell-window-commands.c:171
+#: shell/e-shell-window-commands.c:323
 #, fuzzy
-msgid "About Evolution"
-msgstr "Apie Ximian Evolution"
+msgid "Groupware Suite"
+msgstr "Grupė"
 
-#: shell/e-shell-window-commands.c:382
+#: shell/e-shell-window-commands.c:563
 msgid "_Work Online"
 msgstr "_Dirbti prisijungus"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "_Dirbti atsijungus"
 
-#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Dirbti atsijungus"
 
@@ -16976,43 +16506,6 @@ msgstr "Pasirinkimo laukas"
 msgid "New"
 msgstr "Nauja"
 
-#: shell/evolution-shell-component-utils.c:115
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Nežinoma klaida."
-
-#: shell/evolution-shell-component-utils.c:118
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Klaida iš komponentų sistemos yra:\n"
-"%s"
-
-#: shell/evolution-shell-component-utils.c:125
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Klaida iš aktyvavimo sistemos yra:\n"
-"%s"
-
 #: shell/evolution-test-component.c:140
 msgid "New Test"
 msgstr "Naujas bandymas"
@@ -17344,30 +16837,30 @@ msgid ""
 "Click help for details."
 msgstr ""
 
-#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:522
+#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
+#: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
 msgstr "Pasirinkti įkeliamą sertifikatą..."
 
-#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:604
+#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
+#: smime/gui/certificate-manager.c:638
 msgid "Certificate Name"
 msgstr "Sertifikato Vardas"
 
-#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
+#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
 msgid "Purposes"
 msgstr "Paskirtis"
 
-#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:517
+#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr "Serijinis Numeris"
 
-#: smime/gui/certificate-manager.c:267
+#: smime/gui/certificate-manager.c:271
 msgid "Expires"
 msgstr "Galiojimo pabaiga"
 
-#: smime/gui/certificate-manager.c:417
+#: smime/gui/certificate-manager.c:446
 msgid "E-Mail Address"
 msgstr "El. pašto adresas"
 
@@ -17411,6 +16904,11 @@ msgstr ""
 "Išleido:\n"
 "  Tema: %s\n"
 
+#: smime/gui/e-cert-selector.c:169
+#, fuzzy
+msgid "Select certificate"
+msgstr "SSL Klientinis Sertifikatas"
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr "<Nėra Sertifikato Dalis>"
@@ -17467,7 +16965,7 @@ msgstr ""
 "Prieš sukurdami pasitikėjimą šiuo CA, Jūs turėtumėte patikrinti sertifikatą, "
 "jo taisykles ir procedūras (jei įmanoma)."
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
 msgid "Certificate"
 msgstr "Sertifikatas"
 
@@ -17487,19 +16985,23 @@ msgstr "Bendrinis Vardas (CN)"
 msgid "Contact Certificates"
 msgstr "Kontaktiniai Sertifikatai"
 
-#: smime/gui/smime-ui.glade.h:21
-#, no-c-format
-msgid "Do you want to trust \"%s\" for the following purposes?"
-msgstr "Ar Jūs norite pasitikėti „%s“ šiais tikslais?"
+#: smime/gui/smime-ui.glade.h:20
+msgid "Do not trust the authenticity of this certificate"
+msgstr ""
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:21
 msgid "Dummy window only"
 msgstr "Tik pseudo langas"
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:22
 msgid "Edit"
 msgstr "Keisti"
 
+#: smime/gui/smime-ui.glade.h:23
+#, fuzzy
+msgid "Email Certificate Trust Settings"
+msgstr "Pašto Sertifikatų Autorizatorius"
+
 #: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr "Pašto Gavėjo Sertifikatas"
@@ -17532,247 +17034,258 @@ msgstr "Organizacinis Vienetas (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 Požymis"
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr "SSL Klientinis Sertifikatas"
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr "SSL Serverio Sertifikatas"
 
 #: smime/gui/smime-ui.glade.h:37
+msgid "Trust the authenticity of this certificate"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
 msgid "Trust this CA to identify email users."
 msgstr "Pasitikėti šiuo CA identifikuojant pašto vartotojus."
 
-#: smime/gui/smime-ui.glade.h:38
+#: smime/gui/smime-ui.glade.h:39
 msgid "Trust this CA to identify software developers."
 msgstr "Pasitikėti šiuo CA identifikuojant programų kūrėjus."
 
-#: smime/gui/smime-ui.glade.h:39
+#: smime/gui/smime-ui.glade.h:40
 msgid "Trust this CA to identify web sites."
 msgstr "Pasitikėti šiuo CA identifikuojant tinklalapius."
 
-#: smime/gui/smime-ui.glade.h:40
+#: smime/gui/smime-ui.glade.h:41
 msgid "View"
 msgstr "Peržiūra"
 
-#: smime/gui/smime-ui.glade.h:41
-msgid "View Certificate"
-msgstr "Peržiūrėti Sertifikatą"
-
 #: smime/gui/smime-ui.glade.h:42
-msgid "You have been asked to trust a new Certificate Authority (CA)."
-msgstr "Jums siūloma pasitikėti nauju Sertifikatų Autorizatoriumi (CA)."
-
-#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr "Sau identifikuoti Jūs turite sertifikatus nuo šių organizacijų:"
 
-#: smime/gui/smime-ui.glade.h:44
+#: smime/gui/smime-ui.glade.h:43
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr "Jūsų sertifikatų byla identifikuoja šiuos sertifikatų autorizatorius:"
 
-#: smime/gui/smime-ui.glade.h:45
+#: smime/gui/smime-ui.glade.h:44
 msgid "You have certificates on file that identify these people:"
 msgstr "Jūsų sertifikatų byla saugo šių asmenų sertifikatus:"
 
-#: smime/gui/smime-ui.glade.h:46
+#: smime/gui/smime-ui.glade.h:45
 msgid "Your Certificates"
 msgstr "Jūsų Sertifikatai"
 
-#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
+#: smime/gui/smime-ui.glade.h:46
+msgid "_Edit CA Trust"
+msgstr ""
+
+#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%Y %m %d"
 
-#: smime/lib/e-cert.c:478
+#. x509 certificate usage types
+#: smime/lib/e-cert.c:424
+#, fuzzy
+msgid "Sign"
+msgstr "Pasirašoma"
+
+#: smime/lib/e-cert.c:425
+#, fuzzy
+msgid "Encrypt"
+msgstr "Koduotas"
+
+#: smime/lib/e-cert.c:530
 msgid "Version"
 msgstr "Versija"
 
-#: smime/lib/e-cert.c:493
+#: smime/lib/e-cert.c:545
 msgid "Version 1"
 msgstr "1-a versija"
 
-#: smime/lib/e-cert.c:496
+#: smime/lib/e-cert.c:548
 msgid "Version 2"
 msgstr "2-a versija"
 
-#: smime/lib/e-cert.c:499
+#: smime/lib/e-cert.c:551
 msgid "Version 3"
 msgstr "3-a versija"
 
-#: smime/lib/e-cert.c:581
+#: smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 su RSA kodavimu"
 
-#: smime/lib/e-cert.c:584
+#: smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 su RSA kodavimu"
 
-#: smime/lib/e-cert.c:587
+#: smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 su RSA kodavimu"
 
-#: smime/lib/e-cert.c:590
+#: smime/lib/e-cert.c:642
 msgid "C"
 msgstr "C"
 
-#: smime/lib/e-cert.c:593
+#: smime/lib/e-cert.c:645
 msgid "CN"
 msgstr "CN"
 
-#: smime/lib/e-cert.c:596
+#: smime/lib/e-cert.c:648
 msgid "OU"
 msgstr "OU"
 
-#: smime/lib/e-cert.c:599
+#: smime/lib/e-cert.c:651
 msgid "O"
 msgstr "O"
 
-#: smime/lib/e-cert.c:602
+#: smime/lib/e-cert.c:654
 msgid "L"
 msgstr "L"
 
-#: smime/lib/e-cert.c:605
+#: smime/lib/e-cert.c:657
 msgid "DN"
 msgstr "DN"
 
-#: smime/lib/e-cert.c:608
+#: smime/lib/e-cert.c:660
 msgid "DC"
 msgstr "DC"
 
-#: smime/lib/e-cert.c:611
+#: smime/lib/e-cert.c:663
 msgid "ST"
 msgstr "ST"
 
-#: smime/lib/e-cert.c:614
+#: smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA kodavimas"
 
-#: smime/lib/e-cert.c:617
+#: smime/lib/e-cert.c:669
 msgid "Certificate Key Usage"
 msgstr "Sertifikato Rakto Naudojimas"
 
-#: smime/lib/e-cert.c:620
+#: smime/lib/e-cert.c:672
 msgid "Netscape Certificate Type"
 msgstr "Netscape Sertifikato Tipas"
 
-#: smime/lib/e-cert.c:623
+#: smime/lib/e-cert.c:675
 msgid "Certificate Authority Key Identifier"
 msgstr "Sertifikatoriaus Autorizacinio Rakto Identifikatorius"
 
-#: smime/lib/e-cert.c:626
+#: smime/lib/e-cert.c:678
 msgid "UID"
 msgstr "UID"
 
-#: smime/lib/e-cert.c:635
+#: smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Objekto Identifikatorius (%s)"
 
-#: smime/lib/e-cert.c:686
+#: smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
 msgstr "Algoritmo Identifikatorius"
 
-#: smime/lib/e-cert.c:694
+#: smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
 msgstr "Algoritmo Parametrai"
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:768
 msgid "Subject Public Key Info"
 msgstr "Antraštės Viešo Rakto Info"
 
-#: smime/lib/e-cert.c:721
+#: smime/lib/e-cert.c:773
 msgid "Subject Public Key Algorithm"
 msgstr "Antraštės Viešo Rakto Algoritmas"
 
-#: smime/lib/e-cert.c:736
+#: smime/lib/e-cert.c:788
 msgid "Subject's Public Key"
 msgstr "Antraštės Viešas Raktas"
 
-#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
+#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
 msgid "Error: Unable to process extension"
 msgstr "Klaida: Nepavyko apdoroti išplėtimo"
 
-#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
+#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr "Objekto Pasirašytojas"
 
-#: smime/lib/e-cert.c:782
+#: smime/lib/e-cert.c:834
 msgid "SSL Certificate Authority"
 msgstr "SSL Sertifikatų Autorizatorius"
 
-#: smime/lib/e-cert.c:786
+#: smime/lib/e-cert.c:838
 msgid "Email Certificate Authority"
 msgstr "Pašto Sertifikatų Autorizatorius"
 
-#: smime/lib/e-cert.c:814
+#: smime/lib/e-cert.c:866
 msgid "Signing"
 msgstr "Pasirašoma"
 
-#: smime/lib/e-cert.c:818
+#: smime/lib/e-cert.c:870
 msgid "Non-repudiation"
 msgstr "Ne dalyvis"
 
-#: smime/lib/e-cert.c:822
+#: smime/lib/e-cert.c:874
 msgid "Key Encipherment"
 msgstr "Rakto Koduotė"
 
-#: smime/lib/e-cert.c:826
+#: smime/lib/e-cert.c:878
 msgid "Data Encipherment"
 msgstr "Duomenų Koduotė"
 
-#: smime/lib/e-cert.c:830
+#: smime/lib/e-cert.c:882
 msgid "Key Agreement"
 msgstr "Rakto Sutartis"
 
-#: smime/lib/e-cert.c:834
+#: smime/lib/e-cert.c:886
 msgid "Certificate Signer"
 msgstr "Sertifikato Pasirašytojas"
 
-#: smime/lib/e-cert.c:838
+#: smime/lib/e-cert.c:890
 msgid "CRL Signer"
 msgstr "CRL Pasirašytojas"
 
-#: smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:938
 msgid "Critical"
 msgstr "Kritinis"
 
-#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
+#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
 msgid "Not Critical"
 msgstr "Nekritinis"
 
-#: smime/lib/e-cert.c:912
+#: smime/lib/e-cert.c:964
 msgid "Extensions"
 msgstr "Išplėtimai"
 
-#: smime/lib/e-cert.c:983
+#: smime/lib/e-cert.c:1035
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
 msgid "Certificate Signature Algorithm"
 msgstr "Sertifikato Parašo Algoritmas"
 
-#: smime/lib/e-cert.c:1048
+#: smime/lib/e-cert.c:1100
 msgid "Issuer"
 msgstr "Leidėjas"
 
-#: smime/lib/e-cert.c:1102
+#: smime/lib/e-cert.c:1154
 msgid "Issuer Unique ID"
 msgstr "Unikalus Leidėjo ID"
 
-#: smime/lib/e-cert.c:1121
+#: smime/lib/e-cert.c:1173
 msgid "Subject Unique ID"
 msgstr "Unikalus Temos ID"
 
-#: smime/lib/e-cert.c:1164
+#: smime/lib/e-cert.c:1216
 msgid "Certificate Signature Value"
 msgstr "Sertifikato Parašo Vertė"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
+#: smime/lib/e-cert-db.c:608
 msgid "Certificate already exists"
 msgstr "Toks sertifikatas jau yra"
 
@@ -17918,7 +17431,7 @@ msgstr "Rodyti esamą kontaktą"
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "_Veiksmai"
 
@@ -18081,7 +17594,7 @@ msgstr "_Uždaryti"
 #: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:3
+#: ui/evolution.xml.h:4
 msgid "Close"
 msgstr "Uždaryti"
 
@@ -18094,7 +17607,7 @@ msgid "Delete this item"
 msgstr "Ištrinti šį elementą"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr "Pagrindinė įrankinė"
 
@@ -18137,7 +17650,7 @@ msgstr "Išsaugoti šį elementą į diską"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:44
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "_File"
 msgstr "_Byla"
 
@@ -18394,13 +17907,13 @@ msgstr "_Invertuoti pažymėjimą"
 msgid "_Threaded Message List"
 msgstr "_Gijomis suskirstytas laiškų sąrašas"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Uždaryti šį langą"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "_Close"
 msgstr "_Uždaryti"
 
@@ -18801,7 +18314,7 @@ msgstr "_Ankstesnis Laiškas"
 msgid "_Quoted"
 msgstr "_Cituojant"
 
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
 msgid "_Tools"
 msgstr "Įran_kiai"
 
@@ -19098,109 +18611,123 @@ msgid "_Open Task"
 msgstr "_Atidaryti Užduotį"
 
 #: ui/evolution.xml.h:1
-msgid "About Ximian Evolution..."
-msgstr "Apie Ximian Evolution..."
+#, fuzzy
+msgid "About Evolution..."
+msgstr "Apie Ximian Evolution"
 
 #: ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
 msgstr "Pakeisti Evolution nustatymus"
 
-#: ui/evolution.xml.h:5
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the visibility of the toolbar"
+msgstr "Keisti šio aplanko savybes"
+
+#: ui/evolution.xml.h:6
 #, fuzzy
 msgid "Create a new window displaying this folder"
 msgstr "Sukurti naują kalendorių"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "I_šeiti"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Ximian Evolution _FAQ"
+
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Išeiti iš programos"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:10
 msgid "Forget _Passwords"
 msgstr "Pa_miršti slaptažodžius"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:11
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Pamiršti įsimintus slaptažodžius tam, kad jų vėl būtų paklausta"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:12
 msgid "Import data from other programs"
 msgstr "Importuoti duomenis iš kitų programų"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:14
 #, fuzzy
 msgid "New _Window"
 msgstr "_Langas"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Pi_lot Settings..."
 msgstr "Pi_lot Nuostatos..."
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Send / Receive"
 msgstr "Siųsti / Gauti"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Send queued items and retrieve new items"
 msgstr "Išsiųsti laukiantį paštą ir paimti naują paštą"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Set up Pilot configuration"
 msgstr "Valdyti Pilot nustatymus"
 
-#: ui/evolution.xml.h:17
-msgid "Show information about Ximian Evolution"
+#: ui/evolution.xml.h:19
+#, fuzzy
+msgid "Show information about Evolution"
 msgstr "Rodyti informaciją apie Ximian Evolution"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:20
 msgid "Submit Bug Report"
 msgstr "Išsiųsti klaidos pranešimą"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:21
 msgid "Submit _Bug Report"
 msgstr "Iš_siųsti klaidos pranešimą"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Pranešti apie klaidą, naudojant Bug Buddy"
 
-#: ui/evolution.xml.h:21
-msgid "Toggle whether we are working offline."
-msgstr "Perjungti, ar dirbama atsijungus."
-
 #: ui/evolution.xml.h:23
-msgid "Ximian Evolution _FAQ"
-msgstr "Ximian Evolution _FAQ"
+#, fuzzy
+msgid "T_oolbar"
+msgstr "Pagrindinė įrankinė"
 
 #: ui/evolution.xml.h:24
-msgid "_About Ximian Evolution..."
-msgstr "_Apie Ximian Evolution..."
+msgid "Toggle whether we are working offline."
+msgstr "Perjungti, ar dirbama atsijungus."
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "_About Evolution..."
+msgstr "Apie Ximian Evolution"
+
+#: ui/evolution.xml.h:30
 msgid "_Help"
 msgstr "_Pagalba"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "_Import..."
 msgstr "_Importuoti..."
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "_New"
 msgstr "_Naujas"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 #, fuzzy
 msgid "_Quick Reference"
 msgstr "Pašto Nustatymai"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_Send / Receive"
 msgstr "_Siųsti / Gauti"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 #, fuzzy
 msgid "_Window"
 msgstr "_Langas"
@@ -19273,7 +18800,7 @@ msgid "With _Status"
 msgstr "Priskirti būseną"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:626
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:635
 msgid "UTC"
 msgstr "UTC"
 
@@ -19430,29 +18957,29 @@ msgstr "Kita..."
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
-#: widgets/misc/e-error.c:121
+#: widgets/misc/e-error.c:79 widgets/misc/e-error.c:80
+#: widgets/misc/e-error.c:122
 msgid "Evolution Error"
 msgstr "Evolution Klaida"
 
-#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
-#: widgets/misc/e-error.c:119
+#: widgets/misc/e-error.c:81 widgets/misc/e-error.c:82
+#: widgets/misc/e-error.c:120
 #, fuzzy
 msgid "Evolution Warning"
 msgstr "Evolution Paštas"
 
-#: widgets/misc/e-error.c:118
+#: widgets/misc/e-error.c:119
 #, fuzzy
 msgid "Evolution Information"
 msgstr "Susitikimo informacija"
 
-#: widgets/misc/e-error.c:120
+#: widgets/misc/e-error.c:121
 #, fuzzy
 msgid "Evolution Query"
 msgstr "Evolution bandymas"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:410
+#: widgets/misc/e-error.c:415
 #, fuzzy, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -19600,16 +19127,507 @@ msgstr ""
 "Negalima saugoti į „%s“\n"
 " %s"
 
-#: widgets/misc/e-task-widget.c:211
+#: widgets/misc/e-task-widget.c:212
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: widgets/misc/e-task-widget.c:216
+#: widgets/misc/e-task-widget.c:217
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% užbaigta)"
 
+#~ msgid "Failed to connect to LDAP server"
+#~ msgstr "Nepavyko susisiekti su LDAP serveriu"
+
+#~ msgid "Failed to authenticate with LDAP server"
+#~ msgstr "Nepavyko autentifikavimasis su LDAP serverių"
+
+#~ msgid "Could not perform query on Root DSE"
+#~ msgstr "Negalima daryti užklausos tarp pagrindinio DSE"
+
+#~ msgid "The server responded with no supported search bases"
+#~ msgstr "Serveris nepateikė tinkamų paieškos platformų"
+
+#~ msgid "This server does not support LDAPv3 schema information"
+#~ msgstr "Šis serveris nepalaiko LDAPv3 schemų informacijos"
+
+#~ msgid "Error retrieving schema information"
+#~ msgstr "Klaida gaunant schemų informaciją"
+
+#~ msgid "Server did not respond with valid schema information"
+#~ msgstr "Serveris nepateikė tvarkingos schemų informacijos"
+
+#~ msgid "  S_how Supported Bases "
+#~ msgstr "  _Rodyti Palaikomas Bazes "
+
+#~ msgid "1:00"
+#~ msgstr "1:00"
+
+#~ msgid "5:00"
+#~ msgstr "5:00"
+
+#~ msgid "Connecting"
+#~ msgstr "Jungiamasi"
+
+#~ msgid "Distinguished _name:"
+#~ msgstr "Skirtinis _vardas:"
+
+#~ msgid "Email address:"
+#~ msgstr "El. pašto adresas:"
+
+#~ msgid "Evolution will use this DN to authenticate you with the server"
+#~ msgstr ""
+#~ "Evolution naudos šį skirtinį vardą (DN) autentifikacijos su serveriu metu"
+
+#~ msgid "One"
+#~ msgstr "One"
+
+#~ msgid "S_earch scope: "
+#~ msgstr "Pai_eškos sritis:"
+
+#~ msgid "Searching"
+#~ msgstr "Ieškoma"
+
+#~ msgid "Sub"
+#~ msgstr "Sub"
+
+#~ msgid "This option controls how long a search will be run."
+#~ msgstr "Šis nustatymas valdo didžiausią galimą paieškos trukmę."
+
+#~ msgid "U_se SSL/TLS:"
+#~ msgstr "Naudoti _SSL/TLS:"
+
+#~ msgid "_Display name:"
+#~ msgstr "Ro_domas vardas:"
+
+#~ msgid "_Port number:"
+#~ msgstr "_Prievadas:"
+
+#~ msgid "_Search base:"
+#~ msgstr "_Paieškos sritis:"
+
+#~ msgid "_Server name:"
+#~ msgstr "_Serverio vardas:"
+
+#~ msgid "_Timeout (minutes):"
+#~ msgstr "_Pauzės riba (minutėmis):"
+
+#~ msgid "connecting-tab"
+#~ msgstr "jungties-kortelė"
+
+#~ msgid "general-tab"
+#~ msgstr "bendrinė-kortelė"
+
+#~ msgid "searching-tab"
+#~ msgstr "paieškos-kortelė"
+
+#, fuzzy
+#~ msgid "Job title:"
+#~ msgstr "_Pareigos:"
+
+#, fuzzy
+#~ msgid "Webcam:"
+#~ msgstr "Tinklalapis:"
+
+#~ msgid "Category editor not available."
+#~ msgstr "Kategorijų redaktorius nepasiekiamas."
+
+#, fuzzy
+#~ msgid ""
+#~ "The following entries are invalid:\n"
+#~ "\n"
+#~ msgstr "Žemiau nurodytos jungtys šiuo metu yra aktyvios:"
+
+#~ msgid "Could not find widget for a field: `%s'"
+#~ msgstr "Nepavyko rasti lauko objekto: „%s“"
+
+#~ msgid "Do you want to save changes?"
+#~ msgstr "Ar nori išsaugoti pakeitimus?"
+
+#~ msgid "Error saving %s: %s"
+#~ msgstr "Klaida saugant %s: %s"
+
+#~ msgid ""
+#~ "The addressbook backend for\n"
+#~ "%s\n"
+#~ "has crashed. You will have to restart Evolution in order to use it again"
+#~ msgstr ""
+#~ "Sutriko adresų knygos posistemės\n"
+#~ "%s\n"
+#~ "darbas. Jums teks paleisti Evolution iš naujo tam, kad pasinaudoti ja vėl"
+
+#~ msgid "Can not load URI"
+#~ msgstr "Nepavyko atverti adreso"
+
+#~ msgid "Calendar Properties"
+#~ msgstr "Kalendoriaus Savybės"
+
+#~ msgid "Remote"
+#~ msgstr "Nutolęs"
+
+#~ msgid "Task List Properties"
+#~ msgstr "Užduočių Sąrašo Savybės"
+
+#~ msgid "_Refresh Interval:"
+#~ msgstr "Atnaujinimo Intervalas:"
+
+#~ msgid "_Source URL:"
+#~ msgstr "Pradini_s adresas:"
+
+#~ msgid ""
+#~ "The event being deleted is a meeting, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "Trinamas įvykis yra susitikimas. Ar Jūs norite pasiųsti atšaukimo "
+#~ "pranešimą?"
+
+#~ msgid "Are you sure you want to cancel and delete this meeting?"
+#~ msgstr "Ar tu tikrai nori atšaukti ir ištrinti šį susitikimą?"
+
+#~ msgid ""
+#~ "The task being deleted is assigned, would you like to send a cancellation "
+#~ "notice?"
+#~ msgstr ""
+#~ "Trinama užduotis yra priskirta. Ar Jūs norite pasiųsti atšaukimo "
+#~ "pranešimą?"
+
+#~ msgid "Are you sure you want to cancel and delete this task?"
+#~ msgstr "Ar tu tikrai nori atšaukti ir ištrinti šią užduotį?"
+
+#~ msgid ""
+#~ "The journal entry being deleted is published, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "Trinamas žurnalo įrašas yra viešai paskelbtas. Ar norite pasiųsti "
+#~ "atšaukimo pranešimą?"
+
+#~ msgid "Are you sure you want to cancel and delete this journal entry?"
+#~ msgstr "Ar tu tikrai nori atšaukti ir ištrinti šį žurnalo įrašą?"
+
+#~ msgid "Are you sure you want to delete the appointment `%s'?"
+#~ msgstr "Ar tu tikrai nori ištrinti įvykį „%s“?"
+
+#~ msgid "Are you sure you want to delete this untitled appointment?"
+#~ msgstr "Ar tu tikrai nori ištrinti šį bevardį įvykį?"
+
+#~ msgid "Are you sure you want to delete the task `%s'?"
+#~ msgstr "Ar tu tikrai nori ištrinti užduotį „%s“?"
+
+#~ msgid "Are you sure you want to delete this untitled task?"
+#~ msgstr "Ar tu tikrai nori ištrinti šią bevardę užduotį?"
+
+#~ msgid "Are you sure you want to delete the journal entry `%s'?"
+#~ msgstr "Ar tu tikrai nori ištrinti žurnalo įrašą „%s“?"
+
+#~ msgid "Are you sure want to delete this untitled journal entry?"
+#~ msgstr "Ar tu tikrai nori ištrinti šį bevardį žurnalo įrašą?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d appointment?"
+#~ msgid_plural "Are you sure you want to delete %d appointments?"
+#~ msgstr[0] "Ar tu tikrai nori ištrinti %d įvykių?"
+#~ msgstr[1] "Ar tu tikrai nori ištrinti %d įvykių?"
+#~ msgstr[2] "Ar tu tikrai nori ištrinti %d įvykių?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d task?"
+#~ msgid_plural "Are you sure you want to delete %d tasks?"
+#~ msgstr[0] "Ar tu tikrai nori ištrinti %d užduočių?"
+#~ msgstr[1] "Ar tu tikrai nori ištrinti %d užduočių?"
+#~ msgstr[2] "Ar tu tikrai nori ištrinti %d užduočių?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d journal entry?"
+#~ msgid_plural "Are you sure you want to delete %d journal entries?"
+#~ msgstr[0] "Ar tu tikrai nori ištrinti %d žurnalo įrašų?"
+#~ msgstr[1] "Ar tu tikrai nori ištrinti %d žurnalo įrašų?"
+#~ msgstr[2] "Ar tu tikrai nori ištrinti %d žurnalo įrašų?"
+
+#~ msgid "_Invite Others..."
+#~ msgstr "Pakv_iesti kitus..."
+
+#~ msgid ""
+#~ "This event has been changed, but has not been saved.\n"
+#~ "\n"
+#~ "Do you wish to save your changes?"
+#~ msgstr ""
+#~ "Šis įvykis buvo pakeistas, tačiau neišsaugotas.\n"
+#~ "\n"
+#~ "Ar norėtumėte išsaugoti pakeitimus?"
+
+#~ msgid "_Discard Changes"
+#~ msgstr "_Atsikratyti Pakeitimų"
+
+#~ msgid "Save Event"
+#~ msgstr "Išsaugoti Įvykį"
+
+#~ msgid "The meeting information has been created. Send it?"
+#~ msgstr "Susitikimo informacija buvo sukurta. Ar ją išsiųsti?"
+
+#~ msgid "The meeting information has changed. Send an updated version?"
+#~ msgstr ""
+#~ "Susitikimo informacija buvo pakeista. Siųsti atnaujintą informaciją?"
+
+#~ msgid "The task assignment information has been created. Send it?"
+#~ msgstr "Užduoties priskyrimas buvo sukurtas. Ar išsiųsti informaciją?"
+
+#~ msgid "The task information has changed. Send an updated version?"
+#~ msgstr "Užduoties informacija buvo pakeista. Siųsti atnaujintą informaciją?"
+
+#~ msgid "Could not get article %s from NNTP server"
+#~ msgstr "Negalėjau gauti straipsnio %s iš NNTP serverio"
+
+#~ msgid "Connection error: %s"
+#~ msgstr "Jungimosi klaida: %s"
+
+#~ msgid "Could not get group: %s"
+#~ msgstr "Nepavyko gauti grupės: %s"
+
+#, fuzzy
+#~ msgid "Could not get messages: unspecified error"
+#~ msgstr "Negalėjau išsiųsti laiško: %s"
+
+#~ msgid "Unknown server response: %s"
+#~ msgstr "Nežinomas serverio atsakymas: %s"
+
+#~ msgid "Adjust Score"
+#~ msgstr "Adjust Score"
+
+#~ msgid "Assign Color"
+#~ msgstr "Priskirti spalvą"
+
+#~ msgid "Assign Score"
+#~ msgstr "Priskirti įvertį"
+
+#~ msgid "Attachments"
+#~ msgstr "Priedai"
+
+#~ msgid "Beep"
+#~ msgstr "Signalas"
+
+#~ msgid "contains"
+#~ msgstr "turi savyje"
+
+#~ msgid "Copy to Folder"
+#~ msgstr "Kopijuoti į aplanką"
+
+#~ msgid "Date received"
+#~ msgstr "Gavimo data"
+
+#~ msgid "Date sent"
+#~ msgstr "Siuntimo data"
+
+#~ msgid "Deleted"
+#~ msgstr "Ištrintas"
+
+#~ msgid "does not contain"
+#~ msgstr "neturi savyje"
+
+#~ msgid "does not end with"
+#~ msgstr "nesibaigia"
+
+#~ msgid "does not exist"
+#~ msgstr "neegzistuoja"
+
+#~ msgid "does not return"
+#~ msgstr "negražina"
+
+#~ msgid "does not sound like"
+#~ msgstr "neskamba panašiai į"
+
+#~ msgid "does not start with"
+#~ msgstr "neprasideda su"
+
+#~ msgid "Do Not Exist"
+#~ msgstr "neegzistuoja"
+
+#~ msgid "Draft"
+#~ msgstr "Juodraštis"
+
+#~ msgid "ends with"
+#~ msgstr "baigiasi su"
+
+#~ msgid "Exist"
+#~ msgstr "Egzistuoja"
+
+#~ msgid "exists"
+#~ msgstr "egzistuoja"
+
+#~ msgid "Expression"
+#~ msgstr "Išraiška"
+
+#~ msgid "Follow Up"
+#~ msgstr "Tęsinys"
+
+#~ msgid "is"
+#~ msgstr "yra"
+
+#~ msgid "is after"
+#~ msgstr "yra po"
+
+#~ msgid "is before"
+#~ msgstr "yra prieš"
+
+#~ msgid "is Flagged"
+#~ msgstr "yra pažymėtas"
+
+#~ msgid "is greater than"
+#~ msgstr "yra didesnis už"
+
+#~ msgid "is less than"
+#~ msgstr "yra mažesnis už"
+
+#~ msgid "is not"
+#~ msgstr "nėra"
+
+#~ msgid "is not Flagged"
+#~ msgstr "nėra pažymėtas"
+
+#, fuzzy
+#~ msgid "Junk Test"
+#~ msgstr "Birželis"
+
+#~ msgid "Mailing list"
+#~ msgstr "Konferencija"
+
+#~ msgid "Message Body"
+#~ msgstr "Laiško tekstas"
+
+#~ msgid "Message Header"
+#~ msgstr "Laiško antraštė"
+
+#, fuzzy
+#~ msgid "Message is Junk"
+#~ msgstr "_Laiškai"
+
+#, fuzzy
+#~ msgid "Message is not Junk"
+#~ msgstr "Atšaukti Šiukšlės _Pažymėjimą"
+
+#~ msgid "Move to Folder"
+#~ msgstr "Perkelti į aplanką"
+
+#, fuzzy
+#~ msgid "Pipe to Program"
+#~ msgstr "Išeiti iš programos"
+
+#~ msgid "Play Sound"
+#~ msgstr "Groti garsą"
+
+#~ msgid "Recipients"
+#~ msgstr "Gavėjai"
+
+#~ msgid "Regex Match"
+#~ msgstr "Regex tenkina"
+
+#~ msgid "Replied to"
+#~ msgstr "Atsakytas"
+
+#~ msgid "returns"
+#~ msgstr "gražina"
+
+#~ msgid "returns greater than"
+#~ msgstr "gražina reikšmę didesnę už"
+
+#~ msgid "returns less than"
+#~ msgstr "gražina reikšmę mažesnę už"
+
+#, fuzzy
+#~ msgid "Run Program"
+#~ msgstr "Paleisti programą:"
+
+#~ msgid "Sender"
+#~ msgstr "Siuntėjas"
+
+#~ msgid "Set Status"
+#~ msgstr "Priskirti būseną"
+
+#~ msgid "Size (kB)"
+#~ msgstr "Dydis (kB)"
+
+#~ msgid "sounds like"
+#~ msgstr "skamba panašiai į"
+
+#~ msgid "Source Account"
+#~ msgstr "Šaltinio sąskaita"
+
+#~ msgid "Specific header"
+#~ msgstr "Savita antraštė"
+
+#~ msgid "starts with"
+#~ msgstr "prasideda su"
+
+#~ msgid "Stop Processing"
+#~ msgstr "Sustabdyti vykdymą"
+
+#~ msgid "Unset Status"
+#~ msgstr "Atšaukti Būseną"
+
+#~ msgid "Check _Incoming Mail"
+#~ msgstr "Pat_ikrinti Gautą Paštą"
+
+#~ msgid "Use _Daemon"
+#~ msgstr "Naudoti _Tarnybą"
+
+#~ msgid "_Local Tests Only"
+#~ msgstr "_Tik Vietiniai Testai"
+
+#~ msgid "Working"
+#~ msgstr "Dirbama"
+
+#~ msgid "Brought to you by"
+#~ msgstr "Produktą sukūrė"
+
+#~ msgid "_Filename:"
+#~ msgstr "_Bylos vardas:"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "Unknown error."
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Nežinoma klaida."
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the component system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Klaida iš komponentų sistemos yra:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the activation system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Klaida iš aktyvavimo sistemos yra:\n"
+#~ "%s"
+
+#~ msgid "Do you want to trust \"%s\" for the following purposes?"
+#~ msgstr "Ar Jūs norite pasitikėti „%s“ šiais tikslais?"
+
+#~ msgid "View Certificate"
+#~ msgstr "Peržiūrėti Sertifikatą"
+
+#~ msgid "You have been asked to trust a new Certificate Authority (CA)."
+#~ msgstr "Jums siūloma pasitikėti nauju Sertifikatų Autorizatoriumi (CA)."
+
+#~ msgid "About Ximian Evolution..."
+#~ msgstr "Apie Ximian Evolution..."
+
+#~ msgid "_About Ximian Evolution..."
+#~ msgstr "_Apie Ximian Evolution..."
+
 #~ msgid "Evolution Addressbook folder viewer"
 #~ msgstr "Evolution Adresų Knygos aplankų vaizduoklė"
 
@@ -19916,9 +19934,6 @@ msgstr "%s (%d%% užbaigta)"
 #~ msgid "Primary _email:"
 #~ msgstr "Pagrindinis _el. paštas:"
 
-#~ msgid "S_pouse:"
-#~ msgstr "S_utuoktinis:"
-
 #~ msgid "_Business:"
 #~ msgstr "_Verslo:"
 
@@ -19934,9 +19949,6 @@ msgstr "%s (%d%% užbaigta)"
 #~ msgid "_Mobile:"
 #~ msgstr "_Mobilus:"
 
-#~ msgid "_Office:"
-#~ msgstr "_Ofisas:"
-
 #~ msgid "_Public Calendar URL:"
 #~ msgstr "_Viešo kalendoriaus URL:"
 
@@ -20566,9 +20578,6 @@ msgstr "%s (%d%% užbaigta)"
 #~ msgid "Failed on message %d of %d"
 #~ msgstr "Nesėkmė ties laišku %d iš %d"
 
-#~ msgid "Changing junk status"
-#~ msgstr "Keičiama šiukšlių žymė"
-
 #~ msgid "Search"
 #~ msgstr "Paieška"
 
diff --git a/po/lv.po b/po/lv.po
index f1a56cda4c..2f025f6c0d 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution for latvian\n"
-"POT-Creation-Date: 2004-05-19 14:00-0400\n"
+"POT-Creation-Date: 2004-06-03 11:14-0400\n"
 "PO-Revision-Date: 2003-02-03 23:02+0200\n"
 "Last-Translator: Pēteris Krišjānis <peteris.krisjanis@os.lv>\n"
 "Language-Team: Latvian <lv@li.org>\n"
@@ -60,14 +60,14 @@ msgstr "1 karte"
 msgid "Default Sync Address:"
 msgstr "Noklusētā sinhr. adrese:"
 
-#: addressbook/conduit/address-conduit.c:1150
 #: addressbook/conduit/address-conduit.c:1151
+#: addressbook/conduit/address-conduit.c:1152
 #, fuzzy
 msgid "Could not load addressbook"
 msgstr "Nevarēju ielādēt %s: %s"
 
-#: addressbook/conduit/address-conduit.c:1219
-#: addressbook/conduit/address-conduit.c:1222
+#: addressbook/conduit/address-conduit.c:1220
+#: addressbook/conduit/address-conduit.c:1223
 msgid "Could not read pilot's Address application block"
 msgstr "Nevarēju nolasīt Pilot adrešu aplikācijas bloku"
 
@@ -75,13 +75,13 @@ msgstr "Nevarēju nolasīt Pilot adrešu aplikācijas bloku"
 msgid "Accessing LDAP Server anonymously"
 msgstr "Izmantoju LDAP serveri anonīmi"
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
 msgid "Failed to authenticate.\n"
 msgstr "Neizdevās autentificēties.\n"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sIevadiet %s paroli (lietotājs %s)"
@@ -127,52 +127,24 @@ msgstr "_Kontakti:"
 msgid "Create a new contacts group"
 msgstr "Izveidot jaunu saīsinājumu grupu"
 
-#: addressbook/gui/component/addressbook-component.c:182
+#: addressbook/gui/component/addressbook-component.c:184
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:483
-msgid "Failed to connect to LDAP server"
-msgstr "Nespēju savienoties ar LDAP serveri"
-
-#: addressbook/gui/component/addressbook-config.c:507
-msgid "Failed to authenticate with LDAP server"
-msgstr "Nespēju autentificēties ar LDAP serveri"
-
-#: addressbook/gui/component/addressbook-config.c:535
-msgid "Could not perform query on Root DSE"
-msgstr "Nevarēju izpildīt pieprasījumu uz saknes DSE"
-
-#: addressbook/gui/component/addressbook-config.c:840
-msgid "The server responded with no supported search bases"
-msgstr "Serveris atbildeja ar neatbalstītām meklēšanas bāzēm"
-
-#: addressbook/gui/component/addressbook-config.c:1245
-msgid "This server does not support LDAPv3 schema information"
-msgstr "Šis serveris neatbalsta LDAPv3 shēmas informāciju"
-
-#: addressbook/gui/component/addressbook-config.c:1266
-msgid "Error retrieving schema information"
-msgstr "Kļūda saņemot shēmas informāciju"
-
-#: addressbook/gui/component/addressbook-config.c:1274
-msgid "Server did not respond with valid schema information"
-msgstr "Serveris atbildēja ar nepareizu shēmas informāciju"
-
 #: addressbook/gui/component/addressbook-migrate.c:68
-#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1160
 #, fuzzy
 msgid "Migrating..."
 msgstr "Gaidu..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1201
 #, fuzzy, c-format
 msgid "Migrating `%s':"
 msgstr "Ehotestējam %s"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:438
+#: addressbook/gui/component/addressbook-migrate.c:464
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
 #: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
@@ -180,31 +152,31 @@ msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:446
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
-#: mail/mail-config.glade.h:106
+#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
+#: mail/mail-config.glade.h:109
 msgid "Personal"
 msgstr "Personīgi"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:454
+#: addressbook/gui/component/addressbook-migrate.c:480
 #, fuzzy
 msgid "On LDAP Servers"
 msgstr "LDAP serveris"
 
-#: addressbook/gui/component/addressbook-migrate.c:582
+#: addressbook/gui/component/addressbook-migrate.c:608
 #, fuzzy
 msgid "LDAP Servers"
 msgstr "LDAP serveris"
 
-#: addressbook/gui/component/addressbook-migrate.c:702
+#: addressbook/gui/component/addressbook-migrate.c:728
 #, fuzzy
 msgid "Autocompletion Settings"
 msgstr "Autoaizpildes mapes"
 
-#: addressbook/gui/component/addressbook-migrate.c:1076
+#: addressbook/gui/component/addressbook-migrate.c:1104
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -212,60 +184,55 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1090
+#: addressbook/gui/component/addressbook-migrate.c:1118
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1099
+#: addressbook/gui/component/addressbook-migrate.c:1127
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1109
+#: addressbook/gui/component/addressbook-migrate.c:1137
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:674
+#: addressbook/gui/component/addressbook-view.c:675
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:761
+#: addressbook/gui/component/addressbook-view.c:754
 #, fuzzy
 msgid "New Address Book"
 msgstr "Adrešu grāmata"
 
-#: addressbook/gui/component/addressbook-view.c:762
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
+#: addressbook/gui/component/addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Dzēst"
 
-#: addressbook/gui/component/addressbook-view.c:763
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-view.c:756
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Rekvizīti..."
 
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/addressbook-view.c:1002
+#. Create the contacts group
+#: addressbook/gui/component/addressbook-view.c:995
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
 #: calendar/gui/migration.c:373
 msgid "Contacts"
 msgstr "Kontakti"
@@ -352,10 +319,6 @@ msgid "Manage your S/MIME certificates here"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-msgid "  S_how Supported Bases "
-msgstr "  Pa_rādīt atbalstītās bāzes"
-
-#: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -370,204 +333,170 @@ msgstr "  Pa_rādīt atbalstītās bāzes"
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1:00"
-msgstr "1:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
-msgstr "5:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "Autentifikācija"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
 #, fuzzy
 msgid "<b>Display</b>"
 msgstr "<b>Sākas:</b> "
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 #, fuzzy
 msgid "<b>Downloading</b>"
 msgstr "L_okācija: "
 
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:10
 #, fuzzy
 msgid "<b>Searching</b>"
 msgstr "Meklēšana"
 
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
 msgid "<b>Server Information</b>"
 msgstr "Solis 1: Servera informācija"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
 msgid "<b>Type:</b>"
 msgstr "<b>Līdz:</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:13
 #, fuzzy
 msgid "Add Contacts Group"
 msgstr "_Kontakti:"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:14
 #, fuzzy
 msgid "Address Book Properties"
 msgstr "Adrešu grāmatas resursi"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
-#: mail/mail-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
+#: mail/mail-config.glade.h:42
 msgid "Always"
 msgstr "Vienmēr"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr "Anonīmi"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:17
 #: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Pamata"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
-msgid "Connecting"
-msgstr "Savienojos"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 #: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Detaļas"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
-msgid "Distinguished _name:"
-msgstr "Atšķiramais _vārds:"
-
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:19
 #, fuzzy
 msgid "Distinguished name"
 msgstr "Atšķiramais _vārds:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:20
 #, fuzzy
 msgid "Download limit:"
 msgstr "_Lejupielādes limits:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Email address"
 msgstr "Epasta _adrese:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:22
 #, fuzzy
-msgid "Email address:"
-msgstr "Epasta _adrese:"
-
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "Evolution will use this DN to authenticate you with the server"
-msgstr "Evolution lietos šo DN, lai autentificētu jūs ar serveri"
-
-#: addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
-"Evolution will use this email address to authenticate you with the server"
+"Evolution will use this email address to authenticate you with the server."
 msgstr "Evolution lietos šo epasta adresi,lai autentificētu jūs ar serveri"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:23
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Atbalstītās meklēšanas bāzes"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:24
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
+#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Galvenais"
 
-#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
-#: mail/mail-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
+#: mail/mail-config.glade.h:102
 msgid "Never"
 msgstr "Nekad"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
-msgid "One"
-msgstr "Viens"
-
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:35
-msgid "S_earch scope: "
-msgstr "M_eklēšanas mērogs:"
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Search _base:"
+msgstr "_Meklēšanas bāze:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
 msgid "Search base only"
 msgstr "_Meklēšanas bāze:"
 
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:29
 #, fuzzy
 msgid "Search base:"
 msgstr "_Meklēšanas bāze:"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Search scope:"
 msgstr "M_eklēšanas mērogs:"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
-msgid "Searching"
-msgstr "Meklēšana"
-
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:31
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
-"server if\n"
-"your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL or TLS."
 msgstr ""
 "Izvēloties šo opciju, Evolution savienosies ar jūsu LDAP serveri tikai tad,\n"
 "ja jūsu LDAP serveris atbalsta SSL vai TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a \n"
-"insecure environment. For example, if you and your LDAP server are behind a "
-"firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection "
-"is already\n"
-"secure."
+"you are in a insecure environment. For example, if you and your LDAP server "
+"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
+"because your connection is already secure."
 msgstr ""
 "Izvēloties šo opciju, Evolution lietos SSL/TLS tikai ja jūs esat\n"
 "nedrošā datortīkla vidē. Piemēram, ja jūs un jūsu LDAP serveris ir aiz "
@@ -576,13 +505,12 @@ msgstr ""
 "savienojums jau\n"
 "ir drošs."
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:33
+#, fuzzy
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
-"TLS.  This \n"
-"means that your connection will be insecure, and that you will be vulnerable "
-"to security\n"
-"exploits. "
+"TLS.  This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits. "
 msgstr ""
 "Izvēloties šo opciju, jūs norādat, ka jūsu serveris neizmanto SSL un/vai "
 "TLS. Tas \n"
@@ -590,37 +518,32 @@ msgstr ""
 "drošības\n"
 "kļūdu izmantojumiem."
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Sub"
-msgstr "Apakš"
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr "Atbalstītās meklēšanas bāzes"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
-"searches will \n"
-"begin. If you leave this blank, the search will begin at the root of the "
-"directory tree."
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
 msgstr ""
 "Meklēšanas bāze ir atšķiramais vārds (DN) no ieraksta, kur jūsu meklējumi "
 "tiks uzsākti. \n"
 "Ja jūs atstāsiet šo tukšu, meklējumi sāksies no direktorijas koka saknes."
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:37
+#, fuzzy
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
-"the \n"
-"directory tree. A search scope of \"sub\" will include all entries below "
-"your search base.\n"
-"A search scope of \"one\" will only include the entries one level beneath "
-"your base.\n"
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
 msgstr ""
 "Meklēšanas mērogs definē, cik dziļi jūs vēlaties meklēt direktoriju kokā.\n"
 "Meklēšanas mērogs \"sub\" iekļaus visus ierakstus zemāk par jūsu ieraksta "
@@ -628,25 +551,24 @@ msgstr ""
 "Meklēšanas mērogs \"one\" iekļaus ierakstus tikai vienu līmeni zemāk par "
 "jūsu bāzi.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:58
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 "Šis ir pilnais LDAP servera nosaukums. Piemēram, \"ldap.manakompanija.com\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:39
 #, fuzzy
 msgid ""
-"This is the maximum number of entries to download. Setting this number to "
-"be \n"
+"This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr ""
 "Šis ir maksimālais lejupielādējāmo ierakstu skaits. Uzstādot šo skaitli "
 "pārlieku \n"
 "lielu, tiks bremzēta jūsu adrešu grāmatas darbība."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -656,141 +578,120 @@ msgstr ""
 "ka uzstādot to uz \"Epasta adrese\", tai ir nepieciešama anonīma pieeja jūsu "
 "LDAP serverī."
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:41
+#, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
-"list.\n"
-"It is for display purposes only. "
+"list. It is for display purposes only. "
 msgstr ""
 "Šis ir servera nosaukums, kas parādīsies jūsu Evolution mapju sarakstā.\n"
 "Tas ir tikai attēlošanas pēc."
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:42
+#, fuzzy
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. "
-"A \n"
-"list of standard ports has been provided. Ask your system administrator\n"
-"what port you should specify."
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
 msgstr ""
 "Šis ir LDAP servera ports, pie kura Evolution mēģinās pieslēgties. Tiek \n"
 "piedāvāts standarta portu saraksts. Prasiet jūsu sistēmu administrātoram,\n"
 "kādu portu jums vajadzētu norādīt."
 
-#: addressbook/gui/component/ldap-config.glade.h:67
-msgid "This option controls how long a search will be run."
-msgstr "Šī opcija kontrolē, cik ilgi notiks meklēšana."
-
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:43
 #, fuzzy
 msgid "Timeout:"
 msgstr "Laika formāts:"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
-msgid "U_se SSL/TLS:"
-msgstr "Izman_tot SSL/TLS:"
-
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr "Izmantoju atšķirīgo vārdu (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr "Izmantoju epasta adresi"
 
-#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
-#: mail/mail-config.glade.h:154
+#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
+#: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr "Kad iespējams"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:47
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "_Kontakti:"
 
-#: addressbook/gui/component/ldap-config.glade.h:74
-#: calendar/gui/dialogs/calendar-setup.glade.h:12
-msgid "_Display name:"
-msgstr "_Attēlošanas nosaukums:"
-
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr "_Lejupielādes limits:"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
 msgid "_Email address:"
 msgstr "Epasta _adrese:"
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:50
+#, fuzzy
+msgid "_Find Possible Search Bases"
+msgstr "Atbalstītās meklēšanas bāzes"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Log in method:"
 msgstr "_Pieteikšanās metode:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "_Log in:"
+msgstr "Pieteikšanās"
+
+#: addressbook/gui/component/ldap-config.glade.h:53
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
 msgid "_Name:"
 msgstr "_Vārds:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
-msgid "_Port number:"
-msgstr "_Porta numurs:"
-
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "_Port:"
 msgstr "_Prioritāte:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
-msgid "_Search base:"
-msgstr "_Meklēšanas bāze:"
-
-#: addressbook/gui/component/ldap-config.glade.h:82
-msgid "_Server name:"
-msgstr "_Servera nosaukums:"
+#: addressbook/gui/component/ldap-config.glade.h:55
+#, fuzzy
+msgid "_Search scope:"
+msgstr "M_eklēšanas mērogs:"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:56
 #, fuzzy
 msgid "_Server:"
 msgstr "_Serveris:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
-msgid "_Timeout (minutes):"
-msgstr "_Taimouts (minūtes):"
+#: addressbook/gui/component/ldap-config.glade.h:57
+#, fuzzy
+msgid "_Timeout:"
+msgstr "Laika formāts:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:58
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "_Lietot drošu savienojumu (SSL):"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "kartes"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
-msgid "connecting-tab"
-msgstr "connecting-tab"
-
-#: addressbook/gui/component/ldap-config.glade.h:88
-msgid "general-tab"
-msgstr "general-tab"
-
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:60
 #: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
-#: mail/mail-config.glade.h:182
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "minūtes"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
-msgid "searching-tab"
-msgstr "searching-tab"
-
-#: addressbook/gui/component/select-names/e-select-names.c:497
+#: addressbook/gui/component/select-names/e-select-names.c:503
 #: addressbook/gui/component/select-names/select-names.glade.h:6
 #, fuzzy
 msgid "Select Contacts from Address Book"
 msgstr "Izvēlieties kontaktus no adrešu grāmatas"
 
-#: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
@@ -832,7 +733,7 @@ msgstr "Nenosaukts kontakts"
 
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:222
+#: addressbook/gui/widgets/e-addressbook-view.c:224
 msgid "Source"
 msgstr "Avots"
 
@@ -912,9 +813,9 @@ msgid "<b>Work</b>"
 msgstr "Darba nedēļa"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
-#: addressbook/gui/widgets/eab-contact-display.c:342
-#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/widgets/eab-contact-display.c:334
+#: addressbook/gui/widgets/eab-contact-display.c:353
 msgid "AIM"
 msgstr ""
 
@@ -955,15 +856,15 @@ msgid "Company:"
 msgstr "Kompānija"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:271
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
+#: addressbook/gui/contact-editor/e-contact-editor.c:266
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
 msgstr "Kontakts"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1527
+#: addressbook/gui/contact-editor/e-contact-editor.c:520
 msgid "Contact Editor"
 msgstr "Kontaktu redaktors"
 
@@ -987,83 +888,80 @@ msgid "Full _Name..."
 msgstr "Pil_ns vārds..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:202
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-msgid "Home"
-msgstr "Mājas"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #, fuzzy
 msgid "Home Page:"
 msgstr "Mājas fakss"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-#, fuzzy
-msgid "Job title:"
-msgstr "_Darba nosaukums:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/e-itip-control.c:936
-msgid "Location:"
-msgstr "Lokācija: "
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 #, fuzzy
 msgid "MSN Messenger"
 msgstr "_Pasta vēstule"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 #, fuzzy
 msgid "Mailing Address"
 msgstr "Epasta adrese:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 #, fuzzy
 msgid "Manager:"
 msgstr "Menedžeris"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "_Iesauka:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Notes:"
 msgstr "Piezīm_es:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
-#: addressbook/gui/contact-editor/e-contact-editor.c:203
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-msgid "Other"
-msgstr "Citi"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#, fuzzy
+msgid "Office:"
+msgstr "_Birojs:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "PO Box:"
 msgstr "_Pasta Kastīte:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 #, fuzzy
 msgid "Personal Information"
 msgstr "Optionāla informācija"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 #, fuzzy
 msgid "Profession:"
 msgstr "P_rofesija:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#, fuzzy
+msgid "Spouse:"
+msgstr "_Dzīvesbiedrs:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "State/Province:"
 msgstr "_Rajons/štats/province:"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#, fuzzy
+msgid "Title:"
+msgstr "_Amats/tituls:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+msgid "Video Chat:"
+msgstr ""
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:41
 #, fuzzy
 msgid "Wants to receive HTML mail"
@@ -1071,15 +969,15 @@ msgstr "Grib saņemt _HTML pastu"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:42
 #, fuzzy
-msgid "Webcam:"
-msgstr "Lapa"
+msgid "Web Log:"
+msgstr "_Web lapaspuses adrese:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
-#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
-#: mail/mail-config.glade.h:155
+#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
+#: mail/mail-config.glade.h:157
 msgid "Work"
 msgstr "Darbs"
 
@@ -1101,19 +999,12 @@ msgid "_File under:"
 msgstr "Faila nosaukums:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 #, fuzzy
 msgid "_Where:"
 msgstr "_Serveris:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
-msgid "item7"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
-msgid "item8"
-msgstr ""
-
-#: addressbook/gui/contact-editor/eab-editor.c:316
+#: addressbook/gui/contact-editor/eab-editor.c:315
 #, fuzzy
 msgid ""
 "Are you sure you want\n"
@@ -1122,7 +1013,7 @@ msgstr ""
 "Vai jūs tiešām vēlaties\n"
 "dzēst šo kontaktu?"
 
-#: addressbook/gui/contact-editor/eab-editor.c:319
+#: addressbook/gui/contact-editor/eab-editor.c:318
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -1131,17 +1022,17 @@ msgstr ""
 "dzēst šo kontaktu?"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:351
-#: addressbook/gui/widgets/eab-contact-display.c:372
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:364
 #, fuzzy
 msgid "Address"
 msgstr "_Adrese:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:292
+#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard.c:174
@@ -2127,93 +2018,117 @@ msgstr "Zambija"
 msgid "Zimbabwe"
 msgstr "Zimbabve"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/contact-editor/e-contact-editor.c:179
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:337
+#: addressbook/gui/widgets/eab-contact-display.c:356
 #, fuzzy
 msgid "Jabber"
 msgstr "Nenosaukts saraksts"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:347
-#: addressbook/gui/widgets/eab-contact-display.c:366
+#: addressbook/gui/contact-editor/e-contact-editor.c:180
+#: addressbook/gui/widgets/eab-contact-display.c:339
+#: addressbook/gui/widgets/eab-contact-display.c:358
 #, fuzzy
 msgid "Yahoo"
 msgstr "Joro"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: addressbook/gui/widgets/eab-contact-display.c:338
+#: addressbook/gui/widgets/eab-contact-display.c:357
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:344
-#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#: addressbook/gui/widgets/eab-contact-display.c:355
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/contact-editor/e-contact-editor.c:183
 #, fuzzy
 msgid "GroupWise"
 msgstr "Grupa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+msgid "Home"
+msgstr "Mājas"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+msgid "Other"
+msgstr "Citi"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
 #, fuzzy
 msgid "Source Book"
 msgstr "Avots"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:264
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:278
+#: addressbook/gui/contact-editor/e-contact-editor.c:273
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Jauns kontakts"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:285
+#: addressbook/gui/contact-editor/e-contact-editor.c:280
 #, fuzzy
 msgid "Writable Fields"
 msgstr "Merril Field"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:299
+#: addressbook/gui/contact-editor/e-contact-editor.c:294
 #, fuzzy
 msgid "Changed"
 msgstr "Čada"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
-msgid "Category editor not available."
-msgstr "Kategoriju redaktors nav pieejams."
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:2352
 msgid "This contact belongs to these categories:"
 msgstr "Šis kontakts pieder šādām kategorijām:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#: addressbook/gui/contact-editor/e-contact-editor.c:2429
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Lūdzu izvēlieties starp sekojošām opcijām"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#: addressbook/gui/contact-editor/e-contact-editor.c:2433
 #, fuzzy
 msgid "No image"
 msgstr "Nome"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#: addressbook/gui/contact-editor/e-contact-editor.c:2636
 #, fuzzy
 msgid ""
-"The following entries are invalid:\n"
+"The contact data is invalid:\n"
 "\n"
-msgstr "Pašreizējie aktīvie savienojumi ir:"
+msgstr "Atkārtošanas datums ir nepareizs."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2738
-#, c-format
-msgid "Could not find widget for a field: `%s'"
-msgstr "Nevar atrast logdaļu laukam: `%s'"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#, fuzzy
+msgid "Invalid contact."
+msgstr "Nepareizs mērķis"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+msgid ""
+"The contact cannot be saved to the selected address book. Do you want to "
+"discard changes?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2727
+#: addressbook/gui/contact-editor/e-contact-editor.c:2751
+#, fuzzy
+msgid "_Discard"
+msgstr "Dinarda"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+msgid ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
+msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:62
 #, fuzzy
@@ -2251,7 +2166,7 @@ msgid "_Edit Full"
 msgstr "Rediģēt pilnīgi"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Full Name:"
 msgstr "_Pilns vārds:"
@@ -2408,32 +2323,32 @@ msgstr "Saraksta vā_rds:"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "Ievadiet epasta adresi vai arī iemetiet kontaktu apakšējajā sarakstā:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "contact-list-editor"
 msgstr "contact-list-editor"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:153
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:215
+#: addressbook/gui/widgets/e-addressbook-view.c:217
 #: addressbook/gui/widgets/e-minicard-view.c:460
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
 #, fuzzy
 msgid "Book"
 msgstr "Bodo"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
 #, fuzzy
 msgid "Is New List"
 msgstr "Jauns saraksts"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:215
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
 msgid "Contact List Editor"
 msgstr "Kontaktu saraksta redaktors"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:438
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
 msgid "Save List as VCard"
 msgstr "Saglabāt Sarakstu kā VKarti"
 
@@ -2480,127 +2395,127 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Paplašinātā meklēšana"
 
-#: addressbook/gui/widgets/eab-contact-display.c:129
-#: addressbook/gui/widgets/eab-contact-display.c:192
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:139
-#: addressbook/gui/widgets/eab-contact-display.c:205
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:257
-#: addressbook/gui/widgets/eab-contact-display.c:533
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:525
 #, fuzzy
 msgid "List Members"
 msgstr "Locekļi"
 
-#: addressbook/gui/widgets/eab-contact-display.c:329
-#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/eab-contact-display.c:321
+#: addressbook/gui/widgets/eab-contact-display.c:323
 msgid "E-mail"
 msgstr "E-pasts"
 
-#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/eab-contact-display.c:332
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organizācija"
 
-#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:333
 #, fuzzy
 msgid "Position"
 msgstr "Bostona"
 
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:354
 #, fuzzy
 msgid "Groupwise"
 msgstr "Grupa"
 
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:340
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:349
-#: addressbook/gui/widgets/eab-contact-display.c:370
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:362
 #, fuzzy
 msgid "Phone"
 msgstr "Ponkē"
 
-#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:342
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:354
+#: addressbook/gui/widgets/eab-contact-display.c:346
 #, fuzzy
 msgid "work"
 msgstr "Darbs"
 
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:359
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:368
-#: addressbook/gui/widgets/eab-contact-display.c:587
+#: addressbook/gui/widgets/eab-contact-display.c:360
+#: addressbook/gui/widgets/eab-contact-display.c:579
 #, fuzzy
 msgid "Blog"
 msgstr "Bologna"
 
-#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/eab-contact-display.c:363
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Mobilais telefons"
 
-#: addressbook/gui/widgets/eab-contact-display.c:375
+#: addressbook/gui/widgets/eab-contact-display.c:367
 #, fuzzy
 msgid "personal"
 msgstr "Personīgi"
 
-#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/eab-contact-display.c:374
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Piezīme"
 
-#: addressbook/gui/widgets/eab-contact-display.c:548
+#: addressbook/gui/widgets/eab-contact-display.c:540
 #, fuzzy
 msgid "Job Title"
 msgstr "_Darba nosaukums:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/eab-contact-display.c:544
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:774
+#: smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "Epasts"
 
-#: addressbook/gui/widgets/eab-contact-display.c:579
+#: addressbook/gui/widgets/eab-contact-display.c:571
 #, fuzzy
 msgid "Home page"
 msgstr "Mājas fakss"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 msgid "Success"
 msgstr "Veiksmīgi"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Backend busy"
 msgstr ""
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Repository offline"
 msgstr "Repozitorijs nesaistes režīmā"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 #, fuzzy
 msgid "Address Book does not exist"
 msgstr "Adrešu grāmata neeksistē"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 #, fuzzy
 msgid "No Self Contact defined"
 msgstr "Jauns kontaktu saraksts"
@@ -2608,29 +2523,29 @@ msgstr "Jauns kontaktu saraksts"
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Permission denied"
 msgstr "Atļauja liegta"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:57
 #, fuzzy
 msgid "Contact not found"
 msgstr "Karte nav atrasta"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: addressbook/gui/widgets/eab-gui-util.c:58
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "Kartes ID jau eksistē"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Protocol not supported"
 msgstr "Protokols nav atbalstīts"
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:60
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:233
 #: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
@@ -2643,39 +2558,39 @@ msgid "Cancelled"
 msgstr "Atsaukts"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:61
 #, fuzzy
 msgid "Could not cancel"
 msgstr "Nevar atvērt koplietošanas mapi: `%s'."
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Authentication Failed"
 msgstr "Autentifikācija neizdevusies"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Authentication Required"
 msgstr "Pieprasīta autentifikācija"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:66
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "TLS not Available"
 msgstr "TLS nav pieejams"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#: addressbook/gui/widgets/eab-gui-util.c:66
 #, fuzzy
 msgid "No such source"
 msgstr "Nav tādas vēstules"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:69
+#: addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Other error"
 msgstr "Cita kļūda"
 
-#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:90
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
@@ -2684,7 +2599,7 @@ msgstr ""
 "Mēs nespējām atvērt šo adrešu grāmatu. Lūdzu pārbaudiet\n"
 "vai šis ceļš eksistē un vai jums ir pieejas atļauja ceļa mērķim."
 
-#: addressbook/gui/widgets/eab-gui-util.c:110
+#: addressbook/gui/widgets/eab-gui-util.c:97
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -2694,19 +2609,19 @@ msgstr ""
 "ka esat ievadijuši nepareizu URI, vai arī LDAP serveris\n"
 "ir nesasniedzams."
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:102
 #, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution you must compile the program from the CVS "
-"sources after retrieving OpenLDAP from the link below."
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
 msgstr ""
 "Šai Evolution versijai nav iekompilēts LDAP atbalsts.\n"
 "Ja jūs gribat lietot LDAP Evolution programmā,\n"
 "jums ir jākompilē programma no CVS avota pēc OpenLDAP\n"
 "programmatūras iegūšanas no saites zemāk.\n"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:109
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -2716,11 +2631,7 @@ msgstr ""
 "ka esat ievadijuši nepareizu URI, vai arī serveris\n"
 "ir nesasniedzams."
 
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "Unable to open addressbook"
-msgstr "Nevaru atvērt adrešu gramatu"
-
-#: addressbook/gui/widgets/eab-gui-util.c:162
+#: addressbook/gui/widgets/eab-gui-util.c:129
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2732,7 +2643,7 @@ msgstr ""
 "Lūdzu padariet jūsu meklējumu precīzāku vai arī paliliniet rezultāta limitu\n"
 "direktorijas servera preferencēs šai adrešu grāmatai."
 
-#: addressbook/gui/widgets/eab-gui-util.c:168
+#: addressbook/gui/widgets/eab-gui-util.c:135
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -2744,57 +2655,48 @@ msgstr ""
 "vai arī palieliniet laika limitu direktorijas servera preferencēs\n"
 "šajai adrešu grāmatai."
 
-#: addressbook/gui/widgets/eab-gui-util.c:174
+#: addressbook/gui/widgets/eab-gui-util.c:141
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "Šīs adrešu grāmatas aizmugure nespēja parsēt šo pieprasījumu."
 
-#: addressbook/gui/widgets/eab-gui-util.c:177
+#: addressbook/gui/widgets/eab-gui-util.c:144
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Šīs adrešu grāmatas aizmugure negribēja izpildīt pieprasījumu."
 
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:147
 msgid "This query did not complete successfully."
 msgstr "Šis pieprasījums netika izpildīts veiksmīgi."
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
-msgid "Do you want to save changes?"
-msgstr "Vai jūs vēlaties saglabāt izmaiņas?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:208
-#, fuzzy
-msgid "_Discard"
-msgstr "Dinarda"
-
-#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:169
 msgid "Error adding list"
 msgstr "Kļūda pievienojot sarakstu"
 
-#: addressbook/gui/widgets/eab-gui-util.c:229
-#: addressbook/gui/widgets/eab-gui-util.c:652
+#: addressbook/gui/widgets/eab-gui-util.c:169
+#: addressbook/gui/widgets/eab-gui-util.c:580
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Kļūda pievienojot karti"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying list"
 msgstr "Kļūda mainot sarakstu"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Kļūda mainot karti"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:192
 msgid "Error removing list"
 msgstr "Kļūda izņemot sarakstu"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
-#: addressbook/gui/widgets/eab-gui-util.c:610
+#: addressbook/gui/widgets/eab-gui-util.c:192
+#: addressbook/gui/widgets/eab-gui-util.c:538
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Kļūda izņemot karti"
 
-#: addressbook/gui/widgets/eab-gui-util.c:334
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, fuzzy, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2803,7 +2705,7 @@ msgstr ""
 "%d karšu atvēršana atvērs %d jaunus logus.\n"
 "Vai jūs tiešām vēlaties attēlot visas no šim kartēm?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:360
+#: addressbook/gui/widgets/eab-gui-util.c:300
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2812,54 +2714,49 @@ msgstr ""
 "%s jau eksistē\n"
 "Vai tu vēlies to pārrakstīt?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:364
+#: addressbook/gui/widgets/eab-gui-util.c:304
 msgid "Overwrite"
 msgstr "Pārrakstīt"
 
-#: addressbook/gui/widgets/eab-gui-util.c:400
-#, fuzzy, c-format
-msgid "Error saving %s: %s"
-msgstr "Kļūda saglabājot failu: %s"
-
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:437
+#: addressbook/gui/widgets/eab-gui-util.c:365
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:571
+#: addressbook/gui/widgets/eab-gui-util.c:499
 msgid "list"
 msgstr "saraksts"
 
-#: addressbook/gui/widgets/eab-gui-util.c:706
+#: addressbook/gui/widgets/eab-gui-util.c:634
 #, fuzzy
 msgid "Move contact to"
 msgstr "Pārvietot karti uz"
 
-#: addressbook/gui/widgets/eab-gui-util.c:708
+#: addressbook/gui/widgets/eab-gui-util.c:636
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Kopēt karti uz"
 
-#: addressbook/gui/widgets/eab-gui-util.c:711
+#: addressbook/gui/widgets/eab-gui-util.c:639
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Pārvietot kartes uz"
 
-#: addressbook/gui/widgets/eab-gui-util.c:713
+#: addressbook/gui/widgets/eab-gui-util.c:641
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Kopēt kartes uz"
 
-#: addressbook/gui/widgets/eab-gui-util.c:716
+#: addressbook/gui/widgets/eab-gui-util.c:644
 #, fuzzy
 msgid "Select target addressbook."
 msgstr "Izvēlieties kontaktus no adrešu grāmatas"
 
-#: addressbook/gui/widgets/eab-gui-util.c:939
+#: addressbook/gui/widgets/eab-gui-util.c:867
 msgid "Multiple VCards"
 msgstr "Vairākas VKartes"
 
-#: addressbook/gui/widgets/eab-gui-util.c:942
+#: addressbook/gui/widgets/eab-gui-util.c:870
 #, c-format
 msgid "VCard for %s"
 msgstr "%s VKarte"
@@ -2950,7 +2847,7 @@ msgstr[1] "Kontakti"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:229
+#: addressbook/gui/widgets/e-addressbook-view.c:231
 #: addressbook/gui/widgets/e-minicard-view.c:467
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
 #, fuzzy
@@ -2970,147 +2867,135 @@ msgstr "Molde"
 msgid "Error modifying card"
 msgstr "Kļūda mainot karti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:163
 msgid "Name begins with"
 msgstr "Vārds sākas ar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:164
 msgid "Email begins with"
 msgstr "Epasts sākas ar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:57
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Kategorija ir"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-#: calendar/gui/cal-search-bar.c:50
+#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Jebkuršs lauks satur"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+#: addressbook/gui/widgets/e-addressbook-view.c:172
 msgid "Advanced..."
 msgstr "Paplašināti..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:236
+#: addressbook/gui/widgets/e-addressbook-view.c:238
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:249
+#: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Tips"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:506
+#: addressbook/gui/widgets/e-addressbook-view.c:508
 #, fuzzy
 msgid "Address Book"
 msgstr "Adrešu grāmata"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2076
+#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:2080
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
 msgstr "Saglabāt kā VKarti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 msgid "New Contact..."
 msgstr "Jauns kontakts..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "New Contact List..."
 msgstr "Jauns kontaktu saraksts..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Go to Folder..."
 msgstr "Iet uz mapi..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Import..."
 msgstr "Importēt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1066
 msgid "Search for Contacts..."
 msgstr "Meklēt kontaktus..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Adrešu grāmatas avoti..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1069
 msgid "Pilot Settings..."
 msgstr "Pilot uzstādījumi..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Pārsūtīt kontaktu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
 msgid "Send Message to Contact"
 msgstr "Sūtīt vēstuli kontaktam"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Drukāt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
+#: addressbook/gui/widgets/e-addressbook-view.c:1077
 msgid "Print Envelope"
 msgstr "Drukāt aploksni"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
+#: addressbook/gui/widgets/e-addressbook-view.c:1081
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Adresu grāmata..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1080
+#: addressbook/gui/widgets/e-addressbook-view.c:1082
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Adresu grāmata..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Izgriezt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopēt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1087
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Ievietot"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:1092
+#: calendar/gui/e-calendar-view.c:1280
 msgid "Current View"
 msgstr "Pašreizējais skats"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1309
-#, c-format
-msgid ""
-"The addressbook backend for\n"
-"%s\n"
-"has crashed. You will have to restart Evolution in order to use it again"
-msgstr ""
-"Adrešu grāmatas aizmugure priekš\n"
-"%s\n"
-"ir avarējusi. Jums būs jāparstartē Evolution, ja jūs vēlaties to atkal "
-"izmantot"
-
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1667
-#: calendar/gui/cal-search-bar.c:362
+#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Jebkura kategorija"
 
@@ -3219,7 +3104,7 @@ msgstr "Radio"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-list-view.c:234
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Loma"
@@ -3377,12 +3262,12 @@ msgstr "Evolution pasta sacerētājs."
 msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.c:998
+#: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr "Drukāt kontaktus"
 
-#: addressbook/printing/e-contact-print.c:1064
-#: addressbook/printing/e-contact-print.c:1091
+#: addressbook/printing/e-contact-print.c:1066
+#: addressbook/printing/e-contact-print.c:1093
 #, fuzzy
 msgid "Print contact"
 msgstr "Drukāt kontaktus"
@@ -3635,17 +3520,22 @@ msgstr ""
 msgid "Impossible internal error."
 msgstr "Iekšēja kļūda"
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:629
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
 #, fuzzy
 msgid "Can not open file"
 msgstr "Nevar atvērt vēstuli"
 
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
 #, fuzzy
-msgid "Can not load URI"
-msgstr "Karte nav atrasta"
+msgid "Couldn't get list of addressbooks"
+msgstr "Nevarēju ielādēt %s: %s"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Nevaru atvērt adrešu gramatu"
 
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
@@ -3663,7 +3553,7 @@ msgstr "Nav dots faila nosaukums."
 msgid "Unnamed List"
 msgstr "Nenosaukts saraksts"
 
-#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 #, fuzzy
 msgid "Enter password"
@@ -3947,10 +3837,10 @@ msgid "Whether to show week numbers in date navigator"
 msgstr "Parādīt nedēļas _numurus datuma navigātorā"
 
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:88
-#: calendar/gui/gnome-cal.c:1703
-#: camel/providers/groupwise/camel-gw-listener.c:304
-#: camel/providers/groupwise/camel-gw-listener.c:327
+#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/gnome-cal.c:1705
+#: camel/providers/groupwise/camel-gw-listener.c:311
+#: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
 msgstr "Kalendārs"
 
@@ -3973,7 +3863,7 @@ msgstr "atgriež mazāk kā"
 
 #: calendar/gui/calendar-commands.c:363
 #: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:19 filter/filter.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
 msgid "days"
 msgstr "dienas"
 
@@ -4127,24 +4017,24 @@ msgstr "Nedēļas skats"
 msgid "Month View"
 msgstr "Mēneša skats"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Kopsavilkums satur"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Apraksts satur"
 
-#: calendar/gui/cal-search-bar.c:54
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Komentāri satur"
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:53
 #, fuzzy
 msgid "Location contains"
 msgstr "Apraksts satur"
 
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
 msgid "Unmatched"
 msgstr "Neatbilstoši"
 
@@ -4167,24 +4057,24 @@ msgstr "Atļauja liegta"
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:466
+#: calendar/gui/dialogs/alarm-options.c:467
 msgid "Audio Alarm Options"
 msgstr "Skaņas trauksmes opcijas"
 
-#: calendar/gui/dialogs/alarm-options.c:475
+#: calendar/gui/dialogs/alarm-options.c:476
 msgid "Message Alarm Options"
 msgstr "Ziņas trauksmes opcijas"
 
-#: calendar/gui/dialogs/alarm-options.c:484
+#: calendar/gui/dialogs/alarm-options.c:485
 #, fuzzy
 msgid "Email Alarm Options"
 msgstr "Pasta trauksmes opcijas"
 
-#: calendar/gui/dialogs/alarm-options.c:493
+#: calendar/gui/dialogs/alarm-options.c:494
 msgid "Program Alarm Options"
 msgstr "Programmas Trauksmes opcijas"
 
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:510
 msgid "Unknown Alarm Options"
 msgstr "Nezināmas trauksmes opcijas"
 
@@ -4224,7 +4114,7 @@ msgstr "Sūtīt"
 msgid "With these arguments:"
 msgstr "Ar šiem argumentiem:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
 msgid "dialog1"
 msgstr ""
 
@@ -4233,7 +4123,7 @@ msgid "extra times every"
 msgstr "papildus laiks katras"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:20 filter/filter.glade.h:16
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr "stundas"
 
@@ -4280,7 +4170,7 @@ msgstr "Sūtīt epastu"
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Kopsavilkums:"
 
@@ -4310,7 +4200,6 @@ msgid "hour(s)"
 msgstr "stunda(s)"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:21
 msgid "minute(s)"
 msgstr "minūte(s)"
 
@@ -4318,27 +4207,27 @@ msgstr "minūte(s)"
 msgid "start of appointment"
 msgstr "tikšanās sākums"
 
-#: calendar/gui/dialogs/calendar-setup.c:170
+#: calendar/gui/dialogs/calendar-setup.c:172
 #, fuzzy
 msgid "You must specify a location to get the calendar from."
 msgstr "Jums ir jānorāda faila vārds"
 
-#: calendar/gui/dialogs/calendar-setup.c:178
+#: calendar/gui/dialogs/calendar-setup.c:180
 #, fuzzy, c-format
 msgid "The source location '%s' is not well-formed."
 msgstr "Metode lai ielādētu `%s' nav atbalstīta"
 
-#: calendar/gui/dialogs/calendar-setup.c:193
+#: calendar/gui/dialogs/calendar-setup.c:195
 #, c-format
 msgid "The source location '%s' is not a webcal source."
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:265
+#: calendar/gui/dialogs/calendar-setup.c:275
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:278
+#: calendar/gui/dialogs/calendar-setup.c:288
 #, c-format
 msgid ""
 "The group '%s' is remote. You must specify a location to get the calendar "
@@ -4360,61 +4249,36 @@ msgstr "Uzdevumu saraksts"
 msgid "C_olor:"
 msgstr "_Krāsas"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-#, fuzzy
-msgid "Calendar Properties"
-msgstr "iKalendāra kļūda"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
 msgid "Pick a color"
 msgstr "Izvēlies krāsu"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:8
-#, fuzzy
-msgid "Remote"
-msgstr "Izņemt"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-#, fuzzy
-msgid "Task List Properties"
-msgstr "Uzdevumu saraksts"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
 #, fuzzy
 msgid "_Add Calendar"
 msgstr "Jaunkaledonija"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
 #, fuzzy
 msgid "_Add Group"
 msgstr "_Jauna grupa..."
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-#, fuzzy
-msgid "_Refresh Interval:"
-msgstr " _Atsvaidzināt Sarakstu "
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
 #, fuzzy
 msgid "_Refresh:"
 msgstr "Atsvaidzināt"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-#, fuzzy
-msgid "_Source URL:"
-msgstr "POP Avota URI"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
 #, fuzzy
 msgid "_Type:"
 msgstr "Tips:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
 #, fuzzy
 msgid "_URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
 msgid "weeks"
 msgstr "nedēļas"
 
@@ -4524,7 +4388,7 @@ msgid "Display"
 msgstr "_Attēlot"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:76
 msgid "E_nable"
 msgstr "A_ktivizēt"
 
@@ -4535,7 +4399,7 @@ msgstr "Brīvs/aizņemts pieprasījums"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:563
+#: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Piekdiena"
 
@@ -4549,7 +4413,7 @@ msgstr "Minūtes"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:559
+#: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Pirmdiena"
 
@@ -4559,7 +4423,7 @@ msgstr "_Sv"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:564
+#: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Sesdiena"
 
@@ -4573,7 +4437,7 @@ msgstr "Parādīt nedēļas _numurus datuma navigātorā"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Svēdiena"
 
@@ -4587,7 +4451,7 @@ msgstr "Ce_t"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:562
+#: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Ceturdiena"
 
@@ -4601,7 +4465,7 @@ msgstr "Laika formāts:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:560
+#: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Otradiena"
 
@@ -4611,7 +4475,7 @@ msgstr "N_edēļa sākas:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:561
+#: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Trešdiena"
 
@@ -4645,7 +4509,7 @@ msgid "_Day begins:"
 msgstr "_Diena sākas:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
-#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:43
@@ -4694,86 +4558,48 @@ msgstr "_Tre"
 msgid "before every appointment"
 msgstr "pirms katras tikšanās"
 
-#: calendar/gui/dialogs/cancel-comp.c:57
-msgid ""
-"The event being deleted is a meeting, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"Notikums, kuru jūs vēlaties dzēst, ir sanāksme, vai jūs vēlaties izsūtīt "
-"atsaukumus?"
-
-#: calendar/gui/dialogs/cancel-comp.c:60
-msgid "Are you sure you want to cancel and delete this meeting?"
-msgstr "Vai jūs esat pārliecināts, ka vēlaties atsaukt un izdzēst šo sanāksmi?"
-
-#: calendar/gui/dialogs/cancel-comp.c:66
-msgid ""
-"The task being deleted is assigned, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"Uzdevums, ko jūs vēlaties dzēst, ir norīkots, vai jūs vēlaties izsūtīt "
-"atsaukumu?"
-
-#: calendar/gui/dialogs/cancel-comp.c:69
-msgid "Are you sure you want to cancel and delete this task?"
-msgstr "Vai jūs esat pārliecināts, ka vēlaties atsaukt un izdzēst šo uzdevumu?"
-
-#: calendar/gui/dialogs/cancel-comp.c:75
-msgid ""
-"The journal entry being deleted is published, would you like to send a "
-"cancellation notice?"
-msgstr ""
-"Žurnāla ieraksts, ko jūs vēlaties dzēst, ir publicēts, vai jūs vēlaties "
-"izsūtīt atsaukumu?"
-
-#: calendar/gui/dialogs/cancel-comp.c:78
-msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr ""
-"Vai jūs esat pārliecināts, ka vēlaties atsaukt un izdzēst šo žurnāla "
-"ierakstu?"
-
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Šis notikums ir izdzēsts."
 
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "Šis uzdevums ir izdzēsts."
 
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:68
 msgid "This journal entry has been deleted."
 msgstr "Šis žurnāla ieraksts ir izdzēsts."
 
-#: calendar/gui/dialogs/changed-comp.c:75
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  Jūs esat veicis izmaiņas. Aizmirst šīs izmaiņas un aizvērt redaktoru?"
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Jūs neesat veicis nekādas izmaiņas, aizvērt redaktoru?"
 
-#: calendar/gui/dialogs/changed-comp.c:82
+#: calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "Notikums tika izmainīts."
 
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "Uzdevums tika izmainīts."
 
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:92
 msgid "This journal entry has been changed."
 msgstr "Žurnāla ieraksts tika izmainīts."
 
-#: calendar/gui/dialogs/changed-comp.c:99
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Jūs esat veicat izmaiņas. Aizmirst šīs izmaiņas un atjaunināt redaktoru?"
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Jūs neesat veicis izmaiņas, atjaunināt redaktoru?"
@@ -4811,7 +4637,7 @@ msgid "No summary"
 msgstr "Nav kopsavilkuma"
 
 #: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
 #: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Saglabāt kā..."
@@ -4869,113 +4695,58 @@ msgstr "Atsaukt operāciju"
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:95
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "Vai jūs esat pārliecināts, ka vēlaties dzēst šo tikšanos '%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:98
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr ""
-"Vai jūs esat pārliecināts, ka vēlaties dzēst informāciju par šo nenosaukto "
-"tikšanos?"
-
-#: calendar/gui/dialogs/delete-comp.c:104
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "Vai jūs esat pārliecināts, ka vēlaties dzēst šo uzdevumu '%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:107
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "Vai jūs esat pārliecināts, ka vēlaties dzēst šo nenosaukto uzdevumu?"
-
-#: calendar/gui/dialogs/delete-comp.c:113
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "Vai jūs esat pārliecināts, ka vēlaties dzēst šo žurnāla ierakstu '%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:116
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr ""
-"Vai jūs esat pārliecināts, ka vēlaties dzēst šo nenosaukto žurnāla ierakstu?"
-
-#: calendar/gui/dialogs/delete-comp.c:131
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d appointment?"
-msgid_plural "Are you sure you want to delete %d appointments?"
-msgstr[0] ""
-"Vai jūs esat pārliecināts, ka vēlaties dzēst %d ierakstus par tikšanos?"
-msgstr[1] ""
-"Vai jūs esat pārliecināts, ka vēlaties dzēst %d ierakstus par tikšanos?"
-
-#: calendar/gui/dialogs/delete-comp.c:138
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d task?"
-msgid_plural "Are you sure you want to delete %d tasks?"
-msgstr[0] "Vai jūs esat pārliecināts, ka vēlaties dzēst %d uzdevumus?"
-msgstr[1] "Vai jūs esat pārliecināts, ka vēlaties dzēst %d uzdevumus?"
-
-#: calendar/gui/dialogs/delete-comp.c:145
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d journal entry?"
-msgid_plural "Are you sure you want to delete %d journal entries?"
-msgstr[0] ""
-"Vai jūs esat pārliecināts, ka vēlaties izdzēst %d žurnāla ierakstus?"
-msgstr[1] ""
-"Vai jūs esat pārliecināts, ka vēlaties izdzēst %d žurnāla ierakstus?"
-
-#: calendar/gui/dialogs/delete-error.c:52
+#: calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:55
+#: calendar/gui/dialogs/delete-error.c:57
 msgid "The task could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:58
+#: calendar/gui/dialogs/delete-error.c:60
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:61
+#: calendar/gui/dialogs/delete-error.c:63
 #, fuzzy
 msgid "The item could not be deleted due to a corba error"
 msgstr "Priekšmets nevar tikt nosūtīts!\n"
 
-#: calendar/gui/dialogs/delete-error.c:68
+#: calendar/gui/dialogs/delete-error.c:70
 msgid "The event could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:71
+#: calendar/gui/dialogs/delete-error.c:73
 #, fuzzy
 msgid "The task could not be deleted because permission was denied"
 msgstr ""
 "Apmeklētāja statuss nevar tikt atjaunināts sakarā ar nepareizo statusu!\n"
 
-#: calendar/gui/dialogs/delete-error.c:74
+#: calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:77
+#: calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:84
+#: calendar/gui/dialogs/delete-error.c:86
 #, fuzzy
 msgid "The event could not be deleted due to an error"
 msgstr "Priekšmets nevar tikt nosūtīts!\n"
 
-#: calendar/gui/dialogs/delete-error.c:87
+#: calendar/gui/dialogs/delete-error.c:89
 #, fuzzy
 msgid "The task could not be deleted due to an error"
 msgstr "Priekšmets nevar tikt nosūtīts!\n"
 
-#: calendar/gui/dialogs/delete-error.c:90
+#: calendar/gui/dialogs/delete-error.c:92
 #, fuzzy
 msgid "The journal entry could not be deleted due to an error"
 msgstr ""
 "Apmeklētāja statuss nevar tikt atjaunināts sakarā ar nepareizo statusu!\n"
 
-#: calendar/gui/dialogs/delete-error.c:93
+#: calendar/gui/dialogs/delete-error.c:95
 #, fuzzy
 msgid "The item could not be deleted due to an error"
 msgstr "Priekšmets nevar tikt nosūtīts!\n"
@@ -5113,11 +4884,11 @@ msgstr "_Sākuma laiks:"
 
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:3
+#: calendar/gui/dialogs/meeting-page.glade.h:4
 #: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
 #: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1559
-#: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:100
+#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
+#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
@@ -5143,8 +4914,8 @@ msgstr "_Deleģēt uz..."
 #. FIXME: need to disable for undeletable folders
 #: calendar/gui/dialogs/meeting-page.c:655
 #: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1310 calendar/gui/e-calendar-view.c:1342
-#: mail/em-folder-tree.c:2557 mail/em-folder-view.c:919
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
+#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -5152,7 +4923,7 @@ msgid "_Delete"
 msgstr "_Dzēst"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:240
+#: calendar/gui/e-meeting-list-view.c:218
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Apmeklētājs"
@@ -5188,16 +4959,15 @@ msgid "Member"
 msgstr "Loceklis"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
-#: mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-list-view.c:248
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
 
@@ -5206,20 +4976,20 @@ msgstr "Status"
 msgid "Add A_ttendee"
 msgstr "Apmeklētājs"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "Add attendees from addressbook."
+msgstr "Pievienot sūtītāju adrešu _grāmatai"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Organizētājs:"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
+#: calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "_Change Organizer"
 msgstr "_Mainīt organizētāju"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-#: calendar/gui/e-meeting-time-sel.c:417
-msgid "_Invite Others..."
-msgstr "_Ielūgt citus..."
-
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 #, fuzzy
 msgid "<b>Calendar options</b>"
@@ -5383,7 +5153,7 @@ msgid "_No recurrence"
 msgstr "Bez a_tkārtošanās"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:450
+#: composer/e-msg-composer-attachment-bar.c:453
 msgid "_Remove"
 msgstr "_Izņemt"
 
@@ -5415,57 +5185,21 @@ msgstr "nedēļa(s)"
 msgid "year(s)"
 msgstr "gads(i)"
 
-#: calendar/gui/dialogs/save-comp.c:53
-#, fuzzy
-msgid ""
-"This event has been changed, but has not been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Šis paraksts ir izmainīts, bet nav saglabāts.\n"
-"\n"
-"Vai jūs vēlaties saglabāt jūsu izmaiņas?"
-
-#: calendar/gui/dialogs/save-comp.c:57
-msgid "_Discard Changes"
-msgstr ""
-
-#: calendar/gui/dialogs/save-comp.c:62
-#, fuzzy
-msgid "Save Event"
-msgstr "Kalendāra notikumi"
-
-#: calendar/gui/dialogs/select-source-dialog.c:65
+#: calendar/gui/dialogs/select-source-dialog.c:69
 #, fuzzy
 msgid "Select destination"
 msgstr "Izvēlieties gala mērķa direktoriju, lai importētu šos datus"
 
-#: calendar/gui/dialogs/select-source-dialog.c:86
+#: calendar/gui/dialogs/select-source-dialog.c:90
 #, fuzzy
 msgid "_Destination"
 msgstr "Dzēst šo mapi"
 
-#: calendar/gui/dialogs/select-source-dialog.c:88
+#: calendar/gui/dialogs/select-source-dialog.c:92
 #, fuzzy
 msgid "Task List"
 msgstr "Uzdevumu saraksts"
 
-#: calendar/gui/dialogs/send-comp.c:57
-msgid "The meeting information has been created. Send it?"
-msgstr "Informācija par sanāksmi ir izveidota. Nosūtīt to?"
-
-#: calendar/gui/dialogs/send-comp.c:60
-msgid "The meeting information has changed. Send an updated version?"
-msgstr "Informācija par sanāksmi ir izmainīta. Nosūtīt atjauninātu versiju?"
-
-#: calendar/gui/dialogs/send-comp.c:67
-msgid "The task assignment information has been created. Send it?"
-msgstr "Informācija par uzdevuma norīkojumu ir izveidota. Nosūtīt to?"
-
-#: calendar/gui/dialogs/send-comp.c:71
-msgid "The task information has changed. Send an updated version?"
-msgstr "Informācija par uzdevumu ir izmainīta. Nosūtīt atjauninātu versiju?"
-
 #: calendar/gui/dialogs/task-details-page.c:406
 msgid "Completed date is wrong"
 msgstr "Izpildīšanas datums ir nepareizs"
@@ -5485,7 +5219,7 @@ msgstr "Pabeigts"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #: calendar/gui/e-cal-component-preview.c:249
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:960
 msgid "High"
 msgstr "Augsts"
 
@@ -5499,14 +5233,14 @@ msgstr "Progresā"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:253
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:958
 msgid "Low"
 msgstr "Zems"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:251
 #: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:957
+#: mail/message-list.c:959
 msgid "Normal"
 msgstr "Normāls"
 
@@ -5566,8 +5300,8 @@ msgstr "Konfidenciāli"
 
 #: calendar/gui/dialogs/task-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
+#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Apraksts:"
 
@@ -5743,7 +5477,7 @@ msgstr "_Datuma laikā:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:950
+#: calendar/gui/e-itip-control.c:943
 msgid "Status:"
 msgstr "Statuss:"
 
@@ -5829,12 +5563,12 @@ msgstr "Aizņemts"
 msgid "Deleting selected objects"
 msgstr "Dzēšu izvēlētos objektus"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
 msgid "Updating objects"
 msgstr "Atjaunināt objektus"
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1370
+#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
 #: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Atvērt"
@@ -5845,15 +5579,15 @@ msgid "Open _Web Page"
 msgstr "_Atvērt vēstuli"
 
 #: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1291 calendar/gui/e-calendar-view.c:1376
-#: mail/em-folder-view.c:896 mail/em-popup.c:690 mail/em-popup.c:806
+#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
+#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "_Saglabāt kā..."
 
 #: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1292
-#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
+#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
@@ -5861,24 +5595,24 @@ msgid "_Print..."
 msgstr "_Drukāt..."
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Izgriezt"
 
 #: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1338
-#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2550
-#: mail/message-list.c:1644 ui/evolution-addressbook.xml.h:31
+#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
+#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
+#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Kopēt"
 
 #: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1273 calendar/gui/e-calendar-view.c:1299
-#: calendar/gui/e-calendar-view.c:1372 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
+#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
@@ -5947,71 +5681,71 @@ msgstr "Kopsavilkums"
 msgid "Task sort"
 msgstr "Uzdevumu kārtošana"
 
-#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
 msgid "New _Appointment..."
 msgstr "Jauna _tikšanās...."
 
-#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
+#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
 msgid "New All Day _Event"
 msgstr "Jauns visas di_enas notikums"
 
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
+#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
 msgid "New Meeting"
 msgstr "Jauna sanāksme"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
 msgid "New Task"
 msgstr "Jauns uzdevums"
 
-#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Izvēlēties _pavedienu"
 
-#: calendar/gui/e-calendar-view.c:1280
+#: calendar/gui/e-calendar-view.c:1283
 #, fuzzy
 msgid "_Select Date..."
 msgstr "Dzēst..."
 
-#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publicēt brīvs/aizņemts informāciju"
 
-#: calendar/gui/e-calendar-view.c:1303
+#: calendar/gui/e-calendar-view.c:1306
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Kopēt uz mapi..."
 
-#: calendar/gui/e-calendar-view.c:1304
+#: calendar/gui/e-calendar-view.c:1307
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "Pār_vietot uz mapi..."
 
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1308
 msgid "_Schedule Meeting..."
 msgstr "Plānot _sanāksmi..."
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1309
 msgid "_Forward as iCalendar..."
 msgstr "_Pārsūtīt kā iKalendāru..."
 
-#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1349
 msgid "Go to _Today"
 msgstr "Iet uz _dienu"
 
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1351
 msgid "_Go to Date..."
 msgstr "_Iet uz datumu..."
 
-#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "_Uzstādījumi..."
 
@@ -6025,9 +5759,9 @@ msgstr "Sākuma datums"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:967 calendar/gui/e-itip-control.c:1169
-#: calendar/gui/e-meeting-list-view.c:144
-#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
 #: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
 #: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
 #: camel/camel-tcp-stream-openssl.c:631
@@ -6053,13 +5787,13 @@ msgid "Assigned"
 msgstr "Asignēts"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr "Jā"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "Nē"
 
@@ -6071,7 +5805,7 @@ msgstr "Z"
 msgid "S"
 msgstr "D"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
 msgid "E"
 msgstr "A"
 
@@ -6143,102 +5877,102 @@ msgstr "%d. %b"
 msgid "%02i minute divisions"
 msgstr "%02i minūšu sadaļas"
 
-#: calendar/gui/e-itip-control.c:592
+#: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
 msgstr "Jā. (Sarežģīta atkārtošanās)"
 
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:596
 #, fuzzy, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Katru dienu"
 msgstr[1] "Katru dienu"
 
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:601
 #, fuzzy, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Katru nedēļu"
 msgstr[1] "Katru nedēļu"
 
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:603
 #, fuzzy, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "Katru nedēļu "
 msgstr[1] "Katru nedēļu "
 
-#: calendar/gui/e-itip-control.c:618
+#: calendar/gui/e-itip-control.c:611
 msgid " and "
 msgstr " un "
 
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:618
 #, c-format
 msgid "The %s day of "
 msgstr "%s. dienā, "
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:631
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s, "
 
-#: calendar/gui/e-itip-control.c:645
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "katru mēnesi"
 msgstr[1] "katru mēnesi"
 
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:642
 #, fuzzy, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Katru gadu"
 msgstr[1] "Katru gadu"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:653
 #, fuzzy, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] " kopā %d reizes"
 msgstr[1] " kopā %d reizes"
 
-#: calendar/gui/e-itip-control.c:669
+#: calendar/gui/e-itip-control.c:662
 msgid ", ending on "
 msgstr ", beidzoties "
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:686
 msgid "<b>Starts:</b> "
 msgstr "<b>Sākas:</b> "
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:696
 msgid "<b>Ends:</b> "
 msgstr "<b>Beidzas:</b>"
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:716
 msgid "<b>Completed:</b> "
 msgstr "<b>Izpildīts:</b>"
 
-#: calendar/gui/e-itip-control.c:733
+#: calendar/gui/e-itip-control.c:726
 msgid "<b>Due:</b> "
 msgstr "<b>Līdz:</b>"
 
-#: calendar/gui/e-itip-control.c:771 calendar/gui/e-itip-control.c:827
+#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
 msgid "iCalendar Information"
 msgstr "iKalendāra informācija"
 
 #. Title
-#: calendar/gui/e-itip-control.c:788
+#: calendar/gui/e-itip-control.c:781
 msgid "iCalendar Error"
 msgstr "iKalendāra kļūda"
 
-#: calendar/gui/e-itip-control.c:859 calendar/gui/e-itip-control.c:875
-#: calendar/gui/e-itip-control.c:886 calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
 msgid "An unknown person"
 msgstr "Nezināma persona"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:910
+#: calendar/gui/e-itip-control.c:903
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -6246,304 +5980,308 @@ msgstr ""
 "<br> Lūdzu apskatiet sekojošo informāciju un pēc tam izvēlieties darbību no "
 "izvēlnes zemāk."
 
-#: calendar/gui/e-itip-control.c:925
+#: calendar/gui/e-itip-control.c:918
 msgid "<i>None</i>"
 msgstr "<i>Nekas</i>"
 
-#: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:929
+msgid "Location:"
+msgstr "Lokācija: "
+
+#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Apstiprināts"
 
-#: calendar/gui/e-itip-control.c:959 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Pagaidām akceptēt"
 
-#: calendar/gui/e-itip-control.c:963 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Noliegts"
 
-#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.c:1050
-#: calendar/gui/e-itip-control.c:1076 calendar/gui/e-itip-control.c:1089
-#: calendar/gui/e-itip-control.c:1102 calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
 msgid "Choose an action:"
 msgstr "Izvēlieties darbību:"
 
-#: calendar/gui/e-itip-control.c:1023
+#: calendar/gui/e-itip-control.c:1016
 msgid "Update"
 msgstr "Atjaunot"
 
-#: calendar/gui/e-itip-control.c:1024 calendar/gui/e-itip-control.c:1055
-#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1091
-#: calendar/gui/e-itip-control.c:1104 calendar/gui/e-itip-control.c:1117
-#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
+#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1044
 msgid "Accept"
 msgstr "Apstiprināt"
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1045
 msgid "Tentatively accept"
 msgstr "Pagaidām akceptēt"
 
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1046
 msgid "Decline"
 msgstr "Noliegt"
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1070
 msgid "Send Free/Busy Information"
 msgstr "Nosūtīt brīvs/aizņemts informāciju"
 
-#: calendar/gui/e-itip-control.c:1090
+#: calendar/gui/e-itip-control.c:1083
 msgid "Update respondent status"
 msgstr "Atjaunināt respondenta statusu"
 
-#: calendar/gui/e-itip-control.c:1103
+#: calendar/gui/e-itip-control.c:1096
 msgid "Send Latest Information"
 msgstr "Sūtīt pēdīgo informāciju"
 
-#: calendar/gui/e-itip-control.c:1116 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Atsaukt"
 
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1185
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> ir publicējis informāciju par sanāksmi."
 
-#: calendar/gui/e-itip-control.c:1193
+#: calendar/gui/e-itip-control.c:1186
 msgid "Meeting Information"
 msgstr "Informācija par sanāksmi"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1191
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> pieprasa %s klātbūtni sanāksmē."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1193
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> pieprasa jūsu klātbūtni sanāksmē."
 
-#: calendar/gui/e-itip-control.c:1201
+#: calendar/gui/e-itip-control.c:1194
 msgid "Meeting Proposal"
 msgstr "Sanāksmes iemesls"
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> vēlas pievienot jau eksistējošai sanāksmei."
 
-#: calendar/gui/e-itip-control.c:1206
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Update"
 msgstr "Atjaunināta informācija par sanāksmi"
 
-#: calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1203
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> vēlas saņemt pēdīgo informāciju par sanāksmi."
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1204
 msgid "Meeting Update Request"
 msgstr "Informācijas par sanāksmi atjaunināšanas pieprasīšana"
 
-#: calendar/gui/e-itip-control.c:1218
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> ir atbildējis uz sanāksmes pieprasījumu."
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Reply"
 msgstr "Atbilde par sanāksmi"
 
-#: calendar/gui/e-itip-control.c:1226
+#: calendar/gui/e-itip-control.c:1219
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> ir atsaucis sanāksmi."
 
-#: calendar/gui/e-itip-control.c:1227
+#: calendar/gui/e-itip-control.c:1220
 msgid "Meeting Cancellation"
 msgstr "Sanāksmes atcelšana"
 
-#: calendar/gui/e-itip-control.c:1234 calendar/gui/e-itip-control.c:1302
-#: calendar/gui/e-itip-control.c:1337
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1330
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> ir nosūtijis nesaprotamu vēstuli."
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1228
 msgid "Bad Meeting Message"
 msgstr "Nepareiza vēstule par sanāksmi"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1253
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> ir publicējis informāciju par uzdevumu."
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1254
 msgid "Task Information"
 msgstr "Uzdevuma informācija"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1259
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> pieprasa %s izpildīt uzdevumu."
 
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> pieprasa jums izpildīt uzdevumu."
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1262
 msgid "Task Proposal"
 msgstr "Uzdevuma priekšlikums"
 
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> vēlas pievienot jau eksistējošam uzdevumam."
 
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Update"
 msgstr "Uzdevuma atjaunināšana"
 
-#: calendar/gui/e-itip-control.c:1278
+#: calendar/gui/e-itip-control.c:1271
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> vēlas saņemt pēdīgo informāciju par uzdevumu."
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1272
 msgid "Task Update Request"
 msgstr "Uzdevuma atjaunināšanas pieprasījums"
 
-#: calendar/gui/e-itip-control.c:1286
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> ir atbildējis uz uzdevuma nozīmēšanu."
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Reply"
 msgstr "Uzdevuma atbilde"
 
-#: calendar/gui/e-itip-control.c:1294
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> ir atcēlis uzdevumu."
 
-#: calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1288
 msgid "Task Cancellation"
 msgstr "Uzdevuma atsaukums"
 
-#: calendar/gui/e-itip-control.c:1303
+#: calendar/gui/e-itip-control.c:1296
 msgid "Bad Task Message"
 msgstr "Slikts uzdevuma ziņojums"
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1315
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> ir publicējis brīvs/aizņemts informāciju."
 
-#: calendar/gui/e-itip-control.c:1323
+#: calendar/gui/e-itip-control.c:1316
 msgid "Free/Busy Information"
 msgstr "Brīvs/aizņemts informācija"
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> pieprasa tavu brīvs/aizņemts informāciju."
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1321
 msgid "Free/Busy Request"
 msgstr "Brīvs/aizņemts pieprasījums"
 
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1325
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> ir atbildējis uz brīvs/aizņemts informāciju."
 
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1326
 msgid "Free/Busy Reply"
 msgstr "Brīvs/aizņemts atbilde"
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1331
 msgid "Bad Free/Busy Message"
 msgstr "Slikta Brīvs/aizņemts ziņa"
 
-#: calendar/gui/e-itip-control.c:1413
+#: calendar/gui/e-itip-control.c:1406
 msgid "The message does not appear to be properly formed"
 msgstr "Ziņa, izskatās, ir nepareizi noformēta"
 
-#: calendar/gui/e-itip-control.c:1472
+#: calendar/gui/e-itip-control.c:1465
 msgid "The message contains only unsupported requests."
 msgstr "Ziņa satur tikai neatbalstītus pieprasījumus."
 
-#: calendar/gui/e-itip-control.c:1503
+#: calendar/gui/e-itip-control.c:1496
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Piesaistne nesatur atļautu kalendāra ziņu"
 
-#: calendar/gui/e-itip-control.c:1535
+#: calendar/gui/e-itip-control.c:1528
 msgid "The attachment has no viewable calendar items"
 msgstr "Piesaistnei nav skatāmu kalendāra priekšmetu"
 
-#: calendar/gui/e-itip-control.c:1769
+#: calendar/gui/e-itip-control.c:1762
 msgid "Update complete\n"
 msgstr "Atjaunināšana izpildīta\n"
 
-#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
+#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Apmeklētāja statuss nevar tikt atjaunināts, tāpēc ka priekšmets vairāk "
 "neeksistē"
 
-#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objekts ir nepareizs un nevar tikt atjaunināts\n"
 
-#: calendar/gui/e-itip-control.c:1825
+#: calendar/gui/e-itip-control.c:1818
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Šī atbilde nav no pašreizējā apmeklētāja. Pievienot kā apmeklētāju?"
 
-#: calendar/gui/e-itip-control.c:1837
+#: calendar/gui/e-itip-control.c:1830
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Apmeklētāja statuss nevar tikt atjaunināts sakarā ar nepareizo statusu!\n"
 
-#: calendar/gui/e-itip-control.c:1856
+#: calendar/gui/e-itip-control.c:1849
 msgid "There was an error on the CORBA system\n"
 msgstr "Ir kļūda CORBA sistēmā\n"
 
-#: calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1852
 msgid "Object could not be found\n"
 msgstr "Objektu nevarēja atrast\n"
 
-#: calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1855
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Jums nav pareizo atļauju, lai atjauninātu kalendāru\n"
 
-#: calendar/gui/e-itip-control.c:1865
+#: calendar/gui/e-itip-control.c:1858
 msgid "Attendee status updated\n"
 msgstr "Apmeklētāja status atjaunināts\n"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1861
 msgid "Attendee status could not be updated!\n"
 msgstr "Apmeklētāja status nevar tikt atjaunināts!\n"
 
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1892
 msgid "Removal Complete"
 msgstr "Izņemšana pabeigta"
 
-#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
 msgid "Item sent!\n"
 msgstr "Priekšmets nosūtīts!\n"
 
-#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
+#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
 msgid "The item could not be sent!\n"
 msgstr "Priekšmets nevar tikt nosūtīts!\n"
 
@@ -6584,74 +6322,74 @@ msgstr "datums-sākums"
 msgid "date-start"
 msgstr "datums-beigas"
 
-#: calendar/gui/e-meeting-list-view.c:62
+#: calendar/gui/e-meeting-list-view.c:59
 msgid "Chair Persons"
 msgstr "Vadošās personas"
 
-#: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:479
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
 msgid "Required Participants"
 msgstr "Pieprasītie dalībnieki"
 
-#: calendar/gui/e-meeting-list-view.c:64
+#: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Iespējamie dalībnieki"
 
-#: calendar/gui/e-meeting-list-view.c:65
+#: calendar/gui/e-meeting-list-view.c:62
 msgid "Resources"
 msgstr "Resursi"
 
-#: calendar/gui/e-meeting-list-view.c:140 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
 #: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr "Individuāli"
 
-#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "Grupa"
 
-#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr "Resurss"
 
-#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr "Istaba"
 
-#: calendar/gui/e-meeting-list-view.c:154 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr "Krēsls"
 
-#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:127
 #: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
 msgid "Required Participant"
 msgstr "Pieprasītais dalībnieks"
 
-#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr "Iespējamais dalībnieks"
 
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr "Nepiedalās"
 
-#: calendar/gui/e-meeting-list-view.c:179 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:177
 #: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
 msgid "Needs Action"
 msgstr "Pieprasa darbību"
 
-#: calendar/gui/e-meeting-list-view.c:182 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
 #: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "Pagaidu"
 
-#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr "Deleģēts"
@@ -6668,20 +6406,28 @@ msgstr "Neatrodas Birojā"
 msgid "No Information"
 msgstr "Nav Informācijas"
 
+#: calendar/gui/e-meeting-time-sel.c:417
+#, fuzzy
+msgid "Add attendees from addressbook"
+msgstr "Pievienot sūtītāju adrešu _grāmatai"
+
 #: calendar/gui/e-meeting-time-sel.c:440
 msgid "_Options"
 msgstr "_Opcijas"
 
 #: calendar/gui/e-meeting-time-sel.c:457
-msgid "Show _Only Working Hours"
+#, fuzzy
+msgid "Show _only working hours"
 msgstr "Parādīt Tikai _Darba Stundas"
 
 #: calendar/gui/e-meeting-time-sel.c:467
-msgid "Show _Zoomed Out"
+#, fuzzy
+msgid "Show _zoomed out"
 msgstr "Parādīt Sama_zinātu"
 
 #: calendar/gui/e-meeting-time-sel.c:482
-msgid "_Update Free/Busy"
+#, fuzzy
+msgid "_Update free/busy"
 msgstr "_Atjaunināt Brīvs/Aizņemts Informāciju"
 
 #: calendar/gui/e-meeting-time-sel.c:497
@@ -6697,19 +6443,23 @@ msgid ">_>"
 msgstr ">_>"
 
 #: calendar/gui/e-meeting-time-sel.c:547
-msgid "_All People and Resources"
+#, fuzzy
+msgid "_All people and resources"
 msgstr "_Visi Cilvēki un Resursi"
 
 #: calendar/gui/e-meeting-time-sel.c:556
-msgid "All _People and One Resource"
+#, fuzzy
+msgid "All _people and one resource"
 msgstr "Visi _Cilvēki un Viens Resurss"
 
 #: calendar/gui/e-meeting-time-sel.c:565
-msgid "_Required People"
+#, fuzzy
+msgid "_Required people"
 msgstr "_Pieprasītie Cilvēki"
 
 #: calendar/gui/e-meeting-time-sel.c:574
-msgid "Required People and _One Resource"
+#, fuzzy
+msgid "Required people and _one resource"
 msgstr "Pieprasītie Cilvēki un _Viens Resurss"
 
 #: calendar/gui/e-meeting-time-sel.c:593
@@ -6747,7 +6497,7 @@ msgstr "%m/%d/%Y"
 msgid "Enter the password for %s"
 msgstr "Ievadiet %s paroli"
 
-#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6756,19 +6506,14 @@ msgstr ""
 "Kļūda %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-
 #. FIXME Loading should be async
 #. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:686
+#: calendar/gui/e-tasks.c:801
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Atvērt uzdevumus uz %s"
 
-#: calendar/gui/e-tasks.c:709
+#: calendar/gui/e-tasks.c:824
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6777,53 +6522,48 @@ msgstr ""
 "Kļūda %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:730
+#: calendar/gui/e-tasks.c:845
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Ielādēju attēlus"
 
-#: calendar/gui/e-tasks.c:834
+#: calendar/gui/e-tasks.c:949
 msgid "Completing tasks..."
 msgstr "Izpildam uzdevumus..."
 
-#: calendar/gui/e-tasks.c:857
+#: calendar/gui/e-tasks.c:972
 msgid "Deleting selected objects..."
 msgstr "Dzēšam izvēlētos objektus..."
 
-#: calendar/gui/e-tasks.c:884
+#: calendar/gui/e-tasks.c:999
 msgid "Expunging"
 msgstr "Iztīru"
 
-#: calendar/gui/e-tasks.c:960
+#: calendar/gui/e-tasks.c:1075
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
-#: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
+#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
+#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
 #: calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:705
 msgid "Tasks"
 msgstr "Uzdevumi"
 
-#: calendar/gui/gnome-cal.c:1876
+#: calendar/gui/gnome-cal.c:1878
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Nav tikšanos"
 
-#: calendar/gui/gnome-cal.c:1895
+#: calendar/gui/gnome-cal.c:1897
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Ielādēju attēlus"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1920
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Atvērt ar %s..."
 
-#: calendar/gui/gnome-cal.c:2048
-#, c-format
-msgid "The calendar backend for '%s' has crashed."
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:2894
+#: calendar/gui/gnome-cal.c:2906
 #, fuzzy
 msgid "Purging"
 msgstr "Turīna"
@@ -7022,7 +6762,7 @@ msgid "On The Web"
 msgstr ""
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 
@@ -7033,7 +6773,7 @@ msgid "Unable to migrate calendar `%s'"
 msgstr "Atļauja liegta"
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:869
+#: calendar/gui/migration.c:889
 #, fuzzy, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Nevaru atvērt adrešu gramatu"
@@ -7269,73 +7009,73 @@ msgstr "Drukāt Priekšmetu"
 msgid "Print Setup"
 msgstr "Drukāšanas Uzstādijumi"
 
-#: calendar/gui/tasks-component.c:303
+#: calendar/gui/tasks-component.c:313
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:371
 #, fuzzy
 msgid "New Task List"
 msgstr "Uzdevumu saraksts"
 
-#: calendar/gui/tasks-component.c:398
+#: calendar/gui/tasks-component.c:408
 #, fuzzy, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "Nav uzdevumu"
 msgstr[1] "Nav uzdevumu"
 
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] "%d izvēlētas"
 msgstr[1] "%d izvēlētas"
 
-#: calendar/gui/tasks-component.c:447
+#: calendar/gui/tasks-component.c:457
 #, fuzzy
 msgid "Failed upgrading tasks."
 msgstr "Ielādēju attēlus"
 
-#: calendar/gui/tasks-component.c:526
+#: calendar/gui/tasks-component.c:749
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:538
+#: calendar/gui/tasks-component.c:761
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:576
+#: calendar/gui/tasks-component.c:799
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:804
+#: calendar/gui/tasks-component.c:1040
 msgid "New task"
 msgstr "Jauns uzdevums"
 
-#: calendar/gui/tasks-component.c:805
+#: calendar/gui/tasks-component.c:1041
 msgid "_Task"
 msgstr "_Uzdevums"
 
-#: calendar/gui/tasks-component.c:806
+#: calendar/gui/tasks-component.c:1042
 msgid "Create a new task"
 msgstr "Ievietot jaunu uzdevumu"
 
-#: calendar/gui/tasks-component.c:812
+#: calendar/gui/tasks-component.c:1048
 #, fuzzy
 msgid "New tasks group"
 msgstr "Jauns uzdevums"
 
-#: calendar/gui/tasks-component.c:813
+#: calendar/gui/tasks-component.c:1049
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Uzdevumu saraksts"
 
-#: calendar/gui/tasks-component.c:814
+#: calendar/gui/tasks-component.c:1050
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Ievietot jaunu uzdevumu"
@@ -9109,12 +8849,12 @@ msgstr "Kļūda sāknējot filtra meklēšanu: %s: %s"
 msgid "Unsupported operation: append message: for %s"
 msgstr "Neatbalstīta operācija: pievienot vēstuli: priekš %s"
 
-#: camel/camel-folder.c:1259
+#: camel/camel-folder.c:1262
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Neatbalstīta operācija: meklēšana pēc izteiksmes: priekš %s"
 
-#: camel/camel-folder.c:1299
+#: camel/camel-folder.c:1302
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Neatbalstīta operācija: meklēšana pēc uids: priekš %s"
@@ -9127,11 +8867,16 @@ msgstr "Pārvietojam vēstules"
 msgid "Copying messages"
 msgstr "Kopēju vēstules"
 
-#: camel/camel-folder.c:1666
-msgid "Learning junk and/or non junk message(s)"
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Lansinga"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
 msgstr ""
 
-#: camel/camel-folder.c:1695
+#: camel/camel-folder.c:1701
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "Saņemu %d vēstuli(es)"
@@ -9166,17 +8911,17 @@ msgstr ""
 msgid "(match-threads) requires a match type string"
 msgstr ""
 
-#: camel/camel-folder-search.c:785
+#: camel/camel-folder-search.c:784
 #, fuzzy
 msgid "(match-threads) expects an array result"
 msgstr "(match-all) pieprasa vienu būla rezultātu"
 
-#: camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:790
 #, fuzzy
 msgid "(match-threads) requires the folder set"
 msgstr "(match-all) pieprasa vienu būla rezultātu"
 
-#: camel/camel-folder-search.c:880
+#: camel/camel-folder-search.c:879
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Izpildu pieprasījumu uz nezināmas galvenes: %s"
@@ -9211,7 +8956,8 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
 #: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:706
+#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Atsaukts."
@@ -9586,7 +9332,7 @@ msgstr ""
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1212
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Slikta autentifikācijas atbilde no servera."
 
@@ -9971,40 +9717,40 @@ msgstr "Komanda nav ievietota"
 msgid "export keys: unimplemented"
 msgstr ""
 
-#: camel/camel-store.c:214
+#: camel/camel-store.c:213
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Nevaru dabūt mapi: Nepareiza operācija šajā glabātuvē"
 
-#: camel/camel-store.c:244
+#: camel/camel-store.c:243
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr "Nevaru dabūt mapi: %s: %s"
 
-#: camel/camel-store.c:295
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Nevaru izveidot mapi: Nepareiza operācija šajā glabātuvē"
 
-#: camel/camel-store.c:323
+#: camel/camel-store.c:325
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Nevaru dabūt mapi: %s: %s"
 
-#: camel/camel-store.c:387 camel/camel-vee-store.c:354
+#: camel/camel-store.c:389 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Nevar izdzēst mapi: %s: Nepareiza operācija"
 
-#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#: camel/camel-store.c:439 camel/camel-vee-store.c:387
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Nevar pārsaukt mapi: %s: Nepareiza operācija"
 
-#: camel/camel-store.c:811
+#: camel/camel-store.c:777
 msgid "Trash"
 msgstr "Atkritummape"
 
-#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
-#: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/mail-config.glade.h:95
+#: ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
 msgstr "Jūnijs"
@@ -10234,12 +9980,12 @@ msgstr "Nav tādas vēstules %s iekš %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Nevar kopēt vai pārvietot vēstules virtuālajā mapē"
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:374
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Nevar izdzēst mapi: %s: Nav tādas mapes"
 
-#: camel/camel-vee-store.c:398
+#: camel/camel-vee-store.c:395
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Nevar pārsaukt mapi: %s: Nav tādas mapes"
@@ -10285,31 +10031,31 @@ msgstr "Adrešu grāmata"
 msgid "Post Office Agent SOAP Port:"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:80
+#: camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "Novell GroupWise"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:82
+#: camel/providers/groupwise/camel-groupwise-provider.c:85
 msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: camel/providers/groupwise/camel-groupwise-provider.c:100
 #: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
 msgid "Password"
 msgstr "Parole"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:99
+#: camel/providers/groupwise/camel-groupwise-provider.c:102
 #: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Šī opcija savienos ar IMAP serveri lietojot parasta teksta paroli."
 
-#: camel/providers/groupwise/camel-gw-listener.c:305
-#: camel/providers/groupwise/camel-gw-listener.c:328
+#: camel/providers/groupwise/camel-gw-listener.c:312
+#: camel/providers/groupwise/camel-gw-listener.c:335
 #, fuzzy
 msgid "Checklist"
 msgstr "Bieza dūmaka"
@@ -10452,13 +10198,13 @@ msgid ""
 msgstr "Šī opcija savienos ar IMAP serveri lietojot parasta teksta paroli."
 
 #: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:429
+#: camel/providers/imap/camel-imap-store.c:428
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP serveris %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:431
+#: camel/providers/imap/camel-imap-store.c:430
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP serviss priekš %s uz %s"
@@ -10468,7 +10214,7 @@ msgstr "IMAP serviss priekš %s uz %s"
 #: camel/providers/imap/camel-imap-store.c:551
 #: camel/providers/imap/camel-imap-store.c:571
 #: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
+#: camel/providers/nntp/camel-nntp-store.c:209
 #: camel/providers/pop3/camel-pop3-store.c:175
 #: camel/providers/smtp/camel-smtp-transport.c:269
 #: camel/providers/smtp/camel-smtp-transport.c:285
@@ -10486,10 +10232,10 @@ msgstr "TLS nav pieejams"
 
 #: camel/providers/imap4/camel-imap4-store.c:222
 #: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:815
+#: camel/providers/imap/camel-imap-store.c:845
 #: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:137
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
 #: camel/providers/pop3/camel-pop3-store.c:192
 msgid "Connection cancelled"
 msgstr "Konekcija pārtraukta"
@@ -10502,8 +10248,8 @@ msgid ""
 msgstr "Nevar savienoties ar IMAP serveri %s drošības režīmā: %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:649
-#: camel/providers/imap/camel-imap-store.c:680
+#: camel/providers/imap/camel-imap-store.c:679
+#: camel/providers/imap/camel-imap-store.c:710
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Nevar savienoties ar IMAP serveri %s drošības režīmā: %s"
@@ -10512,7 +10258,7 @@ msgstr "Nevar savienoties ar IMAP serveri %s drošības režīmā: %s"
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1109
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
 msgid "Unknown error"
 msgstr "Nezināma kļūda"
 
@@ -10540,8 +10286,8 @@ msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr "Nevaru dabūt mapi: %s: %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1857
-#: camel/providers/imap/camel-imap-store.c:2235
+#: camel/providers/imap/camel-imap-store.c:1885
+#: camel/providers/imap/camel-imap-store.c:2263
 #, fuzzy, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -10622,12 +10368,12 @@ msgstr "Serveris negaidīti atvienojās: %s"
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3168
+#: camel/providers/imap/camel-imap-store.c:3194
 msgid "Operation cancelled"
 msgstr "Operācija atsaukta"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3171
+#: camel/providers/imap/camel-imap-store.c:3197
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Serveris negaidīti atvienojās: %s"
@@ -10691,13 +10437,6 @@ msgid "Unable to retrieve message: %s"
 msgstr "Nespēju saņemt vēstuli: %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:219
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -10707,15 +10446,15 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-mbox-folder.c:418
+#: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
 msgstr "Nav tādas vēstules"
 
 #: camel/providers/imap/camel-imap-folder.c:2019
-#: camel/providers/imap/camel-imap-folder.c:2621
-#: camel/providers/nntp/camel-nntp-folder.c:238
+#: camel/providers/imap/camel-imap-folder.c:2622
+#: camel/providers/nntp/camel-nntp-folder.c:220
 msgid "This message is not currently available"
 msgstr "Šī vēstule šobrīd nav pieejama"
 
@@ -10724,7 +10463,23 @@ msgstr "Šī vēstule šobrīd nav pieejama"
 msgid "Fetching summary information for new messages"
 msgstr "Saņemu kopsavilkuma informāciju par jaunām vēstulēm"
 
-#: camel/providers/imap/camel-imap-folder.c:2659
+#: camel/providers/imap/camel-imap-folder.c:2463
+#, c-format
+msgid "Incomplete server response: no information provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2471
+#, c-format
+msgid "Incomplete server response: no UID provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2484
+#, c-format
+msgid ""
+"Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2660
 msgid "Could not find message body in FETCH response."
 msgstr "Nevarēju atrast vēstules ķermeni FETCH atbildē."
 
@@ -10790,43 +10545,43 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Lai lasītu un glabātu pastu uz IMAP serveriem."
 
-#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/imap/camel-imap-store.c:680
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS paplašinājums nav atbalstīts."
 
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:711
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL sarunas neizdevušās"
 
-#: camel/providers/imap/camel-imap-store.c:818
+#: camel/providers/imap/camel-imap-store.c:848
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Nevarēju savienoties ar serveri: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1242
+#: camel/providers/imap/camel-imap-store.c:1272
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP serveris %s neatbalsta pieprasīto autentifikācijas tipu %s"
 
-#: camel/providers/imap/camel-imap-store.c:1252
+#: camel/providers/imap/camel-imap-store.c:1282
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Neatbalstīts autentifikācijas tips %s"
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1305
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sLūdzu ievadi IMAP paroli %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1289
+#: camel/providers/imap/camel-imap-store.c:1319
 msgid "You didn't enter a password."
 msgstr "Jūs neievadījāt paroli."
 
-#: camel/providers/imap/camel-imap-store.c:1318
+#: camel/providers/imap/camel-imap-store.c:1348
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10837,18 +10592,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1839
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:1867
+#: camel/providers/imap/camel-imap-store.c:2057
 #, c-format
 msgid "No such folder %s"
 msgstr "Nav tādas mapes %s"
 
-#: camel/providers/imap/camel-imap-store.c:1915
-#: camel/providers/imap/camel-imap-store.c:2296
+#: camel/providers/imap/camel-imap-store.c:1943
+#: camel/providers/imap/camel-imap-store.c:2324
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Vecāku mapei nav atļauts saturēt apakšmapes"
 
-#: camel/providers/imap/camel-imap-store.c:1970
+#: camel/providers/imap/camel-imap-store.c:1998
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10856,7 +10611,7 @@ msgstr "Vecāku mapei nav atļauts saturēt apakšmapes"
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Nevaru dabūt mapi: %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:2274
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Nezināma vecāku mape: %s"
@@ -10890,20 +10645,20 @@ msgid "Index message body data"
 msgstr "Sūtīt vēstuli kontaktam"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:388
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:393
-#: camel/providers/local/camel-local-folder.c:396
+#: camel/providers/local/camel-local-folder.c:392
+#: camel/providers/local/camel-local-folder.c:395
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "pastkaste:%s (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:400
+#: camel/providers/local/camel-local-folder.c:399
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -10963,7 +10718,7 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:142
 #: camel/providers/local/camel-local-store.c:253
-#: camel/providers/local/camel-mbox-store.c:356
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -11036,8 +10791,25 @@ msgstr "Maildir vēstules pievienošana atsaukta"
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Nevaru pievienot vēstuli maildir mapei: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:226
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mbox-folder.c:417
+#: camel/providers/local/camel-mbox-folder.c:436
+#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:475
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-mh-folder.c:221
+#, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+"Nevar dabūt vēstuli: %s no mapes %s\n"
+"  %s"
+
+#: camel/providers/local/camel-maildir-folder.c:236
 msgid "Invalid message contents"
 msgstr "Nepareizs vēstules saturs"
 
@@ -11078,9 +10850,9 @@ msgstr "Nevarēju izdzēst mapi `%s': %s"
 msgid "not a maildir directory"
 msgstr "nav maildir direktorija"
 
-#: camel/providers/local/camel-maildir-store.c:341
-#: camel/providers/local/camel-spool-store.c:286
-#: camel/providers/local/camel-spool-store.c:316
+#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-spool-store.c:284
+#: camel/providers/local/camel-spool-store.c:314
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Nevarēju skanēt mapi `%s': %s"
@@ -11127,27 +10899,18 @@ msgstr "Pasta pievienošana atsaukta"
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Nevar pievienot vēstuli mbox failam: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:435
-#: camel/providers/local/camel-mbox-folder.c:466
-#: camel/providers/local/camel-mbox-folder.c:474
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"Nevar dabūt vēstuli: %s no mapes %s\n"
-"  %s"
-
-#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:468
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Šī mape izskatās, ka ir neatgriezeniski sabojāta."
 
-#: camel/providers/local/camel-mbox-folder.c:475
-msgid "Message construction failed: Corrupt mailbox?"
+#: camel/providers/local/camel-mbox-folder.c:476
+#: camel/providers/local/camel-mh-folder.c:222
+#, fuzzy
+msgid "Message construction failed."
 msgstr "Vēstules konstrukcija neveiksmīga: Sabojāta pastkaste?"
 
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:362
+#: camel/providers/local/camel-mbox-store.c:361
 #, fuzzy
 msgid "Cannot create a folder by this name."
 msgstr "Nevaru izveidot mapi ar šādu nosaukumu"
@@ -11178,32 +10941,32 @@ msgstr "`%s' nav regulārs fails."
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Mape `%s' nav tukša. Netika izdzēsta."
 
-#: camel/providers/local/camel-mbox-store.c:375
+#: camel/providers/local/camel-mbox-store.c:374
 #, fuzzy, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Nevar izveidot direktoriju %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:389
+#: camel/providers/local/camel-mbox-store.c:388
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Nevaru dabūt mapi: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:391
+#: camel/providers/local/camel-mbox-store.c:390
 #, fuzzy
 msgid "Folder already exists"
 msgstr "Kartes ID jau eksistē"
 
-#: camel/providers/local/camel-mbox-store.c:473
+#: camel/providers/local/camel-mbox-store.c:472
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "Norādītais mapes nosaukums nav pareizs: %s"
 
-#: camel/providers/local/camel-mbox-store.c:486
+#: camel/providers/local/camel-mbox-store.c:485
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Nevarēju pārsaukt '%s': %s"
 
-#: camel/providers/local/camel-mbox-store.c:561
+#: camel/providers/local/camel-mbox-store.c:560
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Nevarēju pārsaukt mapi %s par %s: %s"
@@ -11396,7 +11159,7 @@ msgstr ""
 "Mape varētu būt bojāta, kopija saglabāta '%s'"
 
 #: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:997
+#: camel/providers/nntp/camel-nntp-store.c:1126
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Lūdzu ievadiet NNTP paroli %s@%s"
@@ -11413,18 +11176,10 @@ msgstr "Neizdevās nosūtīt serverim lietotāja vārdu"
 msgid "Server rejected username/password"
 msgstr "Serveris noraidīja lietotājvārdu/paroli"
 
-#: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:263
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr "Lietotājs atsaukts"
-
-#: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:259
-#: camel/providers/nntp/camel-nntp-folder.c:265
+#: camel/providers/nntp/camel-nntp-folder.c:147
+#: camel/providers/nntp/camel-nntp-folder.c:149
+#: camel/providers/nntp/camel-nntp-folder.c:158
+#: camel/providers/nntp/camel-nntp-folder.c:234
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11433,64 +11188,51 @@ msgstr "Lietotājs atsaukts"
 msgid "Cannot get message %s: %s"
 msgstr "Nevaru dabūt vēstuli: %s: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:188
-#: camel/providers/nntp/camel-nntp-folder.c:228
+#: camel/providers/nntp/camel-nntp-folder.c:156
+#: camel/providers/nntp/camel-nntp-folder.c:232
+#: camel/providers/nntp/camel-nntp-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+msgid "User cancelled"
+msgstr "Lietotājs atsaukts"
+
+#: camel/providers/nntp/camel-nntp-folder.c:176
+#: camel/providers/nntp/camel-nntp-folder.c:208
 #, c-format
 msgid "Internal error: uid in invalid format: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:201
-#, fuzzy, c-format
-msgid "Could not get article %s from NNTP server"
-msgstr "Nevarēju dabūt grupu sarakstu no servera."
-
-#: camel/providers/nntp/camel-nntp-folder.c:362
-msgid "Posting not allowed by news server"
-msgstr ""
-
+#: camel/providers/nntp/camel-nntp-folder.c:328
+#: camel/providers/nntp/camel-nntp-folder.c:331
 #: camel/providers/nntp/camel-nntp-folder.c:373
-#, c-format
-msgid "Failed to send newsgroups header: %s: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:413
-#: camel/providers/nntp/camel-nntp-folder.c:426
-#, c-format
-msgid "Error posting to newsgroup: %s: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:438
-msgid "Error reading response to posted message: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:441
+#: camel/providers/nntp/camel-nntp-folder.c:375
 #, fuzzy, c-format
-msgid "Error posting message: %s: message not posted"
-msgstr ""
-"Kļūda automātiski glabājot vēstuli: %s\n"
-" %s"
+msgid "Posting failed: %s"
+msgstr "Operācija neizdevusies: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:457
+#: camel/providers/nntp/camel-nntp-folder.c:393
 #, fuzzy
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "Jūs nevarat kopēt vēstules uz atkritumu mapi."
 
-#: camel/providers/nntp/camel-nntp-folder.c:468
+#: camel/providers/nntp/camel-nntp-folder.c:404
 #, fuzzy
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Jūs nevarat kopēt vēstules uz atkritumu mapi."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:44
 msgid "Could not get group list from server."
 msgstr "Nevarēju dabūt grupu sarakstu no servera."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#: camel/providers/nntp/camel-nntp-grouplist.c:97
+#: camel/providers/nntp/camel-nntp-grouplist.c:106
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "Nespēju ielādēt grupu saraksta failu %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#: camel/providers/nntp/camel-nntp-grouplist.c:157
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Nespēju saglabāt grupu saraksta failu %s: %s"
@@ -11520,27 +11262,29 @@ msgid ""
 msgstr ""
 "Šī opcija autentificēsies ar NNTP serveri lietojot parasta teksta paroli."
 
-#: camel/providers/nntp/camel-nntp-store.c:158
+#: camel/providers/nntp/camel-nntp-store.c:118
+#: camel/providers/nntp/camel-nntp-store.c:1233
+#: camel/providers/nntp/camel-nntp-store.c:1331
+#, c-format
+msgid "NNTP Command failed: %s"
+msgstr "NNTP komanda neizdevusies: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:227
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Nevarēju nolasīt sviecienu no %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:170
+#: camel/providers/nntp/camel-nntp-store.c:239
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP serveris %s atgrieza kļūdas kodu %d: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:326
+#: camel/providers/nntp/camel-nntp-store.c:403
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET Ziņas caur %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:640
-#, fuzzy
-msgid "Stream error"
-msgstr "parsēšanas kļūda"
-
-#: camel/providers/nntp/camel-nntp-store.c:643
+#: camel/providers/nntp/camel-nntp-store.c:777
 #, fuzzy, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -11550,75 +11294,75 @@ msgstr ""
 "Kļūda glabājot vēstules uz: %s:\n"
 " %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:735
+#: camel/providers/nntp/camel-nntp-store.c:872
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
 "No such newsgroup. The selected item is a probably a parent folder."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:767
+#: camel/providers/nntp/camel-nntp-store.c:904
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
 "newsgroup does not exist!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:792
+#: camel/providers/nntp/camel-nntp-store.c:929
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:800
+#: camel/providers/nntp/camel-nntp-store.c:937
 #, fuzzy
 msgid "You cannot rename a folder in a News store."
 msgstr "Nevarēju pārsaukt mapi %s par %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:808
+#: camel/providers/nntp/camel-nntp-store.c:945
 #, fuzzy
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "Nevaru pārvietot mapi uz vienu no tās apakšmapēm."
 
-#: camel/providers/nntp/camel-nntp-summary.c:253
-#, fuzzy, c-format
-msgid "Connection error: %s"
-msgstr "Nezināma kļūda: %s"
-
-#: camel/providers/nntp/camel-nntp-summary.c:262
-#, c-format
-msgid "No such folder: %s"
-msgstr "Nav tādas mapes: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1118
+#, fuzzy
+msgid "Authentication requested but not username provided"
+msgstr "Pieprasīta autentifikācija"
 
-#: camel/providers/nntp/camel-nntp-summary.c:268
-#, c-format
-msgid "Could not get group: %s"
-msgstr "Nevaru dabūt grupu: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1146
+#, fuzzy, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr "Neizdevās autentificēties POP serverī %s: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:333
+#: camel/providers/nntp/camel-nntp-store.c:1262
 #, fuzzy
-msgid "Could not get messages: unspecified error"
-msgstr "Nevarēju sagatavot vēstuli: %s"
+msgid "Not connected."
+msgstr "Parādīt kontaktus"
 
-#: camel/providers/nntp/camel-nntp-summary.c:378
+#: camel/providers/nntp/camel-nntp-store.c:1311
 #, c-format
-msgid "NNTP Command failed: %s"
-msgstr "NNTP komanda neizdevusies: %s"
+msgid "No such folder: %s"
+msgstr "Nav tādas mapes: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:438
-#: camel/providers/nntp/camel-nntp-summary.c:543
+#: camel/providers/nntp/camel-nntp-summary.c:218
+#: camel/providers/nntp/camel-nntp-summary.c:314
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Meklēju jaunas vēstules"
 
-#: camel/providers/nntp/camel-nntp-summary.c:558
-#, c-format
-msgid "Unknown server response: %s"
-msgstr "Nezināma servera atbilde: %s"
+#: camel/providers/nntp/camel-nntp-summary.c:225
+#, fuzzy, c-format
+msgid "Unexpected server response from xover: %s"
+msgstr "Negaidīta atbilde no IMAP servera: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:605
+#: camel/providers/nntp/camel-nntp-summary.c:328
+#, fuzzy, c-format
+msgid "Unexpected server response from head: %s"
+msgstr "Negaidīta atbilde no GnuPG: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:368
 msgid "Use cancel"
 msgstr "Izmantot atsaukumu"
 
-#: camel/providers/nntp/camel-nntp-summary.c:607
+#: camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Operācija neizdevusies: %s"
@@ -11666,7 +11410,7 @@ msgstr "Dzēst pēc %s dienas(ām)"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107
 msgid "POP"
 msgstr "POP"
 
@@ -11755,7 +11499,7 @@ msgid "No such folder `%s'."
 msgstr "Nav tādas mapes `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:132
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -11807,7 +11551,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Pasta nosūtīšana ar sendmail programmu"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:119
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -12103,19 +11847,19 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
+#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:408
 msgid "attachment"
 msgstr "piesaistne"
 
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:454
 msgid "Remove selected items from the attachment list"
 msgstr "Izņemt izvēlētos priekšmetus no piesaistņu saraksta"
 
-#: composer/e-msg-composer-attachment-bar.c:491
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Add attachment..."
 msgstr "Pievienot piesaitni..."
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:495
 msgid "Attach a file to the message"
 msgstr "Piesaistīt failu vēstulei"
 
@@ -12179,7 +11923,7 @@ msgstr "(Nenosaukta vēstule)"
 msgid "Open file"
 msgstr "Atvērt failu"
 
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
 msgid "Autogenerated"
 msgstr "Autoģenerēts"
 
@@ -12328,17 +12072,17 @@ msgstr "Piesaistīt failu"
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
+msgid "You cannot attach the file `{0}' to this message."
 msgstr "Piesaistīt failu vēstulei"
 
 #. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4
-msgid "${1}"
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
 msgstr ""
 
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
 
 #. mail-composer:attach-directory primary
@@ -12435,7 +12179,7 @@ msgstr "Nevar izveidot kanālu: %s"
 
 #. mail-composer:no-build-message secondary
 #: composer/mail-composer-errors.xml.h:34
-msgid "Because \"${0}\", you may need to select different mail options."
+msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
@@ -12445,8 +12189,10 @@ msgid "Could not read signature file \"{0}\"."
 msgstr "Nevarēju saglabāt paraksta failu: %s"
 
 #. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38
-msgid "Because \"${1}\"."
+#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted primary
@@ -12871,11 +12617,11 @@ msgid "<b>Then</b>"
 msgstr "<b>Līdz:</b>"
 
 #: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1335
+#: mail/mail-account-gui.c:1347
 msgid "Select Folder"
 msgstr "Izvēlēties mapi"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
 msgid "    "
 msgstr ""
 
@@ -12933,7 +12679,7 @@ msgstr "atpakaļ"
 msgid "months"
 msgstr "mēneši"
 
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
 msgid "seconds"
 msgstr "sekundes"
 
@@ -12965,20 +12711,20 @@ msgstr "ar visām lokālām mapēm"
 msgid "years"
 msgstr "gadi"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:916
-#: mail/mail-config.c:76 mail/mail-config.glade.h:90
+#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
+#: mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Svarīgs"
 
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:919 mail/mail-config.c:79
-#: mail/mail-config.glade.h:145
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: mail/mail-config.glade.h:148
 msgid "To Do"
 msgstr "Darāmais"
 
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:920 mail/mail-config.c:80
-#: mail/mail-config.glade.h:94
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: mail/mail-config.glade.h:97
 msgid "Later"
 msgstr "Vēlāk"
 
@@ -13036,257 +12782,6 @@ msgstr "ienākošais"
 msgid "outgoing"
 msgstr "izejošais"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Adjust Score"
-msgstr "Piešķirt rezultātu"
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Color"
-msgstr "Uzstādīt krāsu"
-
-#: filter/libfilter-i18n.h:4
-msgid "Assign Score"
-msgstr "Uzstādīt rezultātu"
-
-#: filter/libfilter-i18n.h:5
-msgid "Attachments"
-msgstr "Piesaistījumi"
-
-#: filter/libfilter-i18n.h:6
-msgid "Beep"
-msgstr "Pīkstiens"
-
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "satur"
-
-#: filter/libfilter-i18n.h:8
-msgid "Copy to Folder"
-msgstr "Kopēt uz mapi"
-
-#: filter/libfilter-i18n.h:9
-msgid "Date received"
-msgstr "Saņemšanas datums"
-
-#: filter/libfilter-i18n.h:10
-msgid "Date sent"
-msgstr "Nosūtīšanas datums"
-
-#: filter/libfilter-i18n.h:12
-msgid "Deleted"
-msgstr "Dzēsts"
-
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "nesatur"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "nebeidzas ar"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "neeksistē"
-
-#: filter/libfilter-i18n.h:16
-msgid "does not return"
-msgstr "neatgriežas"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "neskan kā"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "nesākas ar"
-
-#: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
-msgstr "Neeksistē"
-
-#: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr "Melnraksts"
-
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "beidzas ar"
-
-#: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr "Eksistē"
-
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "eksistē"
-
-#: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr "Izteiksme"
-
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr "Sekojums"
-
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "ir"
-
-#: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr "ir pēc"
-
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr "ir pirms"
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr "ir karogots"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "ir lielāks par"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "ir mazāks par"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "nav"
-
-#: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr "nav karogots"
-
-#: filter/libfilter-i18n.h:36
-#, fuzzy
-msgid "Junk Test"
-msgstr "Jūnijs"
-
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
-#: widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Iezīme"
-
-#: filter/libfilter-i18n.h:38
-msgid "Mailing list"
-msgstr "Adresātu saraksts"
-
-#: filter/libfilter-i18n.h:39
-msgid "Message Body"
-msgstr "Vēstules ķermenis"
-
-#: filter/libfilter-i18n.h:40
-msgid "Message Header"
-msgstr "Vēstules galvene"
-
-#: filter/libfilter-i18n.h:41
-#, fuzzy
-msgid "Message is Junk"
-msgstr "Vēstule tika nosūtīta"
-
-#: filter/libfilter-i18n.h:42
-#, fuzzy
-msgid "Message is not Junk"
-msgstr "Vēstule %s nav atrasta."
-
-#: filter/libfilter-i18n.h:43
-msgid "Move to Folder"
-msgstr "Pārvietot uz mapi"
-
-#: filter/libfilter-i18n.h:44
-#, fuzzy
-msgid "Pipe to Program"
-msgstr "Iziet no programmas"
-
-#: filter/libfilter-i18n.h:45
-msgid "Play Sound"
-msgstr "Spēlēt skaņu"
-
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Lasīt"
-
-#: filter/libfilter-i18n.h:47
-msgid "Recipients"
-msgstr "Adresāti"
-
-#: filter/libfilter-i18n.h:48
-msgid "Regex Match"
-msgstr "Regex atbilšana"
-
-#: filter/libfilter-i18n.h:49
-msgid "Replied to"
-msgstr "Atbildēts uz"
-
-#: filter/libfilter-i18n.h:50
-msgid "returns"
-msgstr "atgriež"
-
-#: filter/libfilter-i18n.h:51
-msgid "returns greater than"
-msgstr "atgriež lielāku kā"
-
-#: filter/libfilter-i18n.h:52
-msgid "returns less than"
-msgstr "atgriež mazāk kā"
-
-#: filter/libfilter-i18n.h:53
-#, fuzzy
-msgid "Run Program"
-msgstr "Palaist programmu:"
-
-#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Rezultāts"
-
-#: filter/libfilter-i18n.h:55
-msgid "Sender"
-msgstr "Sūtītajs"
-
-#: filter/libfilter-i18n.h:56
-msgid "Set Status"
-msgstr "Uzstādīt statusu"
-
-#: filter/libfilter-i18n.h:57
-msgid "Size (kB)"
-msgstr "Izmērs (kB)"
-
-#: filter/libfilter-i18n.h:58
-msgid "sounds like"
-msgstr "skan kā"
-
-#: filter/libfilter-i18n.h:59
-msgid "Source Account"
-msgstr "Avota konts"
-
-#: filter/libfilter-i18n.h:60
-msgid "Specific header"
-msgstr "Specifiska galvene"
-
-#: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "sākas ar"
-
-#: filter/libfilter-i18n.h:63
-msgid "Stop Processing"
-msgstr "Apturēt procesēšanu"
-
-#: filter/libfilter-i18n.h:64 mail/em-format.c:755 mail/em-format-html.c:1519
-#: mail/em-format-quote.c:302 mail/em-mailer-prefs.c:87
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
-#: smime/lib/e-cert.c:1079
-msgid "Subject"
-msgstr "Subjekts"
-
-#: filter/libfilter-i18n.h:65
-msgid "Unset Status"
-msgstr "Noņemt statusu"
-
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Pievienot noteikumu"
@@ -13305,6 +12800,11 @@ msgstr "Noteikuma nosaukums:"
 msgid "_Score Rules"
 msgstr "Rezultāta noteikumi"
 
+#: filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Rezultāts"
+
 #: filter/searchtypes.xml.h:1
 msgid "Body contains"
 msgstr "Ķermenis satur"
@@ -13389,13 +12889,13 @@ msgstr "_Paraksti"
 msgid "-------- Forwarded Message --------"
 msgstr "Pārsūtīta vēstule"
 
-#: mail/em-composer-utils.c:1499
+#: mail/em-composer-utils.c:1495
 msgid "an unknown sender"
 msgstr "nezināms nosūtītājs"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1509
+#: mail/em-composer-utils.c:1505
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "%Y-%m-%d at %H:%M, %%s rakstīja:"
@@ -13438,8 +12938,8 @@ msgstr "<klikšķiniet šeit, lai izvēlētos mapi>"
 msgid "Create New Folder"
 msgstr "Izveidot jaunu mapi"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
-#: mail/mail-component.c:701
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
+#: mail/mail-component.c:704
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Norādīt, kur lai izveidotu mapi:"
@@ -13455,109 +12955,110 @@ msgstr "Crestview"
 msgid "Folder _name:"
 msgstr "Mapes nosaukums:"
 
-#: mail/em-folder-tree.c:839
+#: mail/em-folder-tree.c:833
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Izņemu mapi %s"
 
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree.c:835
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Atveru mapi %s"
 
-#: mail/em-folder-tree.c:848 mail/message-list.c:1555
+#: mail/em-folder-tree.c:842 mail/message-list.c:1561
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Pārvietoju vēstules uz %s"
 
-#: mail/em-folder-tree.c:850 mail/message-list.c:1557
+#: mail/em-folder-tree.c:844 mail/message-list.c:1563
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopēju vēstules uz %s"
 
-#: mail/em-folder-tree.c:866
+#: mail/em-folder-tree.c:860
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Nevar kopēt vai pārvietot vēstules virtuālajā mapē"
 
-#: mail/em-folder-tree.c:956 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Kopēt uz mapi"
 
-#: mail/em-folder-tree.c:957 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Pārvietot uz mapi"
 
-#: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2069
-#: mail/em-folder-tree.c:2551 mail/em-folder-view.c:798
-#: mail/message-list.c:1645
+#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
+#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
+#: mail/message-list.c:1651
 #, fuzzy
 msgid "_Move"
 msgstr "Pārvietot"
 
-#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#: mail/em-folder-tree.c:955 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "Atcelt uzdevumu"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
 #: mail/em-folder-view.c:798 mail/em-folder-view.c:812
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Izvēlieties mapi"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
 #, fuzzy
 msgid "C_opy"
 msgstr "Kopēt"
 
-#: mail/em-folder-tree.c:2096
+#: mail/em-folder-tree.c:2088
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Glabāju mapi '%s'"
 
-#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
+#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
 #, fuzzy
 msgid "Create folder"
 msgstr "Izveidot jaunu mapi"
 
-#: mail/em-folder-tree.c:2474
+#: mail/em-folder-tree.c:2463
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Pārdēvēt \"%s\" mapi par:"
 
-#: mail/em-folder-tree.c:2476
+#: mail/em-folder-tree.c:2465
 #, fuzzy
 msgid "Rename Folder"
 msgstr "Pārdēvēt mapi"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Skatīt"
 
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2537
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Atvērt jaunā logā"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2555
+#: mail/em-folder-tree.c:2546
 #, fuzzy
 msgid "_New Folder..."
 msgstr "_Jauna mape"
 
-#: mail/em-folder-tree.c:2558
+#: mail/em-folder-tree.c:2549
 msgid "_Rename"
 msgstr "_Pārsaukt"
 
-#: mail/em-folder-tree.c:2561 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Rekvizīti..."
 
 #: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:889
+#: mail/mail-vfolder.c:888
 msgid "VFolders"
 msgstr "vMapes"
 
@@ -13571,19 +13072,19 @@ msgstr ""
 msgid "Inbox"
 msgstr "Iesūtne"
 
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
 msgid "Loading..."
 msgstr "Ielādēju..."
 
 #: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
 #: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
 #: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:551
+#: mail/mail-component.c:554
 msgid "Mail"
 msgstr "Pasts"
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "R_ediģēt kā jaunu ziņojumu..."
@@ -13596,17 +13097,17 @@ msgstr "_Drukāt"
 msgid "_Reply to Sender"
 msgstr "_Atbildēt sūtītājam"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:810
+#: mail/em-folder-view.c:901 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Atbildēt uz _sarakstu"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:811
+#: mail/em-folder-view.c:902 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Atbildēt _visiem"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: mail/em-folder-view.c:903 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Pārsūtīt"
@@ -13661,6 +13162,10 @@ msgstr "Pār_vietot uz mapi..."
 msgid "_Copy to Folder..."
 msgstr "_Kopēt uz mapi..."
 
+#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Iezīme"
+
 #: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Pievienot sūtītāju adrešu _grāmatai"
@@ -13711,12 +13216,12 @@ msgid "Filter on _Mailing List"
 msgstr "Filtrs uz adresātu sarakstu"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
-#: mail/mail-config.glade.h:66
+#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Noklusētais"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1796
 msgid "Print Message"
 msgstr "Drukāt vēstuli"
 
@@ -13756,12 +13261,18 @@ msgstr "Cc"
 msgid "Bcc"
 msgstr "Bcc"
 
+#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
+#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Subjekts"
+
 #: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
 #: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Datums"
 
-#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
+#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
 msgid "Newsgroups"
 msgstr ""
 
@@ -13956,7 +13467,7 @@ msgid ""
 "practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:757
+#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
 #, fuzzy
 msgid "_View Certificate"
 msgstr "_Sertifikāta ID:"
@@ -14019,7 +13530,7 @@ msgstr "Viena n_edēļa"
 msgid "Once per month"
 msgstr "Viens _mēnesis"
 
-#: mail/em-migrate.c:1072
+#: mail/em-migrate.c:1168
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -14027,90 +13538,90 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1506
+#: mail/em-migrate.c:1602
 #, fuzzy, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Nevaru dabūt mapi: %s: %s"
 
-#: mail/em-migrate.c:1532
+#: mail/em-migrate.c:1628
 #, fuzzy, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr ""
 "Nevar meklēt failā: %s\n"
 "%s"
 
-#: mail/em-migrate.c:1715
+#: mail/em-migrate.c:1811
 #, fuzzy, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Nespēju saglabāt grupu saraksta failu %s: %s"
 
-#: mail/em-migrate.c:1919
+#: mail/em-migrate.c:2015
 #, fuzzy, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Nespēju atvērt vai izveidot .newsrc failu %s: %s"
 
-#: mail/em-migrate.c:1933
+#: mail/em-migrate.c:2029
 #, fuzzy, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Neizdevās izveidot kanālu %s: %s"
 
-#: mail/em-migrate.c:1962
+#: mail/em-migrate.c:2058
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#: mail/em-migrate.c:2413 mail/em-migrate.c:2425
 #, fuzzy, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Neizdevās izveidot kanālu %s: %s"
 
-#: mail/em-migrate.c:2480
+#: mail/em-migrate.c:2576
 #, fuzzy, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr ""
 "Nevaru izveidot izejas failu: %s\n"
 " %s"
 
-#: mail/em-migrate.c:2498
+#: mail/em-migrate.c:2594
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 msgstr ""
 
-#: mail/em-popup.c:699
+#: mail/em-popup.c:700
 msgid "Save As..."
 msgstr "Saglabāt kā..."
 
-#: mail/em-popup.c:717
+#: mail/em-popup.c:718
 #, fuzzy, c-format
 msgid "untitled_image.%s"
 msgstr "Nenosaukta vēstule"
 
-#: mail/em-popup.c:807
+#: mail/em-popup.c:808
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:809
+#: mail/em-popup.c:810
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "_Atbildēt sūtītājam"
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:859
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Kopēt saiti pārlūkprogrammā"
 
-#: mail/em-popup.c:859
+#: mail/em-popup.c:860
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Sūtīt _vēstuli uz saraksti..."
 
-#: mail/em-popup.c:860
+#: mail/em-popup.c:861
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Pievienot adrešu grāmatu"
 
-#: mail/em-popup.c:966
+#: mail/em-popup.c:967
 #, c-format
 msgid "Open in %s..."
 msgstr "Atvērt ar %s..."
@@ -14719,7 +14230,7 @@ msgstr "Evolution pasta izpildkopsavilkuma komponente."
 msgid "Mail Accounts"
 msgstr "Pasta konti"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
 msgid "Mail Preferences"
 msgstr "Pasta Preferences"
 
@@ -14732,15 +14243,15 @@ msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importē jūsu veco Eim pastu"
 
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:226
+#: mail/importers/evolution-mbox-importer.c:221
+#: mail/importers/evolution-outlook-importer.c:255
 #: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Importēju..."
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:222
-#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/evolution-mbox-importer.c:223
+#: mail/importers/evolution-outlook-importer.c:257
 #: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Lūdzu uzgaidiet"
@@ -14763,23 +14274,25 @@ msgid "Elm"
 msgstr "Eim"
 
 #: mail/importers/evolution-mbox-importer.c:116
+#: mail/importers/evolution-outlook-importer.c:130
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Dzēst šo mapi"
 
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 #, fuzzy
 msgid "Select folder to import into"
 msgstr "Izvēlēties mapi"
 
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:254
 #: mail/importers/mail-importer.c:226
 #, fuzzy, c-format
 msgid "Importing `%s'"
 msgstr "Importējam"
 
-#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/evolution-outlook-importer.c:301
 #: mail/importers/mail-importer.c:140
 #, fuzzy
 msgid "Importing mailbox"
@@ -14948,15 +14461,15 @@ msgstr ""
 msgid "%s License Agreement"
 msgstr ""
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
 msgid "_Host:"
 msgstr "_Hosts:"
 
-#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
 msgid "User_name:"
 msgstr "_Lietotājvārds:"
 
-#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
 msgid "_Path:"
 msgstr "_Ceļš:"
 
@@ -15019,34 +14532,34 @@ msgstr "%d kopā"
 msgid ", %d unread"
 msgstr "%d nenosūtītas"
 
-#: mail/mail-component.c:653
+#: mail/mail-component.c:656
 msgid "New Mail Message"
 msgstr "Jauna pasta vēstule"
 
-#: mail/mail-component.c:654
+#: mail/mail-component.c:657
 msgid "_Mail Message"
 msgstr "_Pasta vēstule"
 
-#: mail/mail-component.c:655
+#: mail/mail-component.c:658
 msgid "Compose a new mail message"
 msgstr "Sacerēt jaunu pasta vēstuli"
 
-#: mail/mail-component.c:661
+#: mail/mail-component.c:664
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Jauna vMape"
 
-#: mail/mail-component.c:662
+#: mail/mail-component.c:665
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Pasta filtri"
 
-#: mail/mail-component.c:663
+#: mail/mail-component.c:666
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Izveidot jaunu mapi"
 
-#: mail/mail-component.c:795
+#: mail/mail-component.c:798
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
@@ -15058,7 +14571,7 @@ msgstr "Pārbaudam servisu"
 msgid "Connecting to server..."
 msgstr "Savienojamies ar serveri..."
 
-#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Identitāte"
 
@@ -15073,7 +14586,7 @@ msgstr ""
 "nosūtāt."
 
 #: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 #, fuzzy
 msgid "Receiving Mail"
 msgstr "_Saņemot pastu"
@@ -15091,7 +14604,7 @@ msgstr ""
 msgid "Please select among the following options"
 msgstr "Lūdzu izvēlieties starp sekojošām opcijām"
 
-#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131
 #, fuzzy
 msgid "Sending Mail"
 msgstr "_Sūtot pastu"
@@ -15105,7 +14618,7 @@ msgstr ""
 "pārliecināti, prasiet jūsu sistēmu administrātoram vai Internet servisa "
 "piegādātājam."
 
-#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37
 msgid "Account Management"
 msgstr "Kontu pārvaldība"
 
@@ -15123,250 +14636,254 @@ msgstr ""
 "kontu. Lūdzu ievadiet konta nosaukumu laukumā zemāk. Šis nosaukums tiks "
 "izmantots tikai attēlošanas nolūkos."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:2
 #, fuzzy
 msgid " Ch_eck for Supported Types "
 msgstr " _Pārbaudīt atbalstītos paņēmienus"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "<b>Preview</b>"
 msgstr "Pirmsapskats"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "(SSL nav vēl atbalstīts šajā Evolution kompilējumā)"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "<b>S_ignatures</b>"
 msgstr "<b>Sākas:</b> "
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "<b>_Languages</b>"
 msgstr "_Valoda:"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
+msgid "<small>This will make the the filter more reliable, but slower</small>"
+msgstr ""
+
+#: mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "<span weight=\"bold\">Checking for New Mail</span>"
 msgstr "Pārbaudīt jauno pastu"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">General</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
 #, fuzzy
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "Ziņa, ko attēlot"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "Ziņošana par jaunu pastu"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Security</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "Nosūtītās un melnraksta vēstules"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:34
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:35
 #, fuzzy
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "_Vienmēr kodēt uz mani, sūtot kodētu pastu"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:36
 msgid "Account Editor"
 msgstr "Kontu redaktors"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:38
 #, fuzzy
 msgid "Add Ne_w Signature..."
 msgstr "Pievienot jaunu parakstu..."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Add _Script"
 msgstr "Pievienot sk_riptu"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:40
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "_Vienmēr kodēt uz mani, sūtot kodētu pastu"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Vienmēr nosūtīt _kopiju (Cc) uz:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Vienmēr nosūtīt _aklo kopiju (Cc) uz:"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Always _sign outgoing messages when using this account"
 msgstr "_Vienmēr parakstīt izejošās vēstules, kad izmanto šo kontu"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Kodējot, vienmēr _uzticēties atslēgām manā atslēgu rinķī"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Attach original message"
 msgstr "Piesaistīt orģinālo vēstuli"
 
-#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Piesaistne"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:48
 #, fuzzy
 msgid "Automatically _insert smiley images"
 msgstr "_Automātiski ievietot smaidiņu attēlus"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Automatically check for _new mail every"
 msgstr "_Automātiski parbaudīt jauno pastu"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltijas (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltijas (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Beep w_hen new mail arrives"
 msgstr "_Pīkstēt, kad ir saņemts jauns pasts"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "C_haracter set:"
 msgstr "Rakst_zīmju kopa:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Ch_eck for Supported Types "
 msgstr " _Pārbaudīt atbalstītos paņēmienus"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 #, fuzzy
-msgid "Check _Incoming Mail"
+msgid "Check _incoming mail for junk"
 msgstr "Pārbaudīt jauno pastu"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Check spelling while I _type"
 msgstr "Pārbaudīt pareizrakstību kāmēr es _rakstu"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 msgid "Color for _misspelled words:"
 msgstr "Krāsa _kļūdainajiem vārdiem:"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Colors"
 msgstr "_Krāsas"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Confirm _when expunging a folder"
 msgstr "_Apstiprināt, iztīrot mapi"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 #, fuzzy
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
@@ -15383,261 +14900,266 @@ msgstr ""
 "\n"
 "Klikšķināt \"Beigt\" lai saglabātu jūsu uzstādījumus."
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
 msgid "De_fault"
 msgstr "Nokl_usētais"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Default character e_ncoding:"
 msgstr "Noklusētais rakstzīmju ko_dējums:"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 #, fuzzy
 msgid "Defaults"
 msgstr "_Noklusētie"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 msgid "Do not quote original message"
 msgstr "Necitēt oriģinālo vēstuli"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Neparakstīt _sanāksmju pieprasījumus (savietojamībai ar Outlook)"
 
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Izdarīts"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Drafts _Folder:"
 msgstr "_Melnrakstu mape:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:77
 msgid "Email Accounts"
 msgstr "Epasta konti"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Email _Address:"
 msgstr "Epasta _adrese:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "Empty trash folders on e_xit"
 msgstr "Iztukšot _atkritumu mapes pie iziešanas"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "_Sertifikāta ID:"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:81
 msgid "Evolution Account Assistant"
 msgstr "Evolution kontu asistents"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:82
 msgid "Execute Command..."
 msgstr "Izpildīt komandu..."
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Fi_xed-width:"
 msgstr "Fiksē_ts -platums:"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 msgid "Font Properties"
 msgstr "Fontu rekvizīti"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 msgid "Format messages in _HTML"
 msgstr "Formatēt vēstules _HTML"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "HTML Mail"
 msgstr "_HTML pasts"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Headers"
 msgstr "Galvene"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr "Izcelt _citātus ar"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
 #: mail/mail-config.glade.h:91
+#, fuzzy
+msgid "I_nclude remote tests"
+msgstr "Iekļaut:"
+
+#: mail/mail-config.glade.h:94
 msgid "Inline"
 msgstr "Iekļaut"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Mail Configuration"
 msgstr "Pasta konfigurācija"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "Pasta kastes atrašanās vieta"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr "Vēstuļu sacerētājs"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 "Piezīme: jums nepieprasīs ievadīt paroli līdz jūs savienosieties pirmo reizi"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Or_ganization:"
 msgstr "Or_ganizācija:"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _Atslēgas ID:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "Play sound file when new mail arri_ves"
 msgstr "_Spēlēt skaņas failu, kad tiek saņemts jauns pasts"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Norādīt, kad sūta vēstules tikai ar norādītiem _bcc adresātiem"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr "Citēt oriģinālo vēstuli"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr "Citēts"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Re_member password"
 msgstr "Atcerēties šo paroli"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr "At_bildēt-Uz:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "Saņemu epastu"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:120
 #, fuzzy
 msgid "Receiving Options"
 msgstr "Saņemšanas _opcijas"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
 #, fuzzy
 msgid "Remember _password"
 msgstr "Atcerēties šo paroli"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
 #, fuzzy
 msgid "S_tandard Font:"
 msgstr "Sand Point"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 #, fuzzy
 msgid "Security"
 msgstr "_Drošība"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font"
 msgstr "Izvēlieties HTML fiksēta platuma fontu"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:126
 msgid "Select HTML fixed width font for printing"
 msgstr "Izvēlieties HTML fiksēta platuma fontu drukāšanai"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:127
 msgid "Select HTML variable width font"
 msgstr "Izvēlieties HTML mainīga platuma fontu"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:128
 msgid "Select HTML variable width font for printing"
 msgstr "Izvēlieties HTML mainīga platuma fontu drukāšanai"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:129
 #, fuzzy
 msgid "Select..."
 msgstr "Dzēst..."
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "Sūtu epastu"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Sent _Messages Folder:"
 msgstr "Nosūtīto _ziņu mape:"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:134
 msgid "Ser_ver requires authentication"
 msgstr "Ser_veris pieprasa autentikāciju"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:135
 msgid "Server _Type: "
 msgstr "Servera _tips: "
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Ķēdē pašparakstīts sertifikāts"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:137
 #, fuzzy
 msgid "Signat_ure:"
 msgstr "Paraksts:"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "Signatures"
 msgstr "_Paraksti"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr "Norādiet _faila nosaukumu:"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "Spell Checking"
 msgstr "_Pareizrakstības pārbaude"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:141
 msgid "Standard Unix mbox"
 msgstr "Standarta Unix mbox"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "T_erminal Font:"
 msgstr "Oriģinālais kontakts:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "T_ype: "
 msgstr "Tips:"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -15647,7 +15169,7 @@ msgstr ""
 "paraksts. Nosaukums, kuru norādīsiet, tiks\n"
 "izmantots tikai attēlošanas nolūkos."
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
@@ -15657,7 +15179,7 @@ msgstr ""
 "Valodu saraksts šeit parāda tikai tās valodas, kurām jums ir uzstādīta "
 "vārdnīca."
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:149
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -15665,15 +15187,11 @@ msgstr ""
 "Ievadiet nosaukumu, kādu jūs gribētu piešķirt šim kontam.\n"
 "Piemēram: \"Darbs\" vai \"Personīgi\""
 
-#: mail/mail-config.glade.h:148
-msgid "Use _Daemon"
-msgstr ""
-
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:152
 msgid "V_ariable-width:"
 msgstr "_Mainīgs platums:"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
@@ -15684,92 +15202,88 @@ msgstr ""
 "\n"
 "Klikšķiniet \"Nākošais\" lai sāktu."
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:158
 msgid "_Add Signature"
 msgstr "_Pievienot parakstu"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Always load images from the Internet"
 msgstr "_Vienmēr ielādēt attēlus no tīkla"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Digitally sign outgoing messages (by default)"
 msgstr "_Vienmēr parakstīt izejošās vēstules, kad izmanto šo kontu"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:161
 msgid "_Do not notify me when new mail arrives"
 msgstr "Neziņojiet _man, kad ierodas jauns pasts"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:163
 msgid "_Enable"
 msgstr "_Aktivizēt"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:165
 msgid "_Forward style:"
 msgstr "_Pārsūtīšanas stils:"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Load images if sender is in address book"
 msgstr "_Ielādēt attēlus, ja sūtītājs ir adrešu grāmatā"
 
-#: mail/mail-config.glade.h:167
-msgid "_Local Tests Only"
-msgstr ""
-
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Make this my default account"
 msgstr "_Padarīt šo par manu noklusēto kontu"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_Mark messages as read after"
 msgstr "_Atzīmēt vēstules kā lasītas pēc"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Never load images from the Internet"
 msgstr "_Nekad neielādēt attēlus no tīkla"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "_Norādīt, kad sūta HTML vēstules kontaktiem, kuri to nevēlas"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:175
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Norādīt, kad sūta vēstules ar tukšu subjekta rindu"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:176
 msgid "_Reply style:"
 msgstr "_Atbildes stils:"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:177
 msgid "_Script:"
 msgstr "_Skripts:"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:178
 msgid "_Show animated images"
 msgstr "_Rādīt kustīgos attēlus"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "_Use Secure Connection (SSL):"
 msgstr "_Lietot drošu savienojumu (SSL):"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:181
 msgid "color"
 msgstr "krāsa"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "apraksts"
 
@@ -15943,7 +15457,7 @@ msgstr ""
 
 #. mail:camel-exception primary
 #: mail/mail-errors.xml.h:57
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgid "Your message with the subject \"{0}\" was not delivered."
 msgstr ""
 
 #. mail:camel-exception secondary
@@ -16009,11 +15523,6 @@ msgstr ""
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Nevar izveidot direktoriju %s: %s"
 
-#. mail:no-save-path secondary
-#: mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail:no-create-path primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
@@ -16038,12 +15547,6 @@ msgstr ""
 msgid "Cannot create temporary save directory."
 msgstr "Nevar izveidot pagaidu direktoriju: %s"
 
-#. mail:no-create-tmp-path secondary
-#: mail/mail-errors.xml.h:100 mail/mail-errors.xml.h:112
-#: widgets/misc/e-system-errors.xml.h:11 widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail:no-write-path-exists secondary
 #: mail/mail-errors.xml.h:104
 #, fuzzy
@@ -16320,144 +15823,140 @@ msgstr "Pārrakstīt"
 msgid "_Append"
 msgstr "Aspena"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:785
 #, c-format
 msgid "Pinging %s"
 msgstr "Ehotestējam %s"
 
-#: mail/mail-mt.c:897
-msgid "Working"
-msgstr "Strādāju"
-
-#: mail/mail-ops.c:99
+#: mail/mail-ops.c:98
 msgid "Filtering Folder"
 msgstr "Filtrējam mapi"
 
-#: mail/mail-ops.c:260
+#: mail/mail-ops.c:259
 msgid "Fetching Mail"
 msgstr "Pasta saņemšana"
 
-#: mail/mail-ops.c:543
+#: mail/mail-ops.c:542
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Neizdevās saglabāt pastu pagaidu failā %s: %s"
 
-#: mail/mail-ops.c:568
+#: mail/mail-ops.c:567
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:577
+#: mail/mail-ops.c:576
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Neizdevās saglabāt pastu pagaidu failā %s: %s"
 
-#: mail/mail-ops.c:673
+#: mail/mail-ops.c:672
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sūtam %d. vēstuli no %d"
 
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:703
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Neizdevās atkodēt vēstuli."
 
-#: mail/mail-ops.c:708
+#: mail/mail-ops.c:707
 msgid "Complete."
 msgstr "Izpildīts."
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:804
 msgid "Saving message to folder"
 msgstr "Saglabāju vēstuli mapē"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Pārvietoju vēstules uz %s"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopēju vēstules uz %s"
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:1002
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanēju mapes \"%s\""
 
-#: mail/mail-ops.c:1116
+#: mail/mail-ops.c:1115
 msgid "Forwarded messages"
 msgstr "Pārsūtītās vēstules"
 
-#: mail/mail-ops.c:1159
+#: mail/mail-ops.c:1158
 #, c-format
 msgid "Opening folder %s"
 msgstr "Atveru mapi %s"
 
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1230
 #, c-format
 msgid "Opening store %s"
 msgstr "Atveru glabātuvi %s"
 
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1308
 #, c-format
 msgid "Removing folder %s"
 msgstr "Izņemu mapi %s"
 
-#: mail/mail-ops.c:1403
+#: mail/mail-ops.c:1402
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Glabāju mapi '%s'"
 
-#: mail/mail-ops.c:1468
+#: mail/mail-ops.c:1467
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1469
+#: mail/mail-ops.c:1468
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Glabāju mapi '%s'"
 
-#: mail/mail-ops.c:1524
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr "Atjauninu mapi"
 
-#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
+#: mail/mail-ops.c:1559 mail/mail-ops.c:1610
 msgid "Expunging folder"
 msgstr "Iztīru mapi"
 
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1607
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Importējam %s kā %s"
 
-#: mail/mail-ops.c:1609
+#: mail/mail-ops.c:1608
 msgid "Local Folders"
 msgstr "Lokālās mapes"
 
-#: mail/mail-ops.c:1692
+#: mail/mail-ops.c:1691
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Saņemu vēstuli %s"
 
-#: mail/mail-ops.c:1764
+#: mail/mail-ops.c:1763
 #, fuzzy, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Saņemu %d vēstuli(es)"
 msgstr[1] "Saņemu %d vēstuli(es)"
 
-#: mail/mail-ops.c:1850
+#: mail/mail-ops.c:1849
 #, fuzzy, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Saglabāju %d vēstuli(es)"
 msgstr[1] "Saglabāju %d vēstuli(es)"
 
-#: mail/mail-ops.c:1900
+#: mail/mail-ops.c:1899
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -16466,7 +15965,7 @@ msgstr ""
 "Nevaru izveidot izejas failu: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1928
+#: mail/mail-ops.c:1927
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -16475,11 +15974,11 @@ msgstr ""
 "Kļūda glabājot vēstules uz: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1999
+#: mail/mail-ops.c:1998
 msgid "Saving attachment"
 msgstr "Saglabājam piesaistni"
 
-#: mail/mail-ops.c:2016
+#: mail/mail-ops.c:2015
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -16488,17 +15987,17 @@ msgstr ""
 "Nevaru izveidot izejas failu: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2046
+#: mail/mail-ops.c:2045
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nevarēju ierakstīt datus: %s"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Atvienojos no %s"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Pārvienojos ar %s"
@@ -16564,24 +16063,24 @@ msgstr "Atjauninu..."
 msgid "Waiting..."
 msgstr "Gaidu..."
 
-#: mail/mail-session.c:238
+#: mail/mail-session.c:239
 msgid "User canceled operation."
 msgstr "Lietotājs atsauca operāciju."
 
-#: mail/mail-session.c:271
+#: mail/mail-session.c:272
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Ievadiet %s paroli"
 
-#: mail/mail-session.c:273
+#: mail/mail-session.c:274
 msgid "Enter Password"
 msgstr "Ievadiet paroli"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password"
 msgstr "_Atcerēties šo paroli"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:298
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Atcerēties šo paroli uz visu atlikušo sesijas laiku"
 
@@ -16638,79 +16137,79 @@ msgstr "Atjauninu vmapes priekš uri: %s"
 msgid "Updating vFolders for '%s'"
 msgstr "Atjauninu vmapes priekš uri: %s"
 
-#: mail/mail-vfolder.c:959
+#: mail/mail-vfolder.c:958
 msgid "vFolders"
 msgstr "vMapes"
 
-#: mail/mail-vfolder.c:998
+#: mail/mail-vfolder.c:997
 msgid "Edit VFolder"
 msgstr "Rediģēt vMapi"
 
-#: mail/mail-vfolder.c:1082
+#: mail/mail-vfolder.c:1081
 msgid "New VFolder"
 msgstr "Jauna vMape"
 
-#: mail/message-list.c:946
+#: mail/message-list.c:948
 msgid "Unseen"
 msgstr "Neredzēta"
 
-#: mail/message-list.c:947
+#: mail/message-list.c:949
 msgid "Seen"
 msgstr "Redzēta"
 
-#: mail/message-list.c:948
+#: mail/message-list.c:950
 msgid "Answered"
 msgstr "Atbildēta"
 
-#: mail/message-list.c:949
+#: mail/message-list.c:951
 msgid "Multiple Unseen Messages"
 msgstr "Vairākas neredzētas vēstules"
 
-#: mail/message-list.c:950
+#: mail/message-list.c:952
 msgid "Multiple Messages"
 msgstr "Vairākas vēstules"
 
-#: mail/message-list.c:954
+#: mail/message-list.c:956
 msgid "Lowest"
 msgstr "Zemākais"
 
-#: mail/message-list.c:955
+#: mail/message-list.c:957
 msgid "Lower"
 msgstr "Zemāk"
 
-#: mail/message-list.c:959
+#: mail/message-list.c:961
 msgid "Higher"
 msgstr "Augstāk"
 
-#: mail/message-list.c:960
+#: mail/message-list.c:962
 msgid "Highest"
 msgstr "Augstākais"
 
-#: mail/message-list.c:1279
+#: mail/message-list.c:1285
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1286
+#: mail/message-list.c:1292
 msgid "Today %l:%M %p"
 msgstr "Šodien %l:%M %p"
 
-#: mail/message-list.c:1295
+#: mail/message-list.c:1301
 msgid "Yesterday %l:%M %p"
 msgstr "Vakardien %I:%M %p"
 
-#: mail/message-list.c:1307
+#: mail/message-list.c:1313
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1315
+#: mail/message-list.c:1321
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1317
+#: mail/message-list.c:1323
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3300
+#: mail/message-list.c:3321
 msgid "Generating message list"
 msgstr "Izveidoju vēstuļu sarakstu"
 
@@ -16766,6 +16265,10 @@ msgstr "Pārsūtīt"
 msgid "No Response Necessary"
 msgstr "Nav nepieciešama atbilde (No Response Necessary)"
 
+#: mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Lasīt"
+
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Atbildēt"
@@ -16874,45 +16377,49 @@ msgid ""
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:10
-msgid "Whether Evolution should start up in offline mode"
+msgid "Toolbar is visible"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:11
-msgid "Whether to skip the development warning dialog"
+msgid "Whether Evolution should start up in offline mode"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Whether the toolbar should be visible."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:14
 #, fuzzy
 msgid "mail"
 msgstr "Epasts"
 
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
-msgstr "Piedāvā jums"
-
-#: shell/e-shell.c:545 shell/e-shell.c:546
+#: shell/e-shell.c:588 shell/e-shell.c:589
 #, fuzzy, c-format
 msgid "%ld KB"
 msgstr "%d %B"
 
-#: shell/e-shell.c:744
+#: shell/e-shell.c:786
 #, fuzzy
 msgid "Uknown system error."
 msgstr "Nezināma kļūda"
 
-#: shell/e-shell.c:1101
+#: shell/e-shell.c:1143
 msgid "Invalid arguments"
 msgstr "Nepareizi argrumenti"
 
-#: shell/e-shell.c:1103
+#: shell/e-shell.c:1145
 msgid "Cannot register on OAF"
 msgstr "Nevar reģistrēties uz OAF"
 
-#: shell/e-shell.c:1105
+#: shell/e-shell.c:1147
 msgid "Configuration Database not found"
 msgstr "Konfigurāciju datubāze nav atrasta"
 
-#: shell/e-shell.c:1107
+#: shell/e-shell.c:1149
 msgid "Generic error"
 msgstr "Vispārēja kļūda"
 
@@ -16968,7 +16475,7 @@ msgstr ""
 msgid "Select importer"
 msgstr "Izvēlēties mapi"
 
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1026
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
 #, c-format
 msgid "File %s does not exist"
 msgstr "Fails %s neeksistē"
@@ -16996,35 +16503,35 @@ msgstr ""
 "Importējam %s\n"
 "Importējam priekšmetu 1."
 
-#: shell/e-shell-importer.c:549
+#: shell/e-shell-importer.c:570
 msgid "Automatic"
 msgstr "Automātisks"
 
-#: shell/e-shell-importer.c:598
+#: shell/e-shell-importer.c:626
 #, fuzzy
-msgid "_Filename:"
+msgid "F_ilename:"
 msgstr "Faila nosaukums:"
 
-#: shell/e-shell-importer.c:603
+#: shell/e-shell-importer.c:631
 msgid "Select a file"
 msgstr "Izvēlieties failu"
 
-#: shell/e-shell-importer.c:613
+#: shell/e-shell-importer.c:642
 #, fuzzy
 msgid "File _type:"
 msgstr "Faila tips:"
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:681
 #, fuzzy
 msgid "Import data and settings from _older programs"
 msgstr "Importēt datus un uzstādijumus no vecākām programmām"
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:684
 #, fuzzy
 msgid "Import a _single file"
 msgstr "Importēt vienu failu"
 
-#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -17032,26 +16539,26 @@ msgstr ""
 "Lūdzu uzgaidiet...\n"
 "Meklējam eksistējošus uzstādijumus"
 
-#: shell/e-shell-importer.c:727
+#: shell/e-shell-importer.c:756
 msgid "Starting Intelligent Importers"
 msgstr "Startēju inteliģentos importētājus"
 
-#: shell/e-shell-importer.c:853 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
 #, c-format
 msgid "From %s:"
 msgstr "No %s:"
 
-#: shell/e-shell-importer.c:1044
+#: shell/e-shell-importer.c:1073
 #, fuzzy, c-format
 msgid "No importer available for file %s"
 msgstr "Nav pieejams piegādātajs protokolam '%s'"
 
-#: shell/e-shell-importer.c:1056
+#: shell/e-shell-importer.c:1085
 #, fuzzy
 msgid "Unable to execute importer"
 msgstr "Neizdevās palaist gpg."
 
-#: shell/e-shell-importer.c:1169
+#: shell/e-shell-importer.c:1199
 #, fuzzy
 msgid "_Import"
 msgstr "Importēt"
@@ -17099,62 +16606,62 @@ msgstr "Mapes nosaukums nedrīkst saturēt Return (Enter) simbolu."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' un '..' ir rezervēti mapju nosaukumi."
 
-#: shell/e-shell-window.c:336
+#: shell/e-shell-window.c:337
 #, fuzzy
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution pašreiz ir tiešaistē. Klikšķiniet pogu lai strādātu "
 "nesaistē."
 
-#: shell/e-shell-window.c:343
+#: shell/e-shell-window.c:344
 #, fuzzy
 msgid "Evolution is in the process of going offline."
 msgstr "Ximian Evolution ieiet nesaistes režīmā."
 
-#: shell/e-shell-window.c:349
+#: shell/e-shell-window.c:350
 #, fuzzy
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution pašreiz ir nesaistes režīmā. Klikšķiniet uz šīs pogas, lai "
 "strādātu tiešsaistē."
 
-#: shell/e-shell-window.c:621
+#: shell/e-shell-window.c:637
 #, fuzzy, c-format
 msgid "Switch to %s"
 msgstr "Pasts uz %s"
 
-#: shell/e-shell-window-commands.c:64
+#: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Izskatās, ka GNOME Pilot rīki nav uzstādīti šajā sistēmā."
 
-#: shell/e-shell-window-commands.c:72
+#: shell/e-shell-window-commands.c:74
 #, c-format
 msgid "Error executing %s."
 msgstr "Kļūda sāknējot %s."
 
-#: shell/e-shell-window-commands.c:121
+#: shell/e-shell-window-commands.c:123
 #, fuzzy
 msgid "Bug buddy is not installed."
 msgstr "Bug buddy nevar tikt palaists."
 
-#: shell/e-shell-window-commands.c:129
+#: shell/e-shell-window-commands.c:131
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy nevar tikt palaists."
 
-#: shell/e-shell-window-commands.c:171
+#: shell/e-shell-window-commands.c:323
 #, fuzzy
-msgid "About Evolution"
-msgstr "Par Ximian Evolution"
+msgid "Groupware Suite"
+msgstr "Grupa"
 
-#: shell/e-shell-window-commands.c:382
+#: shell/e-shell-window-commands.c:563
 msgid "_Work Online"
 msgstr "_Strādāt tiešsaistē"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "_Strādāt nesaistē"
 
-#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Strādāt nesaistē"
 
@@ -17166,43 +16673,6 @@ msgstr "Izvēles rūtiņa"
 msgid "New"
 msgstr "Jauna"
 
-#: shell/evolution-shell-component-utils.c:115
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Nezināma kļūda."
-
-#: shell/evolution-shell-component-utils.c:118
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Kļūda no komponentu sistēmas ir:\n"
-"%s"
-
-#: shell/evolution-shell-component-utils.c:125
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Kļūda no aktivizēšanas sistēmas ir:\n"
-"%s"
-
 #: shell/evolution-test-component.c:140
 #, fuzzy
 msgid "New Test"
@@ -17546,34 +17016,34 @@ msgid ""
 "Click help for details."
 msgstr ""
 
-#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:522
+#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
+#: smime/gui/certificate-manager.c:556
 #, fuzzy
 msgid "Select a cert to import..."
 msgstr "Izvēlēties mapi"
 
-#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:604
+#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
+#: smime/gui/certificate-manager.c:638
 #, fuzzy
 msgid "Certificate Name"
 msgstr "_Sertifikāta ID:"
 
-#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
+#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
 #, fuzzy
 msgid "Purposes"
 msgstr "Progress"
 
-#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:517
+#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:267
+#: smime/gui/certificate-manager.c:271
 #, fuzzy
 msgid "Expires"
 msgstr "Izteiksme"
 
-#: smime/gui/certificate-manager.c:417
+#: smime/gui/certificate-manager.c:446
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "Epasta adrese:"
@@ -17616,6 +17086,11 @@ msgid ""
 "  Subject: %s\n"
 msgstr ""
 
+#: smime/gui/e-cert-selector.c:169
+#, fuzzy
+msgid "Select certificate"
+msgstr "Iet uz norādīto datumu"
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -17678,7 +17153,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
 #, fuzzy
 msgid "Certificate"
 msgstr "_Sertifikāta ID:"
@@ -17703,20 +17178,24 @@ msgstr "Parastais vārds"
 msgid "Contact Certificates"
 msgstr "_Sertifikāta ID:"
 
-#: smime/gui/smime-ui.glade.h:21
-#, no-c-format
-msgid "Do you want to trust \"%s\" for the following purposes?"
+#: smime/gui/smime-ui.glade.h:20
+msgid "Do not trust the authenticity of this certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:21
 msgid "Dummy window only"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:22
 #, fuzzy
 msgid "Edit"
 msgstr "R_ediģēt"
 
+#: smime/gui/smime-ui.glade.h:23
+#, fuzzy
+msgid "Email Certificate Trust Settings"
+msgstr "Nepareiza sertifikāta autoritāte (SA)"
+
 #: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr ""
@@ -17753,283 +17232,292 @@ msgstr "Organizācija"
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:37
-msgid "Trust this CA to identify email users."
+msgid "Trust the authenticity of this certificate"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:38
-msgid "Trust this CA to identify software developers."
+msgid "Trust this CA to identify email users."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:39
-msgid "Trust this CA to identify web sites."
+msgid "Trust this CA to identify software developers."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:40
-#, fuzzy
-msgid "View"
-msgstr "_Skatīt"
+msgid "Trust this CA to identify web sites."
+msgstr ""
 
 #: smime/gui/smime-ui.glade.h:41
 #, fuzzy
-msgid "View Certificate"
-msgstr "_Sertifikāta ID:"
+msgid "View"
+msgstr "_Skatīt"
 
 #: smime/gui/smime-ui.glade.h:42
-#, fuzzy
-msgid "You have been asked to trust a new Certificate Authority (CA)."
-msgstr "Nepareiza sertifikāta autoritāte (SA)"
-
-#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:44
+#: smime/gui/smime-ui.glade.h:43
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:45
+#: smime/gui/smime-ui.glade.h:44
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:46
+#: smime/gui/smime-ui.glade.h:45
 #, fuzzy
 msgid "Your Certificates"
 msgstr "_Sertifikāta ID:"
 
-#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
+#: smime/gui/smime-ui.glade.h:46
+msgid "_Edit CA Trust"
+msgstr ""
+
+#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 #, fuzzy
 msgid "%d/%m/%Y"
 msgstr "%m/%d/%Y"
 
-#: smime/lib/e-cert.c:478
+#. x509 certificate usage types
+#: smime/lib/e-cert.c:424
+#, fuzzy
+msgid "Sign"
+msgstr "Stauning"
+
+#: smime/lib/e-cert.c:425
+#, fuzzy
+msgid "Encrypt"
+msgstr "PGP kodējums"
+
+#: smime/lib/e-cert.c:530
 #, fuzzy
 msgid "Version"
 msgstr "Vermonta"
 
-#: smime/lib/e-cert.c:493
+#: smime/lib/e-cert.c:545
 #, fuzzy
 msgid "Version 1"
 msgstr "Vermiliona"
 
-#: smime/lib/e-cert.c:496
+#: smime/lib/e-cert.c:548
 #, fuzzy
 msgid "Version 2"
 msgstr "Vermiliona"
 
-#: smime/lib/e-cert.c:499
+#: smime/lib/e-cert.c:551
 #, fuzzy
 msgid "Version 3"
 msgstr "Vermiliona"
 
-#: smime/lib/e-cert.c:581
+#: smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:584
+#: smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:587
+#: smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:590
+#: smime/lib/e-cert.c:642
 #, fuzzy
 msgid "C"
 msgstr " C"
 
-#: smime/lib/e-cert.c:593
+#: smime/lib/e-cert.c:645
 #, fuzzy
 msgid "CN"
 msgstr "Z"
 
-#: smime/lib/e-cert.c:596
+#: smime/lib/e-cert.c:648
 msgid "OU"
 msgstr ""
 
-#: smime/lib/e-cert.c:599
+#: smime/lib/e-cert.c:651
 #, fuzzy
 msgid "O"
 msgstr "OK"
 
-#: smime/lib/e-cert.c:602
+#: smime/lib/e-cert.c:654
 msgid "L"
 msgstr ""
 
-#: smime/lib/e-cert.c:605
+#: smime/lib/e-cert.c:657
 #, fuzzy
 msgid "DN"
 msgstr "Z"
 
-#: smime/lib/e-cert.c:608
+#: smime/lib/e-cert.c:660
 msgid "DC"
 msgstr ""
 
-#: smime/lib/e-cert.c:611
+#: smime/lib/e-cert.c:663
 #, fuzzy
 msgid "ST"
 msgstr "SMTP"
 
-#: smime/lib/e-cert.c:614
+#: smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:617
+#: smime/lib/e-cert.c:669
 #, fuzzy
 msgid "Certificate Key Usage"
 msgstr "_Sertifikāta ID:"
 
-#: smime/lib/e-cert.c:620
+#: smime/lib/e-cert.c:672
 #, fuzzy
 msgid "Netscape Certificate Type"
 msgstr "_Sertifikāta ID:"
 
-#: smime/lib/e-cert.c:623
+#: smime/lib/e-cert.c:675
 #, fuzzy
 msgid "Certificate Authority Key Identifier"
 msgstr "Neuzticams sertifikāts"
 
-#: smime/lib/e-cert.c:626
+#: smime/lib/e-cert.c:678
 #, fuzzy
 msgid "UID"
 msgstr "I"
 
-#: smime/lib/e-cert.c:635
+#: smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr ""
 
-#: smime/lib/e-cert.c:686
+#: smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:694
+#: smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
 msgstr ""
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:768
 #, fuzzy
 msgid "Subject Public Key Info"
 msgstr ""
 "\n"
 "Publiskā atslēga: "
 
-#: smime/lib/e-cert.c:721
+#: smime/lib/e-cert.c:773
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:736
+#: smime/lib/e-cert.c:788
 #, fuzzy
 msgid "Subject's Public Key"
 msgstr "Subjekts ir %s"
 
-#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
+#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
 #, fuzzy
 msgid "Error: Unable to process extension"
 msgstr "Nespēj procesēt spoles mapi"
 
-#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
+#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:782
+#: smime/lib/e-cert.c:834
 #, fuzzy
 msgid "SSL Certificate Authority"
 msgstr "Nepareiza sertifikāta autoritāte (SA)"
 
-#: smime/lib/e-cert.c:786
+#: smime/lib/e-cert.c:838
 #, fuzzy
 msgid "Email Certificate Authority"
 msgstr "Nepareiza sertifikāta autoritāte (SA)"
 
-#: smime/lib/e-cert.c:814
+#: smime/lib/e-cert.c:866
 #, fuzzy
 msgid "Signing"
 msgstr "Stauning"
 
-#: smime/lib/e-cert.c:818
+#: smime/lib/e-cert.c:870
 #, fuzzy
 msgid "Non-repudiation"
 msgstr "Nav Informācijas"
 
-#: smime/lib/e-cert.c:822
+#: smime/lib/e-cert.c:874
 msgid "Key Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:826
+#: smime/lib/e-cert.c:878
 #, fuzzy
 msgid "Data Encipherment"
 msgstr "piesaistne"
 
-#: smime/lib/e-cert.c:830
+#: smime/lib/e-cert.c:882
 msgid "Key Agreement"
 msgstr ""
 
-#: smime/lib/e-cert.c:834
+#: smime/lib/e-cert.c:886
 #, fuzzy
 msgid "Certificate Signer"
 msgstr "_Sertifikāta ID:"
 
-#: smime/lib/e-cert.c:838
+#: smime/lib/e-cert.c:890
 msgid "CRL Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:938
 #, fuzzy
 msgid "Critical"
 msgstr "Curitiba"
 
-#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
+#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
 #, fuzzy
 msgid "Not Critical"
 msgstr "Ziemeļkarolīna"
 
-#: smime/lib/e-cert.c:912
+#: smime/lib/e-cert.c:964
 #, fuzzy
 msgid "Extensions"
 msgstr "Izteiksme"
 
-#: smime/lib/e-cert.c:983
+#: smime/lib/e-cert.c:1035
 #, fuzzy, c-format
 msgid "%s = %s"
 msgstr "%s iekš %s"
 
-#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
 #, fuzzy
 msgid "Certificate Signature Algorithm"
 msgstr "Sertifikāta paraksta neizdošanās"
 
-#: smime/lib/e-cert.c:1048
+#: smime/lib/e-cert.c:1100
 #, fuzzy
 msgid "Issuer"
 msgstr "_Ievietot"
 
-#: smime/lib/e-cert.c:1102
+#: smime/lib/e-cert.c:1154
 msgid "Issuer Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1121
+#: smime/lib/e-cert.c:1173
 #, fuzzy
 msgid "Subject Unique ID"
 msgstr "Subjekts ir %s"
 
-#: smime/lib/e-cert.c:1164
+#: smime/lib/e-cert.c:1216
 #, fuzzy
 msgid "Certificate Signature Value"
 msgstr "Sertifikāta paraksta neizdošanās"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
+#: smime/lib/e-cert-db.c:608
 #, fuzzy
 msgid "Certificate already exists"
 msgstr "Kartes ID jau eksistē"
@@ -18179,7 +17667,7 @@ msgstr "Parādīt pašreizējo kontaktu"
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "_Darbības"
 
@@ -18351,7 +17839,7 @@ msgstr "Aiz_vērt"
 #: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:3
+#: ui/evolution.xml.h:4
 msgid "Close"
 msgstr "Aizvērt"
 
@@ -18364,7 +17852,7 @@ msgid "Delete this item"
 msgstr "Dzēst šo priekšmetu"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr "Galvenā rīkjosla"
 
@@ -18408,7 +17896,7 @@ msgstr "Saglabāt šo priekšmetu uz diska"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:44
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "_File"
 msgstr "_Fails"
 
@@ -18675,13 +18163,13 @@ msgstr "_Invertēt izvēlējumu"
 msgid "_Threaded Message List"
 msgstr "_Sasaistīts Vēstuļu saraksts"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Aizvērt šo logu"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "_Close"
 msgstr "_Aizvērt"
 
@@ -19090,7 +18578,7 @@ msgstr "_Iepriekšējā vēstule"
 msgid "_Quoted"
 msgstr "_Citēts"
 
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
 msgid "_Tools"
 msgstr "_Rīki"
 
@@ -19394,108 +18882,122 @@ msgid "_Open Task"
 msgstr "_Uzdevums"
 
 #: ui/evolution.xml.h:1
-msgid "About Ximian Evolution..."
-msgstr "Par Ximian Evolution..."
+#, fuzzy
+msgid "About Evolution..."
+msgstr "Par Ximian Evolution"
 
 #: ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
 msgstr "Izmainīt Evolution uzstādījumus"
 
-#: ui/evolution.xml.h:5
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the visibility of the toolbar"
+msgstr "Izmainīt rekvizītus šajai mapei"
+
+#: ui/evolution.xml.h:6
 msgid "Create a new window displaying this folder"
 msgstr "Izveidot jaunu logu šai mapei"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "I_ziet"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Ximian Evolution _VUJ"
+
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Iziet no programmas"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:10
 msgid "Forget _Passwords"
 msgstr "Aizmirst _paroles"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:11
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Aizmirst atcerētās paroles, tā kā tās tiks vēlreiz pieprasītas"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:12
 msgid "Import data from other programs"
 msgstr "Importēt datus no citām programmām"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:14
 #, fuzzy
 msgid "New _Window"
 msgstr "_Meklēt Tagad"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Pi_lot Settings..."
 msgstr "Pi_lot Uzstādījumi..."
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Send / Receive"
 msgstr "Sūtīt / Saņemt"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Send queued items and retrieve new items"
 msgstr "Sūtīt sarindotos priekšmetus un saņemt jaunus priekšmetus"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Set up Pilot configuration"
 msgstr "Uzstādīt Pilot konfigurāciju"
 
-#: ui/evolution.xml.h:17
-msgid "Show information about Ximian Evolution"
+#: ui/evolution.xml.h:19
+#, fuzzy
+msgid "Show information about Evolution"
 msgstr "Parādīt informāciju par Ximian Evolution"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:20
 msgid "Submit Bug Report"
 msgstr "Nosūtīt Kļūdu Ziņojumu"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:21
 msgid "Submit _Bug Report"
 msgstr "Nosūtīt _Kļūdu Ziņojumu"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Nosūtīt kļūdu ziņojumu, izmantojot Bug Buddy"
 
-#: ui/evolution.xml.h:21
-msgid "Toggle whether we are working offline."
-msgstr "Norādīt, vai mēs strādājam nesaistes režīmā."
-
 #: ui/evolution.xml.h:23
-msgid "Ximian Evolution _FAQ"
-msgstr "Ximian Evolution _VUJ"
+#, fuzzy
+msgid "T_oolbar"
+msgstr "Galvenā rīkjosla"
 
 #: ui/evolution.xml.h:24
-msgid "_About Ximian Evolution..."
-msgstr "_Par Ximian Evolution..."
+msgid "Toggle whether we are working offline."
+msgstr "Norādīt, vai mēs strādājam nesaistes režīmā."
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "_About Evolution..."
+msgstr "Par Ximian Evolution"
+
+#: ui/evolution.xml.h:30
 msgid "_Help"
 msgstr "_Palīdzība"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "_Import..."
 msgstr "I_mportēt..."
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "_New"
 msgstr "_Jauns"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 #, fuzzy
 msgid "_Quick Reference"
 msgstr "Pasta Preferences"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_Send / Receive"
 msgstr "_Sūtīt / Saņemt"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 #, fuzzy
 msgid "_Window"
 msgstr "_Meklēt Tagad"
@@ -19574,7 +19076,7 @@ msgid "With _Status"
 msgstr "Uzstādīt statusu"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:626
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:635
 msgid "UTC"
 msgstr "UTC"
 
@@ -19734,29 +19236,29 @@ msgstr "Cita..."
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
-#: widgets/misc/e-error.c:121
+#: widgets/misc/e-error.c:79 widgets/misc/e-error.c:80
+#: widgets/misc/e-error.c:122
 msgid "Evolution Error"
 msgstr "Evolution kļūda "
 
-#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
-#: widgets/misc/e-error.c:119
+#: widgets/misc/e-error.c:81 widgets/misc/e-error.c:82
+#: widgets/misc/e-error.c:120
 #, fuzzy
 msgid "Evolution Warning"
 msgstr "Evolution"
 
-#: widgets/misc/e-error.c:118
+#: widgets/misc/e-error.c:119
 #, fuzzy
 msgid "Evolution Information"
 msgstr "Informācija par sanāksmi"
 
-#: widgets/misc/e-error.c:120
+#: widgets/misc/e-error.c:121
 #, fuzzy
 msgid "Evolution Query"
 msgstr "Evolution Kopsavilkuma komponente."
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:410
+#: widgets/misc/e-error.c:415
 #, fuzzy, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -19911,16 +19413,527 @@ msgstr ""
 "Nevar dabūt vēstuli: %s\n"
 "  %s"
 
-#: widgets/misc/e-task-widget.c:211
+#: widgets/misc/e-task-widget.c:212
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: widgets/misc/e-task-widget.c:216
+#: widgets/misc/e-task-widget.c:217
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% izpildīts)"
 
+#~ msgid "Failed to connect to LDAP server"
+#~ msgstr "Nespēju savienoties ar LDAP serveri"
+
+#~ msgid "Failed to authenticate with LDAP server"
+#~ msgstr "Nespēju autentificēties ar LDAP serveri"
+
+#~ msgid "Could not perform query on Root DSE"
+#~ msgstr "Nevarēju izpildīt pieprasījumu uz saknes DSE"
+
+#~ msgid "The server responded with no supported search bases"
+#~ msgstr "Serveris atbildeja ar neatbalstītām meklēšanas bāzēm"
+
+#~ msgid "This server does not support LDAPv3 schema information"
+#~ msgstr "Šis serveris neatbalsta LDAPv3 shēmas informāciju"
+
+#~ msgid "Error retrieving schema information"
+#~ msgstr "Kļūda saņemot shēmas informāciju"
+
+#~ msgid "Server did not respond with valid schema information"
+#~ msgstr "Serveris atbildēja ar nepareizu shēmas informāciju"
+
+#~ msgid "  S_how Supported Bases "
+#~ msgstr "  Pa_rādīt atbalstītās bāzes"
+
+#~ msgid "1:00"
+#~ msgstr "1:00"
+
+#~ msgid "5:00"
+#~ msgstr "5:00"
+
+#~ msgid "Connecting"
+#~ msgstr "Savienojos"
+
+#~ msgid "Distinguished _name:"
+#~ msgstr "Atšķiramais _vārds:"
+
+#, fuzzy
+#~ msgid "Email address:"
+#~ msgstr "Epasta _adrese:"
+
+#~ msgid "Evolution will use this DN to authenticate you with the server"
+#~ msgstr "Evolution lietos šo DN, lai autentificētu jūs ar serveri"
+
+#~ msgid "One"
+#~ msgstr "Viens"
+
+#~ msgid "S_earch scope: "
+#~ msgstr "M_eklēšanas mērogs:"
+
+#~ msgid "Searching"
+#~ msgstr "Meklēšana"
+
+#~ msgid "Sub"
+#~ msgstr "Apakš"
+
+#~ msgid "This option controls how long a search will be run."
+#~ msgstr "Šī opcija kontrolē, cik ilgi notiks meklēšana."
+
+#~ msgid "U_se SSL/TLS:"
+#~ msgstr "Izman_tot SSL/TLS:"
+
+#~ msgid "_Display name:"
+#~ msgstr "_Attēlošanas nosaukums:"
+
+#~ msgid "_Port number:"
+#~ msgstr "_Porta numurs:"
+
+#~ msgid "_Search base:"
+#~ msgstr "_Meklēšanas bāze:"
+
+#~ msgid "_Server name:"
+#~ msgstr "_Servera nosaukums:"
+
+#~ msgid "_Timeout (minutes):"
+#~ msgstr "_Taimouts (minūtes):"
+
+#~ msgid "connecting-tab"
+#~ msgstr "connecting-tab"
+
+#~ msgid "general-tab"
+#~ msgstr "general-tab"
+
+#~ msgid "searching-tab"
+#~ msgstr "searching-tab"
+
+#, fuzzy
+#~ msgid "Job title:"
+#~ msgstr "_Darba nosaukums:"
+
+#, fuzzy
+#~ msgid "Webcam:"
+#~ msgstr "Lapa"
+
+#~ msgid "Category editor not available."
+#~ msgstr "Kategoriju redaktors nav pieejams."
+
+#, fuzzy
+#~ msgid ""
+#~ "The following entries are invalid:\n"
+#~ "\n"
+#~ msgstr "Pašreizējie aktīvie savienojumi ir:"
+
+#~ msgid "Could not find widget for a field: `%s'"
+#~ msgstr "Nevar atrast logdaļu laukam: `%s'"
+
+#~ msgid "Do you want to save changes?"
+#~ msgstr "Vai jūs vēlaties saglabāt izmaiņas?"
+
+#, fuzzy
+#~ msgid "Error saving %s: %s"
+#~ msgstr "Kļūda saglabājot failu: %s"
+
+#~ msgid ""
+#~ "The addressbook backend for\n"
+#~ "%s\n"
+#~ "has crashed. You will have to restart Evolution in order to use it again"
+#~ msgstr ""
+#~ "Adrešu grāmatas aizmugure priekš\n"
+#~ "%s\n"
+#~ "ir avarējusi. Jums būs jāparstartē Evolution, ja jūs vēlaties to atkal "
+#~ "izmantot"
+
+#, fuzzy
+#~ msgid "Can not load URI"
+#~ msgstr "Karte nav atrasta"
+
+#, fuzzy
+#~ msgid "Calendar Properties"
+#~ msgstr "iKalendāra kļūda"
+
+#, fuzzy
+#~ msgid "Remote"
+#~ msgstr "Izņemt"
+
+#, fuzzy
+#~ msgid "Task List Properties"
+#~ msgstr "Uzdevumu saraksts"
+
+#, fuzzy
+#~ msgid "_Refresh Interval:"
+#~ msgstr " _Atsvaidzināt Sarakstu "
+
+#, fuzzy
+#~ msgid "_Source URL:"
+#~ msgstr "POP Avota URI"
+
+#~ msgid ""
+#~ "The event being deleted is a meeting, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "Notikums, kuru jūs vēlaties dzēst, ir sanāksme, vai jūs vēlaties izsūtīt "
+#~ "atsaukumus?"
+
+#~ msgid "Are you sure you want to cancel and delete this meeting?"
+#~ msgstr ""
+#~ "Vai jūs esat pārliecināts, ka vēlaties atsaukt un izdzēst šo sanāksmi?"
+
+#~ msgid ""
+#~ "The task being deleted is assigned, would you like to send a cancellation "
+#~ "notice?"
+#~ msgstr ""
+#~ "Uzdevums, ko jūs vēlaties dzēst, ir norīkots, vai jūs vēlaties izsūtīt "
+#~ "atsaukumu?"
+
+#~ msgid "Are you sure you want to cancel and delete this task?"
+#~ msgstr ""
+#~ "Vai jūs esat pārliecināts, ka vēlaties atsaukt un izdzēst šo uzdevumu?"
+
+#~ msgid ""
+#~ "The journal entry being deleted is published, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "Žurnāla ieraksts, ko jūs vēlaties dzēst, ir publicēts, vai jūs vēlaties "
+#~ "izsūtīt atsaukumu?"
+
+#~ msgid "Are you sure you want to cancel and delete this journal entry?"
+#~ msgstr ""
+#~ "Vai jūs esat pārliecināts, ka vēlaties atsaukt un izdzēst šo žurnāla "
+#~ "ierakstu?"
+
+#~ msgid "Are you sure you want to delete the appointment `%s'?"
+#~ msgstr "Vai jūs esat pārliecināts, ka vēlaties dzēst šo tikšanos '%s'?"
+
+#~ msgid "Are you sure you want to delete this untitled appointment?"
+#~ msgstr ""
+#~ "Vai jūs esat pārliecināts, ka vēlaties dzēst informāciju par šo "
+#~ "nenosaukto tikšanos?"
+
+#~ msgid "Are you sure you want to delete the task `%s'?"
+#~ msgstr "Vai jūs esat pārliecināts, ka vēlaties dzēst šo uzdevumu '%s'?"
+
+#~ msgid "Are you sure you want to delete this untitled task?"
+#~ msgstr ""
+#~ "Vai jūs esat pārliecināts, ka vēlaties dzēst šo nenosaukto uzdevumu?"
+
+#~ msgid "Are you sure you want to delete the journal entry `%s'?"
+#~ msgstr ""
+#~ "Vai jūs esat pārliecināts, ka vēlaties dzēst šo žurnāla ierakstu '%s'?"
+
+#~ msgid "Are you sure want to delete this untitled journal entry?"
+#~ msgstr ""
+#~ "Vai jūs esat pārliecināts, ka vēlaties dzēst šo nenosaukto žurnāla "
+#~ "ierakstu?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d appointment?"
+#~ msgid_plural "Are you sure you want to delete %d appointments?"
+#~ msgstr[0] ""
+#~ "Vai jūs esat pārliecināts, ka vēlaties dzēst %d ierakstus par tikšanos?"
+#~ msgstr[1] ""
+#~ "Vai jūs esat pārliecināts, ka vēlaties dzēst %d ierakstus par tikšanos?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d task?"
+#~ msgid_plural "Are you sure you want to delete %d tasks?"
+#~ msgstr[0] "Vai jūs esat pārliecināts, ka vēlaties dzēst %d uzdevumus?"
+#~ msgstr[1] "Vai jūs esat pārliecināts, ka vēlaties dzēst %d uzdevumus?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d journal entry?"
+#~ msgid_plural "Are you sure you want to delete %d journal entries?"
+#~ msgstr[0] ""
+#~ "Vai jūs esat pārliecināts, ka vēlaties izdzēst %d žurnāla ierakstus?"
+#~ msgstr[1] ""
+#~ "Vai jūs esat pārliecināts, ka vēlaties izdzēst %d žurnāla ierakstus?"
+
+#~ msgid "_Invite Others..."
+#~ msgstr "_Ielūgt citus..."
+
+#, fuzzy
+#~ msgid ""
+#~ "This event has been changed, but has not been saved.\n"
+#~ "\n"
+#~ "Do you wish to save your changes?"
+#~ msgstr ""
+#~ "Šis paraksts ir izmainīts, bet nav saglabāts.\n"
+#~ "\n"
+#~ "Vai jūs vēlaties saglabāt jūsu izmaiņas?"
+
+#, fuzzy
+#~ msgid "Save Event"
+#~ msgstr "Kalendāra notikumi"
+
+#~ msgid "The meeting information has been created. Send it?"
+#~ msgstr "Informācija par sanāksmi ir izveidota. Nosūtīt to?"
+
+#~ msgid "The meeting information has changed. Send an updated version?"
+#~ msgstr "Informācija par sanāksmi ir izmainīta. Nosūtīt atjauninātu versiju?"
+
+#~ msgid "The task assignment information has been created. Send it?"
+#~ msgstr "Informācija par uzdevuma norīkojumu ir izveidota. Nosūtīt to?"
+
+#~ msgid "The task information has changed. Send an updated version?"
+#~ msgstr "Informācija par uzdevumu ir izmainīta. Nosūtīt atjauninātu versiju?"
+
+#, fuzzy
+#~ msgid "Could not get article %s from NNTP server"
+#~ msgstr "Nevarēju dabūt grupu sarakstu no servera."
+
+#, fuzzy
+#~ msgid "Error posting message: %s: message not posted"
+#~ msgstr ""
+#~ "Kļūda automātiski glabājot vēstuli: %s\n"
+#~ " %s"
+
+#, fuzzy
+#~ msgid "Stream error"
+#~ msgstr "parsēšanas kļūda"
+
+#, fuzzy
+#~ msgid "Connection error: %s"
+#~ msgstr "Nezināma kļūda: %s"
+
+#~ msgid "Could not get group: %s"
+#~ msgstr "Nevaru dabūt grupu: %s"
+
+#, fuzzy
+#~ msgid "Could not get messages: unspecified error"
+#~ msgstr "Nevarēju sagatavot vēstuli: %s"
+
+#~ msgid "Unknown server response: %s"
+#~ msgstr "Nezināma servera atbilde: %s"
+
+#~ msgid "Adjust Score"
+#~ msgstr "Piešķirt rezultātu"
+
+#~ msgid "Assign Color"
+#~ msgstr "Uzstādīt krāsu"
+
+#~ msgid "Assign Score"
+#~ msgstr "Uzstādīt rezultātu"
+
+#~ msgid "Attachments"
+#~ msgstr "Piesaistījumi"
+
+#~ msgid "Beep"
+#~ msgstr "Pīkstiens"
+
+#~ msgid "contains"
+#~ msgstr "satur"
+
+#~ msgid "Copy to Folder"
+#~ msgstr "Kopēt uz mapi"
+
+#~ msgid "Date received"
+#~ msgstr "Saņemšanas datums"
+
+#~ msgid "Date sent"
+#~ msgstr "Nosūtīšanas datums"
+
+#~ msgid "Deleted"
+#~ msgstr "Dzēsts"
+
+#~ msgid "does not contain"
+#~ msgstr "nesatur"
+
+#~ msgid "does not end with"
+#~ msgstr "nebeidzas ar"
+
+#~ msgid "does not exist"
+#~ msgstr "neeksistē"
+
+#~ msgid "does not return"
+#~ msgstr "neatgriežas"
+
+#~ msgid "does not sound like"
+#~ msgstr "neskan kā"
+
+#~ msgid "does not start with"
+#~ msgstr "nesākas ar"
+
+#~ msgid "Do Not Exist"
+#~ msgstr "Neeksistē"
+
+#~ msgid "Draft"
+#~ msgstr "Melnraksts"
+
+#~ msgid "ends with"
+#~ msgstr "beidzas ar"
+
+#~ msgid "Exist"
+#~ msgstr "Eksistē"
+
+#~ msgid "exists"
+#~ msgstr "eksistē"
+
+#~ msgid "Expression"
+#~ msgstr "Izteiksme"
+
+#~ msgid "Follow Up"
+#~ msgstr "Sekojums"
+
+#~ msgid "is"
+#~ msgstr "ir"
+
+#~ msgid "is after"
+#~ msgstr "ir pēc"
+
+#~ msgid "is before"
+#~ msgstr "ir pirms"
+
+#~ msgid "is Flagged"
+#~ msgstr "ir karogots"
+
+#~ msgid "is greater than"
+#~ msgstr "ir lielāks par"
+
+#~ msgid "is less than"
+#~ msgstr "ir mazāks par"
+
+#~ msgid "is not"
+#~ msgstr "nav"
+
+#~ msgid "is not Flagged"
+#~ msgstr "nav karogots"
+
+#, fuzzy
+#~ msgid "Junk Test"
+#~ msgstr "Jūnijs"
+
+#~ msgid "Mailing list"
+#~ msgstr "Adresātu saraksts"
+
+#~ msgid "Message Body"
+#~ msgstr "Vēstules ķermenis"
+
+#~ msgid "Message Header"
+#~ msgstr "Vēstules galvene"
+
+#, fuzzy
+#~ msgid "Message is Junk"
+#~ msgstr "Vēstule tika nosūtīta"
+
+#, fuzzy
+#~ msgid "Message is not Junk"
+#~ msgstr "Vēstule %s nav atrasta."
+
+#~ msgid "Move to Folder"
+#~ msgstr "Pārvietot uz mapi"
+
+#, fuzzy
+#~ msgid "Pipe to Program"
+#~ msgstr "Iziet no programmas"
+
+#~ msgid "Play Sound"
+#~ msgstr "Spēlēt skaņu"
+
+#~ msgid "Recipients"
+#~ msgstr "Adresāti"
+
+#~ msgid "Regex Match"
+#~ msgstr "Regex atbilšana"
+
+#~ msgid "Replied to"
+#~ msgstr "Atbildēts uz"
+
+#~ msgid "returns"
+#~ msgstr "atgriež"
+
+#~ msgid "returns greater than"
+#~ msgstr "atgriež lielāku kā"
+
+#~ msgid "returns less than"
+#~ msgstr "atgriež mazāk kā"
+
+#, fuzzy
+#~ msgid "Run Program"
+#~ msgstr "Palaist programmu:"
+
+#~ msgid "Sender"
+#~ msgstr "Sūtītajs"
+
+#~ msgid "Set Status"
+#~ msgstr "Uzstādīt statusu"
+
+#~ msgid "Size (kB)"
+#~ msgstr "Izmērs (kB)"
+
+#~ msgid "sounds like"
+#~ msgstr "skan kā"
+
+#~ msgid "Source Account"
+#~ msgstr "Avota konts"
+
+#~ msgid "Specific header"
+#~ msgstr "Specifiska galvene"
+
+#~ msgid "starts with"
+#~ msgstr "sākas ar"
+
+#~ msgid "Stop Processing"
+#~ msgstr "Apturēt procesēšanu"
+
+#~ msgid "Unset Status"
+#~ msgstr "Noņemt statusu"
+
+#~ msgid "Working"
+#~ msgstr "Strādāju"
+
+#~ msgid "Brought to you by"
+#~ msgstr "Piedāvā jums"
+
+#, fuzzy
+#~ msgid "_Filename:"
+#~ msgstr "Faila nosaukums:"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "Unknown error."
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Nezināma kļūda."
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the component system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Kļūda no komponentu sistēmas ir:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the activation system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Kļūda no aktivizēšanas sistēmas ir:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "View Certificate"
+#~ msgstr "_Sertifikāta ID:"
+
+#, fuzzy
+#~ msgid "You have been asked to trust a new Certificate Authority (CA)."
+#~ msgstr "Nepareiza sertifikāta autoritāte (SA)"
+
+#~ msgid "About Ximian Evolution..."
+#~ msgstr "Par Ximian Evolution..."
+
+#~ msgid "_About Ximian Evolution..."
+#~ msgstr "_Par Ximian Evolution..."
+
 #, fuzzy
 #~ msgid "Evolution Addressbook folder viewer"
 #~ msgstr "Evolution adrešu grāmatas minikaršu skatītājs"
@@ -20234,9 +20247,6 @@ msgstr "%s (%d%% izpildīts)"
 #~ msgid "Primary _email:"
 #~ msgstr "Primārais epasts"
 
-#~ msgid "S_pouse:"
-#~ msgstr "_Dzīvesbiedrs:"
-
 #, fuzzy
 #~ msgid "_Business:"
 #~ msgstr "Darījumi"
@@ -20257,9 +20267,6 @@ msgstr "%s (%d%% izpildīts)"
 #~ msgid "_Mobile:"
 #~ msgstr "Mobīlais tel."
 
-#~ msgid "_Office:"
-#~ msgstr "_Birojs:"
-
 #~ msgid "_Public Calendar URL:"
 #~ msgstr "_Publiskā kalendāra URL:"
 
@@ -21752,10 +21759,6 @@ msgstr "%s (%d%% izpildīts)"
 #~ msgstr "Objektu nevarēja atrast\n"
 
 #, fuzzy
-#~ msgid "Invalid object"
-#~ msgstr "Nepareizs mērķis"
-
-#, fuzzy
 #~ msgid "URI not loaded"
 #~ msgstr "EGrāmata (EBook) nav ielādēta\n"
 
@@ -25713,9 +25716,6 @@ msgstr "%s (%d%% izpildīts)"
 #~ msgid "Lannion"
 #~ msgstr "Laniona"
 
-#~ msgid "Lansing"
-#~ msgstr "Lansinga"
-
 #~ msgid "Lanzhou"
 #~ msgstr "Lanzhou"
 
diff --git a/po/mn.po b/po/mn.po
index f31ff835bb..1faee01116 100755
--- a/po/mn.po
+++ b/po/mn.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.3.5\n"
-"POT-Creation-Date: 2004-05-19 14:00-0400\n"
+"POT-Creation-Date: 2004-06-03 11:14-0400\n"
 "PO-Revision-Date: 2004-01-14 12:40+0800\n"
 "Last-Translator: Dulmandakh <sdulmandakh@yahoo.com>\n"
 "Language-Team: Mongolian <openmn-gnome@lists.sf.net>\n"
@@ -59,13 +59,13 @@ msgstr "картууд"
 msgid "Default Sync Address:"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:1150
 #: addressbook/conduit/address-conduit.c:1151
+#: addressbook/conduit/address-conduit.c:1152
 msgid "Could not load addressbook"
 msgstr "Хаягийн дэвтрийг ачааллаж чадсангүй"
 
-#: addressbook/conduit/address-conduit.c:1219
-#: addressbook/conduit/address-conduit.c:1222
+#: addressbook/conduit/address-conduit.c:1220
+#: addressbook/conduit/address-conduit.c:1223
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
@@ -73,13 +73,13 @@ msgstr ""
 msgid "Accessing LDAP Server anonymously"
 msgstr "LDAP серверт нэргүй хэрэглэгчээр хандаж байна"
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
 msgid "Failed to authenticate.\n"
 msgstr "Баталгаажуулалт хийж чадсангүй.\n"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%s %s-н нууц үгийг оруулах (%s хэрэглэгч)"
@@ -123,51 +123,23 @@ msgstr "_Холбоо"
 msgid "Create a new contacts group"
 msgstr "Шинэ холбоо үүсгэх"
 
-#: addressbook/gui/component/addressbook-component.c:182
+#: addressbook/gui/component/addressbook-component.c:184
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:483
-msgid "Failed to connect to LDAP server"
-msgstr "LDAP  серверт холбогдож чадсангүй"
-
-#: addressbook/gui/component/addressbook-config.c:507
-msgid "Failed to authenticate with LDAP server"
-msgstr "LDAP серверээр баталгаажуулж чадсангүй"
-
-#: addressbook/gui/component/addressbook-config.c:535
-msgid "Could not perform query on Root DSE"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:840
-msgid "The server responded with no supported search bases"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1245
-msgid "This server does not support LDAPv3 schema information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1266
-msgid "Error retrieving schema information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1274
-msgid "Server did not respond with valid schema information"
-msgstr ""
-
 #: addressbook/gui/component/addressbook-migrate.c:68
-#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1160
 msgid "Migrating..."
 msgstr ""
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1201
 #, c-format
 msgid "Migrating `%s':"
 msgstr ""
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:438
+#: addressbook/gui/component/addressbook-migrate.c:464
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
 #: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
@@ -175,30 +147,30 @@ msgid "On This Computer"
 msgstr "Энэ компьютер дээр"
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:446
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
-#: mail/mail-config.glade.h:106
+#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
+#: mail/mail-config.glade.h:109
 msgid "Personal"
 msgstr "Хувийн"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:454
+#: addressbook/gui/component/addressbook-migrate.c:480
 msgid "On LDAP Servers"
 msgstr "LDAP серверүүдэд"
 
-#: addressbook/gui/component/addressbook-migrate.c:582
+#: addressbook/gui/component/addressbook-migrate.c:608
 #, fuzzy
 msgid "LDAP Servers"
 msgstr "LDAP серверүүдэд"
 
-#: addressbook/gui/component/addressbook-migrate.c:702
+#: addressbook/gui/component/addressbook-migrate.c:728
 #, fuzzy
 msgid "Autocompletion Settings"
 msgstr "Автоматаар гүйцээх"
 
-#: addressbook/gui/component/addressbook-migrate.c:1076
+#: addressbook/gui/component/addressbook-migrate.c:1104
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -206,60 +178,55 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1090
+#: addressbook/gui/component/addressbook-migrate.c:1118
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1099
+#: addressbook/gui/component/addressbook-migrate.c:1127
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1109
+#: addressbook/gui/component/addressbook-migrate.c:1137
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:674
+#: addressbook/gui/component/addressbook-view.c:675
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:761
+#: addressbook/gui/component/addressbook-view.c:754
 #, fuzzy
 msgid "New Address Book"
 msgstr "Шинэ хаягийн дэвтэр"
 
-#: addressbook/gui/component/addressbook-view.c:762
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
+#: addressbook/gui/component/addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Устгах"
 
-#: addressbook/gui/component/addressbook-view.c:763
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-view.c:756
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Шинжүүд:"
 
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/addressbook-view.c:1002
+#. Create the contacts group
+#: addressbook/gui/component/addressbook-view.c:995
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
 #: calendar/gui/migration.c:373
 msgid "Contacts"
 msgstr "Холбоонууд"
@@ -337,10 +304,6 @@ msgid "Manage your S/MIME certificates here"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-msgid "  S_how Supported Bases "
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -355,389 +318,321 @@ msgstr ""
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1:00"
-msgstr "1:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
-msgstr "5:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "<b>Б_айршил</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
 #, fuzzy
 msgid "<b>Display</b>"
 msgstr "_Үзүүл"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 #, fuzzy
 msgid "<b>Downloading</b>"
 msgstr "<b>Б_айршил</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:10
 #, fuzzy
 msgid "<b>Searching</b>"
 msgstr "Хайж байна"
 
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
 msgid "<b>Server Information</b>"
 msgstr "2-р алхам: Серверийн мэдээлэл"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
 msgid "<b>Type:</b>"
 msgstr "<b>Хугацаа</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:13
 #, fuzzy
 msgid "Add Contacts Group"
 msgstr "_Холбоо"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:14
 #, fuzzy
 msgid "Address Book Properties"
 msgstr "Хаягийн дэвтэр"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
-#: mail/mail-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
+#: mail/mail-config.glade.h:42
 msgid "Always"
 msgstr "Үргэлж"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr "Хэн нэгэнээр"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:17
 #: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Энгийн"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
-msgid "Connecting"
-msgstr "Холбогдож байна"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 #: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Дэлгэрэнгүй"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
-msgid "Distinguished _name:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:20
 #, fuzzy
 msgid "Download limit:"
 msgstr "_Татаж авах хязгаар:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Email address"
 msgstr "Ц-шуудангийн хаяг:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "Email address:"
-msgstr "Ц-шуудангийн хаяг:"
-
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "Evolution will use this DN to authenticate you with the server"
-msgstr "Коста Рика"
-
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:22
+#, fuzzy
 msgid ""
-"Evolution will use this email address to authenticate you with the server"
-msgstr ""
+"Evolution will use this email address to authenticate you with the server."
+msgstr "Коста Рика"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:23
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Дэмжигдсэн хайлтын сууриуд"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:24
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
+#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Ерөнхий"
 
-#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
-#: mail/mail-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
+#: mail/mail-config.glade.h:102
 msgid "Never"
 msgstr "Хэзээ ч"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
-msgid "One"
-msgstr "Нэг"
-
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:35
-msgid "S_earch scope: "
-msgstr "Хайх _хүрээ"
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Search _base:"
+msgstr "_Хайлтын суурь:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
 msgid "Search base only"
 msgstr "_Хайлтын суурь:"
 
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:29
 #, fuzzy
 msgid "Search base:"
 msgstr "_Хайлтын суурь:"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Search scope:"
 msgstr "Хайх _хүрээ"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
-msgid "Searching"
-msgstr "Хайж байна"
-
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:31
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
-"server if\n"
-"your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL or TLS."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a \n"
-"insecure environment. For example, if you and your LDAP server are behind a "
-"firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection "
-"is already\n"
-"secure."
+"you are in a insecure environment. For example, if you and your LDAP server "
+"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
+"because your connection is already secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
-"TLS.  This \n"
-"means that your connection will be insecure, and that you will be vulnerable "
-"to security\n"
-"exploits. "
+"TLS.  This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Sub"
-msgstr "Дэд"
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr "Дэмжигдсэн хайлтын сууриуд"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
-"searches will \n"
-"begin. If you leave this blank, the search will begin at the root of the "
-"directory tree."
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
-"the \n"
-"directory tree. A search scope of \"sub\" will include all entries below "
-"your search base.\n"
-"A search scope of \"one\" will only include the entries one level beneath "
-"your base.\n"
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:58
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
-"This is the maximum number of entries to download. Setting this number to "
-"be \n"
+"This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:41
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
-"list.\n"
-"It is for display purposes only. "
+"list. It is for display purposes only. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. "
-"A \n"
-"list of standard ports has been provided. Ask your system administrator\n"
-"what port you should specify."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:67
-msgid "This option controls how long a search will be run."
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:43
 #, fuzzy
 msgid "Timeout:"
 msgstr "Цагийн хэлбэр:"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
-msgid "U_se SSL/TLS:"
-msgstr "SSL/TLS ашиглах:"
-
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr "Ц-шуудангийн хаяг ашиглан"
 
-#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
-#: mail/mail-config.glade.h:154
+#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
+#: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr "Хэзээ ч боломжтой"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:47
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "_Холбоо"
 
-#: addressbook/gui/component/ldap-config.glade.h:74
-#: calendar/gui/dialogs/calendar-setup.glade.h:12
-msgid "_Display name:"
-msgstr "_Харуулах нэр:"
-
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr "_Татаж авах хязгаар:"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
 msgid "_Email address:"
 msgstr "Ц-шуудангийн хаяг:"
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:50
+#, fuzzy
+msgid "_Find Possible Search Bases"
+msgstr "Дэмжигдсэн хайлтын сууриуд"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Log in method:"
 msgstr "_Нэвтрэх арга:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "_Log in:"
+msgstr "_Нэвтрэх арга:"
+
+#: addressbook/gui/component/ldap-config.glade.h:53
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
 msgid "_Name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:79
-msgid "_Port number:"
-msgstr "_Портын дугаар:"
-
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "_Port:"
 msgstr "_Давуу эрх:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
-msgid "_Search base:"
-msgstr "_Хайлтын суурь:"
-
-#: addressbook/gui/component/ldap-config.glade.h:82
-msgid "_Server name:"
-msgstr "_Серверийн нэр:"
+#: addressbook/gui/component/ldap-config.glade.h:55
+#, fuzzy
+msgid "_Search scope:"
+msgstr "Хайх _хүрээ"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:56
 #, fuzzy
 msgid "_Server:"
 msgstr "_Серверийн нэр:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
-msgid "_Timeout (minutes):"
-msgstr ""
+#: addressbook/gui/component/ldap-config.glade.h:57
+#, fuzzy
+msgid "_Timeout:"
+msgstr "Цагийн хэлбэр:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:58
 msgid "_Use secure connection:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "картууд"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
-msgid "connecting-tab"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:88
-msgid "general-tab"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:60
 #: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
-#: mail/mail-config.glade.h:182
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "минут"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
-msgid "searching-tab"
-msgstr ""
-
-#: addressbook/gui/component/select-names/e-select-names.c:497
+#: addressbook/gui/component/select-names/e-select-names.c:503
 #: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid "Select Contacts from Address Book"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
@@ -777,7 +672,7 @@ msgstr "Нэргүй холбоо"
 
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:222
+#: addressbook/gui/widgets/e-addressbook-view.c:224
 msgid "Source"
 msgstr "Эх үүсвэр"
 
@@ -856,9 +751,9 @@ msgid "<b>Work</b>"
 msgstr "<b>Ажлын долоо хоног</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
-#: addressbook/gui/widgets/eab-contact-display.c:342
-#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/widgets/eab-contact-display.c:334
+#: addressbook/gui/widgets/eab-contact-display.c:353
 msgid "AIM"
 msgstr ""
 
@@ -898,15 +793,15 @@ msgid "Company:"
 msgstr "_Компаниар"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:271
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
+#: addressbook/gui/contact-editor/e-contact-editor.c:266
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
 msgstr "Холбоо"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1527
+#: addressbook/gui/contact-editor/e-contact-editor.c:520
 msgid "Contact Editor"
 msgstr "Холбооны засварлагч"
 
@@ -930,97 +825,95 @@ msgid "Full _Name..."
 msgstr "Бүтэн _нэр..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:202
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-msgid "Home"
-msgstr "Гэрийн"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #, fuzzy
 msgid "Home Page:"
 msgstr "Вэб хуудас"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-#, fuzzy
-msgid "Job title:"
-msgstr "Албан _тушаал:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/e-itip-control.c:936
-msgid "Location:"
-msgstr "Байршил:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 #, fuzzy
 msgid "MSN Messenger"
 msgstr "_Дараагийн зурвас"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 #, fuzzy
 msgid "Mailing Address"
 msgstr "Ц-шуудангийн хаяг"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 #, fuzzy
 msgid "Manager:"
 msgstr "Зохион байгуулагч"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "_Хоч:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Notes:"
 msgstr "Т_эмдэглэлүүд:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
-#: addressbook/gui/contact-editor/e-contact-editor.c:203
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-msgid "Other"
-msgstr "Бусад"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#, fuzzy
+msgid "Office:"
+msgstr "Ажлын _байр:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "PO Box:"
 msgstr "_Шуудангийн хайрцаг:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 #, fuzzy
 msgid "Personal Information"
 msgstr "Мэдээлэл алга"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 #, fuzzy
 msgid "Profession:"
 msgstr "_Мэргэжил:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#, fuzzy
+msgid "Spouse:"
+msgstr "Гэр бүлийн хүн:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "State/Province:"
 msgstr "_Муж/Аймаг:"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#, fuzzy
+msgid "Title:"
+msgstr "Албан тушаал"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+msgid "Video Chat:"
+msgstr ""
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "Wants to receive HTML mail"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:42
-msgid "Webcam:"
-msgstr ""
+#, fuzzy
+msgid "Web Log:"
+msgstr "_Вэб хуудас нээх"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
-#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
-#: mail/mail-config.glade.h:155
+#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
+#: mail/mail-config.glade.h:157
 msgid "Work"
 msgstr "Ажилын"
 
@@ -1040,41 +933,34 @@ msgid "_File under:"
 msgstr "_Шүүлтүүрүүд..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 #, fuzzy
 msgid "_Where:"
 msgstr "_Хэрэглэгч:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
-msgid "item7"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
-msgid "item8"
-msgstr ""
-
-#: addressbook/gui/contact-editor/eab-editor.c:316
+#: addressbook/gui/contact-editor/eab-editor.c:315
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/eab-editor.c:319
+#: addressbook/gui/contact-editor/eab-editor.c:318
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:351
-#: addressbook/gui/widgets/eab-contact-display.c:372
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Address"
 msgstr "Хаяг"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:292
+#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard.c:174
@@ -2059,86 +1945,109 @@ msgstr "Замби"
 msgid "Zimbabwe"
 msgstr "Зимбаб"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/contact-editor/e-contact-editor.c:179
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:337
+#: addressbook/gui/widgets/eab-contact-display.c:356
 msgid "Jabber"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:347
-#: addressbook/gui/widgets/eab-contact-display.c:366
+#: addressbook/gui/contact-editor/e-contact-editor.c:180
+#: addressbook/gui/widgets/eab-contact-display.c:339
+#: addressbook/gui/widgets/eab-contact-display.c:358
 msgid "Yahoo"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: addressbook/gui/widgets/eab-contact-display.c:338
+#: addressbook/gui/widgets/eab-contact-display.c:357
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:344
-#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#: addressbook/gui/widgets/eab-contact-display.c:355
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/contact-editor/e-contact-editor.c:183
 #, fuzzy
 msgid "GroupWise"
 msgstr "Бүлэг"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+msgid "Home"
+msgstr "Гэрийн"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+msgid "Other"
+msgstr "Бусад"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
 msgid "Source Book"
 msgstr "Эх дэвтэр"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:264
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:278
+#: addressbook/gui/contact-editor/e-contact-editor.c:273
 msgid "Is New Contact"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:285
+#: addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Writable Fields"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:299
+#: addressbook/gui/contact-editor/e-contact-editor.c:294
 msgid "Changed"
 msgstr "Өөрчлөгдсөн"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
-msgid "Category editor not available."
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:2352
 msgid "This contact belongs to these categories:"
 msgstr ""
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#: addressbook/gui/contact-editor/e-contact-editor.c:2429
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Тэмдэглэгдсэн холбоонуудыг устгах"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#: addressbook/gui/contact-editor/e-contact-editor.c:2433
 #, fuzzy
 msgid "No image"
 msgstr "Негр"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#: addressbook/gui/contact-editor/e-contact-editor.c:2636
 #, fuzzy
 msgid ""
-"The following entries are invalid:\n"
+"The contact data is invalid:\n"
 "\n"
 msgstr "Дараахи холболтууд одоо идэвхитэй байна:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2738
-#, c-format
-msgid "Could not find widget for a field: `%s'"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#, fuzzy
+msgid "Invalid contact."
+msgstr "%d холбоонууд"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+msgid ""
+"The contact cannot be saved to the selected address book. Do you want to "
+"discard changes?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2727
+#: addressbook/gui/contact-editor/e-contact-editor.c:2751
+msgid "_Discard"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+msgid ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:62
@@ -2175,7 +2084,7 @@ msgid "_Edit Full"
 msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:166
 msgid "_Full Name:"
 msgstr "_Бүтэн нэр:"
 
@@ -2324,30 +2233,30 @@ msgstr "_Жагсаалтын нэр:"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "contact-list-editor"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:153
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:215
+#: addressbook/gui/widgets/e-addressbook-view.c:217
 #: addressbook/gui/widgets/e-minicard-view.c:460
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Дэвтэр"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
 msgid "Is New List"
 msgstr "Шинэ жагсаалт"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:215
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
 msgid "Contact List Editor"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:438
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
 msgid "Save List as VCard"
 msgstr ""
 
@@ -2390,124 +2299,124 @@ msgstr ""
 msgid "Advanced Search"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:129
-#: addressbook/gui/widgets/eab-contact-display.c:192
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:139
-#: addressbook/gui/widgets/eab-contact-display.c:205
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:257
-#: addressbook/gui/widgets/eab-contact-display.c:533
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:525
 msgid "List Members"
 msgstr "Гишүүдийг жагсаах"
 
-#: addressbook/gui/widgets/eab-contact-display.c:329
-#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/eab-contact-display.c:321
+#: addressbook/gui/widgets/eab-contact-display.c:323
 #, fuzzy
 msgid "E-mail"
 msgstr "Ц-шуудан"
 
-#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/eab-contact-display.c:332
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Байгууллага"
 
-#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:333
 #, fuzzy
 msgid "Position"
 msgstr "Тайлбар"
 
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:354
 #, fuzzy
 msgid "Groupwise"
 msgstr "Бүлэг"
 
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:340
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:349
-#: addressbook/gui/widgets/eab-contact-display.c:370
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:362
 #, fuzzy
 msgid "Phone"
 msgstr "Машины утас"
 
-#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:342
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:354
+#: addressbook/gui/widgets/eab-contact-display.c:346
 #, fuzzy
 msgid "work"
 msgstr "Ажилын"
 
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:359
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:368
-#: addressbook/gui/widgets/eab-contact-display.c:587
+#: addressbook/gui/widgets/eab-contact-display.c:360
+#: addressbook/gui/widgets/eab-contact-display.c:579
 msgid "Blog"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/eab-contact-display.c:363
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Гар утас"
 
-#: addressbook/gui/widgets/eab-contact-display.c:375
+#: addressbook/gui/widgets/eab-contact-display.c:367
 #, fuzzy
 msgid "personal"
 msgstr "Хувийн"
 
-#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/eab-contact-display.c:374
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Тэмдэглэл"
 
-#: addressbook/gui/widgets/eab-contact-display.c:548
+#: addressbook/gui/widgets/eab-contact-display.c:540
 msgid "Job Title"
 msgstr "Албан тушаал"
 
-#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/eab-contact-display.c:544
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:774
+#: smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "Ц-шуудан"
 
-#: addressbook/gui/widgets/eab-contact-display.c:579
+#: addressbook/gui/widgets/eab-contact-display.c:571
 msgid "Home page"
 msgstr "Вэб хуудас"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 msgid "Success"
 msgstr "Амжилттай"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Backend busy"
 msgstr ""
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Repository offline"
 msgstr ""
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 #, fuzzy
 msgid "Address Book does not exist"
 msgstr "Хаягийн дэвтэр"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 #, fuzzy
 msgid "No Self Contact defined"
 msgstr "Шинэ холбооны жагсаалт"
@@ -2515,27 +2424,27 @@ msgstr "Шинэ холбооны жагсаалт"
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Permission denied"
 msgstr "Зөвшөөрөгдөөгүй"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Contact not found"
 msgstr "Холбоо олдсонгүй"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Contact ID already exists"
 msgstr ""
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Protocol not supported"
 msgstr ""
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:60
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:233
 #: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
@@ -2548,38 +2457,38 @@ msgid "Cancelled"
 msgstr "Цуцлагдсан"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:61
 #, fuzzy
 msgid "Could not cancel"
 msgstr "`%s' хавтсыг нээж чадахгүй байна"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Authentication Failed"
 msgstr "Баталгаажуулж чадсангүй"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Authentication Required"
 msgstr "Баталгаажуулах хэрэгтэй"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:66
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "TLS not Available"
 msgstr ""
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#: addressbook/gui/widgets/eab-gui-util.c:66
 msgid "No such source"
 msgstr ""
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:69
+#: addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Other error"
 msgstr "Бусад алдаа"
 
-#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:90
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
@@ -2588,20 +2497,20 @@ msgstr ""
 "Энэ хаягийн дэвтрийг нээх боломжгүй. Түүний оршиж буй зам\n"
 " болон хандах эрхээ шалгана уу."
 
-#: addressbook/gui/widgets/eab-gui-util.c:110
+#: addressbook/gui/widgets/eab-gui-util.c:97
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:102
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution you must compile the program from the CVS "
-"sources after retrieving OpenLDAP from the link below."
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:109
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -2610,11 +2519,7 @@ msgstr ""
 "Энэ хаягийн дэвтрийг нээх боломжгүй. Түүний оршиж буй зам\n"
 " болон хандах эрхээ шалгана уу."
 
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "Unable to open addressbook"
-msgstr "Хаягийн дэвтрийг нээх боломжгүй"
-
-#: addressbook/gui/widgets/eab-gui-util.c:162
+#: addressbook/gui/widgets/eab-gui-util.c:129
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2622,7 +2527,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:168
+#: addressbook/gui/widgets/eab-gui-util.c:135
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -2630,110 +2535,97 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:174
+#: addressbook/gui/widgets/eab-gui-util.c:141
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:177
+#: addressbook/gui/widgets/eab-gui-util.c:144
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:147
 msgid "This query did not complete successfully."
 msgstr "Энэ хүсэлт амжилттай дууссангүй."
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
-msgid "Do you want to save changes?"
-msgstr "Өөрчлөлтүүдийг хадгалахыг хүсч байна уу?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:208
-msgid "_Discard"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:169
 msgid "Error adding list"
 msgstr "Жагсаалтыг нэмэхэд алдаа гарлаа"
 
-#: addressbook/gui/widgets/eab-gui-util.c:229
-#: addressbook/gui/widgets/eab-gui-util.c:652
+#: addressbook/gui/widgets/eab-gui-util.c:169
+#: addressbook/gui/widgets/eab-gui-util.c:580
 msgid "Error adding contact"
 msgstr "Холбоо нэмэхэд алдаа гарлаа"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying list"
 msgstr "Жагсаалтыг өөрчлөхөд алдаа гарлаа"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying contact"
 msgstr "Холбоог өөрчлөхөд алдаа гарлаа"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:192
 msgid "Error removing list"
 msgstr "Жагсаалтыг устгахад алдаа гарлаа"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
-#: addressbook/gui/widgets/eab-gui-util.c:610
+#: addressbook/gui/widgets/eab-gui-util.c:192
+#: addressbook/gui/widgets/eab-gui-util.c:538
 msgid "Error removing contact"
 msgstr "Холбоог устгахад алдаа гарлаа"
 
-#: addressbook/gui/widgets/eab-gui-util.c:334
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:360
+#: addressbook/gui/widgets/eab-gui-util.c:300
 #, c-format
 msgid ""
 "%s already exists\n"
 "Do you want to overwrite it?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:364
+#: addressbook/gui/widgets/eab-gui-util.c:304
 msgid "Overwrite"
 msgstr "Дарж бичих"
 
-#: addressbook/gui/widgets/eab-gui-util.c:400
-#, c-format
-msgid "Error saving %s: %s"
-msgstr ""
-
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:437
+#: addressbook/gui/widgets/eab-gui-util.c:365
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:571
+#: addressbook/gui/widgets/eab-gui-util.c:499
 msgid "list"
 msgstr "жагсаах"
 
-#: addressbook/gui/widgets/eab-gui-util.c:706
+#: addressbook/gui/widgets/eab-gui-util.c:634
 msgid "Move contact to"
 msgstr "Холбоог зөөх"
 
-#: addressbook/gui/widgets/eab-gui-util.c:708
+#: addressbook/gui/widgets/eab-gui-util.c:636
 msgid "Copy contact to"
 msgstr "Холбоог хуулах"
 
-#: addressbook/gui/widgets/eab-gui-util.c:711
+#: addressbook/gui/widgets/eab-gui-util.c:639
 msgid "Move contacts to"
 msgstr "Холбоонуудыг зөөх"
 
-#: addressbook/gui/widgets/eab-gui-util.c:713
+#: addressbook/gui/widgets/eab-gui-util.c:641
 msgid "Copy contacts to"
 msgstr "Холбоонуудыг хуулах"
 
-#: addressbook/gui/widgets/eab-gui-util.c:716
+#: addressbook/gui/widgets/eab-gui-util.c:644
 #, fuzzy
 msgid "Select target addressbook."
 msgstr "Хаягийн дэвтэрт хадгалах"
 
-#: addressbook/gui/widgets/eab-gui-util.c:939
+#: addressbook/gui/widgets/eab-gui-util.c:867
 msgid "Multiple VCards"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:942
+#: addressbook/gui/widgets/eab-gui-util.c:870
 #, c-format
 msgid "VCard for %s"
 msgstr ""
@@ -2821,7 +2713,7 @@ msgstr[1] "%d холбоонууд"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:229
+#: addressbook/gui/widgets/e-addressbook-view.c:231
 #: addressbook/gui/widgets/e-minicard-view.c:467
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
@@ -2839,143 +2731,135 @@ msgstr "Загвар"
 msgid "Error modifying card"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:163
 msgid "Name begins with"
 msgstr "Нэрний эхний үсэг"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:164
 msgid "Email begins with"
 msgstr "Ц-шуудангийн эхний үсэг"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:57
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr ""
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-#: calendar/gui/cal-search-bar.c:50
+#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+#: addressbook/gui/widgets/e-addressbook-view.c:172
 msgid "Advanced..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:236
+#: addressbook/gui/widgets/e-addressbook-view.c:238
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:249
+#: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Төрөл"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:506
+#: addressbook/gui/widgets/e-addressbook-view.c:508
 #, fuzzy
 msgid "Address Book"
 msgstr "Хаягийн дэвтэр"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2076
+#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:2080
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
 msgstr "Нэрээр хадгалах..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 msgid "New Contact..."
 msgstr "Шинэ холбоо..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "New Contact List..."
 msgstr "Шинэ холбооны жагсаалт..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Go to Folder..."
 msgstr "Хавтас руу оч..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Import..."
 msgstr "Оруулах..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1066
 msgid "Search for Contacts..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Хаягийн дэвтэр..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1069
 msgid "Pilot Settings..."
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
 msgid "Send Message to Contact"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Хэвлэх"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
+#: addressbook/gui/widgets/e-addressbook-view.c:1077
 msgid "Print Envelope"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
+#: addressbook/gui/widgets/e-addressbook-view.c:1081
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Хаягийн дэвтэр..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1080
+#: addressbook/gui/widgets/e-addressbook-view.c:1082
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Хаягийн дэвтэр..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Хайчлах"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Хуулах"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1087
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Буулгах"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:1092
+#: calendar/gui/e-calendar-view.c:1280
 msgid "Current View"
 msgstr "Одоогийн үзэмж"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1309
-#, c-format
-msgid ""
-"The addressbook backend for\n"
-"%s\n"
-"has crashed. You will have to restart Evolution in order to use it again"
-msgstr ""
-
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1667
-#: calendar/gui/cal-search-bar.c:362
+#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr ""
 
@@ -3081,7 +2965,7 @@ msgstr "Радио"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-list-view.c:234
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Үүрэг"
@@ -3218,12 +3102,12 @@ msgstr "Эволюшин сэрүүлэг"
 msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.c:998
+#: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr "Холбоонуудыг хэвлэх"
 
-#: addressbook/printing/e-contact-print.c:1064
-#: addressbook/printing/e-contact-print.c:1091
+#: addressbook/printing/e-contact-print.c:1066
+#: addressbook/printing/e-contact-print.c:1093
 msgid "Print contact"
 msgstr "Холбоог хэвлэх"
 
@@ -3470,15 +3354,21 @@ msgstr ""
 msgid "Impossible internal error."
 msgstr ""
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:629
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
 msgid "Can not open file"
 msgstr "Файлыг нээх чадахгүй"
 
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-msgid "Can not load URI"
-msgstr ""
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "Хаягийн дэвтрийг ачааллаж чадсангүй"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Хаягийн дэвтрийг нээх боломжгүй"
 
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
@@ -3496,7 +3386,7 @@ msgstr ""
 msgid "Unnamed List"
 msgstr "Нэр үгүй жагсаалт"
 
-#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
 msgstr ""
@@ -3757,10 +3647,10 @@ msgid "Whether to show week numbers in date navigator"
 msgstr ""
 
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:88
-#: calendar/gui/gnome-cal.c:1703
-#: camel/providers/groupwise/camel-gw-listener.c:304
-#: camel/providers/groupwise/camel-gw-listener.c:327
+#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/gnome-cal.c:1705
+#: camel/providers/groupwise/camel-gw-listener.c:311
+#: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
 msgstr "Хуанли"
 
@@ -3777,7 +3667,7 @@ msgstr ""
 
 #: calendar/gui/calendar-commands.c:363
 #: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:19 filter/filter.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
 msgid "days"
 msgstr "өдрүүд"
 
@@ -3922,24 +3812,24 @@ msgstr "Долоо хоногийн үзэмж"
 msgid "Month View"
 msgstr "Сарын  үзэмж"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Дүгнэлтэд агуулагдаж байна"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Тайлбарт агуулагдаж байна"
 
-#: calendar/gui/cal-search-bar.c:54
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Тайлбарт агуулагдаж байна"
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:53
 #, fuzzy
 msgid "Location contains"
 msgstr "Тайлбарт агуулагдаж байна"
 
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
 msgid "Unmatched"
 msgstr "Тохироогүй"
 
@@ -3960,23 +3850,23 @@ msgstr ""
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:466
+#: calendar/gui/dialogs/alarm-options.c:467
 msgid "Audio Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:475
+#: calendar/gui/dialogs/alarm-options.c:476
 msgid "Message Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:484
+#: calendar/gui/dialogs/alarm-options.c:485
 msgid "Email Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:493
+#: calendar/gui/dialogs/alarm-options.c:494
 msgid "Program Alarm Options"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:510
 msgid "Unknown Alarm Options"
 msgstr ""
 
@@ -4014,7 +3904,7 @@ msgstr "Илгээх этгээд:"
 msgid "With these arguments:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
 msgid "dialog1"
 msgstr ""
 
@@ -4023,7 +3913,7 @@ msgid "extra times every"
 msgstr ""
 
 #: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:20 filter/filter.glade.h:16
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr "цаг"
 
@@ -4071,7 +3961,7 @@ msgstr "Ц-захиа илгээх"
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Нийт:"
 
@@ -4101,7 +3991,6 @@ msgid "hour(s)"
 msgstr "цаг"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:21
 msgid "minute(s)"
 msgstr "минут"
 
@@ -4109,26 +3998,26 @@ msgstr "минут"
 msgid "start of appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:170
+#: calendar/gui/dialogs/calendar-setup.c:172
 msgid "You must specify a location to get the calendar from."
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:178
+#: calendar/gui/dialogs/calendar-setup.c:180
 #, c-format
 msgid "The source location '%s' is not well-formed."
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:193
+#: calendar/gui/dialogs/calendar-setup.c:195
 #, c-format
 msgid "The source location '%s' is not a webcal source."
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:265
+#: calendar/gui/dialogs/calendar-setup.c:275
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:278
+#: calendar/gui/dialogs/calendar-setup.c:288
 #, c-format
 msgid ""
 "The group '%s' is remote. You must specify a location to get the calendar "
@@ -4150,60 +4039,36 @@ msgstr "Үүргийн жагсаалтын бүлэг"
 msgid "C_olor:"
 msgstr "Коморск"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-#, fuzzy
-msgid "Calendar Properties"
-msgstr "Хуанлийн бүлэг"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
 msgid "Pick a color"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:8
-#, fuzzy
-msgid "Remote"
-msgstr "Устгах"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-#, fuzzy
-msgid "Task List Properties"
-msgstr "Үүргийн жагсаалтын бүлэг"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
 #, fuzzy
 msgid "_Add Calendar"
 msgstr "Шинэ хуанли нэмэх"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
 #, fuzzy
 msgid "_Add Group"
 msgstr "Бүлэг"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-msgid "_Refresh Interval:"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
 #, fuzzy
 msgid "_Refresh:"
 msgstr "Ахин шинэчлэх"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-#, fuzzy
-msgid "_Source URL:"
-msgstr "Эх үүсвэр"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
 #, fuzzy
 msgid "_Type:"
 msgstr "Төрөл:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
 #, fuzzy
 msgid "_URL:"
 msgstr "URL"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
 msgid "weeks"
 msgstr ""
 
@@ -4312,7 +4177,7 @@ msgid "Display"
 msgstr "_Үзүүл"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:76
 msgid "E_nable"
 msgstr ""
 
@@ -4323,7 +4188,7 @@ msgstr "Чөлөөтэй/завгүй хүсэлт"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:563
+#: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Баасан"
 
@@ -4337,7 +4202,7 @@ msgstr "Минут"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:559
+#: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Даваа"
 
@@ -4347,7 +4212,7 @@ msgstr "Н_ям"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:564
+#: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Бямба"
 
@@ -4361,7 +4226,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Ням"
 
@@ -4375,7 +4240,7 @@ msgstr "Пү_р"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:562
+#: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Пүрэв"
 
@@ -4389,7 +4254,7 @@ msgstr "Цагийн хэлбэр:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:560
+#: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Мягмар"
 
@@ -4399,7 +4264,7 @@ msgstr "_Долоо хоног эхлэнэ:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:561
+#: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Лхагва"
 
@@ -4433,7 +4298,7 @@ msgid "_Day begins:"
 msgstr "_Өдөр эхлэнэ:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
-#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:43
@@ -4482,76 +4347,46 @@ msgstr "_Лха"
 msgid "before every appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/cancel-comp.c:57
-msgid ""
-"The event being deleted is a meeting, would you like to send a cancellation "
-"notice?"
-msgstr ""
-
-#: calendar/gui/dialogs/cancel-comp.c:60
-msgid "Are you sure you want to cancel and delete this meeting?"
-msgstr ""
-
-#: calendar/gui/dialogs/cancel-comp.c:66
-msgid ""
-"The task being deleted is assigned, would you like to send a cancellation "
-"notice?"
-msgstr ""
-
-#: calendar/gui/dialogs/cancel-comp.c:69
-msgid "Are you sure you want to cancel and delete this task?"
-msgstr ""
-
-#: calendar/gui/dialogs/cancel-comp.c:75
-msgid ""
-"The journal entry being deleted is published, would you like to send a "
-"cancellation notice?"
-msgstr ""
-
-#: calendar/gui/dialogs/cancel-comp.c:78
-msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr ""
-
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:68
 msgid "This journal entry has been deleted."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:75
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:82
+#: calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:92
 msgid "This journal entry has been changed."
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:99
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
@@ -4589,7 +4424,7 @@ msgid "No summary"
 msgstr "Дүгнэлт алга"
 
 #: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
 #: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Нэрээр хадгалах..."
@@ -4643,99 +4478,51 @@ msgstr "`%s' хавтсыг нээж чадахгүй байна"
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:95
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "Та энэ уулзалтыг устгахыг хүсч байна уу?"
-
-#: calendar/gui/dialogs/delete-comp.c:98
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "Та энэ нэрлэгдээгүй уулзалтыг устгахыг хүсч байна уу?"
-
-#: calendar/gui/dialogs/delete-comp.c:104
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "`%s' үүргийг устгана гэдэгтээ итгэлтэй байна уу?"
-
-#: calendar/gui/dialogs/delete-comp.c:107
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "Та энэ нэр үгүй үүргийг устгана гэдэгтээ итгэлтэй байна уу?"
-
-#: calendar/gui/dialogs/delete-comp.c:113
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:116
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr ""
-
-#: calendar/gui/dialogs/delete-comp.c:131
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d appointment?"
-msgid_plural "Are you sure you want to delete %d appointments?"
-msgstr[0] "Та %d уулзалтуудыг устгахыг хүсч байна уу?"
-msgstr[1] "Та %d уулзалтуудыг устгахыг хүсч байна уу?"
-
-#: calendar/gui/dialogs/delete-comp.c:138
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d task?"
-msgid_plural "Are you sure you want to delete %d tasks?"
-msgstr[0] "`%s' үүргийг устгана гэдэгтээ итгэлтэй байна уу?"
-msgstr[1] "`%s' үүргийг устгана гэдэгтээ итгэлтэй байна уу?"
-
-#: calendar/gui/dialogs/delete-comp.c:145
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d journal entry?"
-msgid_plural "Are you sure you want to delete %d journal entries?"
-msgstr[0] "Та %d уулзалтуудыг устгахыг хүсч байна уу?"
-msgstr[1] "Та %d уулзалтуудыг устгахыг хүсч байна уу?"
-
-#: calendar/gui/dialogs/delete-error.c:52
+#: calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:55
+#: calendar/gui/dialogs/delete-error.c:57
 msgid "The task could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:58
+#: calendar/gui/dialogs/delete-error.c:60
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:61
+#: calendar/gui/dialogs/delete-error.c:63
 msgid "The item could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:68
+#: calendar/gui/dialogs/delete-error.c:70
 msgid "The event could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:71
+#: calendar/gui/dialogs/delete-error.c:73
 msgid "The task could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:74
+#: calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:77
+#: calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:84
+#: calendar/gui/dialogs/delete-error.c:86
 msgid "The event could not be deleted due to an error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:87
+#: calendar/gui/dialogs/delete-error.c:89
 msgid "The task could not be deleted due to an error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:90
+#: calendar/gui/dialogs/delete-error.c:92
 msgid "The journal entry could not be deleted due to an error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:93
+#: calendar/gui/dialogs/delete-error.c:95
 msgid "The item could not be deleted due to an error"
 msgstr ""
 
@@ -4872,11 +4659,11 @@ msgstr "_Эхлэх цаг:"
 
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:3
+#: calendar/gui/dialogs/meeting-page.glade.h:4
 #: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
 #: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1559
-#: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:100
+#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
+#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
@@ -4902,8 +4689,8 @@ msgstr ""
 #. FIXME: need to disable for undeletable folders
 #: calendar/gui/dialogs/meeting-page.c:655
 #: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1310 calendar/gui/e-calendar-view.c:1342
-#: mail/em-folder-tree.c:2557 mail/em-folder-view.c:919
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
+#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -4911,7 +4698,7 @@ msgid "_Delete"
 msgstr "_Устгах"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:240
+#: calendar/gui/e-meeting-list-view.c:218
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr ""
@@ -4947,16 +4734,15 @@ msgid "Member"
 msgstr "Гишүүн"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
-#: mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-list-view.c:248
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
 msgid "Status"
 msgstr ""
 
@@ -4964,18 +4750,18 @@ msgstr ""
 msgid "Add A_ttendee"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "Add attendees from addressbook."
+msgstr "Хаягийн дэвтэр..."
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Зохион байгуулагч:"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "_Change Organizer"
-msgstr ""
-
 #: calendar/gui/dialogs/meeting-page.glade.h:6
-#: calendar/gui/e-meeting-time-sel.c:417
-msgid "_Invite Others..."
+msgid "_Change Organizer"
 msgstr ""
 
 #: calendar/gui/dialogs/new-calendar.glade.h:2
@@ -5126,7 +4912,7 @@ msgid "_No recurrence"
 msgstr ""
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:450
+#: composer/e-msg-composer-attachment-bar.c:453
 msgid "_Remove"
 msgstr "_Устгах"
 
@@ -5158,52 +4944,21 @@ msgstr "долоо хоног"
 msgid "year(s)"
 msgstr "жил"
 
-#: calendar/gui/dialogs/save-comp.c:53
-msgid ""
-"This event has been changed, but has not been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-
-#: calendar/gui/dialogs/save-comp.c:57
-msgid "_Discard Changes"
-msgstr "_Өөрчлөлтүүдийг хэрэгсэхгүй"
-
-#: calendar/gui/dialogs/save-comp.c:62
-msgid "Save Event"
-msgstr ""
-
-#: calendar/gui/dialogs/select-source-dialog.c:65
+#: calendar/gui/dialogs/select-source-dialog.c:69
 #, fuzzy
 msgid "Select destination"
 msgstr "Үйлдлээ тэмдэглэх"
 
-#: calendar/gui/dialogs/select-source-dialog.c:86
+#: calendar/gui/dialogs/select-source-dialog.c:90
 #, fuzzy
 msgid "_Destination"
 msgstr "Тайлбар"
 
-#: calendar/gui/dialogs/select-source-dialog.c:88
+#: calendar/gui/dialogs/select-source-dialog.c:92
 #, fuzzy
 msgid "Task List"
 msgstr "Үүргийн жагсаалтын нэр"
 
-#: calendar/gui/dialogs/send-comp.c:57
-msgid "The meeting information has been created. Send it?"
-msgstr ""
-
-#: calendar/gui/dialogs/send-comp.c:60
-msgid "The meeting information has changed. Send an updated version?"
-msgstr ""
-
-#: calendar/gui/dialogs/send-comp.c:67
-msgid "The task assignment information has been created. Send it?"
-msgstr ""
-
-#: calendar/gui/dialogs/send-comp.c:71
-msgid "The task information has changed. Send an updated version?"
-msgstr ""
-
 #: calendar/gui/dialogs/task-details-page.c:406
 msgid "Completed date is wrong"
 msgstr ""
@@ -5223,7 +4978,7 @@ msgstr "Дууссан"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #: calendar/gui/e-cal-component-preview.c:249
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:960
 msgid "High"
 msgstr "Өндөр"
 
@@ -5237,14 +4992,14 @@ msgstr "Явж байна"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:253
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:958
 msgid "Low"
 msgstr "Бага"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:251
 #: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:957
+#: mail/message-list.c:959
 msgid "Normal"
 msgstr "Хэвийн"
 
@@ -5304,8 +5059,8 @@ msgstr ""
 
 #: calendar/gui/dialogs/task-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
+#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Тайлбар:"
 
@@ -5479,7 +5234,7 @@ msgstr "Он сар өдөр:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:950
+#: calendar/gui/e-itip-control.c:943
 msgid "Status:"
 msgstr ""
 
@@ -5565,12 +5320,12 @@ msgstr "Завгүй"
 msgid "Deleting selected objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
 msgid "Updating objects"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1370
+#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
 #: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Нээх"
@@ -5580,15 +5335,15 @@ msgid "Open _Web Page"
 msgstr "_Вэб хуудас нээх"
 
 #: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1291 calendar/gui/e-calendar-view.c:1376
-#: mail/em-folder-view.c:896 mail/em-popup.c:690 mail/em-popup.c:806
+#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
+#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "_Нэрээр хадгалах..."
 
 #: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1292
-#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
+#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
@@ -5596,24 +5351,24 @@ msgid "_Print..."
 msgstr "_Хэвлэх..."
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Х_ачлах"
 
 #: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1338
-#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2550
-#: mail/message-list.c:1644 ui/evolution-addressbook.xml.h:31
+#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
+#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
+#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Хуулах"
 
 #: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1273 calendar/gui/e-calendar-view.c:1299
-#: calendar/gui/e-calendar-view.c:1372 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
+#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
@@ -5682,71 +5437,71 @@ msgstr "Дүгнэлт"
 msgid "Task sort"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
 msgid "New _Appointment..."
 msgstr "Шинэ _уулзалт..."
 
-#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
+#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
+#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
 msgid "New Meeting"
 msgstr "Шинэ уулзалт"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
 msgid "New Task"
 msgstr "Шинэ үүрэг"
 
-#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Бүгдийг _тэмдэглэх"
 
-#: calendar/gui/e-calendar-view.c:1280
+#: calendar/gui/e-calendar-view.c:1283
 #, fuzzy
 msgid "_Select Date..."
 msgstr "_Устгах..."
 
-#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1303
+#: calendar/gui/e-calendar-view.c:1306
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Хавтас руу хуулах..."
 
-#: calendar/gui/e-calendar-view.c:1304
+#: calendar/gui/e-calendar-view.c:1307
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "Хавтас руу зөөх..."
 
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1308
 msgid "_Schedule Meeting..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1309
 msgid "_Forward as iCalendar..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1349
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1351
 msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "_Тохируулгууд..."
 
@@ -5761,9 +5516,9 @@ msgstr ""
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:967 calendar/gui/e-itip-control.c:1169
-#: calendar/gui/e-meeting-list-view.c:144
-#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
 #: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
 #: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
 #: camel/camel-tcp-stream-openssl.c:631
@@ -5789,13 +5544,13 @@ msgid "Assigned"
 msgstr ""
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr "Тийм"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "Үгүй"
 
@@ -5807,7 +5562,7 @@ msgstr "Х"
 msgid "S"
 msgstr "У"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
 msgid "E"
 msgstr ""
 
@@ -5876,402 +5631,406 @@ msgstr "%d %b"
 msgid "%02i minute divisions"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:592
+#: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
 msgstr "Тийм."
 
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:596
 #, fuzzy, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Өдөр тутам"
 msgstr[1] "Өдөр тутам"
 
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:601
 #, fuzzy, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Долоо хоног тутам"
 msgstr[1] "Долоо хоног тутам"
 
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:603
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:618
+#: calendar/gui/e-itip-control.c:611
 msgid " and "
 msgstr " ба"
 
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:618
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:631
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:645
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "сар тутам"
 msgstr[1] "сар тутам"
 
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:642
 #, fuzzy, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Жил бүр"
 msgstr[1] "Жил бүр"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:653
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:669
+#: calendar/gui/e-itip-control.c:662
 msgid ", ending on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:686
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:696
 msgid "<b>Ends:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:716
 msgid "<b>Completed:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:733
+#: calendar/gui/e-itip-control.c:726
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:771 calendar/gui/e-itip-control.c:827
+#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
 msgid "iCalendar Information"
 msgstr ""
 
 #. Title
-#: calendar/gui/e-itip-control.c:788
+#: calendar/gui/e-itip-control.c:781
 msgid "iCalendar Error"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:859 calendar/gui/e-itip-control.c:875
-#: calendar/gui/e-itip-control.c:886 calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
 msgid "An unknown person"
 msgstr ""
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:910
+#: calendar/gui/e-itip-control.c:903
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:925
+#: calendar/gui/e-itip-control.c:918
 msgid "<i>None</i>"
 msgstr "<i>Алга</i>"
 
-#: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:929
+msgid "Location:"
+msgstr "Байршил:"
+
+#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Зөвшөөрөгдсөн"
 
-#: calendar/gui/e-itip-control.c:959 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:963 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.c:1050
-#: calendar/gui/e-itip-control.c:1076 calendar/gui/e-itip-control.c:1089
-#: calendar/gui/e-itip-control.c:1102 calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
 msgid "Choose an action:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1023
+#: calendar/gui/e-itip-control.c:1016
 msgid "Update"
 msgstr "Шинэчлэх"
 
-#: calendar/gui/e-itip-control.c:1024 calendar/gui/e-itip-control.c:1055
-#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1091
-#: calendar/gui/e-itip-control.c:1104 calendar/gui/e-itip-control.c:1117
-#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
+#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "За"
 
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1044
 msgid "Accept"
 msgstr "Зөвшөөрөх"
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1045
 msgid "Tentatively accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1046
 msgid "Decline"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1070
 msgid "Send Free/Busy Information"
 msgstr "Чөлөөтэй/завгүй мэдээллүүдийг илгээх"
 
-#: calendar/gui/e-itip-control.c:1090
+#: calendar/gui/e-itip-control.c:1083
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1103
+#: calendar/gui/e-itip-control.c:1096
 msgid "Send Latest Information"
 msgstr "Сүүлийн мэдээллүүдийг илгээх"
 
-#: calendar/gui/e-itip-control.c:1116 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Цуцлах"
 
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1185
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1193
+#: calendar/gui/e-itip-control.c:1186
 msgid "Meeting Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1191
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1193
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1201
+#: calendar/gui/e-itip-control.c:1194
 msgid "Meeting Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1206
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1203
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1204
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1218
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1226
+#: calendar/gui/e-itip-control.c:1219
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1227
+#: calendar/gui/e-itip-control.c:1220
 msgid "Meeting Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1234 calendar/gui/e-itip-control.c:1302
-#: calendar/gui/e-itip-control.c:1337
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1330
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1228
 msgid "Bad Meeting Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1253
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1254
 msgid "Task Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1259
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1262
 msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1278
+#: calendar/gui/e-itip-control.c:1271
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1272
 msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1286
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1294
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1288
 msgid "Task Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1303
+#: calendar/gui/e-itip-control.c:1296
 msgid "Bad Task Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1315
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1323
+#: calendar/gui/e-itip-control.c:1316
 msgid "Free/Busy Information"
 msgstr "Чөлөөтэй/завгүй мэдээлэл"
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1321
 msgid "Free/Busy Request"
 msgstr "Чөлөөтэй/завгүй хүсэлт"
 
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1325
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1326
 msgid "Free/Busy Reply"
 msgstr "Чөлөөтэй/завгүй хариу"
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1331
 msgid "Bad Free/Busy Message"
 msgstr "Буруу чөлөөтэй/завгүй мэдээлэл"
 
-#: calendar/gui/e-itip-control.c:1413
+#: calendar/gui/e-itip-control.c:1406
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1472
+#: calendar/gui/e-itip-control.c:1465
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1503
+#: calendar/gui/e-itip-control.c:1496
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1535
+#: calendar/gui/e-itip-control.c:1528
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1769
+#: calendar/gui/e-itip-control.c:1762
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
+#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1825
+#: calendar/gui/e-itip-control.c:1818
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1837
+#: calendar/gui/e-itip-control.c:1830
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1856
+#: calendar/gui/e-itip-control.c:1849
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1852
 msgid "Object could not be found\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1855
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1865
+#: calendar/gui/e-itip-control.c:1858
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1861
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1892
 msgid "Removal Complete"
 msgstr "Устгалт дууслаа"
 
-#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
 msgid "Item sent!\n"
 msgstr "Илгээгдсэн!\n"
 
-#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
+#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
 msgid "The item could not be sent!\n"
 msgstr ""
 
@@ -6312,74 +6071,74 @@ msgstr ""
 msgid "date-start"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:62
+#: calendar/gui/e-meeting-list-view.c:59
 msgid "Chair Persons"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:479
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
 msgid "Required Participants"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:64
+#: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:65
+#: calendar/gui/e-meeting-list-view.c:62
 msgid "Resources"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:140 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
 #: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "Бүлэг"
 
-#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr "Өрөө"
 
-#: calendar/gui/e-meeting-list-view.c:154 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:127
 #: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
 msgid "Required Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:179 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:177
 #: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
 msgid "Needs Action"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:182 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
 #: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr ""
@@ -6396,20 +6155,27 @@ msgstr "Ажлын байрандаа байхгүй"
 msgid "No Information"
 msgstr "Мэдээлэл алга"
 
+#: calendar/gui/e-meeting-time-sel.c:417
+#, fuzzy
+msgid "Add attendees from addressbook"
+msgstr "Хаягийн дэвтэр..."
+
 #: calendar/gui/e-meeting-time-sel.c:440
 msgid "_Options"
 msgstr ""
 
 #: calendar/gui/e-meeting-time-sel.c:457
-msgid "Show _Only Working Hours"
-msgstr ""
+#, fuzzy
+msgid "Show _only working hours"
+msgstr "Ажлын долоо хоногийг харуулах"
 
 #: calendar/gui/e-meeting-time-sel.c:467
-msgid "Show _Zoomed Out"
-msgstr ""
+#, fuzzy
+msgid "Show _zoomed out"
+msgstr "Нэг сарыг харуулах"
 
 #: calendar/gui/e-meeting-time-sel.c:482
-msgid "_Update Free/Busy"
+msgid "_Update free/busy"
 msgstr ""
 
 #: calendar/gui/e-meeting-time-sel.c:497
@@ -6425,19 +6191,19 @@ msgid ">_>"
 msgstr ">_>"
 
 #: calendar/gui/e-meeting-time-sel.c:547
-msgid "_All People and Resources"
+msgid "_All people and resources"
 msgstr ""
 
 #: calendar/gui/e-meeting-time-sel.c:556
-msgid "All _People and One Resource"
+msgid "All _people and one resource"
 msgstr ""
 
 #: calendar/gui/e-meeting-time-sel.c:565
-msgid "_Required People"
+msgid "_Required people"
 msgstr ""
 
 #: calendar/gui/e-meeting-time-sel.c:574
-msgid "Required People and _One Resource"
+msgid "Required people and _one resource"
 msgstr ""
 
 #: calendar/gui/e-meeting-time-sel.c:593
@@ -6475,79 +6241,69 @@ msgstr "%m/%d/%Y"
 msgid "Enter the password for %s"
 msgstr "%s %s-н нууц үгийг оруулах (%s хэрэглэгч)"
 
-#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
 #, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-
 #. FIXME Loading should be async
 #. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:686
+#: calendar/gui/e-tasks.c:801
 #, c-format
 msgid "Opening tasks at %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:709
+#: calendar/gui/e-tasks.c:824
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
 "%s"
 msgstr "Жагсаалтыг устгахад алдаа гарлаа"
 
-#: calendar/gui/e-tasks.c:730
+#: calendar/gui/e-tasks.c:845
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Хуанлийг ачааллаж байна"
 
-#: calendar/gui/e-tasks.c:834
+#: calendar/gui/e-tasks.c:949
 msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:857
+#: calendar/gui/e-tasks.c:972
 msgid "Deleting selected objects..."
 msgstr "Тэмдэглэгдсэн обьектуудыг устгаж байна..."
 
-#: calendar/gui/e-tasks.c:884
+#: calendar/gui/e-tasks.c:999
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:960
+#: calendar/gui/e-tasks.c:1075
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
-#: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
+#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
+#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
 #: calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:705
 msgid "Tasks"
 msgstr "Үүргүүд"
 
-#: calendar/gui/gnome-cal.c:1876
+#: calendar/gui/gnome-cal.c:1878
 #, c-format
 msgid "Loading appointments at %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1895
+#: calendar/gui/gnome-cal.c:1897
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Хуанлийг ачааллаж байна"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1920
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "%s-г нэмж байна"
 
-#: calendar/gui/gnome-cal.c:2048
-#, c-format
-msgid "The calendar backend for '%s' has crashed."
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:2894
+#: calendar/gui/gnome-cal.c:2906
 msgid "Purging"
 msgstr ""
 
@@ -6739,7 +6495,7 @@ msgid "On The Web"
 msgstr "Вэб дээр"
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 
@@ -6750,7 +6506,7 @@ msgid "Unable to migrate calendar `%s'"
 msgstr ""
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:869
+#: calendar/gui/migration.c:889
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr ""
@@ -6986,72 +6742,72 @@ msgstr ""
 msgid "Print Setup"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:303
+#: calendar/gui/tasks-component.c:313
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:371
 msgid "New Task List"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:398
+#: calendar/gui/tasks-component.c:408
 #, fuzzy, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d холбоонууд"
 msgstr[1] "%d холбоонууд"
 
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] "Тэмдэглэгдсэн"
 msgstr[1] "Тэмдэглэгдсэн"
 
-#: calendar/gui/tasks-component.c:447
+#: calendar/gui/tasks-component.c:457
 #, fuzzy
 msgid "Failed upgrading tasks."
 msgstr "Хуанлийг ачааллаж байна"
 
-#: calendar/gui/tasks-component.c:526
+#: calendar/gui/tasks-component.c:749
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:538
+#: calendar/gui/tasks-component.c:761
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:576
+#: calendar/gui/tasks-component.c:799
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:804
+#: calendar/gui/tasks-component.c:1040
 msgid "New task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:805
+#: calendar/gui/tasks-component.c:1041
 msgid "_Task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:806
+#: calendar/gui/tasks-component.c:1042
 msgid "Create a new task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:812
+#: calendar/gui/tasks-component.c:1048
 #, fuzzy
 msgid "New tasks group"
 msgstr "Шинэ үүрэг"
 
-#: calendar/gui/tasks-component.c:813
+#: calendar/gui/tasks-component.c:1049
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Үүргийн жагсаалтын бүлэг"
 
-#: calendar/gui/tasks-component.c:814
+#: calendar/gui/tasks-component.c:1050
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Хаягийн дэвтэрт хадгалах"
@@ -8807,12 +8563,12 @@ msgstr ""
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1259
+#: camel/camel-folder.c:1262
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1299
+#: camel/camel-folder.c:1302
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
@@ -8825,11 +8581,16 @@ msgstr ""
 msgid "Copying messages"
 msgstr ""
 
-#: camel/camel-folder.c:1666
-msgid "Learning junk and/or non junk message(s)"
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Анхааруулга"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
 msgstr ""
 
-#: camel/camel-folder.c:1695
+#: camel/camel-folder.c:1701
 msgid "Filtering new message(s)"
 msgstr ""
 
@@ -8859,15 +8620,15 @@ msgstr ""
 msgid "(match-threads) requires a match type string"
 msgstr ""
 
-#: camel/camel-folder-search.c:785
+#: camel/camel-folder-search.c:784
 msgid "(match-threads) expects an array result"
 msgstr ""
 
-#: camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:790
 msgid "(match-threads) requires the folder set"
 msgstr ""
 
-#: camel/camel-folder-search.c:880
+#: camel/camel-folder-search.c:879
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr ""
@@ -8897,7 +8658,8 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
 #: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:706
+#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr ""
@@ -9250,7 +9012,7 @@ msgstr ""
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1212
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -9611,40 +9373,40 @@ msgstr ""
 msgid "export keys: unimplemented"
 msgstr ""
 
-#: camel/camel-store.c:214
+#: camel/camel-store.c:213
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-store.c:244
+#: camel/camel-store.c:243
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
 
-#: camel/camel-store.c:295
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-store.c:323
+#: camel/camel-store.c:325
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
 
-#: camel/camel-store.c:387 camel/camel-vee-store.c:354
+#: camel/camel-store.c:389 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr ""
 
-#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#: camel/camel-store.c:439 camel/camel-vee-store.c:387
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr ""
 
-#: camel/camel-store.c:811
+#: camel/camel-store.c:777
 msgid "Trash"
 msgstr ""
 
-#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
-#: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/mail-config.glade.h:95
+#: ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr ""
 
@@ -9851,12 +9613,12 @@ msgstr ""
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:374
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr ""
 
-#: camel/camel-vee-store.c:398
+#: camel/camel-vee-store.c:395
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr ""
@@ -9900,31 +9662,31 @@ msgstr "Хаягийн дэвтэр"
 msgid "Post Office Agent SOAP Port:"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:80
+#: camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "Novell GroupWise"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:82
+#: camel/providers/groupwise/camel-groupwise-provider.c:85
 msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: camel/providers/groupwise/camel-groupwise-provider.c:100
 #: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
 msgid "Password"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:99
+#: camel/providers/groupwise/camel-groupwise-provider.c:102
 #: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/groupwise/camel-gw-listener.c:305
-#: camel/providers/groupwise/camel-gw-listener.c:328
+#: camel/providers/groupwise/camel-gw-listener.c:312
+#: camel/providers/groupwise/camel-gw-listener.c:335
 #, fuzzy
 msgid "Checklist"
 msgstr "жагсаах"
@@ -10052,13 +9814,13 @@ msgid ""
 msgstr ""
 
 #: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:429
+#: camel/providers/imap/camel-imap-store.c:428
 #, c-format
 msgid "IMAP server %s"
 msgstr ""
 
 #: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:431
+#: camel/providers/imap/camel-imap-store.c:430
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr ""
@@ -10068,7 +9830,7 @@ msgstr ""
 #: camel/providers/imap/camel-imap-store.c:551
 #: camel/providers/imap/camel-imap-store.c:571
 #: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
+#: camel/providers/nntp/camel-nntp-store.c:209
 #: camel/providers/pop3/camel-pop3-store.c:175
 #: camel/providers/smtp/camel-smtp-transport.c:269
 #: camel/providers/smtp/camel-smtp-transport.c:285
@@ -10085,10 +9847,10 @@ msgstr ""
 
 #: camel/providers/imap4/camel-imap4-store.c:222
 #: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:815
+#: camel/providers/imap/camel-imap-store.c:845
 #: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:137
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
 #: camel/providers/pop3/camel-pop3-store.c:192
 msgid "Connection cancelled"
 msgstr ""
@@ -10101,8 +9863,8 @@ msgid ""
 msgstr ""
 
 #: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:649
-#: camel/providers/imap/camel-imap-store.c:680
+#: camel/providers/imap/camel-imap-store.c:679
+#: camel/providers/imap/camel-imap-store.c:710
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
@@ -10111,7 +9873,7 @@ msgstr ""
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1109
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
 msgid "Unknown error"
 msgstr "Үл мэдэгдэх алдаа"
 
@@ -10137,8 +9899,8 @@ msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
 
 #: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1857
-#: camel/providers/imap/camel-imap-store.c:2235
+#: camel/providers/imap/camel-imap-store.c:1885
+#: camel/providers/imap/camel-imap-store.c:2263
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -10216,12 +9978,12 @@ msgstr ""
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3168
+#: camel/providers/imap/camel-imap-store.c:3194
 msgid "Operation cancelled"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3171
+#: camel/providers/imap/camel-imap-store.c:3197
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
@@ -10283,13 +10045,6 @@ msgid "Unable to retrieve message: %s"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:219
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -10297,15 +10052,15 @@ msgid ""
 msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-mbox-folder.c:418
+#: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:2019
-#: camel/providers/imap/camel-imap-folder.c:2621
-#: camel/providers/nntp/camel-nntp-folder.c:238
+#: camel/providers/imap/camel-imap-folder.c:2622
+#: camel/providers/nntp/camel-nntp-folder.c:220
 msgid "This message is not currently available"
 msgstr ""
 
@@ -10314,7 +10069,23 @@ msgstr ""
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2659
+#: camel/providers/imap/camel-imap-folder.c:2463
+#, c-format
+msgid "Incomplete server response: no information provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2471
+#, c-format
+msgid "Incomplete server response: no UID provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2484
+#, c-format
+msgid ""
+"Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2660
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -10372,43 +10143,43 @@ msgstr ""
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/imap/camel-imap-store.c:680
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:711
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:818
+#: camel/providers/imap/camel-imap-store.c:848
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1242
+#: camel/providers/imap/camel-imap-store.c:1272
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1252
+#: camel/providers/imap/camel-imap-store.c:1282
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1305
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1289
+#: camel/providers/imap/camel-imap-store.c:1319
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1318
+#: camel/providers/imap/camel-imap-store.c:1348
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10416,18 +10187,18 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1839
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:1867
+#: camel/providers/imap/camel-imap-store.c:2057
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1915
-#: camel/providers/imap/camel-imap-store.c:2296
+#: camel/providers/imap/camel-imap-store.c:1943
+#: camel/providers/imap/camel-imap-store.c:2324
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1970
+#: camel/providers/imap/camel-imap-store.c:1998
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10435,7 +10206,7 @@ msgstr ""
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
 
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:2274
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr ""
@@ -10467,20 +10238,20 @@ msgid "Index message body data"
 msgstr ""
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:388
 #, c-format
 msgid "~%s (%s)"
 msgstr ""
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:393
-#: camel/providers/local/camel-local-folder.c:396
+#: camel/providers/local/camel-local-folder.c:392
+#: camel/providers/local/camel-local-folder.c:395
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr ""
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:400
+#: camel/providers/local/camel-local-folder.c:399
 #, c-format
 msgid "%s (%s)"
 msgstr ""
@@ -10536,7 +10307,7 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:142
 #: camel/providers/local/camel-local-store.c:253
-#: camel/providers/local/camel-mbox-store.c:356
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10609,8 +10380,23 @@ msgstr ""
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:226
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mbox-folder.c:417
+#: camel/providers/local/camel-mbox-folder.c:436
+#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:475
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-mh-folder.c:221
+#, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-folder.c:236
 msgid "Invalid message contents"
 msgstr ""
 
@@ -10651,9 +10437,9 @@ msgstr ""
 msgid "not a maildir directory"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:341
-#: camel/providers/local/camel-spool-store.c:286
-#: camel/providers/local/camel-spool-store.c:316
+#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-spool-store.c:284
+#: camel/providers/local/camel-spool-store.c:314
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr ""
@@ -10700,25 +10486,18 @@ msgstr ""
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:435
-#: camel/providers/local/camel-mbox-folder.c:466
-#: camel/providers/local/camel-mbox-folder.c:474
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:468
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:475
-msgid "Message construction failed: Corrupt mailbox?"
-msgstr ""
+#: camel/providers/local/camel-mbox-folder.c:476
+#: camel/providers/local/camel-mh-folder.c:222
+#, fuzzy
+msgid "Message construction failed."
+msgstr "Илгээх зурвас"
 
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:362
+#: camel/providers/local/camel-mbox-store.c:361
 msgid "Cannot create a folder by this name."
 msgstr ""
 
@@ -10746,30 +10525,30 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:375
+#: camel/providers/local/camel-mbox-store.c:374
 #, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:389
+#: camel/providers/local/camel-mbox-store.c:388
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:391
+#: camel/providers/local/camel-mbox-store.c:390
 msgid "Folder already exists"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:473
+#: camel/providers/local/camel-mbox-store.c:472
 msgid "The new folder name is illegal."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:486
+#: camel/providers/local/camel-mbox-store.c:485
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "`%s' хавтсыг нээж чадахгүй байна"
 
-#: camel/providers/local/camel-mbox-store.c:561
+#: camel/providers/local/camel-mbox-store.c:560
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "`%s' хавтсыг нээж чадахгүй байна"
@@ -10954,7 +10733,7 @@ msgid ""
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:997
+#: camel/providers/nntp/camel-nntp-store.c:1126
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr ""
@@ -10971,18 +10750,10 @@ msgstr ""
 msgid "Server rejected username/password"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:263
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:259
-#: camel/providers/nntp/camel-nntp-folder.c:265
+#: camel/providers/nntp/camel-nntp-folder.c:147
+#: camel/providers/nntp/camel-nntp-folder.c:149
+#: camel/providers/nntp/camel-nntp-folder.c:158
+#: camel/providers/nntp/camel-nntp-folder.c:234
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -10991,60 +10762,49 @@ msgstr ""
 msgid "Cannot get message %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:188
-#: camel/providers/nntp/camel-nntp-folder.c:228
-#, c-format
-msgid "Internal error: uid in invalid format: %s"
+#: camel/providers/nntp/camel-nntp-folder.c:156
+#: camel/providers/nntp/camel-nntp-folder.c:232
+#: camel/providers/nntp/camel-nntp-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+msgid "User cancelled"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:201
+#: camel/providers/nntp/camel-nntp-folder.c:176
+#: camel/providers/nntp/camel-nntp-folder.c:208
 #, c-format
-msgid "Could not get article %s from NNTP server"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:362
-msgid "Posting not allowed by news server"
+msgid "Internal error: uid in invalid format: %s"
 msgstr ""
 
+#: camel/providers/nntp/camel-nntp-folder.c:328
+#: camel/providers/nntp/camel-nntp-folder.c:331
 #: camel/providers/nntp/camel-nntp-folder.c:373
-#, c-format
-msgid "Failed to send newsgroups header: %s: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:413
-#: camel/providers/nntp/camel-nntp-folder.c:426
-#, c-format
-msgid "Error posting to newsgroup: %s: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:438
-msgid "Error reading response to posted message: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:441
-#, c-format
-msgid "Error posting message: %s: message not posted"
-msgstr ""
+#: camel/providers/nntp/camel-nntp-folder.c:375
+#, fuzzy, c-format
+msgid "Posting failed: %s"
+msgstr "Хавтсанд хадгалах..."
 
-#: camel/providers/nntp/camel-nntp-folder.c:457
+#: camel/providers/nntp/camel-nntp-folder.c:393
 msgid "You cannot post NNTP messages while working offline!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:468
+#: camel/providers/nntp/camel-nntp-folder.c:404
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:44
 msgid "Could not get group list from server."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#: camel/providers/nntp/camel-nntp-grouplist.c:97
+#: camel/providers/nntp/camel-nntp-grouplist.c:106
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#: camel/providers/nntp/camel-nntp-grouplist.c:157
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr ""
@@ -11072,27 +10832,29 @@ msgid ""
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:158
+#: camel/providers/nntp/camel-nntp-store.c:118
+#: camel/providers/nntp/camel-nntp-store.c:1233
+#: camel/providers/nntp/camel-nntp-store.c:1331
+#, c-format
+msgid "NNTP Command failed: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:227
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:170
+#: camel/providers/nntp/camel-nntp-store.c:239
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:326
+#: camel/providers/nntp/camel-nntp-store.c:403
 #, c-format
 msgid "USENET News via %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:640
-#, fuzzy
-msgid "Stream error"
-msgstr "Бусад алдаа"
-
-#: camel/providers/nntp/camel-nntp-store.c:643
+#: camel/providers/nntp/camel-nntp-store.c:777
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -11100,73 +10862,72 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:735
+#: camel/providers/nntp/camel-nntp-store.c:872
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
 "No such newsgroup. The selected item is a probably a parent folder."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:767
+#: camel/providers/nntp/camel-nntp-store.c:904
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
 "newsgroup does not exist!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:792
+#: camel/providers/nntp/camel-nntp-store.c:929
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:800
+#: camel/providers/nntp/camel-nntp-store.c:937
 msgid "You cannot rename a folder in a News store."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:808
+#: camel/providers/nntp/camel-nntp-store.c:945
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:253
-#, fuzzy, c-format
-msgid "Connection error: %s"
-msgstr "Үл мэдэгдэх алдаа"
-
-#: camel/providers/nntp/camel-nntp-summary.c:262
-#, c-format
-msgid "No such folder: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1118
+msgid "Authentication requested but not username provided"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:268
-#, c-format
-msgid "Could not get group: %s"
-msgstr ""
+#: camel/providers/nntp/camel-nntp-store.c:1146
+#, fuzzy, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr "LDAP серверээр баталгаажуулж чадсангүй"
 
-#: camel/providers/nntp/camel-nntp-summary.c:333
+#: camel/providers/nntp/camel-nntp-store.c:1262
 #, fuzzy
-msgid "Could not get messages: unspecified error"
-msgstr "Мэдээллийг хавтсанд хадгалах"
+msgid "Not connected."
+msgstr "Холбоо алга"
 
-#: camel/providers/nntp/camel-nntp-summary.c:378
+#: camel/providers/nntp/camel-nntp-store.c:1311
 #, c-format
-msgid "NNTP Command failed: %s"
+msgid "No such folder: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:438
-#: camel/providers/nntp/camel-nntp-summary.c:543
+#: camel/providers/nntp/camel-nntp-summary.c:218
+#: camel/providers/nntp/camel-nntp-summary.c:314
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:558
+#: camel/providers/nntp/camel-nntp-summary.c:225
+#, c-format
+msgid "Unexpected server response from xover: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-summary.c:328
 #, c-format
-msgid "Unknown server response: %s"
+msgid "Unexpected server response from head: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:605
+#: camel/providers/nntp/camel-nntp-summary.c:368
 msgid "Use cancel"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:607
+#: camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
 msgid "Operation failed: %s"
 msgstr ""
@@ -11214,7 +10975,7 @@ msgstr ""
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107
 msgid "POP"
 msgstr ""
 
@@ -11294,7 +11055,7 @@ msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:132
 msgid "Sendmail"
 msgstr ""
 
@@ -11346,7 +11107,7 @@ msgstr ""
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:119
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122
 msgid "SMTP"
 msgstr ""
 
@@ -11627,19 +11388,19 @@ msgstr ""
 msgid "%.0fG"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
+#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:408
 msgid "attachment"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:454
 msgid "Remove selected items from the attachment list"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:491
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Add attachment..."
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:495
 msgid "Attach a file to the message"
 msgstr ""
 
@@ -11700,7 +11461,7 @@ msgstr "Дараагийн _уншигдаагүй мэдээлэл"
 msgid "Open file"
 msgstr ""
 
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
 msgid "Autogenerated"
 msgstr ""
 
@@ -11834,17 +11595,17 @@ msgstr ""
 
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
-msgid "You cannot attach the file `${0}' to this message."
+msgid "You cannot attach the file `{0}' to this message."
 msgstr ""
 
 #. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4
-msgid "${1}"
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
 msgstr ""
 
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
 
 #. mail-composer:attach-directory primary
@@ -11937,7 +11698,7 @@ msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас ү�
 
 #. mail-composer:no-build-message secondary
 #: composer/mail-composer-errors.xml.h:34
-msgid "Because \"${0}\", you may need to select different mail options."
+msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
@@ -11946,8 +11707,10 @@ msgid "Could not read signature file \"{0}\"."
 msgstr ""
 
 #. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38
-msgid "Because \"${1}\"."
+#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted primary
@@ -12347,11 +12110,11 @@ msgid "<b>Then</b>"
 msgstr "<b>Хугацаа</b>"
 
 #: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1335
+#: mail/mail-account-gui.c:1347
 msgid "Select Folder"
 msgstr ""
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
 msgid "    "
 msgstr " "
 
@@ -12403,7 +12166,7 @@ msgstr ""
 msgid "months"
 msgstr ""
 
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
 msgid "seconds"
 msgstr ""
 
@@ -12435,20 +12198,20 @@ msgstr ""
 msgid "years"
 msgstr ""
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:916
-#: mail/mail-config.c:76 mail/mail-config.glade.h:90
+#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
+#: mail/mail-config.glade.h:93
 msgid "Important"
 msgstr ""
 
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:919 mail/mail-config.c:79
-#: mail/mail-config.glade.h:145
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: mail/mail-config.glade.h:148
 msgid "To Do"
 msgstr ""
 
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:920 mail/mail-config.c:80
-#: mail/mail-config.glade.h:94
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: mail/mail-config.glade.h:97
 msgid "Later"
 msgstr ""
 
@@ -12504,257 +12267,6 @@ msgstr ""
 msgid "outgoing"
 msgstr ""
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Adjust Score"
-msgstr ""
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Color"
-msgstr ""
-
-#: filter/libfilter-i18n.h:4
-msgid "Assign Score"
-msgstr ""
-
-#: filter/libfilter-i18n.h:5
-msgid "Attachments"
-msgstr ""
-
-#: filter/libfilter-i18n.h:6
-msgid "Beep"
-msgstr ""
-
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr ""
-
-#: filter/libfilter-i18n.h:8
-msgid "Copy to Folder"
-msgstr ""
-
-#: filter/libfilter-i18n.h:9
-msgid "Date received"
-msgstr ""
-
-#: filter/libfilter-i18n.h:10
-msgid "Date sent"
-msgstr ""
-
-#: filter/libfilter-i18n.h:12
-msgid "Deleted"
-msgstr ""
-
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr ""
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr ""
-
-#: filter/libfilter-i18n.h:16
-msgid "does not return"
-msgstr ""
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr ""
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
-msgstr ""
-
-#: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr ""
-
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr ""
-
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr ""
-
-#: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr ""
-
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr ""
-
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr ""
-
-#: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr ""
-
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr ""
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr ""
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr ""
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr ""
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr ""
-
-#: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr ""
-
-#: filter/libfilter-i18n.h:36
-#, fuzzy
-msgid "Junk Test"
-msgstr "6-р сар"
-
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
-#: widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr ""
-
-#: filter/libfilter-i18n.h:38
-msgid "Mailing list"
-msgstr ""
-
-#: filter/libfilter-i18n.h:39
-msgid "Message Body"
-msgstr ""
-
-#: filter/libfilter-i18n.h:40
-msgid "Message Header"
-msgstr ""
-
-#: filter/libfilter-i18n.h:41
-#, fuzzy
-msgid "Message is Junk"
-msgstr "_Мэдээлэл"
-
-#: filter/libfilter-i18n.h:42
-#, fuzzy
-msgid "Message is not Junk"
-msgstr "Илгээх зурвас"
-
-#: filter/libfilter-i18n.h:43
-msgid "Move to Folder"
-msgstr ""
-
-#: filter/libfilter-i18n.h:44
-#, fuzzy
-msgid "Pipe to Program"
-msgstr "Програмаас гарах"
-
-#: filter/libfilter-i18n.h:45
-msgid "Play Sound"
-msgstr ""
-
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
-msgid "Read"
-msgstr ""
-
-#: filter/libfilter-i18n.h:47
-msgid "Recipients"
-msgstr ""
-
-#: filter/libfilter-i18n.h:48
-msgid "Regex Match"
-msgstr ""
-
-#: filter/libfilter-i18n.h:49
-msgid "Replied to"
-msgstr ""
-
-#: filter/libfilter-i18n.h:50
-msgid "returns"
-msgstr ""
-
-#: filter/libfilter-i18n.h:51
-msgid "returns greater than"
-msgstr ""
-
-#: filter/libfilter-i18n.h:52
-msgid "returns less than"
-msgstr ""
-
-#: filter/libfilter-i18n.h:53
-#, fuzzy
-msgid "Run Program"
-msgstr "Програм ажиллуул:"
-
-#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr ""
-
-#: filter/libfilter-i18n.h:55
-msgid "Sender"
-msgstr ""
-
-#: filter/libfilter-i18n.h:56
-msgid "Set Status"
-msgstr ""
-
-#: filter/libfilter-i18n.h:57
-msgid "Size (kB)"
-msgstr ""
-
-#: filter/libfilter-i18n.h:58
-msgid "sounds like"
-msgstr ""
-
-#: filter/libfilter-i18n.h:59
-msgid "Source Account"
-msgstr ""
-
-#: filter/libfilter-i18n.h:60
-msgid "Specific header"
-msgstr ""
-
-#: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:63
-msgid "Stop Processing"
-msgstr ""
-
-#: filter/libfilter-i18n.h:64 mail/em-format.c:755 mail/em-format-html.c:1519
-#: mail/em-format-quote.c:302 mail/em-mailer-prefs.c:87
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
-#: smime/lib/e-cert.c:1079
-msgid "Subject"
-msgstr ""
-
-#: filter/libfilter-i18n.h:65
-msgid "Unset Status"
-msgstr ""
-
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr ""
@@ -12771,6 +12283,11 @@ msgstr ""
 msgid "_Score Rules"
 msgstr ""
 
+#: filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr ""
+
 #: filter/searchtypes.xml.h:1
 #, fuzzy
 msgid "Body contains"
@@ -12858,13 +12375,13 @@ msgstr ""
 msgid "-------- Forwarded Message --------"
 msgstr ""
 
-#: mail/em-composer-utils.c:1499
+#: mail/em-composer-utils.c:1495
 msgid "an unknown sender"
 msgstr ""
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1509
+#: mail/em-composer-utils.c:1505
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr ""
 
@@ -12904,8 +12421,8 @@ msgstr ""
 msgid "Create New Folder"
 msgstr ""
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
-#: mail/mail-component.c:701
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
+#: mail/mail-component.c:704
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr ""
@@ -12920,103 +12437,104 @@ msgstr "Хорват"
 msgid "Folder _name:"
 msgstr ""
 
-#: mail/em-folder-tree.c:839
+#: mail/em-folder-tree.c:833
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Хавтсанд хадгалах..."
 
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree.c:835
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Хавтас руу хуулах..."
 
-#: mail/em-folder-tree.c:848 mail/message-list.c:1555
+#: mail/em-folder-tree.c:842 mail/message-list.c:1561
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Тэмдэглэгдсэн зурвасуудыг өөр хавтас руу зөө"
 
-#: mail/em-folder-tree.c:850 mail/message-list.c:1557
+#: mail/em-folder-tree.c:844 mail/message-list.c:1563
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Тэмдэглэгдсэн зурвасуудыг өөр хавтас руу зөө"
 
-#: mail/em-folder-tree.c:866
+#: mail/em-folder-tree.c:860
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 
-#: mail/em-folder-tree.c:956 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Хавтас руу хуулах"
 
-#: mail/em-folder-tree.c:957 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Хавтас руу зөөх"
 
-#: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2069
-#: mail/em-folder-tree.c:2551 mail/em-folder-view.c:798
-#: mail/message-list.c:1645
+#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
+#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
+#: mail/message-list.c:1651
 msgid "_Move"
 msgstr ""
 
-#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#: mail/em-folder-tree.c:955 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "Цуцлах"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
 #: mail/em-folder-view.c:798 mail/em-folder-view.c:812
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
 #, fuzzy
 msgid "C_opy"
 msgstr "Хуулах"
 
-#: mail/em-folder-tree.c:2096
+#: mail/em-folder-tree.c:2088
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
 
-#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
+#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
 msgid "Create folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:2474
+#: mail/em-folder-tree.c:2463
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr ""
 
-#: mail/em-folder-tree.c:2476
+#: mail/em-folder-tree.c:2465
 msgid "Rename Folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:2545 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr ""
 
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2537
 msgid "Open in _New Window"
 msgstr ""
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2555
+#: mail/em-folder-tree.c:2546
 msgid "_New Folder..."
 msgstr ""
 
-#: mail/em-folder-tree.c:2558
+#: mail/em-folder-tree.c:2549
 msgid "_Rename"
 msgstr ""
 
-#: mail/em-folder-tree.c:2561 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr ""
 
 #: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:889
+#: mail/mail-vfolder.c:888
 msgid "VFolders"
 msgstr ""
 
@@ -13030,19 +12548,19 @@ msgstr ""
 msgid "Inbox"
 msgstr ""
 
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
 msgid "Loading..."
 msgstr ""
 
 #: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
 #: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
 #: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:551
+#: mail/mail-component.c:554
 msgid "Mail"
 msgstr ""
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr ""
@@ -13055,17 +12573,17 @@ msgstr ""
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:810
+#: mail/em-folder-view.c:901 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr ""
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:811
+#: mail/em-folder-view.c:902 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr ""
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: mail/em-folder-view.c:903 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr ""
@@ -13118,6 +12636,10 @@ msgstr ""
 msgid "_Copy to Folder..."
 msgstr ""
 
+#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr ""
+
 #: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr ""
@@ -13167,12 +12689,12 @@ msgid "Filter on _Mailing List"
 msgstr ""
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
-#: mail/mail-config.glade.h:66
+#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr ""
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1796
 msgid "Print Message"
 msgstr ""
 
@@ -13211,12 +12733,18 @@ msgstr ""
 msgid "Bcc"
 msgstr ""
 
+#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
+#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr ""
+
 #: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
 #: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr ""
 
-#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
+#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
 msgid "Newsgroups"
 msgstr ""
 
@@ -13396,7 +12924,7 @@ msgid ""
 "practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:757
+#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
 msgid "_View Certificate"
 msgstr ""
 
@@ -13453,7 +12981,7 @@ msgstr "Долоо хоног тутам"
 msgid "Once per month"
 msgstr "сар тутам"
 
-#: mail/em-migrate.c:1072
+#: mail/em-migrate.c:1168
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13461,82 +12989,82 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1506
+#: mail/em-migrate.c:1602
 #, fuzzy, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
 
-#: mail/em-migrate.c:1532
+#: mail/em-migrate.c:1628
 #, fuzzy, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
 
-#: mail/em-migrate.c:1715
+#: mail/em-migrate.c:1811
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:1919
+#: mail/em-migrate.c:2015
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:1933
+#: mail/em-migrate.c:2029
 #, fuzzy, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
 
-#: mail/em-migrate.c:1962
+#: mail/em-migrate.c:2058
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#: mail/em-migrate.c:2413 mail/em-migrate.c:2425
 #, fuzzy, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
 
-#: mail/em-migrate.c:2480
+#: mail/em-migrate.c:2576
 #, fuzzy, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
 
-#: mail/em-migrate.c:2498
+#: mail/em-migrate.c:2594
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 msgstr ""
 
-#: mail/em-popup.c:699
+#: mail/em-popup.c:700
 msgid "Save As..."
 msgstr ""
 
-#: mail/em-popup.c:717
+#: mail/em-popup.c:718
 #, c-format
 msgid "untitled_image.%s"
 msgstr ""
 
-#: mail/em-popup.c:807
+#: mail/em-popup.c:808
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:809
+#: mail/em-popup.c:810
 msgid "_Reply to sender"
 msgstr ""
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:859
 msgid "_Open Link in Browser"
 msgstr ""
 
-#: mail/em-popup.c:859
+#: mail/em-popup.c:860
 msgid "Se_nd message to..."
 msgstr ""
 
-#: mail/em-popup.c:860
+#: mail/em-popup.c:861
 msgid "_Add to Addressbook"
 msgstr ""
 
-#: mail/em-popup.c:966
+#: mail/em-popup.c:967
 #, c-format
 msgid "Open in %s..."
 msgstr ""
@@ -14089,7 +13617,7 @@ msgstr ""
 msgid "Mail Accounts"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
 msgid "Mail Preferences"
 msgstr ""
 
@@ -14103,15 +13631,15 @@ msgid "Evolution is importing your old Elm mail"
 msgstr ""
 
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:226
+#: mail/importers/evolution-mbox-importer.c:221
+#: mail/importers/evolution-outlook-importer.c:255
 #: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr ""
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:222
-#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/evolution-mbox-importer.c:223
+#: mail/importers/evolution-outlook-importer.c:257
 #: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr ""
@@ -14132,21 +13660,23 @@ msgid "Elm"
 msgstr ""
 
 #: mail/importers/evolution-mbox-importer.c:116
+#: mail/importers/evolution-outlook-importer.c:130
 msgid "Destination folder:"
 msgstr ""
 
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder to import into"
 msgstr ""
 
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:254
 #: mail/importers/mail-importer.c:226
 #, fuzzy, c-format
 msgid "Importing `%s'"
 msgstr "Файлуудыг оруулж байна"
 
-#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/evolution-outlook-importer.c:301
 #: mail/importers/mail-importer.c:140
 #, fuzzy
 msgid "Importing mailbox"
@@ -14287,15 +13817,15 @@ msgstr ""
 msgid "%s License Agreement"
 msgstr ""
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
 msgid "_Host:"
 msgstr ""
 
-#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
 msgid "User_name:"
 msgstr ""
 
-#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
 msgid "_Path:"
 msgstr ""
 
@@ -14358,34 +13888,34 @@ msgstr "%d холбоонууд"
 msgid ", %d unread"
 msgstr ""
 
-#: mail/mail-component.c:653
+#: mail/mail-component.c:656
 msgid "New Mail Message"
 msgstr ""
 
-#: mail/mail-component.c:654
+#: mail/mail-component.c:657
 msgid "_Mail Message"
 msgstr ""
 
-#: mail/mail-component.c:655
+#: mail/mail-component.c:658
 msgid "Compose a new mail message"
 msgstr ""
 
-#: mail/mail-component.c:661
+#: mail/mail-component.c:664
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "_Хавтас руу зөөх"
 
-#: mail/mail-component.c:662
+#: mail/mail-component.c:665
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "_Хавтас"
 
-#: mail/mail-component.c:663
+#: mail/mail-component.c:666
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Шинэ хуанли үүсгэх"
 
-#: mail/mail-component.c:795
+#: mail/mail-component.c:798
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
@@ -14397,7 +13927,7 @@ msgstr ""
 msgid "Connecting to server..."
 msgstr ""
 
-#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr ""
 
@@ -14409,7 +13939,7 @@ msgid ""
 msgstr ""
 
 #: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid "Receiving Mail"
 msgstr ""
 
@@ -14423,7 +13953,7 @@ msgstr ""
 msgid "Please select among the following options"
 msgstr ""
 
-#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr ""
 
@@ -14433,7 +13963,7 @@ msgid ""
 "sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37
 msgid "Account Management"
 msgstr ""
 
@@ -14446,232 +13976,236 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:2
 msgid " Ch_eck for Supported Types "
 msgstr ""
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "<b>Preview</b>"
 msgstr "<b>Хугацаа</b>"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr ""
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "<b>S_ignatures</b>"
 msgstr "<b>Дүгнэлт</b>"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "<b>_Languages</b>"
 msgstr "Хэл"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
+msgid "<small>This will make the the filter more reliable, but slower</small>"
+msgstr ""
+
+#: mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Checking for New Mail</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">General</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Security</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:34
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:35
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:36
 msgid "Account Editor"
 msgstr ""
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:38
 msgid "Add Ne_w Signature..."
 msgstr ""
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Add _Script"
 msgstr "_Аюулгүй байдал"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:40
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:44
 msgid "Always _sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Attach original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr ""
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:48
 msgid "Automatically _insert smiley images"
 msgstr ""
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Automatically check for _new mail every"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Beep w_hen new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "C_haracter set:"
 msgstr ""
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 msgid "Ch_eck for Supported Types "
 msgstr ""
 
-#: mail/mail-config.glade.h:53
-msgid "Check _Incoming Mail"
+#: mail/mail-config.glade.h:55
+msgid "Check _incoming mail for junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 msgid "Color for _misspelled words:"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Colors"
 msgstr "Коморск"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 msgid "Confirm _when expunging a folder"
 msgstr ""
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14681,363 +14215,360 @@ msgid ""
 "Click \"Apply\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
 msgid "De_fault"
 msgstr ""
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Default character e_ncoding:"
 msgstr "Тэмдэгтийн кодчилол"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 #, fuzzy
 msgid "Defaults"
 msgstr "Дэлгэрэнгүй"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 msgid "Do not quote original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr ""
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Drafts _Folder:"
 msgstr "_Хавтас:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:77
 msgid "Email Accounts"
 msgstr ""
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Email _Address:"
 msgstr "Ц-шуудангийн хаяг:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:79
 msgid "Empty trash folders on e_xit"
 msgstr ""
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
 msgid "Encry_ption certificate:"
 msgstr ""
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:81
 msgid "Evolution Account Assistant"
 msgstr ""
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:82
 msgid "Execute Command..."
 msgstr ""
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:83
 msgid "Fi_xed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 msgid "Font Properties"
 msgstr ""
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 msgid "Format messages in _HTML"
 msgstr ""
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "HTML Mail"
 msgstr "ХТМЛ захиадал илгээх үү?"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Headers"
 msgstr "Толгой хэсэг"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr ""
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 msgid "IMAPv4 "
 msgstr ""
 
 #: mail/mail-config.glade.h:91
+#, fuzzy
+msgid "I_nclude remote tests"
+msgstr "Агуулах:"
+
+#: mail/mail-config.glade.h:94
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Kerberos "
 msgstr ""
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Mail Configuration"
 msgstr ""
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr ""
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr ""
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Or_ganization:"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "PGP/GPG _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Play sound file when new mail arri_ves"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr ""
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 msgid "Re_member password"
 msgstr ""
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr ""
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:120
 msgid "Receiving Options"
 msgstr ""
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
 msgid "Remember _password"
 msgstr ""
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
 msgid "S_tandard Font:"
 msgstr ""
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 #, fuzzy
 msgid "Security"
 msgstr "_Аюулгүй байдал"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:126
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:127
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:128
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:129
 #, fuzzy
 msgid "Select..."
 msgstr "_Устгах..."
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:133
 msgid "Sent _Messages Folder:"
 msgstr ""
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:134
 msgid "Ser_ver requires authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:135
 msgid "Server _Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:136
 msgid "Si_gning certificate:"
 msgstr ""
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:137
 #, fuzzy
 msgid "Signat_ure:"
 msgstr "Сингапур"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "Signatures"
 msgstr "Сингапур"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr ""
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:140
 msgid "Spell Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:141
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:142
 msgid "T_erminal Font:"
 msgstr ""
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "T_ype: "
 msgstr "Төрөл:"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:149
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:148
-msgid "Use _Daemon"
-msgstr ""
-
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:152
 msgid "V_ariable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:153
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Forward\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:158
 msgid "_Add Signature"
 msgstr ""
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:159
 msgid "_Always load images from the Internet"
 msgstr ""
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:160
 msgid "_Digitally sign outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:161
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:163
 msgid "_Enable"
 msgstr ""
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:165
 msgid "_Forward style:"
 msgstr ""
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:168
 msgid "_Load images if sender is in address book"
 msgstr ""
 
-#: mail/mail-config.glade.h:167
-msgid "_Local Tests Only"
-msgstr ""
-
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_Mark messages as read after"
 msgstr ""
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 msgid "_Never load images from the Internet"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:175
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:176
 msgid "_Reply style:"
 msgstr ""
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:177
 msgid "_Script:"
 msgstr ""
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:178
 msgid "_Show animated images"
 msgstr ""
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 msgid "_Use Secure Connection (SSL):"
 msgstr ""
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:181
 msgid "color"
 msgstr "өнгө"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr ""
 
@@ -15199,7 +14730,7 @@ msgstr ""
 
 #. mail:camel-exception primary
 #: mail/mail-errors.xml.h:57
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgid "Your message with the subject \"{0}\" was not delivered."
 msgstr ""
 
 #. mail:camel-exception secondary
@@ -15255,11 +14786,6 @@ msgstr ""
 msgid "Cannot save to directory \"{0}\"."
 msgstr ""
 
-#. mail:no-save-path secondary
-#: mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail:no-create-path primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
@@ -15277,12 +14803,6 @@ msgstr ""
 msgid "Cannot create temporary save directory."
 msgstr ""
 
-#. mail:no-create-tmp-path secondary
-#: mail/mail-errors.xml.h:100 mail/mail-errors.xml.h:112
-#: widgets/misc/e-system-errors.xml.h:11 widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail:no-write-path-exists secondary
 #: mail/mail-errors.xml.h:104
 msgid "File exists but cannot overwrite it."
@@ -15537,179 +15057,175 @@ msgstr "Дарж бичих"
 msgid "_Append"
 msgstr "Илгээх"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:785
 #, c-format
 msgid "Pinging %s"
 msgstr ""
 
-#: mail/mail-mt.c:897
-msgid "Working"
-msgstr ""
-
-#: mail/mail-ops.c:99
+#: mail/mail-ops.c:98
 msgid "Filtering Folder"
 msgstr ""
 
-#: mail/mail-ops.c:260
+#: mail/mail-ops.c:259
 msgid "Fetching Mail"
 msgstr ""
 
-#: mail/mail-ops.c:543
+#: mail/mail-ops.c:542
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr ""
 
-#: mail/mail-ops.c:568
+#: mail/mail-ops.c:567
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:577
+#: mail/mail-ops.c:576
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr ""
 
-#: mail/mail-ops.c:673
+#: mail/mail-ops.c:672
 #, c-format
 msgid "Sending message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:703
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr ""
 
-#: mail/mail-ops.c:708
+#: mail/mail-ops.c:707
 msgid "Complete."
 msgstr ""
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:804
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:1002
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1116
+#: mail/mail-ops.c:1115
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1159
+#: mail/mail-ops.c:1158
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1230
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1308
 #, c-format
 msgid "Removing folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1403
+#: mail/mail-ops.c:1402
 #, c-format
 msgid "Storing folder '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1468
+#: mail/mail-ops.c:1467
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1469
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1524
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr ""
 
-#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
+#: mail/mail-ops.c:1559 mail/mail-ops.c:1610
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1607
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1609
+#: mail/mail-ops.c:1608
 msgid "Local Folders"
 msgstr ""
 
-#: mail/mail-ops.c:1692
+#: mail/mail-ops.c:1691
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1764
+#: mail/mail-ops.c:1763
 #, fuzzy, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Энэ мэдээллийг хэвлэх"
 msgstr[1] "Энэ мэдээллийг хэвлэх"
 
-#: mail/mail-ops.c:1850
+#: mail/mail-ops.c:1849
 #, fuzzy, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Энэ зурвасыг илгээх"
 msgstr[1] "Энэ зурвасыг илгээх"
 
-#: mail/mail-ops.c:1900
+#: mail/mail-ops.c:1899
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1928
+#: mail/mail-ops.c:1927
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1999
+#: mail/mail-ops.c:1998
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:2016
+#: mail/mail-ops.c:2015
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2046
+#: mail/mail-ops.c:2045
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Reconnecting to %s"
 msgstr ""
@@ -15773,24 +15289,24 @@ msgstr ""
 msgid "Waiting..."
 msgstr ""
 
-#: mail/mail-session.c:238
+#: mail/mail-session.c:239
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-session.c:271
+#: mail/mail-session.c:272
 #, c-format
 msgid "Enter Password for %s"
 msgstr ""
 
-#: mail/mail-session.c:273
+#: mail/mail-session.c:274
 msgid "Enter Password"
 msgstr ""
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password"
 msgstr ""
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:298
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
@@ -15845,79 +15361,79 @@ msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас ү�
 msgid "Updating vFolders for '%s'"
 msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
 
-#: mail/mail-vfolder.c:959
+#: mail/mail-vfolder.c:958
 msgid "vFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:998
+#: mail/mail-vfolder.c:997
 msgid "Edit VFolder"
 msgstr ""
 
-#: mail/mail-vfolder.c:1082
+#: mail/mail-vfolder.c:1081
 msgid "New VFolder"
 msgstr ""
 
-#: mail/message-list.c:946
+#: mail/message-list.c:948
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:947
+#: mail/message-list.c:949
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:948
+#: mail/message-list.c:950
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:949
+#: mail/message-list.c:951
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:950
+#: mail/message-list.c:952
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:954
+#: mail/message-list.c:956
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:955
+#: mail/message-list.c:957
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:959
+#: mail/message-list.c:961
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:960
+#: mail/message-list.c:962
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:1279
+#: mail/message-list.c:1285
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:1286
+#: mail/message-list.c:1292
 msgid "Today %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1295
+#: mail/message-list.c:1301
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1307
+#: mail/message-list.c:1313
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1315
+#: mail/message-list.c:1321
 msgid "%b %d %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1317
+#: mail/message-list.c:1323
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:3300
+#: mail/message-list.c:3321
 msgid "Generating message list"
 msgstr ""
 
@@ -15973,6 +15489,10 @@ msgstr ""
 msgid "No Response Necessary"
 msgstr ""
 
+#: mail/message-tag-followup.c:79
+msgid "Read"
+msgstr ""
+
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr ""
@@ -16069,44 +15589,48 @@ msgid ""
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:10
-msgid "Whether Evolution should start up in offline mode"
+msgid "Toolbar is visible"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:11
-msgid "Whether to skip the development warning dialog"
+msgid "Whether Evolution should start up in offline mode"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:12
-msgid "mail"
+msgid "Whether the toolbar should be visible."
 msgstr ""
 
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+msgid "Whether to skip the development warning dialog"
 msgstr ""
 
-#: shell/e-shell.c:545 shell/e-shell.c:546
+#: shell/apps_evolution_shell.schemas.in.in.h:14
+msgid "mail"
+msgstr ""
+
+#: shell/e-shell.c:588 shell/e-shell.c:589
 #, fuzzy, c-format
 msgid "%ld KB"
 msgstr "%d %B"
 
-#: shell/e-shell.c:744
+#: shell/e-shell.c:786
 #, fuzzy
 msgid "Uknown system error."
 msgstr "Үл мэдэгдэх алдаа"
 
-#: shell/e-shell.c:1101
+#: shell/e-shell.c:1143
 msgid "Invalid arguments"
 msgstr ""
 
-#: shell/e-shell.c:1103
+#: shell/e-shell.c:1145
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:1105
+#: shell/e-shell.c:1147
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:1107
+#: shell/e-shell.c:1149
 msgid "Generic error"
 msgstr ""
 
@@ -16154,7 +15678,7 @@ msgstr ""
 msgid "Select importer"
 msgstr ""
 
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1026
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
 #, c-format
 msgid "File %s does not exist"
 msgstr ""
@@ -16180,55 +15704,56 @@ msgid ""
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:549
+#: shell/e-shell-importer.c:570
 msgid "Automatic"
 msgstr ""
 
-#: shell/e-shell-importer.c:598
-msgid "_Filename:"
-msgstr ""
+#: shell/e-shell-importer.c:626
+#, fuzzy
+msgid "F_ilename:"
+msgstr "Загварын нэр:"
 
-#: shell/e-shell-importer.c:603
+#: shell/e-shell-importer.c:631
 msgid "Select a file"
 msgstr ""
 
-#: shell/e-shell-importer.c:613
+#: shell/e-shell-importer.c:642
 msgid "File _type:"
 msgstr ""
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:681
 msgid "Import data and settings from _older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:684
 msgid "Import a _single file"
 msgstr ""
 
-#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:727
+#: shell/e-shell-importer.c:756
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:853 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
 #, c-format
 msgid "From %s:"
 msgstr ""
 
-#: shell/e-shell-importer.c:1044
+#: shell/e-shell-importer.c:1073
 #, c-format
 msgid "No importer available for file %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:1056
+#: shell/e-shell-importer.c:1085
 msgid "Unable to execute importer"
 msgstr ""
 
-#: shell/e-shell-importer.c:1169
+#: shell/e-shell-importer.c:1199
 msgid "_Import"
 msgstr ""
 
@@ -16273,54 +15798,54 @@ msgstr ""
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: shell/e-shell-window.c:336
+#: shell/e-shell-window.c:337
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 
-#: shell/e-shell-window.c:343
+#: shell/e-shell-window.c:344
 msgid "Evolution is in the process of going offline."
 msgstr ""
 
-#: shell/e-shell-window.c:349
+#: shell/e-shell-window.c:350
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 
-#: shell/e-shell-window.c:621
+#: shell/e-shell-window.c:637
 #, c-format
 msgid "Switch to %s"
 msgstr ""
 
-#: shell/e-shell-window-commands.c:64
+#: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: shell/e-shell-window-commands.c:72
+#: shell/e-shell-window-commands.c:74
 #, c-format
 msgid "Error executing %s."
 msgstr ""
 
-#: shell/e-shell-window-commands.c:121
+#: shell/e-shell-window-commands.c:123
 msgid "Bug buddy is not installed."
 msgstr ""
 
-#: shell/e-shell-window-commands.c:129
+#: shell/e-shell-window-commands.c:131
 msgid "Bug buddy could not be run."
 msgstr ""
 
-#: shell/e-shell-window-commands.c:171
+#: shell/e-shell-window-commands.c:323
 #, fuzzy
-msgid "About Evolution"
-msgstr "Эволюшин"
+msgid "Groupware Suite"
+msgstr "Бүлэг"
 
-#: shell/e-shell-window-commands.c:382
+#: shell/e-shell-window-commands.c:563
 msgid "_Work Online"
 msgstr ""
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr ""
 
-#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr ""
 
@@ -16332,35 +15857,6 @@ msgstr ""
 msgid "New"
 msgstr "Шинэ"
 
-#: shell/evolution-shell-component-utils.c:115
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Үл мэдэгдэх алдаа."
-
-#: shell/evolution-shell-component-utils.c:118
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-
-#: shell/evolution-shell-component-utils.c:125
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-
 #: shell/evolution-test-component.c:140
 #, fuzzy
 msgid "New Test"
@@ -16668,30 +16164,30 @@ msgid ""
 "Click help for details."
 msgstr ""
 
-#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:522
+#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
+#: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
 msgstr ""
 
-#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:604
+#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
+#: smime/gui/certificate-manager.c:638
 msgid "Certificate Name"
 msgstr "Батламжийн нэр"
 
-#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
+#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
 msgid "Purposes"
 msgstr "Зориулалтууд"
 
-#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:517
+#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr "Серийн дугаар"
 
-#: smime/gui/certificate-manager.c:267
+#: smime/gui/certificate-manager.c:271
 msgid "Expires"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:417
+#: smime/gui/certificate-manager.c:446
 msgid "E-Mail Address"
 msgstr "Ц-шуудангийн хаяг"
 
@@ -16731,6 +16227,11 @@ msgid ""
 "  Subject: %s\n"
 msgstr ""
 
+#: smime/gui/e-cert-selector.c:169
+#, fuzzy
+msgid "Select certificate"
+msgstr "SSL харилцагчийн батламж"
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -16785,7 +16286,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
 msgid "Certificate"
 msgstr "Батламж"
 
@@ -16805,19 +16306,23 @@ msgstr ""
 msgid "Contact Certificates"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:21
-#, no-c-format
-msgid "Do you want to trust \"%s\" for the following purposes?"
+#: smime/gui/smime-ui.glade.h:20
+msgid "Do not trust the authenticity of this certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:21
 msgid "Dummy window only"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:22
 msgid "Edit"
 msgstr "Засварлах"
 
+#: smime/gui/smime-ui.glade.h:23
+#, fuzzy
+msgid "Email Certificate Trust Settings"
+msgstr "Батламжийн дэлгэрэнгүй"
+
 #: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr ""
@@ -16850,247 +16355,258 @@ msgstr "Байгууллагын нэгжм (БН)"
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 хуоууны хээ"
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr "SSL харилцагчийн батламж"
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr "SSL серверийн батламж"
 
 #: smime/gui/smime-ui.glade.h:37
-msgid "Trust this CA to identify email users."
+msgid "Trust the authenticity of this certificate"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:38
-msgid "Trust this CA to identify software developers."
+msgid "Trust this CA to identify email users."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:39
-msgid "Trust this CA to identify web sites."
+msgid "Trust this CA to identify software developers."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:40
-msgid "View"
-msgstr "Үзэмж"
+msgid "Trust this CA to identify web sites."
+msgstr ""
 
 #: smime/gui/smime-ui.glade.h:41
-msgid "View Certificate"
-msgstr ""
+msgid "View"
+msgstr "Үзэмж"
 
 #: smime/gui/smime-ui.glade.h:42
-msgid "You have been asked to trust a new Certificate Authority (CA)."
+msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:43
-msgid "You have certificates from these organizations that identify you:"
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:44
-msgid ""
-"You have certificates on file that identify these certificate authorities:"
+msgid "You have certificates on file that identify these people:"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:45
-msgid "You have certificates on file that identify these people:"
+msgid "Your Certificates"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:46
-msgid "Your Certificates"
+msgid "_Edit CA Trust"
 msgstr ""
 
-#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
+#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
-#: smime/lib/e-cert.c:478
+#. x509 certificate usage types
+#: smime/lib/e-cert.c:424
+#, fuzzy
+msgid "Sign"
+msgstr "Тэмдэглэж байна"
+
+#: smime/lib/e-cert.c:425
+#, fuzzy
+msgid "Encrypt"
+msgstr "ПЖП шифр"
+
+#: smime/lib/e-cert.c:530
 msgid "Version"
 msgstr "Хувилбар"
 
-#: smime/lib/e-cert.c:493
+#: smime/lib/e-cert.c:545
 msgid "Version 1"
 msgstr "Хувилбар 1"
 
-#: smime/lib/e-cert.c:496
+#: smime/lib/e-cert.c:548
 msgid "Version 2"
 msgstr "Хувилбар 2"
 
-#: smime/lib/e-cert.c:499
+#: smime/lib/e-cert.c:551
 msgid "Version 3"
 msgstr "Хувилбар 3"
 
-#: smime/lib/e-cert.c:581
+#: smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:584
+#: smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:587
+#: smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:590
+#: smime/lib/e-cert.c:642
 msgid "C"
 msgstr ""
 
-#: smime/lib/e-cert.c:593
+#: smime/lib/e-cert.c:645
 msgid "CN"
 msgstr ""
 
-#: smime/lib/e-cert.c:596
+#: smime/lib/e-cert.c:648
 msgid "OU"
 msgstr ""
 
-#: smime/lib/e-cert.c:599
+#: smime/lib/e-cert.c:651
 msgid "O"
 msgstr ""
 
-#: smime/lib/e-cert.c:602
+#: smime/lib/e-cert.c:654
 msgid "L"
 msgstr ""
 
-#: smime/lib/e-cert.c:605
+#: smime/lib/e-cert.c:657
 msgid "DN"
 msgstr ""
 
-#: smime/lib/e-cert.c:608
+#: smime/lib/e-cert.c:660
 msgid "DC"
 msgstr ""
 
-#: smime/lib/e-cert.c:611
+#: smime/lib/e-cert.c:663
 msgid "ST"
 msgstr ""
 
-#: smime/lib/e-cert.c:614
+#: smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:617
+#: smime/lib/e-cert.c:669
 msgid "Certificate Key Usage"
 msgstr ""
 
-#: smime/lib/e-cert.c:620
+#: smime/lib/e-cert.c:672
 msgid "Netscape Certificate Type"
 msgstr ""
 
-#: smime/lib/e-cert.c:623
+#: smime/lib/e-cert.c:675
 msgid "Certificate Authority Key Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:626
+#: smime/lib/e-cert.c:678
 msgid "UID"
 msgstr ""
 
-#: smime/lib/e-cert.c:635
+#: smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr ""
 
-#: smime/lib/e-cert.c:686
+#: smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:694
+#: smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
 msgstr ""
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:768
 msgid "Subject Public Key Info"
 msgstr ""
 
-#: smime/lib/e-cert.c:721
+#: smime/lib/e-cert.c:773
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:736
+#: smime/lib/e-cert.c:788
 msgid "Subject's Public Key"
 msgstr ""
 
-#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
+#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
 msgid "Error: Unable to process extension"
 msgstr ""
 
-#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
+#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:782
+#: smime/lib/e-cert.c:834
 msgid "SSL Certificate Authority"
 msgstr ""
 
-#: smime/lib/e-cert.c:786
+#: smime/lib/e-cert.c:838
 msgid "Email Certificate Authority"
 msgstr ""
 
-#: smime/lib/e-cert.c:814
+#: smime/lib/e-cert.c:866
 msgid "Signing"
 msgstr "Тэмдэглэж байна"
 
-#: smime/lib/e-cert.c:818
+#: smime/lib/e-cert.c:870
 msgid "Non-repudiation"
 msgstr ""
 
-#: smime/lib/e-cert.c:822
+#: smime/lib/e-cert.c:874
 msgid "Key Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:826
+#: smime/lib/e-cert.c:878
 msgid "Data Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:830
+#: smime/lib/e-cert.c:882
 msgid "Key Agreement"
 msgstr ""
 
-#: smime/lib/e-cert.c:834
+#: smime/lib/e-cert.c:886
 msgid "Certificate Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:838
+#: smime/lib/e-cert.c:890
 msgid "CRL Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:938
 msgid "Critical"
 msgstr "Ноцтой"
 
-#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
+#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
 msgid "Not Critical"
 msgstr "Ноцтой бус"
 
-#: smime/lib/e-cert.c:912
+#: smime/lib/e-cert.c:964
 msgid "Extensions"
 msgstr "Өргөтгөлүүд"
 
-#: smime/lib/e-cert.c:983
+#: smime/lib/e-cert.c:1035
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
 msgid "Certificate Signature Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:1048
+#: smime/lib/e-cert.c:1100
 msgid "Issuer"
 msgstr ""
 
-#: smime/lib/e-cert.c:1102
+#: smime/lib/e-cert.c:1154
 msgid "Issuer Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1121
+#: smime/lib/e-cert.c:1173
 msgid "Subject Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1164
+#: smime/lib/e-cert.c:1216
 msgid "Certificate Signature Value"
 msgstr ""
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
+#: smime/lib/e-cert-db.c:608
 msgid "Certificate already exists"
 msgstr ""
 
@@ -17236,7 +16752,7 @@ msgstr ""
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr ""
 
@@ -17399,7 +16915,7 @@ msgstr "_Хаах"
 #: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:3
+#: ui/evolution.xml.h:4
 msgid "Close"
 msgstr "Хаах"
 
@@ -17412,7 +16928,7 @@ msgid "Delete this item"
 msgstr ""
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr ""
 
@@ -17455,7 +16971,7 @@ msgstr ""
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:44
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "_File"
 msgstr "_Файл"
 
@@ -17712,13 +17228,13 @@ msgstr ""
 msgid "_Threaded Message List"
 msgstr ""
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Энэ цонхыг хаах"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "_Close"
 msgstr "_Хаах"
 
@@ -18118,7 +17634,7 @@ msgstr "_Өмнөх зурвас"
 msgid "_Quoted"
 msgstr "_Хашигдсан"
 
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
 msgid "_Tools"
 msgstr "_Хэрэгслүүд"
 
@@ -18417,108 +17933,119 @@ msgid "_Open Task"
 msgstr "_Нээх"
 
 #: ui/evolution.xml.h:1
-msgid "About Ximian Evolution..."
-msgstr "Эксимиан Эволюшины тухай..."
+#, fuzzy
+msgid "About Evolution..."
+msgstr "Эволюшин"
 
 #: ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
 msgstr "Эволюшины тохиргоонуудыг солих"
 
-#: ui/evolution.xml.h:5
+#: ui/evolution.xml.h:3
+msgid "Change the visibility of the toolbar"
+msgstr ""
+
+#: ui/evolution.xml.h:6
 #, fuzzy
 msgid "Create a new window displaying this folder"
 msgstr "Шинэ хуанли үүсгэх"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "Г_арах"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Эксимиан Эволюшины _ТАА"
+
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Програмаас гарах"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:10
 msgid "Forget _Passwords"
 msgstr "Нууц үгээ _мартсан"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:11
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:12
 msgid "Import data from other programs"
 msgstr "Бусад програмуудаас өгөгдөл оруулах"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:14
 #, fuzzy
 msgid "New _Window"
 msgstr "_Цонх"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Pi_lot Settings..."
 msgstr ""
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Send / Receive"
 msgstr "Илгээх/Хүлээн авах"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Send queued items and retrieve new items"
 msgstr ""
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Set up Pilot configuration"
 msgstr ""
 
-#: ui/evolution.xml.h:17
-msgid "Show information about Ximian Evolution"
+#: ui/evolution.xml.h:19
+msgid "Show information about Evolution"
 msgstr ""
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:20
 msgid "Submit Bug Report"
 msgstr "Цохын тухай мэдээлэх"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:21
 msgid "Submit _Bug Report"
 msgstr "_Цохын тухай мэдээлэх"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Submit a bug report using Bug Buddy"
 msgstr ""
 
-#: ui/evolution.xml.h:21
-msgid "Toggle whether we are working offline."
-msgstr ""
-
 #: ui/evolution.xml.h:23
-msgid "Ximian Evolution _FAQ"
-msgstr "Эксимиан Эволюшины _ТАА"
+msgid "T_oolbar"
+msgstr ""
 
 #: ui/evolution.xml.h:24
-msgid "_About Ximian Evolution..."
-msgstr "_Эксимиан Эволюшины тухай"
+msgid "Toggle whether we are working offline."
+msgstr ""
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "_About Evolution..."
+msgstr "Эволюшин"
+
+#: ui/evolution.xml.h:30
 msgid "_Help"
 msgstr "_Тусламж"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "_Import..."
 msgstr "_Оруулах..."
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "_New"
 msgstr "_Шинэ"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "_Quick Reference"
 msgstr ""
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_Send / Receive"
 msgstr "_Илгээх/хүлээж авах"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 #, fuzzy
 msgid "_Window"
 msgstr "_Цонх"
@@ -18591,7 +18118,7 @@ msgid "With _Status"
 msgstr "_Байдал:"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:626
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:635
 msgid "UTC"
 msgstr "UTC"
 
@@ -18745,30 +18272,30 @@ msgstr "Бусад..."
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
-#: widgets/misc/e-error.c:121
+#: widgets/misc/e-error.c:79 widgets/misc/e-error.c:80
+#: widgets/misc/e-error.c:122
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Эволюшин"
 
-#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
-#: widgets/misc/e-error.c:119
+#: widgets/misc/e-error.c:81 widgets/misc/e-error.c:82
+#: widgets/misc/e-error.c:120
 #, fuzzy
 msgid "Evolution Warning"
 msgstr "Эволюшин сэрүүлэг"
 
-#: widgets/misc/e-error.c:118
+#: widgets/misc/e-error.c:119
 #, fuzzy
 msgid "Evolution Information"
 msgstr "Мэдээлэл алга"
 
-#: widgets/misc/e-error.c:120
+#: widgets/misc/e-error.c:121
 #, fuzzy
 msgid "Evolution Query"
 msgstr "Эволюшин"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:410
+#: widgets/misc/e-error.c:415
 #, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -18911,16 +18438,164 @@ msgstr "Файлыг нээх чадахгүй"
 msgid "Cannot open file \"{0}\"."
 msgstr "Файлыг нээх чадахгүй"
 
-#: widgets/misc/e-task-widget.c:211
+#: widgets/misc/e-task-widget.c:212
 #, c-format
 msgid "%s (...)"
 msgstr ""
 
-#: widgets/misc/e-task-widget.c:216
+#: widgets/misc/e-task-widget.c:217
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr ""
 
+#~ msgid "Failed to connect to LDAP server"
+#~ msgstr "LDAP  серверт холбогдож чадсангүй"
+
+#~ msgid "Failed to authenticate with LDAP server"
+#~ msgstr "LDAP серверээр баталгаажуулж чадсангүй"
+
+#~ msgid "1:00"
+#~ msgstr "1:00"
+
+#~ msgid "5:00"
+#~ msgstr "5:00"
+
+#~ msgid "Connecting"
+#~ msgstr "Холбогдож байна"
+
+#~ msgid "Email address:"
+#~ msgstr "Ц-шуудангийн хаяг:"
+
+#~ msgid "One"
+#~ msgstr "Нэг"
+
+#~ msgid "S_earch scope: "
+#~ msgstr "Хайх _хүрээ"
+
+#~ msgid "Searching"
+#~ msgstr "Хайж байна"
+
+#~ msgid "Sub"
+#~ msgstr "Дэд"
+
+#~ msgid "U_se SSL/TLS:"
+#~ msgstr "SSL/TLS ашиглах:"
+
+#~ msgid "_Display name:"
+#~ msgstr "_Харуулах нэр:"
+
+#~ msgid "_Port number:"
+#~ msgstr "_Портын дугаар:"
+
+#~ msgid "_Search base:"
+#~ msgstr "_Хайлтын суурь:"
+
+#~ msgid "_Server name:"
+#~ msgstr "_Серверийн нэр:"
+
+#, fuzzy
+#~ msgid "Job title:"
+#~ msgstr "Албан _тушаал:"
+
+#~ msgid "Do you want to save changes?"
+#~ msgstr "Өөрчлөлтүүдийг хадгалахыг хүсч байна уу?"
+
+#, fuzzy
+#~ msgid "Calendar Properties"
+#~ msgstr "Хуанлийн бүлэг"
+
+#, fuzzy
+#~ msgid "Remote"
+#~ msgstr "Устгах"
+
+#, fuzzy
+#~ msgid "Task List Properties"
+#~ msgstr "Үүргийн жагсаалтын бүлэг"
+
+#, fuzzy
+#~ msgid "_Source URL:"
+#~ msgstr "Эх үүсвэр"
+
+#~ msgid "Are you sure you want to delete the appointment `%s'?"
+#~ msgstr "Та энэ уулзалтыг устгахыг хүсч байна уу?"
+
+#~ msgid "Are you sure you want to delete this untitled appointment?"
+#~ msgstr "Та энэ нэрлэгдээгүй уулзалтыг устгахыг хүсч байна уу?"
+
+#~ msgid "Are you sure you want to delete the task `%s'?"
+#~ msgstr "`%s' үүргийг устгана гэдэгтээ итгэлтэй байна уу?"
+
+#~ msgid "Are you sure you want to delete this untitled task?"
+#~ msgstr "Та энэ нэр үгүй үүргийг устгана гэдэгтээ итгэлтэй байна уу?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d appointment?"
+#~ msgid_plural "Are you sure you want to delete %d appointments?"
+#~ msgstr[0] "Та %d уулзалтуудыг устгахыг хүсч байна уу?"
+#~ msgstr[1] "Та %d уулзалтуудыг устгахыг хүсч байна уу?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d task?"
+#~ msgid_plural "Are you sure you want to delete %d tasks?"
+#~ msgstr[0] "`%s' үүргийг устгана гэдэгтээ итгэлтэй байна уу?"
+#~ msgstr[1] "`%s' үүргийг устгана гэдэгтээ итгэлтэй байна уу?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d journal entry?"
+#~ msgid_plural "Are you sure you want to delete %d journal entries?"
+#~ msgstr[0] "Та %d уулзалтуудыг устгахыг хүсч байна уу?"
+#~ msgstr[1] "Та %d уулзалтуудыг устгахыг хүсч байна уу?"
+
+#~ msgid "_Discard Changes"
+#~ msgstr "_Өөрчлөлтүүдийг хэрэгсэхгүй"
+
+#, fuzzy
+#~ msgid "Stream error"
+#~ msgstr "Бусад алдаа"
+
+#, fuzzy
+#~ msgid "Connection error: %s"
+#~ msgstr "Үл мэдэгдэх алдаа"
+
+#, fuzzy
+#~ msgid "Could not get messages: unspecified error"
+#~ msgstr "Мэдээллийг хавтсанд хадгалах"
+
+#, fuzzy
+#~ msgid "Junk Test"
+#~ msgstr "6-р сар"
+
+#, fuzzy
+#~ msgid "Message is Junk"
+#~ msgstr "_Мэдээлэл"
+
+#, fuzzy
+#~ msgid "Message is not Junk"
+#~ msgstr "Илгээх зурвас"
+
+#, fuzzy
+#~ msgid "Pipe to Program"
+#~ msgstr "Програмаас гарах"
+
+#, fuzzy
+#~ msgid "Run Program"
+#~ msgstr "Програм ажиллуул:"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "Unknown error."
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Үл мэдэгдэх алдаа."
+
+#~ msgid "About Ximian Evolution..."
+#~ msgstr "Эксимиан Эволюшины тухай..."
+
+#~ msgid "_About Ximian Evolution..."
+#~ msgstr "_Эксимиан Эволюшины тухай"
+
 #~ msgid "Evolution Addressbook folder viewer"
 #~ msgstr "Эволюшин хаягийн дэвтрийн хавтас үзүүлэгч"
 
@@ -19027,9 +18702,6 @@ msgstr ""
 #~ msgid "Primary _email:"
 #~ msgstr "_Анхдагч ц-шуудан:"
 
-#~ msgid "S_pouse:"
-#~ msgstr "Гэр бүлийн хүн:"
-
 #~ msgid "_Business:"
 #~ msgstr "_Бизнес"
 
@@ -19042,9 +18714,6 @@ msgstr ""
 #~ msgid "_Mobile:"
 #~ msgstr "_Гар утас:"
 
-#~ msgid "_Office:"
-#~ msgstr "Ажлын _байр:"
-
 #~ msgid "_This is the mailing address"
 #~ msgstr "_Энэ илгээгдэх хаяг"
 
diff --git a/po/ms.po b/po/ms.po
index 26dee0dcc1..9a33d4e65a 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution HEAD\n"
-"POT-Creation-Date: 2004-05-19 14:00-0400\n"
+"POT-Creation-Date: 2004-06-03 11:14-0400\n"
 "PO-Revision-Date: 2003-11-17 11:40+0800\n"
 "Last-Translator: Mimos Open Source Development Group <ismas@mimos.my>\n"
 "Language-Team: Projek Gabai <gabai-penyumbang@lists.sf.net>\n"
@@ -61,13 +61,13 @@ msgstr "1 kad"
 msgid "Default Sync Address:"
 msgstr "Alamat Segerak Piawai:"
 
-#: addressbook/conduit/address-conduit.c:1150
 #: addressbook/conduit/address-conduit.c:1151
+#: addressbook/conduit/address-conduit.c:1152
 msgid "Could not load addressbook"
 msgstr "Tidak dapat memuatkan buku alamat"
 
-#: addressbook/conduit/address-conduit.c:1219
-#: addressbook/conduit/address-conduit.c:1222
+#: addressbook/conduit/address-conduit.c:1220
+#: addressbook/conduit/address-conduit.c:1223
 msgid "Could not read pilot's Address application block"
 msgstr "Tidak dapat membaca blok aplikasi Alamat rintis"
 
@@ -75,13 +75,13 @@ msgstr "Tidak dapat membaca blok aplikasi Alamat rintis"
 msgid "Accessing LDAP Server anonymously"
 msgstr "Mencapai Pelayan LDAP tanpa nama"
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
 msgid "Failed to authenticate.\n"
 msgstr "Gagal disahkan.\n"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sMasukkan kata laluan bagi %s (pengguna %s)"
@@ -127,52 +127,24 @@ msgstr "_Kenalan:"
 msgid "Create a new contacts group"
 msgstr "Wujudkan kumpulan jalan pintas baru"
 
-#: addressbook/gui/component/addressbook-component.c:182
+#: addressbook/gui/component/addressbook-component.c:184
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:483
-msgid "Failed to connect to LDAP server"
-msgstr "Gagal disambungkan ke pelayan LDAP"
-
-#: addressbook/gui/component/addressbook-config.c:507
-msgid "Failed to authenticate with LDAP server"
-msgstr "Gagal disahkan dengan pelayan LDAP"
-
-#: addressbook/gui/component/addressbook-config.c:535
-msgid "Could not perform query on Root DSE"
-msgstr "Tidak dapat membuat pertanyaan pada Asas DSE"
-
-#: addressbook/gui/component/addressbook-config.c:840
-msgid "The server responded with no supported search bases"
-msgstr "Pelayan memberikan maklum balas dengan tiada asas carian sokongan"
-
-#: addressbook/gui/component/addressbook-config.c:1245
-msgid "This server does not support LDAPv3 schema information"
-msgstr "Pelayan ini tidak menyokong maklumat skema LDAPv3"
-
-#: addressbook/gui/component/addressbook-config.c:1266
-msgid "Error retrieving schema information"
-msgstr "Ralat ketika mendapatkan semula maklumat skema"
-
-#: addressbook/gui/component/addressbook-config.c:1274
-msgid "Server did not respond with valid schema information"
-msgstr "Pelayan tidak memberikan maklum balas dengan maklumat skema yang sah"
-
 #: addressbook/gui/component/addressbook-migrate.c:68
-#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1160
 #, fuzzy
 msgid "Migrating..."
 msgstr "Sedang menunggu..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1201
 #, fuzzy, c-format
 msgid "Migrating `%s':"
 msgstr "%s berdenting"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:438
+#: addressbook/gui/component/addressbook-migrate.c:464
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
 #: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
@@ -180,31 +152,31 @@ msgid "On This Computer"
 msgstr "Atas Komputer Ini"
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:446
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
-#: mail/mail-config.glade.h:106
+#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
+#: mail/mail-config.glade.h:109
 msgid "Personal"
 msgstr "Peribadi"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:454
+#: addressbook/gui/component/addressbook-migrate.c:480
 #, fuzzy
 msgid "On LDAP Servers"
 msgstr "Pelayan LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:582
+#: addressbook/gui/component/addressbook-migrate.c:608
 #, fuzzy
 msgid "LDAP Servers"
 msgstr "Pelayan LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:702
+#: addressbook/gui/component/addressbook-migrate.c:728
 #, fuzzy
 msgid "Autocompletion Settings"
 msgstr "Folder Autocompletion"
 
-#: addressbook/gui/component/addressbook-migrate.c:1076
+#: addressbook/gui/component/addressbook-migrate.c:1104
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -212,60 +184,55 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1090
+#: addressbook/gui/component/addressbook-migrate.c:1118
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1099
+#: addressbook/gui/component/addressbook-migrate.c:1127
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1109
+#: addressbook/gui/component/addressbook-migrate.c:1137
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:674
+#: addressbook/gui/component/addressbook-view.c:675
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:761
+#: addressbook/gui/component/addressbook-view.c:754
 #, fuzzy
 msgid "New Address Book"
 msgstr "Buku Alamat"
 
-#: addressbook/gui/component/addressbook-view.c:762
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
+#: addressbook/gui/component/addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Hapus"
 
-#: addressbook/gui/component/addressbook-view.c:763
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-view.c:756
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Ciri-ciri..."
 
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/addressbook-view.c:1002
+#. Create the contacts group
+#: addressbook/gui/component/addressbook-view.c:995
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
 #: calendar/gui/migration.c:373
 msgid "Contacts"
 msgstr "Kenalan"
@@ -345,10 +312,6 @@ msgid "Manage your S/MIME certificates here"
 msgstr "Urus sijil S/Mime anda di sini"
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-msgid "  S_how Supported Bases "
-msgstr "  T_unjukkan Asas Sokongan"
-
-#: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -363,207 +326,173 @@ msgstr "  T_unjukkan Asas Sokongan"
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1:00"
-msgstr "1:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
-msgstr "5:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "Pengesahan"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
 #, fuzzy
 msgid "<b>Display</b>"
 msgstr "<b>Status:</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 #, fuzzy
 msgid "<b>Downloading</b>"
 msgstr "L_okasi:"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:10
 #, fuzzy
 msgid "<b>Searching</b>"
 msgstr "Sedang mencari"
 
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
 msgid "<b>Server Information</b>"
 msgstr "Langkah 1: Maklumat Pelayan"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
 msgid "<b>Type:</b>"
 msgstr "<b>Genap tempoh:</b> "
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:13
 #, fuzzy
 msgid "Add Contacts Group"
 msgstr "_Kenalan:"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:14
 #, fuzzy
 msgid "Address Book Properties"
 msgstr "Sumber Buku Alamat"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
-#: mail/mail-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
+#: mail/mail-config.glade.h:42
 msgid "Always"
 msgstr "Sentiasa"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr "Tanpa nama"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:17
 #: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Asas"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
-msgid "Connecting"
-msgstr "Disambungkan"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 #: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Perincian"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
-msgid "Distinguished _name:"
-msgstr "Nama_ berbeza:"
-
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:19
 #, fuzzy
 msgid "Distinguished name"
 msgstr "Nama_ berbeza:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:20
 #, fuzzy
 msgid "Download limit:"
 msgstr "_Had muat turun:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Email address"
 msgstr "Alamat e-mel:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "Email address:"
-msgstr "Alamat e-mel:"
-
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "Evolution will use this DN to authenticate you with the server"
-msgstr ""
-"Evolution akan mengggunakan DN ini untuk mengesahkan anda dengan pelayan"
-
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:22
+#, fuzzy
 msgid ""
-"Evolution will use this email address to authenticate you with the server"
+"Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "Evolution akan menggunakan alamat e-mel ini untuk mengesahkan anda dengan "
 "pelayan"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:23
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Asas Carian Sokongan"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:24
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
+#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Am"
 
-#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
-#: mail/mail-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
+#: mail/mail-config.glade.h:102
 msgid "Never"
 msgstr "Tidak Pernah"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
-msgid "One"
-msgstr "Satu"
-
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:35
-msgid "S_earch scope: "
-msgstr "Skop C_arian: "
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Search _base:"
+msgstr "_Asas carian:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
 msgid "Search base only"
 msgstr "_Asas carian:"
 
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:29
 #, fuzzy
 msgid "Search base:"
 msgstr "_Asas carian:"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Search scope:"
 msgstr "Skop C_arian: "
 
-#: addressbook/gui/component/ldap-config.glade.h:39
-msgid "Searching"
-msgstr "Sedang mencari"
-
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:31
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
-"server if\n"
-"your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL or TLS."
 msgstr ""
 "Memilih opsyen ini bermakna Evolution hanya akan disambungkan ke pelayan "
 "LDAP anda jika\n"
 "pelayan LDAP anda menyokong SSL atau TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a \n"
-"insecure environment. For example, if you and your LDAP server are behind a "
-"firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection "
-"is already\n"
-"secure."
+"you are in a insecure environment. For example, if you and your LDAP server "
+"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
+"because your connection is already secure."
 msgstr ""
 "Memilih opsyen ini bermakna Evolution hanya akan cuba menggunakan SSL/TLS "
 "jika anda berada dalam \n"
@@ -573,13 +502,12 @@ msgstr ""
 "sambungan anda sudah\n"
 "selamat."
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:33
+#, fuzzy
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
-"TLS.  This \n"
-"means that your connection will be insecure, and that you will be vulnerable "
-"to security\n"
-"exploits. "
+"TLS.  This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits. "
 msgstr ""
 "Memilih opsyen ini bermakna pelayan anda tidak menyokong sama ada SSL atau "
 "TLS.  Ini \n"
@@ -587,37 +515,32 @@ msgstr ""
 "kepada eksploitasi\n"
 "keselamatan. "
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Sub"
-msgstr "Sub"
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr "Asas Carian Sokongan"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
-"searches will \n"
-"begin. If you leave this blank, the search will begin at the root of the "
-"directory tree."
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
 msgstr ""
 "Asas carian ialah nama berbeza (NB)  bagi entri di mana carian anda akan \n"
 "bermula. Jika anda membiarkannya kosong, carian akan bermula pada akar "
 "pepohon direktori."
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:37
+#, fuzzy
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
-"the \n"
-"directory tree. A search scope of \"sub\" will include all entries below "
-"your search base.\n"
-"A search scope of \"one\" will only include the entries one level beneath "
-"your base.\n"
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
 msgstr ""
 "Skop carian menetapkan sejauh mana anda mahukan carian anda meliputi \n"
 "pepohon direktori. Skop carian bagi \"sub\" akan merangkumi semua entri di "
@@ -625,25 +548,24 @@ msgstr ""
 "Skop carian bagi \"satu\" akan hanya merangkumi entri satu tahap di bawah "
 "asas anda.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:58
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 "Ini nama penuh pelayan ldap anda. Contohnya, \"ldap.syarikatsaya.com\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:39
 #, fuzzy
 msgid ""
-"This is the maximum number of entries to download. Setting this number to "
-"be \n"
+"This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr ""
 "Ini bilangan maksimum entri untuk dimuat turun. Mengesetkan bilangan ini "
 "sehingga \n"
 "terlalu besar akan melambatkan buku alamat anda."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -653,142 +575,121 @@ msgstr ""
 "perhatian bahawa mengesetkannya kepada \"Alamat E-mel\" memerlukan capaian "
 "tanpa nama kepada pelayan ldap anda."
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:41
+#, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
-"list.\n"
-"It is for display purposes only. "
+"list. It is for display purposes only. "
 msgstr ""
 "Ini nama bagi pelayan ini yang akan tertera pada senarai folder Evolution "
 "anda.\n"
 "Ia untuk tujuan paparan sahaja. "
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:42
+#, fuzzy
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. "
-"A \n"
-"list of standard ports has been provided. Ask your system administrator\n"
-"what port you should specify."
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
 msgstr ""
 "Ini port dalam pelayan LDAP yang cuba disambungkan ke Evolution. Satu \n"
 "senarai port piawai telah diberikan. Tanya pentadbir sistem anda\n"
 "apakah port yang patut anda tetapkan."
 
-#: addressbook/gui/component/ldap-config.glade.h:67
-msgid "This option controls how long a search will be run."
-msgstr "Opsyen ini mengawal berapa lama carian akan dijalankan."
-
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:43
 #, fuzzy
 msgid "Timeout:"
 msgstr "Format masa:"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
-msgid "U_se SSL/TLS:"
-msgstr "G_unakan SSL/TLS:"
-
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr "Menggunakan nama berbeza (NB)"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr "Menggunakan alamat e-mel"
 
-#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
-#: mail/mail-config.glade.h:154
+#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
+#: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr "Pada bila-bila masa yang mungkin"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:47
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "_Kenalan:"
 
-#: addressbook/gui/component/ldap-config.glade.h:74
-#: calendar/gui/dialogs/calendar-setup.glade.h:12
-msgid "_Display name:"
-msgstr "_Paparkan nama:"
-
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr "_Had muat turun:"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
 msgid "_Email address:"
 msgstr "Alamat e-mel:"
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:50
+#, fuzzy
+msgid "_Find Possible Search Bases"
+msgstr "Asas Carian Sokongan"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Log in method:"
 msgstr "_Kaedah log masuk:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "_Log in:"
+msgstr "Log masuk"
+
+#: addressbook/gui/component/ldap-config.glade.h:53
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
 msgid "_Name:"
 msgstr "_Nama:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
-msgid "_Port number:"
-msgstr "_Nombor port:"
-
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "_Port:"
 msgstr "_Keutamaan:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
-msgid "_Search base:"
-msgstr "_Asas carian:"
-
-#: addressbook/gui/component/ldap-config.glade.h:82
-msgid "_Server name:"
-msgstr "_Nama pelayan:"
+#: addressbook/gui/component/ldap-config.glade.h:55
+#, fuzzy
+msgid "_Search scope:"
+msgstr "Skop C_arian: "
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:56
 #, fuzzy
 msgid "_Server:"
 msgstr "P_elayan:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
-msgid "_Timeout (minutes):"
-msgstr "_Tamat masa (minit):"
+#: addressbook/gui/component/ldap-config.glade.h:57
+#, fuzzy
+msgid "_Timeout:"
+msgstr "Format masa:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:58
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "_Gunakan sambungan terjamin (SSL):"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "kad"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
-msgid "connecting-tab"
-msgstr "tab sambung"
-
-#: addressbook/gui/component/ldap-config.glade.h:88
-msgid "general-tab"
-msgstr "tab am"
-
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:60
 #: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
-#: mail/mail-config.glade.h:182
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "minit"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
-msgid "searching-tab"
-msgstr "tab cari"
-
-#: addressbook/gui/component/select-names/e-select-names.c:497
+#: addressbook/gui/component/select-names/e-select-names.c:503
 #: addressbook/gui/component/select-names/select-names.glade.h:6
 #, fuzzy
 msgid "Select Contacts from Address Book"
 msgstr "Pilih Kenalan daripada Buku Alamat"
 
-#: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
@@ -828,7 +729,7 @@ msgstr "Kenalan Tanpa Nama"
 
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:222
+#: addressbook/gui/widgets/e-addressbook-view.c:224
 msgid "Source"
 msgstr "Sumber"
 
@@ -907,9 +808,9 @@ msgid "<b>Work</b>"
 msgstr "Minggu Bekerja"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
-#: addressbook/gui/widgets/eab-contact-display.c:342
-#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/widgets/eab-contact-display.c:334
+#: addressbook/gui/widgets/eab-contact-display.c:353
 msgid "AIM"
 msgstr ""
 
@@ -950,15 +851,15 @@ msgid "Company:"
 msgstr "Syarikat"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:271
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
+#: addressbook/gui/contact-editor/e-contact-editor.c:266
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
 msgstr "Kenalan"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1527
+#: addressbook/gui/contact-editor/e-contact-editor.c:520
 msgid "Contact Editor"
 msgstr "Editor Kenalan"
 
@@ -982,83 +883,80 @@ msgid "Full _Name..."
 msgstr "Nama _Penuh..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:202
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-msgid "Home"
-msgstr "Rumah"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #, fuzzy
 msgid "Home Page:"
 msgstr "Laman web"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-#, fuzzy
-msgid "Job title:"
-msgstr "_Gelaran jawatan:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/e-itip-control.c:936
-msgid "Location:"
-msgstr "Lokasi:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 #, fuzzy
 msgid "MSN Messenger"
 msgstr "_Mesej Mel"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 #, fuzzy
 msgid "Mailing Address"
 msgstr "Alamat E-mel"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 #, fuzzy
 msgid "Manager:"
 msgstr "Pengurus"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "_Nama Ringkas:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Notes:"
 msgstr "No_ta:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
-#: addressbook/gui/contact-editor/e-contact-editor.c:203
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-msgid "Other"
-msgstr "Lain"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#, fuzzy
+msgid "Office:"
+msgstr "_Pejabat:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "PO Box:"
 msgstr "_Peti Surat:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 #, fuzzy
 msgid "Personal Information"
 msgstr "Maklumat Opsyenal"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 #, fuzzy
 msgid "Profession:"
 msgstr "P_rofesion:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#, fuzzy
+msgid "Spouse:"
+msgstr "P_asangan:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "State/Province:"
 msgstr "_Negeri/Wilayah:"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#, fuzzy
+msgid "Title:"
+msgstr "_Gelaran:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+msgid "Video Chat:"
+msgstr ""
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:41
 #, fuzzy
 msgid "Wants to receive HTML mail"
@@ -1066,15 +964,15 @@ msgstr "Ingin menerima _mel HTML"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:42
 #, fuzzy
-msgid "Webcam:"
-msgstr "Laman Web:"
+msgid "Web Log:"
+msgstr "_Laman Web:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
-#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
-#: mail/mail-config.glade.h:155
+#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
+#: mail/mail-config.glade.h:157
 msgid "Work"
 msgstr "Kerja"
 
@@ -1094,19 +992,12 @@ msgid "_File under:"
 msgstr "Nama fail:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 #, fuzzy
 msgid "_Where:"
 msgstr "P_elayan:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
-msgid "item7"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
-msgid "item8"
-msgstr ""
-
-#: addressbook/gui/contact-editor/eab-editor.c:316
+#: addressbook/gui/contact-editor/eab-editor.c:315
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -1114,7 +1005,7 @@ msgstr ""
 "Adakah anda pasti ingin\n"
 "menghapuskan kenalan ini?"
 
-#: addressbook/gui/contact-editor/eab-editor.c:319
+#: addressbook/gui/contact-editor/eab-editor.c:318
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -1123,16 +1014,16 @@ msgstr ""
 "menghapuskan kenalan ini?"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:351
-#: addressbook/gui/widgets/eab-contact-display.c:372
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Address"
 msgstr "Alamat"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:292
+#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard.c:174
@@ -2117,90 +2008,113 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/contact-editor/e-contact-editor.c:179
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:337
+#: addressbook/gui/widgets/eab-contact-display.c:356
 #, fuzzy
 msgid "Jabber"
 msgstr "Senarai Id Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:347
-#: addressbook/gui/widgets/eab-contact-display.c:366
+#: addressbook/gui/contact-editor/e-contact-editor.c:180
+#: addressbook/gui/widgets/eab-contact-display.c:339
+#: addressbook/gui/widgets/eab-contact-display.c:358
 #, fuzzy
 msgid "Yahoo"
 msgstr "Yoro"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: addressbook/gui/widgets/eab-contact-display.c:338
+#: addressbook/gui/widgets/eab-contact-display.c:357
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:344
-#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#: addressbook/gui/widgets/eab-contact-display.c:355
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/contact-editor/e-contact-editor.c:183
 #, fuzzy
 msgid "GroupWise"
 msgstr "Kumpulan"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+msgid "Home"
+msgstr "Rumah"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+msgid "Other"
+msgstr "Lain"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
 #, fuzzy
 msgid "Source Book"
 msgstr "Sumber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:264
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:278
+#: addressbook/gui/contact-editor/e-contact-editor.c:273
 msgid "Is New Contact"
 msgstr "Merupakan Kenalan Baru"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:285
+#: addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Writable Fields"
 msgstr "Medan Boleh Tulis"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:299
+#: addressbook/gui/contact-editor/e-contact-editor.c:294
 msgid "Changed"
 msgstr "Diubah"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
-msgid "Category editor not available."
-msgstr "Editor kategori tidak ada."
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:2352
 msgid "This contact belongs to these categories:"
 msgstr "Kenalan ini tergolong dalam kategori ini:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#: addressbook/gui/contact-editor/e-contact-editor.c:2429
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Sila pilih opsyen berikut"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#: addressbook/gui/contact-editor/e-contact-editor.c:2433
 #, fuzzy
 msgid "No image"
 msgstr "Nome"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#: addressbook/gui/contact-editor/e-contact-editor.c:2636
 #, fuzzy
 msgid ""
-"The following entries are invalid:\n"
+"The contact data is invalid:\n"
 "\n"
-msgstr "Sambungan berikut aktif sekarang:"
+msgstr "Tarikh perulangan tak sah"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2738
-#, c-format
-msgid "Could not find widget for a field: `%s'"
-msgstr "Tidak dapat mencari widget bagi medan: `%s'"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#, fuzzy
+msgid "Invalid contact."
+msgstr "Objek tak sah"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+msgid ""
+"The contact cannot be saved to the selected address book. Do you want to "
+"discard changes?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2727
+#: addressbook/gui/contact-editor/e-contact-editor.c:2751
+msgid "_Discard"
+msgstr "_Buang"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+msgid ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
+msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:62
 #, fuzzy
@@ -2237,7 +2151,7 @@ msgid "_Edit Full"
 msgstr "_Edit Penuh "
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:166
 msgid "_Full Name:"
 msgstr "_Nama Penuh:"
 
@@ -2386,30 +2300,30 @@ msgstr "Nama _senarai:"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Taip alamat e-mel atau seret kenalan ke dalam senarai di bawah:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "contact-list-editor"
 msgstr "editor-senarai-kenalan"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:153
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:215
+#: addressbook/gui/widgets/e-addressbook-view.c:217
 #: addressbook/gui/widgets/e-minicard-view.c:460
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Buku"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
 msgid "Is New List"
 msgstr "Ialah Senarai Baru"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:215
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
 msgid "Contact List Editor"
 msgstr "Editor Senarai Kenalan"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:438
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
 msgid "Save List as VCard"
 msgstr "Simpan Senarai sebagai VCard"
 
@@ -2456,124 +2370,124 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Carian Lanjutan"
 
-#: addressbook/gui/widgets/eab-contact-display.c:129
-#: addressbook/gui/widgets/eab-contact-display.c:192
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:139
-#: addressbook/gui/widgets/eab-contact-display.c:205
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:257
-#: addressbook/gui/widgets/eab-contact-display.c:533
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:525
 msgid "List Members"
 msgstr "Senaraikan Ahli"
 
-#: addressbook/gui/widgets/eab-contact-display.c:329
-#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/eab-contact-display.c:321
+#: addressbook/gui/widgets/eab-contact-display.c:323
 msgid "E-mail"
 msgstr "E-mel"
 
-#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/eab-contact-display.c:332
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organisasi"
 
-#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:333
 #, fuzzy
 msgid "Position"
 msgstr "Boston"
 
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:354
 #, fuzzy
 msgid "Groupwise"
 msgstr "Kumpulan"
 
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:340
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:349
-#: addressbook/gui/widgets/eab-contact-display.c:370
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:362
 #, fuzzy
 msgid "Phone"
 msgstr "Ponce"
 
-#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:342
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:354
+#: addressbook/gui/widgets/eab-contact-display.c:346
 #, fuzzy
 msgid "work"
 msgstr "Kerja"
 
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:359
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:368
-#: addressbook/gui/widgets/eab-contact-display.c:587
+#: addressbook/gui/widgets/eab-contact-display.c:360
+#: addressbook/gui/widgets/eab-contact-display.c:579
 msgid "Blog"
 msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/eab-contact-display.c:363
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Telefon Bimbit"
 
-#: addressbook/gui/widgets/eab-contact-display.c:375
+#: addressbook/gui/widgets/eab-contact-display.c:367
 #, fuzzy
 msgid "personal"
 msgstr "Peribadi"
 
-#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/eab-contact-display.c:374
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Nota"
 
-#: addressbook/gui/widgets/eab-contact-display.c:548
+#: addressbook/gui/widgets/eab-contact-display.c:540
 msgid "Job Title"
 msgstr "Gelaran Jawatan"
 
-#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/eab-contact-display.c:544
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:774
+#: smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "E-mel"
 
-#: addressbook/gui/widgets/eab-contact-display.c:579
+#: addressbook/gui/widgets/eab-contact-display.c:571
 msgid "Home page"
 msgstr "Laman web"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 msgid "Success"
 msgstr "Berjaya"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 #, fuzzy
 msgid "Backend busy"
 msgstr "Bahagian belakang sibuk"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Repository offline"
 msgstr "Repositori luar talian"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 #, fuzzy
 msgid "Address Book does not exist"
 msgstr "Buku Alamat tidak wujud"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 #, fuzzy
 msgid "No Self Contact defined"
 msgstr "Senarai Kenalan Baru"
@@ -2581,27 +2495,27 @@ msgstr "Senarai Kenalan Baru"
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Permission denied"
 msgstr "Kebenaran dinafikan"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Contact not found"
 msgstr "Kenalan tidak dijumpai"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Contact ID already exists"
 msgstr "ID Kenalan telah wujud"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Protocol not supported"
 msgstr "Protokol tidak disokong"
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:60
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:233
 #: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
@@ -2614,39 +2528,39 @@ msgid "Cancelled"
 msgstr "Batal"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:61
 #, fuzzy
 msgid "Could not cancel"
 msgstr "Tidak dapat membuka folder sumber: %s"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Authentication Failed"
 msgstr "Pengesahan Gagal"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Authentication Required"
 msgstr "Pengesahan Diperlukan"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:66
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "TLS not Available"
 msgstr "TLS tidak Ada"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#: addressbook/gui/widgets/eab-gui-util.c:66
 #, fuzzy
 msgid "No such source"
 msgstr "Mesej tersebut tidak ada"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:69
+#: addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Other error"
 msgstr "Ralat lain"
 
-#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:90
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
@@ -2655,7 +2569,7 @@ msgstr ""
 "Kami tidak dapat membuka buku alamat ini.  Sila semak ada\n"
 "laluan atau tidak dan adakah anda diberi kebenaran untuk mencapainya."
 
-#: addressbook/gui/widgets/eab-gui-util.c:110
+#: addressbook/gui/widgets/eab-gui-util.c:97
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -2665,12 +2579,12 @@ msgstr ""
 "sama ada anda telah memasukkan URI yang tidak betul, atau pelayan LDAP\n"
 "tidak dapat dijangkau."
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:102
 #, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution you must compile the program from the CVS "
-"sources after retrieving OpenLDAP from the link below."
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
 msgstr ""
 "Versi Evolution ini tidak mempunyai sokongan LDAP\n"
 "yang dikompilkan ke dalamnya.  Jika anda ingin menggunakan LDAP dalam "
@@ -2678,7 +2592,7 @@ msgstr ""
 "anda mestilah kompilkan atur cara dari sumber CVS setelah\n"
 "mendapatkan semula OpenLDAP dari pautan di bawah.\n"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:109
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -2688,11 +2602,7 @@ msgstr ""
 "sama ada anda telah memasukkan URI yang tidak betul, atau pelayan\n"
 "tidak dapat dijangkau."
 
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "Unable to open addressbook"
-msgstr "Tidak dapat membuka buku alamat"
-
-#: addressbook/gui/widgets/eab-gui-util.c:162
+#: addressbook/gui/widgets/eab-gui-util.c:129
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2705,7 +2615,7 @@ msgstr ""
 "Sila jadikan carian anda lebih khusus atau tingkatkan had hasil dalam\n"
 "keutamaan pelayan direktori bagi buku alamat ini."
 
-#: addressbook/gui/widgets/eab-gui-util.c:168
+#: addressbook/gui/widgets/eab-gui-util.c:135
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -2717,54 +2627,46 @@ msgstr ""
 "lebih khusus atau tingkatkan had masa dalam keutamaan pelayan\n"
 "direktori bagi buku alamat ini."
 
-#: addressbook/gui/widgets/eab-gui-util.c:174
+#: addressbook/gui/widgets/eab-gui-util.c:141
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 "Bahagian belakang buku alamat ini tidak dapat menghuraikan pertanyaan ini."
 
-#: addressbook/gui/widgets/eab-gui-util.c:177
+#: addressbook/gui/widgets/eab-gui-util.c:144
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Bahagian belakang buku alamat ini enggan membuat pertanyaan ini."
 
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:147
 msgid "This query did not complete successfully."
 msgstr "Pertanyaan ini tidak dapat disiapkan dengan jayanya."
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
-msgid "Do you want to save changes?"
-msgstr "Adakah anda ingin menyimpan perubahan?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:208
-msgid "_Discard"
-msgstr "_Buang"
-
-#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:169
 msgid "Error adding list"
 msgstr "Ralat ketika menambahkan senarai"
 
-#: addressbook/gui/widgets/eab-gui-util.c:229
-#: addressbook/gui/widgets/eab-gui-util.c:652
+#: addressbook/gui/widgets/eab-gui-util.c:169
+#: addressbook/gui/widgets/eab-gui-util.c:580
 msgid "Error adding contact"
 msgstr "Ralat ketika menambahkan kenalan"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying list"
 msgstr "Ralat ketika mengubahsuaikan senarai"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying contact"
 msgstr "Ralat ketika mengubah suai kenalan"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:192
 msgid "Error removing list"
 msgstr "Ralat ketika mengeluarkan senarai"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
-#: addressbook/gui/widgets/eab-gui-util.c:610
+#: addressbook/gui/widgets/eab-gui-util.c:192
+#: addressbook/gui/widgets/eab-gui-util.c:538
 msgid "Error removing contact"
 msgstr "Ralat ketika mengeluarkan kenalan"
 
-#: addressbook/gui/widgets/eab-gui-util.c:334
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2773,7 +2675,7 @@ msgstr ""
 "Membuka %d kenalan akan turut membuka %d tetingkap baru.\n"
 "Adakah anda benar-benar ingin memaparkan semua kenalan ini?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:360
+#: addressbook/gui/widgets/eab-gui-util.c:300
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2782,50 +2684,45 @@ msgstr ""
 "%s telah wujud\n"
 "Adakah anda ingin menulis gantinya?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:364
+#: addressbook/gui/widgets/eab-gui-util.c:304
 msgid "Overwrite"
 msgstr "Tulis ganti"
 
-#: addressbook/gui/widgets/eab-gui-util.c:400
-#, c-format
-msgid "Error saving %s: %s"
-msgstr "Ralat ketika menyimpan %s: %s"
-
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:437
+#: addressbook/gui/widgets/eab-gui-util.c:365
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:571
+#: addressbook/gui/widgets/eab-gui-util.c:499
 msgid "list"
 msgstr "senarai"
 
-#: addressbook/gui/widgets/eab-gui-util.c:706
+#: addressbook/gui/widgets/eab-gui-util.c:634
 msgid "Move contact to"
 msgstr "Alihkan kenalan ke"
 
-#: addressbook/gui/widgets/eab-gui-util.c:708
+#: addressbook/gui/widgets/eab-gui-util.c:636
 msgid "Copy contact to"
 msgstr "Salin kenalan ke"
 
-#: addressbook/gui/widgets/eab-gui-util.c:711
+#: addressbook/gui/widgets/eab-gui-util.c:639
 msgid "Move contacts to"
 msgstr "Alihkan kenalan ke"
 
-#: addressbook/gui/widgets/eab-gui-util.c:713
+#: addressbook/gui/widgets/eab-gui-util.c:641
 msgid "Copy contacts to"
 msgstr "Salin kenalan ke"
 
-#: addressbook/gui/widgets/eab-gui-util.c:716
+#: addressbook/gui/widgets/eab-gui-util.c:644
 #, fuzzy
 msgid "Select target addressbook."
 msgstr "Pilih Kenalan daripada Buku Alamat"
 
-#: addressbook/gui/widgets/eab-gui-util.c:939
+#: addressbook/gui/widgets/eab-gui-util.c:867
 msgid "Multiple VCards"
 msgstr "VCard Berganda"
 
-#: addressbook/gui/widgets/eab-gui-util.c:942
+#: addressbook/gui/widgets/eab-gui-util.c:870
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard bagi %s"
@@ -2913,7 +2810,7 @@ msgstr[1] "%d kenalan"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:229
+#: addressbook/gui/widgets/e-addressbook-view.c:231
 #: addressbook/gui/widgets/e-minicard-view.c:467
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
@@ -2931,147 +2828,135 @@ msgstr "Model"
 msgid "Error modifying card"
 msgstr "Ralat ketika mengubah suai kad"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:163
 msgid "Name begins with"
 msgstr "Nama bermula dengan"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:164
 msgid "Email begins with"
 msgstr "E-mel bermula dengan"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:57
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Kategorinya ialah"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-#: calendar/gui/cal-search-bar.c:50
+#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Sebarang medan mengandungi"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+#: addressbook/gui/widgets/e-addressbook-view.c:172
 msgid "Advanced..."
 msgstr "Lanjutan..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:236
+#: addressbook/gui/widgets/e-addressbook-view.c:238
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:249
+#: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Jenis"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:506
+#: addressbook/gui/widgets/e-addressbook-view.c:508
 #, fuzzy
 msgid "Address Book"
 msgstr "Buku Alamat"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2076
+#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:2080
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
 msgstr "Simpan sebagai VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 msgid "New Contact..."
 msgstr "Kenalan Baru..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "New Contact List..."
 msgstr "Senarai Kenalan Baru..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Go to Folder..."
 msgstr "Pergi ke Folder..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Import..."
 msgstr "Import..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1066
 msgid "Search for Contacts..."
 msgstr "Carian Kenalan..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Sumber Buku Alamat..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1069
 msgid "Pilot Settings..."
 msgstr "Seting Rintis..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Sampaikan kepada Kenalan"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
 msgid "Send Message to Contact"
 msgstr "Hantar Mesej kepada Kenalan"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Cetak"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
+#: addressbook/gui/widgets/e-addressbook-view.c:1077
 msgid "Print Envelope"
 msgstr "Cetak Sampul Surat"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
+#: addressbook/gui/widgets/e-addressbook-view.c:1081
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Buku Alamat..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1080
+#: addressbook/gui/widgets/e-addressbook-view.c:1082
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Buku Alamat..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Potong"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Salin"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1087
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Tampal"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:1092
+#: calendar/gui/e-calendar-view.c:1280
 msgid "Current View"
 msgstr "Pandangan Semasa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1309
-#, c-format
-msgid ""
-"The addressbook backend for\n"
-"%s\n"
-"has crashed. You will have to restart Evolution in order to use it again"
-msgstr ""
-"Bahagian belakang buku alamat bagi\n"
-"%s\n"
-"telah rosak. Anda perlu memulakan semula Evolution untuk menggunakannya "
-"semula"
-
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1667
-#: calendar/gui/cal-search-bar.c:362
+#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Sebarang Kategori"
 
@@ -3179,7 +3064,7 @@ msgstr "Radio"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-list-view.c:234
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Peranan"
@@ -3323,12 +3208,12 @@ msgstr "Pengimport VCard Evolution"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: addressbook/printing/e-contact-print.c:998
+#: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr "Cetak kenalan"
 
-#: addressbook/printing/e-contact-print.c:1064
-#: addressbook/printing/e-contact-print.c:1091
+#: addressbook/printing/e-contact-print.c:1066
+#: addressbook/printing/e-contact-print.c:1093
 msgid "Print contact"
 msgstr "Cetak kenalan"
 
@@ -3578,15 +3463,21 @@ msgstr "Dalam mod normal, opsyen saiz sepatutnya tidak perlu."
 msgid "Impossible internal error."
 msgstr "Ralat dalaman mustahil."
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:629
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
 msgid "Can not open file"
 msgstr "Tidak dapat membuka fail"
 
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-msgid "Can not load URI"
-msgstr "Tidak dapat menuatkan URI"
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "Tidak dapat memuatkan buku alamat"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Tidak dapat membuka buku alamat"
 
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
@@ -3604,7 +3495,7 @@ msgstr "Tiada nama fail diberikan. "
 msgid "Unnamed List"
 msgstr "Senarai Tanpa Nama"
 
-#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 #, fuzzy
 msgid "Enter password"
@@ -3890,10 +3781,10 @@ msgid "Whether to show week numbers in date navigator"
 msgstr "Tunjukkan bilangan _minggu dalam pemandu arah tarikh"
 
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:88
-#: calendar/gui/gnome-cal.c:1703
-#: camel/providers/groupwise/camel-gw-listener.c:304
-#: camel/providers/groupwise/camel-gw-listener.c:327
+#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/gnome-cal.c:1705
+#: camel/providers/groupwise/camel-gw-listener.c:311
+#: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
 msgstr "Kalendar"
 
@@ -3913,7 +3804,7 @@ msgstr "Singkirkan peristiwa yang lebih lama dari"
 
 #: calendar/gui/calendar-commands.c:363
 #: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:19 filter/filter.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
 msgid "days"
 msgstr "hari"
 
@@ -4063,24 +3954,24 @@ msgstr "Pandangan Minggu"
 msgid "Month View"
 msgstr "Pandangan Bulan"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Ringkasan mengandungi"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Huraian mengandungi"
 
-#: calendar/gui/cal-search-bar.c:54
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Ulasan mengandungi"
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:53
 #, fuzzy
 msgid "Location contains"
 msgstr "Huraian mengandungi"
 
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
 msgid "Unmatched"
 msgstr "Tidak padan"
 
@@ -4101,23 +3992,23 @@ msgstr "Kebenaran dinafikan untuk membuka kalendar"
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/dialogs/alarm-options.c:466
+#: calendar/gui/dialogs/alarm-options.c:467
 msgid "Audio Alarm Options"
 msgstr "Opsyen Penggera Audio"
 
-#: calendar/gui/dialogs/alarm-options.c:475
+#: calendar/gui/dialogs/alarm-options.c:476
 msgid "Message Alarm Options"
 msgstr "Opsyen Penggera Mesej"
 
-#: calendar/gui/dialogs/alarm-options.c:484
+#: calendar/gui/dialogs/alarm-options.c:485
 msgid "Email Alarm Options"
 msgstr "Opsyen Penggera E-mel"
 
-#: calendar/gui/dialogs/alarm-options.c:493
+#: calendar/gui/dialogs/alarm-options.c:494
 msgid "Program Alarm Options"
 msgstr "Opsyen Penggera Atur Cara"
 
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:510
 msgid "Unknown Alarm Options"
 msgstr "Opsyen Penggera Tak Diketahui"
 
@@ -4155,7 +4046,7 @@ msgstr "Hantar Kepada:"
 msgid "With these arguments:"
 msgstr "Dengan argumen ini:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
 msgid "dialog1"
 msgstr "dialog1"
 
@@ -4164,7 +4055,7 @@ msgid "extra times every"
 msgstr "masa tambahan setiap"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:20 filter/filter.glade.h:16
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr "jam"
 
@@ -4211,7 +4102,7 @@ msgstr "Hantar e-mel"
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Ringkasan:"
 
@@ -4241,7 +4132,6 @@ msgid "hour(s)"
 msgstr "jam"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:21
 msgid "minute(s)"
 msgstr "minit"
 
@@ -4249,27 +4139,27 @@ msgstr "minit"
 msgid "start of appointment"
 msgstr "temu janji bermula"
 
-#: calendar/gui/dialogs/calendar-setup.c:170
+#: calendar/gui/dialogs/calendar-setup.c:172
 #, fuzzy
 msgid "You must specify a location to get the calendar from."
 msgstr "Anda mestilah menetapkan nama fail."
 
-#: calendar/gui/dialogs/calendar-setup.c:178
+#: calendar/gui/dialogs/calendar-setup.c:180
 #, fuzzy, c-format
 msgid "The source location '%s' is not well-formed."
 msgstr "Kaedah yang diperlukan untuk memuatkan `%s tidak disokong"
 
-#: calendar/gui/dialogs/calendar-setup.c:193
+#: calendar/gui/dialogs/calendar-setup.c:195
 #, c-format
 msgid "The source location '%s' is not a webcal source."
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:265
+#: calendar/gui/dialogs/calendar-setup.c:275
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr "Sumber dengan nama '%s' telah wujud dalam kumpulan yang dipilih"
 
-#: calendar/gui/dialogs/calendar-setup.c:278
+#: calendar/gui/dialogs/calendar-setup.c:288
 #, c-format
 msgid ""
 "The group '%s' is remote. You must specify a location to get the calendar "
@@ -4291,61 +4181,36 @@ msgstr "Senarai Tugas"
 msgid "C_olor:"
 msgstr "W_arna"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-#, fuzzy
-msgid "Calendar Properties"
-msgstr "Kumpulan Kalendar"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
 msgid "Pick a color"
 msgstr "Pilih warna"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:8
-#, fuzzy
-msgid "Remote"
-msgstr "Keluarkan"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-#, fuzzy
-msgid "Task List Properties"
-msgstr "Senarai Tugas"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
 #, fuzzy
 msgid "_Add Calendar"
 msgstr "Tambah Kalendar Baru"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
 #, fuzzy
 msgid "_Add Group"
 msgstr "_Tambahkan Kumpulan..."
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-#, fuzzy
-msgid "_Refresh Interval:"
-msgstr "Muatkan semula Senarai"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
 #, fuzzy
 msgid "_Refresh:"
 msgstr "Muat semula"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-#, fuzzy
-msgid "_Source URL:"
-msgstr "URI Sumber POP"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
 #, fuzzy
 msgid "_Type:"
 msgstr "Jenis:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
 #, fuzzy
 msgid "_URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
 msgid "weeks"
 msgstr "minggu"
 
@@ -4455,7 +4320,7 @@ msgid "Display"
 msgstr "_Paparkan"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:76
 msgid "E_nable"
 msgstr "Bo_lehkan"
 
@@ -4466,7 +4331,7 @@ msgstr "Permintaan Bebas/Sibuk"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:563
+#: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Jumaat"
 
@@ -4480,7 +4345,7 @@ msgstr "Minit"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:559
+#: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Isnin"
 
@@ -4490,7 +4355,7 @@ msgstr "A_had"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:564
+#: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Sabtu"
 
@@ -4504,7 +4369,7 @@ msgstr "Tunjukkan bilangan _minggu dalam pemandu arah tarikh"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Ahad"
 
@@ -4518,7 +4383,7 @@ msgstr "K_hamis"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:562
+#: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Khamis"
 
@@ -4532,7 +4397,7 @@ msgstr "Format masa:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:560
+#: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Selasa"
 
@@ -4542,7 +4407,7 @@ msgstr "M_inggu bermula:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:561
+#: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Rabu"
 
@@ -4576,7 +4441,7 @@ msgid "_Day begins:"
 msgstr "_Hari bermula:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
-#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:43
@@ -4625,86 +4490,50 @@ msgstr "_Rabu"
 msgid "before every appointment"
 msgstr "sebelum setiap temu janji"
 
-#: calendar/gui/dialogs/cancel-comp.c:57
-msgid ""
-"The event being deleted is a meeting, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"Peristiwa yang sedang dihapuskan ialah mesyuarat, adakah anda ingin "
-"menghantar notis pembatalan?"
-
-#: calendar/gui/dialogs/cancel-comp.c:60
-msgid "Are you sure you want to cancel and delete this meeting?"
-msgstr "Adakah anda pasti ingin membatalkan dan menghapuskan mesyuarat ini?"
-
-#: calendar/gui/dialogs/cancel-comp.c:66
-msgid ""
-"The task being deleted is assigned, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"Tugas yang sedang dihapuskan diumpukkan, adakah anda ingin menghantar notis "
-"pembatalan?"
-
-#: calendar/gui/dialogs/cancel-comp.c:69
-msgid "Are you sure you want to cancel and delete this task?"
-msgstr "Adakah anda pasti ingin membatalkan dan menghapuskan tugas ini?"
-
-#: calendar/gui/dialogs/cancel-comp.c:75
-msgid ""
-"The journal entry being deleted is published, would you like to send a "
-"cancellation notice?"
-msgstr ""
-"Entri jurnal yang sedang dihapuskan disiarkan, adakah anda ingin menghantar "
-"notis pembatalan?"
-
-#: calendar/gui/dialogs/cancel-comp.c:78
-msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr "Adakah anda pasti ingin membatalkan dan menghapuskan entri jurnal ini?"
-
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Peristiwa ini telah dihapuskan."
 
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "Tugas ini telah dihapuskan."
 
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:68
 msgid "This journal entry has been deleted."
 msgstr "Entri jurnal ini telah dihapuskan"
 
-#: calendar/gui/dialogs/changed-comp.c:75
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  Anda telah membuat perubahan. Abaikan perubahan tersebut dan tutup "
 "editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Anda tidak membuat sebarang perubahan, tutup editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:82
+#: calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "Peristiwa ini telah diubah."
 
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "Tugas ini telah diubah."
 
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:92
 msgid "This journal entry has been changed."
 msgstr "Entri jurnal ini telah diubah."
 
-#: calendar/gui/dialogs/changed-comp.c:99
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Anda telah membuat perubahan. Abaikan perubahan tersebut dan kemas kini "
 "editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Anda tidak membuat sebarang perubahan, kemas kini editor?"
@@ -4742,7 +4571,7 @@ msgid "No summary"
 msgstr "Tiada ringkasan"
 
 #: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
 #: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Simpan sebagai..."
@@ -4798,99 +4627,51 @@ msgstr "Tidak dapat batalkan pengendalian"
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:95
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "Adakah anda pasti ingin menghapuskan temu janji `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:98
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "Adakah anda pasti ingin menghapuskan temu janji tak berjudul ini?"
-
-#: calendar/gui/dialogs/delete-comp.c:104
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "Adakah anda pasti ingin menghapuskan tugas `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:107
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "Adakah anda pasti ingin menghapuskan tugas tak berjudul ini?"
-
-#: calendar/gui/dialogs/delete-comp.c:113
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "Adakah anda pasti ingin menghapuskan entri jurnal `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:116
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "Adakah anda pasti ingin menghapuskan entri jurnal tak berjudul ini?"
-
-#: calendar/gui/dialogs/delete-comp.c:131
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d appointment?"
-msgid_plural "Are you sure you want to delete %d appointments?"
-msgstr[0] "Adakah anda pasti ingin menghapuskan %d temu janji?"
-msgstr[1] "Adakah anda pasti ingin menghapuskan %d temu janji?"
-
-#: calendar/gui/dialogs/delete-comp.c:138
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d task?"
-msgid_plural "Are you sure you want to delete %d tasks?"
-msgstr[0] "Adakah anda pasti ingin menghapuskan %d tugas?"
-msgstr[1] "Adakah anda pasti ingin menghapuskan %d tugas?"
-
-#: calendar/gui/dialogs/delete-comp.c:145
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d journal entry?"
-msgid_plural "Are you sure you want to delete %d journal entries?"
-msgstr[0] "Adakah anda pasti ingin menghapuskan %d entri jurnal?"
-msgstr[1] "Adakah anda pasti ingin menghapuskan %d entri jurnal?"
-
-#: calendar/gui/dialogs/delete-error.c:52
+#: calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "Peristiwa tidak dapat dihapuskan disebabkan oleh ralat corba"
 
-#: calendar/gui/dialogs/delete-error.c:55
+#: calendar/gui/dialogs/delete-error.c:57
 msgid "The task could not be deleted due to a corba error"
 msgstr "Tugas tidak boleh dihapuskan disebabkan oleh ralat corba"
 
-#: calendar/gui/dialogs/delete-error.c:58
+#: calendar/gui/dialogs/delete-error.c:60
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr "Entri jurnal tidak dapat dihapuskan disebabkan oleh ralat corba"
 
-#: calendar/gui/dialogs/delete-error.c:61
+#: calendar/gui/dialogs/delete-error.c:63
 msgid "The item could not be deleted due to a corba error"
 msgstr "Item tidak dapat dihapuskan disebabkan oleh ralat corba"
 
-#: calendar/gui/dialogs/delete-error.c:68
+#: calendar/gui/dialogs/delete-error.c:70
 msgid "The event could not be deleted because permission was denied"
 msgstr "Peristiwa tidak dapat dihapuskan kerana kebenaran dinafikan"
 
-#: calendar/gui/dialogs/delete-error.c:71
+#: calendar/gui/dialogs/delete-error.c:73
 msgid "The task could not be deleted because permission was denied"
 msgstr "Tugas tidak dapat dihapuskan kerana kebenaran dinafikan"
 
-#: calendar/gui/dialogs/delete-error.c:74
+#: calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr "Entri jurnal tidak dapat dihapuskan kerana kebenaran dinafikan"
 
-#: calendar/gui/dialogs/delete-error.c:77
+#: calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
 msgstr "Item tidak dapat dihapuskan kerana kebenaran dinafikan"
 
-#: calendar/gui/dialogs/delete-error.c:84
+#: calendar/gui/dialogs/delete-error.c:86
 msgid "The event could not be deleted due to an error"
 msgstr "Peristiwa tidak dapat dihapuskan disebabkan oleh satu ralat"
 
-#: calendar/gui/dialogs/delete-error.c:87
+#: calendar/gui/dialogs/delete-error.c:89
 msgid "The task could not be deleted due to an error"
 msgstr "Tugas tidak boleh dihapuskan disebabkan oleh satu ralat"
 
-#: calendar/gui/dialogs/delete-error.c:90
+#: calendar/gui/dialogs/delete-error.c:92
 msgid "The journal entry could not be deleted due to an error"
 msgstr "Entri jurnal tidak dapat dihapuskan disebabkan oleh satu ralat"
 
-#: calendar/gui/dialogs/delete-error.c:93
+#: calendar/gui/dialogs/delete-error.c:95
 msgid "The item could not be deleted due to an error"
 msgstr "Item tidak dapat dihapuskan disebabkan oleh satu ralat"
 
@@ -5027,11 +4808,11 @@ msgstr "_Masa mula:"
 
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:3
+#: calendar/gui/dialogs/meeting-page.glade.h:4
 #: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
 #: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1559
-#: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:100
+#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
+#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
@@ -5057,8 +4838,8 @@ msgstr "_Ditugaskan Kepada..."
 #. FIXME: need to disable for undeletable folders
 #: calendar/gui/dialogs/meeting-page.c:655
 #: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1310 calendar/gui/e-calendar-view.c:1342
-#: mail/em-folder-tree.c:2557 mail/em-folder-view.c:919
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
+#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -5066,7 +4847,7 @@ msgid "_Delete"
 msgstr "_Hapus"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:240
+#: calendar/gui/e-meeting-list-view.c:218
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Peserta"
@@ -5102,16 +4883,15 @@ msgid "Member"
 msgstr "Ahli"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "Sila Jawab"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
-#: mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-list-view.c:248
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
 
@@ -5120,20 +4900,20 @@ msgstr "Status"
 msgid "Add A_ttendee"
 msgstr "Peserta"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "Add attendees from addressbook."
+msgstr "Tambahkan Penghantar ke Buku_Alamat"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Penyusun:"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
+#: calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "_Change Organizer"
 msgstr "_Ubah Penyusun"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-#: calendar/gui/e-meeting-time-sel.c:417
-msgid "_Invite Others..."
-msgstr "_Jemput Orang Lain..."
-
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
 msgstr "<b>Opsyen kalendar</b>"
@@ -5297,7 +5077,7 @@ msgid "_No recurrence"
 msgstr "_Tiada perulangan"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:450
+#: composer/e-msg-composer-attachment-bar.c:453
 msgid "_Remove"
 msgstr "_Keluarkan"
 
@@ -5329,55 +5109,21 @@ msgstr "minggu"
 msgid "year(s)"
 msgstr "tahun"
 
-#: calendar/gui/dialogs/save-comp.c:53
-msgid ""
-"This event has been changed, but has not been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Peristiwa ini telah diubah tetapi masih belum disimpan.\n"
-"\n"
-"Adakah anda ingin menyimpan perubahan yang dilakukan?"
-
-#: calendar/gui/dialogs/save-comp.c:57
-msgid "_Discard Changes"
-msgstr "_Buang Perubahan"
-
-#: calendar/gui/dialogs/save-comp.c:62
-msgid "Save Event"
-msgstr "Simpan Peristiwa"
-
-#: calendar/gui/dialogs/select-source-dialog.c:65
+#: calendar/gui/dialogs/select-source-dialog.c:69
 #, fuzzy
 msgid "Select destination"
 msgstr "Pilih destinasi untuk folder ini disalin"
 
-#: calendar/gui/dialogs/select-source-dialog.c:86
+#: calendar/gui/dialogs/select-source-dialog.c:90
 #, fuzzy
 msgid "_Destination"
 msgstr "Hapuskan folder ini"
 
-#: calendar/gui/dialogs/select-source-dialog.c:88
+#: calendar/gui/dialogs/select-source-dialog.c:92
 #, fuzzy
 msgid "Task List"
 msgstr "Senarai Tugas"
 
-#: calendar/gui/dialogs/send-comp.c:57
-msgid "The meeting information has been created. Send it?"
-msgstr "Maklumat mesyuarat telah diwujudkan. Hantar maklumat?"
-
-#: calendar/gui/dialogs/send-comp.c:60
-msgid "The meeting information has changed. Send an updated version?"
-msgstr "Maklumat mesyuarat telah diubah. Hantar versi yang telah dikemas kini?"
-
-#: calendar/gui/dialogs/send-comp.c:67
-msgid "The task assignment information has been created. Send it?"
-msgstr "Maklumat umpukan tugas telah diwujudkan. Hantar maklumat?"
-
-#: calendar/gui/dialogs/send-comp.c:71
-msgid "The task information has changed. Send an updated version?"
-msgstr "Maklumat tugas telah diubah. Hantar versi yang telah dikemas kini?"
-
 #: calendar/gui/dialogs/task-details-page.c:406
 msgid "Completed date is wrong"
 msgstr "Tarikh siap adalah salah"
@@ -5397,7 +5143,7 @@ msgstr "Selesai"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #: calendar/gui/e-cal-component-preview.c:249
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:960
 msgid "High"
 msgstr "Tinggi"
 
@@ -5411,14 +5157,14 @@ msgstr "Sedang Dijalankan"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:253
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:958
 msgid "Low"
 msgstr "Rendah"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:251
 #: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:957
+#: mail/message-list.c:959
 msgid "Normal"
 msgstr "Normal"
 
@@ -5477,8 +5223,8 @@ msgstr "Su_lit"
 
 #: calendar/gui/dialogs/task-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
+#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Huraian:"
 
@@ -5652,7 +5398,7 @@ msgstr "Tarikh Genap Tempoh:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:950
+#: calendar/gui/e-itip-control.c:943
 msgid "Status:"
 msgstr "Status:"
 
@@ -5737,12 +5483,12 @@ msgstr "Sibuk"
 msgid "Deleting selected objects"
 msgstr "Menghapuskan objek yang dipilih"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
 msgid "Updating objects"
 msgstr "Mengemaskinikan objek"
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1370
+#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
 #: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Buka"
@@ -5752,15 +5498,15 @@ msgid "Open _Web Page"
 msgstr "Buka Laman _Web"
 
 #: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1291 calendar/gui/e-calendar-view.c:1376
-#: mail/em-folder-view.c:896 mail/em-popup.c:690 mail/em-popup.c:806
+#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
+#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "_Simpan Sebagai..."
 
 #: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1292
-#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
+#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
@@ -5768,24 +5514,24 @@ msgid "_Print..."
 msgstr "_Cetak..."
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "P_otong"
 
 #: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1338
-#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2550
-#: mail/message-list.c:1644 ui/evolution-addressbook.xml.h:31
+#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
+#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
+#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Salin"
 
 #: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1273 calendar/gui/e-calendar-view.c:1299
-#: calendar/gui/e-calendar-view.c:1372 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
+#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
@@ -5854,71 +5600,71 @@ msgstr "Ringkasan"
 msgid "Task sort"
 msgstr "Isihan tugas"
 
-#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
 msgid "New _Appointment..."
 msgstr "Temu janji _Baru..."
 
-#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
+#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
 msgid "New All Day _Event"
 msgstr "_Peristiwa Baru Sepanjang Hari"
 
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
+#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
 msgid "New Meeting"
 msgstr "Mesyuarat Baru"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
 msgid "New Task"
 msgstr "Tugas Baru"
 
-#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Pilih _Bebenang"
 
-#: calendar/gui/e-calendar-view.c:1280
+#: calendar/gui/e-calendar-view.c:1283
 #, fuzzy
 msgid "_Select Date..."
 msgstr "_Hapuskan..."
 
-#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Siarkan Maklumat Bebas/Sibuk"
 
-#: calendar/gui/e-calendar-view.c:1303
+#: calendar/gui/e-calendar-view.c:1306
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Salin ke Folder..."
 
-#: calendar/gui/e-calendar-view.c:1304
+#: calendar/gui/e-calendar-view.c:1307
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "Alih_kan ke Folder..."
 
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1308
 msgid "_Schedule Meeting..."
 msgstr "_Jadualkan Mesyuarat..."
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1309
 msgid "_Forward as iCalendar..."
 msgstr "_Sampaikan sebagai iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
 msgid "Delete this _Occurrence"
 msgstr "Hapuskan Kejadian _ini"
 
-#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
 msgid "Delete _All Occurrences"
 msgstr "Hapuskan _Semua Kejadian"
 
-#: calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1349
 msgid "Go to _Today"
 msgstr "Pergi ke _Hari Ini"
 
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1351
 msgid "_Go to Date..."
 msgstr "_Pergi ke Tarikh..."
 
-#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "_Seting..."
 
@@ -5932,9 +5678,9 @@ msgstr "Tarikh Mula"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:967 calendar/gui/e-itip-control.c:1169
-#: calendar/gui/e-meeting-list-view.c:144
-#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
 #: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
 #: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
 #: camel/camel-tcp-stream-openssl.c:631
@@ -5960,13 +5706,13 @@ msgid "Assigned"
 msgstr "Diumpukkan"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr "Ya"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "Tidak"
 
@@ -5978,7 +5724,7 @@ msgstr "N"
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
 msgid "E"
 msgstr "E"
 
@@ -6050,102 +5796,102 @@ msgstr "%d %b"
 msgid "%02i minute divisions"
 msgstr "%02i bahagian minit"
 
-#: calendar/gui/e-itip-control.c:592
+#: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
 msgstr "Ya. (Perulangan Rumit)"
 
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:596
 #, fuzzy, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Setiap hari"
 msgstr[1] "Setiap hari"
 
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:601
 #, fuzzy, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Setiap minggu"
 msgstr[1] "Setiap minggu"
 
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:603
 #, fuzzy, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "Setiap minggu pada "
 msgstr[1] "Setiap minggu pada "
 
-#: calendar/gui/e-itip-control.c:618
+#: calendar/gui/e-itip-control.c:611
 msgid " and "
 msgstr " dan "
 
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:618
 #, c-format
 msgid "The %s day of "
 msgstr "%s hari dalam "
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:631
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s dalam "
 
-#: calendar/gui/e-itip-control.c:645
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "setiap bulan"
 msgstr[1] "setiap bulan"
 
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:642
 #, fuzzy, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Setiap tahun"
 msgstr[1] "Setiap tahun"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:653
 #, fuzzy, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] " sejumlah %d kali"
 msgstr[1] " sejumlah %d kali"
 
-#: calendar/gui/e-itip-control.c:669
+#: calendar/gui/e-itip-control.c:662
 msgid ", ending on "
 msgstr ", berakhir pada "
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:686
 msgid "<b>Starts:</b> "
 msgstr "<b>Mula:</b> "
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:696
 msgid "<b>Ends:</b> "
 msgstr "<b>Akhir:</b> "
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:716
 msgid "<b>Completed:</b> "
 msgstr "<b>Siap:</b> "
 
-#: calendar/gui/e-itip-control.c:733
+#: calendar/gui/e-itip-control.c:726
 msgid "<b>Due:</b> "
 msgstr "<b>Genap tempoh:</b> "
 
-#: calendar/gui/e-itip-control.c:771 calendar/gui/e-itip-control.c:827
+#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
 msgid "iCalendar Information"
 msgstr "Maklumat iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:788
+#: calendar/gui/e-itip-control.c:781
 msgid "iCalendar Error"
 msgstr "Ralat iCalendar"
 
-#: calendar/gui/e-itip-control.c:859 calendar/gui/e-itip-control.c:875
-#: calendar/gui/e-itip-control.c:886 calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
 msgid "An unknown person"
 msgstr "Orang yang tak diketahui"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:910
+#: calendar/gui/e-itip-control.c:903
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -6153,303 +5899,307 @@ msgstr ""
 "<br>Sila kaji semula maklumat berikut, dan kemudian pilih tindakan daripada "
 "menu di bawah."
 
-#: calendar/gui/e-itip-control.c:925
+#: calendar/gui/e-itip-control.c:918
 msgid "<i>None</i>"
 msgstr "<i>Tiada</i>"
 
-#: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:929
+msgid "Location:"
+msgstr "Lokasi:"
+
+#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Diterima"
 
-#: calendar/gui/e-itip-control.c:959 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Diterima Sementara"
 
-#: calendar/gui/e-itip-control.c:963 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Ditolak"
 
-#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.c:1050
-#: calendar/gui/e-itip-control.c:1076 calendar/gui/e-itip-control.c:1089
-#: calendar/gui/e-itip-control.c:1102 calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
 msgid "Choose an action:"
 msgstr "Pilih tindakan:"
 
-#: calendar/gui/e-itip-control.c:1023
+#: calendar/gui/e-itip-control.c:1016
 msgid "Update"
 msgstr "Kemas kini"
 
-#: calendar/gui/e-itip-control.c:1024 calendar/gui/e-itip-control.c:1055
-#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1091
-#: calendar/gui/e-itip-control.c:1104 calendar/gui/e-itip-control.c:1117
-#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
+#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1044
 msgid "Accept"
 msgstr "Terima"
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1045
 msgid "Tentatively accept"
 msgstr "Terima sementara"
 
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1046
 msgid "Decline"
 msgstr "Tolak"
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1070
 msgid "Send Free/Busy Information"
 msgstr "Hantar Maklumat Bebas/Sibuk"
 
-#: calendar/gui/e-itip-control.c:1090
+#: calendar/gui/e-itip-control.c:1083
 msgid "Update respondent status"
 msgstr "Kemas kini status responden"
 
-#: calendar/gui/e-itip-control.c:1103
+#: calendar/gui/e-itip-control.c:1096
 msgid "Send Latest Information"
 msgstr "Hantar Maklumat Terkini"
 
-#: calendar/gui/e-itip-control.c:1116 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Batal"
 
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1185
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> telah menyiarkan maklumat mesyuarat."
 
-#: calendar/gui/e-itip-control.c:1193
+#: calendar/gui/e-itip-control.c:1186
 msgid "Meeting Information"
 msgstr "Maklumat Mesyuarat"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1191
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> meminta kehadiran %s di mesyuarat."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1193
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> meminta kehadiran anda di mesyuarat."
 
-#: calendar/gui/e-itip-control.c:1201
+#: calendar/gui/e-itip-control.c:1194
 msgid "Meeting Proposal"
 msgstr "Cadangan Mesyuarat"
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> ingin menambahkan pada mesyuarat yang sedia ada."
 
-#: calendar/gui/e-itip-control.c:1206
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Update"
 msgstr "Pengemaskinian Mesyuarat"
 
-#: calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1203
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> ingin menerima maklumat mesyuarat terkini."
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1204
 msgid "Meeting Update Request"
 msgstr "Permintaan Pengemaskinian Mesyuarat"
 
-#: calendar/gui/e-itip-control.c:1218
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> telah memberikan jawapan agar mesyuarat diadakan."
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Reply"
 msgstr "Jawapan Mesyuarat"
 
-#: calendar/gui/e-itip-control.c:1226
+#: calendar/gui/e-itip-control.c:1219
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> telah membatalkan mesyuarat."
 
-#: calendar/gui/e-itip-control.c:1227
+#: calendar/gui/e-itip-control.c:1220
 msgid "Meeting Cancellation"
 msgstr "Pembatalan Mesyuarat"
 
-#: calendar/gui/e-itip-control.c:1234 calendar/gui/e-itip-control.c:1302
-#: calendar/gui/e-itip-control.c:1337
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1330
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> telah menghantar mesej yang tidak dapat difahami."
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1228
 msgid "Bad Meeting Message"
 msgstr "Mesej Mesyuarat Salah"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1253
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> telah menyiarkan maklumat tugas."
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1254
 msgid "Task Information"
 msgstr "Maklumat Tugas"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1259
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> meminta %s untuk menjalankan tugas."
 
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> meminta anda menjalankan tugas."
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1262
 msgid "Task Proposal"
 msgstr "Cadangan Tugas"
 
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> ingin menambahkan pada tugas yang sedia ada."
 
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Update"
 msgstr "Pengemaskinian Tugas"
 
-#: calendar/gui/e-itip-control.c:1278
+#: calendar/gui/e-itip-control.c:1271
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> ingin menerima maklumat tugas terkini."
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1272
 msgid "Task Update Request"
 msgstr "Permintaan Pengemaskinian Tugas"
 
-#: calendar/gui/e-itip-control.c:1286
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> telah memberikan jawapan terhadap umpukan tugas."
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Reply"
 msgstr "Jawapan Tugas"
 
-#: calendar/gui/e-itip-control.c:1294
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> telah membatalkan tugas."
 
-#: calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1288
 msgid "Task Cancellation"
 msgstr "Pembatalan Tugas"
 
-#: calendar/gui/e-itip-control.c:1303
+#: calendar/gui/e-itip-control.c:1296
 msgid "Bad Task Message"
 msgstr "Mesej Tugas Salah"
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1315
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> telah menyiarkan maklumat bebas/sibuk."
 
-#: calendar/gui/e-itip-control.c:1323
+#: calendar/gui/e-itip-control.c:1316
 msgid "Free/Busy Information"
 msgstr "Maklumat Bebas/Sibuk"
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> meminta maklumat bebas/sibuk anda."
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1321
 msgid "Free/Busy Request"
 msgstr "Permintaan Bebas/Sibuk"
 
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1325
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> telah memberikan jawapan terhadap permintaan bebas/sibuk."
 
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1326
 msgid "Free/Busy Reply"
 msgstr "Jawapan Bebas/Sibuk"
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1331
 msgid "Bad Free/Busy Message"
 msgstr "Mesej Bebas/Sibuk Salah"
 
-#: calendar/gui/e-itip-control.c:1413
+#: calendar/gui/e-itip-control.c:1406
 msgid "The message does not appear to be properly formed"
 msgstr "Mesej tidak terbentuk dengan sempurna"
 
-#: calendar/gui/e-itip-control.c:1472
+#: calendar/gui/e-itip-control.c:1465
 msgid "The message contains only unsupported requests."
 msgstr "Mesej mengandungi permintaan yang tidak disokong sahaja."
 
-#: calendar/gui/e-itip-control.c:1503
+#: calendar/gui/e-itip-control.c:1496
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Lampiran tidak mengandungi mesej kalendar yang sah"
 
-#: calendar/gui/e-itip-control.c:1535
+#: calendar/gui/e-itip-control.c:1528
 msgid "The attachment has no viewable calendar items"
 msgstr "Lampiran mempunyai item kalendar yang tidak dapat dilihat"
 
-#: calendar/gui/e-itip-control.c:1769
+#: calendar/gui/e-itip-control.c:1762
 msgid "Update complete\n"
 msgstr "Pengemaskinian siap\n"
 
-#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
+#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Status peserta tidak dapat dikemaskinikan kerana item tidak lagi wujud"
 
-#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objek tak sah dan tidak dapat dikemas kini\n"
 
-#: calendar/gui/e-itip-control.c:1825
+#: calendar/gui/e-itip-control.c:1818
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Maklum balas ini bukannya daripada peserta semasa.  Tambahkan sebagai "
 "peserta?"
 
-#: calendar/gui/e-itip-control.c:1837
+#: calendar/gui/e-itip-control.c:1830
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Status peserta tidak dapat dikemaskinikan kerana status tak sah!\n"
 
-#: calendar/gui/e-itip-control.c:1856
+#: calendar/gui/e-itip-control.c:1849
 msgid "There was an error on the CORBA system\n"
 msgstr "Terdapat ralat pada sistem CORBA\n"
 
-#: calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1852
 msgid "Object could not be found\n"
 msgstr "Objek tidak dapat dijumpai\n"
 
-#: calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1855
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Anda tidak mendapat kebenaran sah untuk mengemaskinikan kalendar\n"
 
-#: calendar/gui/e-itip-control.c:1865
+#: calendar/gui/e-itip-control.c:1858
 msgid "Attendee status updated\n"
 msgstr "Status peserta dikemaskinikan\n"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1861
 msgid "Attendee status could not be updated!\n"
 msgstr "Status peserta tidak dapat dikemaskinikan!\n"
 
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1892
 msgid "Removal Complete"
 msgstr "Pengeluaran Selesai"
 
-#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
 msgid "Item sent!\n"
 msgstr "Item dihantar!\n"
 
-#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
+#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
 msgid "The item could not be sent!\n"
 msgstr "Item tidak dapat dihantar!\n"
 
@@ -6490,74 +6240,74 @@ msgstr "tarikh akhir"
 msgid "date-start"
 msgstr "tarikh mula"
 
-#: calendar/gui/e-meeting-list-view.c:62
+#: calendar/gui/e-meeting-list-view.c:59
 msgid "Chair Persons"
 msgstr "Pengerusi"
 
-#: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:479
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
 msgid "Required Participants"
 msgstr "Peserta yang Diperlukan"
 
-#: calendar/gui/e-meeting-list-view.c:64
+#: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Peserta Opsyenal"
 
-#: calendar/gui/e-meeting-list-view.c:65
+#: calendar/gui/e-meeting-list-view.c:62
 msgid "Resources"
 msgstr "Sumber"
 
-#: calendar/gui/e-meeting-list-view.c:140 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
 #: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr "Individu"
 
-#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "Kumpulan"
 
-#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr "Sumber"
 
-#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr "Bilik"
 
-#: calendar/gui/e-meeting-list-view.c:154 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr "Kerusi"
 
-#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:127
 #: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
 msgid "Required Participant"
 msgstr "Peserta yang Diperlukan"
 
-#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr "Peserta Opsyenal"
 
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr "Bukan Peserta"
 
-#: calendar/gui/e-meeting-list-view.c:179 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:177
 #: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
 msgid "Needs Action"
 msgstr "Memerlukan Tindakan"
 
-#: calendar/gui/e-meeting-list-view.c:182 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
 #: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "Sementara"
 
-#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr "Ditugaskan"
@@ -6574,20 +6324,28 @@ msgstr "Di Luar Pejabat"
 msgid "No Information"
 msgstr "Tiada Maklumat"
 
+#: calendar/gui/e-meeting-time-sel.c:417
+#, fuzzy
+msgid "Add attendees from addressbook"
+msgstr "Tambahkan Penghantar ke Buku_Alamat"
+
 #: calendar/gui/e-meeting-time-sel.c:440
 msgid "_Options"
 msgstr "_Opsyen"
 
 #: calendar/gui/e-meeting-time-sel.c:457
-msgid "Show _Only Working Hours"
+#, fuzzy
+msgid "Show _only working hours"
 msgstr "Tunjukkan _Jam Bekerja Sahaja"
 
 #: calendar/gui/e-meeting-time-sel.c:467
-msgid "Show _Zoomed Out"
+#, fuzzy
+msgid "Show _zoomed out"
 msgstr "Tunjukkan _Zum ke Luar"
 
 #: calendar/gui/e-meeting-time-sel.c:482
-msgid "_Update Free/Busy"
+#, fuzzy
+msgid "_Update free/busy"
 msgstr "_Pengemaskinian Bebas/Sibuk"
 
 #: calendar/gui/e-meeting-time-sel.c:497
@@ -6603,19 +6361,23 @@ msgid ">_>"
 msgstr ">_>"
 
 #: calendar/gui/e-meeting-time-sel.c:547
-msgid "_All People and Resources"
+#, fuzzy
+msgid "_All people and resources"
 msgstr "_Semua Orang dan Sumber"
 
 #: calendar/gui/e-meeting-time-sel.c:556
-msgid "All _People and One Resource"
+#, fuzzy
+msgid "All _people and one resource"
 msgstr "Semua _Orang dan Satu Sumber"
 
 #: calendar/gui/e-meeting-time-sel.c:565
-msgid "_Required People"
+#, fuzzy
+msgid "_Required people"
 msgstr "_Orang yang Diperlukan"
 
 #: calendar/gui/e-meeting-time-sel.c:574
-msgid "Required People and _One Resource"
+#, fuzzy
+msgid "Required people and _one resource"
 msgstr "Orang yang Diperlukan dan _Satu Sumber"
 
 #: calendar/gui/e-meeting-time-sel.c:593
@@ -6653,7 +6415,7 @@ msgstr "%m/%d/%Y"
 msgid "Enter the password for %s"
 msgstr "Masukkan Kata Laluan bagi %s"
 
-#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6662,19 +6424,14 @@ msgstr ""
 "Ralat dalam %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-
 #. FIXME Loading should be async
 #. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:686
+#: calendar/gui/e-tasks.c:801
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Tugas permulaan pada %s"
 
-#: calendar/gui/e-tasks.c:709
+#: calendar/gui/e-tasks.c:824
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6683,53 +6440,48 @@ msgstr ""
 "Ralat dalam %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:730
+#: calendar/gui/e-tasks.c:845
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Memuatkan Imej"
 
-#: calendar/gui/e-tasks.c:834
+#: calendar/gui/e-tasks.c:949
 msgid "Completing tasks..."
 msgstr "Menyiapkan tugas..."
 
-#: calendar/gui/e-tasks.c:857
+#: calendar/gui/e-tasks.c:972
 msgid "Deleting selected objects..."
 msgstr "Menghapuskan objek yang dipilih..."
 
-#: calendar/gui/e-tasks.c:884
+#: calendar/gui/e-tasks.c:999
 msgid "Expunging"
 msgstr "Sedang Buang"
 
-#: calendar/gui/e-tasks.c:960
+#: calendar/gui/e-tasks.c:1075
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
-#: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
+#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
+#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
 #: calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:705
 msgid "Tasks"
 msgstr "Tugas"
 
-#: calendar/gui/gnome-cal.c:1876
+#: calendar/gui/gnome-cal.c:1878
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Tiada temu janji."
 
-#: calendar/gui/gnome-cal.c:1895
+#: calendar/gui/gnome-cal.c:1897
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Memuatkan Imej"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1920
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Buka dalam %s..."
 
-#: calendar/gui/gnome-cal.c:2048
-#, c-format
-msgid "The calendar backend for '%s' has crashed."
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:2894
+#: calendar/gui/gnome-cal.c:2906
 msgid "Purging"
 msgstr "Menyingkir"
 
@@ -6921,7 +6673,7 @@ msgid "On The Web"
 msgstr ""
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 
@@ -6932,7 +6684,7 @@ msgid "Unable to migrate calendar `%s'"
 msgstr "Kebenaran dinafikan untuk membuka kalendar"
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:869
+#: calendar/gui/migration.c:889
 #, fuzzy, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Tidak dapat membuka buku alamat"
@@ -7168,73 +6920,73 @@ msgstr "Item Cetakan"
 msgid "Print Setup"
 msgstr "Persediaan Cetakan"
 
-#: calendar/gui/tasks-component.c:303
+#: calendar/gui/tasks-component.c:313
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:371
 #, fuzzy
 msgid "New Task List"
 msgstr "Senarai Tugas"
 
-#: calendar/gui/tasks-component.c:398
+#: calendar/gui/tasks-component.c:408
 #, fuzzy, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "Tiada tugas"
 msgstr[1] "Tiada tugas"
 
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] "%d dipilih"
 msgstr[1] "%d dipilih"
 
-#: calendar/gui/tasks-component.c:447
+#: calendar/gui/tasks-component.c:457
 #, fuzzy
 msgid "Failed upgrading tasks."
 msgstr "Memuatkan Imej"
 
-#: calendar/gui/tasks-component.c:526
+#: calendar/gui/tasks-component.c:749
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:538
+#: calendar/gui/tasks-component.c:761
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:576
+#: calendar/gui/tasks-component.c:799
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:804
+#: calendar/gui/tasks-component.c:1040
 msgid "New task"
 msgstr "Tugas baru"
 
-#: calendar/gui/tasks-component.c:805
+#: calendar/gui/tasks-component.c:1041
 msgid "_Task"
 msgstr "_Tugas"
 
-#: calendar/gui/tasks-component.c:806
+#: calendar/gui/tasks-component.c:1042
 msgid "Create a new task"
 msgstr "Wujudkan tugas baru"
 
-#: calendar/gui/tasks-component.c:812
+#: calendar/gui/tasks-component.c:1048
 #, fuzzy
 msgid "New tasks group"
 msgstr "Tugas baru"
 
-#: calendar/gui/tasks-component.c:813
+#: calendar/gui/tasks-component.c:1049
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Senarai Tugas"
 
-#: calendar/gui/tasks-component.c:814
+#: calendar/gui/tasks-component.c:1050
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Wujudkan tugas baru"
@@ -9003,12 +8755,12 @@ msgstr "Ralat ketika melaksanakan carian penapis: %s: %s"
 msgid "Unsupported operation: append message: for %s"
 msgstr "Pengendalian tidak disokong: tambahkan mesej: bagi %s"
 
-#: camel/camel-folder.c:1259
+#: camel/camel-folder.c:1262
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Pengendalian tidak disokong: cari mengikut ungkapan: bagi %s"
 
-#: camel/camel-folder.c:1299
+#: camel/camel-folder.c:1302
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Pengendalian tidak disokong: cari mengikut uids: bagi %s"
@@ -9021,11 +8773,16 @@ msgstr "Mengalihkan mesej"
 msgid "Copying messages"
 msgstr "Menyalin mesej"
 
-#: camel/camel-folder.c:1666
-msgid "Learning junk and/or non junk message(s)"
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Lansing"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
 msgstr ""
 
-#: camel/camel-folder.c:1695
+#: camel/camel-folder.c:1701
 msgid "Filtering new message(s)"
 msgstr "Menapis mesej baru"
 
@@ -9059,17 +8816,17 @@ msgstr ""
 msgid "(match-threads) requires a match type string"
 msgstr ""
 
-#: camel/camel-folder-search.c:785
+#: camel/camel-folder-search.c:784
 #, fuzzy
 msgid "(match-threads) expects an array result"
 msgstr "(padan dengan semua) memerlukan hasil bool tunggal"
 
-#: camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:790
 #, fuzzy
 msgid "(match-threads) requires the folder set"
 msgstr "(padan dengan semua) memerlukan hasil bool tunggal"
 
-#: camel/camel-folder-search.c:880
+#: camel/camel-folder-search.c:879
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Membuat pertanyaan pada pengepala yang tak diketahui:  %s"
@@ -9104,7 +8861,8 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
 #: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:706
+#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Batal."
@@ -9493,7 +9251,7 @@ msgstr "Bukti kelayakan yang dirujuk telah tamat tempoh."
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1212
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Maklum balas pengesahan yang salah daripada pelayan."
 
@@ -9876,40 +9634,40 @@ msgstr "Arahan tidak dilaksanakan"
 msgid "export keys: unimplemented"
 msgstr ""
 
-#: camel/camel-store.c:214
+#: camel/camel-store.c:213
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Tidak dapat memperoleh folder: pengendalian tak sah pada simpanan ini"
 
-#: camel/camel-store.c:244
+#: camel/camel-store.c:243
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr "Tidak boleh mewujudkan folder: %s: %s"
 
-#: camel/camel-store.c:295
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Tidak dapat mewujudkan folder: pengendalian tak sah pada simpanan ini"
 
-#: camel/camel-store.c:323
+#: camel/camel-store.c:325
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Tidak boleh mewujudkan folder: %s: %s"
 
-#: camel/camel-store.c:387 camel/camel-vee-store.c:354
+#: camel/camel-store.c:389 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Tidak dapat menghapuskan folder: %s: Pengendalian tak sah"
 
-#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#: camel/camel-store.c:439 camel/camel-vee-store.c:387
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Tidak dapat menamakan semula folder: %s: Pengendalian tak sah"
 
-#: camel/camel-store.c:811
+#: camel/camel-store.c:777
 msgid "Trash"
 msgstr "Sampah"
 
-#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
-#: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/mail-config.glade.h:95
+#: ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
 msgstr "Jun"
@@ -10141,12 +9899,12 @@ msgstr "Tiada mesej %s tersebut dalam %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Tidak dapat menyalin atau mengalihkan mesej ke dalam Folder Maya"
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:374
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Tidak dapat menghapuskan folder: %s: Folder tersebut tidak ada"
 
-#: camel/camel-vee-store.c:398
+#: camel/camel-vee-store.c:395
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Tidak dapat menamakan semula folder: %s: Folder tersebut tidak ada"
@@ -10191,24 +9949,24 @@ msgstr "Buku Alamat"
 msgid "Post Office Agent SOAP Port:"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:80
+#: camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "Novell GroupWise"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:82
+#: camel/providers/groupwise/camel-groupwise-provider.c:85
 msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: camel/providers/groupwise/camel-groupwise-provider.c:100
 #: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
 msgid "Password"
 msgstr "Kata laluan"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:99
+#: camel/providers/groupwise/camel-groupwise-provider.c:102
 #: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
@@ -10216,8 +9974,8 @@ msgstr ""
 "Opsyen ini akan disambungkan ke pelayan IMAP dengan menggunakan kata laluan "
 "teks biasa."
 
-#: camel/providers/groupwise/camel-gw-listener.c:305
-#: camel/providers/groupwise/camel-gw-listener.c:328
+#: camel/providers/groupwise/camel-gw-listener.c:312
+#: camel/providers/groupwise/camel-gw-listener.c:335
 #, fuzzy
 msgid "Checklist"
 msgstr "Kabut yang tebal"
@@ -10362,13 +10120,13 @@ msgstr ""
 "teks biasa."
 
 #: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:429
+#: camel/providers/imap/camel-imap-store.c:428
 #, c-format
 msgid "IMAP server %s"
 msgstr "Pelayan IMAP %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:431
+#: camel/providers/imap/camel-imap-store.c:430
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "Khidmat IMAP bagi %s pada %s"
@@ -10378,7 +10136,7 @@ msgstr "Khidmat IMAP bagi %s pada %s"
 #: camel/providers/imap/camel-imap-store.c:551
 #: camel/providers/imap/camel-imap-store.c:571
 #: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
+#: camel/providers/nntp/camel-nntp-store.c:209
 #: camel/providers/pop3/camel-pop3-store.c:175
 #: camel/providers/smtp/camel-smtp-transport.c:269
 #: camel/providers/smtp/camel-smtp-transport.c:285
@@ -10395,10 +10153,10 @@ msgstr "SSL tidak Ada"
 
 #: camel/providers/imap4/camel-imap4-store.c:222
 #: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:815
+#: camel/providers/imap/camel-imap-store.c:845
 #: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:137
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
 #: camel/providers/pop3/camel-pop3-store.c:192
 msgid "Connection cancelled"
 msgstr "Sambungan dibatalkan"
@@ -10411,8 +10169,8 @@ msgid ""
 msgstr "Gagal disambungkan ke pelayan IMAP %s dalam mod terjamin: %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:649
-#: camel/providers/imap/camel-imap-store.c:680
+#: camel/providers/imap/camel-imap-store.c:679
+#: camel/providers/imap/camel-imap-store.c:710
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Gagal disambungkan ke pelayan IMAP %s dalam mod terjamin: %s"
@@ -10421,7 +10179,7 @@ msgstr "Gagal disambungkan ke pelayan IMAP %s dalam mod terjamin: %s"
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1109
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
 msgid "Unknown error"
 msgstr "Ralat tak diketahui"
 
@@ -10449,8 +10207,8 @@ msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr "Tidak boleh mendapatkan folder: %s: %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1857
-#: camel/providers/imap/camel-imap-store.c:2235
+#: camel/providers/imap/camel-imap-store.c:1885
+#: camel/providers/imap/camel-imap-store.c:2263
 #, fuzzy, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -10529,12 +10287,12 @@ msgstr "Pelayan terputus tanpa dijangkakan: %s"
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3168
+#: camel/providers/imap/camel-imap-store.c:3194
 msgid "Operation cancelled"
 msgstr "Pengendalian dibatalkan"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3171
+#: camel/providers/imap/camel-imap-store.c:3197
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Pelayan terputus tanpa dijangkakan: %s"
@@ -10598,13 +10356,6 @@ msgid "Unable to retrieve message: %s"
 msgstr "Tidak boleh mendapatkan semula mesej: %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:219
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -10614,15 +10365,15 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-mbox-folder.c:418
+#: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
 msgstr "Mesej tersebut tidak ada"
 
 #: camel/providers/imap/camel-imap-folder.c:2019
-#: camel/providers/imap/camel-imap-folder.c:2621
-#: camel/providers/nntp/camel-nntp-folder.c:238
+#: camel/providers/imap/camel-imap-folder.c:2622
+#: camel/providers/nntp/camel-nntp-folder.c:220
 msgid "This message is not currently available"
 msgstr "Mesej ini tidak ada pada masa ini"
 
@@ -10631,7 +10382,23 @@ msgstr "Mesej ini tidak ada pada masa ini"
 msgid "Fetching summary information for new messages"
 msgstr "Mengambil maklumat ringkasan bagi mesej baru"
 
-#: camel/providers/imap/camel-imap-folder.c:2659
+#: camel/providers/imap/camel-imap-folder.c:2463
+#, c-format
+msgid "Incomplete server response: no information provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2471
+#, c-format
+msgid "Incomplete server response: no UID provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2484
+#, c-format
+msgid ""
+"Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2660
 msgid "Could not find message body in FETCH response."
 msgstr "Tidak dapat mencari badan mesej dalam maklum balas FETCH."
 
@@ -10695,43 +10462,43 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Untuk membaca dan menyimpan mel dalam pelayan IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/imap/camel-imap-store.c:680
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "Sambungan SSL/TLS tidak disokong."
 
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:711
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "Rundingan SSL gagal"
 
-#: camel/providers/imap/camel-imap-store.c:818
+#: camel/providers/imap/camel-imap-store.c:848
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Tidak dapat disambungkan dengan arahan \"%s\": %s"
 
-#: camel/providers/imap/camel-imap-store.c:1242
+#: camel/providers/imap/camel-imap-store.c:1272
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "Pelayan IMAP %s tidak menyokong jenis pengesahan yang diminta %s"
 
-#: camel/providers/imap/camel-imap-store.c:1252
+#: camel/providers/imap/camel-imap-store.c:1282
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Tiada sokongan bagi jenis pengesahan %s"
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1305
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sSila masukkan kata laluan IMAP bagi %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1289
+#: camel/providers/imap/camel-imap-store.c:1319
 msgid "You didn't enter a password."
 msgstr "Anda tidak memasukkan kata laluan."
 
-#: camel/providers/imap/camel-imap-store.c:1318
+#: camel/providers/imap/camel-imap-store.c:1348
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10742,18 +10509,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1839
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:1867
+#: camel/providers/imap/camel-imap-store.c:2057
 #, c-format
 msgid "No such folder %s"
 msgstr "Folder tersebut tidak ada%s"
 
-#: camel/providers/imap/camel-imap-store.c:1915
-#: camel/providers/imap/camel-imap-store.c:2296
+#: camel/providers/imap/camel-imap-store.c:1943
+#: camel/providers/imap/camel-imap-store.c:2324
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Folder ibu tidak dibenarkan mengandungi subfolder"
 
-#: camel/providers/imap/camel-imap-store.c:1970
+#: camel/providers/imap/camel-imap-store.c:1998
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10761,7 +10528,7 @@ msgstr "Folder ibu tidak dibenarkan mengandungi subfolder"
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Tidak boleh mewujudkan folder: %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:2274
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Folder ibu tak diketahui: %s"
@@ -10797,20 +10564,20 @@ msgid "Index message body data"
 msgstr "Data kandungan mesej indeks"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:388
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:393
-#: camel/providers/local/camel-local-folder.c:396
+#: camel/providers/local/camel-local-folder.c:392
+#: camel/providers/local/camel-local-folder.c:395
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "peti mel:%s (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:400
+#: camel/providers/local/camel-local-folder.c:399
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -10871,7 +10638,7 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:142
 #: camel/providers/local/camel-local-store.c:253
-#: camel/providers/local/camel-mbox-store.c:356
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10944,8 +10711,25 @@ msgstr "Mesej tambahan dirmel dibatalkan"
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Tidak dapat menambahkan mesej pada folder dirmel: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:226
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mbox-folder.c:417
+#: camel/providers/local/camel-mbox-folder.c:436
+#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:475
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-mh-folder.c:221
+#, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+"Tidak boleh mendapatkan mesej: %s dari folder %s\n"
+"  %s"
+
+#: camel/providers/local/camel-maildir-folder.c:236
 msgid "Invalid message contents"
 msgstr "Kandungan mesej tak sah"
 
@@ -10986,9 +10770,9 @@ msgstr "Tidak dapat menghapuskan folder `%s': %s"
 msgid "not a maildir directory"
 msgstr "Bukan direktori dirmel"
 
-#: camel/providers/local/camel-maildir-store.c:341
-#: camel/providers/local/camel-spool-store.c:286
-#: camel/providers/local/camel-spool-store.c:316
+#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-spool-store.c:284
+#: camel/providers/local/camel-spool-store.c:314
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Tidak dapat mengimbas folder `%s': %s"
@@ -11035,27 +10819,18 @@ msgstr "Tambahan mel dibatalkan"
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Tidak dapat menambahkan mesej pada fail peti mel: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:435
-#: camel/providers/local/camel-mbox-folder.c:466
-#: camel/providers/local/camel-mbox-folder.c:474
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"Tidak boleh mendapatkan mesej: %s dari folder %s\n"
-"  %s"
-
-#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:468
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Folder rosak dan tidak dapat dipulihkan."
 
-#: camel/providers/local/camel-mbox-folder.c:475
-msgid "Message construction failed: Corrupt mailbox?"
+#: camel/providers/local/camel-mbox-folder.c:476
+#: camel/providers/local/camel-mh-folder.c:222
+#, fuzzy
+msgid "Message construction failed."
 msgstr "Binaan mesej gagal: Peti mel rosak?"
 
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:362
+#: camel/providers/local/camel-mbox-store.c:361
 msgid "Cannot create a folder by this name."
 msgstr "Tidak dapat mewujudkan folder dengan nama ini"
 
@@ -11085,31 +10860,31 @@ msgstr "`%s' bukan fail biasa."
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Folder `%s' tidak kosong. Tidak dihapuskan."
 
-#: camel/providers/local/camel-mbox-store.c:375
+#: camel/providers/local/camel-mbox-store.c:374
 #, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Tidak dapat mewujudkan direktori '%s': %s."
 
-#: camel/providers/local/camel-mbox-store.c:389
+#: camel/providers/local/camel-mbox-store.c:388
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Tidak boleh mewujudkan folder: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:391
+#: camel/providers/local/camel-mbox-store.c:390
 #, fuzzy
 msgid "Folder already exists"
 msgstr "ID objek telah wujud"
 
-#: camel/providers/local/camel-mbox-store.c:473
+#: camel/providers/local/camel-mbox-store.c:472
 msgid "The new folder name is illegal."
 msgstr "Nama folder baru tidak sah."
 
-#: camel/providers/local/camel-mbox-store.c:486
+#: camel/providers/local/camel-mbox-store.c:485
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Tidak dapat menamakan semula '%s': %s"
 
-#: camel/providers/local/camel-mbox-store.c:561
+#: camel/providers/local/camel-mbox-store.c:560
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Tidak dapat menamakan semula %s ke %s: %s"
@@ -11302,7 +11077,7 @@ msgstr ""
 "Folder mungkin rosak, salinan disimpan dalam `%s'"
 
 #: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:997
+#: camel/providers/nntp/camel-nntp-store.c:1126
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Sila masukkan kata laluan NNTP bagi %s@%s"
@@ -11319,18 +11094,10 @@ msgstr "Gagal untuk menghantar nama pengguna ke pelayan"
 msgid "Server rejected username/password"
 msgstr "Pelayan menolak nama pengguna/kata laluan"
 
-#: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:263
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr "Pengguna dibatalkan"
-
-#: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:259
-#: camel/providers/nntp/camel-nntp-folder.c:265
+#: camel/providers/nntp/camel-nntp-folder.c:147
+#: camel/providers/nntp/camel-nntp-folder.c:149
+#: camel/providers/nntp/camel-nntp-folder.c:158
+#: camel/providers/nntp/camel-nntp-folder.c:234
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11339,63 +11106,50 @@ msgstr "Pengguna dibatalkan"
 msgid "Cannot get message %s: %s"
 msgstr "Tidak boleh mendapatkan mesej %s: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:188
-#: camel/providers/nntp/camel-nntp-folder.c:228
+#: camel/providers/nntp/camel-nntp-folder.c:156
+#: camel/providers/nntp/camel-nntp-folder.c:232
+#: camel/providers/nntp/camel-nntp-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+msgid "User cancelled"
+msgstr "Pengguna dibatalkan"
+
+#: camel/providers/nntp/camel-nntp-folder.c:176
+#: camel/providers/nntp/camel-nntp-folder.c:208
 #, c-format
 msgid "Internal error: uid in invalid format: %s"
 msgstr "Ralat dalaman: uid dalam format tak sah: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:201
-#, fuzzy, c-format
-msgid "Could not get article %s from NNTP server"
-msgstr "Tidak boleh mendapatkan senarai kumpulan dar pelayan."
-
-#: camel/providers/nntp/camel-nntp-folder.c:362
-msgid "Posting not allowed by news server"
-msgstr ""
-
+#: camel/providers/nntp/camel-nntp-folder.c:328
+#: camel/providers/nntp/camel-nntp-folder.c:331
 #: camel/providers/nntp/camel-nntp-folder.c:373
-#, c-format
-msgid "Failed to send newsgroups header: %s: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:413
-#: camel/providers/nntp/camel-nntp-folder.c:426
-#, c-format
-msgid "Error posting to newsgroup: %s: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:438
-msgid "Error reading response to posted message: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:441
+#: camel/providers/nntp/camel-nntp-folder.c:375
 #, fuzzy, c-format
-msgid "Error posting message: %s: message not posted"
-msgstr ""
-"Ralat ketika menyimpan mesej secara automatik: %s\n"
-" %s"
+msgid "Posting failed: %s"
+msgstr "Pengendalian gagal: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:457
+#: camel/providers/nntp/camel-nntp-folder.c:393
 msgid "You cannot post NNTP messages while working offline!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:468
+#: camel/providers/nntp/camel-nntp-folder.c:404
 #, fuzzy
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Tidak dapat menyalin mesej ke folder mbox sementara: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:44
 msgid "Could not get group list from server."
 msgstr "Tidak boleh mendapatkan senarai kumpulan dar pelayan."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#: camel/providers/nntp/camel-nntp-grouplist.c:97
+#: camel/providers/nntp/camel-nntp-grouplist.c:106
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "Tidak dapat memuatkan fail senarai kumpulan untuk %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#: camel/providers/nntp/camel-nntp-grouplist.c:157
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Tidak dapat menyimpan fail senarai kumpulan untuk %s: %s"
@@ -11427,27 +11181,29 @@ msgstr ""
 "Opsyen ini akan disahkan dengan pelayan NNTP dengan menggunakan kata laluan "
 "teks biasa."
 
-#: camel/providers/nntp/camel-nntp-store.c:158
+#: camel/providers/nntp/camel-nntp-store.c:118
+#: camel/providers/nntp/camel-nntp-store.c:1233
+#: camel/providers/nntp/camel-nntp-store.c:1331
+#, c-format
+msgid "NNTP Command failed: %s"
+msgstr "Arahan NNTP gagal: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:227
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Tidak dapat membaca aluan daripada %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:170
+#: camel/providers/nntp/camel-nntp-store.c:239
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "Pelayan NNTP %s mengembalikan kod ralat %d: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:326
+#: camel/providers/nntp/camel-nntp-store.c:403
 #, c-format
 msgid "USENET News via %s"
 msgstr "Berita USENET melalui %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:640
-#, fuzzy
-msgid "Stream error"
-msgstr "ralat hurai"
-
-#: camel/providers/nntp/camel-nntp-store.c:643
+#: camel/providers/nntp/camel-nntp-store.c:777
 #, fuzzy, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -11457,75 +11213,75 @@ msgstr ""
 "Ralat ketika menyimpan mesej ke: %s:\n"
 " %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:735
+#: camel/providers/nntp/camel-nntp-store.c:872
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
 "No such newsgroup. The selected item is a probably a parent folder."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:767
+#: camel/providers/nntp/camel-nntp-store.c:904
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
 "newsgroup does not exist!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:792
+#: camel/providers/nntp/camel-nntp-store.c:929
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:800
+#: camel/providers/nntp/camel-nntp-store.c:937
 #, fuzzy
 msgid "You cannot rename a folder in a News store."
 msgstr "Tidak dapat menamakan semula folder %s ke %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:808
+#: camel/providers/nntp/camel-nntp-store.c:945
 #, fuzzy
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "Tidak dapat mengalihkan folder ke dalam salah satu turunannya."
 
-#: camel/providers/nntp/camel-nntp-summary.c:253
-#, fuzzy, c-format
-msgid "Connection error: %s"
-msgstr "Ralat tak diketahui: %s"
-
-#: camel/providers/nntp/camel-nntp-summary.c:262
-#, c-format
-msgid "No such folder: %s"
-msgstr "Folder tersebut tidak ada: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1118
+#, fuzzy
+msgid "Authentication requested but not username provided"
+msgstr "Pengesahan diperlukan"
 
-#: camel/providers/nntp/camel-nntp-summary.c:268
-#, c-format
-msgid "Could not get group: %s"
-msgstr "Tidak boleh mendapatkan kumpulan: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1146
+#, fuzzy, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr "Gagal disahkan pada pelayan POP %s: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:333
+#: camel/providers/nntp/camel-nntp-store.c:1262
 #, fuzzy
-msgid "Could not get messages: unspecified error"
-msgstr "Tidak dapat menghantar mesej: %s"
+msgid "Not connected."
+msgstr "Tiada kenalan"
 
-#: camel/providers/nntp/camel-nntp-summary.c:378
+#: camel/providers/nntp/camel-nntp-store.c:1311
 #, c-format
-msgid "NNTP Command failed: %s"
-msgstr "Arahan NNTP gagal: %s"
+msgid "No such folder: %s"
+msgstr "Folder tersebut tidak ada: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:438
-#: camel/providers/nntp/camel-nntp-summary.c:543
+#: camel/providers/nntp/camel-nntp-summary.c:218
+#: camel/providers/nntp/camel-nntp-summary.c:314
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Mengimbas mesej baru"
 
-#: camel/providers/nntp/camel-nntp-summary.c:558
-#, c-format
-msgid "Unknown server response: %s"
-msgstr "Maklum balas pelayan tak diketahui: %s"
+#: camel/providers/nntp/camel-nntp-summary.c:225
+#, fuzzy, c-format
+msgid "Unexpected server response from xover: %s"
+msgstr "Maklum balas yang tidak dijangkakan daripada pelayan IMAP: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:605
+#: camel/providers/nntp/camel-nntp-summary.c:328
+#, fuzzy, c-format
+msgid "Unexpected server response from head: %s"
+msgstr "Maklum balas yang tidak dijangkakan daripada GnuPG: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:368
 msgid "Use cancel"
 msgstr "Penggunaan batal"
 
-#: camel/providers/nntp/camel-nntp-summary.c:607
+#: camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Pengendalian gagal: %s"
@@ -11573,7 +11329,7 @@ msgstr "Hapuskan selepas %s hari"
 msgid "Disable support for all POP3 extensions"
 msgstr "Melumpuhkan sokongan untuk semua sambungan POP3"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107
 msgid "POP"
 msgstr "POP"
 
@@ -11664,7 +11420,7 @@ msgid "No such folder `%s'."
 msgstr "Folder tersebut tidak ada `%s'"
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:132
 msgid "Sendmail"
 msgstr "Hantar mel"
 
@@ -11719,7 +11475,7 @@ msgstr "hantarkan mel"
 msgid "Mail delivery via the sendmail program"
 msgstr "Penyerahan mel melalui atur cara hantar mel"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:119
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -12016,19 +11772,19 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
+#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:408
 msgid "attachment"
 msgstr "lampiran"
 
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:454
 msgid "Remove selected items from the attachment list"
 msgstr "Keluarkan item yang dipilih daripada senarai lampiran"
 
-#: composer/e-msg-composer-attachment-bar.c:491
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Add attachment..."
 msgstr "Tambahkan lampiran..."
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:495
 msgid "Attach a file to the message"
 msgstr "Lampirkan fail ke mesej"
 
@@ -12091,7 +11847,7 @@ msgstr "(Mesej Tak Berjudul)"
 msgid "Open file"
 msgstr "Buka fail"
 
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
 msgid "Autogenerated"
 msgstr "Autogenerated"
 
@@ -12239,17 +11995,17 @@ msgstr "Lampirkan fail"
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
+msgid "You cannot attach the file `{0}' to this message."
 msgstr "Lampirkan fail ke mesej"
 
 #. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4
-msgid "${1}"
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
 msgstr ""
 
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
 
 #. mail-composer:attach-directory primary
@@ -12344,7 +12100,7 @@ msgstr "Tidak dapat mewujudkan saluran: %s"
 
 #. mail-composer:no-build-message secondary
 #: composer/mail-composer-errors.xml.h:34
-msgid "Because \"${0}\", you may need to select different mail options."
+msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
@@ -12354,8 +12110,10 @@ msgid "Could not read signature file \"{0}\"."
 msgstr "Tidak dapat menyimpan fail tandatangan: %s"
 
 #. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38
-msgid "Because \"${1}\"."
+#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted primary
@@ -12782,11 +12540,11 @@ msgid "<b>Then</b>"
 msgstr "<b>Genap tempoh:</b> "
 
 #: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1335
+#: mail/mail-account-gui.c:1347
 msgid "Select Folder"
 msgstr "Pilih Folder"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
 #, fuzzy
 msgid "    "
 msgstr "      "
@@ -12845,7 +12603,7 @@ msgstr "yang lalu"
 msgid "months"
 msgstr "bulan"
 
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
 msgid "seconds"
 msgstr "saat"
 
@@ -12877,20 +12635,20 @@ msgstr "dengan semua folder setempat"
 msgid "years"
 msgstr "tahun"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:916
-#: mail/mail-config.c:76 mail/mail-config.glade.h:90
+#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
+#: mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Penting"
 
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:919 mail/mail-config.c:79
-#: mail/mail-config.glade.h:145
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: mail/mail-config.glade.h:148
 msgid "To Do"
 msgstr "Perkara yang Perlu Dibuat"
 
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:920 mail/mail-config.c:80
-#: mail/mail-config.glade.h:94
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: mail/mail-config.glade.h:97
 msgid "Later"
 msgstr "Selepas itu"
 
@@ -12948,257 +12706,6 @@ msgstr "masuk"
 msgid "outgoing"
 msgstr "keluar"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Adjust Score"
-msgstr "Selaraskan Skor"
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Color"
-msgstr "Umpukkan Warna"
-
-#: filter/libfilter-i18n.h:4
-msgid "Assign Score"
-msgstr "Umpukkan Skor"
-
-#: filter/libfilter-i18n.h:5
-msgid "Attachments"
-msgstr "Lampiran"
-
-#: filter/libfilter-i18n.h:6
-msgid "Beep"
-msgstr "Bip"
-
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "mengandungi"
-
-#: filter/libfilter-i18n.h:8
-msgid "Copy to Folder"
-msgstr "Salin ke Folder"
-
-#: filter/libfilter-i18n.h:9
-msgid "Date received"
-msgstr "Tarikh diterima"
-
-#: filter/libfilter-i18n.h:10
-msgid "Date sent"
-msgstr "Tarikh dihantar"
-
-#: filter/libfilter-i18n.h:12
-msgid "Deleted"
-msgstr "Dihapuskan"
-
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "tidak mengandungi"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "tidak berakhir dengan"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "tidak wujud"
-
-#: filter/libfilter-i18n.h:16
-msgid "does not return"
-msgstr "tidak kembali"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "tidak seperti "
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "tidak dimulakan dengan"
-
-#: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
-msgstr "Tidak Wujud"
-
-#: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr "Draf"
-
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "berakhir dengan"
-
-#: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr "Wujud"
-
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "wujud"
-
-#: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr "Ungkapan"
-
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr "Susulan"
-
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "adalah"
-
-#: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr "adalah selepas"
-
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr "adalah sebelum"
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr "ditandai"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "lebih besar daripada"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "kurang daripada"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "tidak"
-
-#: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr "tidak ditandai"
-
-#: filter/libfilter-i18n.h:36
-#, fuzzy
-msgid "Junk Test"
-msgstr "Jun"
-
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
-#: widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Label"
-
-#: filter/libfilter-i18n.h:38
-msgid "Mailing list"
-msgstr "Senarai mel"
-
-#: filter/libfilter-i18n.h:39
-msgid "Message Body"
-msgstr "Badan Mesej"
-
-#: filter/libfilter-i18n.h:40
-msgid "Message Header"
-msgstr "Pengepala Mesej"
-
-#: filter/libfilter-i18n.h:41
-#, fuzzy
-msgid "Message is Junk"
-msgstr "_Mesej"
-
-#: filter/libfilter-i18n.h:42
-#, fuzzy
-msgid "Message is not Junk"
-msgstr "Tandakan sebagai _Penting"
-
-#: filter/libfilter-i18n.h:43
-msgid "Move to Folder"
-msgstr "Alihkan ke Folder"
-
-#: filter/libfilter-i18n.h:44
-#, fuzzy
-msgid "Pipe to Program"
-msgstr "Keluar dari atur cara"
-
-#: filter/libfilter-i18n.h:45
-msgid "Play Sound"
-msgstr "Dengarkan Bunyi"
-
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Baca"
-
-#: filter/libfilter-i18n.h:47
-msgid "Recipients"
-msgstr "Penerima"
-
-#: filter/libfilter-i18n.h:48
-msgid "Regex Match"
-msgstr "Padanan Regex "
-
-#: filter/libfilter-i18n.h:49
-msgid "Replied to"
-msgstr "Jawapan kepada"
-
-#: filter/libfilter-i18n.h:50
-msgid "returns"
-msgstr "kembali"
-
-#: filter/libfilter-i18n.h:51
-msgid "returns greater than"
-msgstr "kembalikan lebih besar daripada"
-
-#: filter/libfilter-i18n.h:52
-msgid "returns less than"
-msgstr "kembalikan kurang daripada"
-
-#: filter/libfilter-i18n.h:53
-#, fuzzy
-msgid "Run Program"
-msgstr "Jalankan atur cara:"
-
-#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Skor"
-
-#: filter/libfilter-i18n.h:55
-msgid "Sender"
-msgstr "Penghantar"
-
-#: filter/libfilter-i18n.h:56
-msgid "Set Status"
-msgstr "Set Status"
-
-#: filter/libfilter-i18n.h:57
-msgid "Size (kB)"
-msgstr "Saiz (kB)"
-
-#: filter/libfilter-i18n.h:58
-msgid "sounds like"
-msgstr "seperti"
-
-#: filter/libfilter-i18n.h:59
-msgid "Source Account"
-msgstr "Akaun Sumber"
-
-#: filter/libfilter-i18n.h:60
-msgid "Specific header"
-msgstr "Pengepala yang khusus"
-
-#: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "bermula dengan"
-
-#: filter/libfilter-i18n.h:63
-msgid "Stop Processing"
-msgstr "Hentikan Memproses"
-
-#: filter/libfilter-i18n.h:64 mail/em-format.c:755 mail/em-format-html.c:1519
-#: mail/em-format-quote.c:302 mail/em-mailer-prefs.c:87
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
-#: smime/lib/e-cert.c:1079
-msgid "Subject"
-msgstr "Tajuk"
-
-#: filter/libfilter-i18n.h:65
-msgid "Unset Status"
-msgstr "Batalkan Set Status"
-
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Tambahkan Peraturan"
@@ -13216,6 +12723,11 @@ msgstr "Tajuk peraturan"
 msgid "_Score Rules"
 msgstr "Peraturan Skor"
 
+#: filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Skor"
+
 #: filter/searchtypes.xml.h:1
 msgid "Body contains"
 msgstr "Badan mengandungi"
@@ -13296,13 +12808,13 @@ msgstr "Tandatangan"
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Mesej Yang Disampaikan --------"
 
-#: mail/em-composer-utils.c:1499
+#: mail/em-composer-utils.c:1495
 msgid "an unknown sender"
 msgstr "penghantar tak diketahui"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1509
+#: mail/em-composer-utils.c:1505
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "Pada %a, %Y-%m-%d di %H:%M %%+05d, %%s menulis:"
 
@@ -13342,8 +12854,8 @@ msgstr "<klik di sini untuk memilih folder>"
 msgid "Create New Folder"
 msgstr "Wujudkan Folder Baru"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
-#: mail/mail-component.c:701
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
+#: mail/mail-component.c:704
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Tetapkan di mana folder akan diwujudkan:"
@@ -13358,105 +12870,106 @@ msgstr "Crestview"
 msgid "Folder _name:"
 msgstr "Nama _folder:"
 
-#: mail/em-folder-tree.c:839
+#: mail/em-folder-tree.c:833
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Mengeluarkan folder %s"
 
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree.c:835
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Membuka folder %s"
 
-#: mail/em-folder-tree.c:848 mail/message-list.c:1555
+#: mail/em-folder-tree.c:842 mail/message-list.c:1561
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Mengalihkan mesej ke %s"
 
-#: mail/em-folder-tree.c:850 mail/message-list.c:1557
+#: mail/em-folder-tree.c:844 mail/message-list.c:1563
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Menyalin mesej ke %s"
 
-#: mail/em-folder-tree.c:866
+#: mail/em-folder-tree.c:860
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Tidak dapat menyalin atau mengalihkan mesej ke dalam Folder Maya"
 
-#: mail/em-folder-tree.c:956 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Salin ke Folder"
 
-#: mail/em-folder-tree.c:957 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Alihkan ke Folder"
 
-#: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2069
-#: mail/em-folder-tree.c:2551 mail/em-folder-view.c:798
-#: mail/message-list.c:1645
+#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
+#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
+#: mail/message-list.c:1651
 msgid "_Move"
 msgstr "_Alih"
 
-#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#: mail/em-folder-tree.c:955 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "Batalkan Tugas"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
 #: mail/em-folder-view.c:798 mail/em-folder-view.c:812
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Pilih folder"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
 #, fuzzy
 msgid "C_opy"
 msgstr "Salin"
 
-#: mail/em-folder-tree.c:2096
+#: mail/em-folder-tree.c:2088
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Menyimpan folder '%s'"
 
-#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
+#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
 msgid "Create folder"
 msgstr "Wujudkan folder"
 
-#: mail/em-folder-tree.c:2474
+#: mail/em-folder-tree.c:2463
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Namakan semula folder \"%s\" kepada:"
 
-#: mail/em-folder-tree.c:2476
+#: mail/em-folder-tree.c:2465
 msgid "Rename Folder"
 msgstr "Namakan semula Folder"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Lihat"
 
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2537
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Buka dalam Tetingkap _Baru"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2555
+#: mail/em-folder-tree.c:2546
 msgid "_New Folder..."
 msgstr "_Folder Baru..."
 
-#: mail/em-folder-tree.c:2558
+#: mail/em-folder-tree.c:2549
 msgid "_Rename"
 msgstr "_Namakan semula"
 
-#: mail/em-folder-tree.c:2561 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Ciri-ciri..."
 
 #: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:889
+#: mail/mail-vfolder.c:888
 msgid "VFolders"
 msgstr "VFolder"
 
@@ -13470,19 +12983,19 @@ msgstr ""
 msgid "Inbox"
 msgstr "Kotak masuk"
 
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
 msgid "Loading..."
 msgstr "Sedang memuatkan..."
 
 #: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
 #: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
 #: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:551
+#: mail/mail-component.c:554
 msgid "Mail"
 msgstr "Mel"
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Edit sebagai Mesej Baru..."
@@ -13495,17 +13008,17 @@ msgstr "_Cetak"
 msgid "_Reply to Sender"
 msgstr "_Balas kepada Penghantar"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:810
+#: mail/em-folder-view.c:901 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Balas kepada _Senarai"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:811
+#: mail/em-folder-view.c:902 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Balas kepada _Semua"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: mail/em-folder-view.c:903 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Sampaikan"
@@ -13560,6 +13073,10 @@ msgstr "Alih_kan ke Folder..."
 msgid "_Copy to Folder..."
 msgstr "_Salin ke Folder..."
 
+#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Label"
+
 #: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Tambahkan Penghantar ke Buku_Alamat"
@@ -13610,12 +13127,12 @@ msgid "Filter on _Mailing List"
 msgstr "Penapis bagi _Senarai Mel"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
-#: mail/mail-config.glade.h:66
+#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Piawai"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1796
 msgid "Print Message"
 msgstr "Cetak Mesej"
 
@@ -13654,12 +13171,18 @@ msgstr "Sk"
 msgid "Bcc"
 msgstr "St"
 
+#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
+#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Tajuk"
+
 #: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
 #: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Tarikh"
 
-#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
+#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
 msgid "Newsgroups"
 msgstr ""
 
@@ -13854,7 +13377,7 @@ msgid ""
 "practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:757
+#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
 #, fuzzy
 msgid "_View Certificate"
 msgstr "Sijil"
@@ -13915,7 +13438,7 @@ msgstr "Satu m_inggu"
 msgid "Once per month"
 msgstr "Satu bul_an"
 
-#: mail/em-migrate.c:1072
+#: mail/em-migrate.c:1168
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13923,86 +13446,86 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1506
+#: mail/em-migrate.c:1602
 #, fuzzy, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Tidak boleh mewujudkan folder: %s: %s"
 
-#: mail/em-migrate.c:1532
+#: mail/em-migrate.c:1628
 #, fuzzy, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr ""
 "Tidak dapat menyalin penghurai fail: %s\n"
 "%s"
 
-#: mail/em-migrate.c:1715
+#: mail/em-migrate.c:1811
 #, fuzzy, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Tidak dapat menyimpan fail senarai kumpulan untuk %s: %s"
 
-#: mail/em-migrate.c:1919
+#: mail/em-migrate.c:2015
 #, fuzzy, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Gagal disahkan pada pelayan POP %s: %s"
 
-#: mail/em-migrate.c:1933
+#: mail/em-migrate.c:2029
 #, fuzzy, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Gagal mewujudkan saluran bagi '%s': %s"
 
-#: mail/em-migrate.c:1962
+#: mail/em-migrate.c:2058
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#: mail/em-migrate.c:2413 mail/em-migrate.c:2425
 #, fuzzy, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Gagal mewujudkan saluran bagi '%s': %s"
 
-#: mail/em-migrate.c:2480
+#: mail/em-migrate.c:2576
 #, fuzzy, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr ""
 "Tidak dapat mewujudkan fail output: %s\n"
 " %s"
 
-#: mail/em-migrate.c:2498
+#: mail/em-migrate.c:2594
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 msgstr ""
 
-#: mail/em-popup.c:699
+#: mail/em-popup.c:700
 msgid "Save As..."
 msgstr "Simpan Sebagai..."
 
-#: mail/em-popup.c:717
+#: mail/em-popup.c:718
 #, fuzzy, c-format
 msgid "untitled_image.%s"
 msgstr "Mesej Tak Berjudul"
 
-#: mail/em-popup.c:807
+#: mail/em-popup.c:808
 msgid "Set as _Background"
 msgstr "Set sebagai _Latar belakang"
 
-#: mail/em-popup.c:809
+#: mail/em-popup.c:810
 msgid "_Reply to sender"
 msgstr "_Balas kepada penghantar"
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:859
 msgid "_Open Link in Browser"
 msgstr "_Buka Pautan dalam Pelayar"
 
-#: mail/em-popup.c:859
+#: mail/em-popup.c:860
 msgid "Se_nd message to..."
 msgstr "Ha_ntar mesej ke..."
 
-#: mail/em-popup.c:860
+#: mail/em-popup.c:861
 msgid "_Add to Addressbook"
 msgstr "_Tambah ke Buku Alamat"
 
-#: mail/em-popup.c:966
+#: mail/em-popup.c:967
 #, c-format
 msgid "Open in %s..."
 msgstr "Buka dalam %s..."
@@ -14600,7 +14123,7 @@ msgstr "Kawalan keutamaan Mel Evolution"
 msgid "Mail Accounts"
 msgstr "Akaun Mel"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
 msgid "Mail Preferences"
 msgstr "Keutamaan Mel"
 
@@ -14613,15 +14136,15 @@ msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution sedang mengimport mel Elm lama anda"
 
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:226
+#: mail/importers/evolution-mbox-importer.c:221
+#: mail/importers/evolution-outlook-importer.c:255
 #: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Sedang mengimport..."
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:222
-#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/evolution-mbox-importer.c:223
+#: mail/importers/evolution-outlook-importer.c:257
 #: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Sila tunggu"
@@ -14644,23 +14167,25 @@ msgid "Elm"
 msgstr "Elm"
 
 #: mail/importers/evolution-mbox-importer.c:116
+#: mail/importers/evolution-outlook-importer.c:130
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Hapuskan folder ini"
 
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 #, fuzzy
 msgid "Select folder to import into"
 msgstr "Pilih pengimport"
 
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:254
 #: mail/importers/mail-importer.c:226
 #, fuzzy, c-format
 msgid "Importing `%s'"
 msgstr "Mengimport"
 
-#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/evolution-outlook-importer.c:301
 #: mail/importers/mail-importer.c:140
 #, fuzzy
 msgid "Importing mailbox"
@@ -14826,15 +14351,15 @@ msgstr ""
 msgid "%s License Agreement"
 msgstr ""
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
 msgid "_Host:"
 msgstr "_Hos:"
 
-#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
 msgid "User_name:"
 msgstr "Nama_pengguna:"
 
-#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
 msgid "_Path:"
 msgstr "_Laluan:"
 
@@ -14897,34 +14422,34 @@ msgstr "%d keseluruhan"
 msgid ", %d unread"
 msgstr "%d belum dihantar"
 
-#: mail/mail-component.c:653
+#: mail/mail-component.c:656
 msgid "New Mail Message"
 msgstr "Mesej Mel Baru"
 
-#: mail/mail-component.c:654
+#: mail/mail-component.c:657
 msgid "_Mail Message"
 msgstr "_Mesej Mel"
 
-#: mail/mail-component.c:655
+#: mail/mail-component.c:658
 msgid "Compose a new mail message"
 msgstr "Gubah mesej mel baru"
 
-#: mail/mail-component.c:661
+#: mail/mail-component.c:664
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "VFolder Baru"
 
-#: mail/mail-component.c:662
+#: mail/mail-component.c:665
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Penapis Mel"
 
-#: mail/mail-component.c:663
+#: mail/mail-component.c:666
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Wujudkan kalendar baru"
 
-#: mail/mail-component.c:795
+#: mail/mail-component.c:798
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
@@ -14936,7 +14461,7 @@ msgstr "Menyemak Khidmat"
 msgid "Connecting to server..."
 msgstr "Sedang disambungkan ke pelayan..."
 
-#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Pengenalan"
 
@@ -14951,7 +14476,7 @@ msgstr ""
 "e-mel yang anda hantar."
 
 #: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid "Receiving Mail"
 msgstr "Menerima Mel"
 
@@ -14967,7 +14492,7 @@ msgstr ""
 msgid "Please select among the following options"
 msgstr "Sila pilih opsyen berikut"
 
-#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr "Menghantar Mel"
 
@@ -14979,7 +14504,7 @@ msgstr ""
 "Sila masukkan maklumat tentang cara anda menghantar mel. Jika anda tidak "
 "pasti, tanya pentadbir sistem anda atau Penyedia Khidmat Internet."
 
-#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37
 msgid "Account Management"
 msgstr "Pengurusan Akaun"
 
@@ -14997,252 +14522,256 @@ msgstr ""
 "ini dalam ruang di bawah. Nama ini akan digunakan untuk tujuan paparan "
 "sahaja."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:2
 #, fuzzy
 msgid " Ch_eck for Supported Types "
 msgstr "_Semak jenis sokongan "
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "<b>Preview</b>"
 msgstr "Pralihat"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "(SSL tidak disokong dalam binaan Evolution ini)"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "<b>S_ignatures</b>"
 msgstr "<b>Status:</b>"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "<b>_Languages</b>"
 msgstr "<b>Status:</b>"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
+msgid "<small>This will make the the filter more reliable, but slower</small>"
+msgstr ""
+
+#: mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "<span weight=\"bold\">Checking for New Mail</span>"
 msgstr "Menyemak Mel Baru"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">General</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
 #, fuzzy
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "Mesej untuk Dipaparkan:"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "Pemberitahuan Mel Baru"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "Kebersendirian Agak Baik (PGP/GPG)"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Security</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "Mesej Dihantar dan Didraf"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:34
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:35
 #, fuzzy
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr ""
 "S_entiasa sulitkan kepada saya sendiri semasa menghantar mel yang disulitkan"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:36
 msgid "Account Editor"
 msgstr "Editor Akaun"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:38
 #, fuzzy
 msgid "Add Ne_w Signature..."
 msgstr "Tambahkan tandatangan baru..."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Add _Script"
 msgstr "Tambahkan Sk_rip"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:40
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 "Sen_tiasa sulitkan kepada saya sendiri semasa menghantar mel yang disulitkan"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Sentiasa buat _salinan (Sk) kepada:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Sentiasa buat _salinan tersembunyi (St) kepada:"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Always _sign outgoing messages when using this account"
 msgstr "_Sentiasa tandatangan mesej keluar apabila menggunakan akaun ini"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Sentiasa _tekan kekunci dalam gelang kekunci saya semasa menyulitkan"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Attach original message"
 msgstr "Lampirkan mesej asal"
 
-#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Lampiran"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:48
 #, fuzzy
 msgid "Automatically _insert smiley images"
 msgstr "_Secara automatik sisipkan imej smiley"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Automatically check for _new mail every"
 msgstr "_Secara automatik semak mel baru setiap"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltik (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltik (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Beep w_hen new mail arrives"
 msgstr "_Bunyi bip apabila ada mesej baru"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "C_haracter set:"
 msgstr "S_et aksara:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Ch_eck for Supported Types "
 msgstr "_Semak jenis sokongan "
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 #, fuzzy
-msgid "Check _Incoming Mail"
+msgid "Check _incoming mail for junk"
 msgstr "Menyemak Mel Baru"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Check spelling while I _type"
 msgstr "Semak ejaan sambil saya _menaip"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 msgid "Color for _misspelled words:"
 msgstr "Warna bagi _kata yang salah eja:"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Colors"
 msgstr "W_arna"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Confirm _when expunging a folder"
 msgstr "_Sahkan apabila membuang folder"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -15258,116 +14787,121 @@ msgstr ""
 "\n"
 "Klik \"Guna\" untuk menyimpan seting anda."
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
 msgid "De_fault"
 msgstr "Pia_wai"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Default character e_ncoding:"
 msgstr "Pengekodan aksara _piawai:"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 #, fuzzy
 msgid "Defaults"
 msgstr "_Piawai"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 msgid "Do not quote original message"
 msgstr "Jangan petik mesej asal"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Jangan tandatangani _permintaan mesyuarat (bagi keserasian Outlook)"
 
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Selesai"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Drafts _Folder:"
 msgstr "Folder _draf:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:77
 msgid "Email Accounts"
 msgstr "Akaun E-mel"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Email _Address:"
 msgstr "Alamat _e-mel:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "Empty trash folders on e_xit"
 msgstr "Kosongkan _folder sampah apabila keluar"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "Sijil Kenalan"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:81
 msgid "Evolution Account Assistant"
 msgstr "Pembantu Akaun Evolution"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:82
 msgid "Execute Command..."
 msgstr "Laksanakan Arahan..."
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Fi_xed-width:"
 msgstr "Le_bar -tetap:"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 msgid "Font Properties"
 msgstr "Ciri-ciri Fon"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 msgid "Format messages in _HTML"
 msgstr "Formatkan mesej dalam _HTML"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "HTML Mail"
 msgstr "_Mel HTML"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Headers"
 msgstr "Pengepala"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr "Tonjolkan _petikan dengan"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
 #: mail/mail-config.glade.h:91
+#, fuzzy
+msgid "I_nclude remote tests"
+msgstr "Termasuk:"
+
+#: mail/mail-config.glade.h:94
 msgid "Inline"
 msgstr "Dalam Talian"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Kerberos "
 msgstr "Kerberos"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Mail Configuration"
 msgstr "Konfigurasi Mel"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "Lokasi peti mel"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr "Penggubah Mesej"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
@@ -15375,145 +14909,145 @@ msgstr ""
 "Nota: anda tidak akan digesa untuk memberikan kata laluan sehinggalah anda "
 "disambungkan buat pertama kali"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Or_ganization:"
 msgstr "Or_ganisasi:"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _ID Kekunci:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "Play sound file when new mail arri_ves"
 msgstr "_Mainkan fail bunyi apabila ada mel baru"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Penggesa apabila menghantar mesej dengan hanya penerima St ditentukan"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Qmail maildir "
 msgstr "Dirmel Qmail "
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr "Petik mesej asal"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr "Dipetik"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Re_member password"
 msgstr "Ingat kata laluan ini"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr "Jawapan Kepada:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "Menerima E-mel"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:120
 #, fuzzy
 msgid "Receiving Options"
 msgstr "Menerima _Opsyen"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
 #, fuzzy
 msgid "Remember _password"
 msgstr "Ingat kata laluan ini"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
 #, fuzzy
 msgid "S_tandard Font:"
 msgstr "_Fon Piawai:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 #, fuzzy
 msgid "Security"
 msgstr "_Keselamatan"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font"
 msgstr "Pilih fon lebar tetap HTML"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:126
 msgid "Select HTML fixed width font for printing"
 msgstr "Pilih fon lebar tetap HTML untuk pencetakan"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:127
 msgid "Select HTML variable width font"
 msgstr "Pilih fon lebar pemboleh ubah HTML"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:128
 msgid "Select HTML variable width font for printing"
 msgstr "Pilih fon lebar pemboleh ubah HTML untuk pencetakan"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:129
 #, fuzzy
 msgid "Select..."
 msgstr "_Hapuskan..."
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "Menghantar E-mel"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Sent _Messages Folder:"
 msgstr "Folder _mesej Dihantar:"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:134
 msgid "Ser_ver requires authentication"
 msgstr "Pe_layan memerlukan pengesahan"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:135
 msgid "Server _Type: "
 msgstr "Jenis _Pelayan:"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Sijil tandatangan tidak dijumpai"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:137
 #, fuzzy
 msgid "Signat_ure:"
 msgstr "Tandatangan:"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "Signatures"
 msgstr "_Tandatangan"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr "Tetapkan _nama fail:"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "Spell Checking"
 msgstr "Semak _Ejaan"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:141
 msgid "Standard Unix mbox"
 msgstr "Peti mel Unix piawai"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "T_erminal Font:"
 msgstr "_Fon Terminal:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "T_ype: "
 msgstr "Jenis:"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -15523,7 +15057,7 @@ msgstr ""
 "anda. Nama yang anda tetapkan akan digunakan\n"
 "untuk tujuan paparan sahaja. "
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
@@ -15533,7 +15067,7 @@ msgstr ""
 "semakan ejaan. Senarai bahasa di sini hanya menunjukkan bahasa yang terdapat "
 "dalam kamus yang telah dimasukkan."
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:149
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -15541,15 +15075,11 @@ msgstr ""
 "Taip nama yang ingin anda gunakan bagi akaun ini.\n"
 "Contohnya: \"Kerja\" or \"Peribadi\""
 
-#: mail/mail-config.glade.h:148
-msgid "Use _Daemon"
-msgstr ""
-
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:152
 msgid "V_ariable-width:"
 msgstr "L_ebar Pemboleh ubah:"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:153
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -15559,93 +15089,89 @@ msgstr ""
 "\n"
 "Klik \"Sampaikan\" untuk bermula. "
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:158
 msgid "_Add Signature"
 msgstr "_Tambahkan Tandatangan"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Always load images from the Internet"
 msgstr "_Sentiasa muatkan imej daripada internet"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Digitally sign outgoing messages (by default)"
 msgstr "_Sentiasa tandatangan mesej keluar apabila menggunakan akaun ini"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:161
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Jangan beritahu saya apabila ada mel baru"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:163
 msgid "_Enable"
 msgstr "_Bolehkan"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:165
 msgid "_Forward style:"
 msgstr "_Gaya untuk menyampaikan:"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Load images if sender is in address book"
 msgstr "_Muatkan imej jika penghantar ada dalam buku alamat"
 
-#: mail/mail-config.glade.h:167
-msgid "_Local Tests Only"
-msgstr ""
-
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Make this my default account"
 msgstr "_Jadikan ini akaun piawai saya"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_Mark messages as read after"
 msgstr "_Tandakan mesej sebagai telah dibaca selepas"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Never load images from the Internet"
 msgstr "_Jangan muatkan imej daripada internet"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "_Penggesa apabila menghantar mesej HTML kepada kenalan yang tidak mahukannya"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:175
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Penggesa tapabila menghantar mesej tanpa tajuk"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:176
 msgid "_Reply style:"
 msgstr "_Gaya Balasan:"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:177
 msgid "_Script:"
 msgstr "_Skrip:"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:178
 msgid "_Show animated images"
 msgstr "_Tunjukkan imej animasi"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "_Use Secure Connection (SSL):"
 msgstr "_Gunakan sambungan terjamin (SSL):"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "_Use the same fonts as other applications"
 msgstr "_Gunakan fon yang sama seperti aplikasi lain"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:181
 msgid "color"
 msgstr "warna"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "huraian"
 
@@ -15820,7 +15346,7 @@ msgstr ""
 
 #. mail:camel-exception primary
 #: mail/mail-errors.xml.h:57
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgid "Your message with the subject \"{0}\" was not delivered."
 msgstr ""
 
 #. mail:camel-exception secondary
@@ -15886,11 +15412,6 @@ msgstr ""
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Tidak dapat mewujudkan direktori '%s': %s."
 
-#. mail:no-save-path secondary
-#: mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail:no-create-path primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
@@ -15915,12 +15436,6 @@ msgstr ""
 msgid "Cannot create temporary save directory."
 msgstr "Tidak dapat mewujudkan direktori sementara: %s"
 
-#. mail:no-create-tmp-path secondary
-#: mail/mail-errors.xml.h:100 mail/mail-errors.xml.h:112
-#: widgets/misc/e-system-errors.xml.h:11 widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail:no-write-path-exists secondary
 #: mail/mail-errors.xml.h:104
 #, fuzzy
@@ -16200,29 +15715,25 @@ msgstr "Tulis ganti"
 msgid "_Append"
 msgstr "Aspen"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:785
 #, c-format
 msgid "Pinging %s"
 msgstr "%s berdenting"
 
-#: mail/mail-mt.c:897
-msgid "Working"
-msgstr "Berfungsi"
-
-#: mail/mail-ops.c:99
+#: mail/mail-ops.c:98
 msgid "Filtering Folder"
 msgstr "Menapis Folder"
 
-#: mail/mail-ops.c:260
+#: mail/mail-ops.c:259
 msgid "Fetching Mail"
 msgstr "Mengambil Mel"
 
-#: mail/mail-ops.c:543
+#: mail/mail-ops.c:542
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Gagal menggunakan penapis luaran: %s"
 
-#: mail/mail-ops.c:568
+#: mail/mail-ops.c:567
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -16231,115 +15742,115 @@ msgstr ""
 "Gagal untuk menambah ke %s: %s\n"
 "Sebagai ganti menambah ke folder 'Hantar' setempat."
 
-#: mail/mail-ops.c:577
+#: mail/mail-ops.c:576
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Gagal untuk menambah ke folder 'Hantar' setempat: %s"
 
-#: mail/mail-ops.c:673
+#: mail/mail-ops.c:672
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Menghantar mesej %d daripada %d"
 
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:703
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Gagal menyahkod mesej."
 
-#: mail/mail-ops.c:708
+#: mail/mail-ops.c:707
 msgid "Complete."
 msgstr "Selesai."
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:804
 msgid "Saving message to folder"
 msgstr "Menyimpan mesej ke folder"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Mengalihkan mesej ke %s"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Menyalin mesej ke %s"
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:1002
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Mengimbas folder dalam \"%s\""
 
-#: mail/mail-ops.c:1116
+#: mail/mail-ops.c:1115
 msgid "Forwarded messages"
 msgstr "Mesej yang disampaikan"
 
-#: mail/mail-ops.c:1159
+#: mail/mail-ops.c:1158
 #, c-format
 msgid "Opening folder %s"
 msgstr "Membuka folder %s"
 
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1230
 #, c-format
 msgid "Opening store %s"
 msgstr "Membuka simpanan %s"
 
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1308
 #, c-format
 msgid "Removing folder %s"
 msgstr "Mengeluarkan folder %s"
 
-#: mail/mail-ops.c:1403
+#: mail/mail-ops.c:1402
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Menyimpan folder '%s'"
 
-#: mail/mail-ops.c:1468
+#: mail/mail-ops.c:1467
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1469
+#: mail/mail-ops.c:1468
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Menyimpan folder '%s'"
 
-#: mail/mail-ops.c:1524
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr "Memuatkan semula folder"
 
-#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
+#: mail/mail-ops.c:1559 mail/mail-ops.c:1610
 msgid "Expunging folder"
 msgstr "Membuang folder"
 
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1607
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Mengosongkan tong sampah dalam '%s'"
 
-#: mail/mail-ops.c:1609
+#: mail/mail-ops.c:1608
 msgid "Local Folders"
 msgstr "Folder Setempat"
 
-#: mail/mail-ops.c:1692
+#: mail/mail-ops.c:1691
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Mendapatkan semula mesej %s"
 
-#: mail/mail-ops.c:1764
+#: mail/mail-ops.c:1763
 #, fuzzy, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Mendapatkan semula %d mesej"
 msgstr[1] "Mendapatkan semula %d mesej"
 
-#: mail/mail-ops.c:1850
+#: mail/mail-ops.c:1849
 #, fuzzy, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Menyimpan %d mesej"
 msgstr[1] "Menyimpan %d mesej"
 
-#: mail/mail-ops.c:1900
+#: mail/mail-ops.c:1899
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -16348,7 +15859,7 @@ msgstr ""
 "Tidak dapat mewujudkan fail output: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1928
+#: mail/mail-ops.c:1927
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -16357,11 +15868,11 @@ msgstr ""
 "Ralat ketika menyimpan mesej ke: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1999
+#: mail/mail-ops.c:1998
 msgid "Saving attachment"
 msgstr "Menyimpan lampiran"
 
-#: mail/mail-ops.c:2016
+#: mail/mail-ops.c:2015
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -16370,17 +15881,17 @@ msgstr ""
 "Tidak dapat mewujudkan fail output: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2046
+#: mail/mail-ops.c:2045
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Tidak dapat menulis data: %s"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Terputus daripada %s"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Disambungkan semula ke %s"
@@ -16445,24 +15956,24 @@ msgstr "Sedang mengemaskinikan..."
 msgid "Waiting..."
 msgstr "Sedang menunggu..."
 
-#: mail/mail-session.c:238
+#: mail/mail-session.c:239
 msgid "User canceled operation."
 msgstr "Pengguna membatalkan pengendalian."
 
-#: mail/mail-session.c:271
+#: mail/mail-session.c:272
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Masukkan Kata Laluan bagi %s"
 
-#: mail/mail-session.c:273
+#: mail/mail-session.c:274
 msgid "Enter Password"
 msgstr "Masukkan Kata Laluan"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password"
 msgstr "_Ingat kata laluan ini"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:298
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Ingat kata laluan ini bagi sesi seterusnya"
 
@@ -16519,79 +16030,79 @@ msgstr "Mengemaskinikan vfolder bagi uri: %s"
 msgid "Updating vFolders for '%s'"
 msgstr "Mengemaskinikan vfolder bagi uri: %s"
 
-#: mail/mail-vfolder.c:959
+#: mail/mail-vfolder.c:958
 msgid "vFolders"
 msgstr "vFolder"
 
-#: mail/mail-vfolder.c:998
+#: mail/mail-vfolder.c:997
 msgid "Edit VFolder"
 msgstr "Edit vFolder"
 
-#: mail/mail-vfolder.c:1082
+#: mail/mail-vfolder.c:1081
 msgid "New VFolder"
 msgstr "VFolder Baru"
 
-#: mail/message-list.c:946
+#: mail/message-list.c:948
 msgid "Unseen"
 msgstr "Belum dilihat"
 
-#: mail/message-list.c:947
+#: mail/message-list.c:949
 msgid "Seen"
 msgstr "Dilihat"
 
-#: mail/message-list.c:948
+#: mail/message-list.c:950
 msgid "Answered"
 msgstr "Dijawab"
 
-#: mail/message-list.c:949
+#: mail/message-list.c:951
 msgid "Multiple Unseen Messages"
 msgstr "Pelbagai Mesej yang Belum Dilihat"
 
-#: mail/message-list.c:950
+#: mail/message-list.c:952
 msgid "Multiple Messages"
 msgstr "Pelbagai Mesej"
 
-#: mail/message-list.c:954
+#: mail/message-list.c:956
 msgid "Lowest"
 msgstr "Paling rendah"
 
-#: mail/message-list.c:955
+#: mail/message-list.c:957
 msgid "Lower"
 msgstr "Lebih rendah"
 
-#: mail/message-list.c:959
+#: mail/message-list.c:961
 msgid "Higher"
 msgstr "Lebih tinggi"
 
-#: mail/message-list.c:960
+#: mail/message-list.c:962
 msgid "Highest"
 msgstr " Paling tinggi"
 
-#: mail/message-list.c:1279
+#: mail/message-list.c:1285
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1286
+#: mail/message-list.c:1292
 msgid "Today %l:%M %p"
 msgstr "Hari ini %l:%M %p"
 
-#: mail/message-list.c:1295
+#: mail/message-list.c:1301
 msgid "Yesterday %l:%M %p"
 msgstr "Semalam %l:%M %p"
 
-#: mail/message-list.c:1307
+#: mail/message-list.c:1313
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1315
+#: mail/message-list.c:1321
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1317
+#: mail/message-list.c:1323
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3300
+#: mail/message-list.c:3321
 msgid "Generating message list"
 msgstr "Menjana senarai mesej"
 
@@ -16647,6 +16158,10 @@ msgstr "Sampaikan"
 msgid "No Response Necessary"
 msgstr "Maklum Balas Tidak Perlu"
 
+#: mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Baca"
+
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Balas"
@@ -16752,45 +16267,49 @@ msgid ""
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:10
-msgid "Whether Evolution should start up in offline mode"
+msgid "Toolbar is visible"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:11
-msgid "Whether to skip the development warning dialog"
+msgid "Whether Evolution should start up in offline mode"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Whether the toolbar should be visible."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:14
 #, fuzzy
 msgid "mail"
 msgstr "E-mel"
 
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
-msgstr "Dibawa kepada anda oleh"
-
-#: shell/e-shell.c:545 shell/e-shell.c:546
+#: shell/e-shell.c:588 shell/e-shell.c:589
 #, fuzzy, c-format
 msgid "%ld KB"
 msgstr "%d %B"
 
-#: shell/e-shell.c:744
+#: shell/e-shell.c:786
 #, fuzzy
 msgid "Uknown system error."
 msgstr "Ralat tak diketahui"
 
-#: shell/e-shell.c:1101
+#: shell/e-shell.c:1143
 msgid "Invalid arguments"
 msgstr "Argumen tak sah"
 
-#: shell/e-shell.c:1103
+#: shell/e-shell.c:1145
 msgid "Cannot register on OAF"
 msgstr "Tidak dapat mendaftarkan dalam OAF"
 
-#: shell/e-shell.c:1105
+#: shell/e-shell.c:1147
 msgid "Configuration Database not found"
 msgstr "Pangkalan Data Konfigurasi tidak dijumpai"
 
-#: shell/e-shell.c:1107
+#: shell/e-shell.c:1149
 msgid "Generic error"
 msgstr "Ralat generik"
 
@@ -16850,7 +16369,7 @@ msgstr ""
 msgid "Select importer"
 msgstr "Pilih pengimport"
 
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1026
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
 #, c-format
 msgid "File %s does not exist"
 msgstr "Fail %s tidak wujud"
@@ -16878,31 +16397,32 @@ msgstr ""
 "Mengimport %s\n"
 "Mengimport item 1."
 
-#: shell/e-shell-importer.c:549
+#: shell/e-shell-importer.c:570
 msgid "Automatic"
 msgstr "Automatik"
 
-#: shell/e-shell-importer.c:598
-msgid "_Filename:"
-msgstr "_Namafail:"
+#: shell/e-shell-importer.c:626
+#, fuzzy
+msgid "F_ilename:"
+msgstr "Nama fail:"
 
-#: shell/e-shell-importer.c:603
+#: shell/e-shell-importer.c:631
 msgid "Select a file"
 msgstr "Pilih fail"
 
-#: shell/e-shell-importer.c:613
+#: shell/e-shell-importer.c:642
 msgid "File _type:"
 msgstr "_Jenis fail:"
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:681
 msgid "Import data and settings from _older programs"
 msgstr "Import data dan seting daripada program _lama"
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:684
 msgid "Import a _single file"
 msgstr "Import fail _tunggal"
 
-#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -16910,26 +16430,26 @@ msgstr ""
 "Sila tunggu...\n"
 "Sedang mengimbas persediaan sedia ada"
 
-#: shell/e-shell-importer.c:727
+#: shell/e-shell-importer.c:756
 msgid "Starting Intelligent Importers"
 msgstr "Memulakan Pengimport Cerdas"
 
-#: shell/e-shell-importer.c:853 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
 #, c-format
 msgid "From %s:"
 msgstr "Daripada %s:"
 
-#: shell/e-shell-importer.c:1044
+#: shell/e-shell-importer.c:1073
 #, fuzzy, c-format
 msgid "No importer available for file %s"
 msgstr "Tidak ada penyedia bagi protokol `%s'"
 
-#: shell/e-shell-importer.c:1056
+#: shell/e-shell-importer.c:1085
 #, fuzzy
 msgid "Unable to execute importer"
 msgstr "Gagal melaksanakan gpg."
 
-#: shell/e-shell-importer.c:1169
+#: shell/e-shell-importer.c:1199
 msgid "_Import"
 msgstr "_Import"
 
@@ -16979,61 +16499,61 @@ msgstr "Nama folder tidak boleh mengandungi aksara \"#\"."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' dan '..' ialah nama folder simpanan."
 
-#: shell/e-shell-window.c:336
+#: shell/e-shell-window.c:337
 #, fuzzy
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution dalam talian sekarang.  Klik butang ini untuk bekerja luar "
 "talian."
 
-#: shell/e-shell-window.c:343
+#: shell/e-shell-window.c:344
 #, fuzzy
 msgid "Evolution is in the process of going offline."
 msgstr "Ximian Evolution adalah dalam proses menjadi luar talian."
 
-#: shell/e-shell-window.c:349
+#: shell/e-shell-window.c:350
 #, fuzzy
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution luar talian sekarang.  Klik butang ini untuk bekerja dalam "
 "talian."
 
-#: shell/e-shell-window.c:621
+#: shell/e-shell-window.c:637
 #, fuzzy, c-format
 msgid "Switch to %s"
 msgstr "Mel ke %s"
 
-#: shell/e-shell-window-commands.c:64
+#: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Alat GNOME Pilot tidak dipasang dalam sistem ini."
 
-#: shell/e-shell-window-commands.c:72
+#: shell/e-shell-window-commands.c:74
 #, c-format
 msgid "Error executing %s."
 msgstr "Ralat ketika melaksanakan %s."
 
-#: shell/e-shell-window-commands.c:121
+#: shell/e-shell-window-commands.c:123
 msgid "Bug buddy is not installed."
 msgstr "Kawan pepijat tidak dipasang."
 
-#: shell/e-shell-window-commands.c:129
+#: shell/e-shell-window-commands.c:131
 msgid "Bug buddy could not be run."
 msgstr "Kawan pepijat tidak dapat dijalankan."
 
-#: shell/e-shell-window-commands.c:171
+#: shell/e-shell-window-commands.c:323
 #, fuzzy
-msgid "About Evolution"
-msgstr "Tentang Ximian Evolution"
+msgid "Groupware Suite"
+msgstr "Kumpulan"
 
-#: shell/e-shell-window-commands.c:382
+#: shell/e-shell-window-commands.c:563
 msgid "_Work Online"
 msgstr "_Bekerja Dalam Talian"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "_Bekerja Luar Talian"
 
-#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Bekerja Luar Talian"
 
@@ -17045,43 +16565,6 @@ msgstr "Kotak semak"
 msgid "New"
 msgstr "Baru"
 
-#: shell/evolution-shell-component-utils.c:115
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Ralat tak diketahui."
-
-#: shell/evolution-shell-component-utils.c:118
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Ralat daripada sistem komponen ialah:\n"
-"%s"
-
-#: shell/evolution-shell-component-utils.c:125
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Ralat daripada sistem pengaktifan ialah:\n"
-"%s"
-
 #: shell/evolution-test-component.c:140
 #, fuzzy
 msgid "New Test"
@@ -17422,31 +16905,31 @@ msgid ""
 "Click help for details."
 msgstr ""
 
-#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:522
+#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
+#: smime/gui/certificate-manager.c:556
 #, fuzzy
 msgid "Select a cert to import..."
 msgstr "Pilih pengimport"
 
-#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:604
+#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
+#: smime/gui/certificate-manager.c:638
 msgid "Certificate Name"
 msgstr "Nama Sijil"
 
-#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
+#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
 msgid "Purposes"
 msgstr "Tujuan"
 
-#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:517
+#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr "Nombor Siri"
 
-#: smime/gui/certificate-manager.c:267
+#: smime/gui/certificate-manager.c:271
 msgid "Expires"
 msgstr "Tamat tempoh"
 
-#: smime/gui/certificate-manager.c:417
+#: smime/gui/certificate-manager.c:446
 msgid "E-Mail Address"
 msgstr "Alamat E-mel"
 
@@ -17488,6 +16971,11 @@ msgid ""
 "  Subject: %s\n"
 msgstr ""
 
+#: smime/gui/e-cert-selector.c:169
+#, fuzzy
+msgid "Select certificate"
+msgstr "Sijil Pelanggan SSL"
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr "<Not Part of Certificate>"
@@ -17542,7 +17030,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
 #, fuzzy
 msgid "Certificate"
 msgstr "Sijil"
@@ -17565,19 +17053,23 @@ msgstr "Nama Biasa (CN)"
 msgid "Contact Certificates"
 msgstr "Sijil Kenalan"
 
-#: smime/gui/smime-ui.glade.h:21
-#, no-c-format
-msgid "Do you want to trust \"%s\" for the following purposes?"
+#: smime/gui/smime-ui.glade.h:20
+msgid "Do not trust the authenticity of this certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:21
 msgid "Dummy window only"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:22
 msgid "Edit"
 msgstr "Edit"
 
+#: smime/gui/smime-ui.glade.h:23
+#, fuzzy
+msgid "Email Certificate Trust Settings"
+msgstr "Kuasa Sijil Tak Sah (CA)"
+
 #: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr "E-mel Sijil Penerima"
@@ -17610,279 +17102,288 @@ msgstr "Unit Organisasi (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "Cap jari SHA1"
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr "Sijil Pelanggan SSL"
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr "Sijil Pelayan SSL"
 
 #: smime/gui/smime-ui.glade.h:37
-msgid "Trust this CA to identify email users."
+msgid "Trust the authenticity of this certificate"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:38
-msgid "Trust this CA to identify software developers."
+msgid "Trust this CA to identify email users."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:39
-msgid "Trust this CA to identify web sites."
+msgid "Trust this CA to identify software developers."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:40
-msgid "View"
-msgstr "Lihat"
+msgid "Trust this CA to identify web sites."
+msgstr ""
 
 #: smime/gui/smime-ui.glade.h:41
-#, fuzzy
-msgid "View Certificate"
-msgstr "Sijil"
+msgid "View"
+msgstr "Lihat"
 
 #: smime/gui/smime-ui.glade.h:42
-#, fuzzy
-msgid "You have been asked to trust a new Certificate Authority (CA)."
-msgstr "Kuasa Sijil Tak Sah (CA)"
-
-#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr "Anda mempunyai sijil daripada organisasi ini yang mengecam anda:"
 
-#: smime/gui/smime-ui.glade.h:44
+#: smime/gui/smime-ui.glade.h:43
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr "Anda mempunyai sijil pada fail yang mengecam kesahihan sijil ini:"
 
-#: smime/gui/smime-ui.glade.h:45
+#: smime/gui/smime-ui.glade.h:44
 msgid "You have certificates on file that identify these people:"
 msgstr "Anda mempunyai sijil pada fail yang mengecam orang-orang ini:"
 
-#: smime/gui/smime-ui.glade.h:46
+#: smime/gui/smime-ui.glade.h:45
 msgid "Your Certificates"
 msgstr "Sijil Anda"
 
-#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
+#: smime/gui/smime-ui.glade.h:46
+msgid "_Edit CA Trust"
+msgstr ""
+
+#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 #, fuzzy
 msgid "%d/%m/%Y"
 msgstr "%m/%d/%Y"
 
-#: smime/lib/e-cert.c:478
+#. x509 certificate usage types
+#: smime/lib/e-cert.c:424
+#, fuzzy
+msgid "Sign"
+msgstr "Stauning"
+
+#: smime/lib/e-cert.c:425
+#, fuzzy
+msgid "Encrypt"
+msgstr "Penyulitan PGP"
+
+#: smime/lib/e-cert.c:530
 #, fuzzy
 msgid "Version"
 msgstr "Vermont"
 
-#: smime/lib/e-cert.c:493
+#: smime/lib/e-cert.c:545
 #, fuzzy
 msgid "Version 1"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:496
+#: smime/lib/e-cert.c:548
 #, fuzzy
 msgid "Version 2"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:499
+#: smime/lib/e-cert.c:551
 #, fuzzy
 msgid "Version 3"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:581
+#: smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:584
+#: smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:587
+#: smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:590
+#: smime/lib/e-cert.c:642
 #, fuzzy
 msgid "C"
 msgstr " C"
 
-#: smime/lib/e-cert.c:593
+#: smime/lib/e-cert.c:645
 #, fuzzy
 msgid "CN"
 msgstr "N"
 
-#: smime/lib/e-cert.c:596
+#: smime/lib/e-cert.c:648
 msgid "OU"
 msgstr ""
 
-#: smime/lib/e-cert.c:599
+#: smime/lib/e-cert.c:651
 #, fuzzy
 msgid "O"
 msgstr "OK"
 
-#: smime/lib/e-cert.c:602
+#: smime/lib/e-cert.c:654
 msgid "L"
 msgstr ""
 
-#: smime/lib/e-cert.c:605
+#: smime/lib/e-cert.c:657
 #, fuzzy
 msgid "DN"
 msgstr "N"
 
-#: smime/lib/e-cert.c:608
+#: smime/lib/e-cert.c:660
 msgid "DC"
 msgstr ""
 
-#: smime/lib/e-cert.c:611
+#: smime/lib/e-cert.c:663
 #, fuzzy
 msgid "ST"
 msgstr "SMTP"
 
-#: smime/lib/e-cert.c:614
+#: smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:617
+#: smime/lib/e-cert.c:669
 #, fuzzy
 msgid "Certificate Key Usage"
 msgstr "Nama Sijil"
 
-#: smime/lib/e-cert.c:620
+#: smime/lib/e-cert.c:672
 #, fuzzy
 msgid "Netscape Certificate Type"
 msgstr "Nama Sijil"
 
-#: smime/lib/e-cert.c:623
+#: smime/lib/e-cert.c:675
 #, fuzzy
 msgid "Certificate Authority Key Identifier"
 msgstr "Sijil tak dipercayai"
 
-#: smime/lib/e-cert.c:626
+#: smime/lib/e-cert.c:678
 #, fuzzy
 msgid "UID"
 msgstr "ID"
 
-#: smime/lib/e-cert.c:635
+#: smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr ""
 
-#: smime/lib/e-cert.c:686
+#: smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:694
+#: smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
 msgstr ""
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:768
 msgid "Subject Public Key Info"
 msgstr ""
 
-#: smime/lib/e-cert.c:721
+#: smime/lib/e-cert.c:773
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:736
+#: smime/lib/e-cert.c:788
 #, fuzzy
 msgid "Subject's Public Key"
 msgstr "Tajuk adalah %s "
 
-#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
+#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
 #, fuzzy
 msgid "Error: Unable to process extension"
 msgstr "Tidak dapat memproses folder spul"
 
-#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
+#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:782
+#: smime/lib/e-cert.c:834
 #, fuzzy
 msgid "SSL Certificate Authority"
 msgstr "Kuasa Sijil Tak Sah (CA)"
 
-#: smime/lib/e-cert.c:786
+#: smime/lib/e-cert.c:838
 #, fuzzy
 msgid "Email Certificate Authority"
 msgstr "Kuasa Sijil Tak Sah (CA)"
 
-#: smime/lib/e-cert.c:814
+#: smime/lib/e-cert.c:866
 #, fuzzy
 msgid "Signing"
 msgstr "Stauning"
 
-#: smime/lib/e-cert.c:818
+#: smime/lib/e-cert.c:870
 #, fuzzy
 msgid "Non-repudiation"
 msgstr "Tiada Maklumat"
 
-#: smime/lib/e-cert.c:822
+#: smime/lib/e-cert.c:874
 msgid "Key Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:826
+#: smime/lib/e-cert.c:878
 #, fuzzy
 msgid "Data Encipherment"
 msgstr "lampiran"
 
-#: smime/lib/e-cert.c:830
+#: smime/lib/e-cert.c:882
 msgid "Key Agreement"
 msgstr ""
 
-#: smime/lib/e-cert.c:834
+#: smime/lib/e-cert.c:886
 #, fuzzy
 msgid "Certificate Signer"
 msgstr "Nama Sijil"
 
-#: smime/lib/e-cert.c:838
+#: smime/lib/e-cert.c:890
 msgid "CRL Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:938
 #, fuzzy
 msgid "Critical"
 msgstr "Curitiba"
 
-#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
+#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
 #, fuzzy
 msgid "Not Critical"
 msgstr "Carolina Utara"
 
-#: smime/lib/e-cert.c:912
+#: smime/lib/e-cert.c:964
 #, fuzzy
 msgid "Extensions"
 msgstr "Ungkapan"
 
-#: smime/lib/e-cert.c:983
+#: smime/lib/e-cert.c:1035
 #, fuzzy, c-format
 msgid "%s = %s"
 msgstr "%s semasa %s"
 
-#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
 #, fuzzy
 msgid "Certificate Signature Algorithm"
 msgstr "Kegagalan tandatangan sijil"
 
-#: smime/lib/e-cert.c:1048
+#: smime/lib/e-cert.c:1100
 #, fuzzy
 msgid "Issuer"
 msgstr "Dikeluarkan Pada"
 
-#: smime/lib/e-cert.c:1102
+#: smime/lib/e-cert.c:1154
 #, fuzzy
 msgid "Issuer Unique ID"
 msgstr "ID Unik"
 
-#: smime/lib/e-cert.c:1121
+#: smime/lib/e-cert.c:1173
 #, fuzzy
 msgid "Subject Unique ID"
 msgstr "ID Unik"
 
-#: smime/lib/e-cert.c:1164
+#: smime/lib/e-cert.c:1216
 #, fuzzy
 msgid "Certificate Signature Value"
 msgstr "Kegagalan tandatangan sijil"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
+#: smime/lib/e-cert-db.c:608
 #, fuzzy
 msgid "Certificate already exists"
 msgstr "ID Kenalan telah wujud"
@@ -18032,7 +17533,7 @@ msgstr "Lihat kenalan semasa"
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "_Tindakan"
 
@@ -18197,7 +17698,7 @@ msgstr "T_utup"
 #: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:3
+#: ui/evolution.xml.h:4
 msgid "Close"
 msgstr "Tutup"
 
@@ -18210,7 +17711,7 @@ msgid "Delete this item"
 msgstr "Hapuskan item ini"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr "Bar alatan utama"
 
@@ -18253,7 +17754,7 @@ msgstr "Simpan item ini ke dalam cakera"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:44
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "_File"
 msgstr "_Fail"
 
@@ -18512,13 +18013,13 @@ msgstr "_Songsangkan Pemilihan"
 msgid "_Threaded Message List"
 msgstr "_Senarai Mesej yang Disambungkan"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Tutup tetingkap ini"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "_Close"
 msgstr "_Tutup"
 
@@ -18923,7 +18424,7 @@ msgstr "_Mesej Sebelumnya"
 msgid "_Quoted"
 msgstr "_Disebut"
 
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
 msgid "_Tools"
 msgstr "_Alatan"
 
@@ -19226,108 +18727,122 @@ msgid "_Open Task"
 msgstr "_Tugas"
 
 #: ui/evolution.xml.h:1
-msgid "About Ximian Evolution..."
-msgstr "Tentang Ximian Evolution..."
+#, fuzzy
+msgid "About Evolution..."
+msgstr "Tentang Ximian Evolution"
 
 #: ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
 msgstr "Ubah seting Evolution"
 
-#: ui/evolution.xml.h:5
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the visibility of the toolbar"
+msgstr "Ubah ciri-ciri folder ini"
+
+#: ui/evolution.xml.h:6
 msgid "Create a new window displaying this folder"
 msgstr "Wujudkan tetingkap baru yang memaparkan folder ini"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "K_eluar"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Ximian Evolution _Soalan Lazim"
+
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Keluar dari atur cara"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:10
 msgid "Forget _Passwords"
 msgstr "Lupa _Kata Laluan"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:11
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Lupa kata laluan, anda akan digesa untuknya sekali lagi"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:12
 msgid "Import data from other programs"
 msgstr "Import data dari atur cara lain"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:14
 #, fuzzy
 msgid "New _Window"
 msgstr "_Cari Sekarang"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Pi_lot Settings..."
 msgstr "Seting Rin_tis..."
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Send / Receive"
 msgstr "Hantar / Terima"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Send queued items and retrieve new items"
 msgstr "Hantarkan item berbaris gilir dan dapatkan semula item baru"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Set up Pilot configuration"
 msgstr "Sediakan konfigurasi Rintis"
 
-#: ui/evolution.xml.h:17
-msgid "Show information about Ximian Evolution"
+#: ui/evolution.xml.h:19
+#, fuzzy
+msgid "Show information about Evolution"
 msgstr "Tunjukkan maklumat tentang Ximian Evolution"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:20
 msgid "Submit Bug Report"
 msgstr "Serahkan Laporan Pepijat"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:21
 msgid "Submit _Bug Report"
 msgstr "Serahkan _Laporan Pepijat"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Serahkan Laporan pepijat dengan menggunakan Kawan Pepijat"
 
-#: ui/evolution.xml.h:21
-msgid "Toggle whether we are working offline."
-msgstr "Toggle untuk melihat sama ada kami bekerja luar talian atau tidak."
-
 #: ui/evolution.xml.h:23
-msgid "Ximian Evolution _FAQ"
-msgstr "Ximian Evolution _Soalan Lazim"
+#, fuzzy
+msgid "T_oolbar"
+msgstr "Bar alatan utama"
 
 #: ui/evolution.xml.h:24
-msgid "_About Ximian Evolution..."
-msgstr "_Tentang Ximian Evolution..."
+msgid "Toggle whether we are working offline."
+msgstr "Toggle untuk melihat sama ada kami bekerja luar talian atau tidak."
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "_About Evolution..."
+msgstr "Tentang Ximian Evolution"
+
+#: ui/evolution.xml.h:30
 msgid "_Help"
 msgstr "_Bantuan"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "_Import..."
 msgstr "_Import..."
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "_New"
 msgstr "_baru"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 #, fuzzy
 msgid "_Quick Reference"
 msgstr "Keutamaan Mel"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_Send / Receive"
 msgstr "_Hantar / Terima"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 #, fuzzy
 msgid "_Window"
 msgstr "_Cari Sekarang"
@@ -19400,7 +18915,7 @@ msgid "With _Status"
 msgstr "Set Status"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:626
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:635
 msgid "UTC"
 msgstr "UTC"
 
@@ -19557,29 +19072,29 @@ msgstr "Lain..."
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
-#: widgets/misc/e-error.c:121
+#: widgets/misc/e-error.c:79 widgets/misc/e-error.c:80
+#: widgets/misc/e-error.c:122
 msgid "Evolution Error"
 msgstr "Ralat Evolution"
 
-#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
-#: widgets/misc/e-error.c:119
+#: widgets/misc/e-error.c:81 widgets/misc/e-error.c:82
+#: widgets/misc/e-error.c:120
 #, fuzzy
 msgid "Evolution Warning"
 msgstr "Mel Evolution"
 
-#: widgets/misc/e-error.c:118
+#: widgets/misc/e-error.c:119
 #, fuzzy
 msgid "Evolution Information"
 msgstr "Maklumat Mesyuarat"
 
-#: widgets/misc/e-error.c:120
+#: widgets/misc/e-error.c:121
 #, fuzzy
 msgid "Evolution Query"
 msgstr "Ringkasan Evolution"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:410
+#: widgets/misc/e-error.c:415
 #, fuzzy, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -19733,16 +19248,514 @@ msgstr ""
 "Tidak dapat menyimpan dalam `%s'\n"
 " %s"
 
-#: widgets/misc/e-task-widget.c:211
+#: widgets/misc/e-task-widget.c:212
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: widgets/misc/e-task-widget.c:216
+#: widgets/misc/e-task-widget.c:217
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% siap)"
 
+#~ msgid "Failed to connect to LDAP server"
+#~ msgstr "Gagal disambungkan ke pelayan LDAP"
+
+#~ msgid "Failed to authenticate with LDAP server"
+#~ msgstr "Gagal disahkan dengan pelayan LDAP"
+
+#~ msgid "Could not perform query on Root DSE"
+#~ msgstr "Tidak dapat membuat pertanyaan pada Asas DSE"
+
+#~ msgid "The server responded with no supported search bases"
+#~ msgstr "Pelayan memberikan maklum balas dengan tiada asas carian sokongan"
+
+#~ msgid "This server does not support LDAPv3 schema information"
+#~ msgstr "Pelayan ini tidak menyokong maklumat skema LDAPv3"
+
+#~ msgid "Error retrieving schema information"
+#~ msgstr "Ralat ketika mendapatkan semula maklumat skema"
+
+#~ msgid "Server did not respond with valid schema information"
+#~ msgstr ""
+#~ "Pelayan tidak memberikan maklum balas dengan maklumat skema yang sah"
+
+#~ msgid "  S_how Supported Bases "
+#~ msgstr "  T_unjukkan Asas Sokongan"
+
+#~ msgid "1:00"
+#~ msgstr "1:00"
+
+#~ msgid "5:00"
+#~ msgstr "5:00"
+
+#~ msgid "Connecting"
+#~ msgstr "Disambungkan"
+
+#~ msgid "Distinguished _name:"
+#~ msgstr "Nama_ berbeza:"
+
+#~ msgid "Email address:"
+#~ msgstr "Alamat e-mel:"
+
+#~ msgid "Evolution will use this DN to authenticate you with the server"
+#~ msgstr ""
+#~ "Evolution akan mengggunakan DN ini untuk mengesahkan anda dengan pelayan"
+
+#~ msgid "One"
+#~ msgstr "Satu"
+
+#~ msgid "S_earch scope: "
+#~ msgstr "Skop C_arian: "
+
+#~ msgid "Searching"
+#~ msgstr "Sedang mencari"
+
+#~ msgid "Sub"
+#~ msgstr "Sub"
+
+#~ msgid "This option controls how long a search will be run."
+#~ msgstr "Opsyen ini mengawal berapa lama carian akan dijalankan."
+
+#~ msgid "U_se SSL/TLS:"
+#~ msgstr "G_unakan SSL/TLS:"
+
+#~ msgid "_Display name:"
+#~ msgstr "_Paparkan nama:"
+
+#~ msgid "_Port number:"
+#~ msgstr "_Nombor port:"
+
+#~ msgid "_Search base:"
+#~ msgstr "_Asas carian:"
+
+#~ msgid "_Server name:"
+#~ msgstr "_Nama pelayan:"
+
+#~ msgid "_Timeout (minutes):"
+#~ msgstr "_Tamat masa (minit):"
+
+#~ msgid "connecting-tab"
+#~ msgstr "tab sambung"
+
+#~ msgid "general-tab"
+#~ msgstr "tab am"
+
+#~ msgid "searching-tab"
+#~ msgstr "tab cari"
+
+#, fuzzy
+#~ msgid "Job title:"
+#~ msgstr "_Gelaran jawatan:"
+
+#, fuzzy
+#~ msgid "Webcam:"
+#~ msgstr "Laman Web:"
+
+#~ msgid "Category editor not available."
+#~ msgstr "Editor kategori tidak ada."
+
+#, fuzzy
+#~ msgid ""
+#~ "The following entries are invalid:\n"
+#~ "\n"
+#~ msgstr "Sambungan berikut aktif sekarang:"
+
+#~ msgid "Could not find widget for a field: `%s'"
+#~ msgstr "Tidak dapat mencari widget bagi medan: `%s'"
+
+#~ msgid "Do you want to save changes?"
+#~ msgstr "Adakah anda ingin menyimpan perubahan?"
+
+#~ msgid "Error saving %s: %s"
+#~ msgstr "Ralat ketika menyimpan %s: %s"
+
+#~ msgid ""
+#~ "The addressbook backend for\n"
+#~ "%s\n"
+#~ "has crashed. You will have to restart Evolution in order to use it again"
+#~ msgstr ""
+#~ "Bahagian belakang buku alamat bagi\n"
+#~ "%s\n"
+#~ "telah rosak. Anda perlu memulakan semula Evolution untuk menggunakannya "
+#~ "semula"
+
+#~ msgid "Can not load URI"
+#~ msgstr "Tidak dapat menuatkan URI"
+
+#, fuzzy
+#~ msgid "Calendar Properties"
+#~ msgstr "Kumpulan Kalendar"
+
+#, fuzzy
+#~ msgid "Remote"
+#~ msgstr "Keluarkan"
+
+#, fuzzy
+#~ msgid "Task List Properties"
+#~ msgstr "Senarai Tugas"
+
+#, fuzzy
+#~ msgid "_Refresh Interval:"
+#~ msgstr "Muatkan semula Senarai"
+
+#, fuzzy
+#~ msgid "_Source URL:"
+#~ msgstr "URI Sumber POP"
+
+#~ msgid ""
+#~ "The event being deleted is a meeting, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "Peristiwa yang sedang dihapuskan ialah mesyuarat, adakah anda ingin "
+#~ "menghantar notis pembatalan?"
+
+#~ msgid "Are you sure you want to cancel and delete this meeting?"
+#~ msgstr "Adakah anda pasti ingin membatalkan dan menghapuskan mesyuarat ini?"
+
+#~ msgid ""
+#~ "The task being deleted is assigned, would you like to send a cancellation "
+#~ "notice?"
+#~ msgstr ""
+#~ "Tugas yang sedang dihapuskan diumpukkan, adakah anda ingin menghantar "
+#~ "notis pembatalan?"
+
+#~ msgid "Are you sure you want to cancel and delete this task?"
+#~ msgstr "Adakah anda pasti ingin membatalkan dan menghapuskan tugas ini?"
+
+#~ msgid ""
+#~ "The journal entry being deleted is published, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "Entri jurnal yang sedang dihapuskan disiarkan, adakah anda ingin "
+#~ "menghantar notis pembatalan?"
+
+#~ msgid "Are you sure you want to cancel and delete this journal entry?"
+#~ msgstr ""
+#~ "Adakah anda pasti ingin membatalkan dan menghapuskan entri jurnal ini?"
+
+#~ msgid "Are you sure you want to delete the appointment `%s'?"
+#~ msgstr "Adakah anda pasti ingin menghapuskan temu janji `%s'?"
+
+#~ msgid "Are you sure you want to delete this untitled appointment?"
+#~ msgstr "Adakah anda pasti ingin menghapuskan temu janji tak berjudul ini?"
+
+#~ msgid "Are you sure you want to delete the task `%s'?"
+#~ msgstr "Adakah anda pasti ingin menghapuskan tugas `%s'?"
+
+#~ msgid "Are you sure you want to delete this untitled task?"
+#~ msgstr "Adakah anda pasti ingin menghapuskan tugas tak berjudul ini?"
+
+#~ msgid "Are you sure you want to delete the journal entry `%s'?"
+#~ msgstr "Adakah anda pasti ingin menghapuskan entri jurnal `%s'?"
+
+#~ msgid "Are you sure want to delete this untitled journal entry?"
+#~ msgstr "Adakah anda pasti ingin menghapuskan entri jurnal tak berjudul ini?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d appointment?"
+#~ msgid_plural "Are you sure you want to delete %d appointments?"
+#~ msgstr[0] "Adakah anda pasti ingin menghapuskan %d temu janji?"
+#~ msgstr[1] "Adakah anda pasti ingin menghapuskan %d temu janji?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d task?"
+#~ msgid_plural "Are you sure you want to delete %d tasks?"
+#~ msgstr[0] "Adakah anda pasti ingin menghapuskan %d tugas?"
+#~ msgstr[1] "Adakah anda pasti ingin menghapuskan %d tugas?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d journal entry?"
+#~ msgid_plural "Are you sure you want to delete %d journal entries?"
+#~ msgstr[0] "Adakah anda pasti ingin menghapuskan %d entri jurnal?"
+#~ msgstr[1] "Adakah anda pasti ingin menghapuskan %d entri jurnal?"
+
+#~ msgid "_Invite Others..."
+#~ msgstr "_Jemput Orang Lain..."
+
+#~ msgid ""
+#~ "This event has been changed, but has not been saved.\n"
+#~ "\n"
+#~ "Do you wish to save your changes?"
+#~ msgstr ""
+#~ "Peristiwa ini telah diubah tetapi masih belum disimpan.\n"
+#~ "\n"
+#~ "Adakah anda ingin menyimpan perubahan yang dilakukan?"
+
+#~ msgid "_Discard Changes"
+#~ msgstr "_Buang Perubahan"
+
+#~ msgid "Save Event"
+#~ msgstr "Simpan Peristiwa"
+
+#~ msgid "The meeting information has been created. Send it?"
+#~ msgstr "Maklumat mesyuarat telah diwujudkan. Hantar maklumat?"
+
+#~ msgid "The meeting information has changed. Send an updated version?"
+#~ msgstr ""
+#~ "Maklumat mesyuarat telah diubah. Hantar versi yang telah dikemas kini?"
+
+#~ msgid "The task assignment information has been created. Send it?"
+#~ msgstr "Maklumat umpukan tugas telah diwujudkan. Hantar maklumat?"
+
+#~ msgid "The task information has changed. Send an updated version?"
+#~ msgstr "Maklumat tugas telah diubah. Hantar versi yang telah dikemas kini?"
+
+#, fuzzy
+#~ msgid "Could not get article %s from NNTP server"
+#~ msgstr "Tidak boleh mendapatkan senarai kumpulan dar pelayan."
+
+#, fuzzy
+#~ msgid "Error posting message: %s: message not posted"
+#~ msgstr ""
+#~ "Ralat ketika menyimpan mesej secara automatik: %s\n"
+#~ " %s"
+
+#, fuzzy
+#~ msgid "Stream error"
+#~ msgstr "ralat hurai"
+
+#, fuzzy
+#~ msgid "Connection error: %s"
+#~ msgstr "Ralat tak diketahui: %s"
+
+#~ msgid "Could not get group: %s"
+#~ msgstr "Tidak boleh mendapatkan kumpulan: %s"
+
+#, fuzzy
+#~ msgid "Could not get messages: unspecified error"
+#~ msgstr "Tidak dapat menghantar mesej: %s"
+
+#~ msgid "Unknown server response: %s"
+#~ msgstr "Maklum balas pelayan tak diketahui: %s"
+
+#~ msgid "Adjust Score"
+#~ msgstr "Selaraskan Skor"
+
+#~ msgid "Assign Color"
+#~ msgstr "Umpukkan Warna"
+
+#~ msgid "Assign Score"
+#~ msgstr "Umpukkan Skor"
+
+#~ msgid "Attachments"
+#~ msgstr "Lampiran"
+
+#~ msgid "Beep"
+#~ msgstr "Bip"
+
+#~ msgid "contains"
+#~ msgstr "mengandungi"
+
+#~ msgid "Copy to Folder"
+#~ msgstr "Salin ke Folder"
+
+#~ msgid "Date received"
+#~ msgstr "Tarikh diterima"
+
+#~ msgid "Date sent"
+#~ msgstr "Tarikh dihantar"
+
+#~ msgid "Deleted"
+#~ msgstr "Dihapuskan"
+
+#~ msgid "does not contain"
+#~ msgstr "tidak mengandungi"
+
+#~ msgid "does not end with"
+#~ msgstr "tidak berakhir dengan"
+
+#~ msgid "does not exist"
+#~ msgstr "tidak wujud"
+
+#~ msgid "does not return"
+#~ msgstr "tidak kembali"
+
+#~ msgid "does not sound like"
+#~ msgstr "tidak seperti "
+
+#~ msgid "does not start with"
+#~ msgstr "tidak dimulakan dengan"
+
+#~ msgid "Do Not Exist"
+#~ msgstr "Tidak Wujud"
+
+#~ msgid "Draft"
+#~ msgstr "Draf"
+
+#~ msgid "ends with"
+#~ msgstr "berakhir dengan"
+
+#~ msgid "Exist"
+#~ msgstr "Wujud"
+
+#~ msgid "exists"
+#~ msgstr "wujud"
+
+#~ msgid "Expression"
+#~ msgstr "Ungkapan"
+
+#~ msgid "Follow Up"
+#~ msgstr "Susulan"
+
+#~ msgid "is"
+#~ msgstr "adalah"
+
+#~ msgid "is after"
+#~ msgstr "adalah selepas"
+
+#~ msgid "is before"
+#~ msgstr "adalah sebelum"
+
+#~ msgid "is Flagged"
+#~ msgstr "ditandai"
+
+#~ msgid "is greater than"
+#~ msgstr "lebih besar daripada"
+
+#~ msgid "is less than"
+#~ msgstr "kurang daripada"
+
+#~ msgid "is not"
+#~ msgstr "tidak"
+
+#~ msgid "is not Flagged"
+#~ msgstr "tidak ditandai"
+
+#, fuzzy
+#~ msgid "Junk Test"
+#~ msgstr "Jun"
+
+#~ msgid "Mailing list"
+#~ msgstr "Senarai mel"
+
+#~ msgid "Message Body"
+#~ msgstr "Badan Mesej"
+
+#~ msgid "Message Header"
+#~ msgstr "Pengepala Mesej"
+
+#, fuzzy
+#~ msgid "Message is Junk"
+#~ msgstr "_Mesej"
+
+#, fuzzy
+#~ msgid "Message is not Junk"
+#~ msgstr "Tandakan sebagai _Penting"
+
+#~ msgid "Move to Folder"
+#~ msgstr "Alihkan ke Folder"
+
+#, fuzzy
+#~ msgid "Pipe to Program"
+#~ msgstr "Keluar dari atur cara"
+
+#~ msgid "Play Sound"
+#~ msgstr "Dengarkan Bunyi"
+
+#~ msgid "Recipients"
+#~ msgstr "Penerima"
+
+#~ msgid "Regex Match"
+#~ msgstr "Padanan Regex "
+
+#~ msgid "Replied to"
+#~ msgstr "Jawapan kepada"
+
+#~ msgid "returns"
+#~ msgstr "kembali"
+
+#~ msgid "returns greater than"
+#~ msgstr "kembalikan lebih besar daripada"
+
+#~ msgid "returns less than"
+#~ msgstr "kembalikan kurang daripada"
+
+#, fuzzy
+#~ msgid "Run Program"
+#~ msgstr "Jalankan atur cara:"
+
+#~ msgid "Sender"
+#~ msgstr "Penghantar"
+
+#~ msgid "Set Status"
+#~ msgstr "Set Status"
+
+#~ msgid "Size (kB)"
+#~ msgstr "Saiz (kB)"
+
+#~ msgid "sounds like"
+#~ msgstr "seperti"
+
+#~ msgid "Source Account"
+#~ msgstr "Akaun Sumber"
+
+#~ msgid "Specific header"
+#~ msgstr "Pengepala yang khusus"
+
+#~ msgid "starts with"
+#~ msgstr "bermula dengan"
+
+#~ msgid "Stop Processing"
+#~ msgstr "Hentikan Memproses"
+
+#~ msgid "Unset Status"
+#~ msgstr "Batalkan Set Status"
+
+#~ msgid "Working"
+#~ msgstr "Berfungsi"
+
+#~ msgid "Brought to you by"
+#~ msgstr "Dibawa kepada anda oleh"
+
+#~ msgid "_Filename:"
+#~ msgstr "_Namafail:"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "Unknown error."
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Ralat tak diketahui."
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the component system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Ralat daripada sistem komponen ialah:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the activation system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Ralat daripada sistem pengaktifan ialah:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "View Certificate"
+#~ msgstr "Sijil"
+
+#, fuzzy
+#~ msgid "You have been asked to trust a new Certificate Authority (CA)."
+#~ msgstr "Kuasa Sijil Tak Sah (CA)"
+
+#~ msgid "About Ximian Evolution..."
+#~ msgstr "Tentang Ximian Evolution..."
+
+#~ msgid "_About Ximian Evolution..."
+#~ msgstr "_Tentang Ximian Evolution..."
+
 #~ msgid "Evolution Addressbook folder viewer"
 #~ msgstr "Pelihat folder Buku Alamat Evolution"
 
@@ -20047,9 +20060,6 @@ msgstr "%s (%d%% siap)"
 #~ msgid "Primary _email:"
 #~ msgstr "_E-mel primer:"
 
-#~ msgid "S_pouse:"
-#~ msgstr "P_asangan:"
-
 #~ msgid "_Business:"
 #~ msgstr "_Perniagaan:"
 
@@ -20065,9 +20075,6 @@ msgstr "%s (%d%% siap)"
 #~ msgid "_Mobile:"
 #~ msgstr "_Telefon Bimbit:"
 
-#~ msgid "_Office:"
-#~ msgstr "_Pejabat:"
-
 #~ msgid "_Public Calendar URL:"
 #~ msgstr "_URL Kalendar Awam:"
 
@@ -21505,9 +21512,6 @@ msgstr "%s (%d%% siap)"
 #~ msgid "Object not found"
 #~ msgstr "Objek tidak dijumpai"
 
-#~ msgid "Invalid object"
-#~ msgstr "Objek tak sah"
-
 #~ msgid "URI not loaded"
 #~ msgstr "URI tidak dimuatkan"
 
@@ -25603,9 +25607,6 @@ msgstr "%s (%d%% siap)"
 #~ msgid "Lannion"
 #~ msgstr "Lannion"
 
-#~ msgid "Lansing"
-#~ msgstr "Lansing"
-
 #~ msgid "Lanzhou"
 #~ msgstr "Lanzhou"
 
diff --git a/po/nl.po b/po/nl.po
index 6f6a297aa0..370a3f8085 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -20,14 +20,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-26 03:14+0200\n"
+"POT-Creation-Date: 2004-06-03 11:14-0400\n"
 "PO-Revision-Date: 2004-04-03 14:20:47+0100\n"
 "Last-Translator: Daniel van Eeden <daniel_e@dds.nl>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: a11y/addressbook/ea-addressbook-view.c:94
@@ -83,12 +83,12 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "Anonieme verbinding met LDAP server wordt opgezet"
 
 #: addressbook/gui/component/addressbook.c:173
-#: camel/providers/groupwise/camel-gw-listener.c:369
+#: camel/providers/groupwise/camel-gw-listener.c:378
 msgid "Failed to authenticate.\n"
 msgstr "Fout bij het aanmelden.\n"
 
 #: addressbook/gui/component/addressbook.c:179
-#: camel/providers/groupwise/camel-gw-listener.c:358
+#: camel/providers/groupwise/camel-gw-listener.c:367
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sVoer uw wachtwoord in voor %s (gebruiker %s)"
@@ -150,20 +150,16 @@ msgid "Migrating `%s':"
 msgstr "`%s' wordt overgezet:"
 
 #. create the local source group
-#. On This Computer is always first and VFolders is always last
-#: addressbook/gui/component/addressbook-migrate.c:508
+#: addressbook/gui/component/addressbook-migrate.c:464
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
 #: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
-#: mail/mail-component.c:247 mail/mail-vfolder.c:218
+#: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr "Op deze computer"
 
 #. Create the default Person addressbook
-#. Create the default Person calendar
-#. Create the default Person task list
-#. orange
-#: addressbook/gui/component/addressbook-migrate.c:516
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
 #: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
 #: mail/mail-config.glade.h:109
@@ -171,19 +167,19 @@ msgid "Personal"
 msgstr "Persoonlijk"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:524
+#: addressbook/gui/component/addressbook-migrate.c:480
 msgid "On LDAP Servers"
 msgstr "Op LDAP servers"
 
-#: addressbook/gui/component/addressbook-migrate.c:652
+#: addressbook/gui/component/addressbook-migrate.c:608
 msgid "LDAP Servers"
 msgstr "LDAP servers"
 
-#: addressbook/gui/component/addressbook-migrate.c:772
+#: addressbook/gui/component/addressbook-migrate.c:728
 msgid "Autocompletion Settings"
 msgstr "Auto-afmaak instellingen"
 
-#: addressbook/gui/component/addressbook-migrate.c:1148
+#: addressbook/gui/component/addressbook-migrate.c:1104
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -195,7 +191,7 @@ msgstr ""
 "\n"
 "Een ogeblik geduld. Evolution zal nu uw mappen overzetten..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1162
+#: addressbook/gui/component/addressbook-migrate.c:1118
 #, fuzzy
 msgid ""
 "The format of mailing list contacts has changed.\n"
@@ -207,7 +203,7 @@ msgstr ""
 "\n"
 "Een ogeblik geduld. Evolution zal nu uw mappen overzetten..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1171
+#: addressbook/gui/component/addressbook-migrate.c:1127
 #, fuzzy
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
@@ -219,7 +215,7 @@ msgstr ""
 "\n"
 "Een ogeblik geduld. Evolution zal nu uw mappen overzetten..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1181
+#: addressbook/gui/component/addressbook-migrate.c:1137
 #, fuzzy
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
@@ -231,12 +227,6 @@ msgstr ""
 "\n"
 "Een ogeblik geduld. Evolution zal nu uw mappen overzetten..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1194
-msgid ""
-"Some fields are no longer representable in the contact editor. Please wait "
-"while Evolution copies those fields to the 'Notes' field..."
-msgstr ""
-
 #: addressbook/gui/component/addressbook-view.c:675
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
@@ -249,17 +239,16 @@ msgstr "Nieuw adresboek"
 
 #: addressbook/gui/component/addressbook-view.c:755
 #: addressbook/gui/widgets/e-addressbook-view.c:1088
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Verwijderen"
 
 #: addressbook/gui/component/addressbook-view.c:756
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Eigenschappen..."
 
@@ -348,10 +337,6 @@ msgid "Manage your S/MIME certificates here"
 msgstr "Uw S/Mime certificaten hier beheren"
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-msgid "  S_how Supported Bases "
-msgstr "Ondersteunde bases _weergeven"
-
-#: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -373,195 +358,162 @@ msgstr "Ondersteunde bases _weergeven"
 msgid "*"
 msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1:00"
-msgstr "1:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
-msgstr "5:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "Aanmelding"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
 #, fuzzy
 msgid "<b>Display</b>"
 msgstr "<b>Status:</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 #, fuzzy
 msgid "<b>Downloading</b>"
 msgstr "Geografische l_ocatie: "
 
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:10
 #, fuzzy
 msgid "<b>Searching</b>"
 msgstr "Zoeken"
 
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
 msgid "<b>Server Information</b>"
 msgstr "Stap 2: Server informatie"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
 msgid "<b>Type:</b>"
 msgstr "<b>Dan</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:13
 #, fuzzy
 msgid "Add Contacts Group"
 msgstr "Toevoegen aan contacten"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Address Book Properties"
 msgstr "Adresboek eigenschappen"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:42
 msgid "Always"
 msgstr "Altijd"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr "Anoniem"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:17
 #: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Basis"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
-msgid "Connecting"
-msgstr "Bezig met verbinden"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 #: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Details"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
-msgid "Distinguished _name:"
-msgstr "Unieke _naam:"
-
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:19
 #, fuzzy
 msgid "Distinguished name"
 msgstr "Unieke _naam:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:20
 #, fuzzy
 msgid "Download limit:"
 msgstr "_Downloadlimiet:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Email address"
 msgstr "E-mail adres:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "Email address:"
-msgstr "E-mail adres:"
-
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "Evolution will use this DN to authenticate you with the server"
-msgstr "Evolution zal deze DN gebruiken om u te identificeren bij de server"
-
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:22
+#, fuzzy
 msgid ""
-"Evolution will use this email address to authenticate you with the server"
+"Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "Evolution zal dit e-mailadres gebruiken om u te identificeren bij de server"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:23
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Ondersteunde zoekbases"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:24
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Algemeen"
 
-#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
+#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:102
 msgid "Never"
 msgstr "Nooit"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
-msgid "One"
-msgstr "Één"
-
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:35
-msgid "S_earch scope: "
-msgstr "Zoek_gebied: "
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Search _base:"
+msgstr "Zoek basis:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
 msgid "Search base only"
 msgstr "Zoek basis:"
 
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid "Search base:"
 msgstr "Zoek basis:"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Search scope:"
 msgstr "Zoek_gebied: "
 
-#: addressbook/gui/component/ldap-config.glade.h:39
-msgid "Searching"
-msgstr "Zoeken"
-
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:31
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
-"server if\n"
-"your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL or TLS."
 msgstr ""
 "Deze optie selecteren betekend dat Evolution alleen verbinding zal maken\n"
 "met uw LDAP server wanneer het SSL of TLS protocol gebruikt kan worden."
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a \n"
-"insecure environment. For example, if you and your LDAP server are behind a "
-"firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection "
-"is already\n"
-"secure."
+"you are in a insecure environment. For example, if you and your LDAP server "
+"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
+"because your connection is already secure."
 msgstr ""
 "Deze optie selecteren betekend dat Evolution alleen in een onveilige "
 "omgeving\n"
@@ -569,58 +521,52 @@ msgstr ""
 "wanneer u en de LDAP server achter een firewall zitten is het niet nodig om "
 "de verbinding te versleutelen. De verbinding is dan al veilig."
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:33
+#, fuzzy
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
-"TLS.  This \n"
-"means that your connection will be insecure, and that you will be vulnerable "
-"to security\n"
-"exploits. "
+"TLS.  This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits. "
 msgstr ""
 "Deze optie selecteren betekend dat uw LDAP server het SSL of TLS protocol\n"
 "niet ondersteunt. Dit betekend dat uw verbinding onbeveiligd zal zijn en dat "
 "u\n"
 "veiligheidsrisico's loopt."
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Sub"
-msgstr "Sub"
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr "Ondersteunde zoekbases"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
-"searches will \n"
-"begin. If you leave this blank, the search will begin at the root of the "
-"directory tree."
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
 msgstr ""
 "De zoekbasis is de unieke naam (DN) van de ingang waar uw zoekopdrachten "
 "zullen\n"
 "beginnen. Als u hier niets invult, zal de zoekopdracht aan het begin van de "
 "boom starten."
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:37
+#, fuzzy
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
-"the \n"
-"directory tree. A search scope of \"sub\" will include all entries below "
-"your search base.\n"
-"A search scope of \"one\" will only include the entries one level beneath "
-"your base.\n"
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
 msgstr ""
 "De zoekdiepte bepaalt hoe ver de zoekopdracht doorzoekt in een "
 "adresboekboom.\n"
 "Een zoekdiepte van \"sub\" zal alle takken onder uw zoekbasis afzoeken. Een\n"
 "zoekdiepte van \"één\" zal slechts één niveau dieper dan uw zoekbasis gaan.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:58
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -628,16 +574,16 @@ msgstr ""
 "Dit is de volledige naam van uw LDAP-server. Bijvoorbeeld \"ldap.mijnbedrijf."
 "nl\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:39
+#, fuzzy
 msgid ""
-"This is the maximum number of entries to download. Setting this number to "
-"be \n"
+"This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr ""
 "Dit is het maximum aantal kaarten wat zal worden opgehaald. Als u het \n"
 "te hoog zet wordt dit adresboek langzamer maken."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -646,140 +592,119 @@ msgstr ""
 "Dit is de methode die evolution zal gebruiken om u aan te melden. Als het op "
 "\"E-mailadres\" wordt gezet, is anonieme toegang tot de ldap server vereist."
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:41
+#, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
-"list.\n"
-"It is for display purposes only. "
+"list. It is for display purposes only. "
 msgstr ""
 "Deze naam wordt gebruikt om deze server in uw mappenlijst weer te geven.\n"
 "De naam is alleen voor weergave-doeleinden."
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:42
+#, fuzzy
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. "
-"A \n"
-"list of standard ports has been provided. Ask your system administrator\n"
-"what port you should specify."
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
 msgstr ""
 "Dit is de poort van de LDAP-server waarop Evolution contact zal leggen. Er\n"
 "is een lijst met standaardpoorten gegeven. Vraag aan uw systeembeheerder\n"
 "welke poort u moet invullen."
 
-#: addressbook/gui/component/ldap-config.glade.h:67
-msgid "This option controls how long a search will be run."
-msgstr "Deze optie geeft aan hoe lang een zoekopdracht actief zal zijn."
-
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:43
 #, fuzzy
 msgid "Timeout:"
 msgstr "Tijdsformaat:"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
-msgid "U_se SSL/TLS:"
-msgstr "Gebruik _SSL/TLS:"
-
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr "Unieke naam (DN) wordt gebruikt"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr "E-mail adres wordt gebruikt"
 
-#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
+#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr "Indien mogelijk"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:47
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "Toevoegen aan contacten"
 
-#: addressbook/gui/component/ldap-config.glade.h:74
-#: calendar/gui/dialogs/calendar-setup.glade.h:12
-msgid "_Display name:"
-msgstr "_Weergave naam:"
-
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr "_Downloadlimiet:"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
 msgid "_Email address:"
 msgstr "E-mail adres:"
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:50
+#, fuzzy
+msgid "_Find Possible Search Bases"
+msgstr "Ondersteunde zoekbases"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Log in method:"
 msgstr "In_logmethode:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:171
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "_Log in:"
+msgstr "Login"
+
+#: addressbook/gui/component/ldap-config.glade.h:53
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
 msgid "_Name:"
 msgstr "_Naam:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
-msgid "_Port number:"
-msgstr "_Poortnummer:"
-
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "_Port:"
 msgstr "_Prioriteit:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
-msgid "_Search base:"
-msgstr "Zoek_basis:"
-
-#: addressbook/gui/component/ldap-config.glade.h:82
-msgid "_Server name:"
-msgstr "_Servernaam:"
+#: addressbook/gui/component/ldap-config.glade.h:55
+#, fuzzy
+msgid "_Search scope:"
+msgstr "Zoek_gebied: "
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:56
 #, fuzzy
 msgid "_Server:"
 msgstr "_Server:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
-msgid "_Timeout (minutes):"
-msgstr "_Timeout (minuten):"
+#: addressbook/gui/component/ldap-config.glade.h:57
+#, fuzzy
+msgid "_Timeout:"
+msgstr "Tijdsformaat:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:58
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "_Beveiligde verbinding (SSL) gebruiken:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "kaarten"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
-msgid "connecting-tab"
-msgstr "connecting-tab"
-
-#: addressbook/gui/component/ldap-config.glade.h:88
-msgid "general-tab"
-msgstr "Algemeen-tab"
-
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:60
 #: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
 #: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "minuten"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
-msgid "searching-tab"
-msgstr "Zoeken-tab"
-
-#: addressbook/gui/component/select-names/e-select-names.c:492
+#: addressbook/gui/component/select-names/e-select-names.c:503
 #: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid "Select Contacts from Address Book"
 msgstr "Selecteer contacten uit het adresboek"
 
-#: addressbook/gui/component/select-names/e-select-names.c:691
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
@@ -895,8 +820,8 @@ msgstr "Werkweek"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
 #: addressbook/gui/contact-editor/e-contact-editor.c:178
-#: addressbook/gui/widgets/eab-contact-display.c:342
-#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/widgets/eab-contact-display.c:334
+#: addressbook/gui/widgets/eab-contact-display.c:353
 msgid "AIM"
 msgstr "AIM"
 
@@ -937,7 +862,7 @@ msgstr "Opdracht:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: addressbook/gui/contact-editor/e-contact-editor.c:266
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
@@ -968,92 +893,90 @@ msgid "Full _Name..."
 msgstr "Volledige _naam..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-msgid "Home"
-msgstr "Thuis"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #, fuzzy
 msgid "Home Page:"
 msgstr "Homepage"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-#: calendar/gui/e-itip-control.c:930
-msgid "Location:"
-msgstr "Lokatie: "
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 #, fuzzy
 msgid "Mailing Address"
 msgstr "E-mailadres"
 
 # beheerder
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 #, fuzzy
 msgid "Manager:"
 msgstr "Manager"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "_Bijnaam:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Notes:"
 msgstr "Aa_ntekeningen:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr "Novell GroupWise"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
-#: addressbook/gui/contact-editor/e-contact-editor.c:197
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-msgid "Other"
-msgstr "Overige"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#, fuzzy
+msgid "Office:"
+msgstr "Kant_oor:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "PO Box:"
 msgstr "_Postbus:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 #, fuzzy
 msgid "Personal Information"
 msgstr "Optionele Informatie"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 #, fuzzy
 msgid "Profession:"
 msgstr "Be_roep:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#, fuzzy
+msgid "Spouse:"
+msgstr "_Partner:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "State/Province:"
 msgstr "_Staat/Provincie:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
 #, fuzzy
 msgid "Title:"
 msgstr "_Titel:"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+msgid "Video Chat:"
+msgstr ""
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:41
 #, fuzzy
 msgid "Wants to receive HTML mail"
 msgstr "Bij voorkeur _HTML-berichten"
 
+# , fuzzy
 #: addressbook/gui/contact-editor/contact-editor.glade.h:42
 #, fuzzy
-msgid "Webcam:"
-msgstr "Website:"
+msgid "Web Log:"
+msgstr "Homepage:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
@@ -1080,18 +1003,11 @@ msgid "_File under:"
 msgstr "Bestandsnaam:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 #, fuzzy
 msgid "_Where:"
 msgstr "_Server:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
-msgid "item7"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
-msgid "item8"
-msgstr ""
-
 #: addressbook/gui/contact-editor/eab-editor.c:315
 msgid ""
 "Are you sure you want\n"
@@ -1109,8 +1025,8 @@ msgstr ""
 "contact wilt verwijderen?"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:351
-#: addressbook/gui/widgets/eab-contact-display.c:372
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Address"
 msgstr "Adres"
 
@@ -1118,7 +1034,7 @@ msgstr "Adres"
 #: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard.c:174
@@ -2098,27 +2014,27 @@ msgstr "Zimbabwe"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:179
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:337
+#: addressbook/gui/widgets/eab-contact-display.c:356
 msgid "Jabber"
 msgstr "Jabber"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:347
-#: addressbook/gui/widgets/eab-contact-display.c:366
+#: addressbook/gui/widgets/eab-contact-display.c:339
+#: addressbook/gui/widgets/eab-contact-display.c:358
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/widgets/eab-contact-display.c:338
+#: addressbook/gui/widgets/eab-contact-display.c:357
 msgid "MSN"
 msgstr "MSN"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:344
-#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#: addressbook/gui/widgets/eab-contact-display.c:355
 msgid "ICQ"
 msgstr "ICQ"
 
@@ -2126,6 +2042,16 @@ msgstr "ICQ"
 msgid "GroupWise"
 msgstr "GroupWise"
 
+#: addressbook/gui/contact-editor/e-contact-editor.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+msgid "Home"
+msgstr "Thuis"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+msgid "Other"
+msgstr "Overige"
+
 #: addressbook/gui/contact-editor/e-contact-editor.c:252
 msgid "Source Book"
 msgstr "Bron boek"
@@ -2146,45 +2072,45 @@ msgstr "Beschrijfbare velden"
 msgid "Changed"
 msgstr "Veranderd"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2297
+#: addressbook/gui/contact-editor/e-contact-editor.c:2352
 msgid "This contact belongs to these categories:"
 msgstr "Dit contact behoort tot de categoriëen:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2374
+#: addressbook/gui/contact-editor/e-contact-editor.c:2429
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Maak uw keuze uit de volgende mogelijkheden"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2378
+#: addressbook/gui/contact-editor/e-contact-editor.c:2433
 #, fuzzy
 msgid "No image"
 msgstr "Nome"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2581
+#: addressbook/gui/contact-editor/e-contact-editor.c:2636
 #, fuzzy
 msgid ""
 "The contact data is invalid:\n"
 "\n"
 msgstr "Herhalingsdatum is ongeldig"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2609
+#: addressbook/gui/contact-editor/e-contact-editor.c:2664
 #, fuzzy
 msgid "Invalid contact."
 msgstr "Ongeldig doel"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2668
+#: addressbook/gui/contact-editor/e-contact-editor.c:2723
 msgid ""
 "The contact cannot be saved to the selected address book. Do you want to "
 "discard changes?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2672
-#: addressbook/gui/contact-editor/e-contact-editor.c:2696
+#: addressbook/gui/contact-editor/e-contact-editor.c:2727
+#: addressbook/gui/contact-editor/e-contact-editor.c:2751
 msgid "_Discard"
 msgstr "_Verwerpen"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2691
+#: addressbook/gui/contact-editor/e-contact-editor.c:2746
 msgid ""
 "You are moving the contact from one address book to another, but it cannot "
 "be removed from the source. Do you want to save a copy instead?"
@@ -2366,11 +2292,11 @@ msgstr "_Lijstnaam:"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Tik een e-mailadres in of sleep een contact in de onderstaande lijst:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "contact-list-editor"
 msgstr "Contactlijstbewerker"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:153
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
 #: addressbook/gui/widgets/e-addressbook-view.c:217
@@ -2379,17 +2305,17 @@ msgstr "Contactlijstbewerker"
 msgid "Book"
 msgstr "Boek"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
 msgid "Is New List"
 msgstr "Is nieuwe lijst"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:215
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
 msgid "Contact List Editor"
 msgstr "Contactenlijst bewerken"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:438
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
 msgid "Save List as VCard"
 msgstr "Lijst opslaan als VCard"
 
@@ -2436,92 +2362,92 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Uitgebreid zoeken"
 
-#: addressbook/gui/widgets/eab-contact-display.c:129
-#: addressbook/gui/widgets/eab-contact-display.c:192
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
 msgid "(map)"
 msgstr "(kaart)"
 
-#: addressbook/gui/widgets/eab-contact-display.c:139
-#: addressbook/gui/widgets/eab-contact-display.c:205
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
 msgid "map"
 msgstr "kaart"
 
-#: addressbook/gui/widgets/eab-contact-display.c:257
-#: addressbook/gui/widgets/eab-contact-display.c:533
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:525
 msgid "List Members"
 msgstr "Lijstleden"
 
-#: addressbook/gui/widgets/eab-contact-display.c:329
-#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/eab-contact-display.c:321
+#: addressbook/gui/widgets/eab-contact-display.c:323
 msgid "E-mail"
 msgstr "E-mail"
 
-#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/eab-contact-display.c:332
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organisatie"
 
-#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "Position"
 msgstr "Positie"
 
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:354
 msgid "Groupwise"
 msgstr "Groupwise"
 
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:340
 msgid "Video Conferencing"
 msgstr "Video conferentie"
 
-#: addressbook/gui/widgets/eab-contact-display.c:349
-#: addressbook/gui/widgets/eab-contact-display.c:370
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Phone"
 msgstr "Telefoon"
 
-#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:342
 msgid "Fax"
 msgstr "fax"
 
-#: addressbook/gui/widgets/eab-contact-display.c:354
+#: addressbook/gui/widgets/eab-contact-display.c:346
 msgid "work"
 msgstr "werk"
 
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:359
 msgid "WWW"
 msgstr "WWW"
 
-#: addressbook/gui/widgets/eab-contact-display.c:368
-#: addressbook/gui/widgets/eab-contact-display.c:587
+#: addressbook/gui/widgets/eab-contact-display.c:360
+#: addressbook/gui/widgets/eab-contact-display.c:579
 msgid "Blog"
 msgstr "Blog"
 
 # mobieltje? mobiele? pocket?
-#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/eab-contact-display.c:363
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Mobiele telefoon"
 
-#: addressbook/gui/widgets/eab-contact-display.c:375
+#: addressbook/gui/widgets/eab-contact-display.c:367
 msgid "personal"
 msgstr "persoonlijk"
 
-#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/eab-contact-display.c:374
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Opmerkingen"
 
-#: addressbook/gui/widgets/eab-contact-display.c:548
+#: addressbook/gui/widgets/eab-contact-display.c:540
 msgid "Job Title"
 msgstr "Functie"
 
-#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/eab-contact-display.c:544
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:774
+#: smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "E-mail"
 
-#: addressbook/gui/widgets/eab-contact-display.c:579
+#: addressbook/gui/widgets/eab-contact-display.c:571
 msgid "Home page"
 msgstr "Homepage"
 
@@ -2886,13 +2812,13 @@ msgid "Email begins with"
 msgstr "E-mail begint met"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:165
-#: calendar/gui/cal-search-bar.c:57
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Categorie is"
 
 #. We attach subitems below
 #: addressbook/gui/widgets/e-addressbook-view.c:166
-#: calendar/gui/cal-search-bar.c:50
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Een veld bevat"
 
@@ -2904,7 +2830,7 @@ msgstr "Uitgebreid..."
 #: addressbook/gui/widgets/e-addressbook-view.c:238
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:250
+#: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Type"
@@ -2915,7 +2841,7 @@ msgstr "Adresboek"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:852
 #: addressbook/gui/widgets/e-addressbook-view.c:1072
-#: addressbook/gui/widgets/e-addressbook-view.c:2078
+#: addressbook/gui/widgets/e-addressbook-view.c:2080
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
@@ -2983,7 +2909,7 @@ msgid "Cut"
 msgstr "Knippen"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
@@ -2995,13 +2921,13 @@ msgid "Paste"
 msgstr "Plakken"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1092
-#: calendar/gui/e-calendar-view.c:1277
+#: calendar/gui/e-calendar-view.c:1280
 msgid "Current View"
 msgstr "Huidige weergave"
 
 #. All, unmatched, separator
 #: addressbook/gui/widgets/e-addressbook-view.c:1665
-#: calendar/gui/cal-search-bar.c:362
+#: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Elke categorie"
 
@@ -3108,7 +3034,7 @@ msgstr "Radio"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:257
+#: calendar/gui/e-meeting-list-view.c:234
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Rol"
@@ -3217,17 +3143,17 @@ msgstr "Kaartweergave"
 msgid "GTK Tree View"
 msgstr "GTK boomweergave"
 
-#: addressbook/gui/widgets/test-reflow.c:119
+#: addressbook/gui/widgets/test-reflow.c:106
 msgid "Reflow Test"
 msgstr "Terugvloei test"
 
-#: addressbook/gui/widgets/test-reflow.c:120
+#: addressbook/gui/widgets/test-reflow.c:107
 #: addressbook/printing/test-contact-print-style-editor.c:54
 #: addressbook/printing/test-print.c:53
 msgid "Copyright (C) 2000, Ximian, Inc."
 msgstr "Copyright (C) 2000, Ximian, Inc."
 
-#: addressbook/gui/widgets/test-reflow.c:122
+#: addressbook/gui/widgets/test-reflow.c:109
 msgid "This should test the reflow canvas item"
 msgstr "Dit zou het terugvloei canvas item moeten testen"
 
@@ -3817,9 +3743,9 @@ msgstr "Week_nummers tonen in datum navigatie"
 
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
 #: calendar/gui/dialogs/select-source-dialog.c:92
-#: calendar/gui/gnome-cal.c:1704
-#: camel/providers/groupwise/camel-gw-listener.c:304
-#: camel/providers/groupwise/camel-gw-listener.c:327
+#: calendar/gui/gnome-cal.c:1705
+#: camel/providers/groupwise/camel-gw-listener.c:311
+#: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
 msgstr "Kalender"
 
@@ -3838,7 +3764,7 @@ msgstr "Verwijderen van items ouder dan"
 
 #: calendar/gui/calendar-commands.c:363
 #: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:19 filter/filter.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
 msgid "days"
 msgstr "dagen"
 
@@ -3848,10 +3774,6 @@ msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. %d = day of month, %b = abbreviated month name.
-#. You can change the order but don't change the
-#. specifiers or add anything.
 #: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
 #: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
 #: calendar/gui/e-week-view-main-item.c:329
@@ -3991,23 +3913,23 @@ msgstr "Week weergave"
 msgid "Month View"
 msgstr "Maand weergave"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Samenvatting bevat"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Omschrijving bevat"
 
-#: calendar/gui/cal-search-bar.c:54
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Commentaar bevat"
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:53
 msgid "Location contains"
 msgstr "Lokatie bevat"
 
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
 msgid "Unmatched"
 msgstr "Niet passend"
 
@@ -4080,7 +4002,7 @@ msgstr "Aan:"
 msgid "With these arguments:"
 msgstr "Met deze parameters:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
 msgid "dialog1"
 msgstr "dialog1"
 
@@ -4089,7 +4011,7 @@ msgid "extra times every"
 msgstr "nogmaals"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:20 filter/filter.glade.h:16
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr "uren"
 
@@ -4135,7 +4057,7 @@ msgstr "Verstuur een bericht"
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:921 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Samenvatting:"
 
@@ -4166,7 +4088,6 @@ msgstr "u(u)r(en)"
 
 # meervoudsvorm?
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:21
 msgid "minute(s)"
 msgstr "minuten"
 
@@ -4174,27 +4095,27 @@ msgstr "minuten"
 msgid "start of appointment"
 msgstr "begin van afspraak"
 
-#: calendar/gui/dialogs/calendar-setup.c:171
+#: calendar/gui/dialogs/calendar-setup.c:172
 msgid "You must specify a location to get the calendar from."
 msgstr ""
 "U dient een lokatie te geven waar de agenda vandaan gehaalt dient te worden."
 
-#: calendar/gui/dialogs/calendar-setup.c:179
+#: calendar/gui/dialogs/calendar-setup.c:180
 #, c-format
 msgid "The source location '%s' is not well-formed."
 msgstr "De bron lokatie '%s' is niet goed geformeerd."
 
-#: calendar/gui/dialogs/calendar-setup.c:194
+#: calendar/gui/dialogs/calendar-setup.c:195
 #, c-format
 msgid "The source location '%s' is not a webcal source."
 msgstr "De bronlokatie '%s' is geen webcal bron."
 
-#: calendar/gui/dialogs/calendar-setup.c:266
+#: calendar/gui/dialogs/calendar-setup.c:275
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr "Er bestaat al een bron met de naam '%s' in de geselecteerde groep"
 
-#: calendar/gui/dialogs/calendar-setup.c:279
+#: calendar/gui/dialogs/calendar-setup.c:288
 #, c-format
 msgid ""
 "The group '%s' is remote. You must specify a location to get the calendar "
@@ -4218,55 +4139,35 @@ msgstr "Takenlijst-groep"
 msgid "C_olor:"
 msgstr "Kleuren"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "Calendar Properties"
-msgstr "Kalender eigenschappen"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:110
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
 msgid "Pick a color"
 msgstr "Kies een kleur"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:8
-msgid "Remote"
-msgstr "Op afstand"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "Task List Properties"
-msgstr "Takenlijst eigenschappen"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
 #, fuzzy
 msgid "_Add Calendar"
 msgstr "Nieuwe kalender toevoegen"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
 #, fuzzy
 msgid "_Add Group"
 msgstr "Groep toe_voegen..."
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-msgid "_Refresh Interval:"
-msgstr "Ve_rvers Interval:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
 #, fuzzy
 msgid "_Refresh:"
 msgstr "Verversen"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-msgid "_Source URL:"
-msgstr "B_ron URL:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
 #, fuzzy
 msgid "_Type:"
 msgstr "Type:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
 msgid "_URL:"
 msgstr "_URL:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
 msgid "weeks"
 msgstr "weken"
 
@@ -4385,7 +4286,7 @@ msgstr "_Vrij/Bezet publicatie"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:557
+#: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Vrijdag"
 
@@ -4399,7 +4300,7 @@ msgstr "Minuten"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:553
+#: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Maandag"
 
@@ -4409,7 +4310,7 @@ msgstr "Z_on"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Zaterdag"
 
@@ -4423,7 +4324,7 @@ msgstr "Week_nummers tonen in datum navigator"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:552
+#: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Zondag"
 
@@ -4437,7 +4338,7 @@ msgstr "D_on"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:556
+#: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Donderdag"
 
@@ -4451,7 +4352,7 @@ msgstr "Tijdsformaat:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:554
+#: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Dinsdag"
 
@@ -4461,7 +4362,7 @@ msgstr "W_eek begint:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:555
+#: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Woensdag"
 
@@ -4623,7 +4524,7 @@ msgid "No summary"
 msgstr "Geen samenvatting"
 
 #: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
 #: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Opslaan als..."
@@ -4855,13 +4756,8 @@ msgid "_Start time:"
 msgstr "_Begintijd:"
 
 #. an empty string is the same as 'None'
-#. add a "None" option to the stores menu
-#. Put the "None" and "UTC" entries at the top of the combo's list.
-#. When "None" is selected we want the field to be cleared.
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
 #: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:3
+#: calendar/gui/dialogs/meeting-page.glade.h:4
 #: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
 #: filter/filter-rule.c:877 mail/em-account-prefs.c:427
 #: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
@@ -4891,8 +4787,8 @@ msgstr "_Overdragen aan..."
 #. FIXME: need to disable for undeletable folders
 #: calendar/gui/dialogs/meeting-page.c:655
 #: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1310 calendar/gui/e-calendar-view.c:1342
-#: mail/em-folder-tree.c:2562 mail/em-folder-view.c:919
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
+#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -4900,7 +4796,7 @@ msgid "_Delete"
 msgstr "_Verwijderen"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:241
+#: calendar/gui/e-meeting-list-view.c:218
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Aanwezige"
@@ -4936,16 +4832,15 @@ msgid "Member"
 msgstr "Lid"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1048 calendar/gui/e-meeting-list-view.c:264
+#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:271
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
-#: mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-list-view.c:248
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
 
@@ -4953,20 +4848,20 @@ msgstr "Status"
 msgid "Add A_ttendee"
 msgstr "_Aanwezige toevoegen"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "Add attendees from addressbook."
+msgstr "Afzender aan adresboe_k toevoegen"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Coordinator"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
+#: calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "_Change Organizer"
 msgstr "Organisator _veranderen"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-#: calendar/gui/e-meeting-time-sel.c:417
-msgid "_Invite Others..."
-msgstr "Anderen uit_nodigen..."
-
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
 msgstr "<b>Kalender opties</b>"
@@ -5263,7 +5158,7 @@ msgstr "Vertrouwelijk"
 
 #: calendar/gui/dialogs/task-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:976 calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Omschrijving:"
@@ -5427,7 +5322,7 @@ msgstr "Verloopdatum:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:944
+#: calendar/gui/e-itip-control.c:943
 msgid "Status:"
 msgstr "Status:"
 
@@ -5513,12 +5408,12 @@ msgstr "Bezig"
 msgid "Deleting selected objects"
 msgstr "Geselecteerde objecten verwijderen"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
 msgid "Updating objects"
 msgstr "Objecten worden ververst"
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1370
+#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
 #: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Openen"
@@ -5528,15 +5423,15 @@ msgid "Open _Web Page"
 msgstr "Open _website"
 
 #: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1291 calendar/gui/e-calendar-view.c:1376
+#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
 #: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "_Opslaan als..."
 
 #: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1292
-#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
+#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
@@ -5544,15 +5439,15 @@ msgid "_Print..."
 msgstr "Af_drukken..."
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "K_nippen"
 
 #: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1338
-#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2555
+#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
+#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
 #: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
@@ -5560,8 +5455,8 @@ msgid "_Copy"
 msgstr "_Kopiëren"
 
 #: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1273 calendar/gui/e-calendar-view.c:1299
-#: calendar/gui/e-calendar-view.c:1372 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
+#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
@@ -5627,67 +5522,67 @@ msgstr "Samenvatting"
 msgid "Task sort"
 msgstr "Taken Sorteren"
 
-#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
 msgid "New _Appointment..."
 msgstr "Nieuwe _Afspraak..."
 
-#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
+#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
 msgid "New All Day _Event"
 msgstr "Gebeurtenis voor de hele dag"
 
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
+#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
 msgid "New Meeting"
 msgstr "Nieuwe bijeenkomst"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
 msgid "New Task"
 msgstr "Nieuwe taak"
 
-#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "Selec_teer vandaag"
 
-#: calendar/gui/e-calendar-view.c:1280
+#: calendar/gui/e-calendar-view.c:1283
 msgid "_Select Date..."
 msgstr "_Selecteer dag..."
 
-#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publiceer Beschikbaarheidsinformatie"
 
-#: calendar/gui/e-calendar-view.c:1303
+#: calendar/gui/e-calendar-view.c:1306
 msgid "Cop_y to Calendar..."
 msgstr "Naar agenda kopiëren..."
 
-#: calendar/gui/e-calendar-view.c:1304
+#: calendar/gui/e-calendar-view.c:1307
 msgid "Mo_ve to Calendar..."
 msgstr "Naar agenda _verplaatsen..."
 
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1308
 msgid "_Schedule Meeting..."
 msgstr "_Bijeenkomst Plannen..."
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1309
 msgid "_Forward as iCalendar..."
 msgstr "_Doorsturen als iKalender"
 
-#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
 msgid "Delete this _Occurrence"
 msgstr "Verwijder deze Gebeurtenis"
 
-#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
 msgid "Delete _All Occurrences"
 msgstr "Verwijder alle Gebeurtenissen"
 
-#: calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1349
 msgid "Go to _Today"
 msgstr "Ga Naar _Vandaag"
 
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1351
 msgid "_Go to Date..."
 msgstr "_Ga Naar Datum..."
 
-#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "_Instellingen..."
 
@@ -5701,9 +5596,9 @@ msgstr "Begindatum"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:961 calendar/gui/e-itip-control.c:1163
-#: calendar/gui/e-meeting-list-view.c:145
-#: calendar/gui/e-meeting-list-view.c:159 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
 #: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
 #: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
 #: camel/camel-tcp-stream-openssl.c:631
@@ -5729,13 +5624,13 @@ msgid "Assigned"
 msgstr "Toegewezen"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr "Ja"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:170 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "Nee"
 
@@ -5747,7 +5642,7 @@ msgstr "N"
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
 msgid "E"
 msgstr "E"
 
@@ -5766,20 +5661,12 @@ msgstr ""
 "45.436845,125.862501"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d-%m-%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format.
 #: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
@@ -5810,10 +5697,6 @@ msgstr "pm"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#. strftime format %A = full weekday name, %d = day of
-#. month, %B = full month name. You can change the
-#. order but don't change the specifiers or add
-#. anything.
 #: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
@@ -5821,9 +5704,6 @@ msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#. strftime format %d = day of month, %b = abbreviated
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
 #: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
@@ -5834,102 +5714,102 @@ msgstr "%d %b"
 msgid "%02i minute divisions"
 msgstr "%02i minuten delingen"
 
-#: calendar/gui/e-itip-control.c:586
+#: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
 msgstr "Ja. (complexe herhaling)"
 
-#: calendar/gui/e-itip-control.c:597
+#: calendar/gui/e-itip-control.c:596
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Elke dag"
 msgstr[1] "Elke %d dagen"
 
-#: calendar/gui/e-itip-control.c:602
+#: calendar/gui/e-itip-control.c:601
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Elke week"
 msgstr[1] "Elke %d weken"
 
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:603
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "Elke week op"
 msgstr[1] "Elke %d weken op"
 
-#: calendar/gui/e-itip-control.c:612
+#: calendar/gui/e-itip-control.c:611
 msgid " and "
 msgstr " en "
 
-#: calendar/gui/e-itip-control.c:619
+#: calendar/gui/e-itip-control.c:618
 #, c-format
 msgid "The %s day of "
 msgstr "De %s dag van "
 
-#: calendar/gui/e-itip-control.c:632
+#: calendar/gui/e-itip-control.c:631
 #, c-format
 msgid "The %s %s of "
 msgstr "De %s %s van "
 
-#: calendar/gui/e-itip-control.c:639
+#: calendar/gui/e-itip-control.c:638
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "elke maand"
 msgstr[1] "elke %d maanden"
 
-#: calendar/gui/e-itip-control.c:643
+#: calendar/gui/e-itip-control.c:642
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Elk jaar"
 msgstr[1] "Elk %d jaar"
 
-#: calendar/gui/e-itip-control.c:654
+#: calendar/gui/e-itip-control.c:653
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] "een totaal van %d keer"
 msgstr[1] "een totaal van %d keer"
 
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:662
 msgid ", ending on "
 msgstr ", eindigend op "
 
-#: calendar/gui/e-itip-control.c:687
+#: calendar/gui/e-itip-control.c:686
 msgid "<b>Starts:</b> "
 msgstr "<b>Begint:</b> "
 
-#: calendar/gui/e-itip-control.c:697
+#: calendar/gui/e-itip-control.c:696
 msgid "<b>Ends:</b> "
 msgstr "<b>Eindigt: <b>"
 
-#: calendar/gui/e-itip-control.c:717
+#: calendar/gui/e-itip-control.c:716
 msgid "<b>Completed:</b> "
 msgstr "<b>Voltooid:</b>"
 
-#: calendar/gui/e-itip-control.c:727
+#: calendar/gui/e-itip-control.c:726
 msgid "<b>Due:</b> "
 msgstr "<b>Voltooid:</b>"
 
-#: calendar/gui/e-itip-control.c:765 calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
 msgid "iCalendar Information"
 msgstr "iCalendar Informatie"
 
 #. Title
-#: calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:781
 msgid "iCalendar Error"
 msgstr "iCalendar Fout"
 
-#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
-#: calendar/gui/e-itip-control.c:880 calendar/gui/e-itip-control.c:897
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
 msgid "An unknown person"
 msgstr "Een onbekende persoon"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:904
+#: calendar/gui/e-itip-control.c:903
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5937,305 +5817,309 @@ msgstr ""
 "<br> Bekijk de volgende informatie en kies daarna een actie uit het menu "
 "hieronder."
 
-#: calendar/gui/e-itip-control.c:919
+#: calendar/gui/e-itip-control.c:918
 msgid "<i>None</i>"
 msgstr "<i>Geen</i>"
 
-#: calendar/gui/e-itip-control.c:949 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:929
+msgid "Location:"
+msgstr "Lokatie: "
+
+#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Geaccepteerd"
 
-#: calendar/gui/e-itip-control.c:953 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Voorlopig Geaccepteerd"
 
-#: calendar/gui/e-itip-control.c:957 calendar/gui/e-meeting-list-view.c:182
+#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Geweigerd"
 
-#: calendar/gui/e-itip-control.c:1016 calendar/gui/e-itip-control.c:1044
-#: calendar/gui/e-itip-control.c:1070 calendar/gui/e-itip-control.c:1083
-#: calendar/gui/e-itip-control.c:1096 calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
 msgid "Choose an action:"
 msgstr "Kies een actie:"
 
-#: calendar/gui/e-itip-control.c:1017
+#: calendar/gui/e-itip-control.c:1016
 msgid "Update"
 msgstr "Verversen"
 
-#: calendar/gui/e-itip-control.c:1018 calendar/gui/e-itip-control.c:1049
-#: calendar/gui/e-itip-control.c:1072 calendar/gui/e-itip-control.c:1085
-#: calendar/gui/e-itip-control.c:1098 calendar/gui/e-itip-control.c:1111
-#: shell/e-shell.c:1098 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
+#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1044
 msgid "Accept"
 msgstr "Accepteren"
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1045
 msgid "Tentatively accept"
 msgstr "Voorlopig accepteren"
 
-#: calendar/gui/e-itip-control.c:1047
+#: calendar/gui/e-itip-control.c:1046
 msgid "Decline"
 msgstr "Weigeren"
 
-#: calendar/gui/e-itip-control.c:1071
+#: calendar/gui/e-itip-control.c:1070
 msgid "Send Free/Busy Information"
 msgstr "Verstuur Vrij/Bezet Informatie"
 
-#: calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1083
 msgid "Update respondent status"
 msgstr "Ververs antwoordstatus"
 
-#: calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1096
 msgid "Send Latest Information"
 msgstr "Verstuur Laatste Informatie"
 
-#: calendar/gui/e-itip-control.c:1110 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1185
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> heeft bijeenkomstgegevens beschikbaar gemaakt."
 
-#: calendar/gui/e-itip-control.c:1187
+#: calendar/gui/e-itip-control.c:1186
 msgid "Meeting Information"
 msgstr "Bijeenkomst Informatie"
 
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1191
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> verzoekt %s om bij de bijeenkomst aanwezig te zijn."
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1193
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> verzoekt u bij de bijeenkomst aanwezig te zijn."
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1194
 msgid "Meeting Proposal"
 msgstr "Vergadering Voorstel"
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> wil graag aan een bestaande bijeenkomst bijdragen."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Update"
 msgstr "Vergadering Update"
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1203
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> wil graag  de laatste bijeenkomstgegevens ontvangen."
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1204
 msgid "Meeting Update Request"
 msgstr "VergaderingsUpdate Verzoek"
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s<b> heeft geantwoord op een bijeenkomstverzoek."
 
-#: calendar/gui/e-itip-control.c:1213
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Reply"
 msgstr "Bijeenkomst Antwoord"
 
-#: calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1219
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> heeft een bijeenkomst geannuleerd."
 
-#: calendar/gui/e-itip-control.c:1221
+#: calendar/gui/e-itip-control.c:1220
 msgid "Meeting Cancellation"
 msgstr "Bijeenkomst Annulering"
 
-#: calendar/gui/e-itip-control.c:1228 calendar/gui/e-itip-control.c:1296
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1330
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> heeft een onleesbaar bericht gestuurd."
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1228
 msgid "Bad Meeting Message"
 msgstr "Fout Bijeenkomstbericht"
 
-#: calendar/gui/e-itip-control.c:1254
+#: calendar/gui/e-itip-control.c:1253
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> heeft taakgegevens beschikbaar gemaakt."
 
-#: calendar/gui/e-itip-control.c:1255
+#: calendar/gui/e-itip-control.c:1254
 msgid "Task Information"
 msgstr "Taak Informatie"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1259
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> verzoekt %s om een taak uit te voeren."
 
-#: calendar/gui/e-itip-control.c:1262
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> verzoekt u een taak uit te voeren."
 
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1262
 msgid "Task Proposal"
 msgstr "Taak Voorstel"
 
-#: calendar/gui/e-itip-control.c:1267
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> wil graag iets toevoegen aan een bestaande taak."
 
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Update"
 msgstr "Taak Update"
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1271
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> wil graag de laatste taakgegevens ontvangen."
 
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1272
 msgid "Task Update Request"
 msgstr "Taak Update Verzoek"
 
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> heeft een taakopdracht beantwoord."
 
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Reply"
 msgstr "Taak Antwoord"
 
-#: calendar/gui/e-itip-control.c:1288
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> heeft een taak geannuleerd."
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1288
 msgid "Task Cancellation"
 msgstr "Taak Annulering"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1296
 msgid "Bad Task Message"
 msgstr "Fout Taakbericht"
 
-#: calendar/gui/e-itip-control.c:1316
+#: calendar/gui/e-itip-control.c:1315
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s<b> heeft vrij/bezet informatie gepubliceerd."
 
-#: calendar/gui/e-itip-control.c:1317
+#: calendar/gui/e-itip-control.c:1316
 msgid "Free/Busy Information"
 msgstr "Vrij/Bezet Informatie"
 
-#: calendar/gui/e-itip-control.c:1321
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> vraagt om uw beschikbaarheidsinformatie."
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1321
 msgid "Free/Busy Request"
 msgstr "Vrij/Bezet Verzoek"
 
-#: calendar/gui/e-itip-control.c:1326
+#: calendar/gui/e-itip-control.c:1325
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> heeft een verzoek om beschikbaarheidsinformatie beantwoord."
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1326
 msgid "Free/Busy Reply"
 msgstr "Vrij/Bezet Antwoord"
 
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1331
 msgid "Bad Free/Busy Message"
 msgstr "Foutief Vrij/Bezet Bericht"
 
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1406
 msgid "The message does not appear to be properly formed"
 msgstr "Het bericht lijkt niet goed opgemaakt te zijn"
 
-#: calendar/gui/e-itip-control.c:1466
+#: calendar/gui/e-itip-control.c:1465
 msgid "The message contains only unsupported requests."
 msgstr "Het bericht bevat slechts niet ondersteunde aanvragen."
 
-#: calendar/gui/e-itip-control.c:1497
+#: calendar/gui/e-itip-control.c:1496
 msgid "The attachment does not contain a valid calendar message"
 msgstr "De bijlage bevat geen geldig kalenderbericht"
 
-#: calendar/gui/e-itip-control.c:1529
+#: calendar/gui/e-itip-control.c:1528
 msgid "The attachment has no viewable calendar items"
 msgstr "De bijlage heeft geen bekijkbaar kalenderobject"
 
-#: calendar/gui/e-itip-control.c:1763
+#: calendar/gui/e-itip-control.c:1762
 msgid "Update complete\n"
 msgstr "Update Voltooid\n"
 
-#: calendar/gui/e-itip-control.c:1793 calendar/gui/e-itip-control.c:1865
+#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Bezoekerstatus kan niet ververst worden omdat het object niet meer bestaat"
 
-#: calendar/gui/e-itip-control.c:1809 calendar/gui/e-itip-control.c:1847
+#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Object is ongeldig en kan niet worden bijgewerkt\n"
 
-#: calendar/gui/e-itip-control.c:1819
+#: calendar/gui/e-itip-control.c:1818
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Dit antwoord is niet van een geregistreerd staand persoon. Toevoegen in "
 "registratie?"
 
-#: calendar/gui/e-itip-control.c:1831
+#: calendar/gui/e-itip-control.c:1830
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Bezoekerstatus kon niet ververst worden vanwege een ongeldige status!\n"
 
-#: calendar/gui/e-itip-control.c:1850
+#: calendar/gui/e-itip-control.c:1849
 msgid "There was an error on the CORBA system\n"
 msgstr "Er is een fout opgetreden in het CORBA-systeem\n"
 
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1852
 msgid "Object could not be found\n"
 msgstr "Object kan niet worden gevonden\n"
 
-#: calendar/gui/e-itip-control.c:1856
+#: calendar/gui/e-itip-control.c:1855
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "U heeft niet de juiste rechten om de kalender te vernieuwen\n"
 
-#: calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1858
 msgid "Attendee status updated\n"
 msgstr "Bezoekerstatus ververst\n"
 
-#: calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1861
 msgid "Attendee status could not be updated!\n"
 msgstr "Aanwezigheidstatus kon niet worden bijgewerkt!\n"
 
-#: calendar/gui/e-itip-control.c:1893
+#: calendar/gui/e-itip-control.c:1892
 msgid "Removal Complete"
 msgstr "Verwijderen Voltooid"
 
-#: calendar/gui/e-itip-control.c:1916 calendar/gui/e-itip-control.c:1964
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
 msgid "Item sent!\n"
 msgstr "Item Verzonden!\n"
 
-#: calendar/gui/e-itip-control.c:1918 calendar/gui/e-itip-control.c:1968
+#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
 msgid "The item could not be sent!\n"
 msgstr "Dit item kon niet verzonden worden!\n"
 
@@ -6276,74 +6160,74 @@ msgstr "einddatum"
 msgid "date-start"
 msgstr "begindatum"
 
-#: calendar/gui/e-meeting-list-view.c:62
+#: calendar/gui/e-meeting-list-view.c:59
 msgid "Chair Persons"
 msgstr "Voorzitters"
 
-#: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:480
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
 msgid "Required Participants"
 msgstr "Vereiste Deelnemers"
 
-#: calendar/gui/e-meeting-list-view.c:64
+#: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Optionele Deelnemers"
 
-#: calendar/gui/e-meeting-list-view.c:65
+#: calendar/gui/e-meeting-list-view.c:62
 msgid "Resources"
 msgstr "Hulpbronnen"
 
-#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
 #: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr "Persoon"
 
-#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "Groep"
 
-#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr "Hulpbron"
 
-#: calendar/gui/e-meeting-list-view.c:144 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr "Kamer"
 
-#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr "Voorzitter"
 
-#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:127
 #: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
 msgid "Required Participant"
 msgstr "Vereiste deelnemer"
 
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr "Optionele deelnemer"
 
-#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr "Niet-deelnemer"
 
-#: calendar/gui/e-meeting-list-view.c:180 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:177
 #: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
 msgid "Needs Action"
 msgstr "Heeft actie nodig"
 
-#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
 #: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "Voorlopig"
 
-#: calendar/gui/e-meeting-list-view.c:184 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr "Overgedragen"
@@ -6360,20 +6244,28 @@ msgstr "Afwezig"
 msgid "No Information"
 msgstr "Geen informatie"
 
+#: calendar/gui/e-meeting-time-sel.c:417
+#, fuzzy
+msgid "Add attendees from addressbook"
+msgstr "Afzender aan adresboe_k toevoegen"
+
 #: calendar/gui/e-meeting-time-sel.c:440
 msgid "_Options"
 msgstr "_Opties"
 
 #: calendar/gui/e-meeting-time-sel.c:457
-msgid "Show _Only Working Hours"
+#, fuzzy
+msgid "Show _only working hours"
 msgstr "Alleen kantooruren t_onen"
 
 #: calendar/gui/e-meeting-time-sel.c:467
-msgid "Show _Zoomed Out"
+#, fuzzy
+msgid "Show _zoomed out"
 msgstr "Uitge_zoomd tonen"
 
 #: calendar/gui/e-meeting-time-sel.c:482
-msgid "_Update Free/Busy"
+#, fuzzy
+msgid "_Update free/busy"
 msgstr "Vrij/Bezet _actualiseren"
 
 #: calendar/gui/e-meeting-time-sel.c:497
@@ -6389,19 +6281,23 @@ msgid ">_>"
 msgstr ">_>"
 
 #: calendar/gui/e-meeting-time-sel.c:547
-msgid "_All People and Resources"
+#, fuzzy
+msgid "_All people and resources"
 msgstr "_Alle mensen en hulpbronnen"
 
 #: calendar/gui/e-meeting-time-sel.c:556
-msgid "All _People and One Resource"
+#, fuzzy
+msgid "All _people and one resource"
 msgstr "Alle _mensen en één hulpbron"
 
 #: calendar/gui/e-meeting-time-sel.c:565
-msgid "_Required People"
+#, fuzzy
+msgid "_Required people"
 msgstr "_Vereiste mensen"
 
 #: calendar/gui/e-meeting-time-sel.c:574
-msgid "Required People and _One Resource"
+#, fuzzy
+msgid "Required people and _one resource"
 msgstr "Vereiste mensen en één hulpbr_on"
 
 #: calendar/gui/e-meeting-time-sel.c:593
@@ -6421,10 +6317,6 @@ msgstr "%A, %d %B, %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#. This is a strftime() format string %a = abbreviated weekday
-#. name, %m = month number, %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. strftime format of a weekday and a date.
 #: calendar/gui/e-meeting-time-sel.c:2093
 #: calendar/gui/e-meeting-time-sel-item.c:456 e-util/e-time-utils.c:203
 #: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
@@ -6433,10 +6325,6 @@ msgstr "%a %d-%m-%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. This is the preferred date format for the locale.
-#. This is a strftime() format for a short date. %m = month,
-#. %d = day of month, %Y = year (all digits).
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
 #: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
 msgid "%m/%d/%Y"
@@ -6447,7 +6335,7 @@ msgstr "%d-%m-%Y"
 msgid "Enter the password for %s"
 msgstr "Voer uw wachtwoord in voor %s"
 
-#: calendar/gui/e-tasks.c:585 calendar/gui/gnome-cal.c:2019
+#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6458,12 +6346,12 @@ msgstr ""
 
 #. FIXME Loading should be async
 #. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:680
+#: calendar/gui/e-tasks.c:801
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Bezig met openen taken op %s"
 
-#: calendar/gui/e-tasks.c:703
+#: calendar/gui/e-tasks.c:824
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6472,47 +6360,47 @@ msgstr ""
 "Fout bij openen %s:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:724
+#: calendar/gui/e-tasks.c:845
 msgid "Loading tasks"
 msgstr "Taken laden"
 
-#: calendar/gui/e-tasks.c:828
+#: calendar/gui/e-tasks.c:949
 msgid "Completing tasks..."
 msgstr "Bezig met afronden van taken..."
 
-#: calendar/gui/e-tasks.c:851
+#: calendar/gui/e-tasks.c:972
 msgid "Deleting selected objects..."
 msgstr "Geselecteerde objecten worden verwijderd..."
 
-#: calendar/gui/e-tasks.c:878
+#: calendar/gui/e-tasks.c:999
 msgid "Expunging"
 msgstr "Bezig met schrappen"
 
-#: calendar/gui/e-tasks.c:954
+#: calendar/gui/e-tasks.c:1075
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
-#: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
+#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
+#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
 #: calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:705
 msgid "Tasks"
 msgstr "Taken"
 
-#: calendar/gui/gnome-cal.c:1877
+#: calendar/gui/gnome-cal.c:1878
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Bezig met het laden van afspraken uit %s"
 
-#: calendar/gui/gnome-cal.c:1896
+#: calendar/gui/gnome-cal.c:1897
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Bezig met het laden van taken uit %s"
 
-#: calendar/gui/gnome-cal.c:1919
+#: calendar/gui/gnome-cal.c:1920
 #, c-format
 msgid "Opening %s"
 msgstr "Bezig met openen van %s"
 
-#: calendar/gui/gnome-cal.c:2890
+#: calendar/gui/gnome-cal.c:2906
 msgid "Purging"
 msgstr "Legen"
 
@@ -6711,7 +6599,7 @@ msgid "On The Web"
 msgstr "Op het web"
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 
@@ -6722,7 +6610,7 @@ msgid "Unable to migrate calendar `%s'"
 msgstr "Kan de agenda '%s' niet openen."
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:869
+#: calendar/gui/migration.c:889
 #, fuzzy, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Kan taken in '%s' niet openen."
@@ -6958,75 +6846,75 @@ msgstr "Item afdrukken"
 msgid "Print Setup"
 msgstr "Printerinstellingen"
 
-#: calendar/gui/tasks-component.c:303
+#: calendar/gui/tasks-component.c:313
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 "Takenlijst '%s' zal worden verwijderd. Weet u zeker dat u door wilt gaan?"
 
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:371
 msgid "New Task List"
 msgstr "Nieuwe takenlijst"
 
-#: calendar/gui/tasks-component.c:398
+#: calendar/gui/tasks-component.c:408
 #, fuzzy, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d kaarten"
 msgstr[1] "%d kaarten"
 
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:502
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] "%d geselecteerd"
 msgstr[1] "%d geselecteerd"
 
-#: calendar/gui/tasks-component.c:447
+#: calendar/gui/tasks-component.c:457
 #, fuzzy
 msgid "Failed upgrading tasks."
 msgstr "Taken laden"
 
-#: calendar/gui/tasks-component.c:526
+#: calendar/gui/tasks-component.c:749
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 "Kan de takenlijst '%s' niet openen voor het creëren van gebeurtenissen en "
 "afspraken"
 
-#: calendar/gui/tasks-component.c:538
+#: calendar/gui/tasks-component.c:761
 msgid "There is no calendar available for creating tasks"
 msgstr "Er is geen agenda beschikbaar voor het aanmaken van taken"
 
-#: calendar/gui/tasks-component.c:576
+#: calendar/gui/tasks-component.c:799
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:804
+#: calendar/gui/tasks-component.c:1040
 msgid "New task"
 msgstr "Nieuwe Taak"
 
-#: calendar/gui/tasks-component.c:805
+#: calendar/gui/tasks-component.c:1041
 msgid "_Task"
 msgstr "_Taak"
 
-#: calendar/gui/tasks-component.c:806
+#: calendar/gui/tasks-component.c:1042
 msgid "Create a new task"
 msgstr "Nieuwe taak aanmaken"
 
-#: calendar/gui/tasks-component.c:812
+#: calendar/gui/tasks-component.c:1048
 #, fuzzy
 msgid "New tasks group"
 msgstr "Nieuwsgroepen"
 
-#: calendar/gui/tasks-component.c:813
+#: calendar/gui/tasks-component.c:1049
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Takenlijst-groep"
 
-#: calendar/gui/tasks-component.c:814
+#: calendar/gui/tasks-component.c:1050
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Nieuwe taak aanmaken"
@@ -8854,17 +8742,17 @@ msgstr ""
 msgid "(match-threads) requires a match type string"
 msgstr ""
 
-#: camel/camel-folder-search.c:785
+#: camel/camel-folder-search.c:784
 #, fuzzy
 msgid "(match-threads) expects an array result"
 msgstr "(past-allen) vereist enkelvoudig booleaans resultaat"
 
-#: camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:790
 #, fuzzy
 msgid "(match-threads) requires the folder set"
 msgstr "(past-allen) vereist enkelvoudig booleaans resultaat"
 
-#: camel/camel-folder-search.c:880
+#: camel/camel-folder-search.c:879
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Bezig met zoeken naar onbekende koptekst: %s"
@@ -8899,7 +8787,8 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
 #: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:705
+#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Geannuleerd."
@@ -9283,7 +9172,7 @@ msgstr "De referentie-informatie is verlopen."
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1243
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Fout aanmeldingsantwoord van server."
 
@@ -9668,40 +9557,40 @@ msgstr "Opdracht niet geïmplementeerd"
 msgid "export keys: unimplemented"
 msgstr ""
 
-#: camel/camel-store.c:215
+#: camel/camel-store.c:213
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Kan map niet verkrijgen: Ongeldige bewerking op deze opslag"
 
-#: camel/camel-store.c:245
+#: camel/camel-store.c:243
 #, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr "Kan map `%s' niet aanmaken: map bestaat reeds"
 
-#: camel/camel-store.c:299
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Kan map niet maken: Ongeldige bewerking op deze opslag"
 
-#: camel/camel-store.c:327
+#: camel/camel-store.c:325
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Kan map `%s' niet aanmaken: map bestaat reeds"
 
-#: camel/camel-store.c:391 camel/camel-vee-store.c:354
+#: camel/camel-store.c:389 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kon map: %s niet verwijderen: Ongeldige bewerking"
 
-#: camel/camel-store.c:441 camel/camel-vee-store.c:390
+#: camel/camel-store.c:439 camel/camel-vee-store.c:387
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kon de naam van de map: %s niet wijzigen: ongeldige bewerking"
 
-#: camel/camel-store.c:813
+#: camel/camel-store.c:777
 msgid "Trash"
 msgstr "Prullenbak"
 
-#: camel/camel-store.c:815 filter/libfilter-i18n.h:35
-#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/mail-config.glade.h:95
+#: ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Troep"
 
@@ -9932,12 +9821,12 @@ msgstr "Dergelijk bericht %s bestaat niet in %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Kan berichten niet naar een VMap verplaatsen of kopiëren"
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:374
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kon map: %s niet verwijderen: map bestaat niet"
 
-#: camel/camel-vee-store.c:398
+#: camel/camel-vee-store.c:395
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kon de naam van map: %s niet wijzigen naar: map bestaat niet"
@@ -10003,8 +9892,8 @@ msgstr ""
 "Deze optie zal bij het verbinden met de IMAP-server het wachtwoord versturen "
 "als platte tekst."
 
-#: camel/providers/groupwise/camel-gw-listener.c:305
-#: camel/providers/groupwise/camel-gw-listener.c:328
+#: camel/providers/groupwise/camel-gw-listener.c:312
+#: camel/providers/groupwise/camel-gw-listener.c:335
 msgid "Checklist"
 msgstr "Aftekenlijst"
 
@@ -10144,23 +10033,23 @@ msgstr ""
 "als platte tekst."
 
 #: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:429
+#: camel/providers/imap/camel-imap-store.c:428
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP-server %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:431
+#: camel/providers/imap/camel-imap-store.c:430
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP-dienst voor %s op %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:208
 #: camel/providers/imap4/camel-imap4-store.c:225
-#: camel/providers/imap/camel-imap-store.c:552
-#: camel/providers/imap/camel-imap-store.c:572
+#: camel/providers/imap/camel-imap-store.c:551
+#: camel/providers/imap/camel-imap-store.c:571
 #: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
+#: camel/providers/nntp/camel-nntp-store.c:209
 #: camel/providers/pop3/camel-pop3-store.c:175
 #: camel/providers/smtp/camel-smtp-transport.c:269
 #: camel/providers/smtp/camel-smtp-transport.c:285
@@ -10169,18 +10058,18 @@ msgid "Could not connect to %s (port %d): %s"
 msgstr "Kon niet verbinden met %s (poort %d): %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:210
-#: camel/providers/imap/camel-imap-store.c:554
+#: camel/providers/imap/camel-imap-store.c:553
 #: camel/providers/pop3/camel-pop3-store.c:177
 #: camel/providers/smtp/camel-smtp-transport.c:271
 msgid "SSL unavailable"
 msgstr "SSL is niet beschikbaar"
 
 #: camel/providers/imap4/camel-imap4-store.c:222
-#: camel/providers/imap/camel-imap-store.c:569
-#: camel/providers/imap/camel-imap-store.c:846
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/imap/camel-imap-store.c:845
 #: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:137
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
 #: camel/providers/pop3/camel-pop3-store.c:192
 msgid "Connection cancelled"
 msgstr "Verbinding geannuleerd"
@@ -10195,8 +10084,8 @@ msgstr ""
 "ondersteund geen STARTTLS"
 
 #: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:680
-#: camel/providers/imap/camel-imap-store.c:711
+#: camel/providers/imap/camel-imap-store.c:679
+#: camel/providers/imap/camel-imap-store.c:710
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Fout bij opzetten van beveiligde verbinding met IMAP-server %s: %s"
@@ -10205,7 +10094,7 @@ msgstr "Fout bij opzetten van beveiligde verbinding met IMAP-server %s: %s"
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1108
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
 msgid "Unknown error"
 msgstr "Onbekende fout"
 
@@ -10233,8 +10122,8 @@ msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr "Kan map niet verkrijgen `%s': %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1890
-#: camel/providers/imap/camel-imap-store.c:2268
+#: camel/providers/imap/camel-imap-store.c:1885
+#: camel/providers/imap/camel-imap-store.c:2263
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -10313,12 +10202,12 @@ msgstr "De verbinding is onverwacht verbroken door de IMAP-server %s: %s"
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3201
+#: camel/providers/imap/camel-imap-store.c:3194
 msgid "Operation cancelled"
 msgstr "Operatie geannuleerd"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3204
+#: camel/providers/imap/camel-imap-store.c:3197
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server verbrak onverwacht de verbinding: %s"
@@ -10399,7 +10288,7 @@ msgstr "Een dergelijk bericht bestaat niet"
 
 #: camel/providers/imap/camel-imap-folder.c:2019
 #: camel/providers/imap/camel-imap-folder.c:2622
-#: camel/providers/nntp/camel-nntp-folder.c:238
+#: camel/providers/nntp/camel-nntp-folder.c:220
 msgid "This message is not currently available"
 msgstr "Dit bericht is nu niet beschikbaar"
 
@@ -10483,43 +10372,43 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Voor het lezen en opslaan van post op IMAP servers."
 
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:680
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS extensie niet ondersteund"
 
-#: camel/providers/imap/camel-imap-store.c:712
+#: camel/providers/imap/camel-imap-store.c:711
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL-onderhandelingen mislukt"
 
-#: camel/providers/imap/camel-imap-store.c:849
+#: camel/providers/imap/camel-imap-store.c:848
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Kon niet verbinden met commando \"%s\": %s"
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1272
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP-server %s ondersteunt het gevraagde aanmeldingstype %s niet"
 
-#: camel/providers/imap/camel-imap-store.c:1285
+#: camel/providers/imap/camel-imap-store.c:1282
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Geen ondersteuning voor aanmeldingstype %s"
 
-#: camel/providers/imap/camel-imap-store.c:1308
+#: camel/providers/imap/camel-imap-store.c:1305
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sVoer het IMAP-wachtwoord voor %s@%s in"
 
-#: camel/providers/imap/camel-imap-store.c:1322
+#: camel/providers/imap/camel-imap-store.c:1319
 msgid "You didn't enter a password."
 msgstr "U heeft geen wachtwoord ingevoerd"
 
-#: camel/providers/imap/camel-imap-store.c:1351
+#: camel/providers/imap/camel-imap-store.c:1348
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10530,18 +10419,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1872
-#: camel/providers/imap/camel-imap-store.c:2062
+#: camel/providers/imap/camel-imap-store.c:1867
+#: camel/providers/imap/camel-imap-store.c:2057
 #, c-format
 msgid "No such folder %s"
 msgstr "Map `%s' bestaat niet."
 
-#: camel/providers/imap/camel-imap-store.c:1948
-#: camel/providers/imap/camel-imap-store.c:2329
+#: camel/providers/imap/camel-imap-store.c:1943
+#: camel/providers/imap/camel-imap-store.c:2324
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "De map kan geen submappen bevatten"
 
-#: camel/providers/imap/camel-imap-store.c:2003
+#: camel/providers/imap/camel-imap-store.c:1998
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10549,7 +10438,7 @@ msgstr "De map kan geen submappen bevatten"
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Kan map `%s' niet aanmaken: map bestaat reeds."
 
-#: camel/providers/imap/camel-imap-store.c:2279
+#: camel/providers/imap/camel-imap-store.c:2274
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Onbekende oudermap: %s"
@@ -10586,20 +10475,20 @@ msgid "Index message body data"
 msgstr "Indexeer bericht body data"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:388
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:393
-#: camel/providers/local/camel-local-folder.c:396
+#: camel/providers/local/camel-local-folder.c:392
+#: camel/providers/local/camel-local-folder.c:395
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "postbus: %s: (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:400
+#: camel/providers/local/camel-local-folder.c:399
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -10660,7 +10549,7 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:142
 #: camel/providers/local/camel-local-store.c:253
-#: camel/providers/local/camel-mbox-store.c:356
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10792,9 +10681,9 @@ msgstr "Kon map `%s' niet verwijderen: %s"
 msgid "not a maildir directory"
 msgstr "geen maildir-directory"
 
-#: camel/providers/local/camel-maildir-store.c:341
-#: camel/providers/local/camel-spool-store.c:286
-#: camel/providers/local/camel-spool-store.c:316
+#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-spool-store.c:284
+#: camel/providers/local/camel-spool-store.c:314
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Kon map `%s' niet scannen: %s"
@@ -10852,7 +10741,7 @@ msgid "Message construction failed."
 msgstr "Opbouwen bericht mislukt: Beschadigde mailbox?"
 
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:362
+#: camel/providers/local/camel-mbox-store.c:361
 msgid "Cannot create a folder by this name."
 msgstr "Kan geen map met die naam maken"
 
@@ -10882,30 +10771,30 @@ msgstr "`%s' is geen normaal bestand."
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Map `%s' is niet leeg. Niet verwijderd."
 
-#: camel/providers/local/camel-mbox-store.c:375
+#: camel/providers/local/camel-mbox-store.c:374
 #, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Kan directory `%s' niet maken: %s."
 
-#: camel/providers/local/camel-mbox-store.c:389
+#: camel/providers/local/camel-mbox-store.c:388
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Kan de map niet aanmaken: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:391
+#: camel/providers/local/camel-mbox-store.c:390
 msgid "Folder already exists"
 msgstr "Map bestaat reeds"
 
-#: camel/providers/local/camel-mbox-store.c:473
+#: camel/providers/local/camel-mbox-store.c:472
 msgid "The new folder name is illegal."
 msgstr "De opgegeven mapnaam is niet geldig."
 
-#: camel/providers/local/camel-mbox-store.c:486
+#: camel/providers/local/camel-mbox-store.c:485
 #, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Kon `%s' niet hernoemen: `%s': %s"
 
-#: camel/providers/local/camel-mbox-store.c:561
+#: camel/providers/local/camel-mbox-store.c:560
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Kan de map niet hernoemen van '%s' naar %s: %s"
@@ -11096,7 +10985,7 @@ msgstr ""
 "Map is wellicht beschadigd, kopie opgeslagen in '%s'"
 
 #: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:997
+#: camel/providers/nntp/camel-nntp-store.c:1126
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Voer het NNTP wachtwoord in voor %s@%s"
@@ -11113,18 +11002,10 @@ msgstr "Kon de gebruikersnaam niet naar de server versturen"
 msgid "Server rejected username/password"
 msgstr "De server heeft de gebruikersnaam of het wachtwoord geweigerd"
 
-#: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:263
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr "Gebruiker geannuleerd"
-
-#: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:259
-#: camel/providers/nntp/camel-nntp-folder.c:265
+#: camel/providers/nntp/camel-nntp-folder.c:147
+#: camel/providers/nntp/camel-nntp-folder.c:149
+#: camel/providers/nntp/camel-nntp-folder.c:158
+#: camel/providers/nntp/camel-nntp-folder.c:234
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11133,62 +11014,49 @@ msgstr "Gebruiker geannuleerd"
 msgid "Cannot get message %s: %s"
 msgstr "Kan bericht: %s niet verkrijgen: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:188
-#: camel/providers/nntp/camel-nntp-folder.c:228
+#: camel/providers/nntp/camel-nntp-folder.c:156
+#: camel/providers/nntp/camel-nntp-folder.c:232
+#: camel/providers/nntp/camel-nntp-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+msgid "User cancelled"
+msgstr "Gebruiker geannuleerd"
+
+#: camel/providers/nntp/camel-nntp-folder.c:176
+#: camel/providers/nntp/camel-nntp-folder.c:208
 #, c-format
 msgid "Internal error: uid in invalid format: %s"
 msgstr "Interne foute: uid in ongeldig formaat: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:201
-#, c-format
-msgid "Could not get article %s from NNTP server"
-msgstr "Kon het artikel %s niet van de NNTP server verkrijgen"
-
-#: camel/providers/nntp/camel-nntp-folder.c:362
-msgid "Posting not allowed by news server"
-msgstr "Plaatsen niet toegestaan door nieuwsserver"
-
+#: camel/providers/nntp/camel-nntp-folder.c:328
+#: camel/providers/nntp/camel-nntp-folder.c:331
 #: camel/providers/nntp/camel-nntp-folder.c:373
-#, c-format
-msgid "Failed to send newsgroups header: %s: message not posted"
-msgstr ""
-"Het verzenden van nieuwsgroep kop is mislukt: %s\" bericht niet verzonden"
-
-#: camel/providers/nntp/camel-nntp-folder.c:413
-#: camel/providers/nntp/camel-nntp-folder.c:426
-#, c-format
-msgid "Error posting to newsgroup: %s: message not posted"
-msgstr "Fout bij plaatsen in nieuwsgroep: %s: bericht niet geplaatst"
-
-#: camel/providers/nntp/camel-nntp-folder.c:438
-msgid "Error reading response to posted message: message not posted"
-msgstr ""
-"Fout bij het lezen van het antwoord op gepost bericht: bericht niet gepost"
-
-#: camel/providers/nntp/camel-nntp-folder.c:441
-#, c-format
-msgid "Error posting message: %s: message not posted"
-msgstr "Fout bij plaatsen bericht: %s: bericht niet geplaatst"
+#: camel/providers/nntp/camel-nntp-folder.c:375
+#, fuzzy, c-format
+msgid "Posting failed: %s"
+msgstr "Bewerking mislukt: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:457
+#: camel/providers/nntp/camel-nntp-folder.c:393
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "U kunt geen NNTP berichten posten als u offline werkt!"
 
-#: camel/providers/nntp/camel-nntp-folder.c:468
+#: camel/providers/nntp/camel-nntp-folder.c:404
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Het kopieëren van berichten vanuit een NNTP folder is onmogelijk!"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:44
 msgid "Could not get group list from server."
 msgstr "Kan de groepenlijst niet van de server ophalen."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#: camel/providers/nntp/camel-nntp-grouplist.c:97
+#: camel/providers/nntp/camel-nntp-grouplist.c:106
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "Kan groeplijst bestand voor %s niet laden: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#: camel/providers/nntp/camel-nntp-grouplist.c:157
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Kon groepslijstbestand voor %s niet opslaan: %s"
@@ -11220,26 +11088,29 @@ msgid ""
 msgstr ""
 "Deze optie zal aanmelden bij de NNTP-server met een wachtwoord platte tekst."
 
-#: camel/providers/nntp/camel-nntp-store.c:158
+#: camel/providers/nntp/camel-nntp-store.c:118
+#: camel/providers/nntp/camel-nntp-store.c:1233
+#: camel/providers/nntp/camel-nntp-store.c:1331
+#, c-format
+msgid "NNTP Command failed: %s"
+msgstr "NNTP-Opdracht mislukt: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:227
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Kon groet van %s niet lezen: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:170
+#: camel/providers/nntp/camel-nntp-store.c:239
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP server %s retourneerde foutcode %d: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:326
+#: camel/providers/nntp/camel-nntp-store.c:403
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET-Nieuws via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:640
-msgid "Stream error"
-msgstr "Stream fout"
-
-#: camel/providers/nntp/camel-nntp-store.c:643
+#: camel/providers/nntp/camel-nntp-store.c:777
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -11250,7 +11121,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/providers/nntp/camel-nntp-store.c:735
+#: camel/providers/nntp/camel-nntp-store.c:872
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
@@ -11261,7 +11132,7 @@ msgstr ""
 "Groep bestaat niet. Het geselecteerde item is waarschijnlijk een "
 "bovenliggende map."
 
-#: camel/providers/nntp/camel-nntp-store.c:767
+#: camel/providers/nntp/camel-nntp-store.c:904
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
@@ -11271,63 +11142,63 @@ msgstr ""
 "\n"
 "nieuwsgroep bestaat niet!"
 
-#: camel/providers/nntp/camel-nntp-store.c:792
+#: camel/providers/nntp/camel-nntp-store.c:929
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 "U kan geen map aanmaken in een nieuws opslag, in plaats hiervan kunt u "
 "inschrijven."
 
-#: camel/providers/nntp/camel-nntp-store.c:800
+#: camel/providers/nntp/camel-nntp-store.c:937
 msgid "You cannot rename a folder in a News store."
 msgstr "U kan geen mappen hernoemen in een nieuws opslag."
 
-#: camel/providers/nntp/camel-nntp-store.c:808
+#: camel/providers/nntp/camel-nntp-store.c:945
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 "Het is niet mogelijk om een map in een nieuws opslag te verwijderen, in "
 "plaats hiervan kunt u uitschrijven."
 
-#: camel/providers/nntp/camel-nntp-summary.c:253
-#, c-format
-msgid "Connection error: %s"
-msgstr "Verbindings fout: %s"
-
-#: camel/providers/nntp/camel-nntp-summary.c:262
-#, c-format
-msgid "No such folder: %s"
-msgstr "Map: %s bestaat niet"
+#: camel/providers/nntp/camel-nntp-store.c:1118
+#, fuzzy
+msgid "Authentication requested but not username provided"
+msgstr "Aanmelding is vereist"
 
-#: camel/providers/nntp/camel-nntp-summary.c:268
-#, c-format
-msgid "Could not get group: %s"
-msgstr "Kon de groep: %s niet verkrijgen"
+#: camel/providers/nntp/camel-nntp-store.c:1146
+#, fuzzy, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr "Authenticatie op IMAP-server %s middels %s mislukt"
 
-#: camel/providers/nntp/camel-nntp-summary.c:333
+#: camel/providers/nntp/camel-nntp-store.c:1262
 #, fuzzy
-msgid "Could not get messages: unspecified error"
-msgstr "Kan berichten niet verkrijgen: ongespecificeerde fout"
+msgid "Not connected."
+msgstr "Geen contacten"
 
-#: camel/providers/nntp/camel-nntp-summary.c:378
+#: camel/providers/nntp/camel-nntp-store.c:1311
 #, c-format
-msgid "NNTP Command failed: %s"
-msgstr "NNTP-Opdracht mislukt: %s"
+msgid "No such folder: %s"
+msgstr "Map: %s bestaat niet"
 
-#: camel/providers/nntp/camel-nntp-summary.c:438
-#: camel/providers/nntp/camel-nntp-summary.c:543
+#: camel/providers/nntp/camel-nntp-summary.c:218
+#: camel/providers/nntp/camel-nntp-summary.c:314
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: nieuwe berichten doorzoeken"
 
-#: camel/providers/nntp/camel-nntp-summary.c:558
-#, c-format
-msgid "Unknown server response: %s"
-msgstr "Onbekend server-antwoord: %s"
+#: camel/providers/nntp/camel-nntp-summary.c:225
+#, fuzzy, c-format
+msgid "Unexpected server response from xover: %s"
+msgstr "Onverwacht antwoord van IMAP-server: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:605
+#: camel/providers/nntp/camel-nntp-summary.c:328
+#, fuzzy, c-format
+msgid "Unexpected server response from head: %s"
+msgstr "Onverwacht antwoord van GnuPG: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:368
 msgid "Use cancel"
 msgstr "Gebruik annuleren"
 
-#: camel/providers/nntp/camel-nntp-summary.c:607
+#: camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Bewerking mislukt: %s"
@@ -12030,17 +11901,17 @@ msgstr "Bestand(en) bijvoegen"
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
+msgid "You cannot attach the file `{0}' to this message."
 msgstr "Voeg een bestand bij het bericht"
 
 #. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4
-msgid "${1}"
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
 msgstr ""
 
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
 
 #. mail-composer:attach-directory primary
@@ -12135,7 +12006,7 @@ msgstr "Kon de pijp niet maken: %s"
 
 #. mail-composer:no-build-message secondary
 #: composer/mail-composer-errors.xml.h:34
-msgid "Because \"${0}\", you may need to select different mail options."
+msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
@@ -12145,8 +12016,10 @@ msgid "Could not read signature file \"{0}\"."
 msgstr "Kon handtekening-bestand niet opslaan: %s"
 
 #. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38
-msgid "Because \"${1}\"."
+#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted primary
@@ -12312,16 +12185,12 @@ msgstr "Categorieën Actualiseren:"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
 #: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %m/%d/%Y %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
 #: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d-%m-%Y %H:%M:%S"
@@ -12373,31 +12242,23 @@ msgid "%m/%d/%Y %H"
 msgstr "%m/%d/%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#. strftime format of a time in 12-hour format.
 #: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p%n"
 
 #. strptime format for a time of day, in 24-hour format.
-#. strftime format of a time in 24-hour format.
 #: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S%n"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
 #: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
 #: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
 msgid "%H:%M"
@@ -12496,7 +12357,6 @@ msgid "Missing file name."
 msgstr "Unieke _naam:"
 
 #. filter:no-file secondary
-#. filter:bad-file secondary
 #: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
 msgid "You must specify a file name."
 msgstr "U dient een bestandsnaam te geven."
@@ -12532,7 +12392,6 @@ msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
 #. filter:no-name primary
-#. filter:no-name-vfolder primary
 #: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
 #, fuzzy
 msgid "Missing name."
@@ -12675,8 +12534,8 @@ msgstr "met alle lokale folders"
 msgid "years"
 msgstr "jaren"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:1011
-#: mail/mail-config.c:76 mail/mail-config.glade.h:93
+#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
+#: mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Belangrijk"
 
@@ -12744,252 +12603,6 @@ msgstr "inkomend"
 msgid "outgoing"
 msgstr "uitgaand"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Adjust Score"
-msgstr "Score aanpassen"
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Color"
-msgstr "Geef Kleur"
-
-#: filter/libfilter-i18n.h:4
-msgid "Assign Score"
-msgstr "Geef Score"
-
-#: filter/libfilter-i18n.h:5
-msgid "Attachments"
-msgstr "Bijlages"
-
-#: filter/libfilter-i18n.h:6
-msgid "Beep"
-msgstr "Piep"
-
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "bevat"
-
-#: filter/libfilter-i18n.h:8
-msgid "Copy to Folder"
-msgstr "Naar map kopiëren"
-
-#: filter/libfilter-i18n.h:9
-msgid "Date received"
-msgstr "Ontvangstdatum"
-
-#: filter/libfilter-i18n.h:10
-msgid "Date sent"
-msgstr "Verzendingsdatum"
-
-#: filter/libfilter-i18n.h:12
-msgid "Deleted"
-msgstr "Verwijderd"
-
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "bevat niet"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "eindigt niet op"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "bestaat niet"
-
-#: filter/libfilter-i18n.h:16
-msgid "does not return"
-msgstr "komt niet terug"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "klinkt niet als"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "begint niet met"
-
-#: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
-msgstr "bestaat niet"
-
-#: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr "Klad"
-
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "eindigt op"
-
-#: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr "Bestaat"
-
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "bestaat"
-
-#: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr "Expressie"
-
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr "Antwoord"
-
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "is"
-
-#: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr "is na"
-
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr "is voor"
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr "is gemarkeerd"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "is groter dan"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "is kleiner dan"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "is niet"
-
-#: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr "Is niet gemarkeerd"
-
-#: filter/libfilter-i18n.h:36
-msgid "Junk Test"
-msgstr "Troep test"
-
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
-#: widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Label"
-
-#: filter/libfilter-i18n.h:38
-msgid "Mailing list"
-msgstr "Mailinglijst"
-
-#: filter/libfilter-i18n.h:39
-msgid "Message Body"
-msgstr "Berichtinhoud"
-
-#: filter/libfilter-i18n.h:40
-msgid "Message Header"
-msgstr "Berichtkop"
-
-#: filter/libfilter-i18n.h:41
-msgid "Message is Junk"
-msgstr "Bericht is troep"
-
-#: filter/libfilter-i18n.h:42
-msgid "Message is not Junk"
-msgstr "Bericht is geen troep"
-
-#: filter/libfilter-i18n.h:43
-msgid "Move to Folder"
-msgstr "Naar map verplaatsen"
-
-#: filter/libfilter-i18n.h:44
-msgid "Pipe to Program"
-msgstr "Naar programma doorsluizen"
-
-#: filter/libfilter-i18n.h:45
-msgid "Play Sound"
-msgstr "Geluid afspelen"
-
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Gelezen"
-
-#: filter/libfilter-i18n.h:47
-msgid "Recipients"
-msgstr "Geadresseerden"
-
-#: filter/libfilter-i18n.h:48
-msgid "Regex Match"
-msgstr "Overeenkomende regex"
-
-#: filter/libfilter-i18n.h:49
-msgid "Replied to"
-msgstr "Beantwoord aan"
-
-#: filter/libfilter-i18n.h:50
-msgid "returns"
-msgstr "komt terug"
-
-#: filter/libfilter-i18n.h:51
-msgid "returns greater than"
-msgstr "geeft groter dan"
-
-#: filter/libfilter-i18n.h:52
-msgid "returns less than"
-msgstr "geeft kleiner dan"
-
-#: filter/libfilter-i18n.h:53
-msgid "Run Program"
-msgstr "Start een programma"
-
-#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Score"
-
-#: filter/libfilter-i18n.h:55
-msgid "Sender"
-msgstr "Afzender"
-
-#: filter/libfilter-i18n.h:56
-msgid "Set Status"
-msgstr "Stel Status in"
-
-#: filter/libfilter-i18n.h:57
-msgid "Size (kB)"
-msgstr "Grootte (kB)"
-
-#: filter/libfilter-i18n.h:58
-msgid "sounds like"
-msgstr "klinkt als"
-
-#: filter/libfilter-i18n.h:59
-msgid "Source Account"
-msgstr "Source-Account"
-
-#: filter/libfilter-i18n.h:60
-msgid "Specific header"
-msgstr "Specifieke kop"
-
-#: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "begint met"
-
-#: filter/libfilter-i18n.h:63
-msgid "Stop Processing"
-msgstr "Stop met Verwerken"
-
-#: filter/libfilter-i18n.h:64 mail/em-format.c:755 mail/em-format-html.c:1519
-#: mail/em-format-quote.c:302 mail/em-mailer-prefs.c:87
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
-#: smime/lib/e-cert.c:1079
-msgid "Subject"
-msgstr "Onderwerp"
-
-#: filter/libfilter-i18n.h:65
-msgid "Unset Status"
-msgstr "Status herstellen"
-
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Regel Toevoegen"
@@ -13006,6 +12619,11 @@ msgstr "Regelnaam"
 msgid "_Score Rules"
 msgstr "_Score regels"
 
+#: filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Score"
+
 #: filter/searchtypes.xml.h:1
 msgid "Body contains"
 msgstr "Inhoud bevat"
@@ -13084,13 +12702,13 @@ msgstr "Handtekening(en)"
 msgid "-------- Forwarded Message --------"
 msgstr "-------Doorgestuurd bericht-------"
 
-#: mail/em-composer-utils.c:1499
+#: mail/em-composer-utils.c:1495
 msgid "an unknown sender"
 msgstr "een onbekende afzender"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1509
+#: mail/em-composer-utils.c:1505
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "Op %a %d-%m-%Y, om %H:%M %%+05d uur schreef %%s:"
 
@@ -13128,8 +12746,8 @@ msgstr "<klik hier om een map te selecteren>"
 msgid "Create New Folder"
 msgstr "Nieuwe map aanmaken"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
-#: mail/mail-component.c:706
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
+#: mail/mail-component.c:704
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Specificeer waar de map gemaakt moet worden:"
@@ -13144,98 +12762,99 @@ msgstr "Crestview"
 msgid "Folder _name:"
 msgstr "Map_naam:"
 
-#: mail/em-folder-tree.c:839
+#: mail/em-folder-tree.c:833
 #, c-format
 msgid "Moving folder %s"
 msgstr "verplaatsen map %s"
 
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree.c:835
 #, c-format
 msgid "Copying folder %s"
 msgstr "Bezig met kopieëren van map %s"
 
-#: mail/em-folder-tree.c:848 mail/message-list.c:1561
+#: mail/em-folder-tree.c:842 mail/message-list.c:1561
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Berichten worden verplaatst naar map %s"
 
-#: mail/em-folder-tree.c:850 mail/message-list.c:1563
+#: mail/em-folder-tree.c:844 mail/message-list.c:1563
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Berichten worden gekopieërd naar map %s"
 
-#: mail/em-folder-tree.c:866
+#: mail/em-folder-tree.c:860
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Kan bericht(en) niet droppen in hoogste nivo opslag."
 
-#: mail/em-folder-tree.c:956 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Kopiëren naar map"
 
-#: mail/em-folder-tree.c:957 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Verplaatsen naar map"
 
-#: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2069
-#: mail/em-folder-tree.c:2556 mail/em-folder-view.c:798
+#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
+#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
 #: mail/message-list.c:1651
 msgid "_Move"
 msgstr "_Verplaatsen"
 
-#: mail/em-folder-tree.c:961 mail/message-list.c:1653
+#: mail/em-folder-tree.c:955 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "Annuleer Taak"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
 #: mail/em-folder-view.c:798 mail/em-folder-view.c:812
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Map selecteren"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
 #, fuzzy
 msgid "C_opy"
 msgstr "Kopiëren"
 
-#: mail/em-folder-tree.c:2096
+#: mail/em-folder-tree.c:2088
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Bezig met aanmaken map `%s'"
 
-#: mail/em-folder-tree.c:2282 mail/mail-component.c:706
+#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
 msgid "Create folder"
 msgstr "Map aanmaken"
 
-#: mail/em-folder-tree.c:2477
+#: mail/em-folder-tree.c:2463
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "De \"%s\" map hernoemen naar:"
 
-#: mail/em-folder-tree.c:2479
+#: mail/em-folder-tree.c:2465
 msgid "Rename Folder"
 msgstr "Map hernoemen"
 
-#: mail/em-folder-tree.c:2550 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "Beel_d"
 
-#: mail/em-folder-tree.c:2551
+#: mail/em-folder-tree.c:2537
 msgid "Open in _New Window"
 msgstr "Open in _Nieuw Venster"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2560
+#: mail/em-folder-tree.c:2546
 msgid "_New Folder..."
 msgstr "_Nieuwe map..."
 
-#: mail/em-folder-tree.c:2563
+#: mail/em-folder-tree.c:2549
 msgid "_Rename"
 msgstr "_Hernoemen"
 
-#: mail/em-folder-tree.c:2566 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Eigenschappen..."
 
@@ -13254,14 +12873,14 @@ msgstr "UNMATCHED"
 msgid "Inbox"
 msgstr "Inbox"
 
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
 msgid "Loading..."
 msgstr "Bezig met laden..."
 
 #: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
 #: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:510
-#: mail/mail-component.c:556
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
+#: mail/mail-component.c:554
 msgid "Mail"
 msgstr "Post"
 
@@ -13342,6 +12961,10 @@ msgstr "Naar map _verplaatsen..."
 msgid "_Copy to Folder..."
 msgstr "Naar map _kopiëren..."
 
+#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Label"
+
 #: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Afzender aan adresboe_k toevoegen"
@@ -13435,6 +13058,12 @@ msgstr "Cc"
 msgid "Bcc"
 msgstr "Bcc"
 
+#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
+#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Onderwerp"
+
 #: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
 #: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
 msgid "Date"
@@ -13641,7 +13270,7 @@ msgstr ""
 "moelijklijk voor een buitenstaander ome de inhoud van het bericht te "
 "bekijken in een redelijke tijd."
 
-#: mail/em-format-html-display.c:757
+#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
 msgid "_View Certificate"
 msgstr "Certificaat _weergeven"
 
@@ -14408,15 +14037,15 @@ msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution is uw oude Elm mail aan het importeren"
 
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:226
+#: mail/importers/evolution-mbox-importer.c:221
+#: mail/importers/evolution-outlook-importer.c:255
 #: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Importeren..."
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:222
-#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/evolution-mbox-importer.c:223
+#: mail/importers/evolution-outlook-importer.c:257
 #: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Een ogenblik geduld aub"
@@ -14438,21 +14067,23 @@ msgid "Elm"
 msgstr "Elm"
 
 #: mail/importers/evolution-mbox-importer.c:116
+#: mail/importers/evolution-outlook-importer.c:130
 msgid "Destination folder:"
 msgstr "Doel map:"
 
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder to import into"
 msgstr "Selecteer map waar in geimporteerd moet worden"
 
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:254
 #: mail/importers/mail-importer.c:226
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importeren `%s'"
 
-#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/evolution-outlook-importer.c:301
 #: mail/importers/mail-importer.c:140
 msgid "Importing mailbox"
 msgstr "Bezig met Importeren mailbox"
@@ -14649,66 +14280,66 @@ msgstr "%s mailinglijst"
 msgid "Add Filter Rule"
 msgstr "Filterregel Toevoegen"
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:461
 #, fuzzy, c-format
 msgid "%d deleted"
 msgstr "%d geselecteerd"
 
-#: mail/mail-component.c:465
+#: mail/mail-component.c:463
 #, fuzzy, c-format
 msgid "%d junk"
 msgstr "%d niet verzonden"
 
-#: mail/mail-component.c:488
+#: mail/mail-component.c:486
 #, fuzzy, c-format
 msgid "%d drafts"
 msgstr "%d dag"
 
-#: mail/mail-component.c:490
+#: mail/mail-component.c:488
 #, c-format
 msgid "%d sent"
 msgstr "%d verzonden"
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:490
 #, c-format
 msgid "%d unsent"
 msgstr "%d niet verzonden"
 
-#: mail/mail-component.c:496
+#: mail/mail-component.c:494
 #, c-format
 msgid "%d total"
 msgstr "%d totaal"
 
-#: mail/mail-component.c:498
+#: mail/mail-component.c:496
 #, fuzzy, c-format
 msgid ", %d unread"
 msgstr "%d totaal, %d ongelezen"
 
-#: mail/mail-component.c:658
+#: mail/mail-component.c:656
 msgid "New Mail Message"
 msgstr "Nieuw Bericht"
 
-#: mail/mail-component.c:659
+#: mail/mail-component.c:657
 msgid "_Mail Message"
 msgstr "Bericht"
 
-#: mail/mail-component.c:660
+#: mail/mail-component.c:658
 msgid "Compose a new mail message"
 msgstr "Een nieuwe e-mail opstellen"
 
-#: mail/mail-component.c:666
+#: mail/mail-component.c:664
 msgid "New Mail Folder"
 msgstr "Nieuwe berichten map"
 
-#: mail/mail-component.c:667
+#: mail/mail-component.c:665
 msgid "Mail _Folder"
 msgstr "Mail _Map"
 
-#: mail/mail-component.c:668
+#: mail/mail-component.c:666
 msgid "Create a new mail folder"
 msgstr "Maak een berichten map aan"
 
-#: mail/mail-component.c:800
+#: mail/mail-component.c:798
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
@@ -15458,7 +15089,6 @@ msgid ""
 msgstr ""
 
 #. mail:ask-send-only-bcc-contact primary
-#. mail:ask-send-only-bcc primary
 #: mail/mail-errors.xml.h:22 mail/mail-errors.xml.h:29
 #, fuzzy
 msgid "Are you sure you want to send a message with only BCC recipients?"
@@ -15528,7 +15158,6 @@ msgstr ""
 "Weet u zeker dat alle %d berichten in een appart scherm wilt weergeven?"
 
 #. mail:ask-expunge secondary
-#. mail:ask-empty-trash secondary
 #: mail/mail-errors.xml.h:45 mail/mail-errors.xml.h:50
 msgid "If you continue, you will not be able to recover these messages."
 msgstr ""
@@ -15604,13 +15233,6 @@ msgid "{0}."
 msgstr ""
 
 #. mail:session-message-info secondary
-#. mail:session-message-info-cancel secondary
-#. mail:session-message-warning secondary
-#. mail:session-message-warning-cancel secondary
-#. mail:session-message-error secondary
-#. mail:session-message-error-cancel secondary
-#. mail:ask-session-password secondary
-#. mail:filter-load-error secondary
 #: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
 #: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
 #: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
@@ -15638,14 +15260,7 @@ msgstr ""
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Kan directory `%s' niet maken: %s."
 
-#. mail:no-save-path secondary
-#: mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail:no-create-path primary
-#. mail:no-write-path-exists primary
-#. mail:no-write-path-notfile primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
 #, fuzzy
@@ -15669,15 +15284,6 @@ msgstr ""
 msgid "Cannot create temporary save directory."
 msgstr "Kon tijdelijke directory niet maken: %s"
 
-#. mail:no-create-tmp-path secondary
-#. mail:no-delete-folder secondary
-#. system:no-save-file secondary
-#. system:no-load-file secondary
-#: mail/mail-errors.xml.h:100 mail/mail-errors.xml.h:112
-#: widgets/misc/e-system-errors.xml.h:11 widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail:no-write-path-exists secondary
 #: mail/mail-errors.xml.h:104
 #, fuzzy
@@ -15705,7 +15311,6 @@ msgid "Cannot delete system folder \"{0}\"."
 msgstr "Kan lokale map %s niet verwijderen."
 
 #. mail:no-delete-spethal-folder secondary
-#. mail:no-rename-spethal-folder secondary
 #: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
@@ -15738,13 +15343,11 @@ msgid ""
 msgstr ""
 
 #. mail:no-rename-folder-exists primary
-#. mail:no-rename-folder primary
 #: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr ""
 
 #. mail:no-rename-folder-exists secondary
-#. mail:vfolder-notunique secondary
 #: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
 #, fuzzy
 msgid "A folder named \"{1}\" already exists. Please use a different name."
@@ -15756,28 +15359,24 @@ msgid "Because \"{2}\"."
 msgstr ""
 
 #. mail:no-move-folder-nostore primary
-#. mail:no-move-folder-to-nostore primary
 #: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
 #, fuzzy
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Kan map niet verplaatsen: %s"
 
 #. mail:no-move-folder-nostore secondary
-#. mail:no-copy-folder-nostore secondary
 #: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
 #, fuzzy
 msgid "Cannot open source \"{2}\"."
 msgstr "Kan bron niet openen"
 
 #. mail:no-move-folder-to-nostore secondary
-#. mail:no-copy-folder-to-nostore secondary
 #: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
 #, fuzzy
 msgid "Cannot open target \"{2}\"."
 msgstr "Kan bericht niet opnemen"
 
 #. mail:no-copy-folder-nostore primary
-#. mail:no-copy-folder-to-nostore primary
 #: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
 #, fuzzy
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
@@ -15796,7 +15395,6 @@ msgid "Cannot open source \"{1}\""
 msgstr "Kan bron niet openen"
 
 #. mail:account-incomplete primary
-#. mail:account-notunique primary
 #: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
 msgid "Cannot save changes to account."
 msgstr ""
@@ -15964,7 +15562,7 @@ msgstr "Overschrijven"
 msgid "_Append"
 msgstr "Aspen"
 
-#: mail/mail-folder-cache.c:791
+#: mail/mail-folder-cache.c:785
 #, c-format
 msgid "Pinging %s"
 msgstr "%s wordt opgezocht"
@@ -16407,6 +16005,10 @@ msgstr "Doorsturen"
 msgid "No Response Necessary"
 msgstr "Geen antwoord nodig"
 
+#: mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Gelezen"
+
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Beantwoorden"
@@ -16512,44 +16114,48 @@ msgstr ""
 "offline gebruik"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid "Toolbar is visible"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Whether Evolution should start up in offline mode"
 msgstr "Evolution opstarten in offline mode"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Whether the toolbar should be visible."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
 msgid "Whether to skip the development warning dialog"
 msgstr "Toon het waarschuwings dialoog voor de development versie"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
+#: shell/apps_evolution_shell.schemas.in.in.h:14
 msgid "mail"
 msgstr "mail"
 
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
-msgstr "U gebracht door"
-
-#: shell/e-shell.c:545 shell/e-shell.c:546
+#: shell/e-shell.c:588 shell/e-shell.c:589
 #, fuzzy, c-format
 msgid "%ld KB"
 msgstr "%d %B"
 
-#: shell/e-shell.c:743
+#: shell/e-shell.c:786
 #, fuzzy
 msgid "Uknown system error."
 msgstr "Onbekende fout"
 
-#: shell/e-shell.c:1100
+#: shell/e-shell.c:1143
 msgid "Invalid arguments"
 msgstr "Ongeldige argumenten"
 
-#: shell/e-shell.c:1102
+#: shell/e-shell.c:1145
 msgid "Cannot register on OAF"
 msgstr "Kan niet registreren op OAF"
 
-#: shell/e-shell.c:1104
+#: shell/e-shell.c:1147
 msgid "Configuration Database not found"
 msgstr "Configuratiedatabase niet gevonden"
 
-#: shell/e-shell.c:1106
+#: shell/e-shell.c:1149
 msgid "Generic error"
 msgstr "Generieke fout"
 
@@ -16609,7 +16215,7 @@ msgstr ""
 msgid "Select importer"
 msgstr "Importeerder selecteren"
 
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1026
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
 #, c-format
 msgid "File %s does not exist"
 msgstr "Map %s bestaat niet"
@@ -16637,31 +16243,32 @@ msgstr ""
 "Importeren %s\n"
 "Bezig met importeren item 1."
 
-#: shell/e-shell-importer.c:549
+#: shell/e-shell-importer.c:570
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: shell/e-shell-importer.c:598
-msgid "_Filename:"
-msgstr "_Bestandsnaam:"
+#: shell/e-shell-importer.c:626
+#, fuzzy
+msgid "F_ilename:"
+msgstr "Bestandsnaam:"
 
-#: shell/e-shell-importer.c:603
+#: shell/e-shell-importer.c:631
 msgid "Select a file"
 msgstr "Selecteer een bestand"
 
-#: shell/e-shell-importer.c:613
+#: shell/e-shell-importer.c:642
 msgid "File _type:"
 msgstr "Bestands_type:"
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:681
 msgid "Import data and settings from _older programs"
 msgstr "Informatie en instellingen importeren van _oudere programma's"
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:684
 msgid "Import a _single file"
 msgstr "Een enkel bestand i_mporteren"
 
-#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -16669,25 +16276,25 @@ msgstr ""
 "Even geduld...\n"
 "Bestaande instellingen worden nagezocht"
 
-#: shell/e-shell-importer.c:727
+#: shell/e-shell-importer.c:756
 msgid "Starting Intelligent Importers"
 msgstr "Intelligent Importeren wordt gestart"
 
-#: shell/e-shell-importer.c:853 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
 #, c-format
 msgid "From %s:"
 msgstr "Van %s:"
 
-#: shell/e-shell-importer.c:1044
+#: shell/e-shell-importer.c:1073
 #, c-format
 msgid "No importer available for file %s"
 msgstr "Geen importeerder beschikbaar voor bestand %s"
 
-#: shell/e-shell-importer.c:1056
+#: shell/e-shell-importer.c:1085
 msgid "Unable to execute importer"
 msgstr "Kon importeerder niet uitvoeren"
 
-#: shell/e-shell-importer.c:1169
+#: shell/e-shell-importer.c:1199
 msgid "_Import"
 msgstr "_Importeren"
 
@@ -16737,60 +16344,60 @@ msgstr "Mapnaam mag geen \"#\" bevatten."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' en '..' zijn gereserveerde mapnamen."
 
-#: shell/e-shell-window.c:336
+#: shell/e-shell-window.c:337
 #, fuzzy
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Evolution is nu verbonden met het netwerk.  Klik op deze knop om zonder "
 "netwerkverbinding te werken"
 
-#: shell/e-shell-window.c:343
+#: shell/e-shell-window.c:344
 #, fuzzy
 msgid "Evolution is in the process of going offline."
 msgstr "Ximian Evolution is bezig offline te gaan."
 
-#: shell/e-shell-window.c:349
+#: shell/e-shell-window.c:350
 #, fuzzy
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution is nu offline. Klik op deze knop om online te gaan werken."
 
-#: shell/e-shell-window.c:621
+#: shell/e-shell-window.c:637
 #, fuzzy, c-format
 msgid "Switch to %s"
 msgstr "Post versturen naar %s"
 
-#: shell/e-shell-window-commands.c:64
+#: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Het gereedschap voor GNOME Pilot lijkt niet geïnstalleerd te zijn."
 
-#: shell/e-shell-window-commands.c:72
+#: shell/e-shell-window-commands.c:74
 #, c-format
 msgid "Error executing %s."
 msgstr "Fout bij uitvoeren filter %s."
 
-#: shell/e-shell-window-commands.c:121
+#: shell/e-shell-window-commands.c:123
 msgid "Bug buddy is not installed."
 msgstr "Bug-buddy is niet geïnstalleerd."
 
-#: shell/e-shell-window-commands.c:129
+#: shell/e-shell-window-commands.c:131
 msgid "Bug buddy could not be run."
 msgstr "Bug-buddy kon niet worden gestart."
 
-#: shell/e-shell-window-commands.c:171
+#: shell/e-shell-window-commands.c:323
 #, fuzzy
-msgid "About Evolution"
-msgstr "Over Ximian Evolution"
+msgid "Groupware Suite"
+msgstr "Groupwise"
 
-#: shell/e-shell-window-commands.c:382
+#: shell/e-shell-window-commands.c:563
 msgid "_Work Online"
 msgstr "Werk Online"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "Offline _werken"
 
-#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Werk zonder netwerk"
 
@@ -17101,14 +16708,12 @@ msgid "Continue"
 msgstr "Constantine"
 
 #. shell:noshell title
-#. shell:noshell-reason title
 #: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
 #, fuzzy
 msgid "Cannot start Evolution"
 msgstr "Kan geen toegang verkrijgen tot de Evolution shell."
 
 #. shell:noshell primary
-#. shell:noshell-reason primary
 #: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
 #, fuzzy
 msgid "Evolution can not start."
@@ -17132,30 +16737,30 @@ msgid ""
 "Click help for details."
 msgstr ""
 
-#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:522
+#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
+#: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
 msgstr "Selecteer een cert om te importeren"
 
-#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:604
+#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
+#: smime/gui/certificate-manager.c:638
 msgid "Certificate Name"
 msgstr "Certificaat naam"
 
-#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
+#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
 msgid "Purposes"
 msgstr "Doelen"
 
-#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:517
+#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr "Serie nummer"
 
-#: smime/gui/certificate-manager.c:267
+#: smime/gui/certificate-manager.c:271
 msgid "Expires"
 msgstr "Verloopt"
 
-#: smime/gui/certificate-manager.c:417
+#: smime/gui/certificate-manager.c:446
 msgid "E-Mail Address"
 msgstr "E-mailadres"
 
@@ -17258,7 +16863,7 @@ msgstr ""
 "Voordat u deze CA vertrouwd is het raadzaam dat u het certificaat, de "
 "regelgeving en procedures van deze CA besturdeerd, mits aanwezig."
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
 msgid "Certificate"
 msgstr "Certificaat"
 
@@ -17278,19 +16883,23 @@ msgstr "Algemene naam (CN)"
 msgid "Contact Certificates"
 msgstr "Contact certificaten"
 
-#: smime/gui/smime-ui.glade.h:21
-#, no-c-format
-msgid "Do you want to trust \"%s\" for the following purposes?"
-msgstr "Wilt u \"%s\" vertrouwen voor de volgende doelen?"
+#: smime/gui/smime-ui.glade.h:20
+msgid "Do not trust the authenticity of this certificate"
+msgstr ""
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:21
 msgid "Dummy window only"
 msgstr "Enkel een dummy venster"
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:22
 msgid "Edit"
 msgstr "Bewerken"
 
+#: smime/gui/smime-ui.glade.h:23
+#, fuzzy
+msgid "Email Certificate Trust Settings"
+msgstr "E-mail Certificaat Authoriteit"
+
 #: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr "Email ontvanger certificaat"
@@ -17323,245 +16932,255 @@ msgstr "Afdeling (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 vingerafdruk"
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr "SSL gebruikers certificaat"
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr "SSL server certificaat"
 
 #: smime/gui/smime-ui.glade.h:37
+msgid "Trust the authenticity of this certificate"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
 msgid "Trust this CA to identify email users."
 msgstr "Vertrouw deze CA voor het identificeren van email gebruikers."
 
-#: smime/gui/smime-ui.glade.h:38
+#: smime/gui/smime-ui.glade.h:39
 msgid "Trust this CA to identify software developers."
 msgstr "Vertrouw deze CA voor het identificeren van software ontwikkelaars."
 
-#: smime/gui/smime-ui.glade.h:39
+#: smime/gui/smime-ui.glade.h:40
 msgid "Trust this CA to identify web sites."
 msgstr "Vertrouw deze CA voor het identificeren van web pagina's."
 
-#: smime/gui/smime-ui.glade.h:40
+#: smime/gui/smime-ui.glade.h:41
 msgid "View"
 msgstr "Beel_d"
 
-#: smime/gui/smime-ui.glade.h:41
-msgid "View Certificate"
-msgstr "Certificaat tonen"
-
 #: smime/gui/smime-ui.glade.h:42
-msgid "You have been asked to trust a new Certificate Authority (CA)."
-msgstr ""
-"U bent gevraagd om een nieuwe Certificaat Authoriteit (CA) te vertrouwen."
-
-#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr "U hebt certificaten van deze organisaties die u indentificeren:"
 
-#: smime/gui/smime-ui.glade.h:44
+#: smime/gui/smime-ui.glade.h:43
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 "U hebt certificaten in uw bestand die deze certificaat authoriteiten "
 "identificeren:"
 
-#: smime/gui/smime-ui.glade.h:45
+#: smime/gui/smime-ui.glade.h:44
 msgid "You have certificates on file that identify these people:"
 msgstr "U hebt certificaten in uw bestand dat deze personen indentificeren."
 
-#: smime/gui/smime-ui.glade.h:46
+#: smime/gui/smime-ui.glade.h:45
 msgid "Your Certificates"
 msgstr "Uw certificaten"
 
-#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
+#: smime/gui/smime-ui.glade.h:46
+msgid "_Edit CA Trust"
+msgstr ""
+
+#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d-%m-%Y"
 
-#: smime/lib/e-cert.c:478
+#. x509 certificate usage types
+#: smime/lib/e-cert.c:424
+#, fuzzy
+msgid "Sign"
+msgstr "Ondertekenen"
+
+#: smime/lib/e-cert.c:425
+#, fuzzy
+msgid "Encrypt"
+msgstr "Versleuteld"
+
+#: smime/lib/e-cert.c:530
 msgid "Version"
 msgstr "Versie"
 
-#: smime/lib/e-cert.c:493
+#: smime/lib/e-cert.c:545
 msgid "Version 1"
 msgstr "Versie 1"
 
-#: smime/lib/e-cert.c:496
+#: smime/lib/e-cert.c:548
 msgid "Version 2"
 msgstr "Versie 2"
 
-#: smime/lib/e-cert.c:499
+#: smime/lib/e-cert.c:551
 msgid "Version 3"
 msgstr "Versie 3"
 
-#: smime/lib/e-cert.c:581
+#: smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 met RSA Encryptie"
 
-#: smime/lib/e-cert.c:584
+#: smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 met RSA Encryptie"
 
-#: smime/lib/e-cert.c:587
+#: smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 met RSA Encryptie"
 
-#: smime/lib/e-cert.c:590
+#: smime/lib/e-cert.c:642
 msgid "C"
 msgstr "C"
 
-#: smime/lib/e-cert.c:593
+#: smime/lib/e-cert.c:645
 msgid "CN"
 msgstr "CN"
 
-#: smime/lib/e-cert.c:596
+#: smime/lib/e-cert.c:648
 msgid "OU"
 msgstr "OU"
 
-#: smime/lib/e-cert.c:599
+#: smime/lib/e-cert.c:651
 msgid "O"
 msgstr "O"
 
-#: smime/lib/e-cert.c:602
+#: smime/lib/e-cert.c:654
 msgid "L"
 msgstr "L"
 
-#: smime/lib/e-cert.c:605
+#: smime/lib/e-cert.c:657
 msgid "DN"
 msgstr "DN"
 
-#: smime/lib/e-cert.c:608
+#: smime/lib/e-cert.c:660
 msgid "DC"
 msgstr "DC"
 
-#: smime/lib/e-cert.c:611
+#: smime/lib/e-cert.c:663
 msgid "ST"
 msgstr "ST"
 
-#: smime/lib/e-cert.c:614
+#: smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA Encryptie"
 
-#: smime/lib/e-cert.c:617
+#: smime/lib/e-cert.c:669
 msgid "Certificate Key Usage"
 msgstr "Certificaat sleutel gebruik"
 
-#: smime/lib/e-cert.c:620
+#: smime/lib/e-cert.c:672
 msgid "Netscape Certificate Type"
 msgstr "Netscape certificaat type"
 
-#: smime/lib/e-cert.c:623
+#: smime/lib/e-cert.c:675
 msgid "Certificate Authority Key Identifier"
 msgstr "Certificaat Authoriteit sleutel identificator"
 
-#: smime/lib/e-cert.c:626
+#: smime/lib/e-cert.c:678
 msgid "UID"
 msgstr "UID"
 
-#: smime/lib/e-cert.c:635
+#: smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Object Indicator (%s)"
 
-#: smime/lib/e-cert.c:686
+#: smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
 msgstr "Algoritme identificatie"
 
-#: smime/lib/e-cert.c:694
+#: smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
 msgstr "Algoritme parameters"
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:768
 msgid "Subject Public Key Info"
 msgstr "Publieke sleutelinformatie van de persoon"
 
-#: smime/lib/e-cert.c:721
+#: smime/lib/e-cert.c:773
 msgid "Subject Public Key Algorithm"
 msgstr "Publiek sleutel algoritme van de persoon"
 
-#: smime/lib/e-cert.c:736
+#: smime/lib/e-cert.c:788
 msgid "Subject's Public Key"
 msgstr "Publieke sleutel van de persoon"
 
-#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
+#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
 msgid "Error: Unable to process extension"
 msgstr "Fout: Kan de extensie niet verwerken"
 
-#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
+#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr "Object ondertekenaar"
 
-#: smime/lib/e-cert.c:782
+#: smime/lib/e-cert.c:834
 msgid "SSL Certificate Authority"
 msgstr "SSL Certificaat Authoriteit"
 
-#: smime/lib/e-cert.c:786
+#: smime/lib/e-cert.c:838
 msgid "Email Certificate Authority"
 msgstr "E-mail Certificaat Authoriteit"
 
-#: smime/lib/e-cert.c:814
+#: smime/lib/e-cert.c:866
 msgid "Signing"
 msgstr "Ondertekenen"
 
-#: smime/lib/e-cert.c:818
+#: smime/lib/e-cert.c:870
 msgid "Non-repudiation"
 msgstr "Geen informatie"
 
-#: smime/lib/e-cert.c:822
+#: smime/lib/e-cert.c:874
 msgid "Key Encipherment"
 msgstr "Sleutel versleuteling"
 
-#: smime/lib/e-cert.c:826
+#: smime/lib/e-cert.c:878
 msgid "Data Encipherment"
 msgstr "Data versleuteling"
 
-#: smime/lib/e-cert.c:830
+#: smime/lib/e-cert.c:882
 msgid "Key Agreement"
 msgstr "Sleutel overeenkomst"
 
-#: smime/lib/e-cert.c:834
+#: smime/lib/e-cert.c:886
 msgid "Certificate Signer"
 msgstr "Certificaat ondertekenaar"
 
-#: smime/lib/e-cert.c:838
+#: smime/lib/e-cert.c:890
 msgid "CRL Signer"
 msgstr "CRL Tekenaar"
 
-#: smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:938
 msgid "Critical"
 msgstr "Kritisch"
 
-#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
+#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
 msgid "Not Critical"
 msgstr "Niet critisch"
 
-#: smime/lib/e-cert.c:912
+#: smime/lib/e-cert.c:964
 msgid "Extensions"
 msgstr "Uitbreiding"
 
-#: smime/lib/e-cert.c:983
+#: smime/lib/e-cert.c:1035
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
 msgid "Certificate Signature Algorithm"
 msgstr "Certificaatondertekenings algorithme"
 
-#: smime/lib/e-cert.c:1048
+#: smime/lib/e-cert.c:1100
 msgid "Issuer"
 msgstr "Uitgever"
 
-#: smime/lib/e-cert.c:1102
+#: smime/lib/e-cert.c:1154
 msgid "Issuer Unique ID"
 msgstr "Uitgever unieke ID"
 
-#: smime/lib/e-cert.c:1121
+#: smime/lib/e-cert.c:1173
 msgid "Subject Unique ID"
 msgstr "Unieke ID van de persoon"
 
-#: smime/lib/e-cert.c:1164
+#: smime/lib/e-cert.c:1216
 msgid "Certificate Signature Value"
 msgstr "Certificaatondertekenings waarde"
 
@@ -17712,7 +17331,7 @@ msgstr "Huidige contact weergeven"
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "_Acties"
 
@@ -17872,7 +17491,7 @@ msgstr "Sl_uiten"
 #: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:3
+#: ui/evolution.xml.h:4
 msgid "Close"
 msgstr "Sluiten"
 
@@ -17885,7 +17504,7 @@ msgid "Delete this item"
 msgstr "Dit item verwijderen"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr "Hoofdgereedschapsbalk"
 
@@ -17928,7 +17547,7 @@ msgstr "Dit item opslaan op de harde schijf"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:44
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "_File"
 msgstr "_Bestand"
 
@@ -18188,13 +17807,13 @@ msgstr "Selectie in_verteren"
 msgid "_Threaded Message List"
 msgstr "_Berichtenlijst met discussies"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Dit venster sluiten"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "_Close"
 msgstr "Sl_uiten"
 
@@ -18593,7 +18212,7 @@ msgstr "Vo_rig bericht"
 msgid "_Quoted"
 msgstr "Ge_citeerd"
 
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
 msgid "_Tools"
 msgstr "E_xtra"
 
@@ -18890,107 +18509,121 @@ msgid "_Open Task"
 msgstr "_Open taak"
 
 #: ui/evolution.xml.h:1
-msgid "About Ximian Evolution..."
-msgstr "Over Ximian Evolution..."
+#, fuzzy
+msgid "About Evolution..."
+msgstr "Over Ximian Evolution"
 
 #: ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
 msgstr "Instellingen van Evolution bewerken"
 
-#: ui/evolution.xml.h:5
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the visibility of the toolbar"
+msgstr "Eigenschappen veranderen van deze map"
+
+#: ui/evolution.xml.h:6
 msgid "Create a new window displaying this folder"
 msgstr "Een nieuw venster voor deze map openen"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "A_fsluiten"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Ximian Evolution _FAQ"
+
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Programma verlaten"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:10
 msgid "Forget _Passwords"
 msgstr "Wachtwoorden _vergeten"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:11
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "De onthouden wachtwoorden vergeten zodat ze opnieuw gevraagd worden"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:12
 msgid "Import data from other programs"
 msgstr "Importeer gegevens van andere programma's"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:14
 #, fuzzy
 msgid "New _Window"
 msgstr "_Venster"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Pi_lot Settings..."
 msgstr "Pil_ot instellingen..."
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Send / Receive"
 msgstr "Versturen & ontvangen"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Send queued items and retrieve new items"
 msgstr "Items in de wachtrij versturen en nieuwe items ophalen"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Set up Pilot configuration"
 msgstr "Pilotconfiguratie instellen"
 
-#: ui/evolution.xml.h:17
-msgid "Show information about Ximian Evolution"
+#: ui/evolution.xml.h:19
+#, fuzzy
+msgid "Show information about Evolution"
 msgstr "Toon informatie over Ximian Evolution"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:20
 msgid "Submit Bug Report"
 msgstr "Bug-Report Insturen"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:21
 msgid "Submit _Bug Report"
 msgstr "_Bug Report Insturen"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Bug Report insturen met Bug Buddy."
 
-#: ui/evolution.xml.h:21
-msgid "Toggle whether we are working offline."
-msgstr "Offline werken aan- of uitschakelen."
-
 #: ui/evolution.xml.h:23
-msgid "Ximian Evolution _FAQ"
-msgstr "Ximian Evolution _FAQ"
+#, fuzzy
+msgid "T_oolbar"
+msgstr "Hoofdgereedschapsbalk"
 
 #: ui/evolution.xml.h:24
-msgid "_About Ximian Evolution..."
-msgstr "_Over Ximian Evolution..."
+msgid "Toggle whether we are working offline."
+msgstr "Offline werken aan- of uitschakelen."
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "_About Evolution..."
+msgstr "Over Ximian Evolution"
+
+#: ui/evolution.xml.h:30
 msgid "_Help"
 msgstr "_Hulp"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "_Import..."
 msgstr "_Importeren..."
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "_New"
 msgstr "_Nieuw"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "_Quick Reference"
 msgstr "_Verkorte handleiding"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_Send / Receive"
 msgstr "_Versturen & ontvangen"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 #, fuzzy
 msgid "_Window"
 msgstr "_Venster"
@@ -19397,6 +19030,317 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% voltooid)"
 
+#~ msgid "  S_how Supported Bases "
+#~ msgstr "Ondersteunde bases _weergeven"
+
+#~ msgid "1:00"
+#~ msgstr "1:00"
+
+#~ msgid "5:00"
+#~ msgstr "5:00"
+
+#~ msgid "Connecting"
+#~ msgstr "Bezig met verbinden"
+
+#~ msgid "Distinguished _name:"
+#~ msgstr "Unieke _naam:"
+
+#~ msgid "Email address:"
+#~ msgstr "E-mail adres:"
+
+#~ msgid "Evolution will use this DN to authenticate you with the server"
+#~ msgstr "Evolution zal deze DN gebruiken om u te identificeren bij de server"
+
+#~ msgid "One"
+#~ msgstr "Één"
+
+#~ msgid "S_earch scope: "
+#~ msgstr "Zoek_gebied: "
+
+#~ msgid "Searching"
+#~ msgstr "Zoeken"
+
+#~ msgid "Sub"
+#~ msgstr "Sub"
+
+#~ msgid "This option controls how long a search will be run."
+#~ msgstr "Deze optie geeft aan hoe lang een zoekopdracht actief zal zijn."
+
+#~ msgid "U_se SSL/TLS:"
+#~ msgstr "Gebruik _SSL/TLS:"
+
+#~ msgid "_Display name:"
+#~ msgstr "_Weergave naam:"
+
+#~ msgid "_Port number:"
+#~ msgstr "_Poortnummer:"
+
+#~ msgid "_Search base:"
+#~ msgstr "Zoek_basis:"
+
+#~ msgid "_Server name:"
+#~ msgstr "_Servernaam:"
+
+#~ msgid "_Timeout (minutes):"
+#~ msgstr "_Timeout (minuten):"
+
+#~ msgid "connecting-tab"
+#~ msgstr "connecting-tab"
+
+#~ msgid "general-tab"
+#~ msgstr "Algemeen-tab"
+
+#~ msgid "searching-tab"
+#~ msgstr "Zoeken-tab"
+
+#, fuzzy
+#~ msgid "Webcam:"
+#~ msgstr "Website:"
+
+#~ msgid "Calendar Properties"
+#~ msgstr "Kalender eigenschappen"
+
+#~ msgid "Remote"
+#~ msgstr "Op afstand"
+
+#~ msgid "Task List Properties"
+#~ msgstr "Takenlijst eigenschappen"
+
+#~ msgid "_Refresh Interval:"
+#~ msgstr "Ve_rvers Interval:"
+
+#~ msgid "_Source URL:"
+#~ msgstr "B_ron URL:"
+
+#~ msgid "_Invite Others..."
+#~ msgstr "Anderen uit_nodigen..."
+
+#~ msgid "Could not get article %s from NNTP server"
+#~ msgstr "Kon het artikel %s niet van de NNTP server verkrijgen"
+
+#~ msgid "Posting not allowed by news server"
+#~ msgstr "Plaatsen niet toegestaan door nieuwsserver"
+
+#~ msgid "Failed to send newsgroups header: %s: message not posted"
+#~ msgstr ""
+#~ "Het verzenden van nieuwsgroep kop is mislukt: %s\" bericht niet verzonden"
+
+#~ msgid "Error posting to newsgroup: %s: message not posted"
+#~ msgstr "Fout bij plaatsen in nieuwsgroep: %s: bericht niet geplaatst"
+
+#~ msgid "Error reading response to posted message: message not posted"
+#~ msgstr ""
+#~ "Fout bij het lezen van het antwoord op gepost bericht: bericht niet gepost"
+
+#~ msgid "Error posting message: %s: message not posted"
+#~ msgstr "Fout bij plaatsen bericht: %s: bericht niet geplaatst"
+
+#~ msgid "Stream error"
+#~ msgstr "Stream fout"
+
+#~ msgid "Connection error: %s"
+#~ msgstr "Verbindings fout: %s"
+
+#~ msgid "Could not get group: %s"
+#~ msgstr "Kon de groep: %s niet verkrijgen"
+
+#, fuzzy
+#~ msgid "Could not get messages: unspecified error"
+#~ msgstr "Kan berichten niet verkrijgen: ongespecificeerde fout"
+
+#~ msgid "Unknown server response: %s"
+#~ msgstr "Onbekend server-antwoord: %s"
+
+#~ msgid "Adjust Score"
+#~ msgstr "Score aanpassen"
+
+#~ msgid "Assign Color"
+#~ msgstr "Geef Kleur"
+
+#~ msgid "Assign Score"
+#~ msgstr "Geef Score"
+
+#~ msgid "Attachments"
+#~ msgstr "Bijlages"
+
+#~ msgid "Beep"
+#~ msgstr "Piep"
+
+#~ msgid "contains"
+#~ msgstr "bevat"
+
+#~ msgid "Copy to Folder"
+#~ msgstr "Naar map kopiëren"
+
+#~ msgid "Date received"
+#~ msgstr "Ontvangstdatum"
+
+#~ msgid "Date sent"
+#~ msgstr "Verzendingsdatum"
+
+#~ msgid "Deleted"
+#~ msgstr "Verwijderd"
+
+#~ msgid "does not contain"
+#~ msgstr "bevat niet"
+
+#~ msgid "does not end with"
+#~ msgstr "eindigt niet op"
+
+#~ msgid "does not exist"
+#~ msgstr "bestaat niet"
+
+#~ msgid "does not return"
+#~ msgstr "komt niet terug"
+
+#~ msgid "does not sound like"
+#~ msgstr "klinkt niet als"
+
+#~ msgid "does not start with"
+#~ msgstr "begint niet met"
+
+#~ msgid "Do Not Exist"
+#~ msgstr "bestaat niet"
+
+#~ msgid "Draft"
+#~ msgstr "Klad"
+
+#~ msgid "ends with"
+#~ msgstr "eindigt op"
+
+#~ msgid "Exist"
+#~ msgstr "Bestaat"
+
+#~ msgid "exists"
+#~ msgstr "bestaat"
+
+#~ msgid "Expression"
+#~ msgstr "Expressie"
+
+#~ msgid "Follow Up"
+#~ msgstr "Antwoord"
+
+#~ msgid "is"
+#~ msgstr "is"
+
+#~ msgid "is after"
+#~ msgstr "is na"
+
+#~ msgid "is before"
+#~ msgstr "is voor"
+
+#~ msgid "is Flagged"
+#~ msgstr "is gemarkeerd"
+
+#~ msgid "is greater than"
+#~ msgstr "is groter dan"
+
+#~ msgid "is less than"
+#~ msgstr "is kleiner dan"
+
+#~ msgid "is not"
+#~ msgstr "is niet"
+
+#~ msgid "is not Flagged"
+#~ msgstr "Is niet gemarkeerd"
+
+#~ msgid "Junk Test"
+#~ msgstr "Troep test"
+
+#~ msgid "Mailing list"
+#~ msgstr "Mailinglijst"
+
+#~ msgid "Message Body"
+#~ msgstr "Berichtinhoud"
+
+#~ msgid "Message Header"
+#~ msgstr "Berichtkop"
+
+#~ msgid "Message is Junk"
+#~ msgstr "Bericht is troep"
+
+#~ msgid "Message is not Junk"
+#~ msgstr "Bericht is geen troep"
+
+#~ msgid "Move to Folder"
+#~ msgstr "Naar map verplaatsen"
+
+#~ msgid "Pipe to Program"
+#~ msgstr "Naar programma doorsluizen"
+
+#~ msgid "Play Sound"
+#~ msgstr "Geluid afspelen"
+
+#~ msgid "Recipients"
+#~ msgstr "Geadresseerden"
+
+#~ msgid "Regex Match"
+#~ msgstr "Overeenkomende regex"
+
+#~ msgid "Replied to"
+#~ msgstr "Beantwoord aan"
+
+#~ msgid "returns"
+#~ msgstr "komt terug"
+
+#~ msgid "returns greater than"
+#~ msgstr "geeft groter dan"
+
+#~ msgid "returns less than"
+#~ msgstr "geeft kleiner dan"
+
+#~ msgid "Run Program"
+#~ msgstr "Start een programma"
+
+#~ msgid "Sender"
+#~ msgstr "Afzender"
+
+#~ msgid "Set Status"
+#~ msgstr "Stel Status in"
+
+#~ msgid "Size (kB)"
+#~ msgstr "Grootte (kB)"
+
+#~ msgid "sounds like"
+#~ msgstr "klinkt als"
+
+#~ msgid "Source Account"
+#~ msgstr "Source-Account"
+
+#~ msgid "Specific header"
+#~ msgstr "Specifieke kop"
+
+#~ msgid "starts with"
+#~ msgstr "begint met"
+
+#~ msgid "Stop Processing"
+#~ msgstr "Stop met Verwerken"
+
+#~ msgid "Unset Status"
+#~ msgstr "Status herstellen"
+
+#~ msgid "Brought to you by"
+#~ msgstr "U gebracht door"
+
+#~ msgid "_Filename:"
+#~ msgstr "_Bestandsnaam:"
+
+#~ msgid "Do you want to trust \"%s\" for the following purposes?"
+#~ msgstr "Wilt u \"%s\" vertrouwen voor de volgende doelen?"
+
+#~ msgid "View Certificate"
+#~ msgstr "Certificaat tonen"
+
+#~ msgid "You have been asked to trust a new Certificate Authority (CA)."
+#~ msgstr ""
+#~ "U bent gevraagd om een nieuwe Certificaat Authoriteit (CA) te vertrouwen."
+
+#~ msgid "About Ximian Evolution..."
+#~ msgstr "Over Ximian Evolution..."
+
+#~ msgid "_About Ximian Evolution..."
+#~ msgstr "_Over Ximian Evolution..."
+
 #~ msgid "Failed to connect to LDAP server"
 #~ msgstr "Kan geen verbinding krijgen met LDAP server"
 
@@ -19919,9 +19863,6 @@ msgstr "%s (%d%% voltooid)"
 #~ msgid "Primary _email:"
 #~ msgstr "Primaire _e-mail:"
 
-#~ msgid "S_pouse:"
-#~ msgstr "_Partner:"
-
 #~ msgid "_Business:"
 #~ msgstr "_Zakelijk:"
 
@@ -19937,9 +19878,6 @@ msgstr "%s (%d%% voltooid)"
 #~ msgid "_Mobile:"
 #~ msgstr "_Mobiel:"
 
-#~ msgid "_Office:"
-#~ msgstr "Kant_oor:"
-
 #~ msgid "_Public Calendar URL:"
 #~ msgstr "_Publieke kalender URL:"
 
diff --git a/po/nn.po b/po/nn.po
index cc9c59f555..f9f8505a50 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nn\n"
-"POT-Creation-Date: 2004-05-19 14:00-0400\n"
+"POT-Creation-Date: 2004-06-03 11:14-0400\n"
 "PO-Revision-Date: 2004-01-29 11:57+0100\n"
 "Last-Translator: Åsmund Skjæveland <aasmunds@fys.uio.no>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -62,13 +62,13 @@ msgstr "kort"
 msgid "Default Sync Address:"
 msgstr "Standard synkroniseringsaddresse:"
 
-#: addressbook/conduit/address-conduit.c:1150
 #: addressbook/conduit/address-conduit.c:1151
+#: addressbook/conduit/address-conduit.c:1152
 msgid "Could not load addressbook"
 msgstr "Klarte ikkje å lasta adressebok"
 
-#: addressbook/conduit/address-conduit.c:1219
-#: addressbook/conduit/address-conduit.c:1222
+#: addressbook/conduit/address-conduit.c:1220
+#: addressbook/conduit/address-conduit.c:1223
 msgid "Could not read pilot's Address application block"
 msgstr "Klarte ikkje å lese addresseblokka i programmet til piloten"
 
@@ -77,13 +77,13 @@ msgstr "Klarte ikkje å lese addresseblokka i programmet til piloten"
 msgid "Accessing LDAP Server anonymously"
 msgstr "Hentar data frå LDAP-tenar anonymt"
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
 msgid "Failed to authenticate.\n"
 msgstr "Kan ikkje autentisera.\n"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sSkriv inn passord for %s (brukar %s)"
@@ -127,51 +127,23 @@ msgstr "_Kontaktar: "
 msgid "Create a new contacts group"
 msgstr "Lagar ei ny snarveggruppe"
 
-#: addressbook/gui/component/addressbook-component.c:182
+#: addressbook/gui/component/addressbook-component.c:184
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:483
-msgid "Failed to connect to LDAP server"
-msgstr "Klarte ikkje å kopla til LDAP-tenar"
-
-#: addressbook/gui/component/addressbook-config.c:507
-msgid "Failed to authenticate with LDAP server"
-msgstr "Ikkje i stand til å autentisere mot IMAP-tenar"
-
-#: addressbook/gui/component/addressbook-config.c:535
-msgid "Could not perform query on Root DSE"
-msgstr "Kunne ikke utføra spørjing på Root DSE"
-
-#: addressbook/gui/component/addressbook-config.c:840
-msgid "The server responded with no supported search bases"
-msgstr "Tenaren svarte ikkje med nokon støtta basisar for søk"
-
-#: addressbook/gui/component/addressbook-config.c:1245
-msgid "This server does not support LDAPv3 schema information"
-msgstr "Denne tenaren stør ikkje LDAPv3 skjemainformasjon"
-
-#: addressbook/gui/component/addressbook-config.c:1266
-msgid "Error retrieving schema information"
-msgstr "Feil ved henting av skjemainformasjon"
-
-#: addressbook/gui/component/addressbook-config.c:1274
-msgid "Server did not respond with valid schema information"
-msgstr "Tenaren svarte ikkje med gyldig skjema-informasjon"
-
 #: addressbook/gui/component/addressbook-migrate.c:68
-#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1160
 msgid "Migrating..."
 msgstr "Overfører ..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1201
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Overfører «%s»:"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:438
+#: addressbook/gui/component/addressbook-migrate.c:464
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
 #: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
@@ -179,28 +151,28 @@ msgid "On This Computer"
 msgstr "På denne datamaskina"
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:446
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
-#: mail/mail-config.glade.h:106
+#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
+#: mail/mail-config.glade.h:109
 msgid "Personal"
 msgstr "Personleg"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:454
+#: addressbook/gui/component/addressbook-migrate.c:480
 msgid "On LDAP Servers"
 msgstr "På LDAP-tenarar"
 
-#: addressbook/gui/component/addressbook-migrate.c:582
+#: addressbook/gui/component/addressbook-migrate.c:608
 msgid "LDAP Servers"
 msgstr "LDAP-tenarar"
 
-#: addressbook/gui/component/addressbook-migrate.c:702
+#: addressbook/gui/component/addressbook-migrate.c:728
 msgid "Autocompletion Settings"
 msgstr "Autofullføringsinnstillingar"
 
-#: addressbook/gui/component/addressbook-migrate.c:1076
+#: addressbook/gui/component/addressbook-migrate.c:1104
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -212,7 +184,7 @@ msgstr ""
 "\n"
 "Ha tolmod medan Evolution overfører mappene dine ..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1090
+#: addressbook/gui/component/addressbook-migrate.c:1118
 #, fuzzy
 msgid ""
 "The format of mailing list contacts has changed.\n"
@@ -224,7 +196,7 @@ msgstr ""
 "\n"
 "Ha tolmod medan Evolution overfører mappene dine ..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1099
+#: addressbook/gui/component/addressbook-migrate.c:1127
 #, fuzzy
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
@@ -236,7 +208,7 @@ msgstr ""
 "\n"
 "Ha tolmod medan Evolution overfører mappene dine ..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1109
+#: addressbook/gui/component/addressbook-migrate.c:1137
 #, fuzzy
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
@@ -248,40 +220,35 @@ msgstr ""
 "\n"
 "Ha tolmod medan Evolution overfører mappene dine ..."
 
-#: addressbook/gui/component/addressbook-view.c:674
+#: addressbook/gui/component/addressbook-view.c:675
 #, fuzzy, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 "Adresseboka «%s» vil verta fjerna. Er du sikker på at du vil halda fram?"
 
-#: addressbook/gui/component/addressbook-view.c:761
+#: addressbook/gui/component/addressbook-view.c:754
 #, fuzzy
 msgid "New Address Book"
 msgstr "Ny adressebok"
 
-#: addressbook/gui/component/addressbook-view.c:762
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
+#: addressbook/gui/component/addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Slett"
 
-#: addressbook/gui/component/addressbook-view.c:763
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-view.c:756
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Eigenskapar ..."
 
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/addressbook-view.c:1002
+#. Create the contacts group
+#: addressbook/gui/component/addressbook-view.c:995
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
 #: calendar/gui/migration.c:373
 msgid "Contacts"
 msgstr "Kontakter"
@@ -361,10 +328,6 @@ msgid "Manage your S/MIME certificates here"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-msgid "  S_how Supported Bases "
-msgstr "  V_is støtta basar "
-
-#: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -379,278 +342,238 @@ msgstr "  V_is støtta basar "
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1:00"
-msgstr "1:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
-msgstr "5:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "Autentisering"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
 #, fuzzy
 msgid "<b>Display</b>"
 msgstr "_Vis"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 #, fuzzy
 msgid "<b>Downloading</b>"
 msgstr "Send"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:10
 #, fuzzy
 msgid "<b>Searching</b>"
 msgstr "Søker"
 
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
 msgid "<b>Server Information</b>"
 msgstr "Steg 2: Tenarinformasjon"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
 msgid "<b>Type:</b>"
 msgstr "<b>Skal vera ferdig:</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:13
 #, fuzzy
 msgid "Add Contacts Group"
 msgstr "_Kontaktar: "
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:14
 #, fuzzy
 msgid "Address Book Properties"
 msgstr "Addressebokeigenskapar"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
-#: mail/mail-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
+#: mail/mail-config.glade.h:42
 msgid "Always"
 msgstr "Alltid"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr "Anonymt"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:17
 #: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Enkel"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
-msgid "Connecting"
-msgstr "Koplar til"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 #: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Detaljar"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
-msgid "Distinguished _name:"
-msgstr "Distinguished _name:"
-
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:19
 #, fuzzy
 msgid "Distinguished name"
 msgstr "Distinguished _name:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:20
 #, fuzzy
 msgid "Download limit:"
 msgstr "Grense for ne_dlasting:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Email address"
 msgstr "E-postadresse:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "Email address:"
-msgstr "E-postadresse:"
-
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "Evolution will use this DN to authenticate you with the server"
-msgstr "Evolution vil bruka DN til å autentisera deg mot tenaren"
-
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:22
+#, fuzzy
 msgid ""
-"Evolution will use this email address to authenticate you with the server"
+"Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "Evolution kjem til å bruke denne e-postaddressa for å autentisere deg "
 "ovanfor tenaren"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:23
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Støtta søkebasar"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:24
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
+#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Allmennt"
 
-#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
-#: mail/mail-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
+#: mail/mail-config.glade.h:102
 msgid "Never"
 msgstr "Aldri"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
-msgid "One"
-msgstr "Ein"
-
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:35
-msgid "S_earch scope: "
-msgstr "Sø_keområde: "
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Search _base:"
+msgstr "_Søkebase:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
 msgid "Search base only"
 msgstr "_Søkebase:"
 
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:29
 #, fuzzy
 msgid "Search base:"
 msgstr "_Søkebase:"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Search scope:"
 msgstr "Sø_keområde: "
 
-#: addressbook/gui/component/ldap-config.glade.h:39
-msgid "Searching"
-msgstr "Søker"
-
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:31
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
-"server if\n"
-"your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL or TLS."
 msgstr ""
 "Dette valet gjer at Evolution berre vil kopla til LDAP-tenaren dersom\n"
 "denne støttar SSL eller TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a \n"
-"insecure environment. For example, if you and your LDAP server are behind a "
-"firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection "
-"is already\n"
-"secure."
+"you are in a insecure environment. For example, if you and your LDAP server "
+"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
+"because your connection is already secure."
 msgstr ""
 "Dersom du vel dette, vil Evolution berre prøva å bruka SSL/TLS dersom du er "
 "i eit utrygt miljø. Til dømes treng ikkje Evolution å bruka SSL/TLS dersom "
 "du og LDAP-tenaren står bak den same brannveggen, fordi tilkoplinga då er "
 "trygg frå før."
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:33
+#, fuzzy
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
-"TLS.  This \n"
-"means that your connection will be insecure, and that you will be vulnerable "
-"to security\n"
-"exploits. "
+"TLS.  This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits. "
 msgstr ""
 "Dette alternativet betyr at tenaren din ikkje støttar SSL eller TLS:\n"
 "Det tyder at tilkoplinga di ikkje er trygg, og du vil vera sårbar\n"
 "for eventuelle trygglekshol."
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Sub"
-msgstr "Under"
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr "Støtta søkebasar"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
-"searches will \n"
-"begin. If you leave this blank, the search will begin at the root of the "
-"directory tree."
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
 msgstr ""
 "Søkebasen er det distingverte namnet (DN) på oppføringa der søka dine vil "
 "starta. Dersom du let denne stå blank, vil søka byrja ved rota på "
 "katalogtreet."
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:37
+#, fuzzy
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
-"the \n"
-"directory tree. A search scope of \"sub\" will include all entries below "
-"your search base.\n"
-"A search scope of \"one\" will only include the entries one level beneath "
-"your base.\n"
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
 msgstr ""
 "Søkeskopet definerer kor djupt du vil at søket skal gå ned i katalogtreet.\n"
 "Dersom du vel «sub», vert alle oppføringane under søkebasen inkluderte. \n"
 "Dersom du vel «one», vil berre oppføringane eitt nivå under søkebasen din "
 "brukast.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:58
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "Dette er det fulle namnet på LDAP-tenaren. T.d. «ldap.mittfirma.no»."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:39
 #, fuzzy
 msgid ""
-"This is the maximum number of entries to download. Setting this number to "
-"be \n"
+"This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr ""
 "Dette er øvre grense for kor mange oppføringar som skal lastast ned. Å setja "
 "dette talet\n"
 "for høgt vil få adresseboka di til å gå sakte."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -660,140 +583,119 @@ msgstr ""
 "at å setja dette til «e-post-adresse» krev at anonym tilgang til LDAP-"
 "tenaren."
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:41
+#, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
-"list.\n"
-"It is for display purposes only. "
+"list. It is for display purposes only. "
 msgstr ""
 "Dette er det namnet på tenaren som vert vist i Evolution si mappeliste.\n"
 "Det vert berre brukt til å visast på skjermen."
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:42
+#, fuzzy
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. "
-"A \n"
-"list of standard ports has been provided. Ask your system administrator\n"
-"what port you should specify."
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
 msgstr ""
 "Dette er den porten på LDAP-tenaren som Evolution vil prøva å kopla til.\n"
 "Ei liste over standardportar er gitt. Spør systemadministratoren din kva\n"
 "for ein port du skal bruka."
 
-#: addressbook/gui/component/ldap-config.glade.h:67
-msgid "This option controls how long a search will be run."
-msgstr "Dette valet kontrollerer kor lenge eit søk vil køyra."
-
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:43
 #, fuzzy
 msgid "Timeout:"
 msgstr "Tidsformat:"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
-msgid "U_se SSL/TLS:"
-msgstr "B_ruk SSL/TLS:"
-
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr "Bruker distinguished name (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr "Brukar e-post adresse"
 
-#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
-#: mail/mail-config.glade.h:154
+#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
+#: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr "Når det er mogleg"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:47
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "_Kontaktar: "
 
-#: addressbook/gui/component/ldap-config.glade.h:74
-#: calendar/gui/dialogs/calendar-setup.glade.h:12
-msgid "_Display name:"
-msgstr "_Vist namn:"
-
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr "Grense for ne_dlasting:"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
 msgid "_Email address:"
 msgstr "E-postadresse:"
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:50
+#, fuzzy
+msgid "_Find Possible Search Bases"
+msgstr "Støtta søkebasar"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Log in method:"
 msgstr "Metode for å logga inn:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "_Log in:"
+msgstr "Innlogging"
+
+#: addressbook/gui/component/ldap-config.glade.h:53
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
 msgid "_Name:"
 msgstr "_Namn:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
-msgid "_Port number:"
-msgstr "_Portnummer:"
-
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "_Port:"
 msgstr "_Prioritet:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
-msgid "_Search base:"
-msgstr "_Søkebase:"
-
-#: addressbook/gui/component/ldap-config.glade.h:82
-msgid "_Server name:"
-msgstr "_Tenarnamn:"
+#: addressbook/gui/component/ldap-config.glade.h:55
+#, fuzzy
+msgid "_Search scope:"
+msgstr "Sø_keområde: "
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:56
 #, fuzzy
 msgid "_Server:"
 msgstr "_kvar"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
-msgid "_Timeout (minutes):"
-msgstr "_Tid før avbrot (minutt):"
+#: addressbook/gui/component/ldap-config.glade.h:57
+#, fuzzy
+msgid "_Timeout:"
+msgstr "Tidsformat:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:58
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "Br_uk sikker tilknytning (SSL)"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "kort"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
-msgid "connecting-tab"
-msgstr "tilkopling-fane"
-
-#: addressbook/gui/component/ldap-config.glade.h:88
-msgid "general-tab"
-msgstr "almennt-fane"
-
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:60
 #: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
-#: mail/mail-config.glade.h:182
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "minutt"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
-msgid "searching-tab"
-msgstr "søke-fane"
-
-#: addressbook/gui/component/select-names/e-select-names.c:497
+#: addressbook/gui/component/select-names/e-select-names.c:503
 #: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid "Select Contacts from Address Book"
 msgstr "Vel kontaktar frå adresseboka"
 
-#: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
@@ -833,7 +735,7 @@ msgstr "Kontakt utan namn"
 
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:222
+#: addressbook/gui/widgets/e-addressbook-view.c:224
 msgid "Source"
 msgstr "Kjelde"
 
@@ -906,9 +808,9 @@ msgid "<b>Work</b>"
 msgstr "<b>Skal vera ferdig:</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
-#: addressbook/gui/widgets/eab-contact-display.c:342
-#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/widgets/eab-contact-display.c:334
+#: addressbook/gui/widgets/eab-contact-display.c:353
 msgid "AIM"
 msgstr ""
 
@@ -948,15 +850,15 @@ msgid "Company:"
 msgstr "Kommando:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:271
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
+#: addressbook/gui/contact-editor/e-contact-editor.c:266
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
 msgstr "Kontakt"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1527
+#: addressbook/gui/contact-editor/e-contact-editor.c:520
 msgid "Contact Editor"
 msgstr "Kontaktredigering"
 
@@ -980,83 +882,79 @@ msgid "Full _Name..."
 msgstr "Fullt _namn ..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:202
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-msgid "Home"
-msgstr "Heim"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #, fuzzy
 msgid "Home Page:"
 msgstr "Heimeside"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-#, fuzzy
-msgid "Job title:"
-msgstr "_Jobb-tittel:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/e-itip-control.c:936
-#, fuzzy
-msgid "Location:"
-msgstr "Plassering:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 #, fuzzy
 msgid "Mailing Address"
 msgstr "E-postadresse:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 #, fuzzy
 msgid "Manager:"
 msgstr "Sjef"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "Kalle_namn:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Notes:"
 msgstr "M_erknadar:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
-#: addressbook/gui/contact-editor/e-contact-editor.c:203
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-msgid "Other"
-msgstr "Anna"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#, fuzzy
+msgid "Office:"
+msgstr "K_ontor:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "PO Box:"
 msgstr "_Postboks:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 #, fuzzy
 msgid "Personal Information"
 msgstr "Valfri informasjon"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 #, fuzzy
 msgid "Profession:"
 msgstr "_Yrke:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#, fuzzy
+msgid "Spouse:"
+msgstr "E_ktefelle:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "State/Province:"
 msgstr "_Stat/provins:"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#, fuzzy
+msgid "Title:"
+msgstr "_Tittel:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+msgid "Video Chat:"
+msgstr ""
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:41
 #, fuzzy
 msgid "Wants to receive HTML mail"
@@ -1064,15 +962,15 @@ msgstr "_Vil motta HTML-post"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:42
 #, fuzzy
-msgid "Webcam:"
-msgstr "Nettside:"
+msgid "Web Log:"
+msgstr "_Nettsideaddresse:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
-#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
-#: mail/mail-config.glade.h:155
+#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
+#: mail/mail-config.glade.h:157
 msgid "Work"
 msgstr "Arbeid"
 
@@ -1092,19 +990,12 @@ msgid "_File under:"
 msgstr "Filnamn:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 #, fuzzy
 msgid "_Where:"
 msgstr "_kvar"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
-msgid "item7"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
-msgid "item8"
-msgstr ""
-
-#: addressbook/gui/contact-editor/eab-editor.c:316
+#: addressbook/gui/contact-editor/eab-editor.c:315
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -1112,7 +1003,7 @@ msgstr ""
 "Er du sikker på at du vil\n"
 "sletta desse kontaktane?"
 
-#: addressbook/gui/contact-editor/eab-editor.c:319
+#: addressbook/gui/contact-editor/eab-editor.c:318
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -1121,16 +1012,16 @@ msgstr ""
 " slette denne kontakta?"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:351
-#: addressbook/gui/widgets/eab-contact-display.c:372
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Address"
 msgstr "Adresse"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:292
+#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard.c:174
@@ -2117,87 +2008,110 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/contact-editor/e-contact-editor.c:179
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:337
+#: addressbook/gui/widgets/eab-contact-display.c:356
 msgid "Jabber"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:347
-#: addressbook/gui/widgets/eab-contact-display.c:366
+#: addressbook/gui/contact-editor/e-contact-editor.c:180
+#: addressbook/gui/widgets/eab-contact-display.c:339
+#: addressbook/gui/widgets/eab-contact-display.c:358
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: addressbook/gui/widgets/eab-contact-display.c:338
+#: addressbook/gui/widgets/eab-contact-display.c:357
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:344
-#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#: addressbook/gui/widgets/eab-contact-display.c:355
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/contact-editor/e-contact-editor.c:183
 #, fuzzy
 msgid "GroupWise"
 msgstr "Gruppe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+msgid "Home"
+msgstr "Heim"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+msgid "Other"
+msgstr "Anna"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
 msgid "Source Book"
 msgstr "Kjeldebok"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:264
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:278
+#: addressbook/gui/contact-editor/e-contact-editor.c:273
 msgid "Is New Contact"
 msgstr "Er ny kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:285
+#: addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Writable Fields"
 msgstr "Skrivbare felt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:299
+#: addressbook/gui/contact-editor/e-contact-editor.c:294
 msgid "Changed"
 msgstr "Endra"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
-msgid "Category editor not available."
-msgstr "Kategoriredigering ikkje tilgjengeleg."
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:2352
 msgid "This contact belongs to these categories:"
 msgstr "Denne kontakten høyrer til desse kategoriane:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#: addressbook/gui/contact-editor/e-contact-editor.c:2429
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Slett dei valde kontaktane"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#: addressbook/gui/contact-editor/e-contact-editor.c:2433
 #, fuzzy
 msgid "No image"
 msgstr "Niger"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#: addressbook/gui/contact-editor/e-contact-editor.c:2636
 #, fuzzy
 msgid ""
-"The following entries are invalid:\n"
+"The contact data is invalid:\n"
 "\n"
-msgstr "Desse tilkoplingane er aktive:"
+msgstr "Datoen dette skal skje igjen er ikkje gyldig"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2738
-#, c-format
-msgid "Could not find widget for a field: `%s'"
-msgstr "Kan ikkje finna skjermelement for felt: «%s»"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#, fuzzy
+msgid "Invalid contact."
+msgstr "%d kontaktar"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+msgid ""
+"The contact cannot be saved to the selected address book. Do you want to "
+"discard changes?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2727
+#: addressbook/gui/contact-editor/e-contact-editor.c:2751
+msgid "_Discard"
+msgstr "_Forkast"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+msgid ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
+msgstr ""
 
 # TRN: «Send» betre enn «post»?
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:62
@@ -2232,7 +2146,7 @@ msgid "_Edit Full"
 msgstr "R_ediger alt"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:166
 msgid "_Full Name:"
 msgstr "_Fullt namn:"
 
@@ -2380,30 +2294,30 @@ msgstr "_Listenamn:"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Skriv ei e-post-adresse eller dra ein kontakt til lista under:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "contact-list-editor"
 msgstr "contact-list-editor"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:153
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:215
+#: addressbook/gui/widgets/e-addressbook-view.c:217
 #: addressbook/gui/widgets/e-minicard-view.c:460
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Bok"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
 msgid "Is New List"
 msgstr "Er ny liste"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:215
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
 msgid "Contact List Editor"
 msgstr "Redigering av kontakter"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:438
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
 msgid "Save List as VCard"
 msgstr "Lagra liste som VCard"
 
@@ -2450,124 +2364,124 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Avansert søk"
 
-#: addressbook/gui/widgets/eab-contact-display.c:129
-#: addressbook/gui/widgets/eab-contact-display.c:192
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:139
-#: addressbook/gui/widgets/eab-contact-display.c:205
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:257
-#: addressbook/gui/widgets/eab-contact-display.c:533
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:525
 msgid "List Members"
 msgstr "Listemedlemmar"
 
-#: addressbook/gui/widgets/eab-contact-display.c:329
-#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/eab-contact-display.c:321
+#: addressbook/gui/widgets/eab-contact-display.c:323
 #, fuzzy
 msgid "E-mail"
 msgstr "E-post"
 
-#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/eab-contact-display.c:332
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organisasjon"
 
-#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:333
 #, fuzzy
 msgid "Position"
 msgstr "Skildring"
 
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:354
 #, fuzzy
 msgid "Groupwise"
 msgstr "Gruppe"
 
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:340
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:349
-#: addressbook/gui/widgets/eab-contact-display.c:370
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:362
 #, fuzzy
 msgid "Phone"
 msgstr "Bil-telefon"
 
-#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:342
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:354
+#: addressbook/gui/widgets/eab-contact-display.c:346
 #, fuzzy
 msgid "work"
 msgstr "Arbeid"
 
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:359
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:368
-#: addressbook/gui/widgets/eab-contact-display.c:587
+#: addressbook/gui/widgets/eab-contact-display.c:360
+#: addressbook/gui/widgets/eab-contact-display.c:579
 msgid "Blog"
 msgstr "Vevlogg"
 
-#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/eab-contact-display.c:363
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: addressbook/gui/widgets/eab-contact-display.c:375
+#: addressbook/gui/widgets/eab-contact-display.c:367
 #, fuzzy
 msgid "personal"
 msgstr "Personleg"
 
-#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/eab-contact-display.c:374
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Merknad"
 
-#: addressbook/gui/widgets/eab-contact-display.c:548
+#: addressbook/gui/widgets/eab-contact-display.c:540
 msgid "Job Title"
 msgstr "Jobbtittel:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/eab-contact-display.c:544
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:774
+#: smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "E-post"
 
-#: addressbook/gui/widgets/eab-contact-display.c:579
+#: addressbook/gui/widgets/eab-contact-display.c:571
 msgid "Home page"
 msgstr "Heimeside"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 msgid "Success"
 msgstr "Vellukka"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Backend busy"
 msgstr ""
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Repository offline"
 msgstr "Fråkopla lager"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 #, fuzzy
 msgid "Address Book does not exist"
 msgstr "Adresseboka finst ikkje"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 #, fuzzy
 msgid "No Self Contact defined"
 msgstr "Ny kontaktliste"
@@ -2575,27 +2489,27 @@ msgstr "Ny kontaktliste"
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Permission denied"
 msgstr "Nekta tilgang"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Contact not found"
 msgstr "Fann ikkje kontakt"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Contact ID already exists"
 msgstr "Kontakt-ID finst frå før"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Protocol not supported"
 msgstr "Protokollen er ikkje støtta"
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:60
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:233
 #: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
@@ -2608,40 +2522,40 @@ msgid "Cancelled"
 msgstr "Avbroten"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:61
 #, fuzzy
 msgid "Could not cancel"
 msgstr "Klarte ikkje opna kjelde"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Authentication Failed"
 msgstr "Autentisering feila"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Authentication Required"
 msgstr "Treng autentisering"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:66
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "TLS not Available"
 msgstr "TLS er ikkje tilgjengeleg"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#: addressbook/gui/widgets/eab-gui-util.c:66
 #, fuzzy
 msgid "No such source"
 msgstr "Ingen slik melding"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:69
+#: addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Other error"
 msgstr "Anna feil"
 
 # TRN. «Aksessera». Blæ.
-#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:90
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
@@ -2649,7 +2563,7 @@ msgstr ""
 "Kan ikkje opna denne adresseboka. Sjå etter at stien finst og at du har "
 "løyve til å aksessera han."
 
-#: addressbook/gui/widgets/eab-gui-util.c:110
+#: addressbook/gui/widgets/eab-gui-util.c:97
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -2657,17 +2571,18 @@ msgstr ""
 "Kan ikkje opna denne adresseboka. Det betyr anten at du har skrive inn ei "
 "ugyldig adresse, eller at LDAP-tenaren ikkje kan nåast."
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:102
+#, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution you must compile the program from the CVS "
-"sources after retrieving OpenLDAP from the link below."
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
 msgstr ""
 "Denne versjonen av Evolution er ikkje kompilert med LDAP-støtte. Dersom du "
 "ynsjer å bruka LDAP i Evolution, må du kompilera programmet frå kjeldekoden "
 "i CVS etter at du har henta OpenLDAP frå lenkja under."
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:109
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -2675,11 +2590,7 @@ msgstr ""
 "Kan ikkje opna denne adresseboka. Det betyr anten at du har skrive inn ei "
 "ugyldig adresse, eller at tenaren ikkje kan nåast."
 
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "Unable to open addressbook"
-msgstr "Ikkje i stand å opna adresseboka"
-
-#: addressbook/gui/widgets/eab-gui-util.c:162
+#: addressbook/gui/widgets/eab-gui-util.c:129
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2691,7 +2602,7 @@ msgstr ""
 "til å visa. Gjer søket ditt meir spesifikt eller hev\n"
 "resultatgrensa i oppsettet for katalogtenaren i denne adresseboka."
 
-#: addressbook/gui/widgets/eab-gui-util.c:168
+#: addressbook/gui/widgets/eab-gui-util.c:135
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -2703,53 +2614,45 @@ msgstr ""
 "auk grensa for kor lang tid eit søk kan ta i katalogtenar-innstillingane\n"
 "for denne adresseboka."
 
-#: addressbook/gui/widgets/eab-gui-util.c:174
+#: addressbook/gui/widgets/eab-gui-util.c:141
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:177
+#: addressbook/gui/widgets/eab-gui-util.c:144
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:147
 msgid "This query did not complete successfully."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
-msgid "Do you want to save changes?"
-msgstr "Vil du lagra endringane?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:208
-msgid "_Discard"
-msgstr "_Forkast"
-
-#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:169
 msgid "Error adding list"
 msgstr "Feil ved tillegging av liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:229
-#: addressbook/gui/widgets/eab-gui-util.c:652
+#: addressbook/gui/widgets/eab-gui-util.c:169
+#: addressbook/gui/widgets/eab-gui-util.c:580
 msgid "Error adding contact"
 msgstr "Feil når kontakt vart lagt til"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying list"
 msgstr "Feil ved endring av liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying contact"
 msgstr "Feil ved endring av kontakt"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:192
 msgid "Error removing list"
 msgstr "Feil ved fjerning av liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
-#: addressbook/gui/widgets/eab-gui-util.c:610
+#: addressbook/gui/widgets/eab-gui-util.c:192
+#: addressbook/gui/widgets/eab-gui-util.c:538
 msgid "Error removing contact"
 msgstr "Feil ved fjerning av kontakt"
 
-#: addressbook/gui/widgets/eab-gui-util.c:334
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2758,7 +2661,7 @@ msgstr ""
 "Å opna %d kontaktar vil også opna %d nye vindauge på skjermen.\n"
 "Vil du verkeleg visa alle desse kontaktane?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:360
+#: addressbook/gui/widgets/eab-gui-util.c:300
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2767,50 +2670,45 @@ msgstr ""
 "%s eksisterar allereide\n"
 "Vil du skrive over?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:364
+#: addressbook/gui/widgets/eab-gui-util.c:304
 msgid "Overwrite"
 msgstr "Skriv over"
 
-#: addressbook/gui/widgets/eab-gui-util.c:400
-#, c-format
-msgid "Error saving %s: %s"
-msgstr "Feil ved lagring av %s: %s"
-
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:437
+#: addressbook/gui/widgets/eab-gui-util.c:365
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:571
+#: addressbook/gui/widgets/eab-gui-util.c:499
 msgid "list"
 msgstr "liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:706
+#: addressbook/gui/widgets/eab-gui-util.c:634
 msgid "Move contact to"
 msgstr "Flytt kontakt til"
 
-#: addressbook/gui/widgets/eab-gui-util.c:708
+#: addressbook/gui/widgets/eab-gui-util.c:636
 msgid "Copy contact to"
 msgstr "Kopiér kontakt til"
 
-#: addressbook/gui/widgets/eab-gui-util.c:711
+#: addressbook/gui/widgets/eab-gui-util.c:639
 msgid "Move contacts to"
 msgstr "Flytt kontakt til"
 
-#: addressbook/gui/widgets/eab-gui-util.c:713
+#: addressbook/gui/widgets/eab-gui-util.c:641
 msgid "Copy contacts to"
 msgstr "Kopiér kontakt til"
 
-#: addressbook/gui/widgets/eab-gui-util.c:716
+#: addressbook/gui/widgets/eab-gui-util.c:644
 #, fuzzy
 msgid "Select target addressbook."
 msgstr "Vel kontaktar frå adresseboka"
 
-#: addressbook/gui/widgets/eab-gui-util.c:939
+#: addressbook/gui/widgets/eab-gui-util.c:867
 msgid "Multiple VCards"
 msgstr "Fleire VCard"
 
-#: addressbook/gui/widgets/eab-gui-util.c:942
+#: addressbook/gui/widgets/eab-gui-util.c:870
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard for %s"
@@ -2898,7 +2796,7 @@ msgstr[1] "%d kontaktar"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:229
+#: addressbook/gui/widgets/e-addressbook-view.c:231
 #: addressbook/gui/widgets/e-minicard-view.c:467
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
@@ -2916,146 +2814,135 @@ msgstr "Modell"
 msgid "Error modifying card"
 msgstr "Feil ved endringa av kort"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:163
 msgid "Name begins with"
 msgstr "Namnet byrjar med"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:164
 msgid "Email begins with"
 msgstr "E-post byrjar med"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:57
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Kategori er"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-#: calendar/gui/cal-search-bar.c:50
+#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Nokon felt inneheld"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+#: addressbook/gui/widgets/e-addressbook-view.c:172
 msgid "Advanced..."
 msgstr "Avansert ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:236
+#: addressbook/gui/widgets/e-addressbook-view.c:238
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:249
+#: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Type"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:506
+#: addressbook/gui/widgets/e-addressbook-view.c:508
 #, fuzzy
 msgid "Address Book"
 msgstr "Adressebok"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2076
+#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:2080
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
 msgstr "Lagra som VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 msgid "New Contact..."
 msgstr "Ny kontakt ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "New Contact List..."
 msgstr "Ny kontaktliste ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Go to Folder..."
 msgstr "Gå til mappe ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Import..."
 msgstr "Importér ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1066
 msgid "Search for Contacts..."
 msgstr "Søk etter kontakter ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Adressebokkjelder ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1069
 msgid "Pilot Settings..."
 msgstr "Pilot-innstillingar ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Vidaresend kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
 msgid "Send Message to Contact"
 msgstr "Send melding til kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Skriv ut"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
+#: addressbook/gui/widgets/e-addressbook-view.c:1077
 msgid "Print Envelope"
 msgstr "Skriv ut konvolutt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
+#: addressbook/gui/widgets/e-addressbook-view.c:1081
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Adressebok ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1080
+#: addressbook/gui/widgets/e-addressbook-view.c:1082
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Adressebok ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Klipp ut"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopier"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1087
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Lim inn"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:1092
+#: calendar/gui/e-calendar-view.c:1280
 msgid "Current View"
 msgstr "Aktiv vising"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1309
-#, c-format
-msgid ""
-"The addressbook backend for\n"
-"%s\n"
-"has crashed. You will have to restart Evolution in order to use it again"
-msgstr ""
-"Adressebok-bakdelen for\n"
-"%s\n"
-"har krasja. Du må starta Evolution på nytt for å bruka han igjen."
-
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1667
-#: calendar/gui/cal-search-bar.c:362
+#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Einkvar kategori"
 
@@ -3161,7 +3048,7 @@ msgstr "Radio"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-list-view.c:234
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Rolle"
@@ -3307,12 +3194,12 @@ msgstr "Evolution vCalendar-import"
 msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.c:998
+#: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr "Skriv ut kontaktar"
 
-#: addressbook/printing/e-contact-print.c:1064
-#: addressbook/printing/e-contact-print.c:1091
+#: addressbook/printing/e-contact-print.c:1066
+#: addressbook/printing/e-contact-print.c:1093
 msgid "Print contact"
 msgstr "Skriv ut kontakt"
 
@@ -3561,15 +3448,21 @@ msgstr ""
 msgid "Impossible internal error."
 msgstr ""
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:629
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
 msgid "Can not open file"
 msgstr "Kan ikkje opna fil"
 
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-msgid "Can not load URI"
-msgstr "Kan ikkje lasta adresse"
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "Klarte ikkje å lasta adressebok"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Ikkje i stand å opna adresseboka"
 
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
@@ -3587,7 +3480,7 @@ msgstr "Filnamn ikkje oppgjeve."
 msgid "Unnamed List"
 msgstr "Liste utan namn"
 
-#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Skriv inn passord"
@@ -3865,10 +3758,10 @@ msgid "Whether to show week numbers in date navigator"
 msgstr "Om vekenummer skal visast i minikalenderen"
 
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:88
-#: calendar/gui/gnome-cal.c:1703
-#: camel/providers/groupwise/camel-gw-listener.c:304
-#: camel/providers/groupwise/camel-gw-listener.c:327
+#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/gnome-cal.c:1705
+#: camel/providers/groupwise/camel-gw-listener.c:311
+#: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
 msgstr "Kalender"
 
@@ -3888,7 +3781,7 @@ msgstr "Fjern hendingar eldre enn"
 
 #: calendar/gui/calendar-commands.c:363
 #: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:19 filter/filter.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
 msgid "days"
 msgstr "dagar"
 
@@ -4034,24 +3927,24 @@ msgstr "Vekesvising"
 msgid "Month View"
 msgstr "Månadsvising"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Samandrag inneheld"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Skildring inneheld"
 
-#: calendar/gui/cal-search-bar.c:54
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Merknad inneheld"
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:53
 #, fuzzy
 msgid "Location contains"
 msgstr "Skildring inneheld"
 
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
 msgid "Unmatched"
 msgstr "Ikkje truffe"
 
@@ -4072,23 +3965,23 @@ msgstr "Nekta tilgang til å opna kalenderen"
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:466
+#: calendar/gui/dialogs/alarm-options.c:467
 msgid "Audio Alarm Options"
 msgstr "Val for lydlarm"
 
-#: calendar/gui/dialogs/alarm-options.c:475
+#: calendar/gui/dialogs/alarm-options.c:476
 msgid "Message Alarm Options"
 msgstr "Eigenskapar meldingsalarm"
 
-#: calendar/gui/dialogs/alarm-options.c:484
+#: calendar/gui/dialogs/alarm-options.c:485
 msgid "Email Alarm Options"
 msgstr "Alternativ for e-postalam"
 
-#: calendar/gui/dialogs/alarm-options.c:493
+#: calendar/gui/dialogs/alarm-options.c:494
 msgid "Program Alarm Options"
 msgstr "Alternativ for program-alarmar"
 
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:510
 msgid "Unknown Alarm Options"
 msgstr "Alternativ for ukjente alarmar"
 
@@ -4124,7 +4017,7 @@ msgstr "Send til:"
 msgid "With these arguments:"
 msgstr "Med desse argumenta:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
 msgid "dialog1"
 msgstr "dialog1"
 
@@ -4134,7 +4027,7 @@ msgid "extra times every"
 msgstr "gongar kvar(t)"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:20 filter/filter.glade.h:16
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr "timar"
 
@@ -4180,7 +4073,7 @@ msgstr "Send ein e-post"
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Samandrag:"
 
@@ -4210,7 +4103,6 @@ msgid "hour(s)"
 msgstr "time/timar"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:21
 msgid "minute(s)"
 msgstr "minutt"
 
@@ -4218,26 +4110,26 @@ msgstr "minutt"
 msgid "start of appointment"
 msgstr "byrjing på avtale"
 
-#: calendar/gui/dialogs/calendar-setup.c:170
+#: calendar/gui/dialogs/calendar-setup.c:172
 msgid "You must specify a location to get the calendar from."
 msgstr "Du må oppgje ei adresse å henta kalenderen frå."
 
-#: calendar/gui/dialogs/calendar-setup.c:178
+#: calendar/gui/dialogs/calendar-setup.c:180
 #, c-format
 msgid "The source location '%s' is not well-formed."
 msgstr "Kjeldeadressa «%s» er ikkje velforma."
 
-#: calendar/gui/dialogs/calendar-setup.c:193
+#: calendar/gui/dialogs/calendar-setup.c:195
 #, c-format
 msgid "The source location '%s' is not a webcal source."
 msgstr "Kjelda «%s» er ikkje ei webcal-kjelde."
 
-#: calendar/gui/dialogs/calendar-setup.c:265
+#: calendar/gui/dialogs/calendar-setup.c:275
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr "Kjelde med namnet «%s» finst frå før i den valde gruppa"
 
-#: calendar/gui/dialogs/calendar-setup.c:278
+#: calendar/gui/dialogs/calendar-setup.c:288
 #, c-format
 msgid ""
 "The group '%s' is remote. You must specify a location to get the calendar "
@@ -4259,56 +4151,36 @@ msgstr "Oppgåvelistegruppe"
 msgid "C_olor:"
 msgstr "F_argar"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "Calendar Properties"
-msgstr "Kalendereigenskapar"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
 msgid "Pick a color"
 msgstr "Vel ein farge"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:8
-msgid "Remote"
-msgstr "Estern"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "Task List Properties"
-msgstr "Eigenskapar for oppgåveliste"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
 #, fuzzy
 msgid "_Add Calendar"
 msgstr "Legg til ny kalender"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
 #, fuzzy
 msgid "_Add Group"
 msgstr "_Ny gruppe ..."
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-msgid "_Refresh Interval:"
-msgstr "Tid mellom oppf_riskingar:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
 #, fuzzy
 msgid "_Refresh:"
 msgstr "Oppdater"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-msgid "_Source URL:"
-msgstr "_Kjeldeadresse:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
 #, fuzzy
 msgid "_Type:"
 msgstr "Type:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
 #, fuzzy
 msgid "_URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
 msgid "weeks"
 msgstr "veker"
 
@@ -4416,7 +4288,7 @@ msgid "Display"
 msgstr "_Vis"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:76
 msgid "E_nable"
 msgstr "S_lå på"
 
@@ -4427,7 +4299,7 @@ msgstr "_offentleggjering av ledig/oppteken-tid"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:563
+#: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Fredag"
 
@@ -4441,7 +4313,7 @@ msgstr "Minutt"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:559
+#: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Måndag"
 
@@ -4451,7 +4323,7 @@ msgstr "Su_n"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:564
+#: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Laurdag"
 
@@ -4465,7 +4337,7 @@ msgstr "Vis veke_nummer i datonavigatøren"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Søndag"
 
@@ -4479,7 +4351,7 @@ msgstr "T_or"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:562
+#: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Torsdag"
 
@@ -4493,7 +4365,7 @@ msgstr "Tidsformat:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:560
+#: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Tysdag"
 
@@ -4503,7 +4375,7 @@ msgstr "_Veka byrjar:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:561
+#: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Onsdag"
 
@@ -4536,7 +4408,7 @@ msgid "_Day begins:"
 msgstr "_Dagen byrjar:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
-#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:43
@@ -4585,85 +4457,49 @@ msgstr "_Ons"
 msgid "before every appointment"
 msgstr "før kvar avtale"
 
-#: calendar/gui/dialogs/cancel-comp.c:57
-msgid ""
-"The event being deleted is a meeting, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"Hendinga som vert sletta er eit møte. Vil du senda ut ei melding om avlysing?"
-
-#: calendar/gui/dialogs/cancel-comp.c:60
-msgid "Are you sure you want to cancel and delete this meeting?"
-msgstr "Er du sikker på at du vil sletta og avlysa dette møtet?"
-
-#: calendar/gui/dialogs/cancel-comp.c:66
-msgid ""
-"The task being deleted is assigned, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"Oppgåva som vert sletta er tildelt nokon. Vil du senda ei melding om "
-"kansellering?"
-
-#: calendar/gui/dialogs/cancel-comp.c:69
-msgid "Are you sure you want to cancel and delete this task?"
-msgstr "Er du sikker på at du vil kansellera og sletta denne oppgåva?"
-
-#: calendar/gui/dialogs/cancel-comp.c:75
-msgid ""
-"The journal entry being deleted is published, would you like to send a "
-"cancellation notice?"
-msgstr ""
-"Journaloppføringa som vert sletta er publisert. Vil du senda ei melding om "
-"kansellering?"
-
-#: calendar/gui/dialogs/cancel-comp.c:78
-msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr ""
-"Er du sikker på at du vil kansellera og sletta denne journaloppføringa?"
-
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Denne hendinga er sletta."
 
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "Denn oppgåva har vorte sletta."
 
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:68
 msgid "This journal entry has been deleted."
 msgstr "Denne journaloppføringa er sletta."
 
-#: calendar/gui/dialogs/changed-comp.c:75
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  Du har gjort endringar. Vil du forkasta desse endringane og gå ut av "
 "redigering?"
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s Du har ikkje gjort nokon endringar. Gå ut av redigering?"
 
-#: calendar/gui/dialogs/changed-comp.c:82
+#: calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "Hendinga er endra."
 
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "Oppgåva er endra."
 
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:92
 msgid "This journal entry has been changed."
 msgstr "Journalopføringa er endra."
 
-#: calendar/gui/dialogs/changed-comp.c:99
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Du har gjort endringar. Forkast desse endringane og oppdater redigering?"
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Du har ikkje gjort nokon endringar. Oppdater redigering?"
@@ -4701,7 +4537,7 @@ msgid "No summary"
 msgstr "Ikkje noko samandrag"
 
 #: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
 #: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Lagra som ..."
@@ -4755,99 +4591,51 @@ msgstr "Klarte ikkje opna mål"
 msgid "Destination is read only"
 msgstr "Målet er skrivebeskytta"
 
-#: calendar/gui/dialogs/delete-comp.c:95
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "Er du sikker på at du vil sletta avtalen «%s»?"
-
-#: calendar/gui/dialogs/delete-comp.c:98
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "Er du sikker på at du vil sletta denne avtalen utan tittel?"
-
-#: calendar/gui/dialogs/delete-comp.c:104
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "Er du sikker på at du vil sletta oppgåva «%s»?"
-
-#: calendar/gui/dialogs/delete-comp.c:107
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "Er du sikker på at du vil sletta denne oppgåva utan tittel?"
-
-#: calendar/gui/dialogs/delete-comp.c:113
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "Er du sikker på at du vil sletta journaloppføringa «%s»?"
-
-#: calendar/gui/dialogs/delete-comp.c:116
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "Er du sikker på at du vil sletta denne journaloppføringa utan tittel?"
-
-#: calendar/gui/dialogs/delete-comp.c:131
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d appointment?"
-msgid_plural "Are you sure you want to delete %d appointments?"
-msgstr[0] "Er du sikker på at du vil sletta %d avtalar?"
-msgstr[1] "Er du sikker på at du vil sletta %d avtalar?"
-
-#: calendar/gui/dialogs/delete-comp.c:138
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d task?"
-msgid_plural "Are you sure you want to delete %d tasks?"
-msgstr[0] "Er du sikker på at du vil sletta %d oppgåver?"
-msgstr[1] "Er du sikker på at du vil sletta %d oppgåver?"
-
-#: calendar/gui/dialogs/delete-comp.c:145
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d journal entry?"
-msgid_plural "Are you sure you want to delete %d journal entries?"
-msgstr[0] "Er du sikker på at du vil sletta %d journaloppføringar?"
-msgstr[1] "Er du sikker på at du vil sletta %d journaloppføringar?"
-
-#: calendar/gui/dialogs/delete-error.c:52
+#: calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "Hendinga kan ikkje slettast på grunn av ein CORBA-feil"
 
-#: calendar/gui/dialogs/delete-error.c:55
+#: calendar/gui/dialogs/delete-error.c:57
 msgid "The task could not be deleted due to a corba error"
 msgstr "Oppgåva kan ikkje slettast på grunn av ein CORBA-feil"
 
-#: calendar/gui/dialogs/delete-error.c:58
+#: calendar/gui/dialogs/delete-error.c:60
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr "Journaloppføringa kan ikkje slettast på grunn av ein CORBA-feil"
 
-#: calendar/gui/dialogs/delete-error.c:61
+#: calendar/gui/dialogs/delete-error.c:63
 msgid "The item could not be deleted due to a corba error"
 msgstr "Oppføringa kan ikkje slettast på grunn av ein CORBA-feil"
 
-#: calendar/gui/dialogs/delete-error.c:68
+#: calendar/gui/dialogs/delete-error.c:70
 msgid "The event could not be deleted because permission was denied"
 msgstr "Hendinga kan ikkje slettast fordi tilgang vert nekta"
 
-#: calendar/gui/dialogs/delete-error.c:71
+#: calendar/gui/dialogs/delete-error.c:73
 msgid "The task could not be deleted because permission was denied"
 msgstr "Oppgåva kan ikkje slettast fordi tilgang vert nekta"
 
-#: calendar/gui/dialogs/delete-error.c:74
+#: calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr "Journaloppføringa kan ikkje slettast fordi tilgang vert nekta"
 
-#: calendar/gui/dialogs/delete-error.c:77
+#: calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
 msgstr "Oppføringa kan ikkje slettast fordi tilgang vert nekta"
 
-#: calendar/gui/dialogs/delete-error.c:84
+#: calendar/gui/dialogs/delete-error.c:86
 msgid "The event could not be deleted due to an error"
 msgstr "Hendinga kan ikkje slettast på grunn av ein feil"
 
-#: calendar/gui/dialogs/delete-error.c:87
+#: calendar/gui/dialogs/delete-error.c:89
 msgid "The task could not be deleted due to an error"
 msgstr "Oppgåva kan ikkje slettast på grunn av ein feil"
 
-#: calendar/gui/dialogs/delete-error.c:90
+#: calendar/gui/dialogs/delete-error.c:92
 msgid "The journal entry could not be deleted due to an error"
 msgstr "Journaloppføringa kan ikkje slettast på grunn av ein feil"
 
-#: calendar/gui/dialogs/delete-error.c:93
+#: calendar/gui/dialogs/delete-error.c:95
 msgid "The item could not be deleted due to an error"
 msgstr "Oppføringa kan ikkje slettast på grunn av ein feil"
 
@@ -4981,11 +4769,11 @@ msgstr "_Start-tid:"
 
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:3
+#: calendar/gui/dialogs/meeting-page.glade.h:4
 #: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
 #: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1559
-#: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:100
+#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
+#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
@@ -5011,8 +4799,8 @@ msgstr "_Delegér til ..."
 #. FIXME: need to disable for undeletable folders
 #: calendar/gui/dialogs/meeting-page.c:655
 #: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1310 calendar/gui/e-calendar-view.c:1342
-#: mail/em-folder-tree.c:2557 mail/em-folder-view.c:919
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
+#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -5020,7 +4808,7 @@ msgid "_Delete"
 msgstr "_Slett"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:240
+#: calendar/gui/e-meeting-list-view.c:218
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Deltakar"
@@ -5056,16 +4844,15 @@ msgid "Member"
 msgstr "Medlem"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
-#: mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-list-view.c:248
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
 
@@ -5073,20 +4860,20 @@ msgstr "Status"
 msgid "Add A_ttendee"
 msgstr "Legg _til deltakar"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "Add attendees from addressbook."
+msgstr "_Legg til avsendar i adresseboka"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Organisator:"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
+#: calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "_Change Organizer"
 msgstr "_Endre organisator"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-#: calendar/gui/e-meeting-time-sel.c:417
-msgid "_Invite Others..."
-msgstr "_Inviter andre ..."
-
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
 msgstr "   Kalenderalternativ</b>                <b>"
@@ -5236,7 +5023,7 @@ msgid "_No recurrence"
 msgstr "_Inga repetering"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:450
+#: composer/e-msg-composer-attachment-bar.c:453
 msgid "_Remove"
 msgstr "Fje_rn"
 
@@ -5268,54 +5055,20 @@ msgstr "veke(r)"
 msgid "year(s)"
 msgstr "år"
 
-#: calendar/gui/dialogs/save-comp.c:53
-msgid ""
-"This event has been changed, but has not been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Denne hendinga er endra, men ikkje lagra.\n"
-"\n"
-"Vil du lagra endringane?"
-
-#: calendar/gui/dialogs/save-comp.c:57
-msgid "_Discard Changes"
-msgstr "_Forkast endringar"
-
-#: calendar/gui/dialogs/save-comp.c:62
-msgid "Save Event"
-msgstr "Lagra hending"
-
-#: calendar/gui/dialogs/select-source-dialog.c:65
+#: calendar/gui/dialogs/select-source-dialog.c:69
 #, fuzzy
 msgid "Select destination"
 msgstr "Vel målkjelde"
 
-#: calendar/gui/dialogs/select-source-dialog.c:86
+#: calendar/gui/dialogs/select-source-dialog.c:90
 #, fuzzy
 msgid "_Destination"
 msgstr "Målet er skrivebeskytta"
 
-#: calendar/gui/dialogs/select-source-dialog.c:88
+#: calendar/gui/dialogs/select-source-dialog.c:92
 msgid "Task List"
 msgstr "Oppgåveliste"
 
-#: calendar/gui/dialogs/send-comp.c:57
-msgid "The meeting information has been created. Send it?"
-msgstr "Møteinformasjonen er oppretta. Senda ut?"
-
-#: calendar/gui/dialogs/send-comp.c:60
-msgid "The meeting information has changed. Send an updated version?"
-msgstr "Møteinformasjonen er endra. Senda ein oppdatert versjon?"
-
-#: calendar/gui/dialogs/send-comp.c:67
-msgid "The task assignment information has been created. Send it?"
-msgstr "Informasjonen om tildelinga av oppgåva er endra. Send ut?"
-
-#: calendar/gui/dialogs/send-comp.c:71
-msgid "The task information has changed. Send an updated version?"
-msgstr "Oppgåveinformasjonen er endra. Send ein oppdatert versjon?"
-
 #: calendar/gui/dialogs/task-details-page.c:406
 msgid "Completed date is wrong"
 msgstr "Dato for fullføring er feil"
@@ -5336,7 +5089,7 @@ msgstr "Ferdig"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #: calendar/gui/e-cal-component-preview.c:249
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:960
 msgid "High"
 msgstr "Høg"
 
@@ -5350,14 +5103,14 @@ msgstr "Under arbeid"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:253
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:958
 msgid "Low"
 msgstr "Lav"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:251
 #: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:957
+#: mail/message-list.c:959
 msgid "Normal"
 msgstr "Vanleg"
 
@@ -5415,8 +5168,8 @@ msgstr "Kon_fidensielt"
 
 #: calendar/gui/dialogs/task-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
+#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Skildring:"
 
@@ -5581,7 +5334,7 @@ msgstr "Forfallsdato:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:950
+#: calendar/gui/e-itip-control.c:943
 msgid "Status:"
 msgstr "Status:"
 
@@ -5666,12 +5419,12 @@ msgstr "Oppteke"
 msgid "Deleting selected objects"
 msgstr "Slettar valde objekt"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
 msgid "Updating objects"
 msgstr "Oppdaterar objekt"
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1370
+#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
 #: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Opna"
@@ -5681,15 +5434,15 @@ msgid "Open _Web Page"
 msgstr "_Opna nettside"
 
 #: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1291 calendar/gui/e-calendar-view.c:1376
-#: mail/em-folder-view.c:896 mail/em-popup.c:690 mail/em-popup.c:806
+#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
+#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "_Lagra som ..."
 
 #: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1292
-#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
+#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
@@ -5697,24 +5450,24 @@ msgid "_Print..."
 msgstr "S_kriv ut"
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Kl_ipp ut"
 
 #: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1338
-#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2550
-#: mail/message-list.c:1644 ui/evolution-addressbook.xml.h:31
+#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
+#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
+#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Kopier"
 
 #: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1273 calendar/gui/e-calendar-view.c:1299
-#: calendar/gui/e-calendar-view.c:1372 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
+#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
@@ -5783,71 +5536,71 @@ msgstr "Samandrag"
 msgid "Task sort"
 msgstr "Sortér oppgåver"
 
-#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
 msgid "New _Appointment..."
 msgstr "Ny _avtale ..."
 
-#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
+#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
 msgid "New All Day _Event"
 msgstr "Ny h_eildagshending"
 
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
+#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
 msgid "New Meeting"
 msgstr "Nytt møte"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
 msgid "New Task"
 msgstr "Ny oppgåve"
 
-#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Vel _tråd"
 
-#: calendar/gui/e-calendar-view.c:1280
+#: calendar/gui/e-calendar-view.c:1283
 #, fuzzy
 msgid "_Select Date..."
 msgstr "_Vel ..."
 
-#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publiser ledig/oppteken-informasjon"
 
-#: calendar/gui/e-calendar-view.c:1303
+#: calendar/gui/e-calendar-view.c:1306
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Kopier til mappe ..."
 
-#: calendar/gui/e-calendar-view.c:1304
+#: calendar/gui/e-calendar-view.c:1307
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "Flytt til _mappe ..."
 
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1308
 msgid "_Schedule Meeting..."
 msgstr "_Set opp møte ..."
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1309
 msgid "_Forward as iCalendar..."
 msgstr "_Send vidare som iCalendar ..."
 
-#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
 msgid "Delete this _Occurrence"
 msgstr "Slett denne _hendinga"
 
-#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
 msgid "Delete _All Occurrences"
 msgstr "Slett _alle hendingane"
 
-#: calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1349
 msgid "Go to _Today"
 msgstr "Gå _til idag"
 
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1351
 msgid "_Go to Date..."
 msgstr "_Gå til dato ..."
 
-#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "_Innstillingar ..."
 
@@ -5862,9 +5615,9 @@ msgstr "Start-dato"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:967 calendar/gui/e-itip-control.c:1169
-#: calendar/gui/e-meeting-list-view.c:144
-#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
 #: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
 #: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
 #: camel/camel-tcp-stream-openssl.c:631
@@ -5890,13 +5643,13 @@ msgid "Assigned"
 msgstr "Tildelt"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr "Ja"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "Nei"
 
@@ -5908,7 +5661,7 @@ msgstr "N"
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
 msgid "E"
 msgstr "E"
 
@@ -5981,102 +5734,102 @@ msgstr "%d. %b"
 msgid "%02i minute divisions"
 msgstr "%02i minutt oppdeling"
 
-#: calendar/gui/e-itip-control.c:592
+#: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:596
 #, fuzzy, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Kvar dag"
 msgstr[1] "Kvar dag"
 
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:601
 #, fuzzy, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Kvar veke"
 msgstr[1] "Kvar veke"
 
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:603
 #, fuzzy, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "Kvar veke på "
 msgstr[1] "Kvar veke på "
 
-#: calendar/gui/e-itip-control.c:618
+#: calendar/gui/e-itip-control.c:611
 msgid " and "
 msgstr " og "
 
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:618
 #, c-format
 msgid "The %s day of "
 msgstr "Den %s dagen i "
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:631
 #, c-format
 msgid "The %s %s of "
 msgstr "Den %s %s i "
 
-#: calendar/gui/e-itip-control.c:645
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "kvar månad"
 msgstr[1] "kvar månad"
 
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:642
 #, fuzzy, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Kvart år"
 msgstr[1] "Kvart år"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:653
 #, fuzzy, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] " totalt %d gongar"
 msgstr[1] " totalt %d gongar"
 
-#: calendar/gui/e-itip-control.c:669
+#: calendar/gui/e-itip-control.c:662
 msgid ", ending on "
 msgstr ", sluttar på"
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:686
 msgid "<b>Starts:</b> "
 msgstr "<b>Byrjar:</b> "
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:696
 msgid "<b>Ends:</b> "
 msgstr "<b>Sluttar:</b>"
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:716
 msgid "<b>Completed:</b> "
 msgstr "<b>Fullført:</b> "
 
-#: calendar/gui/e-itip-control.c:733
+#: calendar/gui/e-itip-control.c:726
 msgid "<b>Due:</b> "
 msgstr "<b>Skal vera ferdig:</b>"
 
-#: calendar/gui/e-itip-control.c:771 calendar/gui/e-itip-control.c:827
+#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
 msgid "iCalendar Information"
 msgstr "iCalendar-informasjon"
 
 #. Title
-#: calendar/gui/e-itip-control.c:788
+#: calendar/gui/e-itip-control.c:781
 msgid "iCalendar Error"
 msgstr "iCalendar-feil"
 
-#: calendar/gui/e-itip-control.c:859 calendar/gui/e-itip-control.c:875
-#: calendar/gui/e-itip-control.c:886 calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
 msgid "An unknown person"
 msgstr "Ein ukjent person"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:910
+#: calendar/gui/e-itip-control.c:903
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -6084,306 +5837,311 @@ msgstr ""
 "<br> Sjå gjennom den følgjande informasjon, og velj ei handling frå menyen "
 "under."
 
-#: calendar/gui/e-itip-control.c:925
+#: calendar/gui/e-itip-control.c:918
 msgid "<i>None</i>"
 msgstr "<i>Ingen</i>"
 
-#: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:929
+#, fuzzy
+msgid "Location:"
+msgstr "Plassering:"
+
+#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Akseptert"
 
-#: calendar/gui/e-itip-control.c:959 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Mellombels godteke"
 
-#: calendar/gui/e-itip-control.c:963 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Avslått"
 
-#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.c:1050
-#: calendar/gui/e-itip-control.c:1076 calendar/gui/e-itip-control.c:1089
-#: calendar/gui/e-itip-control.c:1102 calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
 msgid "Choose an action:"
 msgstr "Vel ei handling:"
 
-#: calendar/gui/e-itip-control.c:1023
+#: calendar/gui/e-itip-control.c:1016
 msgid "Update"
 msgstr "Oppdater"
 
-#: calendar/gui/e-itip-control.c:1024 calendar/gui/e-itip-control.c:1055
-#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1091
-#: calendar/gui/e-itip-control.c:1104 calendar/gui/e-itip-control.c:1117
-#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
+#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1044
 msgid "Accept"
 msgstr "Godta"
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1045
 msgid "Tentatively accept"
 msgstr "Godta mellombels"
 
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1046
 msgid "Decline"
 msgstr "Avslå"
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1070
 msgid "Send Free/Busy Information"
 msgstr "Send ledig/oppteken-informasjon"
 
-#: calendar/gui/e-itip-control.c:1090
+#: calendar/gui/e-itip-control.c:1083
 msgid "Update respondent status"
 msgstr "Opdatér status på svar"
 
-#: calendar/gui/e-itip-control.c:1103
+#: calendar/gui/e-itip-control.c:1096
 msgid "Send Latest Information"
 msgstr "Send nyaste informasjon"
 
-#: calendar/gui/e-itip-control.c:1116 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1185
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> bar publisert møteinformasjon."
 
-#: calendar/gui/e-itip-control.c:1193
+#: calendar/gui/e-itip-control.c:1186
 msgid "Meeting Information"
 msgstr "Møteinformasjon"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1191
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> ber om at %s er til stades på eit møte."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1193
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> spør etter deg for å stille opp på eit møte."
 
-#: calendar/gui/e-itip-control.c:1201
+#: calendar/gui/e-itip-control.c:1194
 msgid "Meeting Proposal"
 msgstr "Møteframlegg"
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> ynskjer å leggje til noko til eit eksisterande møte."
 
-#: calendar/gui/e-itip-control.c:1206
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Update"
 msgstr "Møteoppdatering"
 
-#: calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1203
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> ber om å få den nyaste møteinformasjonen."
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1204
 msgid "Meeting Update Request"
 msgstr "Førespurnad om møteoppdatering"
 
-#: calendar/gui/e-itip-control.c:1218
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> har svart på ein førespurnad om eit møte."
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Reply"
 msgstr "Møtesvar"
 
-#: calendar/gui/e-itip-control.c:1226
+#: calendar/gui/e-itip-control.c:1219
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> har avlyst eit møte."
 
-#: calendar/gui/e-itip-control.c:1227
+#: calendar/gui/e-itip-control.c:1220
 msgid "Meeting Cancellation"
 msgstr "Møtekansellering"
 
-#: calendar/gui/e-itip-control.c:1234 calendar/gui/e-itip-control.c:1302
-#: calendar/gui/e-itip-control.c:1337
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1330
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> har sendt ei uforståeleg melding."
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1228
 msgid "Bad Meeting Message"
 msgstr "Feil i møtemelding"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1253
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> har publisert informasjon om ei oppgåve."
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1254
 msgid "Task Information"
 msgstr "Oppgåveinformasjon"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1259
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> ber om at %s utfører ei oppgåve."
 
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> ber om at du utfører ei oppgåve."
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1262
 msgid "Task Proposal"
 msgstr "Oppgåveframlegg"
 
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> ønskjar å leggje til ei eksisterande oppgåve."
 
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Update"
 msgstr "Oppgåveoppdatering"
 
-#: calendar/gui/e-itip-control.c:1278
+#: calendar/gui/e-itip-control.c:1271
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> ber om å få den nyaste oppgåveinformasjonen."
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1272
 msgid "Task Update Request"
 msgstr "Oppgåveoppdateringsforepørjing"
 
-#: calendar/gui/e-itip-control.c:1286
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> har svart på ei  oppgåvetildeling."
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Reply"
 msgstr "Oppgåvesvar"
 
-#: calendar/gui/e-itip-control.c:1294
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> har kansellert ei oppgåve."
 
-#: calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1288
 msgid "Task Cancellation"
 msgstr "Oppgåvekansellering"
 
-#: calendar/gui/e-itip-control.c:1303
+#: calendar/gui/e-itip-control.c:1296
 msgid "Bad Task Message"
 msgstr "Ugyldig oppgåvemelding"
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1315
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> har publisert ledig/oppteken-informasjon."
 
-#: calendar/gui/e-itip-control.c:1323
+#: calendar/gui/e-itip-control.c:1316
 msgid "Free/Busy Information"
 msgstr "Fri/ledig-informasjon"
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> spør etter ledig/oppteken-informasjonen din."
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1321
 msgid "Free/Busy Request"
 msgstr "Fri/ledig forespørsel"
 
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1325
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 "<b>%s</b> har svart på ein førespurnad etter ledig/oppteken-informasjon."
 
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1326
 msgid "Free/Busy Reply"
 msgstr "Fri/Oppteke svar"
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1331
 msgid "Bad Free/Busy Message"
 msgstr "Ugyldig ledig/oppteken-melding"
 
-#: calendar/gui/e-itip-control.c:1413
+#: calendar/gui/e-itip-control.c:1406
 msgid "The message does not appear to be properly formed"
 msgstr "Meldinga ser ikkje ut til å vera rett forma"
 
-#: calendar/gui/e-itip-control.c:1472
+#: calendar/gui/e-itip-control.c:1465
 msgid "The message contains only unsupported requests."
 msgstr "Denne meldingar inneheld berre førespurnader som ikkje er støtta."
 
-#: calendar/gui/e-itip-control.c:1503
+#: calendar/gui/e-itip-control.c:1496
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Vedlegg inneheld ikkje ei gyldig kalendermelding."
 
-#: calendar/gui/e-itip-control.c:1535
+#: calendar/gui/e-itip-control.c:1528
 msgid "The attachment has no viewable calendar items"
 msgstr "Vedlegget inneheld ingen kalendervedlegg som let seg visa."
 
-#: calendar/gui/e-itip-control.c:1769
+#: calendar/gui/e-itip-control.c:1762
 msgid "Update complete\n"
 msgstr "Oppdateringa er ferdig\n"
 
-#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
+#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Deltakarstatus kan ikkje oppdaterast, for oppføringa finst ikkje lenger."
 
-#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objektet er ugyldig og kan ikkje oppdaterast\n"
 
-#: calendar/gui/e-itip-control.c:1825
+#: calendar/gui/e-itip-control.c:1818
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Dette svaret er ikkje frå ein aktiv deltakar. Skal vedkommande leggjast til "
 "som deltakar?"
 
-#: calendar/gui/e-itip-control.c:1837
+#: calendar/gui/e-itip-control.c:1830
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Deltakarstatusen kan ikkje oppdaterast på grunn av ein ugyldig status!\n"
 
-#: calendar/gui/e-itip-control.c:1856
+#: calendar/gui/e-itip-control.c:1849
 msgid "There was an error on the CORBA system\n"
 msgstr "Det oppstod ein feil i CORBA-systemet\n"
 
-#: calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1852
 msgid "Object could not be found\n"
 msgstr "Fann ikkje objekt.\n"
 
-#: calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1855
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Du har ikkje dei løyva som trengst for å oppdatera kalenderen\n"
 
-#: calendar/gui/e-itip-control.c:1865
+#: calendar/gui/e-itip-control.c:1858
 msgid "Attendee status updated\n"
 msgstr "Deltakarstatus oppdatert\n"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1861
 msgid "Attendee status could not be updated!\n"
 msgstr "Deltakarstatus kan ikkje oppdaterast!\n"
 
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1892
 msgid "Removal Complete"
 msgstr "Fjerning ferdig"
 
-#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
 msgid "Item sent!\n"
 msgstr "Oppføring sendt!\n"
 
-#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
+#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
 msgid "The item could not be sent!\n"
 msgstr "Oppføringen kan ikkje sendast!\n"
 
@@ -6424,74 +6182,74 @@ msgstr "sluttdato"
 msgid "date-start"
 msgstr "start-dato"
 
-#: calendar/gui/e-meeting-list-view.c:62
+#: calendar/gui/e-meeting-list-view.c:59
 msgid "Chair Persons"
 msgstr "Møteleiarar"
 
-#: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:479
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
 msgid "Required Participants"
 msgstr "Deltakarar som må vera med"
 
-#: calendar/gui/e-meeting-list-view.c:64
+#: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Valgfrie deltakere"
 
-#: calendar/gui/e-meeting-list-view.c:65
+#: calendar/gui/e-meeting-list-view.c:62
 msgid "Resources"
 msgstr "Ressursar"
 
-#: calendar/gui/e-meeting-list-view.c:140 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
 #: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr "Individuell"
 
-#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "Gruppe"
 
-#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr "Ressurs"
 
-#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr "Rom"
 
-#: calendar/gui/e-meeting-list-view.c:154 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr "Møteleiar"
 
-#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:127
 #: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
 msgid "Required Participant"
 msgstr "Deltakar som må vera med"
 
-#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr "Valfri deltakar"
 
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr "Ikkje-deltakar"
 
-#: calendar/gui/e-meeting-list-view.c:179 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:177
 #: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
 msgid "Needs Action"
 msgstr "Krev handling"
 
-#: calendar/gui/e-meeting-list-view.c:182 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
 #: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "Mellombels"
 
-#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr "Delegert"
@@ -6508,20 +6266,28 @@ msgstr "Ute av kontoret"
 msgid "No Information"
 msgstr "Ingen informasjon"
 
+#: calendar/gui/e-meeting-time-sel.c:417
+#, fuzzy
+msgid "Add attendees from addressbook"
+msgstr "_Legg til avsendar i adresseboka"
+
 #: calendar/gui/e-meeting-time-sel.c:440
 msgid "_Options"
 msgstr "_Val"
 
 #: calendar/gui/e-meeting-time-sel.c:457
-msgid "Show _Only Working Hours"
+#, fuzzy
+msgid "Show _only working hours"
 msgstr "Vis kun _arbeidstid"
 
 #: calendar/gui/e-meeting-time-sel.c:467
-msgid "Show _Zoomed Out"
+#, fuzzy
+msgid "Show _zoomed out"
 msgstr "Vis _forminska"
 
 #: calendar/gui/e-meeting-time-sel.c:482
-msgid "_Update Free/Busy"
+#, fuzzy
+msgid "_Update free/busy"
 msgstr "_Oppdater ledig/oppteken"
 
 #: calendar/gui/e-meeting-time-sel.c:497
@@ -6537,19 +6303,23 @@ msgid ">_>"
 msgstr ">_>"
 
 #: calendar/gui/e-meeting-time-sel.c:547
-msgid "_All People and Resources"
+#, fuzzy
+msgid "_All people and resources"
 msgstr "_Alle personar og ressursar"
 
 #: calendar/gui/e-meeting-time-sel.c:556
-msgid "All _People and One Resource"
+#, fuzzy
+msgid "All _people and one resource"
 msgstr "Alle _pesonar og ein ressurs"
 
 #: calendar/gui/e-meeting-time-sel.c:565
-msgid "_Required People"
+#, fuzzy
+msgid "_Required people"
 msgstr "_Påkravde deltakarar"
 
 #: calendar/gui/e-meeting-time-sel.c:574
-msgid "Required People and _One Resource"
+#, fuzzy
+msgid "Required people and _one resource"
 msgstr "Påkravde folk _og ein ressurs"
 
 #: calendar/gui/e-meeting-time-sel.c:593
@@ -6587,7 +6357,7 @@ msgstr "%d/%m/%Y"
 msgid "Enter the password for %s"
 msgstr "Skriv inn passordet for %s"
 
-#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6596,19 +6366,14 @@ msgstr ""
 "Feil på %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-
 #. FIXME Loading should be async
 #. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:686
+#: calendar/gui/e-tasks.c:801
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Opnar oppgåver på %s"
 
-#: calendar/gui/e-tasks.c:709
+#: calendar/gui/e-tasks.c:824
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6617,52 +6382,47 @@ msgstr ""
 "Feil under opning av %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:730
+#: calendar/gui/e-tasks.c:845
 msgid "Loading tasks"
 msgstr "Lastar oppgåver"
 
-#: calendar/gui/e-tasks.c:834
+#: calendar/gui/e-tasks.c:949
 msgid "Completing tasks..."
 msgstr "Fullfører oppgåver ..."
 
-#: calendar/gui/e-tasks.c:857
+#: calendar/gui/e-tasks.c:972
 msgid "Deleting selected objects..."
 msgstr "Slettar valde objekt ..."
 
-#: calendar/gui/e-tasks.c:884
+#: calendar/gui/e-tasks.c:999
 msgid "Expunging"
 msgstr "Tømer"
 
-#: calendar/gui/e-tasks.c:960
+#: calendar/gui/e-tasks.c:1075
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
-#: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
+#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
+#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
 #: calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:705
 msgid "Tasks"
 msgstr "Oppgåver"
 
-#: calendar/gui/gnome-cal.c:1876
+#: calendar/gui/gnome-cal.c:1878
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Avtale - %s"
 
-#: calendar/gui/gnome-cal.c:1895
+#: calendar/gui/gnome-cal.c:1897
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Lastar oppgåver"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1920
 #, c-format
 msgid "Opening %s"
 msgstr "Opnar %s"
 
-#: calendar/gui/gnome-cal.c:2048
-#, c-format
-msgid "The calendar backend for '%s' has crashed."
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:2894
+#: calendar/gui/gnome-cal.c:2906
 msgid "Purging"
 msgstr "Tømmer"
 
@@ -6854,7 +6614,7 @@ msgid "On The Web"
 msgstr ""
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 
@@ -6865,7 +6625,7 @@ msgid "Unable to migrate calendar `%s'"
 msgstr "Kan ikkje opna kalenderen «%s»."
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:869
+#: calendar/gui/migration.c:889
 #, fuzzy, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Ikkje i stand å opna oppgåver i «%s»."
@@ -7101,72 +6861,72 @@ msgstr "Skriv ut element"
 msgid "Print Setup"
 msgstr "Utskriftoppsett"
 
-#: calendar/gui/tasks-component.c:303
+#: calendar/gui/tasks-component.c:313
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:371
 msgid "New Task List"
 msgstr "Ny oppgåveliste"
 
-#: calendar/gui/tasks-component.c:398
+#: calendar/gui/tasks-component.c:408
 #, fuzzy, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d kontaktar"
 msgstr[1] "%d kontaktar"
 
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] "Sletta"
 msgstr[1] "Sletta"
 
-#: calendar/gui/tasks-component.c:447
+#: calendar/gui/tasks-component.c:457
 #, fuzzy
 msgid "Failed upgrading tasks."
 msgstr "Lastar oppgåver"
 
-#: calendar/gui/tasks-component.c:526
+#: calendar/gui/tasks-component.c:749
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:538
+#: calendar/gui/tasks-component.c:761
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:576
+#: calendar/gui/tasks-component.c:799
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:804
+#: calendar/gui/tasks-component.c:1040
 msgid "New task"
 msgstr "Ny oppgåve"
 
-#: calendar/gui/tasks-component.c:805
+#: calendar/gui/tasks-component.c:1041
 msgid "_Task"
 msgstr "_Oppgåve"
 
-#: calendar/gui/tasks-component.c:806
+#: calendar/gui/tasks-component.c:1042
 msgid "Create a new task"
 msgstr "Opprett ei ny oppgåve"
 
-#: calendar/gui/tasks-component.c:812
+#: calendar/gui/tasks-component.c:1048
 #, fuzzy
 msgid "New tasks group"
 msgstr "Ny oppgåve"
 
-#: calendar/gui/tasks-component.c:813
+#: calendar/gui/tasks-component.c:1049
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Oppgåvelistegruppe"
 
-#: calendar/gui/tasks-component.c:814
+#: calendar/gui/tasks-component.c:1050
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Opprett ei ny oppgåve"
@@ -8932,12 +8692,12 @@ msgstr "Feil under køyring av filtersøk: %s: %s"
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1259
+#: camel/camel-folder.c:1262
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Ikkje støtta operasjon: søk etter uttrykk: etter %s"
 
-#: camel/camel-folder.c:1299
+#: camel/camel-folder.c:1302
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Ikkje støtta operasjon: søk etter UID: etter %s"
@@ -8950,11 +8710,16 @@ msgstr "Flyttar meldingar"
 msgid "Copying messages"
 msgstr "Kopierer meldingar"
 
-#: camel/camel-folder.c:1666
-msgid "Learning junk and/or non junk message(s)"
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Åtvaring"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
 msgstr ""
 
-#: camel/camel-folder.c:1695
+#: camel/camel-folder.c:1701
 msgid "Filtering new message(s)"
 msgstr "Filtrerer nye meldingar"
 
@@ -8988,15 +8753,15 @@ msgstr ""
 msgid "(match-threads) requires a match type string"
 msgstr ""
 
-#: camel/camel-folder-search.c:785
+#: camel/camel-folder-search.c:784
 msgid "(match-threads) expects an array result"
 msgstr ""
 
-#: camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:790
 msgid "(match-threads) requires the folder set"
 msgstr ""
 
-#: camel/camel-folder-search.c:880
+#: camel/camel-folder-search.c:879
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr ""
@@ -9029,7 +8794,8 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
 #: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:706
+#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Avbroten."
@@ -9395,7 +9161,7 @@ msgstr ""
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1212
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -9776,41 +9542,41 @@ msgstr ""
 msgid "export keys: unimplemented"
 msgstr ""
 
-#: camel/camel-store.c:214
+#: camel/camel-store.c:213
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Leitar etter tilleggsmodular"
 
-#: camel/camel-store.c:244
+#: camel/camel-store.c:243
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr "Kan ikkje laga mappa: %s: %s"
 
-#: camel/camel-store.c:295
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Klarar ikkje å opprette mappe: Ugyldig operasjon på dette lageret"
 
-#: camel/camel-store.c:323
+#: camel/camel-store.c:325
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Kan ikkje laga mappa: %s: %s"
 
-#: camel/camel-store.c:387 camel/camel-vee-store.c:354
+#: camel/camel-store.c:389 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kan ikkje sletta mappe: %s: Ugyldig operasjon"
 
-#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#: camel/camel-store.c:439 camel/camel-vee-store.c:387
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kan ikkje byta namn på mappa: %s: Ugyldig operasjon"
 
-#: camel/camel-store.c:811
+#: camel/camel-store.c:777
 msgid "Trash"
 msgstr "Papirkorg"
 
-#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
-#: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/mail-config.glade.h:95
+#: ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
 msgstr "Juni"
@@ -10034,12 +9800,12 @@ msgstr "Inga slik melding %s i %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Berre sjekk for ny e-post."
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:374
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kan ikkje sletta mappa: %s: Mappa finst ikkje"
 
-#: camel/camel-vee-store.c:398
+#: camel/camel-vee-store.c:395
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kan ikkje endra namn på mappa: %s: Mappa finst ikkje"
@@ -10086,32 +9852,32 @@ msgstr "Adressebok"
 msgid "Post Office Agent SOAP Port:"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:80
+#: camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "Novell GroupWise"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:82
+#: camel/providers/groupwise/camel-groupwise-provider.c:85
 msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: camel/providers/groupwise/camel-groupwise-provider.c:100
 #: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
 msgid "Password"
 msgstr "Passord"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:99
+#: camel/providers/groupwise/camel-groupwise-provider.c:102
 #: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Dette valet let deg kopla til ein IMAP-tenar med eit klartekst-passord."
 
-#: camel/providers/groupwise/camel-gw-listener.c:305
-#: camel/providers/groupwise/camel-gw-listener.c:328
+#: camel/providers/groupwise/camel-gw-listener.c:312
+#: camel/providers/groupwise/camel-gw-listener.c:335
 #, fuzzy
 msgid "Checklist"
 msgstr "liste"
@@ -10255,13 +10021,13 @@ msgstr ""
 "Dette valet let deg kopla til ein IMAP-tenar med eit klartekst-passord."
 
 #: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:429
+#: camel/providers/imap/camel-imap-store.c:428
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP-tenar %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:431
+#: camel/providers/imap/camel-imap-store.c:430
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP-teneste for %s på %s"
@@ -10271,7 +10037,7 @@ msgstr "IMAP-teneste for %s på %s"
 #: camel/providers/imap/camel-imap-store.c:551
 #: camel/providers/imap/camel-imap-store.c:571
 #: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
+#: camel/providers/nntp/camel-nntp-store.c:209
 #: camel/providers/pop3/camel-pop3-store.c:175
 #: camel/providers/smtp/camel-smtp-transport.c:269
 #: camel/providers/smtp/camel-smtp-transport.c:285
@@ -10289,10 +10055,10 @@ msgstr "TLS er ikkje tilgjengeleg"
 
 #: camel/providers/imap4/camel-imap4-store.c:222
 #: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:815
+#: camel/providers/imap/camel-imap-store.c:845
 #: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:137
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
 #: camel/providers/pop3/camel-pop3-store.c:192
 msgid "Connection cancelled"
 msgstr "Tilknytning avbroten"
@@ -10305,8 +10071,8 @@ msgid ""
 msgstr "Kan ikkje kopla til IMAP-tenaren %s på ein sikker måte: %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:649
-#: camel/providers/imap/camel-imap-store.c:680
+#: camel/providers/imap/camel-imap-store.c:679
+#: camel/providers/imap/camel-imap-store.c:710
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Kan ikkje kopla til IMAP-tenaren %s på ein sikker måte: %s"
@@ -10315,7 +10081,7 @@ msgstr "Kan ikkje kopla til IMAP-tenaren %s på ein sikker måte: %s"
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1109
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
 msgid "Unknown error"
 msgstr "Ukjend feil"
 
@@ -10343,8 +10109,8 @@ msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr "Kan ikkje henta mappa: %s: %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1857
-#: camel/providers/imap/camel-imap-store.c:2235
+#: camel/providers/imap/camel-imap-store.c:1885
+#: camel/providers/imap/camel-imap-store.c:2263
 #, fuzzy, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -10423,12 +10189,12 @@ msgstr ""
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3168
+#: camel/providers/imap/camel-imap-store.c:3194
 msgid "Operation cancelled"
 msgstr "Operasjonen vart avbroten"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3171
+#: camel/providers/imap/camel-imap-store.c:3197
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
@@ -10492,13 +10258,6 @@ msgid "Unable to retrieve message: %s"
 msgstr "Kan ikkje henta melding: %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:219
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -10508,15 +10267,15 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-mbox-folder.c:418
+#: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
 msgstr "Ingen slik melding"
 
 #: camel/providers/imap/camel-imap-folder.c:2019
-#: camel/providers/imap/camel-imap-folder.c:2621
-#: camel/providers/nntp/camel-nntp-folder.c:238
+#: camel/providers/imap/camel-imap-folder.c:2622
+#: camel/providers/nntp/camel-nntp-folder.c:220
 msgid "This message is not currently available"
 msgstr "Denne meldinga er ikkje tilgjengeleg."
 
@@ -10525,7 +10284,23 @@ msgstr "Denne meldinga er ikkje tilgjengeleg."
 msgid "Fetching summary information for new messages"
 msgstr "Hentar samandrag om nye meldingar"
 
-#: camel/providers/imap/camel-imap-folder.c:2659
+#: camel/providers/imap/camel-imap-folder.c:2463
+#, c-format
+msgid "Incomplete server response: no information provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2471
+#, c-format
+msgid "Incomplete server response: no UID provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2484
+#, c-format
+msgid ""
+"Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2660
 msgid "Could not find message body in FETCH response."
 msgstr "Fann ikkje meldingskropp i svar på FETCH."
 
@@ -10589,43 +10364,43 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "For lesing og lagring av e-post på IMAP-tenarar."
 
-#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/imap/camel-imap-store.c:680
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS-utvidinga er ikkje støtta."
 
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:711
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL forhandlinga feila"
 
-#: camel/providers/imap/camel-imap-store.c:818
+#: camel/providers/imap/camel-imap-store.c:848
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Kan ikkje kopla til med kommandoen «%s»: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1242
+#: camel/providers/imap/camel-imap-store.c:1272
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP-tenaren %s søttar ikkje den ønska autentiseringstypa %s"
 
-#: camel/providers/imap/camel-imap-store.c:1252
+#: camel/providers/imap/camel-imap-store.c:1282
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Autentiseringstype %s er ikkje støtta"
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1305
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sSkriv inn IMAP-passordet for %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1289
+#: camel/providers/imap/camel-imap-store.c:1319
 msgid "You didn't enter a password."
 msgstr "Du tasta ikkje inn eit passord."
 
-#: camel/providers/imap/camel-imap-store.c:1318
+#: camel/providers/imap/camel-imap-store.c:1348
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10635,18 +10410,18 @@ msgstr ""
 "Ikkje i stand til å autentisere mot IMAP-tenar.\n"
 "%s\n"
 
-#: camel/providers/imap/camel-imap-store.c:1839
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:1867
+#: camel/providers/imap/camel-imap-store.c:2057
 #, c-format
 msgid "No such folder %s"
 msgstr "Mappa «%s» finst ikkje"
 
-#: camel/providers/imap/camel-imap-store.c:1915
-#: camel/providers/imap/camel-imap-store.c:2296
+#: camel/providers/imap/camel-imap-store.c:1943
+#: camel/providers/imap/camel-imap-store.c:2324
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Foreldermappa kan ikkje ha undermapper"
 
-#: camel/providers/imap/camel-imap-store.c:1970
+#: camel/providers/imap/camel-imap-store.c:1998
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10654,7 +10429,7 @@ msgstr "Foreldermappa kan ikkje ha undermapper"
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Kan ikkje laga mappa: %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:2274
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Ukjend opphavsmappe: %s"
@@ -10690,20 +10465,20 @@ msgid "Index message body data"
 msgstr ""
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:388
 #, c-format
 msgid "~%s (%s)"
 msgstr "%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:393
-#: camel/providers/local/camel-local-folder.c:396
+#: camel/providers/local/camel-local-folder.c:392
+#: camel/providers/local/camel-local-folder.c:395
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "postboks: %s (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:400
+#: camel/providers/local/camel-local-folder.c:399
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -10765,7 +10540,7 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:142
 #: camel/providers/local/camel-local-store.c:253
-#: camel/providers/local/camel-mbox-store.c:356
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10838,8 +10613,25 @@ msgstr "Operasjonen å leggja til ei melding i ei maildir vart avbroten"
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Kan ikkje leggja til melding i maildir-mappe: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:226
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mbox-folder.c:417
+#: camel/providers/local/camel-mbox-folder.c:436
+#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:475
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-mh-folder.c:221
+#, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+"Kan ikkje henta melding: %s frå mappa «%s»\n"
+"  %s"
+
+#: camel/providers/local/camel-maildir-folder.c:236
 msgid "Invalid message contents"
 msgstr "Ugyldig meldingsinnhald"
 
@@ -10880,9 +10672,9 @@ msgstr "Kan ikkje sletta mappa «%s»: %s"
 msgid "not a maildir directory"
 msgstr "ikkje ein maildir-katalog"
 
-#: camel/providers/local/camel-maildir-store.c:341
-#: camel/providers/local/camel-spool-store.c:286
-#: camel/providers/local/camel-spool-store.c:316
+#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-spool-store.c:284
+#: camel/providers/local/camel-spool-store.c:314
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Kunne ikkje søka gjennom mappa «%s»: %s"
@@ -10929,27 +10721,18 @@ msgstr "Å leggja til ein e-post vart avbrote"
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Kan ikkje leggja til ei melding i mbox-fila: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:435
-#: camel/providers/local/camel-mbox-folder.c:466
-#: camel/providers/local/camel-mbox-folder.c:474
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"Kan ikkje henta melding: %s frå mappa «%s»\n"
-"  %s"
-
-#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:468
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Mappa ser ut til å vera øydelagt og kan ikkje reparerast."
 
-#: camel/providers/local/camel-mbox-folder.c:475
-msgid "Message construction failed: Corrupt mailbox?"
+#: camel/providers/local/camel-mbox-folder.c:476
+#: camel/providers/local/camel-mh-folder.c:222
+#, fuzzy
+msgid "Message construction failed."
 msgstr "Bygginga av meldinga feila. Øydelagt mailbox?"
 
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:362
+#: camel/providers/local/camel-mbox-store.c:361
 msgid "Cannot create a folder by this name."
 msgstr "Kan ikkje laga ei mappe med dette namnet."
 
@@ -10979,31 +10762,31 @@ msgstr "«%s» er ikkje ei vanleg fil."
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Mappa «%s» er ikkje tom. Ikkje sletta."
 
-#: camel/providers/local/camel-mbox-store.c:375
+#: camel/providers/local/camel-mbox-store.c:374
 #, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Kan ikkje laga katalogen «%s»: %s"
 
-#: camel/providers/local/camel-mbox-store.c:389
+#: camel/providers/local/camel-mbox-store.c:388
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Kan ikkje laga mappa: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:391
+#: camel/providers/local/camel-mbox-store.c:390
 #, fuzzy
 msgid "Folder already exists"
 msgstr "Kort-id eksisterar allereide"
 
-#: camel/providers/local/camel-mbox-store.c:473
+#: camel/providers/local/camel-mbox-store.c:472
 msgid "The new folder name is illegal."
 msgstr "Det nye mappenamnet er ikkje gyldig."
 
-#: camel/providers/local/camel-mbox-store.c:486
+#: camel/providers/local/camel-mbox-store.c:485
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Kan ikkje endra namnet på «%s»: %s"
 
-#: camel/providers/local/camel-mbox-store.c:561
+#: camel/providers/local/camel-mbox-store.c:560
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Kan ikkje endra namnet på «%s» til «%s»: %s"
@@ -11197,7 +10980,7 @@ msgid ""
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:997
+#: camel/providers/nntp/camel-nntp-store.c:1126
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Skriv inn NNTP-passordet for %s@%s"
@@ -11216,19 +10999,10 @@ msgstr "Klarte ikkje å kople til LDAP-tenar"
 msgid "Server rejected username/password"
 msgstr "Tenaren avslo brukarnamnet"
 
-#: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:263
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-#, fuzzy
-msgid "User cancelled"
-msgstr "Operasjonen vart avbroten"
-
-#: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:259
-#: camel/providers/nntp/camel-nntp-folder.c:265
+#: camel/providers/nntp/camel-nntp-folder.c:147
+#: camel/providers/nntp/camel-nntp-folder.c:149
+#: camel/providers/nntp/camel-nntp-folder.c:158
+#: camel/providers/nntp/camel-nntp-folder.c:234
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11237,64 +11011,52 @@ msgstr "Operasjonen vart avbroten"
 msgid "Cannot get message %s: %s"
 msgstr "Kan ikkje henta melding %s: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:188
-#: camel/providers/nntp/camel-nntp-folder.c:228
+#: camel/providers/nntp/camel-nntp-folder.c:156
+#: camel/providers/nntp/camel-nntp-folder.c:232
+#: camel/providers/nntp/camel-nntp-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+#, fuzzy
+msgid "User cancelled"
+msgstr "Operasjonen vart avbroten"
+
+#: camel/providers/nntp/camel-nntp-folder.c:176
+#: camel/providers/nntp/camel-nntp-folder.c:208
 #, c-format
 msgid "Internal error: uid in invalid format: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:201
-#, fuzzy, c-format
-msgid "Could not get article %s from NNTP server"
-msgstr "Kunne ikkje laga katalog\n"
-
-#: camel/providers/nntp/camel-nntp-folder.c:362
-msgid "Posting not allowed by news server"
-msgstr ""
-
+#: camel/providers/nntp/camel-nntp-folder.c:328
+#: camel/providers/nntp/camel-nntp-folder.c:331
 #: camel/providers/nntp/camel-nntp-folder.c:373
-#, c-format
-msgid "Failed to send newsgroups header: %s: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:413
-#: camel/providers/nntp/camel-nntp-folder.c:426
-#, c-format
-msgid "Error posting to newsgroup: %s: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:438
-msgid "Error reading response to posted message: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:441
+#: camel/providers/nntp/camel-nntp-folder.c:375
 #, fuzzy, c-format
-msgid "Error posting message: %s: message not posted"
-msgstr ""
-"Feil under automatisk lagring av meldinga: %s\n"
-" %s"
+msgid "Posting failed: %s"
+msgstr "Handlinga feila: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:457
+#: camel/providers/nntp/camel-nntp-folder.c:393
 msgid "You cannot post NNTP messages while working offline!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:468
+#: camel/providers/nntp/camel-nntp-folder.c:404
 #, fuzzy
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Kan ikkje lukka mellombels mappe: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:44
 #, fuzzy
 msgid "Could not get group list from server."
 msgstr "Kunne ikkje laga katalog\n"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#: camel/providers/nntp/camel-nntp-grouplist.c:97
+#: camel/providers/nntp/camel-nntp-grouplist.c:106
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "Kan ikkje lasta gruppeliste-fila for %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#: camel/providers/nntp/camel-nntp-grouplist.c:157
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Kan ikkje lagra gruppeliste-fila for %s: %s"
@@ -11322,27 +11084,29 @@ msgid ""
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:158
+#: camel/providers/nntp/camel-nntp-store.c:118
+#: camel/providers/nntp/camel-nntp-store.c:1233
+#: camel/providers/nntp/camel-nntp-store.c:1331
+#, fuzzy, c-format
+msgid "NNTP Command failed: %s"
+msgstr "IMAP-kommando feila: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:227
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Kan ikkje lesa helsing frå %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:170
+#: camel/providers/nntp/camel-nntp-store.c:239
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP-tenaren %s svarte med feilkode %d: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:326
+#: camel/providers/nntp/camel-nntp-store.c:403
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET News via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:640
-#, fuzzy
-msgid "Stream error"
-msgstr "Anna feil"
-
-#: camel/providers/nntp/camel-nntp-store.c:643
+#: camel/providers/nntp/camel-nntp-store.c:777
 #, fuzzy, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -11352,76 +11116,76 @@ msgstr ""
 "Feil ved lagring av meldingar til: %s\n"
 " %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:735
+#: camel/providers/nntp/camel-nntp-store.c:872
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
 "No such newsgroup. The selected item is a probably a parent folder."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:767
+#: camel/providers/nntp/camel-nntp-store.c:904
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
 "newsgroup does not exist!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:792
+#: camel/providers/nntp/camel-nntp-store.c:929
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:800
+#: camel/providers/nntp/camel-nntp-store.c:937
 #, fuzzy
 msgid "You cannot rename a folder in a News store."
 msgstr "Kan ikkje endra namnet på mappa «%s» til «%s»: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:808
+#: camel/providers/nntp/camel-nntp-store.c:945
 #, fuzzy
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "Kan ikkje flytta ei mappe inn i ei av undermappene sine."
 
-#: camel/providers/nntp/camel-nntp-summary.c:253
+#: camel/providers/nntp/camel-nntp-store.c:1118
+#, fuzzy
+msgid "Authentication requested but not username provided"
+msgstr "Autentisering påkrevd"
+
+#: camel/providers/nntp/camel-nntp-store.c:1146
 #, fuzzy, c-format
-msgid "Connection error: %s"
-msgstr "Ukjend feil: %s"
+msgid "Cannot authenticate to server: %s"
+msgstr "Autentisering mot POP-tenaren «%s» feila: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:262
+#: camel/providers/nntp/camel-nntp-store.c:1262
+#, fuzzy
+msgid "Not connected."
+msgstr "Ingen kontaktar"
+
+#: camel/providers/nntp/camel-nntp-store.c:1311
 #, c-format
 msgid "No such folder: %s"
 msgstr "Mappa finst ikkje: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:268
-#, c-format
-msgid "Could not get group: %s"
-msgstr "Kan ikkje henta gruppa: %s"
-
-#: camel/providers/nntp/camel-nntp-summary.c:333
-#, fuzzy
-msgid "Could not get messages: unspecified error"
-msgstr "Kunne ikkje senda meldinga: %s"
-
-#: camel/providers/nntp/camel-nntp-summary.c:378
-#, fuzzy, c-format
-msgid "NNTP Command failed: %s"
-msgstr "IMAP-kommando feila: %s"
-
-#: camel/providers/nntp/camel-nntp-summary.c:438
-#: camel/providers/nntp/camel-nntp-summary.c:543
+#: camel/providers/nntp/camel-nntp-summary.c:218
+#: camel/providers/nntp/camel-nntp-summary.c:314
 #, fuzzy, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s Ser gjennom nye meldingar"
 
-#: camel/providers/nntp/camel-nntp-summary.c:558
-#, c-format
-msgid "Unknown server response: %s"
-msgstr "Ukjent svar frå tenaren: %s"
+#: camel/providers/nntp/camel-nntp-summary.c:225
+#, fuzzy, c-format
+msgid "Unexpected server response from xover: %s"
+msgstr "Uventa svar frå IMAP-tenaren: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:605
+#: camel/providers/nntp/camel-nntp-summary.c:328
+#, fuzzy, c-format
+msgid "Unexpected server response from head: %s"
+msgstr "Uventa svar frå GnuPG: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:368
 #, fuzzy
 msgid "Use cancel"
 msgstr "Avbryt"
 
-#: camel/providers/nntp/camel-nntp-summary.c:607
+#: camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Handlinga feila: %s"
@@ -11472,7 +11236,7 @@ msgstr "Slett etter %s dag(ar)"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107
 msgid "POP"
 msgstr "POP"
 
@@ -11556,7 +11320,7 @@ msgid "No such folder `%s'."
 msgstr "Inga slik mappe «%s»."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:132
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -11608,7 +11372,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:119
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11910,21 +11674,21 @@ msgstr "%.1fM"
 msgid "%.0fG"
 msgstr "%.1fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
+#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:408
 msgid "attachment"
 msgstr "vedlegg"
 
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:454
 #, fuzzy
 msgid "Remove selected items from the attachment list"
 msgstr "Fjern det valte programmet frå lista"
 
-#: composer/e-msg-composer-attachment-bar.c:491
+#: composer/e-msg-composer-attachment-bar.c:494
 #, fuzzy
 msgid "Add attachment..."
 msgstr "Vedlegg"
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:495
 #, fuzzy
 msgid "Attach a file to the message"
 msgstr "Kunne ikkje lagra melding(ar)."
@@ -11988,7 +11752,7 @@ msgstr "Fleire meldingar"
 msgid "Open file"
 msgstr "Opna fil"
 
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
 msgid "Autogenerated"
 msgstr ""
 
@@ -12133,17 +11897,17 @@ msgstr "Legg ved fil"
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
+msgid "You cannot attach the file `{0}' to this message."
 msgstr "Kunne ikkje lagra melding(ar)."
 
 #. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4
-msgid "${1}"
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
 msgstr ""
 
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
 
 #. mail-composer:attach-directory primary
@@ -12238,7 +12002,7 @@ msgstr "Kan ikkje laga røyr: %s"
 
 #. mail-composer:no-build-message secondary
 #: composer/mail-composer-errors.xml.h:34
-msgid "Because \"${0}\", you may need to select different mail options."
+msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
@@ -12248,8 +12012,10 @@ msgid "Could not read signature file \"{0}\"."
 msgstr "Kan ikkje lagra signaturfil: %s"
 
 #. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38
-msgid "Because \"${1}\"."
+#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted primary
@@ -12679,11 +12445,11 @@ msgid "<b>Then</b>"
 msgstr "<b>Skal vera ferdig:</b>"
 
 #: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1335
+#: mail/mail-account-gui.c:1347
 msgid "Select Folder"
 msgstr "Vel mappe"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
 #, fuzzy
 msgid "    "
 msgstr "    "
@@ -12738,7 +12504,7 @@ msgstr "sidan"
 msgid "months"
 msgstr "månader"
 
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
 msgid "seconds"
 msgstr "sekund"
 
@@ -12772,20 +12538,20 @@ msgstr ""
 msgid "years"
 msgstr "år"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:916
-#: mail/mail-config.c:76 mail/mail-config.glade.h:90
+#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
+#: mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Viktig"
 
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:919 mail/mail-config.c:79
-#: mail/mail-config.glade.h:145
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: mail/mail-config.glade.h:148
 msgid "To Do"
 msgstr "Hugseliste"
 
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:920 mail/mail-config.c:80
-#: mail/mail-config.glade.h:94
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: mail/mail-config.glade.h:97
 msgid "Later"
 msgstr "Seinare"
 
@@ -12843,265 +12609,6 @@ msgstr "inkomande"
 msgid "outgoing"
 msgstr "Utgåande"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-#, fuzzy
-msgid "Adjust Score"
-msgstr "Juster poeng"
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Color"
-msgstr "Tildel farge"
-
-#: filter/libfilter-i18n.h:4
-msgid "Assign Score"
-msgstr ""
-
-#: filter/libfilter-i18n.h:5
-msgid "Attachments"
-msgstr "Vedlegg"
-
-#: filter/libfilter-i18n.h:6
-#, fuzzy
-msgid "Beep"
-msgstr "Pipelyd"
-
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "inneheld"
-
-#: filter/libfilter-i18n.h:8
-msgid "Copy to Folder"
-msgstr "Kopier til mappe"
-
-#: filter/libfilter-i18n.h:9
-msgid "Date received"
-msgstr "Dato motteke"
-
-#: filter/libfilter-i18n.h:10
-msgid "Date sent"
-msgstr "Dato sendt"
-
-#: filter/libfilter-i18n.h:12
-msgid "Deleted"
-msgstr "Sletta"
-
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "inneheld ikkje"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "sluttar ikkje med"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "finst ikkje"
-
-#: filter/libfilter-i18n.h:16
-#, fuzzy
-msgid "does not return"
-msgstr "finst ikkje"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "høyres ikkje ut som"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "startar ikkje med"
-
-#: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
-msgstr "Eksisterar ikkje"
-
-#: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr "Kladd"
-
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "sluttar med"
-
-#: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr "Eksisterar"
-
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "eksisterar"
-
-#: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr "Uttrykk"
-
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr ""
-
-#: filter/libfilter-i18n.h:27
-#, fuzzy
-msgid "is"
-msgstr "Liste"
-
-#: filter/libfilter-i18n.h:28
-#, fuzzy
-msgid "is after"
-msgstr "var etter"
-
-#: filter/libfilter-i18n.h:29
-#, fuzzy
-msgid "is before"
-msgstr "var før"
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr "er flagga"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "er større enn"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "er mindre enn"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "er ikkje"
-
-#: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr "er ikkje flagga"
-
-#: filter/libfilter-i18n.h:36
-#, fuzzy
-msgid "Junk Test"
-msgstr "Juni"
-
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
-#: widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Etikett"
-
-#: filter/libfilter-i18n.h:38
-msgid "Mailing list"
-msgstr "E-postliste"
-
-#: filter/libfilter-i18n.h:39
-msgid "Message Body"
-msgstr "Meldingskropp"
-
-#: filter/libfilter-i18n.h:40
-msgid "Message Header"
-msgstr "Meldingshovud"
-
-#: filter/libfilter-i18n.h:41
-#, fuzzy
-msgid "Message is Junk"
-msgstr "Meldingar"
-
-#: filter/libfilter-i18n.h:42
-#, fuzzy
-msgid "Message is not Junk"
-msgstr "Marker som v_iktig"
-
-#: filter/libfilter-i18n.h:43
-msgid "Move to Folder"
-msgstr "Flytt til mappe"
-
-#: filter/libfilter-i18n.h:44
-#, fuzzy
-msgid "Pipe to Program"
-msgstr "Avslutt programmet"
-
-#: filter/libfilter-i18n.h:45
-#, fuzzy
-msgid "Play Sound"
-msgstr "Spel lyd:"
-
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Lesen"
-
-#: filter/libfilter-i18n.h:47
-msgid "Recipients"
-msgstr "Mottakarar"
-
-#: filter/libfilter-i18n.h:48
-msgid "Regex Match"
-msgstr "Treff på regulært uttrykk"
-
-#: filter/libfilter-i18n.h:49
-msgid "Replied to"
-msgstr "Svart til"
-
-#: filter/libfilter-i18n.h:50
-msgid "returns"
-msgstr "returnerer"
-
-#: filter/libfilter-i18n.h:51
-msgid "returns greater than"
-msgstr "returnerer større enn"
-
-#: filter/libfilter-i18n.h:52
-msgid "returns less than"
-msgstr "returnerer mindre enn"
-
-#: filter/libfilter-i18n.h:53
-#, fuzzy
-msgid "Run Program"
-msgstr "Køyr program:"
-
-#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Poengsum"
-
-#: filter/libfilter-i18n.h:55
-msgid "Sender"
-msgstr "Avsendar"
-
-#: filter/libfilter-i18n.h:56
-msgid "Set Status"
-msgstr "Sett status"
-
-# TRN: Det skal ikkje vera KiB?
-#: filter/libfilter-i18n.h:57
-msgid "Size (kB)"
-msgstr "Storleik (kB)"
-
-#: filter/libfilter-i18n.h:58
-msgid "sounds like"
-msgstr "høyres ut som"
-
-#: filter/libfilter-i18n.h:59
-msgid "Source Account"
-msgstr "Avsendarkonto"
-
-#: filter/libfilter-i18n.h:60
-msgid "Specific header"
-msgstr "Spesifikk linje i hovud"
-
-#: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "byrjar med"
-
-#: filter/libfilter-i18n.h:63
-msgid "Stop Processing"
-msgstr "Stopp prosessering"
-
-#: filter/libfilter-i18n.h:64 mail/em-format.c:755 mail/em-format-html.c:1519
-#: mail/em-format-quote.c:302 mail/em-mailer-prefs.c:87
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
-#: smime/lib/e-cert.c:1079
-msgid "Subject"
-msgstr "Emne"
-
-#: filter/libfilter-i18n.h:65
-msgid "Unset Status"
-msgstr "Nullstill status"
-
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Legg til regel"
@@ -13119,6 +12626,11 @@ msgstr "Regelnamn"
 msgid "_Score Rules"
 msgstr "Poengreglar"
 
+#: filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Poengsum"
+
 #: filter/searchtypes.xml.h:1
 msgid "Body contains"
 msgstr "Kropp inneheld"
@@ -13202,13 +12714,13 @@ msgstr "Signatur(ar)"
 msgid "-------- Forwarded Message --------"
 msgstr "Vidaresendt melding"
 
-#: mail/em-composer-utils.c:1499
+#: mail/em-composer-utils.c:1495
 msgid "an unknown sender"
 msgstr "ein ukjend avsendar"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1509
+#: mail/em-composer-utils.c:1505
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "På %a, %d/%m/%Y klokka %H:%M, skreiv %%s:"
@@ -13251,8 +12763,8 @@ msgstr "<klikk her for å velje mappe>"
 msgid "Create New Folder"
 msgstr "Lag ny mappe"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
-#: mail/mail-component.c:701
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
+#: mail/mail-component.c:704
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Oppgje kor mappa skal lagast:"
@@ -13267,107 +12779,108 @@ msgstr "Lag ei ny mappe"
 msgid "Folder _name:"
 msgstr "Mappe_namn:"
 
-#: mail/em-folder-tree.c:839
+#: mail/em-folder-tree.c:833
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Fjernar mappe %s"
 
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree.c:835
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Opnar mappe %s"
 
-#: mail/em-folder-tree.c:848 mail/message-list.c:1555
+#: mail/em-folder-tree.c:842 mail/message-list.c:1561
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Flyttar meldingar til %s"
 
-#: mail/em-folder-tree.c:850 mail/message-list.c:1557
+#: mail/em-folder-tree.c:844 mail/message-list.c:1563
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopierer meldingar til %s"
 
-#: mail/em-folder-tree.c:866
+#: mail/em-folder-tree.c:860
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Berre sjekk for ny e-post."
 
-#: mail/em-folder-tree.c:956 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Kopiér til mappe"
 
-#: mail/em-folder-tree.c:957 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Flytt til mappe"
 
-#: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2069
-#: mail/em-folder-tree.c:2551 mail/em-folder-view.c:798
-#: mail/message-list.c:1645
+#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
+#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
+#: mail/message-list.c:1651
 #, fuzzy
 msgid "_Move"
 msgstr "_Flytt"
 
-#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#: mail/em-folder-tree.c:955 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "Avbryt oppgåve"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
 #: mail/em-folder-view.c:798 mail/em-folder-view.c:812
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Vel mappe"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
 #, fuzzy
 msgid "C_opy"
 msgstr "Kopier"
 
-#: mail/em-folder-tree.c:2096
+#: mail/em-folder-tree.c:2088
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Lagrar mappe «%s»"
 
-#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
+#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
 #, fuzzy
 msgid "Create folder"
 msgstr "Lag ei ny mappe"
 
-#: mail/em-folder-tree.c:2474
+#: mail/em-folder-tree.c:2463
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Endra namn på mappa «%s» til:"
 
-#: mail/em-folder-tree.c:2476
+#: mail/em-folder-tree.c:2465
 msgid "Rename Folder"
 msgstr "Endra namn på mappa"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Visning"
 
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2537
 msgid "Open in _New Window"
 msgstr "Opna i _nytt vindauge"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2555
+#: mail/em-folder-tree.c:2546
 #, fuzzy
 msgid "_New Folder..."
 msgstr "_Ny mappe"
 
-#: mail/em-folder-tree.c:2558
+#: mail/em-folder-tree.c:2549
 msgid "_Rename"
 msgstr "_Gje nytt namn"
 
-#: mail/em-folder-tree.c:2561 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "Ei_genskapar ..."
 
 #: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:889
+#: mail/mail-vfolder.c:888
 msgid "VFolders"
 msgstr "vMapper"
 
@@ -13381,19 +12894,19 @@ msgstr ""
 msgid "Inbox"
 msgstr "Innboks"
 
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
 msgid "Loading..."
 msgstr "Lastar ..."
 
 #: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
 #: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
 #: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:551
+#: mail/mail-component.c:554
 msgid "Mail"
 msgstr "E-post"
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "R_ediger som ny melding .."
@@ -13406,17 +12919,17 @@ msgstr "S_kriv ut"
 msgid "_Reply to Sender"
 msgstr "Sva_r til avsendar"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:810
+#: mail/em-folder-view.c:901 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Svar til _liste"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:811
+#: mail/em-folder-view.c:902 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: mail/em-folder-view.c:903 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Vidaresend"
@@ -13471,6 +12984,10 @@ msgstr "Flytt til _mappe ..."
 msgid "_Copy to Folder..."
 msgstr "_Kopier til mappe ..."
 
+#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Etikett"
+
 #: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "_Legg til avsendar i adresseboka"
@@ -13523,12 +13040,12 @@ msgid "Filter on _Mailing List"
 msgstr "Filtrer på _e-postliste"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
-#: mail/mail-config.glade.h:66
+#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Forvald"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1796
 msgid "Print Message"
 msgstr "Skriv ut melding"
 
@@ -13568,12 +13085,18 @@ msgstr "Cc"
 msgid "Bcc"
 msgstr "Bcc:"
 
+#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
+#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Emne"
+
 #: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
 #: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Dato"
 
-#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
+#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
 msgid "Newsgroups"
 msgstr ""
 
@@ -13762,7 +13285,7 @@ msgid ""
 "practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:757
+#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
 #, fuzzy
 msgid "_View Certificate"
 msgstr "_Sertifikat-ID:"
@@ -13825,7 +13348,7 @@ msgstr "Kvar veke"
 msgid "Once per month"
 msgstr "kvar månad"
 
-#: mail/em-migrate.c:1072
+#: mail/em-migrate.c:1168
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13833,91 +13356,91 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1506
+#: mail/em-migrate.c:1602
 #, fuzzy, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Kan ikkje laga mappa: %s: %s"
 
-#: mail/em-migrate.c:1532
+#: mail/em-migrate.c:1628
 #, fuzzy, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr ""
 "Kan ikkje kopiera fildeskriptor: %s\n"
 "%s"
 
-#: mail/em-migrate.c:1715
+#: mail/em-migrate.c:1811
 #, fuzzy, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Kan ikkje lagra gruppeliste-fila for %s: %s"
 
-#: mail/em-migrate.c:1919
+#: mail/em-migrate.c:2015
 #, fuzzy, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Autentisering mot POP-tenaren «%s» feila: %s"
 
-#: mail/em-migrate.c:1933
+#: mail/em-migrate.c:2029
 #, fuzzy, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Kan ikkje oppretta røyr til «%s»: %s"
 
-#: mail/em-migrate.c:1962
+#: mail/em-migrate.c:2058
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#: mail/em-migrate.c:2413 mail/em-migrate.c:2425
 #, fuzzy, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Kan ikkje oppretta røyr til «%s»: %s"
 
-#: mail/em-migrate.c:2480
+#: mail/em-migrate.c:2576
 #, fuzzy, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr ""
 "Kan ikkje laga utdatafil: %s\n"
 " %s"
 
-#: mail/em-migrate.c:2498
+#: mail/em-migrate.c:2594
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 msgstr ""
 
-#: mail/em-popup.c:699
+#: mail/em-popup.c:700
 msgid "Save As..."
 msgstr "Lagra som ..."
 
-#: mail/em-popup.c:717
+#: mail/em-popup.c:718
 #, c-format
 msgid "untitled_image.%s"
 msgstr ""
 
-#: mail/em-popup.c:807
+#: mail/em-popup.c:808
 #, fuzzy
 msgid "Set as _Background"
 msgstr "Bruk til _bakgrunn"
 
-#: mail/em-popup.c:809
+#: mail/em-popup.c:810
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "Sva_r til avsendar"
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:859
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Opna ved innsetjing"
 
-#: mail/em-popup.c:859
+#: mail/em-popup.c:860
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Sender ei melding til ein nettverksspelar"
 
-#: mail/em-popup.c:860
+#: mail/em-popup.c:861
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Legg til adressebok"
 
-#: mail/em-popup.c:966
+#: mail/em-popup.c:967
 #, c-format
 msgid "Open in %s..."
 msgstr "Opna i %s ..."
@@ -14515,7 +14038,7 @@ msgstr "Evolution e-postinnstillingskontroll"
 msgid "Mail Accounts"
 msgstr "E-postkontoar"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
 msgid "Mail Preferences"
 msgstr "E-postinnstillingar"
 
@@ -14529,15 +14052,15 @@ msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importerer gamal e-post frå Elm"
 
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:226
+#: mail/importers/evolution-mbox-importer.c:221
+#: mail/importers/evolution-outlook-importer.c:255
 #: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Importerer ..."
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:222
-#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/evolution-mbox-importer.c:223
+#: mail/importers/evolution-outlook-importer.c:257
 #: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Vent litt"
@@ -14560,23 +14083,25 @@ msgid "Elm"
 msgstr "Elm"
 
 #: mail/importers/evolution-mbox-importer.c:116
+#: mail/importers/evolution-outlook-importer.c:130
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Målet er skrivebeskytta"
 
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 #, fuzzy
 msgid "Select folder to import into"
 msgstr "Vel importerar"
 
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:254
 #: mail/importers/mail-importer.c:226
 #, fuzzy, c-format
 msgid "Importing `%s'"
 msgstr "Importerar"
 
-#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/evolution-outlook-importer.c:301
 #: mail/importers/mail-importer.c:140
 #, fuzzy
 msgid "Importing mailbox"
@@ -14742,15 +14267,15 @@ msgstr ""
 msgid "%s License Agreement"
 msgstr ""
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
 msgid "_Host:"
 msgstr "_Vert:"
 
-#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
 msgid "User_name:"
 msgstr "Br_ukarnamn:"
 
-#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
 msgid "_Path:"
 msgstr "_Sti:"
 
@@ -14813,34 +14338,34 @@ msgstr "%d kontaktar"
 msgid ", %d unread"
 msgstr ""
 
-#: mail/mail-component.c:653
+#: mail/mail-component.c:656
 msgid "New Mail Message"
 msgstr "Ny e-postmelding"
 
-#: mail/mail-component.c:654
+#: mail/mail-component.c:657
 msgid "_Mail Message"
 msgstr "_E-post"
 
-#: mail/mail-component.c:655
+#: mail/mail-component.c:658
 msgid "Compose a new mail message"
 msgstr "Skriv ein e-post"
 
-#: mail/mail-component.c:661
+#: mail/mail-component.c:664
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Ny vMappe"
 
-#: mail/mail-component.c:662
+#: mail/mail-component.c:665
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "E-postfilter"
 
-#: mail/mail-component.c:663
+#: mail/mail-component.c:666
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Lag ein ny kalender"
 
-#: mail/mail-component.c:795
+#: mail/mail-component.c:798
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
@@ -14853,7 +14378,7 @@ msgstr "Sjekkar teneste"
 msgid "Connecting to server..."
 msgstr " Koplar til tenar ..."
 
-#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Identitet"
 
@@ -14865,7 +14390,7 @@ msgid ""
 msgstr ""
 
 #: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 #, fuzzy
 msgid "Receiving Mail"
 msgstr "Mottak av e-post"
@@ -14880,7 +14405,7 @@ msgstr ""
 msgid "Please select among the following options"
 msgstr ""
 
-#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131
 #, fuzzy
 msgid "Sending Mail"
 msgstr "Sender e-post"
@@ -14891,7 +14416,7 @@ msgid ""
 "sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37
 msgid "Account Management"
 msgstr ""
 
@@ -14904,245 +14429,249 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:2
 #, fuzzy
 msgid " Ch_eck for Supported Types "
 msgstr " _Søk etter støtta typar "
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "<b>Preview</b>"
 msgstr "Førehandsvising"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "<b>S_ignatures</b>"
 msgstr "<b>Status:</b>"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "<b>_Languages</b>"
 msgstr "<b>Status:</b>"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
+msgid "<small>This will make the the filter more reliable, but slower</small>"
+msgstr ""
+
+#: mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "<span weight=\"bold\">Checking for New Mail</span>"
 msgstr "Ser etter ny e-post"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">General</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "Påminning ved ny e-post"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "Pretty Good Privacy"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Security</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "Send meldingar"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:34
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:35
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:36
 msgid "Account Editor"
 msgstr "Kontoredigerar"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:38
 #, fuzzy
 msgid "Add Ne_w Signature..."
 msgstr "Legg til ny signatur ..."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Add _Script"
 msgstr "Legg til skript"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:40
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:44
 msgid "Always _sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Attach original message"
 msgstr "Kunne ikkje lagra melding(ar)."
 
-#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Vedlegg"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:48
 #, fuzzy
 msgid "Automatically _insert smiley images"
 msgstr "Legg til smilefjes _automatisk"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Automatically check for _new mail every"
 msgstr "_Sjå etter nye meldingar kvart"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Beep w_hen new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "C_haracter set:"
 msgstr "T_eiknsett:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Ch_eck for Supported Types "
 msgstr " _Søk etter støtta typar "
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 #, fuzzy
-msgid "Check _Incoming Mail"
+msgid "Check _incoming mail for junk"
 msgstr "Ser etter ny e-post"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 msgid "Color for _misspelled words:"
 msgstr "_Farge for feilstava ord:"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Colors"
 msgstr "F_argar"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Confirm _when expunging a folder"
 msgstr "_Stadfest ved tøming av mappe"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -15152,387 +14681,384 @@ msgid ""
 "Click \"Apply\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
 msgid "De_fault"
 msgstr "_Standard"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Default character e_ncoding:"
 msgstr "Standardt_eiknsett:"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 #, fuzzy
 msgid "Defaults"
 msgstr "_Standard"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 msgid "Do not quote original message"
 msgstr "Ikkje siter opprinneleg melding"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Ferdig"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Drafts _Folder:"
 msgstr "Mappe for _utkast:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Email Accounts"
 msgstr "E-post inneheld"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Email _Address:"
 msgstr "E-post_adresse:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "Empty trash folders on e_xit"
 msgstr "_Tøm papirkorga ved avslutting"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "_Sertifikat-ID:"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Evolution Account Assistant"
 msgstr "KDeelop-installering"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:82
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Køyr autorun.sh"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Fi_xed-width:"
 msgstr "Fast _breidd:"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Font Properties"
 msgstr "Eigenskapar"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 msgid "Format messages in _HTML"
 msgstr "Formater meldingar med _HTML"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "HTML Mail"
 msgstr "_HTML-e-post"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Headers"
 msgstr "Topptekst"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr "_Merk sitering med"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
 #: mail/mail-config.glade.h:91
+#, fuzzy
+msgid "I_nclude remote tests"
+msgstr "Inkluder:"
+
+#: mail/mail-config.glade.h:94
 msgid "Inline"
 msgstr "Innvevd"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Mail Configuration"
 msgstr "Oppsett for post"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "Postkaseeplassering"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "Message Composer"
 msgstr "Melding motteken"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organi_sasjon:"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG-nø_kkel-ID:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Play sound file when new mail arri_ves"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Spø_r ved sending av melding som berre har mottakarar i Bcc-feltet"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr "Siter opprinneleg melding"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr "Sitert"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Re_member password"
 msgstr "Hugs dette passordet"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr "S_var-til:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "Mottek e-post"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:120
 #, fuzzy
 msgid "Receiving Options"
 msgstr "Val for m_ottak"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
 #, fuzzy
 msgid "Remember _password"
 msgstr "Hugs dette passordet"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
 #, fuzzy
 msgid "S_tandard Font:"
 msgstr "_Standard skrifttype:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 #, fuzzy
 msgid "Security"
 msgstr "_Tryggleik"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:126
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:127
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:128
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:129
 #, fuzzy
 msgid "Select..."
 msgstr "_Vel ..."
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:130
 #, fuzzy
 msgid "Sending Email"
 msgstr "Send"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Sent _Messages Folder:"
 msgstr "Mappe for sendte _meldingar:"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:134
 msgid "Ser_ver requires authentication"
 msgstr "Tenaren kre_v autentisering"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:135
 msgid "Server _Type: "
 msgstr "Tenar-_type: "
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Oppsettsdatabasen ikkje funnen"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:137
 #, fuzzy
 msgid "Signat_ure:"
 msgstr "Signatur:"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "Signatures"
 msgstr "_HTML-signatur:"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr "Oppgje _filnamn:"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:140
 msgid "Spell Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:141
 msgid "Standard Unix mbox"
 msgstr "Standard unix e-postkasse"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "T_erminal Font:"
 msgstr "_Terminalskrifttype:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "T_ype: "
 msgstr "Type:"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:149
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:148
-msgid "Use _Daemon"
-msgstr ""
-
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:152
 msgid "V_ariable-width:"
 msgstr "V_ariabel breidde:"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:153
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Forward\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Add Signature"
 msgstr "_HTML-signatur:"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Always load images from the Internet"
 msgstr "Last aldri bilete frå _nettet"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:160
 msgid "_Digitally sign outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:161
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:163
 msgid "_Enable"
 msgstr "_Skru på"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:165
 msgid "_Forward style:"
 msgstr "_Vidaresendingsstil:"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Load images if sender is in address book"
 msgstr "_Last bileta dersom sendaren står i adresseboka"
 
-#: mail/mail-config.glade.h:167
-msgid "_Local Tests Only"
-msgstr ""
-
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Make this my default account"
 msgstr "Gjer _denne til standardkonto"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_Mark messages as read after"
 msgstr "_Merk meldingar som lest etter"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Never load images from the Internet"
 msgstr "Last aldri bilete frå _nettet"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "S_pør ved sending av HTML-meldingar til kontaktar som ikkje vil ha slike"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:175
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Spør ved sending av meldingar med eit tomt emnefelt"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:176
 msgid "_Reply style:"
 msgstr "Sva_rstil:"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_Script:"
 msgstr "_Tryggleik"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:178
 msgid "_Show animated images"
 msgstr "Vi_s animerte bilete"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "_Use Secure Connection (SSL):"
 msgstr "Br_uk sikker tilknytning (SSL)"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:181
 msgid "color"
 msgstr "farge"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "skildring"
 
@@ -15707,7 +15233,7 @@ msgstr ""
 
 #. mail:camel-exception primary
 #: mail/mail-errors.xml.h:57
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgid "Your message with the subject \"{0}\" was not delivered."
 msgstr ""
 
 #. mail:camel-exception secondary
@@ -15774,11 +15300,6 @@ msgstr ""
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Kan ikkje laga katalogen «%s»: %s"
 
-#. mail:no-save-path secondary
-#: mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail:no-create-path primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
@@ -15800,12 +15321,6 @@ msgstr "Kan ikkje laga katalogen «%s»: %s"
 msgid "Cannot create temporary save directory."
 msgstr "Klarte ikkje å lage mellombels katalog: %s"
 
-#. mail:no-create-tmp-path secondary
-#: mail/mail-errors.xml.h:100 mail/mail-errors.xml.h:112
-#: widgets/misc/e-system-errors.xml.h:11 widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail:no-write-path-exists secondary
 #: mail/mail-errors.xml.h:104
 #, fuzzy
@@ -16075,145 +15590,141 @@ msgstr "Skriv over"
 msgid "_Append"
 msgstr "Send"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:785
 #, c-format
 msgid "Pinging %s"
 msgstr "Pingar %s"
 
-#: mail/mail-mt.c:897
-msgid "Working"
-msgstr "Arbeidar"
-
-#: mail/mail-ops.c:99
+#: mail/mail-ops.c:98
 #, fuzzy
 msgid "Filtering Folder"
 msgstr "Les mapper"
 
-#: mail/mail-ops.c:260
+#: mail/mail-ops.c:259
 msgid "Fetching Mail"
 msgstr "Hentar e-post"
 
-#: mail/mail-ops.c:543
+#: mail/mail-ops.c:542
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr ""
 
-#: mail/mail-ops.c:568
+#: mail/mail-ops.c:567
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:577
+#: mail/mail-ops.c:576
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Kan ikkje leggja til i lokal «Sendt»-mappe: %s"
 
-#: mail/mail-ops.c:673
+#: mail/mail-ops.c:672
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sender melding %d av %d"
 
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:703
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Feila på melding %d av %d"
 
-#: mail/mail-ops.c:708
+#: mail/mail-ops.c:707
 msgid "Complete."
 msgstr "Ferdig."
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:804
 msgid "Saving message to folder"
 msgstr "Lagrar meldingar i mappe"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flyttar meldingar til %s"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopierer meldingar til %s"
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:1002
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Leitar gjennom mapper i «%s»"
 
-#: mail/mail-ops.c:1116
+#: mail/mail-ops.c:1115
 msgid "Forwarded messages"
 msgstr "Vidaresendt melding"
 
-#: mail/mail-ops.c:1159
+#: mail/mail-ops.c:1158
 #, c-format
 msgid "Opening folder %s"
 msgstr "Opnar mappe %s"
 
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1230
 #, c-format
 msgid "Opening store %s"
 msgstr "Opnar lager %s"
 
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1308
 #, c-format
 msgid "Removing folder %s"
 msgstr "Fjernar mappe %s"
 
-#: mail/mail-ops.c:1403
+#: mail/mail-ops.c:1402
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Lagrar mappe «%s»"
 
-#: mail/mail-ops.c:1468
+#: mail/mail-ops.c:1467
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1469
+#: mail/mail-ops.c:1468
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Lagrar mappe «%s»"
 
-#: mail/mail-ops.c:1524
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr "Friskar opp mappe"
 
-#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
+#: mail/mail-ops.c:1559 mail/mail-ops.c:1610
 msgid "Expunging folder"
 msgstr "Tømer mappe"
 
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1607
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Tømer papirkorga i «%s»"
 
-#: mail/mail-ops.c:1609
+#: mail/mail-ops.c:1608
 msgid "Local Folders"
 msgstr "Lokale mapper"
 
-#: mail/mail-ops.c:1692
+#: mail/mail-ops.c:1691
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Hentar melding %s"
 
-#: mail/mail-ops.c:1764
+#: mail/mail-ops.c:1763
 #, fuzzy, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Mottek %d melding(ar)"
 msgstr[1] "Mottek %d melding(ar)"
 
-#: mail/mail-ops.c:1850
+#: mail/mail-ops.c:1849
 #, fuzzy, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Lagrar %d melding(ar)"
 msgstr[1] "Lagrar %d melding(ar)"
 
-#: mail/mail-ops.c:1900
+#: mail/mail-ops.c:1899
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -16222,7 +15733,7 @@ msgstr ""
 "Kan ikkje laga utdatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1928
+#: mail/mail-ops.c:1927
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -16231,11 +15742,11 @@ msgstr ""
 "Feil ved lagring av meldingar til: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1999
+#: mail/mail-ops.c:1998
 msgid "Saving attachment"
 msgstr "Lagrar vedlegg"
 
-#: mail/mail-ops.c:2016
+#: mail/mail-ops.c:2015
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -16244,17 +15755,17 @@ msgstr ""
 "Kan ikkje laga utdatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2046
+#: mail/mail-ops.c:2045
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Klarte ikkje å skrive data: %s"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Koplar frå %s"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Koplar til %s på nytt"
@@ -16320,25 +15831,25 @@ msgstr "Oppdaterar ..."
 msgid "Waiting..."
 msgstr "Ventar ..."
 
-#: mail/mail-session.c:238
+#: mail/mail-session.c:239
 msgid "User canceled operation."
 msgstr "Brukar avbraut operasjonen."
 
-#: mail/mail-session.c:271
+#: mail/mail-session.c:272
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Tast inn passord for %s"
 
-#: mail/mail-session.c:273
+#: mail/mail-session.c:274
 msgid "Enter Password"
 msgstr "Tast inn passord"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 #, fuzzy
 msgid "_Remember this password"
 msgstr "Fjern denne oppføringa"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:298
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
@@ -16396,79 +15907,79 @@ msgstr "Lagrar mappe «%s»"
 msgid "Updating vFolders for '%s'"
 msgstr "Lagrar mappe «%s»"
 
-#: mail/mail-vfolder.c:959
+#: mail/mail-vfolder.c:958
 msgid "vFolders"
 msgstr "vMapper"
 
-#: mail/mail-vfolder.c:998
+#: mail/mail-vfolder.c:997
 msgid "Edit VFolder"
 msgstr "Rediger vMappe"
 
-#: mail/mail-vfolder.c:1082
+#: mail/mail-vfolder.c:1081
 msgid "New VFolder"
 msgstr "Ny vMappe"
 
-#: mail/message-list.c:946
+#: mail/message-list.c:948
 msgid "Unseen"
 msgstr "Ulesen"
 
-#: mail/message-list.c:947
+#: mail/message-list.c:949
 msgid "Seen"
 msgstr "Lest"
 
-#: mail/message-list.c:948
+#: mail/message-list.c:950
 msgid "Answered"
 msgstr "Svara"
 
-#: mail/message-list.c:949
+#: mail/message-list.c:951
 msgid "Multiple Unseen Messages"
 msgstr "Fleire uleste meldingar"
 
-#: mail/message-list.c:950
+#: mail/message-list.c:952
 msgid "Multiple Messages"
 msgstr "Fleire meldingar"
 
-#: mail/message-list.c:954
+#: mail/message-list.c:956
 msgid "Lowest"
 msgstr "Lavast"
 
-#: mail/message-list.c:955
+#: mail/message-list.c:957
 msgid "Lower"
 msgstr "Senk"
 
-#: mail/message-list.c:959
+#: mail/message-list.c:961
 msgid "Higher"
 msgstr "Høgare"
 
-#: mail/message-list.c:960
+#: mail/message-list.c:962
 msgid "Highest"
 msgstr "Høgast"
 
-#: mail/message-list.c:1279
+#: mail/message-list.c:1285
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1286
+#: mail/message-list.c:1292
 msgid "Today %l:%M %p"
 msgstr "I dag, %l:%M:%p"
 
-#: mail/message-list.c:1295
+#: mail/message-list.c:1301
 msgid "Yesterday %l:%M %p"
 msgstr "I går, %l:%M:%p"
 
-#: mail/message-list.c:1307
+#: mail/message-list.c:1313
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1315
+#: mail/message-list.c:1321
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1317
+#: mail/message-list.c:1323
 msgid "%b %d %Y"
 msgstr "%d. %b %Y"
 
-#: mail/message-list.c:3300
+#: mail/message-list.c:3321
 msgid "Generating message list"
 msgstr "Opprettar meldingsliste"
 
@@ -16530,6 +16041,10 @@ msgstr "Vidaresend"
 msgid "No Response Necessary"
 msgstr ""
 
+#: mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Lesen"
+
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Svar"
@@ -16638,45 +16153,49 @@ msgid ""
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:10
-msgid "Whether Evolution should start up in offline mode"
+msgid "Toolbar is visible"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:11
-msgid "Whether to skip the development warning dialog"
+msgid "Whether Evolution should start up in offline mode"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Whether the toolbar should be visible."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:14
 #, fuzzy
 msgid "mail"
 msgstr "e-post"
 
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
-msgstr ""
-
-#: shell/e-shell.c:545 shell/e-shell.c:546
+#: shell/e-shell.c:588 shell/e-shell.c:589
 #, fuzzy, c-format
 msgid "%ld KB"
 msgstr "%d. %b"
 
-#: shell/e-shell.c:744
+#: shell/e-shell.c:786
 #, fuzzy
 msgid "Uknown system error."
 msgstr "Ukjend feil"
 
-#: shell/e-shell.c:1101
+#: shell/e-shell.c:1143
 msgid "Invalid arguments"
 msgstr "Ugyldige argument"
 
-#: shell/e-shell.c:1103
+#: shell/e-shell.c:1145
 msgid "Cannot register on OAF"
 msgstr "Kan ikkje registrera i OAF"
 
-#: shell/e-shell.c:1105
+#: shell/e-shell.c:1147
 msgid "Configuration Database not found"
 msgstr "Oppsettsdatabasen ikkje funnen"
 
-#: shell/e-shell.c:1107
+#: shell/e-shell.c:1149
 msgid "Generic error"
 msgstr "Generell feil"
 
@@ -16736,7 +16255,7 @@ msgstr ""
 msgid "Select importer"
 msgstr "Vel importerar"
 
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1026
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
 #, c-format
 msgid "File %s does not exist"
 msgstr "Fila %s finst ikkje"
@@ -16764,31 +16283,32 @@ msgstr ""
 "Importerer %s\n"
 "Importerer oppføring 1."
 
-#: shell/e-shell-importer.c:549
+#: shell/e-shell-importer.c:570
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: shell/e-shell-importer.c:598
-msgid "_Filename:"
-msgstr "_Filnamn:"
+#: shell/e-shell-importer.c:626
+#, fuzzy
+msgid "F_ilename:"
+msgstr "Filnamn:"
 
-#: shell/e-shell-importer.c:603
+#: shell/e-shell-importer.c:631
 msgid "Select a file"
 msgstr "Vel ei fil"
 
-#: shell/e-shell-importer.c:613
+#: shell/e-shell-importer.c:642
 msgid "File _type:"
 msgstr "Fil_type:"
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:681
 msgid "Import data and settings from _older programs"
 msgstr "Importér data _og innstillingar frå eldre program"
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:684
 msgid "Import a _single file"
 msgstr "Importer ei ein_skild fil"
 
-#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -16796,28 +16316,28 @@ msgstr ""
 "Vent...\n"
 "Leitar etter eksisterande oppsett"
 
-#: shell/e-shell-importer.c:727
+#: shell/e-shell-importer.c:756
 msgid "Starting Intelligent Importers"
 msgstr "Startar intelligent import"
 
-#: shell/e-shell-importer.c:853 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
 #, c-format
 msgid "From %s:"
 msgstr "Frå %s:"
 
-#: shell/e-shell-importer.c:1044
+#: shell/e-shell-importer.c:1073
 #, fuzzy, c-format
 msgid "No importer available for file %s"
 msgstr ""
 "Det er ingen importerarar som kan handsama\n"
 "%s"
 
-#: shell/e-shell-importer.c:1056
+#: shell/e-shell-importer.c:1085
 #, fuzzy
 msgid "Unable to execute importer"
 msgstr "Feil under køyring av gpg."
 
-#: shell/e-shell-importer.c:1169
+#: shell/e-shell-importer.c:1199
 msgid "_Import"
 msgstr "_Importér"
 
@@ -16867,60 +16387,60 @@ msgstr "Mappenamn kan ikkje innehalda teiknet «#»."
 msgid "'.' and '..' are reserved folder names."
 msgstr "«.» og «..» er resverte mappenamn."
 
-#: shell/e-shell-window.c:336
+#: shell/e-shell-window.c:337
 #, fuzzy
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution er tilkopla. Klikk på denne knappen for å arbeida fråkopla."
 
-#: shell/e-shell-window.c:343
+#: shell/e-shell-window.c:344
 #, fuzzy
 msgid "Evolution is in the process of going offline."
 msgstr "Ximian Evolution held på å kopla frå."
 
-#: shell/e-shell-window.c:349
+#: shell/e-shell-window.c:350
 #, fuzzy
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution er fråkopla. Klikk på denne knappen for å arbeida tilkopla."
 
-#: shell/e-shell-window.c:621
+#: shell/e-shell-window.c:637
 #, fuzzy, c-format
 msgid "Switch to %s"
 msgstr "E-post til %s"
 
-#: shell/e-shell-window-commands.c:64
+#: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 "GNOME Pilot-verktøya ser ikkje ut til å vera installerte på denne maskinen."
 
-#: shell/e-shell-window-commands.c:72
+#: shell/e-shell-window-commands.c:74
 #, c-format
 msgid "Error executing %s."
 msgstr "Feil ved køyring av %s."
 
-#: shell/e-shell-window-commands.c:121
+#: shell/e-shell-window-commands.c:123
 msgid "Bug buddy is not installed."
 msgstr "Bug Buddy er ikkje installert."
 
-#: shell/e-shell-window-commands.c:129
+#: shell/e-shell-window-commands.c:131
 msgid "Bug buddy could not be run."
 msgstr "Bug Buddy kan ikkje køyrast."
 
-#: shell/e-shell-window-commands.c:171
+#: shell/e-shell-window-commands.c:323
 #, fuzzy
-msgid "About Evolution"
-msgstr "Om Ximian Evolution"
+msgid "Groupware Suite"
+msgstr "Gruppe"
 
-#: shell/e-shell-window-commands.c:382
+#: shell/e-shell-window-commands.c:563
 msgid "_Work Online"
 msgstr "Arbeid _tilkopla"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "Arbeid _fråkopla"
 
-#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Arbeid fråkopla"
 
@@ -16933,43 +16453,6 @@ msgstr "Avkryssingsboks"
 msgid "New"
 msgstr "Ny"
 
-#: shell/evolution-shell-component-utils.c:115
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Ukjend feil."
-
-#: shell/evolution-shell-component-utils.c:118
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Feilen frå komponentsystemet er:\n"
-"%s"
-
-#: shell/evolution-shell-component-utils.c:125
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Feilen frå aktiveringssystemet er:\n"
-"%s"
-
 #: shell/evolution-test-component.c:140
 #, fuzzy
 msgid "New Test"
@@ -17308,35 +16791,35 @@ msgid ""
 "Click help for details."
 msgstr ""
 
-#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:522
+#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
+#: smime/gui/certificate-manager.c:556
 #, fuzzy
 msgid "Select a cert to import..."
 msgstr "Vel importerar"
 
-#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:604
+#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
+#: smime/gui/certificate-manager.c:638
 #, fuzzy
 msgid "Certificate Name"
 msgstr "_Sertifikat-ID:"
 
-#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
+#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
 #, fuzzy
 msgid "Purposes"
 msgstr "Framgang"
 
-#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:517
+#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:569
 #, fuzzy
 msgid "Serial Number"
 msgstr "Serienummer"
 
-#: smime/gui/certificate-manager.c:267
+#: smime/gui/certificate-manager.c:271
 #, fuzzy
 msgid "Expires"
 msgstr "Uttrykk"
 
-#: smime/gui/certificate-manager.c:417
+#: smime/gui/certificate-manager.c:446
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "E-postadresse:"
@@ -17377,6 +16860,11 @@ msgid ""
 "  Subject: %s\n"
 msgstr ""
 
+#: smime/gui/e-cert-selector.c:169
+#, fuzzy
+msgid "Select certificate"
+msgstr "Gå til spesifisert dato"
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -17439,7 +16927,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
 #, fuzzy
 msgid "Certificate"
 msgstr "Sertifikat"
@@ -17464,20 +16952,24 @@ msgstr "Felles namn"
 msgid "Contact Certificates"
 msgstr "_Sertifikat-ID:"
 
-#: smime/gui/smime-ui.glade.h:21
-#, no-c-format
-msgid "Do you want to trust \"%s\" for the following purposes?"
+#: smime/gui/smime-ui.glade.h:20
+msgid "Do not trust the authenticity of this certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:21
 msgid "Dummy window only"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:22
 #, fuzzy
 msgid "Edit"
 msgstr "Rediger"
 
+#: smime/gui/smime-ui.glade.h:23
+#, fuzzy
+msgid "Email Certificate Trust Settings"
+msgstr "Kan ikkje verifisera sertifikat."
+
 #: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr ""
@@ -17514,283 +17006,293 @@ msgstr "Organisasjonseining"
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:37
-msgid "Trust this CA to identify email users."
+msgid "Trust the authenticity of this certificate"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:38
-msgid "Trust this CA to identify software developers."
+msgid "Trust this CA to identify email users."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:39
-msgid "Trust this CA to identify web sites."
+msgid "Trust this CA to identify software developers."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:40
-#, fuzzy
-msgid "View"
-msgstr "Vis"
+msgid "Trust this CA to identify web sites."
+msgstr ""
 
 #: smime/gui/smime-ui.glade.h:41
 #, fuzzy
-msgid "View Certificate"
-msgstr "_Sertifikat-ID:"
+msgid "View"
+msgstr "Vis"
 
 #: smime/gui/smime-ui.glade.h:42
-msgid "You have been asked to trust a new Certificate Authority (CA)."
-msgstr ""
-
-#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:44
+#: smime/gui/smime-ui.glade.h:43
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:45
+#: smime/gui/smime-ui.glade.h:44
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:46
+#: smime/gui/smime-ui.glade.h:45
 #, fuzzy
 msgid "Your Certificates"
 msgstr "Dine sertifikat"
 
-#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
+#: smime/gui/smime-ui.glade.h:46
+msgid "_Edit CA Trust"
+msgstr ""
+
+#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 #, fuzzy
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
-#: smime/lib/e-cert.c:478
+#. x509 certificate usage types
+#: smime/lib/e-cert.c:424
+#, fuzzy
+msgid "Sign"
+msgstr "Stauning"
+
+#: smime/lib/e-cert.c:425
+#, fuzzy
+msgid "Encrypt"
+msgstr "Kryptert"
+
+#: smime/lib/e-cert.c:530
 #, fuzzy
 msgid "Version"
 msgstr "Versjon"
 
-#: smime/lib/e-cert.c:493
+#: smime/lib/e-cert.c:545
 #, fuzzy
 msgid "Version 1"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:496
+#: smime/lib/e-cert.c:548
 #, fuzzy
 msgid "Version 2"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:499
+#: smime/lib/e-cert.c:551
 #, fuzzy
 msgid "Version 3"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:581
+#: smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:584
+#: smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:587
+#: smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:590
+#: smime/lib/e-cert.c:642
 #, fuzzy
 msgid "C"
 msgstr "C"
 
-#: smime/lib/e-cert.c:593
+#: smime/lib/e-cert.c:645
 #, fuzzy
 msgid "CN"
 msgstr "N"
 
-#: smime/lib/e-cert.c:596
+#: smime/lib/e-cert.c:648
 msgid "OU"
 msgstr ""
 
-#: smime/lib/e-cert.c:599
+#: smime/lib/e-cert.c:651
 #, fuzzy
 msgid "O"
 msgstr "O"
 
-#: smime/lib/e-cert.c:602
+#: smime/lib/e-cert.c:654
 #, fuzzy
 msgid "L"
 msgstr "L"
 
-#: smime/lib/e-cert.c:605
+#: smime/lib/e-cert.c:657
 #, fuzzy
 msgid "DN"
 msgstr "N"
 
-#: smime/lib/e-cert.c:608
+#: smime/lib/e-cert.c:660
 msgid "DC"
 msgstr ""
 
-#: smime/lib/e-cert.c:611
+#: smime/lib/e-cert.c:663
 #, fuzzy
 msgid "ST"
 msgstr "SMTP"
 
-#: smime/lib/e-cert.c:614
+#: smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:617
+#: smime/lib/e-cert.c:669
 #, fuzzy
 msgid "Certificate Key Usage"
 msgstr "_Sertifikat-ID:"
 
-#: smime/lib/e-cert.c:620
+#: smime/lib/e-cert.c:672
 #, fuzzy
 msgid "Netscape Certificate Type"
 msgstr "_Sertifikat-ID:"
 
-#: smime/lib/e-cert.c:623
+#: smime/lib/e-cert.c:675
 #, fuzzy
 msgid "Certificate Authority Key Identifier"
 msgstr "Sertifikatet kan ikkje stolast på"
 
-#: smime/lib/e-cert.c:626
+#: smime/lib/e-cert.c:678
 #, fuzzy
 msgid "UID"
 msgstr "UID"
 
-#: smime/lib/e-cert.c:635
+#: smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr ""
 
-#: smime/lib/e-cert.c:686
+#: smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:694
+#: smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
 msgstr ""
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:768
 #, fuzzy
 msgid "Subject Public Key Info"
 msgstr ""
 "\n"
 "Offentleg nøkkel: "
 
-#: smime/lib/e-cert.c:721
+#: smime/lib/e-cert.c:773
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:736
+#: smime/lib/e-cert.c:788
 #, fuzzy
 msgid "Subject's Public Key"
 msgstr "Emne er %s"
 
-#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
+#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
 #, fuzzy
 msgid "Error: Unable to process extension"
 msgstr "Kan ikkje laga 'spool'-katalog"
 
-#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
+#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:782
+#: smime/lib/e-cert.c:834
 #, fuzzy
 msgid "SSL Certificate Authority"
 msgstr "Sertifikatet kan ikkje stolast på"
 
-#: smime/lib/e-cert.c:786
+#: smime/lib/e-cert.c:838
 #, fuzzy
 msgid "Email Certificate Authority"
 msgstr "Kan ikkje verifisera sertifikat."
 
-#: smime/lib/e-cert.c:814
+#: smime/lib/e-cert.c:866
 #, fuzzy
 msgid "Signing"
 msgstr "Stauning"
 
-#: smime/lib/e-cert.c:818
+#: smime/lib/e-cert.c:870
 #, fuzzy
 msgid "Non-repudiation"
 msgstr "Ingen informasjon"
 
-#: smime/lib/e-cert.c:822
+#: smime/lib/e-cert.c:874
 msgid "Key Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:826
+#: smime/lib/e-cert.c:878
 #, fuzzy
 msgid "Data Encipherment"
 msgstr "vedlegg"
 
-#: smime/lib/e-cert.c:830
+#: smime/lib/e-cert.c:882
 msgid "Key Agreement"
 msgstr ""
 
-#: smime/lib/e-cert.c:834
+#: smime/lib/e-cert.c:886
 #, fuzzy
 msgid "Certificate Signer"
 msgstr "_Sertifikat-ID:"
 
-#: smime/lib/e-cert.c:838
+#: smime/lib/e-cert.c:890
 msgid "CRL Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:938
 #, fuzzy
 msgid "Critical"
 msgstr "Kritisk"
 
-#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
+#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
 #, fuzzy
 msgid "Not Critical"
 msgstr "North Carolina"
 
-#: smime/lib/e-cert.c:912
+#: smime/lib/e-cert.c:964
 #, fuzzy
 msgid "Extensions"
 msgstr "Utvidingar"
 
-#: smime/lib/e-cert.c:983
+#: smime/lib/e-cert.c:1035
 #, fuzzy, c-format
 msgid "%s = %s"
 msgstr "%s %s"
 
-#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
 #, fuzzy
 msgid "Certificate Signature Algorithm"
 msgstr "Signaturfil:"
 
-#: smime/lib/e-cert.c:1048
+#: smime/lib/e-cert.c:1100
 #, fuzzy
 msgid "Issuer"
 msgstr "Utferdar"
 
-#: smime/lib/e-cert.c:1102
+#: smime/lib/e-cert.c:1154
 msgid "Issuer Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1121
+#: smime/lib/e-cert.c:1173
 #, fuzzy
 msgid "Subject Unique ID"
 msgstr "Emne er %s"
 
-#: smime/lib/e-cert.c:1164
+#: smime/lib/e-cert.c:1216
 #, fuzzy
 msgid "Certificate Signature Value"
 msgstr "Signaturfil:"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
+#: smime/lib/e-cert-db.c:608
 #, fuzzy
 msgid "Certificate already exists"
 msgstr "Kort-id eksisterar allereide"
@@ -17941,7 +17443,7 @@ msgstr "Vis den valde kontakten"
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "H_andlingar"
 
@@ -18109,7 +17611,7 @@ msgstr "_Lukk"
 #: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:3
+#: ui/evolution.xml.h:4
 msgid "Close"
 msgstr "Lukk"
 
@@ -18122,7 +17624,7 @@ msgid "Delete this item"
 msgstr "Slett dette elementet"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr "Hovudverktylinje"
 
@@ -18165,7 +17667,7 @@ msgstr "Lagra dette elementet til disk"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:44
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "_File"
 msgstr "_Fil"
 
@@ -18424,13 +17926,13 @@ msgstr "_Invertér val"
 msgid "_Threaded Message List"
 msgstr "_Tråda meldingsliste"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Lukk vindauge"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "_Close"
 msgstr "L_ukk"
 
@@ -18874,7 +18376,7 @@ msgstr "_Forrige melding"
 msgid "_Quoted"
 msgstr "_Sitert"
 
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
 msgid "_Tools"
 msgstr "Verk_tøy"
 
@@ -19180,109 +18682,123 @@ msgid "_Open Task"
 msgstr "_Oppgåve"
 
 #: ui/evolution.xml.h:1
-msgid "About Ximian Evolution..."
-msgstr "Om Ximian Evolution ..."
+#, fuzzy
+msgid "About Evolution..."
+msgstr "Om Ximian Evolution"
 
 #: ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
 msgstr "Endre innstillingar for Evolution"
 
-#: ui/evolution.xml.h:5
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the visibility of the toolbar"
+msgstr "Endra namnet på spelarane"
+
+#: ui/evolution.xml.h:6
 #, fuzzy
 msgid "Create a new window displaying this folder"
 msgstr "Lag ein ny kalender"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "_Avslutt"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Ximian Evolution _FAQ"
+
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Avslutt programmet"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:10
 msgid "Forget _Passwords"
 msgstr "Gløym passor_d"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:11
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Fjernar passorda frå minnet, slik at du vil bli spurd om dei på nytt"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:12
 msgid "Import data from other programs"
 msgstr ""
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:14
 #, fuzzy
 msgid "New _Window"
 msgstr "_Finn no"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Pi_lot Settings..."
 msgstr "Pi_lot-innstillingar ..."
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Send / Receive"
 msgstr "Send / Motta"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Send queued items and retrieve new items"
 msgstr "Send køa meldingar og motta ny meldingar"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Set up Pilot configuration"
 msgstr "Oppsett for pilot"
 
-#: ui/evolution.xml.h:17
-msgid "Show information about Ximian Evolution"
+#: ui/evolution.xml.h:19
+#, fuzzy
+msgid "Show information about Evolution"
 msgstr "Vis informasjon om Ximian Evolution"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:20
 msgid "Submit Bug Report"
 msgstr "Send inn feilrapport"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:21
 msgid "Submit _Bug Report"
 msgstr "Send inn _feilrapport"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Send inn ei feilmelding ved hjelp av Bug Buddy"
 
-#: ui/evolution.xml.h:21
-msgid "Toggle whether we are working offline."
-msgstr ""
-
 #: ui/evolution.xml.h:23
-msgid "Ximian Evolution _FAQ"
-msgstr "Ximian Evolution _FAQ"
+#, fuzzy
+msgid "T_oolbar"
+msgstr "Hovudverktylinje"
 
 #: ui/evolution.xml.h:24
-msgid "_About Ximian Evolution..."
-msgstr "_Om Ximian Evolution ..."
+msgid "Toggle whether we are working offline."
+msgstr ""
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "_About Evolution..."
+msgstr "Om Ximian Evolution"
+
+#: ui/evolution.xml.h:30
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "_Import..."
 msgstr "_Importér ..."
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "_New"
 msgstr "_Ny"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 #, fuzzy
 msgid "_Quick Reference"
 msgstr "E-postinnstillingar"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_Send / Receive"
 msgstr "_Sende / Motta"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 #, fuzzy
 msgid "_Window"
 msgstr "_Finn no"
@@ -19361,7 +18877,7 @@ msgid "With _Status"
 msgstr "Sett status"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:626
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:635
 msgid "UTC"
 msgstr "UTC"
 
@@ -19516,29 +19032,29 @@ msgstr "Andre ..."
 msgid "..."
 msgstr "... "
 
-#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
-#: widgets/misc/e-error.c:121
+#: widgets/misc/e-error.c:79 widgets/misc/e-error.c:80
+#: widgets/misc/e-error.c:122
 msgid "Evolution Error"
 msgstr "Evolution feil"
 
-#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
-#: widgets/misc/e-error.c:119
+#: widgets/misc/e-error.c:81 widgets/misc/e-error.c:82
+#: widgets/misc/e-error.c:120
 #, fuzzy
 msgid "Evolution Warning"
 msgstr "Evolution e-post"
 
-#: widgets/misc/e-error.c:118
+#: widgets/misc/e-error.c:119
 #, fuzzy
 msgid "Evolution Information"
 msgstr "Møteinformasjon"
 
-#: widgets/misc/e-error.c:120
+#: widgets/misc/e-error.c:121
 #, fuzzy
 msgid "Evolution Query"
 msgstr "Evolution"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:410
+#: widgets/misc/e-error.c:415
 #, fuzzy, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -19698,16 +19214,501 @@ msgstr ""
 "Klarte ikkje å lagra til «%s»\n"
 " %s"
 
-#: widgets/misc/e-task-widget.c:211
+#: widgets/misc/e-task-widget.c:212
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: widgets/misc/e-task-widget.c:216
+#: widgets/misc/e-task-widget.c:217
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% ferdig)"
 
+#~ msgid "Failed to connect to LDAP server"
+#~ msgstr "Klarte ikkje å kopla til LDAP-tenar"
+
+#~ msgid "Failed to authenticate with LDAP server"
+#~ msgstr "Ikkje i stand til å autentisere mot IMAP-tenar"
+
+#~ msgid "Could not perform query on Root DSE"
+#~ msgstr "Kunne ikke utføra spørjing på Root DSE"
+
+#~ msgid "The server responded with no supported search bases"
+#~ msgstr "Tenaren svarte ikkje med nokon støtta basisar for søk"
+
+#~ msgid "This server does not support LDAPv3 schema information"
+#~ msgstr "Denne tenaren stør ikkje LDAPv3 skjemainformasjon"
+
+#~ msgid "Error retrieving schema information"
+#~ msgstr "Feil ved henting av skjemainformasjon"
+
+#~ msgid "Server did not respond with valid schema information"
+#~ msgstr "Tenaren svarte ikkje med gyldig skjema-informasjon"
+
+#~ msgid "  S_how Supported Bases "
+#~ msgstr "  V_is støtta basar "
+
+#~ msgid "1:00"
+#~ msgstr "1:00"
+
+#~ msgid "5:00"
+#~ msgstr "5:00"
+
+#~ msgid "Connecting"
+#~ msgstr "Koplar til"
+
+#~ msgid "Distinguished _name:"
+#~ msgstr "Distinguished _name:"
+
+#~ msgid "Email address:"
+#~ msgstr "E-postadresse:"
+
+#~ msgid "Evolution will use this DN to authenticate you with the server"
+#~ msgstr "Evolution vil bruka DN til å autentisera deg mot tenaren"
+
+#~ msgid "One"
+#~ msgstr "Ein"
+
+#~ msgid "S_earch scope: "
+#~ msgstr "Sø_keområde: "
+
+#~ msgid "Searching"
+#~ msgstr "Søker"
+
+#~ msgid "Sub"
+#~ msgstr "Under"
+
+#~ msgid "This option controls how long a search will be run."
+#~ msgstr "Dette valet kontrollerer kor lenge eit søk vil køyra."
+
+#~ msgid "U_se SSL/TLS:"
+#~ msgstr "B_ruk SSL/TLS:"
+
+#~ msgid "_Display name:"
+#~ msgstr "_Vist namn:"
+
+#~ msgid "_Port number:"
+#~ msgstr "_Portnummer:"
+
+#~ msgid "_Search base:"
+#~ msgstr "_Søkebase:"
+
+#~ msgid "_Server name:"
+#~ msgstr "_Tenarnamn:"
+
+#~ msgid "_Timeout (minutes):"
+#~ msgstr "_Tid før avbrot (minutt):"
+
+#~ msgid "connecting-tab"
+#~ msgstr "tilkopling-fane"
+
+#~ msgid "general-tab"
+#~ msgstr "almennt-fane"
+
+#~ msgid "searching-tab"
+#~ msgstr "søke-fane"
+
+#, fuzzy
+#~ msgid "Job title:"
+#~ msgstr "_Jobb-tittel:"
+
+#, fuzzy
+#~ msgid "Webcam:"
+#~ msgstr "Nettside:"
+
+#~ msgid "Category editor not available."
+#~ msgstr "Kategoriredigering ikkje tilgjengeleg."
+
+#, fuzzy
+#~ msgid ""
+#~ "The following entries are invalid:\n"
+#~ "\n"
+#~ msgstr "Desse tilkoplingane er aktive:"
+
+#~ msgid "Could not find widget for a field: `%s'"
+#~ msgstr "Kan ikkje finna skjermelement for felt: «%s»"
+
+#~ msgid "Do you want to save changes?"
+#~ msgstr "Vil du lagra endringane?"
+
+#~ msgid "Error saving %s: %s"
+#~ msgstr "Feil ved lagring av %s: %s"
+
+#~ msgid ""
+#~ "The addressbook backend for\n"
+#~ "%s\n"
+#~ "has crashed. You will have to restart Evolution in order to use it again"
+#~ msgstr ""
+#~ "Adressebok-bakdelen for\n"
+#~ "%s\n"
+#~ "har krasja. Du må starta Evolution på nytt for å bruka han igjen."
+
+#~ msgid "Can not load URI"
+#~ msgstr "Kan ikkje lasta adresse"
+
+#~ msgid "Calendar Properties"
+#~ msgstr "Kalendereigenskapar"
+
+#~ msgid "Remote"
+#~ msgstr "Estern"
+
+#~ msgid "Task List Properties"
+#~ msgstr "Eigenskapar for oppgåveliste"
+
+#~ msgid "_Refresh Interval:"
+#~ msgstr "Tid mellom oppf_riskingar:"
+
+#~ msgid "_Source URL:"
+#~ msgstr "_Kjeldeadresse:"
+
+#~ msgid ""
+#~ "The event being deleted is a meeting, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "Hendinga som vert sletta er eit møte. Vil du senda ut ei melding om "
+#~ "avlysing?"
+
+#~ msgid "Are you sure you want to cancel and delete this meeting?"
+#~ msgstr "Er du sikker på at du vil sletta og avlysa dette møtet?"
+
+#~ msgid ""
+#~ "The task being deleted is assigned, would you like to send a cancellation "
+#~ "notice?"
+#~ msgstr ""
+#~ "Oppgåva som vert sletta er tildelt nokon. Vil du senda ei melding om "
+#~ "kansellering?"
+
+#~ msgid "Are you sure you want to cancel and delete this task?"
+#~ msgstr "Er du sikker på at du vil kansellera og sletta denne oppgåva?"
+
+#~ msgid ""
+#~ "The journal entry being deleted is published, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "Journaloppføringa som vert sletta er publisert. Vil du senda ei melding "
+#~ "om kansellering?"
+
+#~ msgid "Are you sure you want to cancel and delete this journal entry?"
+#~ msgstr ""
+#~ "Er du sikker på at du vil kansellera og sletta denne journaloppføringa?"
+
+#~ msgid "Are you sure you want to delete the appointment `%s'?"
+#~ msgstr "Er du sikker på at du vil sletta avtalen «%s»?"
+
+#~ msgid "Are you sure you want to delete this untitled appointment?"
+#~ msgstr "Er du sikker på at du vil sletta denne avtalen utan tittel?"
+
+#~ msgid "Are you sure you want to delete the task `%s'?"
+#~ msgstr "Er du sikker på at du vil sletta oppgåva «%s»?"
+
+#~ msgid "Are you sure you want to delete this untitled task?"
+#~ msgstr "Er du sikker på at du vil sletta denne oppgåva utan tittel?"
+
+#~ msgid "Are you sure you want to delete the journal entry `%s'?"
+#~ msgstr "Er du sikker på at du vil sletta journaloppføringa «%s»?"
+
+#~ msgid "Are you sure want to delete this untitled journal entry?"
+#~ msgstr ""
+#~ "Er du sikker på at du vil sletta denne journaloppføringa utan tittel?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d appointment?"
+#~ msgid_plural "Are you sure you want to delete %d appointments?"
+#~ msgstr[0] "Er du sikker på at du vil sletta %d avtalar?"
+#~ msgstr[1] "Er du sikker på at du vil sletta %d avtalar?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d task?"
+#~ msgid_plural "Are you sure you want to delete %d tasks?"
+#~ msgstr[0] "Er du sikker på at du vil sletta %d oppgåver?"
+#~ msgstr[1] "Er du sikker på at du vil sletta %d oppgåver?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d journal entry?"
+#~ msgid_plural "Are you sure you want to delete %d journal entries?"
+#~ msgstr[0] "Er du sikker på at du vil sletta %d journaloppføringar?"
+#~ msgstr[1] "Er du sikker på at du vil sletta %d journaloppføringar?"
+
+#~ msgid "_Invite Others..."
+#~ msgstr "_Inviter andre ..."
+
+#~ msgid ""
+#~ "This event has been changed, but has not been saved.\n"
+#~ "\n"
+#~ "Do you wish to save your changes?"
+#~ msgstr ""
+#~ "Denne hendinga er endra, men ikkje lagra.\n"
+#~ "\n"
+#~ "Vil du lagra endringane?"
+
+#~ msgid "_Discard Changes"
+#~ msgstr "_Forkast endringar"
+
+#~ msgid "Save Event"
+#~ msgstr "Lagra hending"
+
+#~ msgid "The meeting information has been created. Send it?"
+#~ msgstr "Møteinformasjonen er oppretta. Senda ut?"
+
+#~ msgid "The meeting information has changed. Send an updated version?"
+#~ msgstr "Møteinformasjonen er endra. Senda ein oppdatert versjon?"
+
+#~ msgid "The task assignment information has been created. Send it?"
+#~ msgstr "Informasjonen om tildelinga av oppgåva er endra. Send ut?"
+
+#~ msgid "The task information has changed. Send an updated version?"
+#~ msgstr "Oppgåveinformasjonen er endra. Send ein oppdatert versjon?"
+
+#, fuzzy
+#~ msgid "Could not get article %s from NNTP server"
+#~ msgstr "Kunne ikkje laga katalog\n"
+
+#, fuzzy
+#~ msgid "Error posting message: %s: message not posted"
+#~ msgstr ""
+#~ "Feil under automatisk lagring av meldinga: %s\n"
+#~ " %s"
+
+#, fuzzy
+#~ msgid "Stream error"
+#~ msgstr "Anna feil"
+
+#, fuzzy
+#~ msgid "Connection error: %s"
+#~ msgstr "Ukjend feil: %s"
+
+#~ msgid "Could not get group: %s"
+#~ msgstr "Kan ikkje henta gruppa: %s"
+
+#, fuzzy
+#~ msgid "Could not get messages: unspecified error"
+#~ msgstr "Kunne ikkje senda meldinga: %s"
+
+#~ msgid "Unknown server response: %s"
+#~ msgstr "Ukjent svar frå tenaren: %s"
+
+#, fuzzy
+#~ msgid "Adjust Score"
+#~ msgstr "Juster poeng"
+
+#~ msgid "Assign Color"
+#~ msgstr "Tildel farge"
+
+#~ msgid "Attachments"
+#~ msgstr "Vedlegg"
+
+#, fuzzy
+#~ msgid "Beep"
+#~ msgstr "Pipelyd"
+
+#~ msgid "contains"
+#~ msgstr "inneheld"
+
+#~ msgid "Copy to Folder"
+#~ msgstr "Kopier til mappe"
+
+#~ msgid "Date received"
+#~ msgstr "Dato motteke"
+
+#~ msgid "Date sent"
+#~ msgstr "Dato sendt"
+
+#~ msgid "Deleted"
+#~ msgstr "Sletta"
+
+#~ msgid "does not contain"
+#~ msgstr "inneheld ikkje"
+
+#~ msgid "does not end with"
+#~ msgstr "sluttar ikkje med"
+
+#~ msgid "does not exist"
+#~ msgstr "finst ikkje"
+
+#, fuzzy
+#~ msgid "does not return"
+#~ msgstr "finst ikkje"
+
+#~ msgid "does not sound like"
+#~ msgstr "høyres ikkje ut som"
+
+#~ msgid "does not start with"
+#~ msgstr "startar ikkje med"
+
+#~ msgid "Do Not Exist"
+#~ msgstr "Eksisterar ikkje"
+
+#~ msgid "Draft"
+#~ msgstr "Kladd"
+
+#~ msgid "ends with"
+#~ msgstr "sluttar med"
+
+#~ msgid "Exist"
+#~ msgstr "Eksisterar"
+
+#~ msgid "exists"
+#~ msgstr "eksisterar"
+
+#~ msgid "Expression"
+#~ msgstr "Uttrykk"
+
+#, fuzzy
+#~ msgid "is"
+#~ msgstr "Liste"
+
+#, fuzzy
+#~ msgid "is after"
+#~ msgstr "var etter"
+
+#, fuzzy
+#~ msgid "is before"
+#~ msgstr "var før"
+
+#~ msgid "is Flagged"
+#~ msgstr "er flagga"
+
+#~ msgid "is greater than"
+#~ msgstr "er større enn"
+
+#~ msgid "is less than"
+#~ msgstr "er mindre enn"
+
+#~ msgid "is not"
+#~ msgstr "er ikkje"
+
+#~ msgid "is not Flagged"
+#~ msgstr "er ikkje flagga"
+
+#, fuzzy
+#~ msgid "Junk Test"
+#~ msgstr "Juni"
+
+#~ msgid "Mailing list"
+#~ msgstr "E-postliste"
+
+#~ msgid "Message Body"
+#~ msgstr "Meldingskropp"
+
+#~ msgid "Message Header"
+#~ msgstr "Meldingshovud"
+
+#, fuzzy
+#~ msgid "Message is Junk"
+#~ msgstr "Meldingar"
+
+#, fuzzy
+#~ msgid "Message is not Junk"
+#~ msgstr "Marker som v_iktig"
+
+#~ msgid "Move to Folder"
+#~ msgstr "Flytt til mappe"
+
+#, fuzzy
+#~ msgid "Pipe to Program"
+#~ msgstr "Avslutt programmet"
+
+#, fuzzy
+#~ msgid "Play Sound"
+#~ msgstr "Spel lyd:"
+
+#~ msgid "Recipients"
+#~ msgstr "Mottakarar"
+
+#~ msgid "Regex Match"
+#~ msgstr "Treff på regulært uttrykk"
+
+#~ msgid "Replied to"
+#~ msgstr "Svart til"
+
+#~ msgid "returns"
+#~ msgstr "returnerer"
+
+#~ msgid "returns greater than"
+#~ msgstr "returnerer større enn"
+
+#~ msgid "returns less than"
+#~ msgstr "returnerer mindre enn"
+
+#, fuzzy
+#~ msgid "Run Program"
+#~ msgstr "Køyr program:"
+
+#~ msgid "Sender"
+#~ msgstr "Avsendar"
+
+#~ msgid "Set Status"
+#~ msgstr "Sett status"
+
+# TRN: Det skal ikkje vera KiB?
+#~ msgid "Size (kB)"
+#~ msgstr "Storleik (kB)"
+
+#~ msgid "sounds like"
+#~ msgstr "høyres ut som"
+
+#~ msgid "Source Account"
+#~ msgstr "Avsendarkonto"
+
+#~ msgid "Specific header"
+#~ msgstr "Spesifikk linje i hovud"
+
+#~ msgid "starts with"
+#~ msgstr "byrjar med"
+
+#~ msgid "Stop Processing"
+#~ msgstr "Stopp prosessering"
+
+#~ msgid "Unset Status"
+#~ msgstr "Nullstill status"
+
+#~ msgid "Working"
+#~ msgstr "Arbeidar"
+
+#~ msgid "_Filename:"
+#~ msgstr "_Filnamn:"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "Unknown error."
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Ukjend feil."
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the component system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Feilen frå komponentsystemet er:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the activation system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Feilen frå aktiveringssystemet er:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "View Certificate"
+#~ msgstr "_Sertifikat-ID:"
+
+#~ msgid "About Ximian Evolution..."
+#~ msgstr "Om Ximian Evolution ..."
+
+#~ msgid "_About Ximian Evolution..."
+#~ msgstr "_Om Ximian Evolution ..."
+
 #~ msgid "Evolution Addressbook folder viewer"
 #~ msgstr "Evolution adressebok mappevisar"
 
@@ -20000,9 +20001,6 @@ msgstr "%s (%d%% ferdig)"
 #~ msgid "Primary _email:"
 #~ msgstr "Primær _e-post:"
 
-#~ msgid "S_pouse:"
-#~ msgstr "E_ktefelle:"
-
 #~ msgid "_Business:"
 #~ msgstr "_Firma:"
 
@@ -20018,9 +20016,6 @@ msgstr "%s (%d%% ferdig)"
 #~ msgid "_Mobile:"
 #~ msgstr "_Mobil:"
 
-#~ msgid "_Office:"
-#~ msgstr "K_ontor:"
-
 #~ msgid "_Public Calendar URL:"
 #~ msgstr "_Offentleg kalender-URL:"
 
diff --git a/po/no.po b/po/no.po
index ed9b2eca2d..da90c71117 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,14 +5,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.5\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-22 12:16+0200\n"
+"POT-Creation-Date: 2004-06-03 11:14-0400\n"
 "PO-Revision-Date: 2004-05-22 12:51+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <i18n-nb@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
+"Report-Msgid-Bugs-To: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: a11y/addressbook/ea-addressbook-view.c:94
@@ -67,13 +67,13 @@ msgstr "Kunne ikke lese pilotens adresseapplikasjonsblokk"
 msgid "Accessing LDAP Server anonymously"
 msgstr "Aksesserer LDAP-tjener anonymt"
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
 msgid "Failed to authenticate.\n"
 msgstr "Kunne ikke autentisere.\n"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sSkriv inn passord for %s (bruker %s)"
@@ -118,34 +118,6 @@ msgstr "Opprett en ny kontaktgruppe"
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr "Feil under oppgradering av innstillinger eller mapper for adressebok."
 
-#: addressbook/gui/component/addressbook-config.c:483
-msgid "Failed to connect to LDAP server"
-msgstr "Kunne ikke koble til LDAP-tjener"
-
-#: addressbook/gui/component/addressbook-config.c:507
-msgid "Failed to authenticate with LDAP server"
-msgstr "Kunne ikke autentisere mot LDAP-tjener"
-
-#: addressbook/gui/component/addressbook-config.c:535
-msgid "Could not perform query on Root DSE"
-msgstr "Kunne ikke utføre spørring på Root DSE"
-
-#: addressbook/gui/component/addressbook-config.c:840
-msgid "The server responded with no supported search bases"
-msgstr "Tjeneren svarte ikke med noen støttede basis for søk"
-
-#: addressbook/gui/component/addressbook-config.c:1245
-msgid "This server does not support LDAPv3 schema information"
-msgstr "Denne tjeneren støtter ikke LDAPv3 schema-informasjon"
-
-#: addressbook/gui/component/addressbook-config.c:1266
-msgid "Error retrieving schema information"
-msgstr "Feil under henting av schema-informasjon"
-
-#: addressbook/gui/component/addressbook-config.c:1274
-msgid "Server did not respond with valid schema information"
-msgstr "Tjener svarte ikke med gyldig schema-informasjon"
-
 #: addressbook/gui/component/addressbook-migrate.c:68
 #: calendar/gui/migration.c:137 mail/em-migrate.c:1160
 msgid "Migrating..."
@@ -158,20 +130,16 @@ msgid "Migrating `%s':"
 msgstr "Migrerer «%s»:"
 
 #. create the local source group
-#. On This Computer is always first and VFolders is always last
-#: addressbook/gui/component/addressbook-migrate.c:508
+#: addressbook/gui/component/addressbook-migrate.c:464
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
 #: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
-#: mail/mail-component.c:247 mail/mail-vfolder.c:218
+#: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr "På denne datamaskinen"
 
 #. Create the default Person addressbook
-#. Create the default Person calendar
-#. Create the default Person task list
-#. orange
-#: addressbook/gui/component/addressbook-migrate.c:516
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
 #: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
 #: mail/mail-config.glade.h:109
@@ -179,19 +147,19 @@ msgid "Personal"
 msgstr "Personlig"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:524
+#: addressbook/gui/component/addressbook-migrate.c:480
 msgid "On LDAP Servers"
 msgstr "På LDAP-tjenere"
 
-#: addressbook/gui/component/addressbook-migrate.c:652
+#: addressbook/gui/component/addressbook-migrate.c:608
 msgid "LDAP Servers"
 msgstr "LDAP-tjenere"
 
-#: addressbook/gui/component/addressbook-migrate.c:772
+#: addressbook/gui/component/addressbook-migrate.c:728
 msgid "Autocompletion Settings"
 msgstr "Innstillinger for autofullføring"
 
-#: addressbook/gui/component/addressbook-migrate.c:1148
+#: addressbook/gui/component/addressbook-migrate.c:1104
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -203,7 +171,7 @@ msgstr ""
 "\n"
 "Vennligst vent mens Evolution migrerer dine mapper..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1162
+#: addressbook/gui/component/addressbook-migrate.c:1118
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -213,7 +181,7 @@ msgstr ""
 "\n"
 "Vennligst vent mens Evolution migrerer dine mapper..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1171
+#: addressbook/gui/component/addressbook-migrate.c:1127
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -223,7 +191,7 @@ msgstr ""
 "\n"
 "Vennligst vent mens Evolution migrerer dine mapper..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1181
+#: addressbook/gui/component/addressbook-migrate.c:1137
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -233,45 +201,33 @@ msgstr ""
 "\n"
 "Vennligst vent mens Evolution migrerer dine mapper..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1194
-msgid ""
-"Some fields are no longer representable in the contact editor. Please wait "
-"while Evolution copies those fields to the 'Notes' field..."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-view.c:674
+#: addressbook/gui/component/addressbook-view.c:675
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr "Adressebok «%s» vil bli fjernet. Er du sikker på at du vil fortsette?"
 
-#: addressbook/gui/component/addressbook-view.c:761
+#: addressbook/gui/component/addressbook-view.c:754
 msgid "New Address Book"
 msgstr "Ny adressebok"
 
-#: addressbook/gui/component/addressbook-view.c:762
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
+#: addressbook/gui/component/addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Slett"
 
-#: addressbook/gui/component/addressbook-view.c:763
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-view.c:756
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Egenskaper ..."
 
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
 #. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:1002
+#: addressbook/gui/component/addressbook-view.c:995
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
 #: calendar/gui/migration.c:373
 msgid "Contacts"
 msgstr "Kontakter"
@@ -348,10 +304,6 @@ msgid "Manage your S/MIME certificates here"
 msgstr "Håndter dine S/MIME-sertifikater her"
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-msgid "  S_how Supported Bases "
-msgstr " V_is støttede baser "
-
-#: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -373,183 +325,150 @@ msgstr " V_is støttede baser "
 msgid "*"
 msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr "1"
 
-#: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1:00"
-msgstr "1:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr "5"
 
-#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
-msgstr "5:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "<b>Authentication</b>"
 msgstr "<b>Autentisering</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Display</b>"
 msgstr "<b>Visning</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "<b>Downloading</b>"
 msgstr "<b>Laster ned</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "<b>Searching</b>"
 msgstr "<b>Søker</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:11
 msgid "<b>Server Information</b>"
 msgstr "<b>Tjenerinformasjon</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:12
 msgid "<b>Type:</b>"
 msgstr "<b>Type:</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add Contacts Group"
 msgstr "Legg til kontaktgruppe"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Address Book Properties"
 msgstr "Egenskaper for adressebok"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:42
 msgid "Always"
 msgstr "Alltid"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr "Anonymt"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:17
 #: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Grunnleggende"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
-msgid "Connecting"
-msgstr "Tilkobling"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 #: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Detaljer"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
-msgid "Distinguished _name:"
-msgstr "Distinguished _name:"
-
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished name"
 msgstr "Distinguished name"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Download limit:"
 msgstr "Grense for nedlasting:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Email address"
 msgstr "E-postadresse"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "Email address:"
-msgstr "E-postadresse:"
-
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "Evolution will use this DN to authenticate you with the server"
-msgstr "Evolution vil bruke DN til å autentisere deg mot tjeneren"
-
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:22
+#, fuzzy
 msgid ""
-"Evolution will use this email address to authenticate you with the server"
+"Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "Evolution vil bruke denne e-post adressen til å autentisere deg mot tjeneren"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Find Possible Search Bases"
 msgstr "Finn mulige søkebaser"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:24
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Generelt"
 
-#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
+#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:102
 msgid "Never"
 msgstr "Aldri"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
-msgid "One"
-msgstr "En"
-
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Only locations within starting point"
 msgstr "Kun lokasjoner innenfor startpunktet"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
-msgid "S_earch scope: "
-msgstr "Sø_keområde: "
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Search _base:"
+msgstr "Søkebase:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:28
 msgid "Search base only"
 msgstr "Kun søkebase"
 
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid "Search base:"
 msgstr "Søkebase:"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid "Search scope:"
 msgstr "Søkeområde:"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
-msgid "Searching"
-msgstr "Søker"
-
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:31
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
-"server if\n"
-"your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL or TLS."
 msgstr ""
 "Hvis du aktiverer dette alternativet vil Evolution kun koble til din LDAP-"
 "tjener hvis\n"
 "denne støtter SSL eller TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a \n"
-"insecure environment. For example, if you and your LDAP server are behind a "
-"firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection "
-"is already\n"
-"secure."
+"you are in a insecure environment. For example, if you and your LDAP server "
+"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
+"because your connection is already secure."
 msgstr ""
 "Hvis du aktiverer dette alternativet vil Evolution kun prøve å bruker SSL/"
 "TLS hvis du er i et\n"
@@ -558,74 +477,68 @@ msgstr ""
 "vil ikke Evolution behøve å bruke SSL/TLS fordi tilkoblingen allerede er "
 "sikker."
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:33
+#, fuzzy
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
-"TLS.  This \n"
-"means that your connection will be insecure, and that you will be vulnerable "
-"to security\n"
-"exploits. "
+"TLS.  This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits. "
 msgstr ""
 "Hvis du aktiverer dette alternativet betyr det at din tjener ikke støtter "
 "SSL eller TLS. Dette \n"
 "betyr at din tilkobling vil være usikker, og at du vil være sårbar for "
 "sikkerhetshull. "
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Starting point and locations within it"
 msgstr "Startpunkt og lokasjoner innenfor dette"
 
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Sub"
-msgstr "Under"
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr "Støttede søkebaser"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
-"searches will \n"
-"begin. If you leave this blank, the search will begin at the root of the "
-"directory tree."
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
 msgstr ""
 "Søkebasen er det distingverte navnet (DN) for oppføringen der dine søk vil "
 "starte.\n"
 "Hvis du lar denne stå tom vil søk starte ved roten av katalogtreet."
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:37
+#, fuzzy
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
-"the \n"
-"directory tree. A search scope of \"sub\" will include all entries below "
-"your search base.\n"
-"A search scope of \"one\" will only include the entries one level beneath "
-"your base.\n"
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
 msgstr ""
 "Søkeområdet definerer hvor dypt du ønsker at søket skal gå ned i "
 "katalogtreet.\n"
 "Et søkeområde som «sub» vil ta med alle oppføringer under din søkebase.\n"
 "Et søkeområde som «one» vil kun ta med oppføringer ett nivå under basen.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:58
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 "Dette er fullt navn på din LDAP-tjener. For eksempel «ldap.mittfirma.no»."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:39
+#, fuzzy
 msgid ""
-"This is the maximum number of entries to download. Setting this number to "
-"be \n"
+"This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr ""
 "Dette er maksimalt antall oppføringer som skal lastes ned. Hvis du setter \n"
 "dette \n"
 "tallet for høyt vil adresseboken bli treg."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -634,134 +547,113 @@ msgstr ""
 "Dette er metoden Evolution bruker for å autentisere deg. Merk at hvis du "
 "setter denne til «e-post-adresse» krever anonym tilgang til din LDAP-tjener."
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:41
+#, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
-"list.\n"
-"It is for display purposes only. "
+"list. It is for display purposes only. "
 msgstr ""
 "Dette er navnet på denne tjeneren som vises i mappelisten i Evolution. \n"
 "Det brukes kun for visning på skjermen."
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:42
+#, fuzzy
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. "
-"A \n"
-"list of standard ports has been provided. Ask your system administrator\n"
-"what port you should specify."
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
 msgstr ""
 "Dette er porten på LDAP-tjeneren som Evolution vil prøve å koble  til. En\n"
 "liste med standardporter er gitt. Spør din systemadministrator hvilken\n"
 "port du skal bruke."
 
-#: addressbook/gui/component/ldap-config.glade.h:67
-msgid "This option controls how long a search will be run."
-msgstr "Dette alternativet kontrollerer hvor lenge et søk vil kjøre."
-
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid "Timeout:"
 msgstr "Tidsavbrudd:"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
-msgid "U_se SSL/TLS:"
-msgstr "B_ruk SSL/TLS:"
-
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr "Bruker distinguished name (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr "Bruker e-post adresse"
 
-#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
+#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr "Når mulig"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:47
 msgid "_Add Contacts Group"
 msgstr "_Legg til kontaktgruppe"
 
-#: addressbook/gui/component/ldap-config.glade.h:74
-#: calendar/gui/dialogs/calendar-setup.glade.h:12
-msgid "_Display name:"
-msgstr "_Vis navn:"
-
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr "Grense for ne_dlasting:"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Email address:"
 msgstr "_E-postadresse:"
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:50
+#, fuzzy
+msgid "_Find Possible Search Bases"
+msgstr "Finn mulige søkebaser"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Log in method:"
 msgstr "Metode for på_logging:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:171
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "_Log in:"
+msgstr "Login"
+
+#: addressbook/gui/component/ldap-config.glade.h:53
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
 msgid "_Name:"
 msgstr "_Navn:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
-msgid "_Port number:"
-msgstr "_Portnummer:"
-
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid "_Port:"
 msgstr "_Port:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
-msgid "_Search base:"
-msgstr "_Søkebase:"
-
-#: addressbook/gui/component/ldap-config.glade.h:82
-msgid "_Server name:"
-msgstr "_Tjenernavn:"
+#: addressbook/gui/component/ldap-config.glade.h:55
+#, fuzzy
+msgid "_Search scope:"
+msgstr "Søkeområde:"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:56
 msgid "_Server:"
 msgstr "Tj_ener:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
-msgid "_Timeout (minutes):"
-msgstr "_Tidsavbrudd (minutter):"
+#: addressbook/gui/component/ldap-config.glade.h:57
+#, fuzzy
+msgid "_Timeout:"
+msgstr "Tidsavbrudd:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:58
 msgid "_Use secure connection:"
 msgstr "Br_uk sikker forbindelse:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "kort"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
-msgid "connecting-tab"
-msgstr "connecting-tab"
-
-#: addressbook/gui/component/ldap-config.glade.h:88
-msgid "general-tab"
-msgstr "general-tab"
-
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:60
 #: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
 #: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "minutter"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
-msgid "searching-tab"
-msgstr "searching-tab"
-
-#: addressbook/gui/component/select-names/e-select-names.c:497
+#: addressbook/gui/component/select-names/e-select-names.c:503
 #: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid "Select Contacts from Address Book"
 msgstr "Velg kontakter fra adresseboken"
 
-#: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
@@ -801,7 +693,7 @@ msgstr "Kontakt uten navn:"
 
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:222
+#: addressbook/gui/widgets/e-addressbook-view.c:224
 msgid "Source"
 msgstr "Kilde"
 
@@ -866,9 +758,9 @@ msgid "<b>Work</b>"
 msgstr "<b>Arbeid</b> "
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:177
-#: addressbook/gui/widgets/eab-contact-display.c:342
-#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/widgets/eab-contact-display.c:334
+#: addressbook/gui/widgets/eab-contact-display.c:353
 msgid "AIM"
 msgstr "AIM"
 
@@ -902,15 +794,15 @@ msgid "Company:"
 msgstr "Firma:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:265
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
+#: addressbook/gui/contact-editor/e-contact-editor.c:266
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
 msgstr "Kontakt"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:519
+#: addressbook/gui/contact-editor/e-contact-editor.c:520
 msgid "Contact Editor"
 msgstr "Kontaktredigering"
 
@@ -931,83 +823,81 @@ msgid "Full _Name..."
 msgstr "Fullt _navn..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-msgid "Home"
-msgstr "Hjemme"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "Home Page:"
 msgstr "Hjemmeside:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-#: calendar/gui/e-itip-control.c:930
-msgid "Location:"
-msgstr "Plassering:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "Mailing Address"
 msgstr "Postadresse"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "Manager:"
 msgstr "Leder:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "Ni_ckname:"
 msgstr "_Kallenavn:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "Notes:"
 msgstr "Notater:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-msgid "Other"
-msgstr "Andre"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#, fuzzy
+msgid "Office:"
+msgstr "Kont_or:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "PO Box:"
 msgstr "Postboks:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "Personal Information"
 msgstr "Personlig informasjon"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "Profession:"
 msgstr "Yrke:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#, fuzzy
+msgid "Spouse:"
+msgstr "E_ktefelle:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "State/Province:"
 msgstr "Stat/provins:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "Title:"
 msgstr "Tittel:"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+msgid "Video Chat:"
+msgstr ""
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "Wants to receive HTML mail"
 msgstr "Ønsker å motta HTML-formatert e-post"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:42
-msgid "Webcam:"
-msgstr "Nettkamera:"
+#, fuzzy
+msgid "Web Log:"
+msgstr "Nettside:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
+#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
 #: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
 #: mail/mail-config.glade.h:157
@@ -1027,17 +917,10 @@ msgid "_File under:"
 msgstr "_Lagre under:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "_Where:"
 msgstr "_Hvor:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
-msgid "item7"
-msgstr "oppføring7"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
-msgid "item8"
-msgstr "oppføring8"
-
 #: addressbook/gui/contact-editor/eab-editor.c:315
 msgid ""
 "Are you sure you want\n"
@@ -1055,16 +938,16 @@ msgstr ""
 "slette denne kontakten?"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:351
-#: addressbook/gui/widgets/eab-contact-display.c:372
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Address"
 msgstr "Adresse"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:286
+#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard.c:174
@@ -2042,98 +1925,110 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/contact-editor/e-contact-editor.c:179
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:337
+#: addressbook/gui/widgets/eab-contact-display.c:356
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
-#: addressbook/gui/widgets/eab-contact-display.c:347
-#: addressbook/gui/widgets/eab-contact-display.c:366
+#: addressbook/gui/contact-editor/e-contact-editor.c:180
+#: addressbook/gui/widgets/eab-contact-display.c:339
+#: addressbook/gui/widgets/eab-contact-display.c:358
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: addressbook/gui/widgets/eab-contact-display.c:338
+#: addressbook/gui/widgets/eab-contact-display.c:357
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:344
-#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#: addressbook/gui/widgets/eab-contact-display.c:355
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
+#: addressbook/gui/contact-editor/e-contact-editor.c:183
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:251
+#: addressbook/gui/contact-editor/e-contact-editor.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+msgid "Home"
+msgstr "Hjemme"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+msgid "Other"
+msgstr "Andre"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
 msgid "Source Book"
 msgstr "Kildebok"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:258
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Target Book"
 msgstr "Målbok"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:272
+#: addressbook/gui/contact-editor/e-contact-editor.c:273
 msgid "Is New Contact"
 msgstr "Er ny kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:279
+#: addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Writable Fields"
 msgstr "Skrivbare felter"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:293
+#: addressbook/gui/contact-editor/e-contact-editor.c:294
 msgid "Changed"
 msgstr "Endret"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2294
-msgid "Category editor not available."
-msgstr "Kategori editor ikke tilgjengelig."
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2302
+#: addressbook/gui/contact-editor/e-contact-editor.c:2352
 msgid "This contact belongs to these categories:"
 msgstr "Denne kontakten hører til disse kategoriene:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2379
+#: addressbook/gui/contact-editor/e-contact-editor.c:2429
 msgid "Please select an image for this contact"
 msgstr "Vennligst velg et bilde for denne kontakten"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2383
+#: addressbook/gui/contact-editor/e-contact-editor.c:2433
 msgid "No image"
 msgstr "Uten bilde"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2560
-#: addressbook/gui/contact-editor/e-contact-editor.c:2723
-msgid ""
-"You are moving the contact from one address book to another, but it cannot "
-"be removed from the source. Do you want to save a copy instead?"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2607
+#: addressbook/gui/contact-editor/e-contact-editor.c:2636
 msgid ""
 "The contact data is invalid:\n"
 "\n"
-msgstr "Kontaktdata er ugyldig:\n\n"
+msgstr ""
+"Kontaktdata er ugyldig:\n"
+"\n"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#, fuzzy
+msgid "Invalid contact."
+msgstr "%d kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2700
+#: addressbook/gui/contact-editor/e-contact-editor.c:2723
 msgid ""
 "The contact cannot be saved to the selected address book. Do you want to "
 "discard changes?"
-msgstr "Kontakten kan ikke lagres i valgt adressebok. Vil du forkaste endringene?"
+msgstr ""
+"Kontakten kan ikke lagres i valgt adressebok. Vil du forkaste endringene?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2704
-#: addressbook/gui/contact-editor/e-contact-editor.c:2728
-#: addressbook/gui/widgets/eab-gui-util.c:208
+#: addressbook/gui/contact-editor/e-contact-editor.c:2727
+#: addressbook/gui/contact-editor/e-contact-editor.c:2751
 msgid "_Discard"
 msgstr "_Forkast"
 
+#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+msgid ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:62
 msgid "AOL Instant Messenger"
 msgstr "AOL øyeblikksmeldinger"
@@ -2310,30 +2205,30 @@ msgstr "_Listenavn:"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Skriv en e-post adresse eller dra en kontakt inn i feltet under:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "contact-list-editor"
 msgstr "kontakt-liste-redigering"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:153
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:215
+#: addressbook/gui/widgets/e-addressbook-view.c:217
 #: addressbook/gui/widgets/e-minicard-view.c:460
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Bok"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
 msgid "Is New List"
 msgstr "Er ny liste"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:215
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
 msgid "Contact List Editor"
 msgstr "Kontaktlisteredigering"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:438
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
 msgid "Save List as VCard"
 msgstr "Lagre liste som VCard"
 
@@ -2380,144 +2275,144 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Avansert søk"
 
-#: addressbook/gui/widgets/eab-contact-display.c:129
-#: addressbook/gui/widgets/eab-contact-display.c:192
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
 msgid "(map)"
 msgstr "(kart)"
 
-#: addressbook/gui/widgets/eab-contact-display.c:139
-#: addressbook/gui/widgets/eab-contact-display.c:205
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
 msgid "map"
 msgstr "kart"
 
-#: addressbook/gui/widgets/eab-contact-display.c:257
-#: addressbook/gui/widgets/eab-contact-display.c:533
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:525
 msgid "List Members"
 msgstr "Listemedlemmer"
 
-#: addressbook/gui/widgets/eab-contact-display.c:329
-#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/eab-contact-display.c:321
+#: addressbook/gui/widgets/eab-contact-display.c:323
 msgid "E-mail"
 msgstr "E-post"
 
-#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/eab-contact-display.c:332
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organisasjon"
 
-#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "Position"
 msgstr "Stilling"
 
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:354
 msgid "Groupwise"
 msgstr "Groupwise"
 
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:340
 msgid "Video Conferencing"
 msgstr "Videokonferanse"
 
-#: addressbook/gui/widgets/eab-contact-display.c:349
-#: addressbook/gui/widgets/eab-contact-display.c:370
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Phone"
 msgstr "Telefon"
 
-#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:342
 msgid "Fax"
 msgstr "Faks"
 
-#: addressbook/gui/widgets/eab-contact-display.c:354
+#: addressbook/gui/widgets/eab-contact-display.c:346
 msgid "work"
 msgstr "arbeid"
 
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:359
 msgid "WWW"
 msgstr "WWW"
 
-#: addressbook/gui/widgets/eab-contact-display.c:368
-#: addressbook/gui/widgets/eab-contact-display.c:587
+#: addressbook/gui/widgets/eab-contact-display.c:360
+#: addressbook/gui/widgets/eab-contact-display.c:579
 msgid "Blog"
 msgstr "Weblogg"
 
-#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/eab-contact-display.c:363
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: addressbook/gui/widgets/eab-contact-display.c:375
+#: addressbook/gui/widgets/eab-contact-display.c:367
 msgid "personal"
 msgstr "personlig"
 
-#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/eab-contact-display.c:374
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Kommentar"
 
-#: addressbook/gui/widgets/eab-contact-display.c:548
+#: addressbook/gui/widgets/eab-contact-display.c:540
 msgid "Job Title"
 msgstr "Jobbtittel"
 
-#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/eab-contact-display.c:544
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:774
+#: smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "E-post"
 
-#: addressbook/gui/widgets/eab-contact-display.c:579
+#: addressbook/gui/widgets/eab-contact-display.c:571
 msgid "Home page"
 msgstr "Hjemmeside"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 msgid "Success"
 msgstr "Suksess"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Backend busy"
 msgstr "Motor opptatt"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Repository offline"
 msgstr "Frakoblet lager"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Address Book does not exist"
 msgstr "Adresseboken eksisterer ikke"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "No Self Contact defined"
 msgstr "Egen kontaktinformasjon er ikke definert"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Permission denied"
 msgstr "Tilgang nektet"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Contact not found"
 msgstr "Kontakt ikke funnet"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Contact ID already exists"
 msgstr "Kontakt-ID eksisterer allerede"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Protocol not supported"
 msgstr "Protokollen er ikke støttet"
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:60
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:233
 #: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
@@ -2530,37 +2425,37 @@ msgid "Cancelled"
 msgstr "Avbrutt"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Could not cancel"
 msgstr "Kunne ikke avbryte"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Authentication Failed"
 msgstr "Autentisering feilet"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Authentication Required"
 msgstr "Autentisering kreves"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:66
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "TLS not Available"
 msgstr "TLS er ikke tilgjengelig"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#: addressbook/gui/widgets/eab-gui-util.c:66
 msgid "No such source"
 msgstr "Ingen slik kilde"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:69
+#: addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Other error"
 msgstr "Annen feil"
 
-#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:90
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
@@ -2568,7 +2463,7 @@ msgstr ""
 "Kunne ikke åpne denne adresseboken. Vennligst sjekk at stien eksisterer og "
 "at du har rettigheter til å aksessere den."
 
-#: addressbook/gui/widgets/eab-gui-util.c:110
+#: addressbook/gui/widgets/eab-gui-util.c:97
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -2576,17 +2471,18 @@ msgstr ""
 "Kunne ikke åpne denne adresseboken. Dette betyr enten at du har skrevet inn "
 "en ugyldig URI, eller at LDAP-tjeneren ikke kan nås."
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:102
+#, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution you must compile the program from the CVS "
-"sources after retrieving OpenLDAP from the link below."
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
 msgstr ""
 "Denne versjonen av Evolution har ikke LDAP-støtte kompilert inn. Hvis du "
 "ønsker å bruke LDAP i Evolution må du kompilere programmet fra kildekoden i "
 "CVS etter å ha hentet OpenLDAP fra lenken under."
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:109
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -2594,11 +2490,7 @@ msgstr ""
 "Kunne ikke åpne denne adresseboken. Dette betyr enten at du har skrevet inn "
 "en ugyldig URI, eller at tjeneren ikke kan nås."
 
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "Unable to open addressbook"
-msgstr "Kunne ikke åpne adresseboken"
-
-#: addressbook/gui/widgets/eab-gui-util.c:162
+#: addressbook/gui/widgets/eab-gui-util.c:129
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2606,7 +2498,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:168
+#: addressbook/gui/widgets/eab-gui-util.c:135
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -2614,49 +2506,45 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:174
+#: addressbook/gui/widgets/eab-gui-util.c:141
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "Bakenden for denne adresseboken forsto ikke denne spørringen."
 
-#: addressbook/gui/widgets/eab-gui-util.c:177
+#: addressbook/gui/widgets/eab-gui-util.c:144
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Bakenden for denne adresseboken nektet å utføre denne spørringen."
 
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:147
 msgid "This query did not complete successfully."
 msgstr "Denne spørringen ble ikke fullført."
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
-msgid "Do you want to save changes?"
-msgstr "Vil du lagre endringene?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:169
 msgid "Error adding list"
 msgstr "Feil under innlegging av liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:229
-#: addressbook/gui/widgets/eab-gui-util.c:652
+#: addressbook/gui/widgets/eab-gui-util.c:169
+#: addressbook/gui/widgets/eab-gui-util.c:580
 msgid "Error adding contact"
 msgstr "Feil under innlegging av kontakt"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying list"
 msgstr "Feil ved endring av liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying contact"
 msgstr "Feil under endring av kontakt"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:192
 msgid "Error removing list"
 msgstr "Feil under fjerning av liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
-#: addressbook/gui/widgets/eab-gui-util.c:610
+#: addressbook/gui/widgets/eab-gui-util.c:192
+#: addressbook/gui/widgets/eab-gui-util.c:538
 msgid "Error removing contact"
 msgstr "Feil under fjerning av kontakt"
 
-#: addressbook/gui/widgets/eab-gui-util.c:334
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2665,7 +2553,7 @@ msgstr ""
 "Åpning av %d kontakter vil medføre at %d nye vinduer vil\n"
 "vises på skjermen. Vil du virkelig vise alle disse kontaktene?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:360
+#: addressbook/gui/widgets/eab-gui-util.c:300
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2674,49 +2562,44 @@ msgstr ""
 "%s eksisterer allerede\n"
 "Vil du overskrive den?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:364
+#: addressbook/gui/widgets/eab-gui-util.c:304
 msgid "Overwrite"
 msgstr "Overskriv"
 
-#: addressbook/gui/widgets/eab-gui-util.c:400
-#, c-format
-msgid "Error saving %s: %s"
-msgstr "Feil under lagring av %s: %s"
-
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:437
+#: addressbook/gui/widgets/eab-gui-util.c:365
 msgid "card.vcf"
 msgstr "kort.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:571
+#: addressbook/gui/widgets/eab-gui-util.c:499
 msgid "list"
 msgstr "liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:706
+#: addressbook/gui/widgets/eab-gui-util.c:634
 msgid "Move contact to"
 msgstr "Flytt kontakt til"
 
-#: addressbook/gui/widgets/eab-gui-util.c:708
+#: addressbook/gui/widgets/eab-gui-util.c:636
 msgid "Copy contact to"
 msgstr "Kopier kontakt til"
 
-#: addressbook/gui/widgets/eab-gui-util.c:711
+#: addressbook/gui/widgets/eab-gui-util.c:639
 msgid "Move contacts to"
 msgstr "Flytt kontakter til"
 
-#: addressbook/gui/widgets/eab-gui-util.c:713
+#: addressbook/gui/widgets/eab-gui-util.c:641
 msgid "Copy contacts to"
 msgstr "Kopier kontakter til"
 
-#: addressbook/gui/widgets/eab-gui-util.c:716
+#: addressbook/gui/widgets/eab-gui-util.c:644
 msgid "Select target addressbook."
 msgstr "Velg mål-adressebok"
 
-#: addressbook/gui/widgets/eab-gui-util.c:939
+#: addressbook/gui/widgets/eab-gui-util.c:867
 msgid "Multiple VCards"
 msgstr "Flere VCard"
 
-#: addressbook/gui/widgets/eab-gui-util.c:942
+#: addressbook/gui/widgets/eab-gui-util.c:870
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard for %s"
@@ -2803,7 +2686,7 @@ msgstr[1] "%d kontakter"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:229
+#: addressbook/gui/widgets/e-addressbook-view.c:231
 #: addressbook/gui/widgets/e-minicard-view.c:467
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
@@ -2821,142 +2704,130 @@ msgstr "Modell"
 msgid "Error modifying card"
 msgstr "Feil ved endring av kort"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:163
 msgid "Name begins with"
 msgstr "Navn begynner med"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:164
 msgid "Email begins with"
 msgstr "E-post begynner med"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:58
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Kategorien er"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-#: calendar/gui/cal-search-bar.c:51
+#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Et felt inneholder"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+#: addressbook/gui/widgets/e-addressbook-view.c:172
 msgid "Advanced..."
 msgstr "Avansert..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:236
+#: addressbook/gui/widgets/e-addressbook-view.c:238
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:250
+#: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Type"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:506
+#: addressbook/gui/widgets/e-addressbook-view.c:508
 msgid "Address Book"
 msgstr "Adressebok"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
 #: addressbook/gui/widgets/e-addressbook-view.c:2080
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard..."
 msgstr "Lagre som VCard..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 msgid "New Contact..."
 msgstr "Ny kontakt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "New Contact List..."
 msgstr "Ny kontaktliste..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Go to Folder..."
 msgstr "Gå til mappe..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Import..."
 msgstr "Importer..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1066
 msgid "Search for Contacts..."
 msgstr "Søk etter kontakter..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 msgid "Address Book Sources..."
 msgstr "Adressebok-kilder..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1069
 msgid "Pilot Settings..."
 msgstr "Innstillinger for pilot..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Videresend kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
 msgid "Send Message to Contact"
 msgstr "Send melding til kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Skriv ut"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
+#: addressbook/gui/widgets/e-addressbook-view.c:1077
 msgid "Print Envelope"
 msgstr "Skriv ut konvolutt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
+#: addressbook/gui/widgets/e-addressbook-view.c:1081
 msgid "Copy to Address Book..."
 msgstr "Kopier til adressebok..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1080
+#: addressbook/gui/widgets/e-addressbook-view.c:1082
 msgid "Move to Address Book..."
 msgstr "Flytt til adressebok..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Klipp ut"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopier"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1087
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Lim inn"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:1092
+#: calendar/gui/e-calendar-view.c:1280
 msgid "Current View"
 msgstr "Aktiv visning"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1309
-#, c-format
-msgid ""
-"The addressbook backend for\n"
-"%s\n"
-"has crashed. You will have to restart Evolution in order to use it again"
-msgstr ""
-"Adressebokmotoren for\n"
-"%s\n"
-"har krasjet. Du vil måtte starte Evolution på nytt for å kunne bruke den "
-"igjen"
-
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1667
-#: calendar/gui/cal-search-bar.c:365
+#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Enhver kategori"
 
@@ -3062,7 +2933,7 @@ msgstr "Radio"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:257
+#: calendar/gui/e-meeting-list-view.c:234
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Rolle"
@@ -3170,17 +3041,17 @@ msgstr "Kortvisning"
 msgid "GTK Tree View"
 msgstr "GTK-trevisning"
 
-#: addressbook/gui/widgets/test-reflow.c:119
+#: addressbook/gui/widgets/test-reflow.c:106
 msgid "Reflow Test"
 msgstr ""
 
-#: addressbook/gui/widgets/test-reflow.c:120
+#: addressbook/gui/widgets/test-reflow.c:107
 #: addressbook/printing/test-contact-print-style-editor.c:54
 #: addressbook/printing/test-print.c:53
 msgid "Copyright (C) 2000, Ximian, Inc."
 msgstr "Opphavsrett © 2000, Ximian, Inc."
 
-#: addressbook/gui/widgets/test-reflow.c:122
+#: addressbook/gui/widgets/test-reflow.c:109
 msgid "This should test the reflow canvas item"
 msgstr ""
 
@@ -3456,15 +3327,21 @@ msgstr ""
 msgid "Impossible internal error."
 msgstr "Umulig intern feil."
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:629
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
 msgid "Can not open file"
 msgstr "Kan ikke åpne fil"
 
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-msgid "Can not load URI"
-msgstr "Kan ikke laste URI"
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "Kunne ikke laste adressebok"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Kunne ikke åpne adresseboken"
 
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
@@ -3482,7 +3359,7 @@ msgstr "Ingen filnavn spesifisert."
 msgid "Unnamed List"
 msgstr "Liste uten navn"
 
-#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Oppgi passord"
@@ -3757,10 +3634,10 @@ msgid "Whether to show week numbers in date navigator"
 msgstr "Om ukenummer skal vises i minikalenderen"
 
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:88
-#: calendar/gui/gnome-cal.c:1703
-#: camel/providers/groupwise/camel-gw-listener.c:304
-#: camel/providers/groupwise/camel-gw-listener.c:327
+#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/gnome-cal.c:1705
+#: camel/providers/groupwise/camel-gw-listener.c:311
+#: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
 msgstr "Kalender"
 
@@ -3779,7 +3656,7 @@ msgstr "Slett hendelser eldre enn"
 
 #: calendar/gui/calendar-commands.c:363
 #: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:19 filter/filter.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
 msgid "days"
 msgstr "dager"
 
@@ -3789,10 +3666,6 @@ msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. %d = day of month, %b = abbreviated month name.
-#. You can change the order but don't change the
-#. specifiers or add anything.
 #: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
 #: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
 #: calendar/gui/e-week-view-main-item.c:329
@@ -3929,23 +3802,23 @@ msgstr "Ukevisning"
 msgid "Month View"
 msgstr "Månedsvisning"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Sammendrag inneholder"
 
-#: calendar/gui/cal-search-bar.c:53
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Beskrivelse inneholder"
 
-#: calendar/gui/cal-search-bar.c:55
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Kommentar inneholder"
 
-#: calendar/gui/cal-search-bar.c:57
+#: calendar/gui/cal-search-bar.c:53
 msgid "Location contains"
 msgstr "Lokasjon inneholder"
 
-#: calendar/gui/cal-search-bar.c:369 camel/camel-vee-store.c:329
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
 msgid "Unmatched"
 msgstr "Ingen treff"
 
@@ -3966,23 +3839,23 @@ msgstr "Tilgang nektet ved åpning av kalender"
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/dialogs/alarm-options.c:466
+#: calendar/gui/dialogs/alarm-options.c:467
 msgid "Audio Alarm Options"
 msgstr "Alternativer for lyd-alarmer"
 
-#: calendar/gui/dialogs/alarm-options.c:475
+#: calendar/gui/dialogs/alarm-options.c:476
 msgid "Message Alarm Options"
 msgstr "Alternativer for meldingsalarmer"
 
-#: calendar/gui/dialogs/alarm-options.c:484
+#: calendar/gui/dialogs/alarm-options.c:485
 msgid "Email Alarm Options"
 msgstr "Alternativer for e-post-alarm"
 
-#: calendar/gui/dialogs/alarm-options.c:493
+#: calendar/gui/dialogs/alarm-options.c:494
 msgid "Program Alarm Options"
 msgstr "Alternativer for program-alarmer"
 
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:510
 msgid "Unknown Alarm Options"
 msgstr "Alternativer for ukjente alarmer"
 
@@ -4018,7 +3891,7 @@ msgstr "Send til:"
 msgid "With these arguments:"
 msgstr "Med disse argumentene:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
 msgid "dialog1"
 msgstr "dialog1"
 
@@ -4027,7 +3900,7 @@ msgid "extra times every"
 msgstr "ekstra ganger hver"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:20 filter/filter.glade.h:16
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr "timer"
 
@@ -4073,7 +3946,7 @@ msgstr "Send en melding"
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:921 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Sammendrag:"
 
@@ -4103,7 +3976,6 @@ msgid "hour(s)"
 msgstr "time(r)"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:21
 msgid "minute(s)"
 msgstr "minutt(er)"
 
@@ -4111,26 +3983,26 @@ msgstr "minutt(er)"
 msgid "start of appointment"
 msgstr "start på avtale"
 
-#: calendar/gui/dialogs/calendar-setup.c:170
+#: calendar/gui/dialogs/calendar-setup.c:172
 msgid "You must specify a location to get the calendar from."
 msgstr "Du må oppgi en lokasjon å hente kalenderen fra."
 
-#: calendar/gui/dialogs/calendar-setup.c:178
+#: calendar/gui/dialogs/calendar-setup.c:180
 #, c-format
 msgid "The source location '%s' is not well-formed."
 msgstr "Kildelokasjon «%s» er ikke riktig utformet."
 
-#: calendar/gui/dialogs/calendar-setup.c:193
+#: calendar/gui/dialogs/calendar-setup.c:195
 #, c-format
 msgid "The source location '%s' is not a webcal source."
 msgstr "Kildelokasjon «%s» er ikke en webcal-kilde."
 
-#: calendar/gui/dialogs/calendar-setup.c:265
+#: calendar/gui/dialogs/calendar-setup.c:275
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr "Kilde med navn «%s» eksisterer allerede i valgt gruppe"
 
-#: calendar/gui/dialogs/calendar-setup.c:278
+#: calendar/gui/dialogs/calendar-setup.c:288
 #, c-format
 msgid ""
 "The group '%s' is remote. You must specify a location to get the calendar "
@@ -4150,51 +4022,31 @@ msgstr "Legg til oppgavegruppe"
 msgid "C_olor:"
 msgstr "F_arge:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "Calendar Properties"
-msgstr "Kalenderegenskaper"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:110
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
 msgid "Pick a color"
 msgstr "Velg en farge"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:8
-msgid "Remote"
-msgstr "Ekstern"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "Task List Properties"
-msgstr "Egenskaper for oppgaveliste"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
 msgid "_Add Calendar"
 msgstr "_Legg til kalender"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
 msgid "_Add Group"
 msgstr "_Legg til gruppe"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-msgid "_Refresh Interval:"
-msgstr "Oppdate_ringsintervall:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
 msgid "_Refresh:"
 msgstr "_Oppdater:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-msgid "_Source URL:"
-msgstr "_Kilde-URL:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "_Type:"
 msgstr "_Type:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
 msgid "_URL:"
 msgstr "_URL:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
 msgid "weeks"
 msgstr "uker"
 
@@ -4306,7 +4158,7 @@ msgstr "Publisering av ledig/opptatt-tid"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:557
+#: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Fredag"
 
@@ -4320,7 +4172,7 @@ msgstr "Minutter"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:553
+#: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Mandag"
 
@@ -4330,7 +4182,7 @@ msgstr "S_ø."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Lørdag"
 
@@ -4344,7 +4196,7 @@ msgstr "Vis uke_nummer i datonavigasjon"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:552
+#: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Søndag"
 
@@ -4358,7 +4210,7 @@ msgstr "T_o."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:556
+#: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Torsdag"
 
@@ -4372,7 +4224,7 @@ msgstr "Tidformat:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:554
+#: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Tirsdag"
 
@@ -4382,7 +4234,7 @@ msgstr "Uk_en starter:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:555
+#: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Onsdag"
 
@@ -4464,83 +4316,48 @@ msgstr "_On."
 msgid "before every appointment"
 msgstr "før hver avtale"
 
-#: calendar/gui/dialogs/cancel-comp.c:57
-msgid ""
-"The event being deleted is a meeting, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"Hendelsen som slettes er et møte. Ønsker du å sende melding om kansellering?"
-
-#: calendar/gui/dialogs/cancel-comp.c:60
-msgid "Are you sure you want to cancel and delete this meeting?"
-msgstr "Er du sikker på at du vil avlyse og slette dette møtet?"
-
-#: calendar/gui/dialogs/cancel-comp.c:66
-msgid ""
-"The task being deleted is assigned, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"Oppgaven som slettes er tildelt. Ønsker du å sende en melding om "
-"kansellering?"
-
-#: calendar/gui/dialogs/cancel-comp.c:69
-msgid "Are you sure you want to cancel and delete this task?"
-msgstr "Er du sikker på at du vil avlyse og slette denne oppgaven?"
-
-#: calendar/gui/dialogs/cancel-comp.c:75
-msgid ""
-"The journal entry being deleted is published, would you like to send a "
-"cancellation notice?"
-msgstr ""
-"Journaloppføringen som slettes er publisert. Vil du sende en melding om "
-"avlysing?"
-
-#: calendar/gui/dialogs/cancel-comp.c:78
-msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr "Er du sikker på at du vil avlyse og slette denne journaloppføringen?"
-
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Denne hendelsen er slettet."
 
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "Denne oppgaven er slettet."
 
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:68
 msgid "This journal entry has been deleted."
 msgstr "Denne journaloppføringen er slettet."
 
-#: calendar/gui/dialogs/changed-comp.c:75
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  Du har gjort endringer. Forkast disse endringene og lukk redigering?"
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Du har ikke gjort endringer. Lukk redigering?"
 
-#: calendar/gui/dialogs/changed-comp.c:82
+#: calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "Denne hendelsen er endret."
 
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "Denne oppgaven er endret."
 
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:92
 msgid "This journal entry has been changed."
 msgstr "Denne journaloppføringen er endret."
 
-#: calendar/gui/dialogs/changed-comp.c:99
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Du har gjort endringer. Forkast disse endringene og oppdater redigering?"
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Du har ikke gjort endringer. Oppdater redigering?"
@@ -4578,7 +4395,7 @@ msgid "No summary"
 msgstr "Ingen sammendrag"
 
 #: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
 #: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Lagre som..."
@@ -4632,99 +4449,51 @@ msgstr "Kunne ikke åpne destinasjon"
 msgid "Destination is read only"
 msgstr "Destinasjonen er skrivebeskyttet"
 
-#: calendar/gui/dialogs/delete-comp.c:95
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "Er du sikker på at du vil slette avtalen «%s»?"
-
-#: calendar/gui/dialogs/delete-comp.c:98
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "Er du sikker på at du vil slette denne avtalen uten tittel?"
-
-#: calendar/gui/dialogs/delete-comp.c:104
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "Er du sikker på at du vil slette oppgaven «%s»?"
-
-#: calendar/gui/dialogs/delete-comp.c:107
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "Er du sikker på at du vil slette denne oppgaven uten tittel?"
-
-#: calendar/gui/dialogs/delete-comp.c:113
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "Er du sikker på at du vil slette journaloppføringen «%s»?"
-
-#: calendar/gui/dialogs/delete-comp.c:116
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "Er du sikker på at du vil slette denne journaloppføringen uten tittel?"
-
-#: calendar/gui/dialogs/delete-comp.c:131
-#, c-format
-msgid "Are you sure you want to delete %d appointment?"
-msgid_plural "Are you sure you want to delete %d appointments?"
-msgstr[0] "Er du sikker på at du vil slette %d avtale?"
-msgstr[1] "Er du sikker på at du vil slette %d avtaler?"
-
-#: calendar/gui/dialogs/delete-comp.c:138
-#, c-format
-msgid "Are you sure you want to delete %d task?"
-msgid_plural "Are you sure you want to delete %d tasks?"
-msgstr[0] "Er du sikker på at du vil slette %d oppgave?"
-msgstr[1] "Er du sikker på at du vil slette %d oppgaver?"
-
-#: calendar/gui/dialogs/delete-comp.c:145
-#, c-format
-msgid "Are you sure you want to delete %d journal entry?"
-msgid_plural "Are you sure you want to delete %d journal entries?"
-msgstr[0] "Er du sikker på at du vil slette %d journaloppføring?"
-msgstr[1] "Er du sikker på at du vil slette %d journaloppføringer?"
-
-#: calendar/gui/dialogs/delete-error.c:52
+#: calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "Hendelsen kunne ikke slettes pga en CORBA-feil"
 
-#: calendar/gui/dialogs/delete-error.c:55
+#: calendar/gui/dialogs/delete-error.c:57
 msgid "The task could not be deleted due to a corba error"
 msgstr "Oppgaven kunne ikke slettes pga en CORBA-feil"
 
-#: calendar/gui/dialogs/delete-error.c:58
+#: calendar/gui/dialogs/delete-error.c:60
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr "Journaloppføringen kunne ikke slette pga en CORBA-feil"
 
-#: calendar/gui/dialogs/delete-error.c:61
+#: calendar/gui/dialogs/delete-error.c:63
 msgid "The item could not be deleted due to a corba error"
 msgstr "Oppføringen kunne ikke slettes pga en CORBA-feil"
 
-#: calendar/gui/dialogs/delete-error.c:68
+#: calendar/gui/dialogs/delete-error.c:70
 msgid "The event could not be deleted because permission was denied"
 msgstr "Hendelsen kunne ikke slettes fordi tilgang ble nektet"
 
-#: calendar/gui/dialogs/delete-error.c:71
+#: calendar/gui/dialogs/delete-error.c:73
 msgid "The task could not be deleted because permission was denied"
 msgstr "Oppgaven kunne ikke slettes fordi tilgang nektes"
 
-#: calendar/gui/dialogs/delete-error.c:74
+#: calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr "Journaloppføringen kunne ikke slettes fordi tilgang ble nektet"
 
-#: calendar/gui/dialogs/delete-error.c:77
+#: calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
 msgstr "Oppføringen kunne ikke slettes fordi tilgang ble nektet"
 
-#: calendar/gui/dialogs/delete-error.c:84
+#: calendar/gui/dialogs/delete-error.c:86
 msgid "The event could not be deleted due to an error"
 msgstr "Hendelsen kunne ikke slettes pga en feil"
 
-#: calendar/gui/dialogs/delete-error.c:87
+#: calendar/gui/dialogs/delete-error.c:89
 msgid "The task could not be deleted due to an error"
 msgstr "Oppgaven kunne ikke slettes pga en feil"
 
-#: calendar/gui/dialogs/delete-error.c:90
+#: calendar/gui/dialogs/delete-error.c:92
 msgid "The journal entry could not be deleted due to an error"
 msgstr "Journaloppføringen kunne ikke slette pga en feil"
 
-#: calendar/gui/dialogs/delete-error.c:93
+#: calendar/gui/dialogs/delete-error.c:95
 msgid "The item could not be deleted due to an error"
 msgstr "Oppføringen kunne ikke slettes pga en feil"
 
@@ -4856,17 +4625,12 @@ msgid "_Start time:"
 msgstr "_Start-tid:"
 
 #. an empty string is the same as 'None'
-#. add a "None" option to the stores menu
-#. Put the "None" and "UTC" entries at the top of the combo's list.
-#. When "None" is selected we want the field to be cleared.
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
 #: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:3
+#: calendar/gui/dialogs/meeting-page.glade.h:4
 #: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
 #: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1559
-#: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:103
+#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
+#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
@@ -4892,8 +4656,8 @@ msgstr "_Deleger til..."
 #. FIXME: need to disable for undeletable folders
 #: calendar/gui/dialogs/meeting-page.c:655
 #: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1310 calendar/gui/e-calendar-view.c:1342
-#: mail/em-folder-tree.c:2562 mail/em-folder-view.c:919
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
+#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -4901,7 +4665,7 @@ msgid "_Delete"
 msgstr "_Slett"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:241
+#: calendar/gui/e-meeting-list-view.c:218
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Deltaker"
@@ -4937,16 +4701,15 @@ msgid "Member"
 msgstr "Medlem"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1048 calendar/gui/e-meeting-list-view.c:264
+#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:271
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
-#: mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-list-view.c:248
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
 
@@ -4954,20 +4717,20 @@ msgstr "Status"
 msgid "Add A_ttendee"
 msgstr "Legg til del_taker"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "Add attendees from addressbook."
+msgstr "Legg til avsender i adresse_bok"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Organisator:"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
+#: calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "_Change Organizer"
 msgstr "En_dre organisator"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-#: calendar/gui/e-meeting-time-sel.c:419
-msgid "_Invite Others..."
-msgstr "_Inviter andre..."
-
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
 msgstr "<b>Kalenderalternativer</b>"
@@ -5115,7 +4878,7 @@ msgid "_No recurrence"
 msgstr "I_ngen gjeninntreffelse"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:450
+#: composer/e-msg-composer-attachment-bar.c:453
 msgid "_Remove"
 msgstr "Fje_rn"
 
@@ -5147,52 +4910,18 @@ msgstr "uke(r)"
 msgid "year(s)"
 msgstr "år"
 
-#: calendar/gui/dialogs/save-comp.c:53
-msgid ""
-"This event has been changed, but has not been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Denne hendelsen er endret, men har ikke blitt lagret..\n"
-"\n"
-"Vil du lagre endringene?"
-
-#: calendar/gui/dialogs/save-comp.c:57
-msgid "_Discard Changes"
-msgstr "_Forkast endringer"
-
-#: calendar/gui/dialogs/save-comp.c:62
-msgid "Save Event"
-msgstr "Lagre hendelse"
-
-#: calendar/gui/dialogs/select-source-dialog.c:65
+#: calendar/gui/dialogs/select-source-dialog.c:69
 msgid "Select destination"
 msgstr "Velg mål"
 
-#: calendar/gui/dialogs/select-source-dialog.c:86
+#: calendar/gui/dialogs/select-source-dialog.c:90
 msgid "_Destination"
 msgstr "_Mål"
 
-#: calendar/gui/dialogs/select-source-dialog.c:88
+#: calendar/gui/dialogs/select-source-dialog.c:92
 msgid "Task List"
 msgstr "Oppgaveliste"
 
-#: calendar/gui/dialogs/send-comp.c:57
-msgid "The meeting information has been created. Send it?"
-msgstr "Møteinformasjonen er opprettet. Send den?"
-
-#: calendar/gui/dialogs/send-comp.c:60
-msgid "The meeting information has changed. Send an updated version?"
-msgstr "Møteinformasjonen er endret. Send en oppdatert versjon?"
-
-#: calendar/gui/dialogs/send-comp.c:67
-msgid "The task assignment information has been created. Send it?"
-msgstr "Informasjon om oppgavetildeling er opprettet. Send den?"
-
-#: calendar/gui/dialogs/send-comp.c:71
-msgid "The task information has changed. Send an updated version?"
-msgstr "Oppgaveinformasjonen er endret. Send en oppdatert versjon?"
-
 #: calendar/gui/dialogs/task-details-page.c:406
 msgid "Completed date is wrong"
 msgstr "Dato for ferdigstilling er feil"
@@ -5290,7 +5019,7 @@ msgstr "Ko_nfidensiell"
 
 #: calendar/gui/dialogs/task-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:976 calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Beskrivelse:"
@@ -5454,7 +5183,7 @@ msgstr "Ferdig-dato:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:944
+#: calendar/gui/e-itip-control.c:943
 msgid "Status:"
 msgstr "Status:"
 
@@ -5530,7 +5259,7 @@ msgid "Free"
 msgstr "Ledig"
 
 #: calendar/gui/e-calendar-table.c:427 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:401
+#: calendar/gui/e-meeting-time-sel.c:399
 msgid "Busy"
 msgstr "Opptatt"
 
@@ -5538,12 +5267,12 @@ msgstr "Opptatt"
 msgid "Deleting selected objects"
 msgstr "Sletter valgte objekter"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
 msgid "Updating objects"
 msgstr "Oppdaterer objekter"
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1370
+#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
 #: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Åpne"
@@ -5553,15 +5282,15 @@ msgid "Open _Web Page"
 msgstr "_Åpne nettside"
 
 #: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1291 calendar/gui/e-calendar-view.c:1376
-#: mail/em-folder-view.c:896 mail/em-popup.c:692 mail/em-popup.c:808
+#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
+#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "Lagre _som..."
 
 #: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1292
-#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
+#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
@@ -5569,15 +5298,15 @@ msgid "_Print..."
 msgstr "S_kriv ut..."
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Kli_pp ut"
 
 #: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1338
-#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2555
+#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
+#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
 #: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
@@ -5585,8 +5314,8 @@ msgid "_Copy"
 msgstr "_Kopier"
 
 #: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1273 calendar/gui/e-calendar-view.c:1299
-#: calendar/gui/e-calendar-view.c:1372 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
+#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
@@ -5652,67 +5381,67 @@ msgstr "Sammendrag"
 msgid "Task sort"
 msgstr "Oppgavesortering"
 
-#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
 msgid "New _Appointment..."
 msgstr "Ny _avtale..."
 
-#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
+#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
 msgid "New All Day _Event"
 msgstr "Ny avtale som varer h_ele dagen"
 
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
+#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
 msgid "New Meeting"
 msgstr "Nytt møte"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
 msgid "New Task"
 msgstr "Ny oppgave"
 
-#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "Velg i _dag"
 
-#: calendar/gui/e-calendar-view.c:1280
+#: calendar/gui/e-calendar-view.c:1283
 msgid "_Select Date..."
 msgstr "_Velg dato..."
 
-#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publiser ledig/opptatt-informasjon"
 
-#: calendar/gui/e-calendar-view.c:1303
+#: calendar/gui/e-calendar-view.c:1306
 msgid "Cop_y to Calendar..."
 msgstr "Kop_ier til kalender..."
 
-#: calendar/gui/e-calendar-view.c:1304
+#: calendar/gui/e-calendar-view.c:1307
 msgid "Mo_ve to Calendar..."
 msgstr "Fl_ytt til kalender..."
 
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1308
 msgid "_Schedule Meeting..."
 msgstr "_Sett opp møte..."
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1309
 msgid "_Forward as iCalendar..."
 msgstr "_Videresend som iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
 msgid "Delete this _Occurrence"
 msgstr "Slett denne _hendelsen"
 
-#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
 msgid "Delete _All Occurrences"
 msgstr "Slett _alle hendelser"
 
-#: calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1349
 msgid "Go to _Today"
 msgstr "Gå _til i dag"
 
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1351
 msgid "_Go to Date..."
 msgstr "_Gå til dato..."
 
-#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "Inn_stillinger..."
 
@@ -5726,9 +5455,9 @@ msgstr "Startdato"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:961 calendar/gui/e-itip-control.c:1163
-#: calendar/gui/e-meeting-list-view.c:145
-#: calendar/gui/e-meeting-list-view.c:159 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
 #: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
 #: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
 #: camel/camel-tcp-stream-openssl.c:631
@@ -5754,13 +5483,13 @@ msgid "Assigned"
 msgstr "Tildelt"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr "Ja"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:170 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "Nei"
 
@@ -5772,7 +5501,7 @@ msgstr "N"
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
 msgid "E"
 msgstr "Ø"
 
@@ -5791,20 +5520,12 @@ msgstr ""
 "45.436845,125.862501"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d.%m.%Y %H.%M.%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format.
 #: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
@@ -5835,10 +5556,6 @@ msgstr "pm"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#. strftime format %A = full weekday name, %d = day of
-#. month, %B = full month name. You can change the
-#. order but don't change the specifiers or add
-#. anything.
 #: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
@@ -5846,9 +5563,6 @@ msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#. strftime format %d = day of month, %b = abbreviated
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
 #: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
@@ -5859,102 +5573,102 @@ msgstr "%d %b"
 msgid "%02i minute divisions"
 msgstr "%02i minutters oppdeling"
 
-#: calendar/gui/e-itip-control.c:586
+#: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
 msgstr "Ja (enkel gjeninntreffelse)"
 
-#: calendar/gui/e-itip-control.c:597
+#: calendar/gui/e-itip-control.c:596
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Hver dag"
 msgstr[1] "Hver %d dag"
 
-#: calendar/gui/e-itip-control.c:602
+#: calendar/gui/e-itip-control.c:601
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Hver uke"
 msgstr[1] "Hver %d uker"
 
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:603
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "Hver uke på "
 msgstr[1] "Hver %d uker på "
 
-#: calendar/gui/e-itip-control.c:612
+#: calendar/gui/e-itip-control.c:611
 msgid " and "
 msgstr " og "
 
-#: calendar/gui/e-itip-control.c:619
+#: calendar/gui/e-itip-control.c:618
 #, c-format
 msgid "The %s day of "
 msgstr "Den %s dagen i "
 
-#: calendar/gui/e-itip-control.c:632
+#: calendar/gui/e-itip-control.c:631
 #, c-format
 msgid "The %s %s of "
 msgstr "Den %s %s i "
 
-#: calendar/gui/e-itip-control.c:639
+#: calendar/gui/e-itip-control.c:638
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "hver måned"
 msgstr[1] "hver %d måneder"
 
-#: calendar/gui/e-itip-control.c:643
+#: calendar/gui/e-itip-control.c:642
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Hvert år"
 msgstr[1] "Hvert %d år"
 
-#: calendar/gui/e-itip-control.c:654
+#: calendar/gui/e-itip-control.c:653
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] " totalt %d gang"
 msgstr[1] " totalt %d ganger"
 
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:662
 msgid ", ending on "
 msgstr ", slutter på "
 
-#: calendar/gui/e-itip-control.c:687
+#: calendar/gui/e-itip-control.c:686
 msgid "<b>Starts:</b> "
 msgstr "<b>Starter:</b> "
 
-#: calendar/gui/e-itip-control.c:697
+#: calendar/gui/e-itip-control.c:696
 msgid "<b>Ends:</b> "
 msgstr "<b>Slutter:</b> "
 
-#: calendar/gui/e-itip-control.c:717
+#: calendar/gui/e-itip-control.c:716
 msgid "<b>Completed:</b> "
 msgstr "<b>Fullført:</b> "
 
-#: calendar/gui/e-itip-control.c:727
+#: calendar/gui/e-itip-control.c:726
 msgid "<b>Due:</b> "
 msgstr "<b>Ferdig:</b> "
 
-#: calendar/gui/e-itip-control.c:765 calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
 msgid "iCalendar Information"
 msgstr "iCalendar-informasjon"
 
 #. Title
-#: calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:781
 msgid "iCalendar Error"
 msgstr "iCalender-feil"
 
-#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
-#: calendar/gui/e-itip-control.c:880 calendar/gui/e-itip-control.c:897
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
 msgid "An unknown person"
 msgstr "En ukjent person"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:904
+#: calendar/gui/e-itip-control.c:903
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5962,302 +5676,306 @@ msgstr ""
 "<br>Vennligst sjekk følgende informasjon og velg så en handling fra menyen "
 "under."
 
-#: calendar/gui/e-itip-control.c:919
+#: calendar/gui/e-itip-control.c:918
 msgid "<i>None</i>"
 msgstr "<i>Ingen</i>"
 
-#: calendar/gui/e-itip-control.c:949 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:929
+msgid "Location:"
+msgstr "Plassering:"
+
+#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Godtatt"
 
-#: calendar/gui/e-itip-control.c:953 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Akteptert tentativt"
 
-#: calendar/gui/e-itip-control.c:957 calendar/gui/e-meeting-list-view.c:182
+#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Avslått"
 
-#: calendar/gui/e-itip-control.c:1016 calendar/gui/e-itip-control.c:1044
-#: calendar/gui/e-itip-control.c:1070 calendar/gui/e-itip-control.c:1083
-#: calendar/gui/e-itip-control.c:1096 calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
 msgid "Choose an action:"
 msgstr "Velg en handling:"
 
-#: calendar/gui/e-itip-control.c:1017
+#: calendar/gui/e-itip-control.c:1016
 msgid "Update"
 msgstr "Oppdater"
 
-#: calendar/gui/e-itip-control.c:1018 calendar/gui/e-itip-control.c:1049
-#: calendar/gui/e-itip-control.c:1072 calendar/gui/e-itip-control.c:1085
-#: calendar/gui/e-itip-control.c:1098 calendar/gui/e-itip-control.c:1111
-#: shell/e-shell.c:1098 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
+#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1044
 msgid "Accept"
 msgstr "Godta"
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1045
 msgid "Tentatively accept"
 msgstr "Godta tentativt"
 
-#: calendar/gui/e-itip-control.c:1047
+#: calendar/gui/e-itip-control.c:1046
 msgid "Decline"
 msgstr "Avslå"
 
-#: calendar/gui/e-itip-control.c:1071
+#: calendar/gui/e-itip-control.c:1070
 msgid "Send Free/Busy Information"
 msgstr "Send ledig/opptatt-informasjon"
 
-#: calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1083
 msgid "Update respondent status"
 msgstr "Oppdater status for respondent"
 
-#: calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1096
 msgid "Send Latest Information"
 msgstr "Send siste informasjon"
 
-#: calendar/gui/e-itip-control.c:1110 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1185
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> har publisert møteinformasjon."
 
-#: calendar/gui/e-itip-control.c:1187
+#: calendar/gui/e-itip-control.c:1186
 msgid "Meeting Information"
 msgstr "Møteinformasjon"
 
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1191
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> forespør at %s er tilstede i et møte."
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1193
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> forespør din tilstedeværelse i et møte."
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1194
 msgid "Meeting Proposal"
 msgstr "Møteforslag"
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> ønsker å legge til informasjon i et eksisterende møte."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Update"
 msgstr "Møteoppdatering"
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1203
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> ønsker å motta seneste møteinformasjon."
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1204
 msgid "Meeting Update Request"
 msgstr "Forespørsel om møteoppdatering"
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> har svart på en møteforespørsel."
 
-#: calendar/gui/e-itip-control.c:1213
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Reply"
 msgstr "Møtesvar"
 
-#: calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1219
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> har avlyst et møte."
 
-#: calendar/gui/e-itip-control.c:1221
+#: calendar/gui/e-itip-control.c:1220
 msgid "Meeting Cancellation"
 msgstr "Møteavlysing"
 
-#: calendar/gui/e-itip-control.c:1228 calendar/gui/e-itip-control.c:1296
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1330
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> har sendt en uforståelig melding."
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1228
 msgid "Bad Meeting Message"
 msgstr "Ugyldig møtemelding"
 
-#: calendar/gui/e-itip-control.c:1254
+#: calendar/gui/e-itip-control.c:1253
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> har publisert informasjon om en oppgave."
 
-#: calendar/gui/e-itip-control.c:1255
+#: calendar/gui/e-itip-control.c:1254
 msgid "Task Information"
 msgstr "Oppgaveinformasjon"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1259
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> forespør at %s utfører en oppgave."
 
-#: calendar/gui/e-itip-control.c:1262
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> forespør at du utfører en oppgave."
 
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1262
 msgid "Task Proposal"
 msgstr "Forespørsel om oppgave"
 
-#: calendar/gui/e-itip-control.c:1267
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> ønsker å legge til informasjon i en eksisterende oppgave."
 
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Update"
 msgstr "Oppgaveoppdatering"
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1271
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> ønsker å motta den seneste informasjon om oppgaven."
 
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1272
 msgid "Task Update Request"
 msgstr "Forespørsel om oppgaveoppdatering"
 
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> har svart på en oppgavetildeling."
 
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Reply"
 msgstr "Svar på oppgave"
 
-#: calendar/gui/e-itip-control.c:1288
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> har avlyst en oppgave."
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1288
 msgid "Task Cancellation"
 msgstr "Avlysning av oppgave"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1296
 msgid "Bad Task Message"
 msgstr "Ugyldig oppgavemelding"
 
-#: calendar/gui/e-itip-control.c:1316
+#: calendar/gui/e-itip-control.c:1315
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> har publisert ledig/opptatt-informasjon."
 
-#: calendar/gui/e-itip-control.c:1317
+#: calendar/gui/e-itip-control.c:1316
 msgid "Free/Busy Information"
 msgstr "Ledig/opptatt-informasjon"
 
-#: calendar/gui/e-itip-control.c:1321
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> forespør din ledig/opptatt-informasjon."
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1321
 msgid "Free/Busy Request"
 msgstr "Ledig/opptatt forespørsel"
 
-#: calendar/gui/e-itip-control.c:1326
+#: calendar/gui/e-itip-control.c:1325
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> har svart på en forespørsel etter ledig/opptatt-informasjon."
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1326
 msgid "Free/Busy Reply"
 msgstr "Ledig/opptatt svar"
 
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1331
 msgid "Bad Free/Busy Message"
 msgstr "Ugyldig ledig/opptatt-melding"
 
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1406
 msgid "The message does not appear to be properly formed"
 msgstr "Meldingen ser ikke ut til å være riktig utformet"
 
-#: calendar/gui/e-itip-control.c:1466
+#: calendar/gui/e-itip-control.c:1465
 msgid "The message contains only unsupported requests."
 msgstr "Denne meldingen inneholder forespørsler som ikke er støttet."
 
-#: calendar/gui/e-itip-control.c:1497
+#: calendar/gui/e-itip-control.c:1496
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Vedlegget inneholder ikke et gyldig kalender-vedlegg"
 
-#: calendar/gui/e-itip-control.c:1529
+#: calendar/gui/e-itip-control.c:1528
 msgid "The attachment has no viewable calendar items"
 msgstr "Vedlegget inneholder ingen visbare kalender-vedlegg"
 
-#: calendar/gui/e-itip-control.c:1763
+#: calendar/gui/e-itip-control.c:1762
 msgid "Update complete\n"
 msgstr "Oppdatering fullført\n"
 
-#: calendar/gui/e-itip-control.c:1793 calendar/gui/e-itip-control.c:1865
+#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Deltakerstatus kan ikke oppdateres fordi oppføringen ikke eksisterer lenger"
 
-#: calendar/gui/e-itip-control.c:1809 calendar/gui/e-itip-control.c:1847
+#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objektet er ugyldig og kan ikke oppdateres\n"
 
-#: calendar/gui/e-itip-control.c:1819
+#: calendar/gui/e-itip-control.c:1818
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Dette svaret er ikke fra en aktiv deltaker. Legg til som deltaker?"
 
-#: calendar/gui/e-itip-control.c:1831
+#: calendar/gui/e-itip-control.c:1830
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Deltakerstatus kunne ikke oppdateres pga ugyldig status!\n"
 
-#: calendar/gui/e-itip-control.c:1850
+#: calendar/gui/e-itip-control.c:1849
 msgid "There was an error on the CORBA system\n"
 msgstr "Det oppsto en feil i CORBA-systemet\n"
 
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1852
 msgid "Object could not be found\n"
 msgstr "Objektet kunne ikke finnes\n"
 
-#: calendar/gui/e-itip-control.c:1856
+#: calendar/gui/e-itip-control.c:1855
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Du har ikke rettigheter til å oppdatere kalenderen\n"
 
-#: calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1858
 msgid "Attendee status updated\n"
 msgstr "Deltakerstatus oppdatert\n"
 
-#: calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1861
 msgid "Attendee status could not be updated!\n"
 msgstr "Deltakerstatus kunne ikke oppdateres!\n"
 
-#: calendar/gui/e-itip-control.c:1893
+#: calendar/gui/e-itip-control.c:1892
 msgid "Removal Complete"
 msgstr "Fjerning fullført"
 
-#: calendar/gui/e-itip-control.c:1916 calendar/gui/e-itip-control.c:1964
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
 msgid "Item sent!\n"
 msgstr "Oppføring sendt!\n"
 
-#: calendar/gui/e-itip-control.c:1918 calendar/gui/e-itip-control.c:1968
+#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
 msgid "The item could not be sent!\n"
 msgstr "Oppføringen kunne ikke sendes!\n"
 
@@ -6298,74 +6016,74 @@ msgstr "slutt-dato"
 msgid "date-start"
 msgstr "start-dato"
 
-#: calendar/gui/e-meeting-list-view.c:62
+#: calendar/gui/e-meeting-list-view.c:59
 msgid "Chair Persons"
 msgstr "Styremedlemmer"
 
-#: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:480
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
 msgid "Required Participants"
 msgstr "Obligatoriske deltakere"
 
-#: calendar/gui/e-meeting-list-view.c:64
+#: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Valgfrie deltakere"
 
-#: calendar/gui/e-meeting-list-view.c:65
+#: calendar/gui/e-meeting-list-view.c:62
 msgid "Resources"
 msgstr "Ressurser"
 
-#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
 #: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr "Individuell"
 
-#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "Gruppe"
 
-#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr "Ressurs"
 
-#: calendar/gui/e-meeting-list-view.c:144 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr "Rom"
 
-#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr "Styremedlem"
 
-#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:127
 #: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
 msgid "Required Participant"
 msgstr "Obligatorisk deltaker"
 
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr "Valgfri deltaker"
 
-#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr "Ikke-deltaker"
 
-#: calendar/gui/e-meeting-list-view.c:180 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:177
 #: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
 msgid "Needs Action"
 msgstr "Trenger handling"
 
-#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:183
-#: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:400
+#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "Tentativ"
 
-#: calendar/gui/e-meeting-list-view.c:184 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr "Delegert"
@@ -6374,80 +6092,88 @@ msgstr "Delegert"
 msgid "In Process"
 msgstr "Under arbeid"
 
-#: calendar/gui/e-meeting-time-sel.c:402 designs/OOA/ooa.glade.h:11
+#: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Ute"
 
-#: calendar/gui/e-meeting-time-sel.c:403
+#: calendar/gui/e-meeting-time-sel.c:401
 msgid "No Information"
 msgstr "Ingen informasjon"
 
-#: calendar/gui/e-meeting-time-sel.c:442
+#: calendar/gui/e-meeting-time-sel.c:417
+#, fuzzy
+msgid "Add attendees from addressbook"
+msgstr "Legg til avsender i adresse_bok"
+
+#: calendar/gui/e-meeting-time-sel.c:440
 msgid "_Options"
 msgstr "_Alternativer"
 
-#: calendar/gui/e-meeting-time-sel.c:459
-msgid "Show _Only Working Hours"
+#: calendar/gui/e-meeting-time-sel.c:457
+#, fuzzy
+msgid "Show _only working hours"
 msgstr "Vis k_un arbeidstid"
 
-#: calendar/gui/e-meeting-time-sel.c:469
-msgid "Show _Zoomed Out"
+#: calendar/gui/e-meeting-time-sel.c:467
+#, fuzzy
+msgid "Show _zoomed out"
 msgstr "Vis _zoomet ut"
 
-#: calendar/gui/e-meeting-time-sel.c:484
-msgid "_Update Free/Busy"
+#: calendar/gui/e-meeting-time-sel.c:482
+#, fuzzy
+msgid "_Update free/busy"
 msgstr "_Oppdater ledig/opptatt"
 
-#: calendar/gui/e-meeting-time-sel.c:499
+#: calendar/gui/e-meeting-time-sel.c:497
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:517
+#: calendar/gui/e-meeting-time-sel.c:515
 msgid "_Autopick"
 msgstr "_Autovelg"
 
-#: calendar/gui/e-meeting-time-sel.c:532
+#: calendar/gui/e-meeting-time-sel.c:530
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:549
-msgid "_All People and Resources"
+#: calendar/gui/e-meeting-time-sel.c:547
+#, fuzzy
+msgid "_All people and resources"
 msgstr "_Alle mennesker og ressurser"
 
-#: calendar/gui/e-meeting-time-sel.c:558
-msgid "All _People and One Resource"
+#: calendar/gui/e-meeting-time-sel.c:556
+#, fuzzy
+msgid "All _people and one resource"
 msgstr "Alle _mennesker og en ressurs"
 
-#: calendar/gui/e-meeting-time-sel.c:567
-msgid "_Required People"
+#: calendar/gui/e-meeting-time-sel.c:565
+#, fuzzy
+msgid "_Required people"
 msgstr "_Obligatoriske mennesker"
 
-#: calendar/gui/e-meeting-time-sel.c:576
-msgid "Required People and _One Resource"
+#: calendar/gui/e-meeting-time-sel.c:574
+#, fuzzy
+msgid "Required people and _one resource"
 msgstr "Obligatoriske mennesker _og en ressurs"
 
-#: calendar/gui/e-meeting-time-sel.c:595
+#: calendar/gui/e-meeting-time-sel.c:593
 msgid "Meeting _start time:"
 msgstr "Tid for møtets _start:"
 
-#: calendar/gui/e-meeting-time-sel.c:615
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "Meeting _end time:"
 msgstr "Tid for møtets slutt:"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2062
+#: calendar/gui/e-meeting-time-sel.c:2060
 #: calendar/gui/e-meeting-time-sel-item.c:452
 msgid "%A, %B %d, %Y"
 msgstr "%A, %d %B, %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#. This is a strftime() format string %a = abbreviated weekday
-#. name, %m = month number, %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. strftime format of a weekday and a date.
-#: calendar/gui/e-meeting-time-sel.c:2095
+#: calendar/gui/e-meeting-time-sel.c:2093
 #: calendar/gui/e-meeting-time-sel-item.c:456 e-util/e-time-utils.c:203
 #: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
 msgid "%a %m/%d/%Y"
@@ -6455,10 +6181,6 @@ msgstr "%a %d.%m.%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. This is the preferred date format for the locale.
-#. This is a strftime() format for a short date. %m = month,
-#. %d = day of month, %Y = year (all digits).
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
 #: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
 msgid "%m/%d/%Y"
@@ -6469,7 +6191,7 @@ msgstr "%d.%m.%Y"
 msgid "Enter the password for %s"
 msgstr "Oppgi passord for %s"
 
-#: calendar/gui/e-tasks.c:585 calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6478,19 +6200,14 @@ msgstr ""
 "Feil på «%s»:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:613 calendar/gui/gnome-cal.c:2057
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr "Oppgavemotor for «%s» har krasjet."
-
 #. FIXME Loading should be async
 #. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:687
+#: calendar/gui/e-tasks.c:801
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Åpner oppgaver på %s"
 
-#: calendar/gui/e-tasks.c:710
+#: calendar/gui/e-tasks.c:824
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6499,52 +6216,47 @@ msgstr ""
 "Feil under åpning av «%s»:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:731
+#: calendar/gui/e-tasks.c:845
 msgid "Loading tasks"
 msgstr "Laster oppgaver"
 
-#: calendar/gui/e-tasks.c:835
+#: calendar/gui/e-tasks.c:949
 msgid "Completing tasks..."
 msgstr "Fullfører oppgaver..."
 
-#: calendar/gui/e-tasks.c:858
+#: calendar/gui/e-tasks.c:972
 msgid "Deleting selected objects..."
 msgstr "Sletter valgte objekter..."
 
-#: calendar/gui/e-tasks.c:885
+#: calendar/gui/e-tasks.c:999
 msgid "Expunging"
 msgstr "Tømmer"
 
-#: calendar/gui/e-tasks.c:961
+#: calendar/gui/e-tasks.c:1075
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
-#: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
+#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
+#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
 #: calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:705
 msgid "Tasks"
 msgstr "Oppgaver"
 
-#: calendar/gui/gnome-cal.c:1876
+#: calendar/gui/gnome-cal.c:1878
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Laster avtaler på %s"
 
-#: calendar/gui/gnome-cal.c:1895
+#: calendar/gui/gnome-cal.c:1897
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Laster oppgaver på %s"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1920
 #, c-format
 msgid "Opening %s"
 msgstr "Åpner %s"
 
-#: calendar/gui/gnome-cal.c:2048
-#, c-format
-msgid "The calendar backend for '%s' has crashed."
-msgstr "Kalendermotoren for «%s» har krasjet."
-
-#: calendar/gui/gnome-cal.c:2894
+#: calendar/gui/gnome-cal.c:2906
 msgid "Purging"
 msgstr "Sletter"
 
@@ -6741,7 +6453,7 @@ msgid "On The Web"
 msgstr "På nettet"
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "Kan ikke migrere gamle innstillinger fra evolution/config.xmldb"
 
@@ -6752,7 +6464,7 @@ msgid "Unable to migrate calendar `%s'"
 msgstr "Kan ikke migrere kalender «%s»"
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:869
+#: calendar/gui/migration.c:889
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Kan ikke migrere oppgaver «%s»"
@@ -6988,44 +6700,44 @@ msgstr "Skriv ut oppføring"
 msgid "Print Setup"
 msgstr "Skriveroppsett"
 
-#: calendar/gui/tasks-component.c:303
+#: calendar/gui/tasks-component.c:313
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 "Oppgaveliste «%s» vil bli fjernet. Er du sikker på at du vil fortsette?"
 
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:371
 msgid "New Task List"
 msgstr "Ny oppgaveliste"
 
-#: calendar/gui/tasks-component.c:398
+#: calendar/gui/tasks-component.c:408
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d oppgave"
 msgstr[1] "%d oppgaver"
 
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:502
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", %d valgt"
 msgstr[1] ", %d valgt"
 
-#: calendar/gui/tasks-component.c:447
+#: calendar/gui/tasks-component.c:457
 msgid "Failed upgrading tasks."
 msgstr "Feil under oppgradering av oppgaver."
 
-#: calendar/gui/tasks-component.c:526
+#: calendar/gui/tasks-component.c:749
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "Kan ikke åpne oppgaveliste «%s» for oppretting av hendelser og møter"
 
-#: calendar/gui/tasks-component.c:538
+#: calendar/gui/tasks-component.c:761
 msgid "There is no calendar available for creating tasks"
 msgstr "Ingen kalender tilgjengelig for opppretting av oppgaver"
 
-#: calendar/gui/tasks-component.c:576
+#: calendar/gui/tasks-component.c:799
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
@@ -7033,27 +6745,27 @@ msgstr ""
 "Valgt oppgaveliste er skrivebeskyttet. Hendelser kan ikke opprettes. "
 "Vennligst velg en oppgaveliste du kan skrive til."
 
-#: calendar/gui/tasks-component.c:804
+#: calendar/gui/tasks-component.c:1040
 msgid "New task"
 msgstr "Ny oppgave"
 
-#: calendar/gui/tasks-component.c:805
+#: calendar/gui/tasks-component.c:1041
 msgid "_Task"
 msgstr "_Oppgave"
 
-#: calendar/gui/tasks-component.c:806
+#: calendar/gui/tasks-component.c:1042
 msgid "Create a new task"
 msgstr "Opprett en ny oppgave"
 
-#: calendar/gui/tasks-component.c:812
+#: calendar/gui/tasks-component.c:1048
 msgid "New tasks group"
 msgstr "Ny oppgavegruppe"
 
-#: calendar/gui/tasks-component.c:813
+#: calendar/gui/tasks-component.c:1049
 msgid "_Tasks Group"
 msgstr "_Oppgavegruppe"
 
-#: calendar/gui/tasks-component.c:814
+#: calendar/gui/tasks-component.c:1050
 msgid "Create a new tasks group"
 msgstr "Opprett en ny oppgavegruppe"
 
@@ -7077,7 +6789,7 @@ msgstr "Ikke spør meg igjen."
 msgid "Print Tasks"
 msgstr "Skriv ut oppgaver"
 
-#: calendar/gui/weekday-picker.c:327
+#: calendar/gui/weekday-picker.c:326
 msgid "SMTWTFS"
 msgstr "SMTOTFL"
 
@@ -8879,17 +8591,17 @@ msgstr ""
 msgid "(match-threads) requires a match type string"
 msgstr ""
 
-#: camel/camel-folder-search.c:785
+#: camel/camel-folder-search.c:784
 #, fuzzy
 msgid "(match-threads) expects an array result"
 msgstr "(treff-alle) krever et enkelt bolsk resultat"
 
-#: camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:790
 #, fuzzy
 msgid "(match-threads) requires the folder set"
 msgstr "(treff-alle) krever et enkelt bolsk resultat"
 
-#: camel/camel-folder-search.c:880
+#: camel/camel-folder-search.c:879
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Utfører spørring på ukjent header: %s"
@@ -8924,7 +8636,8 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
 #: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:705
+#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Avbrutt."
@@ -9294,7 +9007,7 @@ msgstr ""
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1243
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Ugyldig svar på autentisering fra tjener."
 
@@ -9661,40 +9374,40 @@ msgstr "importering av nøkler: ikke implementert"
 msgid "export keys: unimplemented"
 msgstr "eksportering av nøkler: ikke implementert"
 
-#: camel/camel-store.c:215
+#: camel/camel-store.c:213
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Kan ikke finne mappe: Ugyldig operasjon på dette lageret"
 
-#: camel/camel-store.c:245
+#: camel/camel-store.c:243
 #, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr "Kan ikke opprette mappe «%s»: mappen eksisterer"
 
-#: camel/camel-store.c:299
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Kan ikke opprette mappe: Ugyldig operasjon på dette lageret"
 
-#: camel/camel-store.c:327
+#: camel/camel-store.c:325
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Kan ikke opprette mappe: «%s»: mappen eksisterer"
 
-#: camel/camel-store.c:391 camel/camel-vee-store.c:354
+#: camel/camel-store.c:389 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kan ikke slette mappe: %s: Ugyldig operasjon"
 
-#: camel/camel-store.c:441 camel/camel-vee-store.c:390
+#: camel/camel-store.c:439 camel/camel-vee-store.c:387
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kan ikke endre navn på mappe: %s: Ugyldig operasjon"
 
-#: camel/camel-store.c:813
+#: camel/camel-store.c:777
 msgid "Trash"
 msgstr "Papirkurv"
 
-#: camel/camel-store.c:815 filter/libfilter-i18n.h:35
-#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/mail-config.glade.h:95
+#: ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Søppel"
 
@@ -9928,12 +9641,12 @@ msgstr "Ingen slik melding %s i %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Kan ikke kopiere eller flytte meldinger inn i en virtuell mappe"
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:374
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kan ikke slette mappe: %s: Ingen slik mappe"
 
-#: camel/camel-vee-store.c:398
+#: camel/camel-vee-store.c:395
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kan ikke endre navn på mappe: %s: Ingen slik mappe"
@@ -9974,15 +9687,15 @@ msgstr "Adressebok og kalender"
 msgid "Post Office Agent SOAP Port:"
 msgstr "SOAP-port for postkontoragent:"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:80
+#: camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "Novell GroupWise"
 msgstr "Novell GroupWise"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:82
+#: camel/providers/groupwise/camel-groupwise-provider.c:85
 msgid "For accessing Novell Groupwise servers"
 msgstr "For å aksessere Novell Groupwise-tjenere"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: camel/providers/groupwise/camel-groupwise-provider.c:100
 #: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
@@ -9991,7 +9704,7 @@ msgstr "For å aksessere Novell Groupwise-tjenere"
 msgid "Password"
 msgstr "Passord"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:99
+#: camel/providers/groupwise/camel-groupwise-provider.c:102
 #: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
@@ -9999,8 +9712,8 @@ msgstr ""
 "Dette valget vil la deg koble til en IMAP-tjener ved å bruke et klartekst-"
 "passord."
 
-#: camel/providers/groupwise/camel-gw-listener.c:305
-#: camel/providers/groupwise/camel-gw-listener.c:328
+#: camel/providers/groupwise/camel-gw-listener.c:312
+#: camel/providers/groupwise/camel-gw-listener.c:335
 msgid "Checklist"
 msgstr "Sjekkliste"
 
@@ -10085,12 +9798,14 @@ msgstr "Kan ikke kopiere meldinger fra mappe «%s» til mappe «%s»: Ukjent"
 #: camel/providers/imap4/camel-imap4-folder.c:866
 #, c-format
 msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-msgstr "Kan ikke flytte meldinger fra mappe «%s» til mappe «%s»: Ugyldig kommando"
+msgstr ""
+"Kan ikke flytte meldinger fra mappe «%s» til mappe «%s»: Ugyldig kommando"
 
 #: camel/providers/imap4/camel-imap4-folder.c:870
 #, c-format
 msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-msgstr "Kan ikke kopiere meldinger fra mappe «%s» til mappe «%s»: Ugyldig kommando"
+msgstr ""
+"Kan ikke kopiere meldinger fra mappe «%s» til mappe «%s»: Ugyldig kommando"
 
 #: camel/providers/imap4/camel-imap4-provider.c:40
 #: camel/providers/imap/camel-imap-provider.c:55
@@ -10131,23 +9846,23 @@ msgstr ""
 "passord."
 
 #: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:429
+#: camel/providers/imap/camel-imap-store.c:428
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP-tjener %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:431
+#: camel/providers/imap/camel-imap-store.c:430
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP-tjeneste for %s på %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:208
 #: camel/providers/imap4/camel-imap4-store.c:225
-#: camel/providers/imap/camel-imap-store.c:552
-#: camel/providers/imap/camel-imap-store.c:572
+#: camel/providers/imap/camel-imap-store.c:551
+#: camel/providers/imap/camel-imap-store.c:571
 #: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
+#: camel/providers/nntp/camel-nntp-store.c:209
 #: camel/providers/pop3/camel-pop3-store.c:175
 #: camel/providers/smtp/camel-smtp-transport.c:269
 #: camel/providers/smtp/camel-smtp-transport.c:285
@@ -10156,18 +9871,18 @@ msgid "Could not connect to %s (port %d): %s"
 msgstr "Kunne ikke koble til %s (port %d): %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:210
-#: camel/providers/imap/camel-imap-store.c:554
+#: camel/providers/imap/camel-imap-store.c:553
 #: camel/providers/pop3/camel-pop3-store.c:177
 #: camel/providers/smtp/camel-smtp-transport.c:271
 msgid "SSL unavailable"
 msgstr "SSL er ikke tilgjengelig"
 
 #: camel/providers/imap4/camel-imap4-store.c:222
-#: camel/providers/imap/camel-imap-store.c:569
-#: camel/providers/imap/camel-imap-store.c:846
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/imap/camel-imap-store.c:845
 #: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:137
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
 #: camel/providers/pop3/camel-pop3-store.c:192
 msgid "Connection cancelled"
 msgstr "Tilkobling avbrutt"
@@ -10180,8 +9895,8 @@ msgid ""
 msgstr "Kunne ikke koble til IMAP-tjener %s i sikker modus: %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:680
-#: camel/providers/imap/camel-imap-store.c:711
+#: camel/providers/imap/camel-imap-store.c:679
+#: camel/providers/imap/camel-imap-store.c:710
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Kunne ikke koble til IMAP-tjener %s i sikker modus: %s"
@@ -10190,7 +9905,7 @@ msgstr "Kunne ikke koble til IMAP-tjener %s i sikker modus: %s"
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1108
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
 msgid "Unknown error"
 msgstr "Ukjent feil"
 
@@ -10218,8 +9933,8 @@ msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr "Finner ikke mappe: %s: %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1888
-#: camel/providers/imap/camel-imap-store.c:2266
+#: camel/providers/imap/camel-imap-store.c:1885
+#: camel/providers/imap/camel-imap-store.c:2263
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -10296,12 +10011,12 @@ msgstr "IMAP-tjener %s koblet fra uventet: %s"
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3199
+#: camel/providers/imap/camel-imap-store.c:3194
 msgid "Operation cancelled"
 msgstr "Operasjon avbrutt"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3202
+#: camel/providers/imap/camel-imap-store.c:3197
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Tjener koblet fra uventet: %s"
@@ -10382,7 +10097,7 @@ msgstr "Ingen slik melding"
 
 #: camel/providers/imap/camel-imap-folder.c:2019
 #: camel/providers/imap/camel-imap-folder.c:2622
-#: camel/providers/nntp/camel-nntp-folder.c:238
+#: camel/providers/nntp/camel-nntp-folder.c:220
 msgid "This message is not currently available"
 msgstr "Denne meldingen er ikke tilgjengelig"
 
@@ -10465,43 +10180,43 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "For lesing og lagring av e-post på IMAP-tjenere."
 
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:680
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS-utvidelse er ikke støttet."
 
-#: camel/providers/imap/camel-imap-store.c:712
+#: camel/providers/imap/camel-imap-store.c:711
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL-forhandling feilet"
 
-#: camel/providers/imap/camel-imap-store.c:849
+#: camel/providers/imap/camel-imap-store.c:848
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Kunne ikke koble til med kommando «%s»: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1273
+#: camel/providers/imap/camel-imap-store.c:1272
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP-tjener %s støtter ikke etterspurt autentiseringstype %s"
 
-#: camel/providers/imap/camel-imap-store.c:1283
+#: camel/providers/imap/camel-imap-store.c:1282
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Ingen støtte for autentiseringstype %s"
 
-#: camel/providers/imap/camel-imap-store.c:1306
+#: camel/providers/imap/camel-imap-store.c:1305
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sVennligst skriv inn IMAP-passord for %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1320
+#: camel/providers/imap/camel-imap-store.c:1319
 msgid "You didn't enter a password."
 msgstr "Du skrev ikke inn et passord."
 
-#: camel/providers/imap/camel-imap-store.c:1349
+#: camel/providers/imap/camel-imap-store.c:1348
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10512,18 +10227,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1870
-#: camel/providers/imap/camel-imap-store.c:2060
+#: camel/providers/imap/camel-imap-store.c:1867
+#: camel/providers/imap/camel-imap-store.c:2057
 #, c-format
 msgid "No such folder %s"
 msgstr "Mappen %s eksisterer ikke"
 
-#: camel/providers/imap/camel-imap-store.c:1946
-#: camel/providers/imap/camel-imap-store.c:2327
+#: camel/providers/imap/camel-imap-store.c:1943
+#: camel/providers/imap/camel-imap-store.c:2324
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Opphavsmappen tillates ikke å ha undermapper"
 
-#: camel/providers/imap/camel-imap-store.c:2001
+#: camel/providers/imap/camel-imap-store.c:1998
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10531,7 +10246,7 @@ msgstr "Opphavsmappen tillates ikke å ha undermapper"
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Kan ikke opprette mappe «%s»: mappen eksisterer."
 
-#: camel/providers/imap/camel-imap-store.c:2277
+#: camel/providers/imap/camel-imap-store.c:2274
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Ukjent opphavsmappe: %s"
@@ -10567,20 +10282,20 @@ msgid "Index message body data"
 msgstr "Indekser data i meldingskropp"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:388
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:393
-#: camel/providers/local/camel-local-folder.c:396
+#: camel/providers/local/camel-local-folder.c:392
+#: camel/providers/local/camel-local-folder.c:395
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "postboks:%s (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:400
+#: camel/providers/local/camel-local-folder.c:399
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -10640,7 +10355,7 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:142
 #: camel/providers/local/camel-local-store.c:253
-#: camel/providers/local/camel-mbox-store.c:356
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10772,9 +10487,9 @@ msgstr "Kunne ikke slette mappe «%s»: %s"
 msgid "not a maildir directory"
 msgstr "ikke en maildir katalog"
 
-#: camel/providers/local/camel-maildir-store.c:341
-#: camel/providers/local/camel-spool-store.c:286
-#: camel/providers/local/camel-spool-store.c:316
+#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-spool-store.c:284
+#: camel/providers/local/camel-spool-store.c:314
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Kunne ikke søke i mappe «%s»: %s"
@@ -10832,7 +10547,7 @@ msgid "Message construction failed."
 msgstr "Oppbygging av melding feilet: Korrupt postboks?"
 
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:362
+#: camel/providers/local/camel-mbox-store.c:361
 msgid "Cannot create a folder by this name."
 msgstr "Kan ikke opprette en mappe med dette navnet."
 
@@ -10862,30 +10577,30 @@ msgstr "«%s» er ikke en vanlig fil."
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Mappen «%s» er ikke tom. Ikke slettet."
 
-#: camel/providers/local/camel-mbox-store.c:375
+#: camel/providers/local/camel-mbox-store.c:374
 #, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Kan ikke opprette katalog «%s»: %s."
 
-#: camel/providers/local/camel-mbox-store.c:389
+#: camel/providers/local/camel-mbox-store.c:388
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Kan ikke opprette mappe: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:391
+#: camel/providers/local/camel-mbox-store.c:390
 msgid "Folder already exists"
 msgstr "Mappen eksisterer allerede"
 
-#: camel/providers/local/camel-mbox-store.c:473
+#: camel/providers/local/camel-mbox-store.c:472
 msgid "The new folder name is illegal."
 msgstr "Det nye mappenavnet er ugyldig."
 
-#: camel/providers/local/camel-mbox-store.c:486
+#: camel/providers/local/camel-mbox-store.c:485
 #, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Kunne ikke endre navn på «%s»: «%s»: %s"
 
-#: camel/providers/local/camel-mbox-store.c:561
+#: camel/providers/local/camel-mbox-store.c:560
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Kunne ikke endre navn på «%s» til %s: %s"
@@ -11076,7 +10791,7 @@ msgstr ""
 "Mappen kan være korrupt, kopi lagret i «%s»"
 
 #: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:997
+#: camel/providers/nntp/camel-nntp-store.c:1126
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Vennligst oppgi NNTP-passord for %s@%s"
@@ -11093,18 +10808,10 @@ msgstr "Kunne ikke sende brukernavn til tjener"
 msgid "Server rejected username/password"
 msgstr "Tjener avviste brukernavn/passord"
 
-#: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:263
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr "Bruker avbrøt"
-
-#: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:259
-#: camel/providers/nntp/camel-nntp-folder.c:265
+#: camel/providers/nntp/camel-nntp-folder.c:147
+#: camel/providers/nntp/camel-nntp-folder.c:149
+#: camel/providers/nntp/camel-nntp-folder.c:158
+#: camel/providers/nntp/camel-nntp-folder.c:234
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11113,60 +10820,49 @@ msgstr "Bruker avbrøt"
 msgid "Cannot get message %s: %s"
 msgstr "Kan ikke hente melding %s: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:188
-#: camel/providers/nntp/camel-nntp-folder.c:228
+#: camel/providers/nntp/camel-nntp-folder.c:156
+#: camel/providers/nntp/camel-nntp-folder.c:232
+#: camel/providers/nntp/camel-nntp-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+msgid "User cancelled"
+msgstr "Bruker avbrøt"
+
+#: camel/providers/nntp/camel-nntp-folder.c:176
+#: camel/providers/nntp/camel-nntp-folder.c:208
 #, c-format
 msgid "Internal error: uid in invalid format: %s"
 msgstr "Intern feil: uid i ugyldig format: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:201
-#, c-format
-msgid "Could not get article %s from NNTP server"
-msgstr "Kunne ikke hente artikkel %s fra NNTP-tjener"
-
-#: camel/providers/nntp/camel-nntp-folder.c:362
-msgid "Posting not allowed by news server"
-msgstr "Posting tillates ikke av nyhetstjener"
-
+#: camel/providers/nntp/camel-nntp-folder.c:328
+#: camel/providers/nntp/camel-nntp-folder.c:331
 #: camel/providers/nntp/camel-nntp-folder.c:373
-#, c-format
-msgid "Failed to send newsgroups header: %s: message not posted"
-msgstr "Feil under sending av hode for nyhetsgruppe: %s: melding ikke postet"
-
-#: camel/providers/nntp/camel-nntp-folder.c:413
-#: camel/providers/nntp/camel-nntp-folder.c:426
-#, c-format
-msgid "Error posting to newsgroup: %s: message not posted"
-msgstr "Feil under posting til nyhetsgruppe: %s: melding ikke postet"
-
-#: camel/providers/nntp/camel-nntp-folder.c:438
-msgid "Error reading response to posted message: message not posted"
-msgstr "Feil under lesing av svar på postet melding: melding ikke postet"
-
-#: camel/providers/nntp/camel-nntp-folder.c:441
-#, c-format
-msgid "Error posting message: %s: message not posted"
-msgstr "Feil under posting av melding: %s: melding ikke postet"
+#: camel/providers/nntp/camel-nntp-folder.c:375
+#, fuzzy, c-format
+msgid "Posting failed: %s"
+msgstr "Operasjonen feilet: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:457
+#: camel/providers/nntp/camel-nntp-folder.c:393
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "Du kan ikke poste NNTP-meldinger mens du arbeider frakoblet!"
 
-#: camel/providers/nntp/camel-nntp-folder.c:468
+#: camel/providers/nntp/camel-nntp-folder.c:404
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Du kan ikke kopiere meldinger fra en NNTP-mappe!"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:44
 msgid "Could not get group list from server."
 msgstr "Kunne ikke hente gruppeliste fra tjener."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#: camel/providers/nntp/camel-nntp-grouplist.c:97
+#: camel/providers/nntp/camel-nntp-grouplist.c:106
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "Kunne ikke laste gruppelistefil for %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#: camel/providers/nntp/camel-nntp-grouplist.c:157
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Kunne ikke lagre gruppelistefil for %s: %s"
@@ -11198,26 +10894,29 @@ msgstr ""
 "Dette alternativet vil autentisere mot NNTP-tjeneren ved bruk av klartekst "
 "passord."
 
-#: camel/providers/nntp/camel-nntp-store.c:158
+#: camel/providers/nntp/camel-nntp-store.c:118
+#: camel/providers/nntp/camel-nntp-store.c:1233
+#: camel/providers/nntp/camel-nntp-store.c:1331
+#, c-format
+msgid "NNTP Command failed: %s"
+msgstr "NNTP-kommando feilet: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:227
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Kan ikke lese hilsen fra %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:170
+#: camel/providers/nntp/camel-nntp-store.c:239
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP-tjener %s returnerte feilkode %d: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:326
+#: camel/providers/nntp/camel-nntp-store.c:403
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET News via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:640
-msgid "Stream error"
-msgstr "Feil i strøm"
-
-#: camel/providers/nntp/camel-nntp-store.c:643
+#: camel/providers/nntp/camel-nntp-store.c:777
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -11228,7 +10927,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/providers/nntp/camel-nntp-store.c:735
+#: camel/providers/nntp/camel-nntp-store.c:872
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
@@ -11238,7 +10937,7 @@ msgstr ""
 "\n"
 "Nyhetsgruppen finnes ikke. Valgt oppføring er sannsynligvis en opphavsmappe."
 
-#: camel/providers/nntp/camel-nntp-store.c:767
+#: camel/providers/nntp/camel-nntp-store.c:904
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
@@ -11248,59 +10947,60 @@ msgstr ""
 "\n"
 "nyhetsgruppen eksisterer ikke!"
 
-#: camel/providers/nntp/camel-nntp-store.c:792
+#: camel/providers/nntp/camel-nntp-store.c:929
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr "Du kan ikke opprette mapper i et News-lager: abonner i stedet."
 
-#: camel/providers/nntp/camel-nntp-store.c:800
+#: camel/providers/nntp/camel-nntp-store.c:937
 msgid "You cannot rename a folder in a News store."
 msgstr "Du kan ikke endre navn på en mappe på en nyhetstjener."
 
-#: camel/providers/nntp/camel-nntp-store.c:808
+#: camel/providers/nntp/camel-nntp-store.c:945
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 "Du kan ikke fjerne en mappe i et News-lager: slett abonnement i stedet."
 
-#: camel/providers/nntp/camel-nntp-summary.c:253
-#, c-format
-msgid "Connection error: %s"
-msgstr "Tilkoblingsfeil: %s"
-
-#: camel/providers/nntp/camel-nntp-summary.c:262
-#, c-format
-msgid "No such folder: %s"
-msgstr "Ingen slik mappe: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1118
+#, fuzzy
+msgid "Authentication requested but not username provided"
+msgstr "Autentisering kreves"
 
-#: camel/providers/nntp/camel-nntp-summary.c:268
-#, c-format
-msgid "Could not get group: %s"
-msgstr "Kunne ikke hente gruppe: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1146
+#, fuzzy, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr "Kunne ikke autentisere mot POP-tjener %s: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:333
-msgid "Could not get messages: unspecified error"
-msgstr "Kunne ikke hente meldinger: uspesifisert feil"
+#: camel/providers/nntp/camel-nntp-store.c:1262
+#, fuzzy
+msgid "Not connected."
+msgstr "Ingen kontakter"
 
-#: camel/providers/nntp/camel-nntp-summary.c:378
+#: camel/providers/nntp/camel-nntp-store.c:1311
 #, c-format
-msgid "NNTP Command failed: %s"
-msgstr "NNTP-kommando feilet: %s"
+msgid "No such folder: %s"
+msgstr "Ingen slik mappe: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:438
-#: camel/providers/nntp/camel-nntp-summary.c:543
+#: camel/providers/nntp/camel-nntp-summary.c:218
+#: camel/providers/nntp/camel-nntp-summary.c:314
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Søker etter nye meldinger"
 
-#: camel/providers/nntp/camel-nntp-summary.c:558
-#, c-format
-msgid "Unknown server response: %s"
-msgstr "Ukjent svar fra tjener: %s"
+#: camel/providers/nntp/camel-nntp-summary.c:225
+#, fuzzy, c-format
+msgid "Unexpected server response from xover: %s"
+msgstr "Uventet svar fra IMAP-tjener: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:328
+#, fuzzy, c-format
+msgid "Unexpected server response from head: %s"
+msgstr "Uventet svar fra GnuPG: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:605
+#: camel/providers/nntp/camel-nntp-summary.c:368
 msgid "Use cancel"
 msgstr "Bruk avbryt"
 
-#: camel/providers/nntp/camel-nntp-summary.c:607
+#: camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Operasjonen feilet: %s"
@@ -11778,19 +11478,19 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
+#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:408
 msgid "attachment"
 msgstr "vedlegg"
 
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:454
 msgid "Remove selected items from the attachment list"
 msgstr "Fjern valgte oppføringer fra vedleggslisten"
 
-#: composer/e-msg-composer-attachment-bar.c:491
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Add attachment..."
 msgstr "Legg til vedlegg..."
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:495
 msgid "Attach a file to the message"
 msgstr "Legg en fil ved meldingen"
 
@@ -11853,7 +11553,7 @@ msgstr "Melding uten navn"
 msgid "Open file"
 msgstr "Åpne fil"
 
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
 msgid "Autogenerated"
 msgstr "Generert automatisk"
 
@@ -12000,17 +11700,17 @@ msgstr "Legg ved fil(er)"
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
+msgid "You cannot attach the file `{0}' to this message."
 msgstr "Legg en fil ved meldingen"
 
 #. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4
-msgid "${1}"
-msgstr "${1}"
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr "{1}"
 
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
 
 #. mail-composer:attach-directory primary
@@ -12098,7 +11798,7 @@ msgstr "Kunne ikke opprette melding."
 
 #. mail-composer:no-build-message secondary
 #: composer/mail-composer-errors.xml.h:34
-msgid "Because \"${0}\", you may need to select different mail options."
+msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
@@ -12107,9 +11807,11 @@ msgid "Could not read signature file \"{0}\"."
 msgstr "Kunne ikke lagre signaturfil «{0}»."
 
 #. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38
-msgid "Because \"${1}\"."
-msgstr "Fordi «{1}»"
+#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr "pga «{1}»."
 
 #. mail-composer:all-accounts-deleted primary
 #: composer/mail-composer-errors.xml.h:40
@@ -12273,16 +11975,12 @@ msgstr "Synkroniser kategorier:"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
 #: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d.%m.%Y %H.%M"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
 #: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d.%m.%Y %H.%M"
@@ -12334,31 +12032,23 @@ msgid "%m/%d/%Y %H"
 msgstr "%d.%m.%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#. strftime format of a time in 12-hour format.
 #: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
 msgstr "%H.%M.%S"
 
 #. strptime format for a time of day, in 24-hour format.
-#. strftime format of a time in 24-hour format.
 #: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr "%H.%M.%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
 #: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%I:%M %p"
 msgstr "%H.%M"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
 #: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
 msgid "%H:%M"
@@ -12455,7 +12145,6 @@ msgid "Missing file name."
 msgstr "Mangler filnavn."
 
 #. filter:no-file secondary
-#. filter:bad-file secondary
 #: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
 msgid "You must specify a file name."
 msgstr "Du må oppgi et filnavn."
@@ -12486,7 +12175,6 @@ msgid "Could not compile regular expression \"{1}\"."
 msgstr "Kunne ikke sette sammen regulært uttrykk «{1}»."
 
 #. filter:no-name primary
-#. filter:no-name-vfolder primary
 #: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
 msgid "Missing name."
 msgstr "Mangler navn."
@@ -12534,7 +12222,7 @@ msgid "<b>Then</b>"
 msgstr "<b>Så</b> "
 
 #: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1335
+#: mail/mail-account-gui.c:1347
 msgid "Select Folder"
 msgstr "Velg mappe"
 
@@ -12626,8 +12314,8 @@ msgstr "med alle lokale mapper"
 msgid "years"
 msgstr "år"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:1011
-#: mail/mail-config.c:76 mail/mail-config.glade.h:93
+#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
+#: mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Viktig"
 
@@ -12691,252 +12379,6 @@ msgstr "innkommende"
 msgid "outgoing"
 msgstr "utgående"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Adjust Score"
-msgstr "Juster poeng"
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Color"
-msgstr "Tilegn farge"
-
-#: filter/libfilter-i18n.h:4
-msgid "Assign Score"
-msgstr "Gi poeng"
-
-#: filter/libfilter-i18n.h:5
-msgid "Attachments"
-msgstr "Vedlegg"
-
-#: filter/libfilter-i18n.h:6
-msgid "Beep"
-msgstr "Pip"
-
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "inneholder"
-
-#: filter/libfilter-i18n.h:8
-msgid "Copy to Folder"
-msgstr "Kopier til mappe"
-
-#: filter/libfilter-i18n.h:9
-msgid "Date received"
-msgstr "Dato mottatt"
-
-#: filter/libfilter-i18n.h:10
-msgid "Date sent"
-msgstr "Dato sendt"
-
-#: filter/libfilter-i18n.h:12
-msgid "Deleted"
-msgstr "Slettet"
-
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "inneholder ikke"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "slutter ikke med"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "eksisterer ikke"
-
-#: filter/libfilter-i18n.h:16
-msgid "does not return"
-msgstr "returnerer ikke"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "ligner ikke"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "starter ikke med"
-
-#: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
-msgstr "Eksisterer ikke"
-
-#: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr "Skisse"
-
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "slutter med"
-
-#: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr "Eksisterer"
-
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "eksisterer"
-
-#: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr "Uttrykk"
-
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr "Følg opp"
-
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "er"
-
-#: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr "er etter"
-
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr "er før"
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr "er merket"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "er større enn"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "er mindre enn"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "er ikke"
-
-#: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr "er ikke merket"
-
-#: filter/libfilter-i18n.h:36
-msgid "Junk Test"
-msgstr "Søppeltest"
-
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
-#: widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Etikett"
-
-#: filter/libfilter-i18n.h:38
-msgid "Mailing list"
-msgstr "E-postliste"
-
-#: filter/libfilter-i18n.h:39
-msgid "Message Body"
-msgstr "Meldingskropp"
-
-#: filter/libfilter-i18n.h:40
-msgid "Message Header"
-msgstr "Meldingshode"
-
-#: filter/libfilter-i18n.h:41
-msgid "Message is Junk"
-msgstr "Meldingen er søppel"
-
-#: filter/libfilter-i18n.h:42
-msgid "Message is not Junk"
-msgstr "Meldingen er ikke søppel"
-
-#: filter/libfilter-i18n.h:43
-msgid "Move to Folder"
-msgstr "Flytt til mappe"
-
-#: filter/libfilter-i18n.h:44
-msgid "Pipe to Program"
-msgstr "Send til program"
-
-#: filter/libfilter-i18n.h:45
-msgid "Play Sound"
-msgstr "Spill lyd"
-
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Les"
-
-#: filter/libfilter-i18n.h:47
-msgid "Recipients"
-msgstr "Mottakere"
-
-#: filter/libfilter-i18n.h:48
-msgid "Regex Match"
-msgstr "Treff på vanlig uttrykk"
-
-#: filter/libfilter-i18n.h:49
-msgid "Replied to"
-msgstr "Svart til"
-
-#: filter/libfilter-i18n.h:50
-msgid "returns"
-msgstr "returnerer"
-
-#: filter/libfilter-i18n.h:51
-msgid "returns greater than"
-msgstr "returnerer større enn"
-
-#: filter/libfilter-i18n.h:52
-msgid "returns less than"
-msgstr "returnerer mindre enn"
-
-#: filter/libfilter-i18n.h:53
-msgid "Run Program"
-msgstr "Kjør program"
-
-#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Gi poeng"
-
-#: filter/libfilter-i18n.h:55
-msgid "Sender"
-msgstr "Avsender"
-
-#: filter/libfilter-i18n.h:56
-msgid "Set Status"
-msgstr "Sett status"
-
-#: filter/libfilter-i18n.h:57
-msgid "Size (kB)"
-msgstr "Størrelse (kB)"
-
-#: filter/libfilter-i18n.h:58
-msgid "sounds like"
-msgstr "lyder som"
-
-#: filter/libfilter-i18n.h:59
-msgid "Source Account"
-msgstr "Kildekonto"
-
-#: filter/libfilter-i18n.h:60
-msgid "Specific header"
-msgstr "Spesifikk header"
-
-#: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "starter med"
-
-#: filter/libfilter-i18n.h:63
-msgid "Stop Processing"
-msgstr "Stopp behandling"
-
-#: filter/libfilter-i18n.h:64 mail/em-format.c:755 mail/em-format-html.c:1519
-#: mail/em-format-quote.c:302 mail/em-mailer-prefs.c:87
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
-#: smime/lib/e-cert.c:1079
-msgid "Subject"
-msgstr "Emne"
-
-#: filter/libfilter-i18n.h:65
-msgid "Unset Status"
-msgstr "Nullstill status"
-
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Legg til regel"
@@ -12953,6 +12395,11 @@ msgstr "Regelnavn"
 msgid "_Score Rules"
 msgstr "_Poengregler"
 
+#: filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Gi poeng"
+
 #: filter/searchtypes.xml.h:1
 msgid "Body contains"
 msgstr "Kropp inneholder"
@@ -13031,13 +12478,13 @@ msgstr "Signatur(er)"
 msgid "-------- Forwarded Message --------"
 msgstr "---------Videresendt melding-------"
 
-#: mail/em-composer-utils.c:1499
+#: mail/em-composer-utils.c:1495
 msgid "an unknown sender"
 msgstr "en ukjent avsender"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1509
+#: mail/em-composer-utils.c:1505
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "%a, %d.%m.%Y kl. %H.%M %%+05d, skrev %%s:"
 
@@ -13075,8 +12522,8 @@ msgstr "<klikk her for å velge en mappe>"
 msgid "Create New Folder"
 msgstr "Opprett ny mappe"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
-#: mail/mail-component.c:706
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
+#: mail/mail-component.c:704
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Spesifiser hvor mappen skal opprettes:"
@@ -13090,96 +12537,97 @@ msgstr "Opprett"
 msgid "Folder _name:"
 msgstr "Mappe_navn:"
 
-#: mail/em-folder-tree.c:839
+#: mail/em-folder-tree.c:833
 #, c-format
 msgid "Moving folder %s"
 msgstr "Flytter mappe %s"
 
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree.c:835
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopierer mappe %s"
 
-#: mail/em-folder-tree.c:848 mail/message-list.c:1561
+#: mail/em-folder-tree.c:842 mail/message-list.c:1561
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Flytter meldinger til mappe %s"
 
-#: mail/em-folder-tree.c:850 mail/message-list.c:1563
+#: mail/em-folder-tree.c:844 mail/message-list.c:1563
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopierer meldinger til mappe %s"
 
-#: mail/em-folder-tree.c:866
+#: mail/em-folder-tree.c:860
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Kan ikke slippe melding(er) toppnivå for lageret"
 
-#: mail/em-folder-tree.c:956 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Kopier til mappe"
 
-#: mail/em-folder-tree.c:957 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Flytt til mappe"
 
-#: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2069
-#: mail/em-folder-tree.c:2556 mail/em-folder-view.c:798
+#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
+#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
 #: mail/message-list.c:1651
 msgid "_Move"
 msgstr "_Flytt"
 
-#: mail/em-folder-tree.c:961 mail/message-list.c:1653
+#: mail/em-folder-tree.c:955 mail/message-list.c:1653
 msgid "Cancel _Drag"
 msgstr "Avbryt _draoperasjon"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
 #: mail/em-folder-view.c:798 mail/em-folder-view.c:812
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Velg mappe"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
 msgid "C_opy"
 msgstr "K_opier"
 
-#: mail/em-folder-tree.c:2096
+#: mail/em-folder-tree.c:2088
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Oppretter mappe «%s»"
 
-#: mail/em-folder-tree.c:2282 mail/mail-component.c:706
+#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
 msgid "Create folder"
 msgstr "Opprett mappe"
 
-#: mail/em-folder-tree.c:2477
+#: mail/em-folder-tree.c:2463
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Endre navn på mappe «%s» til:"
 
-#: mail/em-folder-tree.c:2479
+#: mail/em-folder-tree.c:2465
 msgid "Rename Folder"
 msgstr "Endre navn på mappe"
 
-#: mail/em-folder-tree.c:2550 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Vis"
 
-#: mail/em-folder-tree.c:2551
+#: mail/em-folder-tree.c:2537
 msgid "Open in _New Window"
 msgstr "Åpne i _nytt vindu"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2560
+#: mail/em-folder-tree.c:2546
 msgid "_New Folder..."
 msgstr "_Ny mappe..."
 
-#: mail/em-folder-tree.c:2563
+#: mail/em-folder-tree.c:2549
 msgid "_Rename"
 msgstr "End_re navn"
 
-#: mail/em-folder-tree.c:2566 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "Egenska_per..."
 
@@ -13198,19 +12646,19 @@ msgstr "UTEN TREFF"
 msgid "Inbox"
 msgstr "Innboks"
 
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
 msgid "Loading..."
 msgstr "Laster..."
 
 #: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
 #: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:510
-#: mail/mail-component.c:556
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
+#: mail/mail-component.c:554
 msgid "Mail"
 msgstr "E-post"
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:691
+#: mail/em-folder-view.c:895 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "R_ediger som ny melding..."
@@ -13223,17 +12671,17 @@ msgstr "S_kriv ut"
 msgid "_Reply to Sender"
 msgstr "Sva_r til avsender"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:812
+#: mail/em-folder-view.c:901 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Svar til _listen"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:813
+#: mail/em-folder-view.c:902 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:815
+#: mail/em-folder-view.c:903 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Videresend"
@@ -13286,6 +12734,10 @@ msgstr "Fl_ytt til mappe..."
 msgid "_Copy to Folder..."
 msgstr "K_opier til mappe..."
 
+#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Etikett"
+
 #: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Legg til avsender i adresse_bok"
@@ -13335,12 +12787,12 @@ msgid "Filter on _Mailing List"
 msgstr "Filtrer på e-_postliste"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
+#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
 #: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Forvalgt"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1796
 msgid "Print Message"
 msgstr "Skriv ut melding"
 
@@ -13379,12 +12831,18 @@ msgstr "Cc"
 msgid "Bcc"
 msgstr "Bcc"
 
+#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
+#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Emne"
+
 #: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
 #: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Dato"
 
-#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
+#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
 msgid "Newsgroups"
 msgstr "Nyhetsgrupper"
 
@@ -13521,7 +12979,9 @@ msgstr ""
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
-msgstr "Denne meldingen er signert og gyldig hvilket betyr denne meldingen høyst sannsynlig er autentisk."
+msgstr ""
+"Denne meldingen er signert og gyldig hvilket betyr denne meldingen høyst "
+"sannsynlig er autentisk."
 
 #: mail/em-format-html-display.c:646
 msgid ""
@@ -13578,7 +13038,7 @@ msgstr ""
 "Denne meldingen er kryptert med en sterk algoritme. Det vil være meget "
 "vanskelig for en utenforstående å se innholdet i denne meldingen på kort tid."
 
-#: mail/em-format-html-display.c:757
+#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
 msgid "_View Certificate"
 msgstr "_Vis sertifikat"
 
@@ -13691,36 +13151,36 @@ msgid ""
 "xmldb' does not exist or is corrupt."
 msgstr ""
 
-#: mail/em-popup.c:701
+#: mail/em-popup.c:700
 msgid "Save As..."
 msgstr "Lagre som..."
 
-#: mail/em-popup.c:719
+#: mail/em-popup.c:718
 #, c-format
 msgid "untitled_image.%s"
 msgstr "bilde_uten_navn.%s"
 
-#: mail/em-popup.c:809
+#: mail/em-popup.c:808
 msgid "Set as _Background"
 msgstr "Sett som _bakgrunn"
 
-#: mail/em-popup.c:811
+#: mail/em-popup.c:810
 msgid "_Reply to sender"
 msgstr "Sva_r til avsender"
 
-#: mail/em-popup.c:860
+#: mail/em-popup.c:859
 msgid "_Open Link in Browser"
 msgstr "_Åpne lenke i nettleser"
 
-#: mail/em-popup.c:861
+#: mail/em-popup.c:860
 msgid "Se_nd message to..."
 msgstr "Se_nd melding til..."
 
-#: mail/em-popup.c:862
+#: mail/em-popup.c:861
 msgid "_Add to Addressbook"
 msgstr "Legg til i _adressebok"
 
-#: mail/em-popup.c:968
+#: mail/em-popup.c:967
 #, c-format
 msgid "Open in %s..."
 msgstr "Åpne i %s..."
@@ -14292,15 +13752,15 @@ msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importerer gammel e-post fra Elm"
 
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:226
+#: mail/importers/evolution-mbox-importer.c:221
+#: mail/importers/evolution-outlook-importer.c:255
 #: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Importerer..."
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:222
-#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/evolution-mbox-importer.c:223
+#: mail/importers/evolution-outlook-importer.c:257
 #: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Vennligst vent"
@@ -14322,21 +13782,23 @@ msgid "Elm"
 msgstr "Elm"
 
 #: mail/importers/evolution-mbox-importer.c:116
+#: mail/importers/evolution-outlook-importer.c:130
 msgid "Destination folder:"
 msgstr "Målmappe:"
 
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder to import into"
 msgstr "Velg mappe å importere til"
 
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:254
 #: mail/importers/mail-importer.c:226
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importerer «%s»"
 
-#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/evolution-outlook-importer.c:301
 #: mail/importers/mail-importer.c:140
 msgid "Importing mailbox"
 msgstr "Importerer postboks"
@@ -14482,15 +13944,15 @@ msgstr ""
 msgid "%s License Agreement"
 msgstr "Lisensavtale for %s"
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:167
+#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
 msgid "_Host:"
 msgstr "_Vert:"
 
-#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:151
+#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
 msgid "User_name:"
 msgstr "Bruker_navn:"
 
-#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:173
+#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
 msgid "_Path:"
 msgstr "S_ti:"
 
@@ -14518,66 +13980,66 @@ msgstr "%s e-postliste"
 msgid "Add Filter Rule"
 msgstr "Legg til filterregel"
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:461
 #, c-format
 msgid "%d deleted"
 msgstr "%d slettet"
 
-#: mail/mail-component.c:465
+#: mail/mail-component.c:463
 #, c-format
 msgid "%d junk"
 msgstr "%d søppel"
 
-#: mail/mail-component.c:488
+#: mail/mail-component.c:486
 #, c-format
 msgid "%d drafts"
 msgstr "%d skisser"
 
-#: mail/mail-component.c:490
+#: mail/mail-component.c:488
 #, c-format
 msgid "%d sent"
 msgstr "%d sendt"
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:490
 #, c-format
 msgid "%d unsent"
 msgstr "%d usendt"
 
-#: mail/mail-component.c:496
+#: mail/mail-component.c:494
 #, c-format
 msgid "%d total"
 msgstr "%d totalt"
 
-#: mail/mail-component.c:498
+#: mail/mail-component.c:496
 #, c-format
 msgid ", %d unread"
 msgstr ", %d ulest"
 
-#: mail/mail-component.c:658
+#: mail/mail-component.c:656
 msgid "New Mail Message"
 msgstr "Ny e-post melding"
 
-#: mail/mail-component.c:659
+#: mail/mail-component.c:657
 msgid "_Mail Message"
 msgstr "Send _melding"
 
-#: mail/mail-component.c:660
+#: mail/mail-component.c:658
 msgid "Compose a new mail message"
 msgstr "Skriv en ny e-postmelding"
 
-#: mail/mail-component.c:666
+#: mail/mail-component.c:664
 msgid "New Mail Folder"
 msgstr "Ny e-postmappe"
 
-#: mail/mail-component.c:667
+#: mail/mail-component.c:665
 msgid "Mail _Folder"
 msgstr "_E-postmappe"
 
-#: mail/mail-component.c:668
+#: mail/mail-component.c:666
 msgid "Create a new mail folder"
 msgstr "Opprett en ny e-postmappe"
 
-#: mail/mail-component.c:800
+#: mail/mail-component.c:798
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Feil under oppgradering av innstillinger eller mapper for e-post."
 
@@ -15287,7 +14749,8 @@ msgid ""
 "{0}\n"
 "Send anyway?"
 msgstr ""
-"Vennligst sjekk at følgende mottakere kan og ønsker å motta e-post som HTML:\n"
+"Vennligst sjekk at følgende mottakere kan og ønsker å motta e-post som "
+"HTML:\n"
 "{0}\n"
 "Send likevel?"
 
@@ -15309,7 +14772,6 @@ msgid ""
 msgstr ""
 
 #. mail:ask-send-only-bcc-contact primary
-#. mail:ask-send-only-bcc primary
 #: mail/mail-errors.xml.h:22 mail/mail-errors.xml.h:29
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "Er du sikker på at du ønsker å sende en melding med kun BCB-mottakere?"
@@ -15357,7 +14819,9 @@ msgstr "Bruk forvalgt mappe for skisser?"
 msgid ""
 "Unable to open the drafts folder for this account.  Use the system drafts "
 "folder instead?"
-msgstr "Kunne ikke åpne skisse-mappen for denne kontoen. Vil du bruke standard skisse-mappe?"
+msgstr ""
+"Kunne ikke åpne skisse-mappen for denne kontoen. Vil du bruke standard "
+"skisse-mappe?"
 
 #: mail/mail-errors.xml.h:41
 msgid "Use _Default"
@@ -15372,7 +14836,6 @@ msgid ""
 msgstr "Fjern alle slettede meldinger fra denne mappen permanent"
 
 #. mail:ask-expunge secondary
-#. mail:ask-empty-trash secondary
 #: mail/mail-errors.xml.h:45 mail/mail-errors.xml.h:50
 msgid "If you continue, you will not be able to recover these messages."
 msgstr ""
@@ -15408,7 +14871,7 @@ msgstr ""
 
 #. mail:camel-exception primary
 #: mail/mail-errors.xml.h:57
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgid "Your message with the subject \"{0}\" was not delivered."
 msgstr ""
 
 #. mail:camel-exception secondary
@@ -15441,13 +14904,6 @@ msgid "{0}."
 msgstr "{0}."
 
 #. mail:session-message-info secondary
-#. mail:session-message-info-cancel secondary
-#. mail:session-message-warning secondary
-#. mail:session-message-warning-cancel secondary
-#. mail:session-message-error secondary
-#. mail:session-message-error-cancel secondary
-#. mail:ask-session-password secondary
-#. mail:filter-load-error secondary
 #: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
 #: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
 #: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
@@ -15470,14 +14926,7 @@ msgstr "Feil under lasting av filterdefinisjoner."
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Kan ikke lagre til katalog «{0}»."
 
-#. mail:no-save-path secondary
-#: mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr "{1}"
-
 #. mail:no-create-path primary
-#. mail:no-write-path-exists primary
-#. mail:no-write-path-notfile primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
 msgid "Cannot save to file \"{0}\"."
@@ -15493,15 +14942,6 @@ msgstr "Kan ikke opprette katalog for lagring pga «{1}»"
 msgid "Cannot create temporary save directory."
 msgstr "Kan ikke opprette midlertidig katalog."
 
-#. mail:no-create-tmp-path secondary
-#. mail:no-delete-folder secondary
-#. system:no-save-file secondary
-#. system:no-load-file secondary
-#: mail/mail-errors.xml.h:100 mail/mail-errors.xml.h:112
-#: widgets/misc/e-system-errors.xml.h:11 widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr "pga «{1}»."
-
 #. mail:no-write-path-exists secondary
 #: mail/mail-errors.xml.h:104
 msgid "File exists but cannot overwrite it."
@@ -15523,7 +14963,6 @@ msgid "Cannot delete system folder \"{0}\"."
 msgstr "Kan ikke slette systemmappe «{0}»."
 
 #. mail:no-delete-spethal-folder secondary
-#. mail:no-rename-spethal-folder secondary
 #: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
@@ -15555,13 +14994,11 @@ msgid ""
 msgstr ""
 
 #. mail:no-rename-folder-exists primary
-#. mail:no-rename-folder primary
 #: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr ""
 
 #. mail:no-rename-folder-exists secondary
-#. mail:vfolder-notunique secondary
 #: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
 #, fuzzy
 msgid "A folder named \"{1}\" already exists. Please use a different name."
@@ -15574,26 +15011,22 @@ msgid "Because \"{2}\"."
 msgstr "Fordi «{2}»."
 
 #. mail:no-move-folder-nostore primary
-#. mail:no-move-folder-to-nostore primary
 #: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
 #, fuzzy
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Kunne ikke flytte mappe: %s"
 
 #. mail:no-move-folder-nostore secondary
-#. mail:no-copy-folder-nostore secondary
 #: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
 msgid "Cannot open source \"{2}\"."
 msgstr "Kan ikke åpne kilde «{2}»."
 
 #. mail:no-move-folder-to-nostore secondary
-#. mail:no-copy-folder-to-nostore secondary
 #: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
 msgid "Cannot open target \"{2}\"."
 msgstr "Kan ikke åpne mål «{2}»."
 
 #. mail:no-copy-folder-nostore primary
-#. mail:no-copy-folder-to-nostore primary
 #: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
 #, fuzzy
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
@@ -15610,7 +15043,6 @@ msgid "Cannot open source \"{1}\""
 msgstr "Kan ikke åpne kilde «{1}»"
 
 #. mail:account-incomplete primary
-#. mail:account-notunique primary
 #: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
 msgid "Cannot save changes to account."
 msgstr "Kan ikke lagre endringer for kontoen."
@@ -15767,7 +15199,7 @@ msgstr "_Overskriv"
 msgid "_Append"
 msgstr "_Legg til"
 
-#: mail/mail-folder-cache.c:791
+#: mail/mail-folder-cache.c:785
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinger %s"
@@ -16207,6 +15639,10 @@ msgstr "Videresend"
 msgid "No Response Necessary"
 msgstr "Ingen respons nødvendig"
 
+#: mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Les"
+
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Svar"
@@ -16305,43 +15741,47 @@ msgid ""
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:10
-msgid "Whether Evolution should start up in offline mode"
+msgid "Toolbar is visible"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:11
-msgid "Whether to skip the development warning dialog"
+msgid "Whether Evolution should start up in offline mode"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Whether the toolbar should be visible."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:14
 msgid "mail"
 msgstr "e-post"
 
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
-msgstr "Etter mange timers slit av"
-
-#: shell/e-shell.c:545 shell/e-shell.c:546
+#: shell/e-shell.c:588 shell/e-shell.c:589
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: shell/e-shell.c:743
+#: shell/e-shell.c:786
 msgid "Uknown system error."
 msgstr "Ukjent systemfeil."
 
-#: shell/e-shell.c:1100
+#: shell/e-shell.c:1143
 msgid "Invalid arguments"
 msgstr "Ugyldige argumenter"
 
-#: shell/e-shell.c:1102
+#: shell/e-shell.c:1145
 msgid "Cannot register on OAF"
 msgstr "Kan ikke registrere i OAF"
 
-#: shell/e-shell.c:1104
+#: shell/e-shell.c:1147
 msgid "Configuration Database not found"
 msgstr "Konfigurasjonsdatabase ikke funnet"
 
-#: shell/e-shell.c:1106
+#: shell/e-shell.c:1149
 msgid "Generic error"
 msgstr "Vanlig feil"
 
@@ -16400,7 +15840,7 @@ msgstr ""
 msgid "Select importer"
 msgstr "Velg importerer"
 
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1026
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
 #, c-format
 msgid "File %s does not exist"
 msgstr "Filen %s eksisterer ikke"
@@ -16428,31 +15868,32 @@ msgstr ""
 "Importerer %s\n"
 "Importerer oppføring 1."
 
-#: shell/e-shell-importer.c:549
+#: shell/e-shell-importer.c:570
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: shell/e-shell-importer.c:598
-msgid "_Filename:"
-msgstr "_Filnavn:"
+#: shell/e-shell-importer.c:626
+#, fuzzy
+msgid "F_ilename:"
+msgstr "Filnavn:"
 
-#: shell/e-shell-importer.c:603
+#: shell/e-shell-importer.c:631
 msgid "Select a file"
 msgstr "Velg en fil"
 
-#: shell/e-shell-importer.c:613
+#: shell/e-shell-importer.c:642
 msgid "File _type:"
 msgstr "Fil_type:"
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:681
 msgid "Import data and settings from _older programs"
 msgstr "Importer data og innstillinger fra _eldre programmer"
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:684
 msgid "Import a _single file"
 msgstr "Importer en en_kelt fil"
 
-#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -16460,25 +15901,25 @@ msgstr ""
 "Vennligst vent...\n"
 "Søker etter eksisterende oppsett"
 
-#: shell/e-shell-importer.c:727
+#: shell/e-shell-importer.c:756
 msgid "Starting Intelligent Importers"
 msgstr "Starter intelligent import"
 
-#: shell/e-shell-importer.c:853 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
 #, c-format
 msgid "From %s:"
 msgstr "Fra %s:"
 
-#: shell/e-shell-importer.c:1044
+#: shell/e-shell-importer.c:1073
 #, c-format
 msgid "No importer available for file %s"
 msgstr "Ingen importfunksjon tilgjengelig for fil %s"
 
-#: shell/e-shell-importer.c:1056
+#: shell/e-shell-importer.c:1085
 msgid "Unable to execute importer"
 msgstr "Kan ikke kjøre importprogram"
 
-#: shell/e-shell-importer.c:1169
+#: shell/e-shell-importer.c:1199
 msgid "_Import"
 msgstr "_Importer"
 
@@ -16528,56 +15969,57 @@ msgstr "Mappenavn kan ikke inneholde tegnet «#»."
 msgid "'.' and '..' are reserved folder names."
 msgstr "«.» og «..» er reserverte mappenavn."
 
-#: shell/e-shell-window.c:336
+#: shell/e-shell-window.c:337
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Evolution er koblet til. Klikk på denne knappen for å arbeide frakoblet."
 
-#: shell/e-shell-window.c:343
+#: shell/e-shell-window.c:344
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution er i ferd med å koble fra."
 
-#: shell/e-shell-window.c:349
+#: shell/e-shell-window.c:350
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Evolution er frakoblet. Klikk på denne knappen for å arbeide tilkoblet."
 
-#: shell/e-shell-window.c:621
+#: shell/e-shell-window.c:637
 #, c-format
 msgid "Switch to %s"
 msgstr "Bytt til %s"
 
-#: shell/e-shell-window-commands.c:64
+#: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 "GNOME pilot verktøyene ser ikke ut til å være installert på dette systemet."
 
-#: shell/e-shell-window-commands.c:72
+#: shell/e-shell-window-commands.c:74
 #, c-format
 msgid "Error executing %s."
 msgstr "Feil under kjøring av %s."
 
-#: shell/e-shell-window-commands.c:121
+#: shell/e-shell-window-commands.c:123
 msgid "Bug buddy is not installed."
 msgstr "Bug buddy er ikke installert."
 
-#: shell/e-shell-window-commands.c:129
+#: shell/e-shell-window-commands.c:131
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy kunne ikke kjøres."
 
-#: shell/e-shell-window-commands.c:171
-msgid "About Evolution"
-msgstr "Om Evolution"
+#: shell/e-shell-window-commands.c:323
+#, fuzzy
+msgid "Groupware Suite"
+msgstr "Groupwise"
 
-#: shell/e-shell-window-commands.c:382
+#: shell/e-shell-window-commands.c:563
 msgid "_Work Online"
 msgstr "Ar_beid tilkoblet"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "Ar_beid frakoblet"
 
-#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Arbeid frakoblet"
 
@@ -16884,13 +16326,11 @@ msgid "Continue"
 msgstr "Fortsett"
 
 #. shell:noshell title
-#. shell:noshell-reason title
 #: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
 msgid "Cannot start Evolution"
 msgstr "Kan ikke starte Evolution."
 
 #. shell:noshell primary
-#. shell:noshell-reason primary
 #: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
 msgid "Evolution can not start."
 msgstr "Evolution kan ikke starte."
@@ -16913,30 +16353,30 @@ msgid ""
 "Click help for details."
 msgstr ""
 
-#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:522
+#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
+#: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
 msgstr "Velg et sertifikat som skal importeres..."
 
-#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:604
+#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
+#: smime/gui/certificate-manager.c:638
 msgid "Certificate Name"
 msgstr "Navn på sertifikat"
 
-#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
+#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
 msgid "Purposes"
 msgstr "Hensikter"
 
-#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:517
+#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr "Serienummer"
 
-#: smime/gui/certificate-manager.c:267
+#: smime/gui/certificate-manager.c:271
 msgid "Expires"
 msgstr "Utgår"
 
-#: smime/gui/certificate-manager.c:417
+#: smime/gui/certificate-manager.c:446
 msgid "E-Mail Address"
 msgstr "E-postadresse"
 
@@ -17038,7 +16478,7 @@ msgstr ""
 "Før du stoler på denne CAen for noe formål bør du undersøke sertifikatet og "
 "dets regelsett og prosedyrer (hvis tilgjengelig)."
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
 msgid "Certificate"
 msgstr "Sertifikat"
 
@@ -17058,19 +16498,23 @@ msgstr "Vanlig navn (CN)"
 msgid "Contact Certificates"
 msgstr "Kontaktsertifikater"
 
-#: smime/gui/smime-ui.glade.h:21
-#, no-c-format
-msgid "Do you want to trust \"%s\" for the following purposes?"
-msgstr "Vil du stole på «%s» for følgende formål?"
+#: smime/gui/smime-ui.glade.h:20
+msgid "Do not trust the authenticity of this certificate"
+msgstr ""
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:21
 msgid "Dummy window only"
 msgstr "Dummyvindu"
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:22
 msgid "Edit"
 msgstr "Rediger"
 
+#: smime/gui/smime-ui.glade.h:23
+#, fuzzy
+msgid "Email Certificate Trust Settings"
+msgstr "Sertifikatmyndighet for e-post"
+
 #: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr "Sertifikat for e-postmottaker"
@@ -17103,244 +16547,255 @@ msgstr "Organisasjonsenhet (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "SHA1-fingeravtrykk"
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr "SSL-klientsertifikat"
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr "SSL-tjenersertifikat"
 
 #: smime/gui/smime-ui.glade.h:37
+msgid "Trust the authenticity of this certificate"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
 msgid "Trust this CA to identify email users."
 msgstr "Stol på denne CAen for å identifisere e-postbrukere."
 
-#: smime/gui/smime-ui.glade.h:38
+#: smime/gui/smime-ui.glade.h:39
 msgid "Trust this CA to identify software developers."
 msgstr "Stol på denne CAen for å identifisere programvareutviklere."
 
-#: smime/gui/smime-ui.glade.h:39
+#: smime/gui/smime-ui.glade.h:40
 msgid "Trust this CA to identify web sites."
 msgstr "Stol på denne CAen for identifisering av nettsteder."
 
-#: smime/gui/smime-ui.glade.h:40
+#: smime/gui/smime-ui.glade.h:41
 msgid "View"
 msgstr "Vis"
 
-#: smime/gui/smime-ui.glade.h:41
-msgid "View Certificate"
-msgstr "Vis sertifikat"
-
 #: smime/gui/smime-ui.glade.h:42
-msgid "You have been asked to trust a new Certificate Authority (CA)."
-msgstr "Du er blitt spurt om du vil stole på en ny sertifikatmyndighet (CA)."
-
-#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr "Du har sertifikater som identifiserer deg fra disse organisasjonene:"
 
-#: smime/gui/smime-ui.glade.h:44
+#: smime/gui/smime-ui.glade.h:43
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 "Du har sertifikater på lager som identifiserer disse sertifikatmyndighetene:"
 
-#: smime/gui/smime-ui.glade.h:45
+#: smime/gui/smime-ui.glade.h:44
 msgid "You have certificates on file that identify these people:"
 msgstr "Du har sertifikater som identifiserer disse menneskene på lager:"
 
-#: smime/gui/smime-ui.glade.h:46
+#: smime/gui/smime-ui.glade.h:45
 msgid "Your Certificates"
 msgstr "Dine sertifikater"
 
-#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
+#: smime/gui/smime-ui.glade.h:46
+msgid "_Edit CA Trust"
+msgstr ""
+
+#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d.%m.%Y"
 
-#: smime/lib/e-cert.c:478
+#. x509 certificate usage types
+#: smime/lib/e-cert.c:424
+#, fuzzy
+msgid "Sign"
+msgstr "Signering"
+
+#: smime/lib/e-cert.c:425
+#, fuzzy
+msgid "Encrypt"
+msgstr "Kryptert"
+
+#: smime/lib/e-cert.c:530
 msgid "Version"
 msgstr "Versjon"
 
-#: smime/lib/e-cert.c:493
+#: smime/lib/e-cert.c:545
 msgid "Version 1"
 msgstr "Versjon 1"
 
-#: smime/lib/e-cert.c:496
+#: smime/lib/e-cert.c:548
 msgid "Version 2"
 msgstr "Versjon 2"
 
-#: smime/lib/e-cert.c:499
+#: smime/lib/e-cert.c:551
 msgid "Version 3"
 msgstr "Versjon 3"
 
-#: smime/lib/e-cert.c:581
+#: smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 med RSA-kryptering"
 
-#: smime/lib/e-cert.c:584
+#: smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 med RSA-kryptering"
 
-#: smime/lib/e-cert.c:587
+#: smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 med RSA-kryptering"
 
-#: smime/lib/e-cert.c:590
+#: smime/lib/e-cert.c:642
 msgid "C"
 msgstr "C"
 
-#: smime/lib/e-cert.c:593
+#: smime/lib/e-cert.c:645
 msgid "CN"
 msgstr "CN"
 
-#: smime/lib/e-cert.c:596
+#: smime/lib/e-cert.c:648
 msgid "OU"
 msgstr "OU"
 
-#: smime/lib/e-cert.c:599
+#: smime/lib/e-cert.c:651
 msgid "O"
 msgstr "O"
 
-#: smime/lib/e-cert.c:602
+#: smime/lib/e-cert.c:654
 msgid "L"
 msgstr "L"
 
-#: smime/lib/e-cert.c:605
+#: smime/lib/e-cert.c:657
 msgid "DN"
 msgstr "DN"
 
-#: smime/lib/e-cert.c:608
+#: smime/lib/e-cert.c:660
 msgid "DC"
 msgstr "DC"
 
-#: smime/lib/e-cert.c:611
+#: smime/lib/e-cert.c:663
 msgid "ST"
 msgstr "ST"
 
-#: smime/lib/e-cert.c:614
+#: smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA-kryptering"
 
-#: smime/lib/e-cert.c:617
+#: smime/lib/e-cert.c:669
 msgid "Certificate Key Usage"
 msgstr "Bruksområde for sertifikatnøkkel"
 
-#: smime/lib/e-cert.c:620
+#: smime/lib/e-cert.c:672
 msgid "Netscape Certificate Type"
 msgstr "Netscape sertifikattype"
 
-#: smime/lib/e-cert.c:623
+#: smime/lib/e-cert.c:675
 msgid "Certificate Authority Key Identifier"
 msgstr "Nøkkelidentifikator for sertifikatmyndighet"
 
-#: smime/lib/e-cert.c:626
+#: smime/lib/e-cert.c:678
 msgid "UID"
 msgstr "UID"
 
-#: smime/lib/e-cert.c:635
+#: smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Objektidentifikator (%s)"
 
-#: smime/lib/e-cert.c:686
+#: smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
 msgstr "Algoritmeidentifikator"
 
-#: smime/lib/e-cert.c:694
+#: smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
 msgstr "Parametere for algoritme"
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:768
 msgid "Subject Public Key Info"
 msgstr "Informasjon om subjektets offentlige nøkkel"
 
-#: smime/lib/e-cert.c:721
+#: smime/lib/e-cert.c:773
 msgid "Subject Public Key Algorithm"
 msgstr "Algoritme for subjektets offentlige nøkkel"
 
-#: smime/lib/e-cert.c:736
+#: smime/lib/e-cert.c:788
 msgid "Subject's Public Key"
 msgstr "Subjektets offentlige nøkkel"
 
-#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
+#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
 msgid "Error: Unable to process extension"
 msgstr "Feil: Kan ikke prosessere utvidelse"
 
-#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
+#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr "Signeringspart for objekt"
 
-#: smime/lib/e-cert.c:782
+#: smime/lib/e-cert.c:834
 msgid "SSL Certificate Authority"
 msgstr "SSL-sertifikatmyndighet"
 
-#: smime/lib/e-cert.c:786
+#: smime/lib/e-cert.c:838
 msgid "Email Certificate Authority"
 msgstr "Sertifikatmyndighet for e-post"
 
-#: smime/lib/e-cert.c:814
+#: smime/lib/e-cert.c:866
 msgid "Signing"
 msgstr "Signering"
 
-#: smime/lib/e-cert.c:818
+#: smime/lib/e-cert.c:870
 #, fuzzy
 msgid "Non-repudiation"
 msgstr "Ingen informasjon"
 
-#: smime/lib/e-cert.c:822
+#: smime/lib/e-cert.c:874
 msgid "Key Encipherment"
 msgstr "Nøkkelchiffer"
 
-#: smime/lib/e-cert.c:826
+#: smime/lib/e-cert.c:878
 msgid "Data Encipherment"
 msgstr "Datachiffer"
 
-#: smime/lib/e-cert.c:830
+#: smime/lib/e-cert.c:882
 msgid "Key Agreement"
 msgstr "Nøkkelavtale"
 
-#: smime/lib/e-cert.c:834
+#: smime/lib/e-cert.c:886
 msgid "Certificate Signer"
 msgstr "Sertifikatsignerer"
 
-#: smime/lib/e-cert.c:838
+#: smime/lib/e-cert.c:890
 msgid "CRL Signer"
 msgstr "CRL-signerer"
 
-#: smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:938
 msgid "Critical"
 msgstr "Kritisk"
 
-#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
+#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
 msgid "Not Critical"
 msgstr "Ikke-kritisk"
 
-#: smime/lib/e-cert.c:912
+#: smime/lib/e-cert.c:964
 msgid "Extensions"
 msgstr "Utvidelser"
 
-#: smime/lib/e-cert.c:983
+#: smime/lib/e-cert.c:1035
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
 msgid "Certificate Signature Algorithm"
 msgstr "Signeringsalgoritme for sertifikat"
 
-#: smime/lib/e-cert.c:1048
+#: smime/lib/e-cert.c:1100
 msgid "Issuer"
 msgstr "Utsteder"
 
-#: smime/lib/e-cert.c:1102
+#: smime/lib/e-cert.c:1154
 msgid "Issuer Unique ID"
 msgstr "Unik ID for utsteder"
 
-#: smime/lib/e-cert.c:1121
+#: smime/lib/e-cert.c:1173
 msgid "Subject Unique ID"
 msgstr "Unik ID for subjekt"
 
-#: smime/lib/e-cert.c:1164
+#: smime/lib/e-cert.c:1216
 msgid "Certificate Signature Value"
 msgstr "Signaturverdi for sertifikat"
 
@@ -17490,7 +16945,7 @@ msgstr "Vis aktiv kontakt"
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "H_andlinger"
 
@@ -17649,7 +17104,7 @@ msgstr "L_ukk"
 #: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:3
+#: ui/evolution.xml.h:4
 msgid "Close"
 msgstr "Lukk"
 
@@ -17662,7 +17117,7 @@ msgid "Delete this item"
 msgstr "Slett denne oppføringen"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr "Hovedverktøylinje"
 
@@ -17705,7 +17160,7 @@ msgstr "Lagre denne oppføringen til disk"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:44
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "_File"
 msgstr "_Fil"
 
@@ -17962,13 +17417,13 @@ msgstr "_Reverser utvalg"
 msgid "_Threaded Message List"
 msgstr "Meldingsliste med _tråder"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Lukk dette vinduet"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "_Close"
 msgstr "L_ukk"
 
@@ -18364,7 +17819,7 @@ msgstr "_Forrige melding"
 msgid "_Quoted"
 msgstr "_Sitert"
 
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
 msgid "_Tools"
 msgstr "Ve_rktøy"
 
@@ -18661,106 +18116,120 @@ msgid "_Open Task"
 msgstr "_Åpne oppgave"
 
 #: ui/evolution.xml.h:1
-msgid "About Ximian Evolution..."
-msgstr "Om Ximian Evolution..."
+#, fuzzy
+msgid "About Evolution..."
+msgstr "Om Evolution"
 
 #: ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
 msgstr "Endre innstillinger for Evolution"
 
-#: ui/evolution.xml.h:5
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the visibility of the toolbar"
+msgstr "Endre egenskaper for denne mappen"
+
+#: ui/evolution.xml.h:6
 msgid "Create a new window displaying this folder"
 msgstr "Opprett et nytt vindu som viser denne mappen"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "A_vslutt"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Ximian Evolution _OBS"
+
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Avslutt programmet"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:10
 msgid "Forget _Passwords"
 msgstr "Glem passor_d"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:11
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Glem alle passord slik at du vil bli spurt om å oppgi dem igjen"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:12
 msgid "Import data from other programs"
 msgstr "Importer data fra andre programmer"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:14
 msgid "New _Window"
 msgstr "Nytt _vindu"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Pi_lot Settings..."
 msgstr "Innstillinger for pi_lot..."
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Send / Receive"
 msgstr "Send / motta"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Send queued items and retrieve new items"
 msgstr "Send kølagte oppføringer og hent nye oppføringer"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Set up Pilot configuration"
 msgstr "Konfigurer Pilot"
 
-#: ui/evolution.xml.h:17
-msgid "Show information about Ximian Evolution"
+#: ui/evolution.xml.h:19
+#, fuzzy
+msgid "Show information about Evolution"
 msgstr "Vis informasjon om Ximian Evolution"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:20
 msgid "Submit Bug Report"
 msgstr "Send inn feilrapport"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:21
 msgid "Submit _Bug Report"
 msgstr "Sen_d inn feilrapport"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Send inn en feilrapport med Bug Buddy"
 
-#: ui/evolution.xml.h:21
-msgid "Toggle whether we are working offline."
-msgstr "Skift til frakoblet arbeidsmodus."
-
 #: ui/evolution.xml.h:23
-msgid "Ximian Evolution _FAQ"
-msgstr "Ximian Evolution _OBS"
+#, fuzzy
+msgid "T_oolbar"
+msgstr "Hovedverktøylinje"
 
 #: ui/evolution.xml.h:24
-msgid "_About Ximian Evolution..."
-msgstr "_Om Ximian Evolution..."
+msgid "Toggle whether we are working offline."
+msgstr "Skift til frakoblet arbeidsmodus."
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "_About Evolution..."
+msgstr "Om Evolution"
+
+#: ui/evolution.xml.h:30
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "_Import..."
 msgstr "_Importer..."
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "_New"
 msgstr "_Ny"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "_Quick Reference"
 msgstr "_Hurtigreferanse"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_Send / Receive"
 msgstr "_Send / motta"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 msgid "_Window"
 msgstr "_Vindu"
 
@@ -18874,12 +18343,12 @@ msgstr "Definer visninger..."
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:425
+#: widgets/misc/e-calendar-item.c:423
 msgid "MTWTFSS"
 msgstr "MTOTFLS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1130
+#: widgets/misc/e-calendar-item.c:1128
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -19149,6 +18618,467 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% fullført)"
 
+#~ msgid "Failed to connect to LDAP server"
+#~ msgstr "Kunne ikke koble til LDAP-tjener"
+
+#~ msgid "Failed to authenticate with LDAP server"
+#~ msgstr "Kunne ikke autentisere mot LDAP-tjener"
+
+#~ msgid "Could not perform query on Root DSE"
+#~ msgstr "Kunne ikke utføre spørring på Root DSE"
+
+#~ msgid "The server responded with no supported search bases"
+#~ msgstr "Tjeneren svarte ikke med noen støttede basis for søk"
+
+#~ msgid "This server does not support LDAPv3 schema information"
+#~ msgstr "Denne tjeneren støtter ikke LDAPv3 schema-informasjon"
+
+#~ msgid "Error retrieving schema information"
+#~ msgstr "Feil under henting av schema-informasjon"
+
+#~ msgid "Server did not respond with valid schema information"
+#~ msgstr "Tjener svarte ikke med gyldig schema-informasjon"
+
+#~ msgid "  S_how Supported Bases "
+#~ msgstr " V_is støttede baser "
+
+#~ msgid "1:00"
+#~ msgstr "1:00"
+
+#~ msgid "5:00"
+#~ msgstr "5:00"
+
+#~ msgid "Connecting"
+#~ msgstr "Tilkobling"
+
+#~ msgid "Distinguished _name:"
+#~ msgstr "Distinguished _name:"
+
+#~ msgid "Email address:"
+#~ msgstr "E-postadresse:"
+
+#~ msgid "Evolution will use this DN to authenticate you with the server"
+#~ msgstr "Evolution vil bruke DN til å autentisere deg mot tjeneren"
+
+#~ msgid "One"
+#~ msgstr "En"
+
+#~ msgid "S_earch scope: "
+#~ msgstr "Sø_keområde: "
+
+#~ msgid "Searching"
+#~ msgstr "Søker"
+
+#~ msgid "Sub"
+#~ msgstr "Under"
+
+#~ msgid "This option controls how long a search will be run."
+#~ msgstr "Dette alternativet kontrollerer hvor lenge et søk vil kjøre."
+
+#~ msgid "U_se SSL/TLS:"
+#~ msgstr "B_ruk SSL/TLS:"
+
+#~ msgid "_Display name:"
+#~ msgstr "_Vis navn:"
+
+#~ msgid "_Port number:"
+#~ msgstr "_Portnummer:"
+
+#~ msgid "_Search base:"
+#~ msgstr "_Søkebase:"
+
+#~ msgid "_Server name:"
+#~ msgstr "_Tjenernavn:"
+
+#~ msgid "_Timeout (minutes):"
+#~ msgstr "_Tidsavbrudd (minutter):"
+
+#~ msgid "connecting-tab"
+#~ msgstr "connecting-tab"
+
+#~ msgid "general-tab"
+#~ msgstr "general-tab"
+
+#~ msgid "searching-tab"
+#~ msgstr "searching-tab"
+
+#~ msgid "Webcam:"
+#~ msgstr "Nettkamera:"
+
+#~ msgid "item7"
+#~ msgstr "oppføring7"
+
+#~ msgid "item8"
+#~ msgstr "oppføring8"
+
+#~ msgid "Category editor not available."
+#~ msgstr "Kategori editor ikke tilgjengelig."
+
+#~ msgid "Do you want to save changes?"
+#~ msgstr "Vil du lagre endringene?"
+
+#~ msgid "Error saving %s: %s"
+#~ msgstr "Feil under lagring av %s: %s"
+
+#~ msgid ""
+#~ "The addressbook backend for\n"
+#~ "%s\n"
+#~ "has crashed. You will have to restart Evolution in order to use it again"
+#~ msgstr ""
+#~ "Adressebokmotoren for\n"
+#~ "%s\n"
+#~ "har krasjet. Du vil måtte starte Evolution på nytt for å kunne bruke den "
+#~ "igjen"
+
+#~ msgid "Can not load URI"
+#~ msgstr "Kan ikke laste URI"
+
+#~ msgid "Calendar Properties"
+#~ msgstr "Kalenderegenskaper"
+
+#~ msgid "Remote"
+#~ msgstr "Ekstern"
+
+#~ msgid "Task List Properties"
+#~ msgstr "Egenskaper for oppgaveliste"
+
+#~ msgid "_Refresh Interval:"
+#~ msgstr "Oppdate_ringsintervall:"
+
+#~ msgid "_Source URL:"
+#~ msgstr "_Kilde-URL:"
+
+#~ msgid ""
+#~ "The event being deleted is a meeting, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "Hendelsen som slettes er et møte. Ønsker du å sende melding om "
+#~ "kansellering?"
+
+#~ msgid "Are you sure you want to cancel and delete this meeting?"
+#~ msgstr "Er du sikker på at du vil avlyse og slette dette møtet?"
+
+#~ msgid ""
+#~ "The task being deleted is assigned, would you like to send a cancellation "
+#~ "notice?"
+#~ msgstr ""
+#~ "Oppgaven som slettes er tildelt. Ønsker du å sende en melding om "
+#~ "kansellering?"
+
+#~ msgid "Are you sure you want to cancel and delete this task?"
+#~ msgstr "Er du sikker på at du vil avlyse og slette denne oppgaven?"
+
+#~ msgid ""
+#~ "The journal entry being deleted is published, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "Journaloppføringen som slettes er publisert. Vil du sende en melding om "
+#~ "avlysing?"
+
+#~ msgid "Are you sure you want to cancel and delete this journal entry?"
+#~ msgstr ""
+#~ "Er du sikker på at du vil avlyse og slette denne journaloppføringen?"
+
+#~ msgid "Are you sure you want to delete the appointment `%s'?"
+#~ msgstr "Er du sikker på at du vil slette avtalen «%s»?"
+
+#~ msgid "Are you sure you want to delete this untitled appointment?"
+#~ msgstr "Er du sikker på at du vil slette denne avtalen uten tittel?"
+
+#~ msgid "Are you sure you want to delete the task `%s'?"
+#~ msgstr "Er du sikker på at du vil slette oppgaven «%s»?"
+
+#~ msgid "Are you sure you want to delete this untitled task?"
+#~ msgstr "Er du sikker på at du vil slette denne oppgaven uten tittel?"
+
+#~ msgid "Are you sure you want to delete the journal entry `%s'?"
+#~ msgstr "Er du sikker på at du vil slette journaloppføringen «%s»?"
+
+#~ msgid "Are you sure want to delete this untitled journal entry?"
+#~ msgstr ""
+#~ "Er du sikker på at du vil slette denne journaloppføringen uten tittel?"
+
+#~ msgid "Are you sure you want to delete %d appointment?"
+#~ msgid_plural "Are you sure you want to delete %d appointments?"
+#~ msgstr[0] "Er du sikker på at du vil slette %d avtale?"
+#~ msgstr[1] "Er du sikker på at du vil slette %d avtaler?"
+
+#~ msgid "Are you sure you want to delete %d task?"
+#~ msgid_plural "Are you sure you want to delete %d tasks?"
+#~ msgstr[0] "Er du sikker på at du vil slette %d oppgave?"
+#~ msgstr[1] "Er du sikker på at du vil slette %d oppgaver?"
+
+#~ msgid "Are you sure you want to delete %d journal entry?"
+#~ msgid_plural "Are you sure you want to delete %d journal entries?"
+#~ msgstr[0] "Er du sikker på at du vil slette %d journaloppføring?"
+#~ msgstr[1] "Er du sikker på at du vil slette %d journaloppføringer?"
+
+#~ msgid "_Invite Others..."
+#~ msgstr "_Inviter andre..."
+
+#~ msgid ""
+#~ "This event has been changed, but has not been saved.\n"
+#~ "\n"
+#~ "Do you wish to save your changes?"
+#~ msgstr ""
+#~ "Denne hendelsen er endret, men har ikke blitt lagret..\n"
+#~ "\n"
+#~ "Vil du lagre endringene?"
+
+#~ msgid "_Discard Changes"
+#~ msgstr "_Forkast endringer"
+
+#~ msgid "Save Event"
+#~ msgstr "Lagre hendelse"
+
+#~ msgid "The meeting information has been created. Send it?"
+#~ msgstr "Møteinformasjonen er opprettet. Send den?"
+
+#~ msgid "The meeting information has changed. Send an updated version?"
+#~ msgstr "Møteinformasjonen er endret. Send en oppdatert versjon?"
+
+#~ msgid "The task assignment information has been created. Send it?"
+#~ msgstr "Informasjon om oppgavetildeling er opprettet. Send den?"
+
+#~ msgid "The task information has changed. Send an updated version?"
+#~ msgstr "Oppgaveinformasjonen er endret. Send en oppdatert versjon?"
+
+#~ msgid "The task backend for '%s' has crashed."
+#~ msgstr "Oppgavemotor for «%s» har krasjet."
+
+#~ msgid "The calendar backend for '%s' has crashed."
+#~ msgstr "Kalendermotoren for «%s» har krasjet."
+
+#~ msgid "Could not get article %s from NNTP server"
+#~ msgstr "Kunne ikke hente artikkel %s fra NNTP-tjener"
+
+#~ msgid "Posting not allowed by news server"
+#~ msgstr "Posting tillates ikke av nyhetstjener"
+
+#~ msgid "Failed to send newsgroups header: %s: message not posted"
+#~ msgstr ""
+#~ "Feil under sending av hode for nyhetsgruppe: %s: melding ikke postet"
+
+#~ msgid "Error posting to newsgroup: %s: message not posted"
+#~ msgstr "Feil under posting til nyhetsgruppe: %s: melding ikke postet"
+
+#~ msgid "Error reading response to posted message: message not posted"
+#~ msgstr "Feil under lesing av svar på postet melding: melding ikke postet"
+
+#~ msgid "Error posting message: %s: message not posted"
+#~ msgstr "Feil under posting av melding: %s: melding ikke postet"
+
+#~ msgid "Stream error"
+#~ msgstr "Feil i strøm"
+
+#~ msgid "Connection error: %s"
+#~ msgstr "Tilkoblingsfeil: %s"
+
+#~ msgid "Could not get group: %s"
+#~ msgstr "Kunne ikke hente gruppe: %s"
+
+#~ msgid "Could not get messages: unspecified error"
+#~ msgstr "Kunne ikke hente meldinger: uspesifisert feil"
+
+#~ msgid "Unknown server response: %s"
+#~ msgstr "Ukjent svar fra tjener: %s"
+
+#~ msgid "${1}"
+#~ msgstr "${1}"
+
+#~ msgid "Because \"${1}\"."
+#~ msgstr "Fordi «{1}»"
+
+#~ msgid "Adjust Score"
+#~ msgstr "Juster poeng"
+
+#~ msgid "Assign Color"
+#~ msgstr "Tilegn farge"
+
+#~ msgid "Assign Score"
+#~ msgstr "Gi poeng"
+
+#~ msgid "Attachments"
+#~ msgstr "Vedlegg"
+
+#~ msgid "Beep"
+#~ msgstr "Pip"
+
+#~ msgid "contains"
+#~ msgstr "inneholder"
+
+#~ msgid "Copy to Folder"
+#~ msgstr "Kopier til mappe"
+
+#~ msgid "Date received"
+#~ msgstr "Dato mottatt"
+
+#~ msgid "Date sent"
+#~ msgstr "Dato sendt"
+
+#~ msgid "Deleted"
+#~ msgstr "Slettet"
+
+#~ msgid "does not contain"
+#~ msgstr "inneholder ikke"
+
+#~ msgid "does not end with"
+#~ msgstr "slutter ikke med"
+
+#~ msgid "does not exist"
+#~ msgstr "eksisterer ikke"
+
+#~ msgid "does not return"
+#~ msgstr "returnerer ikke"
+
+#~ msgid "does not sound like"
+#~ msgstr "ligner ikke"
+
+#~ msgid "does not start with"
+#~ msgstr "starter ikke med"
+
+#~ msgid "Do Not Exist"
+#~ msgstr "Eksisterer ikke"
+
+#~ msgid "Draft"
+#~ msgstr "Skisse"
+
+#~ msgid "ends with"
+#~ msgstr "slutter med"
+
+#~ msgid "Exist"
+#~ msgstr "Eksisterer"
+
+#~ msgid "exists"
+#~ msgstr "eksisterer"
+
+#~ msgid "Expression"
+#~ msgstr "Uttrykk"
+
+#~ msgid "Follow Up"
+#~ msgstr "Følg opp"
+
+#~ msgid "is"
+#~ msgstr "er"
+
+#~ msgid "is after"
+#~ msgstr "er etter"
+
+#~ msgid "is before"
+#~ msgstr "er før"
+
+#~ msgid "is Flagged"
+#~ msgstr "er merket"
+
+#~ msgid "is greater than"
+#~ msgstr "er større enn"
+
+#~ msgid "is less than"
+#~ msgstr "er mindre enn"
+
+#~ msgid "is not"
+#~ msgstr "er ikke"
+
+#~ msgid "is not Flagged"
+#~ msgstr "er ikke merket"
+
+#~ msgid "Junk Test"
+#~ msgstr "Søppeltest"
+
+#~ msgid "Mailing list"
+#~ msgstr "E-postliste"
+
+#~ msgid "Message Body"
+#~ msgstr "Meldingskropp"
+
+#~ msgid "Message Header"
+#~ msgstr "Meldingshode"
+
+#~ msgid "Message is Junk"
+#~ msgstr "Meldingen er søppel"
+
+#~ msgid "Message is not Junk"
+#~ msgstr "Meldingen er ikke søppel"
+
+#~ msgid "Move to Folder"
+#~ msgstr "Flytt til mappe"
+
+#~ msgid "Pipe to Program"
+#~ msgstr "Send til program"
+
+#~ msgid "Play Sound"
+#~ msgstr "Spill lyd"
+
+#~ msgid "Recipients"
+#~ msgstr "Mottakere"
+
+#~ msgid "Regex Match"
+#~ msgstr "Treff på vanlig uttrykk"
+
+#~ msgid "Replied to"
+#~ msgstr "Svart til"
+
+#~ msgid "returns"
+#~ msgstr "returnerer"
+
+#~ msgid "returns greater than"
+#~ msgstr "returnerer større enn"
+
+#~ msgid "returns less than"
+#~ msgstr "returnerer mindre enn"
+
+#~ msgid "Run Program"
+#~ msgstr "Kjør program"
+
+#~ msgid "Sender"
+#~ msgstr "Avsender"
+
+#~ msgid "Set Status"
+#~ msgstr "Sett status"
+
+#~ msgid "Size (kB)"
+#~ msgstr "Størrelse (kB)"
+
+#~ msgid "sounds like"
+#~ msgstr "lyder som"
+
+#~ msgid "Source Account"
+#~ msgstr "Kildekonto"
+
+#~ msgid "Specific header"
+#~ msgstr "Spesifikk header"
+
+#~ msgid "starts with"
+#~ msgstr "starter med"
+
+#~ msgid "Stop Processing"
+#~ msgstr "Stopp behandling"
+
+#~ msgid "Unset Status"
+#~ msgstr "Nullstill status"
+
+#~ msgid "Brought to you by"
+#~ msgstr "Etter mange timers slit av"
+
+#~ msgid "_Filename:"
+#~ msgstr "_Filnavn:"
+
+#~ msgid "Do you want to trust \"%s\" for the following purposes?"
+#~ msgstr "Vil du stole på «%s» for følgende formål?"
+
+#~ msgid "View Certificate"
+#~ msgstr "Vis sertifikat"
+
+#~ msgid "You have been asked to trust a new Certificate Authority (CA)."
+#~ msgstr ""
+#~ "Du er blitt spurt om du vil stole på en ny sertifikatmyndighet (CA)."
+
+#~ msgid "About Ximian Evolution..."
+#~ msgstr "Om Ximian Evolution..."
+
+#~ msgid "_About Ximian Evolution..."
+#~ msgstr "_Om Ximian Evolution..."
+
 #~ msgid "Could not open the folder in '%s'"
 #~ msgstr "Kunne ikke åpne mappen i «%s»"
 
@@ -19336,9 +19266,6 @@ msgstr "%s (%d%% fullført)"
 #~ msgid "Primary _email:"
 #~ msgstr "Primær _e-post:"
 
-#~ msgid "S_pouse:"
-#~ msgstr "E_ktefelle:"
-
 #~ msgid "_Business:"
 #~ msgstr "Ar_beid:"
 
@@ -19354,9 +19281,6 @@ msgstr "%s (%d%% fullført)"
 #~ msgid "_Mobile:"
 #~ msgstr "_Mobil:"
 
-#~ msgid "_Office:"
-#~ msgstr "Kont_or:"
-
 #~ msgid "_Public Calendar URL:"
 #~ msgstr "_Offentlig kalender-URL:"
 
diff --git a/po/pl.po b/po/pl.po
index d1b1b895ec..262c62a0ce 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -11,14 +11,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-25 14:45+0200\n"
+"POT-Creation-Date: 2004-06-03 11:14-0400\n"
 "PO-Revision-Date: 2004-01-28 14:18+0100\n"
 "Last-Translator: GNOME PL Team <translators@gnome.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
@@ -75,13 +75,13 @@ msgstr "Nie można odczytać bloku aplikacji adresowej Pilota"
 msgid "Accessing LDAP Server anonymously"
 msgstr "Anonimowy dostęp do serwera LDAP"
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
 msgid "Failed to authenticate.\n"
 msgstr "Nie można dokonać uwierzytelnienia.\n"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sWprowadź hasło dla %s (użytkownik %s)"
@@ -126,35 +126,6 @@ msgstr "Tworzy nową grupę kontaktów"
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr "Nie można zaktualizować ustawień książki adresowej lub folderów."
 
-#: addressbook/gui/component/addressbook-config.c:483
-msgid "Failed to connect to LDAP server"
-msgstr "Nie można nawiązać połączenia z serwerem LDAP"
-
-#: addressbook/gui/component/addressbook-config.c:507
-msgid "Failed to authenticate with LDAP server"
-msgstr "Nie można dokonać uwierzytelnienia na serwerze LDAP"
-
-#: addressbook/gui/component/addressbook-config.c:535
-msgid "Could not perform query on Root DSE"
-msgstr "Nie można wykonać zapytania na głównym DSE"
-
-#: addressbook/gui/component/addressbook-config.c:840
-msgid "The server responded with no supported search bases"
-msgstr ""
-"Serwer nie przekazał w odpowiedzi żadnych obsługiwanych podstaw wyszukiwania"
-
-#: addressbook/gui/component/addressbook-config.c:1245
-msgid "This server does not support LDAPv3 schema information"
-msgstr "Serwer nie obsługuje informacji schematu LDAPv3"
-
-#: addressbook/gui/component/addressbook-config.c:1266
-msgid "Error retrieving schema information"
-msgstr "Błąd przy pobieraniu informacji o schemacie"
-
-#: addressbook/gui/component/addressbook-config.c:1274
-msgid "Server did not respond with valid schema information"
-msgstr "Odpowiedź serwera nie zawiera poprawnych informacji o schemacie"
-
 #: addressbook/gui/component/addressbook-migrate.c:68
 #: calendar/gui/migration.c:137 mail/em-migrate.c:1160
 msgid "Migrating..."
@@ -167,20 +138,16 @@ msgid "Migrating `%s':"
 msgstr "Migrowanie \"%s\":"
 
 #. create the local source group
-#. On This Computer is always first and VFolders is always last
-#: addressbook/gui/component/addressbook-migrate.c:508
+#: addressbook/gui/component/addressbook-migrate.c:464
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
 #: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
-#: mail/mail-component.c:247 mail/mail-vfolder.c:218
+#: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr "Na tym komputerze"
 
 #. Create the default Person addressbook
-#. Create the default Person calendar
-#. Create the default Person task list
-#. orange
-#: addressbook/gui/component/addressbook-migrate.c:516
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
 #: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
 #: mail/mail-config.glade.h:109
@@ -188,19 +155,19 @@ msgid "Personal"
 msgstr "Osobiste"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:524
+#: addressbook/gui/component/addressbook-migrate.c:480
 msgid "On LDAP Servers"
 msgstr "Na serwerze LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:652
+#: addressbook/gui/component/addressbook-migrate.c:608
 msgid "LDAP Servers"
 msgstr "Serwery LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:772
+#: addressbook/gui/component/addressbook-migrate.c:728
 msgid "Autocompletion Settings"
 msgstr "Ustawienia autouzupełniania"
 
-#: addressbook/gui/component/addressbook-migrate.c:1148
+#: addressbook/gui/component/addressbook-migrate.c:1104
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -212,7 +179,7 @@ msgstr ""
 "\n"
 "Zachowaj cierpliwość podczas gdy Evolution będzie migrował foldery..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1162
+#: addressbook/gui/component/addressbook-migrate.c:1118
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -222,7 +189,7 @@ msgstr ""
 "\n"
 "Zachowaj cierpliwość podczas gdy Evolution będzie migrował foldery..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1171
+#: addressbook/gui/component/addressbook-migrate.c:1127
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -232,7 +199,7 @@ msgstr ""
 "\n"
 "Zachowaj cierpliwość podczas gdy Evolution będzie migrował foldery..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1181
+#: addressbook/gui/component/addressbook-migrate.c:1137
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -243,42 +210,33 @@ msgstr ""
 "Zachowaj cierpliwość podczas gdy Evolution będzie migrował dane "
 "synchronizacji Pilota..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1194
-msgid ""
-"Some fields are no longer representable in the contact editor. Please wait "
-"while Evolution copies those fields to the 'Notes' field..."
-msgstr ""
-"Część pól została usunięta z edytora kontaktów. Poczekaj, aż Evolution "
-"skopiuje te pola do sekcji \"Notatki\"..."
-
-#: addressbook/gui/component/addressbook-view.c:674
+#: addressbook/gui/component/addressbook-view.c:675
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 "Książka adresowa \"%s\" zostanie usunięta. Czy na pewno chcesz kontynuować?"
 
-#: addressbook/gui/component/addressbook-view.c:761
+#: addressbook/gui/component/addressbook-view.c:754
 msgid "New Address Book"
 msgstr "Nowa książka adresowa"
 
-#: addressbook/gui/component/addressbook-view.c:762
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
+#: addressbook/gui/component/addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Usuń"
 
-#: addressbook/gui/component/addressbook-view.c:763
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-view.c:756
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Właściwości..."
 
 #. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:1002
+#: addressbook/gui/component/addressbook-view.c:995
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
 #: calendar/gui/migration.c:373
 msgid "Contacts"
@@ -357,10 +315,6 @@ msgid "Manage your S/MIME certificates here"
 msgstr "Zarządzanie certyfikatami S/Mime"
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-msgid "  S_how Supported Bases "
-msgstr " Wyświ_etl obsługiwane typy "
-
-#: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -382,184 +336,149 @@ msgstr " Wyświ_etl obsługiwane typy "
 msgid "*"
 msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr "1"
 
-#: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1:00"
-msgstr "1:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr "5"
 
-#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
-msgstr "5:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "<b>Authentication</b>"
 msgstr "<b>Uwierzytelnianie</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Display</b>"
 msgstr "<b>Wyświetlanie</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "<b>Downloading</b>"
 msgstr "<b>Pobieranie</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "<b>Searching</b>"
 msgstr "<b>Wyszukiwanie</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:11
 msgid "<b>Server Information</b>"
 msgstr "<b>Informacje o serwerze</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:12
 msgid "<b>Type:</b>"
 msgstr "<b>Rodzaj:</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add Contacts Group"
 msgstr "Dodawanie grupy kontaktów"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Address Book Properties"
 msgstr "Właściwości książki adresowej"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:42
 msgid "Always"
 msgstr "Zawsze"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr "Anonimowo"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:17
 #: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Proste"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
-msgid "Connecting"
-msgstr "Nawiązywanie połączenia"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 #: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Szczegóły"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
-msgid "Distinguished _name:"
-msgstr "_Wyróżniona nazwa:"
-
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished name"
 msgstr "Wyróżniona nazwa"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Download limit:"
 msgstr "Limit pobierania:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Email address"
 msgstr "Adres e-mail"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "Email address:"
-msgstr "Adres e-mail:"
-
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "Evolution will use this DN to authenticate you with the server"
-msgstr ""
-"Evolution wykorzysta przy uwierzytelnianiu na serwerze podaną wyróżnioną "
-"nazwę (DN)"
-
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:22
+#, fuzzy
 msgid ""
-"Evolution will use this email address to authenticate you with the server"
+"Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "Evolution wykorzysta przy uwierzytelnianiu na serwerze podany adres e-mail."
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Find Possible Search Bases"
 msgstr "Znajdź możliwe podstawy wyszukiwania"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:24
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Ogólne"
 
-#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
+#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:102
 msgid "Never"
 msgstr "Nigdy"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
-msgid "One"
-msgstr "Jeden"
-
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Only locations within starting point"
 msgstr "Położenia w obrębie punktu startowego"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
-msgid "S_earch scope: "
-msgstr "_Zakres wyszukiwania: "
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Search _base:"
+msgstr "Podstawa wyszukiwania:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:28
 msgid "Search base only"
 msgstr "Wyszukiwanie samej podstawy"
 
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid "Search base:"
 msgstr "Podstawa wyszukiwania:"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid "Search scope:"
 msgstr "Zakres wyszukiwania:"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
-msgid "Searching"
-msgstr "Wyszukiwanie"
-
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:31
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
-"server if\n"
-"your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL or TLS."
 msgstr ""
 "Wybranie tej opcji powoduje, że Evolution nawiąże połączenie z serwerem\n"
 "LDAP, tylko, jeśli obsługuje on protokół SSL lub TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a \n"
-"insecure environment. For example, if you and your LDAP server are behind a "
-"firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection "
-"is already\n"
-"secure."
+"you are in a insecure environment. For example, if you and your LDAP server "
+"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
+"because your connection is already secure."
 msgstr ""
 "Zaznaczenie tej opcji powoduje, że Evolution będzie próbował wykorzystywać "
 "tylko SSL/TLS\n"
@@ -569,13 +488,12 @@ msgstr ""
 "musi\n"
 "wykorzystywać protokołów SSL/TLS, gdyż twoje połączenie jest już bezpieczne."
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:33
+#, fuzzy
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
-"TLS.  This \n"
-"means that your connection will be insecure, and that you will be vulnerable "
-"to security\n"
-"exploits. "
+"TLS.  This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits. "
 msgstr ""
 "Wybranie tej opcji powoduje, że używany serwer nie obsługuje ani protokołu "
 "SSL ani TLS.\n"
@@ -583,37 +501,32 @@ msgstr ""
 "będą podatne\n"
 "na ewentualne ataki z zewnątrz."
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Starting point and locations within it"
 msgstr "Punkt startowy i zawierające się w nim położenia"
 
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Sub"
-msgstr "Podrzędne"
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr "Obsługiwane podstawy wyszukiwania"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
-"searches will \n"
-"begin. If you leave this blank, the search will begin at the root of the "
-"directory tree."
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
 msgstr ""
 "Podstawą wyszukiwania jest wyróżniona nazwa (DN) pozycji gdzie rozpocznie "
 "się wyszukiwanie. Po pozostawieniu tego pola pustym, wyszukiwanie rozpocznie "
 "się od głównego katalogu drzewa katalogów."
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:37
+#, fuzzy
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
-"the \n"
-"directory tree. A search scope of \"sub\" will include all entries below "
-"your search base.\n"
-"A search scope of \"one\" will only include the entries one level beneath "
-"your base.\n"
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
 msgstr ""
 "Zakres wyszukiwania określa głębokość wyszukiwania wgłąb drzewa katalogów.\n"
 "Zakres wyszukiwania \"sub\" dołączy wszystkie poniższe wpisy do podstawy "
@@ -621,23 +534,23 @@ msgstr ""
 "Zakres wyszukiwania \"one\" dołączy tylko wpisy leżące poziom ponad\n"
 "podstawą wyszukiwania.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:58
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "Jest to pełna nazwa serwera LDAP. Na przykład: \"ldap.mojafirma.com\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:39
+#, fuzzy
 msgid ""
-"This is the maximum number of entries to download. Setting this number to "
-"be \n"
+"This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr ""
 "Jest to maksymalna liczba pobieranych pozycji. Zbytnie zwiększenie tej "
 "liczby \n"
 "spowoduje spowolnienie działania książki adresowej."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -647,134 +560,113 @@ msgstr ""
 "Zwróć uwagę na fakt, że ustawienie jej na \"Adres e-mail\" wymaga "
 "anonimowego dostępu do serwera LDAP."
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:41
+#, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
-"list.\n"
-"It is for display purposes only. "
+"list. It is for display purposes only. "
 msgstr ""
 "Jest to nazwa serwera, która będzie widoczna na liście folderów Evolution.\n"
 "Nazwa ta przeznaczona jest tylko do wyświetlania."
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:42
+#, fuzzy
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. "
-"A \n"
-"list of standard ports has been provided. Ask your system administrator\n"
-"what port you should specify."
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
 msgstr ""
 "Jest to port na serwerze LDAP, z którym Evolution nawiąże połączenie.\n"
 "Podano listę standardowych portów. Informacje na temat numeru\n"
 "portu można uzyskać u administratora systemu."
 
-#: addressbook/gui/component/ldap-config.glade.h:67
-msgid "This option controls how long a search will be run."
-msgstr "Opcja ta kontroluje czas trwania wyszukiwania."
-
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid "Timeout:"
 msgstr "Przekroczenie czasu:"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
-msgid "U_se SSL/TLS:"
-msgstr "Uży_cie SSL/TLS:"
-
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr "Użycie wyróżnionej nazwy (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr "Użycie adresu e-mail"
 
-#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
+#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr "Kiedy możliwe"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:47
 msgid "_Add Contacts Group"
 msgstr "_Dodaj grupę kontaktów"
 
-#: addressbook/gui/component/ldap-config.glade.h:74
-#: calendar/gui/dialogs/calendar-setup.glade.h:12
-msgid "_Display name:"
-msgstr "_Wyświetlana nazwa:"
-
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr "_Limit pobierania:"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Email address:"
 msgstr "Adr_es e-mail:"
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:50
+#, fuzzy
+msgid "_Find Possible Search Bases"
+msgstr "Znajdź możliwe podstawy wyszukiwania"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Log in method:"
 msgstr "_Metoda logowania:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:171
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "_Log in:"
+msgstr "Logowanie"
+
+#: addressbook/gui/component/ldap-config.glade.h:53
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
 msgid "_Name:"
 msgstr "_Nazwa:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
-msgid "_Port number:"
-msgstr "Numer p_ortu:"
-
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid "_Port:"
 msgstr "_Port:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
-msgid "_Search base:"
-msgstr "_Podstawa wyszukiwania:"
-
-#: addressbook/gui/component/ldap-config.glade.h:82
-msgid "_Server name:"
-msgstr "_Nazwa serwera:"
+#: addressbook/gui/component/ldap-config.glade.h:55
+#, fuzzy
+msgid "_Search scope:"
+msgstr "Zakres wyszukiwania:"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:56
 msgid "_Server:"
 msgstr "_Serwer:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
-msgid "_Timeout (minutes):"
-msgstr "_Czas oczekiwania (minuty):"
+#: addressbook/gui/component/ldap-config.glade.h:57
+#, fuzzy
+msgid "_Timeout:"
+msgstr "Przekroczenie czasu:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:58
 msgid "_Use secure connection:"
 msgstr "_Bezpieczne połączenie:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "karty"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
-msgid "connecting-tab"
-msgstr "zakładka-nawiązywanie połączenia"
-
-#: addressbook/gui/component/ldap-config.glade.h:88
-msgid "general-tab"
-msgstr "zakładka-ogólne"
-
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:60
 #: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
 #: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "minut"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
-msgid "searching-tab"
-msgstr "zakładka-wyszukiwanie"
-
-#: addressbook/gui/component/select-names/e-select-names.c:497
+#: addressbook/gui/component/select-names/e-select-names.c:503
 #: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid "Select Contacts from Address Book"
 msgstr "Wybór kontaktów z książki adresowej"
 
-#: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
@@ -814,7 +706,7 @@ msgstr "Kontakt bez nazwy"
 
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:222
+#: addressbook/gui/widgets/e-addressbook-view.c:224
 msgid "Source"
 msgstr "Źródło"
 
@@ -879,9 +771,9 @@ msgid "<b>Work</b>"
 msgstr "<b>Praca</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:177
-#: addressbook/gui/widgets/eab-contact-display.c:342
-#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/widgets/eab-contact-display.c:334
+#: addressbook/gui/widgets/eab-contact-display.c:353
 msgid "AIM"
 msgstr "AIM"
 
@@ -915,15 +807,15 @@ msgid "Company:"
 msgstr "Firma:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:265
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
+#: addressbook/gui/contact-editor/e-contact-editor.c:266
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
 msgstr "Kontakt"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:519
+#: addressbook/gui/contact-editor/e-contact-editor.c:520
 msgid "Contact Editor"
 msgstr "Edytor kontaktów"
 
@@ -944,83 +836,81 @@ msgid "Full _Name..."
 msgstr "Pełna _nazwa..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-msgid "Home"
-msgstr "Dom"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "Home Page:"
 msgstr "Witryna domowa:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-#: calendar/gui/e-itip-control.c:930
-msgid "Location:"
-msgstr "Położenie:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "Komunikator MSN"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "Mailing Address"
 msgstr "Adresy pocztowe"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "Manager:"
 msgstr "Menedżer:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "Ni_ckname:"
 msgstr "Przy_domek:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "Notes:"
 msgstr "Notatki:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-msgid "Other"
-msgstr "Inne"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#, fuzzy
+msgid "Office:"
+msgstr "Biuro"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "PO Box:"
 msgstr "Skrytka pocztowa:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "Personal Information"
 msgstr "Informacje osobiste"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "Profession:"
 msgstr "Zawód:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#, fuzzy
+msgid "Spouse:"
+msgstr "Małżonek"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "State/Province:"
 msgstr "Stan/Prowincja:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "Title:"
 msgstr "Tytuł:"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+msgid "Video Chat:"
+msgstr ""
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "Wants to receive HTML mail"
 msgstr "Chce otrzymywać listy w formacie HTML"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:42
-msgid "Webcam:"
-msgstr "Kamera internetowa:"
+#, fuzzy
+msgid "Web Log:"
+msgstr "Witryna WWW:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
+#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
 #: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
 #: mail/mail-config.glade.h:157
@@ -1042,17 +932,10 @@ msgstr "W_idoczny jako:"
 # FIXME - jak zobaczę to w akcji to będę wiedział czy nie zmienić 
 # tego na położenie czy coś innego
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "_Where:"
 msgstr "_Gdzie:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
-msgid "item7"
-msgstr "element7"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
-msgid "item8"
-msgstr "element8"
-
 #: addressbook/gui/contact-editor/eab-editor.c:315
 msgid ""
 "Are you sure you want\n"
@@ -1070,16 +953,16 @@ msgstr ""
 "usunąć ten kontakt?"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:351
-#: addressbook/gui/widgets/eab-contact-display.c:372
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Address"
 msgstr "Adres"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:286
+#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard.c:174
@@ -2057,84 +1940,81 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/contact-editor/e-contact-editor.c:179
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:337
+#: addressbook/gui/widgets/eab-contact-display.c:356
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
-#: addressbook/gui/widgets/eab-contact-display.c:347
-#: addressbook/gui/widgets/eab-contact-display.c:366
+#: addressbook/gui/contact-editor/e-contact-editor.c:180
+#: addressbook/gui/widgets/eab-contact-display.c:339
+#: addressbook/gui/widgets/eab-contact-display.c:358
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: addressbook/gui/widgets/eab-contact-display.c:338
+#: addressbook/gui/widgets/eab-contact-display.c:357
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:344
-#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#: addressbook/gui/widgets/eab-contact-display.c:355
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
+#: addressbook/gui/contact-editor/e-contact-editor.c:183
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:251
+#: addressbook/gui/contact-editor/e-contact-editor.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+msgid "Home"
+msgstr "Dom"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+msgid "Other"
+msgstr "Inne"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
 msgid "Source Book"
 msgstr "Książka źródłowa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:258
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Target Book"
 msgstr "Książka docelowa"
 
 # FIXME - trzeba zobaczyć czy jest dobrze
-#: addressbook/gui/contact-editor/e-contact-editor.c:272
+#: addressbook/gui/contact-editor/e-contact-editor.c:273
 msgid "Is New Contact"
 msgstr "Jest nowym kontaktem"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:279
+#: addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Writable Fields"
 msgstr "Pola do zapisu"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:293
+#: addressbook/gui/contact-editor/e-contact-editor.c:294
 msgid "Changed"
 msgstr "Zmienione"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2294
-msgid "Category editor not available."
-msgstr "Edytor kategorii nie jest dostępny."
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2302
+#: addressbook/gui/contact-editor/e-contact-editor.c:2352
 msgid "This contact belongs to these categories:"
 msgstr "Ten kontakt przynależy do następujących kategorii:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2379
+#: addressbook/gui/contact-editor/e-contact-editor.c:2429
 msgid "Please select an image for this contact"
 msgstr "Wybierz obraz dla tego kontaktu"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2383
+#: addressbook/gui/contact-editor/e-contact-editor.c:2433
 msgid "No image"
 msgstr "Brak obrazu"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2560
-#: addressbook/gui/contact-editor/e-contact-editor.c:2723
-msgid ""
-"You are moving the contact from one address book to another, but it cannot "
-"be removed from the source. Do you want to save a copy instead?"
-msgstr ""
-"Kontakt jest przenoszony z jednej książki adresowej do drugiej, ale nie "
-"można go usunąć ze źródła. Czy zamiast przenoszenia zapisać kopię?"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2607
+#: addressbook/gui/contact-editor/e-contact-editor.c:2636
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2142,7 +2022,12 @@ msgstr ""
 "Dane kontaktu są niepoprawne:\n"
 "\n"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2700
+#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#, fuzzy
+msgid "Invalid contact."
+msgstr "%d kontakt"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2723
 msgid ""
 "The contact cannot be saved to the selected address book. Do you want to "
 "discard changes?"
@@ -2150,12 +2035,19 @@ msgstr ""
 "Nie można zapisać kontaktu do wybranej książki adresowej. Czy porzucić "
 "zmiany?"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2704
-#: addressbook/gui/contact-editor/e-contact-editor.c:2728
-#: addressbook/gui/widgets/eab-gui-util.c:208
+#: addressbook/gui/contact-editor/e-contact-editor.c:2727
+#: addressbook/gui/contact-editor/e-contact-editor.c:2751
 msgid "_Discard"
 msgstr "_Porzuć"
 
+#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+msgid ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+"Kontakt jest przenoszony z jednej książki adresowej do drugiej, ale nie "
+"można go usunąć ze źródła. Czy zamiast przenoszenia zapisać kopię?"
+
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:62
 msgid "AOL Instant Messenger"
 msgstr "Komunikator internetowy AOL"
@@ -2333,30 +2225,30 @@ msgstr "Nazwa _listy:"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Wprowadź adres e-mail lub przeciągnij kontakt do poniższej listy:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "contact-list-editor"
 msgstr "Edytor listy kontaktów"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:153
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:215
+#: addressbook/gui/widgets/e-addressbook-view.c:217
 #: addressbook/gui/widgets/e-minicard-view.c:460
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Książka"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
 msgid "Is New List"
 msgstr "Jest nową listą"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:215
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
 msgid "Contact List Editor"
 msgstr "Edytor listy kontaktów"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:438
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
 msgid "Save List as VCard"
 msgstr "Zapisz listę w formacie VCard"
 
@@ -2404,145 +2296,145 @@ msgid "Advanced Search"
 msgstr "Zaawansowane wyszukiwanie"
 
 # FIXME - dobrze czy nie?
-#: addressbook/gui/widgets/eab-contact-display.c:129
-#: addressbook/gui/widgets/eab-contact-display.c:192
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
 msgid "(map)"
 msgstr "(mapa)"
 
 # FIXME - dobrze czy nie?
-#: addressbook/gui/widgets/eab-contact-display.c:139
-#: addressbook/gui/widgets/eab-contact-display.c:205
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
 msgid "map"
 msgstr "mapa"
 
-#: addressbook/gui/widgets/eab-contact-display.c:257
-#: addressbook/gui/widgets/eab-contact-display.c:533
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:525
 msgid "List Members"
 msgstr "Członkowie listy"
 
-#: addressbook/gui/widgets/eab-contact-display.c:329
-#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/eab-contact-display.c:321
+#: addressbook/gui/widgets/eab-contact-display.c:323
 msgid "E-mail"
 msgstr "E-mail"
 
-#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/eab-contact-display.c:332
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organizacja"
 
-#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "Position"
 msgstr "Pozycja"
 
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:354
 msgid "Groupwise"
 msgstr "Groupwise"
 
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:340
 msgid "Video Conferencing"
 msgstr "Konferencje wideo"
 
-#: addressbook/gui/widgets/eab-contact-display.c:349
-#: addressbook/gui/widgets/eab-contact-display.c:370
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Phone"
 msgstr "Telefon"
 
-#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:342
 msgid "Fax"
 msgstr "Faks"
 
-#: addressbook/gui/widgets/eab-contact-display.c:354
+#: addressbook/gui/widgets/eab-contact-display.c:346
 msgid "work"
 msgstr "praca"
 
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:359
 msgid "WWW"
 msgstr "WWW"
 
-#: addressbook/gui/widgets/eab-contact-display.c:368
-#: addressbook/gui/widgets/eab-contact-display.c:587
+#: addressbook/gui/widgets/eab-contact-display.c:360
+#: addressbook/gui/widgets/eab-contact-display.c:579
 msgid "Blog"
 msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/eab-contact-display.c:363
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Telefon komórkowy"
 
-#: addressbook/gui/widgets/eab-contact-display.c:375
+#: addressbook/gui/widgets/eab-contact-display.c:367
 msgid "personal"
 msgstr "osobiste"
 
-#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/eab-contact-display.c:374
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Notatka"
 
-#: addressbook/gui/widgets/eab-contact-display.c:548
+#: addressbook/gui/widgets/eab-contact-display.c:540
 msgid "Job Title"
 msgstr "Tytuł służbowy"
 
-#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/eab-contact-display.c:544
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:774
+#: smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "E-mail"
 
-#: addressbook/gui/widgets/eab-contact-display.c:579
+#: addressbook/gui/widgets/eab-contact-display.c:571
 msgid "Home page"
 msgstr "Witryna domowa"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 msgid "Success"
 msgstr "Sukces"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Backend busy"
 msgstr "Wsparcie zajęte"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Repository offline"
 msgstr "Repozytorium rozłączone"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Address Book does not exist"
 msgstr "Książka adresowa nie istnieje"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "No Self Contact defined"
 msgstr "Nie zdefiniowano własnego kontaktu"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Permission denied"
 msgstr "Brak uprawnień"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Contact not found"
 msgstr "Nie odnaleziono kontaktu"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Contact ID already exists"
 msgstr "Kontakt z tym ID już istnieje"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Protocol not supported"
 msgstr "Protokół nie jest obsługiwany"
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:60
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:233
 #: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
@@ -2555,37 +2447,37 @@ msgid "Cancelled"
 msgstr "Anulowano"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Could not cancel"
 msgstr "Nie można anulować"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Authentication Failed"
 msgstr "Uwierzytelnienie nie powiodło się"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Authentication Required"
 msgstr "Wymagane uwierzytelnienie"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:66
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "TLS not Available"
 msgstr "TLS nie jest dostępny"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#: addressbook/gui/widgets/eab-gui-util.c:66
 msgid "No such source"
 msgstr "Brak takiego źródła"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:69
+#: addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Other error"
 msgstr "Inny błąd"
 
-#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:90
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
@@ -2593,7 +2485,7 @@ msgstr ""
 "Nie można otworzyć tej książki adresowej. Upewnij się, że ścieżka istnieje "
 "oraz że ma ustawione odpowiednie uprawnienia dostępu."
 
-#: addressbook/gui/widgets/eab-gui-util.c:110
+#: addressbook/gui/widgets/eab-gui-util.c:97
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -2601,17 +2493,18 @@ msgstr ""
 "Nie można otworzyć tej książki adresowej. Może to być spowodowane użyciem "
 "niepoprawnego adresu URI lub niedostępnością serwera LDAP."
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:102
+#, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution you must compile the program from the CVS "
-"sources after retrieving OpenLDAP from the link below."
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
 msgstr ""
 "Używana kopia Evolution została skompilowana bez obsługi LDAP. Aby móc "
 "wykorzystać LDAP, należy pobrać OpenLDAP spod podanego poniżej adresu i "
 "ponownie skompilować Evolution ze źródeł dostępnych w CVS."
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:109
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -2619,11 +2512,7 @@ msgstr ""
 "Nie można otworzyć tej książki adresowej. Może to być spowodowane użyciem "
 "niepoprawnego adresu URI lub niedostępnością serwera."
 
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "Unable to open addressbook"
-msgstr "Nie można otworzyć książki adresowej"
-
-#: addressbook/gui/widgets/eab-gui-util.c:162
+#: addressbook/gui/widgets/eab-gui-util.c:129
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2636,7 +2525,7 @@ msgstr ""
 "Spróbuj doprecyzować zapytanie lub zwiększ limit w ustawieniach serwera "
 "katalogowego, powiązanego z tą książką adresową."
 
-#: addressbook/gui/widgets/eab-gui-util.c:168
+#: addressbook/gui/widgets/eab-gui-util.c:135
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -2648,52 +2537,48 @@ msgstr ""
 "swoje zapytanie lub zwiększ limit czasowy w preferencjach\n"
 "serwera katalogowego obsługującego tą książkę adresową."
 
-#: addressbook/gui/widgets/eab-gui-util.c:174
+#: addressbook/gui/widgets/eab-gui-util.c:141
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 "Podprogram obsługujący tę książkę adresową nie może przeanalizować tego "
 "zapytania."
 
-#: addressbook/gui/widgets/eab-gui-util.c:177
+#: addressbook/gui/widgets/eab-gui-util.c:144
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 "Program obsługujący tę książkę adresową odrzucił wykonanie tego zapytania."
 
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:147
 msgid "This query did not complete successfully."
 msgstr "Zapytanie nie zakończyło się pomyślnie."
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
-msgid "Do you want to save changes?"
-msgstr "Czy chcesz zapisać zmiany?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:169
 msgid "Error adding list"
 msgstr "Błąd przy dodawaniu listy"
 
-#: addressbook/gui/widgets/eab-gui-util.c:229
-#: addressbook/gui/widgets/eab-gui-util.c:652
+#: addressbook/gui/widgets/eab-gui-util.c:169
+#: addressbook/gui/widgets/eab-gui-util.c:580
 msgid "Error adding contact"
 msgstr "Błąd przy dodawaniu kontaktu"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying list"
 msgstr "Błąd przy modyfikacji listy"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying contact"
 msgstr "Błąd przy modyfikacji kontaktu"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:192
 msgid "Error removing list"
 msgstr "Błąd przy usuwaniu listy"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
-#: addressbook/gui/widgets/eab-gui-util.c:610
+#: addressbook/gui/widgets/eab-gui-util.c:192
+#: addressbook/gui/widgets/eab-gui-util.c:538
 msgid "Error removing contact"
 msgstr "Błąd przy usuwaniu kontaktu"
 
-#: addressbook/gui/widgets/eab-gui-util.c:334
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2702,7 +2587,7 @@ msgstr ""
 "Otwarcie %d kontakwó spowoduje jednoczesne otwarcie %d nowych okien.\n"
 "Czy na pewno chcesz wyświetlić te wszystkie kontakty?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:360
+#: addressbook/gui/widgets/eab-gui-util.c:300
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2711,50 +2596,45 @@ msgstr ""
 "%s istnieje.\n"
 "Czy chcesz go nadpisać?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:364
+#: addressbook/gui/widgets/eab-gui-util.c:304
 msgid "Overwrite"
 msgstr "Nadpisz"
 
-#: addressbook/gui/widgets/eab-gui-util.c:400
-#, c-format
-msgid "Error saving %s: %s"
-msgstr "Błąd przy zapisie %s: %s"
-
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:437
+#: addressbook/gui/widgets/eab-gui-util.c:365
 msgid "card.vcf"
 msgstr "karta.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:571
+#: addressbook/gui/widgets/eab-gui-util.c:499
 msgid "list"
 msgstr "lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:706
+#: addressbook/gui/widgets/eab-gui-util.c:634
 msgid "Move contact to"
 msgstr "Przeniesienie kontaktu do"
 
-#: addressbook/gui/widgets/eab-gui-util.c:708
+#: addressbook/gui/widgets/eab-gui-util.c:636
 msgid "Copy contact to"
 msgstr "Skopiowanie kontaktu do"
 
-#: addressbook/gui/widgets/eab-gui-util.c:711
+#: addressbook/gui/widgets/eab-gui-util.c:639
 msgid "Move contacts to"
 msgstr "Przeniesienie kontaktów do"
 
-#: addressbook/gui/widgets/eab-gui-util.c:713
+#: addressbook/gui/widgets/eab-gui-util.c:641
 msgid "Copy contacts to"
 msgstr "Skopiowanie kontaktów do"
 
 # FIXME - albo wybierz 
-#: addressbook/gui/widgets/eab-gui-util.c:716
+#: addressbook/gui/widgets/eab-gui-util.c:644
 msgid "Select target addressbook."
 msgstr "Wybór docelowej książki adresowej."
 
-#: addressbook/gui/widgets/eab-gui-util.c:939
+#: addressbook/gui/widgets/eab-gui-util.c:867
 msgid "Multiple VCards"
 msgstr "Plik VCard z wieloma pozycjami"
 
-#: addressbook/gui/widgets/eab-gui-util.c:942
+#: addressbook/gui/widgets/eab-gui-util.c:870
 #, c-format
 msgid "VCard for %s"
 msgstr "Plik VCard z pozycją %s"
@@ -2843,7 +2723,7 @@ msgstr[2] "%d kontaktów"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:229
+#: addressbook/gui/widgets/e-addressbook-view.c:231
 #: addressbook/gui/widgets/e-minicard-view.c:467
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
@@ -2861,142 +2741,130 @@ msgstr "Model"
 msgid "Error modifying card"
 msgstr "Błąd przy modyfikacji karty"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:163
 msgid "Name begins with"
 msgstr "Nazwa rozpoczyna się od"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:164
 msgid "Email begins with"
 msgstr "E-mail rozpoczyna się od"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:57
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Kategorią jest"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-#: calendar/gui/cal-search-bar.c:50
+#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Jakiekolwiek pole zawiera"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+#: addressbook/gui/widgets/e-addressbook-view.c:172
 msgid "Advanced..."
 msgstr "Zaawansowane..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:236
+#: addressbook/gui/widgets/e-addressbook-view.c:238
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:250
+#: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Rodzaj"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:506
+#: addressbook/gui/widgets/e-addressbook-view.c:508
 msgid "Address Book"
 msgstr "Książka adresowa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
 #: addressbook/gui/widgets/e-addressbook-view.c:2080
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard..."
 msgstr "Zapisz jako VCard..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 msgid "New Contact..."
 msgstr "Nowy kontakt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "New Contact List..."
 msgstr "Nowa lista kontaktów..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Go to Folder..."
 msgstr "Przejdź do folderu..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Import..."
 msgstr "Zaimportuj..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1066
 msgid "Search for Contacts..."
 msgstr "Szukaj kontaktów..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 msgid "Address Book Sources..."
 msgstr "Źródła książki adresowej..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1069
 msgid "Pilot Settings..."
 msgstr "Ustawienia Pilota..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Prześlij kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
 msgid "Send Message to Contact"
 msgstr "Wyślij list do kontaktu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Wydrukuj"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
+#: addressbook/gui/widgets/e-addressbook-view.c:1077
 msgid "Print Envelope"
 msgstr "Wydrukuj kopertę"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
+#: addressbook/gui/widgets/e-addressbook-view.c:1081
 msgid "Copy to Address Book..."
 msgstr "Skopiuj do książki adresowej..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1080
+#: addressbook/gui/widgets/e-addressbook-view.c:1082
 msgid "Move to Address Book..."
 msgstr "Przenieś do książki adresowej..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Wytnij"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Skopiuj"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1087
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Wklej"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:1092
+#: calendar/gui/e-calendar-view.c:1280
 msgid "Current View"
 msgstr "Bieżący widok"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1309
-#, c-format
-msgid ""
-"The addressbook backend for\n"
-"%s\n"
-"has crashed. You will have to restart Evolution in order to use it again"
-msgstr ""
-"Program obsługujący książkę adresową o URI\n"
-"%s\n"
-"nieoczekiwanie zakończył działanie. Aby znów móc jej użyć, należy ponownie "
-"uruchomić Evolution."
-
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1667
-#: calendar/gui/cal-search-bar.c:362
+#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Dowolna kategoria"
 
@@ -3102,7 +2970,7 @@ msgstr "Radio"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:257
+#: calendar/gui/e-meeting-list-view.c:234
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Rola"
@@ -3210,17 +3078,17 @@ msgstr "Widok karty"
 msgid "GTK Tree View"
 msgstr "Widok drzewiasty GTK"
 
-#: addressbook/gui/widgets/test-reflow.c:119
+#: addressbook/gui/widgets/test-reflow.c:106
 msgid "Reflow Test"
 msgstr "Test przeformatowania"
 
-#: addressbook/gui/widgets/test-reflow.c:120
+#: addressbook/gui/widgets/test-reflow.c:107
 #: addressbook/printing/test-contact-print-style-editor.c:54
 #: addressbook/printing/test-print.c:53
 msgid "Copyright (C) 2000, Ximian, Inc."
 msgstr "Copyright (C) 2000, Ximian, Inc."
 
-#: addressbook/gui/widgets/test-reflow.c:122
+#: addressbook/gui/widgets/test-reflow.c:109
 msgid "This should test the reflow canvas item"
 msgstr "Powinno to przetestować element przeformatowania"
 
@@ -3808,10 +3676,10 @@ msgid "Whether to show week numbers in date navigator"
 msgstr "Określa, czy wyświetlać numery tygodni w przeglądarce dat"
 
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:91
-#: calendar/gui/gnome-cal.c:1703
-#: camel/providers/groupwise/camel-gw-listener.c:304
-#: camel/providers/groupwise/camel-gw-listener.c:327
+#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/gnome-cal.c:1705
+#: camel/providers/groupwise/camel-gw-listener.c:311
+#: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
 msgstr "Kalendarz"
 
@@ -3831,7 +3699,7 @@ msgstr "Usunięcie zdarzeń starszych niż"
 
 #: calendar/gui/calendar-commands.c:363
 #: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:19 filter/filter.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
 msgid "days"
 msgstr "dni"
 
@@ -3841,10 +3709,6 @@ msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. %d = day of month, %b = abbreviated month name.
-#. You can change the order but don't change the
-#. specifiers or add anything.
 #: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
 #: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
 #: calendar/gui/e-week-view-main-item.c:329
@@ -3982,23 +3846,23 @@ msgstr "Widok tygodnia"
 msgid "Month View"
 msgstr "Widok miesiąca"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Zestawienie zawiera"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Opis zawiera"
 
-#: calendar/gui/cal-search-bar.c:54
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Komentarz zawiera"
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:53
 msgid "Location contains"
 msgstr "Położenie zawiera"
 
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
 msgid "Unmatched"
 msgstr "Niedopasowane"
 
@@ -4071,7 +3935,7 @@ msgstr "Adresat:"
 msgid "With these arguments:"
 msgstr "Argumenty programu:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
 msgid "dialog1"
 msgstr "dialog1"
 
@@ -4080,7 +3944,7 @@ msgid "extra times every"
 msgstr "dodatkowych razy co"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:20 filter/filter.glade.h:16
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr "godzin"
 
@@ -4127,7 +3991,7 @@ msgstr "Wysłanie listu"
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:921 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Zestawienie:"
 
@@ -4157,7 +4021,6 @@ msgid "hour(s)"
 msgstr "godzin"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:21
 msgid "minute(s)"
 msgstr "minut"
 
@@ -4165,27 +4028,27 @@ msgstr "minut"
 msgid "start of appointment"
 msgstr "początek terminu"
 
-#: calendar/gui/dialogs/calendar-setup.c:171
+#: calendar/gui/dialogs/calendar-setup.c:172
 msgid "You must specify a location to get the calendar from."
 msgstr "Należy podać położenie kalendarza."
 
-#: calendar/gui/dialogs/calendar-setup.c:179
+#: calendar/gui/dialogs/calendar-setup.c:180
 #, c-format
 msgid "The source location '%s' is not well-formed."
 msgstr "Położenie źródła \"%s\" nie jest poprawne."
 
 # FIXME - webcal - ma ktoś pomysł?
-#: calendar/gui/dialogs/calendar-setup.c:194
+#: calendar/gui/dialogs/calendar-setup.c:195
 #, c-format
 msgid "The source location '%s' is not a webcal source."
 msgstr "Położenie źródła \"%s\" nie jest źródłem kalendarza sieciowego."
 
-#: calendar/gui/dialogs/calendar-setup.c:266
+#: calendar/gui/dialogs/calendar-setup.c:275
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr "Źródło o nazwie \"%s\" już istnieje w wybranej grupie"
 
-#: calendar/gui/dialogs/calendar-setup.c:279
+#: calendar/gui/dialogs/calendar-setup.c:288
 #, c-format
 msgid ""
 "The group '%s' is remote. You must specify a location to get the calendar "
@@ -4206,52 +4069,31 @@ msgstr "Dodawanie grupy zadań"
 msgid "C_olor:"
 msgstr "K_olor:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "Calendar Properties"
-msgstr "Właściwości kalendarza"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:110
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
 msgid "Pick a color"
 msgstr "Wybór koloru"
 
-# FIXME - upewnić się
-#: calendar/gui/dialogs/calendar-setup.glade.h:8
-msgid "Remote"
-msgstr "Zdalny"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "Task List Properties"
-msgstr "Właściwości listy zadań"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
 msgid "_Add Calendar"
 msgstr "_Dodaj kalendarz"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
 msgid "_Add Group"
 msgstr "_Dodaj grupę"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-msgid "_Refresh Interval:"
-msgstr "_Czas odświeżania:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
 msgid "_Refresh:"
 msgstr "_Odświeżanie:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-msgid "_Source URL:"
-msgstr "_Adres URL źródła:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "_Type:"
 msgstr "_Rodzaj:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
 msgid "_URL:"
 msgstr "Adr_es URL:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
 msgid "weeks"
 msgstr "tygodni"
 
@@ -4363,7 +4205,7 @@ msgstr "Publikowanie informacji o zajętości"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:557
+#: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Piątek"
 
@@ -4377,7 +4219,7 @@ msgstr "Minut"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:553
+#: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Poniedziałek"
 
@@ -4387,7 +4229,7 @@ msgstr "_Nie"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Sobota"
 
@@ -4401,7 +4243,7 @@ msgstr "Wyświetlanie _numerów tygodni w przeglądarce dat"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:552
+#: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Niedziela"
 
@@ -4415,7 +4257,7 @@ msgstr "_Czw"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:556
+#: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Czwartek"
 
@@ -4429,7 +4271,7 @@ msgstr "Format czasu:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:554
+#: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Środa"
 
@@ -4439,7 +4281,7 @@ msgstr "Początek _tygodnia:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:555
+#: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Środa"
 
@@ -4522,82 +4364,46 @@ msgstr "Ś_ro"
 msgid "before every appointment"
 msgstr "przed każdym terminem"
 
-#: calendar/gui/dialogs/cancel-comp.c:58
-msgid ""
-"The event being deleted is a meeting, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"Usuwane zdarzenie jest spotkaniem. Czy chcesz wysłać powiadomienie o "
-"anulowaniu?"
-
-#: calendar/gui/dialogs/cancel-comp.c:61
-msgid "Are you sure you want to cancel and delete this meeting?"
-msgstr "Czy na pewno chcesz anulować i usunąć to spotkanie?"
-
-#: calendar/gui/dialogs/cancel-comp.c:67
-msgid ""
-"The task being deleted is assigned, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"Usuwane zadanie jest przypisane. Czy chcesz wysłać powiadomienie o "
-"anulowaniu?"
-
-#: calendar/gui/dialogs/cancel-comp.c:70
-msgid "Are you sure you want to cancel and delete this task?"
-msgstr "Czy na pewno chcesz anulować i usunąć to zadanie?"
-
-#: calendar/gui/dialogs/cancel-comp.c:76
-msgid ""
-"The journal entry being deleted is published, would you like to send a "
-"cancellation notice?"
-msgstr ""
-"Usuwany wpis dziennika jest opublikowany. Czy chcesz wysłać powiadomienie o "
-"anulowaniu?"
-
-#: calendar/gui/dialogs/cancel-comp.c:79
-msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr "Czy na pewno chcesz anulować i usunąć ten wpis dziennika?"
-
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Zdarzenie zostało usunięte."
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "Zadanie zostało usunięte."
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:68
 msgid "This journal entry has been deleted."
 msgstr "Wpis dziennika został usunięty."
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  Wprowadzono zmiany. Anulować je wszystkie i zamknąć edytor?"
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s Nie wprowadzono żadnych zmian, zamknąć edytor?"
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "Zdarzenie zostało zmienione."
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "Zadanie zostało zmienione."
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:92
 msgid "This journal entry has been changed."
 msgstr "Wpis dziennika został zmieniony."
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  Wprowadzono zmiany. Anulować je wszystkie i uaktualnić edytor?"
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Nie wprowadzono żadnych zmian, uaktualnić edytor?"
@@ -4635,7 +4441,7 @@ msgid "No summary"
 msgstr "Brak zestawienia"
 
 #: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
 #: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Zapisz jako..."
@@ -4689,102 +4495,51 @@ msgstr "Nie można otworzyć celu"
 msgid "Destination is read only"
 msgstr "Cel jest tylko do odczytu"
 
-#: calendar/gui/dialogs/delete-comp.c:98
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "Czy na pewno chcesz usunąć termin \"%s\"?"
-
-#: calendar/gui/dialogs/delete-comp.c:101
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "Czy na pewno chcesz usunąć ten pozbawiony nazwy termin?"
-
-#: calendar/gui/dialogs/delete-comp.c:108
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "Czy na pewno chcesz usunąć zadanie \"%s\"?"
-
-#: calendar/gui/dialogs/delete-comp.c:111
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "Czy na pewno chcesz usunąć to pozbawione nazwy zadanie?"
-
-#: calendar/gui/dialogs/delete-comp.c:118
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "Czy na pewno chcesz usunąć wpis dziennika zatytułowany \"%s\"?"
-
-#: calendar/gui/dialogs/delete-comp.c:121
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "Czy na pewno chcesz usunąć ten niezatytułowany wpis dziennika?"
-
-#: calendar/gui/dialogs/delete-comp.c:136
-#, c-format
-msgid "Are you sure you want to delete %d appointment?"
-msgid_plural "Are you sure you want to delete %d appointments?"
-msgstr[0] "Czy na pewno chcesz usunąć %d termin?"
-msgstr[1] "Czy na pewno chcesz usunąć %d terminy?"
-msgstr[2] "Czy na pewno chcesz usunąć %d terminów?"
-
-#: calendar/gui/dialogs/delete-comp.c:143
-#, c-format
-msgid "Are you sure you want to delete %d task?"
-msgid_plural "Are you sure you want to delete %d tasks?"
-msgstr[0] "Czy na pewno chcesz usunąć %d zadanie?"
-msgstr[1] "Czy na pewno chcesz usunąć %d zadania?"
-msgstr[2] "Czy na pewno chcesz usunąć %d zadań?"
-
-#: calendar/gui/dialogs/delete-comp.c:150
-#, c-format
-msgid "Are you sure you want to delete %d journal entry?"
-msgid_plural "Are you sure you want to delete %d journal entries?"
-msgstr[0] "Czy na pewno chcesz usunąć %d wpis dziennika?"
-msgstr[1] "Czy na pewno chcesz usunąć %d wpisy dziennika?"
-msgstr[2] "Czy na pewno chcesz usunąć %d wpisów dziennika?"
-
-#: calendar/gui/dialogs/delete-error.c:53
+#: calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "Nie można usunąć zdarzenia na skutek błędu mechanizmu CORBA"
 
-#: calendar/gui/dialogs/delete-error.c:56
+#: calendar/gui/dialogs/delete-error.c:57
 msgid "The task could not be deleted due to a corba error"
 msgstr "Nie można usunąć zadania na skutek błędu mechanizmu CORBA"
 
-#: calendar/gui/dialogs/delete-error.c:59
+#: calendar/gui/dialogs/delete-error.c:60
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr "Nie można usunąć wpisu dziennika na skutek błędu mechanizmu CORBA"
 
-#: calendar/gui/dialogs/delete-error.c:62
+#: calendar/gui/dialogs/delete-error.c:63
 msgid "The item could not be deleted due to a corba error"
 msgstr "Nie można usunąć elementu na skutek błędu mechanizmu CORBA"
 
-#: calendar/gui/dialogs/delete-error.c:69
+#: calendar/gui/dialogs/delete-error.c:70
 msgid "The event could not be deleted because permission was denied"
 msgstr "Nie można usunąć zdarzenia na skutek braku uprawnień"
 
-#: calendar/gui/dialogs/delete-error.c:72
+#: calendar/gui/dialogs/delete-error.c:73
 msgid "The task could not be deleted because permission was denied"
 msgstr "Nie można usunąć zadania na skutek braku uprawnień"
 
-#: calendar/gui/dialogs/delete-error.c:75
+#: calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr "Nie można usunąć wpisu dziennika na skutek braku uprawnień"
 
-#: calendar/gui/dialogs/delete-error.c:78
+#: calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
 msgstr "Nie można usunąć elementu na skutek braku uprawnień"
 
-#: calendar/gui/dialogs/delete-error.c:85
+#: calendar/gui/dialogs/delete-error.c:86
 msgid "The event could not be deleted due to an error"
 msgstr "Nie można usunąć zdarzenia na skutek błędu"
 
-#: calendar/gui/dialogs/delete-error.c:88
+#: calendar/gui/dialogs/delete-error.c:89
 msgid "The task could not be deleted due to an error"
 msgstr "Nie można usunąć zadania na skutek błędu"
 
-#: calendar/gui/dialogs/delete-error.c:91
+#: calendar/gui/dialogs/delete-error.c:92
 msgid "The journal entry could not be deleted due to an error"
 msgstr "Nie można usunąć wpisu dziennika na skutek błędu"
 
-#: calendar/gui/dialogs/delete-error.c:94
+#: calendar/gui/dialogs/delete-error.c:95
 msgid "The item could not be deleted due to an error"
 msgstr "Nie można usunąć elementu na skutek błędu"
 
@@ -4916,13 +4671,8 @@ msgid "_Start time:"
 msgstr "Cza_s rozpoczęcia:"
 
 #. an empty string is the same as 'None'
-#. add a "None" option to the stores menu
-#. Put the "None" and "UTC" entries at the top of the combo's list.
-#. When "None" is selected we want the field to be cleared.
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
 #: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:3
+#: calendar/gui/dialogs/meeting-page.glade.h:4
 #: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
 #: filter/filter-rule.c:877 mail/em-account-prefs.c:427
 #: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
@@ -4952,8 +4702,8 @@ msgstr "_Oddeleguj do..."
 #. FIXME: need to disable for undeletable folders
 #: calendar/gui/dialogs/meeting-page.c:655
 #: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1310 calendar/gui/e-calendar-view.c:1342
-#: mail/em-folder-tree.c:2562 mail/em-folder-view.c:919
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
+#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -4961,7 +4711,7 @@ msgid "_Delete"
 msgstr "_Usuń"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:241
+#: calendar/gui/e-meeting-list-view.c:218
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Uczestnik"
@@ -4997,16 +4747,15 @@ msgid "Member"
 msgstr "Członek"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1048 calendar/gui/e-meeting-list-view.c:264
+#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:271
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
-#: mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-list-view.c:248
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Stan"
 
@@ -5014,20 +4763,20 @@ msgstr "Stan"
 msgid "Add A_ttendee"
 msgstr "Dodaj uczes_tnika"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "Add attendees from addressbook."
+msgstr "Dodaj nadawcę do _książki adresowej"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Organizator:"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
+#: calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "_Change Organizer"
 msgstr "_Zmień organizatora"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-#: calendar/gui/e-meeting-time-sel.c:417
-msgid "_Invite Others..."
-msgstr "_Zaproś innych..."
-
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
 msgstr "<b>Opcje kalendarza</b>"
@@ -5208,53 +4957,19 @@ msgstr "tygodni"
 msgid "year(s)"
 msgstr "lat"
 
-#: calendar/gui/dialogs/save-comp.c:54
-msgid ""
-"This event has been changed, but has not been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Zdarzenie zostało zmienione, lecz nie zostało ono zapisane.\n"
-"\n"
-"Czy chcesz zapisać wprowadzone zmiany?"
-
-#: calendar/gui/dialogs/save-comp.c:58
-msgid "_Discard Changes"
-msgstr "_Porzuć zmiany"
-
-#: calendar/gui/dialogs/save-comp.c:64
-msgid "Save Event"
-msgstr "Zapisz zdarzenie"
-
 # FIXME - A może Wybór miejsca docelowego?
-#: calendar/gui/dialogs/select-source-dialog.c:68
+#: calendar/gui/dialogs/select-source-dialog.c:69
 msgid "Select destination"
 msgstr "Wybierz miejsce docelowe"
 
-#: calendar/gui/dialogs/select-source-dialog.c:89
+#: calendar/gui/dialogs/select-source-dialog.c:90
 msgid "_Destination"
 msgstr "Miejsce _docelowe"
 
-#: calendar/gui/dialogs/select-source-dialog.c:91
+#: calendar/gui/dialogs/select-source-dialog.c:92
 msgid "Task List"
 msgstr "Lista zadań"
 
-#: calendar/gui/dialogs/send-comp.c:58
-msgid "The meeting information has been created. Send it?"
-msgstr "Została utworzona informacja o spotkaniu. Czy wysłać ją?"
-
-#: calendar/gui/dialogs/send-comp.c:61
-msgid "The meeting information has changed. Send an updated version?"
-msgstr "Informacje o spotkaniu zostały zmienione. Czy wysłać aktualną wersję?"
-
-#: calendar/gui/dialogs/send-comp.c:68
-msgid "The task assignment information has been created. Send it?"
-msgstr "Została utworzona informacja o przypisaniu zadania. Czy wysłać ją?"
-
-#: calendar/gui/dialogs/send-comp.c:72
-msgid "The task information has changed. Send an updated version?"
-msgstr "Informacje o zadaniu zostały zmienione. Czy wysłać aktualną wersję?"
-
 #: calendar/gui/dialogs/task-details-page.c:406
 msgid "Completed date is wrong"
 msgstr "Data zakończenia jest niepoprawna"
@@ -5353,7 +5068,7 @@ msgstr "Taj_ny"
 
 #: calendar/gui/dialogs/task-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:976 calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Opis:"
@@ -5522,7 +5237,7 @@ msgstr "Czas zakończenia:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:944
+#: calendar/gui/e-itip-control.c:943
 msgid "Status:"
 msgstr "Stan:"
 
@@ -5606,12 +5321,12 @@ msgstr "Zajęty"
 msgid "Deleting selected objects"
 msgstr "Usuwanie zaznaczonych obiektów"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
 msgid "Updating objects"
 msgstr "Aktualizowanie obiektów"
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1370
+#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
 #: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Otwórz"
@@ -5621,15 +5336,15 @@ msgid "Open _Web Page"
 msgstr "_Otwórz stronę WWW"
 
 #: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1291 calendar/gui/e-calendar-view.c:1376
+#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
 #: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "Z_apisz jako..."
 
 #: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1292
-#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
+#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
@@ -5637,15 +5352,15 @@ msgid "_Print..."
 msgstr "Wy_drukuj..."
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Wytnij"
 
 #: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1338
-#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2555
+#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
+#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
 #: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
@@ -5653,8 +5368,8 @@ msgid "_Copy"
 msgstr "S_kopiuj"
 
 #: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1273 calendar/gui/e-calendar-view.c:1299
-#: calendar/gui/e-calendar-view.c:1372 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
+#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
@@ -5720,67 +5435,67 @@ msgstr "Zestawienie"
 msgid "Task sort"
 msgstr "Porządek zadań"
 
-#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
 msgid "New _Appointment..."
 msgstr "Nowy _termin..."
 
-#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
+#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
 msgid "New All Day _Event"
 msgstr "Nowe zdarzenie _całodniowe"
 
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
+#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
 msgid "New Meeting"
 msgstr "Nowe spotkanie"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
 msgid "New Task"
 msgstr "Nowe zadanie"
 
-#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "_Dzisiaj"
 
-#: calendar/gui/e-calendar-view.c:1280
+#: calendar/gui/e-calendar-view.c:1283
 msgid "_Select Date..."
 msgstr "_Wybierz datę..."
 
-#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Opublikuj informację o zajętości"
 
-#: calendar/gui/e-calendar-view.c:1303
+#: calendar/gui/e-calendar-view.c:1306
 msgid "Cop_y to Calendar..."
 msgstr "S_kopiuj do kalendarza..."
 
-#: calendar/gui/e-calendar-view.c:1304
+#: calendar/gui/e-calendar-view.c:1307
 msgid "Mo_ve to Calendar..."
 msgstr "P_rzenieś do kalendarza..."
 
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1308
 msgid "_Schedule Meeting..."
 msgstr "Zap_lanuj spotkanie..."
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1309
 msgid "_Forward as iCalendar..."
 msgstr "Prześlij w formacie i_Calendar..."
 
-#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
 msgid "Delete this _Occurrence"
 msgstr "Usuń to _wystąpienie"
 
-#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
 msgid "Delete _All Occurrences"
 msgstr "Usuń w_szystkie wystąpienia"
 
-#: calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1349
 msgid "Go to _Today"
 msgstr "Przejdź do d_zisiaj"
 
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1351
 msgid "_Go to Date..."
 msgstr "_Przejdź do daty..."
 
-#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "_Ustawienia..."
 
@@ -5794,9 +5509,9 @@ msgstr "Data rozpoczęcia"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:961 calendar/gui/e-itip-control.c:1163
-#: calendar/gui/e-meeting-list-view.c:145
-#: calendar/gui/e-meeting-list-view.c:159 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
 #: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
 #: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
 #: camel/camel-tcp-stream-openssl.c:631
@@ -5822,13 +5537,13 @@ msgid "Assigned"
 msgstr "Przyporządkowano"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr "Tak"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:170 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "Nie"
 
@@ -5840,7 +5555,7 @@ msgstr "N"
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
 msgid "E"
 msgstr "E"
 
@@ -5859,20 +5574,12 @@ msgstr ""
 "45.436845,125.862501"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d/%m/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format.
 #: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
@@ -5903,10 +5610,6 @@ msgstr "pm"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#. strftime format %A = full weekday name, %d = day of
-#. month, %B = full month name. You can change the
-#. order but don't change the specifiers or add
-#. anything.
 #: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
@@ -5914,9 +5617,6 @@ msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#. strftime format %d = day of month, %b = abbreviated
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
 #: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
@@ -5927,11 +5627,11 @@ msgstr "%d %b"
 msgid "%02i minute divisions"
 msgstr "%02i-minutowe przedziały czasu"
 
-#: calendar/gui/e-itip-control.c:586
+#: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
 msgstr "Tak (powtarzalność złożona)"
 
-#: calendar/gui/e-itip-control.c:597
+#: calendar/gui/e-itip-control.c:596
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
@@ -5939,7 +5639,7 @@ msgstr[0] "Codziennie"
 msgstr[1] "Co %d dni"
 msgstr[2] "Co %d dni"
 
-#: calendar/gui/e-itip-control.c:602
+#: calendar/gui/e-itip-control.c:601
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
@@ -5947,7 +5647,7 @@ msgstr[0] "Co tydzień"
 msgstr[1] "Co %d tygodnie"
 msgstr[2] "Co %d tygodni"
 
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:603
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -5955,21 +5655,21 @@ msgstr[0] "Co tydzień w "
 msgstr[1] "Co %d tygodnie w "
 msgstr[2] "Co %d tygodni w "
 
-#: calendar/gui/e-itip-control.c:612
+#: calendar/gui/e-itip-control.c:611
 msgid " and "
 msgstr " i "
 
-#: calendar/gui/e-itip-control.c:619
+#: calendar/gui/e-itip-control.c:618
 #, c-format
 msgid "The %s day of "
 msgstr "%s. dzień "
 
-#: calendar/gui/e-itip-control.c:632
+#: calendar/gui/e-itip-control.c:631
 #, c-format
 msgid "The %s %s of "
 msgstr "%s. %s "
 
-#: calendar/gui/e-itip-control.c:639
+#: calendar/gui/e-itip-control.c:638
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
@@ -5977,7 +5677,7 @@ msgstr[0] "co miesiąc"
 msgstr[1] "co %d miesiące"
 msgstr[2] "co %d miesięcy"
 
-#: calendar/gui/e-itip-control.c:643
+#: calendar/gui/e-itip-control.c:642
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
@@ -5985,7 +5685,7 @@ msgstr[0] "Co roku"
 msgstr[1] "Co %d lata"
 msgstr[2] "Co %d lat"
 
-#: calendar/gui/e-itip-control.c:654
+#: calendar/gui/e-itip-control.c:653
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
@@ -5993,42 +5693,42 @@ msgstr[0] "łącznie %d raz"
 msgstr[1] "łącznie %d razy"
 msgstr[2] "łącznie %d razy"
 
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:662
 msgid ", ending on "
 msgstr ", kończąc dnia "
 
-#: calendar/gui/e-itip-control.c:687
+#: calendar/gui/e-itip-control.c:686
 msgid "<b>Starts:</b> "
 msgstr "<b>Początek:</b> "
 
-#: calendar/gui/e-itip-control.c:697
+#: calendar/gui/e-itip-control.c:696
 msgid "<b>Ends:</b> "
 msgstr "<b>Koniec:</b>"
 
-#: calendar/gui/e-itip-control.c:717
+#: calendar/gui/e-itip-control.c:716
 msgid "<b>Completed:</b> "
 msgstr "<b>Ukończone:</b> "
 
-#: calendar/gui/e-itip-control.c:727
+#: calendar/gui/e-itip-control.c:726
 msgid "<b>Due:</b> "
 msgstr "<b>Termin końcowy:</b>"
 
-#: calendar/gui/e-itip-control.c:765 calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
 msgid "iCalendar Information"
 msgstr "Informacje iKalendarza"
 
 #. Title
-#: calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:781
 msgid "iCalendar Error"
 msgstr "Błąd iKalendarza"
 
-#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
-#: calendar/gui/e-itip-control.c:880 calendar/gui/e-itip-control.c:897
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
 msgid "An unknown person"
 msgstr "Nieznana osoba"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:904
+#: calendar/gui/e-itip-control.c:903
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -6036,305 +5736,309 @@ msgstr ""
 "<br> Przejrzyj wyświetlone informacje, a następnie wybierz czynność z "
 "poniższego menu."
 
-#: calendar/gui/e-itip-control.c:919
+#: calendar/gui/e-itip-control.c:918
 msgid "<i>None</i>"
 msgstr "<i>Brak</i>"
 
-#: calendar/gui/e-itip-control.c:949 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:929
+msgid "Location:"
+msgstr "Położenie:"
+
+#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Zaakceptowane"
 
-#: calendar/gui/e-itip-control.c:953 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Próbna akceptacja"
 
-#: calendar/gui/e-itip-control.c:957 calendar/gui/e-meeting-list-view.c:182
+#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Odrzucone"
 
-#: calendar/gui/e-itip-control.c:1016 calendar/gui/e-itip-control.c:1044
-#: calendar/gui/e-itip-control.c:1070 calendar/gui/e-itip-control.c:1083
-#: calendar/gui/e-itip-control.c:1096 calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
 msgid "Choose an action:"
 msgstr "Wybór czynności:"
 
-#: calendar/gui/e-itip-control.c:1017
+#: calendar/gui/e-itip-control.c:1016
 msgid "Update"
 msgstr "Aktualizacja"
 
-#: calendar/gui/e-itip-control.c:1018 calendar/gui/e-itip-control.c:1049
-#: calendar/gui/e-itip-control.c:1072 calendar/gui/e-itip-control.c:1085
-#: calendar/gui/e-itip-control.c:1098 calendar/gui/e-itip-control.c:1111
-#: shell/e-shell.c:1098 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
+#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1044
 msgid "Accept"
 msgstr "Akceptacja"
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1045
 msgid "Tentatively accept"
 msgstr "Próbna akceptacja"
 
-#: calendar/gui/e-itip-control.c:1047
+#: calendar/gui/e-itip-control.c:1046
 msgid "Decline"
 msgstr "Odrzucenie"
 
-#: calendar/gui/e-itip-control.c:1071
+#: calendar/gui/e-itip-control.c:1070
 msgid "Send Free/Busy Information"
 msgstr "Wysłanie informacji o zajętości"
 
-#: calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1083
 msgid "Update respondent status"
 msgstr "Pobranie stanu wezwanej osoby"
 
-#: calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1096
 msgid "Send Latest Information"
 msgstr "Wysłanie najświeższej informacji"
 
-#: calendar/gui/e-itip-control.c:1110 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1185
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "Informacja o spotkaniu opublikowana przez <b>%s</b>."
 
-#: calendar/gui/e-itip-control.c:1187
+#: calendar/gui/e-itip-control.c:1186
 msgid "Meeting Information"
 msgstr "Informacje o spotkaniu"
 
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1191
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> zwraca się o obecność osoby %s na spotkaniu."
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1193
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> zwraca się o twoją obecność na spotkaniu."
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1194
 msgid "Meeting Proposal"
 msgstr "Propozycja spotkania"
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> chce dodania do istniejącego spotkania."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Update"
 msgstr "Aktualizacja spotkania"
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1203
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> chce otrzymać najświeższe informacje o spotkaniu."
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1204
 msgid "Meeting Update Request"
 msgstr "Zwrócenie się o aktualizację spotkania"
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> odpowiedział na zwrócenie się o spotkanie."
 
-#: calendar/gui/e-itip-control.c:1213
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Reply"
 msgstr "Odpowiedź na spotkanie"
 
-#: calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1219
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> anulował spotkanie."
 
-#: calendar/gui/e-itip-control.c:1221
+#: calendar/gui/e-itip-control.c:1220
 msgid "Meeting Cancellation"
 msgstr "Anulowanie spotkania"
 
-#: calendar/gui/e-itip-control.c:1228 calendar/gui/e-itip-control.c:1296
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1330
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> wysłał niezrozumiałą wiadomość."
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1228
 msgid "Bad Meeting Message"
 msgstr "Niepoprawna wiadomość o spotkaniu"
 
-#: calendar/gui/e-itip-control.c:1254
+#: calendar/gui/e-itip-control.c:1253
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "Informacja o zadaniu opublikowana przez <b>%s</b>."
 
-#: calendar/gui/e-itip-control.c:1255
+#: calendar/gui/e-itip-control.c:1254
 msgid "Task Information"
 msgstr "Informacje o zadaniu"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1259
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> zwraca się do osoby %s o wykonanie przez zadania."
 
-#: calendar/gui/e-itip-control.c:1262
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> zwraca się o wykonanie przez ciebie zadania."
 
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1262
 msgid "Task Proposal"
 msgstr "Propozycja zadania"
 
-#: calendar/gui/e-itip-control.c:1267
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> chce dodania do istniejącego zadania."
 
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Update"
 msgstr "Aktualizacja zadania"
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1271
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> chce otrzymać  najświeższe informacje o zadaniu."
 
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1272
 msgid "Task Update Request"
 msgstr "Zwrócenie się o aktualizację zadania"
 
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> odpowiedział na przypisanie zadania."
 
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Reply"
 msgstr "Odpowiedź na zadanie"
 
-#: calendar/gui/e-itip-control.c:1288
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> anulował zadanie."
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1288
 msgid "Task Cancellation"
 msgstr "Anulowanie zadania"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1296
 msgid "Bad Task Message"
 msgstr "Niepoprawna wiadomość o zadaniu"
 
-#: calendar/gui/e-itip-control.c:1316
+#: calendar/gui/e-itip-control.c:1315
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "Informacja o zajętości opublikowana przez <b>%s</b>."
 
-#: calendar/gui/e-itip-control.c:1317
+#: calendar/gui/e-itip-control.c:1316
 msgid "Free/Busy Information"
 msgstr "Informacja o zajętości"
 
-#: calendar/gui/e-itip-control.c:1321
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> zwraca się o informację o zajętości."
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1321
 msgid "Free/Busy Request"
 msgstr "Zwrócenie się o informację o zajętości"
 
-#: calendar/gui/e-itip-control.c:1326
+#: calendar/gui/e-itip-control.c:1325
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> odpowiedział na zwrócenie się o informację o zajętości."
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1326
 msgid "Free/Busy Reply"
 msgstr "Odpowiedź z informacją o zajętości"
 
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1331
 msgid "Bad Free/Busy Message"
 msgstr "Niepoprawna wiadomość o zajętości"
 
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1406
 msgid "The message does not appear to be properly formed"
 msgstr "Forma listu jest niepoprawna"
 
-#: calendar/gui/e-itip-control.c:1466
+#: calendar/gui/e-itip-control.c:1465
 msgid "The message contains only unsupported requests."
 msgstr "Lista zawiera tylko nieobsługiwane żądania."
 
-#: calendar/gui/e-itip-control.c:1497
+#: calendar/gui/e-itip-control.c:1496
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Załącznik nie zawiera poprawnego komunikatu kalendarza"
 
-#: calendar/gui/e-itip-control.c:1529
+#: calendar/gui/e-itip-control.c:1528
 msgid "The attachment has no viewable calendar items"
 msgstr "Załącznik nie zawiera dających się wyświetlić elementów kalendarza"
 
-#: calendar/gui/e-itip-control.c:1763
+#: calendar/gui/e-itip-control.c:1762
 msgid "Update complete\n"
 msgstr "Aktualizacja zakończona\n"
 
-#: calendar/gui/e-itip-control.c:1793 calendar/gui/e-itip-control.c:1865
+#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Nie można uaktualnić stanu uczestnika, ponieważ element już nie istnieje"
 
-#: calendar/gui/e-itip-control.c:1809 calendar/gui/e-itip-control.c:1847
+#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Obiekt jest niepoprawny i nie można go zaktualizować\n"
 
-#: calendar/gui/e-itip-control.c:1819
+#: calendar/gui/e-itip-control.c:1818
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Odpowiedź nie pochodzi od aktualnego uczestnika. Czy dodać nadawcę jako "
 "uczestnika?"
 
-#: calendar/gui/e-itip-control.c:1831
+#: calendar/gui/e-itip-control.c:1830
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Nie można uaktualnić stanu uczestnika, ponieważ jest on nieprawidłowy!\n"
 
-#: calendar/gui/e-itip-control.c:1850
+#: calendar/gui/e-itip-control.c:1849
 msgid "There was an error on the CORBA system\n"
 msgstr "Wystąpił błąd w podsystemie CORBA\n"
 
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1852
 msgid "Object could not be found\n"
 msgstr "Nie można odnaleźć obiektu\n"
 
-#: calendar/gui/e-itip-control.c:1856
+#: calendar/gui/e-itip-control.c:1855
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Brak uprawnień potrzebnych do aktualizacji kalendarza\n"
 
-#: calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1858
 msgid "Attendee status updated\n"
 msgstr "Stan uczestnika został uaktualniony\n"
 
-#: calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1861
 msgid "Attendee status could not be updated!\n"
 msgstr "Nie można uaktualnić stanu uczestnika!\n"
 
-#: calendar/gui/e-itip-control.c:1893
+#: calendar/gui/e-itip-control.c:1892
 msgid "Removal Complete"
 msgstr "Usunięcie zakończone"
 
-#: calendar/gui/e-itip-control.c:1916 calendar/gui/e-itip-control.c:1964
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
 msgid "Item sent!\n"
 msgstr "Element został wysłany!\n"
 
-#: calendar/gui/e-itip-control.c:1918 calendar/gui/e-itip-control.c:1968
+#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
 msgid "The item could not be sent!\n"
 msgstr "Nie można wysłać elementu!\n"
 
@@ -6375,74 +6079,74 @@ msgstr "data-początkowa"
 msgid "date-start"
 msgstr "data-końcowa"
 
-#: calendar/gui/e-meeting-list-view.c:62
+#: calendar/gui/e-meeting-list-view.c:59
 msgid "Chair Persons"
 msgstr "Osoby przewodniczące"
 
-#: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:480
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
 msgid "Required Participants"
 msgstr "Wymagani uczestnicy"
 
-#: calendar/gui/e-meeting-list-view.c:64
+#: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Opcjonalni uczestnicy"
 
-#: calendar/gui/e-meeting-list-view.c:65
+#: calendar/gui/e-meeting-list-view.c:62
 msgid "Resources"
 msgstr "Zasoby"
 
-#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
 #: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr "Osoba"
 
-#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "Grupa"
 
-#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr "Zasób"
 
-#: calendar/gui/e-meeting-list-view.c:144 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr "Pomieszczenie"
 
-#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr "Przewodniczenie"
 
-#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:127
 #: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
 msgid "Required Participant"
 msgstr "Wymagany uczestnik"
 
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr "Opcjonalny uczestnik"
 
-#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr "Nie uczestnik"
 
-#: calendar/gui/e-meeting-list-view.c:180 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:177
 #: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
 msgid "Needs Action"
 msgstr "Wymaga działania"
 
-#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
 #: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "Próbne"
 
-#: calendar/gui/e-meeting-list-view.c:184 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr "Oddelegowane"
@@ -6459,20 +6163,28 @@ msgstr "Poza biurem"
 msgid "No Information"
 msgstr "Brak informacji"
 
+#: calendar/gui/e-meeting-time-sel.c:417
+#, fuzzy
+msgid "Add attendees from addressbook"
+msgstr "Dodaj nadawcę do _książki adresowej"
+
 #: calendar/gui/e-meeting-time-sel.c:440
 msgid "_Options"
 msgstr "Opcj_e"
 
 #: calendar/gui/e-meeting-time-sel.c:457
-msgid "Show _Only Working Hours"
+#, fuzzy
+msgid "Show _only working hours"
 msgstr "Wyświetlanie _tylko godzin roboczych"
 
 #: calendar/gui/e-meeting-time-sel.c:467
-msgid "Show _Zoomed Out"
+#, fuzzy
+msgid "Show _zoomed out"
 msgstr "Wyświetlanie w p_owiększeniu"
 
 #: calendar/gui/e-meeting-time-sel.c:482
-msgid "_Update Free/Busy"
+#, fuzzy
+msgid "_Update free/busy"
 msgstr "_Uaktualnij informację o zajętości"
 
 #: calendar/gui/e-meeting-time-sel.c:497
@@ -6488,19 +6200,23 @@ msgid ">_>"
 msgstr ">_>"
 
 #: calendar/gui/e-meeting-time-sel.c:547
-msgid "_All People and Resources"
+#, fuzzy
+msgid "_All people and resources"
 msgstr "_Wszyscy ludzie i zasoby"
 
 #: calendar/gui/e-meeting-time-sel.c:556
-msgid "All _People and One Resource"
+#, fuzzy
+msgid "All _people and one resource"
 msgstr "Wszyscy _ludzie i jeden zasób"
 
 #: calendar/gui/e-meeting-time-sel.c:565
-msgid "_Required People"
+#, fuzzy
+msgid "_Required people"
 msgstr "Wy_magani ludzie"
 
 #: calendar/gui/e-meeting-time-sel.c:574
-msgid "Required People and _One Resource"
+#, fuzzy
+msgid "Required people and _one resource"
 msgstr "Wymagani ludzie i j_eden zasób"
 
 #: calendar/gui/e-meeting-time-sel.c:593
@@ -6520,10 +6236,6 @@ msgstr "%A, %d %B, %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#. This is a strftime() format string %a = abbreviated weekday
-#. name, %m = month number, %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. strftime format of a weekday and a date.
 #: calendar/gui/e-meeting-time-sel.c:2093
 #: calendar/gui/e-meeting-time-sel-item.c:456 e-util/e-time-utils.c:203
 #: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
@@ -6532,10 +6244,6 @@ msgstr "%a %d/%m/%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. This is the preferred date format for the locale.
-#. This is a strftime() format for a short date. %m = month,
-#. %d = day of month, %Y = year (all digits).
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
 #: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
 msgid "%m/%d/%Y"
@@ -6546,7 +6254,7 @@ msgstr "%d/%m/%Y"
 msgid "Enter the password for %s"
 msgstr "Wprowadź hasło dla %s"
 
-#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6555,19 +6263,14 @@ msgstr ""
 "Błąd przy URI %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr "Obsługa zadania dla \"%s\" spowodowała błąd."
-
 #. FIXME Loading should be async
 #. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:686
+#: calendar/gui/e-tasks.c:801
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Otwieranie zadań z %s"
 
-#: calendar/gui/e-tasks.c:709
+#: calendar/gui/e-tasks.c:824
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6576,54 +6279,49 @@ msgstr ""
 "Błąd przy otwieraniu %s:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:730
+#: calendar/gui/e-tasks.c:845
 msgid "Loading tasks"
 msgstr "Wczytywanie zadań"
 
-#: calendar/gui/e-tasks.c:834
+#: calendar/gui/e-tasks.c:949
 msgid "Completing tasks..."
 msgstr "Wykańczanie zadań..."
 
-#: calendar/gui/e-tasks.c:857
+#: calendar/gui/e-tasks.c:972
 msgid "Deleting selected objects..."
 msgstr "Usuwanie zaznaczonych obiektów..."
 
-#: calendar/gui/e-tasks.c:884
+#: calendar/gui/e-tasks.c:999
 msgid "Expunging"
 msgstr "Oczyszczanie"
 
-#: calendar/gui/e-tasks.c:960
+#: calendar/gui/e-tasks.c:1075
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
-#: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
+#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
+#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
 #: calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:705
 msgid "Tasks"
 msgstr "Zadania"
 
 # FIXME - upewnić się tego "at"
-#: calendar/gui/gnome-cal.c:1876
+#: calendar/gui/gnome-cal.c:1878
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Wczytywanie terminów z %s"
 
 # FIXME - upewnić się tego "at"
-#: calendar/gui/gnome-cal.c:1895
+#: calendar/gui/gnome-cal.c:1897
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Wczytywanie zadań z %s"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1920
 #, c-format
 msgid "Opening %s"
 msgstr "Otwieranie %s"
 
-#: calendar/gui/gnome-cal.c:2048
-#, c-format
-msgid "The calendar backend for '%s' has crashed."
-msgstr "Obsługa kalendarza dla \"%s\" spowodowała błąd."
-
-#: calendar/gui/gnome-cal.c:2894
+#: calendar/gui/gnome-cal.c:2906
 msgid "Purging"
 msgstr "Czyszczenie"
 
@@ -6820,7 +6518,7 @@ msgid "On The Web"
 msgstr "Na sieci web"
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "Nie można zmigrować starych ustawień z evolution/config.xmldb"
 
@@ -6831,7 +6529,7 @@ msgid "Unable to migrate calendar `%s'"
 msgstr "Nie można zmigrować kalendarza \"%s\""
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:869
+#: calendar/gui/migration.c:889
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Nie można zmigrować zadań w \"%s\""
@@ -7067,16 +6765,16 @@ msgstr "Wydruk elementu"
 msgid "Print Setup"
 msgstr "Ustawienia wydruku"
 
-#: calendar/gui/tasks-component.c:303
+#: calendar/gui/tasks-component.c:313
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr "Lista zadań \"%s\" zostanie usunięta. Czy na pewno chcesz kontynuować?"
 
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:371
 msgid "New Task List"
 msgstr "Nowa lista zadań"
 
-#: calendar/gui/tasks-component.c:398
+#: calendar/gui/tasks-component.c:408
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -7084,7 +6782,7 @@ msgstr[0] "%d zadanie"
 msgstr[1] "%d zadania"
 msgstr[2] "%d zadań"
 
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:502
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -7092,21 +6790,21 @@ msgstr[0] ", %d zaznaczone"
 msgstr[1] ", %d zaznaczone"
 msgstr[2] ", %d zaznaczonych"
 
-#: calendar/gui/tasks-component.c:447
+#: calendar/gui/tasks-component.c:457
 msgid "Failed upgrading tasks."
 msgstr "Nie można zaktualizować zadań."
 
-#: calendar/gui/tasks-component.c:526
+#: calendar/gui/tasks-component.c:749
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 "Nie można otworzyć listy zadań \"%s\" w celu utworzenia zdarzeń i spotkań"
 
-#: calendar/gui/tasks-component.c:538
+#: calendar/gui/tasks-component.c:761
 msgid "There is no calendar available for creating tasks"
 msgstr "Brak dostępnego kalendarza do utworzenia zadań"
 
-#: calendar/gui/tasks-component.c:576
+#: calendar/gui/tasks-component.c:799
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
@@ -7114,27 +6812,27 @@ msgstr ""
 "Wybrana lista zadań jest tylko do odczytu, nie można tworzyć zdarzeń. "
 "Wybierz kalendarz z możliwością zapisu."
 
-#: calendar/gui/tasks-component.c:804
+#: calendar/gui/tasks-component.c:1040
 msgid "New task"
 msgstr "Nowe zadanie"
 
-#: calendar/gui/tasks-component.c:805
+#: calendar/gui/tasks-component.c:1041
 msgid "_Task"
 msgstr "_Zadanie"
 
-#: calendar/gui/tasks-component.c:806
+#: calendar/gui/tasks-component.c:1042
 msgid "Create a new task"
 msgstr "Tworzy nowe zadanie"
 
-#: calendar/gui/tasks-component.c:812
+#: calendar/gui/tasks-component.c:1048
 msgid "New tasks group"
 msgstr "Nowa grupa zadań"
 
-#: calendar/gui/tasks-component.c:813
+#: calendar/gui/tasks-component.c:1049
 msgid "_Tasks Group"
 msgstr "_Grupa zadań"
 
-#: calendar/gui/tasks-component.c:814
+#: calendar/gui/tasks-component.c:1050
 msgid "Create a new tasks group"
 msgstr "Tworzy nową grupę zadań"
 
@@ -8964,15 +8662,15 @@ msgstr "(match-threads) nie jest dopuszczalne wewnątz match-all"
 msgid "(match-threads) requires a match type string"
 msgstr ""
 
-#: camel/camel-folder-search.c:785
+#: camel/camel-folder-search.c:784
 msgid "(match-threads) expects an array result"
 msgstr "(match-threads) oczekuje wyniku uszeregowanego"
 
-#: camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:790
 msgid "(match-threads) requires the folder set"
 msgstr "(match-threads) wymaga folderu"
 
-#: camel/camel-folder-search.c:880
+#: camel/camel-folder-search.c:879
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Wykonywanie zapytania na nieznanym nagłówku: %s"
@@ -9007,7 +8705,8 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
 #: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:705
+#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Anulowano."
@@ -9395,7 +9094,7 @@ msgstr "Wskazane dane uwierzytelniania są przeterminowane."
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1243
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Niepoprawna odpowiedź serwera na uwierzytelnienie."
 
@@ -9767,43 +9466,43 @@ msgstr "importowanie kluczy: niezaimplementowane"
 msgid "export keys: unimplemented"
 msgstr "eksportowanie kluczy: niezaimplementowane"
 
-#: camel/camel-store.c:215
+#: camel/camel-store.c:213
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr ""
 "Nie można pobrać folderu: Niepoprawna operacja na tym miejscu przechowywania"
 
-#: camel/camel-store.c:245
+#: camel/camel-store.c:243
 #, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr "Nie można utworzyć folderu \"%s\": folder istnieje"
 
-#: camel/camel-store.c:299
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 "Nie można utworzyć folderu: Niepoprawna operacja na tym miejscu "
 "przechowywania"
 
-#: camel/camel-store.c:327
+#: camel/camel-store.c:325
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Nie można utworzyć folderu: %s: folder istnieje"
 
-#: camel/camel-store.c:391 camel/camel-vee-store.c:354
+#: camel/camel-store.c:389 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Nie można usunąć folderu: %s: Niepoprawna operacja"
 
-#: camel/camel-store.c:441 camel/camel-vee-store.c:390
+#: camel/camel-store.c:439 camel/camel-vee-store.c:387
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Nie można zmienić nazwy folderu: %s: Niepoprawna operacja"
 
-#: camel/camel-store.c:813
+#: camel/camel-store.c:777
 msgid "Trash"
 msgstr "Śmietnik"
 
-#: camel/camel-store.c:815 filter/libfilter-i18n.h:35
-#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/mail-config.glade.h:95
+#: ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Śmieć"
 
@@ -10034,12 +9733,12 @@ msgstr "Brak listu %s w %s."
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Nie można skopiować lub przenieść listów do folderu wirtualnego"
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:374
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Nie można usunąć folderu: %s: Folder nie istnieje"
 
-#: camel/camel-vee-store.c:398
+#: camel/camel-vee-store.c:395
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Nie można zmienić nazwy folderu %s: Folder nie istnieje"
@@ -10106,8 +9805,8 @@ msgstr ""
 "Przy tej opcji połączenie z serwerem IMAP nastąpi przy użyciu hasła w "
 "postaci czystego tekstu."
 
-#: camel/providers/groupwise/camel-gw-listener.c:305
-#: camel/providers/groupwise/camel-gw-listener.c:328
+#: camel/providers/groupwise/camel-gw-listener.c:312
+#: camel/providers/groupwise/camel-gw-listener.c:335
 msgid "Checklist"
 msgstr "Lista sprawdzania"
 
@@ -10242,23 +9941,23 @@ msgstr ""
 "postaci czystego tekstu."
 
 #: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:429
+#: camel/providers/imap/camel-imap-store.c:428
 #, c-format
 msgid "IMAP server %s"
 msgstr "Serwer IMAP %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:431
+#: camel/providers/imap/camel-imap-store.c:430
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "usługa IMAP dla %s na %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:208
 #: camel/providers/imap4/camel-imap4-store.c:225
-#: camel/providers/imap/camel-imap-store.c:552
-#: camel/providers/imap/camel-imap-store.c:572
+#: camel/providers/imap/camel-imap-store.c:551
+#: camel/providers/imap/camel-imap-store.c:571
 #: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
+#: camel/providers/nntp/camel-nntp-store.c:209
 #: camel/providers/pop3/camel-pop3-store.c:175
 #: camel/providers/smtp/camel-smtp-transport.c:269
 #: camel/providers/smtp/camel-smtp-transport.c:285
@@ -10267,18 +9966,18 @@ msgid "Could not connect to %s (port %d): %s"
 msgstr "Nie można nawiązać połączenia z %s (port %d): %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:210
-#: camel/providers/imap/camel-imap-store.c:554
+#: camel/providers/imap/camel-imap-store.c:553
 #: camel/providers/pop3/camel-pop3-store.c:177
 #: camel/providers/smtp/camel-smtp-transport.c:271
 msgid "SSL unavailable"
 msgstr "SSL nie jest dostępny"
 
 #: camel/providers/imap4/camel-imap4-store.c:222
-#: camel/providers/imap/camel-imap-store.c:569
-#: camel/providers/imap/camel-imap-store.c:846
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/imap/camel-imap-store.c:845
 #: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:137
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
 #: camel/providers/pop3/camel-pop3-store.c:192
 msgid "Connection cancelled"
 msgstr "Anulowano połączenie"
@@ -10293,8 +9992,8 @@ msgstr ""
 "Serwer nie obsługuje STARTTLS"
 
 #: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:680
-#: camel/providers/imap/camel-imap-store.c:711
+#: camel/providers/imap/camel-imap-store.c:679
+#: camel/providers/imap/camel-imap-store.c:710
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
@@ -10304,7 +10003,7 @@ msgstr ""
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1108
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
 msgid "Unknown error"
 msgstr "Nieznany błąd"
 
@@ -10332,8 +10031,8 @@ msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr "Nie można pobrać folderu \"%s\" na serwerze IMAP %s: Nieznany"
 
 #: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1890
-#: camel/providers/imap/camel-imap-store.c:2268
+#: camel/providers/imap/camel-imap-store.c:1885
+#: camel/providers/imap/camel-imap-store.c:2263
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -10411,12 +10110,12 @@ msgstr "Serwer IMAP %s nieoczekiwanie przerwał połączenie: %s"
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3201
+#: camel/providers/imap/camel-imap-store.c:3194
 msgid "Operation cancelled"
 msgstr "Operacja anulowana"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3204
+#: camel/providers/imap/camel-imap-store.c:3197
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Serwer nieoczekiwanie przerwał połączenie: %s"
@@ -10497,7 +10196,7 @@ msgstr "Nie ma takiego listu"
 
 #: camel/providers/imap/camel-imap-folder.c:2019
 #: camel/providers/imap/camel-imap-folder.c:2622
-#: camel/providers/nntp/camel-nntp-folder.c:238
+#: camel/providers/nntp/camel-nntp-folder.c:220
 msgid "This message is not currently available"
 msgstr "Ten list jest obecnie niedostępny"
 
@@ -10581,43 +10280,43 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Przeglądanie i przechowywanie poczty na serwerach IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:680
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "Rozszerzenie SSL/TLS nie jest obsługiwane."
 
-#: camel/providers/imap/camel-imap-store.c:712
+#: camel/providers/imap/camel-imap-store.c:711
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "Negocjacja SSL nie powiodła się"
 
-#: camel/providers/imap/camel-imap-store.c:849
+#: camel/providers/imap/camel-imap-store.c:848
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Nie można nawiązać połączenia poleceniem \"%s\": %s"
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1272
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "Serwer IMAP-a %s nie obsługuje wymaganego typu uwierzytelniania %s"
 
-#: camel/providers/imap/camel-imap-store.c:1285
+#: camel/providers/imap/camel-imap-store.c:1282
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Brak obsługi typu uwierzytelniania %s"
 
-#: camel/providers/imap/camel-imap-store.c:1308
+#: camel/providers/imap/camel-imap-store.c:1305
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sPodaj hasło IMAP dla %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1322
+#: camel/providers/imap/camel-imap-store.c:1319
 msgid "You didn't enter a password."
 msgstr "Nie wprowadzono hasła."
 
-#: camel/providers/imap/camel-imap-store.c:1351
+#: camel/providers/imap/camel-imap-store.c:1348
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10628,18 +10327,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1872
-#: camel/providers/imap/camel-imap-store.c:2062
+#: camel/providers/imap/camel-imap-store.c:1867
+#: camel/providers/imap/camel-imap-store.c:2057
 #, c-format
 msgid "No such folder %s"
 msgstr "Folder \"%s\" nie istnieje"
 
-#: camel/providers/imap/camel-imap-store.c:1948
-#: camel/providers/imap/camel-imap-store.c:2329
+#: camel/providers/imap/camel-imap-store.c:1943
+#: camel/providers/imap/camel-imap-store.c:2324
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Folder nadrzędny nie może zawierać folderów podrzędnych"
 
-#: camel/providers/imap/camel-imap-store.c:2003
+#: camel/providers/imap/camel-imap-store.c:1998
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10647,7 +10346,7 @@ msgstr "Folder nadrzędny nie może zawierać folderów podrzędnych"
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Nie można utworzyć folderu \"%s\": folder istnieje."
 
-#: camel/providers/imap/camel-imap-store.c:2279
+#: camel/providers/imap/camel-imap-store.c:2274
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Nieznany folder nadrzędny: %s"
@@ -10684,20 +10383,20 @@ msgid "Index message body data"
 msgstr "Dane wiadomości indeksowej"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:388
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:393
-#: camel/providers/local/camel-local-folder.c:396
+#: camel/providers/local/camel-local-folder.c:392
+#: camel/providers/local/camel-local-folder.c:395
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "mailbox:%s (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:400
+#: camel/providers/local/camel-local-folder.c:399
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -10760,7 +10459,7 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:142
 #: camel/providers/local/camel-local-store.c:253
-#: camel/providers/local/camel-mbox-store.c:356
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10896,9 +10595,9 @@ msgstr "Nie można usunąć folderu \"%s\": %s"
 msgid "not a maildir directory"
 msgstr "to nie katalog z listami w formacie maildir"
 
-#: camel/providers/local/camel-maildir-store.c:341
-#: camel/providers/local/camel-spool-store.c:286
-#: camel/providers/local/camel-spool-store.c:316
+#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-spool-store.c:284
+#: camel/providers/local/camel-spool-store.c:314
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Nie można przeszukać folderu \"%s\": %s"
@@ -10955,7 +10654,7 @@ msgid "Message construction failed."
 msgstr "Utworzenie listu nie powiodło się."
 
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:362
+#: camel/providers/local/camel-mbox-store.c:361
 msgid "Cannot create a folder by this name."
 msgstr "Nie można utworzyć folderu o tej nazwie."
 
@@ -10985,30 +10684,30 @@ msgstr "\"%s\" nie jest zwykłym plikiem."
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Folder \"%s\" nie jest pusty. Nie został usunięty."
 
-#: camel/providers/local/camel-mbox-store.c:375
+#: camel/providers/local/camel-mbox-store.c:374
 #, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Nie można utworzyć katalogu \"%s\": %s."
 
-#: camel/providers/local/camel-mbox-store.c:389
+#: camel/providers/local/camel-mbox-store.c:388
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Nie można utworzyć folderu: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:391
+#: camel/providers/local/camel-mbox-store.c:390
 msgid "Folder already exists"
 msgstr "Folder już istnieje"
 
-#: camel/providers/local/camel-mbox-store.c:473
+#: camel/providers/local/camel-mbox-store.c:472
 msgid "The new folder name is illegal."
 msgstr "Nowa nazwa folderu jest niedozwolona."
 
-#: camel/providers/local/camel-mbox-store.c:486
+#: camel/providers/local/camel-mbox-store.c:485
 #, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Nie można zmienić nazwy \"%s\": \"%s\": %s"
 
-#: camel/providers/local/camel-mbox-store.c:561
+#: camel/providers/local/camel-mbox-store.c:560
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Nie można zmienić nazwy \"%s\" na %s: %s"
@@ -11201,7 +10900,7 @@ msgstr ""
 "Folder może być uszkodzony, zapisano kopię w \"%s\""
 
 #: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:997
+#: camel/providers/nntp/camel-nntp-store.c:1126
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Podaj hasło NNTP dla %s@%s"
@@ -11218,19 +10917,11 @@ msgstr "Nie można było przesłać nazwy użytkownika na serwer"
 msgid "Server rejected username/password"
 msgstr "Serwer odrzucił nazwę użytkownika/hasło"
 
-#: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:263
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr "Operacja anulowana"
-
 # c-format
-#: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:259
-#: camel/providers/nntp/camel-nntp-folder.c:265
+#: camel/providers/nntp/camel-nntp-folder.c:147
+#: camel/providers/nntp/camel-nntp-folder.c:149
+#: camel/providers/nntp/camel-nntp-folder.c:158
+#: camel/providers/nntp/camel-nntp-folder.c:234
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11239,62 +10930,49 @@ msgstr "Operacja anulowana"
 msgid "Cannot get message %s: %s"
 msgstr "Nie można pobrać listu %s: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:188
-#: camel/providers/nntp/camel-nntp-folder.c:228
+#: camel/providers/nntp/camel-nntp-folder.c:156
+#: camel/providers/nntp/camel-nntp-folder.c:232
+#: camel/providers/nntp/camel-nntp-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+msgid "User cancelled"
+msgstr "Operacja anulowana"
+
+#: camel/providers/nntp/camel-nntp-folder.c:176
+#: camel/providers/nntp/camel-nntp-folder.c:208
 #, c-format
 msgid "Internal error: uid in invalid format: %s"
 msgstr "Błąd wewnętrzny: uid w niepoporawnej postaci: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:201
-#, c-format
-msgid "Could not get article %s from NNTP server"
-msgstr "Nie można pobrać artykułu %s z serwera NNTP"
-
-#: camel/providers/nntp/camel-nntp-folder.c:362
-msgid "Posting not allowed by news server"
-msgstr "Pozycjonowanie nie jest dozwolone przez serwer wiadomości"
-
+#: camel/providers/nntp/camel-nntp-folder.c:328
+#: camel/providers/nntp/camel-nntp-folder.c:331
 #: camel/providers/nntp/camel-nntp-folder.c:373
-#, c-format
-msgid "Failed to send newsgroups header: %s: message not posted"
-msgstr ""
-"Błąd wysłania nagłówka grupy dyskusyjnej: %s: wiadomość nie została wysłana"
-
-#: camel/providers/nntp/camel-nntp-folder.c:413
-#: camel/providers/nntp/camel-nntp-folder.c:426
-#, c-format
-msgid "Error posting to newsgroup: %s: message not posted"
-msgstr "Błąd wysyłki na grupę dyskusyjną: %s: wiadomość nie została wysłana"
-
-#: camel/providers/nntp/camel-nntp-folder.c:438
-msgid "Error reading response to posted message: message not posted"
-msgstr ""
-"Błąd odczytu odpowiedzi na wysłaną wiadomość: wiadomość nie została wysłana"
-
-#: camel/providers/nntp/camel-nntp-folder.c:441
-#, c-format
-msgid "Error posting message: %s: message not posted"
-msgstr "Błąd wysyłki wiadomości: %s: wiadomość nie została wysłana"
+#: camel/providers/nntp/camel-nntp-folder.c:375
+#, fuzzy, c-format
+msgid "Posting failed: %s"
+msgstr "Operacja nie powiodła się: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:457
+#: camel/providers/nntp/camel-nntp-folder.c:393
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "Nie można wysyłać wiadomości NNTP podczas pracy bez podłączenia!"
 
-#: camel/providers/nntp/camel-nntp-folder.c:468
+#: camel/providers/nntp/camel-nntp-folder.c:404
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Nie można kopiować wiadomości z folderu NNTP!"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:44
 msgid "Could not get group list from server."
 msgstr "Nie można pobrać listy grup z serwera."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#: camel/providers/nntp/camel-nntp-grouplist.c:97
+#: camel/providers/nntp/camel-nntp-grouplist.c:106
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "Nie można wczytać pliku listy grup dla %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#: camel/providers/nntp/camel-nntp-grouplist.c:157
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Nie można zapisać pliku listy grup dla %s: %s"
@@ -11327,26 +11005,29 @@ msgstr ""
 "Przy tej opcji uwierzytelnianie na serwerze NNTP będzie przeprowadzane z "
 "użyciem hasła w postaci czystego tekstu."
 
-#: camel/providers/nntp/camel-nntp-store.c:158
+#: camel/providers/nntp/camel-nntp-store.c:118
+#: camel/providers/nntp/camel-nntp-store.c:1233
+#: camel/providers/nntp/camel-nntp-store.c:1331
+#, c-format
+msgid "NNTP Command failed: %s"
+msgstr "Nie powiodło się polecenie NNTP: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:227
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Nie można odczytać powitania z %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:170
+#: camel/providers/nntp/camel-nntp-store.c:239
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "Serwer NNTP %s zwrócił kod błędu %d: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:326
+#: camel/providers/nntp/camel-nntp-store.c:403
 #, c-format
 msgid "USENET News via %s"
 msgstr "Nowiny USENET za pośrednictwem %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:640
-msgid "Stream error"
-msgstr "Błąd strumienia"
-
-#: camel/providers/nntp/camel-nntp-store.c:643
+#: camel/providers/nntp/camel-nntp-store.c:777
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -11357,7 +11038,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/providers/nntp/camel-nntp-store.c:735
+#: camel/providers/nntp/camel-nntp-store.c:872
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
@@ -11367,7 +11048,7 @@ msgstr ""
 "\n"
 "Nie ma takiej grupy. Wybrany element jest prawdopodobnie folderem nadrzędnym."
 
-#: camel/providers/nntp/camel-nntp-store.c:767
+#: camel/providers/nntp/camel-nntp-store.c:904
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
@@ -11377,61 +11058,62 @@ msgstr ""
 "\n"
 "Grupa nie istnieje!"
 
-#: camel/providers/nntp/camel-nntp-store.c:792
+#: camel/providers/nntp/camel-nntp-store.c:929
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 "Nie można utworzyć folderu w magazynie nowin: zamiast tego zasubskrybuj "
 "grupę."
 
-#: camel/providers/nntp/camel-nntp-store.c:800
+#: camel/providers/nntp/camel-nntp-store.c:937
 msgid "You cannot rename a folder in a News store."
 msgstr "Nie można usunąć folderu z magazynie nowin."
 
-#: camel/providers/nntp/camel-nntp-store.c:808
+#: camel/providers/nntp/camel-nntp-store.c:945
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 "Nie można usunąć folderu w magazynie nowin: zamiast tego odsubskrybuj grupę."
 
-#: camel/providers/nntp/camel-nntp-summary.c:253
-#, c-format
-msgid "Connection error: %s"
-msgstr "Błąd połączenia: %s"
-
-#: camel/providers/nntp/camel-nntp-summary.c:262
-#, c-format
-msgid "No such folder: %s"
-msgstr "Folder nie istnieje: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1118
+#, fuzzy
+msgid "Authentication requested but not username provided"
+msgstr "Wymagane uwierzytelnienie"
 
-#: camel/providers/nntp/camel-nntp-summary.c:268
-#, c-format
-msgid "Could not get group: %s"
-msgstr "Nie można pobrać grupy: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1146
+#, fuzzy, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr "Nie można uwierzytelnić na serwerze IMAP %s przy użyciu %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:333
-msgid "Could not get messages: unspecified error"
-msgstr "Nie można pobrać wiadomości: nieokreślony błąd"
+#: camel/providers/nntp/camel-nntp-store.c:1262
+#, fuzzy
+msgid "Not connected."
+msgstr "Brak kontaktów"
 
-#: camel/providers/nntp/camel-nntp-summary.c:378
+#: camel/providers/nntp/camel-nntp-store.c:1311
 #, c-format
-msgid "NNTP Command failed: %s"
-msgstr "Nie powiodło się polecenie NNTP: %s"
+msgid "No such folder: %s"
+msgstr "Folder nie istnieje: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:438
-#: camel/providers/nntp/camel-nntp-summary.c:543
+#: camel/providers/nntp/camel-nntp-summary.c:218
+#: camel/providers/nntp/camel-nntp-summary.c:314
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Wyszukiwanie nowych listów"
 
-#: camel/providers/nntp/camel-nntp-summary.c:558
-#, c-format
-msgid "Unknown server response: %s"
-msgstr "Nieznana odpowiedź serwera: %s"
+#: camel/providers/nntp/camel-nntp-summary.c:225
+#, fuzzy, c-format
+msgid "Unexpected server response from xover: %s"
+msgstr "Nieoczekiwana odpowiedź od serwera IMAP: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:328
+#, fuzzy, c-format
+msgid "Unexpected server response from head: %s"
+msgstr "Nieoczekiwana odpowiedź od programu GnuPG: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:605
+#: camel/providers/nntp/camel-nntp-summary.c:368
 msgid "Use cancel"
 msgstr "Anulowane przez użytkownika"
 
-#: camel/providers/nntp/camel-nntp-summary.c:607
+#: camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Operacja nie powiodła się: %s"
@@ -12137,17 +11819,19 @@ msgstr "Załączenie plików"
 
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
-msgid "You cannot attach the file `${0}' to this message."
+#, fuzzy
+msgid "You cannot attach the file `{0}' to this message."
 msgstr "Nie można załączyć do tego listu pliku \"${0}\"."
 
 #. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4
-msgid "${1}"
-msgstr "${1}"
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr "{1}"
 
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+#, fuzzy
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
 "Plik \"${0}\" nie jest zwykłym plikiem i nie może być wysłany w wiadomości."
 
@@ -12241,7 +11925,8 @@ msgstr "Nie można utworzyć wiadomości."
 
 #. mail-composer:no-build-message secondary
 #: composer/mail-composer-errors.xml.h:34
-msgid "Because \"${0}\", you may need to select different mail options."
+#, fuzzy
+msgid "Because \"{0}\", you may need to select different mail options."
 msgstr "Ponieważ \"${0}\", możesz potrzebować wybrać inne opcje poczty."
 
 #. mail-composer:no-sig-file primary
@@ -12250,9 +11935,11 @@ msgid "Could not read signature file \"{0}\"."
 msgstr "Nie można odczytać pliku z podpisem \"{0}\"."
 
 #. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38
-msgid "Because \"${1}\"."
-msgstr "Ponieważ \"${1}\"."
+#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr "Ponieważ \"{1}\"."
 
 #. mail-composer:all-accounts-deleted primary
 #: composer/mail-composer-errors.xml.h:40
@@ -12418,16 +12105,12 @@ msgstr "Kategorie synchronizacji:"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
 #: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a %d/%m/%Y %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
 #: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a %d/%m/%Y %H:%M"
@@ -12479,31 +12162,23 @@ msgid "%m/%d/%Y %H"
 msgstr "%d/%m/%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#. strftime format of a time in 12-hour format.
 #: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#. strftime format of a time in 24-hour format.
 #: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
 #: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
 #: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
 msgid "%H:%M"
@@ -12607,7 +12282,6 @@ msgid "Missing file name."
 msgstr "Brakująca nazwa pliku."
 
 #. filter:no-file secondary
-#. filter:bad-file secondary
 #: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
 msgid "You must specify a file name."
 msgstr "Należy podać nazwę pliku."
@@ -12638,7 +12312,6 @@ msgid "Could not compile regular expression \"{1}\"."
 msgstr "Nie można skompilować wyrażenia regularnego \"{1}\"."
 
 #. filter:no-name primary
-#. filter:no-name-vfolder primary
 #: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
 msgid "Missing name."
 msgstr "Brakująca nazwa."
@@ -12781,8 +12454,8 @@ msgstr "ze wszystkimi lokalnymi folderami"
 msgid "years"
 msgstr "lat"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:1011
-#: mail/mail-config.c:76 mail/mail-config.glade.h:93
+#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
+#: mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Ważne"
 
@@ -12847,253 +12520,6 @@ msgstr "przychodzące"
 msgid "outgoing"
 msgstr "wychodzące"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Adjust Score"
-msgstr "Dopasuj punkty"
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Color"
-msgstr "Przypisz kolor"
-
-#: filter/libfilter-i18n.h:4
-msgid "Assign Score"
-msgstr "Przypisz punkty"
-
-#: filter/libfilter-i18n.h:5
-msgid "Attachments"
-msgstr "Załączniki"
-
-#: filter/libfilter-i18n.h:6
-msgid "Beep"
-msgstr "Brzęczyk"
-
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "zawiera"
-
-#: filter/libfilter-i18n.h:8
-msgid "Copy to Folder"
-msgstr "Skopiuj do folderu"
-
-#: filter/libfilter-i18n.h:9
-msgid "Date received"
-msgstr "Data otrzymania"
-
-#: filter/libfilter-i18n.h:10
-msgid "Date sent"
-msgstr "Data wysłania"
-
-#: filter/libfilter-i18n.h:12
-msgid "Deleted"
-msgstr "Usunięty"
-
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "nie zawiera"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "nie kończy się na"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "nie istnieje"
-
-#: filter/libfilter-i18n.h:16
-msgid "does not return"
-msgstr "nie powraca"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "nie brzmi jak"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "nie rozpoczyna się od"
-
-#: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
-msgstr "Nie istnieje"
-
-#: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr "Roboczy"
-
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "kończy się na"
-
-#: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr "Istnieje"
-
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "istnieje"
-
-#: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr "Wyrażenie"
-
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr "Kontynuuj"
-
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "jest"
-
-#: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr "jest po"
-
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr "jest przed"
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr "jest oznaczony"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "jest większy niż"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "jest mniejszy niż"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "nie jest"
-
-#: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr "nie jest oznaczony"
-
-#: filter/libfilter-i18n.h:36
-msgid "Junk Test"
-msgstr "Test śmieci"
-
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
-#: widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Etykieta"
-
-#: filter/libfilter-i18n.h:38
-msgid "Mailing list"
-msgstr "Lista dyskusyjna"
-
-#: filter/libfilter-i18n.h:39
-msgid "Message Body"
-msgstr "Treść listu"
-
-#: filter/libfilter-i18n.h:40
-msgid "Message Header"
-msgstr "Nagłówek listu"
-
-#: filter/libfilter-i18n.h:41
-msgid "Message is Junk"
-msgstr "Wiadomość jest śmieciem"
-
-#: filter/libfilter-i18n.h:42
-msgid "Message is not Junk"
-msgstr "Wiadomość nie jest śmieciem"
-
-#: filter/libfilter-i18n.h:43
-msgid "Move to Folder"
-msgstr "Przeniesienie do folderu"
-
-#: filter/libfilter-i18n.h:44
-msgid "Pipe to Program"
-msgstr "Przesłanie do programu"
-
-#: filter/libfilter-i18n.h:45
-msgid "Play Sound"
-msgstr "Odtworzenie dźwięku"
-
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Przeczytane"
-
-#: filter/libfilter-i18n.h:47
-msgid "Recipients"
-msgstr "Lista odbiorców"
-
-#: filter/libfilter-i18n.h:48
-msgid "Regex Match"
-msgstr "Dopasowanie wg regexp"
-
-#: filter/libfilter-i18n.h:49
-msgid "Replied to"
-msgstr "Odpowiedziana do"
-
-#: filter/libfilter-i18n.h:50
-msgid "returns"
-msgstr "zwraca"
-
-#: filter/libfilter-i18n.h:51
-msgid "returns greater than"
-msgstr "zwraca więcej niż"
-
-#: filter/libfilter-i18n.h:52
-msgid "returns less than"
-msgstr "zwraca mniej niż"
-
-# FIXME - sprawdzić formę
-#: filter/libfilter-i18n.h:53
-msgid "Run Program"
-msgstr "Uruchamiany program"
-
-#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Punkty"
-
-#: filter/libfilter-i18n.h:55
-msgid "Sender"
-msgstr "Nadawca"
-
-#: filter/libfilter-i18n.h:56
-msgid "Set Status"
-msgstr "Ustaw stan"
-
-#: filter/libfilter-i18n.h:57
-msgid "Size (kB)"
-msgstr "Rozmiar (KB)"
-
-#: filter/libfilter-i18n.h:58
-msgid "sounds like"
-msgstr "brzmi jak"
-
-#: filter/libfilter-i18n.h:59
-msgid "Source Account"
-msgstr "Konto źródłowe"
-
-#: filter/libfilter-i18n.h:60
-msgid "Specific header"
-msgstr "Określony nagłówek"
-
-#: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "rozpoczyna się od"
-
-#: filter/libfilter-i18n.h:63
-msgid "Stop Processing"
-msgstr "Zatrzymanie przetwarzania"
-
-#: filter/libfilter-i18n.h:64 mail/em-format.c:755 mail/em-format-html.c:1519
-#: mail/em-format-quote.c:302 mail/em-mailer-prefs.c:87
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
-#: smime/lib/e-cert.c:1079
-msgid "Subject"
-msgstr "Temat"
-
-#: filter/libfilter-i18n.h:65
-msgid "Unset Status"
-msgstr "Wyczyszczenie stanu"
-
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Dodaj regułę"
@@ -13110,6 +12536,11 @@ msgstr "Nazwa reguły"
 msgid "_Score Rules"
 msgstr "Reg_uły punktacji"
 
+#: filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Punkty"
+
 #: filter/searchtypes.xml.h:1
 msgid "Body contains"
 msgstr "Treść zawiera"
@@ -13188,13 +12619,13 @@ msgstr "Podpis(y)"
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Przesyłany list ----------"
 
-#: mail/em-composer-utils.c:1499
+#: mail/em-composer-utils.c:1495
 msgid "an unknown sender"
 msgstr "nieznany nadawca"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1509
+#: mail/em-composer-utils.c:1505
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "W liście z %a, %d-%m-%Y, godz. %H:%M %%+05d, %%s napisał(a):"
 
@@ -13232,8 +12663,8 @@ msgstr "<kliknij, aby wybrać folder> "
 msgid "Create New Folder"
 msgstr "Tworzenie nowego folderu"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
-#: mail/mail-component.c:706
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
+#: mail/mail-component.c:704
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Określ miejsce utworzenia folderu:"
@@ -13247,97 +12678,98 @@ msgstr "Utwórz"
 msgid "Folder _name:"
 msgstr "_Nazwa folderu:"
 
-#: mail/em-folder-tree.c:839
+#: mail/em-folder-tree.c:833
 #, c-format
 msgid "Moving folder %s"
 msgstr "Przenoszenie folderu %s"
 
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree.c:835
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopiowanie folderu %s"
 
-#: mail/em-folder-tree.c:848 mail/message-list.c:1561
+#: mail/em-folder-tree.c:842 mail/message-list.c:1561
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Przenoszenie listów do folderu %s"
 
-#: mail/em-folder-tree.c:850 mail/message-list.c:1563
+#: mail/em-folder-tree.c:844 mail/message-list.c:1563
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopiowanie listów do folderu %s"
 
 # FIXME - ma ktoś coś lepszego?
-#: mail/em-folder-tree.c:866
+#: mail/em-folder-tree.c:860
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Nie można upuścić listu w głównym folderze"
 
-#: mail/em-folder-tree.c:956 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "S_kopiuj do folderu"
 
-#: mail/em-folder-tree.c:957 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "P_rzenieś do folderu"
 
-#: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2069
-#: mail/em-folder-tree.c:2556 mail/em-folder-view.c:798
+#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
+#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
 #: mail/message-list.c:1651
 msgid "_Move"
 msgstr "_Przenieś"
 
-#: mail/em-folder-tree.c:961 mail/message-list.c:1653
+#: mail/em-folder-tree.c:955 mail/message-list.c:1653
 msgid "Cancel _Drag"
 msgstr "Anuluj p_rzeciąganie"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
 #: mail/em-folder-view.c:798 mail/em-folder-view.c:812
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Wybór folderu"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
 msgid "C_opy"
 msgstr "Sk_opiuj"
 
-#: mail/em-folder-tree.c:2096
+#: mail/em-folder-tree.c:2088
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Tworzenie folderu \"%s\""
 
-#: mail/em-folder-tree.c:2282 mail/mail-component.c:706
+#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
 msgid "Create folder"
 msgstr "Tworzenie folderu"
 
-#: mail/em-folder-tree.c:2477
+#: mail/em-folder-tree.c:2463
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Zmiana nazwy folderu \"%s\" na:"
 
-#: mail/em-folder-tree.c:2479
+#: mail/em-folder-tree.c:2465
 msgid "Rename Folder"
 msgstr "Zmień nazwę folderu"
 
-#: mail/em-folder-tree.c:2550 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Widok"
 
-#: mail/em-folder-tree.c:2551
+#: mail/em-folder-tree.c:2537
 msgid "Open in _New Window"
 msgstr "Otwórz w nowym _oknie"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2560
+#: mail/em-folder-tree.c:2546
 msgid "_New Folder..."
 msgstr "_Nowy folder..."
 
-#: mail/em-folder-tree.c:2563
+#: mail/em-folder-tree.c:2549
 msgid "_Rename"
 msgstr "_Zmień nazwę"
 
-#: mail/em-folder-tree.c:2566 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Właściwości..."
 
@@ -13356,14 +12788,14 @@ msgstr "NIEPASUJĄCE"
 msgid "Inbox"
 msgstr "Nadchodzące"
 
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
 msgid "Loading..."
 msgstr "Wczytywanie..."
 
 #: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
 #: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:510
-#: mail/mail-component.c:556
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
+#: mail/mail-component.c:554
 msgid "Mail"
 msgstr "Poczta"
 
@@ -13445,6 +12877,10 @@ msgstr "P_rzenieś do folderu..."
 msgid "_Copy to Folder..."
 msgstr "S_kopiuj do folderu..."
 
+#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Etykieta"
+
 #: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Dodaj nadawcę do _książki adresowej"
@@ -13539,6 +12975,12 @@ msgstr "Cc"
 msgid "Bcc"
 msgstr "Bcc"
 
+#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
+#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Temat"
+
 #: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
 #: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
 msgid "Date"
@@ -13743,7 +13185,7 @@ msgstr ""
 "Ta wiadomość jest zaszyfrowana silnym algorytmem szyfrującym. Osobie obcej "
 "będzie bardzo trudno w konkretnym czasie podejrzeć zawartość tego listu."
 
-#: mail/em-format-html-display.c:757
+#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
 msgid "_View Certificate"
 msgstr "_Wyświetl certyfikat"
 
@@ -14481,15 +13923,15 @@ msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importuje starą pocztę Elma"
 
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:226
+#: mail/importers/evolution-mbox-importer.c:221
+#: mail/importers/evolution-outlook-importer.c:255
 #: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Importowanie..."
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:222
-#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/evolution-mbox-importer.c:223
+#: mail/importers/evolution-outlook-importer.c:257
 #: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Poczekaj chwilę"
@@ -14511,21 +13953,23 @@ msgid "Elm"
 msgstr "Elm"
 
 #: mail/importers/evolution-mbox-importer.c:116
+#: mail/importers/evolution-outlook-importer.c:130
 msgid "Destination folder:"
 msgstr "Folder docelowy:"
 
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder to import into"
 msgstr "Wybierz do którego odbędzie się import"
 
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:254
 #: mail/importers/mail-importer.c:226
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importowanie \"%s\""
 
-#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/evolution-outlook-importer.c:301
 #: mail/importers/mail-importer.c:140
 msgid "Importing mailbox"
 msgstr "Importowanie szkrzynki pocztowej"
@@ -14727,67 +14171,67 @@ msgstr "lista dyskusyjna %s"
 msgid "Add Filter Rule"
 msgstr "Dodanie reguły filtru"
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:461
 #, c-format
 msgid "%d deleted"
 msgstr "%d usunięto"
 
-#: mail/mail-component.c:465
+#: mail/mail-component.c:463
 #, c-format
 msgid "%d junk"
 msgstr "%d śmieci"
 
 # FIXME - albo zmienić koncepcję nazwy :)
-#: mail/mail-component.c:488
+#: mail/mail-component.c:486
 #, c-format
 msgid "%d drafts"
 msgstr "%d zapisanych"
 
-#: mail/mail-component.c:490
+#: mail/mail-component.c:488
 #, c-format
 msgid "%d sent"
 msgstr "%d wysłanych"
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:490
 #, c-format
 msgid "%d unsent"
 msgstr "%d nie wysłanych"
 
-#: mail/mail-component.c:496
+#: mail/mail-component.c:494
 #, c-format
 msgid "%d total"
 msgstr "%d wszystkich"
 
-#: mail/mail-component.c:498
+#: mail/mail-component.c:496
 #, c-format
 msgid ", %d unread"
 msgstr ", %d nieprzeczytanych"
 
-#: mail/mail-component.c:658
+#: mail/mail-component.c:656
 msgid "New Mail Message"
 msgstr "Nowy list"
 
-#: mail/mail-component.c:659
+#: mail/mail-component.c:657
 msgid "_Mail Message"
 msgstr "_List"
 
-#: mail/mail-component.c:660
+#: mail/mail-component.c:658
 msgid "Compose a new mail message"
 msgstr "Tworzy nowy list"
 
-#: mail/mail-component.c:666
+#: mail/mail-component.c:664
 msgid "New Mail Folder"
 msgstr "Nowy folder poczty"
 
-#: mail/mail-component.c:667
+#: mail/mail-component.c:665
 msgid "Mail _Folder"
 msgstr "F_older poczty"
 
-#: mail/mail-component.c:668
+#: mail/mail-component.c:666
 msgid "Create a new mail folder"
 msgstr "Tworzy nowy folder poczty"
 
-#: mail/mail-component.c:800
+#: mail/mail-component.c:798
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Nie powiodło się zaktualizowanie ustawień poczty lub folderów."
 
@@ -15530,7 +14974,6 @@ msgstr ""
 "zawartości listu."
 
 #. mail:ask-send-only-bcc-contact primary
-#. mail:ask-send-only-bcc primary
 #: mail/mail-errors.xml.h:22 mail/mail-errors.xml.h:29
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "Czy na pewno chcesz wysłać list tylko z ukrytymi adresatami (BCC)?"
@@ -15598,7 +15041,6 @@ msgstr ""
 "\"{0}\"?"
 
 #. mail:ask-expunge secondary
-#. mail:ask-empty-trash secondary
 #: mail/mail-errors.xml.h:45 mail/mail-errors.xml.h:50
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "W przypadku kontynuacji, nie będzie możliwości odtworzenia tego listu."
@@ -15636,7 +15078,8 @@ msgstr ""
 
 #. mail:camel-exception primary
 #: mail/mail-errors.xml.h:57
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+#, fuzzy
+msgid "Your message with the subject \"{0}\" was not delivered."
 msgstr "Wiadomość z tematem \"{0}\" nie została dostarczona."
 
 #. mail:camel-exception secondary
@@ -15673,13 +15116,6 @@ msgid "{0}."
 msgstr "{0}."
 
 #. mail:session-message-info secondary
-#. mail:session-message-info-cancel secondary
-#. mail:session-message-warning secondary
-#. mail:session-message-warning-cancel secondary
-#. mail:session-message-error secondary
-#. mail:session-message-error-cancel secondary
-#. mail:ask-session-password secondary
-#. mail:filter-load-error secondary
 #: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
 #: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
 #: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
@@ -15702,14 +15138,7 @@ msgstr "Błąd przy wczytywaniu definicji filtrów."
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Nie można zapisać do katalogu \"{0}\"."
 
-#. mail:no-save-path secondary
-#: mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr "{1}"
-
 #. mail:no-create-path primary
-#. mail:no-write-path-exists primary
-#. mail:no-write-path-notfile primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
 msgid "Cannot save to file \"{0}\"."
@@ -15725,15 +15154,6 @@ msgstr "Nie można utworzyć katalogu zapisu, ponieważ \"{1}\""
 msgid "Cannot create temporary save directory."
 msgstr "Nie można utworzyć tymczasowego katalogu zapisu."
 
-#. mail:no-create-tmp-path secondary
-#. mail:no-delete-folder secondary
-#. system:no-save-file secondary
-#. system:no-load-file secondary
-#: mail/mail-errors.xml.h:100 mail/mail-errors.xml.h:112
-#: widgets/misc/e-system-errors.xml.h:11 widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr "Ponieważ \"{1}\"."
-
 #. mail:no-write-path-exists secondary
 #: mail/mail-errors.xml.h:104
 msgid "File exists but cannot overwrite it."
@@ -15755,7 +15175,6 @@ msgid "Cannot delete system folder \"{0}\"."
 msgstr "Nie można usunąć folderu systemowego \"{0}\"."
 
 #. mail:no-delete-spethal-folder secondary
-#. mail:no-rename-spethal-folder secondary
 #: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
@@ -15789,13 +15208,11 @@ msgstr ""
 "zostanie trwale skasowana."
 
 #. mail:no-rename-folder-exists primary
-#. mail:no-rename-folder primary
 #: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "Nie można zmienić nazwy \"{0}\" to \"{1}\"."
 
 #. mail:no-rename-folder-exists secondary
-#. mail:vfolder-notunique secondary
 #: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr "Folder o nazwie \"{1}\" już istnieje. Użyj innej nazwy."
@@ -15806,25 +15223,21 @@ msgid "Because \"{2}\"."
 msgstr "Ponieważ \"{2}\"."
 
 #. mail:no-move-folder-nostore primary
-#. mail:no-move-folder-to-nostore primary
 #: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Nie można przenieść folderu \"{0}\" do \"{1}\"."
 
 #. mail:no-move-folder-nostore secondary
-#. mail:no-copy-folder-nostore secondary
 #: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
 msgid "Cannot open source \"{2}\"."
 msgstr "Nie można otworzyć źródła \"{2}\"."
 
 #. mail:no-move-folder-to-nostore secondary
-#. mail:no-copy-folder-to-nostore secondary
 #: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
 msgid "Cannot open target \"{2}\"."
 msgstr "Nie można otworzyć celu \"{2}\"."
 
 #. mail:no-copy-folder-nostore primary
-#. mail:no-copy-folder-to-nostore primary
 #: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "Nie można skopiować folderu \"{0}\" do \"{1}\"."
@@ -15840,7 +15253,6 @@ msgid "Cannot open source \"{1}\""
 msgstr "Nie można otworzyć źródła \"{1}\""
 
 #. mail:account-incomplete primary
-#. mail:account-notunique primary
 #: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
 msgid "Cannot save changes to account."
 msgstr "Nie można zapisać zmian do konta."
@@ -16001,7 +15413,7 @@ msgstr "_Nadpisz"
 msgid "_Append"
 msgstr "_Dodaj"
 
-#: mail/mail-folder-cache.c:791
+#: mail/mail-folder-cache.c:785
 #, c-format
 msgid "Pinging %s"
 msgstr "Odpytywanie %s"
@@ -16448,6 +15860,10 @@ msgstr "Prześlij"
 msgid "No Response Necessary"
 msgstr "Odpowiedź niekonieczna"
 
+#: mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Przeczytane"
+
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Odpowiedz"
@@ -16553,44 +15969,48 @@ msgstr ""
 "podłączenia do sieci"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid "Toolbar is visible"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Whether Evolution should start up in offline mode"
 msgstr ""
 "Określa, czy Evolution ma być uruchamiany w trybie bez podłączenia do sieci"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Whether the toolbar should be visible."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
 msgid "Whether to skip the development warning dialog"
 msgstr "Określa, czy opuścić ostrzegawcze okno o rozwojowej wersji"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
+#: shell/apps_evolution_shell.schemas.in.in.h:14
 msgid "mail"
 msgstr "poczta"
 
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
-msgstr "Dostarczone przez"
-
-#: shell/e-shell.c:545 shell/e-shell.c:546
+#: shell/e-shell.c:588 shell/e-shell.c:589
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: shell/e-shell.c:743
+#: shell/e-shell.c:786
 msgid "Uknown system error."
 msgstr "Nieznany błąd systemowy."
 
-#: shell/e-shell.c:1100
+#: shell/e-shell.c:1143
 msgid "Invalid arguments"
 msgstr "Niepoprawny argumenty"
 
-#: shell/e-shell.c:1102
+#: shell/e-shell.c:1145
 msgid "Cannot register on OAF"
 msgstr "Nie można dokonać rejestracji na serwerze OAF"
 
-#: shell/e-shell.c:1104
+#: shell/e-shell.c:1147
 msgid "Configuration Database not found"
 msgstr "Nie odnaleziono bazy danych konfiguracji"
 
-#: shell/e-shell.c:1106
+#: shell/e-shell.c:1149
 msgid "Generic error"
 msgstr "Błąd ogólny"
 
@@ -16650,7 +16070,7 @@ msgstr ""
 msgid "Select importer"
 msgstr "Wybór importera"
 
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1026
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
 #, c-format
 msgid "File %s does not exist"
 msgstr "Plik %s nie istnieje."
@@ -16678,31 +16098,32 @@ msgstr ""
 "Importowanie %s\n"
 "Importowanie 1. elementu."
 
-#: shell/e-shell-importer.c:549
+#: shell/e-shell-importer.c:570
 msgid "Automatic"
 msgstr "Automatycznie"
 
-#: shell/e-shell-importer.c:598
-msgid "_Filename:"
-msgstr "_Nazwa pliku:"
+#: shell/e-shell-importer.c:626
+#, fuzzy
+msgid "F_ilename:"
+msgstr "Nazwa pliku:"
 
-#: shell/e-shell-importer.c:603
+#: shell/e-shell-importer.c:631
 msgid "Select a file"
 msgstr "Wybór pliku"
 
-#: shell/e-shell-importer.c:613
+#: shell/e-shell-importer.c:642
 msgid "File _type:"
 msgstr "_Typ pliku:"
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:681
 msgid "Import data and settings from _older programs"
 msgstr "Import danych i ustawień ze _starszych programów"
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:684
 msgid "Import a _single file"
 msgstr "Imp_ort pojedynczego pliku"
 
-#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -16710,25 +16131,25 @@ msgstr ""
 "Poczekaj chwilę...\n"
 "Trwa analizowanie istniejących konfiguracji"
 
-#: shell/e-shell-importer.c:727
+#: shell/e-shell-importer.c:756
 msgid "Starting Intelligent Importers"
 msgstr "Uruchamianie inteligentnych importerów"
 
-#: shell/e-shell-importer.c:853 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
 #, c-format
 msgid "From %s:"
 msgstr "Od %s:"
 
-#: shell/e-shell-importer.c:1044
+#: shell/e-shell-importer.c:1073
 #, c-format
 msgid "No importer available for file %s"
 msgstr "Brak dostępnego importera dla pliku %s"
 
-#: shell/e-shell-importer.c:1056
+#: shell/e-shell-importer.c:1085
 msgid "Unable to execute importer"
 msgstr "Nie można uruchomić importera"
 
-#: shell/e-shell-importer.c:1169
+#: shell/e-shell-importer.c:1199
 msgid "_Import"
 msgstr "Za_importuj"
 
@@ -16778,58 +16199,59 @@ msgstr "Nazwa folderu nie może zawierać znaku \"#\"."
 msgid "'.' and '..' are reserved folder names."
 msgstr "\".\" oraz \"..\" są zarezerwowanymi nazwami folderów."
 
-#: shell/e-shell-window.c:336
+#: shell/e-shell-window.c:337
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Program Evolution jest obecnie podłączony do sieci. Kliknij na tym przycisku "
 "aby pracować w trybie odłączenia od sieci."
 
-#: shell/e-shell-window.c:343
+#: shell/e-shell-window.c:344
 msgid "Evolution is in the process of going offline."
 msgstr "Program Evolution jest w trakcie rozłączania z siecią."
 
-#: shell/e-shell-window.c:349
+#: shell/e-shell-window.c:350
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Program Evolution jest obecnie rozłączony. Kliknij na tym przycisku aby "
 "pracować w trybie podłączenia do sieci."
 
 # FIXME - sprawdzić formę!!
-#: shell/e-shell-window.c:621
+#: shell/e-shell-window.c:637
 #, c-format
 msgid "Switch to %s"
 msgstr "Przełącz do %s"
 
-#: shell/e-shell-window-commands.c:64
+#: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "W systemie nie jest zainstalowany GNOME Pilot tools."
 
-#: shell/e-shell-window-commands.c:72
+#: shell/e-shell-window-commands.c:74
 #, c-format
 msgid "Error executing %s."
 msgstr "Błąd przy wykonywaniu %s."
 
-#: shell/e-shell-window-commands.c:121
+#: shell/e-shell-window-commands.c:123
 msgid "Bug buddy is not installed."
 msgstr "Nie zainstalowano programu Bug buddy."
 
-#: shell/e-shell-window-commands.c:129
+#: shell/e-shell-window-commands.c:131
 msgid "Bug buddy could not be run."
 msgstr "Nie można uruchomić Bug buddy."
 
-#: shell/e-shell-window-commands.c:171
-msgid "About Evolution"
-msgstr "Informacje o programie Evolution"
+#: shell/e-shell-window-commands.c:323
+#, fuzzy
+msgid "Groupware Suite"
+msgstr "Groupwise"
 
-#: shell/e-shell-window-commands.c:382
+#: shell/e-shell-window-commands.c:563
 msgid "_Work Online"
 msgstr "Praca _z podłączeniem"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "Praca _bez podłączenia"
 
-#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Praca bez podłączenia"
 
@@ -17150,13 +16572,11 @@ msgid "Continue"
 msgstr "Kontynuuj"
 
 #. shell:noshell title
-#. shell:noshell-reason title
 #: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
 msgid "Cannot start Evolution"
 msgstr "Nie można uruchomić Evolution"
 
 #. shell:noshell primary
-#. shell:noshell-reason primary
 #: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
 msgid "Evolution can not start."
 msgstr "Nie można uruchomić Evolution."
@@ -17187,30 +16607,30 @@ msgstr ""
 "\n"
 "Kliknij pomoc aby dowiedzieć się szczegółów."
 
-#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:522
+#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
+#: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
 msgstr "Wybór importowanego certyfikatu..."
 
-#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:604
+#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
+#: smime/gui/certificate-manager.c:638
 msgid "Certificate Name"
 msgstr "Nazwa certyfikatu"
 
-#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
+#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
 msgid "Purposes"
 msgstr "Zastosowania"
 
-#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:517
+#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr "Numer seryjny"
 
-#: smime/gui/certificate-manager.c:267
+#: smime/gui/certificate-manager.c:271
 msgid "Expires"
 msgstr "Traci ważność"
 
-#: smime/gui/certificate-manager.c:417
+#: smime/gui/certificate-manager.c:446
 msgid "E-Mail Address"
 msgstr "Adres e-mail"
 
@@ -17315,7 +16735,7 @@ msgstr ""
 "zapoznać się z jego certyfikatem oraz procedurami bezpieczeństwa (o ile są "
 "dostępne)."
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
 msgid "Certificate"
 msgstr "Certyfikat"
 
@@ -17335,19 +16755,23 @@ msgstr "Wspólna nazwa (CN)"
 msgid "Contact Certificates"
 msgstr "Certyfikaty kontaktu"
 
-#: smime/gui/smime-ui.glade.h:21
-#, no-c-format
-msgid "Do you want to trust \"%s\" for the following purposes?"
-msgstr "Czy chcesz zufać \"%s\" dla nastepujących zastosowań?"
+#: smime/gui/smime-ui.glade.h:20
+msgid "Do not trust the authenticity of this certificate"
+msgstr ""
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:21
 msgid "Dummy window only"
 msgstr "Tylko pozorne okno"
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:22
 msgid "Edit"
 msgstr "Edycja"
 
+#: smime/gui/smime-ui.glade.h:23
+#, fuzzy
+msgid "Email Certificate Trust Settings"
+msgstr "Ośrodek certyfikacji e-mail"
+
 #: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr "Certyfikat odbiorcy e-mail"
@@ -17380,257 +16804,268 @@ msgstr "Jednostka organizacyjna (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "Odcisk SHA1"
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr "Certyfikat klienta SSL"
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr "Certyfikat serwera SSL"
 
 #: smime/gui/smime-ui.glade.h:37
+msgid "Trust the authenticity of this certificate"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
 msgid "Trust this CA to identify email users."
 msgstr "Zaufane CA do identyfikacji użytkowników e-mail."
 
-#: smime/gui/smime-ui.glade.h:38
+#: smime/gui/smime-ui.glade.h:39
 msgid "Trust this CA to identify software developers."
 msgstr "Zaufane CA do identyfikowania twórców oprogramowania."
 
-#: smime/gui/smime-ui.glade.h:39
+#: smime/gui/smime-ui.glade.h:40
 msgid "Trust this CA to identify web sites."
 msgstr "Zaufane CA do identyfokowania stron WWW."
 
-#: smime/gui/smime-ui.glade.h:40
+#: smime/gui/smime-ui.glade.h:41
 msgid "View"
 msgstr "Wyświetl"
 
-#: smime/gui/smime-ui.glade.h:41
-msgid "View Certificate"
-msgstr "Wyświetl certyfikat"
-
-#: smime/gui/smime-ui.glade.h:42
-msgid "You have been asked to trust a new Certificate Authority (CA)."
-msgstr "Wystąpiło zapytanie o zaufanie nowego ośrodka certyfikacji (CA)."
-
 # FIXME - jak to inaczej zformułować?
-#: smime/gui/smime-ui.glade.h:43
+#: smime/gui/smime-ui.glade.h:42
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 "Dostępne są certyfikaty identyfikujące Ciebie z następujących instytucji:"
 
-#: smime/gui/smime-ui.glade.h:44
+#: smime/gui/smime-ui.glade.h:43
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 "W ewidencji dostępne są certyfikaty identyfikujące nastepujące ośrodki "
 "certyfikacji:"
 
-#: smime/gui/smime-ui.glade.h:45
+#: smime/gui/smime-ui.glade.h:44
 msgid "You have certificates on file that identify these people:"
 msgstr "W ewidencji dostępne są certyfikaty identyfikujące następujące osoby:"
 
 # FIXME - zamiast Twoje, by nie było gadającego komputera
-#: smime/gui/smime-ui.glade.h:46
+#: smime/gui/smime-ui.glade.h:45
 msgid "Your Certificates"
 msgstr "Dostępne certyfikaty"
 
-#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
+#: smime/gui/smime-ui.glade.h:46
+msgid "_Edit CA Trust"
+msgstr ""
+
+#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
-#: smime/lib/e-cert.c:478
+#. x509 certificate usage types
+#: smime/lib/e-cert.c:424
+#, fuzzy
+msgid "Sign"
+msgstr "Podpisywanie"
+
+#: smime/lib/e-cert.c:425
+#, fuzzy
+msgid "Encrypt"
+msgstr "Zaszyfrowana"
+
+#: smime/lib/e-cert.c:530
 msgid "Version"
 msgstr "Wersja"
 
-#: smime/lib/e-cert.c:493
+#: smime/lib/e-cert.c:545
 msgid "Version 1"
 msgstr "Wersja 1"
 
-#: smime/lib/e-cert.c:496
+#: smime/lib/e-cert.c:548
 msgid "Version 2"
 msgstr "Wersja 2"
 
-#: smime/lib/e-cert.c:499
+#: smime/lib/e-cert.c:551
 msgid "Version 3"
 msgstr "Wersja 3"
 
-#: smime/lib/e-cert.c:581
+#: smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "Szyfrowanie PKCS #1 MD2 z RSA"
 
-#: smime/lib/e-cert.c:584
+#: smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "Szyfrowanie PKCS #1 MD5 z RSA"
 
-#: smime/lib/e-cert.c:587
+#: smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "Szyfrowanie PKCS #1 SHA-1 z RSA"
 
 # FXIME - Co to za skróty?
-#: smime/lib/e-cert.c:590
+#: smime/lib/e-cert.c:642
 msgid "C"
 msgstr "C"
 
 # FXIME - Co to za skróty?
-#: smime/lib/e-cert.c:593
+#: smime/lib/e-cert.c:645
 msgid "CN"
 msgstr "CN"
 
 # FXIME - Co to za skróty?
-#: smime/lib/e-cert.c:596
+#: smime/lib/e-cert.c:648
 msgid "OU"
 msgstr "OU"
 
 # FXIME - Co to za skróty?
-#: smime/lib/e-cert.c:599
+#: smime/lib/e-cert.c:651
 msgid "O"
 msgstr "O"
 
 # FXIME - Co to za skróty?
-#: smime/lib/e-cert.c:602
+#: smime/lib/e-cert.c:654
 msgid "L"
 msgstr "L"
 
 # FXIME - Co to za skróty?
-#: smime/lib/e-cert.c:605
+#: smime/lib/e-cert.c:657
 msgid "DN"
 msgstr "DN"
 
 # FXIME - Co to za skróty?
-#: smime/lib/e-cert.c:608
+#: smime/lib/e-cert.c:660
 msgid "DC"
 msgstr "DC"
 
 # FXIME - Co to za skróty?
-#: smime/lib/e-cert.c:611
+#: smime/lib/e-cert.c:663
 msgid "ST"
 msgstr "ST"
 
-#: smime/lib/e-cert.c:614
+#: smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
 msgstr "Szyfrowanie PKCS #1 RSA"
 
-#: smime/lib/e-cert.c:617
+#: smime/lib/e-cert.c:669
 msgid "Certificate Key Usage"
 msgstr "Użycie klucza certyfikatu"
 
-#: smime/lib/e-cert.c:620
+#: smime/lib/e-cert.c:672
 msgid "Netscape Certificate Type"
 msgstr "Rodzaj certyfikatu Natscape"
 
-#: smime/lib/e-cert.c:623
+#: smime/lib/e-cert.c:675
 msgid "Certificate Authority Key Identifier"
 msgstr "Identyfikator klucza ośrodka certyfikacji"
 
-#: smime/lib/e-cert.c:626
+#: smime/lib/e-cert.c:678
 msgid "UID"
 msgstr "UID"
 
-#: smime/lib/e-cert.c:635
+#: smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Identyfikator algorytmu (%s)"
 
-#: smime/lib/e-cert.c:686
+#: smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
 msgstr "Identyfikator algorytmu"
 
-#: smime/lib/e-cert.c:694
+#: smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
 msgstr "Parametry algorytmu"
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:768
 msgid "Subject Public Key Info"
 msgstr "Informacja klucza publicznego tematu"
 
-#: smime/lib/e-cert.c:721
+#: smime/lib/e-cert.c:773
 msgid "Subject Public Key Algorithm"
 msgstr "Algorytm klucza publicznego tematu"
 
-#: smime/lib/e-cert.c:736
+#: smime/lib/e-cert.c:788
 msgid "Subject's Public Key"
 msgstr "Klucz publiczny tematu"
 
-#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
+#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
 msgid "Error: Unable to process extension"
 msgstr "Błąd: Nie można przetworzyć rozszerzenia"
 
-#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
+#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr "Podpisujący obiekt"
 
-#: smime/lib/e-cert.c:782
+#: smime/lib/e-cert.c:834
 msgid "SSL Certificate Authority"
 msgstr "Ośrodek certyfikacji SSL"
 
-#: smime/lib/e-cert.c:786
+#: smime/lib/e-cert.c:838
 msgid "Email Certificate Authority"
 msgstr "Ośrodek certyfikacji e-mail"
 
-#: smime/lib/e-cert.c:814
+#: smime/lib/e-cert.c:866
 msgid "Signing"
 msgstr "Podpisywanie"
 
 # FIXME - albo nieodrzucanlne
-#: smime/lib/e-cert.c:818
+#: smime/lib/e-cert.c:870
 msgid "Non-repudiation"
 msgstr "Nie odrzucone"
 
-#: smime/lib/e-cert.c:822
+#: smime/lib/e-cert.c:874
 msgid "Key Encipherment"
 msgstr "Szyfrowanie klucza"
 
-#: smime/lib/e-cert.c:826
+#: smime/lib/e-cert.c:878
 msgid "Data Encipherment"
 msgstr "Szyfrowanie danych"
 
 # FIXME - albo kluczowe uzgodnienie? 
-#: smime/lib/e-cert.c:830
+#: smime/lib/e-cert.c:882
 msgid "Key Agreement"
 msgstr "Uzgodnienie kluczy"
 
-#: smime/lib/e-cert.c:834
+#: smime/lib/e-cert.c:886
 msgid "Certificate Signer"
 msgstr "Podpisujący certyfikat"
 
-#: smime/lib/e-cert.c:838
+#: smime/lib/e-cert.c:890
 msgid "CRL Signer"
 msgstr "Podpisujący CRL"
 
-#: smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:938
 msgid "Critical"
 msgstr "Krytyczne"
 
-#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
+#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
 msgid "Not Critical"
 msgstr "Nie krytyczne"
 
-#: smime/lib/e-cert.c:912
+#: smime/lib/e-cert.c:964
 msgid "Extensions"
 msgstr "Rozszerzenia"
 
-#: smime/lib/e-cert.c:983
+#: smime/lib/e-cert.c:1035
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
 msgid "Certificate Signature Algorithm"
 msgstr "Błędny podpis certyfikatu"
 
-#: smime/lib/e-cert.c:1048
+#: smime/lib/e-cert.c:1100
 msgid "Issuer"
 msgstr "Wystawiający"
 
-#: smime/lib/e-cert.c:1102
+#: smime/lib/e-cert.c:1154
 msgid "Issuer Unique ID"
 msgstr "Unikalne ID wystawiającego"
 
-#: smime/lib/e-cert.c:1121
+#: smime/lib/e-cert.c:1173
 msgid "Subject Unique ID"
 msgstr "Unikalne ID tematu"
 
-#: smime/lib/e-cert.c:1164
+#: smime/lib/e-cert.c:1216
 msgid "Certificate Signature Value"
 msgstr "Wartość podpis certyfikatu"
 
@@ -17780,7 +17215,7 @@ msgstr "Wyświetla bieżący kontakt"
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "Ak_cje"
 
@@ -17939,7 +17374,7 @@ msgstr "Zam_knij"
 #: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:3
+#: ui/evolution.xml.h:4
 msgid "Close"
 msgstr "Zamknij"
 
@@ -17952,7 +17387,7 @@ msgid "Delete this item"
 msgstr "Usuwa bieżący element"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr "Główny pasek narzędziowy"
 
@@ -17995,7 +17430,7 @@ msgstr "Zapisuje bieżący element na dysku"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:44
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "_File"
 msgstr "_Plik"
 
@@ -18256,13 +17691,13 @@ msgstr "_Odwróć zaznaczenie"
 msgid "_Threaded Message List"
 msgstr "Grupowanie listów w wąt_ki"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Zamyka bieżące okno"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "_Close"
 msgstr "Zam_knij"
 
@@ -18660,7 +18095,7 @@ msgstr "_Poprzedni list"
 msgid "_Quoted"
 msgstr "Jako _cytat"
 
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
 msgid "_Tools"
 msgstr "_Narzędzia"
 
@@ -18957,107 +18392,121 @@ msgid "_Open Task"
 msgstr "_Otwórz zadanie"
 
 #: ui/evolution.xml.h:1
-msgid "About Ximian Evolution..."
-msgstr "Informacje o programie Ximian Evolution..."
+#, fuzzy
+msgid "About Evolution..."
+msgstr "Informacje o programie Evolution"
 
 #: ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
 msgstr "Zmienia ustawienia Evolution"
 
-#: ui/evolution.xml.h:5
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the visibility of the toolbar"
+msgstr "Zmienia właściwości folderu"
+
+#: ui/evolution.xml.h:6
 msgid "Create a new window displaying this folder"
 msgstr "Tworzy nowe okno wyświetlające ten folder"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "_Zakończ"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "_Najczęściej zadawane pytania"
+
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Kończy pracę programu"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:10
 msgid "Forget _Passwords"
 msgstr "Zapomnij _hasła"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:11
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Zapomina zapamiętane hasła, co spowoduje ponowne pytanie o nie"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:12
 msgid "Import data from other programs"
 msgstr "Import danych z innych programów"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:14
 msgid "New _Window"
 msgstr "No_we okno"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Pi_lot Settings..."
 msgstr "Ustawienia Pi_lota..."
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Send / Receive"
 msgstr "Wyślij / Odbierz"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Send queued items and retrieve new items"
 msgstr "Wysyła listy w kolejce i pobiera nowe"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Set up Pilot configuration"
 msgstr "Ustawia konfigurację Pilota"
 
-#: ui/evolution.xml.h:17
-msgid "Show information about Ximian Evolution"
+#: ui/evolution.xml.h:19
+#, fuzzy
+msgid "Show information about Evolution"
 msgstr "Wyświetla informacje o programie Ximian Evolution"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:20
 msgid "Submit Bug Report"
 msgstr "Wyślij zgłoszenie błędu"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:21
 msgid "Submit _Bug Report"
 msgstr "Wyślij zgłoszenie _błędu"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Wysyła zgłoszenie błędu za pomocą Bug Buddy"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:23
+#, fuzzy
+msgid "T_oolbar"
+msgstr "Główny pasek narzędziowy"
+
+#: ui/evolution.xml.h:24
 msgid "Toggle whether we are working offline."
 msgstr ""
 "Przełącza pomiędzy trybami pracy z podłączeniem i bez podłączenia do sieci."
 
-#: ui/evolution.xml.h:23
-msgid "Ximian Evolution _FAQ"
-msgstr "_Najczęściej zadawane pytania"
-
-#: ui/evolution.xml.h:24
-msgid "_About Ximian Evolution..."
-msgstr "_Informacje o programie Ximian Evolution..."
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "_About Evolution..."
+msgstr "Informacje o programie Evolution"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "_Help"
 msgstr "Pomo_c"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "_Import..."
 msgstr "Za_importuj..."
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "_New"
 msgstr "_Nowy"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "_Quick Reference"
 msgstr "_Szybki odnośnik"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_Send / Receive"
 msgstr "Wyślij / _Odbierz"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 msgid "_Window"
 msgstr "O_kno"
 
@@ -19449,6 +18898,484 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (zakończono %d%%)"
 
+#~ msgid "Failed to connect to LDAP server"
+#~ msgstr "Nie można nawiązać połączenia z serwerem LDAP"
+
+#~ msgid "Failed to authenticate with LDAP server"
+#~ msgstr "Nie można dokonać uwierzytelnienia na serwerze LDAP"
+
+#~ msgid "Could not perform query on Root DSE"
+#~ msgstr "Nie można wykonać zapytania na głównym DSE"
+
+#~ msgid "The server responded with no supported search bases"
+#~ msgstr ""
+#~ "Serwer nie przekazał w odpowiedzi żadnych obsługiwanych podstaw "
+#~ "wyszukiwania"
+
+#~ msgid "This server does not support LDAPv3 schema information"
+#~ msgstr "Serwer nie obsługuje informacji schematu LDAPv3"
+
+#~ msgid "Error retrieving schema information"
+#~ msgstr "Błąd przy pobieraniu informacji o schemacie"
+
+#~ msgid "Server did not respond with valid schema information"
+#~ msgstr "Odpowiedź serwera nie zawiera poprawnych informacji o schemacie"
+
+#~ msgid ""
+#~ "Some fields are no longer representable in the contact editor. Please "
+#~ "wait while Evolution copies those fields to the 'Notes' field..."
+#~ msgstr ""
+#~ "Część pól została usunięta z edytora kontaktów. Poczekaj, aż Evolution "
+#~ "skopiuje te pola do sekcji \"Notatki\"..."
+
+#~ msgid "  S_how Supported Bases "
+#~ msgstr " Wyświ_etl obsługiwane typy "
+
+#~ msgid "1:00"
+#~ msgstr "1:00"
+
+#~ msgid "5:00"
+#~ msgstr "5:00"
+
+#~ msgid "Connecting"
+#~ msgstr "Nawiązywanie połączenia"
+
+#~ msgid "Distinguished _name:"
+#~ msgstr "_Wyróżniona nazwa:"
+
+#~ msgid "Email address:"
+#~ msgstr "Adres e-mail:"
+
+#~ msgid "Evolution will use this DN to authenticate you with the server"
+#~ msgstr ""
+#~ "Evolution wykorzysta przy uwierzytelnianiu na serwerze podaną wyróżnioną "
+#~ "nazwę (DN)"
+
+#~ msgid "One"
+#~ msgstr "Jeden"
+
+#~ msgid "S_earch scope: "
+#~ msgstr "_Zakres wyszukiwania: "
+
+#~ msgid "Searching"
+#~ msgstr "Wyszukiwanie"
+
+#~ msgid "Sub"
+#~ msgstr "Podrzędne"
+
+#~ msgid "This option controls how long a search will be run."
+#~ msgstr "Opcja ta kontroluje czas trwania wyszukiwania."
+
+#~ msgid "U_se SSL/TLS:"
+#~ msgstr "Uży_cie SSL/TLS:"
+
+#~ msgid "_Display name:"
+#~ msgstr "_Wyświetlana nazwa:"
+
+#~ msgid "_Port number:"
+#~ msgstr "Numer p_ortu:"
+
+#~ msgid "_Search base:"
+#~ msgstr "_Podstawa wyszukiwania:"
+
+#~ msgid "_Server name:"
+#~ msgstr "_Nazwa serwera:"
+
+#~ msgid "_Timeout (minutes):"
+#~ msgstr "_Czas oczekiwania (minuty):"
+
+#~ msgid "connecting-tab"
+#~ msgstr "zakładka-nawiązywanie połączenia"
+
+#~ msgid "general-tab"
+#~ msgstr "zakładka-ogólne"
+
+#~ msgid "searching-tab"
+#~ msgstr "zakładka-wyszukiwanie"
+
+#~ msgid "Webcam:"
+#~ msgstr "Kamera internetowa:"
+
+#~ msgid "item7"
+#~ msgstr "element7"
+
+#~ msgid "item8"
+#~ msgstr "element8"
+
+#~ msgid "Category editor not available."
+#~ msgstr "Edytor kategorii nie jest dostępny."
+
+#~ msgid "Unable to open addressbook"
+#~ msgstr "Nie można otworzyć książki adresowej"
+
+#~ msgid "Do you want to save changes?"
+#~ msgstr "Czy chcesz zapisać zmiany?"
+
+#~ msgid "Error saving %s: %s"
+#~ msgstr "Błąd przy zapisie %s: %s"
+
+#~ msgid ""
+#~ "The addressbook backend for\n"
+#~ "%s\n"
+#~ "has crashed. You will have to restart Evolution in order to use it again"
+#~ msgstr ""
+#~ "Program obsługujący książkę adresową o URI\n"
+#~ "%s\n"
+#~ "nieoczekiwanie zakończył działanie. Aby znów móc jej użyć, należy "
+#~ "ponownie uruchomić Evolution."
+
+#~ msgid "Calendar Properties"
+#~ msgstr "Właściwości kalendarza"
+
+# FIXME - upewnić się
+#~ msgid "Remote"
+#~ msgstr "Zdalny"
+
+#~ msgid "Task List Properties"
+#~ msgstr "Właściwości listy zadań"
+
+#~ msgid "_Refresh Interval:"
+#~ msgstr "_Czas odświeżania:"
+
+#~ msgid "_Source URL:"
+#~ msgstr "_Adres URL źródła:"
+
+#~ msgid ""
+#~ "The event being deleted is a meeting, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "Usuwane zdarzenie jest spotkaniem. Czy chcesz wysłać powiadomienie o "
+#~ "anulowaniu?"
+
+#~ msgid "Are you sure you want to cancel and delete this meeting?"
+#~ msgstr "Czy na pewno chcesz anulować i usunąć to spotkanie?"
+
+#~ msgid ""
+#~ "The task being deleted is assigned, would you like to send a cancellation "
+#~ "notice?"
+#~ msgstr ""
+#~ "Usuwane zadanie jest przypisane. Czy chcesz wysłać powiadomienie o "
+#~ "anulowaniu?"
+
+#~ msgid "Are you sure you want to cancel and delete this task?"
+#~ msgstr "Czy na pewno chcesz anulować i usunąć to zadanie?"
+
+#~ msgid ""
+#~ "The journal entry being deleted is published, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "Usuwany wpis dziennika jest opublikowany. Czy chcesz wysłać powiadomienie "
+#~ "o anulowaniu?"
+
+#~ msgid "Are you sure you want to cancel and delete this journal entry?"
+#~ msgstr "Czy na pewno chcesz anulować i usunąć ten wpis dziennika?"
+
+#~ msgid "Are you sure you want to delete the appointment `%s'?"
+#~ msgstr "Czy na pewno chcesz usunąć termin \"%s\"?"
+
+#~ msgid "Are you sure you want to delete this untitled appointment?"
+#~ msgstr "Czy na pewno chcesz usunąć ten pozbawiony nazwy termin?"
+
+#~ msgid "Are you sure you want to delete the task `%s'?"
+#~ msgstr "Czy na pewno chcesz usunąć zadanie \"%s\"?"
+
+#~ msgid "Are you sure you want to delete this untitled task?"
+#~ msgstr "Czy na pewno chcesz usunąć to pozbawione nazwy zadanie?"
+
+#~ msgid "Are you sure you want to delete the journal entry `%s'?"
+#~ msgstr "Czy na pewno chcesz usunąć wpis dziennika zatytułowany \"%s\"?"
+
+#~ msgid "Are you sure want to delete this untitled journal entry?"
+#~ msgstr "Czy na pewno chcesz usunąć ten niezatytułowany wpis dziennika?"
+
+#~ msgid "Are you sure you want to delete %d appointment?"
+#~ msgid_plural "Are you sure you want to delete %d appointments?"
+#~ msgstr[0] "Czy na pewno chcesz usunąć %d termin?"
+#~ msgstr[1] "Czy na pewno chcesz usunąć %d terminy?"
+#~ msgstr[2] "Czy na pewno chcesz usunąć %d terminów?"
+
+#~ msgid "Are you sure you want to delete %d task?"
+#~ msgid_plural "Are you sure you want to delete %d tasks?"
+#~ msgstr[0] "Czy na pewno chcesz usunąć %d zadanie?"
+#~ msgstr[1] "Czy na pewno chcesz usunąć %d zadania?"
+#~ msgstr[2] "Czy na pewno chcesz usunąć %d zadań?"
+
+#~ msgid "Are you sure you want to delete %d journal entry?"
+#~ msgid_plural "Are you sure you want to delete %d journal entries?"
+#~ msgstr[0] "Czy na pewno chcesz usunąć %d wpis dziennika?"
+#~ msgstr[1] "Czy na pewno chcesz usunąć %d wpisy dziennika?"
+#~ msgstr[2] "Czy na pewno chcesz usunąć %d wpisów dziennika?"
+
+#~ msgid "_Invite Others..."
+#~ msgstr "_Zaproś innych..."
+
+#~ msgid ""
+#~ "This event has been changed, but has not been saved.\n"
+#~ "\n"
+#~ "Do you wish to save your changes?"
+#~ msgstr ""
+#~ "Zdarzenie zostało zmienione, lecz nie zostało ono zapisane.\n"
+#~ "\n"
+#~ "Czy chcesz zapisać wprowadzone zmiany?"
+
+#~ msgid "_Discard Changes"
+#~ msgstr "_Porzuć zmiany"
+
+#~ msgid "Save Event"
+#~ msgstr "Zapisz zdarzenie"
+
+#~ msgid "The meeting information has been created. Send it?"
+#~ msgstr "Została utworzona informacja o spotkaniu. Czy wysłać ją?"
+
+#~ msgid "The meeting information has changed. Send an updated version?"
+#~ msgstr ""
+#~ "Informacje o spotkaniu zostały zmienione. Czy wysłać aktualną wersję?"
+
+#~ msgid "The task assignment information has been created. Send it?"
+#~ msgstr "Została utworzona informacja o przypisaniu zadania. Czy wysłać ją?"
+
+#~ msgid "The task information has changed. Send an updated version?"
+#~ msgstr "Informacje o zadaniu zostały zmienione. Czy wysłać aktualną wersję?"
+
+#~ msgid "The task backend for '%s' has crashed."
+#~ msgstr "Obsługa zadania dla \"%s\" spowodowała błąd."
+
+#~ msgid "The calendar backend for '%s' has crashed."
+#~ msgstr "Obsługa kalendarza dla \"%s\" spowodowała błąd."
+
+#~ msgid "Could not get article %s from NNTP server"
+#~ msgstr "Nie można pobrać artykułu %s z serwera NNTP"
+
+#~ msgid "Posting not allowed by news server"
+#~ msgstr "Pozycjonowanie nie jest dozwolone przez serwer wiadomości"
+
+#~ msgid "Failed to send newsgroups header: %s: message not posted"
+#~ msgstr ""
+#~ "Błąd wysłania nagłówka grupy dyskusyjnej: %s: wiadomość nie została "
+#~ "wysłana"
+
+#~ msgid "Error posting to newsgroup: %s: message not posted"
+#~ msgstr "Błąd wysyłki na grupę dyskusyjną: %s: wiadomość nie została wysłana"
+
+#~ msgid "Error reading response to posted message: message not posted"
+#~ msgstr ""
+#~ "Błąd odczytu odpowiedzi na wysłaną wiadomość: wiadomość nie została "
+#~ "wysłana"
+
+#~ msgid "Error posting message: %s: message not posted"
+#~ msgstr "Błąd wysyłki wiadomości: %s: wiadomość nie została wysłana"
+
+#~ msgid "Stream error"
+#~ msgstr "Błąd strumienia"
+
+#~ msgid "Connection error: %s"
+#~ msgstr "Błąd połączenia: %s"
+
+#~ msgid "Could not get group: %s"
+#~ msgstr "Nie można pobrać grupy: %s"
+
+#~ msgid "Could not get messages: unspecified error"
+#~ msgstr "Nie można pobrać wiadomości: nieokreślony błąd"
+
+#~ msgid "Unknown server response: %s"
+#~ msgstr "Nieznana odpowiedź serwera: %s"
+
+#~ msgid "${1}"
+#~ msgstr "${1}"
+
+#~ msgid "Because \"${1}\"."
+#~ msgstr "Ponieważ \"${1}\"."
+
+#~ msgid "Adjust Score"
+#~ msgstr "Dopasuj punkty"
+
+#~ msgid "Assign Color"
+#~ msgstr "Przypisz kolor"
+
+#~ msgid "Assign Score"
+#~ msgstr "Przypisz punkty"
+
+#~ msgid "Attachments"
+#~ msgstr "Załączniki"
+
+#~ msgid "Beep"
+#~ msgstr "Brzęczyk"
+
+#~ msgid "contains"
+#~ msgstr "zawiera"
+
+#~ msgid "Copy to Folder"
+#~ msgstr "Skopiuj do folderu"
+
+#~ msgid "Date received"
+#~ msgstr "Data otrzymania"
+
+#~ msgid "Date sent"
+#~ msgstr "Data wysłania"
+
+#~ msgid "Deleted"
+#~ msgstr "Usunięty"
+
+#~ msgid "does not contain"
+#~ msgstr "nie zawiera"
+
+#~ msgid "does not end with"
+#~ msgstr "nie kończy się na"
+
+#~ msgid "does not exist"
+#~ msgstr "nie istnieje"
+
+#~ msgid "does not return"
+#~ msgstr "nie powraca"
+
+#~ msgid "does not sound like"
+#~ msgstr "nie brzmi jak"
+
+#~ msgid "does not start with"
+#~ msgstr "nie rozpoczyna się od"
+
+#~ msgid "Do Not Exist"
+#~ msgstr "Nie istnieje"
+
+#~ msgid "Draft"
+#~ msgstr "Roboczy"
+
+#~ msgid "ends with"
+#~ msgstr "kończy się na"
+
+#~ msgid "Exist"
+#~ msgstr "Istnieje"
+
+#~ msgid "exists"
+#~ msgstr "istnieje"
+
+#~ msgid "Expression"
+#~ msgstr "Wyrażenie"
+
+#~ msgid "Follow Up"
+#~ msgstr "Kontynuuj"
+
+#~ msgid "is"
+#~ msgstr "jest"
+
+#~ msgid "is after"
+#~ msgstr "jest po"
+
+#~ msgid "is before"
+#~ msgstr "jest przed"
+
+#~ msgid "is Flagged"
+#~ msgstr "jest oznaczony"
+
+#~ msgid "is greater than"
+#~ msgstr "jest większy niż"
+
+#~ msgid "is less than"
+#~ msgstr "jest mniejszy niż"
+
+#~ msgid "is not"
+#~ msgstr "nie jest"
+
+#~ msgid "is not Flagged"
+#~ msgstr "nie jest oznaczony"
+
+#~ msgid "Junk Test"
+#~ msgstr "Test śmieci"
+
+#~ msgid "Mailing list"
+#~ msgstr "Lista dyskusyjna"
+
+#~ msgid "Message Body"
+#~ msgstr "Treść listu"
+
+#~ msgid "Message Header"
+#~ msgstr "Nagłówek listu"
+
+#~ msgid "Message is Junk"
+#~ msgstr "Wiadomość jest śmieciem"
+
+#~ msgid "Message is not Junk"
+#~ msgstr "Wiadomość nie jest śmieciem"
+
+#~ msgid "Move to Folder"
+#~ msgstr "Przeniesienie do folderu"
+
+#~ msgid "Pipe to Program"
+#~ msgstr "Przesłanie do programu"
+
+#~ msgid "Play Sound"
+#~ msgstr "Odtworzenie dźwięku"
+
+#~ msgid "Recipients"
+#~ msgstr "Lista odbiorców"
+
+#~ msgid "Regex Match"
+#~ msgstr "Dopasowanie wg regexp"
+
+#~ msgid "Replied to"
+#~ msgstr "Odpowiedziana do"
+
+#~ msgid "returns"
+#~ msgstr "zwraca"
+
+#~ msgid "returns greater than"
+#~ msgstr "zwraca więcej niż"
+
+#~ msgid "returns less than"
+#~ msgstr "zwraca mniej niż"
+
+# FIXME - sprawdzić formę
+#~ msgid "Run Program"
+#~ msgstr "Uruchamiany program"
+
+#~ msgid "Sender"
+#~ msgstr "Nadawca"
+
+#~ msgid "Set Status"
+#~ msgstr "Ustaw stan"
+
+#~ msgid "Size (kB)"
+#~ msgstr "Rozmiar (KB)"
+
+#~ msgid "sounds like"
+#~ msgstr "brzmi jak"
+
+#~ msgid "Source Account"
+#~ msgstr "Konto źródłowe"
+
+#~ msgid "Specific header"
+#~ msgstr "Określony nagłówek"
+
+#~ msgid "starts with"
+#~ msgstr "rozpoczyna się od"
+
+#~ msgid "Stop Processing"
+#~ msgstr "Zatrzymanie przetwarzania"
+
+#~ msgid "Unset Status"
+#~ msgstr "Wyczyszczenie stanu"
+
+#~ msgid "Brought to you by"
+#~ msgstr "Dostarczone przez"
+
+#~ msgid "_Filename:"
+#~ msgstr "_Nazwa pliku:"
+
+#~ msgid "Do you want to trust \"%s\" for the following purposes?"
+#~ msgstr "Czy chcesz zufać \"%s\" dla nastepujących zastosowań?"
+
+#~ msgid "View Certificate"
+#~ msgstr "Wyświetl certyfikat"
+
+#~ msgid "You have been asked to trust a new Certificate Authority (CA)."
+#~ msgstr "Wystąpiło zapytanie o zaufanie nowego ośrodka certyfikacji (CA)."
+
+#~ msgid "About Ximian Evolution..."
+#~ msgstr "Informacje o programie Ximian Evolution..."
+
+#~ msgid "_About Ximian Evolution..."
+#~ msgstr "_Informacje o programie Ximian Evolution..."
+
 #~ msgid "Can not load URI"
 #~ msgstr "Nie można wczytać adresu URI"
 
diff --git a/po/pt.po b/po/pt.po
index 82461a911b..6cefbe49ea 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 2.6\n"
-"POT-Creation-Date: 2004-05-19 14:00-0400\n"
+"POT-Creation-Date: 2004-06-03 11:14-0400\n"
 "PO-Revision-Date: 2004-05-16 21:55+0000\n"
 "Last-Translator: Duarte Loreto <happyguy_pt@hotmail.com>\n"
 "Language-Team: Portuguese <gnome_pt@yahoogroups.com>\n"
@@ -55,13 +55,13 @@ msgstr " cartão"
 msgid "Default Sync Address:"
 msgstr "Endereço de Sincronização Por Omissão:"
 
-#: addressbook/conduit/address-conduit.c:1150
 #: addressbook/conduit/address-conduit.c:1151
+#: addressbook/conduit/address-conduit.c:1152
 msgid "Could not load addressbook"
 msgstr "Incapaz de ler o livro de endereços"
 
-#: addressbook/conduit/address-conduit.c:1219
-#: addressbook/conduit/address-conduit.c:1222
+#: addressbook/conduit/address-conduit.c:1220
+#: addressbook/conduit/address-conduit.c:1223
 msgid "Could not read pilot's Address application block"
 msgstr "Incapaz de ler o bloco da aplicação de Endereços da pilot"
 
@@ -69,13 +69,13 @@ msgstr "Incapaz de ler o bloco da aplicação de Endereços da pilot"
 msgid "Accessing LDAP Server anonymously"
 msgstr "A aceder anonimamente ao Servidor LDAP"
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
 msgid "Failed to authenticate.\n"
 msgstr "Falha ao autenticar-se.\n"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sIntroduza a senha para %s (utilizador %s)"
@@ -116,51 +116,23 @@ msgstr "Grupo de _Contactos"
 msgid "Create a new contacts group"
 msgstr "Criar um novo grupo de contactos"
 
-#: addressbook/gui/component/addressbook-component.c:182
+#: addressbook/gui/component/addressbook-component.c:184
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr "Falha ao actualizar as pastas ou definições de Livro de Endereços."
 
-#: addressbook/gui/component/addressbook-config.c:483
-msgid "Failed to connect to LDAP server"
-msgstr "Incapaz de se ligar ao servidor LDAP"
-
-#: addressbook/gui/component/addressbook-config.c:507
-msgid "Failed to authenticate with LDAP server"
-msgstr "Falha ao autenticar-se no servidor LDAP"
-
-#: addressbook/gui/component/addressbook-config.c:535
-msgid "Could not perform query on Root DSE"
-msgstr "Incapaz de efectuar pesquisa no DSE Raíz"
-
-#: addressbook/gui/component/addressbook-config.c:840
-msgid "The server responded with no supported search bases"
-msgstr "O servidor respondeu com nenhuma base de procura suportada"
-
-#: addressbook/gui/component/addressbook-config.c:1245
-msgid "This server does not support LDAPv3 schema information"
-msgstr "Este servidor não suporta esquema de informação LDAPv3"
-
-#: addressbook/gui/component/addressbook-config.c:1266
-msgid "Error retrieving schema information"
-msgstr "Erro ao obter a informação de esquema"
-
-#: addressbook/gui/component/addressbook-config.c:1274
-msgid "Server did not respond with valid schema information"
-msgstr "Servidor não respondeu com informação de esquema válida"
-
 #: addressbook/gui/component/addressbook-migrate.c:68
-#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1160
 msgid "Migrating..."
 msgstr "A migrar..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1201
 #, c-format
 msgid "Migrating `%s':"
 msgstr "A migrar `%s':"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:438
+#: addressbook/gui/component/addressbook-migrate.c:464
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
 #: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
@@ -168,28 +140,28 @@ msgid "On This Computer"
 msgstr "Neste Computador"
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:446
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
-#: mail/mail-config.glade.h:106
+#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
+#: mail/mail-config.glade.h:109
 msgid "Personal"
 msgstr "Pessoal"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:454
+#: addressbook/gui/component/addressbook-migrate.c:480
 msgid "On LDAP Servers"
 msgstr "Em Servidores LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:582
+#: addressbook/gui/component/addressbook-migrate.c:608
 msgid "LDAP Servers"
 msgstr "Servidores LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:702
+#: addressbook/gui/component/addressbook-migrate.c:728
 msgid "Autocompletion Settings"
 msgstr "Definições de Completar Automaticamente"
 
-#: addressbook/gui/component/addressbook-migrate.c:1076
+#: addressbook/gui/component/addressbook-migrate.c:1104
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -201,7 +173,7 @@ msgstr ""
 "\n"
 "Aguarde enquanto o Evolution migra as suas pastas..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1090
+#: addressbook/gui/component/addressbook-migrate.c:1118
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -211,7 +183,7 @@ msgstr ""
 "\n"
 "Aguarde enquanto o Evolution migra as suas pastas..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1099
+#: addressbook/gui/component/addressbook-migrate.c:1127
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -221,7 +193,7 @@ msgstr ""
 "\n"
 "Aguarde enquanto o Evolution migra as suas pastas..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1109
+#: addressbook/gui/component/addressbook-migrate.c:1137
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -232,40 +204,35 @@ msgstr ""
 "\n"
 "Aguarde enquanto o Evolution migra os seus dados Pilot Sync..."
 
-#: addressbook/gui/component/addressbook-view.c:674
+#: addressbook/gui/component/addressbook-view.c:675
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 "O livro de endereços '%s' será removido. Tem a certeza de que deseja "
 "continuar?"
 
-#: addressbook/gui/component/addressbook-view.c:761
+#: addressbook/gui/component/addressbook-view.c:754
 msgid "New Address Book"
 msgstr "Novo Livro de Endereços"
 
-#: addressbook/gui/component/addressbook-view.c:762
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
+#: addressbook/gui/component/addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Apagar"
 
-#: addressbook/gui/component/addressbook-view.c:763
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-view.c:756
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Propriedades..."
 
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/addressbook-view.c:1002
+#. Create the contacts group
+#: addressbook/gui/component/addressbook-view.c:995
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
 #: calendar/gui/migration.c:373
 msgid "Contacts"
 msgstr "Contactos"
@@ -344,10 +311,6 @@ msgid "Manage your S/MIME certificates here"
 msgstr "Efectue aqui a gestão dos seus certificados S/MIME"
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-msgid "  S_how Supported Bases "
-msgstr "  Apresentar _Bases Suportadas "
-
-#: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -362,190 +325,157 @@ msgstr "  Apresentar _Bases Suportadas "
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr "1"
 
-#: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1:00"
-msgstr "1:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr "5"
 
-#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
-msgstr "5:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "<b>Authentication</b>"
 msgstr "<b>Autenticação</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Display</b>"
 msgstr "<b>Apresentação</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "<b>Downloading</b>"
 msgstr "<b>A Efectuar Download</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "<b>Searching</b>"
 msgstr "<b>A Procurar</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:11
 msgid "<b>Server Information</b>"
 msgstr "<b>Informação de Servidor</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:12
 msgid "<b>Type:</b>"
 msgstr "<b>Tipo:</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add Contacts Group"
 msgstr "Adicionar Grupo de Contactos"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Address Book Properties"
 msgstr "Propriedades do Livro de Endereços"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
-#: mail/mail-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
+#: mail/mail-config.glade.h:42
 msgid "Always"
 msgstr "Sempre"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr "Anonimamente"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:17
 #: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Básico"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
-msgid "Connecting"
-msgstr "A ligar"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 #: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Detalhes"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
-msgid "Distinguished _name:"
-msgstr "_Nome distinto:"
-
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished name"
 msgstr "Nome distinto"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Download limit:"
 msgstr "Limite de download:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Email address"
 msgstr "Endereço de email"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "Email address:"
-msgstr "Endereço de email:"
-
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "Evolution will use this DN to authenticate you with the server"
-msgstr "Evolution irá utilizar este ND para o autenticar no servidor"
-
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:22
+#, fuzzy
 msgid ""
-"Evolution will use this email address to authenticate you with the server"
+"Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "Evolution irá utilizar este endereço de email para o autenticar no servidor"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Find Possible Search Bases"
 msgstr "Procurar Possíveis Bases de Procura"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:24
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
+#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Geral"
 
-#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
-#: mail/mail-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
+#: mail/mail-config.glade.h:102
 msgid "Never"
 msgstr "Nunca"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
-msgid "One"
-msgstr "Um"
-
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Only locations within starting point"
 msgstr "Apenas localizações dentro do ponto inicial"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
-msgid "S_earch scope: "
-msgstr "Â_mbito da procura: "
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Search _base:"
+msgstr "Base da procura:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:28
 msgid "Search base only"
 msgstr "Apenas a base da procura"
 
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid "Search base:"
 msgstr "Base da procura:"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid "Search scope:"
 msgstr "Â_mbito da procura:"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
-msgid "Searching"
-msgstr "A procurar"
-
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:31
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
-"server if\n"
-"your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL or TLS."
 msgstr ""
 "Seleccionar esta opção significa que o Evolution apenas se ligará ao seu "
 "servidor\n"
 "LDAP se este suportar SSL ou TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a \n"
-"insecure environment. For example, if you and your LDAP server are behind a "
-"firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection "
-"is already\n"
-"secure."
+"you are in a insecure environment. For example, if you and your LDAP server "
+"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
+"because your connection is already secure."
 msgstr ""
 "Seleccionar esta opção significa que o Evolution apenas tentará utilizar SSL/"
 "TLS se você \n"
@@ -555,50 +485,44 @@ msgstr ""
 "pois a sua ligação\n"
 "já é segura."
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:33
+#, fuzzy
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
-"TLS.  This \n"
-"means that your connection will be insecure, and that you will be vulnerable "
-"to security\n"
-"exploits. "
+"TLS.  This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits. "
 msgstr ""
 "Seleccionar esta opção significa que o seu servidor não suporta ou SSL ou "
 "TLS. Isto \n"
 "significa que a sua ligação será insegura, e que estará vulnerável a abusos\n"
 "de segurança. "
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Starting point and locations within it"
 msgstr "Ponto inicial e localizações contidas"
 
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Sub"
-msgstr "Sub"
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr "Bases de Procura Suportadas"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
-"searches will \n"
-"begin. If you leave this blank, the search will begin at the root of the "
-"directory tree."
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
 msgstr ""
 "A base de procura é o nome distinto (ND) da entrada onde as suas procuras "
 "irão começar.\n"
 "Se vazio, as procuras iniciar-se-ão na raiz da árvore de directório."
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:37
+#, fuzzy
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
-"the \n"
-"directory tree. A search scope of \"sub\" will include all entries below "
-"your search base.\n"
-"A search scope of \"one\" will only include the entries one level beneath "
-"your base.\n"
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
 msgstr ""
 "O âmbito de procura define quão profunda na árvore de directório deseja que "
 "a sua \n"
@@ -607,7 +531,7 @@ msgstr ""
 "Um âmbito de procura \"um\" apenas incluirá apenas as entradas um nível "
 "abaixo da sua base.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:58
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -615,17 +539,17 @@ msgstr ""
 "Este é o nome completo do seu servidor ldap. Por exemplo, \"ldap."
 "minhaempresa.pt\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:39
+#, fuzzy
 msgid ""
-"This is the maximum number of entries to download. Setting this number to "
-"be \n"
+"This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr ""
 "Este é o número máximo de entradas a efectuar download. Definir um número "
 "demasiado \n"
 "grande irá tornar mais lento o seu livro de endereços."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -635,135 +559,114 @@ msgstr ""
 "configurar este parâmetro para \"Endereço de Email\" requer acesso anónimo "
 "ao seu servidor ldap."
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:41
+#, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
-"list.\n"
-"It is for display purposes only. "
+"list. It is for display purposes only. "
 msgstr ""
 "Este é o nome deste servidor que será apresentado na sua lista de pasta "
 "Evolution.\n"
 "O seu propósito é apenas de visualização. "
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:42
+#, fuzzy
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. "
-"A \n"
-"list of standard ports has been provided. Ask your system administrator\n"
-"what port you should specify."
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
 msgstr ""
 "Este é o porto do servidor LDAP a que o Evolution se tentará ligar. É \n"
 "apresentada uma lista de portos standard. Pergunte ao seu administrador de\n"
 "sistemas que porto deverá seleccionar."
 
-#: addressbook/gui/component/ldap-config.glade.h:67
-msgid "This option controls how long a search will be run."
-msgstr "Esta opção determina quanto tempo poderá durar uma procura."
-
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid "Timeout:"
 msgstr "Limite de expiração:"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
-msgid "U_se SSL/TLS:"
-msgstr "Utilizar _SSL/TLS:"
-
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr "Utilizar o nome distinto (ND)"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr "Utilizar o endereço de email"
 
-#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
-#: mail/mail-config.glade.h:154
+#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
+#: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr "Sempre Que Possível"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:47
 msgid "_Add Contacts Group"
 msgstr "_Adicionar Grupo de Contactos"
 
-#: addressbook/gui/component/ldap-config.glade.h:74
-#: calendar/gui/dialogs/calendar-setup.glade.h:12
-msgid "_Display name:"
-msgstr "_Nome de apresentação:"
-
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr "Limite de _download:"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Email address:"
 msgstr "Endereço de _email:"
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:50
+#, fuzzy
+msgid "_Find Possible Search Bases"
+msgstr "Procurar Possíveis Bases de Procura"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Log in method:"
 msgstr "_Método de autenticação:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "_Log in:"
+msgstr "Sessão"
+
+#: addressbook/gui/component/ldap-config.glade.h:53
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
-msgid "_Port number:"
-msgstr "Número do _porto:"
-
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid "_Port:"
 msgstr "_Porto:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
-msgid "_Search base:"
-msgstr "Ba_se da procura:"
-
-#: addressbook/gui/component/ldap-config.glade.h:82
-msgid "_Server name:"
-msgstr "Nome do _servidor:"
+#: addressbook/gui/component/ldap-config.glade.h:55
+#, fuzzy
+msgid "_Search scope:"
+msgstr "Â_mbito da procura:"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:56
 msgid "_Server:"
 msgstr "_Servidor:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
-msgid "_Timeout (minutes):"
-msgstr "E_xpiração (minutos):"
+#: addressbook/gui/component/ldap-config.glade.h:57
+#, fuzzy
+msgid "_Timeout:"
+msgstr "Limite de expiração:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:58
 msgid "_Use secure connection:"
 msgstr "_Utilizar uma ligação segura:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "cartões"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
-msgid "connecting-tab"
-msgstr "separador-a-ligar-se"
-
-#: addressbook/gui/component/ldap-config.glade.h:88
-msgid "general-tab"
-msgstr "separador-geral"
-
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:60
 #: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
-#: mail/mail-config.glade.h:182
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "minutos"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
-msgid "searching-tab"
-msgstr "separador-procura"
-
-#: addressbook/gui/component/select-names/e-select-names.c:497
+#: addressbook/gui/component/select-names/e-select-names.c:503
 #: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid "Select Contacts from Address Book"
 msgstr "Seleccionar os Contactos do Livro de Endereços"
 
-#: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
@@ -803,7 +706,7 @@ msgstr "Contacto Sem Nome"
 
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:222
+#: addressbook/gui/widgets/e-addressbook-view.c:224
 msgid "Source"
 msgstr "Origem"
 
@@ -868,9 +771,9 @@ msgid "<b>Work</b>"
 msgstr "<b>Emprego</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
-#: addressbook/gui/widgets/eab-contact-display.c:342
-#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/widgets/eab-contact-display.c:334
+#: addressbook/gui/widgets/eab-contact-display.c:353
 msgid "AIM"
 msgstr "AIM"
 
@@ -904,15 +807,15 @@ msgid "Company:"
 msgstr "Empresa:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:271
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
+#: addressbook/gui/contact-editor/e-contact-editor.c:266
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
 msgstr "Contacto"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1527
+#: addressbook/gui/contact-editor/e-contact-editor.c:520
 msgid "Contact Editor"
 msgstr "Editor de Contactos"
 
@@ -933,86 +836,85 @@ msgid "Full _Name..."
 msgstr "_Nome Completo..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:202
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-msgid "Home"
-msgstr "Casa"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "Home Page:"
 msgstr "Página Pessoal:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-msgid "Job title:"
-msgstr "Título do cargo:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/e-itip-control.c:936
-msgid "Location:"
-msgstr "Localização:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "Mailing Address"
 msgstr "Endereço de Correio"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "Manager:"
 msgstr "Gestor:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "Ni_ckname:"
 msgstr "Al_cunha:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "Notes:"
 msgstr "Notas:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
-#: addressbook/gui/contact-editor/e-contact-editor.c:203
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-msgid "Other"
-msgstr "Outro"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#, fuzzy
+msgid "Office:"
+msgstr "Escritório"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "PO Box:"
 msgstr "Apartado:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "Personal Information"
 msgstr "Informação Pessoal"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "Profession:"
 msgstr "Profissão:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#, fuzzy
+msgid "Spouse:"
+msgstr "Cônjuge"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "State/Province:"
 msgstr "Estado/Província:"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#, fuzzy
+msgid "Title:"
+msgstr "_Título:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+msgid "Video Chat:"
+msgstr ""
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "Wants to receive HTML mail"
 msgstr "Deseja receber mensagens em HTML"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:42
-msgid "Webcam:"
-msgstr "Câmara web:"
+#, fuzzy
+msgid "Web Log:"
+msgstr "Página Web:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
-#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
-#: mail/mail-config.glade.h:155
+#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
+#: mail/mail-config.glade.h:157
 msgid "Work"
 msgstr "Emprego"
 
@@ -1029,18 +931,11 @@ msgid "_File under:"
 msgstr "_Arquivar sob:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "_Where:"
 msgstr "_Onde:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
-msgid "item7"
-msgstr "item7"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
-msgid "item8"
-msgstr "item8"
-
-#: addressbook/gui/contact-editor/eab-editor.c:316
+#: addressbook/gui/contact-editor/eab-editor.c:315
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -1048,7 +943,7 @@ msgstr ""
 "Tem a certeza de que deseja\n"
 "apagar estes contactos?"
 
-#: addressbook/gui/contact-editor/eab-editor.c:319
+#: addressbook/gui/contact-editor/eab-editor.c:318
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -1057,16 +952,16 @@ msgstr ""
 "apagar este contacto?"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:351
-#: addressbook/gui/widgets/eab-contact-display.c:372
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Address"
 msgstr "Endereço"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:292
+#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard.c:174
@@ -2044,87 +1939,109 @@ msgstr "Zâmbia"
 msgid "Zimbabwe"
 msgstr "Zimbabué"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/contact-editor/e-contact-editor.c:179
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:337
+#: addressbook/gui/widgets/eab-contact-display.c:356
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:347
-#: addressbook/gui/widgets/eab-contact-display.c:366
+#: addressbook/gui/contact-editor/e-contact-editor.c:180
+#: addressbook/gui/widgets/eab-contact-display.c:339
+#: addressbook/gui/widgets/eab-contact-display.c:358
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: addressbook/gui/widgets/eab-contact-display.c:338
+#: addressbook/gui/widgets/eab-contact-display.c:357
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:344
-#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#: addressbook/gui/widgets/eab-contact-display.c:355
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/contact-editor/e-contact-editor.c:183
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+msgid "Home"
+msgstr "Casa"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+msgid "Other"
+msgstr "Outro"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
 msgid "Source Book"
 msgstr "Livro de Origem"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:264
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Target Book"
 msgstr "Livro de Destino"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:278
+#: addressbook/gui/contact-editor/e-contact-editor.c:273
 msgid "Is New Contact"
 msgstr "É um Novo Contacto"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:285
+#: addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Writable Fields"
 msgstr "Campos Editáveis"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:299
+#: addressbook/gui/contact-editor/e-contact-editor.c:294
 msgid "Changed"
 msgstr "Alterado"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
-msgid "Category editor not available."
-msgstr "Editor de categorias indisponível."
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:2352
 msgid "This contact belongs to these categories:"
 msgstr "Este contacto pertence a estas categorias:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#: addressbook/gui/contact-editor/e-contact-editor.c:2429
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Seleccione de entre as seguintes opções"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#: addressbook/gui/contact-editor/e-contact-editor.c:2433
 #, fuzzy
 msgid "No image"
 msgstr "Niger"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#: addressbook/gui/contact-editor/e-contact-editor.c:2636
+#, fuzzy
 msgid ""
-"The following entries are invalid:\n"
+"The contact data is invalid:\n"
 "\n"
+msgstr "Data de recorrência é inválida"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#, fuzzy
+msgid "Invalid contact."
+msgstr "%d contacto"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+msgid ""
+"The contact cannot be saved to the selected address book. Do you want to "
+"discard changes?"
 msgstr ""
-"As seguintes entradas são inválidas:\n"
-"\n"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2738
-#, c-format
-msgid "Could not find widget for a field: `%s'"
-msgstr "Incapaz de encontra widget para um campo: `%s'"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2727
+#: addressbook/gui/contact-editor/e-contact-editor.c:2751
+msgid "_Discard"
+msgstr "_Descartar"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+msgid ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
+msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:62
 msgid "AOL Instant Messenger"
@@ -2157,7 +2074,7 @@ msgid "_Edit Full"
 msgstr "_Edição Completa"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:166
 msgid "_Full Name:"
 msgstr "Nome Comp_leto:"
 
@@ -2303,30 +2220,30 @@ msgid "_Type an email address or drag a contact into the list below:"
 msgstr ""
 "In_troduza um endereço de email ou arraste um contacto para a lista abaixo:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "contact-list-editor"
 msgstr "editor-lista-contactos"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:153
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:215
+#: addressbook/gui/widgets/e-addressbook-view.c:217
 #: addressbook/gui/widgets/e-minicard-view.c:460
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Livro"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
 msgid "Is New List"
 msgstr "É uma Nova Lista"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:215
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
 msgid "Contact List Editor"
 msgstr "Editor de Lista de Contactos"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:438
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
 msgid "Save List as VCard"
 msgstr "Gravar a Lista como um VCard"
 
@@ -2373,144 +2290,144 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Procura Avançada"
 
-#: addressbook/gui/widgets/eab-contact-display.c:129
-#: addressbook/gui/widgets/eab-contact-display.c:192
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
 msgid "(map)"
 msgstr "(mapa)"
 
-#: addressbook/gui/widgets/eab-contact-display.c:139
-#: addressbook/gui/widgets/eab-contact-display.c:205
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
 msgid "map"
 msgstr "mapa"
 
-#: addressbook/gui/widgets/eab-contact-display.c:257
-#: addressbook/gui/widgets/eab-contact-display.c:533
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:525
 msgid "List Members"
 msgstr "Membros da Lista"
 
-#: addressbook/gui/widgets/eab-contact-display.c:329
-#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/eab-contact-display.c:321
+#: addressbook/gui/widgets/eab-contact-display.c:323
 msgid "E-mail"
 msgstr "E-mail"
 
-#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/eab-contact-display.c:332
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organização"
 
-#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "Position"
 msgstr "Cargo"
 
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:354
 msgid "Groupwise"
 msgstr "Groupwise"
 
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:340
 msgid "Video Conferencing"
 msgstr "Vídeo-Conferência"
 
-#: addressbook/gui/widgets/eab-contact-display.c:349
-#: addressbook/gui/widgets/eab-contact-display.c:370
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Phone"
 msgstr "Telefone"
 
-#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:342
 msgid "Fax"
 msgstr "Fax"
 
-#: addressbook/gui/widgets/eab-contact-display.c:354
+#: addressbook/gui/widgets/eab-contact-display.c:346
 msgid "work"
 msgstr "emprego"
 
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:359
 msgid "WWW"
 msgstr "WWW"
 
-#: addressbook/gui/widgets/eab-contact-display.c:368
-#: addressbook/gui/widgets/eab-contact-display.c:587
+#: addressbook/gui/widgets/eab-contact-display.c:360
+#: addressbook/gui/widgets/eab-contact-display.c:579
 msgid "Blog"
 msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/eab-contact-display.c:363
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Telefone Celular"
 
-#: addressbook/gui/widgets/eab-contact-display.c:375
+#: addressbook/gui/widgets/eab-contact-display.c:367
 msgid "personal"
 msgstr "pessoal"
 
-#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/eab-contact-display.c:374
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Nota"
 
-#: addressbook/gui/widgets/eab-contact-display.c:548
+#: addressbook/gui/widgets/eab-contact-display.c:540
 msgid "Job Title"
 msgstr "Título do Cargo"
 
-#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/eab-contact-display.c:544
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:774
+#: smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "Email"
 
-#: addressbook/gui/widgets/eab-contact-display.c:579
+#: addressbook/gui/widgets/eab-contact-display.c:571
 msgid "Home page"
 msgstr "Página pessoal"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 msgid "Success"
 msgstr "Sucesso"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Backend busy"
 msgstr "Módulo de suporte ocupado"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Repository offline"
 msgstr "Repositório desligado"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Address Book does not exist"
 msgstr "Livro de Endereços não existe"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "No Self Contact defined"
 msgstr "Nenhum Contacto Próprio definido"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Permission denied"
 msgstr "Autorização negada"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Contact not found"
 msgstr "Contacto não foi encontrado"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Contact ID already exists"
 msgstr "ID de contacto já existe"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Protocol not supported"
 msgstr "Protocolo não é suportado"
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:60
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:233
 #: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
@@ -2523,37 +2440,37 @@ msgid "Cancelled"
 msgstr "Cancelado"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Could not cancel"
 msgstr "Incapaz de cancelar"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Authentication Failed"
 msgstr "Autenticação Falhou"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Authentication Required"
 msgstr "Autenticação Requerida"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:66
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "TLS not Available"
 msgstr "TLS Indisponível"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#: addressbook/gui/widgets/eab-gui-util.c:66
 msgid "No such source"
 msgstr "Origem inexistente"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:69
+#: addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Other error"
 msgstr "Outro erro"
 
-#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:90
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
@@ -2561,7 +2478,7 @@ msgstr ""
 "Incapaz de abrir este livro de endereços.  Certifique-se de que o caminho "
 "existe e de que possui permissões para lhe aceder."
 
-#: addressbook/gui/widgets/eab-gui-util.c:110
+#: addressbook/gui/widgets/eab-gui-util.c:97
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -2569,17 +2486,18 @@ msgstr ""
 "Incapaz de abrir este livro de endereços.  Isto significa que ou introduziu "
 "um URI incorrecto ou o servir LDAP está inacessível."
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:102
+#, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution you must compile the program from the CVS "
-"sources after retrieving OpenLDAP from the link below."
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
 msgstr ""
 "Esta versão do Evolution não possui suporte LDAP compilado no binário.  Se "
 "deseja utilizar LDAP no Evolution terá de compilar a aplicação a partir do "
 "código fonte em CVS após obter o OpenLDAP a partir do link abaixo."
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:109
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -2587,11 +2505,7 @@ msgstr ""
 "Incapaz de abrir este livro de endereços.  Isto ou significa que introduziu "
 "um URI incorrecto, ou que o servidor está inacessível."
 
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "Unable to open addressbook"
-msgstr "Incapaz de abrir o livro de endereços"
-
-#: addressbook/gui/widgets/eab-gui-util.c:162
+#: addressbook/gui/widgets/eab-gui-util.c:129
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2603,7 +2517,7 @@ msgstr ""
 "forma mais específica ou aumente o limite de resultados nas preferências\n"
 "do servidor de directório para este livro de endereços."
 
-#: addressbook/gui/widgets/eab-gui-util.c:168
+#: addressbook/gui/widgets/eab-gui-util.c:135
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -2615,55 +2529,47 @@ msgstr ""
 "forma mais específica ou aumente o limite de tempo nas preferências do\n"
 "servidor de directório para este livro de endereços."
 
-#: addressbook/gui/widgets/eab-gui-util.c:174
+#: addressbook/gui/widgets/eab-gui-util.c:141
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 "O suporte para este livro de endereços foi incapaz de parsear a consulta."
 
-#: addressbook/gui/widgets/eab-gui-util.c:177
+#: addressbook/gui/widgets/eab-gui-util.c:144
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 "O suporte para este livro de endereços recusou-se a efectuar esta consulta."
 
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:147
 msgid "This query did not complete successfully."
 msgstr "Esta consulta não terminou com sucesso."
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
-msgid "Do you want to save changes?"
-msgstr "Deseja gravar as alterações?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:208
-msgid "_Discard"
-msgstr "_Descartar"
-
-#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:169
 msgid "Error adding list"
 msgstr "Erro ao adicionar a lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:229
-#: addressbook/gui/widgets/eab-gui-util.c:652
+#: addressbook/gui/widgets/eab-gui-util.c:169
+#: addressbook/gui/widgets/eab-gui-util.c:580
 msgid "Error adding contact"
 msgstr "Erro ao adicionar o contacto"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying list"
 msgstr "Erro ao alterar a lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying contact"
 msgstr "Erro ao alterar o contacto"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:192
 msgid "Error removing list"
 msgstr "Erro ao remover a lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
-#: addressbook/gui/widgets/eab-gui-util.c:610
+#: addressbook/gui/widgets/eab-gui-util.c:192
+#: addressbook/gui/widgets/eab-gui-util.c:538
 msgid "Error removing contact"
 msgstr "Erro ao remover o contacto"
 
-#: addressbook/gui/widgets/eab-gui-util.c:334
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2672,7 +2578,7 @@ msgstr ""
 "Abrir %d contactos irá abrir %d novas janelas.\n"
 "Deseja mesmo visualizar todos estes contactos?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:360
+#: addressbook/gui/widgets/eab-gui-util.c:300
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2681,49 +2587,44 @@ msgstr ""
 "%s já existe\n"
 "Deseja sobrepo-lo?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:364
+#: addressbook/gui/widgets/eab-gui-util.c:304
 msgid "Overwrite"
 msgstr "Sobrepor"
 
-#: addressbook/gui/widgets/eab-gui-util.c:400
-#, c-format
-msgid "Error saving %s: %s"
-msgstr "Erro ao gravar %s: %s"
-
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:437
+#: addressbook/gui/widgets/eab-gui-util.c:365
 msgid "card.vcf"
 msgstr "cartao.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:571
+#: addressbook/gui/widgets/eab-gui-util.c:499
 msgid "list"
 msgstr "lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:706
+#: addressbook/gui/widgets/eab-gui-util.c:634
 msgid "Move contact to"
 msgstr "Mover contacto para"
 
-#: addressbook/gui/widgets/eab-gui-util.c:708
+#: addressbook/gui/widgets/eab-gui-util.c:636
 msgid "Copy contact to"
 msgstr "Copiar contacto para"
 
-#: addressbook/gui/widgets/eab-gui-util.c:711
+#: addressbook/gui/widgets/eab-gui-util.c:639
 msgid "Move contacts to"
 msgstr "Mover contactos para"
 
-#: addressbook/gui/widgets/eab-gui-util.c:713
+#: addressbook/gui/widgets/eab-gui-util.c:641
 msgid "Copy contacts to"
 msgstr "Copiar contactos para"
 
-#: addressbook/gui/widgets/eab-gui-util.c:716
+#: addressbook/gui/widgets/eab-gui-util.c:644
 msgid "Select target addressbook."
 msgstr "Seleccionar o livro de endereços de destino."
 
-#: addressbook/gui/widgets/eab-gui-util.c:939
+#: addressbook/gui/widgets/eab-gui-util.c:867
 msgid "Multiple VCards"
 msgstr "Múltiplos VCards"
 
-#: addressbook/gui/widgets/eab-gui-util.c:942
+#: addressbook/gui/widgets/eab-gui-util.c:870
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard de %s"
@@ -2810,7 +2711,7 @@ msgstr[1] "%d contactos"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:229
+#: addressbook/gui/widgets/e-addressbook-view.c:231
 #: addressbook/gui/widgets/e-minicard-view.c:467
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
@@ -2828,143 +2729,131 @@ msgstr "Modelo"
 msgid "Error modifying card"
 msgstr "Erro ao alterar o cartão"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:163
 msgid "Name begins with"
 msgstr "Nome começa por"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:164
 msgid "Email begins with"
 msgstr "Email começa por"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:57
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Categoria é"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-#: calendar/gui/cal-search-bar.c:50
+#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Qualquer campo contém"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+#: addressbook/gui/widgets/e-addressbook-view.c:172
 msgid "Advanced..."
 msgstr "Avançado..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:236
+#: addressbook/gui/widgets/e-addressbook-view.c:238
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:249
+#: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Tipo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:506
+#: addressbook/gui/widgets/e-addressbook-view.c:508
 msgid "Address Book"
 msgstr "Livro de Endereços"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2076
+#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:2080
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
 msgstr "Gravar como um VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 msgid "New Contact..."
 msgstr "Novo Contacto..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "New Contact List..."
 msgstr "Nova Lista de Contactos..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Go to Folder..."
 msgstr "Ir para a Pasta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Import..."
 msgstr "Importar..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1066
 msgid "Search for Contacts..."
 msgstr "Procurar Contactos..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 msgid "Address Book Sources..."
 msgstr "Fontes de Livros de Endereços..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1069
 msgid "Pilot Settings..."
 msgstr "Configuração Pilot..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Reenviar Contacto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
 msgid "Send Message to Contact"
 msgstr "Enviar Mensagem para o Contacto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Imprimir"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
+#: addressbook/gui/widgets/e-addressbook-view.c:1077
 msgid "Print Envelope"
 msgstr "Imprimir um Envelope"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
+#: addressbook/gui/widgets/e-addressbook-view.c:1081
 msgid "Copy to Address Book..."
 msgstr "Copiar para o Livro de Endereços..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1080
+#: addressbook/gui/widgets/e-addressbook-view.c:1082
 msgid "Move to Address Book..."
 msgstr "Mover para o Livro de Endereços..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Cortar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Copiar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1087
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Colar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:1092
+#: calendar/gui/e-calendar-view.c:1280
 msgid "Current View"
 msgstr "Vista Actual"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1309
-#, c-format
-msgid ""
-"The addressbook backend for\n"
-"%s\n"
-"has crashed. You will have to restart Evolution in order to use it again"
-msgstr ""
-"O suporte de livro de endereços para\n"
-"%s\n"
-"terminou com um erro. Terá de reiniciar o Evolution para o poder utilizar "
-"novamente"
-
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1667
-#: calendar/gui/cal-search-bar.c:362
+#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Qualquer Categoria"
 
@@ -3070,7 +2959,7 @@ msgstr "Rádio"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-list-view.c:234
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Cargo"
@@ -3212,12 +3101,12 @@ msgstr "Importador de VCard do Evolution"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: addressbook/printing/e-contact-print.c:998
+#: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr "Imprimir contactos"
 
-#: addressbook/printing/e-contact-print.c:1064
-#: addressbook/printing/e-contact-print.c:1091
+#: addressbook/printing/e-contact-print.c:1066
+#: addressbook/printing/e-contact-print.c:1093
 msgid "Print contact"
 msgstr "Imprimir contacto"
 
@@ -3468,15 +3357,21 @@ msgstr "Em modo normal, não é necessária a opção de tamanho."
 msgid "Impossible internal error."
 msgstr "Erro interno impossível."
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:629
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
 msgid "Can not open file"
 msgstr "Incapaz de abrir o ficheiro"
 
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-msgid "Can not load URI"
-msgstr "Incapaz de ler o URI"
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "Incapaz de ler o livro de endereços"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Incapaz de abrir o livro de endereços"
 
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
@@ -3494,7 +3389,7 @@ msgstr "Nenhum nome de ficheiro indicado."
 msgid "Unnamed List"
 msgstr "Lista Sem Nome"
 
-#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Introduza a senha"
@@ -3769,10 +3664,10 @@ msgid "Whether to show week numbers in date navigator"
 msgstr "Se apresentar os números das semanas no navegador de datas"
 
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:88
-#: calendar/gui/gnome-cal.c:1703
-#: camel/providers/groupwise/camel-gw-listener.c:304
-#: camel/providers/groupwise/camel-gw-listener.c:327
+#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/gnome-cal.c:1705
+#: camel/providers/groupwise/camel-gw-listener.c:311
+#: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
 msgstr "Calendário"
 
@@ -3792,7 +3687,7 @@ msgstr "Expurgar eventos mais antigos do que"
 
 #: calendar/gui/calendar-commands.c:363
 #: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:19 filter/filter.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
 msgid "days"
 msgstr "dias"
 
@@ -3939,23 +3834,23 @@ msgstr "Vista de Semana"
 msgid "Month View"
 msgstr "Vista de Mês"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Resumo contém"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Descrição contém"
 
-#: calendar/gui/cal-search-bar.c:54
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Comentário contém"
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:53
 msgid "Location contains"
 msgstr "Localização contém"
 
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
 msgid "Unmatched"
 msgstr "Sem equivalência"
 
@@ -3976,23 +3871,23 @@ msgstr "Autorização negada ao abrir o calendário"
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/dialogs/alarm-options.c:466
+#: calendar/gui/dialogs/alarm-options.c:467
 msgid "Audio Alarm Options"
 msgstr "Opções Audio de Alarme"
 
-#: calendar/gui/dialogs/alarm-options.c:475
+#: calendar/gui/dialogs/alarm-options.c:476
 msgid "Message Alarm Options"
 msgstr "Opções de Mensagem de Alarme"
 
-#: calendar/gui/dialogs/alarm-options.c:484
+#: calendar/gui/dialogs/alarm-options.c:485
 msgid "Email Alarm Options"
 msgstr "Opções de Email de Alarme"
 
-#: calendar/gui/dialogs/alarm-options.c:493
+#: calendar/gui/dialogs/alarm-options.c:494
 msgid "Program Alarm Options"
 msgstr "Opções de Aplicação de Alarme"
 
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:510
 msgid "Unknown Alarm Options"
 msgstr "Opções Desconhecidas de Alarme"
 
@@ -4028,7 +3923,7 @@ msgstr "Enviar Para:"
 msgid "With these arguments:"
 msgstr "Com estes argumentos:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
 msgid "dialog1"
 msgstr "diálogo1"
 
@@ -4037,7 +3932,7 @@ msgid "extra times every"
 msgstr "tempos extra a cada"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:20 filter/filter.glade.h:16
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr "horas"
 
@@ -4083,7 +3978,7 @@ msgstr "Enviar uma mensagem"
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Resumo:"
 
@@ -4113,7 +4008,6 @@ msgid "hour(s)"
 msgstr "hora(s)"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:21
 msgid "minute(s)"
 msgstr "minuto(s)"
 
@@ -4121,26 +4015,26 @@ msgstr "minuto(s)"
 msgid "start of appointment"
 msgstr "início do compromisso"
 
-#: calendar/gui/dialogs/calendar-setup.c:170
+#: calendar/gui/dialogs/calendar-setup.c:172
 msgid "You must specify a location to get the calendar from."
 msgstr "Tem de especificar uma localização de onde obter o calendário."
 
-#: calendar/gui/dialogs/calendar-setup.c:178
+#: calendar/gui/dialogs/calendar-setup.c:180
 #, c-format
 msgid "The source location '%s' is not well-formed."
 msgstr "A localização de origem '%s' não está correctamente formada."
 
-#: calendar/gui/dialogs/calendar-setup.c:193
+#: calendar/gui/dialogs/calendar-setup.c:195
 #, c-format
 msgid "The source location '%s' is not a webcal source."
 msgstr "A localização de origem '%s' não é uma origem webcal."
 
-#: calendar/gui/dialogs/calendar-setup.c:265
+#: calendar/gui/dialogs/calendar-setup.c:275
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr "Origem com o nome '%s' já existe no grupo seleccionado"
 
-#: calendar/gui/dialogs/calendar-setup.c:278
+#: calendar/gui/dialogs/calendar-setup.c:288
 #, c-format
 msgid ""
 "The group '%s' is remote. You must specify a location to get the calendar "
@@ -4161,51 +4055,31 @@ msgstr "Adicionar Grupo de Tarefas"
 msgid "C_olor:"
 msgstr "C_ores:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "Calendar Properties"
-msgstr "Propriedades do Calendário"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
 msgid "Pick a color"
 msgstr "Seleccione uma cor"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:8
-msgid "Remote"
-msgstr "Remoto"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "Task List Properties"
-msgstr "Propriedades da Lista de Tarefas"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
 msgid "_Add Calendar"
 msgstr "_Adicionar um Calendário"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
 msgid "_Add Group"
 msgstr "_Adicionar um Grupo"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-msgid "_Refresh Interval:"
-msgstr "_Intervalo de Actualização:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
 msgid "_Refresh:"
 msgstr "Actual_izar:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-msgid "_Source URL:"
-msgstr "URL de _Origem:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "_Type:"
 msgstr "_Tipo:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
 msgid "_URL:"
 msgstr "_URL:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
 msgid "weeks"
 msgstr "semanas"
 
@@ -4307,7 +4181,7 @@ msgid "Display"
 msgstr "Apresentação"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:76
 msgid "E_nable"
 msgstr "_Activar"
 
@@ -4317,7 +4191,7 @@ msgstr "Publicação de Estado Livre/Ocupado"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:563
+#: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Sexta-Feira"
 
@@ -4331,7 +4205,7 @@ msgstr "Minutos"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:559
+#: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Segunda-Feira"
 
@@ -4341,7 +4215,7 @@ msgstr "_Dom"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:564
+#: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Sábado"
 
@@ -4355,7 +4229,7 @@ msgstr "Apresentar os _números das semanas no navegador de datas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Domingo"
 
@@ -4369,7 +4243,7 @@ msgstr "Q_ui"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:562
+#: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Quinta-Feira"
 
@@ -4383,7 +4257,7 @@ msgstr "Formato de hora:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:560
+#: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Terça-Feira"
 
@@ -4393,7 +4267,7 @@ msgstr "S_emana começa:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:561
+#: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Quarta-Feira"
 
@@ -4426,7 +4300,7 @@ msgid "_Day begins:"
 msgstr "_Dia começa:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
-#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:43
@@ -4476,83 +4350,47 @@ msgstr "_Qua"
 msgid "before every appointment"
 msgstr "antes de todos os compromissos"
 
-#: calendar/gui/dialogs/cancel-comp.c:57
-msgid ""
-"The event being deleted is a meeting, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"O evento a ser apagado é uma reunião, deseja enviar uma notificação de "
-"cancelamento?"
-
-#: calendar/gui/dialogs/cancel-comp.c:60
-msgid "Are you sure you want to cancel and delete this meeting?"
-msgstr "Tem a certeza de que deseja cancelar e apagar esta reunião?"
-
-#: calendar/gui/dialogs/cancel-comp.c:66
-msgid ""
-"The task being deleted is assigned, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"A tarefa a ser apagada está atribuida, deseja enviar uma notificação de "
-"cancelamento?"
-
-#: calendar/gui/dialogs/cancel-comp.c:69
-msgid "Are you sure you want to cancel and delete this task?"
-msgstr "Tem a certeza de que deseja cancelar e apagar esta tarefa?"
-
-#: calendar/gui/dialogs/cancel-comp.c:75
-msgid ""
-"The journal entry being deleted is published, would you like to send a "
-"cancellation notice?"
-msgstr ""
-"A entrada de diário a ser apagada está publicada, deseja enviar uma "
-"notificação de cancelamento?"
-
-#: calendar/gui/dialogs/cancel-comp.c:78
-msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr "Tem a certeza de que deseja cancelar e apagar esta entrada de diário?"
-
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Este evento foi apagado."
 
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "Esta tarefa foi apagada."
 
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:68
 msgid "This journal entry has been deleted."
 msgstr "Esta entrada de diário foi apagada."
 
-#: calendar/gui/dialogs/changed-comp.c:75
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  Efectuou alterações. Esquecer estas alterações e fechar o editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Não efectuou quaisquer alterações, fechar o editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:82
+#: calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "Este evento foi alterado."
 
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "Esta tarefa foi alterada."
 
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:92
 msgid "This journal entry has been changed."
 msgstr "Esta entrada de diário foi alterada."
 
-#: calendar/gui/dialogs/changed-comp.c:99
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Efectuou alterações. Esquecer essas alterações e actualizar o editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Não efectuou quaisquer alterações, actualizar o editor?"
@@ -4590,7 +4428,7 @@ msgid "No summary"
 msgstr "Sem resumo"
 
 #: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
 #: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Gravar como..."
@@ -4644,99 +4482,51 @@ msgstr "Incapaz de abrir o destino"
 msgid "Destination is read only"
 msgstr "O destino é apenas de leitura"
 
-#: calendar/gui/dialogs/delete-comp.c:95
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "Tem a certeza de que deseja apagar o compromisso `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:98
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "Tem a certeza de que deseja apagar este compromisso sem título?"
-
-#: calendar/gui/dialogs/delete-comp.c:104
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "Tem a certeza de que deseja apagar a tarefa `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:107
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "Tem a certeza de que deseja apagar esta tarefa sem título?"
-
-#: calendar/gui/dialogs/delete-comp.c:113
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "Tem a certeza de que deseja apagar a entrada de diário `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:116
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "Tem a certeza de que deseja apagar esta entrada de diário sem título?"
-
-#: calendar/gui/dialogs/delete-comp.c:131
-#, c-format
-msgid "Are you sure you want to delete %d appointment?"
-msgid_plural "Are you sure you want to delete %d appointments?"
-msgstr[0] "Tem a certeza de que deseja apagar %d compromisso?"
-msgstr[1] "Tem a certeza de que deseja apagar %d compromissos?"
-
-#: calendar/gui/dialogs/delete-comp.c:138
-#, c-format
-msgid "Are you sure you want to delete %d task?"
-msgid_plural "Are you sure you want to delete %d tasks?"
-msgstr[0] "Tem a certeza de que deseja apagar %d tarefa?"
-msgstr[1] "Tem a certeza de que deseja apagar %d tarefas?"
-
-#: calendar/gui/dialogs/delete-comp.c:145
-#, c-format
-msgid "Are you sure you want to delete %d journal entry?"
-msgid_plural "Are you sure you want to delete %d journal entries?"
-msgstr[0] "Tem a certeza de que deseja apagar %d entrada de diário?"
-msgstr[1] "Tem a certeza de que deseja apagar %d entradas de diário?"
-
-#: calendar/gui/dialogs/delete-error.c:52
+#: calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "O evento não pode ser apagado devido a um erro corba"
 
-#: calendar/gui/dialogs/delete-error.c:55
+#: calendar/gui/dialogs/delete-error.c:57
 msgid "The task could not be deleted due to a corba error"
 msgstr "A tarefa não pode ser apagada devido a um erro corba"
 
-#: calendar/gui/dialogs/delete-error.c:58
+#: calendar/gui/dialogs/delete-error.c:60
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr "A entrada de diário não pode ser apagada devido a um erro corba"
 
-#: calendar/gui/dialogs/delete-error.c:61
+#: calendar/gui/dialogs/delete-error.c:63
 msgid "The item could not be deleted due to a corba error"
 msgstr "O item não pode ser apagado devido a um erro corba"
 
-#: calendar/gui/dialogs/delete-error.c:68
+#: calendar/gui/dialogs/delete-error.c:70
 msgid "The event could not be deleted because permission was denied"
 msgstr "O evento não pode ser apagado pois a autorização foi negada"
 
-#: calendar/gui/dialogs/delete-error.c:71
+#: calendar/gui/dialogs/delete-error.c:73
 msgid "The task could not be deleted because permission was denied"
 msgstr "A tarefa não pode ser apagada pois a autorização foi negada"
 
-#: calendar/gui/dialogs/delete-error.c:74
+#: calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr "A entrada de diário não pode ser apagada pois a autorização foi negada"
 
-#: calendar/gui/dialogs/delete-error.c:77
+#: calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
 msgstr "O item não pode ser apagado pois a autorização foi negada"
 
-#: calendar/gui/dialogs/delete-error.c:84
+#: calendar/gui/dialogs/delete-error.c:86
 msgid "The event could not be deleted due to an error"
 msgstr "O evento não pode ser apagado devido a um erro"
 
-#: calendar/gui/dialogs/delete-error.c:87
+#: calendar/gui/dialogs/delete-error.c:89
 msgid "The task could not be deleted due to an error"
 msgstr "A tarefa não pode ser apagada devido a um erro"
 
-#: calendar/gui/dialogs/delete-error.c:90
+#: calendar/gui/dialogs/delete-error.c:92
 msgid "The journal entry could not be deleted due to an error"
 msgstr "A entrada de diário não pode ser apagada devido a um erro"
 
-#: calendar/gui/dialogs/delete-error.c:93
+#: calendar/gui/dialogs/delete-error.c:95
 msgid "The item could not be deleted due to an error"
 msgstr "O item não pode ser apagado devido a um erro"
 
@@ -4869,11 +4659,11 @@ msgstr "Hora de _início:"
 
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:3
+#: calendar/gui/dialogs/meeting-page.glade.h:4
 #: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
 #: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1559
-#: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:100
+#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
+#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
@@ -4899,8 +4689,8 @@ msgstr "_Delegar A..."
 #. FIXME: need to disable for undeletable folders
 #: calendar/gui/dialogs/meeting-page.c:655
 #: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1310 calendar/gui/e-calendar-view.c:1342
-#: mail/em-folder-tree.c:2557 mail/em-folder-view.c:919
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
+#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -4908,7 +4698,7 @@ msgid "_Delete"
 msgstr "Apa_gar"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:240
+#: calendar/gui/e-meeting-list-view.c:218
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Participante"
@@ -4944,16 +4734,15 @@ msgid "Member"
 msgstr "Membro"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
-#: mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-list-view.c:248
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Estado"
 
@@ -4961,20 +4750,20 @@ msgstr "Estado"
 msgid "Add A_ttendee"
 msgstr "Adicionar um Par_ticipante"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "Add attendees from addressbook."
+msgstr "Adicionar o Remetente ao Li_vro de Endereços"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Organizador:"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
+#: calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "_Change Organizer"
 msgstr "_Alterar o Organizador"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-#: calendar/gui/e-meeting-time-sel.c:417
-msgid "_Invite Others..."
-msgstr "Conv_idar Outros..."
-
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
 msgstr "<b>Opções de calendário</b>"
@@ -5121,7 +4910,7 @@ msgid "_No recurrence"
 msgstr "Sem recorrê_ncia"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:450
+#: composer/e-msg-composer-attachment-bar.c:453
 msgid "_Remove"
 msgstr "_Remover"
 
@@ -5153,53 +4942,19 @@ msgstr "semana(s)"
 msgid "year(s)"
 msgstr "ano(s)"
 
-#: calendar/gui/dialogs/save-comp.c:53
-msgid ""
-"This event has been changed, but has not been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Este evento foi alterado mas não foi gravado.\n"
-"\n"
-"Deseja gravar as suas alterações?"
-
-#: calendar/gui/dialogs/save-comp.c:57
-msgid "_Discard Changes"
-msgstr "_Descartar as Alterações"
-
-#: calendar/gui/dialogs/save-comp.c:62
-msgid "Save Event"
-msgstr "Gravar o Evento"
-
-#: calendar/gui/dialogs/select-source-dialog.c:65
+#: calendar/gui/dialogs/select-source-dialog.c:69
 #, fuzzy
 msgid "Select destination"
 msgstr "Seleccionar o destino %s"
 
-#: calendar/gui/dialogs/select-source-dialog.c:86
+#: calendar/gui/dialogs/select-source-dialog.c:90
 msgid "_Destination"
 msgstr "_Destino"
 
-#: calendar/gui/dialogs/select-source-dialog.c:88
+#: calendar/gui/dialogs/select-source-dialog.c:92
 msgid "Task List"
 msgstr "Lista de Tarefas"
 
-#: calendar/gui/dialogs/send-comp.c:57
-msgid "The meeting information has been created. Send it?"
-msgstr "A informação de reunião foi criada. Enviá-la?"
-
-#: calendar/gui/dialogs/send-comp.c:60
-msgid "The meeting information has changed. Send an updated version?"
-msgstr "A informação de reunião foi alterada. Enviar uma versão actualizada?"
-
-#: calendar/gui/dialogs/send-comp.c:67
-msgid "The task assignment information has been created. Send it?"
-msgstr "A informação de atribuição de tarefa foi criada. Enviá-la?"
-
-#: calendar/gui/dialogs/send-comp.c:71
-msgid "The task information has changed. Send an updated version?"
-msgstr "A informação de tarefa foi alterada. Enviar uma versão actualizada?"
-
 #: calendar/gui/dialogs/task-details-page.c:406
 msgid "Completed date is wrong"
 msgstr "Data de finalização incorrecta"
@@ -5219,7 +4974,7 @@ msgstr "Terminada"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #: calendar/gui/e-cal-component-preview.c:249
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:960
 msgid "High"
 msgstr "Alta"
 
@@ -5233,14 +4988,14 @@ msgstr "Em Curso"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:253
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:958
 msgid "Low"
 msgstr "Baixa"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:251
 #: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:957
+#: mail/message-list.c:959
 msgid "Normal"
 msgstr "Normal"
 
@@ -5297,8 +5052,8 @@ msgstr "Con_fidencial"
 
 #: calendar/gui/dialogs/task-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
+#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Descrição:"
 
@@ -5461,7 +5216,7 @@ msgstr "Data de _Término:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:950
+#: calendar/gui/e-itip-control.c:943
 msgid "Status:"
 msgstr "Estado:"
 
@@ -5545,12 +5300,12 @@ msgstr "Ocupado"
 msgid "Deleting selected objects"
 msgstr "A apagar os objectos seleccionados"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
 msgid "Updating objects"
 msgstr "A actualizar os objectos"
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1370
+#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
 #: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Abrir"
@@ -5560,15 +5315,15 @@ msgid "Open _Web Page"
 msgstr "Abrir Página _Web"
 
 #: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1291 calendar/gui/e-calendar-view.c:1376
-#: mail/em-folder-view.c:896 mail/em-popup.c:690 mail/em-popup.c:806
+#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
+#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "Gravar _Como..."
 
 #: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1292
-#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
+#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
@@ -5576,24 +5331,24 @@ msgid "_Print..."
 msgstr "Im_primir..."
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "C_ortar"
 
 #: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1338
-#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2550
-#: mail/message-list.c:1644 ui/evolution-addressbook.xml.h:31
+#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
+#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
+#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Copiar"
 
 #: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1273 calendar/gui/e-calendar-view.c:1299
-#: calendar/gui/e-calendar-view.c:1372 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
+#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
@@ -5659,67 +5414,67 @@ msgstr "Resumo"
 msgid "Task sort"
 msgstr "Ordenação de tarefas"
 
-#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
 msgid "New _Appointment..."
 msgstr "Novo _Compromisso..."
 
-#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
+#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
 msgid "New All Day _Event"
 msgstr "Novo _Evento de Dia Completo"
 
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
+#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
 msgid "New Meeting"
 msgstr "Nova Reunião"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
 msgid "New Task"
 msgstr "Nova Tarefa"
 
-#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "Seleccionar _Hoje"
 
-#: calendar/gui/e-calendar-view.c:1280
+#: calendar/gui/e-calendar-view.c:1283
 msgid "_Select Date..."
 msgstr "_Seleccionar a Data..."
 
-#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publicar a Informação de Livre/Ocupado"
 
-#: calendar/gui/e-calendar-view.c:1303
+#: calendar/gui/e-calendar-view.c:1306
 msgid "Cop_y to Calendar..."
 msgstr "Cop_iar para o Calendário..."
 
-#: calendar/gui/e-calendar-view.c:1304
+#: calendar/gui/e-calendar-view.c:1307
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_ver para o Calendário..."
 
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1308
 msgid "_Schedule Meeting..."
 msgstr "A_gendar Reunião..."
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1309
 msgid "_Forward as iCalendar..."
 msgstr "_Reenviar como iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
 msgid "Delete this _Occurrence"
 msgstr "Apagar esta _Ocorrência"
 
-#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
 msgid "Delete _All Occurrences"
 msgstr "_Apagar Todas as Ocorrências"
 
-#: calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1349
 msgid "Go to _Today"
 msgstr "Ir para _Hoje"
 
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1351
 msgid "_Go to Date..."
 msgstr "_Ir para uma Data..."
 
-#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "Configuraçõe_s..."
 
@@ -5733,9 +5488,9 @@ msgstr "Data de Início"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:967 calendar/gui/e-itip-control.c:1169
-#: calendar/gui/e-meeting-list-view.c:144
-#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
 #: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
 #: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
 #: camel/camel-tcp-stream-openssl.c:631
@@ -5761,13 +5516,13 @@ msgid "Assigned"
 msgstr "Atribuída"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr "Sim"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "Não"
 
@@ -5779,7 +5534,7 @@ msgstr "N"
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
 msgid "E"
 msgstr "E"
 
@@ -5851,102 +5606,102 @@ msgstr "%d %b"
 msgid "%02i minute divisions"
 msgstr "%02i divisões de minuto"
 
-#: calendar/gui/e-itip-control.c:592
+#: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
 msgstr "Sim. (Recorrência Complexa)"
 
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:596
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Todos os dias"
 msgstr[1] "Todos os %d dias"
 
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:601
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Todas as semanas"
 msgstr[1] "Todas as %d semanas"
 
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:603
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "Todas as semanas à "
 msgstr[1] "Todas as %d semanas à "
 
-#: calendar/gui/e-itip-control.c:618
+#: calendar/gui/e-itip-control.c:611
 msgid " and "
 msgstr " e "
 
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:618
 #, c-format
 msgid "The %s day of "
 msgstr "O %s dia de "
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:631
 #, c-format
 msgid "The %s %s of "
 msgstr "O %s %s de "
 
-#: calendar/gui/e-itip-control.c:645
+#: calendar/gui/e-itip-control.c:638
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "todos os meses"
 msgstr[1] "todos os %d meses"
 
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:642
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Todos os anos"
 msgstr[1] "Todos os %d anos"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:653
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] " um total de %d vez"
 msgstr[1] " um total de %d vezes"
 
-#: calendar/gui/e-itip-control.c:669
+#: calendar/gui/e-itip-control.c:662
 msgid ", ending on "
 msgstr ", a terminar em "
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:686
 msgid "<b>Starts:</b> "
 msgstr "<b>Início:</b> "
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:696
 msgid "<b>Ends:</b> "
 msgstr "<b>Fim:</b> "
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:716
 msgid "<b>Completed:</b> "
 msgstr "<b>Terminada:</b> "
 
-#: calendar/gui/e-itip-control.c:733
+#: calendar/gui/e-itip-control.c:726
 msgid "<b>Due:</b> "
 msgstr "<b>Expira:</b> "
 
-#: calendar/gui/e-itip-control.c:771 calendar/gui/e-itip-control.c:827
+#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
 msgid "iCalendar Information"
 msgstr "Informação de iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:788
+#: calendar/gui/e-itip-control.c:781
 msgid "iCalendar Error"
 msgstr "Erro de iCalendar"
 
-#: calendar/gui/e-itip-control.c:859 calendar/gui/e-itip-control.c:875
-#: calendar/gui/e-itip-control.c:886 calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
 msgid "An unknown person"
 msgstr "Uma pessoa desconhecida"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:910
+#: calendar/gui/e-itip-control.c:903
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5954,305 +5709,309 @@ msgstr ""
 "<br> Reveja a informação seguinte e depois seleccione uma acção do menu "
 "abaixo."
 
-#: calendar/gui/e-itip-control.c:925
+#: calendar/gui/e-itip-control.c:918
 msgid "<i>None</i>"
 msgstr "<i>Nenhum</i>"
 
-#: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:929
+msgid "Location:"
+msgstr "Localização:"
+
+#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Aceite"
 
-#: calendar/gui/e-itip-control.c:959 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Aceite Tentativamente"
 
-#: calendar/gui/e-itip-control.c:963 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Recusada"
 
-#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.c:1050
-#: calendar/gui/e-itip-control.c:1076 calendar/gui/e-itip-control.c:1089
-#: calendar/gui/e-itip-control.c:1102 calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
 msgid "Choose an action:"
 msgstr "Seleccione uma acção:"
 
-#: calendar/gui/e-itip-control.c:1023
+#: calendar/gui/e-itip-control.c:1016
 msgid "Update"
 msgstr "Actualizar"
 
-#: calendar/gui/e-itip-control.c:1024 calendar/gui/e-itip-control.c:1055
-#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1091
-#: calendar/gui/e-itip-control.c:1104 calendar/gui/e-itip-control.c:1117
-#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
+#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1044
 msgid "Accept"
 msgstr "Aceitar"
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1045
 msgid "Tentatively accept"
 msgstr "Aceitar tentativamente"
 
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1046
 msgid "Decline"
 msgstr "Recusar"
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1070
 msgid "Send Free/Busy Information"
 msgstr "Enviar Informação de Livre/Ocupado"
 
-#: calendar/gui/e-itip-control.c:1090
+#: calendar/gui/e-itip-control.c:1083
 msgid "Update respondent status"
 msgstr "Actualizar o estado das respostas"
 
-#: calendar/gui/e-itip-control.c:1103
+#: calendar/gui/e-itip-control.c:1096
 msgid "Send Latest Information"
 msgstr "Enviar a Mais Recente Informação"
 
-#: calendar/gui/e-itip-control.c:1116 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1185
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> publicou informação de reunião."
 
-#: calendar/gui/e-itip-control.c:1193
+#: calendar/gui/e-itip-control.c:1186
 msgid "Meeting Information"
 msgstr "Informação de Reunião"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1191
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> pede a presença de %s na reunião."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1193
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> pede a sua presença na reunião."
 
-#: calendar/gui/e-itip-control.c:1201
+#: calendar/gui/e-itip-control.c:1194
 msgid "Meeting Proposal"
 msgstr "Proposta de Reunião"
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> deseja adicionar a uma reunião existente."
 
-#: calendar/gui/e-itip-control.c:1206
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Update"
 msgstr "Actualização de Reunião"
 
-#: calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1203
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> deseja receber a mais recente informação de reunião."
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1204
 msgid "Meeting Update Request"
 msgstr "Pedido de Actualização de Reunião"
 
-#: calendar/gui/e-itip-control.c:1218
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> respondeu a um pedido de reunião."
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Reply"
 msgstr "Resposta de Reunião"
 
-#: calendar/gui/e-itip-control.c:1226
+#: calendar/gui/e-itip-control.c:1219
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> cancelou uma reunião."
 
-#: calendar/gui/e-itip-control.c:1227
+#: calendar/gui/e-itip-control.c:1220
 msgid "Meeting Cancellation"
 msgstr "Cancelamento de Reunião"
 
-#: calendar/gui/e-itip-control.c:1234 calendar/gui/e-itip-control.c:1302
-#: calendar/gui/e-itip-control.c:1337
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1330
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> enviou uma mensagem imperceptível."
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1228
 msgid "Bad Meeting Message"
 msgstr "Mensagem de Reunião Inválida"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1253
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> publicou informação de tarefa."
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1254
 msgid "Task Information"
 msgstr "Informação de Tarefa"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1259
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> requer que %s execute uma tarefa."
 
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> requer que uma tarefa seja executada por si."
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1262
 msgid "Task Proposal"
 msgstr "Proposta de Tarefa"
 
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> deseja adicionar a uma tarefa existente."
 
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Update"
 msgstr "Actualização de Tarefa"
 
-#: calendar/gui/e-itip-control.c:1278
+#: calendar/gui/e-itip-control.c:1271
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> deseja receber a mais recente informação de tarefa."
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1272
 msgid "Task Update Request"
 msgstr "Pedido de Actualização de Tarefa"
 
-#: calendar/gui/e-itip-control.c:1286
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> respondeu a uma atribuição de tarefa."
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Reply"
 msgstr "Resposta a Tarefa"
 
-#: calendar/gui/e-itip-control.c:1294
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> cancelou uma tarefa."
 
-#: calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1288
 msgid "Task Cancellation"
 msgstr "Cancelamento de Tarefa"
 
-#: calendar/gui/e-itip-control.c:1303
+#: calendar/gui/e-itip-control.c:1296
 msgid "Bad Task Message"
 msgstr "Mensagem de Tarefa Inválida"
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1315
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> publicou informação de livre/ocupado."
 
-#: calendar/gui/e-itip-control.c:1323
+#: calendar/gui/e-itip-control.c:1316
 msgid "Free/Busy Information"
 msgstr "Informação de Livre/Ocupado"
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> pede a sua informação de livre/ocupado."
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1321
 msgid "Free/Busy Request"
 msgstr "Pedido de Livre/Ocupado"
 
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1325
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> respondeu a um pedido de livre/ocupado."
 
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1326
 msgid "Free/Busy Reply"
 msgstr "Resposta de Livre/Ocupado"
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1331
 msgid "Bad Free/Busy Message"
 msgstr "Mensagem de Livre/Ocupado Inválida"
 
-#: calendar/gui/e-itip-control.c:1413
+#: calendar/gui/e-itip-control.c:1406
 msgid "The message does not appear to be properly formed"
 msgstr "A mensagem não parece estar correctamente criada"
 
-#: calendar/gui/e-itip-control.c:1472
+#: calendar/gui/e-itip-control.c:1465
 msgid "The message contains only unsupported requests."
 msgstr "A mensagem apenas contém pedidos não suportados."
 
-#: calendar/gui/e-itip-control.c:1503
+#: calendar/gui/e-itip-control.c:1496
 msgid "The attachment does not contain a valid calendar message"
 msgstr "O anexo não contém uma mensagem de calendário válida"
 
-#: calendar/gui/e-itip-control.c:1535
+#: calendar/gui/e-itip-control.c:1528
 msgid "The attachment has no viewable calendar items"
 msgstr "O anexo não contém itens de calendário visíveis"
 
-#: calendar/gui/e-itip-control.c:1769
+#: calendar/gui/e-itip-control.c:1762
 msgid "Update complete\n"
 msgstr "Actualização terminada\n"
 
-#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
+#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Estado de participante não pode ser actualizado pois o item já não existe"
 
-#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objecto é inválido e não pode ser actualizado\n"
 
-#: calendar/gui/e-itip-control.c:1825
+#: calendar/gui/e-itip-control.c:1818
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Esta resposta não é de um participante actual.  Adicionar como participante?"
 
-#: calendar/gui/e-itip-control.c:1837
+#: calendar/gui/e-itip-control.c:1830
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Estado de participante não pode ser actualizado devido a um estado "
 "inválido!\n"
 
-#: calendar/gui/e-itip-control.c:1856
+#: calendar/gui/e-itip-control.c:1849
 msgid "There was an error on the CORBA system\n"
 msgstr "Ocorreu um erro no sistema CORBA\n"
 
-#: calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1852
 msgid "Object could not be found\n"
 msgstr "Objecto não foi encontrado\n"
 
-#: calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1855
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Não possui as permissões adequadas para actualizar o calendário\n"
 
-#: calendar/gui/e-itip-control.c:1865
+#: calendar/gui/e-itip-control.c:1858
 msgid "Attendee status updated\n"
 msgstr "Estado de participante actualizado\n"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1861
 msgid "Attendee status could not be updated!\n"
 msgstr "Estado de participante não pode ser actualizado!\n"
 
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1892
 msgid "Removal Complete"
 msgstr "Acção de Remoção Terminada"
 
-#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
 msgid "Item sent!\n"
 msgstr "Item enviado!\n"
 
-#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
+#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
 msgid "The item could not be sent!\n"
 msgstr "O item não pode ser enviado!\n"
 
@@ -6293,74 +6052,74 @@ msgstr "data-finalização"
 msgid "date-start"
 msgstr "data-início"
 
-#: calendar/gui/e-meeting-list-view.c:62
+#: calendar/gui/e-meeting-list-view.c:59
 msgid "Chair Persons"
 msgstr "Coordenadores"
 
-#: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:479
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
 msgid "Required Participants"
 msgstr "Participantes Requeridos"
 
-#: calendar/gui/e-meeting-list-view.c:64
+#: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Participantes Opcionais"
 
-#: calendar/gui/e-meeting-list-view.c:65
+#: calendar/gui/e-meeting-list-view.c:62
 msgid "Resources"
 msgstr "Recursos"
 
-#: calendar/gui/e-meeting-list-view.c:140 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
 #: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr "Individual"
 
-#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "Grupo"
 
-#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr "Recurso"
 
-#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr "Sala"
 
-#: calendar/gui/e-meeting-list-view.c:154 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr "Coordenador"
 
-#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:127
 #: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
 msgid "Required Participant"
 msgstr "Participante Requerido"
 
-#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr "Participante Opcional"
 
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr "Não-Participante"
 
-#: calendar/gui/e-meeting-list-view.c:179 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:177
 #: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
 msgid "Needs Action"
 msgstr "Requer Acção"
 
-#: calendar/gui/e-meeting-list-view.c:182 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
 #: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "Tentativa"
 
-#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr "Delegada"
@@ -6377,20 +6136,28 @@ msgstr "Fora do Escritório"
 msgid "No Information"
 msgstr "Nenhuma Informação"
 
+#: calendar/gui/e-meeting-time-sel.c:417
+#, fuzzy
+msgid "Add attendees from addressbook"
+msgstr "Adicionar o Remetente ao Li_vro de Endereços"
+
 #: calendar/gui/e-meeting-time-sel.c:440
 msgid "_Options"
 msgstr "_Opções"
 
 #: calendar/gui/e-meeting-time-sel.c:457
-msgid "Show _Only Working Hours"
+#, fuzzy
+msgid "Show _only working hours"
 msgstr "Apenas Aprese_ntar as Horas Úteis"
 
 #: calendar/gui/e-meeting-time-sel.c:467
-msgid "Show _Zoomed Out"
+#, fuzzy
+msgid "Show _zoomed out"
 msgstr "Apresentar com _Zoom Reduzid"
 
 #: calendar/gui/e-meeting-time-sel.c:482
-msgid "_Update Free/Busy"
+#, fuzzy
+msgid "_Update free/busy"
 msgstr "Act_ualizar Livre/Ocupado"
 
 #: calendar/gui/e-meeting-time-sel.c:497
@@ -6406,19 +6173,23 @@ msgid ">_>"
 msgstr ">_>"
 
 #: calendar/gui/e-meeting-time-sel.c:547
-msgid "_All People and Resources"
+#, fuzzy
+msgid "_All people and resources"
 msgstr "Tod_as as Pessoas e Recursos"
 
 #: calendar/gui/e-meeting-time-sel.c:556
-msgid "All _People and One Resource"
+#, fuzzy
+msgid "All _people and one resource"
 msgstr "Todas as _Pessoas e Um Recurso"
 
 #: calendar/gui/e-meeting-time-sel.c:565
-msgid "_Required People"
+#, fuzzy
+msgid "_Required people"
 msgstr "Pessoas _Requeridas"
 
 #: calendar/gui/e-meeting-time-sel.c:574
-msgid "Required People and _One Resource"
+#, fuzzy
+msgid "Required people and _one resource"
 msgstr "Pessoas Requeridas e _Um Recurso"
 
 #: calendar/gui/e-meeting-time-sel.c:593
@@ -6456,7 +6227,7 @@ msgstr "%d/%m/%Y"
 msgid "Enter the password for %s"
 msgstr "Introduza a senha para %s"
 
-#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6465,19 +6236,14 @@ msgstr ""
 "Erro em %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr "O módulo de suporte de tarefas para '%s' terminou com erro."
-
 #. FIXME Loading should be async
 #. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:686
+#: calendar/gui/e-tasks.c:801
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "A abrir tarefas em %s"
 
-#: calendar/gui/e-tasks.c:709
+#: calendar/gui/e-tasks.c:824
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6486,52 +6252,47 @@ msgstr ""
 "Erro ao abrir %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:730
+#: calendar/gui/e-tasks.c:845
 msgid "Loading tasks"
 msgstr "A ler as tarefas"
 
-#: calendar/gui/e-tasks.c:834
+#: calendar/gui/e-tasks.c:949
 msgid "Completing tasks..."
 msgstr "A terminar as tarefas..."
 
-#: calendar/gui/e-tasks.c:857
+#: calendar/gui/e-tasks.c:972
 msgid "Deleting selected objects..."
 msgstr "A apagar os objectos seleccionados..."
 
-#: calendar/gui/e-tasks.c:884
+#: calendar/gui/e-tasks.c:999
 msgid "Expunging"
 msgstr "A expurgar"
 
-#: calendar/gui/e-tasks.c:960
+#: calendar/gui/e-tasks.c:1075
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
-#: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
+#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
+#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
 #: calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:705
 msgid "Tasks"
 msgstr "Tarefas"
 
-#: calendar/gui/gnome-cal.c:1876
+#: calendar/gui/gnome-cal.c:1878
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "A ler os compromisso em %s"
 
-#: calendar/gui/gnome-cal.c:1895
+#: calendar/gui/gnome-cal.c:1897
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "A ler as tarefas em %s"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1920
 #, c-format
 msgid "Opening %s"
 msgstr "A abrir %s"
 
-#: calendar/gui/gnome-cal.c:2048
-#, c-format
-msgid "The calendar backend for '%s' has crashed."
-msgstr "O módulo de suporte de calendário para '%s' terminou com erro."
-
-#: calendar/gui/gnome-cal.c:2894
+#: calendar/gui/gnome-cal.c:2906
 msgid "Purging"
 msgstr "A expurgar"
 
@@ -6729,7 +6490,7 @@ msgid "On The Web"
 msgstr "Na Web"
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "Incapaz de migrar as configurações antigas de evolution/config.xmldb"
 
@@ -6740,7 +6501,7 @@ msgid "Unable to migrate calendar `%s'"
 msgstr "Incapaz de migrar o calendário `%s'"
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:869
+#: calendar/gui/migration.c:889
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Incapaz de migrar as tarefas `%s'"
@@ -6976,44 +6737,44 @@ msgstr "Imprimir o Item"
 msgid "Print Setup"
 msgstr "Configurar a Impressão"
 
-#: calendar/gui/tasks-component.c:303
+#: calendar/gui/tasks-component.c:313
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 "A Lista de Tarefas '%s' será removida. Tem a certeza de que deseja continuar?"
 
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:371
 msgid "New Task List"
 msgstr "Nova Lista de Tarefas"
 
-#: calendar/gui/tasks-component.c:398
+#: calendar/gui/tasks-component.c:408
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d tarefa"
 msgstr[1] "%d tarefas"
 
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] ", %d seleccionada"
 msgstr[1] ", %d seleccionadas"
 
-#: calendar/gui/tasks-component.c:447
+#: calendar/gui/tasks-component.c:457
 msgid "Failed upgrading tasks."
 msgstr "Falha ao actualizar as tarefas."
 
-#: calendar/gui/tasks-component.c:526
+#: calendar/gui/tasks-component.c:749
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "Incapaz de abrir a lista de tarefas '%s' para criar eventos e reuniões"
 
-#: calendar/gui/tasks-component.c:538
+#: calendar/gui/tasks-component.c:761
 msgid "There is no calendar available for creating tasks"
 msgstr "Não existe nenhum calendário disponível para criar tarefas"
 
-#: calendar/gui/tasks-component.c:576
+#: calendar/gui/tasks-component.c:799
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
@@ -7021,27 +6782,27 @@ msgstr ""
 "A lista de tarefas seleccionada é apenas de leitura, não podem ser criados "
 "eventos. Seleccione um calendário para o qual possua permissões de escrita."
 
-#: calendar/gui/tasks-component.c:804
+#: calendar/gui/tasks-component.c:1040
 msgid "New task"
 msgstr "Nova tarefa"
 
-#: calendar/gui/tasks-component.c:805
+#: calendar/gui/tasks-component.c:1041
 msgid "_Task"
 msgstr "_Tarefa"
 
-#: calendar/gui/tasks-component.c:806
+#: calendar/gui/tasks-component.c:1042
 msgid "Create a new task"
 msgstr "Criar uma nova tarefa"
 
-#: calendar/gui/tasks-component.c:812
+#: calendar/gui/tasks-component.c:1048
 msgid "New tasks group"
 msgstr "Novo grupo de tarefas"
 
-#: calendar/gui/tasks-component.c:813
+#: calendar/gui/tasks-component.c:1049
 msgid "_Tasks Group"
 msgstr "Grupo de _Tarefas"
 
-#: calendar/gui/tasks-component.c:814
+#: calendar/gui/tasks-component.c:1050
 msgid "Create a new tasks group"
 msgstr "Criar um novo grupo de tarefas"
 
@@ -8807,12 +8568,12 @@ msgstr "Erro ao executar uma procura com filtro: %s: %s"
 msgid "Unsupported operation: append message: for %s"
 msgstr "Operação não suportada: concatenar mensagem: para %s"
 
-#: camel/camel-folder.c:1259
+#: camel/camel-folder.c:1262
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Operação não suportada: procurar por expressão: para %s"
 
-#: camel/camel-folder.c:1299
+#: camel/camel-folder.c:1302
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Operação não suportada: procura por uids: para %s"
@@ -8825,11 +8586,16 @@ msgstr "A mover mensagens"
 msgid "Copying messages"
 msgstr "A copiar mensagens"
 
-#: camel/camel-folder.c:1666
-msgid "Learning junk and/or non junk message(s)"
-msgstr "A aprender a distinguir mensagens não-solicitadas das restantes"
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Aviso"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr ""
 
-#: camel/camel-folder.c:1695
+#: camel/camel-folder.c:1701
 msgid "Filtering new message(s)"
 msgstr "A filtrar nova(s) mensagem(ns)"
 
@@ -8864,15 +8630,15 @@ msgstr "(coincidir-árvores) agora permitido dentro de coincidir-todas"
 msgid "(match-threads) requires a match type string"
 msgstr "(coincidir-árvores) requer uma expressão de coincidência"
 
-#: camel/camel-folder-search.c:785
+#: camel/camel-folder-search.c:784
 msgid "(match-threads) expects an array result"
 msgstr "(coincidir-árvores) espera um resultado em matriz"
 
-#: camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:790
 msgid "(match-threads) requires the folder set"
 msgstr "(coincidir-árvores) requer um conjunto de pastas"
 
-#: camel/camel-folder-search.c:880
+#: camel/camel-folder-search.c:879
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "A efectuar a procura num cabeçalho desconhecido: %s"
@@ -8907,7 +8673,8 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
 #: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:706
+#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Cancelado."
@@ -9296,7 +9063,7 @@ msgstr "As credenciais de referência expiraram."
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1212
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Resposta de autenticação do servidor inválida."
 
@@ -9661,40 +9428,40 @@ msgstr "importar chaves: não implementado"
 msgid "export keys: unimplemented"
 msgstr "exportar chaves: não implementado"
 
-#: camel/camel-store.c:214
+#: camel/camel-store.c:213
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Incapaz de obter a pasta: Operação inválida neste armazenamento"
 
-#: camel/camel-store.c:244
+#: camel/camel-store.c:243
 #, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr "Incapaz de criar a pasta `%s': pasta já existe"
 
-#: camel/camel-store.c:295
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Incapaz de criar a pasta: Operação inválida neste armazenamento"
 
-#: camel/camel-store.c:323
+#: camel/camel-store.c:325
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Incapaz de criar a pasta `%s': pasta já existe"
 
-#: camel/camel-store.c:387 camel/camel-vee-store.c:354
+#: camel/camel-store.c:389 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Incapaz de apagar a pasta: %s: Operação inválida"
 
-#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#: camel/camel-store.c:439 camel/camel-vee-store.c:387
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Incapaz de renomear a pasta: %s: Operação inválida"
 
-#: camel/camel-store.c:811
+#: camel/camel-store.c:777
 msgid "Trash"
 msgstr "Lixo"
 
-#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
-#: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/mail-config.glade.h:95
+#: ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Não Solicitado"
 
@@ -9926,12 +9693,12 @@ msgstr "Nenhuma mensagem %s em %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Incapaz de copiar ou mover as mensagens para uma Pasta Virtual"
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:374
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Incapaz de apagar a pasta: %s: Pasta não existe"
 
-#: camel/camel-vee-store.c:398
+#: camel/camel-vee-store.c:395
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Incapaz de renomear a pasta: %s: Pasta não existe"
@@ -9972,24 +9739,24 @@ msgstr "Livro de Endereços e Calendário"
 msgid "Post Office Agent SOAP Port:"
 msgstr "Porto do Agente de Correio SOAP:"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:80
+#: camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "Novell GroupWise"
 msgstr "Novell GroupWise"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:82
+#: camel/providers/groupwise/camel-groupwise-provider.c:85
 msgid "For accessing Novell Groupwise servers"
 msgstr "Para aceder a servidores Novell GroupWise"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: camel/providers/groupwise/camel-groupwise-provider.c:100
 #: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
 msgid "Password"
 msgstr "Senha"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:99
+#: camel/providers/groupwise/camel-groupwise-provider.c:102
 #: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
@@ -9997,8 +9764,8 @@ msgstr ""
 "Esta opção irá estabelecer uma ligação a um servidor IMAP utilizando uma "
 "senha em texto simples."
 
-#: camel/providers/groupwise/camel-gw-listener.c:305
-#: camel/providers/groupwise/camel-gw-listener.c:328
+#: camel/providers/groupwise/camel-gw-listener.c:312
+#: camel/providers/groupwise/camel-gw-listener.c:335
 msgid "Checklist"
 msgstr "Lista de verificação"
 
@@ -10131,13 +9898,13 @@ msgstr ""
 "uma senha em texto simples."
 
 #: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:429
+#: camel/providers/imap/camel-imap-store.c:428
 #, c-format
 msgid "IMAP server %s"
 msgstr "Servidor IMAP %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:431
+#: camel/providers/imap/camel-imap-store.c:430
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "Serviço IMAP para %s em %s"
@@ -10147,7 +9914,7 @@ msgstr "Serviço IMAP para %s em %s"
 #: camel/providers/imap/camel-imap-store.c:551
 #: camel/providers/imap/camel-imap-store.c:571
 #: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
+#: camel/providers/nntp/camel-nntp-store.c:209
 #: camel/providers/pop3/camel-pop3-store.c:175
 #: camel/providers/smtp/camel-smtp-transport.c:269
 #: camel/providers/smtp/camel-smtp-transport.c:285
@@ -10164,10 +9931,10 @@ msgstr "SSL indisponível"
 
 #: camel/providers/imap4/camel-imap4-store.c:222
 #: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:815
+#: camel/providers/imap/camel-imap-store.c:845
 #: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:137
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
 #: camel/providers/pop3/camel-pop3-store.c:192
 msgid "Connection cancelled"
 msgstr "Ligação cancelada"
@@ -10182,8 +9949,8 @@ msgstr ""
 "suporta STARTTLS"
 
 #: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:649
-#: camel/providers/imap/camel-imap-store.c:680
+#: camel/providers/imap/camel-imap-store.c:679
+#: camel/providers/imap/camel-imap-store.c:710
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Incapaz de se ligar ao servidor IMAP %s em modo seguro: %s"
@@ -10192,7 +9959,7 @@ msgstr "Incapaz de se ligar ao servidor IMAP %s em modo seguro: %s"
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1109
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
 msgid "Unknown error"
 msgstr "Erro desconhecido"
 
@@ -10220,8 +9987,8 @@ msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr "Incapaz de obter a pasta `%s' no servidor IMAP %s: Desconhecido"
 
 #: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1857
-#: camel/providers/imap/camel-imap-store.c:2235
+#: camel/providers/imap/camel-imap-store.c:1885
+#: camel/providers/imap/camel-imap-store.c:2263
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -10301,12 +10068,12 @@ msgstr "Servidor IMAP %s desligou-se inesperadamente: %s"
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3168
+#: camel/providers/imap/camel-imap-store.c:3194
 msgid "Operation cancelled"
 msgstr "Operação cancelada"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3171
+#: camel/providers/imap/camel-imap-store.c:3197
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Servidor desligou-se inesperadamente: %s"
@@ -10370,13 +10137,6 @@ msgid "Unable to retrieve message: %s"
 msgstr "Incapaz de obter a mensagem: %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:219
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -10386,15 +10146,15 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-mbox-folder.c:418
+#: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
 msgstr "Mensagem inexistente"
 
 #: camel/providers/imap/camel-imap-folder.c:2019
-#: camel/providers/imap/camel-imap-folder.c:2621
-#: camel/providers/nntp/camel-nntp-folder.c:238
+#: camel/providers/imap/camel-imap-folder.c:2622
+#: camel/providers/nntp/camel-nntp-folder.c:220
 msgid "This message is not currently available"
 msgstr "Esta mensagem de momento não está disponível"
 
@@ -10403,7 +10163,23 @@ msgstr "Esta mensagem de momento não está disponível"
 msgid "Fetching summary information for new messages"
 msgstr "A obter a informação de resumo para novas mensagens"
 
-#: camel/providers/imap/camel-imap-folder.c:2659
+#: camel/providers/imap/camel-imap-folder.c:2463
+#, c-format
+msgid "Incomplete server response: no information provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2471
+#, c-format
+msgid "Incomplete server response: no UID provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2484
+#, c-format
+msgid ""
+"Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2660
 msgid "Could not find message body in FETCH response."
 msgstr "Incapaz de encontrar o corpo da mensagem na resposta FETCH."
 
@@ -10463,43 +10239,43 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Para ler e armazenar email em servidores IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/imap/camel-imap-store.c:680
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "Extensão SSL/TLS não suportada."
 
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:711
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "Falha na negociação SSL"
 
-#: camel/providers/imap/camel-imap-store.c:818
+#: camel/providers/imap/camel-imap-store.c:848
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Incapaz de se ligar utilizando o comando \"%s\": %s"
 
-#: camel/providers/imap/camel-imap-store.c:1242
+#: camel/providers/imap/camel-imap-store.c:1272
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "Servidor IMAP %s não suporta o tipo de autenticação %s pedido"
 
-#: camel/providers/imap/camel-imap-store.c:1252
+#: camel/providers/imap/camel-imap-store.c:1282
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Sem suporte para o tipo de autenticação %s"
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1305
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sIntroduza a senha IMAP para %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1289
+#: camel/providers/imap/camel-imap-store.c:1319
 msgid "You didn't enter a password."
 msgstr "Não introduziu a senha."
 
-#: camel/providers/imap/camel-imap-store.c:1318
+#: camel/providers/imap/camel-imap-store.c:1348
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10510,18 +10286,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1839
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:1867
+#: camel/providers/imap/camel-imap-store.c:2057
 #, c-format
 msgid "No such folder %s"
 msgstr "Pasta %s inexistente"
 
-#: camel/providers/imap/camel-imap-store.c:1915
-#: camel/providers/imap/camel-imap-store.c:2296
+#: camel/providers/imap/camel-imap-store.c:1943
+#: camel/providers/imap/camel-imap-store.c:2324
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "A pasta pai não tem permissões para conter subpastas"
 
-#: camel/providers/imap/camel-imap-store.c:1970
+#: camel/providers/imap/camel-imap-store.c:1998
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10529,7 +10305,7 @@ msgstr "A pasta pai não tem permissões para conter subpastas"
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Incapaz de criar a pasta `%s': a pasta já existe."
 
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:2274
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Pasta pai desconhecida: %s"
@@ -10565,20 +10341,20 @@ msgid "Index message body data"
 msgstr "Dados de índice de corpo de mensagem"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:388
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:393
-#: camel/providers/local/camel-local-folder.c:396
+#: camel/providers/local/camel-local-folder.c:392
+#: camel/providers/local/camel-local-folder.c:395
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "caixa-correio:%s (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:400
+#: camel/providers/local/camel-local-folder.c:399
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -10639,7 +10415,7 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:142
 #: camel/providers/local/camel-local-store.c:253
-#: camel/providers/local/camel-mbox-store.c:356
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10712,8 +10488,25 @@ msgstr "Adição de mensagem ao maildir cancelada"
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Incapaz de adicionar a mensagem à pasta maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:226
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mbox-folder.c:417
+#: camel/providers/local/camel-mbox-folder.c:436
+#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:475
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-mh-folder.c:221
+#, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+"Incapaz de obter a mensagem: %s da pasta %s\n"
+"  %s"
+
+#: camel/providers/local/camel-maildir-folder.c:236
 msgid "Invalid message contents"
 msgstr "Conteúdo da mensagem inválido"
 
@@ -10754,9 +10547,9 @@ msgstr "Incapaz de apagar a pasta `%s': %s"
 msgid "not a maildir directory"
 msgstr "não é um directório maildir"
 
-#: camel/providers/local/camel-maildir-store.c:341
-#: camel/providers/local/camel-spool-store.c:286
-#: camel/providers/local/camel-spool-store.c:316
+#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-spool-store.c:284
+#: camel/providers/local/camel-spool-store.c:314
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Incapaz de procurar na pasta `%s': %s"
@@ -10803,27 +10596,18 @@ msgstr "Adição de correio cancelada"
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Incapaz de adicionar a mensagem ao ficheiro mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:435
-#: camel/providers/local/camel-mbox-folder.c:466
-#: camel/providers/local/camel-mbox-folder.c:474
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"Incapaz de obter a mensagem: %s da pasta %s\n"
-"  %s"
-
-#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:468
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "A pasta parece estar irreversivelmente corrompida."
 
-#: camel/providers/local/camel-mbox-folder.c:475
-msgid "Message construction failed: Corrupt mailbox?"
+#: camel/providers/local/camel-mbox-folder.c:476
+#: camel/providers/local/camel-mh-folder.c:222
+#, fuzzy
+msgid "Message construction failed."
 msgstr "Falha na construção de mensagem: Caixa de correio corrompida?"
 
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:362
+#: camel/providers/local/camel-mbox-store.c:361
 msgid "Cannot create a folder by this name."
 msgstr "Incapaz de criar uma pasta com este nome."
 
@@ -10853,30 +10637,30 @@ msgstr "`%s' não é um ficheiro normal."
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Pasta `%s' não está vazia. Não foi apagada."
 
-#: camel/providers/local/camel-mbox-store.c:375
+#: camel/providers/local/camel-mbox-store.c:374
 #, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Incapaz de criar o directório `%s': %s."
 
-#: camel/providers/local/camel-mbox-store.c:389
+#: camel/providers/local/camel-mbox-store.c:388
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Incapaz de criar a pasta: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:391
+#: camel/providers/local/camel-mbox-store.c:390
 msgid "Folder already exists"
 msgstr "A pasta já existe"
 
-#: camel/providers/local/camel-mbox-store.c:473
+#: camel/providers/local/camel-mbox-store.c:472
 msgid "The new folder name is illegal."
 msgstr "O nome da nova pasta é inválido."
 
-#: camel/providers/local/camel-mbox-store.c:486
+#: camel/providers/local/camel-mbox-store.c:485
 #, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Incapaz de renomear `%s': `%s': %s"
 
-#: camel/providers/local/camel-mbox-store.c:561
+#: camel/providers/local/camel-mbox-store.c:560
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Incapaz de renomear '%s' para %s: %s"
@@ -11067,7 +10851,7 @@ msgstr ""
 "Pasta pode estar corrompida, cópia gravada em `%s'"
 
 #: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:997
+#: camel/providers/nntp/camel-nntp-store.c:1126
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Introduza a senha NNTP para %s@%s"
@@ -11084,18 +10868,10 @@ msgstr "Falha ao enviar o utilizador para o servidor"
 msgid "Server rejected username/password"
 msgstr "O servidor rejeitou o par utilizador/senha"
 
-#: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:263
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr "Cancelado pelo utilizador"
-
-#: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:259
-#: camel/providers/nntp/camel-nntp-folder.c:265
+#: camel/providers/nntp/camel-nntp-folder.c:147
+#: camel/providers/nntp/camel-nntp-folder.c:149
+#: camel/providers/nntp/camel-nntp-folder.c:158
+#: camel/providers/nntp/camel-nntp-folder.c:234
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11104,63 +10880,49 @@ msgstr "Cancelado pelo utilizador"
 msgid "Cannot get message %s: %s"
 msgstr "Incapaz de obter a mensagem %s: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:188
-#: camel/providers/nntp/camel-nntp-folder.c:228
+#: camel/providers/nntp/camel-nntp-folder.c:156
+#: camel/providers/nntp/camel-nntp-folder.c:232
+#: camel/providers/nntp/camel-nntp-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+msgid "User cancelled"
+msgstr "Cancelado pelo utilizador"
+
+#: camel/providers/nntp/camel-nntp-folder.c:176
+#: camel/providers/nntp/camel-nntp-folder.c:208
 #, c-format
 msgid "Internal error: uid in invalid format: %s"
 msgstr "Erro interno: uid num formato inválido: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:201
-#, c-format
-msgid "Could not get article %s from NNTP server"
-msgstr "Incapaz de obter o artigo %s do servidor NNTP"
-
-#: camel/providers/nntp/camel-nntp-folder.c:362
-msgid "Posting not allowed by news server"
-msgstr "Afixação não autorizada pelo servidor de notícias"
-
+#: camel/providers/nntp/camel-nntp-folder.c:328
+#: camel/providers/nntp/camel-nntp-folder.c:331
 #: camel/providers/nntp/camel-nntp-folder.c:373
-#, c-format
-msgid "Failed to send newsgroups header: %s: message not posted"
-msgstr ""
-"Falha ao enviar o cabeçalho de grupo de notícias: %s: a mensagem não foi "
-"afixada"
-
-#: camel/providers/nntp/camel-nntp-folder.c:413
-#: camel/providers/nntp/camel-nntp-folder.c:426
-#, c-format
-msgid "Error posting to newsgroup: %s: message not posted"
-msgstr "Erro ao afixar no grupo de notícias: %s: a mensagem não foi afixada"
-
-#: camel/providers/nntp/camel-nntp-folder.c:438
-msgid "Error reading response to posted message: message not posted"
-msgstr ""
-"Erro ao ler uma resposta à mensagem afixada: a mensagem não foi afixada"
-
-#: camel/providers/nntp/camel-nntp-folder.c:441
-#, c-format
-msgid "Error posting message: %s: message not posted"
-msgstr "Erro ao afixar a mensagem: %s: a mensagem não foi afixada"
+#: camel/providers/nntp/camel-nntp-folder.c:375
+#, fuzzy, c-format
+msgid "Posting failed: %s"
+msgstr "Falha na operação: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:457
+#: camel/providers/nntp/camel-nntp-folder.c:393
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "Não pode afixar mensagens NNTP enquanto trabalha desligado!"
 
-#: camel/providers/nntp/camel-nntp-folder.c:468
+#: camel/providers/nntp/camel-nntp-folder.c:404
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Não pode copiar mensagens de uma pasta NNTP!"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:44
 msgid "Could not get group list from server."
 msgstr "Incapaz de obter a lista de grupos do servidor."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#: camel/providers/nntp/camel-nntp-grouplist.c:97
+#: camel/providers/nntp/camel-nntp-grouplist.c:106
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "Incapaz de ler o ficheiro de lista de grupos para %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#: camel/providers/nntp/camel-nntp-grouplist.c:157
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Incapaz de gravar o ficheiro de lista de grupos para %s: %s"
@@ -11192,26 +10954,29 @@ msgstr ""
 "Esta opção irá autenticá-lo perante o servidor NNTP utilizando uma senha em "
 "texto simples."
 
-#: camel/providers/nntp/camel-nntp-store.c:158
+#: camel/providers/nntp/camel-nntp-store.c:118
+#: camel/providers/nntp/camel-nntp-store.c:1233
+#: camel/providers/nntp/camel-nntp-store.c:1331
+#, c-format
+msgid "NNTP Command failed: %s"
+msgstr "Falha no comando NNTP: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:227
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Incapaz de ler as boas vindas de %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:170
+#: camel/providers/nntp/camel-nntp-store.c:239
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "Servidor NNTP %s devolveu o código de erro %d: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:326
+#: camel/providers/nntp/camel-nntp-store.c:403
 #, c-format
 msgid "USENET News via %s"
 msgstr "Notícias USENET via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:640
-msgid "Stream error"
-msgstr "Erro de fluxo de dados"
-
-#: camel/providers/nntp/camel-nntp-store.c:643
+#: camel/providers/nntp/camel-nntp-store.c:777
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -11222,7 +10987,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/providers/nntp/camel-nntp-store.c:735
+#: camel/providers/nntp/camel-nntp-store.c:872
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
@@ -11232,7 +10997,7 @@ msgstr ""
 "\n"
 "Grupo inexistente. O item seleccionado é provavelmente uma pasta pai."
 
-#: camel/providers/nntp/camel-nntp-store.c:767
+#: camel/providers/nntp/camel-nntp-store.c:904
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
@@ -11242,60 +11007,61 @@ msgstr ""
 "\n"
 "O grupo de notícias não existe!"
 
-#: camel/providers/nntp/camel-nntp-store.c:792
+#: camel/providers/nntp/camel-nntp-store.c:929
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr "Não pode criar uma pasta num armazenamento de Notícias: subscreva-a."
 
-#: camel/providers/nntp/camel-nntp-store.c:800
+#: camel/providers/nntp/camel-nntp-store.c:937
 msgid "You cannot rename a folder in a News store."
 msgstr "Não pode renomear uma pasta num armazenamento de notícias."
 
-#: camel/providers/nntp/camel-nntp-store.c:808
+#: camel/providers/nntp/camel-nntp-store.c:945
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 "Não pode remover uma pasta num armazenamento de Notícias: remova a "
 "subscrição."
 
-#: camel/providers/nntp/camel-nntp-summary.c:253
-#, c-format
-msgid "Connection error: %s"
-msgstr "Erro de ligação: %s"
-
-#: camel/providers/nntp/camel-nntp-summary.c:262
-#, c-format
-msgid "No such folder: %s"
-msgstr "Pasta inexistente: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1118
+#, fuzzy
+msgid "Authentication requested but not username provided"
+msgstr "Autenticação requerida"
 
-#: camel/providers/nntp/camel-nntp-summary.c:268
-#, c-format
-msgid "Could not get group: %s"
-msgstr "Incapaz de obter o grupo: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1146
+#, fuzzy, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr "Falha ao autenticar-se no servidor IMAP %s utilizando %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:333
-msgid "Could not get messages: unspecified error"
-msgstr "Incapaz de obter as mensagens: erro não especificado"
+#: camel/providers/nntp/camel-nntp-store.c:1262
+#, fuzzy
+msgid "Not connected."
+msgstr "Nenhum contacto"
 
-#: camel/providers/nntp/camel-nntp-summary.c:378
+#: camel/providers/nntp/camel-nntp-store.c:1311
 #, c-format
-msgid "NNTP Command failed: %s"
-msgstr "Falha no comando NNTP: %s"
+msgid "No such folder: %s"
+msgstr "Pasta inexistente: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:438
-#: camel/providers/nntp/camel-nntp-summary.c:543
+#: camel/providers/nntp/camel-nntp-summary.c:218
+#: camel/providers/nntp/camel-nntp-summary.c:314
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: A procurar novas mensagens"
 
-#: camel/providers/nntp/camel-nntp-summary.c:558
-#, c-format
-msgid "Unknown server response: %s"
-msgstr "Resposta de servidor desconhecida: %s"
+#: camel/providers/nntp/camel-nntp-summary.c:225
+#, fuzzy, c-format
+msgid "Unexpected server response from xover: %s"
+msgstr "Resposta inesperada de servidor IMAP: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:605
+#: camel/providers/nntp/camel-nntp-summary.c:328
+#, fuzzy, c-format
+msgid "Unexpected server response from head: %s"
+msgstr "Resposta inesperada do GnuPG: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:368
 msgid "Use cancel"
 msgstr "Utilize cancelar"
 
-#: camel/providers/nntp/camel-nntp-summary.c:607
+#: camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Falha na operação: %s"
@@ -11343,7 +11109,7 @@ msgstr "Apagar após %s dia(s)"
 msgid "Disable support for all POP3 extensions"
 msgstr "Desactivar suporte para todas as extensões POP3"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107
 msgid "POP"
 msgstr "POP"
 
@@ -11433,7 +11199,7 @@ msgid "No such folder `%s'."
 msgstr "Pasta `%s' inexistente."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:132
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -11487,7 +11253,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Entrega de mensagens através da aplicação sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:119
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11774,19 +11540,19 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
+#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:408
 msgid "attachment"
 msgstr "anexo"
 
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:454
 msgid "Remove selected items from the attachment list"
 msgstr "Remover os items seleccionados da lista de anexos"
 
-#: composer/e-msg-composer-attachment-bar.c:491
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Add attachment..."
 msgstr "Adicionar anexo..."
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:495
 msgid "Attach a file to the message"
 msgstr "Anexar um ficheiro à mensagem"
 
@@ -11849,7 +11615,7 @@ msgstr "Mensagem sem Título"
 msgid "Open file"
 msgstr "Abrir ficheiro"
 
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
 msgid "Autogenerated"
 msgstr "Gerada automaticamente"
 
@@ -11995,17 +11761,19 @@ msgstr "Anexar ficheiro(s)"
 
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
-msgid "You cannot attach the file `${0}' to this message."
+#, fuzzy
+msgid "You cannot attach the file `{0}' to this message."
 msgstr "Não é possível anexar o ficheiro `${0}' a esta mensagem."
 
 #. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4
-msgid "${1}"
-msgstr "${1}"
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr "{1}"
 
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+#, fuzzy
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
 "O ficheiro `${0}' não é um ficheiro normal e não pode ser enviado numa "
 "mensagem."
@@ -12101,7 +11869,8 @@ msgstr "Incapaz de criar a mensagem."
 
 #. mail-composer:no-build-message secondary
 #: composer/mail-composer-errors.xml.h:34
-msgid "Because \"${0}\", you may need to select different mail options."
+#, fuzzy
+msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 "Devido a \"${0}\", poderá ter de seleccionar diferentes opções de mensagem."
 
@@ -12111,9 +11880,11 @@ msgid "Could not read signature file \"{0}\"."
 msgstr "Incapaz de ler o ficheiro de assinatura \"{0}\"."
 
 #. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38
-msgid "Because \"${1}\"."
-msgstr "Devido a \"${1}\"."
+#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr "Devido a \"{1}\"."
 
 #. mail-composer:all-accounts-deleted primary
 #: composer/mail-composer-errors.xml.h:40
@@ -12528,11 +12299,11 @@ msgid "<b>Then</b>"
 msgstr "<b>Então</b>"
 
 #: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1335
+#: mail/mail-account-gui.c:1347
 msgid "Select Folder"
 msgstr "Seleccionar Pasta"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
 msgid "    "
 msgstr "    "
 
@@ -12588,7 +12359,7 @@ msgstr "atrás"
 msgid "months"
 msgstr "meses"
 
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
 msgid "seconds"
 msgstr "segundos"
 
@@ -12620,20 +12391,20 @@ msgstr "com todas as pastas locais"
 msgid "years"
 msgstr "anos"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:916
-#: mail/mail-config.c:76 mail/mail-config.glade.h:90
+#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
+#: mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Importante"
 
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:919 mail/mail-config.c:79
-#: mail/mail-config.glade.h:145
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: mail/mail-config.glade.h:148
 msgid "To Do"
 msgstr "A Fazer"
 
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:920 mail/mail-config.c:80
-#: mail/mail-config.glade.h:94
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: mail/mail-config.glade.h:97
 msgid "Later"
 msgstr "Mais Tarde"
 
@@ -12685,252 +12456,6 @@ msgstr "recebidas"
 msgid "outgoing"
 msgstr "enviadas"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Adjust Score"
-msgstr "Ajustar a Pontuação"
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Color"
-msgstr "Atribuir uma Cor"
-
-#: filter/libfilter-i18n.h:4
-msgid "Assign Score"
-msgstr "Atribuir uma Pontuação"
-
-#: filter/libfilter-i18n.h:5
-msgid "Attachments"
-msgstr "Anexos"
-
-#: filter/libfilter-i18n.h:6
-msgid "Beep"
-msgstr "Beep"
-
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "contém"
-
-#: filter/libfilter-i18n.h:8
-msgid "Copy to Folder"
-msgstr "Copiar para a Pasta"
-
-#: filter/libfilter-i18n.h:9
-msgid "Date received"
-msgstr "Data de recepção"
-
-#: filter/libfilter-i18n.h:10
-msgid "Date sent"
-msgstr "Data de envio"
-
-#: filter/libfilter-i18n.h:12
-msgid "Deleted"
-msgstr "Apagada"
-
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "não contém"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "não termina em"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "não existe"
-
-#: filter/libfilter-i18n.h:16
-msgid "does not return"
-msgstr "não devolve"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "não se assemelha a"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "não começa por"
-
-#: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
-msgstr "Não Existe"
-
-#: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr "Rascunho"
-
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "termina em"
-
-#: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr "Existe"
-
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "existe"
-
-#: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr "Expressão"
-
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr "Seguimento"
-
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "é"
-
-#: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr "é posterior a"
-
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr "é anterior a"
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr "está Marcada"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "é maior do que"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "é menor do que"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "não é"
-
-#: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr "não está Marcada"
-
-#: filter/libfilter-i18n.h:36
-msgid "Junk Test"
-msgstr "Teste de Não Solicitado"
-
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
-#: widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Etiqueta"
-
-#: filter/libfilter-i18n.h:38
-msgid "Mailing list"
-msgstr "Lista de distribuição"
-
-#: filter/libfilter-i18n.h:39
-msgid "Message Body"
-msgstr "Corpo da Mensagem"
-
-#: filter/libfilter-i18n.h:40
-msgid "Message Header"
-msgstr "Cabeçalho da Mensagem"
-
-#: filter/libfilter-i18n.h:41
-msgid "Message is Junk"
-msgstr "Mensagem é Não Solicitada"
-
-#: filter/libfilter-i18n.h:42
-msgid "Message is not Junk"
-msgstr "Mensagem não é Não Solicitada"
-
-#: filter/libfilter-i18n.h:43
-msgid "Move to Folder"
-msgstr "Mover para a Pasta"
-
-#: filter/libfilter-i18n.h:44
-msgid "Pipe to Program"
-msgstr "Canal para a Aplicação"
-
-#: filter/libfilter-i18n.h:45
-msgid "Play Sound"
-msgstr "Reproduzir o Som"
-
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Ler"
-
-#: filter/libfilter-i18n.h:47
-msgid "Recipients"
-msgstr "Destinatários"
-
-#: filter/libfilter-i18n.h:48
-msgid "Regex Match"
-msgstr "Coincidir Expr. Reg."
-
-#: filter/libfilter-i18n.h:49
-msgid "Replied to"
-msgstr "Repondido a"
-
-#: filter/libfilter-i18n.h:50
-msgid "returns"
-msgstr "devolve"
-
-#: filter/libfilter-i18n.h:51
-msgid "returns greater than"
-msgstr "devolve maior do que"
-
-#: filter/libfilter-i18n.h:52
-msgid "returns less than"
-msgstr "devolve menor do que"
-
-#: filter/libfilter-i18n.h:53
-msgid "Run Program"
-msgstr "Executar Aplicação"
-
-#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Pontuação"
-
-#: filter/libfilter-i18n.h:55
-msgid "Sender"
-msgstr "Remetente"
-
-#: filter/libfilter-i18n.h:56
-msgid "Set Status"
-msgstr "Definir o Estado"
-
-#: filter/libfilter-i18n.h:57
-msgid "Size (kB)"
-msgstr "Tamanho (kB)"
-
-#: filter/libfilter-i18n.h:58
-msgid "sounds like"
-msgstr "assemelha-se a"
-
-#: filter/libfilter-i18n.h:59
-msgid "Source Account"
-msgstr "Conta de Origem"
-
-#: filter/libfilter-i18n.h:60
-msgid "Specific header"
-msgstr "Cabeçalho específico"
-
-#: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "começa por"
-
-#: filter/libfilter-i18n.h:63
-msgid "Stop Processing"
-msgstr "Parar o Processamento"
-
-#: filter/libfilter-i18n.h:64 mail/em-format.c:755 mail/em-format-html.c:1519
-#: mail/em-format-quote.c:302 mail/em-mailer-prefs.c:87
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
-#: smime/lib/e-cert.c:1079
-msgid "Subject"
-msgstr "Assunto"
-
-#: filter/libfilter-i18n.h:65
-msgid "Unset Status"
-msgstr "Retirar o Estado"
-
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Adicionar a Regra"
@@ -12947,6 +12472,11 @@ msgstr "Nome da regra"
 msgid "_Score Rules"
 msgstr "Regras de _Pontuação"
 
+#: filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Pontuação"
+
 #: filter/searchtypes.xml.h:1
 msgid "Body contains"
 msgstr "Corpo contém"
@@ -13026,13 +12556,13 @@ msgstr "Assinatura(s)"
 msgid "-------- Forwarded Message --------"
 msgstr "------ Mensagem Reencaminhada ------"
 
-#: mail/em-composer-utils.c:1499
+#: mail/em-composer-utils.c:1495
 msgid "an unknown sender"
 msgstr "um remetente desconhecido"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1509
+#: mail/em-composer-utils.c:1505
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "No(a) %a, %Y-%m-%d às %H:%M %%+05d, %%s escreveu:"
 
@@ -13070,8 +12600,8 @@ msgstr "<clique aqui para seleccionar uma pasta>"
 msgid "Create New Folder"
 msgstr "Criar uma Nova Pasta"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
-#: mail/mail-component.c:701
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
+#: mail/mail-component.c:704
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Especificar onde criar a pasta:"
@@ -13086,104 +12616,105 @@ msgstr "Criar uma pasta"
 msgid "Folder _name:"
 msgstr "_Nome da pasta:"
 
-#: mail/em-folder-tree.c:839
+#: mail/em-folder-tree.c:833
 #, c-format
 msgid "Moving folder %s"
 msgstr "A mover a pasta %s"
 
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree.c:835
 #, c-format
 msgid "Copying folder %s"
 msgstr "A copiar a pasta %s"
 
-#: mail/em-folder-tree.c:848 mail/message-list.c:1555
+#: mail/em-folder-tree.c:842 mail/message-list.c:1561
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "A mover as mensagens para a pasta %s"
 
-#: mail/em-folder-tree.c:850 mail/message-list.c:1557
+#: mail/em-folder-tree.c:844 mail/message-list.c:1563
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "A copiar as mensagens para a pasta %s"
 
-#: mail/em-folder-tree.c:866
+#: mail/em-folder-tree.c:860
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 "Incapaz de largar a(s) mensagem(ns) para o nível de topo do armazenamento"
 
-#: mail/em-folder-tree.c:956 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Copiar para a Pasta"
 
-#: mail/em-folder-tree.c:957 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Mover para a Pasta"
 
-#: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2069
-#: mail/em-folder-tree.c:2551 mail/em-folder-view.c:798
-#: mail/message-list.c:1645
+#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
+#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
+#: mail/message-list.c:1651
 msgid "_Move"
 msgstr "_Mover"
 
-#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#: mail/em-folder-tree.c:955 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "Cancelar a Tarefa"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
 #: mail/em-folder-view.c:798 mail/em-folder-view.c:812
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Seleccionar a pasta"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
 #, fuzzy
 msgid "C_opy"
 msgstr "Copiar"
 
-#: mail/em-folder-tree.c:2096
+#: mail/em-folder-tree.c:2088
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "A criar a pasta `%s'"
 
-#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
+#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
 msgid "Create folder"
 msgstr "Criar uma pasta"
 
-#: mail/em-folder-tree.c:2474
+#: mail/em-folder-tree.c:2463
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Renomear a pasta \"%s\" para:"
 
-#: mail/em-folder-tree.c:2476
+#: mail/em-folder-tree.c:2465
 msgid "Rename Folder"
 msgstr "Renomear a Pasta"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Ver"
 
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2537
 msgid "Open in _New Window"
 msgstr "Abrir numa _Nova Janela"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2555
+#: mail/em-folder-tree.c:2546
 msgid "_New Folder..."
 msgstr "_Nova Pasta..."
 
-#: mail/em-folder-tree.c:2558
+#: mail/em-folder-tree.c:2549
 msgid "_Rename"
 msgstr "_Renomear"
 
-#: mail/em-folder-tree.c:2561 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Propriedades..."
 
 #: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:889
+#: mail/mail-vfolder.c:888
 msgid "VFolders"
 msgstr "VPastas"
 
@@ -13197,19 +12728,19 @@ msgstr "SEMEQUIVALÊNCIA"
 msgid "Inbox"
 msgstr "Caixa de Entrada"
 
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
 msgid "Loading..."
 msgstr "A Ler..."
 
 #: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
 #: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
 #: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:551
+#: mail/mail-component.c:554
 msgid "Mail"
 msgstr "Email"
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Editar como uma Nova Mensagem..."
@@ -13222,17 +12753,17 @@ msgstr "_Imprimir"
 msgid "_Reply to Sender"
 msgstr "_Responder ao Remetente"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:810
+#: mail/em-folder-view.c:901 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Responder para a _Lista"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:811
+#: mail/em-folder-view.c:902 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Responder _a Todos"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: mail/em-folder-view.c:903 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "R_eencaminhar"
@@ -13285,6 +12816,10 @@ msgstr "Mo_ver para a Pasta..."
 msgid "_Copy to Folder..."
 msgstr "_Copiar para a Pasta..."
 
+#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Etiqueta"
+
 #: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Adicionar o Remetente ao Li_vro de Endereços"
@@ -13334,12 +12869,12 @@ msgid "Filter on _Mailing List"
 msgstr "Filtrar baseado na _Lista de Distribuição"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
-#: mail/mail-config.glade.h:66
+#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Por Omissão"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1796
 msgid "Print Message"
 msgstr "Imprimir a Mensagem"
 
@@ -13378,12 +12913,18 @@ msgstr "Cc"
 msgid "Bcc"
 msgstr "Bcc"
 
+#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
+#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Assunto"
+
 #: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
 #: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Data"
 
-#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
+#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
 msgid "Newsgroups"
 msgstr "Grupo de notícias"
 
@@ -13580,7 +13121,7 @@ msgstr ""
 "muito difícil que um terceiro conseguisse visualizar o seu conteúdo dentro "
 "de um período de tempo útil."
 
-#: mail/em-format-html-display.c:757
+#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
 msgid "_View Certificate"
 msgstr "_Visualizar o Certificado"
 
@@ -13633,7 +13174,7 @@ msgstr "Uma vez por semana"
 msgid "Once per month"
 msgstr "Uma vez por mês"
 
-#: mail/em-migrate.c:1072
+#: mail/em-migrate.c:1168
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13645,48 +13186,48 @@ msgstr ""
 "\n"
 "Aguarde enquanto o Evolution migra as suas pastas..."
 
-#: mail/em-migrate.c:1506
+#: mail/em-migrate.c:1602
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Incapaz de criar a nova pasta `%s': %s"
 
-#: mail/em-migrate.c:1532
+#: mail/em-migrate.c:1628
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Incapaz de copiar a pasta `%s' para `%s': %s"
 
-#: mail/em-migrate.c:1715
+#: mail/em-migrate.c:1811
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Incapaz de analisar caixas de correio existentes em `%s': %s"
 
-#: mail/em-migrate.c:1919
+#: mail/em-migrate.c:2015
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Incapaz de abir dados antigos POP manter-no-servidor `%s': %s"
 
-#: mail/em-migrate.c:1933
+#: mail/em-migrate.c:2029
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr ""
 "Incapaz de criar o directório de dados POP3 manter-no-servidor `%s': %s"
 
-#: mail/em-migrate.c:1962
+#: mail/em-migrate.c:2058
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "Incapaz de copiar os dados POP3 manter-no-servidor `%s': %s"
 
-#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#: mail/em-migrate.c:2413 mail/em-migrate.c:2425
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Falha ao criar o armazenamento local de mensagens `%s': %s"
 
-#: mail/em-migrate.c:2480
+#: mail/em-migrate.c:2576
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Incapaz de criar as pastas locais de mensagens em `%s': %s"
 
-#: mail/em-migrate.c:2498
+#: mail/em-migrate.c:2594
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -13694,36 +13235,36 @@ msgstr ""
 "Incapaz de ler as definições da instalação anterior do Evolution, `evolution/"
 "config.xmldb' não existe ou está corrompido."
 
-#: mail/em-popup.c:699
+#: mail/em-popup.c:700
 msgid "Save As..."
 msgstr "Gravar Como..."
 
-#: mail/em-popup.c:717
+#: mail/em-popup.c:718
 #, c-format
 msgid "untitled_image.%s"
 msgstr "imagem_sem_titulo.%s"
 
-#: mail/em-popup.c:807
+#: mail/em-popup.c:808
 msgid "Set as _Background"
 msgstr "Definir como _Fundo"
 
-#: mail/em-popup.c:809
+#: mail/em-popup.c:810
 msgid "_Reply to sender"
 msgstr "_Responder ao remetente"
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:859
 msgid "_Open Link in Browser"
 msgstr "Abrir o Link no _Navegador"
 
-#: mail/em-popup.c:859
+#: mail/em-popup.c:860
 msgid "Se_nd message to..."
 msgstr "Enviar a _mensagem para..."
 
-#: mail/em-popup.c:860
+#: mail/em-popup.c:861
 msgid "_Add to Addressbook"
 msgstr "_Adicionar ao Livro de Endereços"
 
-#: mail/em-popup.c:966
+#: mail/em-popup.c:967
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir em %s..."
@@ -14314,7 +13855,7 @@ msgstr "Controlo de preferências de Email Evolution"
 msgid "Mail Accounts"
 msgstr "Contas de Email"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
 msgid "Mail Preferences"
 msgstr "Preferências do Email"
 
@@ -14328,15 +13869,15 @@ msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution está a importar as suas mensagens Elm antigas"
 
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:226
+#: mail/importers/evolution-mbox-importer.c:221
+#: mail/importers/evolution-outlook-importer.c:255
 #: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "A Importar..."
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:222
-#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/evolution-mbox-importer.c:223
+#: mail/importers/evolution-outlook-importer.c:257
 #: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Aguarde por favor"
@@ -14358,21 +13899,23 @@ msgid "Elm"
 msgstr "Elm"
 
 #: mail/importers/evolution-mbox-importer.c:116
+#: mail/importers/evolution-outlook-importer.c:130
 msgid "Destination folder:"
 msgstr "Pasta de destino:"
 
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder to import into"
 msgstr "Seleccionar a pasta para onde importar"
 
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:254
 #: mail/importers/mail-importer.c:226
 #, c-format
 msgid "Importing `%s'"
 msgstr "A Importar `%s'"
 
-#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/evolution-outlook-importer.c:301
 #: mail/importers/mail-importer.c:140
 msgid "Importing mailbox"
 msgstr "A Importar caixa de correio"
@@ -14538,15 +14081,15 @@ msgstr ""
 msgid "%s License Agreement"
 msgstr "Acordo de Licença de %s"
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
 msgid "_Host:"
 msgstr "_Servidor:"
 
-#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
 msgid "User_name:"
 msgstr "_Nome de utilizador:"
 
-#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
 msgid "_Path:"
 msgstr "_Caminho"
 
@@ -14609,31 +14152,31 @@ msgstr "%d total"
 msgid ", %d unread"
 msgstr ", %d por enviar"
 
-#: mail/mail-component.c:653
+#: mail/mail-component.c:656
 msgid "New Mail Message"
 msgstr "Nova Mensagem de Email"
 
-#: mail/mail-component.c:654
+#: mail/mail-component.c:657
 msgid "_Mail Message"
 msgstr "_Mensagem de Email"
 
-#: mail/mail-component.c:655
+#: mail/mail-component.c:658
 msgid "Compose a new mail message"
 msgstr "Compor uma nova mensagem de email"
 
-#: mail/mail-component.c:661
+#: mail/mail-component.c:664
 msgid "New Mail Folder"
 msgstr "Nova Pasta de Mensagens"
 
-#: mail/mail-component.c:662
+#: mail/mail-component.c:665
 msgid "Mail _Folder"
 msgstr "_Pasta de Mensagens"
 
-#: mail/mail-component.c:663
+#: mail/mail-component.c:666
 msgid "Create a new mail folder"
 msgstr "Criar uma nova pasta de mensagens"
 
-#: mail/mail-component.c:795
+#: mail/mail-component.c:798
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Falha ao actualizar as definições ou pastas de Mensagens."
 
@@ -14645,7 +14188,7 @@ msgstr "A Verificar o Serviço"
 msgid "Connecting to server..."
 msgstr "A estabelecer uma ligação ao servidor..."
 
-#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Identidade"
 
@@ -14660,7 +14203,7 @@ msgstr ""
 "informação nas mensagens que enviar."
 
 #: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid "Receiving Mail"
 msgstr "A Receber Mensagens"
 
@@ -14677,7 +14220,7 @@ msgstr ""
 msgid "Please select among the following options"
 msgstr "Seleccione de entre as seguintes opções"
 
-#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr "A Enviar Mensagens"
 
@@ -14690,7 +14233,7 @@ msgstr ""
 "certeza, pergunte ao seu administrador de sistemas ou Fornecedor de Serviço "
 "de Internet."
 
-#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37
 msgid "Account Management"
 msgstr "Gestão de Contas"
 
@@ -14708,227 +14251,232 @@ msgstr ""
 "Introduza no espaço abaixo um nome para esta conta. Este nome apenas será "
 "utilizado para fins de visualização."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:2
 msgid " Ch_eck for Supported Types "
 msgstr " Verifi_car os Tipos Suportados "
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
 msgid "<b>Preview</b>"
 msgstr "<b>Antever</b>"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "<b>SSL não é suportado nesta compilação do evolution</b>"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "<b>S_ignatures</b>"
 msgstr "<b>Ass_inaturas</b>"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "<b>_Languages</b>"
 msgstr "<b>Idio_mas</b>"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
+msgid "<small>This will make the the filter more reliable, but slower</small>"
+msgstr ""
+
+#: mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">Informação de Conta</span>"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">Alertas</span>"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr "<span weight=\"bold\">Tipo de Autenticação</span>"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">Autenticação</span>"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Checking for New Mail</span>"
 msgstr "<span weight=\"bold\">A Verificar por Novas Mensagens</span>"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr "<span weight=\"bold\">A Compor Mensagens</span>"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">Configuração</span>"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr "<span weight=\"bold\">Comportamento por Omissão</span>"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr "<span weight=\"bold\">Apagar Mensagens</span>"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr "<span weight=\"bold\">Apresentar os Cabeçal_hos das Mensagens</span>"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr "<span weight=\"bold\">Opções de Filtro</span>"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">Geral</span>"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr "<span weight=\"bold\">Etiquetas e Cores</span>"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr "<span weight=\"bold\">A Ler as Imagens</span>"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "<span weight=\"bold\">Apresentação da Mensagem</span>"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr "<span weight=\"bold\">Fontes da Mensagem</span>"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "<span weight=\"bold\">Notificação de Nova Mensagem</span>"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr "<span weight=\"bold\">Informação Opcional</span>"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<span weight=\"bold\">Opções</span>"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">Fontes Impressas</span>"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">Informação Requerida</span>"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">MIME Seguro (S/MIME)</span>"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">Segurança</span>"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">Mensagens Enviadas e Rascunhos</span>"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:34
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">Configuração do Servidor</span>"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:35
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "_Encriptar também para o próprio ao enviar mensagens encriptadas"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:36
 msgid "Account Editor"
 msgstr "Editor de Contas"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:38
 msgid "Add Ne_w Signature..."
 msgstr "A_dicionar uma Nova Assinatura..."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "Add _Script"
 msgstr "Adicionar um _Script"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:40
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "Encriptar se_mpre para o próprio ao enviar mensagens encriptadas"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Enviar _sempre cópia (cc) para:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Enviar sempre cópia _escondida (bcc) para:"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:44
 msgid "Always _sign outgoing messages when using this account"
 msgstr "_Assinar sempre as mensagens enviadas ao utilizar esta conta"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Confiar sempre nas chaves do meu chaveiro ao encrip_tar"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Attach original message"
 msgstr "Anexar a mensagem original"
 
-#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Anexo"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:48
 msgid "Automatically _insert smiley images"
 msgstr "_Inserir automaticamente imagens de risonhos"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Automatically check for _new mail every"
 msgstr "Verificar automaticamente se existem _novas mensagens a cada"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "Baltic (ISO-8859-13)"
 msgstr "Báltico (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Baltic (ISO-8859-4)"
 msgstr "Báltico (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Beep w_hen new mail arrives"
 msgstr "Emitir _beep ao chegarem novas mensagens"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "C_haracter set:"
 msgstr "Con_junto de caracteres:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 msgid "Ch_eck for Supported Types "
 msgstr " Verifi_car Tipos Suportados "
 
-#: mail/mail-config.glade.h:53
-msgid "Check _Incoming Mail"
-msgstr "A Verificar as Mensagens _Recebidas"
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Check _incoming mail for junk"
+msgstr "Verificar se mensagens recebidas são não solicitadas"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Check spelling while I _type"
 msgstr "Verificar a ortografia _enquando escrevo"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Verificar nas mensagens recebidas se são Não Solicitadas"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 msgid "Color for _misspelled words:"
 msgstr "Cor para as palavras _incorrectas:"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 msgid "Colors"
 msgstr "Cores"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 msgid "Confirm _when expunging a folder"
 msgstr "Confirmar ao e_xpurgar uma pasta"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14944,239 +14492,244 @@ msgstr ""
 "\n"
 "Prima \"Aplicar\" para gravar as suas configurações."
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
 msgid "De_fault"
 msgstr "_Omissão"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 msgid "Default character e_ncoding:"
 msgstr "Codificação de caract_eres por omissão:"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 msgid "Defaults"
 msgstr "Omissões"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 msgid "Do not quote original message"
 msgstr "Não citar a mensagem original"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 "Não assinar os pedidos de reunião (para co_mpatibilidade com o Outlook)"
 
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Terminado"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
 msgid "Drafts _Folder:"
 msgstr "_Pasta de Rascunhos:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:77
 msgid "Email Accounts"
 msgstr "Contas de Email"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 msgid "Email _Address:"
 msgstr "Endereço de Em_ail:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:79
 msgid "Empty trash folders on e_xit"
 msgstr "Esva_ziar as pastas de lixo ao sair"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
 msgid "Encry_ption certificate:"
 msgstr "Certificado de encri_ptação:"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:81
 msgid "Evolution Account Assistant"
 msgstr "Assistente de Contas Evolution"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:82
 msgid "Execute Command..."
 msgstr "Executar um Comando..."
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:83
 msgid "Fi_xed-width:"
 msgstr "Largura fi_xa:"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 msgid "Font Properties"
 msgstr "Propriedades da Fonte"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 msgid "Format messages in _HTML"
 msgstr "Formatar mensagens em _HTML"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:87
 msgid "HTML Mail"
 msgstr "Correio HTML"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:88
 msgid "Headers"
 msgstr "Cabeçalhos"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr "_Realçar as citações com"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
 #: mail/mail-config.glade.h:91
+#, fuzzy
+msgid "I_nclude remote tests"
+msgstr "Incluir árvores"
+
+#: mail/mail-config.glade.h:94
 msgid "Inline"
 msgstr "Imbutido"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Mail Configuration"
 msgstr "Configuração de Email"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "Localização da caixa de correio"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr "Compositor de Mensagens"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 "Nota: não lhe será pedida nenhuma senha até que se ligue pela primeira vez"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Or_ganization:"
 msgstr "Or_ganização:"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "PGP/GPG _Key ID:"
 msgstr "ID de C_have PGP/GPG:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Play sound file when new mail arri_ves"
 msgstr "_Reproduzir um ficheiro de som ao chegarem novas mensagens"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Avisar _quando enviar mensagens apenas com destinatários em Bcc"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Qmail maildir "
 msgstr "Directório de email Qmail "
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr "Citar a mensagem original"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr "Citada"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 msgid "Re_member password"
 msgstr "Recordar a sen_ha"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr "Res_ponder-A:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "A Receber Mensagens"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:120
 msgid "Receiving Options"
 msgstr "Opções de Recepção"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
 msgid "Remember _password"
 msgstr "Recordar a sen_ha"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
 msgid "S_tandard Font:"
 msgstr "Fonte S_tandard:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 msgid "Security"
 msgstr "Segurança"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font"
 msgstr "Seleccionar a fonte HTML de largura fixa"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:126
 msgid "Select HTML fixed width font for printing"
 msgstr "Seleccionar a fonte HTML de largura fixa para impressão"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:127
 msgid "Select HTML variable width font"
 msgstr "Seleccionar a fonte HTML de largura variável"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:128
 msgid "Select HTML variable width font for printing"
 msgstr "Seleccionar a fonte HTML de largura variável para impressão"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:129
 msgid "Select..."
 msgstr "Seleccionar..."
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "A Enviar Mensagens"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:133
 msgid "Sent _Messages Folder:"
 msgstr "Pasta de _Mensagens Enviadas:"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:134
 msgid "Ser_ver requires authentication"
 msgstr "Ser_vidor requer autenticação"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:135
 msgid "Server _Type: "
 msgstr "_Tipo de Servidor: "
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:136
 msgid "Si_gning certificate:"
 msgstr "Cert_ificado de assinatura:"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:137
 msgid "Signat_ure:"
 msgstr "Assinat_ura:"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:138
 msgid "Signatures"
 msgstr "Assinaturas"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr "Especificar um nome de _ficheiro:"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:140
 msgid "Spell Checking"
 msgstr "Verificar a _Ortografia"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:141
 msgid "Standard Unix mbox"
 msgstr "mbox standard Unix"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:142
 msgid "T_erminal Font:"
 msgstr "Fonte de _Consola:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:143
 msgid "T_ype: "
 msgstr "T_ipo: "
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -15186,7 +14739,7 @@ msgstr ""
 "sua assinatura. O nome que especificar será utilizado\n"
 "apenas para visualização. "
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
@@ -15196,7 +14749,7 @@ msgstr ""
 "ortográfica e idioma. A listagem de idiomas reflecte apenas aqueles para os "
 "quais possui um dicionário instalado."
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:149
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -15204,15 +14757,11 @@ msgstr ""
 "Indique o nome pelo qual deseja referir-se a esta conta.\n"
 "Por exemplo: \"Trabalho\" ou \"Pessoal\""
 
-#: mail/mail-config.glade.h:148
-msgid "Use _Daemon"
-msgstr "Utilizar _Daemon"
-
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:152
 msgid "V_ariable-width:"
 msgstr "Largura v_ariável:"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:153
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -15222,87 +14771,83 @@ msgstr ""
 "\n"
 "Prima \"Avançar\" para começar. "
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:158
 msgid "_Add Signature"
 msgstr "_Adicionar Assinatura"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:159
 msgid "_Always load images from the Internet"
 msgstr "_Ler sempre as imagens da Internet"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:160
 msgid "_Digitally sign outgoing messages (by default)"
 msgstr "_Assinar digitalmente as mensagens enviadas (por omissão)"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:161
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Não me notificar ao receber novas mensagens"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:163
 msgid "_Enable"
 msgstr "_Activar"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 msgid "_Encrypt outgoing messages (by default)"
 msgstr "_Encriptar as mensagens enviadas (por omissão)"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:165
 msgid "_Forward style:"
 msgstr "_Estilo de reencaminhamento:"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:168
 msgid "_Load images if sender is in address book"
 msgstr "_Ler as imagens se o remetente constar do livro de endereços"
 
-#: mail/mail-config.glade.h:167
-msgid "_Local Tests Only"
-msgstr "Apenas os Testes _Locais"
-
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Make this my default account"
 msgstr "_Tornar esta na minha conta por omissão"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_Mark messages as read after"
 msgstr "_Marcar as mensagens como lidas após"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 msgid "_Never load images from the Internet"
 msgstr "_Nunca ler as imagens da Internet"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "_Avisar ao enviar mensagens HTML para contactos que as não desejam"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:175
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Avisar ao enviar mensagens sem linha de assunto definida"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:176
 msgid "_Reply style:"
 msgstr "Estilo de _resposta:"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:177
 msgid "_Script:"
 msgstr "_Script:"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:178
 msgid "_Show animated images"
 msgstr "Apre_sentar as imagens animadas"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 msgid "_Use Secure Connection (SSL):"
 msgstr "_Utilizar uma Ligação Segura (SSL):"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "_Use the same fonts as other applications"
 msgstr "_Utilizar a mesma fonte que as outras aplicações"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:181
 msgid "color"
 msgstr "cor"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "descrição"
 
@@ -15489,7 +15034,8 @@ msgstr ""
 
 #. mail:camel-exception primary
 #: mail/mail-errors.xml.h:57
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+#, fuzzy
+msgid "Your message with the subject \"{0}\" was not delivered."
 msgstr "A sua mensagem, com o assunto \"{0}\" não foi entregue."
 
 #. mail:camel-exception secondary
@@ -15548,11 +15094,6 @@ msgstr "Erro ao ler as definições de filtro."
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Incapaz de gravar no directório \"{0}\""
 
-#. mail:no-save-path secondary
-#: mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr "{1}"
-
 #. mail:no-create-path primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
@@ -15569,12 +15110,6 @@ msgstr "Incapaz de criar o directório de gravação devido a \"{1}\""
 msgid "Cannot create temporary save directory."
 msgstr "Incapaz de criar o directório temporário de gravação."
 
-#. mail:no-create-tmp-path secondary
-#: mail/mail-errors.xml.h:100 mail/mail-errors.xml.h:112
-#: widgets/misc/e-system-errors.xml.h:11 widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr "Devido a \"{1}\"."
-
 #. mail:no-write-path-exists secondary
 #: mail/mail-errors.xml.h:104
 msgid "File exists but cannot overwrite it."
@@ -15834,29 +15369,25 @@ msgstr "_Sobrepor"
 msgid "_Append"
 msgstr "_Acrescentar"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:785
 #, c-format
 msgid "Pinging %s"
 msgstr "A pingar %s"
 
-#: mail/mail-mt.c:897
-msgid "Working"
-msgstr "A Trabalhar"
-
-#: mail/mail-ops.c:99
+#: mail/mail-ops.c:98
 msgid "Filtering Folder"
 msgstr "A Filtrar a Pasta"
 
-#: mail/mail-ops.c:260
+#: mail/mail-ops.c:259
 msgid "Fetching Mail"
 msgstr "A Obter as Mensagens"
 
-#: mail/mail-ops.c:543
+#: mail/mail-ops.c:542
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Falha ao aplicar os filtros de envio: %s"
 
-#: mail/mail-ops.c:568
+#: mail/mail-ops.c:567
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -15865,115 +15396,115 @@ msgstr ""
 "Falha ao acrescentar a %s: %s\n"
 "Acrescentado à pasta `Enviadas'."
 
-#: mail/mail-ops.c:577
+#: mail/mail-ops.c:576
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Falha ao acrescentar à pasta local `Enviadas': %s"
 
-#: mail/mail-ops.c:673
+#: mail/mail-ops.c:672
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "A enviar a mensagem %d de %d"
 
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:703
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Falha ao enviar %d de %d mensagens."
 
-#: mail/mail-ops.c:708
+#: mail/mail-ops.c:707
 msgid "Complete."
 msgstr "Terminado."
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:804
 msgid "Saving message to folder"
 msgstr "A gravar a mensagem na pasta"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Moving messages to %s"
 msgstr "A mover as mensagens para %s"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Copying messages to %s"
 msgstr "A copiar as mensagens para %s"
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:1002
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "A analisar as pastas em \"%s\""
 
-#: mail/mail-ops.c:1116
+#: mail/mail-ops.c:1115
 msgid "Forwarded messages"
 msgstr "Mensagens reencaminhadas"
 
-#: mail/mail-ops.c:1159
+#: mail/mail-ops.c:1158
 #, c-format
 msgid "Opening folder %s"
 msgstr "A abrir a pasta %s"
 
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1230
 #, c-format
 msgid "Opening store %s"
 msgstr "A abrir o armazenamento %s"
 
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1308
 #, c-format
 msgid "Removing folder %s"
 msgstr "A remover a pasta %s"
 
-#: mail/mail-ops.c:1403
+#: mail/mail-ops.c:1402
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "A armazenar a pasta '%s'"
 
-#: mail/mail-ops.c:1468
+#: mail/mail-ops.c:1467
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "A expurgar e armazenar a conta '%s'"
 
-#: mail/mail-ops.c:1469
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Storing account '%s'"
 msgstr "A armazenar a conta '%s'"
 
-#: mail/mail-ops.c:1524
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr "A actualizar a pasta"
 
-#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
+#: mail/mail-ops.c:1559 mail/mail-ops.c:1610
 msgid "Expunging folder"
 msgstr "A expurgar a pasta"
 
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1607
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "A esvaziar o lixo em '%s'"
 
-#: mail/mail-ops.c:1609
+#: mail/mail-ops.c:1608
 msgid "Local Folders"
 msgstr "Pastas Locais"
 
-#: mail/mail-ops.c:1692
+#: mail/mail-ops.c:1691
 #, c-format
 msgid "Retrieving message %s"
 msgstr "A obter a mensagem %s"
 
-#: mail/mail-ops.c:1764
+#: mail/mail-ops.c:1763
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "A obter %d mensagem"
 msgstr[1] "A obter %d mensagens"
 
-#: mail/mail-ops.c:1850
+#: mail/mail-ops.c:1849
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "A gravar %d mensagem"
 msgstr[1] "A gravar %d mensagens"
 
-#: mail/mail-ops.c:1900
+#: mail/mail-ops.c:1899
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15982,7 +15513,7 @@ msgstr ""
 "Incapaz de criar o ficheiro de resultado: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1928
+#: mail/mail-ops.c:1927
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15991,11 +15522,11 @@ msgstr ""
 "Erro ao gravar as mensagens em: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1999
+#: mail/mail-ops.c:1998
 msgid "Saving attachment"
 msgstr "A gravar o anexo"
 
-#: mail/mail-ops.c:2016
+#: mail/mail-ops.c:2015
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -16004,17 +15535,17 @@ msgstr ""
 "Incapaz de criar o ficheiro de resultado: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2046
+#: mail/mail-ops.c:2045
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Incapaz de escrever dados: %s"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "A desligar-se de %s"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "A estabelecer nova ligação a %s"
@@ -16078,24 +15609,24 @@ msgstr "A Actualizar..."
 msgid "Waiting..."
 msgstr "A Aguardar..."
 
-#: mail/mail-session.c:238
+#: mail/mail-session.c:239
 msgid "User canceled operation."
 msgstr "Utilizador cancelou a operação."
 
-#: mail/mail-session.c:271
+#: mail/mail-session.c:272
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Introduza a Senha para %s"
 
-#: mail/mail-session.c:273
+#: mail/mail-session.c:274
 msgid "Enter Password"
 msgstr "Introduza a Senha"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password"
 msgstr "_Recordar esta senha"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:298
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Recordar esta senha durante o resto desta sessão"
 
@@ -16150,79 +15681,79 @@ msgstr "A actualizar as vpastas para o uri: %s"
 msgid "Updating vFolders for '%s'"
 msgstr "A actualizar as vpastas para o uri: %s"
 
-#: mail/mail-vfolder.c:959
+#: mail/mail-vfolder.c:958
 msgid "vFolders"
 msgstr "vPastas"
 
-#: mail/mail-vfolder.c:998
+#: mail/mail-vfolder.c:997
 msgid "Edit VFolder"
 msgstr "Editar a VPasta"
 
-#: mail/mail-vfolder.c:1082
+#: mail/mail-vfolder.c:1081
 msgid "New VFolder"
 msgstr "Nova VPasta"
 
-#: mail/message-list.c:946
+#: mail/message-list.c:948
 msgid "Unseen"
 msgstr "Por Ler"
 
-#: mail/message-list.c:947
+#: mail/message-list.c:949
 msgid "Seen"
 msgstr "Lida"
 
-#: mail/message-list.c:948
+#: mail/message-list.c:950
 msgid "Answered"
 msgstr "Respondida"
 
-#: mail/message-list.c:949
+#: mail/message-list.c:951
 msgid "Multiple Unseen Messages"
 msgstr "Múltiplas Mensagens Por Ler"
 
-#: mail/message-list.c:950
+#: mail/message-list.c:952
 msgid "Multiple Messages"
 msgstr "Múltiplas Mensagens"
 
-#: mail/message-list.c:954
+#: mail/message-list.c:956
 msgid "Lowest"
 msgstr "Mais Baixo"
 
-#: mail/message-list.c:955
+#: mail/message-list.c:957
 msgid "Lower"
 msgstr "Baixo"
 
-#: mail/message-list.c:959
+#: mail/message-list.c:961
 msgid "Higher"
 msgstr "Alto"
 
-#: mail/message-list.c:960
+#: mail/message-list.c:962
 msgid "Highest"
 msgstr "Mais Alto"
 
-#: mail/message-list.c:1279
+#: mail/message-list.c:1285
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1286
+#: mail/message-list.c:1292
 msgid "Today %l:%M %p"
 msgstr "Hoje %l:%M %p"
 
-#: mail/message-list.c:1295
+#: mail/message-list.c:1301
 msgid "Yesterday %l:%M %p"
 msgstr "Ontem %l:%M %p"
 
-#: mail/message-list.c:1307
+#: mail/message-list.c:1313
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1315
+#: mail/message-list.c:1321
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1317
+#: mail/message-list.c:1323
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3300
+#: mail/message-list.c:3321
 msgid "Generating message list"
 msgstr "A gerar a lista de mensagens"
 
@@ -16278,6 +15809,10 @@ msgstr "Reencaminhar"
 msgid "No Response Necessary"
 msgstr "Nenhuma Resposta Necessária"
 
+#: mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Ler"
+
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Responder"
@@ -16381,43 +15916,47 @@ msgstr ""
 "serem acedidas em modo desligado"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid "Toolbar is visible"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Whether Evolution should start up in offline mode"
 msgstr "Se o Evolution deverá iniciar-se ou não em modo desligado"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Whether the toolbar should be visible."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
 msgid "Whether to skip the development warning dialog"
 msgstr "Se saltar ou não o diálogo de aviso de versão de desenvolvimento"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
+#: shell/apps_evolution_shell.schemas.in.in.h:14
 msgid "mail"
 msgstr "email"
 
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
-msgstr "Trazido até si por"
-
-#: shell/e-shell.c:545 shell/e-shell.c:546
+#: shell/e-shell.c:588 shell/e-shell.c:589
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: shell/e-shell.c:744
+#: shell/e-shell.c:786
 msgid "Uknown system error."
 msgstr "Erro de sistema desconhecido."
 
-#: shell/e-shell.c:1101
+#: shell/e-shell.c:1143
 msgid "Invalid arguments"
 msgstr "Argumentos inválidos"
 
-#: shell/e-shell.c:1103
+#: shell/e-shell.c:1145
 msgid "Cannot register on OAF"
 msgstr "Incapaz de se registar no OAF"
 
-#: shell/e-shell.c:1105
+#: shell/e-shell.c:1147
 msgid "Configuration Database not found"
 msgstr "Base de Dados de Configuração não foi encontrada"
 
-#: shell/e-shell.c:1107
+#: shell/e-shell.c:1149
 msgid "Generic error"
 msgstr "Erro genérico"
 
@@ -16476,7 +16015,7 @@ msgstr ""
 msgid "Select importer"
 msgstr "Seleccionar o importador"
 
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1026
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
 #, c-format
 msgid "File %s does not exist"
 msgstr "Ficheiro %s não existe"
@@ -16504,31 +16043,32 @@ msgstr ""
 "A importar %s\n"
 "A importar o item 1."
 
-#: shell/e-shell-importer.c:549
+#: shell/e-shell-importer.c:570
 msgid "Automatic"
 msgstr "Automático"
 
-#: shell/e-shell-importer.c:598
-msgid "_Filename:"
-msgstr "Nome do _ficheiro:"
+#: shell/e-shell-importer.c:626
+#, fuzzy
+msgid "F_ilename:"
+msgstr "Nome do ficheiro:"
 
-#: shell/e-shell-importer.c:603
+#: shell/e-shell-importer.c:631
 msgid "Select a file"
 msgstr "Seleccione um ficheiro"
 
-#: shell/e-shell-importer.c:613
+#: shell/e-shell-importer.c:642
 msgid "File _type:"
 msgstr "_Tipo de ficheiro:"
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:681
 msgid "Import data and settings from _older programs"
 msgstr "Importar dados e configurações de aplicações _antigas"
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:684
 msgid "Import a _single file"
 msgstr "Importar _um único ficheiro"
 
-#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -16536,25 +16076,25 @@ msgstr ""
 "Aguarde...\n"
 "A procurar por configurações existentes"
 
-#: shell/e-shell-importer.c:727
+#: shell/e-shell-importer.c:756
 msgid "Starting Intelligent Importers"
 msgstr "A Iniciar os Importadores Inteligentes"
 
-#: shell/e-shell-importer.c:853 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
 #, c-format
 msgid "From %s:"
 msgstr "De %s:"
 
-#: shell/e-shell-importer.c:1044
+#: shell/e-shell-importer.c:1073
 #, c-format
 msgid "No importer available for file %s"
 msgstr "Nenhum importador disponível para o ficheiro %s"
 
-#: shell/e-shell-importer.c:1056
+#: shell/e-shell-importer.c:1085
 msgid "Unable to execute importer"
 msgstr "Incapaz de executar o importador"
 
-#: shell/e-shell-importer.c:1169
+#: shell/e-shell-importer.c:1199
 msgid "_Import"
 msgstr "_Importar"
 
@@ -16604,58 +16144,59 @@ msgstr "Nome de pasta não pode conter o caracter \"#\"."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' e '..' são nomes de pastas reservados."
 
-#: shell/e-shell-window.c:336
+#: shell/e-shell-window.c:337
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Evolution de momento está ligado.  Clique neste botão para trabalhar "
 "desligado."
 
-#: shell/e-shell-window.c:343
+#: shell/e-shell-window.c:344
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution está no processo de se desligar."
 
-#: shell/e-shell-window.c:349
+#: shell/e-shell-window.c:350
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Evolution de momento está desligado.  Clique neste botão para trabalhar "
 "ligado."
 
-#: shell/e-shell-window.c:621
+#: shell/e-shell-window.c:637
 #, fuzzy, c-format
 msgid "Switch to %s"
 msgstr "Mensagem para %s"
 
-#: shell/e-shell-window-commands.c:64
+#: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 "Parece que as ferramentas GNOME Pilot não estão instaladas neste sistema."
 
-#: shell/e-shell-window-commands.c:72
+#: shell/e-shell-window-commands.c:74
 #, c-format
 msgid "Error executing %s."
 msgstr "Erro ao executar %s."
 
-#: shell/e-shell-window-commands.c:121
+#: shell/e-shell-window-commands.c:123
 msgid "Bug buddy is not installed."
 msgstr "Bub buddy não está instalado."
 
-#: shell/e-shell-window-commands.c:129
+#: shell/e-shell-window-commands.c:131
 msgid "Bug buddy could not be run."
 msgstr "Incapaz de executar o Bub buddy."
 
-#: shell/e-shell-window-commands.c:171
-msgid "About Evolution"
-msgstr "Sobre o Evolution"
+#: shell/e-shell-window-commands.c:323
+#, fuzzy
+msgid "Groupware Suite"
+msgstr "Groupwise"
 
-#: shell/e-shell-window-commands.c:382
+#: shell/e-shell-window-commands.c:563
 msgid "_Work Online"
 msgstr "Trabalhar _Ligado"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "Trabalhar _Desligado"
 
-#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Trabalhar Desligado"
 
@@ -16667,43 +16208,6 @@ msgstr "Caixa de Selecção"
 msgid "New"
 msgstr "Novo"
 
-#: shell/evolution-shell-component-utils.c:115
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Erro desconhecido."
-
-#: shell/evolution-shell-component-utils.c:118
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"O erro do componente de sistema é:\n"
-"%s"
-
-#: shell/evolution-shell-component-utils.c:125
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"O erro do sistema de activação é:\n"
-"%s"
-
 #: shell/evolution-test-component.c:140
 msgid "New Test"
 msgstr "Novo Teste"
@@ -17041,30 +16545,30 @@ msgid ""
 "Click help for details."
 msgstr ""
 
-#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:522
+#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
+#: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
 msgstr "Seleccionar um certificado a importar..."
 
-#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:604
+#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
+#: smime/gui/certificate-manager.c:638
 msgid "Certificate Name"
 msgstr "Nome do Certificado"
 
-#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
+#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
 msgid "Purposes"
 msgstr "Propósitos"
 
-#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:517
+#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr "Número de Série"
 
-#: smime/gui/certificate-manager.c:267
+#: smime/gui/certificate-manager.c:271
 msgid "Expires"
 msgstr "Expira"
 
-#: smime/gui/certificate-manager.c:417
+#: smime/gui/certificate-manager.c:446
 msgid "E-Mail Address"
 msgstr "Endereço de Email"
 
@@ -17106,6 +16610,11 @@ msgstr ""
 "Emitido por:\n"
 "  Assunto: %s\n"
 
+#: smime/gui/e-cert-selector.c:169
+#, fuzzy
+msgid "Select certificate"
+msgstr "Certificado de Cliente SSL"
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr "<Não faz Parte do Certificado>"
@@ -17162,7 +16671,7 @@ msgstr ""
 "Antes de confiar nesta AC para qualquer propósito, deverá examinar o seu "
 "certificado, regras e procedimentos (se disponíveis)."
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
 msgid "Certificate"
 msgstr "Certificado"
 
@@ -17182,19 +16691,23 @@ msgstr "Nome Comum (NC)"
 msgid "Contact Certificates"
 msgstr "Contactos Certificados"
 
-#: smime/gui/smime-ui.glade.h:21
-#, no-c-format
-msgid "Do you want to trust \"%s\" for the following purposes?"
-msgstr "Deseja confiar em \"%s\" para os seguintes propósitos?"
+#: smime/gui/smime-ui.glade.h:20
+msgid "Do not trust the authenticity of this certificate"
+msgstr ""
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:21
 msgid "Dummy window only"
 msgstr "Apenas janela falsa"
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:22
 msgid "Edit"
 msgstr "Editar"
 
+#: smime/gui/smime-ui.glade.h:23
+#, fuzzy
+msgid "Email Certificate Trust Settings"
+msgstr "Autoridade de Certificação de Email"
+
 #: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr "Certificado de Destinatário da Mensagem"
@@ -17227,250 +16740,260 @@ msgstr "Unidade Organizacional (UO)"
 msgid "SHA1 Fingerprint"
 msgstr "Impressão Digital SHA1"
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr "Certificado de Cliente SSL"
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr "Certificado de Servidor SSL"
 
 #: smime/gui/smime-ui.glade.h:37
+msgid "Trust the authenticity of this certificate"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
 msgid "Trust this CA to identify email users."
 msgstr "Confiar nesta AC para identificar utilizadores de email."
 
-#: smime/gui/smime-ui.glade.h:38
+#: smime/gui/smime-ui.glade.h:39
 msgid "Trust this CA to identify software developers."
 msgstr "Confiar nesta AC para identificar programadores de aplicações."
 
-#: smime/gui/smime-ui.glade.h:39
+#: smime/gui/smime-ui.glade.h:40
 msgid "Trust this CA to identify web sites."
 msgstr "Confiar nesta AC para identificar páginas web."
 
-#: smime/gui/smime-ui.glade.h:40
+#: smime/gui/smime-ui.glade.h:41
 msgid "View"
 msgstr "Ver"
 
-#: smime/gui/smime-ui.glade.h:41
-msgid "View Certificate"
-msgstr "Ver o Certificado"
-
 #: smime/gui/smime-ui.glade.h:42
-msgid "You have been asked to trust a new Certificate Authority (CA)."
-msgstr ""
-"Foi-lhe pedido que confiasse numa nova Autoridade de Certificação (AC)."
-
-#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr "Possui certificados destas organizações, que o identificam:"
 
-#: smime/gui/smime-ui.glade.h:44
+#: smime/gui/smime-ui.glade.h:43
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 "Possui certificados em ficheiro que identificam estas autoridades de "
 "certificação:"
 
-#: smime/gui/smime-ui.glade.h:45
+#: smime/gui/smime-ui.glade.h:44
 msgid "You have certificates on file that identify these people:"
 msgstr "Possui certificados em ficheiro que identificam estas pessoas:"
 
-#: smime/gui/smime-ui.glade.h:46
+#: smime/gui/smime-ui.glade.h:45
 msgid "Your Certificates"
 msgstr "Os Seus Certificados"
 
-#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
+#: smime/gui/smime-ui.glade.h:46
+msgid "_Edit CA Trust"
+msgstr ""
+
+#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
-#: smime/lib/e-cert.c:478
+#. x509 certificate usage types
+#: smime/lib/e-cert.c:424
+#, fuzzy
+msgid "Sign"
+msgstr "Assinar"
+
+#: smime/lib/e-cert.c:425
+#, fuzzy
+msgid "Encrypt"
+msgstr "Encriptada"
+
+#: smime/lib/e-cert.c:530
 msgid "Version"
 msgstr "Versão"
 
-#: smime/lib/e-cert.c:493
+#: smime/lib/e-cert.c:545
 msgid "Version 1"
 msgstr "Versão 1"
 
-#: smime/lib/e-cert.c:496
+#: smime/lib/e-cert.c:548
 msgid "Version 2"
 msgstr "Versão 2"
 
-#: smime/lib/e-cert.c:499
+#: smime/lib/e-cert.c:551
 msgid "Version 3"
 msgstr "Versão 3"
 
-#: smime/lib/e-cert.c:581
+#: smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "MD2 PKCS nº1 Com Encriptação RSA"
 
-#: smime/lib/e-cert.c:584
+#: smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "MD5 PKCS nº1 Com Encriptação RSA"
 
-#: smime/lib/e-cert.c:587
+#: smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "SHA-1 PKCS nº1 Com Encriptação RSA"
 
-#: smime/lib/e-cert.c:590
+#: smime/lib/e-cert.c:642
 msgid "C"
 msgstr "C"
 
-#: smime/lib/e-cert.c:593
+#: smime/lib/e-cert.c:645
 msgid "CN"
 msgstr "NC"
 
-#: smime/lib/e-cert.c:596
+#: smime/lib/e-cert.c:648
 msgid "OU"
 msgstr "UO"
 
-#: smime/lib/e-cert.c:599
+#: smime/lib/e-cert.c:651
 msgid "O"
 msgstr "O"
 
-#: smime/lib/e-cert.c:602
+#: smime/lib/e-cert.c:654
 msgid "L"
 msgstr "L"
 
-#: smime/lib/e-cert.c:605
+#: smime/lib/e-cert.c:657
 msgid "DN"
 msgstr "ND"
 
-#: smime/lib/e-cert.c:608
+#: smime/lib/e-cert.c:660
 msgid "DC"
 msgstr "CD"
 
-#: smime/lib/e-cert.c:611
+#: smime/lib/e-cert.c:663
 msgid "ST"
 msgstr "TS"
 
-#: smime/lib/e-cert.c:614
+#: smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
 msgstr "Encriptação RSA PKCS nº1"
 
-#: smime/lib/e-cert.c:617
+#: smime/lib/e-cert.c:669
 msgid "Certificate Key Usage"
 msgstr "Utilização de Chave de Certificado"
 
-#: smime/lib/e-cert.c:620
+#: smime/lib/e-cert.c:672
 msgid "Netscape Certificate Type"
 msgstr "Tipo de Certificado Netscape"
 
-#: smime/lib/e-cert.c:623
+#: smime/lib/e-cert.c:675
 msgid "Certificate Authority Key Identifier"
 msgstr "Identificador de Chave de Autoridade de Certificação"
 
-#: smime/lib/e-cert.c:626
+#: smime/lib/e-cert.c:678
 msgid "UID"
 msgstr "UID"
 
-#: smime/lib/e-cert.c:635
+#: smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Identificador de Objecto (%s)"
 
-#: smime/lib/e-cert.c:686
+#: smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
 msgstr "Identificador de Algorítmo"
 
-#: smime/lib/e-cert.c:694
+#: smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
 msgstr "Parâmetros do Algorítmo"
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:768
 msgid "Subject Public Key Info"
 msgstr "Informação da Chave Pública do Sujeito"
 
-#: smime/lib/e-cert.c:721
+#: smime/lib/e-cert.c:773
 msgid "Subject Public Key Algorithm"
 msgstr "Algorítmo da Chave Pública do Sujeito"
 
-#: smime/lib/e-cert.c:736
+#: smime/lib/e-cert.c:788
 msgid "Subject's Public Key"
 msgstr "Chave Pública do Sujeito"
 
-#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
+#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
 msgid "Error: Unable to process extension"
 msgstr "Erro: Incapaz de processar a extensão"
 
-#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
+#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr "Assinante do Objecto"
 
-#: smime/lib/e-cert.c:782
+#: smime/lib/e-cert.c:834
 msgid "SSL Certificate Authority"
 msgstr "Autoridade de Certificação SSL"
 
-#: smime/lib/e-cert.c:786
+#: smime/lib/e-cert.c:838
 msgid "Email Certificate Authority"
 msgstr "Autoridade de Certificação de Email"
 
-#: smime/lib/e-cert.c:814
+#: smime/lib/e-cert.c:866
 msgid "Signing"
 msgstr "Assinar"
 
-#: smime/lib/e-cert.c:818
+#: smime/lib/e-cert.c:870
 msgid "Non-repudiation"
 msgstr "Não repudiar"
 
-#: smime/lib/e-cert.c:822
+#: smime/lib/e-cert.c:874
 msgid "Key Encipherment"
 msgstr "Cifra de Chave"
 
-#: smime/lib/e-cert.c:826
+#: smime/lib/e-cert.c:878
 msgid "Data Encipherment"
 msgstr "Cifra de Dados"
 
-#: smime/lib/e-cert.c:830
+#: smime/lib/e-cert.c:882
 msgid "Key Agreement"
 msgstr "Acordo de Chave"
 
-#: smime/lib/e-cert.c:834
+#: smime/lib/e-cert.c:886
 msgid "Certificate Signer"
 msgstr "Assinante do Certificado"
 
-#: smime/lib/e-cert.c:838
+#: smime/lib/e-cert.c:890
 msgid "CRL Signer"
 msgstr "Assinante CRL"
 
-#: smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:938
 msgid "Critical"
 msgstr "Crítico"
 
-#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
+#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
 msgid "Not Critical"
 msgstr "Não Crítico"
 
-#: smime/lib/e-cert.c:912
+#: smime/lib/e-cert.c:964
 msgid "Extensions"
 msgstr "Extensões"
 
-#: smime/lib/e-cert.c:983
+#: smime/lib/e-cert.c:1035
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
 msgid "Certificate Signature Algorithm"
 msgstr "Algorítmo de Assinatura do Certificado"
 
-#: smime/lib/e-cert.c:1048
+#: smime/lib/e-cert.c:1100
 msgid "Issuer"
 msgstr "Emissor"
 
-#: smime/lib/e-cert.c:1102
+#: smime/lib/e-cert.c:1154
 msgid "Issuer Unique ID"
 msgstr "ID Único de Emissor"
 
-#: smime/lib/e-cert.c:1121
+#: smime/lib/e-cert.c:1173
 msgid "Subject Unique ID"
 msgstr "ID Único de Sujeito"
 
-#: smime/lib/e-cert.c:1164
+#: smime/lib/e-cert.c:1216
 msgid "Certificate Signature Value"
 msgstr "Valor da Assinatura do Certificado"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
+#: smime/lib/e-cert-db.c:608
 msgid "Certificate already exists"
 msgstr "Certificado já existe"
 
@@ -17615,7 +17138,7 @@ msgstr "Ver o contacto actual"
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "_Acções"
 
@@ -17775,7 +17298,7 @@ msgstr "_Fechar"
 #: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:3
+#: ui/evolution.xml.h:4
 msgid "Close"
 msgstr "Fechar"
 
@@ -17788,7 +17311,7 @@ msgid "Delete this item"
 msgstr "Apagar este item"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr "Barra de ferramentas principal"
 
@@ -17831,7 +17354,7 @@ msgstr "Gravar este item para disco"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:44
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "_File"
 msgstr "_Ficheiro"
 
@@ -18089,13 +17612,13 @@ msgstr "_Inverter a Selecção"
 msgid "_Threaded Message List"
 msgstr "Lis_ta de Mensagens em Árvore"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Fechar esta janela"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "_Close"
 msgstr "_Fechar"
 
@@ -18493,7 +18016,7 @@ msgstr "Mensagem _Anterior"
 msgid "_Quoted"
 msgstr "_Citada"
 
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
 msgid "_Tools"
 msgstr "Ferramen_tas"
 
@@ -18790,107 +18313,121 @@ msgid "_Open Task"
 msgstr "_Abrir a Tarefa"
 
 #: ui/evolution.xml.h:1
-msgid "About Ximian Evolution..."
-msgstr "Sobre o Ximian Evolution..."
+#, fuzzy
+msgid "About Evolution..."
+msgstr "Sobre o Evolution"
 
 #: ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
 msgstr "Alterar as configurações do Evolution"
 
-#: ui/evolution.xml.h:5
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the visibility of the toolbar"
+msgstr "Alterar as propriedades desta pasta"
+
+#: ui/evolution.xml.h:6
 msgid "Create a new window displaying this folder"
 msgstr "Criar uma nova janela que apresente esta pasta"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "_Sair"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Perguntas Frequentes do _Ximian Evolution"
+
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Sair da aplicação"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:10
 msgid "Forget _Passwords"
 msgstr "Esquecer as _Senhas"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:11
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 "Esquecer as senhas recordadas para que estas lhe sejam novamente pedidas"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:12
 msgid "Import data from other programs"
 msgstr "Importar dados de outras aplicações"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:14
 msgid "New _Window"
 msgstr "Nova _Janela"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Pi_lot Settings..."
 msgstr "Configuração da Pi_lot..."
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Send / Receive"
 msgstr "Enviar / Receber"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Send queued items and retrieve new items"
 msgstr "Enviar itens em fila e obter novos"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Set up Pilot configuration"
 msgstr "Definir a configuração da Pilot"
 
-#: ui/evolution.xml.h:17
-msgid "Show information about Ximian Evolution"
+#: ui/evolution.xml.h:19
+#, fuzzy
+msgid "Show information about Evolution"
 msgstr "Apresentar informação sobre o Ximian Evolution"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:20
 msgid "Submit Bug Report"
 msgstr "Enviar um Relatório de Erro"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:21
 msgid "Submit _Bug Report"
 msgstr "Enviar um Relatório de _Erro"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Enviar um relatório de erro utilizando o Bug Buddy"
 
-#: ui/evolution.xml.h:21
-msgid "Toggle whether we are working offline."
-msgstr "Alternar se estamos ou não a trabalhar online."
-
 #: ui/evolution.xml.h:23
-msgid "Ximian Evolution _FAQ"
-msgstr "Perguntas Frequentes do _Ximian Evolution"
+#, fuzzy
+msgid "T_oolbar"
+msgstr "Barra de ferramentas principal"
 
 #: ui/evolution.xml.h:24
-msgid "_About Ximian Evolution..."
-msgstr "_Sobre o Ximian Evolution..."
+msgid "Toggle whether we are working offline."
+msgstr "Alternar se estamos ou não a trabalhar online."
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "_About Evolution..."
+msgstr "Sobre o Evolution"
+
+#: ui/evolution.xml.h:30
 msgid "_Help"
 msgstr "_Ajuda"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "_Import..."
 msgstr "_Importar..."
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "_New"
 msgstr "_Novo"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "_Quick Reference"
 msgstr "_Referência Rápida"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_Send / Receive"
 msgstr "_Enviar / Receber"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 #, fuzzy
 msgid "_Window"
 msgstr "Nova _Janela"
@@ -18960,7 +18497,7 @@ msgid "With _Status"
 msgstr "Com _Estado"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:626
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:635
 msgid "UTC"
 msgstr "UTC"
 
@@ -19114,26 +18651,26 @@ msgstr "Outro..."
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
-#: widgets/misc/e-error.c:121
+#: widgets/misc/e-error.c:79 widgets/misc/e-error.c:80
+#: widgets/misc/e-error.c:122
 msgid "Evolution Error"
 msgstr "Erro Evolution"
 
-#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
-#: widgets/misc/e-error.c:119
+#: widgets/misc/e-error.c:81 widgets/misc/e-error.c:82
+#: widgets/misc/e-error.c:120
 msgid "Evolution Warning"
 msgstr "Aviso Evolution"
 
-#: widgets/misc/e-error.c:118
+#: widgets/misc/e-error.c:119
 msgid "Evolution Information"
 msgstr "Informação Evolution"
 
-#: widgets/misc/e-error.c:120
+#: widgets/misc/e-error.c:121
 msgid "Evolution Query"
 msgstr "Questão Evolution"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:410
+#: widgets/misc/e-error.c:415
 #, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -19274,16 +18811,539 @@ msgstr "Incapaz de gravar o ficheiro \"{0}\"."
 msgid "Cannot open file \"{0}\"."
 msgstr "Incapaz de abrir o ficheiro \"{0}\"."
 
-#: widgets/misc/e-task-widget.c:211
+#: widgets/misc/e-task-widget.c:212
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: widgets/misc/e-task-widget.c:216
+#: widgets/misc/e-task-widget.c:217
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% terminado)"
 
+#~ msgid "Failed to connect to LDAP server"
+#~ msgstr "Incapaz de se ligar ao servidor LDAP"
+
+#~ msgid "Failed to authenticate with LDAP server"
+#~ msgstr "Falha ao autenticar-se no servidor LDAP"
+
+#~ msgid "Could not perform query on Root DSE"
+#~ msgstr "Incapaz de efectuar pesquisa no DSE Raíz"
+
+#~ msgid "The server responded with no supported search bases"
+#~ msgstr "O servidor respondeu com nenhuma base de procura suportada"
+
+#~ msgid "This server does not support LDAPv3 schema information"
+#~ msgstr "Este servidor não suporta esquema de informação LDAPv3"
+
+#~ msgid "Error retrieving schema information"
+#~ msgstr "Erro ao obter a informação de esquema"
+
+#~ msgid "Server did not respond with valid schema information"
+#~ msgstr "Servidor não respondeu com informação de esquema válida"
+
+#~ msgid "  S_how Supported Bases "
+#~ msgstr "  Apresentar _Bases Suportadas "
+
+#~ msgid "1:00"
+#~ msgstr "1:00"
+
+#~ msgid "5:00"
+#~ msgstr "5:00"
+
+#~ msgid "Connecting"
+#~ msgstr "A ligar"
+
+#~ msgid "Distinguished _name:"
+#~ msgstr "_Nome distinto:"
+
+#~ msgid "Email address:"
+#~ msgstr "Endereço de email:"
+
+#~ msgid "Evolution will use this DN to authenticate you with the server"
+#~ msgstr "Evolution irá utilizar este ND para o autenticar no servidor"
+
+#~ msgid "One"
+#~ msgstr "Um"
+
+#~ msgid "S_earch scope: "
+#~ msgstr "Â_mbito da procura: "
+
+#~ msgid "Searching"
+#~ msgstr "A procurar"
+
+#~ msgid "Sub"
+#~ msgstr "Sub"
+
+#~ msgid "This option controls how long a search will be run."
+#~ msgstr "Esta opção determina quanto tempo poderá durar uma procura."
+
+#~ msgid "U_se SSL/TLS:"
+#~ msgstr "Utilizar _SSL/TLS:"
+
+#~ msgid "_Display name:"
+#~ msgstr "_Nome de apresentação:"
+
+#~ msgid "_Port number:"
+#~ msgstr "Número do _porto:"
+
+#~ msgid "_Search base:"
+#~ msgstr "Ba_se da procura:"
+
+#~ msgid "_Server name:"
+#~ msgstr "Nome do _servidor:"
+
+#~ msgid "_Timeout (minutes):"
+#~ msgstr "E_xpiração (minutos):"
+
+#~ msgid "connecting-tab"
+#~ msgstr "separador-a-ligar-se"
+
+#~ msgid "general-tab"
+#~ msgstr "separador-geral"
+
+#~ msgid "searching-tab"
+#~ msgstr "separador-procura"
+
+#~ msgid "Job title:"
+#~ msgstr "Título do cargo:"
+
+#~ msgid "Webcam:"
+#~ msgstr "Câmara web:"
+
+#~ msgid "item7"
+#~ msgstr "item7"
+
+#~ msgid "item8"
+#~ msgstr "item8"
+
+#~ msgid "Category editor not available."
+#~ msgstr "Editor de categorias indisponível."
+
+#~ msgid ""
+#~ "The following entries are invalid:\n"
+#~ "\n"
+#~ msgstr ""
+#~ "As seguintes entradas são inválidas:\n"
+#~ "\n"
+
+#~ msgid "Could not find widget for a field: `%s'"
+#~ msgstr "Incapaz de encontra widget para um campo: `%s'"
+
+#~ msgid "Do you want to save changes?"
+#~ msgstr "Deseja gravar as alterações?"
+
+#~ msgid "Error saving %s: %s"
+#~ msgstr "Erro ao gravar %s: %s"
+
+#~ msgid ""
+#~ "The addressbook backend for\n"
+#~ "%s\n"
+#~ "has crashed. You will have to restart Evolution in order to use it again"
+#~ msgstr ""
+#~ "O suporte de livro de endereços para\n"
+#~ "%s\n"
+#~ "terminou com um erro. Terá de reiniciar o Evolution para o poder utilizar "
+#~ "novamente"
+
+#~ msgid "Can not load URI"
+#~ msgstr "Incapaz de ler o URI"
+
+#~ msgid "Calendar Properties"
+#~ msgstr "Propriedades do Calendário"
+
+#~ msgid "Remote"
+#~ msgstr "Remoto"
+
+#~ msgid "Task List Properties"
+#~ msgstr "Propriedades da Lista de Tarefas"
+
+#~ msgid "_Refresh Interval:"
+#~ msgstr "_Intervalo de Actualização:"
+
+#~ msgid "_Source URL:"
+#~ msgstr "URL de _Origem:"
+
+#~ msgid ""
+#~ "The event being deleted is a meeting, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "O evento a ser apagado é uma reunião, deseja enviar uma notificação de "
+#~ "cancelamento?"
+
+#~ msgid "Are you sure you want to cancel and delete this meeting?"
+#~ msgstr "Tem a certeza de que deseja cancelar e apagar esta reunião?"
+
+#~ msgid ""
+#~ "The task being deleted is assigned, would you like to send a cancellation "
+#~ "notice?"
+#~ msgstr ""
+#~ "A tarefa a ser apagada está atribuida, deseja enviar uma notificação de "
+#~ "cancelamento?"
+
+#~ msgid "Are you sure you want to cancel and delete this task?"
+#~ msgstr "Tem a certeza de que deseja cancelar e apagar esta tarefa?"
+
+#~ msgid ""
+#~ "The journal entry being deleted is published, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "A entrada de diário a ser apagada está publicada, deseja enviar uma "
+#~ "notificação de cancelamento?"
+
+#~ msgid "Are you sure you want to cancel and delete this journal entry?"
+#~ msgstr ""
+#~ "Tem a certeza de que deseja cancelar e apagar esta entrada de diário?"
+
+#~ msgid "Are you sure you want to delete the appointment `%s'?"
+#~ msgstr "Tem a certeza de que deseja apagar o compromisso `%s'?"
+
+#~ msgid "Are you sure you want to delete this untitled appointment?"
+#~ msgstr "Tem a certeza de que deseja apagar este compromisso sem título?"
+
+#~ msgid "Are you sure you want to delete the task `%s'?"
+#~ msgstr "Tem a certeza de que deseja apagar a tarefa `%s'?"
+
+#~ msgid "Are you sure you want to delete this untitled task?"
+#~ msgstr "Tem a certeza de que deseja apagar esta tarefa sem título?"
+
+#~ msgid "Are you sure you want to delete the journal entry `%s'?"
+#~ msgstr "Tem a certeza de que deseja apagar a entrada de diário `%s'?"
+
+#~ msgid "Are you sure want to delete this untitled journal entry?"
+#~ msgstr ""
+#~ "Tem a certeza de que deseja apagar esta entrada de diário sem título?"
+
+#~ msgid "Are you sure you want to delete %d appointment?"
+#~ msgid_plural "Are you sure you want to delete %d appointments?"
+#~ msgstr[0] "Tem a certeza de que deseja apagar %d compromisso?"
+#~ msgstr[1] "Tem a certeza de que deseja apagar %d compromissos?"
+
+#~ msgid "Are you sure you want to delete %d task?"
+#~ msgid_plural "Are you sure you want to delete %d tasks?"
+#~ msgstr[0] "Tem a certeza de que deseja apagar %d tarefa?"
+#~ msgstr[1] "Tem a certeza de que deseja apagar %d tarefas?"
+
+#~ msgid "Are you sure you want to delete %d journal entry?"
+#~ msgid_plural "Are you sure you want to delete %d journal entries?"
+#~ msgstr[0] "Tem a certeza de que deseja apagar %d entrada de diário?"
+#~ msgstr[1] "Tem a certeza de que deseja apagar %d entradas de diário?"
+
+#~ msgid "_Invite Others..."
+#~ msgstr "Conv_idar Outros..."
+
+#~ msgid ""
+#~ "This event has been changed, but has not been saved.\n"
+#~ "\n"
+#~ "Do you wish to save your changes?"
+#~ msgstr ""
+#~ "Este evento foi alterado mas não foi gravado.\n"
+#~ "\n"
+#~ "Deseja gravar as suas alterações?"
+
+#~ msgid "_Discard Changes"
+#~ msgstr "_Descartar as Alterações"
+
+#~ msgid "Save Event"
+#~ msgstr "Gravar o Evento"
+
+#~ msgid "The meeting information has been created. Send it?"
+#~ msgstr "A informação de reunião foi criada. Enviá-la?"
+
+#~ msgid "The meeting information has changed. Send an updated version?"
+#~ msgstr ""
+#~ "A informação de reunião foi alterada. Enviar uma versão actualizada?"
+
+#~ msgid "The task assignment information has been created. Send it?"
+#~ msgstr "A informação de atribuição de tarefa foi criada. Enviá-la?"
+
+#~ msgid "The task information has changed. Send an updated version?"
+#~ msgstr "A informação de tarefa foi alterada. Enviar uma versão actualizada?"
+
+#~ msgid "The task backend for '%s' has crashed."
+#~ msgstr "O módulo de suporte de tarefas para '%s' terminou com erro."
+
+#~ msgid "The calendar backend for '%s' has crashed."
+#~ msgstr "O módulo de suporte de calendário para '%s' terminou com erro."
+
+#~ msgid "Learning junk and/or non junk message(s)"
+#~ msgstr "A aprender a distinguir mensagens não-solicitadas das restantes"
+
+#~ msgid "Could not get article %s from NNTP server"
+#~ msgstr "Incapaz de obter o artigo %s do servidor NNTP"
+
+#~ msgid "Posting not allowed by news server"
+#~ msgstr "Afixação não autorizada pelo servidor de notícias"
+
+#~ msgid "Failed to send newsgroups header: %s: message not posted"
+#~ msgstr ""
+#~ "Falha ao enviar o cabeçalho de grupo de notícias: %s: a mensagem não foi "
+#~ "afixada"
+
+#~ msgid "Error posting to newsgroup: %s: message not posted"
+#~ msgstr "Erro ao afixar no grupo de notícias: %s: a mensagem não foi afixada"
+
+#~ msgid "Error reading response to posted message: message not posted"
+#~ msgstr ""
+#~ "Erro ao ler uma resposta à mensagem afixada: a mensagem não foi afixada"
+
+#~ msgid "Error posting message: %s: message not posted"
+#~ msgstr "Erro ao afixar a mensagem: %s: a mensagem não foi afixada"
+
+#~ msgid "Stream error"
+#~ msgstr "Erro de fluxo de dados"
+
+#~ msgid "Connection error: %s"
+#~ msgstr "Erro de ligação: %s"
+
+#~ msgid "Could not get group: %s"
+#~ msgstr "Incapaz de obter o grupo: %s"
+
+#~ msgid "Could not get messages: unspecified error"
+#~ msgstr "Incapaz de obter as mensagens: erro não especificado"
+
+#~ msgid "Unknown server response: %s"
+#~ msgstr "Resposta de servidor desconhecida: %s"
+
+#~ msgid "${1}"
+#~ msgstr "${1}"
+
+#~ msgid "Because \"${1}\"."
+#~ msgstr "Devido a \"${1}\"."
+
+#~ msgid "Adjust Score"
+#~ msgstr "Ajustar a Pontuação"
+
+#~ msgid "Assign Color"
+#~ msgstr "Atribuir uma Cor"
+
+#~ msgid "Assign Score"
+#~ msgstr "Atribuir uma Pontuação"
+
+#~ msgid "Attachments"
+#~ msgstr "Anexos"
+
+#~ msgid "Beep"
+#~ msgstr "Beep"
+
+#~ msgid "contains"
+#~ msgstr "contém"
+
+#~ msgid "Copy to Folder"
+#~ msgstr "Copiar para a Pasta"
+
+#~ msgid "Date received"
+#~ msgstr "Data de recepção"
+
+#~ msgid "Date sent"
+#~ msgstr "Data de envio"
+
+#~ msgid "Deleted"
+#~ msgstr "Apagada"
+
+#~ msgid "does not contain"
+#~ msgstr "não contém"
+
+#~ msgid "does not end with"
+#~ msgstr "não termina em"
+
+#~ msgid "does not exist"
+#~ msgstr "não existe"
+
+#~ msgid "does not return"
+#~ msgstr "não devolve"
+
+#~ msgid "does not sound like"
+#~ msgstr "não se assemelha a"
+
+#~ msgid "does not start with"
+#~ msgstr "não começa por"
+
+#~ msgid "Do Not Exist"
+#~ msgstr "Não Existe"
+
+#~ msgid "Draft"
+#~ msgstr "Rascunho"
+
+#~ msgid "ends with"
+#~ msgstr "termina em"
+
+#~ msgid "Exist"
+#~ msgstr "Existe"
+
+#~ msgid "exists"
+#~ msgstr "existe"
+
+#~ msgid "Expression"
+#~ msgstr "Expressão"
+
+#~ msgid "Follow Up"
+#~ msgstr "Seguimento"
+
+#~ msgid "is"
+#~ msgstr "é"
+
+#~ msgid "is after"
+#~ msgstr "é posterior a"
+
+#~ msgid "is before"
+#~ msgstr "é anterior a"
+
+#~ msgid "is Flagged"
+#~ msgstr "está Marcada"
+
+#~ msgid "is greater than"
+#~ msgstr "é maior do que"
+
+#~ msgid "is less than"
+#~ msgstr "é menor do que"
+
+#~ msgid "is not"
+#~ msgstr "não é"
+
+#~ msgid "is not Flagged"
+#~ msgstr "não está Marcada"
+
+#~ msgid "Junk Test"
+#~ msgstr "Teste de Não Solicitado"
+
+#~ msgid "Mailing list"
+#~ msgstr "Lista de distribuição"
+
+#~ msgid "Message Body"
+#~ msgstr "Corpo da Mensagem"
+
+#~ msgid "Message Header"
+#~ msgstr "Cabeçalho da Mensagem"
+
+#~ msgid "Message is Junk"
+#~ msgstr "Mensagem é Não Solicitada"
+
+#~ msgid "Message is not Junk"
+#~ msgstr "Mensagem não é Não Solicitada"
+
+#~ msgid "Move to Folder"
+#~ msgstr "Mover para a Pasta"
+
+#~ msgid "Pipe to Program"
+#~ msgstr "Canal para a Aplicação"
+
+#~ msgid "Play Sound"
+#~ msgstr "Reproduzir o Som"
+
+#~ msgid "Recipients"
+#~ msgstr "Destinatários"
+
+#~ msgid "Regex Match"
+#~ msgstr "Coincidir Expr. Reg."
+
+#~ msgid "Replied to"
+#~ msgstr "Repondido a"
+
+#~ msgid "returns"
+#~ msgstr "devolve"
+
+#~ msgid "returns greater than"
+#~ msgstr "devolve maior do que"
+
+#~ msgid "returns less than"
+#~ msgstr "devolve menor do que"
+
+#~ msgid "Run Program"
+#~ msgstr "Executar Aplicação"
+
+#~ msgid "Sender"
+#~ msgstr "Remetente"
+
+#~ msgid "Set Status"
+#~ msgstr "Definir o Estado"
+
+#~ msgid "Size (kB)"
+#~ msgstr "Tamanho (kB)"
+
+#~ msgid "sounds like"
+#~ msgstr "assemelha-se a"
+
+#~ msgid "Source Account"
+#~ msgstr "Conta de Origem"
+
+#~ msgid "Specific header"
+#~ msgstr "Cabeçalho específico"
+
+#~ msgid "starts with"
+#~ msgstr "começa por"
+
+#~ msgid "Stop Processing"
+#~ msgstr "Parar o Processamento"
+
+#~ msgid "Unset Status"
+#~ msgstr "Retirar o Estado"
+
+#~ msgid "Check _Incoming Mail"
+#~ msgstr "A Verificar as Mensagens _Recebidas"
+
+#~ msgid "Use _Daemon"
+#~ msgstr "Utilizar _Daemon"
+
+#~ msgid "_Local Tests Only"
+#~ msgstr "Apenas os Testes _Locais"
+
+#~ msgid "Working"
+#~ msgstr "A Trabalhar"
+
+#~ msgid "Brought to you by"
+#~ msgstr "Trazido até si por"
+
+#~ msgid "_Filename:"
+#~ msgstr "Nome do _ficheiro:"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "Unknown error."
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Erro desconhecido."
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the component system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "O erro do componente de sistema é:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the activation system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "O erro do sistema de activação é:\n"
+#~ "%s"
+
+#~ msgid "Do you want to trust \"%s\" for the following purposes?"
+#~ msgstr "Deseja confiar em \"%s\" para os seguintes propósitos?"
+
+#~ msgid "View Certificate"
+#~ msgstr "Ver o Certificado"
+
+#~ msgid "You have been asked to trust a new Certificate Authority (CA)."
+#~ msgstr ""
+#~ "Foi-lhe pedido que confiasse numa nova Autoridade de Certificação (AC)."
+
+#~ msgid "About Ximian Evolution..."
+#~ msgstr "Sobre o Ximian Evolution..."
+
+#~ msgid "_About Ximian Evolution..."
+#~ msgstr "_Sobre o Ximian Evolution..."
+
 #~ msgid "Could not initialize gnome-vfs"
 #~ msgstr "Incapaz de inicializar o gnome-vfs"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 6a79692c45..a7874bd62f 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.5.7\n"
-"POT-Creation-Date: 2004-05-19 14:00-0400\n"
+"POT-Creation-Date: 2004-06-03 11:14-0400\n"
 "PO-Revision-Date: 2004-05-17 13:13-0400\n"
 "Last-Translator: Gustavo Maciel Dias Vieira <gustavo@sagui.org>\n"
 "Language-Team: Brazilian Portuguese <gnome-l10n-br@listas.cipsga.org.br>\n"
@@ -59,13 +59,13 @@ msgstr " cartão"
 msgid "Default Sync Address:"
 msgstr "Endereço padrão de sincronização:"
 
-#: addressbook/conduit/address-conduit.c:1150
 #: addressbook/conduit/address-conduit.c:1151
+#: addressbook/conduit/address-conduit.c:1152
 msgid "Could not load addressbook"
 msgstr "Não foi possível carregar catálogo de endereços"
 
-#: addressbook/conduit/address-conduit.c:1219
-#: addressbook/conduit/address-conduit.c:1222
+#: addressbook/conduit/address-conduit.c:1220
+#: addressbook/conduit/address-conduit.c:1223
 msgid "Could not read pilot's Address application block"
 msgstr "Não foi possível ler os dados do aplicativo de endereços do pilot"
 
@@ -73,13 +73,13 @@ msgstr "Não foi possível ler os dados do aplicativo de endereços do pilot"
 msgid "Accessing LDAP Server anonymously"
 msgstr "Acessando servidor LDAP anonimamente"
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
 msgid "Failed to authenticate.\n"
 msgstr "A autenticação falhou.\n"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sEntre senha para %s (usuário %s)"
@@ -120,52 +120,24 @@ msgstr "Grupo de _contatos"
 msgid "Create a new contacts group"
 msgstr "Criar um novo grupo de contatos"
 
-#: addressbook/gui/component/addressbook-component.c:182
+#: addressbook/gui/component/addressbook-component.c:184
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr ""
 "Falha ao atualizar as configuraçoes ou pastas do catálogo de endereços."
 
-#: addressbook/gui/component/addressbook-config.c:483
-msgid "Failed to connect to LDAP server"
-msgstr "Falha de conexão ao servidor LDAP"
-
-#: addressbook/gui/component/addressbook-config.c:507
-msgid "Failed to authenticate with LDAP server"
-msgstr "Falha de autenticação com o servidor LDAP"
-
-#: addressbook/gui/component/addressbook-config.c:535
-msgid "Could not perform query on Root DSE"
-msgstr "Não foi possível realizar consulta na raiz DSE"
-
-#: addressbook/gui/component/addressbook-config.c:840
-msgid "The server responded with no supported search bases"
-msgstr "O servidor respondeu sem bases de pesquisa suportadas"
-
-#: addressbook/gui/component/addressbook-config.c:1245
-msgid "This server does not support LDAPv3 schema information"
-msgstr "Este servidor não suporta informação de schema LDAPv3"
-
-#: addressbook/gui/component/addressbook-config.c:1266
-msgid "Error retrieving schema information"
-msgstr "Erro ao buscar informação de schema"
-
-#: addressbook/gui/component/addressbook-config.c:1274
-msgid "Server did not respond with valid schema information"
-msgstr "O servidor não respondeu com informação de schema válida"
-
 #: addressbook/gui/component/addressbook-migrate.c:68
-#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1160
 msgid "Migrating..."
 msgstr "Migrando..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1201
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Migrando `%s':"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:438
+#: addressbook/gui/component/addressbook-migrate.c:464
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
 #: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
@@ -173,28 +145,28 @@ msgid "On This Computer"
 msgstr "Neste computador"
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:446
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
-#: mail/mail-config.glade.h:106
+#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
+#: mail/mail-config.glade.h:109
 msgid "Personal"
 msgstr "Pessoal"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:454
+#: addressbook/gui/component/addressbook-migrate.c:480
 msgid "On LDAP Servers"
 msgstr "Em servidores LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:582
+#: addressbook/gui/component/addressbook-migrate.c:608
 msgid "LDAP Servers"
 msgstr "Servidores LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:702
+#: addressbook/gui/component/addressbook-migrate.c:728
 msgid "Autocompletion Settings"
 msgstr "Configurações do autocompletar"
 
-#: addressbook/gui/component/addressbook-migrate.c:1076
+#: addressbook/gui/component/addressbook-migrate.c:1104
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -206,7 +178,7 @@ msgstr ""
 "\n"
 "Por favor, aguarde enquanto o Evolution migra as sua pastas..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1090
+#: addressbook/gui/component/addressbook-migrate.c:1118
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -216,7 +188,7 @@ msgstr ""
 "\n"
 "Por favor, aguarde enquanto o Evolution migra as sua pastas..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1099
+#: addressbook/gui/component/addressbook-migrate.c:1127
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -226,7 +198,7 @@ msgstr ""
 "\n"
 "Por favor, aguarde enquanto o Evolution migra as sua pastas..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1109
+#: addressbook/gui/component/addressbook-migrate.c:1137
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -238,40 +210,35 @@ msgstr ""
 "Por favor, aguarde enquanto o Evolution migra os dados de sincronização com "
 "pilot..."
 
-#: addressbook/gui/component/addressbook-view.c:674
+#: addressbook/gui/component/addressbook-view.c:675
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 "O catálogo de endereços '%s' será removido. Você tem certeza que deseja "
 "continuar?"
 
-#: addressbook/gui/component/addressbook-view.c:761
+#: addressbook/gui/component/addressbook-view.c:754
 msgid "New Address Book"
 msgstr "Novo catálogo de endereços"
 
-#: addressbook/gui/component/addressbook-view.c:762
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
+#: addressbook/gui/component/addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Excluir"
 
-#: addressbook/gui/component/addressbook-view.c:763
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-view.c:756
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Propriedades..."
 
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/addressbook-view.c:1002
+#. Create the contacts group
+#: addressbook/gui/component/addressbook-view.c:995
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
 #: calendar/gui/migration.c:373
 msgid "Contacts"
 msgstr "Contatos"
@@ -350,10 +317,6 @@ msgid "Manage your S/MIME certificates here"
 msgstr "Gerencie aqui os seus certificados S/MIME"
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-msgid "  S_how Supported Bases "
-msgstr "  E_xibir bases suportadas "
-
-#: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -368,190 +331,157 @@ msgstr "  E_xibir bases suportadas "
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr "1"
 
-#: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1:00"
-msgstr "1:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr "5"
 
-#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
-msgstr "5:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "<b>Authentication</b>"
 msgstr "<b>Autenticação</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Display</b>"
 msgstr "<b>Exibição</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "<b>Downloading</b>"
 msgstr "<b>Baixando</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "<b>Searching</b>"
 msgstr "<b>Pesquisando</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:11
 msgid "<b>Server Information</b>"
 msgstr "<b>Informação do servidor</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:12
 msgid "<b>Type:</b>"
 msgstr "<b>Tipo:</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add Contacts Group"
 msgstr "Adicionar grupo de contatos"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Address Book Properties"
 msgstr "Propriedades do catálogo de endereços"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
-#: mail/mail-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
+#: mail/mail-config.glade.h:42
 msgid "Always"
 msgstr "Sempre"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr "Anonimamente"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:17
 #: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Básico"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
-msgid "Connecting"
-msgstr "Conectando"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 #: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Detalhes"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
-msgid "Distinguished _name:"
-msgstr "_Distinguished name:"
-
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished name"
 msgstr "Distinguished name"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Download limit:"
 msgstr "Limite de transferência:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Email address"
 msgstr "Endereço de e-mail"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "Email address:"
-msgstr "Endereço de e-mail:"
-
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "Evolution will use this DN to authenticate you with the server"
-msgstr "O Evolution usará este DN para autenticá-lo no servidor"
-
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:22
+#, fuzzy
 msgid ""
-"Evolution will use this email address to authenticate you with the server"
+"Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "O Evolution usará este endereço de e-mail para autenticá-lo no servidor"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Find Possible Search Bases"
 msgstr "Localizar bases de pesquisa possíveis"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:24
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
+#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Geral"
 
-#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
-#: mail/mail-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
+#: mail/mail-config.glade.h:102
 msgid "Never"
 msgstr "Nunca"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
-msgid "One"
-msgstr "Um"
-
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Only locations within starting point"
 msgstr "Apenas locais dentro do ponto de partida"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
-msgid "S_earch scope: "
-msgstr "_Escopo de pesquisa: "
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Search _base:"
+msgstr "Base de pesquisa:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:28
 msgid "Search base only"
 msgstr "Base de pesquisa apenas"
 
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid "Search base:"
 msgstr "Base de pesquisa:"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid "Search scope:"
 msgstr "Escopo de pesquisa:"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
-msgid "Searching"
-msgstr "Pesquisando"
-
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:31
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
-"server if\n"
-"your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL or TLS."
 msgstr ""
 "A seleção desta opção significa que o Evolution apenas estabelecerá conexão "
 "com o seu servidor\n"
 "LDAP se este suportar SSL ou TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a \n"
-"insecure environment. For example, if you and your LDAP server are behind a "
-"firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection "
-"is already\n"
-"secure."
+"you are in a insecure environment. For example, if you and your LDAP server "
+"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
+"because your connection is already secure."
 msgstr ""
 "A seleção desta opção significa que o Evolution apenas tentará usar SSL/TLS "
 "se você estiver em \n"
@@ -561,13 +491,12 @@ msgstr ""
 "conexão já é\n"
 "segura."
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:33
+#, fuzzy
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
-"TLS.  This \n"
-"means that your connection will be insecure, and that you will be vulnerable "
-"to security\n"
-"exploits. "
+"TLS.  This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits. "
 msgstr ""
 "A seleção desta opção significa que o seu servidor não suporta nem SSL nem "
 "TLS.  Isto \n"
@@ -575,38 +504,33 @@ msgstr ""
 "falhas de\n"
 "segurança."
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Starting point and locations within it"
 msgstr "Ponto de partida e locais dentro dele"
 
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Sub"
-msgstr "Sub"
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr "Bases de pesquisa suportadas"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
-"searches will \n"
-"begin. If you leave this blank, the search will begin at the root of the "
-"directory tree."
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
 msgstr ""
 "A base de pesquisa é o distinguished name (DN) do ponto a partir do qual a "
 "suas pesquisas \n"
 "começarão. Se você deixar este campo vazio as pesquisas começarão na raiz da "
 "árvore do diretório."
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:37
+#, fuzzy
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
-"the \n"
-"directory tree. A search scope of \"sub\" will include all entries below "
-"your search base.\n"
-"A search scope of \"one\" will only include the entries one level beneath "
-"your base.\n"
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
 msgstr ""
 "O escopo de pesquisa define a profundidade que você gostaria que as "
 "pesquisas se estendessem \n"
@@ -615,7 +539,7 @@ msgstr ""
 "Um escopo de pesquisa de \"um\" incluirá apenas as entradas que estão um "
 "nível abaixo da sua base.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:58
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -623,17 +547,17 @@ msgstr ""
 "Este é o nome completo do seu servidor LDAP. Por exemplo, \"ldap."
 "minhaempresa.com.br\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:39
+#, fuzzy
 msgid ""
-"This is the maximum number of entries to download. Setting this number to "
-"be \n"
+"This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr ""
 "Este é o número máximo de entradas a serem baixadas. Atribuir um valor muito "
 "grande \n"
 "a este número diminuirá a velocidade de seu catálogo de endereços."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -642,135 +566,114 @@ msgstr ""
 "Este é o método que o Evolution usará para autenticá-lo. Note que a opção "
 "\"Endereço de e-mail\" requer acesso anônimo ao seu servidor LDAP."
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:41
+#, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
-"list.\n"
-"It is for display purposes only. "
+"list. It is for display purposes only. "
 msgstr ""
 "Este é o nome deste servidor que aparecerá na lista de pastas do Evolution.\n"
 "Ele é usado apenas para exibição. "
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:42
+#, fuzzy
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. "
-"A \n"
-"list of standard ports has been provided. Ask your system administrator\n"
-"what port you should specify."
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
 msgstr ""
 "Esta é a porta no servidor LDAP onde o Evolution tentará se conectar. Uma "
 "lista \n"
 "de portas padrão foi fornecida. Pergunte ao seu administrador de sistemas\n"
 "qual porta você deve escolher."
 
-#: addressbook/gui/component/ldap-config.glade.h:67
-msgid "This option controls how long a search will be run."
-msgstr "Esta opção controla o tempo de execução de uma pesquisa."
-
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid "Timeout:"
 msgstr "Tempo limite:"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
-msgid "U_se SSL/TLS:"
-msgstr "_Usar SSL/TLS:"
-
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr "Usando distinguished name (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr "Usando endereço de e-mail"
 
-#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
-#: mail/mail-config.glade.h:154
+#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
+#: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr "Quando possível"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:47
 msgid "_Add Contacts Group"
 msgstr "_Adicionar grupo de contatos"
 
-#: addressbook/gui/component/ldap-config.glade.h:74
-#: calendar/gui/dialogs/calendar-setup.glade.h:12
-msgid "_Display name:"
-msgstr "_Nome para exibição:"
-
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr "_Limite de transferência:"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Email address:"
 msgstr "_Endereço de e-mail:"
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:50
+#, fuzzy
+msgid "_Find Possible Search Bases"
+msgstr "Localizar bases de pesquisa possíveis"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Log in method:"
 msgstr "Método de _login:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "_Log in:"
+msgstr "Login"
+
+#: addressbook/gui/component/ldap-config.glade.h:53
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
-msgid "_Port number:"
-msgstr "Número da _porta:"
-
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid "_Port:"
 msgstr "_Porta:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
-msgid "_Search base:"
-msgstr "_Base de pesquisa:"
-
-#: addressbook/gui/component/ldap-config.glade.h:82
-msgid "_Server name:"
-msgstr "Nome do _servidor:"
+#: addressbook/gui/component/ldap-config.glade.h:55
+#, fuzzy
+msgid "_Search scope:"
+msgstr "Escopo de pesquisa:"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:56
 msgid "_Server:"
 msgstr "_Servidor:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
-msgid "_Timeout (minutes):"
-msgstr "_Tempo limite (minutos):"
+#: addressbook/gui/component/ldap-config.glade.h:57
+#, fuzzy
+msgid "_Timeout:"
+msgstr "Tempo limite:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:58
 msgid "_Use secure connection:"
 msgstr "_Usar conexão segura:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "cartões"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
-msgid "connecting-tab"
-msgstr "connecting-tab"
-
-#: addressbook/gui/component/ldap-config.glade.h:88
-msgid "general-tab"
-msgstr "general-tab"
-
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:60
 #: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
-#: mail/mail-config.glade.h:182
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "minutos"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
-msgid "searching-tab"
-msgstr "searching-tab"
-
-#: addressbook/gui/component/select-names/e-select-names.c:497
+#: addressbook/gui/component/select-names/e-select-names.c:503
 #: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid "Select Contacts from Address Book"
 msgstr "Selecionar contatos do catálogo de endereços"
 
-#: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
@@ -810,7 +713,7 @@ msgstr "Contato sem nome"
 
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:222
+#: addressbook/gui/widgets/e-addressbook-view.c:224
 msgid "Source"
 msgstr "Fonte"
 
@@ -875,9 +778,9 @@ msgid "<b>Work</b>"
 msgstr "<b>Trabalho</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
-#: addressbook/gui/widgets/eab-contact-display.c:342
-#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/widgets/eab-contact-display.c:334
+#: addressbook/gui/widgets/eab-contact-display.c:353
 msgid "AIM"
 msgstr "AIM"
 
@@ -911,15 +814,15 @@ msgid "Company:"
 msgstr "Empresa:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:271
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
+#: addressbook/gui/contact-editor/e-contact-editor.c:266
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
 msgstr "Contato"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1527
+#: addressbook/gui/contact-editor/e-contact-editor.c:520
 msgid "Contact Editor"
 msgstr "Editor de contatos"
 
@@ -940,86 +843,85 @@ msgid "Full _Name..."
 msgstr "_Nome completo..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:202
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-msgid "Home"
-msgstr "Residencial"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "Home Page:"
 msgstr "Página web:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-msgid "Job title:"
-msgstr "Função:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/e-itip-control.c:936
-msgid "Location:"
-msgstr "Local:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "Mailing Address"
 msgstr "Endereço de correpondência"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "Manager:"
 msgstr "Gerente:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "Ni_ckname:"
 msgstr "_Apelido:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "Notes:"
 msgstr "Notas:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
-#: addressbook/gui/contact-editor/e-contact-editor.c:203
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-msgid "Other"
-msgstr "Outro"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#, fuzzy
+msgid "Office:"
+msgstr "_Escritório:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "PO Box:"
 msgstr "Caixa postal:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "Personal Information"
 msgstr "Informação pessoal"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "Profession:"
 msgstr "Profissão:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#, fuzzy
+msgid "Spouse:"
+msgstr "_Cônjuge:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "State/Province:"
 msgstr "Estado/província:"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#, fuzzy
+msgid "Title:"
+msgstr "_Tratamento:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+msgid "Video Chat:"
+msgstr ""
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "Wants to receive HTML mail"
 msgstr "Deseja receber correio HTML"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:42
-msgid "Webcam:"
-msgstr "Webcam:"
+#, fuzzy
+msgid "Web Log:"
+msgstr "Página web:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
-#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
-#: mail/mail-config.glade.h:155
+#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
+#: mail/mail-config.glade.h:157
 msgid "Work"
 msgstr "Trabalho"
 
@@ -1036,18 +938,11 @@ msgid "_File under:"
 msgstr "A_rquivar em:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "_Where:"
 msgstr "On_de:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
-msgid "item7"
-msgstr "item7"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
-msgid "item8"
-msgstr "item8"
-
-#: addressbook/gui/contact-editor/eab-editor.c:316
+#: addressbook/gui/contact-editor/eab-editor.c:315
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -1055,7 +950,7 @@ msgstr ""
 "Você tem certeza que deseja\n"
 "excluir estes contatos?"
 
-#: addressbook/gui/contact-editor/eab-editor.c:319
+#: addressbook/gui/contact-editor/eab-editor.c:318
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -1064,16 +959,16 @@ msgstr ""
 "excluir este contato?"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:351
-#: addressbook/gui/widgets/eab-contact-display.c:372
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Address"
 msgstr "Endereço"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:292
+#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard.c:174
@@ -2051,87 +1946,109 @@ msgstr "Zâmbia"
 msgid "Zimbabwe"
 msgstr "Zimbábue"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/contact-editor/e-contact-editor.c:179
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:337
+#: addressbook/gui/widgets/eab-contact-display.c:356
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:347
-#: addressbook/gui/widgets/eab-contact-display.c:366
+#: addressbook/gui/contact-editor/e-contact-editor.c:180
+#: addressbook/gui/widgets/eab-contact-display.c:339
+#: addressbook/gui/widgets/eab-contact-display.c:358
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: addressbook/gui/widgets/eab-contact-display.c:338
+#: addressbook/gui/widgets/eab-contact-display.c:357
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:344
-#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#: addressbook/gui/widgets/eab-contact-display.c:355
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/contact-editor/e-contact-editor.c:183
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+msgid "Home"
+msgstr "Residencial"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+msgid "Other"
+msgstr "Outro"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
 msgid "Source Book"
 msgstr "Catálogo origem"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:264
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Target Book"
 msgstr "Catálogo alvo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:278
+#: addressbook/gui/contact-editor/e-contact-editor.c:273
 msgid "Is New Contact"
 msgstr "É um novo contato"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:285
+#: addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Writable Fields"
 msgstr "Campos editáveis"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:299
+#: addressbook/gui/contact-editor/e-contact-editor.c:294
 msgid "Changed"
 msgstr "Alterado"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
-msgid "Category editor not available."
-msgstr "Editor de categorias não disponível."
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:2352
 msgid "This contact belongs to these categories:"
 msgstr "Este contato pertence a estas categorias:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#: addressbook/gui/contact-editor/e-contact-editor.c:2429
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Por favor, selecione entre as seguintes opções"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#: addressbook/gui/contact-editor/e-contact-editor.c:2433
 #, fuzzy
 msgid "No image"
 msgstr "Niger"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#: addressbook/gui/contact-editor/e-contact-editor.c:2636
+#, fuzzy
 msgid ""
-"The following entries are invalid:\n"
+"The contact data is invalid:\n"
 "\n"
+msgstr "A data recorrente é inválida"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#, fuzzy
+msgid "Invalid contact."
+msgstr "%d contato"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+msgid ""
+"The contact cannot be saved to the selected address book. Do you want to "
+"discard changes?"
 msgstr ""
-"As seguintes entradas são inválidas:\n"
-"\n"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2738
-#, c-format
-msgid "Could not find widget for a field: `%s'"
-msgstr "Não foi possível encontrar widget para um campo: `%s'"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2727
+#: addressbook/gui/contact-editor/e-contact-editor.c:2751
+msgid "_Discard"
+msgstr "_Descartar"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+msgid ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
+msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:62
 msgid "AOL Instant Messenger"
@@ -2164,7 +2081,7 @@ msgid "_Edit Full"
 msgstr "_Editar completo"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:166
 msgid "_Full Name:"
 msgstr "Nome _completo:"
 
@@ -2310,30 +2227,30 @@ msgid "_Type an email address or drag a contact into the list below:"
 msgstr ""
 "_Digite um endereço de e-mail ou arraste um contato para a lista abaixo:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "contact-list-editor"
 msgstr "contact-list-editor"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:153
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:215
+#: addressbook/gui/widgets/e-addressbook-view.c:217
 #: addressbook/gui/widgets/e-minicard-view.c:460
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Livro"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
 msgid "Is New List"
 msgstr "É nova lista"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:215
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
 msgid "Contact List Editor"
 msgstr "Editor de lista de contatos"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:438
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
 msgid "Save List as VCard"
 msgstr "Salvar lista como VCard"
 
@@ -2380,144 +2297,144 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Pesquisa avançada"
 
-#: addressbook/gui/widgets/eab-contact-display.c:129
-#: addressbook/gui/widgets/eab-contact-display.c:192
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
 msgid "(map)"
 msgstr "(mapa)"
 
-#: addressbook/gui/widgets/eab-contact-display.c:139
-#: addressbook/gui/widgets/eab-contact-display.c:205
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
 msgid "map"
 msgstr "mapa"
 
-#: addressbook/gui/widgets/eab-contact-display.c:257
-#: addressbook/gui/widgets/eab-contact-display.c:533
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:525
 msgid "List Members"
 msgstr "Listar membros"
 
-#: addressbook/gui/widgets/eab-contact-display.c:329
-#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/eab-contact-display.c:321
+#: addressbook/gui/widgets/eab-contact-display.c:323
 msgid "E-mail"
 msgstr "E-mail"
 
-#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/eab-contact-display.c:332
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Empresa"
 
-#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "Position"
 msgstr "Cargo"
 
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:354
 msgid "Groupwise"
 msgstr "Groupwise"
 
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:340
 msgid "Video Conferencing"
 msgstr "Vídeo conferência"
 
-#: addressbook/gui/widgets/eab-contact-display.c:349
-#: addressbook/gui/widgets/eab-contact-display.c:370
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Phone"
 msgstr "Telefone"
 
-#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:342
 msgid "Fax"
 msgstr "Fax"
 
-#: addressbook/gui/widgets/eab-contact-display.c:354
+#: addressbook/gui/widgets/eab-contact-display.c:346
 msgid "work"
 msgstr "trabalho"
 
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:359
 msgid "WWW"
 msgstr "WWW"
 
-#: addressbook/gui/widgets/eab-contact-display.c:368
-#: addressbook/gui/widgets/eab-contact-display.c:587
+#: addressbook/gui/widgets/eab-contact-display.c:360
+#: addressbook/gui/widgets/eab-contact-display.c:579
 msgid "Blog"
 msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/eab-contact-display.c:363
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Telefone celular"
 
-#: addressbook/gui/widgets/eab-contact-display.c:375
+#: addressbook/gui/widgets/eab-contact-display.c:367
 msgid "personal"
 msgstr "pessoal"
 
-#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/eab-contact-display.c:374
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Nota"
 
-#: addressbook/gui/widgets/eab-contact-display.c:548
+#: addressbook/gui/widgets/eab-contact-display.c:540
 msgid "Job Title"
 msgstr "Função"
 
-#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/eab-contact-display.c:544
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:774
+#: smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "E-mail"
 
-#: addressbook/gui/widgets/eab-contact-display.c:579
+#: addressbook/gui/widgets/eab-contact-display.c:571
 msgid "Home page"
 msgstr "Página web"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 msgid "Success"
 msgstr "Sucesso"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Backend busy"
 msgstr "Backend ocupado"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Repository offline"
 msgstr "Repositório desconectado"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Address Book does not exist"
 msgstr "Catálogo de endereços não existe"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "No Self Contact defined"
 msgstr "Não existe contato próprio definido"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Permission denied"
 msgstr "Permissão negada"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Contact not found"
 msgstr "Contato não encontrado"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Contact ID already exists"
 msgstr "O ID do contato já existe"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Protocol not supported"
 msgstr "Protocolo não suportado"
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:60
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:233
 #: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
@@ -2530,37 +2447,37 @@ msgid "Cancelled"
 msgstr "Cancelada"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Could not cancel"
 msgstr "Não foi possível cancelar"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Authentication Failed"
 msgstr "Falhou a autenticação"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Authentication Required"
 msgstr "Autenticação necessária"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:66
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "TLS not Available"
 msgstr "TLS não disponível"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#: addressbook/gui/widgets/eab-gui-util.c:66
 msgid "No such source"
 msgstr "Não existe tal fonte"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:69
+#: addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Other error"
 msgstr "Outro erro"
 
-#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:90
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
@@ -2568,7 +2485,7 @@ msgstr ""
 "Não foi possível abrir este catálogo de endereços.  Por favor, verifique se "
 "o arquivo existe e se você possui as permissões para acessá-lo."
 
-#: addressbook/gui/widgets/eab-gui-util.c:110
+#: addressbook/gui/widgets/eab-gui-util.c:97
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -2576,17 +2493,18 @@ msgstr ""
 "Não foi possível abrir este catálogo de endereços.  Isto significa que você "
 "forneceu uma URI incorreta ou que o servidor LDAP está fora do ar."
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:102
+#, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution you must compile the program from the CVS "
-"sources after retrieving OpenLDAP from the link below."
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
 msgstr ""
 "Esta versão do Evolution não foi compilado com suporte a LDAP. Se você "
 "deseja usar LDAP no Evolution, deve recompilar o programa das fontes em CVS "
 "após obter o OpenLDAP a partir do link abaixo."
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:109
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -2594,11 +2512,7 @@ msgstr ""
 "Não foi possível abrir este catálogo de endereços.  Isto significa que você "
 "forneceu uma URI incorreta ou que o servidor está fora do ar."
 
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "Unable to open addressbook"
-msgstr "Não é possível abrir o catálogo de endereços"
-
-#: addressbook/gui/widgets/eab-gui-util.c:162
+#: addressbook/gui/widgets/eab-gui-util.c:129
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2612,7 +2526,7 @@ msgstr ""
 "resultados nas preferências do servidor de diretório para este\n"
 "catálogo de endereços."
 
-#: addressbook/gui/widgets/eab-gui-util.c:168
+#: addressbook/gui/widgets/eab-gui-util.c:135
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -2624,56 +2538,48 @@ msgstr ""
 "torne a sua pesquisa mais específica ou aumente o limite de tempo nas\n"
 "preferências do servidor de diretório para este catálogo de endereços."
 
-#: addressbook/gui/widgets/eab-gui-util.c:174
+#: addressbook/gui/widgets/eab-gui-util.c:141
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 "O backend para este catálogo de endereços não pôde analisar esta consulta."
 
-#: addressbook/gui/widgets/eab-gui-util.c:177
+#: addressbook/gui/widgets/eab-gui-util.c:144
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 "O backend para este catálogo de endereços recusou-se a processar esta "
 "consulta."
 
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:147
 msgid "This query did not complete successfully."
 msgstr "Esta consulta não terminou com sucesso."
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
-msgid "Do you want to save changes?"
-msgstr "Você deseja salvar as alterações?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:208
-msgid "_Discard"
-msgstr "_Descartar"
-
-#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:169
 msgid "Error adding list"
 msgstr "Erro ao adicionar lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:229
-#: addressbook/gui/widgets/eab-gui-util.c:652
+#: addressbook/gui/widgets/eab-gui-util.c:169
+#: addressbook/gui/widgets/eab-gui-util.c:580
 msgid "Error adding contact"
 msgstr "Erro ao adicionar contato"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying list"
 msgstr "Erro ao modificar lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying contact"
 msgstr "Erro ao modificar contato"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:192
 msgid "Error removing list"
 msgstr "Erro ao remover lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
-#: addressbook/gui/widgets/eab-gui-util.c:610
+#: addressbook/gui/widgets/eab-gui-util.c:192
+#: addressbook/gui/widgets/eab-gui-util.c:538
 msgid "Error removing contact"
 msgstr "Erro ao remover contato"
 
-#: addressbook/gui/widgets/eab-gui-util.c:334
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2682,7 +2588,7 @@ msgstr ""
 "Abrir %d contatos também abrirá %d novas janelas.\n"
 "Você realmente deseja exibir todos estes contatos?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:360
+#: addressbook/gui/widgets/eab-gui-util.c:300
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2691,49 +2597,44 @@ msgstr ""
 "%s já existe\n"
 "Você deseja sobrescrevê-lo?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:364
+#: addressbook/gui/widgets/eab-gui-util.c:304
 msgid "Overwrite"
 msgstr "Sobrescrever"
 
-#: addressbook/gui/widgets/eab-gui-util.c:400
-#, c-format
-msgid "Error saving %s: %s"
-msgstr "Erro ao salvar %s: %s"
-
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:437
+#: addressbook/gui/widgets/eab-gui-util.c:365
 msgid "card.vcf"
 msgstr "cartao.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:571
+#: addressbook/gui/widgets/eab-gui-util.c:499
 msgid "list"
 msgstr "lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:706
+#: addressbook/gui/widgets/eab-gui-util.c:634
 msgid "Move contact to"
 msgstr "Mover contato para"
 
-#: addressbook/gui/widgets/eab-gui-util.c:708
+#: addressbook/gui/widgets/eab-gui-util.c:636
 msgid "Copy contact to"
 msgstr "Copiar contato para"
 
-#: addressbook/gui/widgets/eab-gui-util.c:711
+#: addressbook/gui/widgets/eab-gui-util.c:639
 msgid "Move contacts to"
 msgstr "Mover contatos para"
 
-#: addressbook/gui/widgets/eab-gui-util.c:713
+#: addressbook/gui/widgets/eab-gui-util.c:641
 msgid "Copy contacts to"
 msgstr "Copiar contatos para"
 
-#: addressbook/gui/widgets/eab-gui-util.c:716
+#: addressbook/gui/widgets/eab-gui-util.c:644
 msgid "Select target addressbook."
 msgstr "Selecionar catálogo de endereços alvo."
 
-#: addressbook/gui/widgets/eab-gui-util.c:939
+#: addressbook/gui/widgets/eab-gui-util.c:867
 msgid "Multiple VCards"
 msgstr "Vários VCards"
 
-#: addressbook/gui/widgets/eab-gui-util.c:942
+#: addressbook/gui/widgets/eab-gui-util.c:870
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard para %s"
@@ -2820,7 +2721,7 @@ msgstr[1] "%d contatos"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:229
+#: addressbook/gui/widgets/e-addressbook-view.c:231
 #: addressbook/gui/widgets/e-minicard-view.c:467
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
@@ -2838,142 +2739,131 @@ msgstr "Modelo"
 msgid "Error modifying card"
 msgstr "Erro ao modificar cartão"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:163
 msgid "Name begins with"
 msgstr "Nome começa com"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:164
 msgid "Email begins with"
 msgstr "E-mail começa com"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:57
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Categoria é"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-#: calendar/gui/cal-search-bar.c:50
+#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Qualquer campo contém"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+#: addressbook/gui/widgets/e-addressbook-view.c:172
 msgid "Advanced..."
 msgstr "Avançado..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:236
+#: addressbook/gui/widgets/e-addressbook-view.c:238
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:249
+#: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Tipo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:506
+#: addressbook/gui/widgets/e-addressbook-view.c:508
 msgid "Address Book"
 msgstr "Catálogo de endereços"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2076
+#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:2080
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
 msgstr "Salvar como VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 msgid "New Contact..."
 msgstr "Novo contato..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "New Contact List..."
 msgstr "Nova lista de contatos..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Go to Folder..."
 msgstr "Ir para pasta..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Import..."
 msgstr "Importar..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1066
 msgid "Search for Contacts..."
 msgstr "Pesquisar contatos..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 msgid "Address Book Sources..."
 msgstr "Fontes de catálogos de endereços..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1069
 msgid "Pilot Settings..."
 msgstr "Configurações do pilot..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Encaminhar contato"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
 msgid "Send Message to Contact"
 msgstr "Enviar mensagem ao contato"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Imprimir"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
+#: addressbook/gui/widgets/e-addressbook-view.c:1077
 msgid "Print Envelope"
 msgstr "Imprimir envelope"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
+#: addressbook/gui/widgets/e-addressbook-view.c:1081
 msgid "Copy to Address Book..."
 msgstr "Copiar para catálogo de endereços..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1080
+#: addressbook/gui/widgets/e-addressbook-view.c:1082
 msgid "Move to Address Book..."
 msgstr "Mover para catálogo de endereços..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Recortar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Copiar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1087
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Colar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:1092
+#: calendar/gui/e-calendar-view.c:1280
 msgid "Current View"
 msgstr "Visão atual"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1309
-#, c-format
-msgid ""
-"The addressbook backend for\n"
-"%s\n"
-"has crashed. You will have to restart Evolution in order to use it again"
-msgstr ""
-"O backend do catálogo de endereços para\n"
-"%s\n"
-"capotou. Você tera que reiniciar o Evolution para poder usá-lo novamente"
-
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1667
-#: calendar/gui/cal-search-bar.c:362
+#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Qualquer categoria"
 
@@ -3079,7 +2969,7 @@ msgstr "Rádio"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-list-view.c:234
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Papel"
@@ -3221,12 +3111,12 @@ msgstr "Importador VCard do Evolution"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: addressbook/printing/e-contact-print.c:998
+#: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr "Imprimir contatos"
 
-#: addressbook/printing/e-contact-print.c:1064
-#: addressbook/printing/e-contact-print.c:1091
+#: addressbook/printing/e-contact-print.c:1066
+#: addressbook/printing/e-contact-print.c:1093
 msgid "Print contact"
 msgstr "Imprimir contato"
 
@@ -3476,15 +3366,21 @@ msgstr "No modo normal não é necessário a opção de tamanho."
 msgid "Impossible internal error."
 msgstr "Erro interno impossível."
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:629
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
 msgid "Can not open file"
 msgstr "Não é possível abrir arquivo"
 
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-msgid "Can not load URI"
-msgstr "Não é possível carregar URI"
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "Não foi possível carregar catálogo de endereços"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Não é possível abrir o catálogo de endereços"
 
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
@@ -3502,7 +3398,7 @@ msgstr "Não foi fornecido um nome de arquivo."
 msgid "Unnamed List"
 msgstr "Lista sem nome"
 
-#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Entre a senha"
@@ -3777,10 +3673,10 @@ msgid "Whether to show week numbers in date navigator"
 msgstr "Se é necessário exibir o número da semana no navegador de datas"
 
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:88
-#: calendar/gui/gnome-cal.c:1703
-#: camel/providers/groupwise/camel-gw-listener.c:304
-#: camel/providers/groupwise/camel-gw-listener.c:327
+#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/gnome-cal.c:1705
+#: camel/providers/groupwise/camel-gw-listener.c:311
+#: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
 msgstr "Agenda"
 
@@ -3800,7 +3696,7 @@ msgstr "Apagar permanentemente eventos com idade superior a"
 
 #: calendar/gui/calendar-commands.c:363
 #: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:19 filter/filter.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
 msgid "days"
 msgstr "dias"
 
@@ -3946,23 +3842,23 @@ msgstr "Visão de semana"
 msgid "Month View"
 msgstr "Visão de mês"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Resumo contém"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Descrição contém"
 
-#: calendar/gui/cal-search-bar.c:54
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Comentário contém"
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:53
 msgid "Location contains"
 msgstr "Local contém"
 
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
 msgid "Unmatched"
 msgstr "Não casadas"
 
@@ -3983,23 +3879,23 @@ msgstr "Permissão negada para abrir a agenda"
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/dialogs/alarm-options.c:466
+#: calendar/gui/dialogs/alarm-options.c:467
 msgid "Audio Alarm Options"
 msgstr "Opções do alarme audível"
 
-#: calendar/gui/dialogs/alarm-options.c:475
+#: calendar/gui/dialogs/alarm-options.c:476
 msgid "Message Alarm Options"
 msgstr "Opções do alarme de mensagens"
 
-#: calendar/gui/dialogs/alarm-options.c:484
+#: calendar/gui/dialogs/alarm-options.c:485
 msgid "Email Alarm Options"
 msgstr "Opções do alarme de e-mail"
 
-#: calendar/gui/dialogs/alarm-options.c:493
+#: calendar/gui/dialogs/alarm-options.c:494
 msgid "Program Alarm Options"
 msgstr "Opções do alarme de programa"
 
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:510
 msgid "Unknown Alarm Options"
 msgstr "Opções do alarme desconhecido"
 
@@ -4035,7 +3931,7 @@ msgstr "Enviar para:"
 msgid "With these arguments:"
 msgstr "Com estes argumentos:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
 msgid "dialog1"
 msgstr "dialog1"
 
@@ -4044,7 +3940,7 @@ msgid "extra times every"
 msgstr "vezes extra a cada"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:20 filter/filter.glade.h:16
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr "horas"
 
@@ -4090,7 +3986,7 @@ msgstr "Enviar um e-mail"
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Resumo:"
 
@@ -4120,7 +4016,6 @@ msgid "hour(s)"
 msgstr "hora(s)"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:21
 msgid "minute(s)"
 msgstr "minuto(s)"
 
@@ -4128,26 +4023,26 @@ msgstr "minuto(s)"
 msgid "start of appointment"
 msgstr "início do compromisso"
 
-#: calendar/gui/dialogs/calendar-setup.c:170
+#: calendar/gui/dialogs/calendar-setup.c:172
 msgid "You must specify a location to get the calendar from."
 msgstr "Você deve especificar um local de onde pegar a agenda."
 
-#: calendar/gui/dialogs/calendar-setup.c:178
+#: calendar/gui/dialogs/calendar-setup.c:180
 #, c-format
 msgid "The source location '%s' is not well-formed."
 msgstr "O local fonte '%s' não é bem formado."
 
-#: calendar/gui/dialogs/calendar-setup.c:193
+#: calendar/gui/dialogs/calendar-setup.c:195
 #, c-format
 msgid "The source location '%s' is not a webcal source."
 msgstr "O local fonte '%s' não é uma fonte webcal."
 
-#: calendar/gui/dialogs/calendar-setup.c:265
+#: calendar/gui/dialogs/calendar-setup.c:275
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr "A fonte com o nome '%s' já existe no grupo selecionado"
 
-#: calendar/gui/dialogs/calendar-setup.c:278
+#: calendar/gui/dialogs/calendar-setup.c:288
 #, c-format
 msgid ""
 "The group '%s' is remote. You must specify a location to get the calendar "
@@ -4167,51 +4062,31 @@ msgstr "Adicionar grupo de tarefas"
 msgid "C_olor:"
 msgstr "C_or:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "Calendar Properties"
-msgstr "Propriedades da agenda"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
 msgid "Pick a color"
 msgstr "Escolha uma cor"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:8
-msgid "Remote"
-msgstr "Remoto"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "Task List Properties"
-msgstr "Propriedades da listas de tarefas"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
 msgid "_Add Calendar"
 msgstr "_Adicionar agenda"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
 msgid "_Add Group"
 msgstr "_Adicionar group"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-msgid "_Refresh Interval:"
-msgstr "_Intervalo de atualização:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
 msgid "_Refresh:"
 msgstr "Atuali_zar:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-msgid "_Source URL:"
-msgstr "URL _fonte:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "_Type:"
 msgstr "_Tipo:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
 msgid "_URL:"
 msgstr "_URL:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
 msgid "weeks"
 msgstr "semanas"
 
@@ -4313,7 +4188,7 @@ msgid "Display"
 msgstr "Exibição"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:76
 msgid "E_nable"
 msgstr "A_tivar"
 
@@ -4323,7 +4198,7 @@ msgstr "Publicação de livre/ocupado"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:563
+#: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Sexta-feira"
 
@@ -4337,7 +4212,7 @@ msgstr "Minutos"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:559
+#: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Segunda-feira"
 
@@ -4347,7 +4222,7 @@ msgstr "_Dom"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:564
+#: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Sábado"
 
@@ -4361,7 +4236,7 @@ msgstr "Exibir _números de semana no navegador de datas"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Domigo"
 
@@ -4375,7 +4250,7 @@ msgstr "Qu_i"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:562
+#: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Quinta-feira"
 
@@ -4389,7 +4264,7 @@ msgstr "Formato da hora:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:560
+#: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Terça-feira"
 
@@ -4399,7 +4274,7 @@ msgstr "Sema_na começa:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:561
+#: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Quarta-feira"
 
@@ -4432,7 +4307,7 @@ msgid "_Day begins:"
 msgstr "Dia _começa:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
-#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:43
@@ -4481,83 +4356,47 @@ msgstr "_Qua"
 msgid "before every appointment"
 msgstr "antes de cada compromisso"
 
-#: calendar/gui/dialogs/cancel-comp.c:57
-msgid ""
-"The event being deleted is a meeting, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"O evento que está sendo apagado é uma reunião. Você gostaria de enviar um "
-"aviso de cancelamento?"
-
-#: calendar/gui/dialogs/cancel-comp.c:60
-msgid "Are you sure you want to cancel and delete this meeting?"
-msgstr "Você tem certeza que deseja cancelar e excluir esta reunião?"
-
-#: calendar/gui/dialogs/cancel-comp.c:66
-msgid ""
-"The task being deleted is assigned, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"A tarefa que está sendo apagada está atribuída. Você gostaria de enviar um "
-"aviso de cancelamento?"
-
-#: calendar/gui/dialogs/cancel-comp.c:69
-msgid "Are you sure you want to cancel and delete this task?"
-msgstr "Você tem certeza que deseja cancelar e excluir esta tarefa?"
-
-#: calendar/gui/dialogs/cancel-comp.c:75
-msgid ""
-"The journal entry being deleted is published, would you like to send a "
-"cancellation notice?"
-msgstr ""
-"O item de diário que está sendo apagado está publicado. Você gostaria de "
-"enviar um aviso de cancelamento?"
-
-#: calendar/gui/dialogs/cancel-comp.c:78
-msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr "Você tem certeza que deseja cancelar e excluir este item de diário?"
-
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Este evento foi excluído."
 
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "Esta tarefa foi excluída."
 
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:68
 msgid "This journal entry has been deleted."
 msgstr "Este item de diário foi excluído."
 
-#: calendar/gui/dialogs/changed-comp.c:75
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  Você fez alterações. Esquecer estas alterações e fechar o editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Você não fez alterações, fechar o editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:82
+#: calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "Este evento foi alterado."
 
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "Esta tarefa foi alterada."
 
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:92
 msgid "This journal entry has been changed."
 msgstr "Este item de diário foi alterado."
 
-#: calendar/gui/dialogs/changed-comp.c:99
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Você fez alterações. Esquecer estas alterações e atualizar o editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Você não fez alterações, atualizar o editor?"
@@ -4595,7 +4434,7 @@ msgid "No summary"
 msgstr "Sem resumo"
 
 #: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
 #: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Salvar como..."
@@ -4649,99 +4488,51 @@ msgstr "Não foi possível abrir destino"
 msgid "Destination is read only"
 msgstr "Destino é apenas para leitura"
 
-#: calendar/gui/dialogs/delete-comp.c:95
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "Você tem certeza que deseja excluir o comprimisso `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:98
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "Você tem certeza que deseja excluir este comprimisso sem título?"
-
-#: calendar/gui/dialogs/delete-comp.c:104
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "Você tem certeza que deseja excluir a tarefa `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:107
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "Você tem certeza que deseja excluir esta tarefa sem título?"
-
-#: calendar/gui/dialogs/delete-comp.c:113
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "Você tem certeza que deseja excluir o item de diário `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:116
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "Você tem certeza que deseja excluir este item de diário sem título?"
-
-#: calendar/gui/dialogs/delete-comp.c:131
-#, c-format
-msgid "Are you sure you want to delete %d appointment?"
-msgid_plural "Are you sure you want to delete %d appointments?"
-msgstr[0] "Você tem certeza que deseja excluir %d comprimisso?"
-msgstr[1] "Você tem certeza que deseja excluir %d comprimissos?"
-
-#: calendar/gui/dialogs/delete-comp.c:138
-#, c-format
-msgid "Are you sure you want to delete %d task?"
-msgid_plural "Are you sure you want to delete %d tasks?"
-msgstr[0] "Você tem certeza que deseja excluir %d tarefa?"
-msgstr[1] "Você tem certeza que deseja excluir %d tarefas?"
-
-#: calendar/gui/dialogs/delete-comp.c:145
-#, c-format
-msgid "Are you sure you want to delete %d journal entry?"
-msgid_plural "Are you sure you want to delete %d journal entries?"
-msgstr[0] "Você tem certeza que deseja excluir %d item de diário?"
-msgstr[1] "Você tem certeza que deseja excluir %d itens de diário?"
-
-#: calendar/gui/dialogs/delete-error.c:52
+#: calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "O evento não pôde ser excluído devido a um erro do corba"
 
-#: calendar/gui/dialogs/delete-error.c:55
+#: calendar/gui/dialogs/delete-error.c:57
 msgid "The task could not be deleted due to a corba error"
 msgstr "A tarefa não pôde ser excluída devido a um erro do corba"
 
-#: calendar/gui/dialogs/delete-error.c:58
+#: calendar/gui/dialogs/delete-error.c:60
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr "O item de diário não pôde ser excluído devido a um erro do corba"
 
-#: calendar/gui/dialogs/delete-error.c:61
+#: calendar/gui/dialogs/delete-error.c:63
 msgid "The item could not be deleted due to a corba error"
 msgstr "O item não pôde ser excluído devido a um erro do corba"
 
-#: calendar/gui/dialogs/delete-error.c:68
+#: calendar/gui/dialogs/delete-error.c:70
 msgid "The event could not be deleted because permission was denied"
 msgstr "O evento não pôde ser excluído porque a permissão foi negada"
 
-#: calendar/gui/dialogs/delete-error.c:71
+#: calendar/gui/dialogs/delete-error.c:73
 msgid "The task could not be deleted because permission was denied"
 msgstr "A tarefa não pôde ser excluída porque a permissão foi negada"
 
-#: calendar/gui/dialogs/delete-error.c:74
+#: calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr "O item de diário não pôde ser excluído porque a permissão foi negada"
 
-#: calendar/gui/dialogs/delete-error.c:77
+#: calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
 msgstr "O item não pôde ser excluído porque a permissão foi negada"
 
-#: calendar/gui/dialogs/delete-error.c:84
+#: calendar/gui/dialogs/delete-error.c:86
 msgid "The event could not be deleted due to an error"
 msgstr "O evento não pôde ser excluído devido a um erro"
 
-#: calendar/gui/dialogs/delete-error.c:87
+#: calendar/gui/dialogs/delete-error.c:89
 msgid "The task could not be deleted due to an error"
 msgstr "A tarefa não pôde ser excluída devido a um erro"
 
-#: calendar/gui/dialogs/delete-error.c:90
+#: calendar/gui/dialogs/delete-error.c:92
 msgid "The journal entry could not be deleted due to an error"
 msgstr "O item de diário não pôde ser excluído devido a um erro"
 
-#: calendar/gui/dialogs/delete-error.c:93
+#: calendar/gui/dialogs/delete-error.c:95
 msgid "The item could not be deleted due to an error"
 msgstr "O item não pôde ser excluído devido a um erro"
 
@@ -4874,11 +4665,11 @@ msgstr "Hora de _início:"
 
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:3
+#: calendar/gui/dialogs/meeting-page.glade.h:4
 #: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
 #: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1559
-#: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:100
+#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
+#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
@@ -4904,8 +4695,8 @@ msgstr "_Delegar para..."
 #. FIXME: need to disable for undeletable folders
 #: calendar/gui/dialogs/meeting-page.c:655
 #: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1310 calendar/gui/e-calendar-view.c:1342
-#: mail/em-folder-tree.c:2557 mail/em-folder-view.c:919
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
+#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -4913,7 +4704,7 @@ msgid "_Delete"
 msgstr "E_xcluir"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:240
+#: calendar/gui/e-meeting-list-view.c:218
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Participante"
@@ -4949,16 +4740,15 @@ msgid "Member"
 msgstr "Membro"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
-#: mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-list-view.c:248
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Estado"
 
@@ -4966,20 +4756,20 @@ msgstr "Estado"
 msgid "Add A_ttendee"
 msgstr "Adicionar _participante"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "Add attendees from addressbook."
+msgstr "Adicionar remetente ao catálo_go de endereços"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Organizador:"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
+#: calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "_Change Organizer"
 msgstr "_Alterar organizador"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-#: calendar/gui/e-meeting-time-sel.c:417
-msgid "_Invite Others..."
-msgstr "_Convidar outros..."
-
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
 msgstr "<b>Opções da agenda</b>"
@@ -5131,7 +4921,7 @@ msgid "_No recurrence"
 msgstr "_Sem repetição"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:450
+#: composer/e-msg-composer-attachment-bar.c:453
 msgid "_Remove"
 msgstr "_Remover"
 
@@ -5163,52 +4953,18 @@ msgstr "semana(s)"
 msgid "year(s)"
 msgstr "ano(s)"
 
-#: calendar/gui/dialogs/save-comp.c:53
-msgid ""
-"This event has been changed, but has not been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Este evento foi alterado, mas não foi salvo.\n"
-"\n"
-"Você deseja salvar as suas alterações?"
-
-#: calendar/gui/dialogs/save-comp.c:57
-msgid "_Discard Changes"
-msgstr "_Descartar alterações"
-
-#: calendar/gui/dialogs/save-comp.c:62
-msgid "Save Event"
-msgstr "Salvar evento"
-
-#: calendar/gui/dialogs/select-source-dialog.c:65
+#: calendar/gui/dialogs/select-source-dialog.c:69
 msgid "Select destination"
 msgstr "Selecionar destino"
 
-#: calendar/gui/dialogs/select-source-dialog.c:86
+#: calendar/gui/dialogs/select-source-dialog.c:90
 msgid "_Destination"
 msgstr "_Destino"
 
-#: calendar/gui/dialogs/select-source-dialog.c:88
+#: calendar/gui/dialogs/select-source-dialog.c:92
 msgid "Task List"
 msgstr "Lista de tarefas"
 
-#: calendar/gui/dialogs/send-comp.c:57
-msgid "The meeting information has been created. Send it?"
-msgstr "A informação da reunião foi criada. Enviá-la?"
-
-#: calendar/gui/dialogs/send-comp.c:60
-msgid "The meeting information has changed. Send an updated version?"
-msgstr "A informação da reunião foi alterada. Enviar uma versão atualizada?"
-
-#: calendar/gui/dialogs/send-comp.c:67
-msgid "The task assignment information has been created. Send it?"
-msgstr "A informação de atribuição de tarefa foi criada. Enviá-la?"
-
-#: calendar/gui/dialogs/send-comp.c:71
-msgid "The task information has changed. Send an updated version?"
-msgstr "A informação da tarefa foi alterada. Enviar uma versão atualizada?"
-
 #: calendar/gui/dialogs/task-details-page.c:406
 msgid "Completed date is wrong"
 msgstr "A data de conclusão está errada"
@@ -5228,7 +4984,7 @@ msgstr "Concluída"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #: calendar/gui/e-cal-component-preview.c:249
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:960
 msgid "High"
 msgstr "Alta"
 
@@ -5242,14 +4998,14 @@ msgstr "Em progresso"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:253
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:958
 msgid "Low"
 msgstr "Baixa"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:251
 #: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:957
+#: mail/message-list.c:959
 msgid "Normal"
 msgstr "Normal"
 
@@ -5306,8 +5062,8 @@ msgstr "_Confidencial"
 
 #: calendar/gui/dialogs/task-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
+#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Descrição:"
 
@@ -5470,7 +5226,7 @@ msgstr "Prazo de conclusão:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:950
+#: calendar/gui/e-itip-control.c:943
 msgid "Status:"
 msgstr "Estado:"
 
@@ -5554,12 +5310,12 @@ msgstr "Ocupado"
 msgid "Deleting selected objects"
 msgstr "Excluindo objetos selecionados"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
 msgid "Updating objects"
 msgstr "Atualizando objetos"
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1370
+#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
 #: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "A_brir"
@@ -5569,15 +5325,15 @@ msgid "Open _Web Page"
 msgstr "Abrir página _web"
 
 #: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1291 calendar/gui/e-calendar-view.c:1376
-#: mail/em-folder-view.c:896 mail/em-popup.c:690 mail/em-popup.c:806
+#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
+#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "_Salvar como..."
 
 #: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1292
-#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
+#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
@@ -5585,24 +5341,24 @@ msgid "_Print..."
 msgstr "_Imprimir..."
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Recor_tar"
 
 #: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1338
-#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2550
-#: mail/message-list.c:1644 ui/evolution-addressbook.xml.h:31
+#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
+#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
+#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Copiar"
 
 #: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1273 calendar/gui/e-calendar-view.c:1299
-#: calendar/gui/e-calendar-view.c:1372 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
+#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
@@ -5668,67 +5424,67 @@ msgstr "Resumo"
 msgid "Task sort"
 msgstr "Ordenar tarefas"
 
-#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
 msgid "New _Appointment..."
 msgstr "Novo _compromisso..."
 
-#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
+#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
 msgid "New All Day _Event"
 msgstr "Novo _evento de dia inteiro"
 
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
+#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
 msgid "New Meeting"
 msgstr "Nova reunião"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
 msgid "New Task"
 msgstr "Nova tarefa"
 
-#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "Selecionar _hoje"
 
-#: calendar/gui/e-calendar-view.c:1280
+#: calendar/gui/e-calendar-view.c:1283
 msgid "_Select Date..."
 msgstr "Selecionar data..."
 
-#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publicar informação de livre/ocupado"
 
-#: calendar/gui/e-calendar-view.c:1303
+#: calendar/gui/e-calendar-view.c:1306
 msgid "Cop_y to Calendar..."
 msgstr "Copiar para _pasta..."
 
-#: calendar/gui/e-calendar-view.c:1304
+#: calendar/gui/e-calendar-view.c:1307
 msgid "Mo_ve to Calendar..."
 msgstr "_Mover para pasta..."
 
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1308
 msgid "_Schedule Meeting..."
 msgstr "Agendar _reunião..."
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1309
 msgid "_Forward as iCalendar..."
 msgstr "_Encaminhar como iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
 msgid "Delete this _Occurrence"
 msgstr "Exc_luir esta ocorrência"
 
-#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
 msgid "Delete _All Occurrences"
 msgstr "Excl_uir todas as ocorrências"
 
-#: calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1349
 msgid "Go to _Today"
 msgstr "Ir para _hoje"
 
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1351
 msgid "_Go to Date..."
 msgstr "Ir para _data..."
 
-#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "_Configurações..."
 
@@ -5742,9 +5498,9 @@ msgstr "Data de início"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:967 calendar/gui/e-itip-control.c:1169
-#: calendar/gui/e-meeting-list-view.c:144
-#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
 #: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
 #: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
 #: camel/camel-tcp-stream-openssl.c:631
@@ -5770,13 +5526,13 @@ msgid "Assigned"
 msgstr "Atribuido"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr "Sim"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "Não"
 
@@ -5788,7 +5544,7 @@ msgstr "N"
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
 msgid "E"
 msgstr "L"
 
@@ -5860,102 +5616,102 @@ msgstr "%d %b"
 msgid "%02i minute divisions"
 msgstr "%02i frações de minuto"
 
-#: calendar/gui/e-itip-control.c:592
+#: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
 msgstr "Sim. (Repetição complexa)"
 
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:596
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Todo dia"
 msgstr[1] "A cada %d dias"
 
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:601
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Toda semana"
 msgstr[1] "A cada %d semanas"
 
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:603
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "Toda semana em "
 msgstr[1] "A cada %d semanas em "
 
-#: calendar/gui/e-itip-control.c:618
+#: calendar/gui/e-itip-control.c:611
 msgid " and "
 msgstr " e "
 
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:618
 #, c-format
 msgid "The %s day of "
 msgstr "O %s dia de "
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:631
 #, c-format
 msgid "The %s %s of "
 msgstr "O %s %s de "
 
-#: calendar/gui/e-itip-control.c:645
+#: calendar/gui/e-itip-control.c:638
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "todo mês"
 msgstr[1] "a cada %d meses"
 
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:642
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Todo ano"
 msgstr[1] "A cada %d anos"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:653
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] " um total de %d vez"
 msgstr[1] " um total de %d vezes"
 
-#: calendar/gui/e-itip-control.c:669
+#: calendar/gui/e-itip-control.c:662
 msgid ", ending on "
 msgstr ", terminando em "
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:686
 msgid "<b>Starts:</b> "
 msgstr "<b>Começa:</b> "
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:696
 msgid "<b>Ends:</b> "
 msgstr "<b>Termina:</b> "
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:716
 msgid "<b>Completed:</b> "
 msgstr "<b>Concluída:</b> "
 
-#: calendar/gui/e-itip-control.c:733
+#: calendar/gui/e-itip-control.c:726
 msgid "<b>Due:</b> "
 msgstr "<b>Prazo:</b> "
 
-#: calendar/gui/e-itip-control.c:771 calendar/gui/e-itip-control.c:827
+#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
 msgid "iCalendar Information"
 msgstr "Informação de iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:788
+#: calendar/gui/e-itip-control.c:781
 msgid "iCalendar Error"
 msgstr "Erro de iCalendar"
 
-#: calendar/gui/e-itip-control.c:859 calendar/gui/e-itip-control.c:875
-#: calendar/gui/e-itip-control.c:886 calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
 msgid "An unknown person"
 msgstr "Uma pessoa desconhecida"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:910
+#: calendar/gui/e-itip-control.c:903
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5963,304 +5719,308 @@ msgstr ""
 "<br> Por favor, reveja a seguinte informação e então selecione uma ação a "
 "partir do menu abaixo."
 
-#: calendar/gui/e-itip-control.c:925
+#: calendar/gui/e-itip-control.c:918
 msgid "<i>None</i>"
 msgstr "<i>Nenhum</i>"
 
-#: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:929
+msgid "Location:"
+msgstr "Local:"
+
+#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Aceito"
 
-#: calendar/gui/e-itip-control.c:959 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Aceito preliminarmente"
 
-#: calendar/gui/e-itip-control.c:963 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Recusado"
 
-#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.c:1050
-#: calendar/gui/e-itip-control.c:1076 calendar/gui/e-itip-control.c:1089
-#: calendar/gui/e-itip-control.c:1102 calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
 msgid "Choose an action:"
 msgstr "Escolher uma ação:"
 
-#: calendar/gui/e-itip-control.c:1023
+#: calendar/gui/e-itip-control.c:1016
 msgid "Update"
 msgstr "Atualizar"
 
-#: calendar/gui/e-itip-control.c:1024 calendar/gui/e-itip-control.c:1055
-#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1091
-#: calendar/gui/e-itip-control.c:1104 calendar/gui/e-itip-control.c:1117
-#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
+#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1044
 msgid "Accept"
 msgstr "Aceitar"
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1045
 msgid "Tentatively accept"
 msgstr "Aceitar preliminarmente"
 
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1046
 msgid "Decline"
 msgstr "Recusar"
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1070
 msgid "Send Free/Busy Information"
 msgstr "Enviar informação de livre/ocupado"
 
-#: calendar/gui/e-itip-control.c:1090
+#: calendar/gui/e-itip-control.c:1083
 msgid "Update respondent status"
 msgstr "Atualizar estado do respondente"
 
-#: calendar/gui/e-itip-control.c:1103
+#: calendar/gui/e-itip-control.c:1096
 msgid "Send Latest Information"
 msgstr "Enviar informação mais recente"
 
-#: calendar/gui/e-itip-control.c:1116 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1185
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> publicou informação de reunião."
 
-#: calendar/gui/e-itip-control.c:1193
+#: calendar/gui/e-itip-control.c:1186
 msgid "Meeting Information"
 msgstr "Informação de reunião"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1191
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> requisita a presença de %s em uma reunião."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1193
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> requisita a sua presença em uma reunião."
 
-#: calendar/gui/e-itip-control.c:1201
+#: calendar/gui/e-itip-control.c:1194
 msgid "Meeting Proposal"
 msgstr "Proposta de reunião"
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> deseja adicioná-lo a uma reunião existente."
 
-#: calendar/gui/e-itip-control.c:1206
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Update"
 msgstr "Atualização de reunião"
 
-#: calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1203
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> deseja receber a informação de reunião mais recente."
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1204
 msgid "Meeting Update Request"
 msgstr "_Pedido de atualização de reunião"
 
-#: calendar/gui/e-itip-control.c:1218
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> respondeu a um pedido de reunião."
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Reply"
 msgstr "Resposta a reunião"
 
-#: calendar/gui/e-itip-control.c:1226
+#: calendar/gui/e-itip-control.c:1219
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> cancelou uma reunião."
 
-#: calendar/gui/e-itip-control.c:1227
+#: calendar/gui/e-itip-control.c:1220
 msgid "Meeting Cancellation"
 msgstr "Cancelamento de reunião"
 
-#: calendar/gui/e-itip-control.c:1234 calendar/gui/e-itip-control.c:1302
-#: calendar/gui/e-itip-control.c:1337
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1330
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> enviou uma mensagem incompreensível."
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1228
 msgid "Bad Meeting Message"
 msgstr "Mensagem de reunião inválida"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1253
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> publicou informação de tarefa."
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1254
 msgid "Task Information"
 msgstr "Informação de tarefa"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1259
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> requisita que %s execute uma tarefa."
 
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> requisita que você execute uma tarefa."
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1262
 msgid "Task Proposal"
 msgstr "Proposta de tarefa"
 
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> deseja acrescentá-lo a uma tarefa existente."
 
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Update"
 msgstr "Atualização de tarefa"
 
-#: calendar/gui/e-itip-control.c:1278
+#: calendar/gui/e-itip-control.c:1271
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> deseja receber a informação de tarefa mais recente."
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1272
 msgid "Task Update Request"
 msgstr "Pedido de atualização de tarefa"
 
-#: calendar/gui/e-itip-control.c:1286
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> respondeu a uma atribuição de tarefa."
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Reply"
 msgstr "Resposta a tarefa"
 
-#: calendar/gui/e-itip-control.c:1294
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> cancelou uma tarefa."
 
-#: calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1288
 msgid "Task Cancellation"
 msgstr "Cancelamento de tarefa"
 
-#: calendar/gui/e-itip-control.c:1303
+#: calendar/gui/e-itip-control.c:1296
 msgid "Bad Task Message"
 msgstr "Mensagem de tarefa inválida"
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1315
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> publicou informação de livre/ocupado."
 
-#: calendar/gui/e-itip-control.c:1323
+#: calendar/gui/e-itip-control.c:1316
 msgid "Free/Busy Information"
 msgstr "Informação de livre/ocupado"
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> requisita sua informação de livre/ocupado."
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1321
 msgid "Free/Busy Request"
 msgstr "Pedido de livre/ocupado"
 
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1325
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> respondeu a um pedido de livre/ocupado."
 
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1326
 msgid "Free/Busy Reply"
 msgstr "Resposta de livre/ocupado"
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1331
 msgid "Bad Free/Busy Message"
 msgstr "Mensagem de livre/ocupado inválida"
 
-#: calendar/gui/e-itip-control.c:1413
+#: calendar/gui/e-itip-control.c:1406
 msgid "The message does not appear to be properly formed"
 msgstr "A mensagem não aparenta estar formada corretamente."
 
-#: calendar/gui/e-itip-control.c:1472
+#: calendar/gui/e-itip-control.c:1465
 msgid "The message contains only unsupported requests."
 msgstr "A mensagem contém apenas pedidos não suportados."
 
-#: calendar/gui/e-itip-control.c:1503
+#: calendar/gui/e-itip-control.c:1496
 msgid "The attachment does not contain a valid calendar message"
 msgstr "O anexo não contém uma mensagem de agenda válida"
 
-#: calendar/gui/e-itip-control.c:1535
+#: calendar/gui/e-itip-control.c:1528
 msgid "The attachment has no viewable calendar items"
 msgstr "O anexo não contém itens de agenda visualizáveis"
 
-#: calendar/gui/e-itip-control.c:1769
+#: calendar/gui/e-itip-control.c:1762
 msgid "Update complete\n"
 msgstr "Atualização concluída\n"
 
-#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
+#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Estado do participante não pôde ser atualizado pois o item não existe mais"
 
-#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objeto é inválido e não pode ser atualizado\n"
 
-#: calendar/gui/e-itip-control.c:1825
+#: calendar/gui/e-itip-control.c:1818
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Esta resposta não é de um participante atual. Adicioná-lo como participante?"
 
-#: calendar/gui/e-itip-control.c:1837
+#: calendar/gui/e-itip-control.c:1830
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Estado do participante não pôde ser atualizado devido a um estado inválido!\n"
 
-#: calendar/gui/e-itip-control.c:1856
+#: calendar/gui/e-itip-control.c:1849
 msgid "There was an error on the CORBA system\n"
 msgstr "Ocorreu um erro no sistema CORBA\n"
 
-#: calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1852
 msgid "Object could not be found\n"
 msgstr "Objeto não pôde ser encontrado\n"
 
-#: calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1855
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Você não possui as permissões corretas para atualizar a agenda\n"
 
-#: calendar/gui/e-itip-control.c:1865
+#: calendar/gui/e-itip-control.c:1858
 msgid "Attendee status updated\n"
 msgstr "Estado do participante atualizado\n"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1861
 msgid "Attendee status could not be updated!\n"
 msgstr "Estado do participante não pôde ser atualizado!\n"
 
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1892
 msgid "Removal Complete"
 msgstr "Remoção concluída"
 
-#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
 msgid "Item sent!\n"
 msgstr "Item enviado!\n"
 
-#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
+#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
 msgid "The item could not be sent!\n"
 msgstr "O item não pôde ser enviado!\n"
 
@@ -6301,74 +6061,74 @@ msgstr "data-fim"
 msgid "date-start"
 msgstr "data-inicio"
 
-#: calendar/gui/e-meeting-list-view.c:62
+#: calendar/gui/e-meeting-list-view.c:59
 msgid "Chair Persons"
 msgstr "Moderadores"
 
-#: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:479
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
 msgid "Required Participants"
 msgstr "Participantes necessários"
 
-#: calendar/gui/e-meeting-list-view.c:64
+#: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Participantes opcionais"
 
-#: calendar/gui/e-meeting-list-view.c:65
+#: calendar/gui/e-meeting-list-view.c:62
 msgid "Resources"
 msgstr "Recursos"
 
-#: calendar/gui/e-meeting-list-view.c:140 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
 #: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr "Indivíduo"
 
-#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "Grupo"
 
-#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr "Recurso"
 
-#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr "Sala"
 
-#: calendar/gui/e-meeting-list-view.c:154 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr "Moderador"
 
-#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:127
 #: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
 msgid "Required Participant"
 msgstr "Participante necessário"
 
-#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr "Participante opcional"
 
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr "Não participante"
 
-#: calendar/gui/e-meeting-list-view.c:179 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:177
 #: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
 msgid "Needs Action"
 msgstr "Necessita ação"
 
-#: calendar/gui/e-meeting-list-view.c:182 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
 #: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "Preliminar"
 
-#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr "Delegado"
@@ -6385,20 +6145,28 @@ msgstr "Fora do escritório"
 msgid "No Information"
 msgstr "Sem informação"
 
+#: calendar/gui/e-meeting-time-sel.c:417
+#, fuzzy
+msgid "Add attendees from addressbook"
+msgstr "Adicionar remetente ao catálo_go de endereços"
+
 #: calendar/gui/e-meeting-time-sel.c:440
 msgid "_Options"
 msgstr "_Opções"
 
 #: calendar/gui/e-meeting-time-sel.c:457
-msgid "Show _Only Working Hours"
+#, fuzzy
+msgid "Show _only working hours"
 msgstr "Exibir apenas _horas do expediente"
 
 #: calendar/gui/e-meeting-time-sel.c:467
-msgid "Show _Zoomed Out"
+#, fuzzy
+msgid "Show _zoomed out"
 msgstr "Exibir com _menos ampliação"
 
 #: calendar/gui/e-meeting-time-sel.c:482
-msgid "_Update Free/Busy"
+#, fuzzy
+msgid "_Update free/busy"
 msgstr "_Atualizar livre/ocupado"
 
 #: calendar/gui/e-meeting-time-sel.c:497
@@ -6414,19 +6182,23 @@ msgid ">_>"
 msgstr ">_>"
 
 #: calendar/gui/e-meeting-time-sel.c:547
-msgid "_All People and Resources"
+#, fuzzy
+msgid "_All people and resources"
 msgstr "_Todas as pessoas e recursos"
 
 #: calendar/gui/e-meeting-time-sel.c:556
-msgid "All _People and One Resource"
+#, fuzzy
+msgid "All _people and one resource"
 msgstr "Todas as _pessoas e um recurso"
 
 #: calendar/gui/e-meeting-time-sel.c:565
-msgid "_Required People"
+#, fuzzy
+msgid "_Required people"
 msgstr "Pessoas _necessárias"
 
 #: calendar/gui/e-meeting-time-sel.c:574
-msgid "Required People and _One Resource"
+#, fuzzy
+msgid "Required people and _one resource"
 msgstr "Pessoas necessárias e _um recurso"
 
 #: calendar/gui/e-meeting-time-sel.c:593
@@ -6464,7 +6236,7 @@ msgstr "%d/%m/%Y"
 msgid "Enter the password for %s"
 msgstr "Entre a senha para %s"
 
-#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6473,19 +6245,14 @@ msgstr ""
 "Erro em %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr "O backend de tarefas para '%s' capotou."
-
 #. FIXME Loading should be async
 #. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:686
+#: calendar/gui/e-tasks.c:801
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Abrindo tarefas em %s"
 
-#: calendar/gui/e-tasks.c:709
+#: calendar/gui/e-tasks.c:824
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6494,52 +6261,47 @@ msgstr ""
 "Erro abrindo %s:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:730
+#: calendar/gui/e-tasks.c:845
 msgid "Loading tasks"
 msgstr "Carregando tarefas"
 
-#: calendar/gui/e-tasks.c:834
+#: calendar/gui/e-tasks.c:949
 msgid "Completing tasks..."
 msgstr "Concluindo tarefas..."
 
-#: calendar/gui/e-tasks.c:857
+#: calendar/gui/e-tasks.c:972
 msgid "Deleting selected objects..."
 msgstr "Excluindo objetos selecionados..."
 
-#: calendar/gui/e-tasks.c:884
+#: calendar/gui/e-tasks.c:999
 msgid "Expunging"
 msgstr "Excluindo permanentemente"
 
-#: calendar/gui/e-tasks.c:960
+#: calendar/gui/e-tasks.c:1075
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
-#: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
+#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
+#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
 #: calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:705
 msgid "Tasks"
 msgstr "Tarefas"
 
-#: calendar/gui/gnome-cal.c:1876
+#: calendar/gui/gnome-cal.c:1878
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Carregando compromissos em %s"
 
-#: calendar/gui/gnome-cal.c:1895
+#: calendar/gui/gnome-cal.c:1897
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Carregando tarefas em %s"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1920
 #, c-format
 msgid "Opening %s"
 msgstr "Abrindo %s"
 
-#: calendar/gui/gnome-cal.c:2048
-#, c-format
-msgid "The calendar backend for '%s' has crashed."
-msgstr "O backend de agenda para '%s' capotou."
-
-#: calendar/gui/gnome-cal.c:2894
+#: calendar/gui/gnome-cal.c:2906
 msgid "Purging"
 msgstr "Excluindo permanentemente"
 
@@ -6737,7 +6499,7 @@ msgid "On The Web"
 msgstr "Na web"
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 "Não é possível migrar as configurações antigas de evolution/config.xmldb"
@@ -6749,7 +6511,7 @@ msgid "Unable to migrate calendar `%s'"
 msgstr "Não é possível migrar agenda `%s'"
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:869
+#: calendar/gui/migration.c:889
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Não é possível migrar tarefas `%s'"
@@ -6985,45 +6747,45 @@ msgstr "Imprimir item"
 msgid "Print Setup"
 msgstr "Configurar impressão..."
 
-#: calendar/gui/tasks-component.c:303
+#: calendar/gui/tasks-component.c:313
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 "A lista de tarefas '%s' será removida. Você tem certeza que deseja continuar?"
 
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:371
 msgid "New Task List"
 msgstr "Nova lista de tarefas"
 
-#: calendar/gui/tasks-component.c:398
+#: calendar/gui/tasks-component.c:408
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d tarefa"
 msgstr[1] "%d tarefas"
 
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] "%d selecionada"
 msgstr[1] "%d selecionadas"
 
-#: calendar/gui/tasks-component.c:447
+#: calendar/gui/tasks-component.c:457
 msgid "Failed upgrading tasks."
 msgstr "Falhou a atualização das tarefas."
 
-#: calendar/gui/tasks-component.c:526
+#: calendar/gui/tasks-component.c:749
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 "Não é possível abrir a lista de tarefas '%s' para criar eventos e reuniões"
 
-#: calendar/gui/tasks-component.c:538
+#: calendar/gui/tasks-component.c:761
 msgid "There is no calendar available for creating tasks"
 msgstr "Não existe agenda disponível para a criação de tarefas"
 
-#: calendar/gui/tasks-component.c:576
+#: calendar/gui/tasks-component.c:799
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
@@ -7031,27 +6793,27 @@ msgstr ""
 "A lista de tarefas selecionada é de apenas leitura, eventos não podem ser "
 "criados. Por favor, selecione uma agenda com possibilidade de escrita."
 
-#: calendar/gui/tasks-component.c:804
+#: calendar/gui/tasks-component.c:1040
 msgid "New task"
 msgstr "Nova tarefa"
 
-#: calendar/gui/tasks-component.c:805
+#: calendar/gui/tasks-component.c:1041
 msgid "_Task"
 msgstr "_Tarefa"
 
-#: calendar/gui/tasks-component.c:806
+#: calendar/gui/tasks-component.c:1042
 msgid "Create a new task"
 msgstr "Criar uma nova tarefa"
 
-#: calendar/gui/tasks-component.c:812
+#: calendar/gui/tasks-component.c:1048
 msgid "New tasks group"
 msgstr "Novo grupo de tarefas"
 
-#: calendar/gui/tasks-component.c:813
+#: calendar/gui/tasks-component.c:1049
 msgid "_Tasks Group"
 msgstr "Grupo de _tarefas"
 
-#: calendar/gui/tasks-component.c:814
+#: calendar/gui/tasks-component.c:1050
 msgid "Create a new tasks group"
 msgstr "Cria um novo grupo de tarefas"
 
@@ -8818,12 +8580,12 @@ msgstr "Erro ao executar pesquisa por filtro: %s: %s"
 msgid "Unsupported operation: append message: for %s"
 msgstr "Operação não suportada: anexar mensagem: para %s"
 
-#: camel/camel-folder.c:1259
+#: camel/camel-folder.c:1262
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Operação não suportada: pesquisa por expressão: para %s"
 
-#: camel/camel-folder.c:1299
+#: camel/camel-folder.c:1302
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Operação não suportada: pesquisa por uids: para %s"
@@ -8836,11 +8598,16 @@ msgstr "Movendo mensagens"
 msgid "Copying messages"
 msgstr "Copiando mensagens"
 
-#: camel/camel-folder.c:1666
-msgid "Learning junk and/or non junk message(s)"
-msgstr "Aprendendo mensagens que são ou não são lixo"
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Alerta"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr ""
 
-#: camel/camel-folder.c:1695
+#: camel/camel-folder.c:1701
 msgid "Filtering new message(s)"
 msgstr "Filtrando novas mensagem(ns)"
 
@@ -8874,15 +8641,15 @@ msgstr "(match-threads) não é permitido dentro de match-all"
 msgid "(match-threads) requires a match type string"
 msgstr "(match-threads) requer uma string de tipo de casamento"
 
-#: camel/camel-folder-search.c:785
+#: camel/camel-folder-search.c:784
 msgid "(match-threads) expects an array result"
 msgstr "(match-threads) requer um resultado vetor"
 
-#: camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:790
 msgid "(match-threads) requires the folder set"
 msgstr "(match-threads) requer um conjunto de pastas"
 
-#: camel/camel-folder-search.c:880
+#: camel/camel-folder-search.c:879
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Executando consulta em cabeçalho desconhecido: %s"
@@ -8917,7 +8684,8 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
 #: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:706
+#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Cancelada."
@@ -9306,7 +9074,7 @@ msgstr "As credenciais de referência expiraram."
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1212
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Resposta de autenticação do servidor inválida."
 
@@ -9668,40 +9436,40 @@ msgstr "importar chaves: não implementado"
 msgid "export keys: unimplemented"
 msgstr "exportar chaves: não implementado"
 
-#: camel/camel-store.c:214
+#: camel/camel-store.c:213
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Não é possível obter pasta: Operação inválida neste repositório"
 
-#: camel/camel-store.c:244
+#: camel/camel-store.c:243
 #, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr "Não é possível criar pasta `%s': pasta existe"
 
-#: camel/camel-store.c:295
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Não é possível criar pasta: Operação inválida neste repositório"
 
-#: camel/camel-store.c:323
+#: camel/camel-store.c:325
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Não é possível criar pasta: %s: pasta existe"
 
-#: camel/camel-store.c:387 camel/camel-vee-store.c:354
+#: camel/camel-store.c:389 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Não é possível excluir pasta: %s: Operação inválida"
 
-#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#: camel/camel-store.c:439 camel/camel-vee-store.c:387
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Não é possível renomear pasta: %s: Operação inválida"
 
-#: camel/camel-store.c:811
+#: camel/camel-store.c:777
 msgid "Trash"
 msgstr "Lixeira"
 
-#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
-#: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/mail-config.glade.h:95
+#: ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Lixo"
 
@@ -9933,12 +9701,12 @@ msgstr "Não existe tal mensagem %s em %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Não é possível copiar ou mover mensagem para uma pasta virtual"
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:374
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Não é possível excluir pasta: %s: Não existe tal pasta"
 
-#: camel/camel-vee-store.c:398
+#: camel/camel-vee-store.c:395
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Não é possível renomear pasta: %s: Não existe tal pasta"
@@ -9979,24 +9747,24 @@ msgstr "Catálogo de endereços e agenda"
 msgid "Post Office Agent SOAP Port:"
 msgstr "Porta SOAP do agente de correio:"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:80
+#: camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "Novell GroupWise"
 msgstr "Novell GroupWise"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:82
+#: camel/providers/groupwise/camel-groupwise-provider.c:85
 msgid "For accessing Novell Groupwise servers"
 msgstr "Para acesssar servidores Novell Groupwise"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: camel/providers/groupwise/camel-groupwise-provider.c:100
 #: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
 msgid "Password"
 msgstr "Senha"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:99
+#: camel/providers/groupwise/camel-groupwise-provider.c:102
 #: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
@@ -10004,8 +9772,8 @@ msgstr ""
 "Esta opção estabelelece conexão com o servidor IMAP usando uma senha em "
 "texto claro."
 
-#: camel/providers/groupwise/camel-gw-listener.c:305
-#: camel/providers/groupwise/camel-gw-listener.c:328
+#: camel/providers/groupwise/camel-gw-listener.c:312
+#: camel/providers/groupwise/camel-gw-listener.c:335
 msgid "Checklist"
 msgstr "Lista de tarefas"
 
@@ -10140,13 +9908,13 @@ msgstr ""
 "em texto claro."
 
 #: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:429
+#: camel/providers/imap/camel-imap-store.c:428
 #, c-format
 msgid "IMAP server %s"
 msgstr "Servidor IMAP %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:431
+#: camel/providers/imap/camel-imap-store.c:430
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "Serviço IMAP para %s em %s"
@@ -10156,7 +9924,7 @@ msgstr "Serviço IMAP para %s em %s"
 #: camel/providers/imap/camel-imap-store.c:551
 #: camel/providers/imap/camel-imap-store.c:571
 #: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
+#: camel/providers/nntp/camel-nntp-store.c:209
 #: camel/providers/pop3/camel-pop3-store.c:175
 #: camel/providers/smtp/camel-smtp-transport.c:269
 #: camel/providers/smtp/camel-smtp-transport.c:285
@@ -10173,10 +9941,10 @@ msgstr "SSL não disponível"
 
 #: camel/providers/imap4/camel-imap4-store.c:222
 #: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:815
+#: camel/providers/imap/camel-imap-store.c:845
 #: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:137
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
 #: camel/providers/pop3/camel-pop3-store.c:192
 msgid "Connection cancelled"
 msgstr "Conexão cancelada"
@@ -10191,8 +9959,8 @@ msgstr ""
 "STARTTLS"
 
 #: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:649
-#: camel/providers/imap/camel-imap-store.c:680
+#: camel/providers/imap/camel-imap-store.c:679
+#: camel/providers/imap/camel-imap-store.c:710
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Falhou a conexão ao servidor IMAP %s em modo seguro: %s"
@@ -10201,7 +9969,7 @@ msgstr "Falhou a conexão ao servidor IMAP %s em modo seguro: %s"
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1109
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
 msgid "Unknown error"
 msgstr "Erro desconhecido"
 
@@ -10229,8 +9997,8 @@ msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr "Não é possível obter pasta `%s' no servidor IMAP %s: Desconhecido"
 
 #: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1857
-#: camel/providers/imap/camel-imap-store.c:2235
+#: camel/providers/imap/camel-imap-store.c:1885
+#: camel/providers/imap/camel-imap-store.c:2263
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -10311,12 +10079,12 @@ msgstr "Servidor IMAP %s se desconectou inesperadamente: %s"
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3168
+#: camel/providers/imap/camel-imap-store.c:3194
 msgid "Operation cancelled"
 msgstr "Operação cancelada"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3171
+#: camel/providers/imap/camel-imap-store.c:3197
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "O servidor se desconectou inesperadamente: %s"
@@ -10380,13 +10148,6 @@ msgid "Unable to retrieve message: %s"
 msgstr "Não foi possível buscar a mensagem: %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:219
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -10396,15 +10157,15 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-mbox-folder.c:418
+#: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
 msgstr "Não existe tal mensagem"
 
 #: camel/providers/imap/camel-imap-folder.c:2019
-#: camel/providers/imap/camel-imap-folder.c:2621
-#: camel/providers/nntp/camel-nntp-folder.c:238
+#: camel/providers/imap/camel-imap-folder.c:2622
+#: camel/providers/nntp/camel-nntp-folder.c:220
 msgid "This message is not currently available"
 msgstr "Esta mensagem não está disponível no momento"
 
@@ -10413,7 +10174,23 @@ msgstr "Esta mensagem não está disponível no momento"
 msgid "Fetching summary information for new messages"
 msgstr "Pegando informação de resumo para novas mensagens"
 
-#: camel/providers/imap/camel-imap-folder.c:2659
+#: camel/providers/imap/camel-imap-folder.c:2463
+#, c-format
+msgid "Incomplete server response: no information provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2471
+#, c-format
+msgid "Incomplete server response: no UID provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2484
+#, c-format
+msgid ""
+"Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2660
 msgid "Could not find message body in FETCH response."
 msgstr "Não foi possível localizar corpo da mensagem na resposta FETCH."
 
@@ -10471,43 +10248,43 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Para ler e armazenar correio em servidores IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/imap/camel-imap-store.c:680
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "Extensão SSL/TLS não suportada."
 
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:711
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "Falharam as negociações SSL"
 
-#: camel/providers/imap/camel-imap-store.c:818
+#: camel/providers/imap/camel-imap-store.c:848
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Não foi possível conectar com o comando \"%s\": %s"
 
-#: camel/providers/imap/camel-imap-store.c:1242
+#: camel/providers/imap/camel-imap-store.c:1272
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "O servidor IMAP %s não suporta o tipo de autenticação pedido %s"
 
-#: camel/providers/imap/camel-imap-store.c:1252
+#: camel/providers/imap/camel-imap-store.c:1282
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Sem suporte para o tipo de autenticação %s"
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1305
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sPor favor, entre a senha IMAP para %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1289
+#: camel/providers/imap/camel-imap-store.c:1319
 msgid "You didn't enter a password."
 msgstr "Você não entrou uma senha."
 
-#: camel/providers/imap/camel-imap-store.c:1318
+#: camel/providers/imap/camel-imap-store.c:1348
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10518,18 +10295,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1839
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:1867
+#: camel/providers/imap/camel-imap-store.c:2057
 #, c-format
 msgid "No such folder %s"
 msgstr "Não existe a pasta %s"
 
-#: camel/providers/imap/camel-imap-store.c:1915
-#: camel/providers/imap/camel-imap-store.c:2296
+#: camel/providers/imap/camel-imap-store.c:1943
+#: camel/providers/imap/camel-imap-store.c:2324
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "A pasta pai não pode conter sub-pastas"
 
-#: camel/providers/imap/camel-imap-store.c:1970
+#: camel/providers/imap/camel-imap-store.c:1998
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10537,7 +10314,7 @@ msgstr "A pasta pai não pode conter sub-pastas"
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Não é possível criar pasta `%s': pasta existe."
 
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:2274
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Pasta pai desconhecida: %s"
@@ -10573,20 +10350,20 @@ msgid "Index message body data"
 msgstr "Dados do índice de corpo de mensagens"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:388
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:393
-#: camel/providers/local/camel-local-folder.c:396
+#: camel/providers/local/camel-local-folder.c:392
+#: camel/providers/local/camel-local-folder.c:395
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "caixa postal:%s (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:400
+#: camel/providers/local/camel-local-folder.c:399
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -10647,7 +10424,7 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:142
 #: camel/providers/local/camel-local-store.c:253
-#: camel/providers/local/camel-mbox-store.c:356
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10720,8 +10497,25 @@ msgstr "Cancelado o acréscimo de mensagem maildir"
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Não é possível acrescentar mensagem à pasta maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:226
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mbox-folder.c:417
+#: camel/providers/local/camel-mbox-folder.c:436
+#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:475
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-mh-folder.c:221
+#, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+"Não é possível obter mensagem: %s da pasta %s\n"
+"  %s"
+
+#: camel/providers/local/camel-maildir-folder.c:236
 msgid "Invalid message contents"
 msgstr "Conteúdo de mensagem inválido"
 
@@ -10762,9 +10556,9 @@ msgstr "Não foi possível excluir a pasta `%s': %s"
 msgid "not a maildir directory"
 msgstr "não é um diretório maildir"
 
-#: camel/providers/local/camel-maildir-store.c:341
-#: camel/providers/local/camel-spool-store.c:286
-#: camel/providers/local/camel-spool-store.c:316
+#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-spool-store.c:284
+#: camel/providers/local/camel-spool-store.c:314
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Não foi possível varrer pasta `%s': %s"
@@ -10811,27 +10605,18 @@ msgstr "Acréscimo de correio cancelado"
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Não é possível acrescentar mensagem ao arquivo mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:435
-#: camel/providers/local/camel-mbox-folder.c:466
-#: camel/providers/local/camel-mbox-folder.c:474
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"Não é possível obter mensagem: %s da pasta %s\n"
-"  %s"
-
-#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:468
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "A pasta aparenta estar corrompida de modo irrecuperável."
 
-#: camel/providers/local/camel-mbox-folder.c:475
-msgid "Message construction failed: Corrupt mailbox?"
+#: camel/providers/local/camel-mbox-folder.c:476
+#: camel/providers/local/camel-mh-folder.c:222
+#, fuzzy
+msgid "Message construction failed."
 msgstr "Falha ao construir a mensagem: Caixa postal corrompida?"
 
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:362
+#: camel/providers/local/camel-mbox-store.c:361
 msgid "Cannot create a folder by this name."
 msgstr "Não é possível criar uma pasta com este nome."
 
@@ -10861,30 +10646,30 @@ msgstr "`%s' não é um arquivo comum."
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Pasta `%s' não está vazia. Ela não foi excluída."
 
-#: camel/providers/local/camel-mbox-store.c:375
+#: camel/providers/local/camel-mbox-store.c:374
 #, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Não foi possível criar o diretório `%s': %s."
 
-#: camel/providers/local/camel-mbox-store.c:389
+#: camel/providers/local/camel-mbox-store.c:388
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Não é possível criar pasta: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:391
+#: camel/providers/local/camel-mbox-store.c:390
 msgid "Folder already exists"
 msgstr "A pasta já existe"
 
-#: camel/providers/local/camel-mbox-store.c:473
+#: camel/providers/local/camel-mbox-store.c:472
 msgid "The new folder name is illegal."
 msgstr "O novo nome de pasta não é válido."
 
-#: camel/providers/local/camel-mbox-store.c:486
+#: camel/providers/local/camel-mbox-store.c:485
 #, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Não foi possível renomear `%s': `%s': %s"
 
-#: camel/providers/local/camel-mbox-store.c:561
+#: camel/providers/local/camel-mbox-store.c:560
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Não foi possível renomear '%s' para %s: %s"
@@ -11075,7 +10860,7 @@ msgstr ""
 "A pasta pode estar corrompida, cópia salva em `%s'"
 
 #: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:997
+#: camel/providers/nntp/camel-nntp-store.c:1126
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Por favor, entre a senha NNTP para %s@%s"
@@ -11092,18 +10877,10 @@ msgstr "Falha ao enviar o nome do usuário ao servidor"
 msgid "Server rejected username/password"
 msgstr "O servidor rejeitou o nome do usuário/senha"
 
-#: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:263
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr "O usuário cancelou"
-
-#: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:259
-#: camel/providers/nntp/camel-nntp-folder.c:265
+#: camel/providers/nntp/camel-nntp-folder.c:147
+#: camel/providers/nntp/camel-nntp-folder.c:149
+#: camel/providers/nntp/camel-nntp-folder.c:158
+#: camel/providers/nntp/camel-nntp-folder.c:234
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11112,61 +10889,49 @@ msgstr "O usuário cancelou"
 msgid "Cannot get message %s: %s"
 msgstr "Não é possível obter mensagem: %s: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:188
-#: camel/providers/nntp/camel-nntp-folder.c:228
+#: camel/providers/nntp/camel-nntp-folder.c:156
+#: camel/providers/nntp/camel-nntp-folder.c:232
+#: camel/providers/nntp/camel-nntp-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+msgid "User cancelled"
+msgstr "O usuário cancelou"
+
+#: camel/providers/nntp/camel-nntp-folder.c:176
+#: camel/providers/nntp/camel-nntp-folder.c:208
 #, c-format
 msgid "Internal error: uid in invalid format: %s"
 msgstr "Erro interno: uid em formato inválido: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:201
-#, c-format
-msgid "Could not get article %s from NNTP server"
-msgstr "Não foi possível obter artigo %s do servidor NNTP"
-
-#: camel/providers/nntp/camel-nntp-folder.c:362
-msgid "Posting not allowed by news server"
-msgstr "Publicação não permitida pelo servidor de notícias"
-
+#: camel/providers/nntp/camel-nntp-folder.c:328
+#: camel/providers/nntp/camel-nntp-folder.c:331
 #: camel/providers/nntp/camel-nntp-folder.c:373
-#, c-format
-msgid "Failed to send newsgroups header: %s: message not posted"
-msgstr ""
-"Falha ao enviar cabeçalho do grupo de notícias: %s: mensagem não publicada"
-
-#: camel/providers/nntp/camel-nntp-folder.c:413
-#: camel/providers/nntp/camel-nntp-folder.c:426
-#, c-format
-msgid "Error posting to newsgroup: %s: message not posted"
-msgstr "Erro ao publicar no grupo de notícias: %s: mensagem não publicada"
-
-#: camel/providers/nntp/camel-nntp-folder.c:438
-msgid "Error reading response to posted message: message not posted"
-msgstr "Erro ao ler resposta à mensagem publicada: mensagem não publicada"
-
-#: camel/providers/nntp/camel-nntp-folder.c:441
-#, c-format
-msgid "Error posting message: %s: message not posted"
-msgstr "Erro ao publicar mensagem: %s: mensagem não publicada"
+#: camel/providers/nntp/camel-nntp-folder.c:375
+#, fuzzy, c-format
+msgid "Posting failed: %s"
+msgstr "Falhou a operação: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:457
+#: camel/providers/nntp/camel-nntp-folder.c:393
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "Você não pode publicar mensagens NNTP enquanto trabalha desconectado!"
 
-#: camel/providers/nntp/camel-nntp-folder.c:468
+#: camel/providers/nntp/camel-nntp-folder.c:404
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Você não pode copiar mensagens de uma pasta NNTP!"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:44
 msgid "Could not get group list from server."
 msgstr "Não foi possível obter lista de grupos do servidor."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#: camel/providers/nntp/camel-nntp-grouplist.c:97
+#: camel/providers/nntp/camel-nntp-grouplist.c:106
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "Não foi possível carregar arquivo de lista de grupos para %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#: camel/providers/nntp/camel-nntp-grouplist.c:157
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Não foi possível salvar arquivo de lista de grupos para %s: %s"
@@ -11198,26 +10963,29 @@ msgid ""
 msgstr ""
 "Esta opção autenticará com o servidor NNTP usando uma senha em texto claro."
 
-#: camel/providers/nntp/camel-nntp-store.c:158
+#: camel/providers/nntp/camel-nntp-store.c:118
+#: camel/providers/nntp/camel-nntp-store.c:1233
+#: camel/providers/nntp/camel-nntp-store.c:1331
+#, c-format
+msgid "NNTP Command failed: %s"
+msgstr "Falhou o comando NNTP: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:227
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Não foi possível ler saudação de %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:170
+#: camel/providers/nntp/camel-nntp-store.c:239
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "Servidor NNTP %s retornou código de erro %d: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:326
+#: camel/providers/nntp/camel-nntp-store.c:403
 #, c-format
 msgid "USENET News via %s"
 msgstr "Notícias USENET via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:640
-msgid "Stream error"
-msgstr "Erro no stream"
-
-#: camel/providers/nntp/camel-nntp-store.c:643
+#: camel/providers/nntp/camel-nntp-store.c:777
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -11228,7 +10996,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/providers/nntp/camel-nntp-store.c:735
+#: camel/providers/nntp/camel-nntp-store.c:872
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
@@ -11238,7 +11006,7 @@ msgstr ""
 "\n"
 "Não existe tal grupo. O item selecionado provavelmente é uma pasta pai."
 
-#: camel/providers/nntp/camel-nntp-store.c:767
+#: camel/providers/nntp/camel-nntp-store.c:904
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
@@ -11248,62 +11016,63 @@ msgstr ""
 "\n"
 "Grupo de notícias não existe!"
 
-#: camel/providers/nntp/camel-nntp-store.c:792
+#: camel/providers/nntp/camel-nntp-store.c:929
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 "Não é possível criar uma pasta num repositório de notícias: é possível se "
 "inscrever."
 
-#: camel/providers/nntp/camel-nntp-store.c:800
+#: camel/providers/nntp/camel-nntp-store.c:937
 msgid "You cannot rename a folder in a News store."
 msgstr "Não é possível renomear uma pasta num repositório de notícias."
 
-#: camel/providers/nntp/camel-nntp-store.c:808
+#: camel/providers/nntp/camel-nntp-store.c:945
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 "Não é possível remover uma pasta de um repositório de notícias: é possível "
 "cancelar a inscrição."
 
-#: camel/providers/nntp/camel-nntp-summary.c:253
-#, c-format
-msgid "Connection error: %s"
-msgstr "Erro de conexão: %s"
-
-#: camel/providers/nntp/camel-nntp-summary.c:262
-#, c-format
-msgid "No such folder: %s"
-msgstr "Não existe a pasta: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1118
+#, fuzzy
+msgid "Authentication requested but not username provided"
+msgstr "Autenticação necessária"
 
-#: camel/providers/nntp/camel-nntp-summary.c:268
-#, c-format
-msgid "Could not get group: %s"
-msgstr "Não foi possível obter grupo: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1146
+#, fuzzy, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr "Não é possível autenticar-se com o servidor IMAP %s usando %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:333
-msgid "Could not get messages: unspecified error"
-msgstr "Não foi possível obter mensagens: erro não especificado"
+#: camel/providers/nntp/camel-nntp-store.c:1262
+#, fuzzy
+msgid "Not connected."
+msgstr "Sem contatos"
 
-#: camel/providers/nntp/camel-nntp-summary.c:378
+#: camel/providers/nntp/camel-nntp-store.c:1311
 #, c-format
-msgid "NNTP Command failed: %s"
-msgstr "Falhou o comando NNTP: %s"
+msgid "No such folder: %s"
+msgstr "Não existe a pasta: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:438
-#: camel/providers/nntp/camel-nntp-summary.c:543
+#: camel/providers/nntp/camel-nntp-summary.c:218
+#: camel/providers/nntp/camel-nntp-summary.c:314
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Varrendo novas mensagens"
 
-#: camel/providers/nntp/camel-nntp-summary.c:558
-#, c-format
-msgid "Unknown server response: %s"
-msgstr "Resposta desconhecida do servidor: %s"
+#: camel/providers/nntp/camel-nntp-summary.c:225
+#, fuzzy, c-format
+msgid "Unexpected server response from xover: %s"
+msgstr "Resposta inesperada do servidor IMAP: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:605
+#: camel/providers/nntp/camel-nntp-summary.c:328
+#, fuzzy, c-format
+msgid "Unexpected server response from head: %s"
+msgstr "Resposta inesperada do GnuPG: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:368
 msgid "Use cancel"
 msgstr "Usar cancelar"
 
-#: camel/providers/nntp/camel-nntp-summary.c:607
+#: camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Falhou a operação: %s"
@@ -11351,7 +11120,7 @@ msgstr "Excluir após %s dia(s)"
 msgid "Disable support for all POP3 extensions"
 msgstr "Desativar suporte para todas as extensões do POP3"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107
 msgid "POP"
 msgstr "POP"
 
@@ -11440,7 +11209,7 @@ msgid "No such folder `%s'."
 msgstr "Não existe a pasta `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:132
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -11497,7 +11266,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Entrega de correio usando o programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:119
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11781,19 +11550,19 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
+#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:408
 msgid "attachment"
 msgstr "anexo"
 
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:454
 msgid "Remove selected items from the attachment list"
 msgstr "Remover itens selecionados da lista de anexos"
 
-#: composer/e-msg-composer-attachment-bar.c:491
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Add attachment..."
 msgstr "Adicionar anexo..."
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:495
 msgid "Attach a file to the message"
 msgstr "Anexar um arquivo à mensagem"
 
@@ -11856,7 +11625,7 @@ msgstr "Mensagem sem título"
 msgid "Open file"
 msgstr "Abrir arquivo"
 
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
 msgid "Autogenerated"
 msgstr "Auto-gerado"
 
@@ -12002,17 +11771,19 @@ msgstr "Anexar arquivo(s)"
 
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
-msgid "You cannot attach the file `${0}' to this message."
+#, fuzzy
+msgid "You cannot attach the file `{0}' to this message."
 msgstr "Você não pode anexar o arquivo `${0}' à esta mensagem."
 
 #. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4
-msgid "${1}"
-msgstr "${1}"
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr "{1}"
 
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+#, fuzzy
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
 "O arquivo `${0}' não é um arquivo comum e não pode ser enviado em uma "
 "mensagem."
@@ -12109,7 +11880,8 @@ msgstr "Não foi possível criar mensagem."
 
 #. mail-composer:no-build-message secondary
 #: composer/mail-composer-errors.xml.h:34
-msgid "Because \"${0}\", you may need to select different mail options."
+#, fuzzy
+msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 "Devido a \"${0}\", você pode precisar selecionar opções de correio "
 "diferentes."
@@ -12120,9 +11892,11 @@ msgid "Could not read signature file \"{0}\"."
 msgstr "Não foi possível ler arquivo de assinatura \"{0}\"."
 
 #. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38
-msgid "Because \"${1}\"."
-msgstr "Devido a \"${1}\"."
+#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr "Pois \"{1}\"."
 
 #. mail-composer:all-accounts-deleted primary
 #: composer/mail-composer-errors.xml.h:40
@@ -12537,11 +12311,11 @@ msgid "<b>Then</b>"
 msgstr "<b>Então</b>"
 
 #: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1335
+#: mail/mail-account-gui.c:1347
 msgid "Select Folder"
 msgstr "Selecionar pasta"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
 msgid "    "
 msgstr "    "
 
@@ -12597,7 +12371,7 @@ msgstr "atrás"
 msgid "months"
 msgstr "meses"
 
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
 msgid "seconds"
 msgstr "segundos"
 
@@ -12629,20 +12403,20 @@ msgstr "com todas as pastas locais"
 msgid "years"
 msgstr "anos"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:916
-#: mail/mail-config.c:76 mail/mail-config.glade.h:90
+#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
+#: mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Importante"
 
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:919 mail/mail-config.c:79
-#: mail/mail-config.glade.h:145
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: mail/mail-config.glade.h:148
 msgid "To Do"
 msgstr "A fazer"
 
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:920 mail/mail-config.c:80
-#: mail/mail-config.glade.h:94
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: mail/mail-config.glade.h:97
 msgid "Later"
 msgstr "Mais tarde"
 
@@ -12694,252 +12468,6 @@ msgstr "recebidas"
 msgid "outgoing"
 msgstr "enviadas"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Adjust Score"
-msgstr "Ajustar pontuação"
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Color"
-msgstr "Atribuir cor"
-
-#: filter/libfilter-i18n.h:4
-msgid "Assign Score"
-msgstr "Atribuir pontuação"
-
-#: filter/libfilter-i18n.h:5
-msgid "Attachments"
-msgstr "Anexos"
-
-#: filter/libfilter-i18n.h:6
-msgid "Beep"
-msgstr "Bip"
-
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "contém"
-
-#: filter/libfilter-i18n.h:8
-msgid "Copy to Folder"
-msgstr "Copiar para pasta"
-
-#: filter/libfilter-i18n.h:9
-msgid "Date received"
-msgstr "Data de recepção"
-
-#: filter/libfilter-i18n.h:10
-msgid "Date sent"
-msgstr "Data de envio"
-
-#: filter/libfilter-i18n.h:12
-msgid "Deleted"
-msgstr "Excluída"
-
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "não contém"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "não termina com"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "não existe"
-
-#: filter/libfilter-i18n.h:16
-msgid "does not return"
-msgstr "não retorna"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "não soa como"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "não começa com"
-
-#: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
-msgstr "Não existe"
-
-#: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr "Rascunho"
-
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "termina com"
-
-#: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr "Existe"
-
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "existe"
-
-#: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr "Expressão"
-
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr "Continuar"
-
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "é"
-
-#: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr "é após"
-
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr "é antes"
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr "está Marcada"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "é maior que"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "é menor que"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "não é"
-
-#: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr "não está Marcada"
-
-#: filter/libfilter-i18n.h:36
-msgid "Junk Test"
-msgstr "Teste lixo"
-
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
-#: widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Rótulo"
-
-#: filter/libfilter-i18n.h:38
-msgid "Mailing list"
-msgstr "Lista de discussão"
-
-#: filter/libfilter-i18n.h:39
-msgid "Message Body"
-msgstr "Corpo da mensagem"
-
-#: filter/libfilter-i18n.h:40
-msgid "Message Header"
-msgstr "Cabeçalho da mensagem"
-
-#: filter/libfilter-i18n.h:41
-msgid "Message is Junk"
-msgstr "Mensagem é lixo"
-
-#: filter/libfilter-i18n.h:42
-msgid "Message is not Junk"
-msgstr "Mensagem não é lixo"
-
-#: filter/libfilter-i18n.h:43
-msgid "Move to Folder"
-msgstr "Mover para pasta"
-
-#: filter/libfilter-i18n.h:44
-msgid "Pipe to Program"
-msgstr "Enviar (pipe) para programa"
-
-#: filter/libfilter-i18n.h:45
-msgid "Play Sound"
-msgstr "Tocar som"
-
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Lida"
-
-#: filter/libfilter-i18n.h:47
-msgid "Recipients"
-msgstr "Destinatários"
-
-#: filter/libfilter-i18n.h:48
-msgid "Regex Match"
-msgstr "Casamento com expressão regular"
-
-#: filter/libfilter-i18n.h:49
-msgid "Replied to"
-msgstr "Em resposta a"
-
-#: filter/libfilter-i18n.h:50
-msgid "returns"
-msgstr "retorna"
-
-#: filter/libfilter-i18n.h:51
-msgid "returns greater than"
-msgstr "retorna maior que"
-
-#: filter/libfilter-i18n.h:52
-msgid "returns less than"
-msgstr "retorna menor que"
-
-#: filter/libfilter-i18n.h:53
-msgid "Run Program"
-msgstr "Executar programa"
-
-#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Pontuação"
-
-#: filter/libfilter-i18n.h:55
-msgid "Sender"
-msgstr "Remetente"
-
-#: filter/libfilter-i18n.h:56
-msgid "Set Status"
-msgstr "Atribuir estado"
-
-#: filter/libfilter-i18n.h:57
-msgid "Size (kB)"
-msgstr "Tamanho (kB)"
-
-#: filter/libfilter-i18n.h:58
-msgid "sounds like"
-msgstr "soa como"
-
-#: filter/libfilter-i18n.h:59
-msgid "Source Account"
-msgstr "Conta fonte"
-
-#: filter/libfilter-i18n.h:60
-msgid "Specific header"
-msgstr "Cabeçalho específico"
-
-#: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "começa com"
-
-#: filter/libfilter-i18n.h:63
-msgid "Stop Processing"
-msgstr "Parar o processamento"
-
-#: filter/libfilter-i18n.h:64 mail/em-format.c:755 mail/em-format-html.c:1519
-#: mail/em-format-quote.c:302 mail/em-mailer-prefs.c:87
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
-#: smime/lib/e-cert.c:1079
-msgid "Subject"
-msgstr "Assunto"
-
-#: filter/libfilter-i18n.h:65
-msgid "Unset Status"
-msgstr "Desconfigurar estado"
-
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Adicionar regra"
@@ -12956,6 +12484,11 @@ msgstr "Nome da regra"
 msgid "_Score Rules"
 msgstr "Regras de _pontuação"
 
+#: filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Pontuação"
+
 #: filter/searchtypes.xml.h:1
 msgid "Body contains"
 msgstr "Corpo contém"
@@ -13034,13 +12567,13 @@ msgstr "Assinatura(s)"
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Mensagem encaminhada --------"
 
-#: mail/em-composer-utils.c:1499
+#: mail/em-composer-utils.c:1495
 msgid "an unknown sender"
 msgstr "um remetente desconhecido"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1509
+#: mail/em-composer-utils.c:1505
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "Em %a, %Y-%m-%d às %H:%M %%+05d, %%s escreveu:"
 
@@ -13078,8 +12611,8 @@ msgstr "<clique aqui para selecionar uma pasta>"
 msgid "Create New Folder"
 msgstr "Criar nova pasta"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
-#: mail/mail-component.c:701
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
+#: mail/mail-component.c:704
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Especificar onde criar a pasta:"
@@ -13094,102 +12627,103 @@ msgstr "Criar pasta"
 msgid "Folder _name:"
 msgstr "_Nome da pasta:"
 
-#: mail/em-folder-tree.c:839
+#: mail/em-folder-tree.c:833
 #, c-format
 msgid "Moving folder %s"
 msgstr "Movendo pasta %s"
 
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree.c:835
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copiando pasta %s"
 
-#: mail/em-folder-tree.c:848 mail/message-list.c:1555
+#: mail/em-folder-tree.c:842 mail/message-list.c:1561
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Movendo mensagens para pasta %s"
 
-#: mail/em-folder-tree.c:850 mail/message-list.c:1557
+#: mail/em-folder-tree.c:844 mail/message-list.c:1563
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copiando mensagens para pasta %s"
 
-#: mail/em-folder-tree.c:866
+#: mail/em-folder-tree.c:860
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Não é possível depositar mensagem(ns) no repositório topo"
 
-#: mail/em-folder-tree.c:956 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "Copiar para _pasta"
 
-#: mail/em-folder-tree.c:957 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "M_over para pasta"
 
-#: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2069
-#: mail/em-folder-tree.c:2551 mail/em-folder-view.c:798
-#: mail/message-list.c:1645
+#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
+#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
+#: mail/message-list.c:1651
 msgid "_Move"
 msgstr "_Mover"
 
-#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#: mail/em-folder-tree.c:955 mail/message-list.c:1653
 msgid "Cancel _Drag"
 msgstr "Cancelar _arraste"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
 #: mail/em-folder-view.c:798 mail/em-folder-view.c:812
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Selecionar pasta"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
 #, fuzzy
 msgid "C_opy"
 msgstr "Copiar"
 
-#: mail/em-folder-tree.c:2096
+#: mail/em-folder-tree.c:2088
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Criando pasta `%s'"
 
-#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
+#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
 msgid "Create folder"
 msgstr "Criar pasta"
 
-#: mail/em-folder-tree.c:2474
+#: mail/em-folder-tree.c:2463
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Renomear a pasta \"%s\" para:"
 
-#: mail/em-folder-tree.c:2476
+#: mail/em-folder-tree.c:2465
 msgid "Rename Folder"
 msgstr "Renomear pasta"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Ver"
 
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2537
 msgid "Open in _New Window"
 msgstr "Abrir em nova _janela"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2555
+#: mail/em-folder-tree.c:2546
 msgid "_New Folder..."
 msgstr "_Nova pasta..."
 
-#: mail/em-folder-tree.c:2558
+#: mail/em-folder-tree.c:2549
 msgid "_Rename"
 msgstr "_Renomear"
 
-#: mail/em-folder-tree.c:2561 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Propriedades..."
 
 #: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:889
+#: mail/mail-vfolder.c:888
 msgid "VFolders"
 msgstr "Pastas virtuais"
 
@@ -13203,19 +12737,19 @@ msgstr "NÃO CASADO"
 msgid "Inbox"
 msgstr "Caixa de entrada"
 
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
 msgid "Loading..."
 msgstr "Carregando..."
 
 #: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
 #: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
 #: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:551
+#: mail/mail-component.c:554
 msgid "Mail"
 msgstr "Correio"
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Editar como nova mensagem..."
@@ -13228,17 +12762,17 @@ msgstr "_Imprimir"
 msgid "_Reply to Sender"
 msgstr "_Responder ao remetente"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:810
+#: mail/em-folder-view.c:901 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Responder a _lista"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:811
+#: mail/em-folder-view.c:902 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Responder a _todos"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: mail/em-folder-view.c:903 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "Encamin_har"
@@ -13291,6 +12825,10 @@ msgstr "Mo_ver para pasta..."
 msgid "_Copy to Folder..."
 msgstr "Copiar para p_asta..."
 
+#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Rótulo"
+
 #: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Adicionar remetente ao catálo_go de endereços"
@@ -13340,12 +12878,12 @@ msgid "Filter on _Mailing List"
 msgstr "Filtro por l_ista de discussão"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
-#: mail/mail-config.glade.h:66
+#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Padrão"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1796
 msgid "Print Message"
 msgstr "Imprimir mensagem"
 
@@ -13384,12 +12922,18 @@ msgstr "Cc"
 msgid "Bcc"
 msgstr "Bcc"
 
+#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
+#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Assunto"
+
 #: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
 #: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Data"
 
-#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
+#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
 msgid "Newsgroups"
 msgstr "Grupos de notícias"
 
@@ -13586,7 +13130,7 @@ msgstr ""
 "difícil que um estranho conseguisse ver o conteúdo desta mensagem em uma "
 "quantidade de tempo razoável."
 
-#: mail/em-format-html-display.c:757
+#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
 msgid "_View Certificate"
 msgstr "_Ver certificado"
 
@@ -13639,7 +13183,7 @@ msgstr "Uma vez por semana"
 msgid "Once per month"
 msgstr "Uma vez por mês"
 
-#: mail/em-migrate.c:1072
+#: mail/em-migrate.c:1168
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13651,49 +13195,49 @@ msgstr ""
 "\n"
 "Por favor, aguarde enquanto o Evolution migra as sua pastas..."
 
-#: mail/em-migrate.c:1506
+#: mail/em-migrate.c:1602
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Não é possível criar nova pasta `%s': %s"
 
-#: mail/em-migrate.c:1532
+#: mail/em-migrate.c:1628
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "Não é possível copiar pasta `%s' para `%s': %s"
 
-#: mail/em-migrate.c:1715
+#: mail/em-migrate.c:1811
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr ""
 "Não é possível varrer a procura de caixas de correio existentes em `%s': %s"
 
-#: mail/em-migrate.c:1919
+#: mail/em-migrate.c:2015
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Não é possível abrir dados antigos manter-no-servidor POP `%s': %s"
 
-#: mail/em-migrate.c:1933
+#: mail/em-migrate.c:2029
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr ""
 "Não é possível criar diretório de dados manter-no-servidor POP `%s': %s"
 
-#: mail/em-migrate.c:1962
+#: mail/em-migrate.c:2058
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "Não é possível copiar dados manter-no-servidor POP `%s': %s"
 
-#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#: mail/em-migrate.c:2413 mail/em-migrate.c:2425
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Falhou a criação do repositório local de correio `%s': %s"
 
-#: mail/em-migrate.c:2480
+#: mail/em-migrate.c:2576
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Não é possível criar pastas locais de correio em `%s': %s"
 
-#: mail/em-migrate.c:2498
+#: mail/em-migrate.c:2594
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -13701,36 +13245,36 @@ msgstr ""
 "Não é possível ler configurações de uma instalação anterior do Evolution, "
 "`evolution/config.xmldb' não existe ou está corrompido."
 
-#: mail/em-popup.c:699
+#: mail/em-popup.c:700
 msgid "Save As..."
 msgstr "Salvar como..."
 
-#: mail/em-popup.c:717
+#: mail/em-popup.c:718
 #, c-format
 msgid "untitled_image.%s"
 msgstr "imagem_sem_nome.%s"
 
-#: mail/em-popup.c:807
+#: mail/em-popup.c:808
 msgid "Set as _Background"
 msgstr "Usar como imagem de _fundo"
 
-#: mail/em-popup.c:809
+#: mail/em-popup.c:810
 msgid "_Reply to sender"
 msgstr "_Responder ao remetente"
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:859
 msgid "_Open Link in Browser"
 msgstr "Abrir vínculo no _navegador"
 
-#: mail/em-popup.c:859
+#: mail/em-popup.c:860
 msgid "Se_nd message to..."
 msgstr "Enviar _mensagem a..."
 
-#: mail/em-popup.c:860
+#: mail/em-popup.c:861
 msgid "_Add to Addressbook"
 msgstr "Adicionar ao _catálogo de endereços"
 
-#: mail/em-popup.c:966
+#: mail/em-popup.c:967
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir em %s..."
@@ -14311,7 +13855,7 @@ msgstr "Controle de preferências do correio do Evolution"
 msgid "Mail Accounts"
 msgstr "Contas de correio"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
 msgid "Mail Preferences"
 msgstr "Preferências de correio"
 
@@ -14325,15 +13869,15 @@ msgid "Evolution is importing your old Elm mail"
 msgstr "O Evolution está importando seu correio antigo Elm"
 
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:226
+#: mail/importers/evolution-mbox-importer.c:221
+#: mail/importers/evolution-outlook-importer.c:255
 #: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Importando..."
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:222
-#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/evolution-mbox-importer.c:223
+#: mail/importers/evolution-outlook-importer.c:257
 #: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Por favor, aguarde"
@@ -14355,21 +13899,23 @@ msgid "Elm"
 msgstr "Elm"
 
 #: mail/importers/evolution-mbox-importer.c:116
+#: mail/importers/evolution-outlook-importer.c:130
 msgid "Destination folder:"
 msgstr "Pasta destino:"
 
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder to import into"
 msgstr "Selecionar pasta para onde importar"
 
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:254
 #: mail/importers/mail-importer.c:226
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importando `%s'"
 
-#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/evolution-outlook-importer.c:301
 #: mail/importers/mail-importer.c:140
 msgid "Importing mailbox"
 msgstr "Importando caixa de correio"
@@ -14535,15 +14081,15 @@ msgstr ""
 msgid "%s License Agreement"
 msgstr "Acordo de licença %s"
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
 msgid "_Host:"
 msgstr "_Máquina:"
 
-#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
 msgid "User_name:"
 msgstr "Nome do _usuário:"
 
-#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
 msgid "_Path:"
 msgstr "_Caminho:"
 
@@ -14606,31 +14152,31 @@ msgstr "%d total"
 msgid ", %d unread"
 msgstr ", %d não lidas"
 
-#: mail/mail-component.c:653
+#: mail/mail-component.c:656
 msgid "New Mail Message"
 msgstr "Nova mensagem de correio"
 
-#: mail/mail-component.c:654
+#: mail/mail-component.c:657
 msgid "_Mail Message"
 msgstr "_Mensagem de correio"
 
-#: mail/mail-component.c:655
+#: mail/mail-component.c:658
 msgid "Compose a new mail message"
 msgstr "Redigir uma nova mensagem de correio"
 
-#: mail/mail-component.c:661
+#: mail/mail-component.c:664
 msgid "New Mail Folder"
 msgstr "Nova pasta de correio"
 
-#: mail/mail-component.c:662
+#: mail/mail-component.c:665
 msgid "Mail _Folder"
 msgstr "_Pasta de correio"
 
-#: mail/mail-component.c:663
+#: mail/mail-component.c:666
 msgid "Create a new mail folder"
 msgstr "Criar uma nova pasta de correio"
 
-#: mail/mail-component.c:795
+#: mail/mail-component.c:798
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Falhou a atualização das configurações ou pastas de correio."
 
@@ -14642,7 +14188,7 @@ msgstr "Verificando serviço"
 msgid "Connecting to server..."
 msgstr "Conectando ao servidor..."
 
-#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Identidade"
 
@@ -14657,7 +14203,7 @@ msgstr ""
 "informação nas mensagens enviadas."
 
 #: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid "Receiving Mail"
 msgstr "Recebendo correio"
 
@@ -14674,7 +14220,7 @@ msgstr ""
 msgid "Please select among the following options"
 msgstr "Por favor, selecione entre as seguintes opções"
 
-#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr "Enviando correio"
 
@@ -14687,7 +14233,7 @@ msgstr ""
 "tiver certeza, consulte o seu administrador de sistema ou o seu provedor de "
 "Internet."
 
-#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37
 msgid "Account Management"
 msgstr "Gerência de conta"
 
@@ -14705,227 +14251,232 @@ msgstr ""
 "correio do Evolution. Por favor, entre um nome para esta conta no espaço "
 "abaixo. Este nome será usado apenas para propósitos de exibição."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:2
 msgid " Ch_eck for Supported Types "
 msgstr " _Verificar tipos suportados "
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
 msgid "<b>Preview</b>"
 msgstr "<b>Visualizar</b>"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "<b>SSL não é suportado nesta cópia do Evolution</b>"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "<b>S_ignatures</b>"
 msgstr "<b>_Assinaturas</b>"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "<b>_Languages</b>"
 msgstr "<b>_Línguas</b>"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
+msgid "<small>This will make the the filter more reliable, but slower</small>"
+msgstr ""
+
+#: mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">Informação de conta</span>"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">Alertas</span>"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr "<span weight=\"bold\">Tipo de autenticação</span>"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">Autenticação</span>"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Checking for New Mail</span>"
 msgstr "<span weight=\"bold\">Verificando novas mensagens</span>"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr "<span weight=\"bold\">Redigindo mensagens</span>"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">Configuração</span>"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr "<span weight=\"bold\">Comportamento padrão</span>"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr "<span weight=\"bold\">Excluir correio</span>"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr "<span weight=\"bold\">_Cabeçalhos de correio exibidos</span>"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr "<span weight=\"bold\">Opções de filtragem</span>"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">Geral</span>"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr "<span weight=\"bold\">Rótulos e cores</span>"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr "<span weight=\"bold\">Carregando imagens</span>"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "<span weight=\"bold\">Exibição de mensagens</span>"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr "<span weight=\"bold\">Fontes de mensagem</span>"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "<span weight=\"bold\">Notificação de nova mensagem</span>"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr "<span weight=\"bold\">Informação opcional</span>"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<span weight=\"bold\">Opções</span>"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">Fontes de impressão</span>"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">Informação necessária</span>"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">Segurança</span>"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">Mensagens enviadas e rascunhos</span>"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:34
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">Configuração do servidor</span>"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:35
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "Cifrar também para mim mesmo ao en_viar correio cifrado"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:36
 msgid "Account Editor"
 msgstr "Editor de contas"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:38
 msgid "Add Ne_w Signature..."
 msgstr "Adicionar _nova assinatura..."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "Add _Script"
 msgstr "Adicionar s_cript"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:40
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "_Cifrar sempre para mim mesmo ao enviar correio cifrado"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Enviar sempre uma _cópia (Cc) para:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Enviar sempre uma cópia oc_ulta (Bcc) para:"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:44
 msgid "Always _sign outgoing messages when using this account"
 msgstr "Sempre _assinar mensagens enviadas ao usar esta conta"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Con_fiar sempre nas chaves em meu chaveiro ao cifrar"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Attach original message"
 msgstr "Anexar mensagem original"
 
-#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Anexo"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:48
 msgid "Automatically _insert smiley images"
 msgstr "Inserir automaticamente imagens de _carinhas"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Automatically check for _new mail every"
 msgstr "_Verificar automaticamente novas mensagens a cada"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "Baltic (ISO-8859-13)"
 msgstr "Báltico (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Baltic (ISO-8859-4)"
 msgstr "Báltico (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Beep w_hen new mail arrives"
 msgstr "_Soe um bip quando uma nova mensagem chegar"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "C_haracter set:"
 msgstr "Con_junto de caracteres:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 msgid "Ch_eck for Supported Types "
 msgstr "_Verificar tipos suportados "
 
-#: mail/mail-config.glade.h:53
-msgid "Check _Incoming Mail"
-msgstr "_Testar mensagens recebidas"
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Check _incoming mail for junk"
+msgstr "Verificar se mensagens recebidas são lixo"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Check spelling while I _type"
 msgstr "Verificar a ortografia enquanto eu _digito"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Testa se mensagens recebidas são lixo"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 msgid "Color for _misspelled words:"
 msgstr "Cor das palavras _erradas:"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 msgid "Colors"
 msgstr "Cores"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 msgid "Confirm _when expunging a folder"
 msgstr "C_onfirmar ao excluir permanentemente uma pasta"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14941,107 +14492,112 @@ msgstr ""
 "\n"
 "Pressione \"Aplicar\" para salvar suas configurações."
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
 msgid "De_fault"
 msgstr "_Padrão"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 msgid "Default character e_ncoding:"
 msgstr "Co_dificação de caracteres padrão:"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 msgid "Defaults"
 msgstr "Padrões"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 msgid "Do not quote original message"
 msgstr "Não citar a mensagem original"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "_Não assinar pedidos de reunião (para compatibilidade com o Outlook)"
 
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Terminado"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
 msgid "Drafts _Folder:"
 msgstr "P_asta de rascunhos:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:77
 msgid "Email Accounts"
 msgstr "Contas de correio"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 msgid "Email _Address:"
 msgstr "Endereço e_letrônico:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:79
 msgid "Empty trash folders on e_xit"
 msgstr "_Esvaziar lixeiras ao sair"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
 msgid "Encry_ption certificate:"
 msgstr "Certificado de ci_fragem:"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:81
 msgid "Evolution Account Assistant"
 msgstr "Assistente de contas do Evolution"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:82
 msgid "Execute Command..."
 msgstr "Executar comando..."
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:83
 msgid "Fi_xed-width:"
 msgstr "Largura fi_xa:"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 msgid "Font Properties"
 msgstr "Propriedades da fonte"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 msgid "Format messages in _HTML"
 msgstr "Formatar mensagens em _HTML"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:87
 msgid "HTML Mail"
 msgstr "Correio HTML"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:88
 msgid "Headers"
 msgstr "Cabeçalhos"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr "_Realçar citações com"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
 #: mail/mail-config.glade.h:91
+#, fuzzy
+msgid "I_nclude remote tests"
+msgstr "Incluir encadeamentos"
+
+#: mail/mail-config.glade.h:94
 msgid "Inline"
 msgstr "Embutido"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Mail Configuration"
 msgstr "Configuração de correio"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "Localização da caixa postal"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr "Redator de mensagens"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
@@ -15049,131 +14605,131 @@ msgstr ""
 "Nota: não será pedido que você forneça uma senha até que você faça a "
 "primeira conexão"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Or_ganization:"
 msgstr "Empres_a:"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "PGP/GPG _Key ID:"
 msgstr "ID da c_have PGP/GPG:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Play sound file when new mail arri_ves"
 msgstr "Toque um _arquivo de som quando uma nova mensagem chegar"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Perguntar ao enviar mensagens com apenas destinatários _Bcc"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr "Citar mensagem original"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr "Citado"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 msgid "Re_member password"
 msgstr "Le_mbrar senha"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr "Respon_der-a:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "Recebendo mensagem"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:120
 msgid "Receiving Options"
 msgstr "Opções de recepção"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
 msgid "Remember _password"
 msgstr "_Lembrar senha"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
 msgid "S_tandard Font:"
 msgstr "Fonte _padrão:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 msgid "Security"
 msgstr "Segurança"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font"
 msgstr "Selecionar fonte HTML de largura fixa"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:126
 msgid "Select HTML fixed width font for printing"
 msgstr "Selecionar fonte HTML de largura fixa para impressão"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:127
 msgid "Select HTML variable width font"
 msgstr "Selecionar fonte HTML de largura variável"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:128
 msgid "Select HTML variable width font for printing"
 msgstr "Selecionar fonte HTML de largura variável para impressão"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:129
 msgid "Select..."
 msgstr "Selecionar..."
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "Enviando mensagem"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:133
 msgid "Sent _Messages Folder:"
 msgstr "Pasta de _mensagens enviadas:"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:134
 msgid "Ser_ver requires authentication"
 msgstr "Servi_dor requer autenticação"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:135
 msgid "Server _Type: "
 msgstr "_Tipo do servidor: "
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:136
 msgid "Si_gning certificate:"
 msgstr "Certificado de a_ssinatura:"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:137
 msgid "Signat_ure:"
 msgstr "Assinat_ura:"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:138
 msgid "Signatures"
 msgstr "Assinaturas"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr "Nome do _arquivo:"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:140
 msgid "Spell Checking"
 msgstr "Verificação ortográfica"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:141
 msgid "Standard Unix mbox"
 msgstr "Mbox padrão do Unix"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:142
 msgid "T_erminal Font:"
 msgstr "Fonte de _terminal:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:143
 msgid "T_ype: "
 msgstr "_Tipo: "
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -15183,7 +14739,7 @@ msgstr ""
 "assinatura. O nome que você especificar será\n"
 "usado apenas para propósitos de exibição. "
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
@@ -15193,7 +14749,7 @@ msgstr ""
 "correção ortográfica. A lista de línguas aqui reflete apenas as línguas para "
 "as quais você possui um dicionário instalado."
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:149
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -15201,15 +14757,11 @@ msgstr ""
 "Digite o nome pelo qual você gostaria de chamar esta conta.\n"
 "Por exemplo: \"Trabalho\" ou \"Pessoal\""
 
-#: mail/mail-config.glade.h:148
-msgid "Use _Daemon"
-msgstr "Usar _daemon"
-
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:152
 msgid "V_ariable-width:"
 msgstr "Largura v_ariável:"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:153
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -15219,87 +14771,83 @@ msgstr ""
 "\n"
 "Pressione \"Próximo\" para começar. "
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:158
 msgid "_Add Signature"
 msgstr "_Adicionar assinatura"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:159
 msgid "_Always load images from the Internet"
 msgstr "_Sempre carregar imagens da Internet"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:160
 msgid "_Digitally sign outgoing messages (by default)"
 msgstr "_Assinar digitalmente mensagens enviadas (por padrão)"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:161
 msgid "_Do not notify me when new mail arrives"
 msgstr "Não me noti_fique quando uma nova mensagem chegar"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:163
 msgid "_Enable"
 msgstr "_Ativar"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 msgid "_Encrypt outgoing messages (by default)"
 msgstr "_Cifrar mensagens enviadas (por padrão)"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:165
 msgid "_Forward style:"
 msgstr "Estilo de _encaminhamento:"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:168
 msgid "_Load images if sender is in address book"
 msgstr "C_arregar imagens se o remetente está no catálogo de endereços"
 
-#: mail/mail-config.glade.h:167
-msgid "_Local Tests Only"
-msgstr "_Testes locais apenas"
-
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Make this my default account"
 msgstr "_Torne esta a minha conta padrão"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_Mark messages as read after"
 msgstr "_Marcar mensagens como lidas após"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 msgid "_Never load images from the Internet"
 msgstr "_Nunca carregar imagens da Internet"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "_Perguntar ao enviar mensagens HTML para contatos que não as querem"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:175
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Perguntar ao enviar mensagens com um assunto vazio"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:176
 msgid "_Reply style:"
 msgstr "Estilo de _resposta:"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:177
 msgid "_Script:"
 msgstr "_Script:"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:178
 msgid "_Show animated images"
 msgstr "_Exibir imagens animadas"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 msgid "_Use Secure Connection (SSL):"
 msgstr "Usar conexão se_gura (SSL):"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "_Use the same fonts as other applications"
 msgstr "_Usar as mesmas fontes que outros aplicativos usam"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:181
 msgid "color"
 msgstr "cor"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "descrição"
 
@@ -15488,7 +15036,8 @@ msgstr ""
 
 #. mail:camel-exception primary
 #: mail/mail-errors.xml.h:57
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+#, fuzzy
+msgid "Your message with the subject \"{0}\" was not delivered."
 msgstr "Sua mensagem com o assunto \"{0}\" não foi entregue."
 
 #. mail:camel-exception secondary
@@ -15547,11 +15096,6 @@ msgstr "Erro ao carregar definições de filtro."
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Não é possível salvar para o diretório \"{0}\"."
 
-#. mail:no-save-path secondary
-#: mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr "{1}"
-
 #. mail:no-create-path primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
@@ -15568,12 +15112,6 @@ msgstr "Não foi possível criar o diretório para salvar, pois \"{1}\""
 msgid "Cannot create temporary save directory."
 msgstr "Não foi possível criar diretório temporário."
 
-#. mail:no-create-tmp-path secondary
-#: mail/mail-errors.xml.h:100 mail/mail-errors.xml.h:112
-#: widgets/misc/e-system-errors.xml.h:11 widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr "Pois \"{1}\"."
-
 #. mail:no-write-path-exists secondary
 #: mail/mail-errors.xml.h:104
 msgid "File exists but cannot overwrite it."
@@ -15835,29 +15373,25 @@ msgstr "S_obrescrever"
 msgid "_Append"
 msgstr "_Adicionar"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:785
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinging %s"
 
-#: mail/mail-mt.c:897
-msgid "Working"
-msgstr "Trabalhando"
-
-#: mail/mail-ops.c:99
+#: mail/mail-ops.c:98
 msgid "Filtering Folder"
 msgstr "Filtrando pasta"
 
-#: mail/mail-ops.c:260
+#: mail/mail-ops.c:259
 msgid "Fetching Mail"
 msgstr "Pegando correio"
 
-#: mail/mail-ops.c:543
+#: mail/mail-ops.c:542
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Falha ao aplicar filtros de saída: %s"
 
-#: mail/mail-ops.c:568
+#: mail/mail-ops.c:567
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -15866,115 +15400,115 @@ msgstr ""
 "Falha ao acrescentar a %s: %s\n"
 "Acrescentando à pasta local `Enviada'."
 
-#: mail/mail-ops.c:577
+#: mail/mail-ops.c:576
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Falha ao acrescentar à pasta local `Enviada': %s"
 
-#: mail/mail-ops.c:673
+#: mail/mail-ops.c:672
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando mensagem %d de %d"
 
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:703
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Falhou o envio de %d de %d mensagens"
 
-#: mail/mail-ops.c:708
+#: mail/mail-ops.c:707
 msgid "Complete."
 msgstr "Concluída."
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:804
 msgid "Saving message to folder"
 msgstr "Salvando mensagem na pasta"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Movendo mensagens para %s"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiando mensagens para %s"
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:1002
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Varrendo pastas em \"%s\""
 
-#: mail/mail-ops.c:1116
+#: mail/mail-ops.c:1115
 msgid "Forwarded messages"
 msgstr "Mensagens encaminhadas"
 
-#: mail/mail-ops.c:1159
+#: mail/mail-ops.c:1158
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abrindo pasta %s"
 
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1230
 #, c-format
 msgid "Opening store %s"
 msgstr "Abrindo repositório %s"
 
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1308
 #, c-format
 msgid "Removing folder %s"
 msgstr "Removendo pasta %s"
 
-#: mail/mail-ops.c:1403
+#: mail/mail-ops.c:1402
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Armazenando pasta '%s'"
 
-#: mail/mail-ops.c:1468
+#: mail/mail-ops.c:1467
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Excluindo permanentemente e armazenando conta '%s'"
 
-#: mail/mail-ops.c:1469
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Armazenando conta '%s'"
 
-#: mail/mail-ops.c:1524
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr "Atualizando pasta"
 
-#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
+#: mail/mail-ops.c:1559 mail/mail-ops.c:1610
 msgid "Expunging folder"
 msgstr "Excluindo permanentemente pasta"
 
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1607
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Esvaziando lixeira em '%s'"
 
-#: mail/mail-ops.c:1609
+#: mail/mail-ops.c:1608
 msgid "Local Folders"
 msgstr "Pastas locais"
 
-#: mail/mail-ops.c:1692
+#: mail/mail-ops.c:1691
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Buscando mensagem %s"
 
-#: mail/mail-ops.c:1764
+#: mail/mail-ops.c:1763
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Buscando %d mensagem"
 msgstr[1] "Buscando %d mensagens"
 
-#: mail/mail-ops.c:1850
+#: mail/mail-ops.c:1849
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Salvando %d mensagem"
 msgstr[1] "Salvando %d mensagens"
 
-#: mail/mail-ops.c:1900
+#: mail/mail-ops.c:1899
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15983,7 +15517,7 @@ msgstr ""
 "Não é possível criar arquivo de saída: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1928
+#: mail/mail-ops.c:1927
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15992,11 +15526,11 @@ msgstr ""
 "Erro ao salvar mensagens para: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1999
+#: mail/mail-ops.c:1998
 msgid "Saving attachment"
 msgstr "Salvando anexo"
 
-#: mail/mail-ops.c:2016
+#: mail/mail-ops.c:2015
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -16005,17 +15539,17 @@ msgstr ""
 "Não é possível criar arquivo de saída: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2046
+#: mail/mail-ops.c:2045
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Não foi possível escrever dados: %s"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Desconectando de %s"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Reconectando a %s"
@@ -16079,24 +15613,24 @@ msgstr "Atualizando..."
 msgid "Waiting..."
 msgstr "Esperando..."
 
-#: mail/mail-session.c:238
+#: mail/mail-session.c:239
 msgid "User canceled operation."
 msgstr "O usuário cancelou a operação."
 
-#: mail/mail-session.c:271
+#: mail/mail-session.c:272
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Entre senha para %s"
 
-#: mail/mail-session.c:273
+#: mail/mail-session.c:274
 msgid "Enter Password"
 msgstr "Entre a senha"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password"
 msgstr "_Lembrar esta senha"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:298
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Lembrar esta senha pelo restante desta sessão"
 
@@ -16151,79 +15685,79 @@ msgstr "Atualizando pastas virtuais para URI: %s"
 msgid "Updating vFolders for '%s'"
 msgstr "Atualizando pastas virtuais para URI: %s"
 
-#: mail/mail-vfolder.c:959
+#: mail/mail-vfolder.c:958
 msgid "vFolders"
 msgstr "Pastas virtuais"
 
-#: mail/mail-vfolder.c:998
+#: mail/mail-vfolder.c:997
 msgid "Edit VFolder"
 msgstr "Editar pasta virtual"
 
-#: mail/mail-vfolder.c:1082
+#: mail/mail-vfolder.c:1081
 msgid "New VFolder"
 msgstr "Nova pasta virtual"
 
-#: mail/message-list.c:946
+#: mail/message-list.c:948
 msgid "Unseen"
 msgstr "Não vista"
 
-#: mail/message-list.c:947
+#: mail/message-list.c:949
 msgid "Seen"
 msgstr "Vista"
 
-#: mail/message-list.c:948
+#: mail/message-list.c:950
 msgid "Answered"
 msgstr "Respondida"
 
-#: mail/message-list.c:949
+#: mail/message-list.c:951
 msgid "Multiple Unseen Messages"
 msgstr "Várias mensagens não vistas"
 
-#: mail/message-list.c:950
+#: mail/message-list.c:952
 msgid "Multiple Messages"
 msgstr "Várias mensagens"
 
-#: mail/message-list.c:954
+#: mail/message-list.c:956
 msgid "Lowest"
 msgstr "Mínima"
 
-#: mail/message-list.c:955
+#: mail/message-list.c:957
 msgid "Lower"
 msgstr "Mais baixa"
 
-#: mail/message-list.c:959
+#: mail/message-list.c:961
 msgid "Higher"
 msgstr "Mais alta"
 
-#: mail/message-list.c:960
+#: mail/message-list.c:962
 msgid "Highest"
 msgstr "Máxima"
 
-#: mail/message-list.c:1279
+#: mail/message-list.c:1285
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1286
+#: mail/message-list.c:1292
 msgid "Today %l:%M %p"
 msgstr "Hoje %k:%M"
 
-#: mail/message-list.c:1295
+#: mail/message-list.c:1301
 msgid "Yesterday %l:%M %p"
 msgstr "Ontem %k:%M"
 
-#: mail/message-list.c:1307
+#: mail/message-list.c:1313
 msgid "%a %l:%M %p"
 msgstr "%a %k:%M"
 
-#: mail/message-list.c:1315
+#: mail/message-list.c:1321
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %k:%M"
 
-#: mail/message-list.c:1317
+#: mail/message-list.c:1323
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:3300
+#: mail/message-list.c:3321
 msgid "Generating message list"
 msgstr "Gerando lista de mensagens"
 
@@ -16279,6 +15813,10 @@ msgstr "Encaminhar"
 msgid "No Response Necessary"
 msgstr "Não é necessário resposta"
 
+#: mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Lida"
+
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Responder"
@@ -16383,43 +15921,47 @@ msgstr ""
 "desconectado."
 
 #: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid "Toolbar is visible"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Whether Evolution should start up in offline mode"
 msgstr "Se o Evolution deve iniciar no modo desconectado"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Whether the toolbar should be visible."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
 msgid "Whether to skip the development warning dialog"
 msgstr "Se o diálogo de alerta de desenvolvimento não deve ser exibido"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
+#: shell/apps_evolution_shell.schemas.in.in.h:14
 msgid "mail"
 msgstr "correio"
 
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
-msgstr "Feito para você por"
-
-#: shell/e-shell.c:545 shell/e-shell.c:546
+#: shell/e-shell.c:588 shell/e-shell.c:589
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: shell/e-shell.c:744
+#: shell/e-shell.c:786
 msgid "Uknown system error."
 msgstr "Erro de sistema desconhecido."
 
-#: shell/e-shell.c:1101
+#: shell/e-shell.c:1143
 msgid "Invalid arguments"
 msgstr "Argumentos inválidos"
 
-#: shell/e-shell.c:1103
+#: shell/e-shell.c:1145
 msgid "Cannot register on OAF"
 msgstr "Não é possível registrar no OAF"
 
-#: shell/e-shell.c:1105
+#: shell/e-shell.c:1147
 msgid "Configuration Database not found"
 msgstr "Não foi localizado o banco de dados de configuração"
 
-#: shell/e-shell.c:1107
+#: shell/e-shell.c:1149
 msgid "Generic error"
 msgstr "Erro genérico"
 
@@ -16478,7 +16020,7 @@ msgstr ""
 msgid "Select importer"
 msgstr "Selecionar importador"
 
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1026
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
 #, c-format
 msgid "File %s does not exist"
 msgstr "Arquivo %s não existe"
@@ -16506,31 +16048,32 @@ msgstr ""
 "Importando %s\n"
 "Importando item 1."
 
-#: shell/e-shell-importer.c:549
+#: shell/e-shell-importer.c:570
 msgid "Automatic"
 msgstr "Automático"
 
-#: shell/e-shell-importer.c:598
-msgid "_Filename:"
-msgstr "_Nome do arquivo:"
+#: shell/e-shell-importer.c:626
+#, fuzzy
+msgid "F_ilename:"
+msgstr "Nome do arquivo:"
 
-#: shell/e-shell-importer.c:603
+#: shell/e-shell-importer.c:631
 msgid "Select a file"
 msgstr "Selecionar um arquivo"
 
-#: shell/e-shell-importer.c:613
+#: shell/e-shell-importer.c:642
 msgid "File _type:"
 msgstr "_Tipo do arquivo:"
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:681
 msgid "Import data and settings from _older programs"
 msgstr "Importar _dados e configurações de programas antigos"
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:684
 msgid "Import a _single file"
 msgstr "Importar _um único arquivo"
 
-#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -16538,25 +16081,25 @@ msgstr ""
 "Aguarde por favor...\n"
 "Varrendo a procura de configurações existentes"
 
-#: shell/e-shell-importer.c:727
+#: shell/e-shell-importer.c:756
 msgid "Starting Intelligent Importers"
 msgstr "Iniciando importadores inteligentes"
 
-#: shell/e-shell-importer.c:853 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
 #, c-format
 msgid "From %s:"
 msgstr "De %s:"
 
-#: shell/e-shell-importer.c:1044
+#: shell/e-shell-importer.c:1073
 #, c-format
 msgid "No importer available for file %s"
 msgstr "Não existe importador disponível para o arquivo %s"
 
-#: shell/e-shell-importer.c:1056
+#: shell/e-shell-importer.c:1085
 msgid "Unable to execute importer"
 msgstr "Não é possível executar o importador"
 
-#: shell/e-shell-importer.c:1169
+#: shell/e-shell-importer.c:1199
 msgid "_Import"
 msgstr "_Importar"
 
@@ -16606,58 +16149,59 @@ msgstr "O nome da pasta não pode conter o caractere \"#\"."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' e '..' são nomes de pastas reservados."
 
-#: shell/e-shell-window.c:336
+#: shell/e-shell-window.c:337
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "O Evolution está atualmente conectado. Clique neste botão para trabalhar "
 "desconectado."
 
-#: shell/e-shell-window.c:343
+#: shell/e-shell-window.c:344
 msgid "Evolution is in the process of going offline."
 msgstr "O Evolution está em preocesso de se desconectar."
 
-#: shell/e-shell-window.c:349
+#: shell/e-shell-window.c:350
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "O Evolution está atualmente desconectado. Clique neste botão para trabalhar "
 "conectado."
 
-#: shell/e-shell-window.c:621
+#: shell/e-shell-window.c:637
 #, fuzzy, c-format
 msgid "Switch to %s"
 msgstr "Correio para %s"
 
-#: shell/e-shell-window-commands.c:64
+#: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 "As ferramentas do GNOME Pilot não aparentam estar instaladas no seu sistema."
 
-#: shell/e-shell-window-commands.c:72
+#: shell/e-shell-window-commands.c:74
 #, c-format
 msgid "Error executing %s."
 msgstr "Erro ao executar %s."
 
-#: shell/e-shell-window-commands.c:121
+#: shell/e-shell-window-commands.c:123
 msgid "Bug buddy is not installed."
 msgstr "Bug buddy não está instalado."
 
-#: shell/e-shell-window-commands.c:129
+#: shell/e-shell-window-commands.c:131
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy não pôde ser executado."
 
-#: shell/e-shell-window-commands.c:171
-msgid "About Evolution"
-msgstr "Sobre o Evolution"
+#: shell/e-shell-window-commands.c:323
+#, fuzzy
+msgid "Groupware Suite"
+msgstr "Groupwise"
 
-#: shell/e-shell-window-commands.c:382
+#: shell/e-shell-window-commands.c:563
 msgid "_Work Online"
 msgstr "_Trabalhar conectado"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "_Trabalhar desconectado"
 
-#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Trabalhar desconectado"
 
@@ -16669,43 +16213,6 @@ msgstr "Caixa de marcação"
 msgid "New"
 msgstr "Novo"
 
-#: shell/evolution-shell-component-utils.c:115
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Erro desconhecido."
-
-#: shell/evolution-shell-component-utils.c:118
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"O erro do sistema de componentes é:\n"
-"%s"
-
-#: shell/evolution-shell-component-utils.c:125
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"O erro do sistema de ativação é:\n"
-"%s"
-
 #: shell/evolution-test-component.c:140
 msgid "New Test"
 msgstr "Novo teste"
@@ -17040,30 +16547,30 @@ msgid ""
 "Click help for details."
 msgstr ""
 
-#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:522
+#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
+#: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
 msgstr "Selecionar um certificado a importar..."
 
-#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:604
+#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
+#: smime/gui/certificate-manager.c:638
 msgid "Certificate Name"
 msgstr "Nome do certificado"
 
-#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
+#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
 msgid "Purposes"
 msgstr "Propósitos"
 
-#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:517
+#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr "Número de série"
 
-#: smime/gui/certificate-manager.c:267
+#: smime/gui/certificate-manager.c:271
 msgid "Expires"
 msgstr "Válido até"
 
-#: smime/gui/certificate-manager.c:417
+#: smime/gui/certificate-manager.c:446
 msgid "E-Mail Address"
 msgstr "Endereço de e-mail"
 
@@ -17105,6 +16612,11 @@ msgstr ""
 "Emitido por:\n"
 "    Assunto: %s\n"
 
+#: smime/gui/e-cert-selector.c:169
+#, fuzzy
+msgid "Select certificate"
+msgstr "Certificado do cliente SSL"
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr "<Não é parte do certificado>"
@@ -17161,7 +16673,7 @@ msgstr ""
 "Antes de confiar nesta AC para qualquer propósito você deve examinar o seu "
 "certificado e as suas políticas e procedimentos (se disponíveis)."
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
 msgid "Certificate"
 msgstr "Certificado"
 
@@ -17181,19 +16693,23 @@ msgstr "Nome comum (CN)"
 msgid "Contact Certificates"
 msgstr "Certificados do contato"
 
-#: smime/gui/smime-ui.glade.h:21
-#, no-c-format
-msgid "Do you want to trust \"%s\" for the following purposes?"
-msgstr "Você deseja confiar em \"%s\" para os seguintes propósitos?"
+#: smime/gui/smime-ui.glade.h:20
+msgid "Do not trust the authenticity of this certificate"
+msgstr ""
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:21
 msgid "Dummy window only"
 msgstr "Janela boneco apenas"
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:22
 msgid "Edit"
 msgstr "Editar"
 
+#: smime/gui/smime-ui.glade.h:23
+#, fuzzy
+msgid "Email Certificate Trust Settings"
+msgstr "Autoridade certificadora de e-mail"
+
 #: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr "Certificado do destinatário da mensagem"
@@ -17226,249 +16742,260 @@ msgstr "Unidade organizacional (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "Impressão digital SHA1"
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr "Certificado do cliente SSL"
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr "Certificado do servidor SSL"
 
 #: smime/gui/smime-ui.glade.h:37
+msgid "Trust the authenticity of this certificate"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
 msgid "Trust this CA to identify email users."
 msgstr "Confiar nesta AC para identificar usuários de correio."
 
-#: smime/gui/smime-ui.glade.h:38
+#: smime/gui/smime-ui.glade.h:39
 msgid "Trust this CA to identify software developers."
 msgstr "Confiar nesta AC para identificar desenvolvedores de software."
 
-#: smime/gui/smime-ui.glade.h:39
+#: smime/gui/smime-ui.glade.h:40
 msgid "Trust this CA to identify web sites."
 msgstr "Confiar nesta AC para identificar sites web."
 
-#: smime/gui/smime-ui.glade.h:40
+#: smime/gui/smime-ui.glade.h:41
 msgid "View"
 msgstr "Ver"
 
-#: smime/gui/smime-ui.glade.h:41
-msgid "View Certificate"
-msgstr "Ver certificado"
-
 #: smime/gui/smime-ui.glade.h:42
-msgid "You have been asked to trust a new Certificate Authority (CA)."
-msgstr "É pedido que você confie em uma nova autoridade certificadora (AC)."
-
-#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr "Você possui certificados dessas organizações que lhe identificam:"
 
-#: smime/gui/smime-ui.glade.h:44
+#: smime/gui/smime-ui.glade.h:43
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 "Você possui certificados em arquivo que identificam estas autoridades "
 "certificadoras:"
 
-#: smime/gui/smime-ui.glade.h:45
+#: smime/gui/smime-ui.glade.h:44
 msgid "You have certificates on file that identify these people:"
 msgstr "Você possui certificados em arquivo que identificam estas pessoas:"
 
-#: smime/gui/smime-ui.glade.h:46
+#: smime/gui/smime-ui.glade.h:45
 msgid "Your Certificates"
 msgstr "Seus certificados"
 
-#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
+#: smime/gui/smime-ui.glade.h:46
+msgid "_Edit CA Trust"
+msgstr ""
+
+#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
-#: smime/lib/e-cert.c:478
+#. x509 certificate usage types
+#: smime/lib/e-cert.c:424
+#, fuzzy
+msgid "Sign"
+msgstr "Assinando"
+
+#: smime/lib/e-cert.c:425
+#, fuzzy
+msgid "Encrypt"
+msgstr "Cifrada"
+
+#: smime/lib/e-cert.c:530
 msgid "Version"
 msgstr "Versão"
 
-#: smime/lib/e-cert.c:493
+#: smime/lib/e-cert.c:545
 msgid "Version 1"
 msgstr "Versão 1"
 
-#: smime/lib/e-cert.c:496
+#: smime/lib/e-cert.c:548
 msgid "Version 2"
 msgstr "Versão 2"
 
-#: smime/lib/e-cert.c:499
+#: smime/lib/e-cert.c:551
 msgid "Version 3"
 msgstr "Versão 3"
 
-#: smime/lib/e-cert.c:581
+#: smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 com cifragem RSA"
 
-#: smime/lib/e-cert.c:584
+#: smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 com cifragem RSA"
 
-#: smime/lib/e-cert.c:587
+#: smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 com cifragem RSA"
 
-#: smime/lib/e-cert.c:590
+#: smime/lib/e-cert.c:642
 msgid "C"
 msgstr "C"
 
-#: smime/lib/e-cert.c:593
+#: smime/lib/e-cert.c:645
 msgid "CN"
 msgstr "CN"
 
-#: smime/lib/e-cert.c:596
+#: smime/lib/e-cert.c:648
 msgid "OU"
 msgstr "OU"
 
-#: smime/lib/e-cert.c:599
+#: smime/lib/e-cert.c:651
 msgid "O"
 msgstr "O"
 
-#: smime/lib/e-cert.c:602
+#: smime/lib/e-cert.c:654
 msgid "L"
 msgstr "L"
 
-#: smime/lib/e-cert.c:605
+#: smime/lib/e-cert.c:657
 msgid "DN"
 msgstr "DN"
 
-#: smime/lib/e-cert.c:608
+#: smime/lib/e-cert.c:660
 msgid "DC"
 msgstr "DC"
 
-#: smime/lib/e-cert.c:611
+#: smime/lib/e-cert.c:663
 msgid "ST"
 msgstr "ST"
 
-#: smime/lib/e-cert.c:614
+#: smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 cifragem RSA"
 
-#: smime/lib/e-cert.c:617
+#: smime/lib/e-cert.c:669
 msgid "Certificate Key Usage"
 msgstr "Uso chave do certificado"
 
-#: smime/lib/e-cert.c:620
+#: smime/lib/e-cert.c:672
 msgid "Netscape Certificate Type"
 msgstr "Tipo de certificado Netscape"
 
-#: smime/lib/e-cert.c:623
+#: smime/lib/e-cert.c:675
 msgid "Certificate Authority Key Identifier"
 msgstr "Identificador da chave da autoridade certificadora"
 
-#: smime/lib/e-cert.c:626
+#: smime/lib/e-cert.c:678
 msgid "UID"
 msgstr "UID"
 
-#: smime/lib/e-cert.c:635
+#: smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Identificador do objeto (%s)"
 
-#: smime/lib/e-cert.c:686
+#: smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
 msgstr "Identificador do algoritmo"
 
-#: smime/lib/e-cert.c:694
+#: smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
 msgstr "Parâmetros do algoritmo"
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:768
 msgid "Subject Public Key Info"
 msgstr "Informação da chave pública do sujeito"
 
-#: smime/lib/e-cert.c:721
+#: smime/lib/e-cert.c:773
 msgid "Subject Public Key Algorithm"
 msgstr "Algoritmo da chave pública do sujeito"
 
-#: smime/lib/e-cert.c:736
+#: smime/lib/e-cert.c:788
 msgid "Subject's Public Key"
 msgstr "Chave pública do sujeito"
 
-#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
+#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
 msgid "Error: Unable to process extension"
 msgstr "Erro: Não é possível processar extensão"
 
-#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
+#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr "Autor da assinatura do objeto"
 
-#: smime/lib/e-cert.c:782
+#: smime/lib/e-cert.c:834
 msgid "SSL Certificate Authority"
 msgstr "Autoridade certificadora SSL"
 
-#: smime/lib/e-cert.c:786
+#: smime/lib/e-cert.c:838
 msgid "Email Certificate Authority"
 msgstr "Autoridade certificadora de e-mail"
 
-#: smime/lib/e-cert.c:814
+#: smime/lib/e-cert.c:866
 msgid "Signing"
 msgstr "Assinando"
 
-#: smime/lib/e-cert.c:818
+#: smime/lib/e-cert.c:870
 msgid "Non-repudiation"
 msgstr "Não repúdio"
 
-#: smime/lib/e-cert.c:822
+#: smime/lib/e-cert.c:874
 msgid "Key Encipherment"
 msgstr "Cifragem da chave"
 
-#: smime/lib/e-cert.c:826
+#: smime/lib/e-cert.c:878
 msgid "Data Encipherment"
 msgstr "Cifragem dos dados"
 
-#: smime/lib/e-cert.c:830
+#: smime/lib/e-cert.c:882
 msgid "Key Agreement"
 msgstr "Acordo de chave"
 
-#: smime/lib/e-cert.c:834
+#: smime/lib/e-cert.c:886
 msgid "Certificate Signer"
 msgstr "Autor da assinatura do certificado"
 
-#: smime/lib/e-cert.c:838
+#: smime/lib/e-cert.c:890
 msgid "CRL Signer"
 msgstr "Autor da assinatura CRL"
 
-#: smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:938
 msgid "Critical"
 msgstr "Crítico"
 
-#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
+#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
 msgid "Not Critical"
 msgstr "Não crítico"
 
-#: smime/lib/e-cert.c:912
+#: smime/lib/e-cert.c:964
 msgid "Extensions"
 msgstr "Extensões"
 
-#: smime/lib/e-cert.c:983
+#: smime/lib/e-cert.c:1035
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
 msgid "Certificate Signature Algorithm"
 msgstr "Algoritmo da assinatura do certificado"
 
-#: smime/lib/e-cert.c:1048
+#: smime/lib/e-cert.c:1100
 msgid "Issuer"
 msgstr "Emissor"
 
-#: smime/lib/e-cert.c:1102
+#: smime/lib/e-cert.c:1154
 msgid "Issuer Unique ID"
 msgstr "ID único do emissor"
 
-#: smime/lib/e-cert.c:1121
+#: smime/lib/e-cert.c:1173
 msgid "Subject Unique ID"
 msgstr "ID único do sujeito"
 
-#: smime/lib/e-cert.c:1164
+#: smime/lib/e-cert.c:1216
 msgid "Certificate Signature Value"
 msgstr "Valor da assinatura do certificado"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
+#: smime/lib/e-cert-db.c:608
 msgid "Certificate already exists"
 msgstr "O certificado já existe"
 
@@ -17613,7 +17140,7 @@ msgstr "Ver o contato atual"
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "Açõe_s"
 
@@ -17773,7 +17300,7 @@ msgstr "_Fechar"
 #: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:3
+#: ui/evolution.xml.h:4
 msgid "Close"
 msgstr "Fechar"
 
@@ -17786,7 +17313,7 @@ msgid "Delete this item"
 msgstr "Excluir este item"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr "Barra de tarefas principal"
 
@@ -17829,7 +17356,7 @@ msgstr "Salvar este item para disco"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:44
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "_File"
 msgstr "_Arquivo"
 
@@ -18090,13 +17617,13 @@ msgstr "_Inverter seleção"
 msgid "_Threaded Message List"
 msgstr "Lista de mensagens _encadeadas"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Fechar esta janela"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "_Close"
 msgstr "_Fechar"
 
@@ -18492,7 +18019,7 @@ msgstr "_Mensagem anterior"
 msgid "_Quoted"
 msgstr "_Citado"
 
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
 msgid "_Tools"
 msgstr "_Ferramentas"
 
@@ -18789,108 +18316,122 @@ msgid "_Open Task"
 msgstr "_Abrir tarefa"
 
 #: ui/evolution.xml.h:1
-msgid "About Ximian Evolution..."
-msgstr "Sobre o Ximian Evolution..."
+#, fuzzy
+msgid "About Evolution..."
+msgstr "Sobre o Evolution"
 
 #: ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
 msgstr "Alterar as configurações do Evolution"
 
-#: ui/evolution.xml.h:5
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the visibility of the toolbar"
+msgstr "Alterar as propriedades desta pasta"
+
+#: ui/evolution.xml.h:6
 msgid "Create a new window displaying this folder"
 msgstr "Cria uma nova janela exibindo esta pasta"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "Sai_r"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "_FAQ do Ximian Evolution"
+
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Sair do programa"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:10
 msgid "Forget _Passwords"
 msgstr "Esquecer _senhas"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:11
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 "Esquecer senhas armazenadas de tal forma que você tenha que fornecê-las "
 "novamente"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:12
 msgid "Import data from other programs"
 msgstr "Importar dados de outros programas"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:14
 msgid "New _Window"
 msgstr "Nova _janela"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Pi_lot Settings..."
 msgstr "Configurações do _pilot..."
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Send / Receive"
 msgstr "Enviar / receber"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Send queued items and retrieve new items"
 msgstr "Enviar itens na fila de saída e buscar novos itens"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Set up Pilot configuration"
 msgstr "Configurar o pilot"
 
-#: ui/evolution.xml.h:17
-msgid "Show information about Ximian Evolution"
+#: ui/evolution.xml.h:19
+#, fuzzy
+msgid "Show information about Evolution"
 msgstr "Exibir informação sobre o Ximian Evolution"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:20
 msgid "Submit Bug Report"
 msgstr "Enviar relatório de erro"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:21
 msgid "Submit _Bug Report"
 msgstr "Enviar relatório de _erro"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Enviar relatório de erro usando o Bug Buddy"
 
-#: ui/evolution.xml.h:21
-msgid "Toggle whether we are working offline."
-msgstr "Alternar se estamos trabalhando desconectados."
-
 #: ui/evolution.xml.h:23
-msgid "Ximian Evolution _FAQ"
-msgstr "_FAQ do Ximian Evolution"
+#, fuzzy
+msgid "T_oolbar"
+msgstr "Barra de tarefas principal"
 
 #: ui/evolution.xml.h:24
-msgid "_About Ximian Evolution..."
-msgstr "_Sobre o Ximian Evolution..."
+msgid "Toggle whether we are working offline."
+msgstr "Alternar se estamos trabalhando desconectados."
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "_About Evolution..."
+msgstr "Sobre o Evolution"
+
+#: ui/evolution.xml.h:30
 msgid "_Help"
 msgstr "Aj_uda"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "_Import..."
 msgstr "_Importar..."
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "_New"
 msgstr "_Novo"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "_Quick Reference"
 msgstr "_Referência rápida"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_Send / Receive"
 msgstr "_Enviar / receber"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 #, fuzzy
 msgid "_Window"
 msgstr "Nova _janela"
@@ -18960,7 +18501,7 @@ msgid "With _Status"
 msgstr "Com _estado"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:626
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:635
 msgid "UTC"
 msgstr "UTC"
 
@@ -19114,26 +18655,26 @@ msgstr "Outro..."
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
-#: widgets/misc/e-error.c:121
+#: widgets/misc/e-error.c:79 widgets/misc/e-error.c:80
+#: widgets/misc/e-error.c:122
 msgid "Evolution Error"
 msgstr "Erro do Evolution"
 
-#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
-#: widgets/misc/e-error.c:119
+#: widgets/misc/e-error.c:81 widgets/misc/e-error.c:82
+#: widgets/misc/e-error.c:120
 msgid "Evolution Warning"
 msgstr "Alerta do Evolution"
 
-#: widgets/misc/e-error.c:118
+#: widgets/misc/e-error.c:119
 msgid "Evolution Information"
 msgstr "Informação do Evolution"
 
-#: widgets/misc/e-error.c:120
+#: widgets/misc/e-error.c:121
 msgid "Evolution Query"
 msgstr "Consulta do Evolution"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:410
+#: widgets/misc/e-error.c:415
 #, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -19273,16 +18814,532 @@ msgstr "Não é possível salvar arquivo \"{0}\""
 msgid "Cannot open file \"{0}\"."
 msgstr "Não é possível abrir arquivo \"{0}\""
 
-#: widgets/misc/e-task-widget.c:211
+#: widgets/misc/e-task-widget.c:212
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: widgets/misc/e-task-widget.c:216
+#: widgets/misc/e-task-widget.c:217
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% cumprida)"
 
+#~ msgid "Failed to connect to LDAP server"
+#~ msgstr "Falha de conexão ao servidor LDAP"
+
+#~ msgid "Failed to authenticate with LDAP server"
+#~ msgstr "Falha de autenticação com o servidor LDAP"
+
+#~ msgid "Could not perform query on Root DSE"
+#~ msgstr "Não foi possível realizar consulta na raiz DSE"
+
+#~ msgid "The server responded with no supported search bases"
+#~ msgstr "O servidor respondeu sem bases de pesquisa suportadas"
+
+#~ msgid "This server does not support LDAPv3 schema information"
+#~ msgstr "Este servidor não suporta informação de schema LDAPv3"
+
+#~ msgid "Error retrieving schema information"
+#~ msgstr "Erro ao buscar informação de schema"
+
+#~ msgid "Server did not respond with valid schema information"
+#~ msgstr "O servidor não respondeu com informação de schema válida"
+
+#~ msgid "  S_how Supported Bases "
+#~ msgstr "  E_xibir bases suportadas "
+
+#~ msgid "1:00"
+#~ msgstr "1:00"
+
+#~ msgid "5:00"
+#~ msgstr "5:00"
+
+#~ msgid "Connecting"
+#~ msgstr "Conectando"
+
+#~ msgid "Distinguished _name:"
+#~ msgstr "_Distinguished name:"
+
+#~ msgid "Email address:"
+#~ msgstr "Endereço de e-mail:"
+
+#~ msgid "Evolution will use this DN to authenticate you with the server"
+#~ msgstr "O Evolution usará este DN para autenticá-lo no servidor"
+
+#~ msgid "One"
+#~ msgstr "Um"
+
+#~ msgid "S_earch scope: "
+#~ msgstr "_Escopo de pesquisa: "
+
+#~ msgid "Searching"
+#~ msgstr "Pesquisando"
+
+#~ msgid "Sub"
+#~ msgstr "Sub"
+
+#~ msgid "This option controls how long a search will be run."
+#~ msgstr "Esta opção controla o tempo de execução de uma pesquisa."
+
+#~ msgid "U_se SSL/TLS:"
+#~ msgstr "_Usar SSL/TLS:"
+
+#~ msgid "_Display name:"
+#~ msgstr "_Nome para exibição:"
+
+#~ msgid "_Port number:"
+#~ msgstr "Número da _porta:"
+
+#~ msgid "_Search base:"
+#~ msgstr "_Base de pesquisa:"
+
+#~ msgid "_Server name:"
+#~ msgstr "Nome do _servidor:"
+
+#~ msgid "_Timeout (minutes):"
+#~ msgstr "_Tempo limite (minutos):"
+
+#~ msgid "connecting-tab"
+#~ msgstr "connecting-tab"
+
+#~ msgid "general-tab"
+#~ msgstr "general-tab"
+
+#~ msgid "searching-tab"
+#~ msgstr "searching-tab"
+
+#~ msgid "Job title:"
+#~ msgstr "Função:"
+
+#~ msgid "Webcam:"
+#~ msgstr "Webcam:"
+
+#~ msgid "item7"
+#~ msgstr "item7"
+
+#~ msgid "item8"
+#~ msgstr "item8"
+
+#~ msgid "Category editor not available."
+#~ msgstr "Editor de categorias não disponível."
+
+#~ msgid ""
+#~ "The following entries are invalid:\n"
+#~ "\n"
+#~ msgstr ""
+#~ "As seguintes entradas são inválidas:\n"
+#~ "\n"
+
+#~ msgid "Could not find widget for a field: `%s'"
+#~ msgstr "Não foi possível encontrar widget para um campo: `%s'"
+
+#~ msgid "Do you want to save changes?"
+#~ msgstr "Você deseja salvar as alterações?"
+
+#~ msgid "Error saving %s: %s"
+#~ msgstr "Erro ao salvar %s: %s"
+
+#~ msgid ""
+#~ "The addressbook backend for\n"
+#~ "%s\n"
+#~ "has crashed. You will have to restart Evolution in order to use it again"
+#~ msgstr ""
+#~ "O backend do catálogo de endereços para\n"
+#~ "%s\n"
+#~ "capotou. Você tera que reiniciar o Evolution para poder usá-lo novamente"
+
+#~ msgid "Can not load URI"
+#~ msgstr "Não é possível carregar URI"
+
+#~ msgid "Calendar Properties"
+#~ msgstr "Propriedades da agenda"
+
+#~ msgid "Remote"
+#~ msgstr "Remoto"
+
+#~ msgid "Task List Properties"
+#~ msgstr "Propriedades da listas de tarefas"
+
+#~ msgid "_Refresh Interval:"
+#~ msgstr "_Intervalo de atualização:"
+
+#~ msgid "_Source URL:"
+#~ msgstr "URL _fonte:"
+
+#~ msgid ""
+#~ "The event being deleted is a meeting, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "O evento que está sendo apagado é uma reunião. Você gostaria de enviar um "
+#~ "aviso de cancelamento?"
+
+#~ msgid "Are you sure you want to cancel and delete this meeting?"
+#~ msgstr "Você tem certeza que deseja cancelar e excluir esta reunião?"
+
+#~ msgid ""
+#~ "The task being deleted is assigned, would you like to send a cancellation "
+#~ "notice?"
+#~ msgstr ""
+#~ "A tarefa que está sendo apagada está atribuída. Você gostaria de enviar "
+#~ "um aviso de cancelamento?"
+
+#~ msgid "Are you sure you want to cancel and delete this task?"
+#~ msgstr "Você tem certeza que deseja cancelar e excluir esta tarefa?"
+
+#~ msgid ""
+#~ "The journal entry being deleted is published, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "O item de diário que está sendo apagado está publicado. Você gostaria de "
+#~ "enviar um aviso de cancelamento?"
+
+#~ msgid "Are you sure you want to cancel and delete this journal entry?"
+#~ msgstr "Você tem certeza que deseja cancelar e excluir este item de diário?"
+
+#~ msgid "Are you sure you want to delete the appointment `%s'?"
+#~ msgstr "Você tem certeza que deseja excluir o comprimisso `%s'?"
+
+#~ msgid "Are you sure you want to delete this untitled appointment?"
+#~ msgstr "Você tem certeza que deseja excluir este comprimisso sem título?"
+
+#~ msgid "Are you sure you want to delete the task `%s'?"
+#~ msgstr "Você tem certeza que deseja excluir a tarefa `%s'?"
+
+#~ msgid "Are you sure you want to delete this untitled task?"
+#~ msgstr "Você tem certeza que deseja excluir esta tarefa sem título?"
+
+#~ msgid "Are you sure you want to delete the journal entry `%s'?"
+#~ msgstr "Você tem certeza que deseja excluir o item de diário `%s'?"
+
+#~ msgid "Are you sure want to delete this untitled journal entry?"
+#~ msgstr "Você tem certeza que deseja excluir este item de diário sem título?"
+
+#~ msgid "Are you sure you want to delete %d appointment?"
+#~ msgid_plural "Are you sure you want to delete %d appointments?"
+#~ msgstr[0] "Você tem certeza que deseja excluir %d comprimisso?"
+#~ msgstr[1] "Você tem certeza que deseja excluir %d comprimissos?"
+
+#~ msgid "Are you sure you want to delete %d task?"
+#~ msgid_plural "Are you sure you want to delete %d tasks?"
+#~ msgstr[0] "Você tem certeza que deseja excluir %d tarefa?"
+#~ msgstr[1] "Você tem certeza que deseja excluir %d tarefas?"
+
+#~ msgid "Are you sure you want to delete %d journal entry?"
+#~ msgid_plural "Are you sure you want to delete %d journal entries?"
+#~ msgstr[0] "Você tem certeza que deseja excluir %d item de diário?"
+#~ msgstr[1] "Você tem certeza que deseja excluir %d itens de diário?"
+
+#~ msgid "_Invite Others..."
+#~ msgstr "_Convidar outros..."
+
+#~ msgid ""
+#~ "This event has been changed, but has not been saved.\n"
+#~ "\n"
+#~ "Do you wish to save your changes?"
+#~ msgstr ""
+#~ "Este evento foi alterado, mas não foi salvo.\n"
+#~ "\n"
+#~ "Você deseja salvar as suas alterações?"
+
+#~ msgid "_Discard Changes"
+#~ msgstr "_Descartar alterações"
+
+#~ msgid "Save Event"
+#~ msgstr "Salvar evento"
+
+#~ msgid "The meeting information has been created. Send it?"
+#~ msgstr "A informação da reunião foi criada. Enviá-la?"
+
+#~ msgid "The meeting information has changed. Send an updated version?"
+#~ msgstr "A informação da reunião foi alterada. Enviar uma versão atualizada?"
+
+#~ msgid "The task assignment information has been created. Send it?"
+#~ msgstr "A informação de atribuição de tarefa foi criada. Enviá-la?"
+
+#~ msgid "The task information has changed. Send an updated version?"
+#~ msgstr "A informação da tarefa foi alterada. Enviar uma versão atualizada?"
+
+#~ msgid "The task backend for '%s' has crashed."
+#~ msgstr "O backend de tarefas para '%s' capotou."
+
+#~ msgid "The calendar backend for '%s' has crashed."
+#~ msgstr "O backend de agenda para '%s' capotou."
+
+#~ msgid "Learning junk and/or non junk message(s)"
+#~ msgstr "Aprendendo mensagens que são ou não são lixo"
+
+#~ msgid "Could not get article %s from NNTP server"
+#~ msgstr "Não foi possível obter artigo %s do servidor NNTP"
+
+#~ msgid "Posting not allowed by news server"
+#~ msgstr "Publicação não permitida pelo servidor de notícias"
+
+#~ msgid "Failed to send newsgroups header: %s: message not posted"
+#~ msgstr ""
+#~ "Falha ao enviar cabeçalho do grupo de notícias: %s: mensagem não publicada"
+
+#~ msgid "Error posting to newsgroup: %s: message not posted"
+#~ msgstr "Erro ao publicar no grupo de notícias: %s: mensagem não publicada"
+
+#~ msgid "Error reading response to posted message: message not posted"
+#~ msgstr "Erro ao ler resposta à mensagem publicada: mensagem não publicada"
+
+#~ msgid "Error posting message: %s: message not posted"
+#~ msgstr "Erro ao publicar mensagem: %s: mensagem não publicada"
+
+#~ msgid "Stream error"
+#~ msgstr "Erro no stream"
+
+#~ msgid "Connection error: %s"
+#~ msgstr "Erro de conexão: %s"
+
+#~ msgid "Could not get group: %s"
+#~ msgstr "Não foi possível obter grupo: %s"
+
+#~ msgid "Could not get messages: unspecified error"
+#~ msgstr "Não foi possível obter mensagens: erro não especificado"
+
+#~ msgid "Unknown server response: %s"
+#~ msgstr "Resposta desconhecida do servidor: %s"
+
+#~ msgid "${1}"
+#~ msgstr "${1}"
+
+#~ msgid "Because \"${1}\"."
+#~ msgstr "Devido a \"${1}\"."
+
+#~ msgid "Adjust Score"
+#~ msgstr "Ajustar pontuação"
+
+#~ msgid "Assign Color"
+#~ msgstr "Atribuir cor"
+
+#~ msgid "Assign Score"
+#~ msgstr "Atribuir pontuação"
+
+#~ msgid "Attachments"
+#~ msgstr "Anexos"
+
+#~ msgid "Beep"
+#~ msgstr "Bip"
+
+#~ msgid "contains"
+#~ msgstr "contém"
+
+#~ msgid "Copy to Folder"
+#~ msgstr "Copiar para pasta"
+
+#~ msgid "Date received"
+#~ msgstr "Data de recepção"
+
+#~ msgid "Date sent"
+#~ msgstr "Data de envio"
+
+#~ msgid "Deleted"
+#~ msgstr "Excluída"
+
+#~ msgid "does not contain"
+#~ msgstr "não contém"
+
+#~ msgid "does not end with"
+#~ msgstr "não termina com"
+
+#~ msgid "does not exist"
+#~ msgstr "não existe"
+
+#~ msgid "does not return"
+#~ msgstr "não retorna"
+
+#~ msgid "does not sound like"
+#~ msgstr "não soa como"
+
+#~ msgid "does not start with"
+#~ msgstr "não começa com"
+
+#~ msgid "Do Not Exist"
+#~ msgstr "Não existe"
+
+#~ msgid "Draft"
+#~ msgstr "Rascunho"
+
+#~ msgid "ends with"
+#~ msgstr "termina com"
+
+#~ msgid "Exist"
+#~ msgstr "Existe"
+
+#~ msgid "exists"
+#~ msgstr "existe"
+
+#~ msgid "Expression"
+#~ msgstr "Expressão"
+
+#~ msgid "Follow Up"
+#~ msgstr "Continuar"
+
+#~ msgid "is"
+#~ msgstr "é"
+
+#~ msgid "is after"
+#~ msgstr "é após"
+
+#~ msgid "is before"
+#~ msgstr "é antes"
+
+#~ msgid "is Flagged"
+#~ msgstr "está Marcada"
+
+#~ msgid "is greater than"
+#~ msgstr "é maior que"
+
+#~ msgid "is less than"
+#~ msgstr "é menor que"
+
+#~ msgid "is not"
+#~ msgstr "não é"
+
+#~ msgid "is not Flagged"
+#~ msgstr "não está Marcada"
+
+#~ msgid "Junk Test"
+#~ msgstr "Teste lixo"
+
+#~ msgid "Mailing list"
+#~ msgstr "Lista de discussão"
+
+#~ msgid "Message Body"
+#~ msgstr "Corpo da mensagem"
+
+#~ msgid "Message Header"
+#~ msgstr "Cabeçalho da mensagem"
+
+#~ msgid "Message is Junk"
+#~ msgstr "Mensagem é lixo"
+
+#~ msgid "Message is not Junk"
+#~ msgstr "Mensagem não é lixo"
+
+#~ msgid "Move to Folder"
+#~ msgstr "Mover para pasta"
+
+#~ msgid "Pipe to Program"
+#~ msgstr "Enviar (pipe) para programa"
+
+#~ msgid "Play Sound"
+#~ msgstr "Tocar som"
+
+#~ msgid "Recipients"
+#~ msgstr "Destinatários"
+
+#~ msgid "Regex Match"
+#~ msgstr "Casamento com expressão regular"
+
+#~ msgid "Replied to"
+#~ msgstr "Em resposta a"
+
+#~ msgid "returns"
+#~ msgstr "retorna"
+
+#~ msgid "returns greater than"
+#~ msgstr "retorna maior que"
+
+#~ msgid "returns less than"
+#~ msgstr "retorna menor que"
+
+#~ msgid "Run Program"
+#~ msgstr "Executar programa"
+
+#~ msgid "Sender"
+#~ msgstr "Remetente"
+
+#~ msgid "Set Status"
+#~ msgstr "Atribuir estado"
+
+#~ msgid "Size (kB)"
+#~ msgstr "Tamanho (kB)"
+
+#~ msgid "sounds like"
+#~ msgstr "soa como"
+
+#~ msgid "Source Account"
+#~ msgstr "Conta fonte"
+
+#~ msgid "Specific header"
+#~ msgstr "Cabeçalho específico"
+
+#~ msgid "starts with"
+#~ msgstr "começa com"
+
+#~ msgid "Stop Processing"
+#~ msgstr "Parar o processamento"
+
+#~ msgid "Unset Status"
+#~ msgstr "Desconfigurar estado"
+
+#~ msgid "Check _Incoming Mail"
+#~ msgstr "_Testar mensagens recebidas"
+
+#~ msgid "Use _Daemon"
+#~ msgstr "Usar _daemon"
+
+#~ msgid "_Local Tests Only"
+#~ msgstr "_Testes locais apenas"
+
+#~ msgid "Working"
+#~ msgstr "Trabalhando"
+
+#~ msgid "Brought to you by"
+#~ msgstr "Feito para você por"
+
+#~ msgid "_Filename:"
+#~ msgstr "_Nome do arquivo:"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "Unknown error."
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Erro desconhecido."
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the component system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "O erro do sistema de componentes é:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the activation system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "O erro do sistema de ativação é:\n"
+#~ "%s"
+
+#~ msgid "Do you want to trust \"%s\" for the following purposes?"
+#~ msgstr "Você deseja confiar em \"%s\" para os seguintes propósitos?"
+
+#~ msgid "View Certificate"
+#~ msgstr "Ver certificado"
+
+#~ msgid "You have been asked to trust a new Certificate Authority (CA)."
+#~ msgstr "É pedido que você confie em uma nova autoridade certificadora (AC)."
+
+#~ msgid "About Ximian Evolution..."
+#~ msgstr "Sobre o Ximian Evolution..."
+
+#~ msgid "_About Ximian Evolution..."
+#~ msgstr "_Sobre o Ximian Evolution..."
+
 #~ msgid "Could not initialize gnome-vfs"
 #~ msgstr "Não foi possível iniciar gnome-vfs"
 
@@ -19479,9 +19536,6 @@ msgstr "%s (%d%% cumprida)"
 #~ msgid "Primary _email:"
 #~ msgstr "E-mail _principal:"
 
-#~ msgid "S_pouse:"
-#~ msgstr "_Cônjuge:"
-
 #~ msgid "_Business:"
 #~ msgstr "C_omercial:"
 
@@ -19497,9 +19551,6 @@ msgstr "%s (%d%% cumprida)"
 #~ msgid "_Mobile:"
 #~ msgstr "Ce_lular:"
 
-#~ msgid "_Office:"
-#~ msgstr "_Escritório:"
-
 #~ msgid "_Public Calendar URL:"
 #~ msgstr "URL da agenda _pública:"
 
diff --git a/po/ro.po b/po/ro.po
index 3fac0f94c6..a7d64dd73b 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.15\n"
-"POT-Creation-Date: 2004-05-19 14:00-0400\n"
+"POT-Creation-Date: 2004-06-03 11:14-0400\n"
 "PO-Revision-Date: 2001-09-12 16:59+0800\n"
 "Last-Translator: Tiberiu Micu <tibimicu@gmx.net>\n"
 "Language-Team: Română <ro@li.org>\n"
@@ -62,14 +62,14 @@ msgstr "Tipăreşte calendar"
 msgid "Default Sync Address:"
 msgstr "Adresa email:"
 
-#: addressbook/conduit/address-conduit.c:1150
 #: addressbook/conduit/address-conduit.c:1151
+#: addressbook/conduit/address-conduit.c:1152
 #, fuzzy
 msgid "Could not load addressbook"
 msgstr "Nu pot încărca %s: %s"
 
-#: addressbook/conduit/address-conduit.c:1219
-#: addressbook/conduit/address-conduit.c:1222
+#: addressbook/conduit/address-conduit.c:1220
+#: addressbook/conduit/address-conduit.c:1223
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
@@ -77,8 +77,8 @@ msgstr ""
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
 #, fuzzy
 msgid "Failed to authenticate.\n"
 msgstr ""
@@ -86,8 +86,8 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
 #, fuzzy, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "Introduceţi parola pentru %s"
@@ -135,62 +135,24 @@ msgstr "Grup de _contact"
 msgid "Create a new contacts group"
 msgstr "Crează un grup nou de scurtături"
 
-#: addressbook/gui/component/addressbook-component.c:182
+#: addressbook/gui/component/addressbook-component.c:184
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:483
-#, fuzzy
-msgid "Failed to connect to LDAP server"
-msgstr "Nu mă pot conecta la serverul LDAP."
-
-#: addressbook/gui/component/addressbook-config.c:507
-#, fuzzy
-msgid "Failed to authenticate with LDAP server"
-msgstr ""
-"Autentificare la serverul IMAP eşuată.\n"
-"%s\n"
-"\n"
-
-#: addressbook/gui/component/addressbook-config.c:535
-msgid "Could not perform query on Root DSE"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:840
-msgid "The server responded with no supported search bases"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1245
-#, fuzzy
-msgid "This server does not support LDAPv3 schema information"
-msgstr "Răspunsul serverului IMAP nu conţine informaţia %s"
-
-#: addressbook/gui/component/addressbook-config.c:1266
-#, fuzzy
-msgid "Error retrieving schema information"
-msgstr ""
-"Eroare la încarcarea informaţiei de filtrare:\n"
-"%s"
-
-#: addressbook/gui/component/addressbook-config.c:1274
-#, fuzzy
-msgid "Server did not respond with valid schema information"
-msgstr "Răspunsul serverului IMAP nu conţine informaţia %s"
-
 #: addressbook/gui/component/addressbook-migrate.c:68
-#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1160
 #, fuzzy
 msgid "Migrating..."
 msgstr "Aştept..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1201
 #, fuzzy, c-format
 msgid "Migrating `%s':"
 msgstr "Trimit \"%s\""
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:438
+#: addressbook/gui/component/addressbook-migrate.c:464
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
 #: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
@@ -198,31 +160,31 @@ msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:446
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
-#: mail/mail-config.glade.h:106
+#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
+#: mail/mail-config.glade.h:109
 msgid "Personal"
 msgstr ""
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:454
+#: addressbook/gui/component/addressbook-migrate.c:480
 #, fuzzy
 msgid "On LDAP Servers"
 msgstr "Server LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:582
+#: addressbook/gui/component/addressbook-migrate.c:608
 #, fuzzy
 msgid "LDAP Servers"
 msgstr "Server LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:702
+#: addressbook/gui/component/addressbook-migrate.c:728
 #, fuzzy
 msgid "Autocompletion Settings"
 msgstr "Data terminare"
 
-#: addressbook/gui/component/addressbook-migrate.c:1076
+#: addressbook/gui/component/addressbook-migrate.c:1104
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -230,61 +192,56 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1090
+#: addressbook/gui/component/addressbook-migrate.c:1118
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1099
+#: addressbook/gui/component/addressbook-migrate.c:1127
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1109
+#: addressbook/gui/component/addressbook-migrate.c:1137
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:674
+#: addressbook/gui/component/addressbook-view.c:675
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:761
+#: addressbook/gui/component/addressbook-view.c:754
 #, fuzzy
 msgid "New Address Book"
 msgstr "Agendă"
 
-#: addressbook/gui/component/addressbook-view.c:762
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
+#: addressbook/gui/component/addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Şterg"
 
-#: addressbook/gui/component/addressbook-view.c:763
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-view.c:756
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 #, fuzzy
 msgid "Properties..."
 msgstr "_Proprietăţi..."
 
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/addressbook-view.c:1002
+#. Create the contacts group
+#: addressbook/gui/component/addressbook-view.c:995
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
 #: calendar/gui/migration.c:373
 msgid "Contacts"
 msgstr "Contacte"
@@ -371,11 +328,6 @@ msgid "Manage your S/MIME certificates here"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-#, fuzzy
-msgid "  S_how Supported Bases "
-msgstr "Verific tipurile suportate"
-
-#: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -390,413 +342,329 @@ msgstr "Verific tipurile suportate"
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:4
-#, fuzzy
-msgid "1:00"
-msgstr "100%"
-
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "Autentificare"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
 #, fuzzy
 msgid "<b>Display</b>"
 msgstr "Descriere:"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 #, fuzzy
 msgid "<b>Downloading</b>"
 msgstr "_Acţiune"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:10
 #, fuzzy
 msgid "<b>Searching</b>"
 msgstr "Caut..."
 
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
 msgid "<b>Server Information</b>"
 msgstr "Informaţie sursă"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
 msgid "<b>Type:</b>"
 msgstr "Descriere:"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:13
 #, fuzzy
 msgid "Add Contacts Group"
 msgstr "Grup de _contact"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:14
 #, fuzzy
 msgid "Address Book Properties"
 msgstr "Surse agendă"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
-#: mail/mail-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
+#: mail/mail-config.glade.h:42
 #, fuzzy
 msgid "Always"
 msgstr "Alarme"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:16
 #, fuzzy
 msgid "Anonymously"
 msgstr "Anonim"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:17
 #: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "De bază"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
-#, fuzzy
-msgid "Connecting"
-msgstr "Deconectare de la %s"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 #: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Detalii"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
-#, fuzzy
-msgid "Distinguished _name:"
-msgstr "_Nume listă:"
-
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:19
 #, fuzzy
 msgid "Distinguished name"
 msgstr "_Nume listă:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:20
 #, fuzzy
 msgid "Download limit:"
 msgstr "Încarcă _imaginile"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Email address"
 msgstr "Adresa email:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-#, fuzzy
-msgid "Email address:"
-msgstr "Adresa email:"
-
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "Evolution will use this DN to authenticate you with the server"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid ""
-"Evolution will use this email address to authenticate you with the server"
+"Evolution will use this email address to authenticate you with the server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:23
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Stochez căutarea ca dosar V"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:24
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
+#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "General"
 
-#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
-#: mail/mail-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
+#: mail/mail-config.glade.h:102
 #, fuzzy
 msgid "Never"
 msgstr "Fiecare"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
-msgid "One"
-msgstr "Unu"
-
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:27
 #, fuzzy
-msgid "S_earch scope: "
-msgstr "Scopul căutării:"
+msgid "Search _base:"
+msgstr "Domeniu căutare:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
 msgid "Search base only"
 msgstr "Domeniu căutare:"
 
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:29
 #, fuzzy
 msgid "Search base:"
 msgstr "Domeniu căutare:"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Search scope:"
 msgstr "Scopul căutării:"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
-#, fuzzy
-msgid "Searching"
-msgstr "Caut..."
-
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:31
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
-"server if\n"
-"your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL or TLS."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a \n"
-"insecure environment. For example, if you and your LDAP server are behind a "
-"firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection "
-"is already\n"
-"secure."
+"you are in a insecure environment. For example, if you and your LDAP server "
+"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
+"because your connection is already secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
-"TLS.  This \n"
-"means that your connection will be insecure, and that you will be vulnerable "
-"to security\n"
-"exploits. "
+"TLS.  This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:50
-#, fuzzy
-msgid "Sub"
-msgstr "Du"
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:35
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "Stochez căutarea ca dosar V"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
-"searches will \n"
-"begin. If you leave this blank, the search will begin at the root of the "
-"directory tree."
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
-"the \n"
-"directory tree. A search scope of \"sub\" will include all entries below "
-"your search base.\n"
-"A search scope of \"one\" will only include the entries one level beneath "
-"your base.\n"
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:58
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
-"This is the maximum number of entries to download. Setting this number to "
-"be \n"
+"This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:41
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
-"list.\n"
-"It is for display purposes only. "
+"list. It is for display purposes only. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. "
-"A \n"
-"list of standard ports has been provided. Ask your system administrator\n"
-"what port you should specify."
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:67
-msgid "This option controls how long a search will be run."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:43
 #, fuzzy
 msgid "Timeout:"
 msgstr "Format timp:"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
-msgid "U_se SSL/TLS:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:45
 #, fuzzy
 msgid "Using email address"
 msgstr "_Aceasta este adresa de expediere"
 
-#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
-#: mail/mail-config.glade.h:154
+#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
+#: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:47
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "Grup de _contact"
 
-#: addressbook/gui/component/ldap-config.glade.h:74
-#: calendar/gui/dialogs/calendar-setup.glade.h:12
-#, fuzzy
-msgid "_Display name:"
-msgstr "Afişează"
-
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
 msgid "_Email address:"
 msgstr "Adresa email:"
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:50
+#, fuzzy
+msgid "_Find Possible Search Bases"
+msgstr "Stochez căutarea ca dosar V"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
+#: addressbook/gui/component/ldap-config.glade.h:52
 #, fuzzy
-msgid "_Name:"
-msgstr "Nume:"
+msgid "_Log in:"
+msgstr "Logare NT"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:53
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
 #, fuzzy
-msgid "_Port number:"
-msgstr "Port:"
+msgid "_Name:"
+msgstr "Nume:"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "_Port:"
 msgstr "_Prioritate:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
-#, fuzzy
-msgid "_Search base:"
-msgstr "Domeniu căutare:"
-
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:55
 #, fuzzy
-msgid "_Server name:"
-msgstr "Mesaj server:"
+msgid "_Search scope:"
+msgstr "Scopul căutării:"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:56
 #, fuzzy
 msgid "_Server:"
 msgstr "Mesaj server:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:57
 #, fuzzy
-msgid "_Timeout (minutes):"
-msgstr "Durata de sforăire (minute)"
+msgid "_Timeout:"
+msgstr "Format timp:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:58
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "Foloseşte conectare securizată (SSL)"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:59
 #, fuzzy
 msgid "cards"
 msgstr "Nepornit"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
-#, fuzzy
-msgid "connecting-tab"
-msgstr "Deconectare de la %s"
-
-#: addressbook/gui/component/ldap-config.glade.h:88
-#, fuzzy
-msgid "general-tab"
-msgstr "General"
-
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:60
 #: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
-#: mail/mail-config.glade.h:182
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "minute"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
-#, fuzzy
-msgid "searching-tab"
-msgstr "Caut..."
-
-#: addressbook/gui/component/select-names/e-select-names.c:497
+#: addressbook/gui/component/select-names/e-select-names.c:503
 #: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid "Select Contacts from Address Book"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
@@ -839,7 +707,7 @@ msgstr "Contact schimbat:"
 
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:222
+#: addressbook/gui/widgets/e-addressbook-view.c:224
 msgid "Source"
 msgstr "Sursă"
 
@@ -919,9 +787,9 @@ msgid "<b>Work</b>"
 msgstr "Săptămâna de lucru"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
-#: addressbook/gui/widgets/eab-contact-display.c:342
-#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/widgets/eab-contact-display.c:334
+#: addressbook/gui/widgets/eab-contact-display.c:353
 msgid "AIM"
 msgstr ""
 
@@ -962,8 +830,8 @@ msgid "Company:"
 msgstr "Companie"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:271
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
+#: addressbook/gui/contact-editor/e-contact-editor.c:266
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
 #, fuzzy
@@ -971,7 +839,7 @@ msgid "Contact"
 msgstr "Contacte"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1527
+#: addressbook/gui/contact-editor/e-contact-editor.c:520
 msgid "Contact Editor"
 msgstr "Editor de contacte"
 
@@ -996,84 +864,80 @@ msgid "Full _Name..."
 msgstr "_Nume complet..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:202
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-msgid "Home"
-msgstr "Adresa de acasă"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #, fuzzy
 msgid "Home Page:"
 msgstr "Fax acasă"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-#, fuzzy
-msgid "Job title:"
-msgstr "_Funcţia:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/e-itip-control.c:936
-#, fuzzy
-msgid "Location:"
-msgstr "_Acţiune"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 #, fuzzy
 msgid "MSN Messenger"
 msgstr "Mesaj _mail"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 #, fuzzy
 msgid "Mailing Address"
 msgstr "Adresa email:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 #, fuzzy
 msgid "Manager:"
 msgstr "Manager"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "Poreclă:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Notes:"
 msgstr "No_tiţe"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
-#: addressbook/gui/contact-editor/e-contact-editor.c:203
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-msgid "Other"
-msgstr "Alte"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#, fuzzy
+msgid "Office:"
+msgstr "Birou:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "PO Box:"
 msgstr "Căsuţa _poştală:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 #, fuzzy
 msgid "Personal Information"
 msgstr "Informaţie opţională"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 #, fuzzy
 msgid "Profession:"
 msgstr "_Profesie:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#, fuzzy
+msgid "Spouse:"
+msgstr "_Soţ/soţie:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "State/Province:"
 msgstr "_Stat/Provincie"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#, fuzzy
+msgid "Title:"
+msgstr "_Titlu:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+msgid "Video Chat:"
+msgstr ""
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:41
 #, fuzzy
 msgid "Wants to receive HTML mail"
@@ -1081,15 +945,15 @@ msgstr "Doriţi sa primiţi mail-uri _HTML"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:42
 #, fuzzy
-msgid "Webcam:"
-msgstr "Pagină"
+msgid "Web Log:"
+msgstr "Adresa paginii de web:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
-#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
-#: mail/mail-config.glade.h:155
+#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
+#: mail/mail-config.glade.h:157
 #, fuzzy
 msgid "Work"
 msgstr "Lucrez"
@@ -1112,26 +976,19 @@ msgid "_File under:"
 msgstr "Nume fişier:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 #, fuzzy
 msgid "_Where:"
 msgstr "Mesaj server:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
-msgid "item7"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
-msgid "item8"
-msgstr ""
-
-#: addressbook/gui/contact-editor/eab-editor.c:316
+#: addressbook/gui/contact-editor/eab-editor.c:315
 #, fuzzy
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
 msgstr "Sunteţi sigur că doriţi să ştergeţi acest cont?"
 
-#: addressbook/gui/contact-editor/eab-editor.c:319
+#: addressbook/gui/contact-editor/eab-editor.c:318
 #, fuzzy
 msgid ""
 "Are you sure you want\n"
@@ -1139,17 +996,17 @@ msgid ""
 msgstr "Sunteţi sigur că doriţi să ştergeţi acest cont?"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:351
-#: addressbook/gui/widgets/eab-contact-display.c:372
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:364
 #, fuzzy
 msgid "Address"
 msgstr "_Adresa:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:292
+#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard.c:174
@@ -2209,94 +2066,117 @@ msgstr ""
 msgid "Zimbabwe"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/contact-editor/e-contact-editor.c:179
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:337
+#: addressbook/gui/widgets/eab-contact-display.c:356
 #, fuzzy
 msgid "Jabber"
 msgstr "Contact schimbat:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:347
-#: addressbook/gui/widgets/eab-contact-display.c:366
+#: addressbook/gui/contact-editor/e-contact-editor.c:180
+#: addressbook/gui/widgets/eab-contact-display.c:339
+#: addressbook/gui/widgets/eab-contact-display.c:358
 #, fuzzy
 msgid "Yahoo"
 msgstr "Port:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: addressbook/gui/widgets/eab-contact-display.c:338
+#: addressbook/gui/widgets/eab-contact-display.c:357
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:344
-#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#: addressbook/gui/widgets/eab-contact-display.c:355
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/contact-editor/e-contact-editor.c:183
 #, fuzzy
 msgid "GroupWise"
 msgstr "Nume grup:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+msgid "Home"
+msgstr "Adresa de acasă"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+msgid "Other"
+msgstr "Alte"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
 #, fuzzy
 msgid "Source Book"
 msgstr "Sursă"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:264
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:278
+#: addressbook/gui/contact-editor/e-contact-editor.c:273
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Contact nou"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:285
+#: addressbook/gui/contact-editor/e-contact-editor.c:280
 #, fuzzy
 msgid "Writable Fields"
 msgstr "Câmpul De la"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:299
+#: addressbook/gui/contact-editor/e-contact-editor.c:294
 #, fuzzy
 msgid "Changed"
 msgstr "Scaun"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
-#, fuzzy
-msgid "Category editor not available."
-msgstr "Nu e disponibilă o descriere."
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:2352
 msgid "This contact belongs to these categories:"
 msgstr "Această persoană de contact aparţine categoriilor:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#: addressbook/gui/contact-editor/e-contact-editor.c:2429
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Şterge contactele selectate"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#: addressbook/gui/contact-editor/e-contact-editor.c:2433
 #, fuzzy
 msgid "No image"
 msgstr "Nume"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#: addressbook/gui/contact-editor/e-contact-editor.c:2636
 #, fuzzy
 msgid ""
-"The following entries are invalid:\n"
+"The contact data is invalid:\n"
 "\n"
 msgstr "Urmatoarele conexiuni sunt actualmente active:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2738
-#, fuzzy, c-format
-msgid "Could not find widget for a field: `%s'"
-msgstr "Nu pot şterge dosarul sumar al fişierelor `%s': %s"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#, fuzzy
+msgid "Invalid contact."
+msgstr "Conţinut invalid al mesajului"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+msgid ""
+"The contact cannot be saved to the selected address book. Do you want to "
+"discard changes?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2727
+#: addressbook/gui/contact-editor/e-contact-editor.c:2751
+#, fuzzy
+msgid "_Discard"
+msgstr "Tipăreşte calendar"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+msgid ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
+msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:62
 #, fuzzy
@@ -2334,7 +2214,7 @@ msgid "_Edit Full"
 msgstr "Editare completă"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Full Name:"
 msgstr "Nume complet:"
@@ -2492,32 +2372,32 @@ msgid "_Type an email address or drag a contact into the list below:"
 msgstr ""
 "Introduceţi o adresă de email sau trageţi contactul în lista de mai jos:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "contact-list-editor"
 msgstr "editor-lista-contact"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:153
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:215
+#: addressbook/gui/widgets/e-addressbook-view.c:217
 #: addressbook/gui/widgets/e-minicard-view.c:460
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
 #, fuzzy
 msgid "Book"
 msgstr "Corp"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
 #, fuzzy
 msgid "Is New List"
 msgstr "Listă nouă"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:215
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
 msgid "Contact List Editor"
 msgstr "Editor lista de contacte"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:438
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
 #, fuzzy
 msgid "Save List as VCard"
 msgstr "Salvează ca şi card V"
@@ -2565,127 +2445,127 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Căutare avansată"
 
-#: addressbook/gui/widgets/eab-contact-display.c:129
-#: addressbook/gui/widgets/eab-contact-display.c:192
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:139
-#: addressbook/gui/widgets/eab-contact-display.c:205
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:257
-#: addressbook/gui/widgets/eab-contact-display.c:533
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:525
 #, fuzzy
 msgid "List Members"
 msgstr "Membri"
 
-#: addressbook/gui/widgets/eab-contact-display.c:329
-#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/eab-contact-display.c:321
+#: addressbook/gui/widgets/eab-contact-display.c:323
 msgid "E-mail"
 msgstr "E-mail"
 
-#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/eab-contact-display.c:332
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organizaţie"
 
-#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:333
 #, fuzzy
 msgid "Position"
 msgstr "Jos:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:354
 #, fuzzy
 msgid "Groupwise"
 msgstr "Nume grup:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:340
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:349
-#: addressbook/gui/widgets/eab-contact-display.c:370
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:362
 #, fuzzy
 msgid "Phone"
 msgstr "Inexistent"
 
-#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:342
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:354
+#: addressbook/gui/widgets/eab-contact-display.c:346
 #, fuzzy
 msgid "work"
 msgstr "Lucrez"
 
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:359
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:368
-#: addressbook/gui/widgets/eab-contact-display.c:587
+#: addressbook/gui/widgets/eab-contact-display.c:360
+#: addressbook/gui/widgets/eab-contact-display.c:579
 #, fuzzy
 msgid "Blog"
 msgstr "întotdeauna"
 
-#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/eab-contact-display.c:363
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Telefon mobil"
 
-#: addressbook/gui/widgets/eab-contact-display.c:375
+#: addressbook/gui/widgets/eab-contact-display.c:367
 #, fuzzy
 msgid "personal"
 msgstr "General"
 
-#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/eab-contact-display.c:374
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Notă"
 
-#: addressbook/gui/widgets/eab-contact-display.c:548
+#: addressbook/gui/widgets/eab-contact-display.c:540
 #, fuzzy
 msgid "Job Title"
 msgstr "_Funcţia:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/eab-contact-display.c:544
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:774
+#: smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "Email"
 
-#: addressbook/gui/widgets/eab-contact-display.c:579
+#: addressbook/gui/widgets/eab-contact-display.c:571
 #, fuzzy
 msgid "Home page"
 msgstr "Fax acasă"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 msgid "Success"
 msgstr "Succes"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Backend busy"
 msgstr ""
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Repository offline"
 msgstr "Depozitare offline"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 #, fuzzy
 msgid "Address Book does not exist"
 msgstr "Dosarul `%s' nu există."
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 #, fuzzy
 msgid "No Self Contact defined"
 msgstr "Listă contacte nouă"
@@ -2693,29 +2573,29 @@ msgstr "Listă contacte nouă"
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Permission denied"
 msgstr "Acces interzis"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:57
 #, fuzzy
 msgid "Contact not found"
 msgstr "Nu găsesc card-ul"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: addressbook/gui/widgets/eab-gui-util.c:58
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "ID-ul card-ului există deja"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Protocol not supported"
 msgstr "Protocol nesuportat"
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:60
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:233
 #: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
@@ -2728,41 +2608,41 @@ msgid "Cancelled"
 msgstr "Revocat"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:61
 #, fuzzy
 msgid "Could not cancel"
 msgstr "Nu pot redenumi dosarul: %s"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:62
 #, fuzzy
 msgid "Authentication Failed"
 msgstr "Eşec la autentificare."
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: addressbook/gui/widgets/eab-gui-util.c:63
 #, fuzzy
 msgid "Authentication Required"
 msgstr "Necesită autentificare"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:66
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "TLS not Available"
 msgstr ""
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#: addressbook/gui/widgets/eab-gui-util.c:66
 #, fuzzy
 msgid "No such source"
 msgstr "Nu există mesaj"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:69
+#: addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Other error"
 msgstr "Altă eroare"
 
-#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:90
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
@@ -2771,7 +2651,7 @@ msgstr ""
 "Nu pot deschide această agendă. Vă rog verificaţi dacă există calea\n"
 "şi daca aveţi drepturi de acces."
 
-#: addressbook/gui/widgets/eab-gui-util.c:110
+#: addressbook/gui/widgets/eab-gui-util.c:97
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -2781,19 +2661,19 @@ msgstr ""
 "că aţi introdus URI incorect, sau serverul LDAP\n"
 "e căzut"
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:102
 #, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution you must compile the program from the CVS "
-"sources after retrieving OpenLDAP from the link below."
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
 msgstr ""
 "Această versiune de Evolution nu are compilat suport LDAP.\n"
 "Dacă doriţi să folosiţi LDAP în Evolution trebuie să compilaţi\n"
 "programul din sursele CVS după ce descărcaţi OpenLDAP urmând\n"
 "legătura următoare.\n"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:109
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -2803,11 +2683,7 @@ msgstr ""
 "că aţi introdus URI incorect, sau serverul LDAP\n"
 "e căzut"
 
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "Unable to open addressbook"
-msgstr "Nu pot deschide agenda"
-
-#: addressbook/gui/widgets/eab-gui-util.c:162
+#: addressbook/gui/widgets/eab-gui-util.c:129
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2815,7 +2691,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:168
+#: addressbook/gui/widgets/eab-gui-util.c:135
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -2823,120 +2699,106 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:174
+#: addressbook/gui/widgets/eab-gui-util.c:141
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:177
+#: addressbook/gui/widgets/eab-gui-util.c:144
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:147
 msgid "This query did not complete successfully."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
-msgid "Do you want to save changes?"
-msgstr "Doriţi să salvaţi modificările?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:208
-#, fuzzy
-msgid "_Discard"
-msgstr "Tipăreşte calendar"
-
-#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:169
 msgid "Error adding list"
 msgstr "Eroare adăugare listă"
 
-#: addressbook/gui/widgets/eab-gui-util.c:229
-#: addressbook/gui/widgets/eab-gui-util.c:652
+#: addressbook/gui/widgets/eab-gui-util.c:169
+#: addressbook/gui/widgets/eab-gui-util.c:580
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Eroare adăugare card"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying list"
 msgstr "Eroare la modificarea listei"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Eroare la modificare card"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:192
 msgid "Error removing list"
 msgstr "Eroare la ştergerea listei"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
-#: addressbook/gui/widgets/eab-gui-util.c:610
+#: addressbook/gui/widgets/eab-gui-util.c:192
+#: addressbook/gui/widgets/eab-gui-util.c:538
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Eroare ştergere card"
 
-#: addressbook/gui/widgets/eab-gui-util.c:334
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
 "Do you really want to display all of these contacts?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:360
+#: addressbook/gui/widgets/eab-gui-util.c:300
 #, c-format
 msgid ""
 "%s already exists\n"
 "Do you want to overwrite it?"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:364
+#: addressbook/gui/widgets/eab-gui-util.c:304
 #, fuzzy
 msgid "Overwrite"
 msgstr "Suprascrieţi fişierul?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:400
-#, fuzzy, c-format
-msgid "Error saving %s: %s"
-msgstr "Eroare la salvarea fişierului: %s"
-
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:437
+#: addressbook/gui/widgets/eab-gui-util.c:365
 msgid "card.vcf"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:571
+#: addressbook/gui/widgets/eab-gui-util.c:499
 #, fuzzy
 msgid "list"
 msgstr "Ceaţă"
 
-#: addressbook/gui/widgets/eab-gui-util.c:706
+#: addressbook/gui/widgets/eab-gui-util.c:634
 #, fuzzy
 msgid "Move contact to"
 msgstr "Nepornit"
 
-#: addressbook/gui/widgets/eab-gui-util.c:708
+#: addressbook/gui/widgets/eab-gui-util.c:636
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Nepornit"
 
-#: addressbook/gui/widgets/eab-gui-util.c:711
+#: addressbook/gui/widgets/eab-gui-util.c:639
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Nepornit"
 
-#: addressbook/gui/widgets/eab-gui-util.c:713
+#: addressbook/gui/widgets/eab-gui-util.c:641
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Nepornit"
 
-#: addressbook/gui/widgets/eab-gui-util.c:716
+#: addressbook/gui/widgets/eab-gui-util.c:644
 #, fuzzy
 msgid "Select target addressbook."
 msgstr "Salvează in agendă"
 
-#: addressbook/gui/widgets/eab-gui-util.c:939
+#: addressbook/gui/widgets/eab-gui-util.c:867
 msgid "Multiple VCards"
 msgstr "Carduri V multiple"
 
-#: addressbook/gui/widgets/eab-gui-util.c:942
+#: addressbook/gui/widgets/eab-gui-util.c:870
 #, c-format
 msgid "VCard for %s"
 msgstr "Card V pentru %s"
@@ -3028,7 +2890,7 @@ msgstr[1] "Contacte"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:229
+#: addressbook/gui/widgets/e-addressbook-view.c:231
 #: addressbook/gui/widgets/e-minicard-view.c:467
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
 #, fuzzy
@@ -3049,155 +2911,147 @@ msgstr "Mobil"
 msgid "Error modifying card"
 msgstr "Eroare la modificare card"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:163
 #, fuzzy
 msgid "Name begins with"
 msgstr "se termină cu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:164
 #, fuzzy
 msgid "Email begins with"
 msgstr "se termină cu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:57
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: calendar/gui/cal-search-bar.c:54
 #, fuzzy
 msgid "Category is"
 msgstr "Categorii"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-#: calendar/gui/cal-search-bar.c:50
+#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Orice câmp conţine"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+#: addressbook/gui/widgets/e-addressbook-view.c:172
 msgid "Advanced..."
 msgstr "Avansat..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:236
+#: addressbook/gui/widgets/e-addressbook-view.c:238
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:249
+#: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Tip"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:506
+#: addressbook/gui/widgets/e-addressbook-view.c:508
 #, fuzzy
 msgid "Address Book"
 msgstr "Agendă"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2076
+#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:2080
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
 msgstr "Salvează ca şi card V"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 #, fuzzy
 msgid "New Contact..."
 msgstr "Contact nou"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Listă contacte nouă"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "Mer_gi la dosarul..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 #, fuzzy
 msgid "Import..."
 msgstr "_Importă..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1066
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_Caută contacte"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Surse _agendă..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1069
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "Setări _pilot..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:10
 #, fuzzy
 msgid "Forward Contact"
 msgstr "Înaintează _anexat"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
 #, fuzzy
 msgid "Send Message to Contact"
 msgstr "Trimite mesaj la contact"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Tipăreşte"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
+#: addressbook/gui/widgets/e-addressbook-view.c:1077
 msgid "Print Envelope"
 msgstr "Tipăreşte plic"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
+#: addressbook/gui/widgets/e-addressbook-view.c:1081
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Agendă"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1080
+#: addressbook/gui/widgets/e-addressbook-view.c:1082
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Agendă"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Decupează"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Copiază"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1087
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Lipeşte"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:1092
+#: calendar/gui/e-calendar-view.c:1280
 #, fuzzy
 msgid "Current View"
 msgstr "Vizualizarea _curentă"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1309
-#, c-format
-msgid ""
-"The addressbook backend for\n"
-"%s\n"
-"has crashed. You will have to restart Evolution in order to use it again"
-msgstr ""
-
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1667
-#: calendar/gui/cal-search-bar.c:362
+#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: calendar/gui/cal-search-bar.c:358
 #, fuzzy
 msgid "Any Category"
 msgstr "Categorie:"
@@ -3307,7 +3161,7 @@ msgstr "Radio"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-list-view.c:234
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Rol"
@@ -3467,13 +3321,13 @@ msgstr "Compozitorul de mailuiri Evolution."
 msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.c:998
+#: addressbook/printing/e-contact-print.c:1000
 #, fuzzy
 msgid "Print contacts"
 msgstr "Tipăreşte contactele selectate"
 
-#: addressbook/printing/e-contact-print.c:1064
-#: addressbook/printing/e-contact-print.c:1091
+#: addressbook/printing/e-contact-print.c:1066
+#: addressbook/printing/e-contact-print.c:1093
 #, fuzzy
 msgid "Print contact"
 msgstr "Tipăreşte contactele selectate"
@@ -3730,17 +3584,22 @@ msgstr ""
 msgid "Impossible internal error."
 msgstr "Altă eroare"
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:629
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
 #, fuzzy
 msgid "Can not open file"
 msgstr "Nu pot deschide mesajul"
 
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
 #, fuzzy
-msgid "Can not load URI"
-msgstr "Nu găsesc card-ul"
+msgid "Couldn't get list of addressbooks"
+msgstr "Nu pot încărca %s: %s"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Nu pot deschide agenda"
 
 #: addressbook/tools/evolution-addressbook-import.c:46
 #, fuzzy
@@ -3762,7 +3621,7 @@ msgstr "Nici un destinatar specificat"
 msgid "Unnamed List"
 msgstr "Contact schimbat:"
 
-#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 #, fuzzy
 msgid "Enter password"
@@ -4041,10 +3900,10 @@ msgid "Whether to show week numbers in date navigator"
 msgstr "Arată numărul de săptămâni"
 
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:88
-#: calendar/gui/gnome-cal.c:1703
-#: camel/providers/groupwise/camel-gw-listener.c:304
-#: camel/providers/groupwise/camel-gw-listener.c:327
+#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/gnome-cal.c:1705
+#: camel/providers/groupwise/camel-gw-listener.c:311
+#: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
 msgstr "Calendar"
 
@@ -4062,7 +3921,7 @@ msgstr "e mai mic decât"
 
 #: calendar/gui/calendar-commands.c:363
 #: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:19 filter/filter.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
 msgid "days"
 msgstr "zile"
 
@@ -4222,24 +4081,24 @@ msgstr "Afişare săptamână"
 msgid "Month View"
 msgstr "Afişare lună"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Rezumatul conţine"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Descrierea conţine"
 
-#: calendar/gui/cal-search-bar.c:54
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Comentariul conţine"
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:53
 #, fuzzy
 msgid "Location contains"
 msgstr "Descrierea conţine"
 
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
 msgid "Unmatched"
 msgstr ""
 
@@ -4262,24 +4121,24 @@ msgstr "Acces interzis"
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:466
+#: calendar/gui/dialogs/alarm-options.c:467
 msgid "Audio Alarm Options"
 msgstr "Opţiuni alarmă audio"
 
-#: calendar/gui/dialogs/alarm-options.c:475
+#: calendar/gui/dialogs/alarm-options.c:476
 msgid "Message Alarm Options"
 msgstr "Opţiuni mesaje alarmă"
 
-#: calendar/gui/dialogs/alarm-options.c:484
+#: calendar/gui/dialogs/alarm-options.c:485
 #, fuzzy
 msgid "Email Alarm Options"
 msgstr "Opţiuni alarmă mail"
 
-#: calendar/gui/dialogs/alarm-options.c:493
+#: calendar/gui/dialogs/alarm-options.c:494
 msgid "Program Alarm Options"
 msgstr "Opţiuni alarmă program"
 
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:510
 msgid "Unknown Alarm Options"
 msgstr "Opţiuni alarmă necunoscute"
 
@@ -4319,7 +4178,7 @@ msgstr "Timite ca:"
 msgid "With these arguments:"
 msgstr "Cu argumentele:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
 msgid "dialog1"
 msgstr ""
 
@@ -4328,7 +4187,7 @@ msgid "extra times every"
 msgstr "timp în plus la fiecare"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:20 filter/filter.glade.h:16
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr "ore"
 
@@ -4376,7 +4235,7 @@ msgstr "Trimite un email"
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Cuprins:"
 
@@ -4406,7 +4265,6 @@ msgid "hour(s)"
 msgstr "ora"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:21
 msgid "minute(s)"
 msgstr "minut(e)"
 
@@ -4414,27 +4272,27 @@ msgstr "minut(e)"
 msgid "start of appointment"
 msgstr "început întâlnire"
 
-#: calendar/gui/dialogs/calendar-setup.c:170
+#: calendar/gui/dialogs/calendar-setup.c:172
 #, fuzzy
 msgid "You must specify a location to get the calendar from."
 msgstr "Nume stil:"
 
-#: calendar/gui/dialogs/calendar-setup.c:178
+#: calendar/gui/dialogs/calendar-setup.c:180
 #, fuzzy, c-format
 msgid "The source location '%s' is not well-formed."
 msgstr "Metoda necesară pentru a încărca `%s' nesuportată"
 
-#: calendar/gui/dialogs/calendar-setup.c:193
+#: calendar/gui/dialogs/calendar-setup.c:195
 #, c-format
 msgid "The source location '%s' is not a webcal source."
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:265
+#: calendar/gui/dialogs/calendar-setup.c:275
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:278
+#: calendar/gui/dialogs/calendar-setup.c:288
 #, c-format
 msgid ""
 "The group '%s' is remote. You must specify a location to get the calendar "
@@ -4456,61 +4314,36 @@ msgstr "Lista de sarcini"
 msgid "C_olor:"
 msgstr "Închide"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-#, fuzzy
-msgid "Calendar Properties"
-msgstr "Calendar"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
 msgid "Pick a color"
 msgstr "Alege o culoare"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:8
-#, fuzzy
-msgid "Remote"
-msgstr "Şterge"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-#, fuzzy
-msgid "Task List Properties"
-msgstr "Lista de sarcini"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
 #, fuzzy
 msgid "_Add Calendar"
 msgstr "Adaugă în calendar"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
 #, fuzzy
 msgid "_Add Group"
 msgstr "Grup _Nou..."
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-#, fuzzy
-msgid "_Refresh Interval:"
-msgstr "Reîmprospătează lista"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
 #, fuzzy
 msgid "_Refresh:"
 msgstr "Reîmprospătează lista"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-#, fuzzy
-msgid "_Source URL:"
-msgstr "Sursă"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
 #, fuzzy
 msgid "_Type:"
 msgstr "Tip:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
 #, fuzzy
 msgid "_URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
 msgid "weeks"
 msgstr "săptămâni"
 
@@ -4623,7 +4456,7 @@ msgid "Display"
 msgstr "Afişează"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:76
 #, fuzzy
 msgid "E_nable"
 msgstr "Validează"
@@ -4635,7 +4468,7 @@ msgstr "URL liber-ocupat"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:563
+#: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Vineri"
 
@@ -4651,7 +4484,7 @@ msgstr "minute"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:559
+#: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Luni"
 
@@ -4662,7 +4495,7 @@ msgstr "Dum"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:564
+#: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Sâmbătă"
 
@@ -4677,7 +4510,7 @@ msgstr "Arată numărul de săptămâni"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Duminică"
 
@@ -4693,7 +4526,7 @@ msgstr "Joi"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:562
+#: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Joi"
 
@@ -4708,7 +4541,7 @@ msgstr "Format timp:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:560
+#: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Marţi"
 
@@ -4718,7 +4551,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:561
+#: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Miercuri"
 
@@ -4756,7 +4589,7 @@ msgid "_Day begins:"
 msgstr "Afişează staţiile:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
-#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:43
@@ -4816,78 +4649,48 @@ msgstr "Mie"
 msgid "before every appointment"
 msgstr "înainte de sfîrşitul întâlnirii"
 
-#: calendar/gui/dialogs/cancel-comp.c:57
-msgid ""
-"The event being deleted is a meeting, would you like to send a cancellation "
-"notice?"
-msgstr ""
-
-#: calendar/gui/dialogs/cancel-comp.c:60
-msgid "Are you sure you want to cancel and delete this meeting?"
-msgstr "Sunteţi sigur că doriţi să anulaţi şi ştergeţi această întâlnire?"
-
-#: calendar/gui/dialogs/cancel-comp.c:66
-msgid ""
-"The task being deleted is assigned, would you like to send a cancellation "
-"notice?"
-msgstr ""
-
-#: calendar/gui/dialogs/cancel-comp.c:69
-msgid "Are you sure you want to cancel and delete this task?"
-msgstr "Sunteţi sigur că doriţi să anulaţi şi ştergeţi această sarcină?"
-
-#: calendar/gui/dialogs/cancel-comp.c:75
-msgid ""
-"The journal entry being deleted is published, would you like to send a "
-"cancellation notice?"
-msgstr ""
-
-#: calendar/gui/dialogs/cancel-comp.c:78
-msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr "Sunteţi sigur că doriţi să anulaţi şi ştergeţi intrarea din jurnal?"
-
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Acest eveniment a fost şters."
 
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "Acestă sarcină a fost ştearsă."
 
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:68
 msgid "This journal entry has been deleted."
 msgstr "Această intrare în jurnal a fost ştersă."
 
-#: calendar/gui/dialogs/changed-comp.c:75
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s Aţi făcut modificări. Ignoraţi aceste schimbări şi închideţi editorul?"
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s N-aţi făcut modificări, închideţi editorul?"
 
-#: calendar/gui/dialogs/changed-comp.c:82
+#: calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "Acest eveniment a fost modificat."
 
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "Această sarcina a fost modificată."
 
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:92
 msgid "This journal entry has been changed."
 msgstr "Această intrare în jurnal a fost modificată."
 
-#: calendar/gui/dialogs/changed-comp.c:99
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s Aţi făcut modificări. Ignoraţi aceste modificări şi actualizaţi editorul?"
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Nu aţi făcut modificări, actualizaţi editorul?"
@@ -4926,7 +4729,7 @@ msgid "No summary"
 msgstr "Nu există rezumat"
 
 #: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
 #: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Salvează ca..."
@@ -4981,100 +4784,52 @@ msgstr "Anulare operaţie"
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:95
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "Sunteţi sigur că doriţi să ştergeţi întălnirea `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:98
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "Sunteţi sigur că doriţi să ştergeţi întălnirea"
-
-#: calendar/gui/dialogs/delete-comp.c:104
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "Sunteţi sigur că doriţî să ştergeţi sarcina `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:107
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "Sunteţi sigur că doriţî să ştergeţi această sarcină?"
-
-#: calendar/gui/dialogs/delete-comp.c:113
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "Sunteţi sigur că doriţi să ştergeţi intrarea din jurnal `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:116
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "Sunteţi sigur că doriţi să ştergeţi această intrare din jurnal?"
-
-#: calendar/gui/dialogs/delete-comp.c:131
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d appointment?"
-msgid_plural "Are you sure you want to delete %d appointments?"
-msgstr[0] "Sunteţi sigur că doriţi să ştergeţi întălnirea `%d'?"
-msgstr[1] "Sunteţi sigur că doriţi să ştergeţi întălnirea `%d'?"
-
-#: calendar/gui/dialogs/delete-comp.c:138
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d task?"
-msgid_plural "Are you sure you want to delete %d tasks?"
-msgstr[0] "Sunteţi sigur că doriţi să ştergeţi task-ul `%d'?"
-msgstr[1] "Sunteţi sigur că doriţi să ştergeţi task-ul `%d'?"
-
-#: calendar/gui/dialogs/delete-comp.c:145
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d journal entry?"
-msgid_plural "Are you sure you want to delete %d journal entries?"
-msgstr[0] "Sunteţi sigur că doriţi să ştergeţi %d intrări din jurnal?"
-msgstr[1] "Sunteţi sigur că doriţi să ştergeţi %d intrări din jurnal?"
-
-#: calendar/gui/dialogs/delete-error.c:52
+#: calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:55
+#: calendar/gui/dialogs/delete-error.c:57
 msgid "The task could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:58
+#: calendar/gui/dialogs/delete-error.c:60
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:61
+#: calendar/gui/dialogs/delete-error.c:63
 msgid "The item could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:68
+#: calendar/gui/dialogs/delete-error.c:70
 msgid "The event could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:71
+#: calendar/gui/dialogs/delete-error.c:73
 msgid "The task could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:74
+#: calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:77
+#: calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:84
+#: calendar/gui/dialogs/delete-error.c:86
 msgid "The event could not be deleted due to an error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:87
+#: calendar/gui/dialogs/delete-error.c:89
 msgid "The task could not be deleted due to an error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:90
+#: calendar/gui/dialogs/delete-error.c:92
 #, fuzzy
 msgid "The journal entry could not be deleted due to an error"
 msgstr "Această intrare în jurnal a fost ştersă."
 
-#: calendar/gui/dialogs/delete-error.c:93
+#: calendar/gui/dialogs/delete-error.c:95
 msgid "The item could not be deleted due to an error"
 msgstr ""
 
@@ -5220,11 +4975,11 @@ msgstr "Ora de început"
 
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:3
+#: calendar/gui/dialogs/meeting-page.glade.h:4
 #: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
 #: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1559
-#: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:100
+#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
+#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
@@ -5251,8 +5006,8 @@ msgstr "_Delegat la..."
 #. FIXME: need to disable for undeletable folders
 #: calendar/gui/dialogs/meeting-page.c:655
 #: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1310 calendar/gui/e-calendar-view.c:1342
-#: mail/em-folder-tree.c:2557 mail/em-folder-view.c:919
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
+#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -5260,7 +5015,7 @@ msgid "_Delete"
 msgstr "_Şterge"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:240
+#: calendar/gui/e-meeting-list-view.c:218
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Participare"
@@ -5297,16 +5052,15 @@ msgid "Member"
 msgstr "Membru"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
-#: mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-list-view.c:248
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Stare"
 
@@ -5315,20 +5069,20 @@ msgstr "Stare"
 msgid "Add A_ttendee"
 msgstr "Toţi participanţii"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "Add attendees from addressbook."
+msgstr "Adaugă expeditorul în agendă"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Organizator:"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
+#: calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "_Change Organizer"
 msgstr "Schimbă organizator"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-#: calendar/gui/e-meeting-time-sel.c:417
-msgid "_Invite Others..."
-msgstr "_Invită pe alţii..."
-
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 #, fuzzy
 msgid "<b>Calendar options</b>"
@@ -5497,7 +5251,7 @@ msgid "_No recurrence"
 msgstr "Nici o revenire"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:450
+#: composer/e-msg-composer-attachment-bar.c:453
 msgid "_Remove"
 msgstr "Şte_rge"
 
@@ -5530,64 +5284,21 @@ msgstr "săptămîna"
 msgid "year(s)"
 msgstr "anul"
 
-#: calendar/gui/dialogs/save-comp.c:53
-#, fuzzy
-msgid ""
-"This event has been changed, but has not been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Această semnătură a fost modificată, dar n-a fost salvată.\n"
-"Doriţi să salvaţi modificările?"
-
-#: calendar/gui/dialogs/save-comp.c:57
-msgid "_Discard Changes"
-msgstr ""
-
-#: calendar/gui/dialogs/save-comp.c:62
-#, fuzzy
-msgid "Save Event"
-msgstr "Mesaj calendar"
-
-#: calendar/gui/dialogs/select-source-dialog.c:65
+#: calendar/gui/dialogs/select-source-dialog.c:69
 #, fuzzy
 msgid "Select destination"
 msgstr "Alegeţi dosarul destinaţie pentru importul datelor"
 
-#: calendar/gui/dialogs/select-source-dialog.c:86
+#: calendar/gui/dialogs/select-source-dialog.c:90
 #, fuzzy
 msgid "_Destination"
 msgstr "Şterge acest dosar"
 
-#: calendar/gui/dialogs/select-source-dialog.c:88
+#: calendar/gui/dialogs/select-source-dialog.c:92
 #, fuzzy
 msgid "Task List"
 msgstr "Lista de sarcini"
 
-#: calendar/gui/dialogs/send-comp.c:57
-#, fuzzy
-msgid "The meeting information has been created. Send it?"
-msgstr ""
-"Informaţiile despre întâlnire au fost schimbate. Trimit o versiune "
-"actualizată?"
-
-#: calendar/gui/dialogs/send-comp.c:60
-msgid "The meeting information has changed. Send an updated version?"
-msgstr ""
-"Informaţiile despre întâlnire au fost schimbate. Trimit o versiune "
-"actualizată?"
-
-#: calendar/gui/dialogs/send-comp.c:67
-#, fuzzy
-msgid "The task assignment information has been created. Send it?"
-msgstr ""
-"Informaţiile despre sarcină au fost schimbate. Trimit o versiune actualizată?"
-
-#: calendar/gui/dialogs/send-comp.c:71
-msgid "The task information has changed. Send an updated version?"
-msgstr ""
-"Informaţiile despre sarcină au fost schimbate. Trimit o versiune actualizată?"
-
 #: calendar/gui/dialogs/task-details-page.c:406
 #, fuzzy
 msgid "Completed date is wrong"
@@ -5608,7 +5319,7 @@ msgstr "Terminat"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #: calendar/gui/e-cal-component-preview.c:249
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:960
 msgid "High"
 msgstr "Ridicat"
 
@@ -5622,14 +5333,14 @@ msgstr "În derulare"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:253
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:958
 msgid "Low"
 msgstr "Scăzut"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:251
 #: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:957
+#: mail/message-list.c:959
 msgid "Normal"
 msgstr "Normal"
 
@@ -5691,8 +5402,8 @@ msgstr "Confidenţial"
 
 #: calendar/gui/dialogs/task-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
+#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Descriere:"
 
@@ -5869,7 +5580,7 @@ msgstr "_Data scadentă:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:950
+#: calendar/gui/e-itip-control.c:943
 #, fuzzy
 msgid "Status:"
 msgstr "_Stare"
@@ -5959,12 +5670,12 @@ msgstr "Ocupat"
 msgid "Deleting selected objects"
 msgstr "Şterge contactele selectate"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
 msgid "Updating objects"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1370
+#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
 #: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "Deschide"
@@ -5975,15 +5686,15 @@ msgid "Open _Web Page"
 msgstr "Deschide mesajul"
 
 #: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1291 calendar/gui/e-calendar-view.c:1376
-#: mail/em-folder-view.c:896 mail/em-popup.c:690 mail/em-popup.c:806
+#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
+#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "_Salvează ca..."
 
 #: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1292
-#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
+#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
@@ -5991,24 +5702,24 @@ msgid "_Print..."
 msgstr "_Tipăreşte..."
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Dec_upează"
 
 #: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1338
-#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2550
-#: mail/message-list.c:1644 ui/evolution-addressbook.xml.h:31
+#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
+#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
+#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Copiază"
 
 #: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1273 calendar/gui/e-calendar-view.c:1299
-#: calendar/gui/e-calendar-view.c:1372 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
+#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
@@ -6083,80 +5794,80 @@ msgstr "Rezumat"
 msgid "Task sort"
 msgstr "Sortare sarcini"
 
-#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "întâlnire nouă..."
 
-#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
+#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
 #, fuzzy
 msgid "New All Day _Event"
 msgstr "Eveniment zilnic nou"
 
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
+#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
 #, fuzzy
 msgid "New Meeting"
 msgstr "Întâlnire"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
 msgid "New Task"
 msgstr "Sarcină nouă"
 
-#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Selec_tează înlănţuirea"
 
-#: calendar/gui/e-calendar-view.c:1280
+#: calendar/gui/e-calendar-view.c:1283
 #, fuzzy
 msgid "_Select Date..."
 msgstr "Şterge..."
 
-#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
 #, fuzzy
 msgid "_Publish Free/Busy Information"
 msgstr "Aceasta e informaţie liber-ocupat."
 
-#: calendar/gui/e-calendar-view.c:1303
+#: calendar/gui/e-calendar-view.c:1306
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Copiez în folderul..."
 
-#: calendar/gui/e-calendar-view.c:1304
+#: calendar/gui/e-calendar-view.c:1307
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "Mut în folderul..."
 
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1308
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "Progra_mare întâlniri"
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1309
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Înaintează ca şi _calendar i"
 
-#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "Şterge această apariţie"
 
-#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
 #, fuzzy
 msgid "Delete _All Occurrences"
 msgstr "Şterge toate apariţiile"
 
-#: calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1349
 msgid "Go to _Today"
 msgstr "Mergi la _ziua"
 
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1351
 #, fuzzy
 msgid "_Go to Date..."
 msgstr "Mergi la data..."
 
-#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
 #, fuzzy
 msgid "_Settings..."
 msgstr "Setări _mail..."
@@ -6171,9 +5882,9 @@ msgstr "Data început"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:967 calendar/gui/e-itip-control.c:1169
-#: calendar/gui/e-meeting-list-view.c:144
-#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
 #: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
 #: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
 #: camel/camel-tcp-stream-openssl.c:631
@@ -6199,13 +5910,13 @@ msgid "Assigned"
 msgstr "Alocat"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr "Da"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "Nu"
 
@@ -6217,7 +5928,7 @@ msgstr "N"
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
 msgid "E"
 msgstr "E"
 
@@ -6289,446 +6000,451 @@ msgstr "%d %b"
 msgid "%02i minute divisions"
 msgstr "%02i diviziuni minute"
 
-#: calendar/gui/e-itip-control.c:592
+#: calendar/gui/e-itip-control.c:585
 #, fuzzy
 msgid "Yes. (Complex Recurrence)"
 msgstr "Revenire simplă"
 
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:596
 #, fuzzy, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Fiecare"
 msgstr[1] "Fiecare"
 
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:601
 #, fuzzy, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Fiecare"
 msgstr[1] "Fiecare"
 
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:603
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:618
+#: calendar/gui/e-itip-control.c:611
 msgid " and "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:618
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:631
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:645
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "O lună"
 msgstr[1] "O lună"
 
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:642
 #, fuzzy, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Fiecare"
 msgstr[1] "Fiecare"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:653
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:669
+#: calendar/gui/e-itip-control.c:662
 msgid ", ending on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:686
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:696
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "Ora de sfârşit a întâlnirii:"
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:716
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Terminat "
 
-#: calendar/gui/e-itip-control.c:733
+#: calendar/gui/e-itip-control.c:726
 #, fuzzy
 msgid "<b>Due:</b> "
 msgstr "Descriere:"
 
-#: calendar/gui/e-itip-control.c:771 calendar/gui/e-itip-control.c:827
+#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
 #, fuzzy
 msgid "iCalendar Information"
 msgstr "informaţie calendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:788
+#: calendar/gui/e-itip-control.c:781
 #, fuzzy
 msgid "iCalendar Error"
 msgstr "Calendar"
 
-#: calendar/gui/e-itip-control.c:859 calendar/gui/e-itip-control.c:875
-#: calendar/gui/e-itip-control.c:886 calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
 #, fuzzy
 msgid "An unknown person"
 msgstr "Eroare necunoscută"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:910
+#: calendar/gui/e-itip-control.c:903
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:925
+#: calendar/gui/e-itip-control.c:918
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:929
+#, fuzzy
+msgid "Location:"
+msgstr "_Acţiune"
+
+#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 #, fuzzy
 msgid "Accepted"
 msgstr " Acceptă "
 
-#: calendar/gui/e-itip-control.c:959 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
 #, fuzzy
 msgid "Tentatively Accepted"
 msgstr " Intenţie "
 
-#: calendar/gui/e-itip-control.c:963 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 #, fuzzy
 msgid "Declined"
 msgstr " Refuză "
 
-#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.c:1050
-#: calendar/gui/e-itip-control.c:1076 calendar/gui/e-itip-control.c:1089
-#: calendar/gui/e-itip-control.c:1102 calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
 #, fuzzy
 msgid "Choose an action:"
 msgstr "Selectez o acţiune"
 
-#: calendar/gui/e-itip-control.c:1023
+#: calendar/gui/e-itip-control.c:1016
 #, fuzzy
 msgid "Update"
 msgstr "a fost după"
 
-#: calendar/gui/e-itip-control.c:1024 calendar/gui/e-itip-control.c:1055
-#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1091
-#: calendar/gui/e-itip-control.c:1104 calendar/gui/e-itip-control.c:1117
-#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
+#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1044
 #, fuzzy
 msgid "Accept"
 msgstr " Acceptă "
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1045
 #, fuzzy
 msgid "Tentatively accept"
 msgstr " Intenţie "
 
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1046
 #, fuzzy
 msgid "Decline"
 msgstr " Refuză "
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1070
 #, fuzzy
 msgid "Send Free/Busy Information"
 msgstr "Informaţie sursă"
 
-#: calendar/gui/e-itip-control.c:1090
+#: calendar/gui/e-itip-control.c:1083
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1103
+#: calendar/gui/e-itip-control.c:1096
 #, fuzzy
 msgid "Send Latest Information"
 msgstr "Informaţie"
 
-#: calendar/gui/e-itip-control.c:1116 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Renunţă"
 
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1185
 #, fuzzy, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "Obţine ultimele informaţii despre întâlnire"
 
-#: calendar/gui/e-itip-control.c:1193
+#: calendar/gui/e-itip-control.c:1186
 #, fuzzy
 msgid "Meeting Information"
 msgstr "Informaţie opţională"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1191
 #, fuzzy, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "Aceasta e o cerere pentru o informaţie liber-ocupat."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1193
 #, fuzzy, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "Aceasta e o cerere pentru o informaţie liber-ocupat."
 
-#: calendar/gui/e-itip-control.c:1201
+#: calendar/gui/e-itip-control.c:1194
 #, fuzzy
 msgid "Meeting Proposal"
 msgstr "Întâlnire"
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1198
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "Obţine ultimele informaţii despre întâlnire"
 
-#: calendar/gui/e-itip-control.c:1206
+#: calendar/gui/e-itip-control.c:1199
 #, fuzzy
 msgid "Meeting Update"
 msgstr "Ora de sfârşit a întâlnirii:"
 
-#: calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1203
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "Obţine ultimele informaţii despre întâlnire"
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1204
 #, fuzzy
 msgid "Meeting Update Request"
 msgstr "Cerere de întâlnire (FIXME)"
 
-#: calendar/gui/e-itip-control.c:1218
+#: calendar/gui/e-itip-control.c:1211
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "Acesta e un răspuns la o cerere de întâlnire."
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1212
 #, fuzzy
 msgid "Meeting Reply"
 msgstr "Întâlnire"
 
-#: calendar/gui/e-itip-control.c:1226
+#: calendar/gui/e-itip-control.c:1219
 #, fuzzy, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "Acesta e un răspuns la o cerere de întâlnire."
 
-#: calendar/gui/e-itip-control.c:1227
+#: calendar/gui/e-itip-control.c:1220
 #, fuzzy
 msgid "Meeting Cancellation"
 msgstr "Selectez o acţiune"
 
-#: calendar/gui/e-itip-control.c:1234 calendar/gui/e-itip-control.c:1302
-#: calendar/gui/e-itip-control.c:1337
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1330
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1228
 #, fuzzy
 msgid "Bad Meeting Message"
 msgstr "Găseşte în mesaj"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1253
 #, fuzzy, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "Obţine ultimele informaţii despre întâlnire"
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1254
 #, fuzzy
 msgid "Task Information"
 msgstr "Informaţie"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1259
 #, fuzzy, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "Aceasta e o cerere pentru o informaţie liber-ocupat."
 
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1261
 #, fuzzy, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "Aceasta e o cerere pentru o informaţie liber-ocupat."
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1262
 #, fuzzy
 msgid "Task Proposal"
 msgstr "Panou sarcini"
 
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1266
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "Aceasta e o cerere pentru ultima informaţie despre sarcină."
 
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1267
 #, fuzzy
 msgid "Task Update"
 msgstr "a fost după"
 
-#: calendar/gui/e-itip-control.c:1278
+#: calendar/gui/e-itip-control.c:1271
 #, fuzzy, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "Aceasta e o cerere pentru ultima informaţie despre sarcină."
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1272
 #, fuzzy
 msgid "Task Update Request"
 msgstr "Ce_rere task (FIXME)"
 
-#: calendar/gui/e-itip-control.c:1286
+#: calendar/gui/e-itip-control.c:1279
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "Acesta e un răspuns la o cerere de întâlnire."
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1280
 #, fuzzy
 msgid "Task Reply"
 msgstr "Răspunde"
 
-#: calendar/gui/e-itip-control.c:1294
+#: calendar/gui/e-itip-control.c:1287
 #, fuzzy, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "Acesta e un răspuns la o cerere de întâlnire."
 
-#: calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1288
 #, fuzzy
 msgid "Task Cancellation"
 msgstr "Aceasta e o anulare a unei sarcini"
 
-#: calendar/gui/e-itip-control.c:1303
+#: calendar/gui/e-itip-control.c:1296
 #, fuzzy
 msgid "Bad Task Message"
 msgstr "Mesaj calendar"
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1315
 #, fuzzy, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "Aceasta e informaţie liber-ocupat."
 
-#: calendar/gui/e-itip-control.c:1323
+#: calendar/gui/e-itip-control.c:1316
 #, fuzzy
 msgid "Free/Busy Information"
 msgstr "Informaţie sursă"
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1320
 #, fuzzy, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "Aceasta e o cerere pentru o informaţie liber-ocupat."
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1321
 #, fuzzy
 msgid "Free/Busy Request"
 msgstr "URL liber-ocupat"
 
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1325
 #, fuzzy, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "Acesta e un răspuns la o cerere liber-ocupat."
 
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1326
 #, fuzzy
 msgid "Free/Busy Reply"
 msgstr "URL liber-ocupat"
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1331
 #, fuzzy
 msgid "Bad Free/Busy Message"
 msgstr "Tipăreşte mesaj"
 
-#: calendar/gui/e-itip-control.c:1413
+#: calendar/gui/e-itip-control.c:1406
 #, fuzzy
 msgid "The message does not appear to be properly formed"
 msgstr "Dosarul pare a fi deteriorat irecuperabil."
 
-#: calendar/gui/e-itip-control.c:1472
+#: calendar/gui/e-itip-control.c:1465
 msgid "The message contains only unsupported requests."
 msgstr "Mesajul conţine numai cererile nesuportate."
 
-#: calendar/gui/e-itip-control.c:1503
+#: calendar/gui/e-itip-control.c:1496
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1535
+#: calendar/gui/e-itip-control.c:1528
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1769
+#: calendar/gui/e-itip-control.c:1762
 #, fuzzy
 msgid "Update complete\n"
 msgstr "Întâlnire încheiată:"
 
-#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
+#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1825
+#: calendar/gui/e-itip-control.c:1818
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1837
+#: calendar/gui/e-itip-control.c:1830
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1856
+#: calendar/gui/e-itip-control.c:1849
 #, fuzzy
 msgid "There was an error on the CORBA system\n"
 msgstr "S-a produs o eroare la descărcarea sursei de ştiri</dt>"
 
-#: calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1852
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Bug buddy nu poate fi rulat."
 
-#: calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1855
 #, fuzzy
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Nu pot deschide dosarul în `%s'"
 
-#: calendar/gui/e-itip-control.c:1865
+#: calendar/gui/e-itip-control.c:1858
 #, fuzzy
 msgid "Attendee status updated\n"
 msgstr "Adrese participare"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1861
 #, fuzzy
 msgid "Attendee status could not be updated!\n"
 msgstr "Adrese participare"
 
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1892
 #, fuzzy
 msgid "Removal Complete"
 msgstr "% Terminat"
 
-#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
 #, fuzzy
 msgid "Item sent!\n"
 msgstr "Date trimise"
 
-#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
+#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
 msgid "The item could not be sent!\n"
 msgstr ""
 
@@ -6769,81 +6485,81 @@ msgstr "dată sfîrşit"
 msgid "date-start"
 msgstr "dată început"
 
-#: calendar/gui/e-meeting-list-view.c:62
+#: calendar/gui/e-meeting-list-view.c:59
 #, fuzzy
 msgid "Chair Persons"
 msgstr "Telefon maşină"
 
-#: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:479
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
 #, fuzzy
 msgid "Required Participants"
 msgstr "Participant necesar"
 
-#: calendar/gui/e-meeting-list-view.c:64
+#: calendar/gui/e-meeting-list-view.c:61
 #, fuzzy
 msgid "Optional Participants"
 msgstr "Participant opţional"
 
-#: calendar/gui/e-meeting-list-view.c:65
+#: calendar/gui/e-meeting-list-view.c:62
 #, fuzzy
 msgid "Resources"
 msgstr "Sursă"
 
-#: calendar/gui/e-meeting-list-view.c:140 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
 #: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 #, fuzzy
 msgid "Group"
 msgstr "Nume grup:"
 
-#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 #, fuzzy
 msgid "Resource"
 msgstr "Sursă"
 
-#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:154 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr "Scaun"
 
-#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:127
 #: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
 msgid "Required Participant"
 msgstr "Participant necesar"
 
-#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr "Participant opţional"
 
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr "Neparticipant"
 
-#: calendar/gui/e-meeting-list-view.c:179 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:177
 #: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
 #, fuzzy
 msgid "Needs Action"
 msgstr "Selectez o acţiune"
 
-#: calendar/gui/e-meeting-list-view.c:182 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
 #: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "Tentativă"
 
-#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 #, fuzzy
 msgid "Delegated"
@@ -6862,20 +6578,28 @@ msgstr "Afară din oficiu"
 msgid "No Information"
 msgstr "Nici o informaţie"
 
+#: calendar/gui/e-meeting-time-sel.c:417
+#, fuzzy
+msgid "Add attendees from addressbook"
+msgstr "Adaugă expeditorul în agendă"
+
 #: calendar/gui/e-meeting-time-sel.c:440
 msgid "_Options"
 msgstr "_Opţiuni"
 
 #: calendar/gui/e-meeting-time-sel.c:457
-msgid "Show _Only Working Hours"
+#, fuzzy
+msgid "Show _only working hours"
 msgstr "Arată numai _orele de lucru"
 
 #: calendar/gui/e-meeting-time-sel.c:467
-msgid "Show _Zoomed Out"
+#, fuzzy
+msgid "Show _zoomed out"
 msgstr "Arată mărit"
 
 #: calendar/gui/e-meeting-time-sel.c:482
-msgid "_Update Free/Busy"
+#, fuzzy
+msgid "_Update free/busy"
 msgstr "Act_ualizează liber/ocupat"
 
 #: calendar/gui/e-meeting-time-sel.c:497
@@ -6891,19 +6615,23 @@ msgid ">_>"
 msgstr ">_>"
 
 #: calendar/gui/e-meeting-time-sel.c:547
-msgid "_All People and Resources"
+#, fuzzy
+msgid "_All people and resources"
 msgstr "To_ate persoanele şi resursele"
 
 #: calendar/gui/e-meeting-time-sel.c:556
-msgid "All _People and One Resource"
+#, fuzzy
+msgid "All _people and one resource"
 msgstr "Toate _persoanele şi o resursă"
 
 #: calendar/gui/e-meeting-time-sel.c:565
-msgid "_Required People"
+#, fuzzy
+msgid "_Required people"
 msgstr "Necesa_r o persoană"
 
 #: calendar/gui/e-meeting-time-sel.c:574
-msgid "Required People and _One Resource"
+#, fuzzy
+msgid "Required people and _one resource"
 msgstr "Necesar o persoană şi _o resursă"
 
 #: calendar/gui/e-meeting-time-sel.c:593
@@ -6941,82 +6669,72 @@ msgstr "%m/%d/%Y"
 msgid "Enter the password for %s"
 msgstr "Introduceţi parola pentru %s"
 
-#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr "Eroare la start %s"
 
-#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-
 #. FIXME Loading should be async
 #. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:686
+#: calendar/gui/e-tasks.c:801
 #, fuzzy, c-format
 msgid "Opening tasks at %s"
 msgstr "Deschid rezerva %s"
 
-#: calendar/gui/e-tasks.c:709
+#: calendar/gui/e-tasks.c:824
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
 "%s"
 msgstr "Eroare la start %s"
 
-#: calendar/gui/e-tasks.c:730
+#: calendar/gui/e-tasks.c:845
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Încarcă _imaginile"
 
-#: calendar/gui/e-tasks.c:834
+#: calendar/gui/e-tasks.c:949
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Data terminare"
 
-#: calendar/gui/e-tasks.c:857
+#: calendar/gui/e-tasks.c:972
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Şterge contactele selectate"
 
-#: calendar/gui/e-tasks.c:884
+#: calendar/gui/e-tasks.c:999
 #, fuzzy
 msgid "Expunging"
 msgstr "Distrug dosarul"
 
-#: calendar/gui/e-tasks.c:960
+#: calendar/gui/e-tasks.c:1075
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
-#: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
+#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
+#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
 #: calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:705
 msgid "Tasks"
 msgstr "Sarcini"
 
-#: calendar/gui/gnome-cal.c:1876
+#: calendar/gui/gnome-cal.c:1878
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Nu există întâlniri"
 
-#: calendar/gui/gnome-cal.c:1895
+#: calendar/gui/gnome-cal.c:1897
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Încarcă _imaginile"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1920
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Deschide în %s..."
 
-#: calendar/gui/gnome-cal.c:2048
-#, c-format
-msgid "The calendar backend for '%s' has crashed."
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:2894
+#: calendar/gui/gnome-cal.c:2906
 #, fuzzy
 msgid "Purging"
 msgstr "Turc"
@@ -7225,7 +6943,7 @@ msgid "On The Web"
 msgstr ""
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 
@@ -7236,7 +6954,7 @@ msgid "Unable to migrate calendar `%s'"
 msgstr "Acces interzis"
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:869
+#: calendar/gui/migration.c:889
 #, fuzzy, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Nu pot deschide agenda"
@@ -7479,74 +7197,74 @@ msgstr "Tipăreşte elementul"
 msgid "Print Setup"
 msgstr "Setează tipărirea"
 
-#: calendar/gui/tasks-component.c:303
+#: calendar/gui/tasks-component.c:313
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:371
 #, fuzzy
 msgid "New Task List"
 msgstr "Lista de sarcini"
 
-#: calendar/gui/tasks-component.c:398
+#: calendar/gui/tasks-component.c:408
 #, fuzzy, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "Nu există sarcini"
 msgstr[1] "Nu există sarcini"
 
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] "Şterse"
 msgstr[1] "Şterse"
 
-#: calendar/gui/tasks-component.c:447
+#: calendar/gui/tasks-component.c:457
 #, fuzzy
 msgid "Failed upgrading tasks."
 msgstr "Încarcă _imaginile"
 
-#: calendar/gui/tasks-component.c:526
+#: calendar/gui/tasks-component.c:749
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:538
+#: calendar/gui/tasks-component.c:761
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:576
+#: calendar/gui/tasks-component.c:799
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:804
+#: calendar/gui/tasks-component.c:1040
 #, fuzzy
 msgid "New task"
 msgstr "Sarcină nouă"
 
-#: calendar/gui/tasks-component.c:805
+#: calendar/gui/tasks-component.c:1041
 msgid "_Task"
 msgstr "Sarcină"
 
-#: calendar/gui/tasks-component.c:806
+#: calendar/gui/tasks-component.c:1042
 msgid "Create a new task"
 msgstr "Crează o sarcină nouă"
 
-#: calendar/gui/tasks-component.c:812
+#: calendar/gui/tasks-component.c:1048
 #, fuzzy
 msgid "New tasks group"
 msgstr "Sarcină nouă"
 
-#: calendar/gui/tasks-component.c:813
+#: calendar/gui/tasks-component.c:1049
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Lista de sarcini"
 
-#: calendar/gui/tasks-component.c:814
+#: calendar/gui/tasks-component.c:1050
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Crează o sarcină nouă"
@@ -9357,14 +9075,14 @@ msgstr "Eroare execuţie filtru căutare: %s: %s"
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1259
+#: camel/camel-folder.c:1262
 #, fuzzy, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 "Eroare executare expresia căutare: %s:\n"
 "%s"
 
-#: camel/camel-folder.c:1299
+#: camel/camel-folder.c:1302
 #, fuzzy, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
@@ -9381,11 +9099,16 @@ msgstr "Copiez mesaje"
 msgid "Copying messages"
 msgstr "Copiez mesajele în %s"
 
-#: camel/camel-folder.c:1666
-msgid "Learning junk and/or non junk message(s)"
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Avertisment"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
 msgstr ""
 
-#: camel/camel-folder.c:1695
+#: camel/camel-folder.c:1701
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "Primesc mesaje"
@@ -9420,17 +9143,17 @@ msgstr ""
 msgid "(match-threads) requires a match type string"
 msgstr ""
 
-#: camel/camel-folder-search.c:785
+#: camel/camel-folder-search.c:784
 #, fuzzy
 msgid "(match-threads) expects an array result"
 msgstr "(potrivire totală) se cere un singur rezultat"
 
-#: camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:790
 #, fuzzy
 msgid "(match-threads) requires the folder set"
 msgstr "(potrivire totală) se cere un singur rezultat"
 
-#: camel/camel-folder-search.c:880
+#: camel/camel-folder-search.c:879
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Execută interogare în header necunoscut: %s"
@@ -9460,7 +9183,8 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
 #: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:706
+#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Anulat."
@@ -9833,7 +9557,7 @@ msgstr ""
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1212
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Răspuns de la server de autentificare eşuată."
 
@@ -10229,42 +9953,42 @@ msgstr "Comandă neimplementată"
 msgid "export keys: unimplemented"
 msgstr ""
 
-#: camel/camel-store.c:214
+#: camel/camel-store.c:213
 #, fuzzy
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Nu pot crea dosarul blocat la %s: %s"
 
-#: camel/camel-store.c:244
+#: camel/camel-store.c:243
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr "Nu pot lua dosarul: %s: %s"
 
-#: camel/camel-store.c:295
+#: camel/camel-store.c:297
 #, fuzzy
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Nu pot crea dosarul blocat la %s: %s"
 
-#: camel/camel-store.c:323
+#: camel/camel-store.c:325
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Nu pot lua dosarul: %s: %s"
 
-#: camel/camel-store.c:387 camel/camel-vee-store.c:354
+#: camel/camel-store.c:389 camel/camel-vee-store.c:351
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Nu pot crea dosarul blocat la %s: %s"
 
-#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#: camel/camel-store.c:439 camel/camel-vee-store.c:387
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Nu pot crea dosarul blocat la %s: %s"
 
-#: camel/camel-store.c:811
+#: camel/camel-store.c:777
 msgid "Trash"
 msgstr "Gunoi"
 
-#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
-#: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/mail-config.glade.h:95
+#: ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
 msgstr "Iunie"
@@ -10494,12 +10218,12 @@ msgstr "Nu există mesajul %s în %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Verific mesajele noi în toate dosarele"
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:374
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Nu pot lua dosarul: %s: %s"
 
-#: camel/camel-vee-store.c:398
+#: camel/camel-vee-store.c:395
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Nu pot lua dosarul: %s: %s"
@@ -10545,32 +10269,32 @@ msgstr "Agendă"
 msgid "Post Office Agent SOAP Port:"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:80
+#: camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "Novell GroupWise"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:82
+#: camel/providers/groupwise/camel-groupwise-provider.c:85
 msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: camel/providers/groupwise/camel-groupwise-provider.c:100
 #: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
 msgid "Password"
 msgstr "Parola"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:99
+#: camel/providers/groupwise/camel-groupwise-provider.c:102
 #: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Această opţiune vă va conecta la serverul IMAP folosind o parolă în clar "
 
-#: camel/providers/groupwise/camel-gw-listener.c:305
-#: camel/providers/groupwise/camel-gw-listener.c:328
+#: camel/providers/groupwise/camel-gw-listener.c:312
+#: camel/providers/groupwise/camel-gw-listener.c:335
 #, fuzzy
 msgid "Checklist"
 msgstr "Ceaţă densă"
@@ -10714,13 +10438,13 @@ msgstr ""
 "Această opţiune vă va conecta la serverul IMAP folosind o parolă în clar "
 
 #: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:429
+#: camel/providers/imap/camel-imap-store.c:428
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "Server SMTP %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:431
+#: camel/providers/imap/camel-imap-store.c:430
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s serviciu pentru %s în %s"
@@ -10730,7 +10454,7 @@ msgstr "%s serviciu pentru %s în %s"
 #: camel/providers/imap/camel-imap-store.c:551
 #: camel/providers/imap/camel-imap-store.c:571
 #: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
+#: camel/providers/nntp/camel-nntp-store.c:209
 #: camel/providers/pop3/camel-pop3-store.c:175
 #: camel/providers/smtp/camel-smtp-transport.c:269
 #: camel/providers/smtp/camel-smtp-transport.c:285
@@ -10747,10 +10471,10 @@ msgstr ""
 
 #: camel/providers/imap4/camel-imap4-store.c:222
 #: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:815
+#: camel/providers/imap/camel-imap-store.c:845
 #: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:137
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
 #: camel/providers/pop3/camel-pop3-store.c:192
 msgid "Connection cancelled"
 msgstr "Conexiune anulată"
@@ -10765,8 +10489,8 @@ msgstr ""
 "Eroare la trimiterea numelui utilizator: %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:649
-#: camel/providers/imap/camel-imap-store.c:680
+#: camel/providers/imap/camel-imap-store.c:679
+#: camel/providers/imap/camel-imap-store.c:710
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
@@ -10777,7 +10501,7 @@ msgstr ""
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1109
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
 msgid "Unknown error"
 msgstr "Eroare necunoscută"
 
@@ -10805,8 +10529,8 @@ msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr "Nu pot lua dosarul: %s: %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1857
-#: camel/providers/imap/camel-imap-store.c:2235
+#: camel/providers/imap/camel-imap-store.c:1885
+#: camel/providers/imap/camel-imap-store.c:2263
 #, fuzzy, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -10885,12 +10609,12 @@ msgstr "Server deconectat neaşteptat"
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3168
+#: camel/providers/imap/camel-imap-store.c:3194
 msgid "Operation cancelled"
 msgstr "Operaţia anulată"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3171
+#: camel/providers/imap/camel-imap-store.c:3197
 #, fuzzy, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server deconectat neaşteptat"
@@ -10953,13 +10677,6 @@ msgid "Unable to retrieve message: %s"
 msgstr "Eşec la decodarea mesajului."
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:219
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -10969,15 +10686,15 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-mbox-folder.c:418
+#: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
 msgstr "Nu există mesaj"
 
 #: camel/providers/imap/camel-imap-folder.c:2019
-#: camel/providers/imap/camel-imap-folder.c:2621
-#: camel/providers/nntp/camel-nntp-folder.c:238
+#: camel/providers/imap/camel-imap-folder.c:2622
+#: camel/providers/nntp/camel-nntp-folder.c:220
 msgid "This message is not currently available"
 msgstr "Mesajul nu este disponibil în mod curent"
 
@@ -10986,7 +10703,23 @@ msgstr "Mesajul nu este disponibil în mod curent"
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2659
+#: camel/providers/imap/camel-imap-folder.c:2463
+#, c-format
+msgid "Incomplete server response: no information provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2471
+#, c-format
+msgid "Incomplete server response: no UID provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2484
+#, c-format
+msgid ""
+"Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2660
 msgid "Could not find message body in FETCH response."
 msgstr "Nu pot găsi corpul mesajului în răspunsul FETCH."
 
@@ -11051,45 +10784,45 @@ msgstr "IMAPv4"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Pentru citirea şi stocarea mesajelor pe servere IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/imap/camel-imap-store.c:680
 #: camel/providers/pop3/camel-pop3-store.c:228
 #, fuzzy
 msgid "SSL/TLS extension not supported."
 msgstr "Operaţie nesuportată"
 
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:711
 #: camel/providers/pop3/camel-pop3-store.c:269
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "Eşec la autentificare."
 
-#: camel/providers/imap/camel-imap-store.c:818
+#: camel/providers/imap/camel-imap-store.c:848
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Nu mă pot conecta la serverul: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1242
+#: camel/providers/imap/camel-imap-store.c:1272
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "Serverul IMAP %s nu suportă tipul cerut de autentificare %s"
 
-#: camel/providers/imap/camel-imap-store.c:1252
+#: camel/providers/imap/camel-imap-store.c:1282
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Tip de autentificare nesuportat %s"
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1305
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sVă rog intoduceţi parola IMAP pentru %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1289
+#: camel/providers/imap/camel-imap-store.c:1319
 msgid "You didn't enter a password."
 msgstr "Nu aţi introdus o parolă."
 
-#: camel/providers/imap/camel-imap-store.c:1318
+#: camel/providers/imap/camel-imap-store.c:1348
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -11100,18 +10833,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1839
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:1867
+#: camel/providers/imap/camel-imap-store.c:2057
 #, c-format
 msgid "No such folder %s"
 msgstr "Nu există dosarul %s"
 
-#: camel/providers/imap/camel-imap-store.c:1915
-#: camel/providers/imap/camel-imap-store.c:2296
+#: camel/providers/imap/camel-imap-store.c:1943
+#: camel/providers/imap/camel-imap-store.c:2324
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1970
+#: camel/providers/imap/camel-imap-store.c:1998
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -11119,7 +10852,7 @@ msgstr ""
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Nu pot lua dosarul: %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:2274
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Eroare necunoscută: %s"
@@ -11153,20 +10886,20 @@ msgid "Index message body data"
 msgstr "Trimite mesaj la contact"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:388
 #, fuzzy, c-format
 msgid "~%s (%s)"
 msgstr "%s (...)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:393
-#: camel/providers/local/camel-local-folder.c:396
+#: camel/providers/local/camel-local-folder.c:392
+#: camel/providers/local/camel-local-folder.c:395
 #, fuzzy, c-format
 msgid "mailbox:%s (%s)"
 msgstr "Nu pot deschide căsuţa poştală: %s: %s\n"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:400
+#: camel/providers/local/camel-local-folder.c:399
 #, fuzzy, c-format
 msgid "%s (%s)"
 msgstr "%s (...)"
@@ -11230,7 +10963,7 @@ msgstr "Pentru stocarea mail-urilor locale în directoare spool Unix"
 
 #: camel/providers/local/camel-local-store.c:142
 #: camel/providers/local/camel-local-store.c:253
-#: camel/providers/local/camel-mbox-store.c:356
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -11304,8 +11037,25 @@ msgstr "Eşuare la mesajul %d"
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Nu pot adăuga mesajul la dosarul maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:226
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mbox-folder.c:417
+#: camel/providers/local/camel-mbox-folder.c:436
+#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:475
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-mh-folder.c:221
+#, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+"Nu pot lua mesajul: %s din dosarul %s\n"
+"  %s"
+
+#: camel/providers/local/camel-maildir-folder.c:236
 msgid "Invalid message contents"
 msgstr "Conţinut invalid al mesajului"
 
@@ -11346,9 +11096,9 @@ msgstr "Nu pot şterge dosarul `%s': %s"
 msgid "not a maildir directory"
 msgstr "nu e director maildir"
 
-#: camel/providers/local/camel-maildir-store.c:341
-#: camel/providers/local/camel-spool-store.c:286
-#: camel/providers/local/camel-spool-store.c:316
+#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-spool-store.c:284
+#: camel/providers/local/camel-spool-store.c:314
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Nu pot scana dosarul `%s': %s"
@@ -11399,27 +11149,18 @@ msgstr "Operaţia anulată"
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Nu pot adăuga mesajul la fişierul mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:435
-#: camel/providers/local/camel-mbox-folder.c:466
-#: camel/providers/local/camel-mbox-folder.c:474
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"Nu pot lua mesajul: %s din dosarul %s\n"
-"  %s"
-
-#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:468
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Dosarul pare a fi deteriorat irecuperabil."
 
-#: camel/providers/local/camel-mbox-folder.c:475
-msgid "Message construction failed: Corrupt mailbox?"
+#: camel/providers/local/camel-mbox-folder.c:476
+#: camel/providers/local/camel-mh-folder.c:222
+#, fuzzy
+msgid "Message construction failed."
 msgstr "Construcţia mesajului eşuată: căsuţa poştală coruptă?"
 
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:362
+#: camel/providers/local/camel-mbox-store.c:361
 #, fuzzy
 msgid "Cannot create a folder by this name."
 msgstr "Nu pot crea dosarul blocat la %s: %s"
@@ -11450,32 +11191,32 @@ msgstr "`%s' nu e un fişier obişnuit."
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Dosarul `%s' nu e gol. Nu s-a şters."
 
-#: camel/providers/local/camel-mbox-store.c:375
+#: camel/providers/local/camel-mbox-store.c:374
 #, fuzzy, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Nu pot crea directorul %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:389
+#: camel/providers/local/camel-mbox-store.c:388
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Nu pot lua dosarul: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:391
+#: camel/providers/local/camel-mbox-store.c:390
 #, fuzzy
 msgid "Folder already exists"
 msgstr "ID-ul card-ului există deja"
 
-#: camel/providers/local/camel-mbox-store.c:473
+#: camel/providers/local/camel-mbox-store.c:472
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "Numele dosarului specificat este invalid."
 
-#: camel/providers/local/camel-mbox-store.c:486
+#: camel/providers/local/camel-mbox-store.c:485
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Nu pot redenumi dosarul: %s"
 
-#: camel/providers/local/camel-mbox-store.c:561
+#: camel/providers/local/camel-mbox-store.c:560
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Nu pot redenumi dosarul %s în %s: %s"
@@ -11673,7 +11414,7 @@ msgstr ""
 "Dosarul poate fi corupt, copia salvată în `%s'"
 
 #: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:997
+#: camel/providers/nntp/camel-nntp-store.c:1126
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Introduceţi vă rog parola NNTP pentru %s@%s"
@@ -11690,19 +11431,10 @@ msgstr "Eşec la trimiterea numelui utilizator la server"
 msgid "Server rejected username/password"
 msgstr "Nume utilizator/parolă rejectat de server"
 
-#: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:263
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-#, fuzzy
-msgid "User cancelled"
-msgstr "Operaţia anulată"
-
-#: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:259
-#: camel/providers/nntp/camel-nntp-folder.c:265
+#: camel/providers/nntp/camel-nntp-folder.c:147
+#: camel/providers/nntp/camel-nntp-folder.c:149
+#: camel/providers/nntp/camel-nntp-folder.c:158
+#: camel/providers/nntp/camel-nntp-folder.c:234
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11713,64 +11445,52 @@ msgstr ""
 "Nu pot lua mesajul: %s\n"
 "  %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:188
-#: camel/providers/nntp/camel-nntp-folder.c:228
+#: camel/providers/nntp/camel-nntp-folder.c:156
+#: camel/providers/nntp/camel-nntp-folder.c:232
+#: camel/providers/nntp/camel-nntp-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+#, fuzzy
+msgid "User cancelled"
+msgstr "Operaţia anulată"
+
+#: camel/providers/nntp/camel-nntp-folder.c:176
+#: camel/providers/nntp/camel-nntp-folder.c:208
 #, c-format
 msgid "Internal error: uid in invalid format: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:201
-#, fuzzy, c-format
-msgid "Could not get article %s from NNTP server"
-msgstr "Nu pot obţine lista grup de la server."
-
-#: camel/providers/nntp/camel-nntp-folder.c:362
-msgid "Posting not allowed by news server"
-msgstr ""
-
+#: camel/providers/nntp/camel-nntp-folder.c:328
+#: camel/providers/nntp/camel-nntp-folder.c:331
 #: camel/providers/nntp/camel-nntp-folder.c:373
-#, c-format
-msgid "Failed to send newsgroups header: %s: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:413
-#: camel/providers/nntp/camel-nntp-folder.c:426
-#, c-format
-msgid "Error posting to newsgroup: %s: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:438
-msgid "Error reading response to posted message: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:441
+#: camel/providers/nntp/camel-nntp-folder.c:375
 #, fuzzy, c-format
-msgid "Error posting message: %s: message not posted"
-msgstr ""
-"Eroare la salvarea automată a mesajului: %s:\n"
-"%s"
+msgid "Posting failed: %s"
+msgstr "Operaţia anulată"
 
-#: camel/providers/nntp/camel-nntp-folder.c:457
+#: camel/providers/nntp/camel-nntp-folder.c:393
 #, fuzzy
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "Nu puteţi copia mesaje din acest dosar"
 
-#: camel/providers/nntp/camel-nntp-folder.c:468
+#: camel/providers/nntp/camel-nntp-folder.c:404
 #, fuzzy
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Nu puteţi copia mesaje din acest dosar"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:44
 msgid "Could not get group list from server."
 msgstr "Nu pot obţine lista grup de la server."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#: camel/providers/nntp/camel-nntp-grouplist.c:97
+#: camel/providers/nntp/camel-nntp-grouplist.c:106
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "Nu pot să încarc fişierul listă de grup pentru %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#: camel/providers/nntp/camel-nntp-grouplist.c:157
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Nu pot să salvez fişierul listă de grup pentru: %s: %s"
@@ -11801,27 +11521,29 @@ msgid ""
 msgstr ""
 "Această optiune vă va autentifica la serverul NNTP folosind o parolă în clar "
 
-#: camel/providers/nntp/camel-nntp-store.c:158
+#: camel/providers/nntp/camel-nntp-store.c:118
+#: camel/providers/nntp/camel-nntp-store.c:1233
+#: camel/providers/nntp/camel-nntp-store.c:1331
+#, fuzzy, c-format
+msgid "NNTP Command failed: %s"
+msgstr "Comanda IMAP eşuată: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:227
 #, fuzzy, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Nu pot crea directorul %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:170
+#: camel/providers/nntp/camel-nntp-store.c:239
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:326
+#: camel/providers/nntp/camel-nntp-store.c:403
 #, c-format
 msgid "USENET News via %s"
 msgstr "Ştiri USENET via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:640
-#, fuzzy
-msgid "Stream error"
-msgstr "Altă eroare"
-
-#: camel/providers/nntp/camel-nntp-store.c:643
+#: camel/providers/nntp/camel-nntp-store.c:777
 #, fuzzy, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -11831,76 +11553,76 @@ msgstr ""
 "Eroare la salvarea mesajului: %s:\n"
 " %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:735
+#: camel/providers/nntp/camel-nntp-store.c:872
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
 "No such newsgroup. The selected item is a probably a parent folder."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:767
+#: camel/providers/nntp/camel-nntp-store.c:904
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
 "newsgroup does not exist!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:792
+#: camel/providers/nntp/camel-nntp-store.c:929
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:800
+#: camel/providers/nntp/camel-nntp-store.c:937
 #, fuzzy
 msgid "You cannot rename a folder in a News store."
 msgstr "Nu pot redenumi dosarul %s în %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:808
+#: camel/providers/nntp/camel-nntp-store.c:945
 #, fuzzy
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "Nu pot muta un dosar într-unul din descendenţii săi/"
 
-#: camel/providers/nntp/camel-nntp-summary.c:253
-#, fuzzy, c-format
-msgid "Connection error: %s"
-msgstr "Eroare necunoscută: %s"
-
-#: camel/providers/nntp/camel-nntp-summary.c:262
-#, fuzzy, c-format
-msgid "No such folder: %s"
-msgstr "Nu există dosarul %s"
+#: camel/providers/nntp/camel-nntp-store.c:1118
+#, fuzzy
+msgid "Authentication requested but not username provided"
+msgstr "Necesită autentificare"
 
-#: camel/providers/nntp/camel-nntp-summary.c:268
+#: camel/providers/nntp/camel-nntp-store.c:1146
 #, fuzzy, c-format
-msgid "Could not get group: %s"
-msgstr "Nu pot crea conexiunea: %s"
+msgid "Cannot authenticate to server: %s"
+msgstr "Autentificare nereuşită la serverul KPOP: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:333
+#: camel/providers/nntp/camel-nntp-store.c:1262
 #, fuzzy
-msgid "Could not get messages: unspecified error"
-msgstr "Nu pot aduce mesajul: %s"
+msgid "Not connected."
+msgstr "Contact nou"
 
-#: camel/providers/nntp/camel-nntp-summary.c:378
+#: camel/providers/nntp/camel-nntp-store.c:1311
 #, fuzzy, c-format
-msgid "NNTP Command failed: %s"
-msgstr "Comanda IMAP eşuată: %s"
+msgid "No such folder: %s"
+msgstr "Nu există dosarul %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:438
-#: camel/providers/nntp/camel-nntp-summary.c:543
+#: camel/providers/nntp/camel-nntp-summary.c:218
+#: camel/providers/nntp/camel-nntp-summary.c:314
 #, fuzzy, c-format
 msgid "%s: Scanning new messages"
 msgstr "Salvez mesajele"
 
-#: camel/providers/nntp/camel-nntp-summary.c:558
+#: camel/providers/nntp/camel-nntp-summary.c:225
 #, fuzzy, c-format
-msgid "Unknown server response: %s"
-msgstr "Eroare necunoscută: %s"
+msgid "Unexpected server response from xover: %s"
+msgstr "Răspuns neaşteptat de la serverul IMAP: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:605
+#: camel/providers/nntp/camel-nntp-summary.c:328
+#, fuzzy, c-format
+msgid "Unexpected server response from head: %s"
+msgstr "Răspuns neaşteptat de la serverul IMAP: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:368
 #, fuzzy
 msgid "Use cancel"
 msgstr "Renunţă"
 
-#: camel/providers/nntp/camel-nntp-summary.c:607
+#: camel/providers/nntp/camel-nntp-summary.c:370
 #, fuzzy, c-format
 msgid "Operation failed: %s"
 msgstr "Operaţia anulată"
@@ -11950,7 +11672,7 @@ msgstr "Ştergere după %s zi(le)"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107
 msgid "POP"
 msgstr "POP"
 
@@ -12042,7 +11764,7 @@ msgid "No such folder `%s'."
 msgstr "Nu există dosarul `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:132
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -12097,7 +11819,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Mail trimis prin intermediul programului sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:119
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -12400,19 +12122,19 @@ msgstr "%.1fM"
 msgid "%.0fG"
 msgstr "%.1fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
+#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:408
 msgid "attachment"
 msgstr "anexă"
 
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:454
 msgid "Remove selected items from the attachment list"
 msgstr "Scoate articolele selectate din lista de anexe"
 
-#: composer/e-msg-composer-attachment-bar.c:491
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Add attachment..."
 msgstr "Adaugă anexă..."
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:495
 msgid "Attach a file to the message"
 msgstr "Anexează un fişier la mesaj"
 
@@ -12476,7 +12198,7 @@ msgstr "(Mesaj fără titlu)"
 msgid "Open file"
 msgstr "Deschide fişier"
 
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
 msgid "Autogenerated"
 msgstr ""
 
@@ -12625,17 +12347,17 @@ msgstr "Anexează un fisier"
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
+msgid "You cannot attach the file `{0}' to this message."
 msgstr "Anexează un fişier la mesaj"
 
 #. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4
-msgid "${1}"
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
 msgstr ""
 
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
 
 #. mail-composer:attach-directory primary
@@ -12733,7 +12455,7 @@ msgstr "Nu pot crea conexiunea: %s"
 
 #. mail-composer:no-build-message secondary
 #: composer/mail-composer-errors.xml.h:34
-msgid "Because \"${0}\", you may need to select different mail options."
+msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
@@ -12745,8 +12467,10 @@ msgstr ""
 "%s"
 
 #. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38
-msgid "Because \"${1}\"."
+#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted primary
@@ -13187,11 +12911,11 @@ msgid "<b>Then</b>"
 msgstr "Descriere:"
 
 #: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1335
+#: mail/mail-account-gui.c:1347
 msgid "Select Folder"
 msgstr "Alege dosar"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
 msgid "    "
 msgstr ""
 
@@ -13253,7 +12977,7 @@ msgstr ""
 msgid "months"
 msgstr "luni"
 
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
 msgid "seconds"
 msgstr "secunde"
 
@@ -13286,21 +13010,21 @@ msgstr "cu toate dosarele locale"
 msgid "years"
 msgstr "ani"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:916
-#: mail/mail-config.c:76 mail/mail-config.glade.h:90
+#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
+#: mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Important"
 
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:919 mail/mail-config.c:79
-#: mail/mail-config.glade.h:145
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: mail/mail-config.glade.h:148
 #, fuzzy
 msgid "To Do"
 msgstr "La"
 
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:920 mail/mail-config.c:80
-#: mail/mail-config.glade.h:94
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Later"
 msgstr "după"
@@ -13360,270 +13084,6 @@ msgstr "intră"
 msgid "outgoing"
 msgstr "iese"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-#, fuzzy
-msgid "Adjust Score"
-msgstr "Atribuie punctaj"
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Color"
-msgstr "Atribuie culoare"
-
-#: filter/libfilter-i18n.h:4
-msgid "Assign Score"
-msgstr "Atribuie punctaj"
-
-#: filter/libfilter-i18n.h:5
-msgid "Attachments"
-msgstr "Anexe"
-
-#: filter/libfilter-i18n.h:6
-#, fuzzy
-msgid "Beep"
-msgstr "Mărime"
-
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "conţine"
-
-#: filter/libfilter-i18n.h:8
-msgid "Copy to Folder"
-msgstr "Copiază în dosar"
-
-#: filter/libfilter-i18n.h:9
-msgid "Date received"
-msgstr "Date recepţionate"
-
-#: filter/libfilter-i18n.h:10
-msgid "Date sent"
-msgstr "Date trimise"
-
-#: filter/libfilter-i18n.h:12
-msgid "Deleted"
-msgstr "Şterse"
-
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "nu conţine"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "nu se termină cu"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "nu există"
-
-#: filter/libfilter-i18n.h:16
-#, fuzzy
-msgid "does not return"
-msgstr "nu există"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "nu sună ca"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "nu începe cu"
-
-#: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
-msgstr "Nu există"
-
-#: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr "Ciornă"
-
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "se termină cu"
-
-#: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr "Există"
-
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "există"
-
-#: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr "Expresie"
-
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr ""
-
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "este"
-
-#: filter/libfilter-i18n.h:28
-#, fuzzy
-msgid "is after"
-msgstr "a fost după"
-
-#: filter/libfilter-i18n.h:29
-#, fuzzy
-msgid "is before"
-msgstr "a fost înainte"
-
-#: filter/libfilter-i18n.h:30
-#, fuzzy
-msgid "is Flagged"
-msgstr "Marcat"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "e mai mare decât"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "e mai mic decât"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "nu este"
-
-#: filter/libfilter-i18n.h:34
-#, fuzzy
-msgid "is not Flagged"
-msgstr "Marcat"
-
-#: filter/libfilter-i18n.h:36
-#, fuzzy
-msgid "Junk Test"
-msgstr "Iunie"
-
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
-#: widgets/misc/e-expander.c:189
-#, fuzzy
-msgid "Label"
-msgstr "eticheta26"
-
-#: filter/libfilter-i18n.h:38
-msgid "Mailing list"
-msgstr "Lista de mail"
-
-#: filter/libfilter-i18n.h:39
-msgid "Message Body"
-msgstr "Corp mesaj"
-
-#: filter/libfilter-i18n.h:40
-msgid "Message Header"
-msgstr "Antet mesaj"
-
-#: filter/libfilter-i18n.h:41
-#, fuzzy
-msgid "Message is Junk"
-msgstr "Mesajul a fost trimis"
-
-#: filter/libfilter-i18n.h:42
-#, fuzzy
-msgid "Message is not Junk"
-msgstr "Mesajul %s negăsit."
-
-#: filter/libfilter-i18n.h:43
-msgid "Move to Folder"
-msgstr "Mută in dosar"
-
-#: filter/libfilter-i18n.h:44
-#, fuzzy
-msgid "Pipe to Program"
-msgstr "Ieşire din program"
-
-#: filter/libfilter-i18n.h:45
-#, fuzzy
-msgid "Play Sound"
-msgstr "Redă sunetul:"
-
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Citeşte"
-
-#: filter/libfilter-i18n.h:47
-msgid "Recipients"
-msgstr "Destinatari"
-
-#: filter/libfilter-i18n.h:48
-msgid "Regex Match"
-msgstr "Potrivire regex"
-
-#: filter/libfilter-i18n.h:49
-msgid "Replied to"
-msgstr "Răspuns la"
-
-#: filter/libfilter-i18n.h:50
-#, fuzzy
-msgid "returns"
-msgstr "Ocupat"
-
-#: filter/libfilter-i18n.h:51
-#, fuzzy
-msgid "returns greater than"
-msgstr "e mai mare decât"
-
-#: filter/libfilter-i18n.h:52
-#, fuzzy
-msgid "returns less than"
-msgstr "e mai mic decât"
-
-#: filter/libfilter-i18n.h:53
-#, fuzzy
-msgid "Run Program"
-msgstr "Rulează programul:"
-
-#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Punctaj"
-
-#: filter/libfilter-i18n.h:55
-msgid "Sender"
-msgstr "Expeditor"
-
-#: filter/libfilter-i18n.h:56
-msgid "Set Status"
-msgstr "Setează starea"
-
-#: filter/libfilter-i18n.h:57
-msgid "Size (kB)"
-msgstr "Mărime (kB)"
-
-#: filter/libfilter-i18n.h:58
-msgid "sounds like"
-msgstr "sună ca"
-
-#: filter/libfilter-i18n.h:59
-msgid "Source Account"
-msgstr "Cont sursă"
-
-#: filter/libfilter-i18n.h:60
-msgid "Specific header"
-msgstr "Antet specific"
-
-#: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "începe cu"
-
-#: filter/libfilter-i18n.h:63
-msgid "Stop Processing"
-msgstr "Opresc procesarea"
-
-#: filter/libfilter-i18n.h:64 mail/em-format.c:755 mail/em-format-html.c:1519
-#: mail/em-format-quote.c:302 mail/em-mailer-prefs.c:87
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
-#: smime/lib/e-cert.c:1079
-msgid "Subject"
-msgstr "Subiect"
-
-#: filter/libfilter-i18n.h:65
-#, fuzzy
-msgid "Unset Status"
-msgstr "Setează starea"
-
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Adaugă reguli"
@@ -13642,6 +13102,11 @@ msgstr "Nume regulă:"
 msgid "_Score Rules"
 msgstr "Reguli de punctaj"
 
+#: filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Punctaj"
+
 #: filter/searchtypes.xml.h:1
 #, fuzzy
 msgid "Body contains"
@@ -13737,14 +13202,14 @@ msgstr "Semnătură HTML:"
 msgid "-------- Forwarded Message --------"
 msgstr "Mesaje înaintate"
 
-#: mail/em-composer-utils.c:1499
+#: mail/em-composer-utils.c:1495
 #, fuzzy
 msgid "an unknown sender"
 msgstr "Eroare necunoscută"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1509
+#: mail/em-composer-utils.c:1505
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr ""
 
@@ -13788,8 +13253,8 @@ msgstr "<clic aici să alegeţi un dosar>"
 msgid "Create New Folder"
 msgstr "Creză dosar nou..."
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
-#: mail/mail-component.c:701
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
+#: mail/mail-component.c:704
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Precizaţi unde să fie creat dosarul:"
@@ -13805,110 +13270,111 @@ msgstr "Previzualizare"
 msgid "Folder _name:"
 msgstr "Nume dosar:"
 
-#: mail/em-folder-tree.c:839
+#: mail/em-folder-tree.c:833
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Şterg dosarul %s"
 
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree.c:835
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Deschid dosarul %s"
 
-#: mail/em-folder-tree.c:848 mail/message-list.c:1555
+#: mail/em-folder-tree.c:842 mail/message-list.c:1561
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Mut mesajele în %s"
 
-#: mail/em-folder-tree.c:850 mail/message-list.c:1557
+#: mail/em-folder-tree.c:844 mail/message-list.c:1563
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copiez mesajele în %s"
 
-#: mail/em-folder-tree.c:866
+#: mail/em-folder-tree.c:860
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Verific mesajele noi în toate dosarele"
 
-#: mail/em-folder-tree.c:956 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "Copiază în folder"
 
-#: mail/em-folder-tree.c:957 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Mută in dosar"
 
-#: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2069
-#: mail/em-folder-tree.c:2551 mail/em-folder-view.c:798
-#: mail/message-list.c:1645
+#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
+#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
+#: mail/message-list.c:1651
 #, fuzzy
 msgid "_Move"
 msgstr "Mută"
 
-#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#: mail/em-folder-tree.c:955 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "Anulează sarcina"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
 #: mail/em-folder-view.c:798 mail/em-folder-view.c:812
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Alege dosarul"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
 #, fuzzy
 msgid "C_opy"
 msgstr "Copiază"
 
-#: mail/em-folder-tree.c:2096
+#: mail/em-folder-tree.c:2088
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Creez dosar nou"
 
-#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
+#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
 #, fuzzy
 msgid "Create folder"
 msgstr "Creez un dosar nou"
 
-#: mail/em-folder-tree.c:2474
+#: mail/em-folder-tree.c:2463
 #, fuzzy, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Redenumşte dosarul '%s'"
 
-#: mail/em-folder-tree.c:2476
+#: mail/em-folder-tree.c:2465
 #, fuzzy
 msgid "Rename Folder"
 msgstr "Redenumşte dosarul '%s'"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Vizualizare"
 
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2537
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Deschide în fereastră nouă"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2555
+#: mail/em-folder-tree.c:2546
 #, fuzzy
 msgid "_New Folder..."
 msgstr "Dosar _nou"
 
-#: mail/em-folder-tree.c:2558
+#: mail/em-folder-tree.c:2549
 #, fuzzy
 msgid "_Rename"
 msgstr "Redenumeşte"
 
-#: mail/em-folder-tree.c:2561 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Proprietăţi..."
 
 #: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:889
+#: mail/mail-vfolder.c:888
 msgid "VFolders"
 msgstr "Dosare V"
 
@@ -13922,19 +13388,19 @@ msgstr ""
 msgid "Inbox"
 msgstr "Inbox"
 
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
 msgid "Loading..."
 msgstr "Încarc..."
 
 #: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
 #: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
 #: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:551
+#: mail/mail-component.c:554
 msgid "Mail"
 msgstr "Mail"
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Editează ca mesaj nou..."
@@ -13947,17 +13413,17 @@ msgstr "Ti_păreşte"
 msgid "_Reply to Sender"
 msgstr "_Răspunde la expeditor"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:810
+#: mail/em-folder-view.c:901 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Răspunde la _listă"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:811
+#: mail/em-folder-view.c:902 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Răspunde la toţi"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: mail/em-folder-view.c:903 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Înaintează"
@@ -14018,6 +13484,11 @@ msgstr "Mut în folderul..."
 msgid "_Copy to Folder..."
 msgstr "_Copiază în dosarul..."
 
+#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
+#, fuzzy
+msgid "Label"
+msgstr "eticheta26"
+
 #: mail/em-folder-view.c:932
 #, fuzzy
 msgid "Add Sender to Address_book"
@@ -14071,13 +13542,13 @@ msgid "Filter on _Mailing List"
 msgstr "Filtru pe lista de mail"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
-#: mail/mail-config.glade.h:66
+#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/mail-config.glade.h:68
 #, fuzzy
 msgid "Default"
 msgstr "Implicit"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1796
 msgid "Print Message"
 msgstr "Tipăreşte mesaj"
 
@@ -14118,12 +13589,18 @@ msgstr "Cc"
 msgid "Bcc"
 msgstr "Bcc:"
 
+#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
+#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Subiect"
+
 #: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
 #: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Data"
 
-#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
+#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
 msgid "Newsgroups"
 msgstr ""
 
@@ -14319,7 +13796,7 @@ msgid ""
 "practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:757
+#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
 #, fuzzy
 msgid "_View Certificate"
 msgstr "ID certificat:"
@@ -14383,7 +13860,7 @@ msgstr "O săptămână"
 msgid "Once per month"
 msgstr "O lună"
 
-#: mail/em-migrate.c:1072
+#: mail/em-migrate.c:1168
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -14391,91 +13868,91 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1506
+#: mail/em-migrate.c:1602
 #, fuzzy, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Nu pot lua dosarul: %s: %s"
 
-#: mail/em-migrate.c:1532
+#: mail/em-migrate.c:1628
 #, fuzzy, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr ""
 "Nu pot căuta în fişierul: %s\n"
 "%s"
 
-#: mail/em-migrate.c:1715
+#: mail/em-migrate.c:1811
 #, fuzzy, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Nu pot să salvez fişierul listă de grup pentru: %s: %s"
 
-#: mail/em-migrate.c:1919
+#: mail/em-migrate.c:2015
 #, fuzzy, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Nu pot să deschid sau să creez fişierul .newsrc pentru %s: %s"
 
-#: mail/em-migrate.c:1933
+#: mail/em-migrate.c:2029
 #, fuzzy, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Eşec la decodarea mesajului."
 
-#: mail/em-migrate.c:1962
+#: mail/em-migrate.c:2058
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#: mail/em-migrate.c:2413 mail/em-migrate.c:2425
 #, fuzzy, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Eşec la decodarea mesajului."
 
-#: mail/em-migrate.c:2480
+#: mail/em-migrate.c:2576
 #, fuzzy, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr ""
 "Nu pot crea fişierul de ieşire: %s\n"
 " %s"
 
-#: mail/em-migrate.c:2498
+#: mail/em-migrate.c:2594
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 msgstr ""
 
-#: mail/em-popup.c:699
+#: mail/em-popup.c:700
 msgid "Save As..."
 msgstr "Salvează ca..."
 
-#: mail/em-popup.c:717
+#: mail/em-popup.c:718
 #, fuzzy, c-format
 msgid "untitled_image.%s"
 msgstr "(Mesaj fără titlu)"
 
-#: mail/em-popup.c:807
+#: mail/em-popup.c:808
 #, fuzzy
 msgid "Set as _Background"
 msgstr "Fundal:"
 
-#: mail/em-popup.c:809
+#: mail/em-popup.c:810
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "_Răspunde la expeditor"
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:859
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Deschide legătura în navigator"
 
-#: mail/em-popup.c:859
+#: mail/em-popup.c:860
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Trimite _mesaj către lista..."
 
-#: mail/em-popup.c:860
+#: mail/em-popup.c:861
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Adăugare agendă"
 
-#: mail/em-popup.c:966
+#: mail/em-popup.c:967
 #, c-format
 msgid "Open in %s..."
 msgstr "Deschide în %s..."
@@ -15081,7 +14558,7 @@ msgstr "Componenta Evolution pentru sumarul activităţilor."
 msgid "Mail Accounts"
 msgstr "Conturi"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
 #, fuzzy
 msgid "Mail Preferences"
 msgstr "Preferinţe calendar"
@@ -15097,16 +14574,16 @@ msgid "Evolution is importing your old Elm mail"
 msgstr "Componentă Evolution pentru manipularea mailului."
 
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:226
+#: mail/importers/evolution-mbox-importer.c:221
+#: mail/importers/evolution-outlook-importer.c:255
 #: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
 #, fuzzy
 msgid "Importing..."
 msgstr "Se importă"
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:222
-#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/evolution-mbox-importer.c:223
+#: mail/importers/evolution-outlook-importer.c:257
 #: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 #, fuzzy
 msgid "Please wait"
@@ -15130,23 +14607,25 @@ msgid "Elm"
 msgstr ""
 
 #: mail/importers/evolution-mbox-importer.c:116
+#: mail/importers/evolution-outlook-importer.c:130
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Şterge acest dosar"
 
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 #, fuzzy
 msgid "Select folder to import into"
 msgstr "Alege dosar"
 
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:254
 #: mail/importers/mail-importer.c:226
 #, fuzzy, c-format
 msgid "Importing `%s'"
 msgstr "Se importă"
 
-#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/evolution-outlook-importer.c:301
 #: mail/importers/mail-importer.c:140
 #, fuzzy
 msgid "Importing mailbox"
@@ -15297,17 +14776,17 @@ msgstr ""
 msgid "%s License Agreement"
 msgstr ""
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
 #, fuzzy
 msgid "_Host:"
 msgstr "Gazdă:"
 
-#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
 #, fuzzy
 msgid "User_name:"
 msgstr "Nume utilizator:"
 
-#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
 #, fuzzy
 msgid "_Path:"
 msgstr "Cale:"
@@ -15371,36 +14850,36 @@ msgstr "%d total"
 msgid ", %d unread"
 msgstr "%d netrimise"
 
-#: mail/mail-component.c:653
+#: mail/mail-component.c:656
 #, fuzzy
 msgid "New Mail Message"
 msgstr "Mesaj _mail"
 
-#: mail/mail-component.c:654
+#: mail/mail-component.c:657
 msgid "_Mail Message"
 msgstr "Mesaj _mail"
 
-#: mail/mail-component.c:655
+#: mail/mail-component.c:658
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Compune un mesaj"
 
-#: mail/mail-component.c:661
+#: mail/mail-component.c:664
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Dosar V Nou"
 
-#: mail/mail-component.c:662
+#: mail/mail-component.c:665
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Editează filtre"
 
-#: mail/mail-component.c:663
+#: mail/mail-component.c:666
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Creez un mail nou"
 
-#: mail/mail-component.c:795
+#: mail/mail-component.c:798
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
@@ -15412,7 +14891,7 @@ msgstr ""
 msgid "Connecting to server..."
 msgstr "Conectare la server..."
 
-#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Identitate"
 
@@ -15428,7 +14907,7 @@ msgstr ""
 "această informaţie în emailul pe care-l trimiteţi"
 
 #: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 #, fuzzy
 msgid "Receiving Mail"
 msgstr "Primesc mail"
@@ -15447,7 +14926,7 @@ msgstr ""
 msgid "Please select among the following options"
 msgstr ""
 
-#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131
 #, fuzzy
 msgid "Sending Mail"
 msgstr "Trimit mail"
@@ -15462,7 +14941,7 @@ msgstr ""
 "Dacă nu ştiţi ce protocol folosiţi, contactaţi administratorul dumneavostră "
 "de sistem sau furnizorul de serviciu Internet."
 
-#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37
 msgid "Account Management"
 msgstr "Management cont"
 
@@ -15481,248 +14960,252 @@ msgstr ""
 "rog introduceţi mai jos un nume pentru acest cont. Acest nume va fi folosit "
 "doar pentru afişare."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:2
 #, fuzzy
 msgid " Ch_eck for Supported Types "
 msgstr "Verific tipurile suportate"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "<b>Preview</b>"
 msgstr "Previzualizare"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "Semnarea e nesuportată de acest cifru"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "<b>S_ignatures</b>"
 msgstr "Descriere:"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "<b>_Languages</b>"
 msgstr "Limbaj"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
+msgid "<small>This will make the the filter more reliable, but slower</small>"
+msgstr ""
+
+#: mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "<span weight=\"bold\">Checking for New Mail</span>"
 msgstr "Verific mailurile noi"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">General</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
 #, fuzzy
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "Mesaj de afişat"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "Configurare mail"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Security</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "Trimite şi mesajele ciornă"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:34
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:35
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:36
 #, fuzzy
 msgid "Account Editor"
 msgstr "Cont"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:38
 #, fuzzy
 msgid "Add Ne_w Signature..."
 msgstr "Salvează semnătura"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Add _Script"
 msgstr "Adaugă criteriu"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:40
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:44
 msgid "Always _sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Attach original message"
 msgstr "Anexează un fişier la mesaj"
 
-#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Anexă"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:48
 #, fuzzy
 msgid "Automatically _insert smiley images"
 msgstr "Verifică automat dacă sunt mailuri noi la fiecare"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Automatically check for _new mail every"
 msgstr "Verifică automat dacă sunt mailuri noi la fiecare"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Beep w_hen new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Set de caractere necunoscut: %s"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Ch_eck for Supported Types "
 msgstr "Verific tipurile suportate"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 #, fuzzy
-msgid "Check _Incoming Mail"
+msgid "Check _incoming mail for junk"
 msgstr "Verific mailurile noi"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Culoare pentru sarcinile de astăzi"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Colors"
 msgstr "Închide"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Confirm _when expunging a folder"
 msgstr "Distrug dosarul"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 #, fuzzy
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
@@ -15740,303 +15223,304 @@ msgstr ""
 "\n"
 "Clic \"Terminare\" pentru a salva setările"
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
 msgid "De_fault"
 msgstr "Implicit"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Default character e_ncoding:"
 msgstr "Setul de caractere implicit: "
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 #, fuzzy
 msgid "Defaults"
 msgstr "Implicit"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Nu pot deschide mesajul"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Gata"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Drafts _Folder:"
 msgstr "Dosar ciorne:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Email Accounts"
 msgstr "Email-ul conţine"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Email _Address:"
 msgstr "Adresa email:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "Empty trash folders on e_xit"
 msgstr "Goleşte dosarul cu reziduuri la ieşire"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "ID certificat:"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:81
 #, fuzzy
 msgid "Evolution Account Assistant"
 msgstr "Asistentul de conturi Evolution"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:82
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Execută acţiunile"
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Fi_xed-width:"
 msgstr "se termină cu"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Font Properties"
 msgstr "Proprietăţi"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Mesaje înaintate"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "HTML Mail"
 msgstr "În mailuri HTML"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Headers"
 msgstr "Antet"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "Iluminează citatele cu "
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
 #: mail/mail-config.glade.h:91
+#, fuzzy
+msgid "I_nclude remote tests"
+msgstr "Include:"
+
+#: mail/mail-config.glade.h:94
 msgid "Inline"
 msgstr "În linie"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Kerberos "
 msgstr "Kerberos"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Mail Configuration"
 msgstr "Configurare mail"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "Locaţie căsuţă poştală"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "Message Composer"
 msgstr "Antet mesaj"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organi_zaţie:"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 #, fuzzy
 msgid "PGP/GPG _Key ID:"
 msgstr "ID cheie PGP:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Play sound file when new mail arri_ves"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Întreabă-mă când trimit mesaje fără subiect"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Qmail maildir "
 msgstr "Maildir Qmail "
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "Quote original message"
 msgstr "Nu pot deschide mesajul"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr "Cotat"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Re_member password"
 msgstr "Memorez această parolă"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Răspunde la:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "Primesc email"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:120
 #, fuzzy
 msgid "Receiving Options"
 msgstr "Opţiuni primire"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
 #, fuzzy
 msgid "Remember _password"
 msgstr "Memorez această parolă"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
 #, fuzzy
 msgid "S_tandard Font:"
 msgstr "Mbox Unix standard"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 #, fuzzy
 msgid "Security"
 msgstr "_Securitate"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:126
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:127
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:128
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:129
 #, fuzzy
 msgid "Select..."
 msgstr "Şterge..."
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "Trimit email"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Sent _Messages Folder:"
 msgstr "Dosar mesaje trimise:"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:134
 #, fuzzy
 msgid "Ser_ver requires authentication"
 msgstr "Serverul necesită _autentificare"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:135
 #, fuzzy
 msgid "Server _Type: "
 msgstr "Tip server:"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "ID certificat:"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:137
 #, fuzzy
 msgid "Signat_ure:"
 msgstr "Salvează semnătura"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "Signatures"
 msgstr "Semnătură HTML:"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:139
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Nume stil:"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:140
 msgid "Spell Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:141
 msgid "Standard Unix mbox"
 msgstr "Mbox Unix standard"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "T_erminal Font:"
 msgstr "Contact original:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "T_ype: "
 msgstr "Tip:"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:149
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:148
-msgid "Use _Daemon"
-msgstr ""
-
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:152
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Variabil"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
@@ -16047,102 +15531,98 @@ msgstr ""
 "\n"
 "Clic \"Următorul\" pentru a începe"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Add Signature"
 msgstr "Semnătură HTML:"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Always load images from the Internet"
 msgstr "Întotdeauna încarcă imaginile neconectat"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:160
 msgid "_Digitally sign outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:161
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:163
 #, fuzzy
 msgid "_Enable"
 msgstr "Validează"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:165
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Înaintează ca"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Load images if sender is in address book"
 msgstr "Încarcă imaginile dacă expeditorul e în agendă"
 
-#: mail/mail-config.glade.h:167
-msgid "_Local Tests Only"
-msgstr ""
-
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Fă contul acesta contul meu implicit"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "Marchează mesajele ca \"Citit\" după"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Never load images from the Internet"
 msgstr "Nu încărca niciodată imaginile neconectat"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Întreabă-mă când trimit mesaje fără subiect"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Întreabă-mă când trimit mesaje fără subiect"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Răspunde la toţi"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_Script:"
 msgstr "_Securitate"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Ploaie torenţială"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "_Use Secure Connection (SSL):"
 msgstr "Foloseşte conectare securizată (SSL)"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:181
 #, fuzzy
 msgid "color"
 msgstr " culoare"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:182
 #, fuzzy
 msgid "description"
 msgstr "Descriere:"
@@ -16314,7 +15794,7 @@ msgstr ""
 
 #. mail:camel-exception primary
 #: mail/mail-errors.xml.h:57
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgid "Your message with the subject \"{0}\" was not delivered."
 msgstr ""
 
 #. mail:camel-exception secondary
@@ -16380,11 +15860,6 @@ msgstr ""
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Nu pot crea directorul %s: %s"
 
-#. mail:no-save-path secondary
-#: mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail:no-create-path primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
@@ -16409,12 +15884,6 @@ msgstr ""
 msgid "Cannot create temporary save directory."
 msgstr "Nu pot crea directorul temporar: %s"
 
-#. mail:no-create-tmp-path secondary
-#: mail/mail-errors.xml.h:100 mail/mail-errors.xml.h:112
-#: widgets/misc/e-system-errors.xml.h:11 widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail:no-write-path-exists secondary
 #: mail/mail-errors.xml.h:104
 #, fuzzy
@@ -16686,149 +16155,145 @@ msgstr "Suprascrieţi fişierul?"
 msgid "_Append"
 msgstr "Deschide"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:785
 #, fuzzy, c-format
 msgid "Pinging %s"
 msgstr "Trimit \"%s\""
 
-#: mail/mail-mt.c:897
-msgid "Working"
-msgstr "Lucrez"
-
-#: mail/mail-ops.c:99
+#: mail/mail-ops.c:98
 #, fuzzy
 msgid "Filtering Folder"
 msgstr "Actualizez dosarul"
 
-#: mail/mail-ops.c:260
+#: mail/mail-ops.c:259
 #, fuzzy
 msgid "Fetching Mail"
 msgstr "Primesc mail"
 
-#: mail/mail-ops.c:543
+#: mail/mail-ops.c:542
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Eşuare la stocarea mesajului în fişierul temporar %s: %s"
 
-#: mail/mail-ops.c:568
+#: mail/mail-ops.c:567
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:577
+#: mail/mail-ops.c:576
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Eşuare la stocarea mesajului în fişierul temporar %s: %s"
 
-#: mail/mail-ops.c:673
+#: mail/mail-ops.c:672
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Trimit mesajul %d din %d"
 
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:703
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Eşec la decodarea mesajului."
 
-#: mail/mail-ops.c:708
+#: mail/mail-ops.c:707
 msgid "Complete."
 msgstr "Terminat"
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:804
 msgid "Saving message to folder"
 msgstr "Salvez mesaj în dosar"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Mut mesajele în %s"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiez mesajele în %s"
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:1002
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Scanez dosarele în \"%s\""
 
-#: mail/mail-ops.c:1116
+#: mail/mail-ops.c:1115
 msgid "Forwarded messages"
 msgstr "Mesaje înaintate"
 
-#: mail/mail-ops.c:1159
+#: mail/mail-ops.c:1158
 #, c-format
 msgid "Opening folder %s"
 msgstr "Deschid dosarul %s"
 
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1230
 #, c-format
 msgid "Opening store %s"
 msgstr "Deschid rezerva %s"
 
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1308
 #, c-format
 msgid "Removing folder %s"
 msgstr "Şterg dosarul %s"
 
-#: mail/mail-ops.c:1403
+#: mail/mail-ops.c:1402
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "Creez dosar nou"
 
-#: mail/mail-ops.c:1468
+#: mail/mail-ops.c:1467
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1469
+#: mail/mail-ops.c:1468
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Creez dosar nou"
 
-#: mail/mail-ops.c:1524
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr "Actualizez dosarul"
 
-#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
+#: mail/mail-ops.c:1559 mail/mail-ops.c:1610
 msgid "Expunging folder"
 msgstr "Distrug dosarul"
 
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1607
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr ""
 "Se importă %s.\n"
 "Start %s"
 
-#: mail/mail-ops.c:1609
+#: mail/mail-ops.c:1608
 #, fuzzy
 msgid "Local Folders"
 msgstr "Dosare speciale"
 
-#: mail/mail-ops.c:1692
+#: mail/mail-ops.c:1691
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Primesc mesajul %s"
 
-#: mail/mail-ops.c:1764
+#: mail/mail-ops.c:1763
 #, fuzzy, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Primesc mesaje"
 msgstr[1] "Primesc mesaje"
 
-#: mail/mail-ops.c:1850
+#: mail/mail-ops.c:1849
 #, fuzzy, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Salvez mesajele"
 msgstr[1] "Salvez mesajele"
 
-#: mail/mail-ops.c:1900
+#: mail/mail-ops.c:1899
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -16837,7 +16302,7 @@ msgstr ""
 "Nu pot crea fişierul de ieşire: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1928
+#: mail/mail-ops.c:1927
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -16846,11 +16311,11 @@ msgstr ""
 "Eroare la salvarea mesajului: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1999
+#: mail/mail-ops.c:1998
 msgid "Saving attachment"
 msgstr "Salvez anexa"
 
-#: mail/mail-ops.c:2016
+#: mail/mail-ops.c:2015
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -16859,17 +16324,17 @@ msgstr ""
 "Nu pot crea fişierul de ieşire: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2046
+#: mail/mail-ops.c:2045
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nu pot scrie data: %s"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Deconectare de la %s"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "Deconectare de la %s"
@@ -16936,26 +16401,26 @@ msgstr "Actualizez..."
 msgid "Waiting..."
 msgstr "Aştept..."
 
-#: mail/mail-session.c:238
+#: mail/mail-session.c:239
 msgid "User canceled operation."
 msgstr "Operaţie anulată de utilizator."
 
-#: mail/mail-session.c:271
+#: mail/mail-session.c:272
 #, fuzzy, c-format
 msgid "Enter Password for %s"
 msgstr "Introduceţi parola pentru %s"
 
-#: mail/mail-session.c:273
+#: mail/mail-session.c:274
 #, fuzzy
 msgid "Enter Password"
 msgstr "Introduceţi parola pentru %s"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 #, fuzzy
 msgid "_Remember this password"
 msgstr "Memorez această parolă"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:298
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
@@ -17015,81 +16480,81 @@ msgstr "Scanez dosarele în \"%s\""
 msgid "Updating vFolders for '%s'"
 msgstr "Scanez dosarele în \"%s\""
 
-#: mail/mail-vfolder.c:959
+#: mail/mail-vfolder.c:958
 #, fuzzy
 msgid "vFolders"
 msgstr "Dosare"
 
-#: mail/mail-vfolder.c:998
+#: mail/mail-vfolder.c:997
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "Editează dosare V"
 
-#: mail/mail-vfolder.c:1082
+#: mail/mail-vfolder.c:1081
 msgid "New VFolder"
 msgstr "Dosar V Nou"
 
-#: mail/message-list.c:946
+#: mail/message-list.c:948
 msgid "Unseen"
 msgstr "Nevăzut"
 
-#: mail/message-list.c:947
+#: mail/message-list.c:949
 msgid "Seen"
 msgstr "Văzut"
 
-#: mail/message-list.c:948
+#: mail/message-list.c:950
 msgid "Answered"
 msgstr "Răspuns"
 
-#: mail/message-list.c:949
+#: mail/message-list.c:951
 msgid "Multiple Unseen Messages"
 msgstr "Mesaje nevăzute multiple"
 
-#: mail/message-list.c:950
+#: mail/message-list.c:952
 msgid "Multiple Messages"
 msgstr "Mesaje multiple"
 
-#: mail/message-list.c:954
+#: mail/message-list.c:956
 msgid "Lowest"
 msgstr "Cea mai scăzută"
 
-#: mail/message-list.c:955
+#: mail/message-list.c:957
 msgid "Lower"
 msgstr "Mai scăzută"
 
-#: mail/message-list.c:959
+#: mail/message-list.c:961
 msgid "Higher"
 msgstr "Mai mare"
 
-#: mail/message-list.c:960
+#: mail/message-list.c:962
 msgid "Highest"
 msgstr "Cea mai mare"
 
-#: mail/message-list.c:1279
+#: mail/message-list.c:1285
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1286
+#: mail/message-list.c:1292
 msgid "Today %l:%M %p"
 msgstr "Astăzi %l:%M %p"
 
-#: mail/message-list.c:1295
+#: mail/message-list.c:1301
 msgid "Yesterday %l:%M %p"
 msgstr "Ieri %l:%M %p"
 
-#: mail/message-list.c:1307
+#: mail/message-list.c:1313
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1315
+#: mail/message-list.c:1321
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1317
+#: mail/message-list.c:1323
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3300
+#: mail/message-list.c:3321
 #, fuzzy
 msgid "Generating message list"
 msgstr "Salvez mesajele"
@@ -17151,6 +16616,10 @@ msgstr "Înaintează"
 msgid "No Response Necessary"
 msgstr ""
 
+#: mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Citeşte"
+
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Răspunde"
@@ -17261,46 +16730,50 @@ msgid ""
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:10
-msgid "Whether Evolution should start up in offline mode"
+msgid "Toolbar is visible"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:11
-msgid "Whether to skip the development warning dialog"
+msgid "Whether Evolution should start up in offline mode"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Whether the toolbar should be visible."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:14
 #, fuzzy
 msgid "mail"
 msgstr "Email"
 
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
-msgstr ""
-
-#: shell/e-shell.c:545 shell/e-shell.c:546
+#: shell/e-shell.c:588 shell/e-shell.c:589
 #, fuzzy, c-format
 msgid "%ld KB"
 msgstr "%d %B"
 
-#: shell/e-shell.c:744
+#: shell/e-shell.c:786
 #, fuzzy
 msgid "Uknown system error."
 msgstr "Eroare necunoscută"
 
-#: shell/e-shell.c:1101
+#: shell/e-shell.c:1143
 #, fuzzy
 msgid "Invalid arguments"
 msgstr "Conţinut invalid al mesajului"
 
-#: shell/e-shell.c:1103
+#: shell/e-shell.c:1145
 msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/e-shell.c:1105
+#: shell/e-shell.c:1147
 msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell.c:1107
+#: shell/e-shell.c:1149
 msgid "Generic error"
 msgstr "Eroare generică"
 
@@ -17357,7 +16830,7 @@ msgstr ""
 msgid "Select importer"
 msgstr "Alege dosar"
 
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1026
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
 #, fuzzy, c-format
 msgid "File %s does not exist"
 msgstr "Dosarul `%s' nu există."
@@ -17385,59 +16858,59 @@ msgstr ""
 "Se importă %s\n"
 "Se importă elementul 1."
 
-#: shell/e-shell-importer.c:549
+#: shell/e-shell-importer.c:570
 msgid "Automatic"
 msgstr "Automat"
 
-#: shell/e-shell-importer.c:598
+#: shell/e-shell-importer.c:626
 #, fuzzy
-msgid "_Filename:"
+msgid "F_ilename:"
 msgstr "Nume fişier:"
 
-#: shell/e-shell-importer.c:603
+#: shell/e-shell-importer.c:631
 msgid "Select a file"
 msgstr "Selectează un fişier"
 
-#: shell/e-shell-importer.c:613
+#: shell/e-shell-importer.c:642
 #, fuzzy
 msgid "File _type:"
 msgstr "Tip fişier:"
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:681
 msgid "Import data and settings from _older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:684
 #, fuzzy
 msgid "Import a _single file"
 msgstr "Import fişiere"
 
-#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:727
+#: shell/e-shell-importer.c:756
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:853 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
 #, fuzzy, c-format
 msgid "From %s:"
 msgstr "De la:"
 
-#: shell/e-shell-importer.c:1044
+#: shell/e-shell-importer.c:1073
 #, fuzzy, c-format
 msgid "No importer available for file %s"
 msgstr "Nici un furnizor valid pentru protocolul `%s'"
 
-#: shell/e-shell-importer.c:1056
+#: shell/e-shell-importer.c:1085
 #, fuzzy
 msgid "Unable to execute importer"
 msgstr "Eşec la decodarea mesajului."
 
-#: shell/e-shell-importer.c:1169
+#: shell/e-shell-importer.c:1199
 #, fuzzy
 msgid "_Import"
 msgstr "Import"
@@ -17488,63 +16961,63 @@ msgstr "Nu pot deschide directorul cache: %s"
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: shell/e-shell-window.c:336
+#: shell/e-shell-window.c:337
 #, fuzzy
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Evolution este actualmente conectat. Daţi clic pe buton pentru a lucra "
 "deconectat."
 
-#: shell/e-shell-window.c:343
+#: shell/e-shell-window.c:344
 #, fuzzy
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution este în proces de deconectare."
 
-#: shell/e-shell-window.c:349
+#: shell/e-shell-window.c:350
 #, fuzzy
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Evolution este actualmente deconectat. Daţi clic pe buton pentru a lucra "
 "conectat."
 
-#: shell/e-shell-window.c:621
+#: shell/e-shell-window.c:637
 #, fuzzy, c-format
 msgid "Switch to %s"
 msgstr "Mail la %s"
 
-#: shell/e-shell-window-commands.c:64
+#: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: shell/e-shell-window-commands.c:72
+#: shell/e-shell-window-commands.c:74
 #, fuzzy, c-format
 msgid "Error executing %s."
 msgstr "Eroare execuţie filtru: %s: %s"
 
-#: shell/e-shell-window-commands.c:121
+#: shell/e-shell-window-commands.c:123
 #, fuzzy
 msgid "Bug buddy is not installed."
 msgstr "Bug buddy nu poate fi rulat."
 
-#: shell/e-shell-window-commands.c:129
+#: shell/e-shell-window-commands.c:131
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy nu poate fi rulat."
 
-#: shell/e-shell-window-commands.c:171
+#: shell/e-shell-window-commands.c:323
 #, fuzzy
-msgid "About Evolution"
-msgstr "Despre Evolution..."
+msgid "Groupware Suite"
+msgstr "Nume grup:"
 
-#: shell/e-shell-window-commands.c:382
+#: shell/e-shell-window-commands.c:563
 #, fuzzy
 msgid "_Work Online"
 msgstr "Lucrează offline"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "Lucrează deconectat"
 
-#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Lucrează deconectat"
 
@@ -17557,32 +17030,6 @@ msgstr "Chinez"
 msgid "New"
 msgstr "Nou"
 
-#: shell/evolution-shell-component-utils.c:115
-#, fuzzy, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr "Eroare necunoscută"
-
-#: shell/evolution-shell-component-utils.c:118
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-
-#: shell/evolution-shell-component-utils.c:125
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-
 #: shell/evolution-test-component.c:140
 #, fuzzy
 msgid "New Test"
@@ -17926,34 +17373,34 @@ msgid ""
 "Click help for details."
 msgstr ""
 
-#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:522
+#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
+#: smime/gui/certificate-manager.c:556
 #, fuzzy
 msgid "Select a cert to import..."
 msgstr "Alege dosar"
 
-#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:604
+#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
+#: smime/gui/certificate-manager.c:638
 #, fuzzy
 msgid "Certificate Name"
 msgstr "ID certificat:"
 
-#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
+#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
 #, fuzzy
 msgid "Purposes"
 msgstr "În desfăşurare"
 
-#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:517
+#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:267
+#: smime/gui/certificate-manager.c:271
 #, fuzzy
 msgid "Expires"
 msgstr "Expresie"
 
-#: smime/gui/certificate-manager.c:417
+#: smime/gui/certificate-manager.c:446
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "Adresa email:"
@@ -17998,6 +17445,11 @@ msgstr ""
 "Publicist: %s\n"
 "Subiect: %s"
 
+#: smime/gui/e-cert-selector.c:169
+#, fuzzy
+msgid "Select certificate"
+msgstr "Mergi la o anumită data"
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -18058,7 +17510,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
 #, fuzzy
 msgid "Certificate"
 msgstr "ID certificat:"
@@ -18083,20 +17535,24 @@ msgstr "Nume comun"
 msgid "Contact Certificates"
 msgstr "ID certificat:"
 
-#: smime/gui/smime-ui.glade.h:21
-#, no-c-format
-msgid "Do you want to trust \"%s\" for the following purposes?"
+#: smime/gui/smime-ui.glade.h:20
+msgid "Do not trust the authenticity of this certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:21
 msgid "Dummy window only"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:22
 #, fuzzy
 msgid "Edit"
 msgstr "_Editează"
 
+#: smime/gui/smime-ui.glade.h:23
+#, fuzzy
+msgid "Email Certificate Trust Settings"
+msgstr "Eşec la verificarea certificatului."
+
 #: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr ""
@@ -18133,281 +17589,292 @@ msgstr "Organizaţie"
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:37
-msgid "Trust this CA to identify email users."
+msgid "Trust the authenticity of this certificate"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:38
-msgid "Trust this CA to identify software developers."
+msgid "Trust this CA to identify email users."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:39
-msgid "Trust this CA to identify web sites."
+msgid "Trust this CA to identify software developers."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:40
-#, fuzzy
-msgid "View"
-msgstr "_Vizualizare"
+msgid "Trust this CA to identify web sites."
+msgstr ""
 
 #: smime/gui/smime-ui.glade.h:41
 #, fuzzy
-msgid "View Certificate"
-msgstr "ID certificat:"
+msgid "View"
+msgstr "_Vizualizare"
 
 #: smime/gui/smime-ui.glade.h:42
-msgid "You have been asked to trust a new Certificate Authority (CA)."
-msgstr ""
-
-#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:44
+#: smime/gui/smime-ui.glade.h:43
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:45
+#: smime/gui/smime-ui.glade.h:44
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:46
+#: smime/gui/smime-ui.glade.h:45
 #, fuzzy
 msgid "Your Certificates"
 msgstr "ID certificat:"
 
-#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
+#: smime/gui/smime-ui.glade.h:46
+#, fuzzy
+msgid "_Edit CA Trust"
+msgstr "Editare task"
+
+#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 #, fuzzy
 msgid "%d/%m/%Y"
 msgstr "%m/%d/%Y"
 
-#: smime/lib/e-cert.c:478
+#. x509 certificate usage types
+#: smime/lib/e-cert.c:424
+#, fuzzy
+msgid "Sign"
+msgstr "Setări"
+
+#: smime/lib/e-cert.c:425
+#, fuzzy
+msgid "Encrypt"
+msgstr "Criptare PGP"
+
+#: smime/lib/e-cert.c:530
 #, fuzzy
 msgid "Version"
 msgstr "lună"
 
-#: smime/lib/e-cert.c:493
+#: smime/lib/e-cert.c:545
 #, fuzzy
 msgid "Version 1"
 msgstr "lună"
 
-#: smime/lib/e-cert.c:496
+#: smime/lib/e-cert.c:548
 #, fuzzy
 msgid "Version 2"
 msgstr "lună"
 
-#: smime/lib/e-cert.c:499
+#: smime/lib/e-cert.c:551
 #, fuzzy
 msgid "Version 3"
 msgstr "lună"
 
-#: smime/lib/e-cert.c:581
+#: smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:584
+#: smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:587
+#: smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:590
+#: smime/lib/e-cert.c:642
 #, fuzzy
 msgid "C"
 msgstr ", "
 
-#: smime/lib/e-cert.c:593
+#: smime/lib/e-cert.c:645
 #, fuzzy
 msgid "CN"
 msgstr "N"
 
-#: smime/lib/e-cert.c:596
+#: smime/lib/e-cert.c:648
 msgid "OU"
 msgstr ""
 
-#: smime/lib/e-cert.c:599
+#: smime/lib/e-cert.c:651
 #, fuzzy
 msgid "O"
 msgstr "OK"
 
-#: smime/lib/e-cert.c:602
+#: smime/lib/e-cert.c:654
 msgid "L"
 msgstr ""
 
-#: smime/lib/e-cert.c:605
+#: smime/lib/e-cert.c:657
 #, fuzzy
 msgid "DN"
 msgstr "N"
 
-#: smime/lib/e-cert.c:608
+#: smime/lib/e-cert.c:660
 msgid "DC"
 msgstr ""
 
-#: smime/lib/e-cert.c:611
+#: smime/lib/e-cert.c:663
 #, fuzzy
 msgid "ST"
 msgstr "SMTP"
 
-#: smime/lib/e-cert.c:614
+#: smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:617
+#: smime/lib/e-cert.c:669
 #, fuzzy
 msgid "Certificate Key Usage"
 msgstr "ID certificat:"
 
-#: smime/lib/e-cert.c:620
+#: smime/lib/e-cert.c:672
 #, fuzzy
 msgid "Netscape Certificate Type"
 msgstr "ID certificat:"
 
-#: smime/lib/e-cert.c:623
+#: smime/lib/e-cert.c:675
 #, fuzzy
 msgid "Certificate Authority Key Identifier"
 msgstr "ID certificat:"
 
-#: smime/lib/e-cert.c:626
+#: smime/lib/e-cert.c:678
 #, fuzzy
 msgid "UID"
 msgstr "I"
 
-#: smime/lib/e-cert.c:635
+#: smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr ""
 
-#: smime/lib/e-cert.c:686
+#: smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:694
+#: smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
 msgstr ""
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:768
 #, fuzzy
 msgid "Subject Public Key Info"
 msgstr ""
 "\n"
 "Cheia publică:"
 
-#: smime/lib/e-cert.c:721
+#: smime/lib/e-cert.c:773
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:736
+#: smime/lib/e-cert.c:788
 #, fuzzy
 msgid "Subject's Public Key"
 msgstr "Subiectul este %s"
 
-#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
+#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
 #, fuzzy
 msgid "Error: Unable to process extension"
 msgstr "Nu pot procesa dosarul spool"
 
-#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
+#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:782
+#: smime/lib/e-cert.c:834
 #, fuzzy
 msgid "SSL Certificate Authority"
 msgstr "ID certificat:"
 
-#: smime/lib/e-cert.c:786
+#: smime/lib/e-cert.c:838
 #, fuzzy
 msgid "Email Certificate Authority"
 msgstr "Eşec la verificarea certificatului."
 
-#: smime/lib/e-cert.c:814
+#: smime/lib/e-cert.c:866
 #, fuzzy
 msgid "Signing"
 msgstr "Setări"
 
-#: smime/lib/e-cert.c:818
+#: smime/lib/e-cert.c:870
 #, fuzzy
 msgid "Non-repudiation"
 msgstr "Nici o informaţie"
 
-#: smime/lib/e-cert.c:822
+#: smime/lib/e-cert.c:874
 msgid "Key Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:826
+#: smime/lib/e-cert.c:878
 #, fuzzy
 msgid "Data Encipherment"
 msgstr "anexă"
 
-#: smime/lib/e-cert.c:830
+#: smime/lib/e-cert.c:882
 msgid "Key Agreement"
 msgstr ""
 
-#: smime/lib/e-cert.c:834
+#: smime/lib/e-cert.c:886
 #, fuzzy
 msgid "Certificate Signer"
 msgstr "ID certificat:"
 
-#: smime/lib/e-cert.c:838
+#: smime/lib/e-cert.c:890
 msgid "CRL Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:938
 #, fuzzy
 msgid "Critical"
 msgstr "Tradiţional"
 
-#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
+#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
 msgid "Not Critical"
 msgstr ""
 
-#: smime/lib/e-cert.c:912
+#: smime/lib/e-cert.c:964
 #, fuzzy
 msgid "Extensions"
 msgstr "Expresie"
 
-#: smime/lib/e-cert.c:983
+#: smime/lib/e-cert.c:1035
 #, fuzzy, c-format
 msgid "%s = %s"
 msgstr "%s server %s"
 
-#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
 #, fuzzy
 msgid "Certificate Signature Algorithm"
 msgstr "Fişier semnătură:"
 
-#: smime/lib/e-cert.c:1048
+#: smime/lib/e-cert.c:1100
 #, fuzzy
 msgid "Issuer"
 msgstr "_Inserează"
 
-#: smime/lib/e-cert.c:1102
+#: smime/lib/e-cert.c:1154
 msgid "Issuer Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1121
+#: smime/lib/e-cert.c:1173
 #, fuzzy
 msgid "Subject Unique ID"
 msgstr "Subiectul este %s"
 
-#: smime/lib/e-cert.c:1164
+#: smime/lib/e-cert.c:1216
 #, fuzzy
 msgid "Certificate Signature Value"
 msgstr "Fişier semnătură:"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
+#: smime/lib/e-cert-db.c:608
 #, fuzzy
 msgid "Certificate already exists"
 msgstr "ID-ul card-ului există deja"
@@ -18565,7 +18032,7 @@ msgstr "ora curentă"
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "_Acţiuni"
 
@@ -18745,7 +18212,7 @@ msgstr "Închide"
 #: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:3
+#: ui/evolution.xml.h:4
 msgid "Close"
 msgstr "Închide"
 
@@ -18759,7 +18226,7 @@ msgid "Delete this item"
 msgstr "Şterge acest articol"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr "Bara de unelte principală"
 
@@ -18804,7 +18271,7 @@ msgstr "Salvează acest articol pe disc"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:44
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "_File"
 msgstr "_Fişier"
 
@@ -19080,13 +18547,13 @@ msgstr "_Inversează selecţia"
 msgid "_Threaded Message List"
 msgstr "Listă de mesaje înlănţuite"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Închide această fereastră"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "_Close"
 msgstr "În_chide"
 
@@ -19522,7 +18989,7 @@ msgstr "Tipăreşte mesaj"
 msgid "_Quoted"
 msgstr "Cotat"
 
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
 msgid "_Tools"
 msgstr "_Unelte"
 
@@ -19840,7 +19307,7 @@ msgstr "Sarcină"
 
 #: ui/evolution.xml.h:1
 #, fuzzy
-msgid "About Ximian Evolution..."
+msgid "About Evolution..."
 msgstr "Despre Evolution..."
 
 #: ui/evolution.xml.h:2
@@ -19848,106 +19315,118 @@ msgstr "Despre Evolution..."
 msgid "Change Evolution's settings"
 msgstr "Setări Evolution..."
 
-#: ui/evolution.xml.h:5
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the visibility of the toolbar"
+msgstr "Schimbă proprietăţile acestui dosar"
+
+#: ui/evolution.xml.h:6
 #, fuzzy
 msgid "Create a new window displaying this folder"
 msgstr "Creez un dosar nou"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "Ieşire"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Ximian Evolution _FAQ"
+
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Ieşire din program"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:10
 msgid "Forget _Passwords"
 msgstr "Uită _parolele"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:11
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Uită parolele memorate astfel veţi fi întrebat despre ele din nou"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:12
 msgid "Import data from other programs"
 msgstr ""
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:14
 #, fuzzy
 msgid "New _Window"
 msgstr "Legătura DN:"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 #, fuzzy
 msgid "Pi_lot Settings..."
 msgstr "Setări _pilot..."
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Send / Receive"
 msgstr "Trimite / Primeşte"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Trimite mailurile din coadă şi descarcă mailurile noi"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 #, fuzzy
 msgid "Set up Pilot configuration"
 msgstr "Configurare mail"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:19
 #, fuzzy
-msgid "Show information about Ximian Evolution"
+msgid "Show information about Evolution"
 msgstr "Arată informaţii despre Evolution"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:20
 msgid "Submit Bug Report"
 msgstr "Raportează o eroare"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:21
 msgid "Submit _Bug Report"
 msgstr "Raportează o eroare"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Raportează o problemă folosind Bug Buddy"
 
-#: ui/evolution.xml.h:21
-msgid "Toggle whether we are working offline."
-msgstr "Selectează în timp lucrăm deconectaţi"
-
 #: ui/evolution.xml.h:23
-msgid "Ximian Evolution _FAQ"
-msgstr "Ximian Evolution _FAQ"
+#, fuzzy
+msgid "T_oolbar"
+msgstr "Bara de unelte principală"
 
 #: ui/evolution.xml.h:24
-msgid "_About Ximian Evolution..."
-msgstr "Despre Ximian Evolution..."
+msgid "Toggle whether we are working offline."
+msgstr "Selectează în timp lucrăm deconectaţi"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "_About Evolution..."
+msgstr "Despre Evolution..."
+
+#: ui/evolution.xml.h:30
 msgid "_Help"
 msgstr "Ajutor"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "_Import..."
 msgstr "_Importă..."
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "_New"
 msgstr "_Nou"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 #, fuzzy
 msgid "_Quick Reference"
 msgstr "Preferinţe calendar"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_Send / Receive"
 msgstr "Trimite / Primeşte"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 #, fuzzy
 msgid "_Window"
 msgstr "Legătura DN:"
@@ -20032,7 +19511,7 @@ msgid "With _Status"
 msgstr "Setează starea"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:626
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:635
 msgid "UTC"
 msgstr ""
 
@@ -20194,30 +19673,30 @@ msgstr "Alte..."
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
-#: widgets/misc/e-error.c:121
+#: widgets/misc/e-error.c:79 widgets/misc/e-error.c:80
+#: widgets/misc/e-error.c:122
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Evolution"
 
-#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
-#: widgets/misc/e-error.c:119
+#: widgets/misc/e-error.c:81 widgets/misc/e-error.c:82
+#: widgets/misc/e-error.c:120
 #, fuzzy
 msgid "Evolution Warning"
 msgstr "Evolution"
 
-#: widgets/misc/e-error.c:118
+#: widgets/misc/e-error.c:119
 #, fuzzy
 msgid "Evolution Information"
 msgstr "Informaţie opţională"
 
-#: widgets/misc/e-error.c:120
+#: widgets/misc/e-error.c:121
 #, fuzzy
 msgid "Evolution Query"
 msgstr "Compozitorul de mailuiri Evolution."
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:410
+#: widgets/misc/e-error.c:415
 #, fuzzy, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -20376,17 +19855,476 @@ msgstr ""
 "Nu pot lua mesajul: %s\n"
 "  %s"
 
-#: widgets/misc/e-task-widget.c:211
+#: widgets/misc/e-task-widget.c:212
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: widgets/misc/e-task-widget.c:216
+#: widgets/misc/e-task-widget.c:217
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% complet)"
 
 #, fuzzy
+#~ msgid "Failed to connect to LDAP server"
+#~ msgstr "Nu mă pot conecta la serverul LDAP."
+
+#, fuzzy
+#~ msgid "Failed to authenticate with LDAP server"
+#~ msgstr ""
+#~ "Autentificare la serverul IMAP eşuată.\n"
+#~ "%s\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid "This server does not support LDAPv3 schema information"
+#~ msgstr "Răspunsul serverului IMAP nu conţine informaţia %s"
+
+#, fuzzy
+#~ msgid "Error retrieving schema information"
+#~ msgstr ""
+#~ "Eroare la încarcarea informaţiei de filtrare:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Server did not respond with valid schema information"
+#~ msgstr "Răspunsul serverului IMAP nu conţine informaţia %s"
+
+#, fuzzy
+#~ msgid "  S_how Supported Bases "
+#~ msgstr "Verific tipurile suportate"
+
+#, fuzzy
+#~ msgid "1:00"
+#~ msgstr "100%"
+
+#, fuzzy
+#~ msgid "Connecting"
+#~ msgstr "Deconectare de la %s"
+
+#, fuzzy
+#~ msgid "Distinguished _name:"
+#~ msgstr "_Nume listă:"
+
+#, fuzzy
+#~ msgid "Email address:"
+#~ msgstr "Adresa email:"
+
+#~ msgid "One"
+#~ msgstr "Unu"
+
+#, fuzzy
+#~ msgid "S_earch scope: "
+#~ msgstr "Scopul căutării:"
+
+#, fuzzy
+#~ msgid "Searching"
+#~ msgstr "Caut..."
+
+#, fuzzy
+#~ msgid "Sub"
+#~ msgstr "Du"
+
+#, fuzzy
+#~ msgid "_Display name:"
+#~ msgstr "Afişează"
+
+#, fuzzy
+#~ msgid "_Port number:"
+#~ msgstr "Port:"
+
+#, fuzzy
+#~ msgid "_Search base:"
+#~ msgstr "Domeniu căutare:"
+
+#, fuzzy
+#~ msgid "_Server name:"
+#~ msgstr "Mesaj server:"
+
+#, fuzzy
+#~ msgid "_Timeout (minutes):"
+#~ msgstr "Durata de sforăire (minute)"
+
+#, fuzzy
+#~ msgid "connecting-tab"
+#~ msgstr "Deconectare de la %s"
+
+#, fuzzy
+#~ msgid "general-tab"
+#~ msgstr "General"
+
+#, fuzzy
+#~ msgid "searching-tab"
+#~ msgstr "Caut..."
+
+#, fuzzy
+#~ msgid "Job title:"
+#~ msgstr "_Funcţia:"
+
+#, fuzzy
+#~ msgid "Webcam:"
+#~ msgstr "Pagină"
+
+#, fuzzy
+#~ msgid "Category editor not available."
+#~ msgstr "Nu e disponibilă o descriere."
+
+#, fuzzy
+#~ msgid "Could not find widget for a field: `%s'"
+#~ msgstr "Nu pot şterge dosarul sumar al fişierelor `%s': %s"
+
+#~ msgid "Do you want to save changes?"
+#~ msgstr "Doriţi să salvaţi modificările?"
+
+#, fuzzy
+#~ msgid "Error saving %s: %s"
+#~ msgstr "Eroare la salvarea fişierului: %s"
+
+#, fuzzy
+#~ msgid "Can not load URI"
+#~ msgstr "Nu găsesc card-ul"
+
+#, fuzzy
+#~ msgid "Calendar Properties"
+#~ msgstr "Calendar"
+
+#, fuzzy
+#~ msgid "Remote"
+#~ msgstr "Şterge"
+
+#, fuzzy
+#~ msgid "Task List Properties"
+#~ msgstr "Lista de sarcini"
+
+#, fuzzy
+#~ msgid "_Refresh Interval:"
+#~ msgstr "Reîmprospătează lista"
+
+#, fuzzy
+#~ msgid "_Source URL:"
+#~ msgstr "Sursă"
+
+#~ msgid "Are you sure you want to cancel and delete this meeting?"
+#~ msgstr "Sunteţi sigur că doriţi să anulaţi şi ştergeţi această întâlnire?"
+
+#~ msgid "Are you sure you want to cancel and delete this task?"
+#~ msgstr "Sunteţi sigur că doriţi să anulaţi şi ştergeţi această sarcină?"
+
+#~ msgid "Are you sure you want to cancel and delete this journal entry?"
+#~ msgstr "Sunteţi sigur că doriţi să anulaţi şi ştergeţi intrarea din jurnal?"
+
+#~ msgid "Are you sure you want to delete the appointment `%s'?"
+#~ msgstr "Sunteţi sigur că doriţi să ştergeţi întălnirea `%s'?"
+
+#~ msgid "Are you sure you want to delete this untitled appointment?"
+#~ msgstr "Sunteţi sigur că doriţi să ştergeţi întălnirea"
+
+#~ msgid "Are you sure you want to delete the task `%s'?"
+#~ msgstr "Sunteţi sigur că doriţî să ştergeţi sarcina `%s'?"
+
+#~ msgid "Are you sure you want to delete this untitled task?"
+#~ msgstr "Sunteţi sigur că doriţî să ştergeţi această sarcină?"
+
+#~ msgid "Are you sure you want to delete the journal entry `%s'?"
+#~ msgstr "Sunteţi sigur că doriţi să ştergeţi intrarea din jurnal `%s'?"
+
+#~ msgid "Are you sure want to delete this untitled journal entry?"
+#~ msgstr "Sunteţi sigur că doriţi să ştergeţi această intrare din jurnal?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d appointment?"
+#~ msgid_plural "Are you sure you want to delete %d appointments?"
+#~ msgstr[0] "Sunteţi sigur că doriţi să ştergeţi întălnirea `%d'?"
+#~ msgstr[1] "Sunteţi sigur că doriţi să ştergeţi întălnirea `%d'?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d task?"
+#~ msgid_plural "Are you sure you want to delete %d tasks?"
+#~ msgstr[0] "Sunteţi sigur că doriţi să ştergeţi task-ul `%d'?"
+#~ msgstr[1] "Sunteţi sigur că doriţi să ştergeţi task-ul `%d'?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d journal entry?"
+#~ msgid_plural "Are you sure you want to delete %d journal entries?"
+#~ msgstr[0] "Sunteţi sigur că doriţi să ştergeţi %d intrări din jurnal?"
+#~ msgstr[1] "Sunteţi sigur că doriţi să ştergeţi %d intrări din jurnal?"
+
+#~ msgid "_Invite Others..."
+#~ msgstr "_Invită pe alţii..."
+
+#, fuzzy
+#~ msgid ""
+#~ "This event has been changed, but has not been saved.\n"
+#~ "\n"
+#~ "Do you wish to save your changes?"
+#~ msgstr ""
+#~ "Această semnătură a fost modificată, dar n-a fost salvată.\n"
+#~ "Doriţi să salvaţi modificările?"
+
+#, fuzzy
+#~ msgid "Save Event"
+#~ msgstr "Mesaj calendar"
+
+#, fuzzy
+#~ msgid "The meeting information has been created. Send it?"
+#~ msgstr ""
+#~ "Informaţiile despre întâlnire au fost schimbate. Trimit o versiune "
+#~ "actualizată?"
+
+#~ msgid "The meeting information has changed. Send an updated version?"
+#~ msgstr ""
+#~ "Informaţiile despre întâlnire au fost schimbate. Trimit o versiune "
+#~ "actualizată?"
+
+#, fuzzy
+#~ msgid "The task assignment information has been created. Send it?"
+#~ msgstr ""
+#~ "Informaţiile despre sarcină au fost schimbate. Trimit o versiune "
+#~ "actualizată?"
+
+#~ msgid "The task information has changed. Send an updated version?"
+#~ msgstr ""
+#~ "Informaţiile despre sarcină au fost schimbate. Trimit o versiune "
+#~ "actualizată?"
+
+#, fuzzy
+#~ msgid "Could not get article %s from NNTP server"
+#~ msgstr "Nu pot obţine lista grup de la server."
+
+#, fuzzy
+#~ msgid "Error posting message: %s: message not posted"
+#~ msgstr ""
+#~ "Eroare la salvarea automată a mesajului: %s:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Stream error"
+#~ msgstr "Altă eroare"
+
+#, fuzzy
+#~ msgid "Connection error: %s"
+#~ msgstr "Eroare necunoscută: %s"
+
+#, fuzzy
+#~ msgid "Could not get group: %s"
+#~ msgstr "Nu pot crea conexiunea: %s"
+
+#, fuzzy
+#~ msgid "Could not get messages: unspecified error"
+#~ msgstr "Nu pot aduce mesajul: %s"
+
+#, fuzzy
+#~ msgid "Unknown server response: %s"
+#~ msgstr "Eroare necunoscută: %s"
+
+#, fuzzy
+#~ msgid "Adjust Score"
+#~ msgstr "Atribuie punctaj"
+
+#~ msgid "Assign Color"
+#~ msgstr "Atribuie culoare"
+
+#~ msgid "Assign Score"
+#~ msgstr "Atribuie punctaj"
+
+#~ msgid "Attachments"
+#~ msgstr "Anexe"
+
+#, fuzzy
+#~ msgid "Beep"
+#~ msgstr "Mărime"
+
+#~ msgid "contains"
+#~ msgstr "conţine"
+
+#~ msgid "Copy to Folder"
+#~ msgstr "Copiază în dosar"
+
+#~ msgid "Date received"
+#~ msgstr "Date recepţionate"
+
+#~ msgid "Date sent"
+#~ msgstr "Date trimise"
+
+#~ msgid "Deleted"
+#~ msgstr "Şterse"
+
+#~ msgid "does not contain"
+#~ msgstr "nu conţine"
+
+#~ msgid "does not end with"
+#~ msgstr "nu se termină cu"
+
+#~ msgid "does not exist"
+#~ msgstr "nu există"
+
+#, fuzzy
+#~ msgid "does not return"
+#~ msgstr "nu există"
+
+#~ msgid "does not sound like"
+#~ msgstr "nu sună ca"
+
+#~ msgid "does not start with"
+#~ msgstr "nu începe cu"
+
+#~ msgid "Do Not Exist"
+#~ msgstr "Nu există"
+
+#~ msgid "Draft"
+#~ msgstr "Ciornă"
+
+#~ msgid "ends with"
+#~ msgstr "se termină cu"
+
+#~ msgid "Exist"
+#~ msgstr "Există"
+
+#~ msgid "exists"
+#~ msgstr "există"
+
+#~ msgid "Expression"
+#~ msgstr "Expresie"
+
+#~ msgid "is"
+#~ msgstr "este"
+
+#, fuzzy
+#~ msgid "is after"
+#~ msgstr "a fost după"
+
+#, fuzzy
+#~ msgid "is before"
+#~ msgstr "a fost înainte"
+
+#, fuzzy
+#~ msgid "is Flagged"
+#~ msgstr "Marcat"
+
+#~ msgid "is greater than"
+#~ msgstr "e mai mare decât"
+
+#~ msgid "is less than"
+#~ msgstr "e mai mic decât"
+
+#~ msgid "is not"
+#~ msgstr "nu este"
+
+#, fuzzy
+#~ msgid "is not Flagged"
+#~ msgstr "Marcat"
+
+#, fuzzy
+#~ msgid "Junk Test"
+#~ msgstr "Iunie"
+
+#~ msgid "Mailing list"
+#~ msgstr "Lista de mail"
+
+#~ msgid "Message Body"
+#~ msgstr "Corp mesaj"
+
+#~ msgid "Message Header"
+#~ msgstr "Antet mesaj"
+
+#, fuzzy
+#~ msgid "Message is Junk"
+#~ msgstr "Mesajul a fost trimis"
+
+#, fuzzy
+#~ msgid "Message is not Junk"
+#~ msgstr "Mesajul %s negăsit."
+
+#~ msgid "Move to Folder"
+#~ msgstr "Mută in dosar"
+
+#, fuzzy
+#~ msgid "Pipe to Program"
+#~ msgstr "Ieşire din program"
+
+#, fuzzy
+#~ msgid "Play Sound"
+#~ msgstr "Redă sunetul:"
+
+#~ msgid "Recipients"
+#~ msgstr "Destinatari"
+
+#~ msgid "Regex Match"
+#~ msgstr "Potrivire regex"
+
+#~ msgid "Replied to"
+#~ msgstr "Răspuns la"
+
+#, fuzzy
+#~ msgid "returns"
+#~ msgstr "Ocupat"
+
+#, fuzzy
+#~ msgid "returns greater than"
+#~ msgstr "e mai mare decât"
+
+#, fuzzy
+#~ msgid "returns less than"
+#~ msgstr "e mai mic decât"
+
+#, fuzzy
+#~ msgid "Run Program"
+#~ msgstr "Rulează programul:"
+
+#~ msgid "Sender"
+#~ msgstr "Expeditor"
+
+#~ msgid "Set Status"
+#~ msgstr "Setează starea"
+
+#~ msgid "Size (kB)"
+#~ msgstr "Mărime (kB)"
+
+#~ msgid "sounds like"
+#~ msgstr "sună ca"
+
+#~ msgid "Source Account"
+#~ msgstr "Cont sursă"
+
+#~ msgid "Specific header"
+#~ msgstr "Antet specific"
+
+#~ msgid "starts with"
+#~ msgstr "începe cu"
+
+#~ msgid "Stop Processing"
+#~ msgstr "Opresc procesarea"
+
+#, fuzzy
+#~ msgid "Unset Status"
+#~ msgstr "Setează starea"
+
+#~ msgid "Working"
+#~ msgstr "Lucrez"
+
+#, fuzzy
+#~ msgid "_Filename:"
+#~ msgstr "Nume fişier:"
+
+#, fuzzy
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "Unknown error."
+#~ msgstr "Eroare necunoscută"
+
+#, fuzzy
+#~ msgid "View Certificate"
+#~ msgstr "ID certificat:"
+
+#, fuzzy
+#~ msgid "About Ximian Evolution..."
+#~ msgstr "Despre Evolution..."
+
+#~ msgid "_About Ximian Evolution..."
+#~ msgstr "Despre Ximian Evolution..."
+
+#, fuzzy
 #~ msgid "Evolution Addressbook folder viewer"
 #~ msgstr "Vizualizor agendă minicard Evolution"
 
@@ -20594,10 +20532,6 @@ msgstr "%s (%d%% complet)"
 #~ msgstr "Email principal"
 
 #, fuzzy
-#~ msgid "S_pouse:"
-#~ msgstr "_Soţ/soţie:"
-
-#, fuzzy
 #~ msgid "_Business:"
 #~ msgstr "Serviciu"
 
@@ -20617,9 +20551,6 @@ msgstr "%s (%d%% complet)"
 #~ msgid "_Mobile:"
 #~ msgstr "_Mobil"
 
-#~ msgid "_Office:"
-#~ msgstr "Birou:"
-
 #, fuzzy
 #~ msgid "_Public Calendar URL:"
 #~ msgstr "Calendar URI"
@@ -22016,10 +21947,6 @@ msgstr "%s (%d%% complet)"
 #~ msgstr "Bug buddy nu poate fi rulat."
 
 #, fuzzy
-#~ msgid "Invalid object"
-#~ msgstr "Conţinut invalid al mesajului"
-
-#, fuzzy
 #~ msgid "URI not loaded"
 #~ msgstr "EBook neîncărcat\n"
 
@@ -24059,10 +23986,6 @@ msgstr "%s (%d%% complet)"
 #~ msgstr "Limbaj"
 
 #, fuzzy
-#~ msgid "Lansing"
-#~ msgstr "Avertisment"
-
-#, fuzzy
 #~ msgid "Laredo"
 #~ msgstr "Pager"
 
@@ -28737,9 +28660,6 @@ msgstr "%s (%d%% complet)"
 #~ msgid "Work week"
 #~ msgstr "Săptămînă lucrătoare"
 
-#~ msgid "Edit Task"
-#~ msgstr "Editare task"
-
 #~ msgid "Mark Complete"
 #~ msgstr "Marcare completă"
 
diff --git a/po/ru.po b/po/ru.po
index ac2065bc4e..fb1b5ca213 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
-"POT-Creation-Date: 2004-05-19 14:00-0400\n"
+"POT-Creation-Date: 2004-06-03 11:14-0400\n"
 "PO-Revision-Date: 2004-02-27 17:10+0200\n"
 "Last-Translator: Leonid Kanter <leon@asplinux.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -64,13 +64,13 @@ msgstr "карточек"
 msgid "Default Sync Address:"
 msgstr "Адрес синхронизации по умолчанию:"
 
-#: addressbook/conduit/address-conduit.c:1150
 #: addressbook/conduit/address-conduit.c:1151
+#: addressbook/conduit/address-conduit.c:1152
 msgid "Could not load addressbook"
 msgstr "Не удается загрузить адресную книгу"
 
-#: addressbook/conduit/address-conduit.c:1219
-#: addressbook/conduit/address-conduit.c:1222
+#: addressbook/conduit/address-conduit.c:1220
+#: addressbook/conduit/address-conduit.c:1223
 msgid "Could not read pilot's Address application block"
 msgstr "Не удается прочитать блок приложения адресов Пилота"
 
@@ -78,13 +78,13 @@ msgstr "Не удается прочитать блок приложения а�
 msgid "Accessing LDAP Server anonymously"
 msgstr "Анонимное подключение к серверу LDAP"
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
 msgid "Failed to authenticate.\n"
 msgstr "Ошибка проверки подлинности.\n"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sВведите пароль для %s (пользователь %s)"
@@ -128,51 +128,23 @@ msgstr "_Контакты:"
 msgid "Create a new contacts group"
 msgstr "Создать новую группу ярлыков"
 
-#: addressbook/gui/component/addressbook-component.c:182
+#: addressbook/gui/component/addressbook-component.c:184
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:483
-msgid "Failed to connect to LDAP server"
-msgstr "Не удается подключиться к серверу LDAP"
-
-#: addressbook/gui/component/addressbook-config.c:507
-msgid "Failed to authenticate with LDAP server"
-msgstr "Сбой аутентификации на сервере LDAP"
-
-#: addressbook/gui/component/addressbook-config.c:535
-msgid "Could not perform query on Root DSE"
-msgstr "Не удается выполнить запрос в корневом DSE"
-
-#: addressbook/gui/component/addressbook-config.c:840
-msgid "The server responded with no supported search bases"
-msgstr "Сервер отвечает без поддержки баз поиска"
-
-#: addressbook/gui/component/addressbook-config.c:1245
-msgid "This server does not support LDAPv3 schema information"
-msgstr "Этот сервер не поддерживает информацию LDAPv3 schema"
-
-#: addressbook/gui/component/addressbook-config.c:1266
-msgid "Error retrieving schema information"
-msgstr "Ошибка при загрузке информации schema"
-
-#: addressbook/gui/component/addressbook-config.c:1274
-msgid "Server did not respond with valid schema information"
-msgstr "Сервер не отвечает корректной информацией schema"
-
 #: addressbook/gui/component/addressbook-migrate.c:68
-#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1160
 msgid "Migrating..."
 msgstr "Перенос..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1201
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Переносится '%s':"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:438
+#: addressbook/gui/component/addressbook-migrate.c:464
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
 #: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
@@ -180,28 +152,28 @@ msgid "On This Computer"
 msgstr "На этом компьютере"
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:446
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
-#: mail/mail-config.glade.h:106
+#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
+#: mail/mail-config.glade.h:109
 msgid "Personal"
 msgstr "Личный"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:454
+#: addressbook/gui/component/addressbook-migrate.c:480
 msgid "On LDAP Servers"
 msgstr "На серверах LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:582
+#: addressbook/gui/component/addressbook-migrate.c:608
 msgid "LDAP Servers"
 msgstr "Серверы LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:702
+#: addressbook/gui/component/addressbook-migrate.c:728
 msgid "Autocompletion Settings"
 msgstr "Настройка автозавершения"
 
-#: addressbook/gui/component/addressbook-migrate.c:1076
+#: addressbook/gui/component/addressbook-migrate.c:1104
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -213,7 +185,7 @@ msgstr ""
 "\n"
 "Производится преобразование папок для новой версии..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1090
+#: addressbook/gui/component/addressbook-migrate.c:1118
 #, fuzzy
 msgid ""
 "The format of mailing list contacts has changed.\n"
@@ -225,7 +197,7 @@ msgstr ""
 "\n"
 "Производится преобразование папок для новой версии..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1099
+#: addressbook/gui/component/addressbook-migrate.c:1127
 #, fuzzy
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
@@ -237,7 +209,7 @@ msgstr ""
 "\n"
 "Производится преобразование папок для новой версии..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1109
+#: addressbook/gui/component/addressbook-migrate.c:1137
 #, fuzzy
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
@@ -249,39 +221,34 @@ msgstr ""
 "\n"
 "Производится преобразование папок для новой версии..."
 
-#: addressbook/gui/component/addressbook-view.c:674
+#: addressbook/gui/component/addressbook-view.c:675
 #, fuzzy, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr "Адресная книга '%s' будет удалена. Вы действительно хотите продолжить?"
 
-#: addressbook/gui/component/addressbook-view.c:761
+#: addressbook/gui/component/addressbook-view.c:754
 #, fuzzy
 msgid "New Address Book"
 msgstr "Новая адресная книга"
 
-#: addressbook/gui/component/addressbook-view.c:762
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
+#: addressbook/gui/component/addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Удалить"
 
-#: addressbook/gui/component/addressbook-view.c:763
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-view.c:756
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Свойства..."
 
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/addressbook-view.c:1002
+#. Create the contacts group
+#: addressbook/gui/component/addressbook-view.c:995
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
 #: calendar/gui/migration.c:373
 msgid "Contacts"
 msgstr "Контакты"
@@ -362,10 +329,6 @@ msgid "Manage your S/MIME certificates here"
 msgstr "Здесь можно управлять вашими сертификатами S/Mime"
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-msgid "  S_how Supported Bases "
-msgstr "  _Показывать поддерживаемые типы "
-
-#: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -380,205 +343,170 @@ msgstr "  _Показывать поддерживаемые типы "
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1:00"
-msgstr "1:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
-msgstr "5:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "Проверка подлинности"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
 #, fuzzy
 msgid "<b>Display</b>"
 msgstr "Отображение"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 #, fuzzy
 msgid "<b>Downloading</b>"
 msgstr "<b>Отправка эл.почты:</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:10
 #, fuzzy
 msgid "<b>Searching</b>"
 msgstr "Поиск"
 
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
 msgid "<b>Server Information</b>"
 msgstr "Шаг 2: Сведения о сервере"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
 msgid "<b>Type:</b>"
 msgstr "<b>К:</b> "
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:13
 #, fuzzy
 msgid "Add Contacts Group"
 msgstr "_Контакты:"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:14
 #, fuzzy
 msgid "Address Book Properties"
 msgstr "Свойства адресной книги"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
-#: mail/mail-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
+#: mail/mail-config.glade.h:42
 msgid "Always"
 msgstr "Всегда"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr "Анонимно"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:17
 #: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Основные"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
-msgid "Connecting"
-msgstr "Подключение"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 #: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Подробности"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
-msgid "Distinguished _name:"
-msgstr "Отличительное _имя (DN):"
-
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:19
 #, fuzzy
 msgid "Distinguished name"
 msgstr "Отличительное _имя (DN):"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:20
 #, fuzzy
 msgid "Download limit:"
 msgstr "Ограничение загрузки:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Email address"
 msgstr "Электронная почта:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "Email address:"
-msgstr "Электронная почта:"
-
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "Evolution will use this DN to authenticate you with the server"
-msgstr ""
-"Evolution будет использовать это значение DN для проверки вашей подлинности "
-"на сервере"
-
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:22
+#, fuzzy
 msgid ""
-"Evolution will use this email address to authenticate you with the server"
+"Evolution will use this email address to authenticate you with the server."
 msgstr "Этот адрес будет использоваться для идентификации вас на сервере"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:23
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Поддерживаемые базы поиска"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:24
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
+#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Общие"
 
-#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
-#: mail/mail-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
+#: mail/mail-config.glade.h:102
 msgid "Never"
 msgstr "Никогда"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
-msgid "One"
-msgstr "Один"
-
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:35
-msgid "S_earch scope: "
-msgstr "_Диапазон поиска: "
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Search _base:"
+msgstr "База поиска:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
 msgid "Search base only"
 msgstr "База поиска:"
 
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid "Search base:"
 msgstr "База поиска:"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Search scope:"
 msgstr "_Диапазон поиска: "
 
-#: addressbook/gui/component/ldap-config.glade.h:39
-msgid "Searching"
-msgstr "Поиск"
-
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:31
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
-"server if\n"
-"your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL or TLS."
 msgstr ""
 "Выбор этой опции означает, что Evolution будет устанавливать соединение с "
 "вашим\n"
 "сервером LDAP только в том случае, если он поддерживает SSL or TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a \n"
-"insecure environment. For example, if you and your LDAP server are behind a "
-"firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection "
-"is already\n"
-"secure."
+"you are in a insecure environment. For example, if you and your LDAP server "
+"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
+"because your connection is already secure."
 msgstr ""
 "Выбор этой опции означает, что Evolution будет пытаться использовать SSL/"
 "TLS\n"
@@ -587,71 +515,64 @@ msgstr ""
 "вы и ваш сервер LDAP находятся за межсетевым экраном, то Evolution не будет\n"
 "использовать SSL/TLS, так как ваше соединение уже достаточно безопасно."
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:33
+#, fuzzy
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
-"TLS.  This \n"
-"means that your connection will be insecure, and that you will be vulnerable "
-"to security\n"
-"exploits. "
+"TLS.  This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits. "
 msgstr ""
 "Выбор этой опции означает, что ваш сервер не поддерживает протоколы SSL\n"
 "и TLS . Это означает, что ваше соединение с сервером будет уязвимым для атак."
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Sub"
-msgstr "Под"
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr "Поддерживаемые базы поиска"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
-"searches will \n"
-"begin. If you leave this blank, the search will begin at the root of the "
-"directory tree."
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
 msgstr ""
 "База поиска является известным именем записи (DN - distinguished name),\n"
 "откуда начнется ваш поиск. Если вы оставите это поле пустым,\n"
 "то поиск начнется с корня дерева каталогов."
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:37
+#, fuzzy
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
-"the \n"
-"directory tree. A search scope of \"sub\" will include all entries below "
-"your search base.\n"
-"A search scope of \"one\" will only include the entries one level beneath "
-"your base.\n"
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
 msgstr ""
 "Глубина поиска определяет, как далеко вниз по дереву каталогов будет\n"
 "осуществляться поиск. Глубина поиска \"sub\" включает все элементы\n"
 "под каталогом начала поиска. Глубина поиска \"one\" включает в себя\n"
 "элементы на один уровень ниже каталога начала поиска.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:58
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "Полное имя вашего сервера LDAP. Например: \"ldap.mycompany.com\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:39
 #, fuzzy
 msgid ""
-"This is the maximum number of entries to download. Setting this number to "
-"be \n"
+"This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr ""
 "Максимальное число элементов для загрузки. Установка очень большого\n"
 "значения может серьезно замедлить работу вашей адресной книги."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -661,140 +582,119 @@ msgstr ""
 "что установка этого параметра в \"Адрес эл. почты\" требует анонимного "
 "доступа к вашему серверу LDAP."
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:41
+#, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
-"list.\n"
-"It is for display purposes only. "
+"list. It is for display purposes only. "
 msgstr ""
 "Это имя сервера будет появляться в списке каталогов Evolution.\n"
 "Оно используется только для отображения."
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:42
+#, fuzzy
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. "
-"A \n"
-"list of standard ports has been provided. Ask your system administrator\n"
-"what port you should specify."
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
 msgstr ""
 "Порт сервера LDAP, на котором Evolution будет устанавливать соединение.\n"
 "Список стандартных портов ранее уже был предоставлен. Спросите вашего\n"
 "системного администратора, какой из них вам необходимо использовать."
 
-#: addressbook/gui/component/ldap-config.glade.h:67
-msgid "This option controls how long a search will be run."
-msgstr "Этот параметр определяет, как долго будет производиться поиск."
-
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:43
 #, fuzzy
 msgid "Timeout:"
 msgstr "Формат времени:"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
-msgid "U_se SSL/TLS:"
-msgstr "И_спользовать SSL/TLS:"
-
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr "По отличительному имени (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr "По почтовому адресу"
 
-#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
-#: mail/mail-config.glade.h:154
+#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
+#: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr "Когда это возможно"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:47
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "_Контакты:"
 
-#: addressbook/gui/component/ldap-config.glade.h:74
-#: calendar/gui/dialogs/calendar-setup.glade.h:12
-msgid "_Display name:"
-msgstr "Показать имя:"
-
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr "Ограничение загрузки:"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
 msgid "_Email address:"
 msgstr "Электронная почта:"
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:50
+#, fuzzy
+msgid "_Find Possible Search Bases"
+msgstr "Поддерживаемые базы поиска"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Log in method:"
 msgstr "_Метод подключения:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "_Log in:"
+msgstr "Регистрация"
+
+#: addressbook/gui/component/ldap-config.glade.h:53
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
 msgid "_Name:"
 msgstr "_Имя:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
-msgid "_Port number:"
-msgstr "_Номер порта:"
-
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "_Port:"
 msgstr "Приоритет:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
-msgid "_Search base:"
-msgstr "_База поиска:"
-
-#: addressbook/gui/component/ldap-config.glade.h:82
-msgid "_Server name:"
-msgstr "Имя _сервера:"
+#: addressbook/gui/component/ldap-config.glade.h:55
+#, fuzzy
+msgid "_Search scope:"
+msgstr "_Диапазон поиска: "
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:56
 #, fuzzy
 msgid "_Server:"
 msgstr "С_ервер:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
-msgid "_Timeout (minutes):"
-msgstr "_Задержка (минут):"
+#: addressbook/gui/component/ldap-config.glade.h:57
+#, fuzzy
+msgid "_Timeout:"
+msgstr "Формат времени:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:58
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "Использовать _защищенное соединение (SSL)"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "карточек"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
-msgid "connecting-tab"
-msgstr "вкладка соединения"
-
-#: addressbook/gui/component/ldap-config.glade.h:88
-msgid "general-tab"
-msgstr "общая вкладка"
-
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:60
 #: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
-#: mail/mail-config.glade.h:182
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "минут"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
-msgid "searching-tab"
-msgstr "вкладка поиска"
-
-#: addressbook/gui/component/select-names/e-select-names.c:497
+#: addressbook/gui/component/select-names/e-select-names.c:503
 #: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid "Select Contacts from Address Book"
 msgstr "Выбор контактов из адресной книги"
 
-#: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
@@ -834,7 +734,7 @@ msgstr "Безымянный контакт"
 
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:222
+#: addressbook/gui/widgets/e-addressbook-view.c:224
 msgid "Source"
 msgstr "Источник"
 
@@ -907,9 +807,9 @@ msgid "<b>Work</b>"
 msgstr "<b>К:</b> "
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
-#: addressbook/gui/widgets/eab-contact-display.c:342
-#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/widgets/eab-contact-display.c:334
+#: addressbook/gui/widgets/eab-contact-display.c:353
 msgid "AIM"
 msgstr "AIM"
 
@@ -949,15 +849,15 @@ msgid "Company:"
 msgstr "Команда:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:271
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
+#: addressbook/gui/contact-editor/e-contact-editor.c:266
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
 msgstr "Контакт"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1527
+#: addressbook/gui/contact-editor/e-contact-editor.c:520
 msgid "Contact Editor"
 msgstr "Редактор контактов"
 
@@ -981,83 +881,80 @@ msgid "Full _Name..."
 msgstr "По_лное имя..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:202
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-msgid "Home"
-msgstr "Домашний"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #, fuzzy
 msgid "Home Page:"
 msgstr "Домашняя страничка"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-#, fuzzy
-msgid "Job title:"
-msgstr "Должность:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/e-itip-control.c:936
-msgid "Location:"
-msgstr "Расположение:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 #, fuzzy
 msgid "Mailing Address"
 msgstr "Электронная почта"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 #, fuzzy
 msgid "Manager:"
 msgstr "Мeнеджер"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "Псевдон_им:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Notes:"
 msgstr "Примечания:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 #, fuzzy
 msgid "Novell Groupwise"
 msgstr "Novell GroupWise"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
-#: addressbook/gui/contact-editor/e-contact-editor.c:203
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-msgid "Other"
-msgstr "Другие"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#, fuzzy
+msgid "Office:"
+msgstr "Ком_ната:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "PO Box:"
 msgstr "Аб.ящик:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 #, fuzzy
 msgid "Personal Information"
 msgstr "Дополнительная информация"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 #, fuzzy
 msgid "Profession:"
 msgstr "Професси_я:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#, fuzzy
+msgid "Spouse:"
+msgstr "С_упруг(а):"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "State/Province:"
 msgstr "Область, край:"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#, fuzzy
+msgid "Title:"
+msgstr "Заголовок:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+msgid "Video Chat:"
+msgstr ""
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:41
 #, fuzzy
 msgid "Wants to receive HTML mail"
@@ -1065,15 +962,15 @@ msgstr "Согласен получать почту в формате _HTML"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:42
 #, fuzzy
-msgid "Webcam:"
-msgstr "Веб-страница:"
+msgid "Web Log:"
+msgstr "_Веб-страница:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
-#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
-#: mail/mail-config.glade.h:155
+#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
+#: mail/mail-config.glade.h:157
 msgid "Work"
 msgstr "Служебное"
 
@@ -1093,19 +990,12 @@ msgid "_File under:"
 msgstr "Имя файла:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 #, fuzzy
 msgid "_Where:"
 msgstr "С_ервер:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
-msgid "item7"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
-msgid "item8"
-msgstr ""
-
-#: addressbook/gui/contact-editor/eab-editor.c:316
+#: addressbook/gui/contact-editor/eab-editor.c:315
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -1113,7 +1003,7 @@ msgstr ""
 "Вы действительно хотите\n"
 "удалить эти контакты?"
 
-#: addressbook/gui/contact-editor/eab-editor.c:319
+#: addressbook/gui/contact-editor/eab-editor.c:318
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -1122,16 +1012,16 @@ msgstr ""
 "удалить этот контакт?"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:351
-#: addressbook/gui/widgets/eab-contact-display.c:372
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Address"
 msgstr "Адрес"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:292
+#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard.c:174
@@ -2109,87 +1999,110 @@ msgstr "Замбия"
 msgid "Zimbabwe"
 msgstr "Зимбабве"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/contact-editor/e-contact-editor.c:179
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:337
+#: addressbook/gui/widgets/eab-contact-display.c:356
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:347
-#: addressbook/gui/widgets/eab-contact-display.c:366
+#: addressbook/gui/contact-editor/e-contact-editor.c:180
+#: addressbook/gui/widgets/eab-contact-display.c:339
+#: addressbook/gui/widgets/eab-contact-display.c:358
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: addressbook/gui/widgets/eab-contact-display.c:338
+#: addressbook/gui/widgets/eab-contact-display.c:357
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:344
-#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#: addressbook/gui/widgets/eab-contact-display.c:355
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/contact-editor/e-contact-editor.c:183
 #, fuzzy
 msgid "GroupWise"
 msgstr "Novell GroupWise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+msgid "Home"
+msgstr "Домашний"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+msgid "Other"
+msgstr "Другие"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
 msgid "Source Book"
 msgstr "Книга-источник"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:264
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Target Book"
 msgstr "Книга назначения"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:278
+#: addressbook/gui/contact-editor/e-contact-editor.c:273
 msgid "Is New Contact"
 msgstr "Является новым конактом"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:285
+#: addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Writable Fields"
 msgstr "Поля для записи"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:299
+#: addressbook/gui/contact-editor/e-contact-editor.c:294
 msgid "Changed"
 msgstr "Изменено"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
-msgid "Category editor not available."
-msgstr "Редактор категорий недоступен."
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:2352
 msgid "This contact belongs to these categories:"
 msgstr "Этот контакт принадлежит следующим категориям:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#: addressbook/gui/contact-editor/e-contact-editor.c:2429
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Выберите один из следующих вариантов"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#: addressbook/gui/contact-editor/e-contact-editor.c:2433
 #, fuzzy
 msgid "No image"
 msgstr "Нигер"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#: addressbook/gui/contact-editor/e-contact-editor.c:2636
 #, fuzzy
 msgid ""
-"The following entries are invalid:\n"
+"The contact data is invalid:\n"
 "\n"
-msgstr "В настоящий момент активны следующие соединения:"
+msgstr "Повторяющаяся дата некорректна"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2738
-#, c-format
-msgid "Could not find widget for a field: `%s'"
-msgstr "Не удается найти элемент управления для поля: \"%s\""
+#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#, fuzzy
+msgid "Invalid contact."
+msgstr "%d контактов"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+msgid ""
+"The contact cannot be saved to the selected address book. Do you want to "
+"discard changes?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2727
+#: addressbook/gui/contact-editor/e-contact-editor.c:2751
+msgid "_Discard"
+msgstr "_Отклонить"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+msgid ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
+msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:62
 msgid "AOL Instant Messenger"
@@ -2222,7 +2135,7 @@ msgid "_Edit Full"
 msgstr "_Изменить все"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:166
 msgid "_Full Name:"
 msgstr "_Полное имя:"
 
@@ -2370,30 +2283,30 @@ msgstr "Имя _списка:"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Введите эл.адрес или перетащите контакт в список, приведённый ниже:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "contact-list-editor"
 msgstr "Редактор списка контактов"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:153
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:215
+#: addressbook/gui/widgets/e-addressbook-view.c:217
 #: addressbook/gui/widgets/e-minicard-view.c:460
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Книга"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
 msgid "Is New List"
 msgstr "является новым списком"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:215
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
 msgid "Contact List Editor"
 msgstr "Редактор списка контактов"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:438
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
 msgid "Save List as VCard"
 msgstr "Сохранить список как VCard"
 
@@ -2440,119 +2353,119 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Расширенный поиск"
 
-#: addressbook/gui/widgets/eab-contact-display.c:129
-#: addressbook/gui/widgets/eab-contact-display.c:192
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:139
-#: addressbook/gui/widgets/eab-contact-display.c:205
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:257
-#: addressbook/gui/widgets/eab-contact-display.c:533
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:525
 msgid "List Members"
 msgstr "Участники списка"
 
-#: addressbook/gui/widgets/eab-contact-display.c:329
-#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/eab-contact-display.c:321
+#: addressbook/gui/widgets/eab-contact-display.c:323
 msgid "E-mail"
 msgstr "Эл. почта"
 
-#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/eab-contact-display.c:332
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Организация"
 
-#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "Position"
 msgstr "Должность"
 
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:354
 #, fuzzy
 msgid "Groupwise"
 msgstr "Группа"
 
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:340
 msgid "Video Conferencing"
 msgstr "Видеоконференции"
 
-#: addressbook/gui/widgets/eab-contact-display.c:349
-#: addressbook/gui/widgets/eab-contact-display.c:370
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Phone"
 msgstr "Телефон"
 
-#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:342
 msgid "Fax"
 msgstr "Факс"
 
-#: addressbook/gui/widgets/eab-contact-display.c:354
+#: addressbook/gui/widgets/eab-contact-display.c:346
 msgid "work"
 msgstr "работа"
 
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:359
 msgid "WWW"
 msgstr "WWW"
 
-#: addressbook/gui/widgets/eab-contact-display.c:368
-#: addressbook/gui/widgets/eab-contact-display.c:587
+#: addressbook/gui/widgets/eab-contact-display.c:360
+#: addressbook/gui/widgets/eab-contact-display.c:579
 msgid "Blog"
 msgstr "Блог"
 
-#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/eab-contact-display.c:363
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Мобильный телефон"
 
-#: addressbook/gui/widgets/eab-contact-display.c:375
+#: addressbook/gui/widgets/eab-contact-display.c:367
 msgid "personal"
 msgstr "личный"
 
-#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/eab-contact-display.c:374
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Примечание"
 
-#: addressbook/gui/widgets/eab-contact-display.c:548
+#: addressbook/gui/widgets/eab-contact-display.c:540
 msgid "Job Title"
 msgstr "Должность"
 
-#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/eab-contact-display.c:544
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:774
+#: smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "Эл. почта"
 
-#: addressbook/gui/widgets/eab-contact-display.c:579
+#: addressbook/gui/widgets/eab-contact-display.c:571
 msgid "Home page"
 msgstr "Домашняя страничка"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 msgid "Success"
 msgstr "Успешно"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Backend busy"
 msgstr ""
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Repository offline"
 msgstr "Репозиторий вне сети"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 #, fuzzy
 msgid "Address Book does not exist"
 msgstr "Адресная книга не существует"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 #, fuzzy
 msgid "No Self Contact defined"
 msgstr "Создать список контактов"
@@ -2560,27 +2473,27 @@ msgstr "Создать список контактов"
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Permission denied"
 msgstr "Отказ в доступе"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Contact not found"
 msgstr "Контакт не найден"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Contact ID already exists"
 msgstr "Идентификатор контакта уже существует"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Protocol not supported"
 msgstr "Протокол не поддерживается"
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:60
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:233
 #: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
@@ -2593,39 +2506,39 @@ msgid "Cancelled"
 msgstr "Отменено"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:61
 #, fuzzy
 msgid "Could not cancel"
 msgstr "Не удается открыть \"%s\": %s"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Authentication Failed"
 msgstr "Сбой проверки подлинности"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Authentication Required"
 msgstr "Требуется проверка подлинности"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:66
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "TLS not Available"
 msgstr "TLS недоступен"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#: addressbook/gui/widgets/eab-gui-util.c:66
 #, fuzzy
 msgid "No such source"
 msgstr "Нет такого сообщения"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:69
+#: addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Other error"
 msgstr "Иная ошибка"
 
-#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:90
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
@@ -2633,7 +2546,7 @@ msgstr ""
 "Не удается открыть эту адресную книгу. Убедитесь, что путь существует и что "
 "у вас имеются необходимые права доступа."
 
-#: addressbook/gui/widgets/eab-gui-util.c:110
+#: addressbook/gui/widgets/eab-gui-util.c:97
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -2641,18 +2554,19 @@ msgstr ""
 "Не удается открыть эту адресную книгу.  Это значит, что либо введен неверный "
 "URI, либо сервер LDAP недоступен."
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:102
+#, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution you must compile the program from the CVS "
-"sources after retrieving OpenLDAP from the link below."
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
 msgstr ""
 "Эта версия Evolution не имеет встроенной поддержки LDAP. Если вы хотите "
 "использовать LDAP в Evolution, вы должны пересобрать программу из исходных "
 "текстов из CVS после установки OpenLDAP; получить его можно по приведенной "
 "ниже ссылке."
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:109
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -2660,11 +2574,7 @@ msgstr ""
 "Не удается открыть эту адресную книгу. Это значит, что либо введен неверный "
 "URI, либо сервер недоступен."
 
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "Unable to open addressbook"
-msgstr "Не удается открыть адресную книгу"
-
-#: addressbook/gui/widgets/eab-gui-util.c:162
+#: addressbook/gui/widgets/eab-gui-util.c:129
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2677,7 +2587,7 @@ msgstr ""
 "поднимите ограничения для выдачи результатов в\n"
 "настройках сервера каталога для этой адресной книги."
 
-#: addressbook/gui/widgets/eab-gui-util.c:168
+#: addressbook/gui/widgets/eab-gui-util.c:135
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -2690,55 +2600,47 @@ msgstr ""
 "поднимите ограничения времени в настройках сервера\n"
 "каталога для этой адресной книги."
 
-#: addressbook/gui/widgets/eab-gui-util.c:174
+#: addressbook/gui/widgets/eab-gui-util.c:141
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 "База данных для этой адресной книги не смогла обработать текущий запрос."
 
-#: addressbook/gui/widgets/eab-gui-util.c:177
+#: addressbook/gui/widgets/eab-gui-util.c:144
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 "База данных для этой адресной книги отказалась обрабатывать текущий запрос."
 
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:147
 msgid "This query did not complete successfully."
 msgstr "Этот запрос завершился с ошибкой."
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
-msgid "Do you want to save changes?"
-msgstr "Хотите сохранить изменения?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:208
-msgid "_Discard"
-msgstr "_Отклонить"
-
-#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:169
 msgid "Error adding list"
 msgstr "Ошибка добавления списка"
 
-#: addressbook/gui/widgets/eab-gui-util.c:229
-#: addressbook/gui/widgets/eab-gui-util.c:652
+#: addressbook/gui/widgets/eab-gui-util.c:169
+#: addressbook/gui/widgets/eab-gui-util.c:580
 msgid "Error adding contact"
 msgstr "Ошибка добавления контакта"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying list"
 msgstr "Ошибка изменения списка"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying contact"
 msgstr "Ошибка изменения контакта"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:192
 msgid "Error removing list"
 msgstr "Ошибка удаления списка"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
-#: addressbook/gui/widgets/eab-gui-util.c:610
+#: addressbook/gui/widgets/eab-gui-util.c:192
+#: addressbook/gui/widgets/eab-gui-util.c:538
 msgid "Error removing contact"
 msgstr "Ошибка удаления контакта"
 
-#: addressbook/gui/widgets/eab-gui-util.c:334
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2747,7 +2649,7 @@ msgstr ""
 "Открытие %d контактов также откроет %d новых окон.\n"
 "Вы действительно хотите отобразить все эти контакты?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:360
+#: addressbook/gui/widgets/eab-gui-util.c:300
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2756,49 +2658,44 @@ msgstr ""
 "%s уже существует\n"
 "Хотите переписать?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:364
+#: addressbook/gui/widgets/eab-gui-util.c:304
 msgid "Overwrite"
 msgstr "Перезаписать"
 
-#: addressbook/gui/widgets/eab-gui-util.c:400
-#, c-format
-msgid "Error saving %s: %s"
-msgstr "Ошибка сохранения %s: %s"
-
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:437
+#: addressbook/gui/widgets/eab-gui-util.c:365
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:571
+#: addressbook/gui/widgets/eab-gui-util.c:499
 msgid "list"
 msgstr "список"
 
-#: addressbook/gui/widgets/eab-gui-util.c:706
+#: addressbook/gui/widgets/eab-gui-util.c:634
 msgid "Move contact to"
 msgstr "Переместить контакт в"
 
-#: addressbook/gui/widgets/eab-gui-util.c:708
+#: addressbook/gui/widgets/eab-gui-util.c:636
 msgid "Copy contact to"
 msgstr "Копировать контакт в"
 
-#: addressbook/gui/widgets/eab-gui-util.c:711
+#: addressbook/gui/widgets/eab-gui-util.c:639
 msgid "Move contacts to"
 msgstr "Переместить контакты в"
 
-#: addressbook/gui/widgets/eab-gui-util.c:713
+#: addressbook/gui/widgets/eab-gui-util.c:641
 msgid "Copy contacts to"
 msgstr "Копировать контакты в"
 
-#: addressbook/gui/widgets/eab-gui-util.c:716
+#: addressbook/gui/widgets/eab-gui-util.c:644
 msgid "Select target addressbook."
 msgstr "Выберите целевую адресную книгу."
 
-#: addressbook/gui/widgets/eab-gui-util.c:939
+#: addressbook/gui/widgets/eab-gui-util.c:867
 msgid "Multiple VCards"
 msgstr "Множество VCards"
 
-#: addressbook/gui/widgets/eab-gui-util.c:942
+#: addressbook/gui/widgets/eab-gui-util.c:870
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard для %s"
@@ -2888,7 +2785,7 @@ msgstr[2] "%d контактов"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:229
+#: addressbook/gui/widgets/e-addressbook-view.c:231
 #: addressbook/gui/widgets/e-minicard-view.c:467
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
@@ -2906,142 +2803,131 @@ msgstr "Модель"
 msgid "Error modifying card"
 msgstr "Ошибка при изменении карточки"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:163
 msgid "Name begins with"
 msgstr "Имя начинается с"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:164
 msgid "Email begins with"
 msgstr "Почтовый адрес начинается с"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:57
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Категории "
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-#: calendar/gui/cal-search-bar.c:50
+#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Любое поле содержит"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+#: addressbook/gui/widgets/e-addressbook-view.c:172
 msgid "Advanced..."
 msgstr "Дополнительно..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:236
+#: addressbook/gui/widgets/e-addressbook-view.c:238
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:249
+#: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Тип"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:506
+#: addressbook/gui/widgets/e-addressbook-view.c:508
 msgid "Address Book"
 msgstr "Адресная книга"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2076
+#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:2080
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
 msgstr "Сохранить как VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 msgid "New Contact..."
 msgstr "Создать контакт..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "New Contact List..."
 msgstr "Создать список контактов..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Go to Folder..."
 msgstr "Перейти к папке..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Import..."
 msgstr "Импорт..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1066
 msgid "Search for Contacts..."
 msgstr "Найти контакты..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 msgid "Address Book Sources..."
 msgstr "Источники адресных книг..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1069
 msgid "Pilot Settings..."
 msgstr "Настройка Pilot..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Переслать контакт"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
 msgid "Send Message to Contact"
 msgstr "Отправить сообщение к контакту"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Печать"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
+#: addressbook/gui/widgets/e-addressbook-view.c:1077
 msgid "Print Envelope"
 msgstr "Напечатать конверт"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
+#: addressbook/gui/widgets/e-addressbook-view.c:1081
 msgid "Copy to Address Book..."
 msgstr "Копировать в адресную книгу..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1080
+#: addressbook/gui/widgets/e-addressbook-view.c:1082
 msgid "Move to Address Book..."
 msgstr "Переместить в адресную книгу..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Вырезать"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Копировать"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1087
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Вставить"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:1092
+#: calendar/gui/e-calendar-view.c:1280
 msgid "Current View"
 msgstr "Текущий вид"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1309
-#, c-format
-msgid ""
-"The addressbook backend for\n"
-"%s\n"
-"has crashed. You will have to restart Evolution in order to use it again"
-msgstr ""
-"Произошла ошибка в базе данных адресной книги\n"
-"%s.\n"
-"Необходимо перезапустить Evolution."
-
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1667
-#: calendar/gui/cal-search-bar.c:362
+#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Любая категория"
 
@@ -3147,7 +3033,7 @@ msgstr "Радио"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-list-view.c:234
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Должность"
@@ -3292,12 +3178,12 @@ msgstr "Evolution vCalendar importer"
 msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.c:998
+#: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr "Напечатать контакты"
 
-#: addressbook/printing/e-contact-print.c:1064
-#: addressbook/printing/e-contact-print.c:1091
+#: addressbook/printing/e-contact-print.c:1066
+#: addressbook/printing/e-contact-print.c:1093
 msgid "Print contact"
 msgstr "Напечатать контакт"
 
@@ -3548,15 +3434,21 @@ msgstr ""
 msgid "Impossible internal error."
 msgstr "Невозможная внутренняя ошибка."
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:629
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
 msgid "Can not open file"
 msgstr "Не удается открыть файл"
 
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-msgid "Can not load URI"
-msgstr "Не удается загрузить URI"
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "Не удается загрузить адресную книгу"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Не удается открыть адресную книгу"
 
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
@@ -3574,7 +3466,7 @@ msgstr "Не указано имя файла."
 msgid "Unnamed List"
 msgstr "Безымянный список"
 
-#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Ввод пароля"
@@ -3855,10 +3747,10 @@ msgid "Whether to show week numbers in date navigator"
 msgstr "Показывать ли номера недель в навигаторе по датам"
 
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:88
-#: calendar/gui/gnome-cal.c:1703
-#: camel/providers/groupwise/camel-gw-listener.c:304
-#: camel/providers/groupwise/camel-gw-listener.c:327
+#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/gnome-cal.c:1705
+#: camel/providers/groupwise/camel-gw-listener.c:311
+#: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
 msgstr "Календарь"
 
@@ -3880,7 +3772,7 @@ msgstr ""
 
 #: calendar/gui/calendar-commands.c:363
 #: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:19 filter/filter.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
 msgid "days"
 msgstr "дней"
 
@@ -4025,24 +3917,24 @@ msgstr "Как неделю"
 msgid "Month View"
 msgstr "как месяц"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "\"Коротко\" содержит"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Описание содержит"
 
-#: calendar/gui/cal-search-bar.c:54
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Комментарий содержит"
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:53
 #, fuzzy
 msgid "Location contains"
 msgstr "Описание содержит"
 
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
 msgid "Unmatched"
 msgstr "Прочее"
 
@@ -4063,23 +3955,23 @@ msgstr "Отказ в доступе при открытии календаря"
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/dialogs/alarm-options.c:466
+#: calendar/gui/dialogs/alarm-options.c:467
 msgid "Audio Alarm Options"
 msgstr "Параметры звукового сигнала"
 
-#: calendar/gui/dialogs/alarm-options.c:475
+#: calendar/gui/dialogs/alarm-options.c:476
 msgid "Message Alarm Options"
 msgstr "Параметры сигнала-сообщения"
 
-#: calendar/gui/dialogs/alarm-options.c:484
+#: calendar/gui/dialogs/alarm-options.c:485
 msgid "Email Alarm Options"
 msgstr "Параметры сигнала по почте"
 
-#: calendar/gui/dialogs/alarm-options.c:493
+#: calendar/gui/dialogs/alarm-options.c:494
 msgid "Program Alarm Options"
 msgstr "Параметры программы-сигнала"
 
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:510
 msgid "Unknown Alarm Options"
 msgstr "Параметры сигнала неизвестного типа"
 
@@ -4115,7 +4007,7 @@ msgstr "Отправить:"
 msgid "With these arguments:"
 msgstr "С аргументами:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
 msgid "dialog1"
 msgstr "dialog1"
 
@@ -4124,7 +4016,7 @@ msgid "extra times every"
 msgstr "дополнительное время каждые"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:20 filter/filter.glade.h:16
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr "часов"
 
@@ -4170,7 +4062,7 @@ msgstr "Отправить почту"
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Сводка:"
 
@@ -4200,7 +4092,6 @@ msgid "hour(s)"
 msgstr "часов"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:21
 msgid "minute(s)"
 msgstr "минут"
 
@@ -4208,26 +4099,26 @@ msgstr "минут"
 msgid "start of appointment"
 msgstr "начало встречи"
 
-#: calendar/gui/dialogs/calendar-setup.c:170
+#: calendar/gui/dialogs/calendar-setup.c:172
 msgid "You must specify a location to get the calendar from."
 msgstr "Необходимо указать адрес, откуда можно получить календарь."
 
-#: calendar/gui/dialogs/calendar-setup.c:178
+#: calendar/gui/dialogs/calendar-setup.c:180
 #, c-format
 msgid "The source location '%s' is not well-formed."
 msgstr "Адрес источника '%s' сформирован неверно."
 
-#: calendar/gui/dialogs/calendar-setup.c:193
+#: calendar/gui/dialogs/calendar-setup.c:195
 #, c-format
 msgid "The source location '%s' is not a webcal source."
 msgstr "Адрес источника '%s' не является адресом webcal."
 
-#: calendar/gui/dialogs/calendar-setup.c:265
+#: calendar/gui/dialogs/calendar-setup.c:275
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr "Источник с именем '%s' уже существует в выбранной группе"
 
-#: calendar/gui/dialogs/calendar-setup.c:278
+#: calendar/gui/dialogs/calendar-setup.c:288
 #, c-format
 msgid ""
 "The group '%s' is remote. You must specify a location to get the calendar "
@@ -4249,56 +4140,36 @@ msgstr "Группа списка задач"
 msgid "C_olor:"
 msgstr "_Цвета"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "Calendar Properties"
-msgstr "Свойства календаря"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
 msgid "Pick a color"
 msgstr "Выбрать цвет"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:8
-msgid "Remote"
-msgstr "Удаленный"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "Task List Properties"
-msgstr "Свойства списка задач"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
 #, fuzzy
 msgid "_Add Calendar"
 msgstr "Добавление нового календаря"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
 #, fuzzy
 msgid "_Add Group"
 msgstr "_Добавить группу..."
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-msgid "_Refresh Interval:"
-msgstr "_Интервал обновления:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
 #, fuzzy
 msgid "_Refresh:"
 msgstr "Обновить"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-msgid "_Source URL:"
-msgstr "URL _источника:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
 #, fuzzy
 msgid "_Type:"
 msgstr "Тип:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
 #, fuzzy
 msgid "_URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
 msgid "weeks"
 msgstr "недели"
 
@@ -4406,7 +4277,7 @@ msgid "Display"
 msgstr "Отображение"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:76
 msgid "E_nable"
 msgstr "_Включить"
 
@@ -4417,7 +4288,7 @@ msgstr "Запрос информации о занятости"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:563
+#: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Пятница"
 
@@ -4431,7 +4302,7 @@ msgstr "Минут"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:559
+#: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Понедельник"
 
@@ -4441,7 +4312,7 @@ msgstr "Вск"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:564
+#: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Суббота"
 
@@ -4455,7 +4326,7 @@ msgstr "Показывать номера недель в навигаторе �
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Воскресенье"
 
@@ -4469,7 +4340,7 @@ msgstr "Чтв"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:562
+#: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Четверг"
 
@@ -4483,7 +4354,7 @@ msgstr "Формат времени:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:560
+#: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Вторник"
 
@@ -4493,7 +4364,7 @@ msgstr "Начало недели:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:561
+#: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Среда"
 
@@ -4526,7 +4397,7 @@ msgid "_Day begins:"
 msgstr "_День начинается:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
-#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:43
@@ -4575,81 +4446,46 @@ msgstr "Срд"
 msgid "before every appointment"
 msgstr "перед каждой встречей"
 
-#: calendar/gui/dialogs/cancel-comp.c:57
-msgid ""
-"The event being deleted is a meeting, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"Удаляемое событие является собранием, хотите отправить уведомление об отмене?"
-
-#: calendar/gui/dialogs/cancel-comp.c:60
-msgid "Are you sure you want to cancel and delete this meeting?"
-msgstr "Вы действительно хотите отменить и удалить это собрание?"
-
-#: calendar/gui/dialogs/cancel-comp.c:66
-msgid ""
-"The task being deleted is assigned, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"Удаляемое событие является назначенной задачей, хотите отправить уведомление "
-"об отмене?"
-
-#: calendar/gui/dialogs/cancel-comp.c:69
-msgid "Are you sure you want to cancel and delete this task?"
-msgstr "Вы действительно хотите отменить и удалить эту задачу?"
-
-#: calendar/gui/dialogs/cancel-comp.c:75
-msgid ""
-"The journal entry being deleted is published, would you like to send a "
-"cancellation notice?"
-msgstr ""
-"Удаляемое событие является опубликованной записью в журнале,хотите отправить "
-"уведомление об отмене?"
-
-#: calendar/gui/dialogs/cancel-comp.c:78
-msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr "Вы действительно хотите отменить и удалить эту запись в журнале?"
-
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Это событие было удалено."
 
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "Эта задача была удалена."
 
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:68
 msgid "This journal entry has been deleted."
 msgstr "Эта запись в журнале была удалена."
 
-#: calendar/gui/dialogs/changed-comp.c:75
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  Вы сделали изменения. Отменить их и закрыть редактор?"
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Вы ничего не изменили. Закрыть редактор?"
 
-#: calendar/gui/dialogs/changed-comp.c:82
+#: calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "Это событие было изменено."
 
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "Эта задача была изменена."
 
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:92
 msgid "This journal entry has been changed."
 msgstr "Эта запись в журнале была изменена."
 
-#: calendar/gui/dialogs/changed-comp.c:99
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s Вы сделали изменения. Отменить их?"
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Вы ничего не изменили. Обновить редактор?"
@@ -4687,7 +4523,7 @@ msgid "No summary"
 msgstr "Нет Краткого описания"
 
 #: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
 #: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Сохранить как..."
@@ -4743,102 +4579,51 @@ msgstr "Назначение:"
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:95
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "Вы действительно хотите удалить встречу \"%s\"?"
-
-#: calendar/gui/dialogs/delete-comp.c:98
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "Вы действительно хотите удалить эту неозаглавленную встречу?"
-
-#: calendar/gui/dialogs/delete-comp.c:104
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "Вы действительно хотите удалить задачу \"%s\"?"
-
-#: calendar/gui/dialogs/delete-comp.c:107
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "Вы действительно хотите удалить эту неозаглавленную задачу?"
-
-#: calendar/gui/dialogs/delete-comp.c:113
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "Вы действительно хотите удалить запись в журнале \"%s\"?"
-
-#: calendar/gui/dialogs/delete-comp.c:116
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "Вы действительно хотите удалить эту неозаглавленную запись в журнале?"
-
-#: calendar/gui/dialogs/delete-comp.c:131
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d appointment?"
-msgid_plural "Are you sure you want to delete %d appointments?"
-msgstr[0] "Вы действительно хотите удалить %d встреч?"
-msgstr[1] "Вы действительно хотите удалить %d встреч?"
-msgstr[2] "Вы действительно хотите удалить %d встреч?"
-
-#: calendar/gui/dialogs/delete-comp.c:138
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d task?"
-msgid_plural "Are you sure you want to delete %d tasks?"
-msgstr[0] "Вы действительно хотите удалить %d задач?"
-msgstr[1] "Вы действительно хотите удалить %d задач?"
-msgstr[2] "Вы действительно хотите удалить %d задач?"
-
-#: calendar/gui/dialogs/delete-comp.c:145
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d journal entry?"
-msgid_plural "Are you sure you want to delete %d journal entries?"
-msgstr[0] "Вы действительно хотите удалить %d записей в журнале?"
-msgstr[1] "Вы действительно хотите удалить %d записей в журнале?"
-msgstr[2] "Вы действительно хотите удалить %d записей в журнале?"
-
-#: calendar/gui/dialogs/delete-error.c:52
+#: calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "Это событие не может быть удалено из-за ошибки corba"
 
-#: calendar/gui/dialogs/delete-error.c:55
+#: calendar/gui/dialogs/delete-error.c:57
 msgid "The task could not be deleted due to a corba error"
 msgstr "Эта задача не может быть удалена из-за ошибки corba"
 
-#: calendar/gui/dialogs/delete-error.c:58
+#: calendar/gui/dialogs/delete-error.c:60
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr "Эта запись в журнале не может быть удалена из-за ошибки corba"
 
-#: calendar/gui/dialogs/delete-error.c:61
+#: calendar/gui/dialogs/delete-error.c:63
 msgid "The item could not be deleted due to a corba error"
 msgstr "Этот элемент не может быть удален из-за ошибки corba"
 
-#: calendar/gui/dialogs/delete-error.c:68
+#: calendar/gui/dialogs/delete-error.c:70
 msgid "The event could not be deleted because permission was denied"
 msgstr "Это событие не может быть удалено: нет доступа"
 
-#: calendar/gui/dialogs/delete-error.c:71
+#: calendar/gui/dialogs/delete-error.c:73
 msgid "The task could not be deleted because permission was denied"
 msgstr "Эта задача не может быть удалена: недостаточно прав"
 
-#: calendar/gui/dialogs/delete-error.c:74
+#: calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr "Эта запись в журнале не может быть удалена: недостаточно прав"
 
-#: calendar/gui/dialogs/delete-error.c:77
+#: calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
 msgstr "Этот элемент не может быть удален: нет доступа"
 
-#: calendar/gui/dialogs/delete-error.c:84
+#: calendar/gui/dialogs/delete-error.c:86
 msgid "The event could not be deleted due to an error"
 msgstr "Это событие не может быть удалено из-за ошибки"
 
-#: calendar/gui/dialogs/delete-error.c:87
+#: calendar/gui/dialogs/delete-error.c:89
 msgid "The task could not be deleted due to an error"
 msgstr "Эта задача не может быть удалена из-за ошибки"
 
-#: calendar/gui/dialogs/delete-error.c:90
+#: calendar/gui/dialogs/delete-error.c:92
 msgid "The journal entry could not be deleted due to an error"
 msgstr "Эта запись в журнале не может быть удалена из-за ошибки"
 
-#: calendar/gui/dialogs/delete-error.c:93
+#: calendar/gui/dialogs/delete-error.c:95
 msgid "The item could not be deleted due to an error"
 msgstr "Этот элемент не может быть удален из-за ошибки"
 
@@ -4972,11 +4757,11 @@ msgstr "Нача_ло:"
 
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:3
+#: calendar/gui/dialogs/meeting-page.glade.h:4
 #: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
 #: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1559
-#: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:100
+#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
+#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
@@ -5002,8 +4787,8 @@ msgstr "Доверить..."
 #. FIXME: need to disable for undeletable folders
 #: calendar/gui/dialogs/meeting-page.c:655
 #: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1310 calendar/gui/e-calendar-view.c:1342
-#: mail/em-folder-tree.c:2557 mail/em-folder-view.c:919
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
+#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -5011,7 +4796,7 @@ msgid "_Delete"
 msgstr "_Удалить"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:240
+#: calendar/gui/e-meeting-list-view.c:218
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Участник"
@@ -5047,16 +4832,15 @@ msgid "Member"
 msgstr "Участник"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "Заинтересованное лицо"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
-#: mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-list-view.c:248
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Состояние"
 
@@ -5065,20 +4849,20 @@ msgstr "Состояние"
 msgid "Add A_ttendee"
 msgstr "Участник"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "Add attendees from addressbook."
+msgstr "Добавить отправителя в _адресную книгу"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Организатор:"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
+#: calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "_Change Organizer"
 msgstr "Изменить организатора"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-#: calendar/gui/e-meeting-time-sel.c:417
-msgid "_Invite Others..."
-msgstr "Пригласить других..."
-
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
 msgstr "<b>Параметры календаря</b>"
@@ -5226,7 +5010,7 @@ msgid "_No recurrence"
 msgstr "Без повторения"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:450
+#: composer/e-msg-composer-attachment-bar.c:453
 msgid "_Remove"
 msgstr "Удалить"
 
@@ -5258,55 +5042,20 @@ msgstr "неделя"
 msgid "year(s)"
 msgstr "год(лет)"
 
-#: calendar/gui/dialogs/save-comp.c:53
-msgid ""
-"This event has been changed, but has not been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Это событие было изменено, но не сохранено.\n"
-"\n"
-"Сохранить изменения?"
-
-#: calendar/gui/dialogs/save-comp.c:57
-msgid "_Discard Changes"
-msgstr "_Отклонить изменения"
-
-#: calendar/gui/dialogs/save-comp.c:62
-msgid "Save Event"
-msgstr "Сохранить событие"
-
-#: calendar/gui/dialogs/select-source-dialog.c:65
+#: calendar/gui/dialogs/select-source-dialog.c:69
 #, fuzzy
 msgid "Select destination"
 msgstr "Назначение:"
 
-#: calendar/gui/dialogs/select-source-dialog.c:86
+#: calendar/gui/dialogs/select-source-dialog.c:90
 #, fuzzy
 msgid "_Destination"
 msgstr "Папка _черновиков:"
 
-#: calendar/gui/dialogs/select-source-dialog.c:88
+#: calendar/gui/dialogs/select-source-dialog.c:92
 msgid "Task List"
 msgstr "Список задач"
 
-#: calendar/gui/dialogs/send-comp.c:57
-msgid "The meeting information has been created. Send it?"
-msgstr "Была создана информация о собрании. Отправить ее?"
-
-#: calendar/gui/dialogs/send-comp.c:60
-msgid "The meeting information has changed. Send an updated version?"
-msgstr "Информация о собрании была изменена. Отправить обновлённую версию?"
-
-#: calendar/gui/dialogs/send-comp.c:67
-msgid "The task assignment information has been created. Send it?"
-msgstr ""
-"Информация о назначении задачи была изменена. Отправить обновлённую версию?"
-
-#: calendar/gui/dialogs/send-comp.c:71
-msgid "The task information has changed. Send an updated version?"
-msgstr "Информация о задаче была изменена. Отправить обновлённую версию?"
-
 #: calendar/gui/dialogs/task-details-page.c:406
 msgid "Completed date is wrong"
 msgstr "Дата выполнения некорректна"
@@ -5326,7 +5075,7 @@ msgstr "Выполнено"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #: calendar/gui/e-cal-component-preview.c:249
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:960
 msgid "High"
 msgstr "Высокий"
 
@@ -5340,14 +5089,14 @@ msgstr "В процессе"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:253
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:958
 msgid "Low"
 msgstr "Низкий"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:251
 #: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:957
+#: mail/message-list.c:959
 msgid "Normal"
 msgstr "Нормальный"
 
@@ -5405,8 +5154,8 @@ msgstr "Кон_фиденциально"
 
 #: calendar/gui/dialogs/task-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
+#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Описание:"
 
@@ -5579,7 +5328,7 @@ msgstr "Дата выполнения:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:950
+#: calendar/gui/e-itip-control.c:943
 msgid "Status:"
 msgstr "Состояние:"
 
@@ -5664,12 +5413,12 @@ msgstr "Занят"
 msgid "Deleting selected objects"
 msgstr "Удаление выделенных объектов"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
 msgid "Updating objects"
 msgstr "Обновление объектов"
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1370
+#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
 #: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Открыть"
@@ -5679,15 +5428,15 @@ msgid "Open _Web Page"
 msgstr "Открыть _веб-страницу"
 
 #: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1291 calendar/gui/e-calendar-view.c:1376
-#: mail/em-folder-view.c:896 mail/em-popup.c:690 mail/em-popup.c:806
+#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
+#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "Со_хранить как..."
 
 #: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1292
-#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
+#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
@@ -5695,24 +5444,24 @@ msgid "_Print..."
 msgstr "_Печать..."
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Вырезать"
 
 #: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1338
-#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2550
-#: mail/message-list.c:1644 ui/evolution-addressbook.xml.h:31
+#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
+#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
+#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Копировать"
 
 #: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1273 calendar/gui/e-calendar-view.c:1299
-#: calendar/gui/e-calendar-view.c:1372 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
+#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
@@ -5781,71 +5530,71 @@ msgstr "Сводка"
 msgid "Task sort"
 msgstr "Сортировка задач"
 
-#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
 msgid "New _Appointment..."
 msgstr "Новая _встреча..."
 
-#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
+#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
 msgid "New All Day _Event"
 msgstr "Новое ежедневное событие"
 
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
+#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
 msgid "New Meeting"
 msgstr "Новое собрание"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
 msgid "New Task"
 msgstr "Новая задача"
 
-#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Выделить подшивку"
 
-#: calendar/gui/e-calendar-view.c:1280
+#: calendar/gui/e-calendar-view.c:1283
 #, fuzzy
 msgid "_Select Date..."
 msgstr "_Выбрать..."
 
-#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "Опубликовать информацию о занятости"
 
-#: calendar/gui/e-calendar-view.c:1303
+#: calendar/gui/e-calendar-view.c:1306
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Копировать в папку..."
 
-#: calendar/gui/e-calendar-view.c:1304
+#: calendar/gui/e-calendar-view.c:1307
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "Переместить в папку..."
 
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1308
 msgid "_Schedule Meeting..."
 msgstr "_Назначить собрание..."
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1309
 msgid "_Forward as iCalendar..."
 msgstr "_Переслать как iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
 msgid "Delete this _Occurrence"
 msgstr "Удалить это вхождение"
 
-#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
 msgid "Delete _All Occurrences"
 msgstr "Удалить все вхождения"
 
-#: calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1349
 msgid "Go to _Today"
 msgstr "Перейти к сег_одняшнему дню"
 
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1351
 msgid "_Go to Date..."
 msgstr "Пере_йти к дате..."
 
-#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "_Настройка..."
 
@@ -5860,9 +5609,9 @@ msgstr "Дата начала"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:967 calendar/gui/e-itip-control.c:1169
-#: calendar/gui/e-meeting-list-view.c:144
-#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
 #: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
 #: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
 #: camel/camel-tcp-stream-openssl.c:631
@@ -5888,13 +5637,13 @@ msgid "Assigned"
 msgstr "Назначено"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr "Да"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "Нет"
 
@@ -5906,7 +5655,7 @@ msgstr "С"
 msgid "S"
 msgstr "Ю"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
 msgid "E"
 msgstr "В"
 
@@ -5978,11 +5727,11 @@ msgstr "%d %b"
 msgid "%02i minute divisions"
 msgstr "Деления через %02i минут"
 
-#: calendar/gui/e-itip-control.c:592
+#: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
 msgstr "Да. (Сложное повторение)"
 
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:596
 #, fuzzy, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
@@ -5990,7 +5739,7 @@ msgstr[0] "Каждый день"
 msgstr[1] "Каждый день"
 msgstr[2] "Каждый день"
 
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:601
 #, fuzzy, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
@@ -5998,7 +5747,7 @@ msgstr[0] "Каждую неделю"
 msgstr[1] "Каждую неделю"
 msgstr[2] "Каждую неделю"
 
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:603
 #, fuzzy, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -6006,21 +5755,21 @@ msgstr[0] "Каждую неделю в "
 msgstr[1] "Каждую неделю в "
 msgstr[2] "Каждую неделю в "
 
-#: calendar/gui/e-itip-control.c:618
+#: calendar/gui/e-itip-control.c:611
 msgid " and "
 msgstr " и "
 
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:618
 #, c-format
 msgid "The %s day of "
 msgstr "%s дней "
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:631
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s "
 
-#: calendar/gui/e-itip-control.c:645
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy, c-format
 msgid "every month"
 msgid_plural "every %d months"
@@ -6028,7 +5777,7 @@ msgstr[0] "каждый месяц"
 msgstr[1] "каждый месяц"
 msgstr[2] "каждый месяц"
 
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:642
 #, fuzzy, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
@@ -6036,7 +5785,7 @@ msgstr[0] "Каждый год"
 msgstr[1] "Каждый год"
 msgstr[2] "Каждый год"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:653
 #, fuzzy, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
@@ -6044,42 +5793,42 @@ msgstr[0] " всего %d раз"
 msgstr[1] " всего %d раз"
 msgstr[2] " всего %d раз"
 
-#: calendar/gui/e-itip-control.c:669
+#: calendar/gui/e-itip-control.c:662
 msgid ", ending on "
 msgstr ", заканчивается на"
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:686
 msgid "<b>Starts:</b> "
 msgstr "<b>Начинается:</b> "
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:696
 msgid "<b>Ends:</b> "
 msgstr "<b>Заканчивается:</b>"
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:716
 msgid "<b>Completed:</b> "
 msgstr "<b>Выполнено:</b>"
 
-#: calendar/gui/e-itip-control.c:733
+#: calendar/gui/e-itip-control.c:726
 msgid "<b>Due:</b> "
 msgstr "<b>К:</b> "
 
-#: calendar/gui/e-itip-control.c:771 calendar/gui/e-itip-control.c:827
+#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
 msgid "iCalendar Information"
 msgstr "Сведения iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:788
+#: calendar/gui/e-itip-control.c:781
 msgid "iCalendar Error"
 msgstr "Ошибка iCalendar"
 
-#: calendar/gui/e-itip-control.c:859 calendar/gui/e-itip-control.c:875
-#: calendar/gui/e-itip-control.c:886 calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
 msgid "An unknown person"
 msgstr "Неизвестное лицо"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:910
+#: calendar/gui/e-itip-control.c:903
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -6087,305 +5836,309 @@ msgstr ""
 "<b> Пересмотрите следующую информацию и выберите действие из расположенного "
 "ниже меню."
 
-#: calendar/gui/e-itip-control.c:925
+#: calendar/gui/e-itip-control.c:918
 msgid "<i>None</i>"
 msgstr "<i>Нет</i>"
 
-#: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:929
+msgid "Location:"
+msgstr "Расположение:"
+
+#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Принято"
 
-#: calendar/gui/e-itip-control.c:959 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Экспериментально принятый"
 
-#: calendar/gui/e-itip-control.c:963 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Отклонено"
 
-#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.c:1050
-#: calendar/gui/e-itip-control.c:1076 calendar/gui/e-itip-control.c:1089
-#: calendar/gui/e-itip-control.c:1102 calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
 msgid "Choose an action:"
 msgstr "Выберите действие:"
 
-#: calendar/gui/e-itip-control.c:1023
+#: calendar/gui/e-itip-control.c:1016
 msgid "Update"
 msgstr "Обновить"
 
-#: calendar/gui/e-itip-control.c:1024 calendar/gui/e-itip-control.c:1055
-#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1091
-#: calendar/gui/e-itip-control.c:1104 calendar/gui/e-itip-control.c:1117
-#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
+#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Ок"
 
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1044
 msgid "Accept"
 msgstr "Принять"
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1045
 msgid "Tentatively accept"
 msgstr "Принять экспериментально"
 
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1046
 msgid "Decline"
 msgstr "Отклонить"
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1070
 msgid "Send Free/Busy Information"
 msgstr "Отправить информацию о занятости"
 
-#: calendar/gui/e-itip-control.c:1090
+#: calendar/gui/e-itip-control.c:1083
 msgid "Update respondent status"
 msgstr "Обновить состояние"
 
-#: calendar/gui/e-itip-control.c:1103
+#: calendar/gui/e-itip-control.c:1096
 msgid "Send Latest Information"
 msgstr "Отправить последнюю информацию"
 
-#: calendar/gui/e-itip-control.c:1116 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Отменить"
 
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1185
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> опубликовал последнюю информацию о собрании."
 
-#: calendar/gui/e-itip-control.c:1193
+#: calendar/gui/e-itip-control.c:1186
 msgid "Meeting Information"
 msgstr "Информация о собрании"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1191
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> запрашивает присутствие %s на собрании."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1193
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> запрашивает ваше присутствие на собрании."
 
-#: calendar/gui/e-itip-control.c:1201
+#: calendar/gui/e-itip-control.c:1194
 msgid "Meeting Proposal"
 msgstr "Предложение собрания"
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> желает добавить к существующему собранию."
 
-#: calendar/gui/e-itip-control.c:1206
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Update"
 msgstr "Обновление собрания"
 
-#: calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1203
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> желает получить последнюю информацию о собрании."
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1204
 msgid "Meeting Update Request"
 msgstr "Запрос обновления собрания"
 
-#: calendar/gui/e-itip-control.c:1218
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> ответил на приглашение на собрание."
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Reply"
 msgstr "Ответ собрания"
 
-#: calendar/gui/e-itip-control.c:1226
+#: calendar/gui/e-itip-control.c:1219
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> отменил собрание."
 
-#: calendar/gui/e-itip-control.c:1227
+#: calendar/gui/e-itip-control.c:1220
 msgid "Meeting Cancellation"
 msgstr "Отмена собрания"
 
-#: calendar/gui/e-itip-control.c:1234 calendar/gui/e-itip-control.c:1302
-#: calendar/gui/e-itip-control.c:1337
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1330
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> отправил невразумительное сообщение."
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1228
 msgid "Bad Meeting Message"
 msgstr "Неверное сообщение собрания"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1253
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> опубликовал информацию о задаче"
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1254
 msgid "Task Information"
 msgstr "Информация о задаче"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1259
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> запрашивает %s для выполнения задачи."
 
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> запрашивает, чтобы вы выполнили задачу."
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1262
 msgid "Task Proposal"
 msgstr "Предложение задачи"
 
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> желает добавить к существующей задаче."
 
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Update"
 msgstr "Обновление задачи"
 
-#: calendar/gui/e-itip-control.c:1278
+#: calendar/gui/e-itip-control.c:1271
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> желает получить последнюю информацию о задаче."
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1272
 msgid "Task Update Request"
 msgstr "Запрос обновления задачи"
 
-#: calendar/gui/e-itip-control.c:1286
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> ответил на назначение задачи."
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Reply"
 msgstr "Ответ собрания"
 
-#: calendar/gui/e-itip-control.c:1294
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> отменил задачу."
 
-#: calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1288
 msgid "Task Cancellation"
 msgstr "Отмена задачи"
 
-#: calendar/gui/e-itip-control.c:1303
+#: calendar/gui/e-itip-control.c:1296
 msgid "Bad Task Message"
 msgstr "Сообщение календаря"
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1315
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> опубликовал информацию о занятости."
 
-#: calendar/gui/e-itip-control.c:1323
+#: calendar/gui/e-itip-control.c:1316
 msgid "Free/Busy Information"
 msgstr "Информация о занятости"
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> запрашивает информацию о вашей занятости."
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1321
 msgid "Free/Busy Request"
 msgstr "Запрос информации о занятости"
 
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1325
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> ответил на запрос информации о занятости."
 
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1326
 msgid "Free/Busy Reply"
 msgstr "Ответ занятости"
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1331
 msgid "Bad Free/Busy Message"
 msgstr "Неверное сообщение о занятости"
 
-#: calendar/gui/e-itip-control.c:1413
+#: calendar/gui/e-itip-control.c:1406
 msgid "The message does not appear to be properly formed"
 msgstr "Похоже что сообщение не было правильно сформировано"
 
-#: calendar/gui/e-itip-control.c:1472
+#: calendar/gui/e-itip-control.c:1465
 msgid "The message contains only unsupported requests."
 msgstr "Это сообщение содержит только неподдерживаемые запросы"
 
-#: calendar/gui/e-itip-control.c:1503
+#: calendar/gui/e-itip-control.c:1496
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Вложение не содержит правильного сообщения календаря."
 
-#: calendar/gui/e-itip-control.c:1535
+#: calendar/gui/e-itip-control.c:1528
 msgid "The attachment has no viewable calendar items"
 msgstr "Вложение не содержит пригодных для просмотра элементов календаря."
 
-#: calendar/gui/e-itip-control.c:1769
+#: calendar/gui/e-itip-control.c:1762
 msgid "Update complete\n"
 msgstr "Обновление закончено\n"
 
-#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
+#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Статус участника не может быть обновлён, потому что элемент больше не "
 "существует"
 
-#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Объект некорректен и не может быть обновлен\n"
 
-#: calendar/gui/e-itip-control.c:1825
+#: calendar/gui/e-itip-control.c:1818
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Этот ответ пришел не от текущего участника.  Добавить его, как участника?"
 
-#: calendar/gui/e-itip-control.c:1837
+#: calendar/gui/e-itip-control.c:1830
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Статус участника не может быть обновлён из-за неверного текущего статуса!\n"
 
-#: calendar/gui/e-itip-control.c:1856
+#: calendar/gui/e-itip-control.c:1849
 msgid "There was an error on the CORBA system\n"
 msgstr "В системе CORBA произошла ошибка\n"
 
-#: calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1852
 msgid "Object could not be found\n"
 msgstr "Объект не может быть найден!\n"
 
-#: calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1855
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "У вас нет соответствующих прав для обновления календаря\n"
 
-#: calendar/gui/e-itip-control.c:1865
+#: calendar/gui/e-itip-control.c:1858
 msgid "Attendee status updated\n"
 msgstr "Статус участника обновлён!\n"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1861
 msgid "Attendee status could not be updated!\n"
 msgstr "Статус участника не может быть обновлён!\n"
 
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1892
 msgid "Removal Complete"
 msgstr "Удаление завершено"
 
-#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
 msgid "Item sent!\n"
 msgstr "Элемент отправлен!\n"
 
-#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
+#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
 msgid "The item could not be sent!\n"
 msgstr "Элемент не может быть послан!\n"
 
@@ -6426,74 +6179,74 @@ msgstr "дата-завершения"
 msgid "date-start"
 msgstr "дата-начала"
 
-#: calendar/gui/e-meeting-list-view.c:62
+#: calendar/gui/e-meeting-list-view.c:59
 msgid "Chair Persons"
 msgstr "Председатели"
 
-#: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:479
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
 msgid "Required Participants"
 msgstr "Необходимые участники"
 
-#: calendar/gui/e-meeting-list-view.c:64
+#: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Дополнительные участники"
 
-#: calendar/gui/e-meeting-list-view.c:65
+#: calendar/gui/e-meeting-list-view.c:62
 msgid "Resources"
 msgstr "Ресурсы"
 
-#: calendar/gui/e-meeting-list-view.c:140 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
 #: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr "Индивидуально"
 
-#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "Группа"
 
-#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr "Источник"
 
-#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr "Комната"
 
-#: calendar/gui/e-meeting-list-view.c:154 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr "Председатель"
 
-#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:127
 #: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
 msgid "Required Participant"
 msgstr "Требуемые участники"
 
-#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr "Дополнительные участники"
 
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr "Не участвует"
 
-#: calendar/gui/e-meeting-list-view.c:179 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:177
 #: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
 msgid "Needs Action"
 msgstr "Необходимое действие"
 
-#: calendar/gui/e-meeting-list-view.c:182 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
 #: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "Экспериментальный"
 
-#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr "Передано"
@@ -6510,20 +6263,28 @@ msgstr "Вне офиса"
 msgid "No Information"
 msgstr "Нет информации"
 
+#: calendar/gui/e-meeting-time-sel.c:417
+#, fuzzy
+msgid "Add attendees from addressbook"
+msgstr "Добавить отправителя в _адресную книгу"
+
 #: calendar/gui/e-meeting-time-sel.c:440
 msgid "_Options"
 msgstr "Параметры"
 
 #: calendar/gui/e-meeting-time-sel.c:457
-msgid "Show _Only Working Hours"
+#, fuzzy
+msgid "Show _only working hours"
 msgstr "Показывать только рабочие часы"
 
 #: calendar/gui/e-meeting-time-sel.c:467
-msgid "Show _Zoomed Out"
+#, fuzzy
+msgid "Show _zoomed out"
 msgstr "Показывать уменьшенные"
 
 #: calendar/gui/e-meeting-time-sel.c:482
-msgid "_Update Free/Busy"
+#, fuzzy
+msgid "_Update free/busy"
 msgstr "Обновить информацию о занятости"
 
 #: calendar/gui/e-meeting-time-sel.c:497
@@ -6539,19 +6300,23 @@ msgid ">_>"
 msgstr ">_>"
 
 #: calendar/gui/e-meeting-time-sel.c:547
-msgid "_All People and Resources"
+#, fuzzy
+msgid "_All people and resources"
 msgstr "Все люди и ресурсы"
 
 #: calendar/gui/e-meeting-time-sel.c:556
-msgid "All _People and One Resource"
+#, fuzzy
+msgid "All _people and one resource"
 msgstr "Все люди и один ресурс"
 
 #: calendar/gui/e-meeting-time-sel.c:565
-msgid "_Required People"
+#, fuzzy
+msgid "_Required people"
 msgstr "Требуемые люди"
 
 #: calendar/gui/e-meeting-time-sel.c:574
-msgid "Required People and _One Resource"
+#, fuzzy
+msgid "Required people and _one resource"
 msgstr "Требуемые люди и один ресурс"
 
 #: calendar/gui/e-meeting-time-sel.c:593
@@ -6589,7 +6354,7 @@ msgstr "%d.%m.%Y"
 msgid "Enter the password for %s"
 msgstr "Введите пароль для %s"
 
-#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6598,19 +6363,14 @@ msgstr ""
 "Ошибка в \"%s\":\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-
 #. FIXME Loading should be async
 #. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:686
+#: calendar/gui/e-tasks.c:801
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Открытие задач %s"
 
-#: calendar/gui/e-tasks.c:709
+#: calendar/gui/e-tasks.c:824
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6619,52 +6379,47 @@ msgstr ""
 "Ошибка открытия %s:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:730
+#: calendar/gui/e-tasks.c:845
 msgid "Loading tasks"
 msgstr "Загрузка задач"
 
-#: calendar/gui/e-tasks.c:834
+#: calendar/gui/e-tasks.c:949
 msgid "Completing tasks..."
 msgstr "Завершение выполнения задач..."
 
-#: calendar/gui/e-tasks.c:857
+#: calendar/gui/e-tasks.c:972
 msgid "Deleting selected objects..."
 msgstr "Удаление выделенных объектов..."
 
-#: calendar/gui/e-tasks.c:884
+#: calendar/gui/e-tasks.c:999
 msgid "Expunging"
 msgstr "Очистка папки"
 
-#: calendar/gui/e-tasks.c:960
+#: calendar/gui/e-tasks.c:1075
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
-#: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
+#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
+#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
 #: calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:705
 msgid "Tasks"
 msgstr "Задачи"
 
-#: calendar/gui/gnome-cal.c:1876
+#: calendar/gui/gnome-cal.c:1878
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Встреча - %s"
 
-#: calendar/gui/gnome-cal.c:1895
+#: calendar/gui/gnome-cal.c:1897
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Загрузка задач"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1920
 #, c-format
 msgid "Opening %s"
 msgstr "Открывается %s"
 
-#: calendar/gui/gnome-cal.c:2048
-#, c-format
-msgid "The calendar backend for '%s' has crashed."
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:2894
+#: calendar/gui/gnome-cal.c:2906
 #, fuzzy
 msgid "Purging"
 msgstr "Турин"
@@ -6865,7 +6620,7 @@ msgid "On The Web"
 msgstr "В Сети"
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 
@@ -6876,7 +6631,7 @@ msgid "Unable to migrate calendar `%s'"
 msgstr "Не удаётся открыть календарь '%s'."
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:869
+#: calendar/gui/migration.c:889
 #, fuzzy, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Не удается открыть задачи в '%s'."
@@ -7112,16 +6867,16 @@ msgstr "Напечатать элемент"
 msgid "Print Setup"
 msgstr "Настройка печати"
 
-#: calendar/gui/tasks-component.c:303
+#: calendar/gui/tasks-component.c:313
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr "Список задач '%s' будет удален. Вы действительно хотите продолжить?"
 
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:371
 msgid "New Task List"
 msgstr "Новый список задач"
 
-#: calendar/gui/tasks-component.c:398
+#: calendar/gui/tasks-component.c:408
 #, fuzzy, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -7129,7 +6884,7 @@ msgstr[0] "%d контактов"
 msgstr[1] "%d контактов"
 msgstr[2] "%d контактов"
 
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -7137,49 +6892,49 @@ msgstr[0] "Удалённое"
 msgstr[1] "Удалённое"
 msgstr[2] "Удалённое"
 
-#: calendar/gui/tasks-component.c:447
+#: calendar/gui/tasks-component.c:457
 #, fuzzy
 msgid "Failed upgrading tasks."
 msgstr "Загрузка задач"
 
-#: calendar/gui/tasks-component.c:526
+#: calendar/gui/tasks-component.c:749
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "Не удается открыть список задач '%s' для создания событий и собраний"
 
-#: calendar/gui/tasks-component.c:538
+#: calendar/gui/tasks-component.c:761
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:576
+#: calendar/gui/tasks-component.c:799
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:804
+#: calendar/gui/tasks-component.c:1040
 msgid "New task"
 msgstr "Новая задача"
 
-#: calendar/gui/tasks-component.c:805
+#: calendar/gui/tasks-component.c:1041
 msgid "_Task"
 msgstr "_Задача"
 
-#: calendar/gui/tasks-component.c:806
+#: calendar/gui/tasks-component.c:1042
 msgid "Create a new task"
 msgstr "Создать новую задачу"
 
-#: calendar/gui/tasks-component.c:812
+#: calendar/gui/tasks-component.c:1048
 #, fuzzy
 msgid "New tasks group"
 msgstr "Новая задача"
 
-#: calendar/gui/tasks-component.c:813
+#: calendar/gui/tasks-component.c:1049
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Группа списка задач"
 
-#: calendar/gui/tasks-component.c:814
+#: calendar/gui/tasks-component.c:1050
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Создать новую задачу"
@@ -8947,12 +8702,12 @@ msgstr "Ошибка выполнения поиска фильтра: %s: %s"
 msgid "Unsupported operation: append message: for %s"
 msgstr "Неподдерживаемая операция: добавить сообщение: для %s"
 
-#: camel/camel-folder.c:1259
+#: camel/camel-folder.c:1262
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Неподдерживаемая операция: поиск выражения: для %s"
 
-#: camel/camel-folder.c:1299
+#: camel/camel-folder.c:1302
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
@@ -8966,11 +8721,16 @@ msgstr "Перемещение сообщений"
 msgid "Copying messages"
 msgstr "Копирование сообщений"
 
-#: camel/camel-folder.c:1666
-msgid "Learning junk and/or non junk message(s)"
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Изменение статуса спама"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
 msgstr ""
 
-#: camel/camel-folder.c:1695
+#: camel/camel-folder.c:1701
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "Получение %d сообщений"
@@ -9005,17 +8765,17 @@ msgstr ""
 msgid "(match-threads) requires a match type string"
 msgstr ""
 
-#: camel/camel-folder-search.c:785
+#: camel/camel-folder-search.c:784
 #, fuzzy
 msgid "(match-threads) expects an array result"
 msgstr "(совпадает все) требует единственного логического результата"
 
-#: camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:790
 #, fuzzy
 msgid "(match-threads) requires the folder set"
 msgstr "(совпадает все) требует единственного логического результата"
 
-#: camel/camel-folder-search.c:880
+#: camel/camel-folder-search.c:879
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Запрашивается неизвестный заголовок: %s"
@@ -9050,7 +8810,8 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
 #: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:706
+#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Отменено."
@@ -9428,7 +9189,7 @@ msgstr ""
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1212
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Неверный ответ от сервера при идентификации."
 
@@ -9813,40 +9574,40 @@ msgstr "Команда не реализована"
 msgid "export keys: unimplemented"
 msgstr ""
 
-#: camel/camel-store.c:214
+#: camel/camel-store.c:213
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Не удается получить папку: недопустимая операция в этом хранилище"
 
-#: camel/camel-store.c:244
+#: camel/camel-store.c:243
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr "Не удается создать папку: %s: %s"
 
-#: camel/camel-store.c:295
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Не удается создать папку: недопустимая операция в этом хранилище"
 
-#: camel/camel-store.c:323
+#: camel/camel-store.c:325
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Не удается создать папку: %s: %s"
 
-#: camel/camel-store.c:387 camel/camel-vee-store.c:354
+#: camel/camel-store.c:389 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Не удается удалить папку: %s: недопустимая операция"
 
-#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#: camel/camel-store.c:439 camel/camel-vee-store.c:387
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Не удается переименовать папку: %s: недопустимая операция"
 
-#: camel/camel-store.c:811
+#: camel/camel-store.c:777
 msgid "Trash"
 msgstr "Корзина"
 
-#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
-#: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/mail-config.glade.h:95
+#: ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Спам"
 
@@ -10076,12 +9837,12 @@ msgstr "Нет сообщения %s в %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Не удается скопировать или переместить сообщения в виртуальную папку"
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:374
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Не удается удалить папку: %s: нет такой папки"
 
-#: camel/camel-vee-store.c:398
+#: camel/camel-vee-store.c:395
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Не удается переименовать папку: %s: нет такой папки"
@@ -10126,25 +9887,25 @@ msgstr "Адресная книга"
 msgid "Post Office Agent SOAP Port:"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:80
+#: camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "Novell GroupWise"
 msgstr "Novell GroupWise"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:82
+#: camel/providers/groupwise/camel-groupwise-provider.c:85
 #, fuzzy
 msgid "For accessing Novell Groupwise servers"
 msgstr "Для доступа к серверам Novell Groupwise"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: camel/providers/groupwise/camel-groupwise-provider.c:100
 #: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
 msgid "Password"
 msgstr "Пароль"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:99
+#: camel/providers/groupwise/camel-groupwise-provider.c:102
 #: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
@@ -10152,8 +9913,8 @@ msgstr ""
 "Подключение к серверу IMAP будет производиться с использованием "
 "незашифрованного пароля."
 
-#: camel/providers/groupwise/camel-gw-listener.c:305
-#: camel/providers/groupwise/camel-gw-listener.c:328
+#: camel/providers/groupwise/camel-gw-listener.c:312
+#: camel/providers/groupwise/camel-gw-listener.c:335
 #, fuzzy
 msgid "Checklist"
 msgstr "список"
@@ -10298,13 +10059,13 @@ msgstr ""
 "незашифрованного пароля."
 
 #: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:429
+#: camel/providers/imap/camel-imap-store.c:428
 #, c-format
 msgid "IMAP server %s"
 msgstr "Сервер IMAP %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:431
+#: camel/providers/imap/camel-imap-store.c:430
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "Сервис IMAP для %s на %s"
@@ -10314,7 +10075,7 @@ msgstr "Сервис IMAP для %s на %s"
 #: camel/providers/imap/camel-imap-store.c:551
 #: camel/providers/imap/camel-imap-store.c:571
 #: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
+#: camel/providers/nntp/camel-nntp-store.c:209
 #: camel/providers/pop3/camel-pop3-store.c:175
 #: camel/providers/smtp/camel-smtp-transport.c:269
 #: camel/providers/smtp/camel-smtp-transport.c:285
@@ -10331,10 +10092,10 @@ msgstr "SSL недоступен"
 
 #: camel/providers/imap4/camel-imap4-store.c:222
 #: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:815
+#: camel/providers/imap/camel-imap-store.c:845
 #: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:137
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
 #: camel/providers/pop3/camel-pop3-store.c:192
 msgid "Connection cancelled"
 msgstr "Соединение отменено"
@@ -10347,8 +10108,8 @@ msgid ""
 msgstr "Не удается подключиться к серверу IMAP %s в защищенном режиме:%s"
 
 #: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:649
-#: camel/providers/imap/camel-imap-store.c:680
+#: camel/providers/imap/camel-imap-store.c:679
+#: camel/providers/imap/camel-imap-store.c:710
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Не удается подключиться к серверу IMAP %s в защищенном режиме:%s"
@@ -10357,7 +10118,7 @@ msgstr "Не удается подключиться к серверу IMAP %s �
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1109
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
 msgid "Unknown error"
 msgstr "Неизвестная ошибка"
 
@@ -10385,8 +10146,8 @@ msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr "Не удается получить папку: %s: %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1857
-#: camel/providers/imap/camel-imap-store.c:2235
+#: camel/providers/imap/camel-imap-store.c:1885
+#: camel/providers/imap/camel-imap-store.c:2263
 #, fuzzy, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -10465,12 +10226,12 @@ msgstr "Сервер неожиданно отключился: %s"
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3168
+#: camel/providers/imap/camel-imap-store.c:3194
 msgid "Operation cancelled"
 msgstr "Операция отменена"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3171
+#: camel/providers/imap/camel-imap-store.c:3197
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Сервер неожиданно отключился: %s"
@@ -10534,13 +10295,6 @@ msgid "Unable to retrieve message: %s"
 msgstr "Не удается получить сообщение: %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:219
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -10550,15 +10304,15 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-mbox-folder.c:418
+#: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
 msgstr "Нет такого сообщения"
 
 #: camel/providers/imap/camel-imap-folder.c:2019
-#: camel/providers/imap/camel-imap-folder.c:2621
-#: camel/providers/nntp/camel-nntp-folder.c:238
+#: camel/providers/imap/camel-imap-folder.c:2622
+#: camel/providers/nntp/camel-nntp-folder.c:220
 msgid "This message is not currently available"
 msgstr "Это сообщение в настоящий момент недоступно"
 
@@ -10567,7 +10321,23 @@ msgstr "Это сообщение в настоящий момент недос�
 msgid "Fetching summary information for new messages"
 msgstr "Получение краткой информации по новым сообщениям "
 
-#: camel/providers/imap/camel-imap-folder.c:2659
+#: camel/providers/imap/camel-imap-folder.c:2463
+#, c-format
+msgid "Incomplete server response: no information provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2471
+#, c-format
+msgid "Incomplete server response: no UID provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2484
+#, c-format
+msgid ""
+"Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2660
 msgid "Could not find message body in FETCH response."
 msgstr "Не удается найти тело сообщения в ответе на команду FETCH."
 
@@ -10629,43 +10399,43 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Для чтения и хранения почты на серверах IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/imap/camel-imap-store.c:680
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "Расширение SSL/TLS не поддерживается"
 
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:711
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "Сбой согласований SSL"
 
-#: camel/providers/imap/camel-imap-store.c:818
+#: camel/providers/imap/camel-imap-store.c:848
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Не удается подключиться командой \"%s\": %s"
 
-#: camel/providers/imap/camel-imap-store.c:1242
+#: camel/providers/imap/camel-imap-store.c:1272
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "Сервер IMAP %s не поддерживает затребованный тип аутентификации %s"
 
-#: camel/providers/imap/camel-imap-store.c:1252
+#: camel/providers/imap/camel-imap-store.c:1282
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Аутентификация %s не поддерживается"
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1305
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sВведите пароль IMAP для %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1289
+#: camel/providers/imap/camel-imap-store.c:1319
 msgid "You didn't enter a password."
 msgstr "Вы не ввели пароль."
 
-#: camel/providers/imap/camel-imap-store.c:1318
+#: camel/providers/imap/camel-imap-store.c:1348
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10676,18 +10446,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1839
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:1867
+#: camel/providers/imap/camel-imap-store.c:2057
 #, c-format
 msgid "No such folder %s"
 msgstr "Нет такой папки %s"
 
-#: camel/providers/imap/camel-imap-store.c:1915
-#: camel/providers/imap/camel-imap-store.c:2296
+#: camel/providers/imap/camel-imap-store.c:1943
+#: camel/providers/imap/camel-imap-store.c:2324
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Эта папка не может содержать подпапки"
 
-#: camel/providers/imap/camel-imap-store.c:1970
+#: camel/providers/imap/camel-imap-store.c:1998
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10695,7 +10465,7 @@ msgstr "Эта папка не может содержать подпапки"
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Не удается создать папку: %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:2274
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Неизвестная родительская папка: %s"
@@ -10727,20 +10497,20 @@ msgid "Index message body data"
 msgstr "Индексировать данные тела сообщения"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:388
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:393
-#: camel/providers/local/camel-local-folder.c:396
+#: camel/providers/local/camel-local-folder.c:392
+#: camel/providers/local/camel-local-folder.c:395
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "почтовый ящик: %s: (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:400
+#: camel/providers/local/camel-local-folder.c:399
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -10801,7 +10571,7 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:142
 #: camel/providers/local/camel-local-store.c:253
-#: camel/providers/local/camel-mbox-store.c:356
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10874,8 +10644,25 @@ msgstr "Добавление сообщения к папке почтового
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Не удается добавить сообщение к папке почтового каталога: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:226
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mbox-folder.c:417
+#: camel/providers/local/camel-mbox-folder.c:436
+#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:475
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-mh-folder.c:221
+#, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+"Не удается получить сообщение: %s из папки %s\n"
+"  %s"
+
+#: camel/providers/local/camel-maildir-folder.c:236
 msgid "Invalid message contents"
 msgstr "Неверное содержание сообщения"
 
@@ -10916,9 +10703,9 @@ msgstr "Не удается удалить папку \"%s\": %s"
 msgid "not a maildir directory"
 msgstr "не является почтовым каталогом"
 
-#: camel/providers/local/camel-maildir-store.c:341
-#: camel/providers/local/camel-spool-store.c:286
-#: camel/providers/local/camel-spool-store.c:316
+#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-spool-store.c:284
+#: camel/providers/local/camel-spool-store.c:314
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Не удается просканировать папку \"%s\": %s"
@@ -10965,27 +10752,18 @@ msgstr "Добавление почты отменено"
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Не удается добавить сообщение к файлу mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:435
-#: camel/providers/local/camel-mbox-folder.c:466
-#: camel/providers/local/camel-mbox-folder.c:474
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"Не удается получить сообщение: %s из папки %s\n"
-"  %s"
-
-#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:468
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Видимо, папка невостановимо испорчена."
 
-#: camel/providers/local/camel-mbox-folder.c:475
-msgid "Message construction failed: Corrupt mailbox?"
+#: camel/providers/local/camel-mbox-folder.c:476
+#: camel/providers/local/camel-mh-folder.c:222
+#, fuzzy
+msgid "Message construction failed."
 msgstr "Сбой при создании сообщения: почтовый ящик поврежден?"
 
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:362
+#: camel/providers/local/camel-mbox-store.c:361
 msgid "Cannot create a folder by this name."
 msgstr "Не удается создать папку с таким именем."
 
@@ -11015,30 +10793,30 @@ msgstr "\"%s\" не является обычным файлом."
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Папка \"%s\" не пуста. Не удалена."
 
-#: camel/providers/local/camel-mbox-store.c:375
+#: camel/providers/local/camel-mbox-store.c:374
 #, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Не удается создать каталог '%s': %s."
 
-#: camel/providers/local/camel-mbox-store.c:389
+#: camel/providers/local/camel-mbox-store.c:388
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Не удается создать папку: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:391
+#: camel/providers/local/camel-mbox-store.c:390
 msgid "Folder already exists"
 msgstr "Папка уже существует"
 
-#: camel/providers/local/camel-mbox-store.c:473
+#: camel/providers/local/camel-mbox-store.c:472
 msgid "The new folder name is illegal."
 msgstr "Имя новой папки недопустимо."
 
-#: camel/providers/local/camel-mbox-store.c:486
+#: camel/providers/local/camel-mbox-store.c:485
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Не удается переименовать \"%s\": %s"
 
-#: camel/providers/local/camel-mbox-store.c:561
+#: camel/providers/local/camel-mbox-store.c:560
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Не удается переименовать %s в %s: %s"
@@ -11231,7 +11009,7 @@ msgstr ""
 "Папка может быть испорчена, копия сохранена в \"%s\""
 
 #: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:997
+#: camel/providers/nntp/camel-nntp-store.c:1126
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Введите пароль NNTP для %s@%s"
@@ -11248,18 +11026,10 @@ msgstr "Сбой передачи имени пользователя на се�
 msgid "Server rejected username/password"
 msgstr "Сервер отверг имя пользователя/пароль"
 
-#: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:263
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr "Отменено пользователем"
-
-#: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:259
-#: camel/providers/nntp/camel-nntp-folder.c:265
+#: camel/providers/nntp/camel-nntp-folder.c:147
+#: camel/providers/nntp/camel-nntp-folder.c:149
+#: camel/providers/nntp/camel-nntp-folder.c:158
+#: camel/providers/nntp/camel-nntp-folder.c:234
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11268,64 +11038,51 @@ msgstr "Отменено пользователем"
 msgid "Cannot get message %s: %s"
 msgstr "Не удается получить сообщение %s: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:188
-#: camel/providers/nntp/camel-nntp-folder.c:228
+#: camel/providers/nntp/camel-nntp-folder.c:156
+#: camel/providers/nntp/camel-nntp-folder.c:232
+#: camel/providers/nntp/camel-nntp-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+msgid "User cancelled"
+msgstr "Отменено пользователем"
+
+#: camel/providers/nntp/camel-nntp-folder.c:176
+#: camel/providers/nntp/camel-nntp-folder.c:208
 #, c-format
 msgid "Internal error: uid in invalid format: %s"
 msgstr "Внутренняя ошибка: uid в неверном формате: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:201
-#, c-format
-msgid "Could not get article %s from NNTP server"
-msgstr "Не удается получить статью %s с сервера NNTP"
-
-#: camel/providers/nntp/camel-nntp-folder.c:362
-msgid "Posting not allowed by news server"
-msgstr ""
-
+#: camel/providers/nntp/camel-nntp-folder.c:328
+#: camel/providers/nntp/camel-nntp-folder.c:331
 #: camel/providers/nntp/camel-nntp-folder.c:373
-#, c-format
-msgid "Failed to send newsgroups header: %s: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:413
-#: camel/providers/nntp/camel-nntp-folder.c:426
-#, c-format
-msgid "Error posting to newsgroup: %s: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:438
-msgid "Error reading response to posted message: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:441
+#: camel/providers/nntp/camel-nntp-folder.c:375
 #, fuzzy, c-format
-msgid "Error posting message: %s: message not posted"
-msgstr ""
-"Ошибка при автосохранении сообщения: %s\n"
-" %s"
+msgid "Posting failed: %s"
+msgstr "Сбой операции: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:457
+#: camel/providers/nntp/camel-nntp-folder.c:393
 msgid "You cannot post NNTP messages while working offline!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:468
+#: camel/providers/nntp/camel-nntp-folder.c:404
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Вы не можете копировать сообщения из папки NNTP!"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:44
 msgid "Could not get group list from server."
 msgstr "Не удается получить список групп с сервера."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#: camel/providers/nntp/camel-nntp-grouplist.c:97
+#: camel/providers/nntp/camel-nntp-grouplist.c:106
 #, fuzzy, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr ""
 "Не удается создать файл вывода: %s\n"
 " %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#: camel/providers/nntp/camel-nntp-grouplist.c:157
 #, fuzzy, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr ""
@@ -11358,26 +11115,29 @@ msgstr ""
 "Подключение к серверу NNTP будет производиться с использованием "
 "незашифрованного пароля."
 
-#: camel/providers/nntp/camel-nntp-store.c:158
+#: camel/providers/nntp/camel-nntp-store.c:118
+#: camel/providers/nntp/camel-nntp-store.c:1233
+#: camel/providers/nntp/camel-nntp-store.c:1331
+#, c-format
+msgid "NNTP Command failed: %s"
+msgstr "Сбой команды NNTP: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:227
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Не удается считать приветствие из %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:170
+#: camel/providers/nntp/camel-nntp-store.c:239
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "Сервер NNTP %s вернул код ошибки %d: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:326
+#: camel/providers/nntp/camel-nntp-store.c:403
 #, c-format
 msgid "USENET News via %s"
 msgstr "Новости USENET через %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:640
-msgid "Stream error"
-msgstr "Ошибка потока"
-
-#: camel/providers/nntp/camel-nntp-store.c:643
+#: camel/providers/nntp/camel-nntp-store.c:777
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -11388,75 +11148,75 @@ msgstr ""
 "\n"
 " %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:735
+#: camel/providers/nntp/camel-nntp-store.c:872
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
 "No such newsgroup. The selected item is a probably a parent folder."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:767
+#: camel/providers/nntp/camel-nntp-store.c:904
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
 "newsgroup does not exist!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:792
+#: camel/providers/nntp/camel-nntp-store.c:929
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:800
+#: camel/providers/nntp/camel-nntp-store.c:937
 #, fuzzy
 msgid "You cannot rename a folder in a News store."
 msgstr "Не удается переименовать папку %s в %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:808
+#: camel/providers/nntp/camel-nntp-store.c:945
 #, fuzzy
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "Не удается переместить папку в собственную подпапку."
 
-#: camel/providers/nntp/camel-nntp-summary.c:253
-#, c-format
-msgid "Connection error: %s"
-msgstr "Ошибка соединения: %s"
-
-#: camel/providers/nntp/camel-nntp-summary.c:262
-#, c-format
-msgid "No such folder: %s"
-msgstr "Нет такой папки: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1118
+#, fuzzy
+msgid "Authentication requested but not username provided"
+msgstr "Требуется аутентификация"
 
-#: camel/providers/nntp/camel-nntp-summary.c:268
-#, c-format
-msgid "Could not get group: %s"
-msgstr "Не удается получить группу: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1146
+#, fuzzy, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr "Сбой идентификации на сервере POP %s: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:333
+#: camel/providers/nntp/camel-nntp-store.c:1262
 #, fuzzy
-msgid "Could not get messages: unspecified error"
-msgstr "Не удается получить сообщения: неуказанная ошибка"
+msgid "Not connected."
+msgstr "Нет контактов"
 
-#: camel/providers/nntp/camel-nntp-summary.c:378
+#: camel/providers/nntp/camel-nntp-store.c:1311
 #, c-format
-msgid "NNTP Command failed: %s"
-msgstr "Сбой команды NNTP: %s"
+msgid "No such folder: %s"
+msgstr "Нет такой папки: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:438
-#: camel/providers/nntp/camel-nntp-summary.c:543
+#: camel/providers/nntp/camel-nntp-summary.c:218
+#: camel/providers/nntp/camel-nntp-summary.c:314
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Поиск новых сообщений"
 
-#: camel/providers/nntp/camel-nntp-summary.c:558
-#, c-format
-msgid "Unknown server response: %s"
-msgstr "Неизвестный ответ сервера: %s"
+#: camel/providers/nntp/camel-nntp-summary.c:225
+#, fuzzy, c-format
+msgid "Unexpected server response from xover: %s"
+msgstr "Неожиданный ответ от сервера IMAP: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:605
+#: camel/providers/nntp/camel-nntp-summary.c:328
+#, fuzzy, c-format
+msgid "Unexpected server response from head: %s"
+msgstr "Неожиданный ответ от GnuPG: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:368
 msgid "Use cancel"
 msgstr "Использование отменено"
 
-#: camel/providers/nntp/camel-nntp-summary.c:607
+#: camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Сбой операции: %s"
@@ -11504,7 +11264,7 @@ msgstr "Удалять через %s дней"
 msgid "Disable support for all POP3 extensions"
 msgstr "Запретить поддержку всех расширений POP3"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107
 msgid "POP"
 msgstr "POP"
 
@@ -11594,7 +11354,7 @@ msgid "No such folder `%s'."
 msgstr "Нет такой папки \"%s\""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:132
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -11646,7 +11406,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Доставка почты через программу sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:119
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11945,19 +11705,19 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
+#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:408
 msgid "attachment"
 msgstr "вложение"
 
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:454
 msgid "Remove selected items from the attachment list"
 msgstr "Удалить выбранные элементы из списка вложений"
 
-#: composer/e-msg-composer-attachment-bar.c:491
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Add attachment..."
 msgstr "Добавить вложение..."
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:495
 msgid "Attach a file to the message"
 msgstr "Вложить файл в сообщение"
 
@@ -12020,7 +11780,7 @@ msgstr "Множество сообщений"
 msgid "Open file"
 msgstr "Открыть файл"
 
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
 msgid "Autogenerated"
 msgstr "Создана автоматически"
 
@@ -12169,17 +11929,17 @@ msgstr "Вложить файл(ы)"
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
+msgid "You cannot attach the file `{0}' to this message."
 msgstr "Вложить файл в сообщение"
 
 #. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4
-msgid "${1}"
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
 msgstr ""
 
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
 
 #. mail-composer:attach-directory primary
@@ -12274,7 +12034,7 @@ msgstr "Не удается создать канал: %s"
 
 #. mail-composer:no-build-message secondary
 #: composer/mail-composer-errors.xml.h:34
-msgid "Because \"${0}\", you may need to select different mail options."
+msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
@@ -12284,8 +12044,10 @@ msgid "Could not read signature file \"{0}\"."
 msgstr "Не удается сохранить файл подписи: %s"
 
 #. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38
-msgid "Because \"${1}\"."
+#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted primary
@@ -12717,11 +12479,11 @@ msgid "<b>Then</b>"
 msgstr "<b>К:</b> "
 
 #: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1335
+#: mail/mail-account-gui.c:1347
 msgid "Select Folder"
 msgstr "Выбрать папку"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
 msgid "    "
 msgstr "    "
 
@@ -12779,7 +12541,7 @@ msgstr "назад"
 msgid "months"
 msgstr "месяцы"
 
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
 msgid "seconds"
 msgstr "секунд"
 
@@ -12811,20 +12573,20 @@ msgstr "со всеми локальными папками"
 msgid "years"
 msgstr "годы"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:916
-#: mail/mail-config.c:76 mail/mail-config.glade.h:90
+#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
+#: mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Важное"
 
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:919 mail/mail-config.c:79
-#: mail/mail-config.glade.h:145
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: mail/mail-config.glade.h:148
 msgid "To Do"
 msgstr "Выполнить"
 
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:920 mail/mail-config.c:80
-#: mail/mail-config.glade.h:94
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: mail/mail-config.glade.h:97
 msgid "Later"
 msgstr "Позже"
 
@@ -12882,254 +12644,6 @@ msgstr "входящие"
 msgid "outgoing"
 msgstr "исходящие"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Adjust Score"
-msgstr "Скорректировать вес"
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Color"
-msgstr "Назначить цвет"
-
-#: filter/libfilter-i18n.h:4
-msgid "Assign Score"
-msgstr "Назначить вес"
-
-#: filter/libfilter-i18n.h:5
-msgid "Attachments"
-msgstr "Вложения"
-
-#: filter/libfilter-i18n.h:6
-msgid "Beep"
-msgstr "Звуковой сигнал"
-
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "содержит"
-
-#: filter/libfilter-i18n.h:8
-msgid "Copy to Folder"
-msgstr "Копировать в папку"
-
-#: filter/libfilter-i18n.h:9
-msgid "Date received"
-msgstr "Дата получения"
-
-#: filter/libfilter-i18n.h:10
-msgid "Date sent"
-msgstr "Дата отправки"
-
-#: filter/libfilter-i18n.h:12
-msgid "Deleted"
-msgstr "Удалённое"
-
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "не содержит"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "не заканчивается на"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "не существует."
-
-#: filter/libfilter-i18n.h:16
-msgid "does not return"
-msgstr "не возвращает"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "звучит не как"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "не начинается с"
-
-#: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
-msgstr "Не существует"
-
-#: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr "Черновик"
-
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "заканчивается на"
-
-#: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr "Существует"
-
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "cуществуют"
-
-#: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr "Выражение"
-
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr "К исполнению"
-
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "является"
-
-#: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr "после"
-
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr "до"
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr "отмечено"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "больше чем"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "меньше чем"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "не является"
-
-#: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr "не отмечено"
-
-#: filter/libfilter-i18n.h:36
-msgid "Junk Test"
-msgstr "Проверка на спам"
-
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
-#: widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Надпись"
-
-#: filter/libfilter-i18n.h:38
-msgid "Mailing list"
-msgstr "Список рассылки"
-
-#: filter/libfilter-i18n.h:39
-msgid "Message Body"
-msgstr "Тело сообщения"
-
-#: filter/libfilter-i18n.h:40
-msgid "Message Header"
-msgstr "Заголовок сообщения"
-
-#: filter/libfilter-i18n.h:41
-msgid "Message is Junk"
-msgstr "Это сообщение - спам"
-
-#: filter/libfilter-i18n.h:42
-msgid "Message is not Junk"
-msgstr "Это сообщение - не спам"
-
-#: filter/libfilter-i18n.h:43
-msgid "Move to Folder"
-msgstr "Переместить в папку"
-
-#: filter/libfilter-i18n.h:44
-#, fuzzy
-msgid "Pipe to Program"
-msgstr "Выйти из программы"
-
-#: filter/libfilter-i18n.h:45
-msgid "Play Sound"
-msgstr "Воспроизвести звук"
-
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Прочитанное"
-
-#: filter/libfilter-i18n.h:47
-msgid "Recipients"
-msgstr "Получатели"
-
-#: filter/libfilter-i18n.h:48
-msgid "Regex Match"
-msgstr "Совпадение рег.выражения"
-
-#: filter/libfilter-i18n.h:49
-msgid "Replied to"
-msgstr "В ответ на"
-
-#: filter/libfilter-i18n.h:50
-msgid "returns"
-msgstr "возвращает"
-
-#: filter/libfilter-i18n.h:51
-msgid "returns greater than"
-msgstr "возвращает больше чем"
-
-#: filter/libfilter-i18n.h:52
-msgid "returns less than"
-msgstr "возвращает меньше чем"
-
-#: filter/libfilter-i18n.h:53
-#, fuzzy
-msgid "Run Program"
-msgstr "Запустить программу:"
-
-#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Вес"
-
-#: filter/libfilter-i18n.h:55
-msgid "Sender"
-msgstr "Отправитель"
-
-#: filter/libfilter-i18n.h:56
-msgid "Set Status"
-msgstr "Установить состояние"
-
-#: filter/libfilter-i18n.h:57
-msgid "Size (kB)"
-msgstr "Размер (кб)"
-
-#: filter/libfilter-i18n.h:58
-msgid "sounds like"
-msgstr "звучит как"
-
-#: filter/libfilter-i18n.h:59
-msgid "Source Account"
-msgstr "Исходная учетная запись"
-
-#: filter/libfilter-i18n.h:60
-msgid "Specific header"
-msgstr "Специфичный заголовок"
-
-#: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "начинается с"
-
-#: filter/libfilter-i18n.h:63
-msgid "Stop Processing"
-msgstr "Остановить обработку"
-
-#: filter/libfilter-i18n.h:64 mail/em-format.c:755 mail/em-format-html.c:1519
-#: mail/em-format-quote.c:302 mail/em-mailer-prefs.c:87
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
-#: smime/lib/e-cert.c:1079
-msgid "Subject"
-msgstr "Тема"
-
-#: filter/libfilter-i18n.h:65
-msgid "Unset Status"
-msgstr "Снять состояние"
-
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Добавить правило"
@@ -13147,6 +12661,11 @@ msgstr "Имя правила"
 msgid "_Score Rules"
 msgstr "Правила назначения весов"
 
+#: filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Вес"
+
 #: filter/searchtypes.xml.h:1
 msgid "Body contains"
 msgstr "Тело содержит"
@@ -13227,13 +12746,13 @@ msgstr "Подпись(и)"
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Пересланное сообщение --------"
 
-#: mail/em-composer-utils.c:1499
+#: mail/em-composer-utils.c:1495
 msgid "an unknown sender"
 msgstr "неизвестный отправитель"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1509
+#: mail/em-composer-utils.c:1505
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "В сообщении от %d.%m.%Y %H:%M %%s пишет:"
 
@@ -13272,8 +12791,8 @@ msgstr "<щёлкните здесь, чтобы выбрать папку>"
 msgid "Create New Folder"
 msgstr "Создание новой папки"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
-#: mail/mail-component.c:701
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
+#: mail/mail-component.c:704
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Укажите, где создать папку:"
@@ -13288,105 +12807,106 @@ msgstr "Создать новую папку"
 msgid "Folder _name:"
 msgstr "_Имя папки:"
 
-#: mail/em-folder-tree.c:839
+#: mail/em-folder-tree.c:833
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Удаление папки \"%s\""
 
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree.c:835
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Открытие папки \"%s\""
 
-#: mail/em-folder-tree.c:848 mail/message-list.c:1555
+#: mail/em-folder-tree.c:842 mail/message-list.c:1561
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Перемещение сообщений в %s"
 
-#: mail/em-folder-tree.c:850 mail/message-list.c:1557
+#: mail/em-folder-tree.c:844 mail/message-list.c:1563
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Копирование сообщений в %s"
 
-#: mail/em-folder-tree.c:866
+#: mail/em-folder-tree.c:860
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Не удается скопировать или переместить сообщения в виртуальную папку"
 
-#: mail/em-folder-tree.c:956 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Копировать в папку"
 
-#: mail/em-folder-tree.c:957 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "Переместить в папку"
 
-#: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2069
-#: mail/em-folder-tree.c:2551 mail/em-folder-view.c:798
-#: mail/message-list.c:1645
+#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
+#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
+#: mail/message-list.c:1651
 msgid "_Move"
 msgstr "Пере_местить"
 
-#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#: mail/em-folder-tree.c:955 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "Отменить задачу"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
 #: mail/em-folder-view.c:798 mail/em-folder-view.c:812
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Выбрать папку"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
 #, fuzzy
 msgid "C_opy"
 msgstr "Копировать"
 
-#: mail/em-folder-tree.c:2096
+#: mail/em-folder-tree.c:2088
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Сохранение папки \"%s\""
 
-#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
+#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
 #, fuzzy
 msgid "Create folder"
 msgstr "Создать новую папку"
 
-#: mail/em-folder-tree.c:2474
+#: mail/em-folder-tree.c:2463
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Переименовать папку \"%s\" в:"
 
-#: mail/em-folder-tree.c:2476
+#: mail/em-folder-tree.c:2465
 msgid "Rename Folder"
 msgstr "Переименование папки"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Вид"
 
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2537
 msgid "Open in _New Window"
 msgstr "Открыть в _новом окне"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2555
+#: mail/em-folder-tree.c:2546
 msgid "_New Folder..."
 msgstr "_Создать папку..."
 
-#: mail/em-folder-tree.c:2558
+#: mail/em-folder-tree.c:2549
 msgid "_Rename"
 msgstr "Пе_реименовать"
 
-#: mail/em-folder-tree.c:2561 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Свойства..."
 
 #: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:889
+#: mail/mail-vfolder.c:888
 msgid "VFolders"
 msgstr "VFolders"
 
@@ -13400,19 +12920,19 @@ msgstr ""
 msgid "Inbox"
 msgstr "Входящие"
 
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
 msgid "Loading..."
 msgstr "Загрузка..."
 
 #: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
 #: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
 #: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:551
+#: mail/mail-component.c:554
 msgid "Mail"
 msgstr "Почта"
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Править как новое сообщение..."
@@ -13425,17 +12945,17 @@ msgstr "_Печать"
 msgid "_Reply to Sender"
 msgstr "О_тветить отправителю"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:810
+#: mail/em-folder-view.c:901 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Ответить в с_писок"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:811
+#: mail/em-folder-view.c:902 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Ответить _всем"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: mail/em-folder-view.c:903 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "Пе_реслать"
@@ -13488,6 +13008,10 @@ msgstr "Переместить в папку..."
 msgid "_Copy to Folder..."
 msgstr "_Копировать в папку..."
 
+#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Надпись"
+
 #: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Добавить отправителя в _адресную книгу"
@@ -13538,12 +13062,12 @@ msgid "Filter on _Mailing List"
 msgstr "Фильтр по списку рассылки"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
-#: mail/mail-config.glade.h:66
+#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "По умолчанию"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1796
 msgid "Print Message"
 msgstr "Напечатать сообщение"
 
@@ -13582,12 +13106,18 @@ msgstr "Копия"
 msgid "Bcc"
 msgstr "Скр.копия"
 
+#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
+#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Тема"
+
 #: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
 #: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Дата"
 
-#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
+#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
 msgid "Newsgroups"
 msgstr ""
 
@@ -13779,7 +13309,7 @@ msgid ""
 "practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:757
+#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
 msgid "_View Certificate"
 msgstr "_Просмотреть сертификат"
 
@@ -13837,7 +13367,7 @@ msgstr "Каждую неделю"
 msgid "Once per month"
 msgstr "каждый месяц"
 
-#: mail/em-migrate.c:1072
+#: mail/em-migrate.c:1168
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13845,89 +13375,89 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1506
+#: mail/em-migrate.c:1602
 #, fuzzy, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Не удается создать папку: %s: %s"
 
-#: mail/em-migrate.c:1532
+#: mail/em-migrate.c:1628
 #, fuzzy, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr ""
 "Не удается скопировать дескриптор файла: %s\n"
 "%s"
 
-#: mail/em-migrate.c:1715
+#: mail/em-migrate.c:1811
 #, fuzzy, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr ""
 "Не удается создать файл вывода: %s\n"
 " %s"
 
-#: mail/em-migrate.c:1919
+#: mail/em-migrate.c:2015
 #, fuzzy, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Сбой идентификации на сервере POP %s: %s"
 
-#: mail/em-migrate.c:1933
+#: mail/em-migrate.c:2029
 #, fuzzy, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Сбой при создании канала к \"%s\": %s"
 
-#: mail/em-migrate.c:1962
+#: mail/em-migrate.c:2058
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#: mail/em-migrate.c:2413 mail/em-migrate.c:2425
 #, fuzzy, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Сбой при создании канала к \"%s\": %s"
 
-#: mail/em-migrate.c:2480
+#: mail/em-migrate.c:2576
 #, fuzzy, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr ""
 "Не удается создать файл вывода: %s\n"
 " %s"
 
-#: mail/em-migrate.c:2498
+#: mail/em-migrate.c:2594
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 msgstr ""
 
-#: mail/em-popup.c:699
+#: mail/em-popup.c:700
 msgid "Save As..."
 msgstr "Сохранить как..."
 
-#: mail/em-popup.c:717
+#: mail/em-popup.c:718
 #, fuzzy, c-format
 msgid "untitled_image.%s"
 msgstr "Неозаглавленное сообщение"
 
-#: mail/em-popup.c:807
+#: mail/em-popup.c:808
 msgid "Set as _Background"
 msgstr "Установить как _фон"
 
-#: mail/em-popup.c:809
+#: mail/em-popup.c:810
 msgid "_Reply to sender"
 msgstr "Ответить отп_равителю"
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:859
 msgid "_Open Link in Browser"
 msgstr "_Открыть ссылку в браузере"
 
-#: mail/em-popup.c:859
+#: mail/em-popup.c:860
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Отправить сообщение в список..."
 
-#: mail/em-popup.c:860
+#: mail/em-popup.c:861
 msgid "_Add to Addressbook"
 msgstr "_Добавить в адресную книгу"
 
-#: mail/em-popup.c:966
+#: mail/em-popup.c:967
 #, c-format
 msgid "Open in %s..."
 msgstr "Открыть в %s..."
@@ -14501,7 +14031,7 @@ msgstr "Evolution Mail preferences control"
 msgid "Mail Accounts"
 msgstr "Учётные записи"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
 msgid "Mail Preferences"
 msgstr "Настройка почты"
 
@@ -14515,15 +14045,15 @@ msgid "Evolution is importing your old Elm mail"
 msgstr "Импорт вашей почты из Elm"
 
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:226
+#: mail/importers/evolution-mbox-importer.c:221
+#: mail/importers/evolution-outlook-importer.c:255
 #: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Импорт..."
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:222
-#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/evolution-mbox-importer.c:223
+#: mail/importers/evolution-outlook-importer.c:257
 #: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Подождите пожалуйста"
@@ -14546,23 +14076,25 @@ msgid "Elm"
 msgstr "Elm"
 
 #: mail/importers/evolution-mbox-importer.c:116
+#: mail/importers/evolution-outlook-importer.c:130
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Папка _черновиков:"
 
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 #, fuzzy
 msgid "Select folder to import into"
 msgstr "Выберите сертификат для импорта..."
 
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:254
 #: mail/importers/mail-importer.c:226
 #, fuzzy, c-format
 msgid "Importing `%s'"
 msgstr "Импорт"
 
-#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/evolution-outlook-importer.c:301
 #: mail/importers/mail-importer.c:140
 #, fuzzy
 msgid "Importing mailbox"
@@ -14725,15 +14257,15 @@ msgstr ""
 msgid "%s License Agreement"
 msgstr ""
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
 msgid "_Host:"
 msgstr "Сервер:"
 
-#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
 msgid "User_name:"
 msgstr "_Имя пользователя:"
 
-#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
 msgid "_Path:"
 msgstr "Путь:"
 
@@ -14796,34 +14328,34 @@ msgstr "%d контактов"
 msgid ", %d unread"
 msgstr ""
 
-#: mail/mail-component.c:653
+#: mail/mail-component.c:656
 msgid "New Mail Message"
 msgstr "Новое почтовое сообщение"
 
-#: mail/mail-component.c:654
+#: mail/mail-component.c:657
 msgid "_Mail Message"
 msgstr "Почтовое сообщение..."
 
-#: mail/mail-component.c:655
+#: mail/mail-component.c:658
 msgid "Compose a new mail message"
 msgstr "Создать новое сообщение"
 
-#: mail/mail-component.c:661
+#: mail/mail-component.c:664
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Новая виртуальная папка"
 
-#: mail/mail-component.c:662
+#: mail/mail-component.c:665
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Почтовые фильтры"
 
-#: mail/mail-component.c:663
+#: mail/mail-component.c:666
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Создать новый календарь"
 
-#: mail/mail-component.c:795
+#: mail/mail-component.c:798
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
@@ -14835,7 +14367,7 @@ msgstr "Проверка сервиса"
 msgid "Connecting to server..."
 msgstr "Подключение к серверу..."
 
-#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Подлинность"
 
@@ -14850,7 +14382,7 @@ msgstr ""
 "отправляемую вами почту."
 
 #: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid "Receiving Mail"
 msgstr "Получение почты"
 
@@ -14867,7 +14399,7 @@ msgstr ""
 msgid "Please select among the following options"
 msgstr "Выберите один из следующих вариантов"
 
-#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr "Отправка почты"
 
@@ -14879,7 +14411,7 @@ msgstr ""
 "Введите информацию о способе отправки электронной почты. Если вы не уверены, "
 "свяжитесь со своим системным администратором или поставщиком услуг Интернета."
 
-#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37
 msgid "Account Management"
 msgstr "Управление учетными записями"
 
@@ -14897,249 +14429,254 @@ msgstr ""
 "учетной записи в строке ниже. Это имя будет использовано только для "
 "отображения."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:2
 #, fuzzy
 msgid " Ch_eck for Supported Types "
 msgstr " Проверка поддерживаемых типов "
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "<b>Preview</b>"
 msgstr "Предварительный просмотр"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "(В этой сборке Evolution SSL не поддерживается)"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "<b>S_ignatures</b>"
 msgstr "<b>Состояние:</b> "
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "<b>_Languages</b>"
 msgstr "<b>Состояние:</b> "
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
+msgid "<small>This will make the the filter more reliable, but slower</small>"
+msgstr ""
+
+#: mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "<span weight=\"bold\">Checking for New Mail</span>"
 msgstr "Проверка новой почты"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
 #, fuzzy
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr "<b>_Отображаемые заголовки письма</b>"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">General</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "Уведомление о новой почте"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Security</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "Отправленные сообщения и черновики"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:34
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:35
 #, fuzzy
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "Всегда шифровать моим ключом, когда посылается шифрованная почта"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:36
 msgid "Account Editor"
 msgstr "Редактор учетных записей"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:38
 #, fuzzy
 msgid "Add Ne_w Signature..."
 msgstr "Добавить новую подпись..."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Add _Script"
 msgstr "Добавить _скрипт"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:40
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "Всегда шифровать моим ключом при отправке зашифрованной почты"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Всегда отправлять копию (Cc) на:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Всегда отправлять невидимую копию (Bcc) на:"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Always _sign outgoing messages when using this account"
 msgstr "Всегда подписывать сообщения, когда используется эта учетная запись"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Всегда доверять ключам в моем наборе ключей при кодировании"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Attach original message"
 msgstr "Вложить оригинальное сообщение"
 
-#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Вложение"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:48
 #, fuzzy
 msgid "Automatically _insert smiley images"
 msgstr "_Автоматически вставлять изображение эмоций"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Automatically check for _new mail every"
 msgstr "_Автоматически проверять новую почту каждые"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltic (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltic (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Beep w_hen new mail arrives"
 msgstr "_Звуковой сигнал при приходе новой почты"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "C_haracter set:"
 msgstr "_Набор символов:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Ch_eck for Supported Types "
 msgstr " Проверка поддерживаемых типов "
 
-#: mail/mail-config.glade.h:53
-msgid "Check _Incoming Mail"
-msgstr "Проверять _входящую почту"
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Check _incoming mail for junk"
+msgstr "Проверять, являются ли входящие сообщения спамом"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Check spelling while I _type"
 msgstr "Проверять орфографию в процессе ввода _текста"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Проверяет, являются ли входящие сообщения спамом"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 msgid "Color for _misspelled words:"
 msgstr "Цвет для _ошибочных слов:"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Colors"
 msgstr "_Цвета"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Confirm _when expunging a folder"
 msgstr "_Запрашивать подтверждение очистки папки от удаленных сообщений"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -15155,116 +14692,121 @@ msgstr ""
 "\n"
 "Нажмите \"Применить\", чтобы сохранить ваши настройки."
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
 msgid "De_fault"
 msgstr "Сделать основной"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Default character e_ncoding:"
 msgstr "_Кодировка символов по умолчанию:"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 #, fuzzy
 msgid "Defaults"
 msgstr "По _умолчанию"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 msgid "Do not quote original message"
 msgstr "Не цитировать исходное сообщение"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Не подписывать приглашения (для совместимости с Outlook)"
 
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Готово"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Drafts _Folder:"
 msgstr "Папка _черновиков:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:77
 msgid "Email Accounts"
 msgstr "Учетные записи электронной почты"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Email _Address:"
 msgstr "_Электронная почта:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "Empty trash folders on e_xit"
 msgstr "_Очищать корзину при выходе"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "ID _сертификата:"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:81
 msgid "Evolution Account Assistant"
 msgstr "Помощник по учетным записям Evolution"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:82
 msgid "Execute Command..."
 msgstr "Выполнить команду..."
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Fi_xed-width:"
 msgstr "Фиксированная ширина:"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 msgid "Font Properties"
 msgstr "Свойства шрифтов"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 msgid "Format messages in _HTML"
 msgstr "Форматировать сообщения в _HTML"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "HTML Mail"
 msgstr "Почта _HTML"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Headers"
 msgstr "_Заголовки"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr "Выделять _цитирование:"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
 #: mail/mail-config.glade.h:91
+#, fuzzy
+msgid "I_nclude remote tests"
+msgstr "Включить:"
+
+#: mail/mail-config.glade.h:94
 msgid "Inline"
 msgstr "Встроенное"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Mail Configuration"
 msgstr "Настройка почты"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "Расположение почтового ящика"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr "Составление сообщения"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
@@ -15272,147 +14814,147 @@ msgstr ""
 "Примечание: вам не будет предложено ввести пароль до первого подключения к "
 "серверу"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Or_ganization:"
 msgstr "О_рганизация:"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "PGP/GPG _Key ID:"
 msgstr "Идентификатор ключа PGP/GPG:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "Play sound file when new mail arri_ves"
 msgstr "_Воспроизводить звуковой файл при приходе новой почты"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "Пр_едупреждать при отправке сообщений, в которых определены только "
 "получатели скрытой копии."
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Qmail maildir "
 msgstr "Почтовый каталог Qmail "
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr "Цитировать исходное сообщение"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr "Процитировано"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Re_member password"
 msgstr "Запомнить пароль"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr "_Обратный адрес:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "Получение почты"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:120
 #, fuzzy
 msgid "Receiving Options"
 msgstr "П_араметры получения"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
 #, fuzzy
 msgid "Remember _password"
 msgstr "Запомнить пароль"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
 #, fuzzy
 msgid "S_tandard Font:"
 msgstr "_Стандартный шрифт:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 #, fuzzy
 msgid "Security"
 msgstr "_Безопасность"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font"
 msgstr "Выберите шрифт HTML фиксированной ширины"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:126
 msgid "Select HTML fixed width font for printing"
 msgstr "Выберите шрифт HTML фиксированной ширины для печати"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:127
 msgid "Select HTML variable width font"
 msgstr "Выберите шрифт HTML переменной ширины"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:128
 msgid "Select HTML variable width font for printing"
 msgstr "Выберите шрифт HTML переменной ширины для печати"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:129
 #, fuzzy
 msgid "Select..."
 msgstr "_Выбрать..."
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "Отправка эл.почты"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Sent _Messages Folder:"
 msgstr "Папка отправленных сообщений:"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:134
 msgid "Ser_ver requires authentication"
 msgstr "Т_ребуется проверка подлинности"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:135
 msgid "Server _Type: "
 msgstr "Тип сервера:"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "ID _сертификата:"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:137
 #, fuzzy
 msgid "Signat_ure:"
 msgstr "Подпись:"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "Signatures"
 msgstr "_Подписи"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr "Имя _файла:"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "Spell Checking"
 msgstr "Проверка _орфографии"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:141
 msgid "Standard Unix mbox"
 msgstr "Стандартный файл Unix mbox"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "T_erminal Font:"
 msgstr "Шрифт _терминала:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "T_ype: "
 msgstr "Тип:"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -15422,7 +14964,7 @@ msgstr ""
 "в качестве вашей подписи. Имя, указанное вами,\n"
 "будет использоваться только для отображения. "
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
@@ -15432,7 +14974,7 @@ msgstr ""
 "орфографии. В списке языков отображены те, для которых у вас установлены "
 "словари."
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:149
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -15440,15 +14982,11 @@ msgstr ""
 "Укажите имя, используемое для дальнейших обращений к этой \n"
 "учетной записи. Например, \"Служебная\" или \"Личная\""
 
-#: mail/mail-config.glade.h:148
-msgid "Use _Daemon"
-msgstr "Использовать _демон"
-
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:152
 msgid "V_ariable-width:"
 msgstr "_Переменной ширины:"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:153
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -15458,92 +14996,88 @@ msgstr ""
 "\n"
 "Нажмите \"Далее\" для начала настройки. "
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:158
 msgid "_Add Signature"
 msgstr "Добавить подпись"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Always load images from the Internet"
 msgstr "Всегда загружать изображения"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Digitally sign outgoing messages (by default)"
 msgstr "Всегда подписывать сообщения, когда используется эта учетная запись"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:161
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Не уведомлять о приходе новой почты"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:163
 msgid "_Enable"
 msgstr "_Включить"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 msgid "_Encrypt outgoing messages (by default)"
 msgstr "_Шифровать исходящие сообщения (по умолчанию)"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:165
 msgid "_Forward style:"
 msgstr "Стиль _пересылки:"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:168
 msgid "_Load images if sender is in address book"
 msgstr "_Загружать изображения, если отправитель есть в адресной книге"
 
-#: mail/mail-config.glade.h:167
-msgid "_Local Tests Only"
-msgstr "Только _локальные тесты"
-
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Make this my default account"
 msgstr "_Сделать основной учетной записью"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_Mark messages as read after"
 msgstr "По_мечать сообщения как \"Прочитанные\" через:"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Never load images from the Internet"
 msgstr "Никогда не загружать изображения"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "_Предупреждать при отправке сообщений в формате HTML тем, кто не желает этого"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:175
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Предупреждать при отправке сообщений с пустой темой"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:176
 msgid "_Reply style:"
 msgstr "Стиль _ответа:"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:177
 msgid "_Script:"
 msgstr "_Скрипт:"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:178
 msgid "_Show animated images"
 msgstr "_Показывать анимированные изображения "
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "_Use Secure Connection (SSL):"
 msgstr "Использовать _защищенное соединение (SSL)"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "_Use the same fonts as other applications"
 msgstr "_Использовать такие же шрифты, как и прочие приложения"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:181
 msgid "color"
 msgstr "цвет"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "описание"
 
@@ -15718,7 +15252,7 @@ msgstr ""
 
 #. mail:camel-exception primary
 #: mail/mail-errors.xml.h:57
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgid "Your message with the subject \"{0}\" was not delivered."
 msgstr ""
 
 #. mail:camel-exception secondary
@@ -15784,11 +15318,6 @@ msgstr ""
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Не удается создать каталог '%s': %s."
 
-#. mail:no-save-path secondary
-#: mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail:no-create-path primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
@@ -15810,12 +15339,6 @@ msgstr "Не удается создать каталог '%s': %s."
 msgid "Cannot create temporary save directory."
 msgstr "Не удается создать временный каталог: %s"
 
-#. mail:no-create-tmp-path secondary
-#: mail/mail-errors.xml.h:100 mail/mail-errors.xml.h:112
-#: widgets/misc/e-system-errors.xml.h:11 widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail:no-write-path-exists secondary
 #: mail/mail-errors.xml.h:104
 #, fuzzy
@@ -16094,29 +15617,25 @@ msgstr "Перезаписать"
 msgid "_Append"
 msgstr "Отправить"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:785
 #, c-format
 msgid "Pinging %s"
 msgstr "Ping на %s"
 
-#: mail/mail-mt.c:897
-msgid "Working"
-msgstr "Обработка"
-
-#: mail/mail-ops.c:99
+#: mail/mail-ops.c:98
 msgid "Filtering Folder"
 msgstr "Фильтрация папки"
 
-#: mail/mail-ops.c:260
+#: mail/mail-ops.c:259
 msgid "Fetching Mail"
 msgstr "Получение эл.почты"
 
-#: mail/mail-ops.c:543
+#: mail/mail-ops.c:542
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Ошибка применения фильтров исходящей почты: %s"
 
-#: mail/mail-ops.c:568
+#: mail/mail-ops.c:567
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -16125,101 +15644,101 @@ msgstr ""
 "Ошибка добавления в %s: %s\n"
 "Производится добавление в локальную папку \"Отправленные\"."
 
-#: mail/mail-ops.c:577
+#: mail/mail-ops.c:576
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Ошибка сохранения в локальной папке \"Отправленные\": %s"
 
-#: mail/mail-ops.c:673
+#: mail/mail-ops.c:672
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Отправка сообщения %d из %d"
 
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:703
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Сбой на сообщении %d из %d"
 
-#: mail/mail-ops.c:708
+#: mail/mail-ops.c:707
 msgid "Complete."
 msgstr "Выполнено."
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:804
 msgid "Saving message to folder"
 msgstr "Сохранение сообщения в папке"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Перемещение сообщений в %s"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Копирование сообщений в %s"
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:1002
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Сканирование папок на \"%s\""
 
-#: mail/mail-ops.c:1116
+#: mail/mail-ops.c:1115
 msgid "Forwarded messages"
 msgstr "Пересланные сообщения"
 
-#: mail/mail-ops.c:1159
+#: mail/mail-ops.c:1158
 #, c-format
 msgid "Opening folder %s"
 msgstr "Открытие папки \"%s\""
 
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1230
 #, c-format
 msgid "Opening store %s"
 msgstr "Открытие хранилища %s"
 
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1308
 #, c-format
 msgid "Removing folder %s"
 msgstr "Удаление папки \"%s\""
 
-#: mail/mail-ops.c:1403
+#: mail/mail-ops.c:1402
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Сохранение папки \"%s\""
 
-#: mail/mail-ops.c:1468
+#: mail/mail-ops.c:1467
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1469
+#: mail/mail-ops.c:1468
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Сохранение папки \"%s\""
 
-#: mail/mail-ops.c:1524
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr "Обновление папки"
 
-#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
+#: mail/mail-ops.c:1559 mail/mail-ops.c:1610
 msgid "Expunging folder"
 msgstr "Очистка папки"
 
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1607
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Очистка корзины в '%s'"
 
-#: mail/mail-ops.c:1609
+#: mail/mail-ops.c:1608
 msgid "Local Folders"
 msgstr "Локальные папки"
 
-#: mail/mail-ops.c:1692
+#: mail/mail-ops.c:1691
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Получение сообщения %s"
 
-#: mail/mail-ops.c:1764
+#: mail/mail-ops.c:1763
 #, fuzzy, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
@@ -16227,7 +15746,7 @@ msgstr[0] "Получение %d сообщений"
 msgstr[1] "Получение %d сообщений"
 msgstr[2] "Получение %d сообщений"
 
-#: mail/mail-ops.c:1850
+#: mail/mail-ops.c:1849
 #, fuzzy, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
@@ -16235,7 +15754,7 @@ msgstr[0] "Сохранение %d сообщений"
 msgstr[1] "Сохранение %d сообщений"
 msgstr[2] "Сохранение %d сообщений"
 
-#: mail/mail-ops.c:1900
+#: mail/mail-ops.c:1899
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -16244,7 +15763,7 @@ msgstr ""
 "Не удается создать файл вывода: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1928
+#: mail/mail-ops.c:1927
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -16253,11 +15772,11 @@ msgstr ""
 "Ошибка сохранения сообщений в: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1999
+#: mail/mail-ops.c:1998
 msgid "Saving attachment"
 msgstr "Сохранение вложения"
 
-#: mail/mail-ops.c:2016
+#: mail/mail-ops.c:2015
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -16266,17 +15785,17 @@ msgstr ""
 "Не удается создать файл вывода: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2046
+#: mail/mail-ops.c:2045
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Не удается записать данные: %s"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Отключение от %s"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Переподключение к %s"
@@ -16340,24 +15859,24 @@ msgstr "Обновление..."
 msgid "Waiting..."
 msgstr "Ожидание..."
 
-#: mail/mail-session.c:238
+#: mail/mail-session.c:239
 msgid "User canceled operation."
 msgstr "Операция отменена пользователем."
 
-#: mail/mail-session.c:271
+#: mail/mail-session.c:272
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Введите пароль для %s"
 
-#: mail/mail-session.c:273
+#: mail/mail-session.c:274
 msgid "Enter Password"
 msgstr "Ввод пароля"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password"
 msgstr "_Запомнить этот пароль"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:298
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Запомнить этот пароль до завершения этого сеанса"
 
@@ -16414,79 +15933,79 @@ msgstr "Обновление виртуальных папок для uri: %s"
 msgid "Updating vFolders for '%s'"
 msgstr "Обновление виртуальных папок для uri: %s"
 
-#: mail/mail-vfolder.c:959
+#: mail/mail-vfolder.c:958
 msgid "vFolders"
 msgstr "vFolders"
 
-#: mail/mail-vfolder.c:998
+#: mail/mail-vfolder.c:997
 msgid "Edit VFolder"
 msgstr "Править виртуальную папку"
 
-#: mail/mail-vfolder.c:1082
+#: mail/mail-vfolder.c:1081
 msgid "New VFolder"
 msgstr "Новая виртуальная папка"
 
-#: mail/message-list.c:946
+#: mail/message-list.c:948
 msgid "Unseen"
 msgstr "Непрочитано"
 
-#: mail/message-list.c:947
+#: mail/message-list.c:949
 msgid "Seen"
 msgstr "Прочитано"
 
-#: mail/message-list.c:948
+#: mail/message-list.c:950
 msgid "Answered"
 msgstr "Отвечено"
 
-#: mail/message-list.c:949
+#: mail/message-list.c:951
 msgid "Multiple Unseen Messages"
 msgstr "Множество непрочитанных сообщений"
 
-#: mail/message-list.c:950
+#: mail/message-list.c:952
 msgid "Multiple Messages"
 msgstr "Множество сообщений"
 
-#: mail/message-list.c:954
+#: mail/message-list.c:956
 msgid "Lowest"
 msgstr "Самый низкий"
 
-#: mail/message-list.c:955
+#: mail/message-list.c:957
 msgid "Lower"
 msgstr "Низкий"
 
-#: mail/message-list.c:959
+#: mail/message-list.c:961
 msgid "Higher"
 msgstr "Высокий"
 
-#: mail/message-list.c:960
+#: mail/message-list.c:962
 msgid "Highest"
 msgstr "Самый высокий"
 
-#: mail/message-list.c:1279
+#: mail/message-list.c:1285
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1286
+#: mail/message-list.c:1292
 msgid "Today %l:%M %p"
 msgstr "Сегодня %I:%M %p"
 
-#: mail/message-list.c:1295
+#: mail/message-list.c:1301
 msgid "Yesterday %l:%M %p"
 msgstr "Вчера %l:%M %p"
 
-#: mail/message-list.c:1307
+#: mail/message-list.c:1313
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1315
+#: mail/message-list.c:1321
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1317
+#: mail/message-list.c:1323
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3300
+#: mail/message-list.c:3321
 msgid "Generating message list"
 msgstr "Создание списка сообщений"
 
@@ -16542,6 +16061,10 @@ msgstr "Переслать"
 msgid "No Response Necessary"
 msgstr "Можно не отвечать"
 
+#: mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Прочитанное"
+
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Ответить"
@@ -16644,44 +16167,48 @@ msgid ""
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid "Toolbar is visible"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Whether Evolution should start up in offline mode"
 msgstr "Должен ли Evolution запускаться в автономном режиме"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Whether the toolbar should be visible."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
 msgid "Whether to skip the development warning dialog"
 msgstr "Пропускать ли предупреждение о тестовой версии"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
+#: shell/apps_evolution_shell.schemas.in.in.h:14
 msgid "mail"
 msgstr "почта"
 
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
-msgstr "Создана для вас"
-
-#: shell/e-shell.c:545 shell/e-shell.c:546
+#: shell/e-shell.c:588 shell/e-shell.c:589
 #, fuzzy, c-format
 msgid "%ld KB"
 msgstr "%d %B"
 
-#: shell/e-shell.c:744
+#: shell/e-shell.c:786
 #, fuzzy
 msgid "Uknown system error."
 msgstr "Неизвестная ошибка"
 
-#: shell/e-shell.c:1101
+#: shell/e-shell.c:1143
 msgid "Invalid arguments"
 msgstr "Недопустимые аргументы"
 
-#: shell/e-shell.c:1103
+#: shell/e-shell.c:1145
 msgid "Cannot register on OAF"
 msgstr "Не удается зарегистрировать в OAF"
 
-#: shell/e-shell.c:1105
+#: shell/e-shell.c:1147
 msgid "Configuration Database not found"
 msgstr "База данных настроек не найдена"
 
-#: shell/e-shell.c:1107
+#: shell/e-shell.c:1149
 msgid "Generic error"
 msgstr "Обычная ошибка"
 
@@ -16737,7 +16264,7 @@ msgstr ""
 msgid "Select importer"
 msgstr "Выбрать импортер"
 
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1026
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
 #, c-format
 msgid "File %s does not exist"
 msgstr "Файл \"%s\" не существует."
@@ -16765,31 +16292,32 @@ msgstr ""
 "Импорт %s\n"
 "Импорт элемента 1."
 
-#: shell/e-shell-importer.c:549
+#: shell/e-shell-importer.c:570
 msgid "Automatic"
 msgstr "Автоматическое"
 
-#: shell/e-shell-importer.c:598
-msgid "_Filename:"
-msgstr "_Имя файла:"
+#: shell/e-shell-importer.c:626
+#, fuzzy
+msgid "F_ilename:"
+msgstr "Имя файла:"
 
-#: shell/e-shell-importer.c:603
+#: shell/e-shell-importer.c:631
 msgid "Select a file"
 msgstr "Выбрать файл"
 
-#: shell/e-shell-importer.c:613
+#: shell/e-shell-importer.c:642
 msgid "File _type:"
 msgstr "_Тип файла:"
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:681
 msgid "Import data and settings from _older programs"
 msgstr "Импорт данных и настроек из _старых программ"
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:684
 msgid "Import a _single file"
 msgstr "Импорт _одного файла"
 
-#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -16797,26 +16325,26 @@ msgstr ""
 "Пожалуйста подождите...\n"
 "Сканирование существующих настроек"
 
-#: shell/e-shell-importer.c:727
+#: shell/e-shell-importer.c:756
 msgid "Starting Intelligent Importers"
 msgstr "Запуск интеллектуального импортера"
 
-#: shell/e-shell-importer.c:853 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
 #, c-format
 msgid "From %s:"
 msgstr "Из %s:"
 
-#: shell/e-shell-importer.c:1044
+#: shell/e-shell-importer.c:1073
 #, fuzzy, c-format
 msgid "No importer available for file %s"
 msgstr "Провайдер для протокола \"%s\" не доступен"
 
-#: shell/e-shell-importer.c:1056
+#: shell/e-shell-importer.c:1085
 #, fuzzy
 msgid "Unable to execute importer"
 msgstr "Сбой при исполнении gpg."
 
-#: shell/e-shell-importer.c:1169
+#: shell/e-shell-importer.c:1199
 msgid "_Import"
 msgstr "_Импорт"
 
@@ -16861,61 +16389,61 @@ msgstr "Имя папки не может содержать символ \"#\".
 msgid "'.' and '..' are reserved folder names."
 msgstr "\".\" и \"..\" -- зарезервированные имена папок."
 
-#: shell/e-shell-window.c:336
+#: shell/e-shell-window.c:337
 #, fuzzy
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution сейчас в сетевом режиме работы. Нажмите на эту кнопку для "
 "перехода в режим работы вне сети."
 
-#: shell/e-shell-window.c:343
+#: shell/e-shell-window.c:344
 #, fuzzy
 msgid "Evolution is in the process of going offline."
 msgstr "Ximian Evolution в процессе перехода в режим работы вне сети."
 
-#: shell/e-shell-window.c:349
+#: shell/e-shell-window.c:350
 #, fuzzy
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution сейчас в автономном режиме работы. Нажмите на эту кнопку "
 "для перехода в режим работы в сети."
 
-#: shell/e-shell-window.c:621
+#: shell/e-shell-window.c:637
 #, fuzzy, c-format
 msgid "Switch to %s"
 msgstr "Почта к %s"
 
-#: shell/e-shell-window-commands.c:64
+#: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Похоже, утилита GNOME Pilot не установлена в этой системе"
 
-#: shell/e-shell-window-commands.c:72
+#: shell/e-shell-window-commands.c:74
 #, c-format
 msgid "Error executing %s."
 msgstr "Ошибка выполнения %s."
 
-#: shell/e-shell-window-commands.c:121
+#: shell/e-shell-window-commands.c:123
 msgid "Bug buddy is not installed."
 msgstr "Bug buddy не установлен."
 
-#: shell/e-shell-window-commands.c:129
+#: shell/e-shell-window-commands.c:131
 msgid "Bug buddy could not be run."
 msgstr "Не удается запустить Bug buddy."
 
-#: shell/e-shell-window-commands.c:171
+#: shell/e-shell-window-commands.c:323
 #, fuzzy
-msgid "About Evolution"
-msgstr "О программе Ximian Evolution"
+msgid "Groupware Suite"
+msgstr "Группа"
 
-#: shell/e-shell-window-commands.c:382
+#: shell/e-shell-window-commands.c:563
 msgid "_Work Online"
 msgstr "Перейти в сетевой режим"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "Ав_тономная работа"
 
-#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Перейти в режим работы вне сети"
 
@@ -16927,43 +16455,6 @@ msgstr "Флажок"
 msgid "New"
 msgstr "Создать"
 
-#: shell/evolution-shell-component-utils.c:115
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Неизвестная ошибка."
-
-#: shell/evolution-shell-component-utils.c:118
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Ошибка системы компонентов:\n"
-"%s"
-
-#: shell/evolution-shell-component-utils.c:125
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Ошибка системы активации:\n"
-"%s"
-
 #: shell/evolution-test-component.c:140
 #, fuzzy
 msgid "New Test"
@@ -17280,30 +16771,30 @@ msgid ""
 "Click help for details."
 msgstr ""
 
-#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:522
+#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
+#: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
 msgstr "Выберите сертификат для импорта..."
 
-#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:604
+#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
+#: smime/gui/certificate-manager.c:638
 msgid "Certificate Name"
 msgstr "Имя сертификата"
 
-#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
+#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
 msgid "Purposes"
 msgstr "Назначения"
 
-#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:517
+#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr "Серийный номер"
 
-#: smime/gui/certificate-manager.c:267
+#: smime/gui/certificate-manager.c:271
 msgid "Expires"
 msgstr "Годен до"
 
-#: smime/gui/certificate-manager.c:417
+#: smime/gui/certificate-manager.c:446
 msgid "E-Mail Address"
 msgstr "Электронная почта"
 
@@ -17349,6 +16840,11 @@ msgstr ""
 "Выпущен:\n"
 "  Тема: %s\n"
 
+#: smime/gui/e-cert-selector.c:169
+#, fuzzy
+msgid "Select certificate"
+msgstr "Сертификат клиента SSL"
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr "<Не является частью сертификата>"
@@ -17403,7 +16899,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
 msgid "Certificate"
 msgstr "Сертификат"
 
@@ -17423,19 +16919,23 @@ msgstr "Общее имя (CN)"
 msgid "Contact Certificates"
 msgstr "Сертификаты контактов"
 
-#: smime/gui/smime-ui.glade.h:21
-#, no-c-format
-msgid "Do you want to trust \"%s\" for the following purposes?"
-msgstr "Доверять \"%s\" для следующих целей?"
+#: smime/gui/smime-ui.glade.h:20
+msgid "Do not trust the authenticity of this certificate"
+msgstr ""
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:21
 msgid "Dummy window only"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:22
 msgid "Edit"
 msgstr "Правка"
 
+#: smime/gui/smime-ui.glade.h:23
+#, fuzzy
+msgid "Email Certificate Trust Settings"
+msgstr "Поставщик сертификата эл. почты"
+
 #: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr "Сертификат получателя почты"
@@ -17468,251 +16968,261 @@ msgstr "Подразделение организации (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "Отпечаток SHA1"
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr "Сертификат клиента SSL"
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr "Сертификат сервере SSL"
 
 #: smime/gui/smime-ui.glade.h:37
-msgid "Trust this CA to identify email users."
+msgid "Trust the authenticity of this certificate"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:38
-msgid "Trust this CA to identify software developers."
+msgid "Trust this CA to identify email users."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:39
-msgid "Trust this CA to identify web sites."
+msgid "Trust this CA to identify software developers."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:40
-msgid "View"
-msgstr "Просмотр"
+msgid "Trust this CA to identify web sites."
+msgstr ""
 
 #: smime/gui/smime-ui.glade.h:41
-msgid "View Certificate"
-msgstr "Просмотр сертификата"
+msgid "View"
+msgstr "Просмотр"
 
 #: smime/gui/smime-ui.glade.h:42
-#, fuzzy
-msgid "You have been asked to trust a new Certificate Authority (CA)."
-msgstr "Некорректная авторизация сертификата (CA)"
-
-#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:44
+#: smime/gui/smime-ui.glade.h:43
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:45
+#: smime/gui/smime-ui.glade.h:44
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:46
+#: smime/gui/smime-ui.glade.h:45
 msgid "Your Certificates"
 msgstr "Ваши сертификаты"
 
-#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
+#: smime/gui/smime-ui.glade.h:46
+msgid "_Edit CA Trust"
+msgstr ""
+
+#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d.%m.%Y"
 
-#: smime/lib/e-cert.c:478
+#. x509 certificate usage types
+#: smime/lib/e-cert.c:424
+#, fuzzy
+msgid "Sign"
+msgstr "Stauning"
+
+#: smime/lib/e-cert.c:425
+#, fuzzy
+msgid "Encrypt"
+msgstr "Зашифровано"
+
+#: smime/lib/e-cert.c:530
 msgid "Version"
 msgstr "Версия"
 
-#: smime/lib/e-cert.c:493
+#: smime/lib/e-cert.c:545
 msgid "Version 1"
 msgstr "Версия 1"
 
-#: smime/lib/e-cert.c:496
+#: smime/lib/e-cert.c:548
 msgid "Version 2"
 msgstr "Версия 2"
 
-#: smime/lib/e-cert.c:499
+#: smime/lib/e-cert.c:551
 msgid "Version 3"
 msgstr "Версия 3"
 
-#: smime/lib/e-cert.c:581
+#: smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:584
+#: smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:587
+#: smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:590
+#: smime/lib/e-cert.c:642
 msgid "C"
 msgstr "C"
 
-#: smime/lib/e-cert.c:593
+#: smime/lib/e-cert.c:645
 msgid "CN"
 msgstr "CN"
 
-#: smime/lib/e-cert.c:596
+#: smime/lib/e-cert.c:648
 msgid "OU"
 msgstr "OU"
 
-#: smime/lib/e-cert.c:599
+#: smime/lib/e-cert.c:651
 msgid "O"
 msgstr "O"
 
-#: smime/lib/e-cert.c:602
+#: smime/lib/e-cert.c:654
 msgid "L"
 msgstr "L"
 
-#: smime/lib/e-cert.c:605
+#: smime/lib/e-cert.c:657
 msgid "DN"
 msgstr "DN"
 
-#: smime/lib/e-cert.c:608
+#: smime/lib/e-cert.c:660
 msgid "DC"
 msgstr "DC"
 
-#: smime/lib/e-cert.c:611
+#: smime/lib/e-cert.c:663
 msgid "ST"
 msgstr "ST"
 
-#: smime/lib/e-cert.c:614
+#: smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:617
+#: smime/lib/e-cert.c:669
 msgid "Certificate Key Usage"
 msgstr "Использование ключа сертификата"
 
-#: smime/lib/e-cert.c:620
+#: smime/lib/e-cert.c:672
 msgid "Netscape Certificate Type"
 msgstr "Тип сертификата Netscape"
 
-#: smime/lib/e-cert.c:623
+#: smime/lib/e-cert.c:675
 msgid "Certificate Authority Key Identifier"
 msgstr "Идентификатор ключа поставщика"
 
-#: smime/lib/e-cert.c:626
+#: smime/lib/e-cert.c:678
 msgid "UID"
 msgstr "UID"
 
-#: smime/lib/e-cert.c:635
+#: smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Идентификатор объекта (%s)"
 
-#: smime/lib/e-cert.c:686
+#: smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
 msgstr "Идентификатор алгоритма"
 
-#: smime/lib/e-cert.c:694
+#: smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
 msgstr "Параметры алгоритма"
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:768
 msgid "Subject Public Key Info"
 msgstr ""
 
-#: smime/lib/e-cert.c:721
+#: smime/lib/e-cert.c:773
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:736
+#: smime/lib/e-cert.c:788
 msgid "Subject's Public Key"
 msgstr "Публичный ключ темы"
 
-#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
+#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
 msgid "Error: Unable to process extension"
 msgstr "Ошибка: не удается обработать расширение"
 
-#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
+#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr "Объект подписан"
 
-#: smime/lib/e-cert.c:782
+#: smime/lib/e-cert.c:834
 msgid "SSL Certificate Authority"
 msgstr "Поставщик сертификата SSL"
 
-#: smime/lib/e-cert.c:786
+#: smime/lib/e-cert.c:838
 msgid "Email Certificate Authority"
 msgstr "Поставщик сертификата эл. почты"
 
-#: smime/lib/e-cert.c:814
+#: smime/lib/e-cert.c:866
 #, fuzzy
 msgid "Signing"
 msgstr "Stauning"
 
-#: smime/lib/e-cert.c:818
+#: smime/lib/e-cert.c:870
 #, fuzzy
 msgid "Non-repudiation"
 msgstr "Нет информации"
 
-#: smime/lib/e-cert.c:822
+#: smime/lib/e-cert.c:874
 msgid "Key Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:826
+#: smime/lib/e-cert.c:878
 #, fuzzy
 msgid "Data Encipherment"
 msgstr "вложение"
 
-#: smime/lib/e-cert.c:830
+#: smime/lib/e-cert.c:882
 msgid "Key Agreement"
 msgstr ""
 
-#: smime/lib/e-cert.c:834
+#: smime/lib/e-cert.c:886
 msgid "Certificate Signer"
 msgstr "Сертификат подписан"
 
-#: smime/lib/e-cert.c:838
+#: smime/lib/e-cert.c:890
 msgid "CRL Signer"
 msgstr "CRL подписан"
 
-#: smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:938
 msgid "Critical"
 msgstr "Критично"
 
-#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
+#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
 msgid "Not Critical"
 msgstr "Не критично"
 
-#: smime/lib/e-cert.c:912
+#: smime/lib/e-cert.c:964
 msgid "Extensions"
 msgstr "Расширения"
 
-#: smime/lib/e-cert.c:983
+#: smime/lib/e-cert.c:1035
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
 msgid "Certificate Signature Algorithm"
 msgstr "Алгоритм подписи сертификата"
 
-#: smime/lib/e-cert.c:1048
+#: smime/lib/e-cert.c:1100
 msgid "Issuer"
 msgstr "Поставщик"
 
-#: smime/lib/e-cert.c:1102
+#: smime/lib/e-cert.c:1154
 msgid "Issuer Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1121
+#: smime/lib/e-cert.c:1173
 msgid "Subject Unique ID"
 msgstr "Уникальный ID темы"
 
-#: smime/lib/e-cert.c:1164
+#: smime/lib/e-cert.c:1216
 msgid "Certificate Signature Value"
 msgstr "Значение подписи сертификата"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
+#: smime/lib/e-cert-db.c:608
 msgid "Certificate already exists"
 msgstr "Сертификат уже существует"
 
@@ -17860,7 +17370,7 @@ msgstr "Просмотреть текущий контакт"
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "_Действия"
 
@@ -18023,7 +17533,7 @@ msgstr "Закрыть"
 #: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:3
+#: ui/evolution.xml.h:4
 msgid "Close"
 msgstr "Закрыть"
 
@@ -18036,7 +17546,7 @@ msgid "Delete this item"
 msgstr "Удалить этот элемент"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr "Главная панель инструментов"
 
@@ -18079,7 +17589,7 @@ msgstr "Сохранить этот элемент на диске"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:44
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "_File"
 msgstr "_Файл"
 
@@ -18336,13 +17846,13 @@ msgstr "Обратить выделение"
 msgid "_Threaded Message List"
 msgstr "Показывать подшивки в списке сообщений"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Закрыть это окно"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "_Close"
 msgstr "_Закрыть"
 
@@ -18744,7 +18254,7 @@ msgstr "Предыдущему сообщению"
 msgid "_Quoted"
 msgstr "Как _цитирование"
 
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
 msgid "_Tools"
 msgstr "С_ервис"
 
@@ -19041,108 +18551,122 @@ msgid "_Open Task"
 msgstr "_Открыть задачу"
 
 #: ui/evolution.xml.h:1
-msgid "About Ximian Evolution..."
-msgstr "О программе Ximian Evolution..."
+#, fuzzy
+msgid "About Evolution..."
+msgstr "О программе Ximian Evolution"
 
 #: ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
 msgstr "Изменить настройки Evolution"
 
-#: ui/evolution.xml.h:5
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the visibility of the toolbar"
+msgstr "Изменить свойства этой папки"
+
+#: ui/evolution.xml.h:6
 #, fuzzy
 msgid "Create a new window displaying this folder"
 msgstr "Создать новый календарь"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "В_ыйти"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "_Часто задаваемые вопросы по Evolution"
+
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Выйти из программы"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:10
 msgid "Forget _Passwords"
 msgstr "Забыть пароли"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:11
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Забыть запомненные пароли, вы будете спрошены о них опять"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:12
 msgid "Import data from other programs"
 msgstr "Импортировать данные из других программ"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:14
 #, fuzzy
 msgid "New _Window"
 msgstr "_Окно"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Pi_lot Settings..."
 msgstr "Изменить настройки утилиты _Pilot..."
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Send / Receive"
 msgstr "Отправить/получить"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Send queued items and retrieve new items"
 msgstr "Отправить элементы из очереди и получить новые элементы"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Set up Pilot configuration"
 msgstr "Настроить утилиту Pilot"
 
-#: ui/evolution.xml.h:17
-msgid "Show information about Ximian Evolution"
+#: ui/evolution.xml.h:19
+#, fuzzy
+msgid "Show information about Evolution"
 msgstr "Показать информацию о программе Ximian Evolution"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:20
 msgid "Submit Bug Report"
 msgstr "Отправить сообщение об ошибке"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:21
 msgid "Submit _Bug Report"
 msgstr "Отправить сообщение об оши_бке"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Отправить сообщение об ошибке, используя программу \"Баг Бадди\""
 
-#: ui/evolution.xml.h:21
-msgid "Toggle whether we are working offline."
-msgstr "Переключить работу в/вне сети."
-
 #: ui/evolution.xml.h:23
-msgid "Ximian Evolution _FAQ"
-msgstr "_Часто задаваемые вопросы по Evolution"
+#, fuzzy
+msgid "T_oolbar"
+msgstr "Главная панель инструментов"
 
 #: ui/evolution.xml.h:24
-msgid "_About Ximian Evolution..."
-msgstr "_О программе Ximian Evolution..."
+msgid "Toggle whether we are working offline."
+msgstr "Переключить работу в/вне сети."
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "_About Evolution..."
+msgstr "О программе Ximian Evolution"
+
+#: ui/evolution.xml.h:30
 msgid "_Help"
 msgstr "_Справка"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "_Import..."
 msgstr "_Импорт.."
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "_New"
 msgstr "_Создать"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "_Quick Reference"
 msgstr "_Быстрая справка"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_Send / Receive"
 msgstr "_Получить и отправить"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 #, fuzzy
 msgid "_Window"
 msgstr "_Окно"
@@ -19215,7 +18739,7 @@ msgid "With _Status"
 msgstr "Установить состояние"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:626
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:635
 msgid "UTC"
 msgstr "UTC"
 
@@ -19372,30 +18896,30 @@ msgstr "Другая..."
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
-#: widgets/misc/e-error.c:121
+#: widgets/misc/e-error.c:79 widgets/misc/e-error.c:80
+#: widgets/misc/e-error.c:122
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Evolution"
 
-#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
-#: widgets/misc/e-error.c:119
+#: widgets/misc/e-error.c:81 widgets/misc/e-error.c:82
+#: widgets/misc/e-error.c:120
 #, fuzzy
 msgid "Evolution Warning"
 msgstr "Почта Evolution"
 
-#: widgets/misc/e-error.c:118
+#: widgets/misc/e-error.c:119
 #, fuzzy
 msgid "Evolution Information"
 msgstr "Информация о собрании"
 
-#: widgets/misc/e-error.c:120
+#: widgets/misc/e-error.c:121
 #, fuzzy
 msgid "Evolution Query"
 msgstr "Evolution"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:410
+#: widgets/misc/e-error.c:415
 #, fuzzy, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -19545,16 +19069,517 @@ msgstr ""
 "Не удается сохранить в '%s'\n"
 " %s"
 
-#: widgets/misc/e-task-widget.c:211
+#: widgets/misc/e-task-widget.c:212
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: widgets/misc/e-task-widget.c:216
+#: widgets/misc/e-task-widget.c:217
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% выполнено)"
 
+#~ msgid "Failed to connect to LDAP server"
+#~ msgstr "Не удается подключиться к серверу LDAP"
+
+#~ msgid "Failed to authenticate with LDAP server"
+#~ msgstr "Сбой аутентификации на сервере LDAP"
+
+#~ msgid "Could not perform query on Root DSE"
+#~ msgstr "Не удается выполнить запрос в корневом DSE"
+
+#~ msgid "The server responded with no supported search bases"
+#~ msgstr "Сервер отвечает без поддержки баз поиска"
+
+#~ msgid "This server does not support LDAPv3 schema information"
+#~ msgstr "Этот сервер не поддерживает информацию LDAPv3 schema"
+
+#~ msgid "Error retrieving schema information"
+#~ msgstr "Ошибка при загрузке информации schema"
+
+#~ msgid "Server did not respond with valid schema information"
+#~ msgstr "Сервер не отвечает корректной информацией schema"
+
+#~ msgid "  S_how Supported Bases "
+#~ msgstr "  _Показывать поддерживаемые типы "
+
+#~ msgid "1:00"
+#~ msgstr "1:00"
+
+#~ msgid "5:00"
+#~ msgstr "5:00"
+
+#~ msgid "Connecting"
+#~ msgstr "Подключение"
+
+#~ msgid "Distinguished _name:"
+#~ msgstr "Отличительное _имя (DN):"
+
+#~ msgid "Email address:"
+#~ msgstr "Электронная почта:"
+
+#~ msgid "Evolution will use this DN to authenticate you with the server"
+#~ msgstr ""
+#~ "Evolution будет использовать это значение DN для проверки вашей "
+#~ "подлинности на сервере"
+
+#~ msgid "One"
+#~ msgstr "Один"
+
+#~ msgid "S_earch scope: "
+#~ msgstr "_Диапазон поиска: "
+
+#~ msgid "Searching"
+#~ msgstr "Поиск"
+
+#~ msgid "Sub"
+#~ msgstr "Под"
+
+#~ msgid "This option controls how long a search will be run."
+#~ msgstr "Этот параметр определяет, как долго будет производиться поиск."
+
+#~ msgid "U_se SSL/TLS:"
+#~ msgstr "И_спользовать SSL/TLS:"
+
+#~ msgid "_Display name:"
+#~ msgstr "Показать имя:"
+
+#~ msgid "_Port number:"
+#~ msgstr "_Номер порта:"
+
+#~ msgid "_Search base:"
+#~ msgstr "_База поиска:"
+
+#~ msgid "_Server name:"
+#~ msgstr "Имя _сервера:"
+
+#~ msgid "_Timeout (minutes):"
+#~ msgstr "_Задержка (минут):"
+
+#~ msgid "connecting-tab"
+#~ msgstr "вкладка соединения"
+
+#~ msgid "general-tab"
+#~ msgstr "общая вкладка"
+
+#~ msgid "searching-tab"
+#~ msgstr "вкладка поиска"
+
+#, fuzzy
+#~ msgid "Job title:"
+#~ msgstr "Должность:"
+
+#, fuzzy
+#~ msgid "Webcam:"
+#~ msgstr "Веб-страница:"
+
+#~ msgid "Category editor not available."
+#~ msgstr "Редактор категорий недоступен."
+
+#, fuzzy
+#~ msgid ""
+#~ "The following entries are invalid:\n"
+#~ "\n"
+#~ msgstr "В настоящий момент активны следующие соединения:"
+
+#~ msgid "Could not find widget for a field: `%s'"
+#~ msgstr "Не удается найти элемент управления для поля: \"%s\""
+
+#~ msgid "Do you want to save changes?"
+#~ msgstr "Хотите сохранить изменения?"
+
+#~ msgid "Error saving %s: %s"
+#~ msgstr "Ошибка сохранения %s: %s"
+
+#~ msgid ""
+#~ "The addressbook backend for\n"
+#~ "%s\n"
+#~ "has crashed. You will have to restart Evolution in order to use it again"
+#~ msgstr ""
+#~ "Произошла ошибка в базе данных адресной книги\n"
+#~ "%s.\n"
+#~ "Необходимо перезапустить Evolution."
+
+#~ msgid "Can not load URI"
+#~ msgstr "Не удается загрузить URI"
+
+#~ msgid "Calendar Properties"
+#~ msgstr "Свойства календаря"
+
+#~ msgid "Remote"
+#~ msgstr "Удаленный"
+
+#~ msgid "Task List Properties"
+#~ msgstr "Свойства списка задач"
+
+#~ msgid "_Refresh Interval:"
+#~ msgstr "_Интервал обновления:"
+
+#~ msgid "_Source URL:"
+#~ msgstr "URL _источника:"
+
+#~ msgid ""
+#~ "The event being deleted is a meeting, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "Удаляемое событие является собранием, хотите отправить уведомление об "
+#~ "отмене?"
+
+#~ msgid "Are you sure you want to cancel and delete this meeting?"
+#~ msgstr "Вы действительно хотите отменить и удалить это собрание?"
+
+#~ msgid ""
+#~ "The task being deleted is assigned, would you like to send a cancellation "
+#~ "notice?"
+#~ msgstr ""
+#~ "Удаляемое событие является назначенной задачей, хотите отправить "
+#~ "уведомление об отмене?"
+
+#~ msgid "Are you sure you want to cancel and delete this task?"
+#~ msgstr "Вы действительно хотите отменить и удалить эту задачу?"
+
+#~ msgid ""
+#~ "The journal entry being deleted is published, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "Удаляемое событие является опубликованной записью в журнале,хотите "
+#~ "отправить уведомление об отмене?"
+
+#~ msgid "Are you sure you want to cancel and delete this journal entry?"
+#~ msgstr "Вы действительно хотите отменить и удалить эту запись в журнале?"
+
+#~ msgid "Are you sure you want to delete the appointment `%s'?"
+#~ msgstr "Вы действительно хотите удалить встречу \"%s\"?"
+
+#~ msgid "Are you sure you want to delete this untitled appointment?"
+#~ msgstr "Вы действительно хотите удалить эту неозаглавленную встречу?"
+
+#~ msgid "Are you sure you want to delete the task `%s'?"
+#~ msgstr "Вы действительно хотите удалить задачу \"%s\"?"
+
+#~ msgid "Are you sure you want to delete this untitled task?"
+#~ msgstr "Вы действительно хотите удалить эту неозаглавленную задачу?"
+
+#~ msgid "Are you sure you want to delete the journal entry `%s'?"
+#~ msgstr "Вы действительно хотите удалить запись в журнале \"%s\"?"
+
+#~ msgid "Are you sure want to delete this untitled journal entry?"
+#~ msgstr ""
+#~ "Вы действительно хотите удалить эту неозаглавленную запись в журнале?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d appointment?"
+#~ msgid_plural "Are you sure you want to delete %d appointments?"
+#~ msgstr[0] "Вы действительно хотите удалить %d встреч?"
+#~ msgstr[1] "Вы действительно хотите удалить %d встреч?"
+#~ msgstr[2] "Вы действительно хотите удалить %d встреч?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d task?"
+#~ msgid_plural "Are you sure you want to delete %d tasks?"
+#~ msgstr[0] "Вы действительно хотите удалить %d задач?"
+#~ msgstr[1] "Вы действительно хотите удалить %d задач?"
+#~ msgstr[2] "Вы действительно хотите удалить %d задач?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d journal entry?"
+#~ msgid_plural "Are you sure you want to delete %d journal entries?"
+#~ msgstr[0] "Вы действительно хотите удалить %d записей в журнале?"
+#~ msgstr[1] "Вы действительно хотите удалить %d записей в журнале?"
+#~ msgstr[2] "Вы действительно хотите удалить %d записей в журнале?"
+
+#~ msgid "_Invite Others..."
+#~ msgstr "Пригласить других..."
+
+#~ msgid ""
+#~ "This event has been changed, but has not been saved.\n"
+#~ "\n"
+#~ "Do you wish to save your changes?"
+#~ msgstr ""
+#~ "Это событие было изменено, но не сохранено.\n"
+#~ "\n"
+#~ "Сохранить изменения?"
+
+#~ msgid "_Discard Changes"
+#~ msgstr "_Отклонить изменения"
+
+#~ msgid "Save Event"
+#~ msgstr "Сохранить событие"
+
+#~ msgid "The meeting information has been created. Send it?"
+#~ msgstr "Была создана информация о собрании. Отправить ее?"
+
+#~ msgid "The meeting information has changed. Send an updated version?"
+#~ msgstr "Информация о собрании была изменена. Отправить обновлённую версию?"
+
+#~ msgid "The task assignment information has been created. Send it?"
+#~ msgstr ""
+#~ "Информация о назначении задачи была изменена. Отправить обновлённую "
+#~ "версию?"
+
+#~ msgid "The task information has changed. Send an updated version?"
+#~ msgstr "Информация о задаче была изменена. Отправить обновлённую версию?"
+
+#~ msgid "Could not get article %s from NNTP server"
+#~ msgstr "Не удается получить статью %s с сервера NNTP"
+
+#, fuzzy
+#~ msgid "Error posting message: %s: message not posted"
+#~ msgstr ""
+#~ "Ошибка при автосохранении сообщения: %s\n"
+#~ " %s"
+
+#~ msgid "Stream error"
+#~ msgstr "Ошибка потока"
+
+#~ msgid "Connection error: %s"
+#~ msgstr "Ошибка соединения: %s"
+
+#~ msgid "Could not get group: %s"
+#~ msgstr "Не удается получить группу: %s"
+
+#, fuzzy
+#~ msgid "Could not get messages: unspecified error"
+#~ msgstr "Не удается получить сообщения: неуказанная ошибка"
+
+#~ msgid "Unknown server response: %s"
+#~ msgstr "Неизвестный ответ сервера: %s"
+
+#~ msgid "Adjust Score"
+#~ msgstr "Скорректировать вес"
+
+#~ msgid "Assign Color"
+#~ msgstr "Назначить цвет"
+
+#~ msgid "Assign Score"
+#~ msgstr "Назначить вес"
+
+#~ msgid "Attachments"
+#~ msgstr "Вложения"
+
+#~ msgid "Beep"
+#~ msgstr "Звуковой сигнал"
+
+#~ msgid "contains"
+#~ msgstr "содержит"
+
+#~ msgid "Copy to Folder"
+#~ msgstr "Копировать в папку"
+
+#~ msgid "Date received"
+#~ msgstr "Дата получения"
+
+#~ msgid "Date sent"
+#~ msgstr "Дата отправки"
+
+#~ msgid "Deleted"
+#~ msgstr "Удалённое"
+
+#~ msgid "does not contain"
+#~ msgstr "не содержит"
+
+#~ msgid "does not end with"
+#~ msgstr "не заканчивается на"
+
+#~ msgid "does not exist"
+#~ msgstr "не существует."
+
+#~ msgid "does not return"
+#~ msgstr "не возвращает"
+
+#~ msgid "does not sound like"
+#~ msgstr "звучит не как"
+
+#~ msgid "does not start with"
+#~ msgstr "не начинается с"
+
+#~ msgid "Do Not Exist"
+#~ msgstr "Не существует"
+
+#~ msgid "Draft"
+#~ msgstr "Черновик"
+
+#~ msgid "ends with"
+#~ msgstr "заканчивается на"
+
+#~ msgid "Exist"
+#~ msgstr "Существует"
+
+#~ msgid "exists"
+#~ msgstr "cуществуют"
+
+#~ msgid "Expression"
+#~ msgstr "Выражение"
+
+#~ msgid "Follow Up"
+#~ msgstr "К исполнению"
+
+#~ msgid "is"
+#~ msgstr "является"
+
+#~ msgid "is after"
+#~ msgstr "после"
+
+#~ msgid "is before"
+#~ msgstr "до"
+
+#~ msgid "is Flagged"
+#~ msgstr "отмечено"
+
+#~ msgid "is greater than"
+#~ msgstr "больше чем"
+
+#~ msgid "is less than"
+#~ msgstr "меньше чем"
+
+#~ msgid "is not"
+#~ msgstr "не является"
+
+#~ msgid "is not Flagged"
+#~ msgstr "не отмечено"
+
+#~ msgid "Junk Test"
+#~ msgstr "Проверка на спам"
+
+#~ msgid "Mailing list"
+#~ msgstr "Список рассылки"
+
+#~ msgid "Message Body"
+#~ msgstr "Тело сообщения"
+
+#~ msgid "Message Header"
+#~ msgstr "Заголовок сообщения"
+
+#~ msgid "Message is Junk"
+#~ msgstr "Это сообщение - спам"
+
+#~ msgid "Message is not Junk"
+#~ msgstr "Это сообщение - не спам"
+
+#~ msgid "Move to Folder"
+#~ msgstr "Переместить в папку"
+
+#, fuzzy
+#~ msgid "Pipe to Program"
+#~ msgstr "Выйти из программы"
+
+#~ msgid "Play Sound"
+#~ msgstr "Воспроизвести звук"
+
+#~ msgid "Recipients"
+#~ msgstr "Получатели"
+
+#~ msgid "Regex Match"
+#~ msgstr "Совпадение рег.выражения"
+
+#~ msgid "Replied to"
+#~ msgstr "В ответ на"
+
+#~ msgid "returns"
+#~ msgstr "возвращает"
+
+#~ msgid "returns greater than"
+#~ msgstr "возвращает больше чем"
+
+#~ msgid "returns less than"
+#~ msgstr "возвращает меньше чем"
+
+#, fuzzy
+#~ msgid "Run Program"
+#~ msgstr "Запустить программу:"
+
+#~ msgid "Sender"
+#~ msgstr "Отправитель"
+
+#~ msgid "Set Status"
+#~ msgstr "Установить состояние"
+
+#~ msgid "Size (kB)"
+#~ msgstr "Размер (кб)"
+
+#~ msgid "sounds like"
+#~ msgstr "звучит как"
+
+#~ msgid "Source Account"
+#~ msgstr "Исходная учетная запись"
+
+#~ msgid "Specific header"
+#~ msgstr "Специфичный заголовок"
+
+#~ msgid "starts with"
+#~ msgstr "начинается с"
+
+#~ msgid "Stop Processing"
+#~ msgstr "Остановить обработку"
+
+#~ msgid "Unset Status"
+#~ msgstr "Снять состояние"
+
+#~ msgid "Check _Incoming Mail"
+#~ msgstr "Проверять _входящую почту"
+
+#~ msgid "Use _Daemon"
+#~ msgstr "Использовать _демон"
+
+#~ msgid "_Local Tests Only"
+#~ msgstr "Только _локальные тесты"
+
+#~ msgid "Working"
+#~ msgstr "Обработка"
+
+#~ msgid "Brought to you by"
+#~ msgstr "Создана для вас"
+
+#~ msgid "_Filename:"
+#~ msgstr "_Имя файла:"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "Unknown error."
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Неизвестная ошибка."
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the component system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Ошибка системы компонентов:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the activation system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Ошибка системы активации:\n"
+#~ "%s"
+
+#~ msgid "Do you want to trust \"%s\" for the following purposes?"
+#~ msgstr "Доверять \"%s\" для следующих целей?"
+
+#~ msgid "View Certificate"
+#~ msgstr "Просмотр сертификата"
+
+#, fuzzy
+#~ msgid "You have been asked to trust a new Certificate Authority (CA)."
+#~ msgstr "Некорректная авторизация сертификата (CA)"
+
+#~ msgid "About Ximian Evolution..."
+#~ msgstr "О программе Ximian Evolution..."
+
+#~ msgid "_About Ximian Evolution..."
+#~ msgstr "_О программе Ximian Evolution..."
+
 #~ msgid "Evolution Addressbook folder viewer"
 #~ msgstr "Evolution Addressbook folder viewer"
 
@@ -19857,9 +19882,6 @@ msgstr "%s (%d%% выполнено)"
 #~ msgid "Primary _email:"
 #~ msgstr "_Эл. почта:"
 
-#~ msgid "S_pouse:"
-#~ msgstr "С_упруг(а):"
-
 #~ msgid "_Business:"
 #~ msgstr "Рабочий:"
 
@@ -19875,9 +19897,6 @@ msgstr "%s (%d%% выполнено)"
 #~ msgid "_Mobile:"
 #~ msgstr "Сотовый:"
 
-#~ msgid "_Office:"
-#~ msgstr "Ком_ната:"
-
 #~ msgid "_Public Calendar URL:"
 #~ msgstr "URI _публичного календаря:"
 
@@ -20494,9 +20513,6 @@ msgstr "%s (%d%% выполнено)"
 #~ msgid "Failed on message %d of %d"
 #~ msgstr "Сбой на сообщении %d из %d"
 
-#~ msgid "Changing junk status"
-#~ msgstr "Изменение статуса спама"
-
 #~ msgid "Search"
 #~ msgstr "Найти"
 
diff --git a/po/sk.po b/po/sk.po
index b3d3b056b0..6fe1335ec0 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.evolution-1-4-branch.sk\n"
-"POT-Creation-Date: 2004-05-19 14:00-0400\n"
+"POT-Creation-Date: 2004-06-03 11:14-0400\n"
 "PO-Revision-Date: 2003-09-26 13:48+0200\n"
 "Last-Translator: Stanislav Visnovsky <visnovsky@kde.org>\n"
 "Language-Team: Slovak <sk-i18n@linux.sk>\n"
@@ -65,14 +65,14 @@ msgstr "1 karta"
 msgid "Default Sync Address:"
 msgstr "Štandardná adresa pre synchronizáciu:"
 
-#: addressbook/conduit/address-conduit.c:1150
 #: addressbook/conduit/address-conduit.c:1151
+#: addressbook/conduit/address-conduit.c:1152
 #, fuzzy
 msgid "Could not load addressbook"
 msgstr "Nie je možné načítať %s: %s"
 
-#: addressbook/conduit/address-conduit.c:1219
-#: addressbook/conduit/address-conduit.c:1222
+#: addressbook/conduit/address-conduit.c:1220
+#: addressbook/conduit/address-conduit.c:1223
 msgid "Could not read pilot's Address application block"
 msgstr "Nie je možné prečítať blok aplikácie Adresa z pilota"
 
@@ -80,13 +80,13 @@ msgstr "Nie je možné prečítať blok aplikácie Adresa z pilota"
 msgid "Accessing LDAP Server anonymously"
 msgstr "Používam server LDAP anonymne"
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
 msgid "Failed to authenticate.\n"
 msgstr "Nepodarilo sa prihlásiť.\n"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sZadajte heslo pre %s (používateľ %s)"
@@ -132,52 +132,24 @@ msgstr "_Kontakty:"
 msgid "Create a new contacts group"
 msgstr "Vytvoriť novú skupinu skratiek"
 
-#: addressbook/gui/component/addressbook-component.c:182
+#: addressbook/gui/component/addressbook-component.c:184
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:483
-msgid "Failed to connect to LDAP server"
-msgstr "Nepodarilo sa pripojiť k serveru LDAP"
-
-#: addressbook/gui/component/addressbook-config.c:507
-msgid "Failed to authenticate with LDAP server"
-msgstr "Nepodarilo sa prihlásiť na IMAP serveri"
-
-#: addressbook/gui/component/addressbook-config.c:535
-msgid "Could not perform query on Root DSE"
-msgstr "Nepodarilo sa vykonať dotaz na koreňovom DSE"
-
-#: addressbook/gui/component/addressbook-config.c:840
-msgid "The server responded with no supported search bases"
-msgstr "Server odpovedal nepodporovanými databázami hľadania"
-
-#: addressbook/gui/component/addressbook-config.c:1245
-msgid "This server does not support LDAPv3 schema information"
-msgstr "Tento server nepodporuje informácie schém LDAPv3"
-
-#: addressbook/gui/component/addressbook-config.c:1266
-msgid "Error retrieving schema information"
-msgstr "Chyba pri načítavaní informácie zo schémy"
-
-#: addressbook/gui/component/addressbook-config.c:1274
-msgid "Server did not respond with valid schema information"
-msgstr "Server neodpovedal platnou informáciou o schéme"
-
 #: addressbook/gui/component/addressbook-migrate.c:68
-#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1160
 #, fuzzy
 msgid "Migrating..."
 msgstr "Čakám..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1201
 #, fuzzy, c-format
 msgid "Migrating `%s':"
 msgstr "Prehľadávam %s"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:438
+#: addressbook/gui/component/addressbook-migrate.c:464
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
 #: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
@@ -185,31 +157,31 @@ msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:446
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
-#: mail/mail-config.glade.h:106
+#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
+#: mail/mail-config.glade.h:109
 msgid "Personal"
 msgstr "Osobný"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:454
+#: addressbook/gui/component/addressbook-migrate.c:480
 #, fuzzy
 msgid "On LDAP Servers"
 msgstr "LDAP Server"
 
-#: addressbook/gui/component/addressbook-migrate.c:582
+#: addressbook/gui/component/addressbook-migrate.c:608
 #, fuzzy
 msgid "LDAP Servers"
 msgstr "LDAP Server"
 
-#: addressbook/gui/component/addressbook-migrate.c:702
+#: addressbook/gui/component/addressbook-migrate.c:728
 #, fuzzy
 msgid "Autocompletion Settings"
 msgstr "Priečinky automatického dopĺňania"
 
-#: addressbook/gui/component/addressbook-migrate.c:1076
+#: addressbook/gui/component/addressbook-migrate.c:1104
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -217,60 +189,55 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1090
+#: addressbook/gui/component/addressbook-migrate.c:1118
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1099
+#: addressbook/gui/component/addressbook-migrate.c:1127
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1109
+#: addressbook/gui/component/addressbook-migrate.c:1137
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:674
+#: addressbook/gui/component/addressbook-view.c:675
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:761
+#: addressbook/gui/component/addressbook-view.c:754
 #, fuzzy
 msgid "New Address Book"
 msgstr "Adresár"
 
-#: addressbook/gui/component/addressbook-view.c:762
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
+#: addressbook/gui/component/addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Odstrániť"
 
-#: addressbook/gui/component/addressbook-view.c:763
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-view.c:756
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Vlastnosti..."
 
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/addressbook-view.c:1002
+#. Create the contacts group
+#: addressbook/gui/component/addressbook-view.c:995
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
 #: calendar/gui/migration.c:373
 msgid "Contacts"
 msgstr "Kontakty"
@@ -351,10 +318,6 @@ msgid "Manage your S/MIME certificates here"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-msgid "  S_how Supported Bases "
-msgstr "Zobraziť _podporované základy"
-
-#: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -369,251 +332,212 @@ msgstr "Zobraziť _podporované základy"
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1:00"
-msgstr "1:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
-msgstr "5:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "Overenie"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
 #, fuzzy
 msgid "<b>Display</b>"
 msgstr "<b>Stav:</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 #, fuzzy
 msgid "<b>Downloading</b>"
 msgstr "_Miesto: "
 
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:10
 #, fuzzy
 msgid "<b>Searching</b>"
 msgstr "Hľadám"
 
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
 msgid "<b>Server Information</b>"
 msgstr "Krok 1. Informácie o serveri"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
 msgid "<b>Type:</b>"
 msgstr "<b>Termín:</b> "
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:13
 #, fuzzy
 msgid "Add Contacts Group"
 msgstr "_Kontakty:"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:14
 #, fuzzy
 msgid "Address Book Properties"
 msgstr "Zdroje adresára"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
-#: mail/mail-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
+#: mail/mail-config.glade.h:42
 msgid "Always"
 msgstr "Vždy"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr "Anonymne"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:17
 #: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Základné"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
-msgid "Connecting"
-msgstr "Pripojenie"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 #: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Detaily"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
-msgid "Distinguished _name:"
-msgstr "_Známe meno:"
-
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:19
 #, fuzzy
 msgid "Distinguished name"
 msgstr "_Známe meno:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:20
 #, fuzzy
 msgid "Download limit:"
 msgstr "Obmedzenie _sťahovania:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Email address"
 msgstr "Emailová adresa:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "Email address:"
-msgstr "Emailová adresa:"
-
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "Evolution will use this DN to authenticate you with the server"
-msgstr "Evolution použije tento DN pre prihlásenie na váš server"
-
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:22
+#, fuzzy
 msgid ""
-"Evolution will use this email address to authenticate you with the server"
+"Evolution will use this email address to authenticate you with the server."
 msgstr "Evolution použije túto e-mailovú adresu pre prihlásenie na váš server"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:23
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Podporované databáze hľadania"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:24
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
+#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Všeobecné"
 
-#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
-#: mail/mail-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
+#: mail/mail-config.glade.h:102
 msgid "Never"
 msgstr "Nikdy"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
-msgid "One"
-msgstr "Jeden"
-
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:35
-msgid "S_earch scope: "
-msgstr "_Rozsah hľadania:"
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Search _base:"
+msgstr "_Oblasť hľadania:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
 msgid "Search base only"
 msgstr "_Oblasť hľadania:"
 
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:29
 #, fuzzy
 msgid "Search base:"
 msgstr "_Oblasť hľadania:"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Search scope:"
 msgstr "_Rozsah hľadania:"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
-msgid "Searching"
-msgstr "Hľadám"
-
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:31
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
-"server if\n"
-"your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL or TLS."
 msgstr ""
 "Výber tejto voľby znamená, že Evolution bude váš server LDAP\n"
 "používať iba ak sever podporuje SSL alebo TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a \n"
-"insecure environment. For example, if you and your LDAP server are behind a "
-"firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection "
-"is already\n"
-"secure."
+"you are in a insecure environment. For example, if you and your LDAP server "
+"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
+"because your connection is already secure."
 msgstr ""
 "Zapnutie tejto voľby znamená, že Evolution sa bude pokúšať použiť\n"
 "SSL/TLS iba v nezabezpečenom prostredí. napríklad, ak je váš\n"
 "server LDAP za firewallom, Evolution nemusí tieto protokoly používať,\n"
 "pretože vaše spojenie už zabezpečené je."
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:33
+#, fuzzy
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
-"TLS.  This \n"
-"means that your connection will be insecure, and that you will be vulnerable "
-"to security\n"
-"exploits. "
+"TLS.  This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits. "
 msgstr ""
 "Táto voľba znamená, že váš server nepodporuje ani SSL ani TLS.\n"
 "Preto bude vaše spojenie nezabezpečené proti útokom."
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Sub"
-msgstr "Pod"
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr "Podporované databáze hľadania"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
-"searches will \n"
-"begin. If you leave this blank, the search will begin at the root of the "
-"directory tree."
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
 msgstr ""
 "Základ hľadania je dobre známe meno (distinquished name DN)\n"
 "položky, kde hľadanie začne. Ak ho necháte prázdne, bude sa\n"
 "hľadať v celom adresárovom strome."
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:37
+#, fuzzy
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
-"the \n"
-"directory tree. A search scope of \"sub\" will include all entries below "
-"your search base.\n"
-"A search scope of \"one\" will only include the entries one level beneath "
-"your base.\n"
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
 msgstr ""
 "Rozsah hľadania určuje, ako hlboko sa pri hľadaní môže v strome\n"
 "zostúpiť. Rozsah \"Pod\" znamená vo všetkých položkách podstromu\n"
@@ -621,23 +545,22 @@ msgstr ""
 "Rozsah hľadania \"jedna\" zahrnie iba položky, ktoré sú jednu úroveň\n"
 "pod vašim základnom hľadania.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:58
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "Toto je plné meno vášho serveru LDAP. Napríklad \"ldap.mojafirma.sk\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:39
 #, fuzzy
 msgid ""
-"This is the maximum number of entries to download. Setting this number to "
-"be \n"
+"This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr ""
 "Toto je maximálny počet sťahovaných kariet. Ak nastavíte príliš veľké číslo, "
 "tento adresár bude pomalý."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -646,142 +569,121 @@ msgstr ""
 "Toto je metóda, ktorú Evolution použije pre prihlásenie. Uvedmte si, že "
 "použitie voľby \"E-mailová adresa\" vyžaduje anonymný prístup k serveru LDAP."
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:41
+#, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
-"list.\n"
-"It is for display purposes only. "
+"list. It is for display purposes only. "
 msgstr ""
 "Toto meno sa bude identifikovať tento server v zozname priečinkov "
 "Evolution.\n"
 "Používa sa iba na zobrazovanie."
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:42
+#, fuzzy
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. "
-"A \n"
-"list of standard ports has been provided. Ask your system administrator\n"
-"what port you should specify."
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
 msgstr ""
 "Toto je port serveru LDAP, ku ktorému sa Evolution pokúsi pripojiť.\n"
 "Zoznam štandardných portov je predvyplnený. Číslo portu by vám\n"
 "mal poskytnúť váš administrátor."
 
-#: addressbook/gui/component/ldap-config.glade.h:67
-msgid "This option controls how long a search will be run."
-msgstr "Táto voľba učuje, ako dlho môže hľadanie prebiehať."
-
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:43
 #, fuzzy
 msgid "Timeout:"
 msgstr "Formát času:"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
-msgid "U_se SSL/TLS:"
-msgstr "Použiť _SSL/TLS:"
-
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr "Použiť známe meno (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr "Použiť e-mailovú adresu"
 
-#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
-#: mail/mail-config.glade.h:154
+#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
+#: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr "Ak je to možné"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:47
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "_Kontakty:"
 
-#: addressbook/gui/component/ldap-config.glade.h:74
-#: calendar/gui/dialogs/calendar-setup.glade.h:12
-msgid "_Display name:"
-msgstr "Meno pre zo_brazenie:"
-
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr "Obmedzenie _sťahovania:"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
 msgid "_Email address:"
 msgstr "Emailová adresa:"
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:50
+#, fuzzy
+msgid "_Find Possible Search Bases"
+msgstr "Podporované databáze hľadania"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Log in method:"
 msgstr "Spôsob _prihlásenia:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "_Log in:"
+msgstr "Prihlásenie"
+
+#: addressbook/gui/component/ldap-config.glade.h:53
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
 msgid "_Name:"
 msgstr "_Meno:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
-msgid "_Port number:"
-msgstr "_Port:"
-
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "_Port:"
 msgstr "_Priorita:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
-msgid "_Search base:"
-msgstr "_Oblasť hľadania:"
-
-#: addressbook/gui/component/ldap-config.glade.h:82
-msgid "_Server name:"
-msgstr "_Meno serveru:"
+#: addressbook/gui/component/ldap-config.glade.h:55
+#, fuzzy
+msgid "_Search scope:"
+msgstr "_Rozsah hľadania:"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:56
 #, fuzzy
 msgid "_Server:"
 msgstr "S_erver:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
-msgid "_Timeout (minutes):"
-msgstr "Ča_kanie (minúty):"
+#: addressbook/gui/component/ldap-config.glade.h:57
+#, fuzzy
+msgid "_Timeout:"
+msgstr "Formát času:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:58
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "Použiť _bezpečné pripojenie (SSL):"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "karty"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
-msgid "connecting-tab"
-msgstr "connecting-tab"
-
-#: addressbook/gui/component/ldap-config.glade.h:88
-msgid "general-tab"
-msgstr "general-tab"
-
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:60
 #: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
-#: mail/mail-config.glade.h:182
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "minút"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
-msgid "searching-tab"
-msgstr "searching-tab"
-
-#: addressbook/gui/component/select-names/e-select-names.c:497
+#: addressbook/gui/component/select-names/e-select-names.c:503
 #: addressbook/gui/component/select-names/select-names.glade.h:6
 #, fuzzy
 msgid "Select Contacts from Address Book"
 msgstr "Vyberte kontakty z adresára"
 
-#: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
@@ -821,7 +723,7 @@ msgstr "Kontakt bez mena"
 
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:222
+#: addressbook/gui/widgets/e-addressbook-view.c:224
 msgid "Source"
 msgstr "Zdroj"
 
@@ -900,9 +802,9 @@ msgid "<b>Work</b>"
 msgstr "Pracovný týždeň"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
-#: addressbook/gui/widgets/eab-contact-display.c:342
-#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/widgets/eab-contact-display.c:334
+#: addressbook/gui/widgets/eab-contact-display.c:353
 msgid "AIM"
 msgstr ""
 
@@ -943,15 +845,15 @@ msgid "Company:"
 msgstr "Firma"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:271
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
+#: addressbook/gui/contact-editor/e-contact-editor.c:266
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
 msgstr "Kontakt"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1527
+#: addressbook/gui/contact-editor/e-contact-editor.c:520
 msgid "Contact Editor"
 msgstr "Editor kontaktov"
 
@@ -975,83 +877,80 @@ msgid "Full _Name..."
 msgstr "_Celé meno..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:202
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-msgid "Home"
-msgstr "Domov"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #, fuzzy
 msgid "Home Page:"
 msgstr "Domáci fax"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-#, fuzzy
-msgid "Job title:"
-msgstr "Činnosť/po_zícia:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/e-itip-control.c:936
-msgid "Location:"
-msgstr "Umiestnenie:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 #, fuzzy
 msgid "MSN Messenger"
 msgstr "_Poslať správu"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 #, fuzzy
 msgid "Mailing Address"
 msgstr "Zliať e-mailovú adresu"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 #, fuzzy
 msgid "Manager:"
 msgstr "Vedúci"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "Pre_zývka:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Notes:"
 msgstr "_Poznámky:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
-#: addressbook/gui/contact-editor/e-contact-editor.c:203
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-msgid "Other"
-msgstr "Iné"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#, fuzzy
+msgid "Office:"
+msgstr "Prac_ovisko:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "PO Box:"
 msgstr "_PO Box:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 #, fuzzy
 msgid "Personal Information"
 msgstr "Nepovinné informácie"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 #, fuzzy
 msgid "Profession:"
 msgstr "_Povolanie:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#, fuzzy
+msgid "Spouse:"
+msgstr "Ma_nžel(ka):"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "State/Province:"
 msgstr "_Štát/Provincia:"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#, fuzzy
+msgid "Title:"
+msgstr "_Titul:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+msgid "Video Chat:"
+msgstr ""
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:41
 #, fuzzy
 msgid "Wants to receive HTML mail"
@@ -1059,15 +958,15 @@ msgstr "Chce prijímať poštu ako _HTML"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:42
 #, fuzzy
-msgid "Webcam:"
-msgstr "Strana"
+msgid "Web Log:"
+msgstr "Adresa _WWW stránky:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
-#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
-#: mail/mail-config.glade.h:155
+#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
+#: mail/mail-config.glade.h:157
 msgid "Work"
 msgstr "Zamestnanie"
 
@@ -1087,19 +986,12 @@ msgid "_File under:"
 msgstr "Meno súboru:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 #, fuzzy
 msgid "_Where:"
 msgstr "S_erver:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
-msgid "item7"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
-msgid "item8"
-msgstr ""
-
-#: addressbook/gui/contact-editor/eab-editor.c:316
+#: addressbook/gui/contact-editor/eab-editor.c:315
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -1107,23 +999,23 @@ msgstr ""
 "Naozaj chcete odstrániť\n"
 "tieto kontakty?"
 
-#: addressbook/gui/contact-editor/eab-editor.c:319
+#: addressbook/gui/contact-editor/eab-editor.c:318
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
 msgstr "Naozaj chcete odstrániť tento kontakt?"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:351
-#: addressbook/gui/widgets/eab-contact-display.c:372
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Address"
 msgstr "Adresa"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:292
+#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard.c:174
@@ -2108,91 +2000,114 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/contact-editor/e-contact-editor.c:179
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:337
+#: addressbook/gui/widgets/eab-contact-display.c:356
 #, fuzzy
 msgid "Jabber"
 msgstr "Zoznam bez mena"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:347
-#: addressbook/gui/widgets/eab-contact-display.c:366
+#: addressbook/gui/contact-editor/e-contact-editor.c:180
+#: addressbook/gui/widgets/eab-contact-display.c:339
+#: addressbook/gui/widgets/eab-contact-display.c:358
 #, fuzzy
 msgid "Yahoo"
 msgstr "Yoro"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: addressbook/gui/widgets/eab-contact-display.c:338
+#: addressbook/gui/widgets/eab-contact-display.c:357
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:344
-#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#: addressbook/gui/widgets/eab-contact-display.c:355
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/contact-editor/e-contact-editor.c:183
 #, fuzzy
 msgid "GroupWise"
 msgstr "Skupina"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+msgid "Home"
+msgstr "Domov"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+msgid "Other"
+msgstr "Iné"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
 #, fuzzy
 msgid "Source Book"
 msgstr "Zdroj"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:264
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:278
+#: addressbook/gui/contact-editor/e-contact-editor.c:273
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Nový kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:285
+#: addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Writable Fields"
 msgstr "Zapisovateľné polia"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:299
+#: addressbook/gui/contact-editor/e-contact-editor.c:294
 msgid "Changed"
 msgstr "Zmenené"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
-msgid "Category editor not available."
-msgstr "Editor kategórií nie je k dispozícii."
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:2352
 msgid "This contact belongs to these categories:"
 msgstr "Tento kontakt patrí do týchto kategórií:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#: addressbook/gui/contact-editor/e-contact-editor.c:2429
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Prosím, vyberte si z týchto možností"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#: addressbook/gui/contact-editor/e-contact-editor.c:2433
 #, fuzzy
 msgid "No image"
 msgstr "Nome"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#: addressbook/gui/contact-editor/e-contact-editor.c:2636
 #, fuzzy
 msgid ""
-"The following entries are invalid:\n"
+"The contact data is invalid:\n"
 "\n"
-msgstr "Tieto spojenia sú momentálne aktívne:"
+msgstr "Dátum opakovania je neplatný"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2738
-#, c-format
-msgid "Could not find widget for a field: `%s'"
-msgstr "Nie je možné nájsť prvok pre pole: `%s'"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#, fuzzy
+msgid "Invalid contact."
+msgstr "Neplatný účel"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+msgid ""
+"The contact cannot be saved to the selected address book. Do you want to "
+"discard changes?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2727
+#: addressbook/gui/contact-editor/e-contact-editor.c:2751
+msgid "_Discard"
+msgstr "_Zahodiť"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+msgid ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
+msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:62
 #, fuzzy
@@ -2229,7 +2144,7 @@ msgid "_Edit Full"
 msgstr "_Upraviť celé"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:166
 msgid "_Full Name:"
 msgstr "_Celé meno:"
 
@@ -2378,30 +2293,30 @@ msgstr "Meno _zoznamu:"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "Za_dajte emailovú adresu, alebo do zoznamu pretiahnite kontakt myšou:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "contact-list-editor"
 msgstr "editor-zoznamu-kontaktov"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:153
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:215
+#: addressbook/gui/widgets/e-addressbook-view.c:217
 #: addressbook/gui/widgets/e-minicard-view.c:460
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Kniha"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
 msgid "Is New List"
 msgstr "Je nový zoznam"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:215
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
 msgid "Contact List Editor"
 msgstr "Editor zoznamu kontaktov"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:438
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
 msgid "Save List as VCard"
 msgstr "Uložiť zoznam ako VCard"
 
@@ -2448,128 +2363,128 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Pokročilé hľadanie"
 
-#: addressbook/gui/widgets/eab-contact-display.c:129
-#: addressbook/gui/widgets/eab-contact-display.c:192
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:139
-#: addressbook/gui/widgets/eab-contact-display.c:205
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:257
-#: addressbook/gui/widgets/eab-contact-display.c:533
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:525
 #, fuzzy
 msgid "List Members"
 msgstr "Členovia"
 
-#: addressbook/gui/widgets/eab-contact-display.c:329
-#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/eab-contact-display.c:321
+#: addressbook/gui/widgets/eab-contact-display.c:323
 #, fuzzy
 msgid "E-mail"
 msgstr "E-mail"
 
-#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/eab-contact-display.c:332
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organizácia"
 
-#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:333
 #, fuzzy
 msgid "Position"
 msgstr "Boston"
 
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:354
 #, fuzzy
 msgid "Groupwise"
 msgstr "Skupina"
 
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:340
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:349
-#: addressbook/gui/widgets/eab-contact-display.c:370
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:362
 #, fuzzy
 msgid "Phone"
 msgstr "Ponce"
 
-#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:342
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:354
+#: addressbook/gui/widgets/eab-contact-display.c:346
 #, fuzzy
 msgid "work"
 msgstr "Zamestnanie"
 
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:359
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:368
-#: addressbook/gui/widgets/eab-contact-display.c:587
+#: addressbook/gui/widgets/eab-contact-display.c:360
+#: addressbook/gui/widgets/eab-contact-display.c:579
 #, fuzzy
 msgid "Blog"
 msgstr "Boloňa"
 
-#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/eab-contact-display.c:363
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Mobil"
 
-#: addressbook/gui/widgets/eab-contact-display.c:375
+#: addressbook/gui/widgets/eab-contact-display.c:367
 #, fuzzy
 msgid "personal"
 msgstr "Osobný"
 
-#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/eab-contact-display.c:374
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Poznámka"
 
-#: addressbook/gui/widgets/eab-contact-display.c:548
+#: addressbook/gui/widgets/eab-contact-display.c:540
 #, fuzzy
 msgid "Job Title"
 msgstr "Činnosť/po_zícia:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/eab-contact-display.c:544
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:774
+#: smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "E-mail"
 
-#: addressbook/gui/widgets/eab-contact-display.c:579
+#: addressbook/gui/widgets/eab-contact-display.c:571
 #, fuzzy
 msgid "Home page"
 msgstr "Domáci fax"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 msgid "Success"
 msgstr "Úspech"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Backend busy"
 msgstr ""
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Repository offline"
 msgstr "Sklad off-line"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 #, fuzzy
 msgid "Address Book does not exist"
 msgstr "Adresár neexistuje"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 #, fuzzy
 msgid "No Self Contact defined"
 msgstr "Nový zoznam kontaktov"
@@ -2577,29 +2492,29 @@ msgstr "Nový zoznam kontaktov"
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Permission denied"
 msgstr "Prístup zamietnutý"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:57
 #, fuzzy
 msgid "Contact not found"
 msgstr "Karta nenájdená"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: addressbook/gui/widgets/eab-gui-util.c:58
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "ID karty už existuje"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Protocol not supported"
 msgstr "Protokol nepodporovaný"
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:60
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:233
 #: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
@@ -2612,39 +2527,39 @@ msgid "Cancelled"
 msgstr "Zrušený"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:61
 #, fuzzy
 msgid "Could not cancel"
 msgstr "Nie je možné otvoriť zdieľaný priečinok: %s."
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Authentication Failed"
 msgstr "Overenie zlyhalo"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Authentication Required"
 msgstr "Vyžadované overenie"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:66
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "TLS not Available"
 msgstr "TLS nie je k dispozícii"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#: addressbook/gui/widgets/eab-gui-util.c:66
 #, fuzzy
 msgid "No such source"
 msgstr "Taká správa neexistuje"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:69
+#: addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Other error"
 msgstr "Iná chyba"
 
-#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:90
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
@@ -2653,7 +2568,7 @@ msgstr ""
 "Nebolo možné otvoriť tento adresár. Prosím, overte, že cesta\n"
 "existuje a že máte dostatočné práva."
 
-#: addressbook/gui/widgets/eab-gui-util.c:110
+#: addressbook/gui/widgets/eab-gui-util.c:97
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -2662,18 +2577,18 @@ msgstr ""
 "Nebolo možné otvoriť tento adresár. To buď znamená, že ste\n"
 "zadali neplatné URI, alebo LDAP server nefunguje."
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:102
 #, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution you must compile the program from the CVS "
-"sources after retrieving OpenLDAP from the link below."
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
 msgstr ""
 "Táto verzia Evolution nemá zakompilovanú podporu LDAP.\n"
 "Ak chcete LDAP v Evolution používať, musíte ho prekompilovať\n"
 "z CVS po získaní OpenLDAP z tohto odkazu.\n"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:109
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -2682,11 +2597,7 @@ msgstr ""
 "Nebolo možné otvoriť tento adresár. To buď znamená, že ste\n"
 "zadali neplatné URI, alebo server nefunguje."
 
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "Unable to open addressbook"
-msgstr "Nie je možné otvoriť adresár"
-
-#: addressbook/gui/widgets/eab-gui-util.c:162
+#: addressbook/gui/widgets/eab-gui-util.c:129
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2698,7 +2609,7 @@ msgstr ""
 "dotaz alebo zvýšte obmedzenie v nastavení adresárového\n"
 "serveru pre tento adresár."
 
-#: addressbook/gui/widgets/eab-gui-util.c:168
+#: addressbook/gui/widgets/eab-gui-util.c:135
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -2709,56 +2620,48 @@ msgstr ""
 "alebo pre tento adresár. Prosím, upresnite hľadanie alebo zvýšte\n"
 "časový limit v nastavení adresárového serveru pre tento adresár."
 
-#: addressbook/gui/widgets/eab-gui-util.c:174
+#: addressbook/gui/widgets/eab-gui-util.c:141
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "Podpora tohto adresára nedokázala spracovať tento dotaz."
 
-#: addressbook/gui/widgets/eab-gui-util.c:177
+#: addressbook/gui/widgets/eab-gui-util.c:144
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Podpora tohto adresára odmietla vykonať tento dotaz."
 
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:147
 msgid "This query did not complete successfully."
 msgstr "Tento dotaz nebol dokončený úspešne."
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
-msgid "Do you want to save changes?"
-msgstr "Chcete uložiť zmeny?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:208
-msgid "_Discard"
-msgstr "_Zahodiť"
-
-#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:169
 msgid "Error adding list"
 msgstr "Chyba pri pridávaní zoznamu"
 
-#: addressbook/gui/widgets/eab-gui-util.c:229
-#: addressbook/gui/widgets/eab-gui-util.c:652
+#: addressbook/gui/widgets/eab-gui-util.c:169
+#: addressbook/gui/widgets/eab-gui-util.c:580
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Chyba pri pridávaní karty"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying list"
 msgstr "Chyba pri zmene zoznamu"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Chyba pri zmene karty"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:192
 msgid "Error removing list"
 msgstr "Chyba pri odstraňovaní zoznamu"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
-#: addressbook/gui/widgets/eab-gui-util.c:610
+#: addressbook/gui/widgets/eab-gui-util.c:192
+#: addressbook/gui/widgets/eab-gui-util.c:538
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Chyba pri odstraňovaní karty"
 
-#: addressbook/gui/widgets/eab-gui-util.c:334
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, fuzzy, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2767,7 +2670,7 @@ msgstr ""
 "Požadujete, aby sa %d kariet otvorilo v %d nových oknách.\n"
 "Naozaj chcete zobraziť všetky tieto karty?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:360
+#: addressbook/gui/widgets/eab-gui-util.c:300
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2776,54 +2679,49 @@ msgstr ""
 "%s už existuje.\n"
 "Chcete ho prepísať?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:364
+#: addressbook/gui/widgets/eab-gui-util.c:304
 msgid "Overwrite"
 msgstr "Prepísať"
 
-#: addressbook/gui/widgets/eab-gui-util.c:400
-#, c-format
-msgid "Error saving %s: %s"
-msgstr "Chyba pri ukladaní %s: %s"
-
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:437
+#: addressbook/gui/widgets/eab-gui-util.c:365
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:571
+#: addressbook/gui/widgets/eab-gui-util.c:499
 msgid "list"
 msgstr "zoznam"
 
-#: addressbook/gui/widgets/eab-gui-util.c:706
+#: addressbook/gui/widgets/eab-gui-util.c:634
 #, fuzzy
 msgid "Move contact to"
 msgstr "Presunúť kartu do"
 
-#: addressbook/gui/widgets/eab-gui-util.c:708
+#: addressbook/gui/widgets/eab-gui-util.c:636
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Kopírovať kartu do"
 
-#: addressbook/gui/widgets/eab-gui-util.c:711
+#: addressbook/gui/widgets/eab-gui-util.c:639
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Presunúť karty do"
 
-#: addressbook/gui/widgets/eab-gui-util.c:713
+#: addressbook/gui/widgets/eab-gui-util.c:641
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Kopírovať karty do"
 
-#: addressbook/gui/widgets/eab-gui-util.c:716
+#: addressbook/gui/widgets/eab-gui-util.c:644
 #, fuzzy
 msgid "Select target addressbook."
 msgstr "Vyberte kontakty z adresára"
 
-#: addressbook/gui/widgets/eab-gui-util.c:939
+#: addressbook/gui/widgets/eab-gui-util.c:867
 msgid "Multiple VCards"
 msgstr "Viacero VKariet"
 
-#: addressbook/gui/widgets/eab-gui-util.c:942
+#: addressbook/gui/widgets/eab-gui-util.c:870
 #, c-format
 msgid "VCard for %s"
 msgstr "VKartapre %s"
@@ -2914,7 +2812,7 @@ msgstr[1] "Kontakty"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:229
+#: addressbook/gui/widgets/e-addressbook-view.c:231
 #: addressbook/gui/widgets/e-minicard-view.c:467
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
@@ -2932,146 +2830,135 @@ msgstr "Model"
 msgid "Error modifying card"
 msgstr "Chyba pri zmene karty"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:163
 msgid "Name begins with"
 msgstr "Meno začína na"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:164
 msgid "Email begins with"
 msgstr "E-mail končí na"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:57
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Kategória je"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-#: calendar/gui/cal-search-bar.c:50
+#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Ľubovoľné pole obsahuje"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+#: addressbook/gui/widgets/e-addressbook-view.c:172
 msgid "Advanced..."
 msgstr "Pokročilé..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:236
+#: addressbook/gui/widgets/e-addressbook-view.c:238
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:249
+#: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Typ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:506
+#: addressbook/gui/widgets/e-addressbook-view.c:508
 #, fuzzy
 msgid "Address Book"
 msgstr "Adresár"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2076
+#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:2080
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
 msgstr "Uložiť ako VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 msgid "New Contact..."
 msgstr "Nový kontakt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "New Contact List..."
 msgstr "Nový zoznam kontaktov..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Go to Folder..."
 msgstr "Prejsť do priečinku..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Import..."
 msgstr "Importovať..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1066
 msgid "Search for Contacts..."
 msgstr "Hľadať kontakty..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Zdroje adresára..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1069
 msgid "Pilot Settings..."
 msgstr "Nastavenie pilota..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Predať ďalej kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
 msgid "Send Message to Contact"
 msgstr "Poslať správu kontaktu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Tlačiť"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
+#: addressbook/gui/widgets/e-addressbook-view.c:1077
 msgid "Print Envelope"
 msgstr "Tlačiť obálku"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
+#: addressbook/gui/widgets/e-addressbook-view.c:1081
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Adresár..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1080
+#: addressbook/gui/widgets/e-addressbook-view.c:1082
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Adresár..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Vystrihnúť"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopírovať"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1087
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Vložiť"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:1092
+#: calendar/gui/e-calendar-view.c:1280
 msgid "Current View"
 msgstr "Aktuálny pohľad"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1309
-#, c-format
-msgid ""
-"The addressbook backend for\n"
-"%s\n"
-"has crashed. You will have to restart Evolution in order to use it again"
-msgstr ""
-"Adresárové rozhranie pre\n"
-"%s\n"
-"spadlo. Aby ste ho mohli znovu použiť, musíte Evolution reštartovať."
-
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1667
-#: calendar/gui/cal-search-bar.c:362
+#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Ľubovoľná kategória"
 
@@ -3180,7 +3067,7 @@ msgstr "Rádio"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-list-view.c:234
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Rola"
@@ -3324,13 +3211,13 @@ msgstr "Import formátu VCard do Evolution"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: addressbook/printing/e-contact-print.c:998
+#: addressbook/printing/e-contact-print.c:1000
 #, fuzzy
 msgid "Print contacts"
 msgstr "Tlačiť vybrané kontakty"
 
-#: addressbook/printing/e-contact-print.c:1064
-#: addressbook/printing/e-contact-print.c:1091
+#: addressbook/printing/e-contact-print.c:1066
+#: addressbook/printing/e-contact-print.c:1093
 #, fuzzy
 msgid "Print contact"
 msgstr "Tlačiť vybrané kontakty"
@@ -3583,17 +3470,22 @@ msgstr ""
 msgid "Impossible internal error."
 msgstr "Interná chyba"
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:629
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
 #, fuzzy
 msgid "Can not open file"
 msgstr "Nie je možné otvoriť správu"
 
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
 #, fuzzy
-msgid "Can not load URI"
-msgstr "Karta nenájdená"
+msgid "Couldn't get list of addressbooks"
+msgstr "Nie je možné načítať %s: %s"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Nie je možné otvoriť adresár"
 
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
@@ -3611,7 +3503,7 @@ msgstr "Nezadané meno súboru."
 msgid "Unnamed List"
 msgstr "Zoznam bez mena"
 
-#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 #, fuzzy
 msgid "Enter password"
@@ -3892,10 +3784,10 @@ msgid "Whether to show week numbers in date navigator"
 msgstr "Zobraziť čí_sla týždňov v navigárovi dátumov"
 
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:88
-#: calendar/gui/gnome-cal.c:1703
-#: camel/providers/groupwise/camel-gw-listener.c:304
-#: camel/providers/groupwise/camel-gw-listener.c:327
+#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/gnome-cal.c:1705
+#: camel/providers/groupwise/camel-gw-listener.c:311
+#: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
 msgstr "Kalendár"
 
@@ -3918,7 +3810,7 @@ msgstr "vráti menej než"
 
 #: calendar/gui/calendar-commands.c:363
 #: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:19 filter/filter.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
 msgid "days"
 msgstr "dní"
 
@@ -4071,24 +3963,24 @@ msgstr "Týždeň"
 msgid "Month View"
 msgstr "Mesiac"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Súhrn obsahuje"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Popis obsahuje"
 
-#: calendar/gui/cal-search-bar.c:54
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Komentár obsahuje"
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:53
 #, fuzzy
 msgid "Location contains"
 msgstr "Popis obsahuje"
 
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
 msgid "Unmatched"
 msgstr "Nenájdené"
 
@@ -4109,23 +4001,23 @@ msgstr "Prístup zamietnutý pri otváraní kalendára"
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:466
+#: calendar/gui/dialogs/alarm-options.c:467
 msgid "Audio Alarm Options"
 msgstr "Zvukové alarmy"
 
-#: calendar/gui/dialogs/alarm-options.c:475
+#: calendar/gui/dialogs/alarm-options.c:476
 msgid "Message Alarm Options"
 msgstr "Alarmy správami"
 
-#: calendar/gui/dialogs/alarm-options.c:484
+#: calendar/gui/dialogs/alarm-options.c:485
 msgid "Email Alarm Options"
 msgstr "Možnosti e-mailového alarmu"
 
-#: calendar/gui/dialogs/alarm-options.c:493
+#: calendar/gui/dialogs/alarm-options.c:494
 msgid "Program Alarm Options"
 msgstr "Programové alarmy"
 
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:510
 msgid "Unknown Alarm Options"
 msgstr "Neznáme alarmy"
 
@@ -4163,7 +4055,7 @@ msgstr "Adresát:"
 msgid "With these arguments:"
 msgstr "S týmito argumentami:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
 msgid "dialog1"
 msgstr "dialog1"
 
@@ -4172,7 +4064,7 @@ msgid "extra times every"
 msgstr "extra oprakovanie každých"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:20 filter/filter.glade.h:16
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr "hodín"
 
@@ -4219,7 +4111,7 @@ msgstr "Poslať e-mail"
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Súhrn:"
 
@@ -4249,7 +4141,6 @@ msgid "hour(s)"
 msgstr "hodín"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:21
 msgid "minute(s)"
 msgstr "minút"
 
@@ -4257,27 +4148,27 @@ msgstr "minút"
 msgid "start of appointment"
 msgstr "začiatok schôdzky"
 
-#: calendar/gui/dialogs/calendar-setup.c:170
+#: calendar/gui/dialogs/calendar-setup.c:172
 #, fuzzy
 msgid "You must specify a location to get the calendar from."
 msgstr "Musíte zadať meno súboru."
 
-#: calendar/gui/dialogs/calendar-setup.c:178
+#: calendar/gui/dialogs/calendar-setup.c:180
 #, fuzzy, c-format
 msgid "The source location '%s' is not well-formed."
 msgstr "Metódy potrebná pre načítanie `%s' nie je podporovaná"
 
-#: calendar/gui/dialogs/calendar-setup.c:193
+#: calendar/gui/dialogs/calendar-setup.c:195
 #, c-format
 msgid "The source location '%s' is not a webcal source."
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:265
+#: calendar/gui/dialogs/calendar-setup.c:275
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:278
+#: calendar/gui/dialogs/calendar-setup.c:288
 #, c-format
 msgid ""
 "The group '%s' is remote. You must specify a location to get the calendar "
@@ -4299,60 +4190,35 @@ msgstr "Zoznam úloh"
 msgid "C_olor:"
 msgstr "_Farby"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-#, fuzzy
-msgid "Calendar Properties"
-msgstr "Chyba iCalendar"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
 msgid "Pick a color"
 msgstr "Vyberte farbu"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:8
-#, fuzzy
-msgid "Remote"
-msgstr "Odstrániť"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-#, fuzzy
-msgid "Task List Properties"
-msgstr "Zoznam úloh"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
 #, fuzzy
 msgid "_Add Calendar"
 msgstr "Nová Kaledónia"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
 #, fuzzy
 msgid "_Add Group"
 msgstr "_Pridať skupinu..."
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-#, fuzzy
-msgid "_Refresh Interval:"
-msgstr "Obnoviť zoznam"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
 #, fuzzy
 msgid "_Refresh:"
 msgstr "Aktualizovať"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-#, fuzzy
-msgid "_Source URL:"
-msgstr "Zdrojové URI pre POP"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
 #, fuzzy
 msgid "_Type:"
 msgstr "Typ:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
 msgid "_URL:"
 msgstr "_URL:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
 msgid "weeks"
 msgstr "týždňov"
 
@@ -4462,7 +4328,7 @@ msgid "Display"
 msgstr "_Zobrazenie"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:76
 msgid "E_nable"
 msgstr "_Povoliť"
 
@@ -4473,7 +4339,7 @@ msgstr "Požiadavka na informácie o voľnom čase"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:563
+#: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Piatok"
 
@@ -4487,7 +4353,7 @@ msgstr "Minúty"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:559
+#: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Pondelok"
 
@@ -4497,7 +4363,7 @@ msgstr "_Ne"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:564
+#: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Sobota"
 
@@ -4511,7 +4377,7 @@ msgstr "Zobraziť čí_sla týždňov v navigárovi dátumov"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Nedeľa"
 
@@ -4525,7 +4391,7 @@ msgstr "Š_tv"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:562
+#: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Štvrtok"
 
@@ -4539,7 +4405,7 @@ msgstr "Formát času:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:560
+#: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Utorok"
 
@@ -4549,7 +4415,7 @@ msgstr "_Týždeň začína:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:561
+#: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Streda"
 
@@ -4583,7 +4449,7 @@ msgid "_Day begins:"
 msgstr "_Deň začína:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
-#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:43
@@ -4632,80 +4498,46 @@ msgstr "_Str"
 msgid "before every appointment"
 msgstr "pred každou schôdzkou"
 
-#: calendar/gui/dialogs/cancel-comp.c:57
-msgid ""
-"The event being deleted is a meeting, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"Odstraňovaná udalosť je schôdzka. Chcete poslať oznámenie o jej zrušení?"
-
-#: calendar/gui/dialogs/cancel-comp.c:60
-msgid "Are you sure you want to cancel and delete this meeting?"
-msgstr "Naozaj chcete zrušiť a odstrániť toto stretnutie?"
-
-#: calendar/gui/dialogs/cancel-comp.c:66
-msgid ""
-"The task being deleted is assigned, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"Odstraňovaná úloha je priradená. Chcete poslať oznámenie o jej zrušení?"
-
-#: calendar/gui/dialogs/cancel-comp.c:69
-msgid "Are you sure you want to cancel and delete this task?"
-msgstr "Naozaj chcete zrušiť a odstrániť túto úlohu?"
-
-#: calendar/gui/dialogs/cancel-comp.c:75
-msgid ""
-"The journal entry being deleted is published, would you like to send a "
-"cancellation notice?"
-msgstr ""
-"Odstraňovaný záznam žurnálu je publikovaný. Chcete poslať oznámenie o jeho "
-"zrušení?"
-
-#: calendar/gui/dialogs/cancel-comp.c:78
-msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr "Naozaj chcete zrušiť a odstrániť túto položku denníka?"
-
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Táto udalosť bola odstránená."
 
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "Táto úloha bola odstránená."
 
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:68
 msgid "This journal entry has been deleted."
 msgstr "Táto položka denníka bola odstránená."
 
-#: calendar/gui/dialogs/changed-comp.c:75
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  Urobili ste zmeny. Zahodiť ich a zatvoriť editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Neurobili ste žiadne zmeny, zatvoriť editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:82
+#: calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "Táto udalosť bola zmenená."
 
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "Táto úloha bola zmenená."
 
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:92
 msgid "This journal entry has been changed."
 msgstr "Táto položka denníka bola zmenená."
 
-#: calendar/gui/dialogs/changed-comp.c:99
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  Urobili ste zmeny. Zahodiť ich a aktualizovať editor?"
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Neurobili ste žiadne zmeny. Aktualizovať editor?"
@@ -4743,7 +4575,7 @@ msgid "No summary"
 msgstr "Žiadny súhrn"
 
 #: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
 #: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Uložiť ako..."
@@ -4798,102 +4630,54 @@ msgstr "Zrušiť operáciu"
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:95
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "Naozaj chcete odstrániť schôdzku `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:98
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "Naozaj chcete odstrániť túto schôdzku bez mena?"
-
-#: calendar/gui/dialogs/delete-comp.c:104
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "Naozaj chcete odstrániť úlohu `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:107
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "Naozaj chcete odstrániť úlohu bez mena?"
-
-#: calendar/gui/dialogs/delete-comp.c:113
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "Naozaj chcete odstrániť položku denníka `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:116
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "Naozaj chcete odstrániť položku denníka bez mena?"
-
-#: calendar/gui/dialogs/delete-comp.c:131
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d appointment?"
-msgid_plural "Are you sure you want to delete %d appointments?"
-msgstr[0] "Naozaj chcete odstrániť %d schôdzok?"
-msgstr[1] "Naozaj chcete odstrániť %d schôdzok?"
-
-#: calendar/gui/dialogs/delete-comp.c:138
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d task?"
-msgid_plural "Are you sure you want to delete %d tasks?"
-msgstr[0] "Naozaj chcete odstrániť %d úloh?"
-msgstr[1] "Naozaj chcete odstrániť %d úloh?"
-
-#: calendar/gui/dialogs/delete-comp.c:145
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d journal entry?"
-msgid_plural "Are you sure you want to delete %d journal entries?"
-msgstr[0] "Naozaj chcete odstrániť %d položiek denníka?"
-msgstr[1] "Naozaj chcete odstrániť %d položiek denníka?"
-
-#: calendar/gui/dialogs/delete-error.c:52
+#: calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "Udalosť nie je možné odstrániť kvôli chybe systému CORBA"
 
-#: calendar/gui/dialogs/delete-error.c:55
+#: calendar/gui/dialogs/delete-error.c:57
 msgid "The task could not be deleted due to a corba error"
 msgstr "Úlohu nie je možné odstrániť kvôli chybe systému CORBA"
 
-#: calendar/gui/dialogs/delete-error.c:58
+#: calendar/gui/dialogs/delete-error.c:60
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr "Položku žurnálu nie je možné odstrániť kvôli chybe systému CORBA"
 
-#: calendar/gui/dialogs/delete-error.c:61
+#: calendar/gui/dialogs/delete-error.c:63
 msgid "The item could not be deleted due to a corba error"
 msgstr "Položku nie je možné odstrániť kvôli chybe systému CORBA"
 
-#: calendar/gui/dialogs/delete-error.c:68
+#: calendar/gui/dialogs/delete-error.c:70
 msgid "The event could not be deleted because permission was denied"
 msgstr "Udalosť nie je možné odstrániť kvôli nedostatočným právam"
 
-#: calendar/gui/dialogs/delete-error.c:71
+#: calendar/gui/dialogs/delete-error.c:73
 msgid "The task could not be deleted because permission was denied"
 msgstr "Úlohu nie je možné odstrániť kvôli nedostatočným právam"
 
-#: calendar/gui/dialogs/delete-error.c:74
+#: calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr "Položku žurnálu nie je možné odstrániť kvôli nedostatočným právam"
 
-#: calendar/gui/dialogs/delete-error.c:77
+#: calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
 msgstr "Položku nie je možné odstrániť kvôli nedostatočným právam"
 
-#: calendar/gui/dialogs/delete-error.c:84
+#: calendar/gui/dialogs/delete-error.c:86
 #, fuzzy
 msgid "The event could not be deleted due to an error"
 msgstr "Udalosť nie je možné odstrániť kvôli chybe systému CORBA"
 
-#: calendar/gui/dialogs/delete-error.c:87
+#: calendar/gui/dialogs/delete-error.c:89
 #, fuzzy
 msgid "The task could not be deleted due to an error"
 msgstr "Úlohu nie je možné odstrániť kvôli chybe systému CORBA"
 
-#: calendar/gui/dialogs/delete-error.c:90
+#: calendar/gui/dialogs/delete-error.c:92
 #, fuzzy
 msgid "The journal entry could not be deleted due to an error"
 msgstr "Položku žurnálu nie je možné odstrániť kvôli chybe systému CORBA"
 
-#: calendar/gui/dialogs/delete-error.c:93
+#: calendar/gui/dialogs/delete-error.c:95
 #, fuzzy
 msgid "The item could not be deleted due to an error"
 msgstr "Položku nie je možné odstrániť kvôli chybe systému CORBA"
@@ -5031,11 +4815,11 @@ msgstr "Čas _začiatku:"
 
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:3
+#: calendar/gui/dialogs/meeting-page.glade.h:4
 #: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
 #: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1559
-#: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:100
+#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
+#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
@@ -5061,8 +4845,8 @@ msgstr "_Delegovať na..."
 #. FIXME: need to disable for undeletable folders
 #: calendar/gui/dialogs/meeting-page.c:655
 #: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1310 calendar/gui/e-calendar-view.c:1342
-#: mail/em-folder-tree.c:2557 mail/em-folder-view.c:919
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
+#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -5070,7 +4854,7 @@ msgid "_Delete"
 msgstr "_Odstrániť"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:240
+#: calendar/gui/e-meeting-list-view.c:218
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Účastník"
@@ -5106,16 +4890,15 @@ msgid "Member"
 msgstr "Člen"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
-#: mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-list-view.c:248
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Stav"
 
@@ -5124,20 +4907,20 @@ msgstr "Stav"
 msgid "Add A_ttendee"
 msgstr "Účastník"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "Add attendees from addressbook."
+msgstr "Pridať odosielateľa do _adresára"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Organizátor:"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
+#: calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "_Change Organizer"
 msgstr "_Zmeniť organizátora"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-#: calendar/gui/e-meeting-time-sel.c:417
-msgid "_Invite Others..."
-msgstr "_Pozvať ostatných..."
-
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 #, fuzzy
 msgid "<b>Calendar options</b>"
@@ -5298,7 +5081,7 @@ msgid "_No recurrence"
 msgstr "_Neopakovať"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:450
+#: composer/e-msg-composer-attachment-bar.c:453
 msgid "_Remove"
 msgstr "_Odstrániť"
 
@@ -5330,55 +5113,21 @@ msgstr "týždňov"
 msgid "year(s)"
 msgstr "rokov"
 
-#: calendar/gui/dialogs/save-comp.c:53
-msgid ""
-"This event has been changed, but has not been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Táto udalosť bola zmenená, ale Tento podpis bol zmenený, ale neuložená.\n"
-"\n"
-"Chcete uložiť zmeny?"
-
-#: calendar/gui/dialogs/save-comp.c:57
-msgid "_Discard Changes"
-msgstr "_Zahodiť zmeny"
-
-#: calendar/gui/dialogs/save-comp.c:62
-msgid "Save Event"
-msgstr "Uložiť udalosť"
-
-#: calendar/gui/dialogs/select-source-dialog.c:65
+#: calendar/gui/dialogs/select-source-dialog.c:69
 #, fuzzy
 msgid "Select destination"
 msgstr "Vyberte cieľový priečinok pre import týchro dát"
 
-#: calendar/gui/dialogs/select-source-dialog.c:86
+#: calendar/gui/dialogs/select-source-dialog.c:90
 #, fuzzy
 msgid "_Destination"
 msgstr "Odstrániť tento priečinok"
 
-#: calendar/gui/dialogs/select-source-dialog.c:88
+#: calendar/gui/dialogs/select-source-dialog.c:92
 #, fuzzy
 msgid "Task List"
 msgstr "Zoznam úloh"
 
-#: calendar/gui/dialogs/send-comp.c:57
-msgid "The meeting information has been created. Send it?"
-msgstr "Informácia o schôdzke bola vytvorená. Chcete ju poslať?"
-
-#: calendar/gui/dialogs/send-comp.c:60
-msgid "The meeting information has changed. Send an updated version?"
-msgstr "Informácia o schôdzke sa zmenila. Chcete poslať upravenú verziu?"
-
-#: calendar/gui/dialogs/send-comp.c:67
-msgid "The task assignment information has been created. Send it?"
-msgstr "Informácia o priradení úlohy bola vytvorená. Chcete ju poslať?"
-
-#: calendar/gui/dialogs/send-comp.c:71
-msgid "The task information has changed. Send an updated version?"
-msgstr "Informácia o úlohe sa zmenila. Chcete poslať upravenú verziu?"
-
 #: calendar/gui/dialogs/task-details-page.c:406
 msgid "Completed date is wrong"
 msgstr "Dátum dokončenia je neplatný"
@@ -5398,7 +5147,7 @@ msgstr "Dokončený"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #: calendar/gui/e-cal-component-preview.c:249
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:960
 msgid "High"
 msgstr "Vysoká"
 
@@ -5412,14 +5161,14 @@ msgstr "Prebieha"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:253
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:958
 msgid "Low"
 msgstr "Nízka"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:251
 #: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:957
+#: mail/message-list.c:959
 msgid "Normal"
 msgstr "Normálny"
 
@@ -5479,8 +5228,8 @@ msgstr "_Tajné"
 
 #: calendar/gui/dialogs/task-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
+#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Popis:"
 
@@ -5656,7 +5405,7 @@ msgstr "_Termín:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:950
+#: calendar/gui/e-itip-control.c:943
 msgid "Status:"
 msgstr "Stav:"
 
@@ -5742,12 +5491,12 @@ msgstr "Zaneprázdnený"
 msgid "Deleting selected objects"
 msgstr "Odstráňujem vybrané objekty"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
 msgid "Updating objects"
 msgstr "Aktualizujem objekty"
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1370
+#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
 #: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Otvoriť"
@@ -5758,15 +5507,15 @@ msgid "Open _Web Page"
 msgstr "_Otvoriť správu"
 
 #: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1291 calendar/gui/e-calendar-view.c:1376
-#: mail/em-folder-view.c:896 mail/em-popup.c:690 mail/em-popup.c:806
+#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
+#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "Uložiť _ako..."
 
 #: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1292
-#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
+#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
@@ -5774,24 +5523,24 @@ msgid "_Print..."
 msgstr "_Tlačiť..."
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Vystri_hnúť"
 
 #: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1338
-#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2550
-#: mail/message-list.c:1644 ui/evolution-addressbook.xml.h:31
+#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
+#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
+#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Kopírovať"
 
 #: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1273 calendar/gui/e-calendar-view.c:1299
-#: calendar/gui/e-calendar-view.c:1372 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
+#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
@@ -5860,71 +5609,71 @@ msgstr "Súhrn"
 msgid "Task sort"
 msgstr "Triedenie úloh"
 
-#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
 msgid "New _Appointment..."
 msgstr "Nová _schôdzka..."
 
-#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
+#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
 msgid "New All Day _Event"
 msgstr "Nová celodenná _udalosť"
 
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
+#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
 msgid "New Meeting"
 msgstr "Nové stretnutie"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
 msgid "New Task"
 msgstr "Nová úloha"
 
-#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Vybrať _vlákno"
 
-#: calendar/gui/e-calendar-view.c:1280
+#: calendar/gui/e-calendar-view.c:1283
 #, fuzzy
 msgid "_Select Date..."
 msgstr "Odstrániť..."
 
-#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publikovať informácie o voľnom čase"
 
-#: calendar/gui/e-calendar-view.c:1303
+#: calendar/gui/e-calendar-view.c:1306
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Kopírovať do priečinku..."
 
-#: calendar/gui/e-calendar-view.c:1304
+#: calendar/gui/e-calendar-view.c:1307
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "Pre_sunúť do priečinka..."
 
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1308
 msgid "_Schedule Meeting..."
 msgstr "Naplánovať _stretnutie..."
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1309
 msgid "_Forward as iCalendar..."
 msgstr "Poslať ďalej ako i_Calendar..."
 
-#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
 msgid "Delete this _Occurrence"
 msgstr "Odstrániť tento vý_skyt"
 
-#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
 msgid "Delete _All Occurrences"
 msgstr "Odstrániť _všetky výskyty"
 
-#: calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1349
 msgid "Go to _Today"
 msgstr "Prejsť na d_nešný dátum"
 
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1351
 msgid "_Go to Date..."
 msgstr "_Prejsť na dátum..."
 
-#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "Nas_tavenie..."
 
@@ -5938,9 +5687,9 @@ msgstr "Dátum štartu"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:967 calendar/gui/e-itip-control.c:1169
-#: calendar/gui/e-meeting-list-view.c:144
-#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
 #: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
 #: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
 #: camel/camel-tcp-stream-openssl.c:631
@@ -5966,13 +5715,13 @@ msgid "Assigned"
 msgstr "Priradené"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr "Áno"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "Nie"
 
@@ -5984,7 +5733,7 @@ msgstr "S"
 msgid "S"
 msgstr "J"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
 msgid "E"
 msgstr "V"
 
@@ -6056,405 +5805,409 @@ msgstr "%d %b"
 msgid "%02i minute divisions"
 msgstr "%02i rozdelení minúty"
 
-#: calendar/gui/e-itip-control.c:592
+#: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
 msgstr "Áno. (Úplné opakovanie)"
 
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:596
 #, fuzzy, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Každý deň"
 msgstr[1] "Každý deň"
 
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:601
 #, fuzzy, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Každý týždeň"
 msgstr[1] "Každý týždeň"
 
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:603
 #, fuzzy, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "Každý týždeň "
 msgstr[1] "Každý týždeň "
 
-#: calendar/gui/e-itip-control.c:618
+#: calendar/gui/e-itip-control.c:611
 msgid " and "
 msgstr " a "
 
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:618
 #, c-format
 msgid "The %s day of "
 msgstr "%s deň z "
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:631
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s z "
 
-#: calendar/gui/e-itip-control.c:645
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "každý mesiac"
 msgstr[1] "každý mesiac"
 
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:642
 #, fuzzy, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Každý rok"
 msgstr[1] "Každý rok"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:653
 #, fuzzy, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] " celkom %d-krát"
 msgstr[1] " celkom %d-krát"
 
-#: calendar/gui/e-itip-control.c:669
+#: calendar/gui/e-itip-control.c:662
 msgid ", ending on "
 msgstr ", končiace na "
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:686
 msgid "<b>Starts:</b> "
 msgstr "<b>Začína:</b> "
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:696
 msgid "<b>Ends:</b> "
 msgstr "<b>Končí:</b> "
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:716
 msgid "<b>Completed:</b> "
 msgstr "<b>Dokončený:</b> "
 
-#: calendar/gui/e-itip-control.c:733
+#: calendar/gui/e-itip-control.c:726
 msgid "<b>Due:</b> "
 msgstr "<b>Termín:</b> "
 
-#: calendar/gui/e-itip-control.c:771 calendar/gui/e-itip-control.c:827
+#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
 msgid "iCalendar Information"
 msgstr "Informácie o iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:788
+#: calendar/gui/e-itip-control.c:781
 msgid "iCalendar Error"
 msgstr "Chyba iCalendar"
 
-#: calendar/gui/e-itip-control.c:859 calendar/gui/e-itip-control.c:875
-#: calendar/gui/e-itip-control.c:886 calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
 msgid "An unknown person"
 msgstr "Neznáma osoba"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:910
+#: calendar/gui/e-itip-control.c:903
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 "<br> Prosím, skontrolujte tieto informácie a potom vyberte z menu akciu."
 
-#: calendar/gui/e-itip-control.c:925
+#: calendar/gui/e-itip-control.c:918
 msgid "<i>None</i>"
 msgstr "<i>Žiadna</i>"
 
-#: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:929
+msgid "Location:"
+msgstr "Umiestnenie:"
+
+#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Akceptované"
 
-#: calendar/gui/e-itip-control.c:959 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Predbežne akceptové"
 
-#: calendar/gui/e-itip-control.c:963 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Odmietnuté"
 
-#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.c:1050
-#: calendar/gui/e-itip-control.c:1076 calendar/gui/e-itip-control.c:1089
-#: calendar/gui/e-itip-control.c:1102 calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
 msgid "Choose an action:"
 msgstr "Vyberte akciu:"
 
-#: calendar/gui/e-itip-control.c:1023
+#: calendar/gui/e-itip-control.c:1016
 msgid "Update"
 msgstr "Aktualizovať"
 
-#: calendar/gui/e-itip-control.c:1024 calendar/gui/e-itip-control.c:1055
-#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1091
-#: calendar/gui/e-itip-control.c:1104 calendar/gui/e-itip-control.c:1117
-#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
+#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1044
 msgid "Accept"
 msgstr "Akceptovať"
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1045
 msgid "Tentatively accept"
 msgstr "Predbežne akceptovať"
 
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1046
 msgid "Decline"
 msgstr "Odmietnuť"
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1070
 msgid "Send Free/Busy Information"
 msgstr "Poslať informácie o voľnom čase"
 
-#: calendar/gui/e-itip-control.c:1090
+#: calendar/gui/e-itip-control.c:1083
 msgid "Update respondent status"
 msgstr "Aktualizovať stav respondenta"
 
-#: calendar/gui/e-itip-control.c:1103
+#: calendar/gui/e-itip-control.c:1096
 msgid "Send Latest Information"
 msgstr "Poslať najnovšie informácie"
 
-#: calendar/gui/e-itip-control.c:1116 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1185
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> poslal informácie o stretnutí."
 
-#: calendar/gui/e-itip-control.c:1193
+#: calendar/gui/e-itip-control.c:1186
 msgid "Meeting Information"
 msgstr "Informácie o stretnutí"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1191
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> požaduje účasť %s na stretnutí."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1193
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> požaduje vašu účasť na stretnutí."
 
-#: calendar/gui/e-itip-control.c:1201
+#: calendar/gui/e-itip-control.c:1194
 msgid "Meeting Proposal"
 msgstr "Návrh na stretnutie"
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> si praje byť pridaný na existujúce stretnutie."
 
-#: calendar/gui/e-itip-control.c:1206
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Update"
 msgstr "Aktualizácia stretnutia"
 
-#: calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1203
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> si praje dostať najnovšie informácie o stretnutí."
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1204
 msgid "Meeting Update Request"
 msgstr "Požiadavka na aktualizáciu stretnutia"
 
-#: calendar/gui/e-itip-control.c:1218
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> odpovedal na požiadavku o stretnutí."
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Reply"
 msgstr "Odpoveď pre stretnutie"
 
-#: calendar/gui/e-itip-control.c:1226
+#: calendar/gui/e-itip-control.c:1219
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> zrušil stretnutie."
 
-#: calendar/gui/e-itip-control.c:1227
+#: calendar/gui/e-itip-control.c:1220
 msgid "Meeting Cancellation"
 msgstr "Zrušenie stretnutia"
 
-#: calendar/gui/e-itip-control.c:1234 calendar/gui/e-itip-control.c:1302
-#: calendar/gui/e-itip-control.c:1337
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1330
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> poslal nerozpoznateľnú správu."
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1228
 msgid "Bad Meeting Message"
 msgstr "Neplatná správa o stretnutí"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1253
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> poslal informácie o úlohe."
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1254
 msgid "Task Information"
 msgstr "Informácia o úlohe"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1259
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> požaduje, aby %s vykonal úlohu."
 
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> požaduje, aby ste vykonali úlohu."
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1262
 msgid "Task Proposal"
 msgstr "Návrh úlohy"
 
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> si praje byť pridaný do existujúcej úlohy."
 
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Update"
 msgstr "Aktualizácia úlohy"
 
-#: calendar/gui/e-itip-control.c:1278
+#: calendar/gui/e-itip-control.c:1271
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> si praje získať najnovšie informácie o úlohe."
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1272
 msgid "Task Update Request"
 msgstr "Požiadavka na aktualizáciu úlohy"
 
-#: calendar/gui/e-itip-control.c:1286
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> odpovedal na priradenie úlohy."
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Reply"
 msgstr "Odpoveď pre úlohu"
 
-#: calendar/gui/e-itip-control.c:1294
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> zrušil úlohu."
 
-#: calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1288
 msgid "Task Cancellation"
 msgstr "Zrušenie úlohy"
 
-#: calendar/gui/e-itip-control.c:1303
+#: calendar/gui/e-itip-control.c:1296
 msgid "Bad Task Message"
 msgstr "Neplatná správa úlohy"
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1315
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> publikoval informácie o voľnom čase."
 
-#: calendar/gui/e-itip-control.c:1323
+#: calendar/gui/e-itip-control.c:1316
 msgid "Free/Busy Information"
 msgstr "Informácie o voľnom čase"
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> požaduje informáciu o vašom voľnom čase."
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1321
 msgid "Free/Busy Request"
 msgstr "Požiadavka na informácie o voľnom čase"
 
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1325
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> odpovedal na požiadavku na informácie o voľnom čase"
 
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1326
 msgid "Free/Busy Reply"
 msgstr "Odpoveď s informácio o voľnom čase"
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1331
 msgid "Bad Free/Busy Message"
 msgstr "Neplatná správa o voľnom čase"
 
-#: calendar/gui/e-itip-control.c:1413
+#: calendar/gui/e-itip-control.c:1406
 msgid "The message does not appear to be properly formed"
 msgstr "Správa asi nie je správne formátovaná"
 
-#: calendar/gui/e-itip-control.c:1472
+#: calendar/gui/e-itip-control.c:1465
 msgid "The message contains only unsupported requests."
 msgstr "Táto správa obsahuje iba nepodporované požiadavky."
 
-#: calendar/gui/e-itip-control.c:1503
+#: calendar/gui/e-itip-control.c:1496
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Príloha neobsahuje platnú správu kalendára"
 
-#: calendar/gui/e-itip-control.c:1535
+#: calendar/gui/e-itip-control.c:1528
 msgid "The attachment has no viewable calendar items"
 msgstr "Príloha nemá žiadne zobraziteľné položky kalendára"
 
-#: calendar/gui/e-itip-control.c:1769
+#: calendar/gui/e-itip-control.c:1762
 msgid "Update complete\n"
 msgstr "Aktualizácia dokončená\n"
 
-#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
+#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Stav účastníka nie je možné aktualizovať, pretože položka už neexistuje"
 
-#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objekt nie je platný a nie je možné ho aktualizovať\n"
 
-#: calendar/gui/e-itip-control.c:1825
+#: calendar/gui/e-itip-control.c:1818
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Táto odpoveď nie je od účastníka. Chcete ho ako účastníka pridať?"
 
-#: calendar/gui/e-itip-control.c:1837
+#: calendar/gui/e-itip-control.c:1830
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Stav účastníka nie je možné aktualizovať, pretože jeho stav nie je platný!\n"
 
-#: calendar/gui/e-itip-control.c:1856
+#: calendar/gui/e-itip-control.c:1849
 msgid "There was an error on the CORBA system\n"
 msgstr "Nastala chyba v systéme CORBA\n"
 
-#: calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1852
 msgid "Object could not be found\n"
 msgstr "Objekt sa nepodarilo nájsť\n"
 
-#: calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1855
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Nemáte práva pre aktualizáciu kalendára\n"
 
-#: calendar/gui/e-itip-control.c:1865
+#: calendar/gui/e-itip-control.c:1858
 msgid "Attendee status updated\n"
 msgstr "Stav účastníka bol aktualizovaný\n"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1861
 msgid "Attendee status could not be updated!\n"
 msgstr "Stav účastníka nie je možné aktualizovať!\n"
 
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1892
 msgid "Removal Complete"
 msgstr "Odstránenie dokončené"
 
-#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
 msgid "Item sent!\n"
 msgstr "Položka poslaná!\n"
 
-#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
+#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
 msgid "The item could not be sent!\n"
 msgstr "Položku nie je možné poslať!\n"
 
@@ -6495,74 +6248,74 @@ msgstr "dátum konca"
 msgid "date-start"
 msgstr "dátum začiatku"
 
-#: calendar/gui/e-meeting-list-view.c:62
+#: calendar/gui/e-meeting-list-view.c:59
 msgid "Chair Persons"
 msgstr "Predsedovia"
 
-#: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:479
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
 msgid "Required Participants"
 msgstr "Vyžadovaní účastníci"
 
-#: calendar/gui/e-meeting-list-view.c:64
+#: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Nepovinní účastníci"
 
-#: calendar/gui/e-meeting-list-view.c:65
+#: calendar/gui/e-meeting-list-view.c:62
 msgid "Resources"
 msgstr "Zdroje"
 
-#: calendar/gui/e-meeting-list-view.c:140 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
 #: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr "Individuálne"
 
-#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "Skupina"
 
-#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr "Zdroj"
 
-#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr "Miestnosť"
 
-#: calendar/gui/e-meeting-list-view.c:154 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr "Predseda"
 
-#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:127
 #: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
 msgid "Required Participant"
 msgstr "Vyžadovaný účastník"
 
-#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr "Nepovinný účastník"
 
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr "Bez účasti"
 
-#: calendar/gui/e-meeting-list-view.c:179 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:177
 #: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
 msgid "Needs Action"
 msgstr "Potrebné úkony"
 
-#: calendar/gui/e-meeting-list-view.c:182 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
 #: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "Predbežný"
 
-#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr "Delegované"
@@ -6579,20 +6332,28 @@ msgstr "Mimo kancelárie"
 msgid "No Information"
 msgstr "Žiadna informácia"
 
+#: calendar/gui/e-meeting-time-sel.c:417
+#, fuzzy
+msgid "Add attendees from addressbook"
+msgstr "Pridať odosielateľa do _adresára"
+
 #: calendar/gui/e-meeting-time-sel.c:440
 msgid "_Options"
 msgstr "_Nastavenie"
 
 #: calendar/gui/e-meeting-time-sel.c:457
-msgid "Show _Only Working Hours"
+#, fuzzy
+msgid "Show _only working hours"
 msgstr "Zobraziť _iba pracovné hodiny"
 
 #: calendar/gui/e-meeting-time-sel.c:467
-msgid "Show _Zoomed Out"
+#, fuzzy
+msgid "Show _zoomed out"
 msgstr "Ukázať z_menšené"
 
 #: calendar/gui/e-meeting-time-sel.c:482
-msgid "_Update Free/Busy"
+#, fuzzy
+msgid "_Update free/busy"
 msgstr "_Obnoviť voľno/zaneprázdnený"
 
 #: calendar/gui/e-meeting-time-sel.c:497
@@ -6608,19 +6369,23 @@ msgid ">_>"
 msgstr ">_>"
 
 #: calendar/gui/e-meeting-time-sel.c:547
-msgid "_All People and Resources"
+#, fuzzy
+msgid "_All people and resources"
 msgstr "_Všetky osoby a zdroje"
 
 #: calendar/gui/e-meeting-time-sel.c:556
-msgid "All _People and One Resource"
+#, fuzzy
+msgid "All _people and one resource"
 msgstr "Všetky _osoby a jeden zdroj"
 
 #: calendar/gui/e-meeting-time-sel.c:565
-msgid "_Required People"
+#, fuzzy
+msgid "_Required people"
 msgstr "_Vyžadované osoby"
 
 #: calendar/gui/e-meeting-time-sel.c:574
-msgid "Required People and _One Resource"
+#, fuzzy
+msgid "Required people and _one resource"
 msgstr "Vyžadované osoby a _jeden zdroj"
 
 #: calendar/gui/e-meeting-time-sel.c:593
@@ -6658,7 +6423,7 @@ msgstr "%d/%m/%Y"
 msgid "Enter the password for %s"
 msgstr "Zadajte vaše heslo pre %s"
 
-#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6667,19 +6432,14 @@ msgstr ""
 "Chyba pre %s:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-
 #. FIXME Loading should be async
 #. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:686
+#: calendar/gui/e-tasks.c:801
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Otváram úlohy na %s"
 
-#: calendar/gui/e-tasks.c:709
+#: calendar/gui/e-tasks.c:824
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6688,53 +6448,48 @@ msgstr ""
 "Chyba pre %s:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:730
+#: calendar/gui/e-tasks.c:845
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Nahrávanie obrázkov"
 
-#: calendar/gui/e-tasks.c:834
+#: calendar/gui/e-tasks.c:949
 msgid "Completing tasks..."
 msgstr "Dokončujem úlohy..."
 
-#: calendar/gui/e-tasks.c:857
+#: calendar/gui/e-tasks.c:972
 msgid "Deleting selected objects..."
 msgstr "Odstráňujem vybrané objekty..."
 
-#: calendar/gui/e-tasks.c:884
+#: calendar/gui/e-tasks.c:999
 msgid "Expunging"
 msgstr "Čistím"
 
-#: calendar/gui/e-tasks.c:960
+#: calendar/gui/e-tasks.c:1075
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
-#: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
+#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
+#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
 #: calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:705
 msgid "Tasks"
 msgstr "Úlohy"
 
-#: calendar/gui/gnome-cal.c:1876
+#: calendar/gui/gnome-cal.c:1878
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Žiadne schôdzky."
 
-#: calendar/gui/gnome-cal.c:1895
+#: calendar/gui/gnome-cal.c:1897
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Nahrávanie obrázkov"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1920
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Otvoriť v %s..."
 
-#: calendar/gui/gnome-cal.c:2048
-#, c-format
-msgid "The calendar backend for '%s' has crashed."
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:2894
+#: calendar/gui/gnome-cal.c:2906
 #, fuzzy
 msgid "Purging"
 msgstr "Turín"
@@ -6929,7 +6684,7 @@ msgid "On The Web"
 msgstr ""
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 
@@ -6940,7 +6695,7 @@ msgid "Unable to migrate calendar `%s'"
 msgstr "Prístup zamietnutý pri otváraní kalendára"
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:869
+#: calendar/gui/migration.c:889
 #, fuzzy, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Nie je možné otvoriť adresár"
@@ -7176,73 +6931,73 @@ msgstr "Tlačiť položku"
 msgid "Print Setup"
 msgstr "Nastavenie tlačiarne"
 
-#: calendar/gui/tasks-component.c:303
+#: calendar/gui/tasks-component.c:313
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:371
 #, fuzzy
 msgid "New Task List"
 msgstr "Zoznam úloh"
 
-#: calendar/gui/tasks-component.c:398
+#: calendar/gui/tasks-component.c:408
 #, fuzzy, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "Žiadne úlohy"
 msgstr[1] "Žiadne úlohy"
 
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] "%d vybraných"
 msgstr[1] "%d vybraných"
 
-#: calendar/gui/tasks-component.c:447
+#: calendar/gui/tasks-component.c:457
 #, fuzzy
 msgid "Failed upgrading tasks."
 msgstr "Nahrávanie obrázkov"
 
-#: calendar/gui/tasks-component.c:526
+#: calendar/gui/tasks-component.c:749
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:538
+#: calendar/gui/tasks-component.c:761
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:576
+#: calendar/gui/tasks-component.c:799
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:804
+#: calendar/gui/tasks-component.c:1040
 msgid "New task"
 msgstr "Nová úloha"
 
-#: calendar/gui/tasks-component.c:805
+#: calendar/gui/tasks-component.c:1041
 msgid "_Task"
 msgstr "Ú_loha"
 
-#: calendar/gui/tasks-component.c:806
+#: calendar/gui/tasks-component.c:1042
 msgid "Create a new task"
 msgstr "Vytvorí novú úlohu"
 
-#: calendar/gui/tasks-component.c:812
+#: calendar/gui/tasks-component.c:1048
 #, fuzzy
 msgid "New tasks group"
 msgstr "Nová úloha"
 
-#: calendar/gui/tasks-component.c:813
+#: calendar/gui/tasks-component.c:1049
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Zoznam úloh"
 
-#: calendar/gui/tasks-component.c:814
+#: calendar/gui/tasks-component.c:1050
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Vytvorí novú úlohu"
@@ -9010,12 +8765,12 @@ msgstr "Chyba pri vykonávaní hľadania filtra: %s: %s"
 msgid "Unsupported operation: append message: for %s"
 msgstr "Nepodporovaná operácia: pridať správu: pre %s"
 
-#: camel/camel-folder.c:1259
+#: camel/camel-folder.c:1262
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Nepodporovaná operácia: hľadanie výrazom: %s"
 
-#: camel/camel-folder.c:1299
+#: camel/camel-folder.c:1302
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Nepodporovaná operácia: hľadanie pomocou uid: %s"
@@ -9028,11 +8783,16 @@ msgstr "Presúvam správy"
 msgid "Copying messages"
 msgstr "Kopírujem správy"
 
-#: camel/camel-folder.c:1666
-msgid "Learning junk and/or non junk message(s)"
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Lansing"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
 msgstr ""
 
-#: camel/camel-folder.c:1695
+#: camel/camel-folder.c:1701
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "Získavam %d správ"
@@ -9067,17 +8827,17 @@ msgstr ""
 msgid "(match-threads) requires a match type string"
 msgstr ""
 
-#: camel/camel-folder-search.c:785
+#: camel/camel-folder-search.c:784
 #, fuzzy
 msgid "(match-threads) expects an array result"
 msgstr "(odpovedá všetkému) vyžaduje jeden pravdivostný výsledok"
 
-#: camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:790
 #, fuzzy
 msgid "(match-threads) requires the folder set"
 msgstr "(odpovedá všetkému) vyžaduje jeden pravdivostný výsledok"
 
-#: camel/camel-folder-search.c:880
+#: camel/camel-folder-search.c:879
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Vykonanie otázky na neznámej hlavičke: %s"
@@ -9112,7 +8872,8 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
 #: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:706
+#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Zrušené."
@@ -9492,7 +9253,7 @@ msgstr "Poverenie, na ktoré sa odkazujete, vypršalo."
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1212
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Neplatná odpoveď na overenie od serveru."
 
@@ -9876,40 +9637,40 @@ msgstr "Príkaz neimplementovaný"
 msgid "export keys: unimplemented"
 msgstr ""
 
-#: camel/camel-store.c:214
+#: camel/camel-store.c:213
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Nie je možné získať priečinok: Neplatná operácia pre tento sklad"
 
-#: camel/camel-store.c:244
+#: camel/camel-store.c:243
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr "Nie je možné získať priečinok: %s: %s"
 
-#: camel/camel-store.c:295
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Nie je možné vytvoriť priečinok: Neplatná operácia pre tento sklad"
 
-#: camel/camel-store.c:323
+#: camel/camel-store.c:325
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Nie je možné získať priečinok: %s: %s"
 
-#: camel/camel-store.c:387 camel/camel-vee-store.c:354
+#: camel/camel-store.c:389 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Nie je možné odstrániť priečinok: %s: Neplatná operácia"
 
-#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#: camel/camel-store.c:439 camel/camel-vee-store.c:387
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Nie je možné premenovať priečinok: %s: Neplatná operácia"
 
-#: camel/camel-store.c:811
+#: camel/camel-store.c:777
 msgid "Trash"
 msgstr "Odpadky"
 
-#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
-#: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/mail-config.glade.h:95
+#: ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
 msgstr "Jún"
@@ -10142,12 +9903,12 @@ msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 "Nepodarilo sa skopírovať alebo presunúť správu do virtuálneho priečinku"
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:374
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Nie je možné odstrániť priečinok: %s: Priečinok neexistuje"
 
-#: camel/camel-vee-store.c:398
+#: camel/camel-vee-store.c:395
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Nie je možné premenovať priečinok: %s: Priečinok neexistuje"
@@ -10194,32 +9955,32 @@ msgstr "Adresár"
 msgid "Post Office Agent SOAP Port:"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:80
+#: camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "Novell GroupWise"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:82
+#: camel/providers/groupwise/camel-groupwise-provider.c:85
 msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: camel/providers/groupwise/camel-groupwise-provider.c:100
 #: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
 msgid "Password"
 msgstr "Heslo"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:99
+#: camel/providers/groupwise/camel-groupwise-provider.c:102
 #: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Táto voľba pripojí na IMAP server pomocou hesiel prenášaných ako čistý text."
 
-#: camel/providers/groupwise/camel-gw-listener.c:305
-#: camel/providers/groupwise/camel-gw-listener.c:328
+#: camel/providers/groupwise/camel-gw-listener.c:312
+#: camel/providers/groupwise/camel-gw-listener.c:335
 #, fuzzy
 msgid "Checklist"
 msgstr "Hustý opar"
@@ -10363,13 +10124,13 @@ msgstr ""
 "Táto voľba pripojí na IMAP server pomocou hesiel prenášaných ako čistý text."
 
 #: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:429
+#: camel/providers/imap/camel-imap-store.c:428
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP server %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:431
+#: camel/providers/imap/camel-imap-store.c:430
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "Služba IMAP pre %s na %s"
@@ -10379,7 +10140,7 @@ msgstr "Služba IMAP pre %s na %s"
 #: camel/providers/imap/camel-imap-store.c:551
 #: camel/providers/imap/camel-imap-store.c:571
 #: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
+#: camel/providers/nntp/camel-nntp-store.c:209
 #: camel/providers/pop3/camel-pop3-store.c:175
 #: camel/providers/smtp/camel-smtp-transport.c:269
 #: camel/providers/smtp/camel-smtp-transport.c:285
@@ -10397,10 +10158,10 @@ msgstr "TLS nie je k dispozícii"
 
 #: camel/providers/imap4/camel-imap4-store.c:222
 #: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:815
+#: camel/providers/imap/camel-imap-store.c:845
 #: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:137
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
 #: camel/providers/pop3/camel-pop3-store.c:192
 msgid "Connection cancelled"
 msgstr "Spojenie zrušené"
@@ -10413,8 +10174,8 @@ msgid ""
 msgstr "Nepodarilo sa pripojiť k IMAP serveru %s v zabezpečenom režime: %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:649
-#: camel/providers/imap/camel-imap-store.c:680
+#: camel/providers/imap/camel-imap-store.c:679
+#: camel/providers/imap/camel-imap-store.c:710
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Nepodarilo sa pripojiť k IMAP serveru %s v zabezpečenom režime: %s"
@@ -10423,7 +10184,7 @@ msgstr "Nepodarilo sa pripojiť k IMAP serveru %s v zabezpečenom režime: %s"
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1109
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
 msgid "Unknown error"
 msgstr "Neznáma chyba"
 
@@ -10451,8 +10212,8 @@ msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr "Nie je možné získať priečinok: %s: %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1857
-#: camel/providers/imap/camel-imap-store.c:2235
+#: camel/providers/imap/camel-imap-store.c:1885
+#: camel/providers/imap/camel-imap-store.c:2263
 #, fuzzy, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -10531,12 +10292,12 @@ msgstr "Server neočakávane zrušil spojenie: %s"
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3168
+#: camel/providers/imap/camel-imap-store.c:3194
 msgid "Operation cancelled"
 msgstr "Operácia zrušená"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3171
+#: camel/providers/imap/camel-imap-store.c:3197
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server neočakávane zrušil spojenie: %s"
@@ -10600,13 +10361,6 @@ msgid "Unable to retrieve message: %s"
 msgstr "Nepodarilo sa prijať správu: %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:219
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -10616,15 +10370,15 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-mbox-folder.c:418
+#: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
 msgstr "Taká správa neexistuje"
 
 #: camel/providers/imap/camel-imap-folder.c:2019
-#: camel/providers/imap/camel-imap-folder.c:2621
-#: camel/providers/nntp/camel-nntp-folder.c:238
+#: camel/providers/imap/camel-imap-folder.c:2622
+#: camel/providers/nntp/camel-nntp-folder.c:220
 msgid "This message is not currently available"
 msgstr "Táto správa momentálne nie je k dipozícii"
 
@@ -10633,7 +10387,23 @@ msgstr "Táto správa momentálne nie je k dipozícii"
 msgid "Fetching summary information for new messages"
 msgstr "Sťahujem súhrnné informácie pre nové správy"
 
-#: camel/providers/imap/camel-imap-folder.c:2659
+#: camel/providers/imap/camel-imap-folder.c:2463
+#, c-format
+msgid "Incomplete server response: no information provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2471
+#, c-format
+msgid "Incomplete server response: no UID provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2484
+#, c-format
+msgid ""
+"Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2660
 msgid "Could not find message body in FETCH response."
 msgstr "Nie je možné nájsť telo správy v odpovedi FETCH."
 
@@ -10698,43 +10468,43 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Pre čítanie a ukladanie pošty na IMAP serveroch."
 
-#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/imap/camel-imap-store.c:680
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "Rozšírenie SSL/TLS nie je podporované."
 
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:711
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "Zlyhala dohoda SSL"
 
-#: camel/providers/imap/camel-imap-store.c:818
+#: camel/providers/imap/camel-imap-store.c:848
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Nie je možné spojenie s %s (port %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:1242
+#: camel/providers/imap/camel-imap-store.c:1272
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "Požadovaný spôsob overenia %s nie je podporovaný IMAP serverom %s"
 
-#: camel/providers/imap/camel-imap-store.c:1252
+#: camel/providers/imap/camel-imap-store.c:1282
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Overenie typu %s nie je podporované."
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1305
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sProsím, zadajte IMAP heslo pre %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1289
+#: camel/providers/imap/camel-imap-store.c:1319
 msgid "You didn't enter a password."
 msgstr "Nezadali ste heslo."
 
-#: camel/providers/imap/camel-imap-store.c:1318
+#: camel/providers/imap/camel-imap-store.c:1348
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10745,18 +10515,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1839
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:1867
+#: camel/providers/imap/camel-imap-store.c:2057
 #, c-format
 msgid "No such folder %s"
 msgstr "Priečinok %s neexistuje"
 
-#: camel/providers/imap/camel-imap-store.c:1915
-#: camel/providers/imap/camel-imap-store.c:2296
+#: camel/providers/imap/camel-imap-store.c:1943
+#: camel/providers/imap/camel-imap-store.c:2324
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Rodičovský priečinok nesmie obsahovať podpriečinky"
 
-#: camel/providers/imap/camel-imap-store.c:1970
+#: camel/providers/imap/camel-imap-store.c:1998
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10764,7 +10534,7 @@ msgstr "Rodičovský priečinok nesmie obsahovať podpriečinky"
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Nie je možné získať priečinok: %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:2274
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Neznámy rodičovský priečinok: %s"
@@ -10798,20 +10568,20 @@ msgid "Index message body data"
 msgstr "Poslať správu kontaktu"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:388
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:393
-#: camel/providers/local/camel-local-folder.c:396
+#: camel/providers/local/camel-local-folder.c:392
+#: camel/providers/local/camel-local-folder.c:395
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "poštová schránka: %s (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:400
+#: camel/providers/local/camel-local-folder.c:399
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -10872,7 +10642,7 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:142
 #: camel/providers/local/camel-local-store.c:253
-#: camel/providers/local/camel-mbox-store.c:356
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10945,8 +10715,25 @@ msgstr "Pridanie správy maildir zrušené"
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Nie je možné pridať správu do priečinku maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:226
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mbox-folder.c:417
+#: camel/providers/local/camel-mbox-folder.c:436
+#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:475
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-mh-folder.c:221
+#, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+"Nie je možné získať správu: %s z priečinku %s\n"
+"  %s"
+
+#: camel/providers/local/camel-maildir-folder.c:236
 msgid "Invalid message contents"
 msgstr "Neplatný obsah správy"
 
@@ -10987,9 +10774,9 @@ msgstr "Nie je možné odstrániť priečinok `%s': %s"
 msgid "not a maildir directory"
 msgstr "nie je priečinok maildir"
 
-#: camel/providers/local/camel-maildir-store.c:341
-#: camel/providers/local/camel-spool-store.c:286
-#: camel/providers/local/camel-spool-store.c:316
+#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-spool-store.c:284
+#: camel/providers/local/camel-spool-store.c:314
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Nie je možné prehľadať priečinok `%s': %s"
@@ -11036,27 +10823,18 @@ msgstr "Pridanie pošty zrušené"
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Nie je možné pridať správu do súboru mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:435
-#: camel/providers/local/camel-mbox-folder.c:466
-#: camel/providers/local/camel-mbox-folder.c:474
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"Nie je možné získať správu: %s z priečinku %s\n"
-"  %s"
-
-#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:468
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Priečinok vyzerá ako nenapraviteľne poškodený."
 
-#: camel/providers/local/camel-mbox-folder.c:475
-msgid "Message construction failed: Corrupt mailbox?"
+#: camel/providers/local/camel-mbox-folder.c:476
+#: camel/providers/local/camel-mh-folder.c:222
+#, fuzzy
+msgid "Message construction failed."
 msgstr "Vytvorenie správy zlyhalo: Poškodená poštová schránka?"
 
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:362
+#: camel/providers/local/camel-mbox-store.c:361
 #, fuzzy
 msgid "Cannot create a folder by this name."
 msgstr "Nepodarilo sa vytvoriť priečinok s týmto menom"
@@ -11087,32 +10865,32 @@ msgstr "`%s' nie je normálny súbor."
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Priečinok `%s' nie je prázdny. Neodstránený."
 
-#: camel/providers/local/camel-mbox-store.c:375
+#: camel/providers/local/camel-mbox-store.c:374
 #, fuzzy, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Nie je možné vytvoriť priečinok %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:389
+#: camel/providers/local/camel-mbox-store.c:388
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Nie je možné získať priečinok: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:391
+#: camel/providers/local/camel-mbox-store.c:390
 #, fuzzy
 msgid "Folder already exists"
 msgstr "ID karty už existuje"
 
-#: camel/providers/local/camel-mbox-store.c:473
+#: camel/providers/local/camel-mbox-store.c:472
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "Zadané meno priečinku nie je platné: %s"
 
-#: camel/providers/local/camel-mbox-store.c:486
+#: camel/providers/local/camel-mbox-store.c:485
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Nie je možné premenovať \"%s\": %s"
 
-#: camel/providers/local/camel-mbox-store.c:561
+#: camel/providers/local/camel-mbox-store.c:560
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Nie je možné premenovať priečinok %s na %s: %s"
@@ -11305,7 +11083,7 @@ msgstr ""
 "Priečinok je asi poškodený, kópia uložená do `%s'"
 
 #: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:997
+#: camel/providers/nntp/camel-nntp-store.c:1126
 #, fuzzy, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "%sProsím, zadajte SMTP heslo pre %s@%s"
@@ -11323,18 +11101,10 @@ msgstr "Nepodarilo sa pripojiť k serveru LDAP"
 msgid "Server rejected username/password"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:263
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr "Používateľ zrušený"
-
-#: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:259
-#: camel/providers/nntp/camel-nntp-folder.c:265
+#: camel/providers/nntp/camel-nntp-folder.c:147
+#: camel/providers/nntp/camel-nntp-folder.c:149
+#: camel/providers/nntp/camel-nntp-folder.c:158
+#: camel/providers/nntp/camel-nntp-folder.c:234
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11343,66 +11113,53 @@ msgstr "Používateľ zrušený"
 msgid "Cannot get message %s: %s"
 msgstr "Nie je možné získať správu %s: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:188
-#: camel/providers/nntp/camel-nntp-folder.c:228
+#: camel/providers/nntp/camel-nntp-folder.c:156
+#: camel/providers/nntp/camel-nntp-folder.c:232
+#: camel/providers/nntp/camel-nntp-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+msgid "User cancelled"
+msgstr "Používateľ zrušený"
+
+#: camel/providers/nntp/camel-nntp-folder.c:176
+#: camel/providers/nntp/camel-nntp-folder.c:208
 #, c-format
 msgid "Internal error: uid in invalid format: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:201
-#, fuzzy, c-format
-msgid "Could not get article %s from NNTP server"
-msgstr "Nie je možné získať skupinu: %s"
-
-#: camel/providers/nntp/camel-nntp-folder.c:362
-msgid "Posting not allowed by news server"
-msgstr ""
-
+#: camel/providers/nntp/camel-nntp-folder.c:328
+#: camel/providers/nntp/camel-nntp-folder.c:331
 #: camel/providers/nntp/camel-nntp-folder.c:373
-#, c-format
-msgid "Failed to send newsgroups header: %s: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:413
-#: camel/providers/nntp/camel-nntp-folder.c:426
-#, c-format
-msgid "Error posting to newsgroup: %s: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:438
-msgid "Error reading response to posted message: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:441
+#: camel/providers/nntp/camel-nntp-folder.c:375
 #, fuzzy, c-format
-msgid "Error posting message: %s: message not posted"
-msgstr ""
-"Chyba pri automatickom ukladaní správ: %s\n"
-" %s"
+msgid "Posting failed: %s"
+msgstr "Operácia zlyhala: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:457
+#: camel/providers/nntp/camel-nntp-folder.c:393
 msgid "You cannot post NNTP messages while working offline!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:468
+#: camel/providers/nntp/camel-nntp-folder.c:404
 #, fuzzy
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Nie je možné zatvoriť dočasný priečinok: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:44
 #, fuzzy
 msgid "Could not get group list from server."
 msgstr "Nie je možné získať skupinu: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#: camel/providers/nntp/camel-nntp-grouplist.c:97
+#: camel/providers/nntp/camel-nntp-grouplist.c:106
 #, fuzzy, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr ""
 "Nepodarilo sa vytvoriť výstupný súbor: %s\n"
 " %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#: camel/providers/nntp/camel-nntp-grouplist.c:157
 #, fuzzy, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr ""
@@ -11434,27 +11191,29 @@ msgstr ""
 "Táto možnosť nastaví overenie na NNTP server pomocou poslania hesla ako "
 "čistého textu."
 
-#: camel/providers/nntp/camel-nntp-store.c:158
+#: camel/providers/nntp/camel-nntp-store.c:118
+#: camel/providers/nntp/camel-nntp-store.c:1233
+#: camel/providers/nntp/camel-nntp-store.c:1331
+#, c-format
+msgid "NNTP Command failed: %s"
+msgstr "NNTP príkaz zlyhal: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:227
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Nie je možné prečítať privítanie z %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:170
+#: camel/providers/nntp/camel-nntp-store.c:239
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "Server NNTP %s vrátil chybový kód %d: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:326
+#: camel/providers/nntp/camel-nntp-store.c:403
 #, c-format
 msgid "USENET News via %s"
 msgstr "Diskusné skupiny USENET pomocou %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:640
-#, fuzzy
-msgid "Stream error"
-msgstr "chyba spracovania"
-
-#: camel/providers/nntp/camel-nntp-store.c:643
+#: camel/providers/nntp/camel-nntp-store.c:777
 #, fuzzy, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -11464,75 +11223,75 @@ msgstr ""
 "Chyba pri ukladaní správ do `%s':\n"
 "%s"
 
-#: camel/providers/nntp/camel-nntp-store.c:735
+#: camel/providers/nntp/camel-nntp-store.c:872
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
 "No such newsgroup. The selected item is a probably a parent folder."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:767
+#: camel/providers/nntp/camel-nntp-store.c:904
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
 "newsgroup does not exist!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:792
+#: camel/providers/nntp/camel-nntp-store.c:929
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:800
+#: camel/providers/nntp/camel-nntp-store.c:937
 #, fuzzy
 msgid "You cannot rename a folder in a News store."
 msgstr "Nie je možné premenovať priečinok %s na %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:808
+#: camel/providers/nntp/camel-nntp-store.c:945
 #, fuzzy
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "Nie je možné presunúť priečinok do jednoho zo svojích podpriečinkov."
 
-#: camel/providers/nntp/camel-nntp-summary.c:253
-#, fuzzy, c-format
-msgid "Connection error: %s"
-msgstr "Neznáma chyba: %s"
-
-#: camel/providers/nntp/camel-nntp-summary.c:262
-#, c-format
-msgid "No such folder: %s"
-msgstr "Priečinok neexistuje: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1118
+#, fuzzy
+msgid "Authentication requested but not username provided"
+msgstr "Autentifikácia vyžadovaná"
 
-#: camel/providers/nntp/camel-nntp-summary.c:268
-#, c-format
-msgid "Could not get group: %s"
-msgstr "Nie je možné získať skupinu: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1146
+#, fuzzy, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr "Nepodarilo sa prihlásiť na POP server %s: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:333
+#: camel/providers/nntp/camel-nntp-store.c:1262
 #, fuzzy
-msgid "Could not get messages: unspecified error"
-msgstr "Nie je možné poslať správu: %s"
+msgid "Not connected."
+msgstr "Zobraziť kontakty"
 
-#: camel/providers/nntp/camel-nntp-summary.c:378
+#: camel/providers/nntp/camel-nntp-store.c:1311
 #, c-format
-msgid "NNTP Command failed: %s"
-msgstr "NNTP príkaz zlyhal: %s"
+msgid "No such folder: %s"
+msgstr "Priečinok neexistuje: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:438
-#: camel/providers/nntp/camel-nntp-summary.c:543
+#: camel/providers/nntp/camel-nntp-summary.c:218
+#: camel/providers/nntp/camel-nntp-summary.c:314
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Hľadám nové správy"
 
-#: camel/providers/nntp/camel-nntp-summary.c:558
-#, c-format
-msgid "Unknown server response: %s"
-msgstr "Neznáma odpoveď serveru: %s"
+#: camel/providers/nntp/camel-nntp-summary.c:225
+#, fuzzy, c-format
+msgid "Unexpected server response from xover: %s"
+msgstr "Neočakávaná odpoveď od IMAP serveru: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:605
+#: camel/providers/nntp/camel-nntp-summary.c:328
+#, fuzzy, c-format
+msgid "Unexpected server response from head: %s"
+msgstr "Neočakávaná odpoveď od GnuPG: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:368
 msgid "Use cancel"
 msgstr "Použite Zrušiť"
 
-#: camel/providers/nntp/camel-nntp-summary.c:607
+#: camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Operácia zlyhala: %s"
@@ -11580,7 +11339,7 @@ msgstr "Odstrániť po %s dňoch"
 msgid "Disable support for all POP3 extensions"
 msgstr "Zakázať podporu pre všetky rozšírenia POP3"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107
 msgid "POP"
 msgstr "POP"
 
@@ -11669,7 +11428,7 @@ msgid "No such folder `%s'."
 msgstr "Priečinok `%s' neexistuje."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:132
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -11721,7 +11480,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Prenos pošty pomocou programu sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:119
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -12015,19 +11774,19 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
+#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:408
 msgid "attachment"
 msgstr "príloha"
 
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:454
 msgid "Remove selected items from the attachment list"
 msgstr "Odstráni vybrané položky zo zoznamu príloh"
 
-#: composer/e-msg-composer-attachment-bar.c:491
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Add attachment..."
 msgstr "Pridať prílohu..."
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:495
 msgid "Attach a file to the message"
 msgstr "Priloží súbor k správe"
 
@@ -12090,7 +11849,7 @@ msgstr "(Správa bez mena)"
 msgid "Open file"
 msgstr "Otvoriť súbor"
 
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
 msgid "Autogenerated"
 msgstr "Automaticky generované"
 
@@ -12239,17 +11998,17 @@ msgstr "Priložiť súbor"
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
+msgid "You cannot attach the file `{0}' to this message."
 msgstr "Priloží súbor k správe"
 
 #. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4
-msgid "${1}"
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
 msgstr ""
 
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
 
 #. mail-composer:attach-directory primary
@@ -12344,7 +12103,7 @@ msgstr "Nie je možné vytvoriť rúru: %s"
 
 #. mail-composer:no-build-message secondary
 #: composer/mail-composer-errors.xml.h:34
-msgid "Because \"${0}\", you may need to select different mail options."
+msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
@@ -12354,8 +12113,10 @@ msgid "Could not read signature file \"{0}\"."
 msgstr "Nepodarilo sa uložiť súbor podpisu: %s"
 
 #. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38
-msgid "Because \"${1}\"."
+#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted primary
@@ -12778,11 +12539,11 @@ msgid "<b>Then</b>"
 msgstr "<b>Termín:</b> "
 
 #: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1335
+#: mail/mail-account-gui.c:1347
 msgid "Select Folder"
 msgstr "Vybrať priečinok"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
 #, fuzzy
 msgid "    "
 msgstr "      "
@@ -12842,7 +12603,7 @@ msgstr "späť"
 msgid "months"
 msgstr "mesiacov"
 
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
 msgid "seconds"
 msgstr "sekúnd"
 
@@ -12874,20 +12635,20 @@ msgstr "pre všetky lokálne priečinky"
 msgid "years"
 msgstr "rokov"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:916
-#: mail/mail-config.c:76 mail/mail-config.glade.h:90
+#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
+#: mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Dôležité"
 
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:919 mail/mail-config.c:79
-#: mail/mail-config.glade.h:145
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: mail/mail-config.glade.h:148
 msgid "To Do"
 msgstr "Urobiť"
 
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:920 mail/mail-config.c:80
-#: mail/mail-config.glade.h:94
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: mail/mail-config.glade.h:97
 msgid "Later"
 msgstr "Neskôr"
 
@@ -12945,257 +12706,6 @@ msgstr "prijatá"
 msgid "outgoing"
 msgstr "odoslaná"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Adjust Score"
-msgstr "Upraviť skóre"
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Color"
-msgstr "Priradiť farbu"
-
-#: filter/libfilter-i18n.h:4
-msgid "Assign Score"
-msgstr "Priradiť skóre"
-
-#: filter/libfilter-i18n.h:5
-msgid "Attachments"
-msgstr "Prílohy"
-
-#: filter/libfilter-i18n.h:6
-msgid "Beep"
-msgstr "Pípnuť"
-
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "obsahuje"
-
-#: filter/libfilter-i18n.h:8
-msgid "Copy to Folder"
-msgstr "Kopírovať do priečinku"
-
-#: filter/libfilter-i18n.h:9
-msgid "Date received"
-msgstr "Dátum prijatia"
-
-#: filter/libfilter-i18n.h:10
-msgid "Date sent"
-msgstr "Dátum odoslania"
-
-#: filter/libfilter-i18n.h:12
-msgid "Deleted"
-msgstr "Odstránené"
-
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "neobsahuje"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "nekončí na"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "neexistuje"
-
-#: filter/libfilter-i18n.h:16
-msgid "does not return"
-msgstr "nevrátiť"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "nevyzerá ako"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "nezačína na"
-
-#: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
-msgstr "Neexistuje"
-
-#: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr "Návrh"
-
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "končí na"
-
-#: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr "Existuje"
-
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "existuje"
-
-#: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr "Výraz"
-
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr "Follow Up"
-
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "je"
-
-#: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr "je po"
-
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr "bolo pred"
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr "je označený"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "je viac než"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "je menej než"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "nie je"
-
-#: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr "nie je označený"
-
-#: filter/libfilter-i18n.h:36
-#, fuzzy
-msgid "Junk Test"
-msgstr "Jún"
-
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
-#: widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Popis"
-
-#: filter/libfilter-i18n.h:38
-msgid "Mailing list"
-msgstr "Konferencia"
-
-#: filter/libfilter-i18n.h:39
-msgid "Message Body"
-msgstr "Telo správy"
-
-#: filter/libfilter-i18n.h:40
-msgid "Message Header"
-msgstr "Hlavička správy"
-
-#: filter/libfilter-i18n.h:41
-#, fuzzy
-msgid "Message is Junk"
-msgstr "Správy"
-
-#: filter/libfilter-i18n.h:42
-#, fuzzy
-msgid "Message is not Junk"
-msgstr "Označiť ako _dôležitú"
-
-#: filter/libfilter-i18n.h:43
-msgid "Move to Folder"
-msgstr "Presunúť do priečinku"
-
-#: filter/libfilter-i18n.h:44
-#, fuzzy
-msgid "Pipe to Program"
-msgstr "Ukončí program"
-
-#: filter/libfilter-i18n.h:45
-msgid "Play Sound"
-msgstr "Zahrať zvuk"
-
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Prečítaná"
-
-#: filter/libfilter-i18n.h:47
-msgid "Recipients"
-msgstr "Adresáti"
-
-#: filter/libfilter-i18n.h:48
-msgid "Regex Match"
-msgstr "Regul. výraz"
-
-#: filter/libfilter-i18n.h:49
-msgid "Replied to"
-msgstr "Odpovedaná"
-
-#: filter/libfilter-i18n.h:50
-msgid "returns"
-msgstr "vráti"
-
-#: filter/libfilter-i18n.h:51
-msgid "returns greater than"
-msgstr "vráti viac než"
-
-#: filter/libfilter-i18n.h:52
-msgid "returns less than"
-msgstr "vráti menej než"
-
-#: filter/libfilter-i18n.h:53
-#, fuzzy
-msgid "Run Program"
-msgstr "Spustiť program:"
-
-#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Skóre"
-
-#: filter/libfilter-i18n.h:55
-msgid "Sender"
-msgstr "Odosielateľ"
-
-#: filter/libfilter-i18n.h:56
-msgid "Set Status"
-msgstr "Nastaviť stav"
-
-#: filter/libfilter-i18n.h:57
-msgid "Size (kB)"
-msgstr "Veľkosť (kB)"
-
-#: filter/libfilter-i18n.h:58
-msgid "sounds like"
-msgstr "vyzerá ako"
-
-#: filter/libfilter-i18n.h:59
-msgid "Source Account"
-msgstr "Zdrojový účet"
-
-#: filter/libfilter-i18n.h:60
-msgid "Specific header"
-msgstr "Špecifická hlavička"
-
-#: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "začína na"
-
-#: filter/libfilter-i18n.h:63
-msgid "Stop Processing"
-msgstr "Zastaviť spracovanie"
-
-#: filter/libfilter-i18n.h:64 mail/em-format.c:755 mail/em-format-html.c:1519
-#: mail/em-format-quote.c:302 mail/em-mailer-prefs.c:87
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
-#: smime/lib/e-cert.c:1079
-msgid "Subject"
-msgstr "Predmet"
-
-#: filter/libfilter-i18n.h:65
-msgid "Unset Status"
-msgstr "Zrušiť nastavenie stavu"
-
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Pridať pravidlo"
@@ -13213,6 +12723,11 @@ msgstr "Meno pravidla"
 msgid "_Score Rules"
 msgstr "Pravidlá skóre"
 
+#: filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Skóre"
+
 #: filter/searchtypes.xml.h:1
 msgid "Body contains"
 msgstr "Telo obsahuje"
@@ -13294,13 +12809,13 @@ msgstr "Podpisy"
 msgid "-------- Forwarded Message --------"
 msgstr "Predaná správa"
 
-#: mail/em-composer-utils.c:1499
+#: mail/em-composer-utils.c:1495
 msgid "an unknown sender"
 msgstr "neznámy odosielateľ"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1509
+#: mail/em-composer-utils.c:1505
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "Dňa %a, %Y-%m-%d at %H:%M, %%s napísal:"
@@ -13343,8 +12858,8 @@ msgstr "<kliknutím vyberiete priečinok>"
 msgid "Create New Folder"
 msgstr "Vytvoriť nový priečinok"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
-#: mail/mail-component.c:701
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
+#: mail/mail-component.c:704
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Zadajte, kde vytvoriť priečinok"
@@ -13359,108 +12874,109 @@ msgstr "Crestview"
 msgid "Folder _name:"
 msgstr "_Meno priečinku:"
 
-#: mail/em-folder-tree.c:839
+#: mail/em-folder-tree.c:833
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Odstraňujem priečinok %s"
 
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree.c:835
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Otváram priečinok %s"
 
-#: mail/em-folder-tree.c:848 mail/message-list.c:1555
+#: mail/em-folder-tree.c:842 mail/message-list.c:1561
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Presúvam správy do %s"
 
-#: mail/em-folder-tree.c:850 mail/message-list.c:1557
+#: mail/em-folder-tree.c:844 mail/message-list.c:1563
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopírujem správy do %s"
 
-#: mail/em-folder-tree.c:866
+#: mail/em-folder-tree.c:860
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 "Nepodarilo sa skopírovať alebo presunúť správu do virtuálneho priečinku"
 
-#: mail/em-folder-tree.c:956 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Kopírovať do priečinku"
 
-#: mail/em-folder-tree.c:957 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Presunúť do priečinku"
 
-#: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2069
-#: mail/em-folder-tree.c:2551 mail/em-folder-view.c:798
-#: mail/message-list.c:1645
+#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
+#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
+#: mail/message-list.c:1651
 #, fuzzy
 msgid "_Move"
 msgstr "Presunúť"
 
-#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#: mail/em-folder-tree.c:955 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "Zrušiť úlohu"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
 #: mail/em-folder-view.c:798 mail/em-folder-view.c:812
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Vybrať priečinok"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
 #, fuzzy
 msgid "C_opy"
 msgstr "Kopírovať"
 
-#: mail/em-folder-tree.c:2096
+#: mail/em-folder-tree.c:2088
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Ukladám priečinok '%s'"
 
-#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
+#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
 #, fuzzy
 msgid "Create folder"
 msgstr "Vytvoriť nový priečinok"
 
-#: mail/em-folder-tree.c:2474
+#: mail/em-folder-tree.c:2463
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Premenovať priečinok \"%s\" na:"
 
-#: mail/em-folder-tree.c:2476
+#: mail/em-folder-tree.c:2465
 msgid "Rename Folder"
 msgstr "Premenovať priečinok"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Pohľad"
 
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2537
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Otvoriť v novom okne"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2555
+#: mail/em-folder-tree.c:2546
 msgid "_New Folder..."
 msgstr "Nový _priečinok..."
 
-#: mail/em-folder-tree.c:2558
+#: mail/em-folder-tree.c:2549
 msgid "_Rename"
 msgstr "_Premenovať"
 
-#: mail/em-folder-tree.c:2561 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Vlastnosti..."
 
 #: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:889
+#: mail/mail-vfolder.c:888
 msgid "VFolders"
 msgstr "VPriečinky"
 
@@ -13474,19 +12990,19 @@ msgstr ""
 msgid "Inbox"
 msgstr "Doručená pošta"
 
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
 msgid "Loading..."
 msgstr "Načítavam..."
 
 #: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
 #: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
 #: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:551
+#: mail/mail-component.c:554
 msgid "Mail"
 msgstr "Pošta"
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Upraviť ako novú správu..."
@@ -13499,17 +13015,17 @@ msgstr "_Tlačiť"
 msgid "_Reply to Sender"
 msgstr "_Odpovedať odosielateľovi"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:810
+#: mail/em-folder-view.c:901 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Odpovedať _zoznamu"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:811
+#: mail/em-folder-view.c:902 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Odpovedať _všetkým"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: mail/em-folder-view.c:903 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "Poslať ď_alej"
@@ -13564,6 +13080,10 @@ msgstr "Pre_sunúť do priečinka..."
 msgid "_Copy to Folder..."
 msgstr "_Kopírovať do priečinku..."
 
+#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Popis"
+
 #: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Pridať odosielateľa do _adresára"
@@ -13614,12 +13134,12 @@ msgid "Filter on _Mailing List"
 msgstr "Filter na _konferenciu"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
-#: mail/mail-config.glade.h:66
+#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Štandard"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1796
 msgid "Print Message"
 msgstr "Tlačiť správu"
 
@@ -13659,12 +13179,18 @@ msgstr "Cc"
 msgid "Bcc"
 msgstr "Bcc"
 
+#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
+#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Predmet"
+
 #: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
 #: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Dátum"
 
-#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
+#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
 msgid "Newsgroups"
 msgstr ""
 
@@ -13856,7 +13382,7 @@ msgid ""
 "practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:757
+#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
 #, fuzzy
 msgid "_View Certificate"
 msgstr "ID _certifikátu:"
@@ -13918,7 +13444,7 @@ msgstr "Jeden _týždeň"
 msgid "Once per month"
 msgstr "Jeden _mesiac"
 
-#: mail/em-migrate.c:1072
+#: mail/em-migrate.c:1168
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13926,93 +13452,93 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1506
+#: mail/em-migrate.c:1602
 #, fuzzy, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Nie je možné získať priečinok: %s: %s"
 
-#: mail/em-migrate.c:1532
+#: mail/em-migrate.c:1628
 #, fuzzy, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr ""
 "Nepodarilo sa skopírovať deskriptor súboru: %s\n"
 "%s"
 
-#: mail/em-migrate.c:1715
+#: mail/em-migrate.c:1811
 #, fuzzy, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr ""
 "Nepodarilo sa vytvoriť výstupný súbor: %s\n"
 " %s"
 
-#: mail/em-migrate.c:1919
+#: mail/em-migrate.c:2015
 #, fuzzy, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Nepodarilo sa prihlásiť na POP server %s: %s"
 
-#: mail/em-migrate.c:1933
+#: mail/em-migrate.c:2029
 #, fuzzy, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Nepodarilo sa vytvoriť rúru do '%s': %s"
 
-#: mail/em-migrate.c:1962
+#: mail/em-migrate.c:2058
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#: mail/em-migrate.c:2413 mail/em-migrate.c:2425
 #, fuzzy, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Nepodarilo sa vytvoriť rúru do '%s': %s"
 
-#: mail/em-migrate.c:2480
+#: mail/em-migrate.c:2576
 #, fuzzy, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr ""
 "Nepodarilo sa vytvoriť výstupný súbor: %s\n"
 " %s"
 
-#: mail/em-migrate.c:2498
+#: mail/em-migrate.c:2594
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 msgstr ""
 
-#: mail/em-popup.c:699
+#: mail/em-popup.c:700
 #, fuzzy
 msgid "Save As..."
 msgstr "Uložiť _ako..."
 
-#: mail/em-popup.c:717
+#: mail/em-popup.c:718
 #, fuzzy, c-format
 msgid "untitled_image.%s"
 msgstr "Správa bez mena"
 
-#: mail/em-popup.c:807
+#: mail/em-popup.c:808
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:809
+#: mail/em-popup.c:810
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "_Odpovedať odosielateľovi"
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:859
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Otvoriť odkaz v prehliadači"
 
-#: mail/em-popup.c:859
+#: mail/em-popup.c:860
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Poslať _správu zoznamu..."
 
-#: mail/em-popup.c:860
+#: mail/em-popup.c:861
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Pridať odosielateľa do adresára"
 
-#: mail/em-popup.c:966
+#: mail/em-popup.c:967
 #, c-format
 msgid "Open in %s..."
 msgstr "Otvoriť v %s..."
@@ -14608,7 +14134,7 @@ msgstr "Ovládací prvok nastavenia pošty Evolution"
 msgid "Mail Accounts"
 msgstr "Poštové účty"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
 msgid "Mail Preferences"
 msgstr "Nastavenie pošty"
 
@@ -14622,15 +14148,15 @@ msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importuje vašu starú pošty Elm"
 
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:226
+#: mail/importers/evolution-mbox-importer.c:221
+#: mail/importers/evolution-outlook-importer.c:255
 #: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Importujem..."
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:222
-#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/evolution-mbox-importer.c:223
+#: mail/importers/evolution-outlook-importer.c:257
 #: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Prosím, čakajte"
@@ -14653,23 +14179,25 @@ msgid "Elm"
 msgstr "Elm"
 
 #: mail/importers/evolution-mbox-importer.c:116
+#: mail/importers/evolution-outlook-importer.c:130
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Odstrániť tento priečinok"
 
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 #, fuzzy
 msgid "Select folder to import into"
 msgstr "Vyberte nástroj pre import"
 
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:254
 #: mail/importers/mail-importer.c:226
 #, fuzzy, c-format
 msgid "Importing `%s'"
 msgstr "Importujem"
 
-#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/evolution-outlook-importer.c:301
 #: mail/importers/mail-importer.c:140
 #, fuzzy
 msgid "Importing mailbox"
@@ -14830,15 +14358,15 @@ msgstr ""
 msgid "%s License Agreement"
 msgstr ""
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
 msgid "_Host:"
 msgstr "_Hostiteľ:"
 
-#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
 msgid "User_name:"
 msgstr "Po_užívateľ:"
 
-#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
 msgid "_Path:"
 msgstr "_Cesta:"
 
@@ -14901,34 +14429,34 @@ msgstr "celkovo %d"
 msgid ", %d unread"
 msgstr "%d neposlaných"
 
-#: mail/mail-component.c:653
+#: mail/mail-component.c:656
 msgid "New Mail Message"
 msgstr "Nová správa"
 
-#: mail/mail-component.c:654
+#: mail/mail-component.c:657
 msgid "_Mail Message"
 msgstr "_Poslať správu"
 
-#: mail/mail-component.c:655
+#: mail/mail-component.c:658
 msgid "Compose a new mail message"
 msgstr "Napísať novú správu"
 
-#: mail/mail-component.c:661
+#: mail/mail-component.c:664
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Nový vPriečinok"
 
-#: mail/mail-component.c:662
+#: mail/mail-component.c:665
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Poštové filtre"
 
-#: mail/mail-component.c:663
+#: mail/mail-component.c:666
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Vytvoriť nový priečinok"
 
-#: mail/mail-component.c:795
+#: mail/mail-component.c:798
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
@@ -14940,7 +14468,7 @@ msgstr "Kontrolujem službu"
 msgid "Connecting to server..."
 msgstr "Pripájam sa na server..."
 
-#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Identita"
 
@@ -14954,7 +14482,7 @@ msgstr ""
 "nemusíte zadať, iba ak chcete, aby boli posielané vo vašich správach."
 
 #: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid "Receiving Mail"
 msgstr "Prijem pošty"
 
@@ -14971,7 +14499,7 @@ msgstr ""
 msgid "Please select among the following options"
 msgstr "Prosím, vyberte si z týchto možností"
 
-#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr "Posielanie pošty"
 
@@ -14984,7 +14512,7 @@ msgstr ""
 "ktorý typ serveru použiť, kontaktujte vášho administrátora alebo "
 "poskytovateľa pripojenia na Internet."
 
-#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37
 msgid "Account Management"
 msgstr "Správa účtu"
 
@@ -15001,250 +14529,254 @@ msgstr ""
 "Prosím, zadajte meno pre tento účet. Toto meno bude používané iba pre "
 "zobrazenie."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:2
 #, fuzzy
 msgid " Ch_eck for Supported Types "
 msgstr "Kontrolovať _podporované typy"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "<b>Preview</b>"
 msgstr "Ukážka"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "(Táto verzia Evolution nepodporuje SSL)"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "<b>S_ignatures</b>"
 msgstr "<b>Stav:</b>"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "<b>_Languages</b>"
 msgstr "<b>Stav:</b>"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
+msgid "<small>This will make the the filter more reliable, but slower</small>"
+msgstr ""
+
+#: mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "<span weight=\"bold\">Checking for New Mail</span>"
 msgstr "Kontrolujem novú poštu"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">General</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
 #, fuzzy
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "Zobrazené správy:"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "Upozornenie na novú poštu"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Security</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "Odoslané a koncepty"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:34
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:35
 #, fuzzy
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "_Vždy šifrovať kópiu sebe pri posielaní šifrovanej správy"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:36
 msgid "Account Editor"
 msgstr "Editor účtu"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:38
 #, fuzzy
 msgid "Add Ne_w Signature..."
 msgstr "Pridať nový podpis..."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Add _Script"
 msgstr "Pridať _skript"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:40
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "_Vždy šifrovať kópiu sebe pri posielaní šifrovanej správy"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Vždy poslať _kópiu (Cc):"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Vždy poslať _slepú kópiu (Bcc):"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Always _sign outgoing messages when using this account"
 msgstr "_Vždy podpisovať správy pri použití tohto účtu"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Vždy _dôverovať kľúčom v mojom keyringu pri šifrovaní"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Attach original message"
 msgstr "Priložiť pôvodnú správu"
 
-#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Príloha"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:48
 #, fuzzy
 msgid "Automatically _insert smiley images"
 msgstr "_Automaticky vložiť smajlíky"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Automatically check for _new mail every"
 msgstr "_Automaticky kontrolovať novú poštu každých"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "Baltic (ISO-8859-13)"
 msgstr "Pobaltská (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Baltic (ISO-8859-4)"
 msgstr "Pobaltská (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Beep w_hen new mail arrives"
 msgstr "Píp_nuť pri príchode novej správy"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "C_haracter set:"
 msgstr "_Znaková sada:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Ch_eck for Supported Types "
 msgstr "Kontrolovať _podporované typy"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 #, fuzzy
-msgid "Check _Incoming Mail"
+msgid "Check _incoming mail for junk"
 msgstr "Kontrolujem novú poštu"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Check spelling while I _type"
 msgstr "Kontrolovať pravopis _priebežne"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 msgid "Color for _misspelled words:"
 msgstr "Farba pre ne_správne slová:"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Colors"
 msgstr "_Farby"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Confirm _when expunging a folder"
 msgstr "_Potvrdenie pri čistení priečinku"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -15260,261 +14792,266 @@ msgstr ""
 "\n"
 "Kliknutím na \"Použiť\" uložíte vaše nastavenie."
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
 msgid "De_fault"
 msgstr "Š_tandardné"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Default character e_ncoding:"
 msgstr "Štandardná _znaková sada:"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 #, fuzzy
 msgid "Defaults"
 msgstr "Š_tandardné"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 msgid "Do not quote original message"
 msgstr "Necitovať pôvodnú správu"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 "Nepodpisovať požiadavky na _stretnutie (pre kompatibilitu s klientom Outlook)"
 
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Hotovo"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Drafts _Folder:"
 msgstr "Priečinok _konceptov:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:77
 msgid "Email Accounts"
 msgstr "E-mailové účty"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Email _Address:"
 msgstr "_E-mailová adresa:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "Empty trash folders on e_xit"
 msgstr "Vyprázdniť O_dpadky pri ukončení"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "ID _certifikátu:"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:81
 msgid "Evolution Account Assistant"
 msgstr "Sprievodca účtom Evolution"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:82
 msgid "Execute Command..."
 msgstr "Vykonať príkaz..."
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Fi_xed-width:"
 msgstr "Pe_vná šírka:"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 msgid "Font Properties"
 msgstr "Vlastnosti písma"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 msgid "Format messages in _HTML"
 msgstr "Písať správy v _HTML"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "HTML Mail"
 msgstr "_HTML správy"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Headers"
 msgstr "Hlavička"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr "_Zvýrazniť citácie pomocou"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
 #: mail/mail-config.glade.h:91
+#, fuzzy
+msgid "I_nclude remote tests"
+msgstr "Vložiť:"
+
+#: mail/mail-config.glade.h:94
 msgid "Inline"
 msgstr "v texte"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Mail Configuration"
 msgstr "Nastavenie pošty"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "Umiestnenie poštovej schránky"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr "Písanie správ"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "Poznámka: Kým sa prvýkrát nepripojíte, nebudete musieť heslo zadávať."
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Or_ganization:"
 msgstr "Or_ganizácia:"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "PGP/GPG _Key ID:"
 msgstr "ID PGP/GPG _kľúča:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "Play sound file when new mail arri_ves"
 msgstr "_Zahrať zvuk pri príchode novej správy"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Pýtať sa pri posielaní správ s adresátmi iba v _Bcc"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr "Citovať pôvodnú správu"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr "Citovať"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Re_member password"
 msgstr "Uložiť toto heslo"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr "Komu o_dpovedať:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "Príjem pošty"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:120
 #, fuzzy
 msgid "Receiving Options"
 msgstr "Nastavenie _príjmu"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
 #, fuzzy
 msgid "Remember _password"
 msgstr "Uložiť toto heslo"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
 #, fuzzy
 msgid "S_tandard Font:"
 msgstr "Š_tandardné písmo:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 #, fuzzy
 msgid "Security"
 msgstr "Za_bezpečenie"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font"
 msgstr "Vyberte písmo pevnej širky pre HTML"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:126
 msgid "Select HTML fixed width font for printing"
 msgstr "Vyberte písmo pevnej širky pre tlač HTML"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:127
 msgid "Select HTML variable width font"
 msgstr "Vyberte písmo premenlivej širky pre HTML"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:128
 msgid "Select HTML variable width font for printing"
 msgstr "Vyberte písmo premenlivej šírky pre tlač HTML"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:129
 #, fuzzy
 msgid "Select..."
 msgstr "Odstrániť..."
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "Posielanie pošty"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Sent _Messages Folder:"
 msgstr "Priečinok pre _odoslané správy:"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:134
 msgid "Ser_ver requires authentication"
 msgstr "Server vyžaduje _prihlásenie"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:135
 msgid "Server _Type: "
 msgstr "_Typ serveru:"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Samopodpísaný certifikát v reťazci"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:137
 #, fuzzy
 msgid "Signat_ure:"
 msgstr "Podpis:"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "Signatures"
 msgstr "_Podpisy"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr "Zadajte _meno súboru:"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "Spell Checking"
 msgstr "Kontrola _pravopisu"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:141
 msgid "Standard Unix mbox"
 msgstr "Štandardný Unixový súbor mbox"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "T_erminal Font:"
 msgstr "Písmo _terminálu:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "T_ype: "
 msgstr "Typ:"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -15523,7 +15060,7 @@ msgstr ""
 "Výstup tohto skriptu sa použije ako vaša signatúra.\n"
 "Zadané meno sa použije iba pre zobrazenie."
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
@@ -15532,7 +15069,7 @@ msgstr ""
 "Táto časť umožňuje nastviť chovanie a jazyk pre kontrolu pravopisu. Zoznam "
 "jazykov obsahuje iba tie, pre ktoré máte nainštalované slovníky."
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:149
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -15540,15 +15077,11 @@ msgstr ""
 "Zadajte meno, ako chcete tento účet označovať.\n"
 "Napríklad \"Pracovný\" alebo \"Osobný\"."
 
-#: mail/mail-config.glade.h:148
-msgid "Use _Daemon"
-msgstr ""
-
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:152
 msgid "V_ariable-width:"
 msgstr "_Premenlivá šírka:"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:153
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -15558,93 +15091,89 @@ msgstr ""
 "\n"
 "Kliknutím \"Nasledujúci\" začnete."
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:158
 msgid "_Add Signature"
 msgstr "_Pridať podpis"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Always load images from the Internet"
 msgstr "_Vždy načítavať obrázky zo siete"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Digitally sign outgoing messages (by default)"
 msgstr "_Vždy podpisovať správy pri použití tohto účtu"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:161
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Neuprozorňovať na príchod novej správy"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:163
 msgid "_Enable"
 msgstr "_Povoliť"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:165
 msgid "_Forward style:"
 msgstr "Štýl _preposielania:"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Load images if sender is in address book"
 msgstr "_Načítať obrázky ak je odosielateľ v adresári"
 
-#: mail/mail-config.glade.h:167
-msgid "_Local Tests Only"
-msgstr ""
-
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Make this my default account"
 msgstr "Použiť ako š_tandardný účet"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_Mark messages as read after"
 msgstr "_Označiť správy ako prečítané po"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Never load images from the Internet"
 msgstr "_Nikdy nenačítať obrázky zo siete"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "_Pýtať sa pri posielaní HTML správ kontaktom, ktoré nechcú tento formát"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:175
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Pýtať sa pri posielaní správ be_z predmetu"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:176
 msgid "_Reply style:"
 msgstr "Š_týl odpovede:"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:177
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:178
 msgid "_Show animated images"
 msgstr "Zobraziť _animované obrázky"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "_Use Secure Connection (SSL):"
 msgstr "Použiť _bezpečné pripojenie (SSL):"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "_Use the same fonts as other applications"
 msgstr "_Použiť rovnaké písma ako ostatné aplikácie"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:181
 msgid "color"
 msgstr "farba"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "popis"
 
@@ -15816,7 +15345,7 @@ msgstr ""
 
 #. mail:camel-exception primary
 #: mail/mail-errors.xml.h:57
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgid "Your message with the subject \"{0}\" was not delivered."
 msgstr ""
 
 #. mail:camel-exception secondary
@@ -15882,11 +15411,6 @@ msgstr ""
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Nie je možné vytvoriť priečinok %s: %s"
 
-#. mail:no-save-path secondary
-#: mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail:no-create-path primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
@@ -15911,12 +15435,6 @@ msgstr ""
 msgid "Cannot create temporary save directory."
 msgstr "Nie je možné vytvoriť dočasný priečinok: %s"
 
-#. mail:no-create-tmp-path secondary
-#: mail/mail-errors.xml.h:100 mail/mail-errors.xml.h:112
-#: widgets/misc/e-system-errors.xml.h:11 widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail:no-write-path-exists secondary
 #: mail/mail-errors.xml.h:104
 #, fuzzy
@@ -16195,29 +15713,25 @@ msgstr "Prepísať"
 msgid "_Append"
 msgstr "Aspen"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:785
 #, c-format
 msgid "Pinging %s"
 msgstr "Prehľadávam %s"
 
-#: mail/mail-mt.c:897
-msgid "Working"
-msgstr "Pracujem"
-
-#: mail/mail-ops.c:99
+#: mail/mail-ops.c:98
 msgid "Filtering Folder"
 msgstr "Filtrujem priečinok"
 
-#: mail/mail-ops.c:260
+#: mail/mail-ops.c:259
 msgid "Fetching Mail"
 msgstr "Prijímam poštu"
 
-#: mail/mail-ops.c:543
+#: mail/mail-ops.c:542
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Nepodarilo sa použiť filtre pre odosielanú poštu : %s"
 
-#: mail/mail-ops.c:568
+#: mail/mail-ops.c:567
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -16226,115 +15740,115 @@ msgstr ""
 "Nepodarilo sa pridať do %s: %s\n"
 "Namiesto toho sa pridá do priečinka `Odoslané'."
 
-#: mail/mail-ops.c:577
+#: mail/mail-ops.c:576
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Nepodarilo sa pridať do lokálneho priečinku \"Odoslené\": %s"
 
-#: mail/mail-ops.c:673
+#: mail/mail-ops.c:672
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Posielam správu %d z %d"
 
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:703
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Nepodarilo sa dekódovať správu."
 
-#: mail/mail-ops.c:708
+#: mail/mail-ops.c:707
 msgid "Complete."
 msgstr "Dokončené."
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:804
 msgid "Saving message to folder"
 msgstr "Ukladám správu do priečinku"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Presúvam správy do %s"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopírujem správy do %s"
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:1002
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Prechádzam priečinky v \"%s\""
 
-#: mail/mail-ops.c:1116
+#: mail/mail-ops.c:1115
 msgid "Forwarded messages"
 msgstr "Správy predané ďalej"
 
-#: mail/mail-ops.c:1159
+#: mail/mail-ops.c:1158
 #, c-format
 msgid "Opening folder %s"
 msgstr "Otváram priečinok %s"
 
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1230
 #, c-format
 msgid "Opening store %s"
 msgstr "Otváram sklad %s"
 
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1308
 #, c-format
 msgid "Removing folder %s"
 msgstr "Odstraňujem priečinok %s"
 
-#: mail/mail-ops.c:1403
+#: mail/mail-ops.c:1402
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Ukladám priečinok '%s'"
 
-#: mail/mail-ops.c:1468
+#: mail/mail-ops.c:1467
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1469
+#: mail/mail-ops.c:1468
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Ukladám priečinok '%s'"
 
-#: mail/mail-ops.c:1524
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr "Aktualizujem priečinok"
 
-#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
+#: mail/mail-ops.c:1559 mail/mail-ops.c:1610
 msgid "Expunging folder"
 msgstr "Čistím priečinok"
 
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1607
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Vyprázdňujem kôš v '%s'"
 
-#: mail/mail-ops.c:1609
+#: mail/mail-ops.c:1608
 msgid "Local Folders"
 msgstr "Lokálne priečinky"
 
-#: mail/mail-ops.c:1692
+#: mail/mail-ops.c:1691
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Získavam správu %s"
 
-#: mail/mail-ops.c:1764
+#: mail/mail-ops.c:1763
 #, fuzzy, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Získavam %d správ"
 msgstr[1] "Získavam %d správ"
 
-#: mail/mail-ops.c:1850
+#: mail/mail-ops.c:1849
 #, fuzzy, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Ukladám %d správ"
 msgstr[1] "Ukladám %d správ"
 
-#: mail/mail-ops.c:1900
+#: mail/mail-ops.c:1899
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -16343,7 +15857,7 @@ msgstr ""
 "Nepodarilo sa vytvoriť výstupný súbor: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1928
+#: mail/mail-ops.c:1927
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -16352,11 +15866,11 @@ msgstr ""
 "Chyba pri ukladaní správ do `%s':\n"
 "%s"
 
-#: mail/mail-ops.c:1999
+#: mail/mail-ops.c:1998
 msgid "Saving attachment"
 msgstr "Ukladám prílohu"
 
-#: mail/mail-ops.c:2016
+#: mail/mail-ops.c:2015
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -16365,17 +15879,17 @@ msgstr ""
 "Nepodarilo sa vytvoriť výstupný súbor: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2046
+#: mail/mail-ops.c:2045
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nie je možné zapísať dáta: %s"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Odpojujem sa od %s"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Znovu sa pripojujem na %s"
@@ -16440,24 +15954,24 @@ msgstr "Obnovujem..."
 msgid "Waiting..."
 msgstr "Čakám..."
 
-#: mail/mail-session.c:238
+#: mail/mail-session.c:239
 msgid "User canceled operation."
 msgstr "Používateľ zrušil operáciu."
 
-#: mail/mail-session.c:271
+#: mail/mail-session.c:272
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Zadajte vaše heslo pre %s"
 
-#: mail/mail-session.c:273
+#: mail/mail-session.c:274
 msgid "Enter Password"
 msgstr "Zadajte heslo"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password"
 msgstr "_Uložiť toto heslo"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:298
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Zapamätať si heslo pre zvyšok tohto sedenia"
 
@@ -16514,79 +16028,79 @@ msgstr "Aktualizujem vpriečinky pre uri: %s"
 msgid "Updating vFolders for '%s'"
 msgstr "Aktualizujem vpriečinky pre uri: %s"
 
-#: mail/mail-vfolder.c:959
+#: mail/mail-vfolder.c:958
 msgid "vFolders"
 msgstr "vPriečinky"
 
-#: mail/mail-vfolder.c:998
+#: mail/mail-vfolder.c:997
 msgid "Edit VFolder"
 msgstr "Upraviť vpriečinok"
 
-#: mail/mail-vfolder.c:1082
+#: mail/mail-vfolder.c:1081
 msgid "New VFolder"
 msgstr "Nový vPriečinok"
 
-#: mail/message-list.c:946
+#: mail/message-list.c:948
 msgid "Unseen"
 msgstr "Nevidené"
 
-#: mail/message-list.c:947
+#: mail/message-list.c:949
 msgid "Seen"
 msgstr "Videné"
 
-#: mail/message-list.c:948
+#: mail/message-list.c:950
 msgid "Answered"
 msgstr "Odpovedané"
 
-#: mail/message-list.c:949
+#: mail/message-list.c:951
 msgid "Multiple Unseen Messages"
 msgstr "Viacero neprečítaných správ"
 
-#: mail/message-list.c:950
+#: mail/message-list.c:952
 msgid "Multiple Messages"
 msgstr "Viacero správ"
 
-#: mail/message-list.c:954
+#: mail/message-list.c:956
 msgid "Lowest"
 msgstr "Najnižšia"
 
-#: mail/message-list.c:955
+#: mail/message-list.c:957
 msgid "Lower"
 msgstr "Nižšia"
 
-#: mail/message-list.c:959
+#: mail/message-list.c:961
 msgid "Higher"
 msgstr "Vyššia"
 
-#: mail/message-list.c:960
+#: mail/message-list.c:962
 msgid "Highest"
 msgstr "Najvyššia"
 
-#: mail/message-list.c:1279
+#: mail/message-list.c:1285
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1286
+#: mail/message-list.c:1292
 msgid "Today %l:%M %p"
 msgstr "Dnes %l:%M %p"
 
-#: mail/message-list.c:1295
+#: mail/message-list.c:1301
 msgid "Yesterday %l:%M %p"
 msgstr "Včera %l:%M %p"
 
-#: mail/message-list.c:1307
+#: mail/message-list.c:1313
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1315
+#: mail/message-list.c:1321
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1317
+#: mail/message-list.c:1323
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3300
+#: mail/message-list.c:3321
 msgid "Generating message list"
 msgstr "Generujem zoznam správ"
 
@@ -16642,6 +16156,10 @@ msgstr "Poslať ďalej"
 msgid "No Response Necessary"
 msgstr "Odpoveď nie je nutná"
 
+#: mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Prečítaná"
+
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Odpovedať"
@@ -16747,45 +16265,49 @@ msgid ""
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:10
-msgid "Whether Evolution should start up in offline mode"
+msgid "Toolbar is visible"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:11
-msgid "Whether to skip the development warning dialog"
+msgid "Whether Evolution should start up in offline mode"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Whether the toolbar should be visible."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:14
 #, fuzzy
 msgid "mail"
 msgstr "E-mail"
 
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
-msgstr "Pre vás vytvoril"
-
-#: shell/e-shell.c:545 shell/e-shell.c:546
+#: shell/e-shell.c:588 shell/e-shell.c:589
 #, fuzzy, c-format
 msgid "%ld KB"
 msgstr "%d %B"
 
-#: shell/e-shell.c:744
+#: shell/e-shell.c:786
 #, fuzzy
 msgid "Uknown system error."
 msgstr "Neznáma chyba"
 
-#: shell/e-shell.c:1101
+#: shell/e-shell.c:1143
 msgid "Invalid arguments"
 msgstr "Neplatné argumenty"
 
-#: shell/e-shell.c:1103
+#: shell/e-shell.c:1145
 msgid "Cannot register on OAF"
 msgstr "Nie je možné zaregistrovať u OAF"
 
-#: shell/e-shell.c:1105
+#: shell/e-shell.c:1147
 msgid "Configuration Database not found"
 msgstr "Konfiguračná databáza nenájdená"
 
-#: shell/e-shell.c:1107
+#: shell/e-shell.c:1149
 msgid "Generic error"
 msgstr "Všeobecná chyba"
 
@@ -16845,7 +16367,7 @@ msgstr ""
 msgid "Select importer"
 msgstr "Vyberte nástroj pre import"
 
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1026
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
 #, c-format
 msgid "File %s does not exist"
 msgstr "Súbor %s neexistuje"
@@ -16873,35 +16395,35 @@ msgstr ""
 "Importujem %s\n"
 "Importujem položku 1."
 
-#: shell/e-shell-importer.c:549
+#: shell/e-shell-importer.c:570
 msgid "Automatic"
 msgstr "Automaticky"
 
-#: shell/e-shell-importer.c:598
+#: shell/e-shell-importer.c:626
 #, fuzzy
-msgid "_Filename:"
+msgid "F_ilename:"
 msgstr "Meno súboru:"
 
-#: shell/e-shell-importer.c:603
+#: shell/e-shell-importer.c:631
 msgid "Select a file"
 msgstr "Vyberte súbor"
 
-#: shell/e-shell-importer.c:613
+#: shell/e-shell-importer.c:642
 #, fuzzy
 msgid "File _type:"
 msgstr "Typ súboru:"
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:681
 #, fuzzy
 msgid "Import data and settings from _older programs"
 msgstr "Importovať dáta a nastavenia zo starších programov"
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:684
 #, fuzzy
 msgid "Import a _single file"
 msgstr "Importovať jeden súbor"
 
-#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -16909,26 +16431,26 @@ msgstr ""
 "Prosím, čakajte...\n"
 "Hľadám existujúce nastavenie"
 
-#: shell/e-shell-importer.c:727
+#: shell/e-shell-importer.c:756
 msgid "Starting Intelligent Importers"
 msgstr "Spúšťam inteligentné importy"
 
-#: shell/e-shell-importer.c:853 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
 #, c-format
 msgid "From %s:"
 msgstr "Od %s:"
 
-#: shell/e-shell-importer.c:1044
+#: shell/e-shell-importer.c:1073
 #, fuzzy, c-format
 msgid "No importer available for file %s"
 msgstr "Pre protokol `%s' nie je k dispozícii poskytovateľ"
 
-#: shell/e-shell-importer.c:1056
+#: shell/e-shell-importer.c:1085
 #, fuzzy
 msgid "Unable to execute importer"
 msgstr "Nepodarilo sa spustiť gpg."
 
-#: shell/e-shell-importer.c:1169
+#: shell/e-shell-importer.c:1199
 #, fuzzy
 msgid "_Import"
 msgstr "Import"
@@ -16979,61 +16501,61 @@ msgstr "Meno priečinku nesmie obsahovať znak \"#\"."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' a '..' sú rezervované mená priečinkov."
 
-#: shell/e-shell-window.c:336
+#: shell/e-shell-window.c:337
 #, fuzzy
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution je momentálne on-line. Stlačením tohto tlačidla prejdete do "
 "módu off-line."
 
-#: shell/e-shell-window.c:343
+#: shell/e-shell-window.c:344
 #, fuzzy
 msgid "Evolution is in the process of going offline."
 msgstr "Ximian Evolution prechádza do módu off-line."
 
-#: shell/e-shell-window.c:349
+#: shell/e-shell-window.c:350
 #, fuzzy
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution je momentálne off-line. Stlačením tohto tlačidla prejdete "
 "do módu on-line."
 
-#: shell/e-shell-window.c:621
+#: shell/e-shell-window.c:637
 #, fuzzy, c-format
 msgid "Switch to %s"
 msgstr "Pošta pre %s"
 
-#: shell/e-shell-window-commands.c:64
+#: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Vyzerá to, že nemáte nainštalované nástroje pre PalmPilota GNOME."
 
-#: shell/e-shell-window-commands.c:72
+#: shell/e-shell-window-commands.c:74
 #, c-format
 msgid "Error executing %s."
 msgstr "Chyba pri vykonávaní %s."
 
-#: shell/e-shell-window-commands.c:121
+#: shell/e-shell-window-commands.c:123
 msgid "Bug buddy is not installed."
 msgstr "Priateľ v núdzi nie je nainštalovaný."
 
-#: shell/e-shell-window-commands.c:129
+#: shell/e-shell-window-commands.c:131
 msgid "Bug buddy could not be run."
 msgstr "Nedá sa spustiť nástroj pre oznamovanie chýb"
 
-#: shell/e-shell-window-commands.c:171
+#: shell/e-shell-window-commands.c:323
 #, fuzzy
-msgid "About Evolution"
-msgstr "O Ximian Evolution"
+msgid "Groupware Suite"
+msgstr "Skupina"
 
-#: shell/e-shell-window-commands.c:382
+#: shell/e-shell-window-commands.c:563
 msgid "_Work Online"
 msgstr "Pracovať _on-line"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "_Pracovať off-line"
 
-#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Pracovať off-line"
 
@@ -17045,43 +16567,6 @@ msgstr "Zaškrtávacie tlačidlo"
 msgid "New"
 msgstr "Nová"
 
-#: shell/evolution-shell-component-utils.c:115
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Neznáma chyba."
-
-#: shell/evolution-shell-component-utils.c:118
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Chyba z komponentového systému:\n"
-"%s"
-
-#: shell/evolution-shell-component-utils.c:125
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Chyba z aktivačného systému:\n"
-"%s"
-
 #: shell/evolution-test-component.c:140
 #, fuzzy
 msgid "New Test"
@@ -17418,34 +16903,34 @@ msgid ""
 "Click help for details."
 msgstr ""
 
-#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:522
+#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
+#: smime/gui/certificate-manager.c:556
 #, fuzzy
 msgid "Select a cert to import..."
 msgstr "Vyberte nástroj pre import"
 
-#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:604
+#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
+#: smime/gui/certificate-manager.c:638
 #, fuzzy
 msgid "Certificate Name"
 msgstr "ID _certifikátu:"
 
-#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
+#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
 #, fuzzy
 msgid "Purposes"
 msgstr "Priebeh"
 
-#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:517
+#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:267
+#: smime/gui/certificate-manager.c:271
 #, fuzzy
 msgid "Expires"
 msgstr "Výraz"
 
-#: smime/gui/certificate-manager.c:417
+#: smime/gui/certificate-manager.c:446
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "Zliať e-mailovú adresu"
@@ -17488,6 +16973,11 @@ msgid ""
 "  Subject: %s\n"
 msgstr ""
 
+#: smime/gui/e-cert-selector.c:169
+#, fuzzy
+msgid "Select certificate"
+msgstr "Prejsť na zadaný dátum"
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -17550,7 +17040,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
 #, fuzzy
 msgid "Certificate"
 msgstr "ID _certifikátu:"
@@ -17575,20 +17065,24 @@ msgstr "Spoločé meno"
 msgid "Contact Certificates"
 msgstr "ID _certifikátu:"
 
-#: smime/gui/smime-ui.glade.h:21
-#, no-c-format
-msgid "Do you want to trust \"%s\" for the following purposes?"
+#: smime/gui/smime-ui.glade.h:20
+msgid "Do not trust the authenticity of this certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:21
 msgid "Dummy window only"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:22
 #, fuzzy
 msgid "Edit"
 msgstr "_Upraviť"
 
+#: smime/gui/smime-ui.glade.h:23
+#, fuzzy
+msgid "Email Certificate Trust Settings"
+msgstr "Neplatná certifikačná autorita (CA)"
+
 #: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr ""
@@ -17625,280 +17119,289 @@ msgstr "Organizáčná jednotka"
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:37
-msgid "Trust this CA to identify email users."
+msgid "Trust the authenticity of this certificate"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:38
-msgid "Trust this CA to identify software developers."
+msgid "Trust this CA to identify email users."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:39
-msgid "Trust this CA to identify web sites."
+msgid "Trust this CA to identify software developers."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:40
-#, fuzzy
-msgid "View"
-msgstr "_Pohľad"
+msgid "Trust this CA to identify web sites."
+msgstr ""
 
 #: smime/gui/smime-ui.glade.h:41
 #, fuzzy
-msgid "View Certificate"
-msgstr "ID _certifikátu:"
+msgid "View"
+msgstr "_Pohľad"
 
 #: smime/gui/smime-ui.glade.h:42
-#, fuzzy
-msgid "You have been asked to trust a new Certificate Authority (CA)."
-msgstr "Neplatná certifikačná autorita (CA)"
-
-#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:44
+#: smime/gui/smime-ui.glade.h:43
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:45
+#: smime/gui/smime-ui.glade.h:44
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:46
+#: smime/gui/smime-ui.glade.h:45
 #, fuzzy
 msgid "Your Certificates"
 msgstr "ID _certifikátu:"
 
-#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
+#: smime/gui/smime-ui.glade.h:46
+msgid "_Edit CA Trust"
+msgstr ""
+
+#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 #, fuzzy
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
-#: smime/lib/e-cert.c:478
+#. x509 certificate usage types
+#: smime/lib/e-cert.c:424
+#, fuzzy
+msgid "Sign"
+msgstr "Stauning"
+
+#: smime/lib/e-cert.c:425
+#, fuzzy
+msgid "Encrypt"
+msgstr "Šifrovanie PGP"
+
+#: smime/lib/e-cert.c:530
 #, fuzzy
 msgid "Version"
 msgstr "Vermont"
 
-#: smime/lib/e-cert.c:493
+#: smime/lib/e-cert.c:545
 #, fuzzy
 msgid "Version 1"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:496
+#: smime/lib/e-cert.c:548
 #, fuzzy
 msgid "Version 2"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:499
+#: smime/lib/e-cert.c:551
 #, fuzzy
 msgid "Version 3"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:581
+#: smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:584
+#: smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:587
+#: smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:590
+#: smime/lib/e-cert.c:642
 #, fuzzy
 msgid "C"
 msgstr " C"
 
-#: smime/lib/e-cert.c:593
+#: smime/lib/e-cert.c:645
 #, fuzzy
 msgid "CN"
 msgstr "S"
 
-#: smime/lib/e-cert.c:596
+#: smime/lib/e-cert.c:648
 msgid "OU"
 msgstr ""
 
-#: smime/lib/e-cert.c:599
+#: smime/lib/e-cert.c:651
 #, fuzzy
 msgid "O"
 msgstr "OK"
 
-#: smime/lib/e-cert.c:602
+#: smime/lib/e-cert.c:654
 msgid "L"
 msgstr ""
 
-#: smime/lib/e-cert.c:605
+#: smime/lib/e-cert.c:657
 #, fuzzy
 msgid "DN"
 msgstr "S"
 
-#: smime/lib/e-cert.c:608
+#: smime/lib/e-cert.c:660
 msgid "DC"
 msgstr ""
 
-#: smime/lib/e-cert.c:611
+#: smime/lib/e-cert.c:663
 #, fuzzy
 msgid "ST"
 msgstr "SMTP"
 
-#: smime/lib/e-cert.c:614
+#: smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:617
+#: smime/lib/e-cert.c:669
 #, fuzzy
 msgid "Certificate Key Usage"
 msgstr "ID _certifikátu:"
 
-#: smime/lib/e-cert.c:620
+#: smime/lib/e-cert.c:672
 #, fuzzy
 msgid "Netscape Certificate Type"
 msgstr "ID _certifikátu:"
 
-#: smime/lib/e-cert.c:623
+#: smime/lib/e-cert.c:675
 #, fuzzy
 msgid "Certificate Authority Key Identifier"
 msgstr "Nedôveryhodný certifikát"
 
-#: smime/lib/e-cert.c:626
+#: smime/lib/e-cert.c:678
 #, fuzzy
 msgid "UID"
 msgstr "ID"
 
-#: smime/lib/e-cert.c:635
+#: smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr ""
 
-#: smime/lib/e-cert.c:686
+#: smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:694
+#: smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
 msgstr ""
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:768
 msgid "Subject Public Key Info"
 msgstr ""
 
-#: smime/lib/e-cert.c:721
+#: smime/lib/e-cert.c:773
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:736
+#: smime/lib/e-cert.c:788
 #, fuzzy
 msgid "Subject's Public Key"
 msgstr "Predmet je %s"
 
-#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
+#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
 #, fuzzy
 msgid "Error: Unable to process extension"
 msgstr "Nie je možné spracovať priečinok fronty"
 
-#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
+#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:782
+#: smime/lib/e-cert.c:834
 #, fuzzy
 msgid "SSL Certificate Authority"
 msgstr "Neplatná certifikačná autorita (CA)"
 
-#: smime/lib/e-cert.c:786
+#: smime/lib/e-cert.c:838
 #, fuzzy
 msgid "Email Certificate Authority"
 msgstr "Neplatná certifikačná autorita (CA)"
 
-#: smime/lib/e-cert.c:814
+#: smime/lib/e-cert.c:866
 #, fuzzy
 msgid "Signing"
 msgstr "Stauning"
 
-#: smime/lib/e-cert.c:818
+#: smime/lib/e-cert.c:870
 #, fuzzy
 msgid "Non-repudiation"
 msgstr "Žiadna informácia"
 
-#: smime/lib/e-cert.c:822
+#: smime/lib/e-cert.c:874
 msgid "Key Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:826
+#: smime/lib/e-cert.c:878
 #, fuzzy
 msgid "Data Encipherment"
 msgstr "príloha"
 
-#: smime/lib/e-cert.c:830
+#: smime/lib/e-cert.c:882
 msgid "Key Agreement"
 msgstr ""
 
-#: smime/lib/e-cert.c:834
+#: smime/lib/e-cert.c:886
 #, fuzzy
 msgid "Certificate Signer"
 msgstr "ID _certifikátu:"
 
-#: smime/lib/e-cert.c:838
+#: smime/lib/e-cert.c:890
 msgid "CRL Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:938
 #, fuzzy
 msgid "Critical"
 msgstr "Curitiba"
 
-#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
+#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
 #, fuzzy
 msgid "Not Critical"
 msgstr "Severmí Karolina"
 
-#: smime/lib/e-cert.c:912
+#: smime/lib/e-cert.c:964
 #, fuzzy
 msgid "Extensions"
 msgstr "Výraz"
 
-#: smime/lib/e-cert.c:983
+#: smime/lib/e-cert.c:1035
 #, fuzzy, c-format
 msgid "%s = %s"
 msgstr "%s o %s"
 
-#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
 #, fuzzy
 msgid "Certificate Signature Algorithm"
 msgstr "Zlyhanie podpisu certifikátu"
 
-#: smime/lib/e-cert.c:1048
+#: smime/lib/e-cert.c:1100
 #, fuzzy
 msgid "Issuer"
 msgstr "_Vložiť"
 
-#: smime/lib/e-cert.c:1102
+#: smime/lib/e-cert.c:1154
 msgid "Issuer Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1121
+#: smime/lib/e-cert.c:1173
 #, fuzzy
 msgid "Subject Unique ID"
 msgstr "Predmet je %s"
 
-#: smime/lib/e-cert.c:1164
+#: smime/lib/e-cert.c:1216
 #, fuzzy
 msgid "Certificate Signature Value"
 msgstr "Zlyhanie podpisu certifikátu"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
+#: smime/lib/e-cert-db.c:608
 #, fuzzy
 msgid "Certificate already exists"
 msgstr "ID karty už existuje"
@@ -18048,7 +17551,7 @@ msgstr "Zobraziť aktuálny kontakt"
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "A_kcie"
 
@@ -18216,7 +17719,7 @@ msgstr "_Zavrieť"
 #: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:3
+#: ui/evolution.xml.h:4
 msgid "Close"
 msgstr "Zavrieť"
 
@@ -18229,7 +17732,7 @@ msgid "Delete this item"
 msgstr "Odstráni túto položku"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr "Hlavný panel nástrojov"
 
@@ -18272,7 +17775,7 @@ msgstr "Uložiť túto položku na disk"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:44
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "_File"
 msgstr "_Súbor"
 
@@ -18532,13 +18035,13 @@ msgstr "_Obrátiť výber"
 msgid "_Threaded Message List"
 msgstr "Zoznam _vlákien"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Zavrie toto okno"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "_Close"
 msgstr "_Zavrieť"
 
@@ -18946,7 +18449,7 @@ msgstr "_Predchádzajúca správa"
 msgid "_Quoted"
 msgstr "_Citované"
 
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
 msgid "_Tools"
 msgstr "_Nástroje"
 
@@ -19249,109 +18752,123 @@ msgid "_Open Task"
 msgstr "Ú_loha"
 
 #: ui/evolution.xml.h:1
-msgid "About Ximian Evolution..."
-msgstr "O Ximian Evolution..."
+#, fuzzy
+msgid "About Evolution..."
+msgstr "O Ximian Evolution"
 
 #: ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
 msgstr "Zmeniť nastavenie Evolution"
 
-#: ui/evolution.xml.h:5
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the visibility of the toolbar"
+msgstr "Zmení vlastnosti tohto priečinku"
+
+#: ui/evolution.xml.h:6
 msgid "Create a new window displaying this folder"
 msgstr "Vytvoriť nové okno pre tento priečinok"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "_Koniec"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Ximian Evolution _FAQ"
+
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Ukončí program"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:10
 msgid "Forget _Passwords"
 msgstr "Zabudnúť _heslá"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:11
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Zabudnúť uložené heslá, takže ich budete musieť znovu zadať"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:12
 msgid "Import data from other programs"
 msgstr "Importovať dáta z iných programov"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:14
 #, fuzzy
 msgid "New _Window"
 msgstr "_Nájsť teraz"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Pi_lot Settings..."
 msgstr "Nastavenie _pilota..."
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Send / Receive"
 msgstr "Príjem / odoslanie"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Send queued items and retrieve new items"
 msgstr "Poslať neodoslanú poštu a prijať novú poštu"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Set up Pilot configuration"
 msgstr "Nastavenie Pilota"
 
-#: ui/evolution.xml.h:17
-msgid "Show information about Ximian Evolution"
+#: ui/evolution.xml.h:19
+#, fuzzy
+msgid "Show information about Evolution"
 msgstr "Zobrazí informáciu o Ximian Evolution"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:20
 msgid "Submit Bug Report"
 msgstr "Pošle správu o chybe"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:21
 msgid "Submit _Bug Report"
 msgstr "_Poslať správu o chybe"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Submit a bug report using Bug Buddy"
 msgstr ""
 "Pošle správu o chybe pomocou nástroja pre oznamovanie chýb Priateľ v núdzi."
 
-#: ui/evolution.xml.h:21
-msgid "Toggle whether we are working offline."
-msgstr "Prepne, či pracujete on alebo off-line."
-
 #: ui/evolution.xml.h:23
-msgid "Ximian Evolution _FAQ"
-msgstr "Ximian Evolution _FAQ"
+#, fuzzy
+msgid "T_oolbar"
+msgstr "Hlavný panel nástrojov"
 
 #: ui/evolution.xml.h:24
-msgid "_About Ximian Evolution..."
-msgstr "O Ximian _Evolution..."
+msgid "Toggle whether we are working offline."
+msgstr "Prepne, či pracujete on alebo off-line."
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "_About Evolution..."
+msgstr "O Ximian Evolution"
+
+#: ui/evolution.xml.h:30
 msgid "_Help"
 msgstr "_Pomocník"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "_Import..."
 msgstr "_Import..."
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "_New"
 msgstr "_Nový"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 #, fuzzy
 msgid "_Quick Reference"
 msgstr "Nastavenie pošty"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_Send / Receive"
 msgstr "_Poslať / Prijať"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 #, fuzzy
 msgid "_Window"
 msgstr "_Nájsť teraz"
@@ -19430,7 +18947,7 @@ msgid "With _Status"
 msgstr "Nastaviť stav"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:626
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:635
 msgid "UTC"
 msgstr "UTC"
 
@@ -19587,29 +19104,29 @@ msgstr "Iné..."
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
-#: widgets/misc/e-error.c:121
+#: widgets/misc/e-error.c:79 widgets/misc/e-error.c:80
+#: widgets/misc/e-error.c:122
 msgid "Evolution Error"
 msgstr "Chyba Evolution"
 
-#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
-#: widgets/misc/e-error.c:119
+#: widgets/misc/e-error.c:81 widgets/misc/e-error.c:82
+#: widgets/misc/e-error.c:120
 #, fuzzy
 msgid "Evolution Warning"
 msgstr "Pošta Evolution"
 
-#: widgets/misc/e-error.c:118
+#: widgets/misc/e-error.c:119
 #, fuzzy
 msgid "Evolution Information"
 msgstr "Informácie o stretnutí"
 
-#: widgets/misc/e-error.c:120
+#: widgets/misc/e-error.c:121
 #, fuzzy
 msgid "Evolution Query"
 msgstr "Súhrn Evolution"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:410
+#: widgets/misc/e-error.c:415
 #, fuzzy, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -19763,16 +19280,509 @@ msgstr ""
 "Nie je možné uložiť do %s\n"
 "  %s"
 
-#: widgets/misc/e-task-widget.c:211
+#: widgets/misc/e-task-widget.c:212
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: widgets/misc/e-task-widget.c:216
+#: widgets/misc/e-task-widget.c:217
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% hotových)"
 
+#~ msgid "Failed to connect to LDAP server"
+#~ msgstr "Nepodarilo sa pripojiť k serveru LDAP"
+
+#~ msgid "Failed to authenticate with LDAP server"
+#~ msgstr "Nepodarilo sa prihlásiť na IMAP serveri"
+
+#~ msgid "Could not perform query on Root DSE"
+#~ msgstr "Nepodarilo sa vykonať dotaz na koreňovom DSE"
+
+#~ msgid "The server responded with no supported search bases"
+#~ msgstr "Server odpovedal nepodporovanými databázami hľadania"
+
+#~ msgid "This server does not support LDAPv3 schema information"
+#~ msgstr "Tento server nepodporuje informácie schém LDAPv3"
+
+#~ msgid "Error retrieving schema information"
+#~ msgstr "Chyba pri načítavaní informácie zo schémy"
+
+#~ msgid "Server did not respond with valid schema information"
+#~ msgstr "Server neodpovedal platnou informáciou o schéme"
+
+#~ msgid "  S_how Supported Bases "
+#~ msgstr "Zobraziť _podporované základy"
+
+#~ msgid "1:00"
+#~ msgstr "1:00"
+
+#~ msgid "5:00"
+#~ msgstr "5:00"
+
+#~ msgid "Connecting"
+#~ msgstr "Pripojenie"
+
+#~ msgid "Distinguished _name:"
+#~ msgstr "_Známe meno:"
+
+#~ msgid "Email address:"
+#~ msgstr "Emailová adresa:"
+
+#~ msgid "Evolution will use this DN to authenticate you with the server"
+#~ msgstr "Evolution použije tento DN pre prihlásenie na váš server"
+
+#~ msgid "One"
+#~ msgstr "Jeden"
+
+#~ msgid "S_earch scope: "
+#~ msgstr "_Rozsah hľadania:"
+
+#~ msgid "Searching"
+#~ msgstr "Hľadám"
+
+#~ msgid "Sub"
+#~ msgstr "Pod"
+
+#~ msgid "This option controls how long a search will be run."
+#~ msgstr "Táto voľba učuje, ako dlho môže hľadanie prebiehať."
+
+#~ msgid "U_se SSL/TLS:"
+#~ msgstr "Použiť _SSL/TLS:"
+
+#~ msgid "_Display name:"
+#~ msgstr "Meno pre zo_brazenie:"
+
+#~ msgid "_Port number:"
+#~ msgstr "_Port:"
+
+#~ msgid "_Search base:"
+#~ msgstr "_Oblasť hľadania:"
+
+#~ msgid "_Server name:"
+#~ msgstr "_Meno serveru:"
+
+#~ msgid "_Timeout (minutes):"
+#~ msgstr "Ča_kanie (minúty):"
+
+#~ msgid "connecting-tab"
+#~ msgstr "connecting-tab"
+
+#~ msgid "general-tab"
+#~ msgstr "general-tab"
+
+#~ msgid "searching-tab"
+#~ msgstr "searching-tab"
+
+#, fuzzy
+#~ msgid "Job title:"
+#~ msgstr "Činnosť/po_zícia:"
+
+#, fuzzy
+#~ msgid "Webcam:"
+#~ msgstr "Strana"
+
+#~ msgid "Category editor not available."
+#~ msgstr "Editor kategórií nie je k dispozícii."
+
+#, fuzzy
+#~ msgid ""
+#~ "The following entries are invalid:\n"
+#~ "\n"
+#~ msgstr "Tieto spojenia sú momentálne aktívne:"
+
+#~ msgid "Could not find widget for a field: `%s'"
+#~ msgstr "Nie je možné nájsť prvok pre pole: `%s'"
+
+#~ msgid "Do you want to save changes?"
+#~ msgstr "Chcete uložiť zmeny?"
+
+#~ msgid "Error saving %s: %s"
+#~ msgstr "Chyba pri ukladaní %s: %s"
+
+#~ msgid ""
+#~ "The addressbook backend for\n"
+#~ "%s\n"
+#~ "has crashed. You will have to restart Evolution in order to use it again"
+#~ msgstr ""
+#~ "Adresárové rozhranie pre\n"
+#~ "%s\n"
+#~ "spadlo. Aby ste ho mohli znovu použiť, musíte Evolution reštartovať."
+
+#, fuzzy
+#~ msgid "Can not load URI"
+#~ msgstr "Karta nenájdená"
+
+#, fuzzy
+#~ msgid "Calendar Properties"
+#~ msgstr "Chyba iCalendar"
+
+#, fuzzy
+#~ msgid "Remote"
+#~ msgstr "Odstrániť"
+
+#, fuzzy
+#~ msgid "Task List Properties"
+#~ msgstr "Zoznam úloh"
+
+#, fuzzy
+#~ msgid "_Refresh Interval:"
+#~ msgstr "Obnoviť zoznam"
+
+#, fuzzy
+#~ msgid "_Source URL:"
+#~ msgstr "Zdrojové URI pre POP"
+
+#~ msgid ""
+#~ "The event being deleted is a meeting, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "Odstraňovaná udalosť je schôdzka. Chcete poslať oznámenie o jej zrušení?"
+
+#~ msgid "Are you sure you want to cancel and delete this meeting?"
+#~ msgstr "Naozaj chcete zrušiť a odstrániť toto stretnutie?"
+
+#~ msgid ""
+#~ "The task being deleted is assigned, would you like to send a cancellation "
+#~ "notice?"
+#~ msgstr ""
+#~ "Odstraňovaná úloha je priradená. Chcete poslať oznámenie o jej zrušení?"
+
+#~ msgid "Are you sure you want to cancel and delete this task?"
+#~ msgstr "Naozaj chcete zrušiť a odstrániť túto úlohu?"
+
+#~ msgid ""
+#~ "The journal entry being deleted is published, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "Odstraňovaný záznam žurnálu je publikovaný. Chcete poslať oznámenie o "
+#~ "jeho zrušení?"
+
+#~ msgid "Are you sure you want to cancel and delete this journal entry?"
+#~ msgstr "Naozaj chcete zrušiť a odstrániť túto položku denníka?"
+
+#~ msgid "Are you sure you want to delete the appointment `%s'?"
+#~ msgstr "Naozaj chcete odstrániť schôdzku `%s'?"
+
+#~ msgid "Are you sure you want to delete this untitled appointment?"
+#~ msgstr "Naozaj chcete odstrániť túto schôdzku bez mena?"
+
+#~ msgid "Are you sure you want to delete the task `%s'?"
+#~ msgstr "Naozaj chcete odstrániť úlohu `%s'?"
+
+#~ msgid "Are you sure you want to delete this untitled task?"
+#~ msgstr "Naozaj chcete odstrániť úlohu bez mena?"
+
+#~ msgid "Are you sure you want to delete the journal entry `%s'?"
+#~ msgstr "Naozaj chcete odstrániť položku denníka `%s'?"
+
+#~ msgid "Are you sure want to delete this untitled journal entry?"
+#~ msgstr "Naozaj chcete odstrániť položku denníka bez mena?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d appointment?"
+#~ msgid_plural "Are you sure you want to delete %d appointments?"
+#~ msgstr[0] "Naozaj chcete odstrániť %d schôdzok?"
+#~ msgstr[1] "Naozaj chcete odstrániť %d schôdzok?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d task?"
+#~ msgid_plural "Are you sure you want to delete %d tasks?"
+#~ msgstr[0] "Naozaj chcete odstrániť %d úloh?"
+#~ msgstr[1] "Naozaj chcete odstrániť %d úloh?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d journal entry?"
+#~ msgid_plural "Are you sure you want to delete %d journal entries?"
+#~ msgstr[0] "Naozaj chcete odstrániť %d položiek denníka?"
+#~ msgstr[1] "Naozaj chcete odstrániť %d položiek denníka?"
+
+#~ msgid "_Invite Others..."
+#~ msgstr "_Pozvať ostatných..."
+
+#~ msgid ""
+#~ "This event has been changed, but has not been saved.\n"
+#~ "\n"
+#~ "Do you wish to save your changes?"
+#~ msgstr ""
+#~ "Táto udalosť bola zmenená, ale Tento podpis bol zmenený, ale neuložená.\n"
+#~ "\n"
+#~ "Chcete uložiť zmeny?"
+
+#~ msgid "_Discard Changes"
+#~ msgstr "_Zahodiť zmeny"
+
+#~ msgid "Save Event"
+#~ msgstr "Uložiť udalosť"
+
+#~ msgid "The meeting information has been created. Send it?"
+#~ msgstr "Informácia o schôdzke bola vytvorená. Chcete ju poslať?"
+
+#~ msgid "The meeting information has changed. Send an updated version?"
+#~ msgstr "Informácia o schôdzke sa zmenila. Chcete poslať upravenú verziu?"
+
+#~ msgid "The task assignment information has been created. Send it?"
+#~ msgstr "Informácia o priradení úlohy bola vytvorená. Chcete ju poslať?"
+
+#~ msgid "The task information has changed. Send an updated version?"
+#~ msgstr "Informácia o úlohe sa zmenila. Chcete poslať upravenú verziu?"
+
+#, fuzzy
+#~ msgid "Could not get article %s from NNTP server"
+#~ msgstr "Nie je možné získať skupinu: %s"
+
+#, fuzzy
+#~ msgid "Error posting message: %s: message not posted"
+#~ msgstr ""
+#~ "Chyba pri automatickom ukladaní správ: %s\n"
+#~ " %s"
+
+#, fuzzy
+#~ msgid "Stream error"
+#~ msgstr "chyba spracovania"
+
+#, fuzzy
+#~ msgid "Connection error: %s"
+#~ msgstr "Neznáma chyba: %s"
+
+#~ msgid "Could not get group: %s"
+#~ msgstr "Nie je možné získať skupinu: %s"
+
+#, fuzzy
+#~ msgid "Could not get messages: unspecified error"
+#~ msgstr "Nie je možné poslať správu: %s"
+
+#~ msgid "Unknown server response: %s"
+#~ msgstr "Neznáma odpoveď serveru: %s"
+
+#~ msgid "Adjust Score"
+#~ msgstr "Upraviť skóre"
+
+#~ msgid "Assign Color"
+#~ msgstr "Priradiť farbu"
+
+#~ msgid "Assign Score"
+#~ msgstr "Priradiť skóre"
+
+#~ msgid "Attachments"
+#~ msgstr "Prílohy"
+
+#~ msgid "Beep"
+#~ msgstr "Pípnuť"
+
+#~ msgid "contains"
+#~ msgstr "obsahuje"
+
+#~ msgid "Copy to Folder"
+#~ msgstr "Kopírovať do priečinku"
+
+#~ msgid "Date received"
+#~ msgstr "Dátum prijatia"
+
+#~ msgid "Date sent"
+#~ msgstr "Dátum odoslania"
+
+#~ msgid "Deleted"
+#~ msgstr "Odstránené"
+
+#~ msgid "does not contain"
+#~ msgstr "neobsahuje"
+
+#~ msgid "does not end with"
+#~ msgstr "nekončí na"
+
+#~ msgid "does not exist"
+#~ msgstr "neexistuje"
+
+#~ msgid "does not return"
+#~ msgstr "nevrátiť"
+
+#~ msgid "does not sound like"
+#~ msgstr "nevyzerá ako"
+
+#~ msgid "does not start with"
+#~ msgstr "nezačína na"
+
+#~ msgid "Do Not Exist"
+#~ msgstr "Neexistuje"
+
+#~ msgid "Draft"
+#~ msgstr "Návrh"
+
+#~ msgid "ends with"
+#~ msgstr "končí na"
+
+#~ msgid "Exist"
+#~ msgstr "Existuje"
+
+#~ msgid "exists"
+#~ msgstr "existuje"
+
+#~ msgid "Expression"
+#~ msgstr "Výraz"
+
+#~ msgid "Follow Up"
+#~ msgstr "Follow Up"
+
+#~ msgid "is"
+#~ msgstr "je"
+
+#~ msgid "is after"
+#~ msgstr "je po"
+
+#~ msgid "is before"
+#~ msgstr "bolo pred"
+
+#~ msgid "is Flagged"
+#~ msgstr "je označený"
+
+#~ msgid "is greater than"
+#~ msgstr "je viac než"
+
+#~ msgid "is less than"
+#~ msgstr "je menej než"
+
+#~ msgid "is not"
+#~ msgstr "nie je"
+
+#~ msgid "is not Flagged"
+#~ msgstr "nie je označený"
+
+#, fuzzy
+#~ msgid "Junk Test"
+#~ msgstr "Jún"
+
+#~ msgid "Mailing list"
+#~ msgstr "Konferencia"
+
+#~ msgid "Message Body"
+#~ msgstr "Telo správy"
+
+#~ msgid "Message Header"
+#~ msgstr "Hlavička správy"
+
+#, fuzzy
+#~ msgid "Message is Junk"
+#~ msgstr "Správy"
+
+#, fuzzy
+#~ msgid "Message is not Junk"
+#~ msgstr "Označiť ako _dôležitú"
+
+#~ msgid "Move to Folder"
+#~ msgstr "Presunúť do priečinku"
+
+#, fuzzy
+#~ msgid "Pipe to Program"
+#~ msgstr "Ukončí program"
+
+#~ msgid "Play Sound"
+#~ msgstr "Zahrať zvuk"
+
+#~ msgid "Recipients"
+#~ msgstr "Adresáti"
+
+#~ msgid "Regex Match"
+#~ msgstr "Regul. výraz"
+
+#~ msgid "Replied to"
+#~ msgstr "Odpovedaná"
+
+#~ msgid "returns"
+#~ msgstr "vráti"
+
+#~ msgid "returns greater than"
+#~ msgstr "vráti viac než"
+
+#~ msgid "returns less than"
+#~ msgstr "vráti menej než"
+
+#, fuzzy
+#~ msgid "Run Program"
+#~ msgstr "Spustiť program:"
+
+#~ msgid "Sender"
+#~ msgstr "Odosielateľ"
+
+#~ msgid "Set Status"
+#~ msgstr "Nastaviť stav"
+
+#~ msgid "Size (kB)"
+#~ msgstr "Veľkosť (kB)"
+
+#~ msgid "sounds like"
+#~ msgstr "vyzerá ako"
+
+#~ msgid "Source Account"
+#~ msgstr "Zdrojový účet"
+
+#~ msgid "Specific header"
+#~ msgstr "Špecifická hlavička"
+
+#~ msgid "starts with"
+#~ msgstr "začína na"
+
+#~ msgid "Stop Processing"
+#~ msgstr "Zastaviť spracovanie"
+
+#~ msgid "Unset Status"
+#~ msgstr "Zrušiť nastavenie stavu"
+
+#~ msgid "Working"
+#~ msgstr "Pracujem"
+
+#~ msgid "Brought to you by"
+#~ msgstr "Pre vás vytvoril"
+
+#, fuzzy
+#~ msgid "_Filename:"
+#~ msgstr "Meno súboru:"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "Unknown error."
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Neznáma chyba."
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the component system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Chyba z komponentového systému:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the activation system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Chyba z aktivačného systému:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "View Certificate"
+#~ msgstr "ID _certifikátu:"
+
+#, fuzzy
+#~ msgid "You have been asked to trust a new Certificate Authority (CA)."
+#~ msgstr "Neplatná certifikačná autorita (CA)"
+
+#~ msgid "About Ximian Evolution..."
+#~ msgstr "O Ximian Evolution..."
+
+#~ msgid "_About Ximian Evolution..."
+#~ msgstr "O Ximian _Evolution..."
+
 #~ msgid "Evolution Addressbook folder viewer"
 #~ msgstr "Prehliadač priečinku adresára Evolution"
 
@@ -20066,9 +20076,6 @@ msgstr "%s (%d%% hotových)"
 #~ msgid "Primary _email:"
 #~ msgstr "Primárny _email:"
 
-#~ msgid "S_pouse:"
-#~ msgstr "Ma_nžel(ka):"
-
 #~ msgid "_Business:"
 #~ msgstr "_Zamestnanie:"
 
@@ -20084,9 +20091,6 @@ msgstr "%s (%d%% hotových)"
 #~ msgid "_Mobile:"
 #~ msgstr "_Mobil:"
 
-#~ msgid "_Office:"
-#~ msgstr "Prac_ovisko:"
-
 #~ msgid "_Public Calendar URL:"
 #~ msgstr "URL pre _verejný kalendár:"
 
@@ -21539,10 +21543,6 @@ msgstr "%s (%d%% hotových)"
 #~ msgstr "Objekt sa nepodarilo nájsť\n"
 
 #, fuzzy
-#~ msgid "Invalid object"
-#~ msgstr "Neplatný účel"
-
-#, fuzzy
 #~ msgid "URI not loaded"
 #~ msgstr "EBook nenačítaný\n"
 
@@ -25499,9 +25499,6 @@ msgstr "%s (%d%% hotových)"
 #~ msgid "Lannion"
 #~ msgstr "Lannion"
 
-#~ msgid "Lansing"
-#~ msgstr "Lansing"
-
 #~ msgid "Lanzhou"
 #~ msgstr "Lanzhou"
 
diff --git a/po/sl.po b/po/sl.po
index 85fef77544..6c794f865d 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2004-05-19 14:00-0400\n"
+"POT-Creation-Date: 2004-06-03 11:14-0400\n"
 "PO-Revision-Date: 2000-07-28 03:15+0200\n"
 "Last-Translator: Andraz Tori <andraz.tori1@guest.arnes.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -59,14 +59,14 @@ msgstr "1 vizitka"
 msgid "Default Sync Address:"
 msgstr "Privzet usklajevalni naslov:"
 
-#: addressbook/conduit/address-conduit.c:1150
 #: addressbook/conduit/address-conduit.c:1151
+#: addressbook/conduit/address-conduit.c:1152
 #, fuzzy
 msgid "Could not load addressbook"
 msgstr "Nisem mogel naložiti %s: %s"
 
-#: addressbook/conduit/address-conduit.c:1219
-#: addressbook/conduit/address-conduit.c:1222
+#: addressbook/conduit/address-conduit.c:1220
+#: addressbook/conduit/address-conduit.c:1223
 msgid "Could not read pilot's Address application block"
 msgstr "Nisem mogel prebrati Pilotovega adresarja"
 
@@ -74,14 +74,14 @@ msgstr "Nisem mogel prebrati Pilotovega adresarja"
 msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
 #, fuzzy
 msgid "Failed to authenticate.\n"
 msgstr "Nisem mogel preveriti certifikatov."
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
 #, fuzzy, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "Vpišite geslo za %s (uporabnik %s)"
@@ -129,62 +129,24 @@ msgstr "Skupina _stikov"
 msgid "Create a new contacts group"
 msgstr "Ustvari novo skupino bližnjic"
 
-#: addressbook/gui/component/addressbook-component.c:182
+#: addressbook/gui/component/addressbook-component.c:184
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:483
-#, fuzzy
-msgid "Failed to connect to LDAP server"
-msgstr "Nisem se mogel povezati s strežnikom LDAP."
-
-#: addressbook/gui/component/addressbook-config.c:507
-#, fuzzy
-msgid "Failed to authenticate with LDAP server"
-msgstr ""
-"Strežniku IMAP se nisem mogel avtentificirati.\n"
-"%s\n"
-"\n"
-
-#: addressbook/gui/component/addressbook-config.c:535
-#, fuzzy
-msgid "Could not perform query on Root DSE"
-msgstr "Nisem mogel razčleniti niza poizvedbe"
-
-#: addressbook/gui/component/addressbook-config.c:840
-msgid "The server responded with no supported search bases"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1245
-msgid "This server does not support LDAPv3 schema information"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1266
-#, fuzzy
-msgid "Error retrieving schema information"
-msgstr ""
-"Napaka ob nalaganju podatkov o filtrih:\n"
-"%s"
-
-#: addressbook/gui/component/addressbook-config.c:1274
-#, fuzzy
-msgid "Server did not respond with valid schema information"
-msgstr "Odgovor strežnika IMAP ni vseboval podatkov %s"
-
 #: addressbook/gui/component/addressbook-migrate.c:68
-#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1160
 #, fuzzy
 msgid "Migrating..."
 msgstr "Čakam..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1201
 #, fuzzy, c-format
 msgid "Migrating `%s':"
 msgstr "Ustvarjam \"%s\""
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:438
+#: addressbook/gui/component/addressbook-migrate.c:464
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
 #: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
@@ -192,32 +154,32 @@ msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:446
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
-#: mail/mail-config.glade.h:106
+#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
+#: mail/mail-config.glade.h:109
 #, fuzzy
 msgid "Personal"
 msgstr "Priština"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:454
+#: addressbook/gui/component/addressbook-migrate.c:480
 #, fuzzy
 msgid "On LDAP Servers"
 msgstr "Strežnik LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:582
+#: addressbook/gui/component/addressbook-migrate.c:608
 #, fuzzy
 msgid "LDAP Servers"
 msgstr "Strežnik LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:702
+#: addressbook/gui/component/addressbook-migrate.c:728
 #, fuzzy
 msgid "Autocompletion Settings"
 msgstr "Krajevne mape"
 
-#: addressbook/gui/component/addressbook-migrate.c:1076
+#: addressbook/gui/component/addressbook-migrate.c:1104
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -225,60 +187,55 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1090
+#: addressbook/gui/component/addressbook-migrate.c:1118
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1099
+#: addressbook/gui/component/addressbook-migrate.c:1127
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1109
+#: addressbook/gui/component/addressbook-migrate.c:1137
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:674
+#: addressbook/gui/component/addressbook-view.c:675
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:761
+#: addressbook/gui/component/addressbook-view.c:754
 #, fuzzy
 msgid "New Address Book"
 msgstr "Adresar"
 
-#: addressbook/gui/component/addressbook-view.c:762
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
+#: addressbook/gui/component/addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Zbriši"
 
-#: addressbook/gui/component/addressbook-view.c:763
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-view.c:756
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Lastnosti..."
 
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/addressbook-view.c:1002
+#. Create the contacts group
+#: addressbook/gui/component/addressbook-view.c:995
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
 #: calendar/gui/migration.c:373
 msgid "Contacts"
 msgstr "Stiki"
@@ -365,11 +322,6 @@ msgid "Manage your S/MIME certificates here"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-#, fuzzy
-msgid "  S_how Supported Bases "
-msgstr "_Preveri za podprte vrste  "
-
-#: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -384,271 +336,218 @@ msgstr "_Preveri za podprte vrste  "
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:4
-#, fuzzy
-msgid "1:00"
-msgstr "100"
-
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "Avtentifikacija"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
 #, fuzzy
 msgid "<b>Display</b>"
 msgstr "Stanje:"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 #, fuzzy
 msgid "<b>Downloading</b>"
 msgstr "<b>Napaka ob prenašanju Metar</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:10
 #, fuzzy
 msgid "<b>Searching</b>"
 msgstr "Iskanje"
 
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
 msgid "<b>Server Information</b>"
 msgstr "Podatki o izvorni kodi"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
 msgid "<b>Type:</b>"
 msgstr "končano "
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:13
 #, fuzzy
 msgid "Add Contacts Group"
 msgstr "Skupina _stikov"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:14
 #, fuzzy
 msgid "Address Book Properties"
 msgstr "Viri adresarja"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
-#: mail/mail-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
+#: mail/mail-config.glade.h:42
 msgid "Always"
 msgstr "Vedno"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:16
 #, fuzzy
 msgid "Anonymously"
 msgstr "Anonimno"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:17
 #: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Osnovno"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
-#, fuzzy
-msgid "Connecting"
-msgstr "Connecticut"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 #: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Podrobnosti"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
-#, fuzzy
-msgid "Distinguished _name:"
-msgstr "_Razločno ime:"
-
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:19
 #, fuzzy
 msgid "Distinguished name"
 msgstr "_Razločno ime:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:20
 #, fuzzy
 msgid "Download limit:"
 msgstr "_Omejitev prenosov"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Email address"
 msgstr "_E-poštni naslov:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-#, fuzzy
-msgid "Email address:"
-msgstr "_E-poštni naslov:"
-
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:22
 #, fuzzy
-msgid "Evolution will use this DN to authenticate you with the server"
-msgstr ""
-"Evolucija bo uporabila ta e-poštni naslov, za vašo avtentifikacijo pri "
-"strežniku"
-
-#: addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
-"Evolution will use this email address to authenticate you with the server"
+"Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "Evolucija bo uporabila ta e-poštni naslov, za vašo avtentifikacijo pri "
 "strežniku"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:23
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Shranjena iskanja"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:24
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
+#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Splošno"
 
-#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
-#: mail/mail-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
+#: mail/mail-config.glade.h:102
 msgid "Never"
 msgstr "Nikoli"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
-msgid "One"
-msgstr "Ena"
-
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:27
 #, fuzzy
-msgid "S_earch scope: "
-msgstr "_Doseg iskanja:"
+msgid "Search _base:"
+msgstr "Iskanje v _zbirki:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
 msgid "Search base only"
 msgstr "Iskanje v _zbirki:"
 
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:29
 #, fuzzy
 msgid "Search base:"
 msgstr "Iskanje v _zbirki:"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Search scope:"
 msgstr "_Doseg iskanja:"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
-msgid "Searching"
-msgstr "Iskanje"
-
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:31
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
-"server if\n"
-"your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL or TLS."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:32
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a \n"
-"insecure environment. For example, if you and your LDAP server are behind a "
-"firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection "
-"is already\n"
-"secure."
+"you are in a insecure environment. For example, if you and your LDAP server "
+"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
+"because your connection is already secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
-"TLS.  This \n"
-"means that your connection will be insecure, and that you will be vulnerable "
-"to security\n"
-"exploits. "
+"TLS.  This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Sub"
-msgstr "Pod"
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:35
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "Shranjena iskanja"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
-"searches will \n"
-"begin. If you leave this blank, the search will begin at the root of the "
-"directory tree."
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
-"the \n"
-"directory tree. A search scope of \"sub\" will include all entries below "
-"your search base.\n"
-"A search scope of \"one\" will only include the entries one level beneath "
-"your base.\n"
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:58
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:39
 #, fuzzy
 msgid ""
-"This is the maximum number of entries to download. Setting this number to "
-"be \n"
+"This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr ""
 "To je največje število vizik za prenos.  Če je to nastavljeno na preveč, bo "
 "upočasnilo ta adresar."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -658,149 +557,119 @@ msgstr ""
 "boste to nastavili na \"E-poštni naslov\", bo potrebovan anonimni dostop do "
 "vašega strežnika LDAP"
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:41
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
-"list.\n"
-"It is for display purposes only. "
+"list. It is for display purposes only. "
 msgstr ""
 "To ime bo uporabljeno za identifikacijo vašega računa. Uporablja se le za "
 "prikaz."
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. "
-"A \n"
-"list of standard ports has been provided. Ask your system administrator\n"
-"what port you should specify."
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:67
-msgid "This option controls how long a search will be run."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:43
 #, fuzzy
 msgid "Timeout:"
 msgstr "Oblika izpisa časa:"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
-msgid "U_se SSL/TLS:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:44
 #, fuzzy
 msgid "Using distinguished name (DN)"
 msgstr "Razločno ime (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:45
 #, fuzzy
 msgid "Using email address"
 msgstr "E-poštni naslov"
 
-#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
-#: mail/mail-config.glade.h:154
+#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
+#: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr "Kadar je možno"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:47
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "Skupina _stikov"
 
-#: addressbook/gui/component/ldap-config.glade.h:74
-#: calendar/gui/dialogs/calendar-setup.glade.h:12
-#, fuzzy
-msgid "_Display name:"
-msgstr "_Prikaz"
-
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:48
 #, fuzzy
 msgid "_Download limit:"
 msgstr "_Omejitev prenosov"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
 msgid "_Email address:"
 msgstr "_E-poštni naslov:"
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:50
+#, fuzzy
+msgid "_Find Possible Search Bases"
+msgstr "Shranjena iskanja"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "_Log in:"
+msgstr "Prijava"
+
+#: addressbook/gui/component/ldap-config.glade.h:53
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
 msgid "_Name:"
 msgstr "_Ime:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
-#, fuzzy
-msgid "_Port number:"
-msgstr "Številka vrat:"
-
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid "_Port:"
 msgstr "_Vrata:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:55
 #, fuzzy
-msgid "_Search base:"
-msgstr "Iskanje v _zbirki:"
-
-#: addressbook/gui/component/ldap-config.glade.h:82
-msgid "_Server name:"
-msgstr "Ime _strežnika:"
+msgid "_Search scope:"
+msgstr "_Doseg iskanja:"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:56
 #, fuzzy
 msgid "_Server:"
 msgstr "Strežniki"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:57
 #, fuzzy
-msgid "_Timeout (minutes):"
-msgstr "Čas podaljška spanja (minut)"
+msgid "_Timeout:"
+msgstr "Oblika izpisa časa:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:58
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "Uporabi _varno povezavo (SSL)"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:59
 #, fuzzy
 msgid "cards"
 msgstr "ni vizitk"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
-#, fuzzy
-msgid "connecting-tab"
-msgstr "Znova se povezujem z %s"
-
-#: addressbook/gui/component/ldap-config.glade.h:88
-#, fuzzy
-msgid "general-tab"
-msgstr "Splošno"
-
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:60
 #: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
-#: mail/mail-config.glade.h:182
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "minut"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
-#, fuzzy
-msgid "searching-tab"
-msgstr "Iskanje"
-
-#: addressbook/gui/component/select-names/e-select-names.c:497
+#: addressbook/gui/component/select-names/e-select-names.c:503
 #: addressbook/gui/component/select-names/select-names.glade.h:6
 #, fuzzy
 msgid "Select Contacts from Address Book"
 msgstr "Izberi stike iz adresarja"
 
-#: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
@@ -842,7 +711,7 @@ msgstr "Neimenovan stik"
 
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:222
+#: addressbook/gui/widgets/e-addressbook-view.c:224
 msgid "Source"
 msgstr "Izvorna koda"
 
@@ -922,9 +791,9 @@ msgid "<b>Work</b>"
 msgstr "Delavni teden"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
-#: addressbook/gui/widgets/eab-contact-display.c:342
-#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/widgets/eab-contact-display.c:334
+#: addressbook/gui/widgets/eab-contact-display.c:353
 msgid "AIM"
 msgstr ""
 
@@ -965,8 +834,8 @@ msgid "Company:"
 msgstr "Podjetje"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:271
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
+#: addressbook/gui/contact-editor/e-contact-editor.c:266
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
 #, fuzzy
@@ -974,7 +843,7 @@ msgid "Contact"
 msgstr "Stiki"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1527
+#: addressbook/gui/contact-editor/e-contact-editor.c:520
 msgid "Contact Editor"
 msgstr "Urejevalnik stikov"
 
@@ -998,84 +867,80 @@ msgid "Full _Name..."
 msgstr "_Polno ime..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:202
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-msgid "Home"
-msgstr "Doma"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #, fuzzy
 msgid "Home Page:"
 msgstr "Domači faks"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-#, fuzzy
-msgid "Job title:"
-msgstr "Službeni _naziv:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/e-itip-control.c:936
-#, fuzzy
-msgid "Location:"
-msgstr "_Lega:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 #, fuzzy
 msgid "MSN Messenger"
 msgstr "_Pošlji sporočilo"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 #, fuzzy
 msgid "Mailing Address"
 msgstr "E-poštni naslov:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 #, fuzzy
 msgid "Manager:"
 msgstr "Upravljalec"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "_Vzdevek:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Notes:"
 msgstr "Opom_be:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
-#: addressbook/gui/contact-editor/e-contact-editor.c:203
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-msgid "Other"
-msgstr "Drugo"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#, fuzzy
+msgid "Office:"
+msgstr "Pi_sarna:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "PO Box:"
 msgstr "_Poštni predal:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 #, fuzzy
 msgid "Personal Information"
 msgstr "Podatki po želji"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 #, fuzzy
 msgid "Profession:"
 msgstr "_Poklic:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#, fuzzy
+msgid "Spouse:"
+msgstr "_Partner(ka):"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "State/Province:"
 msgstr "_Država/Provinca:"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#, fuzzy
+msgid "Title:"
+msgstr "_Naziv:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+msgid "Video Chat:"
+msgstr ""
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:41
 #, fuzzy
 msgid "Wants to receive HTML mail"
@@ -1083,15 +948,15 @@ msgstr "Želi dobivati _HTML e-pošto"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:42
 #, fuzzy
-msgid "Webcam:"
-msgstr "Stran"
+msgid "Web Log:"
+msgstr "Naslov _spletne strani:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
-#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
-#: mail/mail-config.glade.h:155
+#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
+#: mail/mail-config.glade.h:157
 #, fuzzy
 msgid "Work"
 msgstr "Delam"
@@ -1114,19 +979,12 @@ msgid "_File under:"
 msgstr "Ime datoteke:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 #, fuzzy
 msgid "_Where:"
 msgstr "Strežniki"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
-msgid "item7"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
-msgid "item8"
-msgstr ""
-
-#: addressbook/gui/contact-editor/eab-editor.c:316
+#: addressbook/gui/contact-editor/eab-editor.c:315
 #, fuzzy
 msgid ""
 "Are you sure you want\n"
@@ -1135,7 +993,7 @@ msgstr ""
 "Ste prepričani, \n"
 "da želite zbrisati ta stik?"
 
-#: addressbook/gui/contact-editor/eab-editor.c:319
+#: addressbook/gui/contact-editor/eab-editor.c:318
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -1144,17 +1002,17 @@ msgstr ""
 "da želite zbrisati ta stik?"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:351
-#: addressbook/gui/widgets/eab-contact-display.c:372
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:364
 #, fuzzy
 msgid "Address"
 msgstr "_Naslov:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:292
+#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard.c:174
@@ -2140,93 +1998,117 @@ msgstr "Zambija"
 msgid "Zimbabwe"
 msgstr "Zimbabve"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/contact-editor/e-contact-editor.c:179
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:337
+#: addressbook/gui/widgets/eab-contact-display.c:356
 #, fuzzy
 msgid "Jabber"
 msgstr "Neimenovan seznam stikov"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:347
-#: addressbook/gui/widgets/eab-contact-display.c:366
+#: addressbook/gui/contact-editor/e-contact-editor.c:180
+#: addressbook/gui/widgets/eab-contact-display.c:339
+#: addressbook/gui/widgets/eab-contact-display.c:358
 #, fuzzy
 msgid "Yahoo"
 msgstr "Idaho"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: addressbook/gui/widgets/eab-contact-display.c:338
+#: addressbook/gui/widgets/eab-contact-display.c:357
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:344
-#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#: addressbook/gui/widgets/eab-contact-display.c:355
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/contact-editor/e-contact-editor.c:183
 #, fuzzy
 msgid "GroupWise"
 msgstr "Skupina"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+msgid "Home"
+msgstr "Doma"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+msgid "Other"
+msgstr "Drugo"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
 #, fuzzy
 msgid "Source Book"
 msgstr "Izvorna koda"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:264
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:278
+#: addressbook/gui/contact-editor/e-contact-editor.c:273
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Nov stik"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:285
+#: addressbook/gui/contact-editor/e-contact-editor.c:280
 #, fuzzy
 msgid "Writable Fields"
 msgstr "Virtualne mape"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:299
+#: addressbook/gui/contact-editor/e-contact-editor.c:294
 #, fuzzy
 msgid "Changed"
 msgstr "Čad"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
-msgid "Category editor not available."
-msgstr "Urejevalnik kategorij ni na voljo."
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:2352
 msgid "This contact belongs to these categories:"
 msgstr "Stik pripada sledečim kategorijam:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#: addressbook/gui/contact-editor/e-contact-editor.c:2429
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Prosim, izberite med naslednjimi možnostmi"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#: addressbook/gui/contact-editor/e-contact-editor.c:2433
 #, fuzzy
 msgid "No image"
 msgstr "Niger"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#: addressbook/gui/contact-editor/e-contact-editor.c:2636
 #, fuzzy
 msgid ""
-"The following entries are invalid:\n"
+"The contact data is invalid:\n"
 "\n"
-msgstr "Sledeče povezave so trenutno aktivne:"
+msgstr "Čas ni veljaven"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2738
-#, c-format
-msgid "Could not find widget for a field: `%s'"
-msgstr "Nisem mogel najti gradnika za polje `%s'"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#, fuzzy
+msgid "Invalid contact."
+msgstr "Neveljaven argument"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+msgid ""
+"The contact cannot be saved to the selected address book. Do you want to "
+"discard changes?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2727
+#: addressbook/gui/contact-editor/e-contact-editor.c:2751
+#, fuzzy
+msgid "_Discard"
+msgstr "_Prikaz"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+msgid ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
+msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:62
 #, fuzzy
@@ -2264,7 +2146,7 @@ msgid "_Edit Full"
 msgstr "Uredi celoto"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Full Name:"
 msgstr "_Polno ime:"
@@ -2421,31 +2303,31 @@ msgstr "_Ime seznama::"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "Vpišite e-poštni naslov ali potegnite skik na spodnji seznam:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "contact-list-editor"
 msgstr "Urejevalnik stikov"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:153
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:215
+#: addressbook/gui/widgets/e-addressbook-view.c:217
 #: addressbook/gui/widgets/e-minicard-view.c:460
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
 #, fuzzy
 msgid "Is New List"
 msgstr "Nov seznam"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:215
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
 msgid "Contact List Editor"
 msgstr "Urejevalnik stikov"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:438
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
 msgid "Save List as VCard"
 msgstr "Shrani kot vVizitko"
 
@@ -2492,126 +2374,126 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Napredno iskanje"
 
-#: addressbook/gui/widgets/eab-contact-display.c:129
-#: addressbook/gui/widgets/eab-contact-display.c:192
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:139
-#: addressbook/gui/widgets/eab-contact-display.c:205
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:257
-#: addressbook/gui/widgets/eab-contact-display.c:533
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:525
 #, fuzzy
 msgid "List Members"
 msgstr "Člani"
 
-#: addressbook/gui/widgets/eab-contact-display.c:329
-#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/eab-contact-display.c:321
+#: addressbook/gui/widgets/eab-contact-display.c:323
 msgid "E-mail"
 msgstr "E-pošta"
 
-#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/eab-contact-display.c:332
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organizacija"
 
-#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:333
 #, fuzzy
 msgid "Position"
 msgstr "Poklic"
 
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:354
 #, fuzzy
 msgid "Groupwise"
 msgstr "Skupina"
 
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:340
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:349
-#: addressbook/gui/widgets/eab-contact-display.c:370
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:362
 #, fuzzy
 msgid "Phone"
 msgstr "Telefon v avtu"
 
-#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:342
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:354
+#: addressbook/gui/widgets/eab-contact-display.c:346
 #, fuzzy
 msgid "work"
 msgstr "Delam"
 
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:359
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:368
-#: addressbook/gui/widgets/eab-contact-display.c:587
+#: addressbook/gui/widgets/eab-contact-display.c:360
+#: addressbook/gui/widgets/eab-contact-display.c:579
 msgid "Blog"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/eab-contact-display.c:363
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Prenosni telefon"
 
-#: addressbook/gui/widgets/eab-contact-display.c:375
+#: addressbook/gui/widgets/eab-contact-display.c:367
 #, fuzzy
 msgid "personal"
 msgstr "Priština"
 
-#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/eab-contact-display.c:374
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Opomba"
 
-#: addressbook/gui/widgets/eab-contact-display.c:548
+#: addressbook/gui/widgets/eab-contact-display.c:540
 #, fuzzy
 msgid "Job Title"
 msgstr "Službeni _naziv:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/eab-contact-display.c:544
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:774
+#: smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "E-pošta"
 
-#: addressbook/gui/widgets/eab-contact-display.c:579
+#: addressbook/gui/widgets/eab-contact-display.c:571
 #, fuzzy
 msgid "Home page"
 msgstr "Domači faks"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 msgid "Success"
 msgstr "Uspeh"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Backend busy"
 msgstr ""
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Repository offline"
 msgstr "Skladišče, ki ni na mreži"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 #, fuzzy
 msgid "Address Book does not exist"
 msgstr "Mapa %s ne obstaja"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 #, fuzzy
 msgid "No Self Contact defined"
 msgstr "Nov seznam stikov"
@@ -2619,29 +2501,29 @@ msgstr "Nov seznam stikov"
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Permission denied"
 msgstr "Nimate dovoljenja"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:57
 #, fuzzy
 msgid "Contact not found"
 msgstr "Vizitka ni bila najdena"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: addressbook/gui/widgets/eab-gui-util.c:58
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "ID vizitke že obstaja"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Protocol not supported"
 msgstr "Protokol ni podprt"
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:60
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:233
 #: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
@@ -2654,41 +2536,41 @@ msgid "Cancelled"
 msgstr "preklicano"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:61
 #, fuzzy
 msgid "Could not cancel"
 msgstr "Nisem mogel preimenovati mape: %s"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:62
 #, fuzzy
 msgid "Authentication Failed"
 msgstr "Avtentifikacija ni uspela."
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: addressbook/gui/widgets/eab-gui-util.c:63
 #, fuzzy
 msgid "Authentication Required"
 msgstr "Potrebna je avtentifikacija"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:66
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "TLS not Available"
 msgstr ""
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#: addressbook/gui/widgets/eab-gui-util.c:66
 #, fuzzy
 msgid "No such source"
 msgstr "Ni takšnega sporočila"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:69
+#: addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Other error"
 msgstr "Drugačna napaka"
 
-#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:90
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
@@ -2697,7 +2579,7 @@ msgstr ""
 "Nisem megel odpreti tega adresarja. Prosim preverite, ali \n"
 "pot obstaja in ali imate dovoljenje za dostop."
 
-#: addressbook/gui/widgets/eab-gui-util.c:110
+#: addressbook/gui/widgets/eab-gui-util.c:97
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -2706,19 +2588,19 @@ msgstr ""
 "Ne morem odpreti tega adresarja. To pomeni, da \n"
 "ste vpisali neveljaven URI ali, da strežnik LDAP ne deluje"
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:102
 #, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution you must compile the program from the CVS "
-"sources after retrieving OpenLDAP from the link below."
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
 msgstr ""
 "Ta različica Evolucije nima vgrajene podpore za LDAP.\n"
 "Če želite v Evoluciji uporabljati LDAP, morate po tem,\n"
 "ko boste s spodnje povezave prenesli program OpenLDAP,\n"
 "Evolucijo prevesti iz izvorne kode CVS.\n"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:109
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -2727,11 +2609,7 @@ msgstr ""
 "Ne morem odpreti tega adresarja. To pomeni, da \n"
 "ste vpisali neveljaven URI ali, da strežnik LDAP ne deluje"
 
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "Unable to open addressbook"
-msgstr "Kliknite tu za odprtje adresarja"
-
-#: addressbook/gui/widgets/eab-gui-util.c:162
+#: addressbook/gui/widgets/eab-gui-util.c:129
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2739,7 +2617,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:168
+#: addressbook/gui/widgets/eab-gui-util.c:135
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -2747,57 +2625,48 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:174
+#: addressbook/gui/widgets/eab-gui-util.c:141
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:177
+#: addressbook/gui/widgets/eab-gui-util.c:144
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:147
 msgid "This query did not complete successfully."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
-msgid "Do you want to save changes?"
-msgstr "Želite shraniti spremembe"
-
-#: addressbook/gui/widgets/eab-gui-util.c:208
-#, fuzzy
-msgid "_Discard"
-msgstr "_Prikaz"
-
-#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:169
 msgid "Error adding list"
 msgstr "Napaka ob dodajanju seznama"
 
-#: addressbook/gui/widgets/eab-gui-util.c:229
-#: addressbook/gui/widgets/eab-gui-util.c:652
+#: addressbook/gui/widgets/eab-gui-util.c:169
+#: addressbook/gui/widgets/eab-gui-util.c:580
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Napaka ob dodajanju vizitke"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying list"
 msgstr "Napaka ob spreminjanju seznama"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Napaka ob spreminjanju vizitke"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:192
 msgid "Error removing list"
 msgstr "Napaka ob odstranjevanju seznama"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
-#: addressbook/gui/widgets/eab-gui-util.c:610
+#: addressbook/gui/widgets/eab-gui-util.c:192
+#: addressbook/gui/widgets/eab-gui-util.c:538
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Napaka ob odstranjevanju vizitke"
 
-#: addressbook/gui/widgets/eab-gui-util.c:334
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, fuzzy, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2806,7 +2675,7 @@ msgstr ""
 "Zahtevali ste prikaz %d vizitk. To bo povzročilo odprtje %d novih oken na \n"
 " vašem zaslonu. Resnično želite prikazati vse te vizitke?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:360
+#: addressbook/gui/widgets/eab-gui-util.c:300
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2815,55 +2684,50 @@ msgstr ""
 "%s že obstaja\n"
 "Jo želite prepisati?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:364
+#: addressbook/gui/widgets/eab-gui-util.c:304
 #, fuzzy
 msgid "Overwrite"
 msgstr "Prepiši datoteko?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:400
-#, fuzzy, c-format
-msgid "Error saving %s: %s"
-msgstr "Napaka ob shranjevanju datoteke: %s"
-
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:437
+#: addressbook/gui/widgets/eab-gui-util.c:365
 msgid "card.vcf"
 msgstr "vizitka.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:571
+#: addressbook/gui/widgets/eab-gui-util.c:499
 msgid "list"
 msgstr "seznam"
 
-#: addressbook/gui/widgets/eab-gui-util.c:706
+#: addressbook/gui/widgets/eab-gui-util.c:634
 #, fuzzy
 msgid "Move contact to"
 msgstr "Prestavi vizitko v"
 
-#: addressbook/gui/widgets/eab-gui-util.c:708
+#: addressbook/gui/widgets/eab-gui-util.c:636
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Kopiraj vizitko v"
 
-#: addressbook/gui/widgets/eab-gui-util.c:711
+#: addressbook/gui/widgets/eab-gui-util.c:639
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Prestavi vizitke v"
 
-#: addressbook/gui/widgets/eab-gui-util.c:713
+#: addressbook/gui/widgets/eab-gui-util.c:641
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Kopiraj vizitke v"
 
-#: addressbook/gui/widgets/eab-gui-util.c:716
+#: addressbook/gui/widgets/eab-gui-util.c:644
 #, fuzzy
 msgid "Select target addressbook."
 msgstr "Izberi stike iz adresarja"
 
-#: addressbook/gui/widgets/eab-gui-util.c:939
+#: addressbook/gui/widgets/eab-gui-util.c:867
 msgid "Multiple VCards"
 msgstr "Več vVizitk"
 
-#: addressbook/gui/widgets/eab-gui-util.c:942
+#: addressbook/gui/widgets/eab-gui-util.c:870
 #, c-format
 msgid "VCard for %s"
 msgstr "VVizitka za %s"
@@ -2954,7 +2818,7 @@ msgstr[1] "Stiki"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:229
+#: addressbook/gui/widgets/e-addressbook-view.c:231
 #: addressbook/gui/widgets/e-minicard-view.c:467
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
 #, fuzzy
@@ -2974,151 +2838,143 @@ msgstr "Prestavi"
 msgid "Error modifying card"
 msgstr "Napaka ob spreminjanju vizitke"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:163
 msgid "Name begins with"
 msgstr "Ime se začne z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:164
 #, fuzzy
 msgid "Email begins with"
 msgstr "Ime se začne z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:57
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Kategorija je"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-#: calendar/gui/cal-search-bar.c:50
+#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Katerokoli polje vsebuje"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+#: addressbook/gui/widgets/e-addressbook-view.c:172
 msgid "Advanced..."
 msgstr "Napredno..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:236
+#: addressbook/gui/widgets/e-addressbook-view.c:238
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:249
+#: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Vrsta"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:506
+#: addressbook/gui/widgets/e-addressbook-view.c:508
 #, fuzzy
 msgid "Address Book"
 msgstr "Adresar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2076
+#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:2080
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
 msgstr "Shrani kot vVizitko"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 #, fuzzy
 msgid "New Contact..."
 msgstr "Nov stik"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Nov seznam stikov"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "Pojdi v _mapo..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 #, fuzzy
 msgid "Import..."
 msgstr "_Uvozi..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1066
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_Išči po kontaktih"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Viri _adresarja..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1069
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "_Nastavitve pilota..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Posreduj _stik"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
 msgid "Send Message to Contact"
 msgstr "Stiku pošlji sporočilo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Natisni"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
+#: addressbook/gui/widgets/e-addressbook-view.c:1077
 msgid "Print Envelope"
 msgstr "Natisni kuverto"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
+#: addressbook/gui/widgets/e-addressbook-view.c:1081
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Adresar..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1080
+#: addressbook/gui/widgets/e-addressbook-view.c:1082
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Adresar..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Izreži"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopiraj"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1087
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Prilepi"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:1092
+#: calendar/gui/e-calendar-view.c:1280
 #, fuzzy
 msgid "Current View"
 msgstr "_Trenutni pogled"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1309
-#, c-format
-msgid ""
-"The addressbook backend for\n"
-"%s\n"
-"has crashed. You will have to restart Evolution in order to use it again"
-msgstr ""
-
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1667
-#: calendar/gui/cal-search-bar.c:362
+#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "katerakoli kategorija"
 
@@ -3227,7 +3083,7 @@ msgstr "Radijo"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-list-view.c:234
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Vloga"
@@ -3385,13 +3241,13 @@ msgstr "Evolucijin setavljalnik pošte."
 msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.c:998
+#: addressbook/printing/e-contact-print.c:1000
 #, fuzzy
 msgid "Print contacts"
 msgstr "Na_tisni stike..."
 
-#: addressbook/printing/e-contact-print.c:1064
-#: addressbook/printing/e-contact-print.c:1091
+#: addressbook/printing/e-contact-print.c:1066
+#: addressbook/printing/e-contact-print.c:1093
 #, fuzzy
 msgid "Print contact"
 msgstr "Na_tisni stike..."
@@ -3645,17 +3501,22 @@ msgstr ""
 msgid "Impossible internal error."
 msgstr "Notranja napaka"
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:629
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
 #, fuzzy
 msgid "Can not open file"
 msgstr "Ne morem dobiti sporočila"
 
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
 #, fuzzy
-msgid "Can not load URI"
-msgstr "Vizitka ni bila najdena"
+msgid "Couldn't get list of addressbooks"
+msgstr "Nisem mogel naložiti %s: %s"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Kliknite tu za odprtje adresarja"
 
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
@@ -3674,7 +3535,7 @@ msgstr "Ime datoteke ni navedeno."
 msgid "Unnamed List"
 msgstr "Neimenovan seznam stikov"
 
-#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 #, fuzzy
 msgid "Enter password"
@@ -3958,10 +3819,10 @@ msgid "Whether to show week numbers in date navigator"
 msgstr "Kaži številke tednov v navigatorju po dnevih"
 
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:88
-#: calendar/gui/gnome-cal.c:1703
-#: camel/providers/groupwise/camel-gw-listener.c:304
-#: camel/providers/groupwise/camel-gw-listener.c:327
+#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/gnome-cal.c:1705
+#: camel/providers/groupwise/camel-gw-listener.c:311
+#: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
 msgstr "Koledar"
 
@@ -3984,7 +3845,7 @@ msgstr "je manjše"
 
 #: calendar/gui/calendar-commands.c:363
 #: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:19 filter/filter.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
 msgid "days"
 msgstr "dni"
 
@@ -4137,24 +3998,24 @@ msgstr "Tedenski pogled"
 msgid "Month View"
 msgstr "Mesečni pogled"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Povzetek vsebuje"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Opis vsebuje"
 
-#: calendar/gui/cal-search-bar.c:54
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Komentar vsebuje"
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:53
 #, fuzzy
 msgid "Location contains"
 msgstr "Opis vsebuje"
 
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
 msgid "Unmatched"
 msgstr "Brez zadetka"
 
@@ -4177,24 +4038,24 @@ msgstr "Nimate dovoljenja"
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:466
+#: calendar/gui/dialogs/alarm-options.c:467
 msgid "Audio Alarm Options"
 msgstr "Možnosti zvočnega alarma"
 
-#: calendar/gui/dialogs/alarm-options.c:475
+#: calendar/gui/dialogs/alarm-options.c:476
 msgid "Message Alarm Options"
 msgstr "možnosti alrama sporočil"
 
-#: calendar/gui/dialogs/alarm-options.c:484
+#: calendar/gui/dialogs/alarm-options.c:485
 #, fuzzy
 msgid "Email Alarm Options"
 msgstr "Možnosti alarma pošte"
 
-#: calendar/gui/dialogs/alarm-options.c:493
+#: calendar/gui/dialogs/alarm-options.c:494
 msgid "Program Alarm Options"
 msgstr "Možnosti alarma programa"
 
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:510
 msgid "Unknown Alarm Options"
 msgstr "Neznane možnosti alarma"
 
@@ -4234,7 +4095,7 @@ msgstr "Pošlji kot:"
 msgid "With these arguments:"
 msgstr "S temi argumenti:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
 #, fuzzy
 msgid "dialog1"
 msgstr "Kaži dialog"
@@ -4244,7 +4105,7 @@ msgid "extra times every"
 msgstr "dodatnih ponovitev vsakih"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:20 filter/filter.glade.h:16
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr "ur"
 
@@ -4291,7 +4152,7 @@ msgstr "Pošlji e-pošto"
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Povzetek:"
 
@@ -4321,7 +4182,6 @@ msgid "hour(s)"
 msgstr "ur"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:21
 msgid "minute(s)"
 msgstr "minut"
 
@@ -4329,27 +4189,27 @@ msgstr "minut"
 msgid "start of appointment"
 msgstr "pričetek sestanka"
 
-#: calendar/gui/dialogs/calendar-setup.c:170
+#: calendar/gui/dialogs/calendar-setup.c:172
 #, fuzzy
 msgid "You must specify a location to get the calendar from."
 msgstr "Navedite ime datoteke:"
 
-#: calendar/gui/dialogs/calendar-setup.c:178
+#: calendar/gui/dialogs/calendar-setup.c:180
 #, fuzzy, c-format
 msgid "The source location '%s' is not well-formed."
 msgstr "Postopek potreben za naložitev `%s' ni podprt"
 
-#: calendar/gui/dialogs/calendar-setup.c:193
+#: calendar/gui/dialogs/calendar-setup.c:195
 #, c-format
 msgid "The source location '%s' is not a webcal source."
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:265
+#: calendar/gui/dialogs/calendar-setup.c:275
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:278
+#: calendar/gui/dialogs/calendar-setup.c:288
 #, c-format
 msgid ""
 "The group '%s' is remote. You must specify a location to get the calendar "
@@ -4371,61 +4231,36 @@ msgstr "Seznam _nalog"
 msgid "C_olor:"
 msgstr "_Zapri"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-#, fuzzy
-msgid "Calendar Properties"
-msgstr "Napaka iKoledarja"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
 msgid "Pick a color"
 msgstr "Izberi barvo"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:8
-#, fuzzy
-msgid "Remote"
-msgstr "Odstrani"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-#, fuzzy
-msgid "Task List Properties"
-msgstr "Lastnosti seznama opravil"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
 #, fuzzy
 msgid "_Add Calendar"
 msgstr "Dodaj _koledarju"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
 #, fuzzy
 msgid "_Add Group"
 msgstr "_Nova skupina..."
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-#, fuzzy
-msgid "_Refresh Interval:"
-msgstr " _Osveži seznam"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
 #, fuzzy
 msgid "_Refresh:"
 msgstr "Osveži"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-#, fuzzy
-msgid "_Source URL:"
-msgstr "URI vira POP"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
 #, fuzzy
 msgid "_Type:"
 msgstr "Vrsta:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
 #, fuzzy
 msgid "_URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
 msgid "weeks"
 msgstr "tedenov"
 
@@ -4535,7 +4370,7 @@ msgid "Display"
 msgstr "Prikaz"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:76
 msgid "E_nable"
 msgstr "_Vključi"
 
@@ -4546,7 +4381,7 @@ msgstr "Zahtevek po podatkih o zasedenosti"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:563
+#: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "petek"
 
@@ -4560,7 +4395,7 @@ msgstr "Minut"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:559
+#: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "ponedeljek"
 
@@ -4571,7 +4406,7 @@ msgstr "_ned"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:564
+#: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "sobota"
 
@@ -4585,7 +4420,7 @@ msgstr "Kaži številke tednov v navigatorju po dnevih"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "nedeljo"
 
@@ -4600,7 +4435,7 @@ msgstr "č_et"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:562
+#: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "četrtek"
 
@@ -4614,7 +4449,7 @@ msgstr "Oblika izpisa časa:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:560
+#: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "torek"
 
@@ -4624,7 +4459,7 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:561
+#: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "sreda"
 
@@ -4659,7 +4494,7 @@ msgid "_Day begins:"
 msgstr "Konec dneva:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
-#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:43
@@ -4713,76 +4548,46 @@ msgstr "_sre"
 msgid "before every appointment"
 msgstr "pred koncem sestanka"
 
-#: calendar/gui/dialogs/cancel-comp.c:57
-msgid ""
-"The event being deleted is a meeting, would you like to send a cancellation "
-"notice?"
-msgstr ""
-
-#: calendar/gui/dialogs/cancel-comp.c:60
-msgid "Are you sure you want to cancel and delete this meeting?"
-msgstr "Ste prepričani, da želite preklicati in zbrisati ta sestanek?"
-
-#: calendar/gui/dialogs/cancel-comp.c:66
-msgid ""
-"The task being deleted is assigned, would you like to send a cancellation "
-"notice?"
-msgstr ""
-
-#: calendar/gui/dialogs/cancel-comp.c:69
-msgid "Are you sure you want to cancel and delete this task?"
-msgstr "Ste prepričani, da želite preklicati in zbrisati to opravilo?"
-
-#: calendar/gui/dialogs/cancel-comp.c:75
-msgid ""
-"The journal entry being deleted is published, would you like to send a "
-"cancellation notice?"
-msgstr ""
-
-#: calendar/gui/dialogs/cancel-comp.c:78
-msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr "Ste prepričani, da želite preklicati in zbrisati ta dnevniški vpis?"
-
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Ta dogodek je bil zbrisan."
 
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "To opravilo je bilo zbrisano."
 
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:68
 msgid "This journal entry has been deleted."
 msgstr "Ta dnevniški vpis je bil zbrisan."
 
-#: calendar/gui/dialogs/changed-comp.c:75
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  Naredili ste spremembe. Prekliči spremembe in zapri urejevalnik?"
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Ničesar niste spremenili, zapri urejevalnik?"
 
-#: calendar/gui/dialogs/changed-comp.c:82
+#: calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "Ta dogodek je bil spremenjen."
 
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "Ta posel je bil spremenjen."
 
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:92
 msgid "This journal entry has been changed."
 msgstr "Ta dnevniški vpis je bil spremenjen."
 
-#: calendar/gui/dialogs/changed-comp.c:99
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  Naredili ste spremembe. Pozabi spremembe in posodobi urejevalnik?"
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Ničesar niste spremenili, posodobi urejevalnik?"
@@ -4821,7 +4626,7 @@ msgid "No summary"
 msgstr "Ni povzetka"
 
 #: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
 #: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Shrani kot..."
@@ -4876,106 +4681,58 @@ msgstr "Prekliči operacijo"
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:95
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "Ste prepričani, da želite zbrisati ta sestanek `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:98
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "Ste prepričani, želite zbrisati ta neimenovan sestanek?"
-
-#: calendar/gui/dialogs/delete-comp.c:104
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "Ste prepričani, da želite zbrisati posel `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:107
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "Ste prepričani, da želite zbrisati ta neimenovan posel?"
-
-#: calendar/gui/dialogs/delete-comp.c:113
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "Ste prepričani, da želite zbrisati dnevniški vpis `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:116
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "Ste prepričani, da želite zbrisati ta neimenovan dnevniški vpis?"
-
-#: calendar/gui/dialogs/delete-comp.c:131
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d appointment?"
-msgid_plural "Are you sure you want to delete %d appointments?"
-msgstr[0] "Ste prepričani, da želite zbrisati %d sestankov?"
-msgstr[1] "Ste prepričani, da želite zbrisati %d sestankov?"
-
-#: calendar/gui/dialogs/delete-comp.c:138
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d task?"
-msgid_plural "Are you sure you want to delete %d tasks?"
-msgstr[0] "Ste prepričani, da želite zbrisati %d opravil?"
-msgstr[1] "Ste prepričani, da želite zbrisati %d opravil?"
-
-#: calendar/gui/dialogs/delete-comp.c:145
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d journal entry?"
-msgid_plural "Are you sure you want to delete %d journal entries?"
-msgstr[0] "Ste prepričani, da želite zbrisati %d dnevniških vpisov?"
-msgstr[1] "Ste prepričani, da želite zbrisati %d dnevniških vpisov?"
-
-#: calendar/gui/dialogs/delete-error.c:52
+#: calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:55
+#: calendar/gui/dialogs/delete-error.c:57
 msgid "The task could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:58
+#: calendar/gui/dialogs/delete-error.c:60
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:61
+#: calendar/gui/dialogs/delete-error.c:63
 #, fuzzy
 msgid "The item could not be deleted due to a corba error"
 msgstr "Predmeta ni bilo mogoče poslati!\n"
 
-#: calendar/gui/dialogs/delete-error.c:68
+#: calendar/gui/dialogs/delete-error.c:70
 msgid "The event could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:71
+#: calendar/gui/dialogs/delete-error.c:73
 #, fuzzy
 msgid "The task could not be deleted because permission was denied"
 msgstr ""
 "Stanja udeleženca ni bilo možno posodobiti zaradi neveljavnega stanja!\n"
 
-#: calendar/gui/dialogs/delete-error.c:74
+#: calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:77
+#: calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:84
+#: calendar/gui/dialogs/delete-error.c:86
 #, fuzzy
 msgid "The event could not be deleted due to an error"
 msgstr "Predmeta ni bilo mogoče poslati!\n"
 
-#: calendar/gui/dialogs/delete-error.c:87
+#: calendar/gui/dialogs/delete-error.c:89
 #, fuzzy
 msgid "The task could not be deleted due to an error"
 msgstr "Predmeta ni bilo mogoče poslati!\n"
 
-#: calendar/gui/dialogs/delete-error.c:90
+#: calendar/gui/dialogs/delete-error.c:92
 #, fuzzy
 msgid "The journal entry could not be deleted due to an error"
 msgstr ""
 "Stanja udeleženca ni bilo možno posodobiti zaradi neveljavnega stanja!\n"
 
-#: calendar/gui/dialogs/delete-error.c:93
+#: calendar/gui/dialogs/delete-error.c:95
 #, fuzzy
 msgid "The item could not be deleted due to an error"
 msgstr "Predmeta ni bilo mogoče poslati!\n"
@@ -5116,11 +4873,11 @@ msgstr "_Čas pričetka:"
 
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:3
+#: calendar/gui/dialogs/meeting-page.glade.h:4
 #: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
 #: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1559
-#: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:100
+#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
+#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
@@ -5146,8 +4903,8 @@ msgstr "_Delegiraj komu..."
 #. FIXME: need to disable for undeletable folders
 #: calendar/gui/dialogs/meeting-page.c:655
 #: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1310 calendar/gui/e-calendar-view.c:1342
-#: mail/em-folder-tree.c:2557 mail/em-folder-view.c:919
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
+#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -5155,7 +4912,7 @@ msgid "_Delete"
 msgstr "_Zbriši"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:240
+#: calendar/gui/e-meeting-list-view.c:218
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Udeležen"
@@ -5191,16 +4948,15 @@ msgid "Member"
 msgstr "Član"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
-#: mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-list-view.c:248
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Stanje"
 
@@ -5209,20 +4965,20 @@ msgstr "Stanje"
 msgid "Add A_ttendee"
 msgstr "Vsi udeleženi"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "Add attendees from addressbook."
+msgstr "Pošiljatelja dodaj v _adresar"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Organizator:"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
+#: calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "_Change Organizer"
 msgstr "_Spremeni organizatorja"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-#: calendar/gui/e-meeting-time-sel.c:417
-msgid "_Invite Others..."
-msgstr "_Povabi ostale..."
-
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 #, fuzzy
 msgid "<b>Calendar options</b>"
@@ -5390,7 +5146,7 @@ msgid "_No recurrence"
 msgstr "_Brez ponovitve"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:450
+#: composer/e-msg-composer-attachment-bar.c:453
 msgid "_Remove"
 msgstr "_Odstrani"
 
@@ -5422,59 +5178,21 @@ msgstr "tednov"
 msgid "year(s)"
 msgstr "let"
 
-#: calendar/gui/dialogs/save-comp.c:53
-#, fuzzy
-msgid ""
-"This event has been changed, but has not been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Podpis je bil spremenjen, a ni bil shranjen.\n"
-"\n"
-"Želite shraniti spremembe?"
-
-#: calendar/gui/dialogs/save-comp.c:57
-#, fuzzy
-msgid "_Discard Changes"
-msgstr "Zavrzi to sporočilo"
-
-#: calendar/gui/dialogs/save-comp.c:62
-#, fuzzy
-msgid "Save Event"
-msgstr "Sporočilo koledarja"
-
-#: calendar/gui/dialogs/select-source-dialog.c:65
+#: calendar/gui/dialogs/select-source-dialog.c:69
 #, fuzzy
 msgid "Select destination"
 msgstr "Izberite ciljno mapo za uvoz teh podatkov"
 
-#: calendar/gui/dialogs/select-source-dialog.c:86
+#: calendar/gui/dialogs/select-source-dialog.c:90
 #, fuzzy
 msgid "_Destination"
 msgstr "Zbriši to mapo"
 
-#: calendar/gui/dialogs/select-source-dialog.c:88
+#: calendar/gui/dialogs/select-source-dialog.c:92
 #, fuzzy
 msgid "Task List"
 msgstr "Seznam _nalog"
 
-#: calendar/gui/dialogs/send-comp.c:57
-msgid "The meeting information has been created. Send it?"
-msgstr "Podatki o sestanku so bili ustvarjeni. Naj jih pošljem?"
-
-#: calendar/gui/dialogs/send-comp.c:60
-msgid "The meeting information has changed. Send an updated version?"
-msgstr ""
-"Podatki o sestanku so se spremenili. Naj pošljem posodobljeno različico?"
-
-#: calendar/gui/dialogs/send-comp.c:67
-msgid "The task assignment information has been created. Send it?"
-msgstr "Podatki o nalogi so bili ustvarjeni. Naj jih pošljem?"
-
-#: calendar/gui/dialogs/send-comp.c:71
-msgid "The task information has changed. Send an updated version?"
-msgstr "Podatki o nalogi so se spremenili. Naj pošljem posodobljeno različico?"
-
 #: calendar/gui/dialogs/task-details-page.c:406
 #, fuzzy
 msgid "Completed date is wrong"
@@ -5495,7 +5213,7 @@ msgstr "končano"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #: calendar/gui/e-cal-component-preview.c:249
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:960
 msgid "High"
 msgstr "visoka"
 
@@ -5509,14 +5227,14 @@ msgstr "v teku"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:253
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:958
 msgid "Low"
 msgstr "nizka"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:251
 #: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:957
+#: mail/message-list.c:959
 msgid "Normal"
 msgstr "običajna"
 
@@ -5576,8 +5294,8 @@ msgstr "_Zaupno"
 
 #: calendar/gui/dialogs/task-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
+#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Opis:"
 
@@ -5750,7 +5468,7 @@ msgstr "Do datuma:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:950
+#: calendar/gui/e-itip-control.c:943
 msgid "Status:"
 msgstr "Stanje:"
 
@@ -5836,12 +5554,12 @@ msgstr "Zaseden"
 msgid "Deleting selected objects"
 msgstr "Brišem izbrane predmete"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
 msgid "Updating objects"
 msgstr "Posodabljam predmete"
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1370
+#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
 #: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Odpri"
@@ -5852,15 +5570,15 @@ msgid "Open _Web Page"
 msgstr "FIXME: _Odpri spletno stran"
 
 #: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1291 calendar/gui/e-calendar-view.c:1376
-#: mail/em-folder-view.c:896 mail/em-popup.c:690 mail/em-popup.c:806
+#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
+#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "_Shrani kot..."
 
 #: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1292
-#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
+#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
@@ -5868,24 +5586,24 @@ msgid "_Print..."
 msgstr "Na_tisni..."
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Izreži"
 
 #: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1338
-#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2550
-#: mail/message-list.c:1644 ui/evolution-addressbook.xml.h:31
+#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
+#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
+#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Kopiraj"
 
 #: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1273 calendar/gui/e-calendar-view.c:1299
-#: calendar/gui/e-calendar-view.c:1372 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
+#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
@@ -5957,75 +5675,75 @@ msgstr "Povzetek"
 msgid "Task sort"
 msgstr "Sortiranje opravil"
 
-#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
 msgid "New _Appointment..."
 msgstr "Nov _sestanek..."
 
-#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
+#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
 msgid "New All Day _Event"
 msgstr "Nov celodnevni _dogodek"
 
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
+#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
 #, fuzzy
 msgid "New Meeting"
 msgstr "Nov sestanek"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
 #, fuzzy
 msgid "New Task"
 msgstr "Nova _naloga"
 
-#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Izberi ni_t"
 
-#: calendar/gui/e-calendar-view.c:1280
+#: calendar/gui/e-calendar-view.c:1283
 #, fuzzy
 msgid "_Select Date..."
 msgstr "Zbriši..."
 
-#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Objavi podatek o zasedenosti"
 
-#: calendar/gui/e-calendar-view.c:1303
+#: calendar/gui/e-calendar-view.c:1306
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Kopiraj v mapo..."
 
-#: calendar/gui/e-calendar-view.c:1304
+#: calendar/gui/e-calendar-view.c:1307
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "Presta_vi v mapo..."
 
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1308
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "_Načrtuj sestanek"
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1309
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Posreduj naprej kot i_Koledar"
 
-#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
 msgid "Delete this _Occurrence"
 msgstr "Zbriši to _pojavitev"
 
-#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
 msgid "Delete _All Occurrences"
 msgstr "Zbriši _vse pojavitve"
 
-#: calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1349
 msgid "Go to _Today"
 msgstr "Pojdi na _danes"
 
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1351
 msgid "_Go to Date..."
 msgstr "_Pojdi na datum..."
 
-#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
 #, fuzzy
 msgid "_Settings..."
 msgstr "_Nastavitve pošte..."
@@ -6040,9 +5758,9 @@ msgstr "Datum pričetka"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:967 calendar/gui/e-itip-control.c:1169
-#: calendar/gui/e-meeting-list-view.c:144
-#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
 #: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
 #: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
 #: camel/camel-tcp-stream-openssl.c:631
@@ -6068,13 +5786,13 @@ msgid "Assigned"
 msgstr "Določena"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr "Da"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "Ne"
 
@@ -6086,7 +5804,7 @@ msgstr "N"
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
 msgid "E"
 msgstr "E"
 
@@ -6158,106 +5876,106 @@ msgstr "%d %b"
 msgid "%02i minute divisions"
 msgstr "%02i deljenj minute"
 
-#: calendar/gui/e-itip-control.c:592
+#: calendar/gui/e-itip-control.c:585
 #, fuzzy
 msgid "Yes. (Complex Recurrence)"
 msgstr "_Enostavna ponovitev"
 
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:596
 #, fuzzy, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Vsak "
 msgstr[1] "Vsak "
 
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:601
 #, fuzzy, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Vsak "
 msgstr[1] "Vsak "
 
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:603
 #, fuzzy, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "Vsak "
 msgstr[1] "Vsak "
 
-#: calendar/gui/e-itip-control.c:618
+#: calendar/gui/e-itip-control.c:611
 #, fuzzy
 msgid " and "
 msgstr "Pesek"
 
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:618
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:631
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:645
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "En _mesec"
 msgstr[1] "En _mesec"
 
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:642
 #, fuzzy, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Vsak "
 msgstr[1] "Vsak "
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:653
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:669
+#: calendar/gui/e-itip-control.c:662
 msgid ", ending on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:686
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:696
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "Konec: <b>"
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:716
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "končano "
 
-#: calendar/gui/e-itip-control.c:733
+#: calendar/gui/e-itip-control.c:726
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:771 calendar/gui/e-itip-control.c:827
+#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
 msgid "iCalendar Information"
 msgstr "Podatki o iKoledarju"
 
 #. Title
-#: calendar/gui/e-itip-control.c:788
+#: calendar/gui/e-itip-control.c:781
 msgid "iCalendar Error"
 msgstr "Napaka iKoledarja"
 
-#: calendar/gui/e-itip-control.c:859 calendar/gui/e-itip-control.c:875
-#: calendar/gui/e-itip-control.c:886 calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
 msgid "An unknown person"
 msgstr "neznana oseba"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:910
+#: calendar/gui/e-itip-control.c:903
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -6265,304 +5983,309 @@ msgstr ""
 "<br> Prosimo, preglejte sledeče podatke in izberite dejanje iz spodnjega "
 "menuja."
 
-#: calendar/gui/e-itip-control.c:925
+#: calendar/gui/e-itip-control.c:918
 msgid "<i>None</i>"
 msgstr "<i>Nič</i>"
 
-#: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:929
+#, fuzzy
+msgid "Location:"
+msgstr "_Lega:"
+
+#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Sprejeto"
 
-#: calendar/gui/e-itip-control.c:959 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Poskusno sprejeto"
 
-#: calendar/gui/e-itip-control.c:963 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Zavrnjeno"
 
-#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.c:1050
-#: calendar/gui/e-itip-control.c:1076 calendar/gui/e-itip-control.c:1089
-#: calendar/gui/e-itip-control.c:1102 calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
 msgid "Choose an action:"
 msgstr "Izberi dejanje:"
 
-#: calendar/gui/e-itip-control.c:1023
+#: calendar/gui/e-itip-control.c:1016
 msgid "Update"
 msgstr "Posodobi"
 
-#: calendar/gui/e-itip-control.c:1024 calendar/gui/e-itip-control.c:1055
-#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1091
-#: calendar/gui/e-itip-control.c:1104 calendar/gui/e-itip-control.c:1117
-#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
+#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "V redu"
 
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1044
 msgid "Accept"
 msgstr "Sprejmi"
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1045
 msgid "Tentatively accept"
 msgstr "Poskusno sprejmi"
 
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1046
 msgid "Decline"
 msgstr "Odbij"
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1070
 msgid "Send Free/Busy Information"
 msgstr "Pošlji podatek o zasedenosti"
 
-#: calendar/gui/e-itip-control.c:1090
+#: calendar/gui/e-itip-control.c:1083
 msgid "Update respondent status"
 msgstr "Osveži stanje respondenta"
 
-#: calendar/gui/e-itip-control.c:1103
+#: calendar/gui/e-itip-control.c:1096
 msgid "Send Latest Information"
 msgstr "Pošlji zadnje podatke"
 
-#: calendar/gui/e-itip-control.c:1116 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Prekliči"
 
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1185
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> je izdal(a) podatke o sestanku."
 
-#: calendar/gui/e-itip-control.c:1193
+#: calendar/gui/e-itip-control.c:1186
 msgid "Meeting Information"
 msgstr "Podatki o sestanku"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1191
 #, fuzzy, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> zahteva vašo prisotnost na sestanku."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1193
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> zahteva vašo prisotnost na sestanku."
 
-#: calendar/gui/e-itip-control.c:1201
+#: calendar/gui/e-itip-control.c:1194
 msgid "Meeting Proposal"
 msgstr "Predlog sestanka"
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> vas želi dodati k obstoječem sestanku."
 
-#: calendar/gui/e-itip-control.c:1206
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Update"
 msgstr "Posodobitev sestanka"
 
-#: calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1203
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> želi dobiti najnovejše podatke o sestanku."
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1204
 msgid "Meeting Update Request"
 msgstr "Zahtevek za posodobitev sestanka"
 
-#: calendar/gui/e-itip-control.c:1218
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> je odgovoril(a) na zahtevek po sestanku."
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Reply"
 msgstr "Odgovor na sestanek"
 
-#: calendar/gui/e-itip-control.c:1226
+#: calendar/gui/e-itip-control.c:1219
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> je preklical(a) sestanek."
 
-#: calendar/gui/e-itip-control.c:1227
+#: calendar/gui/e-itip-control.c:1220
 msgid "Meeting Cancellation"
 msgstr "Preklic sestanka"
 
-#: calendar/gui/e-itip-control.c:1234 calendar/gui/e-itip-control.c:1302
-#: calendar/gui/e-itip-control.c:1337
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1330
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> je poslal(a) nerazumljivo sporočilo."
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1228
 msgid "Bad Meeting Message"
 msgstr "Nerazumljivo sporočilo o sestanku"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1253
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> je objavil(a) podatke o nalogi."
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1254
 msgid "Task Information"
 msgstr "Podatki o nalogi"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1259
 #, fuzzy, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> zahteva, da opravite nalogo."
 
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> zahteva, da opravite nalogo."
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1262
 msgid "Task Proposal"
 msgstr "Predlog naloge"
 
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> vas želi dodati k obstoječi nalogi."
 
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Update"
 msgstr "Posodobitev naloge"
 
-#: calendar/gui/e-itip-control.c:1278
+#: calendar/gui/e-itip-control.c:1271
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> želi dobiti najnovejše podatke o nalogi."
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1272
 msgid "Task Update Request"
 msgstr "Zahtevek za posodobitev naloge"
 
-#: calendar/gui/e-itip-control.c:1286
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> je odgovoril(a) na dodelitev naloge."
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Reply"
 msgstr "Odgovor na nalogo"
 
-#: calendar/gui/e-itip-control.c:1294
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> je preklical(a) nalogo."
 
-#: calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1288
 msgid "Task Cancellation"
 msgstr "Preklic naloge"
 
-#: calendar/gui/e-itip-control.c:1303
+#: calendar/gui/e-itip-control.c:1296
 msgid "Bad Task Message"
 msgstr "Nerazumljivo sporočilo o nalogi"
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1315
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> je objavil(a) podatke o zasedenosti."
 
-#: calendar/gui/e-itip-control.c:1323
+#: calendar/gui/e-itip-control.c:1316
 msgid "Free/Busy Information"
 msgstr "Podatek o zasedenosti"
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> zahteva vaše podatke o zasedenosti."
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1321
 msgid "Free/Busy Request"
 msgstr "Zahtevek po podatkih o zasedenosti"
 
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1325
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> je odgovoril(a) na zahtevek po podatkih o zasedenosti."
 
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1326
 msgid "Free/Busy Reply"
 msgstr "Odgovor zasedenosti"
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1331
 msgid "Bad Free/Busy Message"
 msgstr "Nerazumljivo sporočilo o zasedenosti"
 
-#: calendar/gui/e-itip-control.c:1413
+#: calendar/gui/e-itip-control.c:1406
 msgid "The message does not appear to be properly formed"
 msgstr "Zdi se, da sporočilo ni pravilno oblikovano"
 
-#: calendar/gui/e-itip-control.c:1472
+#: calendar/gui/e-itip-control.c:1465
 msgid "The message contains only unsupported requests."
 msgstr "To sporočilo vsebuje le nepodprte zahtevke."
 
-#: calendar/gui/e-itip-control.c:1503
+#: calendar/gui/e-itip-control.c:1496
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Priloga ne vsebuje veljavnega sporočila koledarja"
 
-#: calendar/gui/e-itip-control.c:1535
+#: calendar/gui/e-itip-control.c:1528
 msgid "The attachment has no viewable calendar items"
 msgstr "Priloga nima gledljivih predmetov koledarja"
 
-#: calendar/gui/e-itip-control.c:1769
+#: calendar/gui/e-itip-control.c:1762
 msgid "Update complete\n"
 msgstr "Posodobitev končana\n"
 
-#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
+#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Stanja udeleženca ni bilo možno posodobiti, ker predmet ne obstaja več"
 
-#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1825
+#: calendar/gui/e-itip-control.c:1818
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1837
+#: calendar/gui/e-itip-control.c:1830
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Stanja udeleženca ni bilo možno posodobiti zaradi neveljavnega stanja!\n"
 
-#: calendar/gui/e-itip-control.c:1856
+#: calendar/gui/e-itip-control.c:1849
 #, fuzzy
 msgid "There was an error on the CORBA system\n"
 msgstr "Napaka ob prenašanju podatkov za"
 
-#: calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1852
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Predmeta ni bilo mogoče poslati!\n"
 
-#: calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1855
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1865
+#: calendar/gui/e-itip-control.c:1858
 msgid "Attendee status updated\n"
 msgstr "Stanje udeleženca posodobljeno\n"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1861
 msgid "Attendee status could not be updated!\n"
 msgstr "Stanja udeleženca ni bilo možno posodobiti!\n"
 
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1892
 msgid "Removal Complete"
 msgstr "Odstranjevanje končano"
 
-#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
 msgid "Item sent!\n"
 msgstr "Predmet poslan!\n"
 
-#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
+#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
 msgid "The item could not be sent!\n"
 msgstr "Predmeta ni bilo mogoče poslati!\n"
 
@@ -6603,75 +6326,75 @@ msgstr "končni-datum"
 msgid "date-start"
 msgstr "začetni-datum"
 
-#: calendar/gui/e-meeting-list-view.c:62
+#: calendar/gui/e-meeting-list-view.c:59
 msgid "Chair Persons"
 msgstr "Predsedujoči"
 
-#: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:479
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
 msgid "Required Participants"
 msgstr "Potrebni udeleženci"
 
-#: calendar/gui/e-meeting-list-view.c:64
+#: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Možni udeleženci"
 
-#: calendar/gui/e-meeting-list-view.c:65
+#: calendar/gui/e-meeting-list-view.c:62
 #, fuzzy
 msgid "Resources"
 msgstr "Vir"
 
-#: calendar/gui/e-meeting-list-view.c:140 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
 #: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr "Individualno"
 
-#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "Skupina"
 
-#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr "Vir"
 
-#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr "Soba"
 
-#: calendar/gui/e-meeting-list-view.c:154 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr "Stol"
 
-#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:127
 #: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
 msgid "Required Participant"
 msgstr "Potrebni udeleženci"
 
-#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr "Možni sodelujoči"
 
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr "Ne-sodelujoči"
 
-#: calendar/gui/e-meeting-list-view.c:179 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:177
 #: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
 msgid "Needs Action"
 msgstr "Potrebuje dejanje"
 
-#: calendar/gui/e-meeting-list-view.c:182 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
 #: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "Poskusno"
 
-#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr "Delegirano"
@@ -6688,20 +6411,28 @@ msgstr "Iz pisarne"
 msgid "No Information"
 msgstr "Ni podatkov"
 
+#: calendar/gui/e-meeting-time-sel.c:417
+#, fuzzy
+msgid "Add attendees from addressbook"
+msgstr "Pošiljatelja dodaj v _adresar"
+
 #: calendar/gui/e-meeting-time-sel.c:440
 msgid "_Options"
 msgstr "_Možnosti"
 
 #: calendar/gui/e-meeting-time-sel.c:457
-msgid "Show _Only Working Hours"
+#, fuzzy
+msgid "Show _only working hours"
 msgstr "Kaži le delavne ure"
 
 #: calendar/gui/e-meeting-time-sel.c:467
-msgid "Show _Zoomed Out"
+#, fuzzy
+msgid "Show _zoomed out"
 msgstr "Kaži poman_jšano"
 
 #: calendar/gui/e-meeting-time-sel.c:482
-msgid "_Update Free/Busy"
+#, fuzzy
+msgid "_Update free/busy"
 msgstr "_Posodobi prosto/zasedeno"
 
 #: calendar/gui/e-meeting-time-sel.c:497
@@ -6717,19 +6448,23 @@ msgid ">_>"
 msgstr ">_>"
 
 #: calendar/gui/e-meeting-time-sel.c:547
-msgid "_All People and Resources"
+#, fuzzy
+msgid "_All people and resources"
 msgstr "_Vsi ljudje in vsa sredstva"
 
 #: calendar/gui/e-meeting-time-sel.c:556
-msgid "All _People and One Resource"
+#, fuzzy
+msgid "All _people and one resource"
 msgstr "Vsi ljudje in eno sredstvo"
 
 #: calendar/gui/e-meeting-time-sel.c:565
-msgid "_Required People"
+#, fuzzy
+msgid "_Required people"
 msgstr "_Potrebni ljudje"
 
 #: calendar/gui/e-meeting-time-sel.c:574
-msgid "Required People and _One Resource"
+#, fuzzy
+msgid "Required people and _one resource"
 msgstr "Potrebni ljudje in eno sredstvo"
 
 #: calendar/gui/e-meeting-time-sel.c:593
@@ -6767,7 +6502,7 @@ msgstr "%d/%m/%Y"
 msgid "Enter the password for %s"
 msgstr "Vpišite geslo za %s"
 
-#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
@@ -6776,19 +6511,14 @@ msgstr ""
 "Napaka ob '%s':\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-
 #. FIXME Loading should be async
 #. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:686
+#: calendar/gui/e-tasks.c:801
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Odpiram naloge v %s"
 
-#: calendar/gui/e-tasks.c:709
+#: calendar/gui/e-tasks.c:824
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6797,55 +6527,50 @@ msgstr ""
 "Napaka ob '%s':\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:730
+#: calendar/gui/e-tasks.c:845
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Naloži _slike"
 
-#: calendar/gui/e-tasks.c:834
+#: calendar/gui/e-tasks.c:949
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Datum zaključka"
 
-#: calendar/gui/e-tasks.c:857
+#: calendar/gui/e-tasks.c:972
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Brišem izbrane predmete"
 
-#: calendar/gui/e-tasks.c:884
+#: calendar/gui/e-tasks.c:999
 msgid "Expunging"
 msgstr "Uničujem"
 
-#: calendar/gui/e-tasks.c:960
+#: calendar/gui/e-tasks.c:1075
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
-#: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
+#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
+#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
 #: calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:705
 msgid "Tasks"
 msgstr "Naloge"
 
-#: calendar/gui/gnome-cal.c:1876
+#: calendar/gui/gnome-cal.c:1878
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Ni sestankovov"
 
-#: calendar/gui/gnome-cal.c:1895
+#: calendar/gui/gnome-cal.c:1897
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Naloži _slike"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1920
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Odpiram '%s'"
 
-#: calendar/gui/gnome-cal.c:2048
-#, c-format
-msgid "The calendar backend for '%s' has crashed."
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:2894
+#: calendar/gui/gnome-cal.c:2906
 #, fuzzy
 msgid "Purging"
 msgstr "Odhodna"
@@ -7046,7 +6771,7 @@ msgid "On The Web"
 msgstr ""
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 
@@ -7057,7 +6782,7 @@ msgid "Unable to migrate calendar `%s'"
 msgstr "Nimate dovoljenja"
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:869
+#: calendar/gui/migration.c:889
 #, fuzzy, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Kliknite tu za odprtje adresarja"
@@ -7293,73 +7018,73 @@ msgstr "Natisni predmet"
 msgid "Print Setup"
 msgstr "Nastavitev tiskanja"
 
-#: calendar/gui/tasks-component.c:303
+#: calendar/gui/tasks-component.c:313
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:371
 #, fuzzy
 msgid "New Task List"
 msgstr "Seznam _nalog"
 
-#: calendar/gui/tasks-component.c:398
+#: calendar/gui/tasks-component.c:408
 #, fuzzy, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "Brez nalog"
 msgstr[1] "Brez nalog"
 
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] "%d izbranih"
 msgstr[1] "%d izbranih"
 
-#: calendar/gui/tasks-component.c:447
+#: calendar/gui/tasks-component.c:457
 #, fuzzy
 msgid "Failed upgrading tasks."
 msgstr "Naloži _slike"
 
-#: calendar/gui/tasks-component.c:526
+#: calendar/gui/tasks-component.c:749
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:538
+#: calendar/gui/tasks-component.c:761
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:576
+#: calendar/gui/tasks-component.c:799
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:804
+#: calendar/gui/tasks-component.c:1040
 msgid "New task"
 msgstr "Nova naloga"
 
-#: calendar/gui/tasks-component.c:805
+#: calendar/gui/tasks-component.c:1041
 msgid "_Task"
 msgstr "_Naloga"
 
-#: calendar/gui/tasks-component.c:806
+#: calendar/gui/tasks-component.c:1042
 msgid "Create a new task"
 msgstr "Ustvari nov posel"
 
-#: calendar/gui/tasks-component.c:812
+#: calendar/gui/tasks-component.c:1048
 #, fuzzy
 msgid "New tasks group"
 msgstr "Viri novic"
 
-#: calendar/gui/tasks-component.c:813
+#: calendar/gui/tasks-component.c:1049
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Seznam _nalog"
 
-#: calendar/gui/tasks-component.c:814
+#: calendar/gui/tasks-component.c:1050
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Ustvari nov posel"
@@ -9142,12 +8867,12 @@ msgstr "Napaka ob izvajanju iskanja s filtrom: %s: %s"
 msgid "Unsupported operation: append message: for %s"
 msgstr "Nepodprto dejanje: dodaj sporočilo: za %s"
 
-#: camel/camel-folder.c:1259
+#: camel/camel-folder.c:1262
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Nepodprto dejanje: iskanje z izrazom: za %s"
 
-#: camel/camel-folder.c:1299
+#: camel/camel-folder.c:1302
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Nepodprto dejanje: iskanje po uid-jih: za %s"
@@ -9161,11 +8886,16 @@ msgstr "Prestavljam sporočila"
 msgid "Copying messages"
 msgstr "Kopiram sporočila v %s"
 
-#: camel/camel-folder.c:1666
-msgid "Learning junk and/or non junk message(s)"
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Opozorilo"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
 msgstr ""
 
-#: camel/camel-folder.c:1695
+#: camel/camel-folder.c:1701
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "Prenašam %d sporočil"
@@ -9200,17 +8930,17 @@ msgstr ""
 msgid "(match-threads) requires a match type string"
 msgstr ""
 
-#: camel/camel-folder-search.c:785
+#: camel/camel-folder-search.c:784
 #, fuzzy
 msgid "(match-threads) expects an array result"
 msgstr "(match-all) zahteva enojen booleanov rezultat"
 
-#: camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:790
 #, fuzzy
 msgid "(match-threads) requires the folder set"
 msgstr "(match-all) zahteva enojen booleanov rezultat"
 
-#: camel/camel-folder-search.c:880
+#: camel/camel-folder-search.c:879
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Opravljam poizvedbo na neznani glavi: %s"
@@ -9240,7 +8970,8 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
 #: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:706
+#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Preklicano."
@@ -9620,7 +9351,7 @@ msgstr ""
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1212
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Strežnik je sporočil slab odgovor avtentifikaciji."
 
@@ -10009,40 +9740,40 @@ msgstr "Ukaz ni implementiran"
 msgid "export keys: unimplemented"
 msgstr ""
 
-#: camel/camel-store.c:214
+#: camel/camel-store.c:213
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Ne morem dobiti mape: neveljavno dejanje na tej shrambi"
 
-#: camel/camel-store.c:244
+#: camel/camel-store.c:243
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr "Ne morem dobiti mape: %s: %s"
 
-#: camel/camel-store.c:295
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Ne morem ustvariti mape: neveljavno dejanje na tej shrambi"
 
-#: camel/camel-store.c:323
+#: camel/camel-store.c:325
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Ne morem dobiti mape: %s: %s"
 
-#: camel/camel-store.c:387 camel/camel-vee-store.c:354
+#: camel/camel-store.c:389 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Ne morem zbrisati mape: %s: neveljavno dejanje"
 
-#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#: camel/camel-store.c:439 camel/camel-vee-store.c:387
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Ne morem preimenovati mape %s: neveljavno dejanjea"
 
-#: camel/camel-store.c:811
+#: camel/camel-store.c:777
 msgid "Trash"
 msgstr "Smeti"
 
-#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
-#: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/mail-config.glade.h:95
+#: ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
 msgstr "junij"
@@ -10276,12 +10007,12 @@ msgstr "Ni takšnega sporočila %s v %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Preveri za nova sporočila v vseh mapah"
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:374
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Ne morem zbrisati mape: %s: mapa ne obstaja"
 
-#: camel/camel-vee-store.c:398
+#: camel/camel-vee-store.c:395
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Ne morem preimenovati mape: %s: mapa ne obstaja"
@@ -10327,31 +10058,31 @@ msgstr "Adresar"
 msgid "Post Office Agent SOAP Port:"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:80
+#: camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "Novell GroupWise"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:82
+#: camel/providers/groupwise/camel-groupwise-provider.c:85
 msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: camel/providers/groupwise/camel-groupwise-provider.c:100
 #: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
 msgid "Password"
 msgstr "Geslo"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:99
+#: camel/providers/groupwise/camel-groupwise-provider.c:102
 #: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Ta možnost narekuje povezavo s strežnikom IMAP z nešifriranim geslom."
 
-#: camel/providers/groupwise/camel-gw-listener.c:305
-#: camel/providers/groupwise/camel-gw-listener.c:328
+#: camel/providers/groupwise/camel-gw-listener.c:312
+#: camel/providers/groupwise/camel-gw-listener.c:335
 #, fuzzy
 msgid "Checklist"
 msgstr "Goste meglice"
@@ -10494,13 +10225,13 @@ msgid ""
 msgstr "Ta možnost narekuje povezavo s strežnikom IMAP z nešifriranim geslom."
 
 #: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:429
+#: camel/providers/imap/camel-imap-store.c:428
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "Strežnik SMTP %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:431
+#: camel/providers/imap/camel-imap-store.c:430
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "storitev %s za %s na %s"
@@ -10510,7 +10241,7 @@ msgstr "storitev %s za %s na %s"
 #: camel/providers/imap/camel-imap-store.c:551
 #: camel/providers/imap/camel-imap-store.c:571
 #: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
+#: camel/providers/nntp/camel-nntp-store.c:209
 #: camel/providers/pop3/camel-pop3-store.c:175
 #: camel/providers/smtp/camel-smtp-transport.c:269
 #: camel/providers/smtp/camel-smtp-transport.c:285
@@ -10527,10 +10258,10 @@ msgstr ""
 
 #: camel/providers/imap4/camel-imap4-store.c:222
 #: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:815
+#: camel/providers/imap/camel-imap-store.c:845
 #: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:137
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
 #: camel/providers/pop3/camel-pop3-store.c:192
 msgid "Connection cancelled"
 msgstr "Povezava prekinjena"
@@ -10543,8 +10274,8 @@ msgid ""
 msgstr "Nisem se mogel povezati s strežnikom SMTP %s v varnem načinu: %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:649
-#: camel/providers/imap/camel-imap-store.c:680
+#: camel/providers/imap/camel-imap-store.c:679
+#: camel/providers/imap/camel-imap-store.c:710
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Nisem se mogel povezati s strežnikom SMTP %s v varnem načinu: %s"
@@ -10553,7 +10284,7 @@ msgstr "Nisem se mogel povezati s strežnikom SMTP %s v varnem načinu: %s"
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1109
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
 msgid "Unknown error"
 msgstr "Neznana napaka"
 
@@ -10581,8 +10312,8 @@ msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr "Ne morem dobiti mape: %s: %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1857
-#: camel/providers/imap/camel-imap-store.c:2235
+#: camel/providers/imap/camel-imap-store.c:1885
+#: camel/providers/imap/camel-imap-store.c:2263
 #, fuzzy, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -10661,12 +10392,12 @@ msgstr "Povezava s strežnikom je bila nepričakovano prekinjena: %s"
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3168
+#: camel/providers/imap/camel-imap-store.c:3194
 msgid "Operation cancelled"
 msgstr "Operacija razveljavljena"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3171
+#: camel/providers/imap/camel-imap-store.c:3197
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Povezava s strežnikom je bila nepričakovano prekinjena: %s"
@@ -10728,13 +10459,6 @@ msgid "Unable to retrieve message: %s"
 msgstr "Nisem uspel prenesti sporočila"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:219
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -10744,15 +10468,15 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-mbox-folder.c:418
+#: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
 msgstr "Ni takšnega sporočila"
 
 #: camel/providers/imap/camel-imap-folder.c:2019
-#: camel/providers/imap/camel-imap-folder.c:2621
-#: camel/providers/nntp/camel-nntp-folder.c:238
+#: camel/providers/imap/camel-imap-folder.c:2622
+#: camel/providers/nntp/camel-nntp-folder.c:220
 msgid "This message is not currently available"
 msgstr "To sporočilo trenutno ni na voljo"
 
@@ -10761,7 +10485,23 @@ msgstr "To sporočilo trenutno ni na voljo"
 msgid "Fetching summary information for new messages"
 msgstr "Prenašam povzetke novih sporočil"
 
-#: camel/providers/imap/camel-imap-folder.c:2659
+#: camel/providers/imap/camel-imap-folder.c:2463
+#, c-format
+msgid "Incomplete server response: no information provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2471
+#, c-format
+msgid "Incomplete server response: no UID provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2484
+#, c-format
+msgid ""
+"Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2660
 msgid "Could not find message body in FETCH response."
 msgstr "Nisem mogel najti telesa sporočila v odgovoru FETCH."
 
@@ -10825,43 +10565,43 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Za branje in hranjenje pošte na strežnikih IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/imap/camel-imap-store.c:680
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "Razširitev SSL/TLS ni podprta"
 
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:711
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "Pogajanje SSL ni uspelo"
 
-#: camel/providers/imap/camel-imap-store.c:818
+#: camel/providers/imap/camel-imap-store.c:848
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Nisem se mogel povezati s strežnikom: %s."
 
-#: camel/providers/imap/camel-imap-store.c:1242
+#: camel/providers/imap/camel-imap-store.c:1272
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "Strežnik IMAP %s ne podpira zahtevanega načina avtentifikacije %s"
 
-#: camel/providers/imap/camel-imap-store.c:1252
+#: camel/providers/imap/camel-imap-store.c:1282
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Ni podpore za način avtentifikacije %s"
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1305
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sProsim vpišite geslo IMAP za %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1289
+#: camel/providers/imap/camel-imap-store.c:1319
 msgid "You didn't enter a password."
 msgstr "Nistve vpisali gesla."
 
-#: camel/providers/imap/camel-imap-store.c:1318
+#: camel/providers/imap/camel-imap-store.c:1348
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10872,18 +10612,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1839
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:1867
+#: camel/providers/imap/camel-imap-store.c:2057
 #, c-format
 msgid "No such folder %s"
 msgstr "Ni takšne mape %s"
 
-#: camel/providers/imap/camel-imap-store.c:1915
-#: camel/providers/imap/camel-imap-store.c:2296
+#: camel/providers/imap/camel-imap-store.c:1943
+#: camel/providers/imap/camel-imap-store.c:2324
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Starševski mapi ni dovoljeno vsebovati podmape"
 
-#: camel/providers/imap/camel-imap-store.c:1970
+#: camel/providers/imap/camel-imap-store.c:1998
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10891,7 +10631,7 @@ msgstr "Starševski mapi ni dovoljeno vsebovati podmape"
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Ne morem dobiti mape: %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:2274
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Neznana napaka: %s"
@@ -10925,20 +10665,20 @@ msgid "Index message body data"
 msgstr "Stiku pošlji sporočilo"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:388
 #, fuzzy, c-format
 msgid "~%s (%s)"
 msgstr "%s (%d)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:393
-#: camel/providers/local/camel-local-folder.c:396
+#: camel/providers/local/camel-local-folder.c:392
+#: camel/providers/local/camel-local-folder.c:395
 #, fuzzy, c-format
 msgid "mailbox:%s (%s)"
 msgstr "Ne morem odpreti poštnega predala: %s: %s\n"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:400
+#: camel/providers/local/camel-local-folder.c:399
 #, fuzzy, c-format
 msgid "%s (%s)"
 msgstr "%s (%d)"
@@ -10998,7 +10738,7 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:142
 #: camel/providers/local/camel-local-store.c:253
-#: camel/providers/local/camel-mbox-store.c:356
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -11071,8 +10811,25 @@ msgstr "Dodajanje sporočila v mailidr preklicano"
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Ne morem dodati sporočila v mapo vrste maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:226
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mbox-folder.c:417
+#: camel/providers/local/camel-mbox-folder.c:436
+#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:475
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-mh-folder.c:221
+#, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+"Ne morem dobiti sporočila: %s iz mape %s\n"
+"  %s"
+
+#: camel/providers/local/camel-maildir-folder.c:236
 msgid "Invalid message contents"
 msgstr "Neveljavna vsebina sporočila"
 
@@ -11113,9 +10870,9 @@ msgstr "Nisem mogel zbrisati mape `%s': %s"
 msgid "not a maildir directory"
 msgstr "ni imenik vrste maildir"
 
-#: camel/providers/local/camel-maildir-store.c:341
-#: camel/providers/local/camel-spool-store.c:286
-#: camel/providers/local/camel-spool-store.c:316
+#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-spool-store.c:284
+#: camel/providers/local/camel-spool-store.c:314
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Nisem mogel prebrati mape `%s': %s"
@@ -11164,27 +10921,18 @@ msgstr "Dodajanje sporočila razveljavljeno"
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Ne morem pripeti sporočila k datoteki vrste mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:435
-#: camel/providers/local/camel-mbox-folder.c:466
-#: camel/providers/local/camel-mbox-folder.c:474
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"Ne morem dobiti sporočila: %s iz mape %s\n"
-"  %s"
-
-#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:468
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Zdi se, da je mapa poškodovana in je ni mogoče popraviti."
 
-#: camel/providers/local/camel-mbox-folder.c:475
-msgid "Message construction failed: Corrupt mailbox?"
+#: camel/providers/local/camel-mbox-folder.c:476
+#: camel/providers/local/camel-mh-folder.c:222
+#, fuzzy
+msgid "Message construction failed."
 msgstr "Konstrukcija sporočila ni uspela: Naj pokvarim poštni predal?"
 
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:362
+#: camel/providers/local/camel-mbox-store.c:361
 #, fuzzy
 msgid "Cannot create a folder by this name."
 msgstr "Ne morem ustvariti mape s takšnim imenom"
@@ -11215,32 +10963,32 @@ msgstr "`%s' ni običajna datoteka."
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Mapa `%s' ni prazna. Ni zbrisana."
 
-#: camel/providers/local/camel-mbox-store.c:375
+#: camel/providers/local/camel-mbox-store.c:374
 #, fuzzy, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Nisem mogel ustvariti imenika %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:389
+#: camel/providers/local/camel-mbox-store.c:388
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Ne morem dobiti mape: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:391
+#: camel/providers/local/camel-mbox-store.c:390
 #, fuzzy
 msgid "Folder already exists"
 msgstr "ID vizitke že obstaja"
 
-#: camel/providers/local/camel-mbox-store.c:473
+#: camel/providers/local/camel-mbox-store.c:472
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "Izbrano ime mape ni veljavno: %s"
 
-#: camel/providers/local/camel-mbox-store.c:486
+#: camel/providers/local/camel-mbox-store.c:485
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Nisem mogel preimenovati mape: %s"
 
-#: camel/providers/local/camel-mbox-store.c:561
+#: camel/providers/local/camel-mbox-store.c:560
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Nisem mogel preimenovati mape %s v %s: %s"
@@ -11433,7 +11181,7 @@ msgstr ""
 "Mapa je morda pokvarjena, kopija shranjena v `%s'"
 
 #: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:997
+#: camel/providers/nntp/camel-nntp-store.c:1126
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Prosim vpišite geslo NNTP za %s@%s"
@@ -11450,18 +11198,10 @@ msgstr "Nisem uspel poslati uporabniškega imena strežniku"
 msgid "Server rejected username/password"
 msgstr "Strežnik je zavrnil uporabniško ime/geslo"
 
-#: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:263
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr "Uporabnik je preklical"
-
-#: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:259
-#: camel/providers/nntp/camel-nntp-folder.c:265
+#: camel/providers/nntp/camel-nntp-folder.c:147
+#: camel/providers/nntp/camel-nntp-folder.c:149
+#: camel/providers/nntp/camel-nntp-folder.c:158
+#: camel/providers/nntp/camel-nntp-folder.c:234
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11470,64 +11210,51 @@ msgstr "Uporabnik je preklical"
 msgid "Cannot get message %s: %s"
 msgstr "Ne morem dobiti sporočila %s: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:188
-#: camel/providers/nntp/camel-nntp-folder.c:228
+#: camel/providers/nntp/camel-nntp-folder.c:156
+#: camel/providers/nntp/camel-nntp-folder.c:232
+#: camel/providers/nntp/camel-nntp-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+msgid "User cancelled"
+msgstr "Uporabnik je preklical"
+
+#: camel/providers/nntp/camel-nntp-folder.c:176
+#: camel/providers/nntp/camel-nntp-folder.c:208
 #, c-format
 msgid "Internal error: uid in invalid format: %s"
 msgstr "Notranja napaka: uid ima neveljavno obliko: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:201
-#, fuzzy, c-format
-msgid "Could not get article %s from NNTP server"
-msgstr "Nisem mogel dobiti seznama skupin s strežnika."
-
-#: camel/providers/nntp/camel-nntp-folder.c:362
-msgid "Posting not allowed by news server"
-msgstr ""
-
+#: camel/providers/nntp/camel-nntp-folder.c:328
+#: camel/providers/nntp/camel-nntp-folder.c:331
 #: camel/providers/nntp/camel-nntp-folder.c:373
-#, c-format
-msgid "Failed to send newsgroups header: %s: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:413
-#: camel/providers/nntp/camel-nntp-folder.c:426
-#, c-format
-msgid "Error posting to newsgroup: %s: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:438
-msgid "Error reading response to posted message: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:441
+#: camel/providers/nntp/camel-nntp-folder.c:375
 #, fuzzy, c-format
-msgid "Error posting message: %s: message not posted"
-msgstr ""
-"Napaka ob samodejnem shranjevanju sporočila: %s\n"
-" %s"
+msgid "Posting failed: %s"
+msgstr "Operacija ni uspela: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:457
+#: camel/providers/nntp/camel-nntp-folder.c:393
 #, fuzzy
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "Ne morete kopirati sporočil iz te mape smeti."
 
-#: camel/providers/nntp/camel-nntp-folder.c:468
+#: camel/providers/nntp/camel-nntp-folder.c:404
 #, fuzzy
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Ne morete kopirati sporočil iz te mape smeti."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:44
 msgid "Could not get group list from server."
 msgstr "Nisem mogel dobiti seznama skupin s strežnika."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#: camel/providers/nntp/camel-nntp-grouplist.c:97
+#: camel/providers/nntp/camel-nntp-grouplist.c:106
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "Nisem mogel naložiti datoteke s seznamom skupin za %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#: camel/providers/nntp/camel-nntp-grouplist.c:157
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Nisem mogel shraniti datoteke s seznamom skupin za %s: %s"
@@ -11556,27 +11283,29 @@ msgid ""
 msgstr ""
 "Ta možnost se bo avtentificirala pri strežniku NNTP z nešifriranim geslom."
 
-#: camel/providers/nntp/camel-nntp-store.c:158
+#: camel/providers/nntp/camel-nntp-store.c:118
+#: camel/providers/nntp/camel-nntp-store.c:1233
+#: camel/providers/nntp/camel-nntp-store.c:1331
+#, c-format
+msgid "NNTP Command failed: %s"
+msgstr "Ukaz NNTP ni uspel: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:227
 #, fuzzy, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Nisem mogel ustvariti imenika %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:170
+#: camel/providers/nntp/camel-nntp-store.c:239
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:326
+#: camel/providers/nntp/camel-nntp-store.c:403
 #, c-format
 msgid "USENET News via %s"
 msgstr "USNET Novičke preko %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:640
-#, fuzzy
-msgid "Stream error"
-msgstr "Drugačna napaka"
-
-#: camel/providers/nntp/camel-nntp-store.c:643
+#: camel/providers/nntp/camel-nntp-store.c:777
 #, fuzzy, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -11586,75 +11315,75 @@ msgstr ""
 "Napaka ob shranjevanju sporočil v: %s:\n"
 " %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:735
+#: camel/providers/nntp/camel-nntp-store.c:872
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
 "No such newsgroup. The selected item is a probably a parent folder."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:767
+#: camel/providers/nntp/camel-nntp-store.c:904
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
 "newsgroup does not exist!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:792
+#: camel/providers/nntp/camel-nntp-store.c:929
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:800
+#: camel/providers/nntp/camel-nntp-store.c:937
 #, fuzzy
 msgid "You cannot rename a folder in a News store."
 msgstr "Nisem mogel preimenovati mape %s v %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:808
+#: camel/providers/nntp/camel-nntp-store.c:945
 #, fuzzy
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "Ne morem kopirati mape v eno od naslednic."
 
-#: camel/providers/nntp/camel-nntp-summary.c:253
-#, fuzzy, c-format
-msgid "Connection error: %s"
-msgstr "Neznana napaka: %s"
-
-#: camel/providers/nntp/camel-nntp-summary.c:262
-#, c-format
-msgid "No such folder: %s"
-msgstr "Ni takšne mape: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1118
+#, fuzzy
+msgid "Authentication requested but not username provided"
+msgstr "Potrebna je avtentifikacija"
 
-#: camel/providers/nntp/camel-nntp-summary.c:268
-#, c-format
-msgid "Could not get group: %s"
-msgstr "Nisem mogel dobiti skupine: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1146
+#, fuzzy, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr "Strežniku KPOP se nisem mogel avtentificirati: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:333
+#: camel/providers/nntp/camel-nntp-store.c:1262
 #, fuzzy
-msgid "Could not get messages: unspecified error"
-msgstr "Nisem mogel dobiti sporočila: %s"
+msgid "Not connected."
+msgstr "Nov stik"
 
-#: camel/providers/nntp/camel-nntp-summary.c:378
+#: camel/providers/nntp/camel-nntp-store.c:1311
 #, c-format
-msgid "NNTP Command failed: %s"
-msgstr "Ukaz NNTP ni uspel: %s"
+msgid "No such folder: %s"
+msgstr "Ni takšne mape: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:438
-#: camel/providers/nntp/camel-nntp-summary.c:543
+#: camel/providers/nntp/camel-nntp-summary.c:218
+#: camel/providers/nntp/camel-nntp-summary.c:314
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Pregledujem za novimi sporočili"
 
-#: camel/providers/nntp/camel-nntp-summary.c:558
-#, c-format
-msgid "Unknown server response: %s"
-msgstr "Neznan odgovor strežnika: %s"
+#: camel/providers/nntp/camel-nntp-summary.c:225
+#, fuzzy, c-format
+msgid "Unexpected server response from xover: %s"
+msgstr "Nepričakovan odgovor strežnika IMAP: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:328
+#, fuzzy, c-format
+msgid "Unexpected server response from head: %s"
+msgstr "Nepričakovan odgovor strežnika POP: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:605
+#: camel/providers/nntp/camel-nntp-summary.c:368
 msgid "Use cancel"
 msgstr "Uporabite preklic"
 
-#: camel/providers/nntp/camel-nntp-summary.c:607
+#: camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Operacija ni uspela: %s"
@@ -11702,7 +11431,7 @@ msgstr "Zbriši po %s dneh"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107
 msgid "POP"
 msgstr "POP"
 
@@ -11791,7 +11520,7 @@ msgid "No such folder `%s'."
 msgstr "Ni takšne mape `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:132
 msgid "Sendmail"
 msgstr "Program sendmail"
 
@@ -11845,7 +11574,7 @@ msgstr "program sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Dostava pošte preko programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:119
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -12142,19 +11871,19 @@ msgstr "%.1fM"
 msgid "%.0fG"
 msgstr "%.1fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
+#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:408
 msgid "attachment"
 msgstr "priloga"
 
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:454
 msgid "Remove selected items from the attachment list"
 msgstr "Odstrani izbrane predmete iz seznama prilog"
 
-#: composer/e-msg-composer-attachment-bar.c:491
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Add attachment..."
 msgstr "Dodaj prilogo..."
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:495
 msgid "Attach a file to the message"
 msgstr "Priloži datoteko k sporočilu"
 
@@ -12218,7 +11947,7 @@ msgstr "(Neimenovano sporočilo)"
 msgid "Open file"
 msgstr "Odpri datoteko"
 
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
 msgid "Autogenerated"
 msgstr ""
 
@@ -12368,17 +12097,17 @@ msgstr "Priloži datoteko"
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
+msgid "You cannot attach the file `{0}' to this message."
 msgstr "Priloži datoteko k sporočilu"
 
 #. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4
-msgid "${1}"
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
 msgstr ""
 
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
 
 #. mail-composer:attach-directory primary
@@ -12473,7 +12202,7 @@ msgstr "Nisem mogel ustvariti povzetka"
 
 #. mail-composer:no-build-message secondary
 #: composer/mail-composer-errors.xml.h:34
-msgid "Because \"${0}\", you may need to select different mail options."
+msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
@@ -12483,8 +12212,10 @@ msgid "Could not read signature file \"{0}\"."
 msgstr "Nisem mogel shraniti datoteke s podpisom."
 
 #. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38
-msgid "Because \"${1}\"."
+#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted primary
@@ -12912,11 +12643,11 @@ msgid "<b>Then</b>"
 msgstr "končano "
 
 #: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1335
+#: mail/mail-account-gui.c:1347
 msgid "Select Folder"
 msgstr "Izberi mapo"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
 msgid "    "
 msgstr ""
 
@@ -12978,7 +12709,7 @@ msgstr "nazaj"
 msgid "months"
 msgstr "mesecev"
 
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
 msgid "seconds"
 msgstr " sekund"
 
@@ -13011,21 +12742,21 @@ msgstr "z vsemi krajevnimi mapami"
 msgid "years"
 msgstr "let"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:916
-#: mail/mail-config.c:76 mail/mail-config.glade.h:90
+#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
+#: mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Pomembno"
 
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:919 mail/mail-config.c:79
-#: mail/mail-config.glade.h:145
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: mail/mail-config.glade.h:148
 #, fuzzy
 msgid "To Do"
 msgstr "Seznam opravil"
 
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:920 mail/mail-config.c:80
-#: mail/mail-config.glade.h:94
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: mail/mail-config.glade.h:97
 #, fuzzy
 msgid "Later"
 msgstr "po"
@@ -13084,263 +12815,6 @@ msgstr "dohodna"
 msgid "outgoing"
 msgstr "odhodna"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-#, fuzzy
-msgid "Adjust Score"
-msgstr "Dodeli točke"
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Color"
-msgstr "Dodeli barvo"
-
-#: filter/libfilter-i18n.h:4
-msgid "Assign Score"
-msgstr "Dodeli točke"
-
-#: filter/libfilter-i18n.h:5
-msgid "Attachments"
-msgstr "Priloge"
-
-#: filter/libfilter-i18n.h:6
-msgid "Beep"
-msgstr "Pisk"
-
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "vsebuje"
-
-#: filter/libfilter-i18n.h:8
-msgid "Copy to Folder"
-msgstr "Kopiraj v mapo"
-
-#: filter/libfilter-i18n.h:9
-msgid "Date received"
-msgstr "Sprejeto dne"
-
-#: filter/libfilter-i18n.h:10
-msgid "Date sent"
-msgstr "Poslano dne"
-
-#: filter/libfilter-i18n.h:12
-msgid "Deleted"
-msgstr "Zbrisano"
-
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "ne vsebuje"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "se ne konča z"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "ne obstaja"
-
-#: filter/libfilter-i18n.h:16
-#, fuzzy
-msgid "does not return"
-msgstr "ne obstaja"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "ne zveni kot"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "se ne začne z"
-
-#: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
-msgstr "ne obstaja"
-
-#: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr "Osnutek"
-
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "se konča z"
-
-#: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr "obstaja"
-
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "obstaja"
-
-#: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr "Izraz"
-
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr "Navezava"
-
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "je"
-
-#: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr "je po"
-
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr "je pred"
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr "je označeno"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "je večje"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "je manjše"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "ni"
-
-#: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr "ni označeno"
-
-#: filter/libfilter-i18n.h:36
-#, fuzzy
-msgid "Junk Test"
-msgstr "junij"
-
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
-#: widgets/misc/e-expander.c:189
-#, fuzzy
-msgid "Label"
-msgstr "oznaka9"
-
-#: filter/libfilter-i18n.h:38
-msgid "Mailing list"
-msgstr "Dopisni seznam"
-
-#: filter/libfilter-i18n.h:39
-msgid "Message Body"
-msgstr "Jedro sporočila"
-
-#: filter/libfilter-i18n.h:40
-msgid "Message Header"
-msgstr "Glava sporočila"
-
-#: filter/libfilter-i18n.h:41
-#, fuzzy
-msgid "Message is Junk"
-msgstr "Sporočilo je bilo poslano"
-
-#: filter/libfilter-i18n.h:42
-#, fuzzy
-msgid "Message is not Junk"
-msgstr "Sporočilo %s ni bilo najdeno."
-
-#: filter/libfilter-i18n.h:43
-msgid "Move to Folder"
-msgstr "Prestavi v mapo"
-
-#: filter/libfilter-i18n.h:44
-#, fuzzy
-msgid "Pipe to Program"
-msgstr "Izhod iz programa"
-
-#: filter/libfilter-i18n.h:45
-msgid "Play Sound"
-msgstr "Predvajaj zvok"
-
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Beri"
-
-#: filter/libfilter-i18n.h:47
-msgid "Recipients"
-msgstr "Prejemnik"
-
-#: filter/libfilter-i18n.h:48
-msgid "Regex Match"
-msgstr "Regularni izraz"
-
-#: filter/libfilter-i18n.h:49
-msgid "Replied to"
-msgstr "Odgovorjeno na"
-
-#: filter/libfilter-i18n.h:50
-msgid "returns"
-msgstr ""
-
-#: filter/libfilter-i18n.h:51
-#, fuzzy
-msgid "returns greater than"
-msgstr "je večje"
-
-#: filter/libfilter-i18n.h:52
-#, fuzzy
-msgid "returns less than"
-msgstr "je manjše"
-
-#: filter/libfilter-i18n.h:53
-#, fuzzy
-msgid "Run Program"
-msgstr "Poženi program:"
-
-#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Točke"
-
-#: filter/libfilter-i18n.h:55
-msgid "Sender"
-msgstr "Pošiljatelj"
-
-#: filter/libfilter-i18n.h:56
-msgid "Set Status"
-msgstr "Nastavi stanje"
-
-#: filter/libfilter-i18n.h:57
-msgid "Size (kB)"
-msgstr "Velikost (kB)"
-
-#: filter/libfilter-i18n.h:58
-msgid "sounds like"
-msgstr "zveni kot"
-
-#: filter/libfilter-i18n.h:59
-msgid "Source Account"
-msgstr "Izvorni račun"
-
-#: filter/libfilter-i18n.h:60
-msgid "Specific header"
-msgstr "Določena glava"
-
-#: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "se začne z"
-
-#: filter/libfilter-i18n.h:63
-msgid "Stop Processing"
-msgstr "Prenehaj z obdelavo"
-
-#: filter/libfilter-i18n.h:64 mail/em-format.c:755 mail/em-format-html.c:1519
-#: mail/em-format-quote.c:302 mail/em-mailer-prefs.c:87
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
-#: smime/lib/e-cert.c:1079
-msgid "Subject"
-msgstr "Zadeva"
-
-#: filter/libfilter-i18n.h:65
-#, fuzzy
-msgid "Unset Status"
-msgstr "Nastavi stanje"
-
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Dodaj pravilo"
@@ -13359,6 +12833,11 @@ msgstr "Ime pravila: "
 msgid "_Score Rules"
 msgstr "Točke pravil"
 
+#: filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Točke"
+
 #: filter/searchtypes.xml.h:1
 msgid "Body contains"
 msgstr "Telo vsebuje"
@@ -13446,13 +12925,13 @@ msgstr "Podpisi"
 msgid "-------- Forwarded Message --------"
 msgstr "Posredovano sporočilo"
 
-#: mail/em-composer-utils.c:1499
+#: mail/em-composer-utils.c:1495
 msgid "an unknown sender"
 msgstr "neznan pošiljatelj"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1509
+#: mail/em-composer-utils.c:1505
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "Na %s, %Y-%m-%d ob %H:%M, je %%s napisal(a):"
@@ -13496,8 +12975,8 @@ msgstr "<kliknite tukaj za izbiro mape>"
 msgid "Create New Folder"
 msgstr "Ustvari _novo mapo..."
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
-#: mail/mail-component.c:701
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
+#: mail/mail-component.c:704
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Navedi kje naj se ustvarimapa:"
@@ -13513,109 +12992,110 @@ msgstr "Ustvari pravilo"
 msgid "Folder _name:"
 msgstr "Ime mape:"
 
-#: mail/em-folder-tree.c:839
+#: mail/em-folder-tree.c:833
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Odstranjujem mapo %s"
 
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree.c:835
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Odpiram mapo %s"
 
-#: mail/em-folder-tree.c:848 mail/message-list.c:1555
+#: mail/em-folder-tree.c:842 mail/message-list.c:1561
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Izbiram sporočila v mapi \"%s\""
 
-#: mail/em-folder-tree.c:850 mail/message-list.c:1557
+#: mail/em-folder-tree.c:844 mail/message-list.c:1563
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopiram sporočila v %s"
 
-#: mail/em-folder-tree.c:866
+#: mail/em-folder-tree.c:860
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Preveri za nova sporočila v vseh mapah"
 
-#: mail/em-folder-tree.c:956 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Kopiraj v mapo"
 
-#: mail/em-folder-tree.c:957 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Prestavi v mapo"
 
-#: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2069
-#: mail/em-folder-tree.c:2551 mail/em-folder-view.c:798
-#: mail/message-list.c:1645
+#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
+#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
+#: mail/message-list.c:1651
 #, fuzzy
 msgid "_Move"
 msgstr "Prestavi"
 
-#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#: mail/em-folder-tree.c:955 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "Prekliči opravilo"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
 #: mail/em-folder-view.c:798 mail/em-folder-view.c:812
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Izberi mapo"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
 #, fuzzy
 msgid "C_opy"
 msgstr "Kopiraj"
 
-#: mail/em-folder-tree.c:2096
+#: mail/em-folder-tree.c:2088
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Odstranjujem mapo %s"
 
-#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
+#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
 #, fuzzy
 msgid "Create folder"
 msgstr "Ustvari novo mapo"
 
-#: mail/em-folder-tree.c:2474
+#: mail/em-folder-tree.c:2463
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Preimenuj mapo \"%s\" v:"
 
-#: mail/em-folder-tree.c:2476
+#: mail/em-folder-tree.c:2465
 #, fuzzy
 msgid "Rename Folder"
 msgstr "Preimenuj mapo"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "Po_gled"
 
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2537
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Odpri v novem oknu"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2555
+#: mail/em-folder-tree.c:2546
 #, fuzzy
 msgid "_New Folder..."
 msgstr "_Nova mapa"
 
-#: mail/em-folder-tree.c:2558
+#: mail/em-folder-tree.c:2549
 msgid "_Rename"
 msgstr "P_reimenuj"
 
-#: mail/em-folder-tree.c:2561 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Lastnosti..."
 
 #: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:889
+#: mail/mail-vfolder.c:888
 msgid "VFolders"
 msgstr "vMape"
 
@@ -13629,19 +13109,19 @@ msgstr ""
 msgid "Inbox"
 msgstr "Dohodna pošta"
 
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
 msgid "Loading..."
 msgstr "Nalagam..."
 
 #: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
 #: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
 #: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:551
+#: mail/mail-component.c:554
 msgid "Mail"
 msgstr "Pošta"
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Uredi kot novo sporočilo..."
@@ -13654,17 +13134,17 @@ msgstr "Na_tisni"
 msgid "_Reply to Sender"
 msgstr "_Odgovori pošiljatelju"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:810
+#: mail/em-folder-view.c:901 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Odgovori na _seznam"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:811
+#: mail/em-folder-view.c:902 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Odgovori _vsem"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: mail/em-folder-view.c:903 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Posreduj naprej"
@@ -13719,6 +13199,11 @@ msgstr "Presta_vi v mapo..."
 msgid "_Copy to Folder..."
 msgstr "_Kopiraj v mapo..."
 
+#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
+#, fuzzy
+msgid "Label"
+msgstr "oznaka9"
+
 #: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Pošiljatelja dodaj v _adresar"
@@ -13769,12 +13254,12 @@ msgid "Filter on _Mailing List"
 msgstr "Filter glede na p_oštni seznam"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
-#: mail/mail-config.glade.h:66
+#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Privzeto"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1796
 msgid "Print Message"
 msgstr "Natisni sporočilo"
 
@@ -13814,12 +13299,18 @@ msgstr "Cc"
 msgid "Bcc"
 msgstr "Bcc:"
 
+#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
+#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Zadeva"
+
 #: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
 #: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Datum"
 
-#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
+#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
 #, fuzzy
 msgid "Newsgroups"
 msgstr "Viri novic"
@@ -14018,7 +13509,7 @@ msgid ""
 "practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:757
+#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
 #, fuzzy
 msgid "_View Certificate"
 msgstr "ID _certifikata:"
@@ -14082,7 +13573,7 @@ msgstr "En _teden"
 msgid "Once per month"
 msgstr "En _mesec"
 
-#: mail/em-migrate.c:1072
+#: mail/em-migrate.c:1168
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -14090,91 +13581,91 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1506
+#: mail/em-migrate.c:1602
 #, fuzzy, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Ne morem dobiti mape: %s: %s"
 
-#: mail/em-migrate.c:1532
+#: mail/em-migrate.c:1628
 #, fuzzy, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr ""
 "Nisem mogel izvesti klica 'seek' na datoteki: %s\n"
 " %s"
 
-#: mail/em-migrate.c:1715
+#: mail/em-migrate.c:1811
 #, fuzzy, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Nisem mogel shraniti datoteke s seznamom skupin za %s: %s"
 
-#: mail/em-migrate.c:1919
+#: mail/em-migrate.c:2015
 #, fuzzy, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Ne morem odpreti ali ustvariti .newsrc datoteke za %s: %s"
 
-#: mail/em-migrate.c:1933
+#: mail/em-migrate.c:2029
 #, fuzzy, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Nisem mogel ustvariti cevi do %s: %s"
 
-#: mail/em-migrate.c:1962
+#: mail/em-migrate.c:2058
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#: mail/em-migrate.c:2413 mail/em-migrate.c:2425
 #, fuzzy, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Nisem mogel ustvariti cevi do %s: %s"
 
-#: mail/em-migrate.c:2480
+#: mail/em-migrate.c:2576
 #, fuzzy, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr ""
 "Nisem mogel ustvariti izhodne datoteke: %s\n"
 " %s"
 
-#: mail/em-migrate.c:2498
+#: mail/em-migrate.c:2594
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 msgstr ""
 
-#: mail/em-popup.c:699
+#: mail/em-popup.c:700
 msgid "Save As..."
 msgstr "Shrani kot..."
 
-#: mail/em-popup.c:717
+#: mail/em-popup.c:718
 #, fuzzy, c-format
 msgid "untitled_image.%s"
 msgstr "Neimenovano sporočilo"
 
-#: mail/em-popup.c:807
+#: mail/em-popup.c:808
 #, fuzzy
 msgid "Set as _Background"
 msgstr "Ozadje:"
 
-#: mail/em-popup.c:809
+#: mail/em-popup.c:810
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "Odgovori pošiljatelju"
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:859
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Odpri povezavo v brskalniku"
 
-#: mail/em-popup.c:859
+#: mail/em-popup.c:860
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Pošlji _sporočilo na seznam..."
 
-#: mail/em-popup.c:860
+#: mail/em-popup.c:861
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Dodaj adresar"
 
-#: mail/em-popup.c:966
+#: mail/em-popup.c:967
 #, c-format
 msgid "Open in %s..."
 msgstr "Odpri v %s..."
@@ -14782,7 +14273,7 @@ msgstr "Evolucijin veznik Koledarja"
 msgid "Mail Accounts"
 msgstr "Poštni račun"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
 #, fuzzy
 msgid "Mail Preferences"
 msgstr "Nastavitve"
@@ -14796,15 +14287,15 @@ msgid "Evolution is importing your old Elm mail"
 msgstr "Evolucija uvaža vašo staro pošto Elm."
 
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:226
+#: mail/importers/evolution-mbox-importer.c:221
+#: mail/importers/evolution-outlook-importer.c:255
 #: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Uvažam..."
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:222
-#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/evolution-mbox-importer.c:223
+#: mail/importers/evolution-outlook-importer.c:257
 #: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Prosim pokačajte"
@@ -14827,23 +14318,25 @@ msgid "Elm"
 msgstr "Elm"
 
 #: mail/importers/evolution-mbox-importer.c:116
+#: mail/importers/evolution-outlook-importer.c:130
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Zbriši to mapo"
 
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 #, fuzzy
 msgid "Select folder to import into"
 msgstr "Izberi mapo"
 
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:254
 #: mail/importers/mail-importer.c:226
 #, fuzzy, c-format
 msgid "Importing `%s'"
 msgstr "Uvažam"
 
-#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/evolution-outlook-importer.c:301
 #: mail/importers/mail-importer.c:140
 #, fuzzy
 msgid "Importing mailbox"
@@ -14993,16 +14486,16 @@ msgstr ""
 msgid "%s License Agreement"
 msgstr ""
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
 msgid "_Host:"
 msgstr "_Gostitelj:"
 
-#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
 #, fuzzy
 msgid "User_name:"
 msgstr "_Uporabniško ime:"
 
-#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
 msgid "_Path:"
 msgstr "_Pot:"
 
@@ -15065,35 +14558,35 @@ msgstr "skupaj %d"
 msgid ", %d unread"
 msgstr " (XXX neprebran)"
 
-#: mail/mail-component.c:653
+#: mail/mail-component.c:656
 msgid "New Mail Message"
 msgstr "Novo poštno sporočilo"
 
-#: mail/mail-component.c:654
+#: mail/mail-component.c:657
 msgid "_Mail Message"
 msgstr "_Pošlji sporočilo"
 
-#: mail/mail-component.c:655
+#: mail/mail-component.c:658
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Sestavi novo sporočilo"
 
-#: mail/mail-component.c:661
+#: mail/mail-component.c:664
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Nova vMapa"
 
-#: mail/mail-component.c:662
+#: mail/mail-component.c:665
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Uredi filtre"
 
-#: mail/mail-component.c:663
+#: mail/mail-component.c:666
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Ustvari nov koledar"
 
-#: mail/mail-component.c:795
+#: mail/mail-component.c:798
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
@@ -15105,7 +14598,7 @@ msgstr "Preverjam storitev"
 msgid "Connecting to server..."
 msgstr "Vzpostavljam povezavo s strežnikom..."
 
-#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Identiteta"
 
@@ -15121,7 +14614,7 @@ msgstr ""
 "jo boste pošiljali."
 
 #: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid "Receiving Mail"
 msgstr "Sprejemanje pošte"
 
@@ -15139,7 +14632,7 @@ msgstr ""
 msgid "Please select among the following options"
 msgstr "Prosim, izberite med naslednjimi možnostmi"
 
-#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr "Pošiljanje pošte"
 
@@ -15153,7 +14646,7 @@ msgstr ""
 "se obrnite na vašega sistemskega administratorja ali ponudnika dostopa do "
 "interneta."
 
-#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37
 msgid "Account Management"
 msgstr "Upravljanje z računom"
 
@@ -15173,255 +14666,259 @@ msgstr ""
 "Prosim, v prostor spodaj vpišite ime za ta račun. Ime bo uporabljeno le za "
 "prikaz."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:2
 #, fuzzy
 msgid " Ch_eck for Supported Types "
 msgstr "_Preveri za podprte vrste  "
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "<b>Preview</b>"
 msgstr "Predogled"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "(SSL v tej zgradbi Evolucije ni vgrajen)"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "<b>S_ignatures</b>"
 msgstr "Stanje:"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "<b>_Languages</b>"
 msgstr "Stanje:"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
+msgid "<small>This will make the the filter more reliable, but slower</small>"
+msgstr ""
+
+#: mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "<span weight=\"bold\">Checking for New Mail</span>"
 msgstr "Preverjam za novo pošto"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">General</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
 #, fuzzy
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "Sporočila za prikaz"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "Opozorilo o novi pošti"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Security</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "Poslana sporočila in osnutki"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:34
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:35
 #, fuzzy
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "Kadar pošiljam šifrirano pošto, _vedno šifriraj sebi"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:36
 #, fuzzy
 msgid "Account Editor"
 msgstr "Račun %d"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:38
 #, fuzzy
 msgid "Add Ne_w Signature..."
 msgstr "Dodaj nov podpis"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Add _Script"
 msgstr "_Skripta"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "Kadar pošiljam šifrirano pošto, _vedno šifriraj sebi"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Vedno pošlji _kopije (Cc) na:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Vedno pošlji _slepe kopije (Bcc) na:"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Always _sign outgoing messages when using this account"
 msgstr "Ob uporabi tega računa _vedno podpiši odhodno pošto"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Attach original message"
 msgstr "Priloži datoteko k sporočilu"
 
-#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Priloga"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:48
 #, fuzzy
 msgid "Automatically _insert smiley images"
 msgstr "_Samodejno preveri za novo pošto"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Automatically check for _new mail every"
 msgstr "_Samodejno preveri za novo pošto"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Beep w_hen new mail arrives"
 msgstr "Ob prihodu nove pošte zapiskaj"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 #, fuzzy
 msgid "C_haracter set:"
 msgstr "Neznan nabor znakov: %s"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Ch_eck for Supported Types "
 msgstr "_Preveri za podprte vrste  "
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 #, fuzzy
-msgid "Check _Incoming Mail"
+msgid "Check _incoming mail for junk"
 msgstr "Strežnik dohodne pošte"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 #, fuzzy
 msgid "Color for _misspelled words:"
 msgstr "Barva za opravila, ki so na vrsti danes"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Colors"
 msgstr "_Zapri"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Confirm _when expunging a folder"
 msgstr "Potrdi ob uničevanju mape"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 #, fuzzy
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
@@ -15438,284 +14935,289 @@ msgstr ""
 "\n"
 "Kliknite \"Končaj\" za shranitev vaših nastavitev."
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
 msgid "De_fault"
 msgstr "_Privzeto"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Default character e_ncoding:"
 msgstr "Privzet nabor znakov: "
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 #, fuzzy
 msgid "Defaults"
 msgstr "Privzeto"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "Ne morem dobiti sporočila"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Opravljeno"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Drafts _Folder:"
 msgstr "Mapa _osnutkov:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:77
 #, fuzzy
 msgid "Email Accounts"
 msgstr "Poštni račun"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Email _Address:"
 msgstr "_E-poštni naslov:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "Empty trash folders on e_xit"
 msgstr "Ob izhodu _sprazni mapo smeti"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "ID _certifikata:"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:81
 msgid "Evolution Account Assistant"
 msgstr "Evolucijin druid za račune"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:82
 msgid "Execute Command..."
 msgstr "Izvrši ukaz..."
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Fi_xed-width:"
 msgstr "se konča z"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 #, fuzzy
 msgid "Font Properties"
 msgstr "Lastnosti računa"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 #, fuzzy
 msgid "Format messages in _HTML"
 msgstr "Posredovana sporočila"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "HTML Mail"
 msgstr "V pošti HTML"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Headers"
 msgstr "Glava"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 #, fuzzy
 msgid "Highlight _quotations with"
 msgstr "_Osvetli citiranja z"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
 #: mail/mail-config.glade.h:91
+#, fuzzy
+msgid "I_nclude remote tests"
+msgstr "Vključi:"
+
+#: mail/mail-config.glade.h:94
 msgid "Inline"
 msgstr "Kot del sporočila"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Mail Configuration"
 msgstr "Nastavitev pošte"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "Mesto poštnega predala"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:101
 #, fuzzy
 msgid "Message Composer"
 msgstr "Sporočila"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 #, fuzzy
 msgid "Or_ganization:"
 msgstr "Organi_zacija:"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "PGP/GPG _Key ID:"
 msgstr "ID _ključa PGP/GPG:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "Play sound file when new mail arri_ves"
 msgstr "Ob prihodu nove pošte zaigraj zvočno datoteko"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 #, fuzzy
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Zahtevaj potrditev ob pošiljanju sporočil, ki imajo le BCC prejemnike"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Qmail maildir "
 msgstr "Poštni imenik Qmail"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "Quote original message"
 msgstr "Ne morem dobiti sporočila"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr "Citirano"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Re_member password"
 msgstr "Zapomni si geslo"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 #, fuzzy
 msgid "Re_ply-To:"
 msgstr "Odgovori-na:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "Sprejemam e-pošto"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:120
 #, fuzzy
 msgid "Receiving Options"
 msgstr "Možnosti sprejema"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
 #, fuzzy
 msgid "Remember _password"
 msgstr "Zapomni si geslo"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
 #, fuzzy
 msgid "S_tandard Font:"
 msgstr "Običajnen Unix poštni predal"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 #, fuzzy
 msgid "Security"
 msgstr "_Varnost"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:126
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:127
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:128
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:129
 #, fuzzy
 msgid "Select..."
 msgstr "Zbriši..."
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "Pošiljam e-pošto"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Sent _Messages Folder:"
 msgstr "Mapa _poslanih sporočil:"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:134
 msgid "Ser_ver requires authentication"
 msgstr "St_režnik zahteva avtentifikacijo"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:135
 msgid "Server _Type: "
 msgstr "Vrs_ta strežnika:"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Nisem mogel podpisati: certifikat za \"%s\" ni bil najden."
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:137
 #, fuzzy
 msgid "Signat_ure:"
 msgstr "Podpisi"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "Signatures"
 msgstr "_Podpisi"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:139
 #, fuzzy
 msgid "Specify _filename:"
 msgstr "Navedite ime datoteke:"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:140
 msgid "Spell Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:141
 msgid "Standard Unix mbox"
 msgstr "Običajnen Unix poštni predal"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "T_erminal Font:"
 msgstr "Prvotni stik:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "T_ype: "
 msgstr "Vrsta:"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:149
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -15723,16 +15225,12 @@ msgstr ""
 "Vpišite ime s katerimi želite imenovati ta račun. Na primer:\"službeni\" ali "
 "\"domači\"."
 
-#: mail/mail-config.glade.h:148
-msgid "Use _Daemon"
-msgstr ""
-
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:152
 #, fuzzy
 msgid "V_ariable-width:"
 msgstr "Spremenljivo"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
@@ -15743,105 +15241,101 @@ msgstr ""
 "\n"
 "Kliknite \"Naprej\" za začetek. "
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:158
 #, fuzzy
 msgid "_Add Signature"
 msgstr "_Podpisi"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Always load images from the Internet"
 msgstr "_Vedno naloži slike s spleta"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Digitally sign outgoing messages (by default)"
 msgstr "Ob uporabi tega računa _vedno podpiši odhodno pošto"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:161
 #, fuzzy
 msgid "_Do not notify me when new mail arrives"
 msgstr "Ob prihodu nove pošte me ne obvesti"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:163
 #, fuzzy
 msgid "_Enable"
 msgstr "Vključi"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:165
 #, fuzzy
 msgid "_Forward style:"
 msgstr "Posreduj naprej kot"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Load images if sender is in address book"
 msgstr "_Naloži slike, če je pošiljatelj v adresarju"
 
-#: mail/mail-config.glade.h:167
-msgid "_Local Tests Only"
-msgstr ""
-
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 #, fuzzy
 msgid "_Make this my default account"
 msgstr "Naj bo to moj p_rivzet račun"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Mark messages as read after"
 msgstr "_Označi sporočila kot prebrana po:"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Never load images from the Internet"
 msgstr "_Nikoli ne naloži slik s spleta"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 #, fuzzy
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 "Zahtevaj potrditev ob pošiljanju v obliki HTML tistim stikom, ki tega nočejo"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:175
 #, fuzzy
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Zahtevaj potrditev ob pošiljanju sporočil bre_z predmeta"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:176
 #, fuzzy
 msgid "_Reply style:"
 msgstr "Odgovori vsem"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:177
 #, fuzzy
 msgid "_Script:"
 msgstr "_Skripta"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:178
 #, fuzzy
 msgid "_Show animated images"
 msgstr "Kaži čas kot"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "_Use Secure Connection (SSL):"
 msgstr "Uporabi _varno povezavo (SSL)"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:181
 #, fuzzy
 msgid "color"
 msgstr " barvo"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "opis"
 
@@ -16013,7 +15507,7 @@ msgstr ""
 
 #. mail:camel-exception primary
 #: mail/mail-errors.xml.h:57
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgid "Your message with the subject \"{0}\" was not delivered."
 msgstr ""
 
 #. mail:camel-exception secondary
@@ -16079,11 +15573,6 @@ msgstr ""
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Nisem mogel ustvariti imenika %s: %s"
 
-#. mail:no-save-path secondary
-#: mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail:no-create-path primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
@@ -16108,12 +15597,6 @@ msgstr ""
 msgid "Cannot create temporary save directory."
 msgstr "Nisem mogel ustvariti začasnega imenika: %s"
 
-#. mail:no-create-tmp-path secondary
-#: mail/mail-errors.xml.h:100 mail/mail-errors.xml.h:112
-#: widgets/misc/e-system-errors.xml.h:11 widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail:no-write-path-exists secondary
 #: mail/mail-errors.xml.h:104
 #, fuzzy
@@ -16394,144 +15877,140 @@ msgstr "Prepiši datoteko?"
 msgid "_Append"
 msgstr "Pošlji"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:785
 #, fuzzy, c-format
 msgid "Pinging %s"
 msgstr "Pregledujem %s"
 
-#: mail/mail-mt.c:897
-msgid "Working"
-msgstr "Delam"
-
-#: mail/mail-ops.c:99
+#: mail/mail-ops.c:98
 msgid "Filtering Folder"
 msgstr "Mapa filtrov"
 
-#: mail/mail-ops.c:260
+#: mail/mail-ops.c:259
 msgid "Fetching Mail"
 msgstr "Sprejemanje pošte"
 
-#: mail/mail-ops.c:543
+#: mail/mail-ops.c:542
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Nisem uspel shraniti pošte v začasno datoteko %s: %s"
 
-#: mail/mail-ops.c:568
+#: mail/mail-ops.c:567
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:577
+#: mail/mail-ops.c:576
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Nisem uspel shraniti pošte v začasno datoteko %s: %s"
 
-#: mail/mail-ops.c:673
+#: mail/mail-ops.c:672
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Pošiljam sporočilo %d od %d"
 
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:703
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Nisem uspel dešifrirati sporočila"
 
-#: mail/mail-ops.c:708
+#: mail/mail-ops.c:707
 msgid "Complete."
 msgstr "Končano."
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:804
 msgid "Saving message to folder"
 msgstr "Shranjujem sporočilo v mapo"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Prestavljam sporočila v %s"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopiram sporočila v %s"
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:1002
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Pregledujem mape v \"%s\""
 
-#: mail/mail-ops.c:1116
+#: mail/mail-ops.c:1115
 msgid "Forwarded messages"
 msgstr "Posredovana sporočila"
 
-#: mail/mail-ops.c:1159
+#: mail/mail-ops.c:1158
 #, c-format
 msgid "Opening folder %s"
 msgstr "Odpiram mapo %s"
 
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1230
 #, c-format
 msgid "Opening store %s"
 msgstr "Odpiram shrambo %s"
 
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1308
 #, c-format
 msgid "Removing folder %s"
 msgstr "Odstranjujem mapo %s"
 
-#: mail/mail-ops.c:1403
+#: mail/mail-ops.c:1402
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Odstranjujem mapo %s"
 
-#: mail/mail-ops.c:1468
+#: mail/mail-ops.c:1467
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1469
+#: mail/mail-ops.c:1468
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Odstranjujem mapo %s"
 
-#: mail/mail-ops.c:1524
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr "Osvežujem mapo"
 
-#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
+#: mail/mail-ops.c:1559 mail/mail-ops.c:1610
 msgid "Expunging folder"
 msgstr "Uničujem mapo"
 
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1607
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Uvažam %s kot %s"
 
-#: mail/mail-ops.c:1609
+#: mail/mail-ops.c:1608
 msgid "Local Folders"
 msgstr "Krajevne mape"
 
-#: mail/mail-ops.c:1692
+#: mail/mail-ops.c:1691
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Prenašam sporočilo %s"
 
-#: mail/mail-ops.c:1764
+#: mail/mail-ops.c:1763
 #, fuzzy, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Prenašam %d sporočil"
 msgstr[1] "Prenašam %d sporočil"
 
-#: mail/mail-ops.c:1850
+#: mail/mail-ops.c:1849
 #, fuzzy, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Shranjujem %d sporočil"
 msgstr[1] "Shranjujem %d sporočil"
 
-#: mail/mail-ops.c:1900
+#: mail/mail-ops.c:1899
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -16540,7 +16019,7 @@ msgstr ""
 "Nisem mogel ustvariti izhodne datoteke: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1928
+#: mail/mail-ops.c:1927
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -16549,11 +16028,11 @@ msgstr ""
 "Napaka ob shranjevanju sporočil v: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1999
+#: mail/mail-ops.c:1998
 msgid "Saving attachment"
 msgstr "Shranjujem prilogo"
 
-#: mail/mail-ops.c:2016
+#: mail/mail-ops.c:2015
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -16562,17 +16041,17 @@ msgstr ""
 "Nisem mogel ustvariti izhodne datoteke: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2046
+#: mail/mail-ops.c:2045
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nisem model pisati podatkov: %s"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Odklapljam se od %s"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Znova se povezujem z %s"
@@ -16638,24 +16117,24 @@ msgstr "Posodabljam..."
 msgid "Waiting..."
 msgstr "Čakam..."
 
-#: mail/mail-session.c:238
+#: mail/mail-session.c:239
 msgid "User canceled operation."
 msgstr "Uporabnik je dejanje preklical."
 
-#: mail/mail-session.c:271
+#: mail/mail-session.c:272
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Vpišite geslo za %s"
 
-#: mail/mail-session.c:273
+#: mail/mail-session.c:274
 msgid "Enter Password"
 msgstr "Vpišite geslo"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password"
 msgstr "_Zapomni si to geslo"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:298
 #, fuzzy
 msgid "_Remember this password for the remainder of this session"
 msgstr "Pomni geslo do konca seje"
@@ -16715,79 +16194,79 @@ msgstr "Posodabljam vmape za uri: %s"
 msgid "Updating vFolders for '%s'"
 msgstr "Posodabljam vmape za uri: %s"
 
-#: mail/mail-vfolder.c:959
+#: mail/mail-vfolder.c:958
 msgid "vFolders"
 msgstr "vMape"
 
-#: mail/mail-vfolder.c:998
+#: mail/mail-vfolder.c:997
 msgid "Edit VFolder"
 msgstr "Uredi VMapo"
 
-#: mail/mail-vfolder.c:1082
+#: mail/mail-vfolder.c:1081
 msgid "New VFolder"
 msgstr "Nova vMapa"
 
-#: mail/message-list.c:946
+#: mail/message-list.c:948
 msgid "Unseen"
 msgstr "Nevideno"
 
-#: mail/message-list.c:947
+#: mail/message-list.c:949
 msgid "Seen"
 msgstr "Videno"
 
-#: mail/message-list.c:948
+#: mail/message-list.c:950
 msgid "Answered"
 msgstr "Odgovorjeno"
 
-#: mail/message-list.c:949
+#: mail/message-list.c:951
 msgid "Multiple Unseen Messages"
 msgstr "več nevidenih sporočil"
 
-#: mail/message-list.c:950
+#: mail/message-list.c:952
 msgid "Multiple Messages"
 msgstr "Več sporočil"
 
-#: mail/message-list.c:954
+#: mail/message-list.c:956
 msgid "Lowest"
 msgstr "najnižja"
 
-#: mail/message-list.c:955
+#: mail/message-list.c:957
 msgid "Lower"
 msgstr "nizka"
 
-#: mail/message-list.c:959
+#: mail/message-list.c:961
 msgid "Higher"
 msgstr "visoka"
 
-#: mail/message-list.c:960
+#: mail/message-list.c:962
 msgid "Highest"
 msgstr "najvišja"
 
-#: mail/message-list.c:1279
+#: mail/message-list.c:1285
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1286
+#: mail/message-list.c:1292
 msgid "Today %l:%M %p"
 msgstr "Danes %l:%M %p"
 
-#: mail/message-list.c:1295
+#: mail/message-list.c:1301
 msgid "Yesterday %l:%M %p"
 msgstr "Včeraj %l:%M %p"
 
-#: mail/message-list.c:1307
+#: mail/message-list.c:1313
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1315
+#: mail/message-list.c:1321
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: mail/message-list.c:1317
+#: mail/message-list.c:1323
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:3300
+#: mail/message-list.c:3321
 msgid "Generating message list"
 msgstr "Ustvarjam seznam sporočil"
 
@@ -16848,6 +16327,10 @@ msgstr "Posreduj naprej"
 msgid "No Response Necessary"
 msgstr ""
 
+#: mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Beri"
+
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Odgovori"
@@ -16957,45 +16440,49 @@ msgid ""
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:10
-msgid "Whether Evolution should start up in offline mode"
+msgid "Toolbar is visible"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:11
-msgid "Whether to skip the development warning dialog"
+msgid "Whether Evolution should start up in offline mode"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Whether the toolbar should be visible."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:14
 #, fuzzy
 msgid "mail"
 msgstr "E-pošta"
 
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
-msgstr "K vam prinešeno od"
-
-#: shell/e-shell.c:545 shell/e-shell.c:546
+#: shell/e-shell.c:588 shell/e-shell.c:589
 #, fuzzy, c-format
 msgid "%ld KB"
 msgstr "%d %B"
 
-#: shell/e-shell.c:744
+#: shell/e-shell.c:786
 #, fuzzy
 msgid "Uknown system error."
 msgstr "Neznana napaka"
 
-#: shell/e-shell.c:1101
+#: shell/e-shell.c:1143
 msgid "Invalid arguments"
 msgstr "Neveljavni argumenti"
 
-#: shell/e-shell.c:1103
+#: shell/e-shell.c:1145
 msgid "Cannot register on OAF"
 msgstr "Ne morem se registrirati pri OAF"
 
-#: shell/e-shell.c:1105
+#: shell/e-shell.c:1147
 msgid "Configuration Database not found"
 msgstr "Podatkovna zbirka nastavitev ni bila najdena"
 
-#: shell/e-shell.c:1107
+#: shell/e-shell.c:1149
 msgid "Generic error"
 msgstr "Generična napaka"
 
@@ -17052,7 +16539,7 @@ msgstr ""
 msgid "Select importer"
 msgstr "Izberi mapo"
 
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1026
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
 #, c-format
 msgid "File %s does not exist"
 msgstr "Mapa %s ne obstaja"
@@ -17080,35 +16567,35 @@ msgstr ""
 "Uvažam %s\n"
 "Uvažam predmet 1."
 
-#: shell/e-shell-importer.c:549
+#: shell/e-shell-importer.c:570
 msgid "Automatic"
 msgstr "Samodejno"
 
-#: shell/e-shell-importer.c:598
+#: shell/e-shell-importer.c:626
 #, fuzzy
-msgid "_Filename:"
-msgstr "_Ime datoteke:"
+msgid "F_ilename:"
+msgstr "Ime datoteke:"
 
-#: shell/e-shell-importer.c:603
+#: shell/e-shell-importer.c:631
 msgid "Select a file"
 msgstr "Izberi datoteko"
 
-#: shell/e-shell-importer.c:613
+#: shell/e-shell-importer.c:642
 #, fuzzy
 msgid "File _type:"
 msgstr "Vrsta datoteke:"
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:681
 #, fuzzy
 msgid "Import data and settings from _older programs"
 msgstr "Uvozi podatke in nastavitve iz starejših programov"
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:684
 #, fuzzy
 msgid "Import a _single file"
 msgstr "Uvozi eno samo datoteko"
 
-#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -17116,26 +16603,26 @@ msgstr ""
 "Prosim počakajte...\n"
 "Iščem že obstoječe namestitve"
 
-#: shell/e-shell-importer.c:727
+#: shell/e-shell-importer.c:756
 msgid "Starting Intelligent Importers"
 msgstr "Poganjam pametne uvoznike"
 
-#: shell/e-shell-importer.c:853 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
 #, c-format
 msgid "From %s:"
 msgstr "Od: %s:"
 
-#: shell/e-shell-importer.c:1044
+#: shell/e-shell-importer.c:1073
 #, fuzzy, c-format
 msgid "No importer available for file %s"
 msgstr "Noben nuditelj za protokol '%s' ni dostopen"
 
-#: shell/e-shell-importer.c:1056
+#: shell/e-shell-importer.c:1085
 #, fuzzy
 msgid "Unable to execute importer"
 msgstr "Nisem uspel dešifrirati sporočila"
 
-#: shell/e-shell-importer.c:1169
+#: shell/e-shell-importer.c:1199
 #, fuzzy
 msgid "_Import"
 msgstr "Uvozi"
@@ -17184,61 +16671,61 @@ msgstr "Ime mape ne more vsebovati znaka return"
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' in '..' sta rezervirana za imena map."
 
-#: shell/e-shell-window.c:336
+#: shell/e-shell-window.c:337
 #, fuzzy
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolucija je trenutno na mreži.  Kliknite na ta gumb za delo brez "
 "mreže."
 
-#: shell/e-shell-window.c:343
+#: shell/e-shell-window.c:344
 #, fuzzy
 msgid "Evolution is in the process of going offline."
 msgstr "Ximian Evolucija je v procesu odklapljanja od mreže."
 
-#: shell/e-shell-window.c:349
+#: shell/e-shell-window.c:350
 #, fuzzy
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolucija trenutno ni na mreži.  Kliknite ta gumb za delo z mrežo."
 
-#: shell/e-shell-window.c:621
+#: shell/e-shell-window.c:637
 #, fuzzy, c-format
 msgid "Switch to %s"
 msgstr "Pošta za %s"
 
-#: shell/e-shell-window-commands.c:64
+#: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Orodja GNOME Pilot niso nameščena na vašem sistemu."
 
-#: shell/e-shell-window-commands.c:72
+#: shell/e-shell-window-commands.c:74
 #, c-format
 msgid "Error executing %s."
 msgstr "Napaka ob izvajanju %s."
 
-#: shell/e-shell-window-commands.c:121
+#: shell/e-shell-window-commands.c:123
 #, fuzzy
 msgid "Bug buddy is not installed."
 msgstr "Programa 'Bug buddy' ni bilo mogoče pognati."
 
-#: shell/e-shell-window-commands.c:129
+#: shell/e-shell-window-commands.c:131
 msgid "Bug buddy could not be run."
 msgstr "Programa 'Bug buddy' ni bilo mogoče pognati."
 
-#: shell/e-shell-window-commands.c:171
+#: shell/e-shell-window-commands.c:323
 #, fuzzy
-msgid "About Evolution"
-msgstr "_O Ximian Evoluciji..."
+msgid "Groupware Suite"
+msgstr "Skupina"
 
-#: shell/e-shell-window-commands.c:382
+#: shell/e-shell-window-commands.c:563
 msgid "_Work Online"
 msgstr "Delaj na _mreži"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "Delaj _brez mreže"
 
-#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Delaj brez mreže"
 
@@ -17250,43 +16737,6 @@ msgstr ""
 msgid "New"
 msgstr "Nov"
 
-#: shell/evolution-shell-component-utils.c:115
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Neznana napaka."
-
-#: shell/evolution-shell-component-utils.c:118
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Napaka iz komponentnega sistema je:\n"
-"%s"
-
-#: shell/evolution-shell-component-utils.c:125
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Napaka iz aktivacijskega sistema je:\n"
-"%s"
-
 #: shell/evolution-test-component.c:140
 #, fuzzy
 msgid "New Test"
@@ -17634,34 +17084,34 @@ msgid ""
 "Click help for details."
 msgstr ""
 
-#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:522
+#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
+#: smime/gui/certificate-manager.c:556
 #, fuzzy
 msgid "Select a cert to import..."
 msgstr "Izberi mapo"
 
-#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:604
+#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
+#: smime/gui/certificate-manager.c:638
 #, fuzzy
 msgid "Certificate Name"
 msgstr "ID _certifikata:"
 
-#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
+#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
 #, fuzzy
 msgid "Purposes"
 msgstr "Napredek"
 
-#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:517
+#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:267
+#: smime/gui/certificate-manager.c:271
 #, fuzzy
 msgid "Expires"
 msgstr "Izraz"
 
-#: smime/gui/certificate-manager.c:417
+#: smime/gui/certificate-manager.c:446
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "E-poštni naslov:"
@@ -17706,6 +17156,11 @@ msgstr ""
 "Proizvedel: %s\n"
 "Zadeva: %s"
 
+#: smime/gui/e-cert-selector.c:169
+#, fuzzy
+msgid "Select certificate"
+msgstr "Pojdi na določen datum"
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -17764,7 +17219,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
 #, fuzzy
 msgid "Certificate"
 msgstr "ID _certifikata:"
@@ -17789,19 +17244,23 @@ msgstr "Splošno ime"
 msgid "Contact Certificates"
 msgstr "ID _certifikata:"
 
-#: smime/gui/smime-ui.glade.h:21
-#, no-c-format
-msgid "Do you want to trust \"%s\" for the following purposes?"
+#: smime/gui/smime-ui.glade.h:20
+msgid "Do not trust the authenticity of this certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:21
 msgid "Dummy window only"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:22
 msgid "Edit"
 msgstr "Uredi"
 
+#: smime/gui/smime-ui.glade.h:23
+#, fuzzy
+msgid "Email Certificate Trust Settings"
+msgstr "Nisem mogel preveriti certifikatov."
+
 #: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr ""
@@ -17838,281 +17297,292 @@ msgstr "Organizacija"
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:37
-msgid "Trust this CA to identify email users."
+msgid "Trust the authenticity of this certificate"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:38
-msgid "Trust this CA to identify software developers."
+msgid "Trust this CA to identify email users."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:39
-msgid "Trust this CA to identify web sites."
+msgid "Trust this CA to identify software developers."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:40
-#, fuzzy
-msgid "View"
-msgstr "Po_gled"
+msgid "Trust this CA to identify web sites."
+msgstr ""
 
 #: smime/gui/smime-ui.glade.h:41
 #, fuzzy
-msgid "View Certificate"
-msgstr "ID _certifikata:"
+msgid "View"
+msgstr "Po_gled"
 
 #: smime/gui/smime-ui.glade.h:42
-msgid "You have been asked to trust a new Certificate Authority (CA)."
-msgstr ""
-
-#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:44
+#: smime/gui/smime-ui.glade.h:43
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:45
+#: smime/gui/smime-ui.glade.h:44
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:46
+#: smime/gui/smime-ui.glade.h:45
 #, fuzzy
 msgid "Your Certificates"
 msgstr "ID _certifikata:"
 
-#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
+#: smime/gui/smime-ui.glade.h:46
+#, fuzzy
+msgid "_Edit CA Trust"
+msgstr "Uredi nalogo"
+
+#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
-#: smime/lib/e-cert.c:478
+#. x509 certificate usage types
+#: smime/lib/e-cert.c:424
+#, fuzzy
+msgid "Sign"
+msgstr "podpis"
+
+#: smime/lib/e-cert.c:425
+#, fuzzy
+msgid "Encrypt"
+msgstr "šifriranje"
+
+#: smime/lib/e-cert.c:530
 #, fuzzy
 msgid "Version"
 msgstr "Vermont"
 
-#: smime/lib/e-cert.c:493
+#: smime/lib/e-cert.c:545
 #, fuzzy
 msgid "Version 1"
 msgstr "Vermont"
 
-#: smime/lib/e-cert.c:496
+#: smime/lib/e-cert.c:548
 #, fuzzy
 msgid "Version 2"
 msgstr "Vermont"
 
-#: smime/lib/e-cert.c:499
+#: smime/lib/e-cert.c:551
 #, fuzzy
 msgid "Version 3"
 msgstr "Vermont"
 
-#: smime/lib/e-cert.c:581
+#: smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:584
+#: smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:587
+#: smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:590
+#: smime/lib/e-cert.c:642
 #, fuzzy
 msgid "C"
 msgstr " C"
 
-#: smime/lib/e-cert.c:593
+#: smime/lib/e-cert.c:645
 #, fuzzy
 msgid "CN"
 msgstr "N"
 
-#: smime/lib/e-cert.c:596
+#: smime/lib/e-cert.c:648
 msgid "OU"
 msgstr ""
 
-#: smime/lib/e-cert.c:599
+#: smime/lib/e-cert.c:651
 #, fuzzy
 msgid "O"
 msgstr "V redu"
 
-#: smime/lib/e-cert.c:602
+#: smime/lib/e-cert.c:654
 msgid "L"
 msgstr ""
 
-#: smime/lib/e-cert.c:605
+#: smime/lib/e-cert.c:657
 #, fuzzy
 msgid "DN"
 msgstr "N"
 
-#: smime/lib/e-cert.c:608
+#: smime/lib/e-cert.c:660
 msgid "DC"
 msgstr ""
 
-#: smime/lib/e-cert.c:611
+#: smime/lib/e-cert.c:663
 #, fuzzy
 msgid "ST"
 msgstr "SMTP"
 
-#: smime/lib/e-cert.c:614
+#: smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:617
+#: smime/lib/e-cert.c:669
 #, fuzzy
 msgid "Certificate Key Usage"
 msgstr "ID _certifikata:"
 
-#: smime/lib/e-cert.c:620
+#: smime/lib/e-cert.c:672
 #, fuzzy
 msgid "Netscape Certificate Type"
 msgstr "ID _certifikata:"
 
-#: smime/lib/e-cert.c:623
+#: smime/lib/e-cert.c:675
 #, fuzzy
 msgid "Certificate Authority Key Identifier"
 msgstr "ID _certifikata:"
 
-#: smime/lib/e-cert.c:626
+#: smime/lib/e-cert.c:678
 #, fuzzy
 msgid "UID"
 msgstr "I"
 
-#: smime/lib/e-cert.c:635
+#: smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr ""
 
-#: smime/lib/e-cert.c:686
+#: smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:694
+#: smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
 msgstr ""
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:768
 #, fuzzy
 msgid "Subject Public Key Info"
 msgstr ""
 "\n"
 "Javni ključ: "
 
-#: smime/lib/e-cert.c:721
+#: smime/lib/e-cert.c:773
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:736
+#: smime/lib/e-cert.c:788
 #, fuzzy
 msgid "Subject's Public Key"
 msgstr "Zadeva je %s"
 
-#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
+#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
 #, fuzzy
 msgid "Error: Unable to process extension"
 msgstr "Nisem mogel obdelati mape vrste 'spool'"
 
-#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
+#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
 #, fuzzy
 msgid "Object Signer"
 msgstr "_Predmet"
 
-#: smime/lib/e-cert.c:782
+#: smime/lib/e-cert.c:834
 #, fuzzy
 msgid "SSL Certificate Authority"
 msgstr "ID _certifikata:"
 
-#: smime/lib/e-cert.c:786
+#: smime/lib/e-cert.c:838
 #, fuzzy
 msgid "Email Certificate Authority"
 msgstr "Nisem mogel preveriti certifikatov."
 
-#: smime/lib/e-cert.c:814
+#: smime/lib/e-cert.c:866
 #, fuzzy
 msgid "Signing"
 msgstr "dohodna"
 
-#: smime/lib/e-cert.c:818
+#: smime/lib/e-cert.c:870
 #, fuzzy
 msgid "Non-repudiation"
 msgstr "Ni podatkov"
 
-#: smime/lib/e-cert.c:822
+#: smime/lib/e-cert.c:874
 msgid "Key Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:826
+#: smime/lib/e-cert.c:878
 #, fuzzy
 msgid "Data Encipherment"
 msgstr "priloga"
 
-#: smime/lib/e-cert.c:830
+#: smime/lib/e-cert.c:882
 msgid "Key Agreement"
 msgstr ""
 
-#: smime/lib/e-cert.c:834
+#: smime/lib/e-cert.c:886
 #, fuzzy
 msgid "Certificate Signer"
 msgstr "ID _certifikata:"
 
-#: smime/lib/e-cert.c:838
+#: smime/lib/e-cert.c:890
 msgid "CRL Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:938
 #, fuzzy
 msgid "Critical"
 msgstr "Hrvaška"
 
-#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
+#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
 msgid "Not Critical"
 msgstr ""
 
-#: smime/lib/e-cert.c:912
+#: smime/lib/e-cert.c:964
 #, fuzzy
 msgid "Extensions"
 msgstr "Izraz"
 
-#: smime/lib/e-cert.c:983
+#: smime/lib/e-cert.c:1035
 #, fuzzy, c-format
 msgid "%s = %s"
 msgstr "%s ob %s"
 
-#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
 #, fuzzy
 msgid "Certificate Signature Algorithm"
 msgstr "Nisem mogel shraniti datoteke s podpisom."
 
-#: smime/lib/e-cert.c:1048
+#: smime/lib/e-cert.c:1100
 #, fuzzy
 msgid "Issuer"
 msgstr "_Vstavi"
 
-#: smime/lib/e-cert.c:1102
+#: smime/lib/e-cert.c:1154
 msgid "Issuer Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1121
+#: smime/lib/e-cert.c:1173
 #, fuzzy
 msgid "Subject Unique ID"
 msgstr "Zadeva je %s"
 
-#: smime/lib/e-cert.c:1164
+#: smime/lib/e-cert.c:1216
 #, fuzzy
 msgid "Certificate Signature Value"
 msgstr "Nisem mogel shraniti datoteke s podpisom."
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
+#: smime/lib/e-cert-db.c:608
 #, fuzzy
 msgid "Certificate already exists"
 msgstr "ID vizitke že obstaja"
@@ -18265,7 +17735,7 @@ msgstr "Poglej trenutni stik"
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "_Dejanja"
 
@@ -18437,7 +17907,7 @@ msgstr "_Zapri"
 #: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:3
+#: ui/evolution.xml.h:4
 msgid "Close"
 msgstr "Zapri"
 
@@ -18450,7 +17920,7 @@ msgid "Delete this item"
 msgstr "Zbriši ta predmet"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr "Glavna orodjarna"
 
@@ -18494,7 +17964,7 @@ msgstr "Shrani ta predmet na disk"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:44
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "_File"
 msgstr "_Datoteka"
 
@@ -18765,13 +18235,13 @@ msgstr "_Obrni izbor"
 msgid "_Threaded Message List"
 msgstr "_Niten seznam sporočil"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Zapri to okno"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "_Close"
 msgstr "_Zapri"
 
@@ -19182,7 +18652,7 @@ msgstr "_Prejšnje sporočilo"
 msgid "_Quoted"
 msgstr "_Citirano"
 
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
 msgid "_Tools"
 msgstr "_Orodja"
 
@@ -19489,113 +18959,127 @@ msgid "_Open Task"
 msgstr "_Naloga"
 
 #: ui/evolution.xml.h:1
-msgid "About Ximian Evolution..."
-msgstr "O Ximian Evoluciji..."
+#, fuzzy
+msgid "About Evolution..."
+msgstr "_O Ximian Evoluciji..."
 
 #: ui/evolution.xml.h:2
 #, fuzzy
 msgid "Change Evolution's settings"
 msgstr "Evolucijina lupina."
 
-#: ui/evolution.xml.h:5
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the visibility of the toolbar"
+msgstr "Spremeni lastnosti te mape"
+
+#: ui/evolution.xml.h:6
 #, fuzzy
 msgid "Create a new window displaying this folder"
 msgstr "Ustvari novo mapo"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "Iz_hod"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "_Pogosto zastavljena vprašanja"
+
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Izhod iz programa"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:10
 msgid "Forget _Passwords"
 msgstr "Pozabi _gesla"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:11
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Pozabi pomnjena gesla tako, da boste zanje znova vprašani"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:12
 msgid "Import data from other programs"
 msgstr "Uvozi podatke iz drugih programov"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:14
 #, fuzzy
 msgid "New _Window"
 msgstr "_Išči sedaj"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 #, fuzzy
 msgid "Pi_lot Settings..."
 msgstr "_Nastavitve pilota..."
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Send / Receive"
 msgstr "Oddaja / sprejem"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Pošlji pošto v vrsti in sprejmi novo pošto"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 #, fuzzy
 msgid "Set up Pilot configuration"
 msgstr "Nastavitev pošte"
 
-#: ui/evolution.xml.h:17
-msgid "Show information about Ximian Evolution"
+#: ui/evolution.xml.h:19
+#, fuzzy
+msgid "Show information about Evolution"
 msgstr "Kaži podatke o Ximian Evoluciji"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:20
 msgid "Submit Bug Report"
 msgstr "Pošlji poročilo o hrošču"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:21
 msgid "Submit _Bug Report"
 msgstr "_Pošlji poročilo o hrošču"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Pošlji poročilo o hrošču z uporabo progama Bug buddy"
 
-#: ui/evolution.xml.h:21
-msgid "Toggle whether we are working offline."
-msgstr "Preklopi delo z mrežo"
-
 #: ui/evolution.xml.h:23
-msgid "Ximian Evolution _FAQ"
-msgstr "_Pogosto zastavljena vprašanja"
+#, fuzzy
+msgid "T_oolbar"
+msgstr "_Orodjarne"
 
 #: ui/evolution.xml.h:24
-msgid "_About Ximian Evolution..."
+msgid "Toggle whether we are working offline."
+msgstr "Preklopi delo z mrežo"
+
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "_About Evolution..."
 msgstr "_O Ximian Evoluciji..."
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "_Help"
 msgstr "_Pomoč"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "_Import..."
 msgstr "_Uvozi..."
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "_New"
 msgstr "_Nova"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 #, fuzzy
 msgid "_Quick Reference"
 msgstr "Hitro iskanje"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_Send / Receive"
 msgstr "_Oddaja / sprejem"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 #, fuzzy
 msgid "_Window"
 msgstr "_Išči sedaj"
@@ -19681,7 +19165,7 @@ msgid "With _Status"
 msgstr "Nastavi stanje"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:626
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:635
 msgid "UTC"
 msgstr "UTC"
 
@@ -19841,29 +19325,29 @@ msgstr "Drugo..."
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
-#: widgets/misc/e-error.c:121
+#: widgets/misc/e-error.c:79 widgets/misc/e-error.c:80
+#: widgets/misc/e-error.c:122
 msgid "Evolution Error"
 msgstr "Napaka Evolucije"
 
-#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
-#: widgets/misc/e-error.c:119
+#: widgets/misc/e-error.c:81 widgets/misc/e-error.c:82
+#: widgets/misc/e-error.c:120
 #, fuzzy
 msgid "Evolution Warning"
 msgstr "Evolucija "
 
-#: widgets/misc/e-error.c:118
+#: widgets/misc/e-error.c:119
 #, fuzzy
 msgid "Evolution Information"
 msgstr "Podatki o sestanku"
 
-#: widgets/misc/e-error.c:120
+#: widgets/misc/e-error.c:121
 #, fuzzy
 msgid "Evolution Query"
 msgstr "Alarm Evolucije"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:410
+#: widgets/misc/e-error.c:415
 #, fuzzy, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -20020,17 +19504,497 @@ msgstr ""
 "Nisem mogel odpreti URIja `%s':\n"
 "%s"
 
-#: widgets/misc/e-task-widget.c:211
+#: widgets/misc/e-task-widget.c:212
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: widgets/misc/e-task-widget.c:216
+#: widgets/misc/e-task-widget.c:217
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% končano)"
 
 #, fuzzy
+#~ msgid "Failed to connect to LDAP server"
+#~ msgstr "Nisem se mogel povezati s strežnikom LDAP."
+
+#, fuzzy
+#~ msgid "Failed to authenticate with LDAP server"
+#~ msgstr ""
+#~ "Strežniku IMAP se nisem mogel avtentificirati.\n"
+#~ "%s\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid "Could not perform query on Root DSE"
+#~ msgstr "Nisem mogel razčleniti niza poizvedbe"
+
+#, fuzzy
+#~ msgid "Error retrieving schema information"
+#~ msgstr ""
+#~ "Napaka ob nalaganju podatkov o filtrih:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Server did not respond with valid schema information"
+#~ msgstr "Odgovor strežnika IMAP ni vseboval podatkov %s"
+
+#, fuzzy
+#~ msgid "  S_how Supported Bases "
+#~ msgstr "_Preveri za podprte vrste  "
+
+#, fuzzy
+#~ msgid "1:00"
+#~ msgstr "100"
+
+#, fuzzy
+#~ msgid "Connecting"
+#~ msgstr "Connecticut"
+
+#, fuzzy
+#~ msgid "Distinguished _name:"
+#~ msgstr "_Razločno ime:"
+
+#, fuzzy
+#~ msgid "Email address:"
+#~ msgstr "_E-poštni naslov:"
+
+#, fuzzy
+#~ msgid "Evolution will use this DN to authenticate you with the server"
+#~ msgstr ""
+#~ "Evolucija bo uporabila ta e-poštni naslov, za vašo avtentifikacijo pri "
+#~ "strežniku"
+
+#~ msgid "One"
+#~ msgstr "Ena"
+
+#, fuzzy
+#~ msgid "S_earch scope: "
+#~ msgstr "_Doseg iskanja:"
+
+#~ msgid "Searching"
+#~ msgstr "Iskanje"
+
+#~ msgid "Sub"
+#~ msgstr "Pod"
+
+#, fuzzy
+#~ msgid "_Display name:"
+#~ msgstr "_Prikaz"
+
+#, fuzzy
+#~ msgid "_Port number:"
+#~ msgstr "Številka vrat:"
+
+#, fuzzy
+#~ msgid "_Search base:"
+#~ msgstr "Iskanje v _zbirki:"
+
+#~ msgid "_Server name:"
+#~ msgstr "Ime _strežnika:"
+
+#, fuzzy
+#~ msgid "_Timeout (minutes):"
+#~ msgstr "Čas podaljška spanja (minut)"
+
+#, fuzzy
+#~ msgid "connecting-tab"
+#~ msgstr "Znova se povezujem z %s"
+
+#, fuzzy
+#~ msgid "general-tab"
+#~ msgstr "Splošno"
+
+#, fuzzy
+#~ msgid "searching-tab"
+#~ msgstr "Iskanje"
+
+#, fuzzy
+#~ msgid "Job title:"
+#~ msgstr "Službeni _naziv:"
+
+#, fuzzy
+#~ msgid "Webcam:"
+#~ msgstr "Stran"
+
+#~ msgid "Category editor not available."
+#~ msgstr "Urejevalnik kategorij ni na voljo."
+
+#, fuzzy
+#~ msgid ""
+#~ "The following entries are invalid:\n"
+#~ "\n"
+#~ msgstr "Sledeče povezave so trenutno aktivne:"
+
+#~ msgid "Could not find widget for a field: `%s'"
+#~ msgstr "Nisem mogel najti gradnika za polje `%s'"
+
+#~ msgid "Do you want to save changes?"
+#~ msgstr "Želite shraniti spremembe"
+
+#, fuzzy
+#~ msgid "Error saving %s: %s"
+#~ msgstr "Napaka ob shranjevanju datoteke: %s"
+
+#, fuzzy
+#~ msgid "Can not load URI"
+#~ msgstr "Vizitka ni bila najdena"
+
+#, fuzzy
+#~ msgid "Calendar Properties"
+#~ msgstr "Napaka iKoledarja"
+
+#, fuzzy
+#~ msgid "Remote"
+#~ msgstr "Odstrani"
+
+#, fuzzy
+#~ msgid "Task List Properties"
+#~ msgstr "Lastnosti seznama opravil"
+
+#, fuzzy
+#~ msgid "_Refresh Interval:"
+#~ msgstr " _Osveži seznam"
+
+#, fuzzy
+#~ msgid "_Source URL:"
+#~ msgstr "URI vira POP"
+
+#~ msgid "Are you sure you want to cancel and delete this meeting?"
+#~ msgstr "Ste prepričani, da želite preklicati in zbrisati ta sestanek?"
+
+#~ msgid "Are you sure you want to cancel and delete this task?"
+#~ msgstr "Ste prepričani, da želite preklicati in zbrisati to opravilo?"
+
+#~ msgid "Are you sure you want to cancel and delete this journal entry?"
+#~ msgstr "Ste prepričani, da želite preklicati in zbrisati ta dnevniški vpis?"
+
+#~ msgid "Are you sure you want to delete the appointment `%s'?"
+#~ msgstr "Ste prepričani, da želite zbrisati ta sestanek `%s'?"
+
+#~ msgid "Are you sure you want to delete this untitled appointment?"
+#~ msgstr "Ste prepričani, želite zbrisati ta neimenovan sestanek?"
+
+#~ msgid "Are you sure you want to delete the task `%s'?"
+#~ msgstr "Ste prepričani, da želite zbrisati posel `%s'?"
+
+#~ msgid "Are you sure you want to delete this untitled task?"
+#~ msgstr "Ste prepričani, da želite zbrisati ta neimenovan posel?"
+
+#~ msgid "Are you sure you want to delete the journal entry `%s'?"
+#~ msgstr "Ste prepričani, da želite zbrisati dnevniški vpis `%s'?"
+
+#~ msgid "Are you sure want to delete this untitled journal entry?"
+#~ msgstr "Ste prepričani, da želite zbrisati ta neimenovan dnevniški vpis?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d appointment?"
+#~ msgid_plural "Are you sure you want to delete %d appointments?"
+#~ msgstr[0] "Ste prepričani, da želite zbrisati %d sestankov?"
+#~ msgstr[1] "Ste prepričani, da želite zbrisati %d sestankov?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d task?"
+#~ msgid_plural "Are you sure you want to delete %d tasks?"
+#~ msgstr[0] "Ste prepričani, da želite zbrisati %d opravil?"
+#~ msgstr[1] "Ste prepričani, da želite zbrisati %d opravil?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d journal entry?"
+#~ msgid_plural "Are you sure you want to delete %d journal entries?"
+#~ msgstr[0] "Ste prepričani, da želite zbrisati %d dnevniških vpisov?"
+#~ msgstr[1] "Ste prepričani, da želite zbrisati %d dnevniških vpisov?"
+
+#~ msgid "_Invite Others..."
+#~ msgstr "_Povabi ostale..."
+
+#, fuzzy
+#~ msgid ""
+#~ "This event has been changed, but has not been saved.\n"
+#~ "\n"
+#~ "Do you wish to save your changes?"
+#~ msgstr ""
+#~ "Podpis je bil spremenjen, a ni bil shranjen.\n"
+#~ "\n"
+#~ "Želite shraniti spremembe?"
+
+#, fuzzy
+#~ msgid "_Discard Changes"
+#~ msgstr "Zavrzi to sporočilo"
+
+#, fuzzy
+#~ msgid "Save Event"
+#~ msgstr "Sporočilo koledarja"
+
+#~ msgid "The meeting information has been created. Send it?"
+#~ msgstr "Podatki o sestanku so bili ustvarjeni. Naj jih pošljem?"
+
+#~ msgid "The meeting information has changed. Send an updated version?"
+#~ msgstr ""
+#~ "Podatki o sestanku so se spremenili. Naj pošljem posodobljeno različico?"
+
+#~ msgid "The task assignment information has been created. Send it?"
+#~ msgstr "Podatki o nalogi so bili ustvarjeni. Naj jih pošljem?"
+
+#~ msgid "The task information has changed. Send an updated version?"
+#~ msgstr ""
+#~ "Podatki o nalogi so se spremenili. Naj pošljem posodobljeno različico?"
+
+#, fuzzy
+#~ msgid "Could not get article %s from NNTP server"
+#~ msgstr "Nisem mogel dobiti seznama skupin s strežnika."
+
+#, fuzzy
+#~ msgid "Error posting message: %s: message not posted"
+#~ msgstr ""
+#~ "Napaka ob samodejnem shranjevanju sporočila: %s\n"
+#~ " %s"
+
+#, fuzzy
+#~ msgid "Stream error"
+#~ msgstr "Drugačna napaka"
+
+#, fuzzy
+#~ msgid "Connection error: %s"
+#~ msgstr "Neznana napaka: %s"
+
+#~ msgid "Could not get group: %s"
+#~ msgstr "Nisem mogel dobiti skupine: %s"
+
+#, fuzzy
+#~ msgid "Could not get messages: unspecified error"
+#~ msgstr "Nisem mogel dobiti sporočila: %s"
+
+#~ msgid "Unknown server response: %s"
+#~ msgstr "Neznan odgovor strežnika: %s"
+
+#, fuzzy
+#~ msgid "Adjust Score"
+#~ msgstr "Dodeli točke"
+
+#~ msgid "Assign Color"
+#~ msgstr "Dodeli barvo"
+
+#~ msgid "Assign Score"
+#~ msgstr "Dodeli točke"
+
+#~ msgid "Attachments"
+#~ msgstr "Priloge"
+
+#~ msgid "Beep"
+#~ msgstr "Pisk"
+
+#~ msgid "contains"
+#~ msgstr "vsebuje"
+
+#~ msgid "Copy to Folder"
+#~ msgstr "Kopiraj v mapo"
+
+#~ msgid "Date received"
+#~ msgstr "Sprejeto dne"
+
+#~ msgid "Date sent"
+#~ msgstr "Poslano dne"
+
+#~ msgid "Deleted"
+#~ msgstr "Zbrisano"
+
+#~ msgid "does not contain"
+#~ msgstr "ne vsebuje"
+
+#~ msgid "does not end with"
+#~ msgstr "se ne konča z"
+
+#~ msgid "does not exist"
+#~ msgstr "ne obstaja"
+
+#, fuzzy
+#~ msgid "does not return"
+#~ msgstr "ne obstaja"
+
+#~ msgid "does not sound like"
+#~ msgstr "ne zveni kot"
+
+#~ msgid "does not start with"
+#~ msgstr "se ne začne z"
+
+#~ msgid "Do Not Exist"
+#~ msgstr "ne obstaja"
+
+#~ msgid "Draft"
+#~ msgstr "Osnutek"
+
+#~ msgid "ends with"
+#~ msgstr "se konča z"
+
+#~ msgid "Exist"
+#~ msgstr "obstaja"
+
+#~ msgid "exists"
+#~ msgstr "obstaja"
+
+#~ msgid "Expression"
+#~ msgstr "Izraz"
+
+#~ msgid "Follow Up"
+#~ msgstr "Navezava"
+
+#~ msgid "is"
+#~ msgstr "je"
+
+#~ msgid "is after"
+#~ msgstr "je po"
+
+#~ msgid "is before"
+#~ msgstr "je pred"
+
+#~ msgid "is Flagged"
+#~ msgstr "je označeno"
+
+#~ msgid "is greater than"
+#~ msgstr "je večje"
+
+#~ msgid "is less than"
+#~ msgstr "je manjše"
+
+#~ msgid "is not"
+#~ msgstr "ni"
+
+#~ msgid "is not Flagged"
+#~ msgstr "ni označeno"
+
+#, fuzzy
+#~ msgid "Junk Test"
+#~ msgstr "junij"
+
+#~ msgid "Mailing list"
+#~ msgstr "Dopisni seznam"
+
+#~ msgid "Message Body"
+#~ msgstr "Jedro sporočila"
+
+#~ msgid "Message Header"
+#~ msgstr "Glava sporočila"
+
+#, fuzzy
+#~ msgid "Message is Junk"
+#~ msgstr "Sporočilo je bilo poslano"
+
+#, fuzzy
+#~ msgid "Message is not Junk"
+#~ msgstr "Sporočilo %s ni bilo najdeno."
+
+#~ msgid "Move to Folder"
+#~ msgstr "Prestavi v mapo"
+
+#, fuzzy
+#~ msgid "Pipe to Program"
+#~ msgstr "Izhod iz programa"
+
+#~ msgid "Play Sound"
+#~ msgstr "Predvajaj zvok"
+
+#~ msgid "Recipients"
+#~ msgstr "Prejemnik"
+
+#~ msgid "Regex Match"
+#~ msgstr "Regularni izraz"
+
+#~ msgid "Replied to"
+#~ msgstr "Odgovorjeno na"
+
+#, fuzzy
+#~ msgid "returns greater than"
+#~ msgstr "je večje"
+
+#, fuzzy
+#~ msgid "returns less than"
+#~ msgstr "je manjše"
+
+#, fuzzy
+#~ msgid "Run Program"
+#~ msgstr "Poženi program:"
+
+#~ msgid "Sender"
+#~ msgstr "Pošiljatelj"
+
+#~ msgid "Set Status"
+#~ msgstr "Nastavi stanje"
+
+#~ msgid "Size (kB)"
+#~ msgstr "Velikost (kB)"
+
+#~ msgid "sounds like"
+#~ msgstr "zveni kot"
+
+#~ msgid "Source Account"
+#~ msgstr "Izvorni račun"
+
+#~ msgid "Specific header"
+#~ msgstr "Določena glava"
+
+#~ msgid "starts with"
+#~ msgstr "se začne z"
+
+#~ msgid "Stop Processing"
+#~ msgstr "Prenehaj z obdelavo"
+
+#, fuzzy
+#~ msgid "Unset Status"
+#~ msgstr "Nastavi stanje"
+
+#~ msgid "Working"
+#~ msgstr "Delam"
+
+#~ msgid "Brought to you by"
+#~ msgstr "K vam prinešeno od"
+
+#, fuzzy
+#~ msgid "_Filename:"
+#~ msgstr "_Ime datoteke:"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "Unknown error."
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Neznana napaka."
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the component system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Napaka iz komponentnega sistema je:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the activation system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Napaka iz aktivacijskega sistema je:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "View Certificate"
+#~ msgstr "ID _certifikata:"
+
+#~ msgid "About Ximian Evolution..."
+#~ msgstr "O Ximian Evoluciji..."
+
+#~ msgid "_About Ximian Evolution..."
+#~ msgstr "_O Ximian Evoluciji..."
+
+#, fuzzy
 #~ msgid "Evolution Addressbook folder viewer"
 #~ msgstr "Evolucijin pregledovalnik mini vizitk adresarja"
 
@@ -20270,9 +20234,6 @@ msgstr "%s (%d%% končano)"
 #~ msgid "Primary _email:"
 #~ msgstr "prvi e-naslov"
 
-#~ msgid "S_pouse:"
-#~ msgstr "_Partner(ka):"
-
 #, fuzzy
 #~ msgid "_Business:"
 #~ msgstr "_Službeni"
@@ -20293,9 +20254,6 @@ msgstr "%s (%d%% končano)"
 #~ msgid "_Mobile:"
 #~ msgstr "_Prenosni telefon"
 
-#~ msgid "_Office:"
-#~ msgstr "Pi_sarna:"
-
 #~ msgid "_Public Calendar URL:"
 #~ msgstr "URL _javnega koledarja"
 
@@ -21735,10 +21693,6 @@ msgstr "%s (%d%% končano)"
 #~ msgstr "Predmeta ni bilo mogoče poslati!\n"
 
 #, fuzzy
-#~ msgid "Invalid object"
-#~ msgstr "Neveljaven argument"
-
-#, fuzzy
 #~ msgid "URI not loaded"
 #~ msgstr "EKnjiga ni naložena\n"
 
@@ -24049,9 +24003,6 @@ msgstr "%s (%d%% končano)"
 #~ msgid "_Show full path for folders"
 #~ msgstr "_Kaži celotne poti map"
 
-#~ msgid "Filename:"
-#~ msgstr "Ime datoteke:"
-
 #, fuzzy
 #~ msgid ""
 #~ "Cannot activate component %s :\n"
@@ -26368,9 +26319,6 @@ msgstr "%s (%d%% končano)"
 #~ msgid "Work week"
 #~ msgstr "Delavni teden"
 
-#~ msgid "Edit Task"
-#~ msgstr "Uredi nalogo"
-
 #~ msgid "Edit the task"
 #~ msgstr "Uredi opravilo"
 
@@ -26450,9 +26398,6 @@ msgstr "%s (%d%% končano)"
 #~ msgid "sign and encrypt"
 #~ msgstr "podpis in šifriranje"
 
-#~ msgid "sign"
-#~ msgstr "podpis"
-
 #~ msgid "That file exists but is not readable."
 #~ msgstr "Ta datoteka obstaja a ni berljiva."
 
@@ -27202,9 +27147,6 @@ msgstr "%s (%d%% končano)"
 #~ msgid "_Redo"
 #~ msgstr "Obnovi"
 
-#~ msgid "_Toolbars"
-#~ msgstr "_Orodjarne"
-
 #~ msgid "_Undo"
 #~ msgstr "_Razveljavi"
 
diff --git a/po/sq.po b/po/sq.po
index 4b8aa3b1d0..e40d6f7672 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.HEAD\n"
-"POT-Creation-Date: 2004-05-19 14:00-0400\n"
+"POT-Creation-Date: 2004-06-03 11:14-0400\n"
 "PO-Revision-Date: 2004-01-05 00:46+0100\n"
 "Last-Translator: Laurent Dhima <laurenti@alblinux.net>\n"
 "Language-Team: Albanian <gnome-albanian-perkthyesit@lists.sourceforge.net>\n"
@@ -60,13 +60,13 @@ msgstr "cards"
 msgid "Default Sync Address:"
 msgstr "Adresa sync e prezgjedhur:"
 
-#: addressbook/conduit/address-conduit.c:1150
 #: addressbook/conduit/address-conduit.c:1151
+#: addressbook/conduit/address-conduit.c:1152
 msgid "Could not load addressbook"
 msgstr "I pamundur ngarkimi i librit të adresave"
 
-#: addressbook/conduit/address-conduit.c:1219
-#: addressbook/conduit/address-conduit.c:1222
+#: addressbook/conduit/address-conduit.c:1220
+#: addressbook/conduit/address-conduit.c:1223
 msgid "Could not read pilot's Address application block"
 msgstr "Nuk arrij të lexoj bllokun e adresave të pilot-it"
 
@@ -74,13 +74,13 @@ msgstr "Nuk arrij të lexoj bllokun e adresave të pilot-it"
 msgid "Accessing LDAP Server anonymously"
 msgstr "Hyrje anonime tek server-i LDAP"
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
 msgid "Failed to authenticate.\n"
 msgstr "Autentifikimi dështoi.\n"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sShkruaj password për %s (përdoruesi %s)"
@@ -124,52 +124,24 @@ msgstr "_Kontakt"
 msgid "Create a new contacts group"
 msgstr "Krijo një grup të ri shtigjesh"
 
-#: addressbook/gui/component/addressbook-component.c:182
+#: addressbook/gui/component/addressbook-component.c:184
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:483
-msgid "Failed to connect to LDAP server"
-msgstr "Lidhja me server-in LDAP dështoi"
-
-#: addressbook/gui/component/addressbook-config.c:507
-msgid "Failed to authenticate with LDAP server"
-msgstr "Identifikimi me server-in LDAP dështoi"
-
-#: addressbook/gui/component/addressbook-config.c:535
-msgid "Could not perform query on Root DSE"
-msgstr "E pamundur kryerja e kërkesave tek DSE Root"
-
-#: addressbook/gui/component/addressbook-config.c:840
-msgid "The server responded with no supported search bases"
-msgstr "Server-i u përgjigj me baza kërkesash të pasuportuara"
-
-#: addressbook/gui/component/addressbook-config.c:1245
-msgid "This server does not support LDAPv3 schema information"
-msgstr "Ky server nuk suporton informacionet e skemës LDAPv3"
-
-#: addressbook/gui/component/addressbook-config.c:1266
-msgid "Error retrieving schema information"
-msgstr "Gabim gjatë tërheqjes së informacionit të skemës"
-
-#: addressbook/gui/component/addressbook-config.c:1274
-msgid "Server did not respond with valid schema information"
-msgstr "Server-i nuk përgjigjet me informacion skeme të vlefshëm"
-
 #: addressbook/gui/component/addressbook-migrate.c:68
-#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1160
 #, fuzzy
 msgid "Migrating..."
 msgstr "Duke ngarkuar..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1201
 #, c-format
 msgid "Migrating `%s':"
 msgstr ""
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:438
+#: addressbook/gui/component/addressbook-migrate.c:464
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
 #: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
@@ -177,30 +149,30 @@ msgid "On This Computer"
 msgstr "Në këtë kompjuter"
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:446
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
-#: mail/mail-config.glade.h:106
+#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
+#: mail/mail-config.glade.h:109
 msgid "Personal"
 msgstr "Personale"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:454
+#: addressbook/gui/component/addressbook-migrate.c:480
 msgid "On LDAP Servers"
 msgstr "Në server-ët LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:582
+#: addressbook/gui/component/addressbook-migrate.c:608
 #, fuzzy
 msgid "LDAP Servers"
 msgstr "Në server-ët LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:702
+#: addressbook/gui/component/addressbook-migrate.c:728
 #, fuzzy
 msgid "Autocompletion Settings"
 msgstr "Plotësim automatik"
 
-#: addressbook/gui/component/addressbook-migrate.c:1076
+#: addressbook/gui/component/addressbook-migrate.c:1104
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -208,60 +180,55 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1090
+#: addressbook/gui/component/addressbook-migrate.c:1118
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1099
+#: addressbook/gui/component/addressbook-migrate.c:1127
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1109
+#: addressbook/gui/component/addressbook-migrate.c:1137
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:674
+#: addressbook/gui/component/addressbook-view.c:675
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:761
+#: addressbook/gui/component/addressbook-view.c:754
 #, fuzzy
 msgid "New Address Book"
 msgstr "Rubrikë e re"
 
-#: addressbook/gui/component/addressbook-view.c:762
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
+#: addressbook/gui/component/addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Elemino"
 
-#: addressbook/gui/component/addressbook-view.c:763
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-view.c:756
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Pronësitë..."
 
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/addressbook-view.c:1002
+#. Create the contacts group
+#: addressbook/gui/component/addressbook-view.c:995
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
 #: calendar/gui/migration.c:373
 msgid "Contacts"
 msgstr "Kontakte"
@@ -342,10 +309,6 @@ msgid "Manage your S/MIME certificates here"
 msgstr "Manazho këtu çertifikatat tuaja S/Mime"
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-msgid "  S_how Supported Bases "
-msgstr "  S_hfaq bazat e suportuara "
-
-#: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -360,205 +323,172 @@ msgstr "  S_hfaq bazat e suportuara "
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1:00"
-msgstr "1:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
-msgstr "5:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "Identifikimi"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
 #, fuzzy
 msgid "<b>Display</b>"
 msgstr "<b>Gjendja:</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 #, fuzzy
 msgid "<b>Downloading</b>"
 msgstr "Pozicioni:"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:10
 #, fuzzy
 msgid "<b>Searching</b>"
 msgstr "Duke kërkuar"
 
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
 msgid "<b>Server Information</b>"
 msgstr "Hapi 1: Informacione mbi server-in"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
 msgid "<b>Type:</b>"
 msgstr "<b>Gjendja:</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:13
 #, fuzzy
 msgid "Add Contacts Group"
 msgstr "_Kontakt"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:14
 #, fuzzy
 msgid "Address Book Properties"
 msgstr "Buruesit e Librit të Adresave"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
-#: mail/mail-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
+#: mail/mail-config.glade.h:42
 msgid "Always"
 msgstr "Gjithmonë"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr "Anonimisht"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:17
 #: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Të përgjithshme"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
-msgid "Connecting"
-msgstr "Duke lidhur"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 #: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Hollësi"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
-msgid "Distinguished _name:"
-msgstr "_Emri dallues:"
-
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:19
 #, fuzzy
 msgid "Distinguished name"
 msgstr "_Emri dallues:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:20
 #, fuzzy
 msgid "Download limit:"
 msgstr "Limiti i _download:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Email address"
 msgstr "Adresa Email:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "Email address:"
-msgstr "Adresa Email:"
-
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "Evolution will use this DN to authenticate you with the server"
-msgstr "Evolution do të përdorë këtë DN për t'ju autentifikuar me server-in"
-
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:22
+#, fuzzy
 msgid ""
-"Evolution will use this email address to authenticate you with the server"
+"Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "Evolution do të përdorë këtë adresë email për t'ju autentifikuar me server-in"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:23
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Bazat e suportuara të kërkimit"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:24
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
+#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Të përgjithshme"
 
-#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
-#: mail/mail-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
+#: mail/mail-config.glade.h:102
 msgid "Never"
 msgstr "Asnjëherë"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
-msgid "One"
-msgstr "Një"
-
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:35
-msgid "S_earch scope: "
-msgstr "F_usha e kërkimit: "
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Search _base:"
+msgstr "Baza e _kërkimit:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
 msgid "Search base only"
 msgstr "Baza e _kërkimit:"
 
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:29
 #, fuzzy
 msgid "Search base:"
 msgstr "Baza e _kërkimit:"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Search scope:"
 msgstr "F_usha e kërkimit: "
 
-#: addressbook/gui/component/ldap-config.glade.h:39
-msgid "Searching"
-msgstr "Duke kërkuar"
-
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:31
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
-"server if\n"
-"your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL or TLS."
 msgstr ""
 "Po të zgjidhni këtë opcion do të thotë që Evolution do të lidhet me server-"
 "in tuaj LDAP vetëm\n"
 "nëqoftëse serveri juaj LDAP suporton SSL apo TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a \n"
-"insecure environment. For example, if you and your LDAP server are behind a "
-"firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection "
-"is already\n"
-"secure."
+"you are in a insecure environment. For example, if you and your LDAP server "
+"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
+"because your connection is already secure."
 msgstr ""
 "Po të zgjidhni këtë opcion Evolution do të përpiqet të përdorë SSL/TLS nëse "
 "jeni në një \n"
@@ -568,13 +498,12 @@ msgstr ""
 "është e\n"
 "sigurtë."
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:33
+#, fuzzy
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
-"TLS.  This \n"
-"means that your connection will be insecure, and that you will be vulnerable "
-"to security\n"
-"exploits. "
+"TLS.  This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits. "
 msgstr ""
 "Po të zgjidhni këtë opcion do të thotë që serveri juaj nuk suporton SSL apo "
 "TLS.  Kjo \n"
@@ -582,38 +511,33 @@ msgstr ""
 "jeni i pambrojtur ndaj\n"
 "exploits. "
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Sub"
-msgstr "Sub"
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr "Bazat e suportuara të kërkimit"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
-"searches will \n"
-"begin. If you leave this blank, the search will begin at the root of the "
-"directory tree."
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
 msgstr ""
 "Baza e kërkimit është emri i veçantë (DN)  i zërit ku kërkimet tuaja do "
 "tëfillojnë.\n"
 "Nëse kjo fushë lihet bosh kërkimi do të fillojë nga rrënja e pemës së "
 "directory."
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:37
+#, fuzzy
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
-"the \n"
-"directory tree. A search scope of \"sub\" will include all entries below "
-"your search base.\n"
-"A search scope of \"one\" will only include the entries one level beneath "
-"your base.\n"
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
 msgstr ""
 "Gjerësia e kërkimit përcakton se sa në thellësi dëshironi të zgjerohet "
 "kërkimi gjatë\n"
@@ -621,7 +545,7 @@ msgstr ""
 "nën bazën e kërkimit.\n"
 "Një gjerësi kërkimi \"një\" do të përfshijë vetëm zërat një nivel nën bazë.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:58
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -629,18 +553,17 @@ msgstr ""
 "Ky është emri i plotë i server-it tuaj ldap. Për shembull, \"ldap."
 "shoqëriaime.com\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:39
 #, fuzzy
 msgid ""
-"This is the maximum number of entries to download. Setting this number to "
-"be \n"
+"This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr ""
 "Ky është numri maksimum i zërave për tu shkarkuar. Duke e vendosur këtë "
 "numër \n"
 "tepër të madh do të ngadalsoni në menyrë të ndjeshme rubrikën tuaj."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -650,21 +573,21 @@ msgstr ""
 "për t'a vendosur këtë si \"Adresa Email\" kërkon hyrje anonime tek server-i "
 "juaj ldap."
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:41
+#, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
-"list.\n"
-"It is for display purposes only. "
+"list. It is for display purposes only. "
 msgstr ""
 "Ky emër përdoret për të identifikuar llogarinë tuaj.\n"
 "Shërben vetëm për të shfaqur një emër. "
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:42
+#, fuzzy
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. "
-"A \n"
-"list of standard ports has been provided. Ask your system administrator\n"
-"what port you should specify."
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
 msgstr ""
 "Kjo është porta tek server-i LDAP me të cilën Evolution do të përpiqet të "
 "lidhet. Një \n"
@@ -672,120 +595,99 @@ msgstr ""
 "tuaj të sistemit\n"
 "se çfarë porte duhet të përdorni."
 
-#: addressbook/gui/component/ldap-config.glade.h:67
-msgid "This option controls how long a search will be run."
-msgstr "Ky opcion kontrollon kohëzgjatjen e një kërkimi."
-
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:43
 #, fuzzy
 msgid "Timeout:"
 msgstr "Formati i orës:"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
-msgid "U_se SSL/TLS:"
-msgstr "Pë_rdor SSL/TLS:"
-
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr "Duke përdorur emër të përveçëm (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr "Duke përdorur adresën email"
 
-#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
-#: mail/mail-config.glade.h:154
+#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
+#: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr "Sa herë të jetë e mundur"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:47
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "_Kontakt"
 
-#: addressbook/gui/component/ldap-config.glade.h:74
-#: calendar/gui/dialogs/calendar-setup.glade.h:12
-msgid "_Display name:"
-msgstr "Emri i _dukshëm:"
-
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr "Limiti i _download:"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
 msgid "_Email address:"
 msgstr "Adresa Email:"
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:50
+#, fuzzy
+msgid "_Find Possible Search Bases"
+msgstr "Bazat e suportuara të kërkimit"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Log in method:"
 msgstr "Metoda e _identifikimit:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "_Log in:"
+msgstr "Metoda e _identifikimit:"
+
+#: addressbook/gui/component/ldap-config.glade.h:53
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
 msgid "_Name:"
 msgstr "_Emri:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
-msgid "_Port number:"
-msgstr "Numri i _portës:"
-
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "_Port:"
 msgstr "Prioriteti i prezgjedhur:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
-msgid "_Search base:"
-msgstr "Baza e _kërkimit:"
-
-#: addressbook/gui/component/ldap-config.glade.h:82
-msgid "_Server name:"
-msgstr "Emri i _server-it:"
+#: addressbook/gui/component/ldap-config.glade.h:55
+#, fuzzy
+msgid "_Search scope:"
+msgstr "F_usha e kërkimit: "
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:56
 #, fuzzy
 msgid "_Server:"
 msgstr "Emri i _server-it:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
-msgid "_Timeout (minutes):"
-msgstr "_Timeout (në minuta):"
+#: addressbook/gui/component/ldap-config.glade.h:57
+#, fuzzy
+msgid "_Timeout:"
+msgstr "Formati i orës:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:58
 msgid "_Use secure connection:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "cards"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
-msgid "connecting-tab"
-msgstr "gjuhëza-lidhjes"
-
-#: addressbook/gui/component/ldap-config.glade.h:88
-msgid "general-tab"
-msgstr "gjuhëza-e përgjithshme"
-
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:60
 #: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
-#: mail/mail-config.glade.h:182
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "minuta"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
-msgid "searching-tab"
-msgstr "gjuhëza-kërkimit"
-
-#: addressbook/gui/component/select-names/e-select-names.c:497
+#: addressbook/gui/component/select-names/e-select-names.c:503
 #: addressbook/gui/component/select-names/select-names.glade.h:6
 #, fuzzy
 msgid "Select Contacts from Address Book"
 msgstr "Zgjidh kontaktet nga rubrika"
 
-#: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
@@ -825,7 +727,7 @@ msgstr "Kontakt pa emër"
 
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:222
+#: addressbook/gui/widgets/e-addressbook-view.c:224
 msgid "Source"
 msgstr "Buruesi"
 
@@ -904,9 +806,9 @@ msgid "<b>Work</b>"
 msgstr "Java punuese"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
-#: addressbook/gui/widgets/eab-contact-display.c:342
-#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/widgets/eab-contact-display.c:334
+#: addressbook/gui/widgets/eab-contact-display.c:353
 msgid "AIM"
 msgstr ""
 
@@ -947,15 +849,15 @@ msgid "Company:"
 msgstr "Shoqëria"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:271
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
+#: addressbook/gui/contact-editor/e-contact-editor.c:266
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
 msgstr "Kontakti"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1527
+#: addressbook/gui/contact-editor/e-contact-editor.c:520
 msgid "Contact Editor"
 msgstr "Editori i kontakteve"
 
@@ -979,82 +881,79 @@ msgid "Full _Name..."
 msgstr "Emri dhe _mbiemri..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:202
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-msgid "Home"
-msgstr "Shtëpi"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #, fuzzy
 msgid "Home Page:"
 msgstr "Fax në shtëpi"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-#, fuzzy
-msgid "Job title:"
-msgstr "_Titulli:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/e-itip-control.c:936
-msgid "Location:"
-msgstr "Pozicioni:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 #, fuzzy
 msgid "Mailing Address"
 msgstr "Bashko adresën E-Mail"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 #, fuzzy
 msgid "Manager:"
 msgstr "Manazhuesi"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "_Nickname:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Notes:"
 msgstr "Shë_nime:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
-#: addressbook/gui/contact-editor/e-contact-editor.c:203
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-msgid "Other"
-msgstr "Tjetër"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#, fuzzy
+msgid "Office:"
+msgstr "_Zyra:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "PO Box:"
 msgstr "_Kutia e postës:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 #, fuzzy
 msgid "Personal Information"
 msgstr "Informacione"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 #, fuzzy
 msgid "Profession:"
 msgstr "P_rofesioni:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#, fuzzy
+msgid "Spouse:"
+msgstr "Bashkë_shorti/ja:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "State/Province:"
 msgstr "_Shteti/Rrethi:"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#, fuzzy
+msgid "Title:"
+msgstr "_Titulli:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+msgid "Video Chat:"
+msgstr ""
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:41
 #, fuzzy
 msgid "Wants to receive HTML mail"
@@ -1062,15 +961,15 @@ msgstr "Dëshiron të marrë mail në _HTML"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:42
 #, fuzzy
-msgid "Webcam:"
+msgid "Web Log:"
 msgstr "Faqja"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
-#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
-#: mail/mail-config.glade.h:155
+#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
+#: mail/mail-config.glade.h:157
 msgid "Work"
 msgstr "Punësim"
 
@@ -1090,18 +989,11 @@ msgid "_File under:"
 msgstr "Emri i file:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "_Where:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
-msgid "item7"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
-msgid "item8"
-msgstr ""
-
-#: addressbook/gui/contact-editor/eab-editor.c:316
+#: addressbook/gui/contact-editor/eab-editor.c:315
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -1109,7 +1001,7 @@ msgstr ""
 "Jeni i sigurt që dëshiron\n"
 "të eleminosh këto kontakte?"
 
-#: addressbook/gui/contact-editor/eab-editor.c:319
+#: addressbook/gui/contact-editor/eab-editor.c:318
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -1118,16 +1010,16 @@ msgstr ""
 "të eleminosh këtë kontakt?"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:351
-#: addressbook/gui/widgets/eab-contact-display.c:372
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Address"
 msgstr "Adresa"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:292
+#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard.c:174
@@ -2112,87 +2004,110 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/contact-editor/e-contact-editor.c:179
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:337
+#: addressbook/gui/widgets/eab-contact-display.c:356
 msgid "Jabber"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:347
-#: addressbook/gui/widgets/eab-contact-display.c:366
+#: addressbook/gui/contact-editor/e-contact-editor.c:180
+#: addressbook/gui/widgets/eab-contact-display.c:339
+#: addressbook/gui/widgets/eab-contact-display.c:358
 msgid "Yahoo"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: addressbook/gui/widgets/eab-contact-display.c:338
+#: addressbook/gui/widgets/eab-contact-display.c:357
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:344
-#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#: addressbook/gui/widgets/eab-contact-display.c:355
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/contact-editor/e-contact-editor.c:183
 #, fuzzy
 msgid "GroupWise"
 msgstr "Grupi"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+msgid "Home"
+msgstr "Shtëpi"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+msgid "Other"
+msgstr "Tjetër"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
 #, fuzzy
 msgid "Source Book"
 msgstr "Buruesi"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:264
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:278
+#: addressbook/gui/contact-editor/e-contact-editor.c:273
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Kontakt i Ri"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:285
+#: addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Writable Fields"
 msgstr "Fusha të ndryshueshme"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:299
+#: addressbook/gui/contact-editor/e-contact-editor.c:294
 msgid "Changed"
 msgstr "Ndryshuar"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
-msgid "Category editor not available."
-msgstr "Editori i kategorive nuk është disponibël."
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:2352
 msgid "This contact belongs to these categories:"
 msgstr "Ky kontak u takon këtyre kategorive:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#: addressbook/gui/contact-editor/e-contact-editor.c:2429
 msgid "Please select an image for this contact"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#: addressbook/gui/contact-editor/e-contact-editor.c:2433
 #, fuzzy
 msgid "No image"
 msgstr "Niger"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#: addressbook/gui/contact-editor/e-contact-editor.c:2636
 msgid ""
-"The following entries are invalid:\n"
+"The contact data is invalid:\n"
 "\n"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2738
-#, c-format
-msgid "Could not find widget for a field: `%s'"
-msgstr "E pamundur gjetja e widget për një fushë: `%s'"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#, fuzzy
+msgid "Invalid contact."
+msgstr "Kontakte"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+msgid ""
+"The contact cannot be saved to the selected address book. Do you want to "
+"discard changes?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2727
+#: addressbook/gui/contact-editor/e-contact-editor.c:2751
+msgid "_Discard"
+msgstr "_Anullo"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+msgid ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
+msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:62
 msgid "AOL Instant Messenger"
@@ -2228,7 +2143,7 @@ msgid "_Edit Full"
 msgstr "Ndrysho _plotësisht"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:166
 msgid "_Full Name:"
 msgstr "Emri dhe _mbiemri:"
 
@@ -2377,30 +2292,30 @@ msgid "_Type an email address or drag a contact into the list below:"
 msgstr ""
 "_Shkruaj një adresë email ose zvarrit një kontakt nga lista e mëposhtme:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "contact-list-editor"
 msgstr "editor i listës së kontakteve"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:153
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:215
+#: addressbook/gui/widgets/e-addressbook-view.c:217
 #: addressbook/gui/widgets/e-minicard-view.c:460
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Libri"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
 msgid "Is New List"
 msgstr "Është një listë e re"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:215
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
 msgid "Contact List Editor"
 msgstr "Editori i listës së kontakteve"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:438
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
 msgid "Save List as VCard"
 msgstr "Ruaje listën si VCard"
 
@@ -2447,127 +2362,127 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Kërkim i hollësishëm"
 
-#: addressbook/gui/widgets/eab-contact-display.c:129
-#: addressbook/gui/widgets/eab-contact-display.c:192
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:139
-#: addressbook/gui/widgets/eab-contact-display.c:205
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:257
-#: addressbook/gui/widgets/eab-contact-display.c:533
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:525
 #, fuzzy
 msgid "List Members"
 msgstr "Anëtarë"
 
-#: addressbook/gui/widgets/eab-contact-display.c:329
-#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/eab-contact-display.c:321
+#: addressbook/gui/widgets/eab-contact-display.c:323
 #, fuzzy
 msgid "E-mail"
 msgstr "Email"
 
-#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/eab-contact-display.c:332
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organizata"
 
-#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:333
 #, fuzzy
 msgid "Position"
 msgstr "Përshkrimi:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:354
 #, fuzzy
 msgid "Groupwise"
 msgstr "Grupi"
 
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:340
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:349
-#: addressbook/gui/widgets/eab-contact-display.c:370
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:362
 #, fuzzy
 msgid "Phone"
 msgstr "Telefoni në makinë"
 
-#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:342
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:354
+#: addressbook/gui/widgets/eab-contact-display.c:346
 #, fuzzy
 msgid "work"
 msgstr "Punësim"
 
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:359
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:368
-#: addressbook/gui/widgets/eab-contact-display.c:587
+#: addressbook/gui/widgets/eab-contact-display.c:360
+#: addressbook/gui/widgets/eab-contact-display.c:579
 msgid "Blog"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/eab-contact-display.c:363
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Celulari"
 
-#: addressbook/gui/widgets/eab-contact-display.c:375
+#: addressbook/gui/widgets/eab-contact-display.c:367
 #, fuzzy
 msgid "personal"
 msgstr "Personale"
 
-#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/eab-contact-display.c:374
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Shënim"
 
-#: addressbook/gui/widgets/eab-contact-display.c:548
+#: addressbook/gui/widgets/eab-contact-display.c:540
 #, fuzzy
 msgid "Job Title"
 msgstr "_Titulli:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/eab-contact-display.c:544
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:774
+#: smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "Email"
 
-#: addressbook/gui/widgets/eab-contact-display.c:579
+#: addressbook/gui/widgets/eab-contact-display.c:571
 #, fuzzy
 msgid "Home page"
 msgstr "Fax në shtëpi"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 msgid "Success"
 msgstr "Në rregull"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Backend busy"
 msgstr ""
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Repository offline"
 msgstr "Depozita është jashtë linje"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 #, fuzzy
 msgid "Address Book does not exist"
 msgstr "Rubrika nuk ekziston"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 #, fuzzy
 msgid "No Self Contact defined"
 msgstr "Lista e re kontaktesh"
@@ -2575,29 +2490,29 @@ msgstr "Lista e re kontaktesh"
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Permission denied"
 msgstr "Leja nuk u pranua"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:57
 #, fuzzy
 msgid "Contact not found"
 msgstr "Card nuk u gjet"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: addressbook/gui/widgets/eab-gui-util.c:58
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "ID e card ekziston"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Protocol not supported"
 msgstr "Protokoll i pasuportuar"
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:60
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:233
 #: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
@@ -2610,38 +2525,38 @@ msgid "Cancelled"
 msgstr "Anulluar"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:61
 #, fuzzy
 msgid "Could not cancel"
 msgstr "E pamundur hapja e kartelës tek '%s'"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Authentication Failed"
 msgstr "Identifikimi dështoi"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Authentication Required"
 msgstr "Është i nevojshëm identifikimi"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:66
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "TLS not Available"
 msgstr "TLS jo në dispozicion"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#: addressbook/gui/widgets/eab-gui-util.c:66
 msgid "No such source"
 msgstr ""
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:69
+#: addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Other error"
 msgstr "Gabim tjetër"
 
-#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:90
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
@@ -2650,7 +2565,7 @@ msgstr ""
 "Nuk arrijmë të hapim këtë libër adresash.  Kontrollo që pozicioni\n"
 "ekziston dhe që keni të drejtën të futeni në të."
 
-#: addressbook/gui/widgets/eab-gui-util.c:110
+#: addressbook/gui/widgets/eab-gui-util.c:97
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -2660,19 +2575,19 @@ msgstr ""
 "që është dhënë një URI e pasaktë, ose që server-i LDAP\n"
 "nuk është i arritshëm."
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:102
 #, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution you must compile the program from the CVS "
-"sources after retrieving OpenLDAP from the link below."
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
 msgstr ""
 "Ky version i Evolution nuk ka të kompiluar suportin LDAP.\n"
 "Nëse dëshironi të përdorni LDAP në Evolution do t'ju duhet\n"
 "t'a kompiloni programin nga buruesit CVS mbasi të keni shkarkuar\n"
 "OpenLDAP nga lidhja e mëposhtme.\n"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:109
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -2682,11 +2597,7 @@ msgstr ""
 "që është dhënë një URI e pasaktë, ose që server-i LDAP\n"
 "nuk është i arritshëm."
 
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "Unable to open addressbook"
-msgstr "E pamundur hapja e librit të adresave"
-
-#: addressbook/gui/widgets/eab-gui-util.c:162
+#: addressbook/gui/widgets/eab-gui-util.c:129
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2699,7 +2610,7 @@ msgstr ""
 "rikonfiguro limitin e rezultateve tek preferimet e server-it të directory\n"
 "për këtë libër adresash."
 
-#: addressbook/gui/widgets/eab-gui-util.c:168
+#: addressbook/gui/widgets/eab-gui-util.c:135
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -2713,58 +2624,50 @@ msgstr ""
 "directory\n"
 "për këtë libër adresash."
 
-#: addressbook/gui/widgets/eab-gui-util.c:174
+#: addressbook/gui/widgets/eab-gui-util.c:141
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 "Backend për këtë libër adresash nuk është në gjendje të përpunojë këtë "
 "kërkesë."
 
-#: addressbook/gui/widgets/eab-gui-util.c:177
+#: addressbook/gui/widgets/eab-gui-util.c:144
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Backend për këtë libër adresash nuk pranoi të përpunojë këtë kërkesë."
 
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:147
 msgid "This query did not complete successfully."
 msgstr "Kjo kërkesë nuk u plotësua me sukses."
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
-msgid "Do you want to save changes?"
-msgstr "Dëshiron të ruash ndryshimet e kryera?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:208
-msgid "_Discard"
-msgstr "_Anullo"
-
-#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:169
 msgid "Error adding list"
 msgstr "Gabim gjatë shtimit të listës"
 
-#: addressbook/gui/widgets/eab-gui-util.c:229
-#: addressbook/gui/widgets/eab-gui-util.c:652
+#: addressbook/gui/widgets/eab-gui-util.c:169
+#: addressbook/gui/widgets/eab-gui-util.c:580
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Gabim gjatë shtimit të card"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying list"
 msgstr "Gabim gjatë ndryshimit të listës"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Gabim gjatë ndryshimit të card"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:192
 msgid "Error removing list"
 msgstr "Gabim gjatë eleminimit të listës"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
-#: addressbook/gui/widgets/eab-gui-util.c:610
+#: addressbook/gui/widgets/eab-gui-util.c:192
+#: addressbook/gui/widgets/eab-gui-util.c:538
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Gabim gjatë eleminimit të card"
 
-#: addressbook/gui/widgets/eab-gui-util.c:334
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, fuzzy, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2773,7 +2676,7 @@ msgstr ""
 "Hapja e %d cards do të ketë si pasojë hapjen e %d dritareve të reja.\n"
 "Me të vërtetë dëshiron t'i shikosh të gjitha?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:360
+#: addressbook/gui/widgets/eab-gui-util.c:300
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2782,54 +2685,49 @@ msgstr ""
 "%s ekziston\n"
 "Dëshiron t'a mbishkruash?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:364
+#: addressbook/gui/widgets/eab-gui-util.c:304
 msgid "Overwrite"
 msgstr "Mbishkruaj"
 
-#: addressbook/gui/widgets/eab-gui-util.c:400
-#, c-format
-msgid "Error saving %s: %s"
-msgstr "Gabim gjatë ruajtjes së %s: %s"
-
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:437
+#: addressbook/gui/widgets/eab-gui-util.c:365
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:571
+#: addressbook/gui/widgets/eab-gui-util.c:499
 msgid "list"
 msgstr "lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:706
+#: addressbook/gui/widgets/eab-gui-util.c:634
 #, fuzzy
 msgid "Move contact to"
 msgstr "Lëviz card tek"
 
-#: addressbook/gui/widgets/eab-gui-util.c:708
+#: addressbook/gui/widgets/eab-gui-util.c:636
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Kopjo card tek"
 
-#: addressbook/gui/widgets/eab-gui-util.c:711
+#: addressbook/gui/widgets/eab-gui-util.c:639
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Lëviz cards tek"
 
-#: addressbook/gui/widgets/eab-gui-util.c:713
+#: addressbook/gui/widgets/eab-gui-util.c:641
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Kopjo cards tek"
 
-#: addressbook/gui/widgets/eab-gui-util.c:716
+#: addressbook/gui/widgets/eab-gui-util.c:644
 #, fuzzy
 msgid "Select target addressbook."
 msgstr "Zgjidh kontaktet nga rubrika"
 
-#: addressbook/gui/widgets/eab-gui-util.c:939
+#: addressbook/gui/widgets/eab-gui-util.c:867
 msgid "Multiple VCards"
 msgstr "VCards shumëfishe"
 
-#: addressbook/gui/widgets/eab-gui-util.c:942
+#: addressbook/gui/widgets/eab-gui-util.c:870
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard për %s"
@@ -2920,7 +2818,7 @@ msgstr[1] "Kontakte"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:229
+#: addressbook/gui/widgets/e-addressbook-view.c:231
 #: addressbook/gui/widgets/e-minicard-view.c:467
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
@@ -2938,146 +2836,135 @@ msgstr "Modeli"
 msgid "Error modifying card"
 msgstr "Gabim gjatë ndryshimit të card"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:163
 msgid "Name begins with"
 msgstr "Emri fillon me"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:164
 msgid "Email begins with"
 msgstr "Email fillon me"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:57
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Kategoria është"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-#: calendar/gui/cal-search-bar.c:50
+#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Çfarëdo fushe që përmban"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+#: addressbook/gui/widgets/e-addressbook-view.c:172
 msgid "Advanced..."
 msgstr "Detajuar..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:236
+#: addressbook/gui/widgets/e-addressbook-view.c:238
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:249
+#: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Lloji"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:506
+#: addressbook/gui/widgets/e-addressbook-view.c:508
 #, fuzzy
 msgid "Address Book"
 msgstr "Rubrika"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2076
+#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:2080
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
 msgstr "Ruaje si VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 msgid "New Contact..."
 msgstr "Kontakt i ri..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "New Contact List..."
 msgstr "Listë e re kontaktesh..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Go to Folder..."
 msgstr "Shko tek kartela..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Import..."
 msgstr "Importo..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1066
 msgid "Search for Contacts..."
 msgstr "Kërko për kontaktet..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Burimet e rubrikës..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1069
 msgid "Pilot Settings..."
 msgstr "Rregullimet Pilot..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Përcill kontaktin"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
 msgid "Send Message to Contact"
 msgstr "Dërgo një mesazh tek kontakti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Printo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
+#: addressbook/gui/widgets/e-addressbook-view.c:1077
 msgid "Print Envelope"
 msgstr "Printo zarfin"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
+#: addressbook/gui/widgets/e-addressbook-view.c:1081
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Rubrika"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1080
+#: addressbook/gui/widgets/e-addressbook-view.c:1082
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Rubrika"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Prije"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopjo"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1087
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Ngjit"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:1092
+#: calendar/gui/e-calendar-view.c:1280
 msgid "Current View"
 msgstr "Paraqitja aktuale"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1309
-#, c-format
-msgid ""
-"The addressbook backend for\n"
-"%s\n"
-"has crashed. You will have to restart Evolution in order to use it again"
-msgstr ""
-"Backend i rubrikës për\n"
-"%s\n"
-"shkoi në krash. Do t'ju duhet të rinisni Evolution që ta përdorni përsëri"
-
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1667
-#: calendar/gui/cal-search-bar.c:362
+#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Çdo kategori"
 
@@ -3186,7 +3073,7 @@ msgstr "Radio"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-list-view.c:234
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Roli"
@@ -3333,13 +3220,13 @@ msgstr "Shfaqësi i kalendarit të Evolution"
 msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.c:998
+#: addressbook/printing/e-contact-print.c:1000
 #, fuzzy
 msgid "Print contacts"
 msgstr "Printo cards"
 
-#: addressbook/printing/e-contact-print.c:1064
-#: addressbook/printing/e-contact-print.c:1091
+#: addressbook/printing/e-contact-print.c:1066
+#: addressbook/printing/e-contact-print.c:1093
 #, fuzzy
 msgid "Print contact"
 msgstr "Gjej kontaktin në"
@@ -3592,17 +3479,22 @@ msgstr ""
 msgid "Impossible internal error."
 msgstr "Gabim i brendshëm"
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:629
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
 #, fuzzy
 msgid "Can not open file"
 msgstr "Hap file"
 
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
 #, fuzzy
-msgid "Can not load URI"
-msgstr "Card nuk u gjet"
+msgid "Couldn't get list of addressbooks"
+msgstr "I pamundur ngarkimi i librit të adresave"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "E pamundur hapja e librit të adresave"
 
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
@@ -3620,7 +3512,7 @@ msgstr ""
 msgid "Unnamed List"
 msgstr "Listë pa emër"
 
-#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 #, fuzzy
 msgid "Enter password"
@@ -3903,10 +3795,10 @@ msgid "Whether to show week numbers in date navigator"
 msgstr "Shfaq _numrat e javëve"
 
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:88
-#: calendar/gui/gnome-cal.c:1703
-#: camel/providers/groupwise/camel-gw-listener.c:304
-#: camel/providers/groupwise/camel-gw-listener.c:327
+#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/gnome-cal.c:1705
+#: camel/providers/groupwise/camel-gw-listener.c:311
+#: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
 msgstr "Kalendari"
 
@@ -3923,7 +3815,7 @@ msgstr ""
 
 #: calendar/gui/calendar-commands.c:363
 #: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:19 filter/filter.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
 msgid "days"
 msgstr "ditë"
 
@@ -4073,24 +3965,24 @@ msgstr "Paraqitja javore"
 msgid "Month View"
 msgstr "Paraqitja mujore"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Përmbledhja përmban"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Përshkrimi përmban"
 
-#: calendar/gui/cal-search-bar.c:54
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Komenti përmban"
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:53
 #, fuzzy
 msgid "Location contains"
 msgstr "Përshkrimi përmban"
 
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
 msgid "Unmatched"
 msgstr "Jo korrispondues"
 
@@ -4111,23 +4003,23 @@ msgstr "Nuk ke të drejtë të hapësh kalendarin"
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:466
+#: calendar/gui/dialogs/alarm-options.c:467
 msgid "Audio Alarm Options"
 msgstr "Opcionet e alarmit audio"
 
-#: calendar/gui/dialogs/alarm-options.c:475
+#: calendar/gui/dialogs/alarm-options.c:476
 msgid "Message Alarm Options"
 msgstr "Opcionet e alarmit me mesazh"
 
-#: calendar/gui/dialogs/alarm-options.c:484
+#: calendar/gui/dialogs/alarm-options.c:485
 msgid "Email Alarm Options"
 msgstr "Opcionet e alarmit me email"
 
-#: calendar/gui/dialogs/alarm-options.c:493
+#: calendar/gui/dialogs/alarm-options.c:494
 msgid "Program Alarm Options"
 msgstr "Opcionet e programit të alarmit"
 
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:510
 msgid "Unknown Alarm Options"
 msgstr "Opcione alarmi të panjohura"
 
@@ -4165,7 +4057,7 @@ msgstr "Dërgo tek:"
 msgid "With these arguments:"
 msgstr "Me këto argumente:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
 msgid "dialog1"
 msgstr "dialogu1"
 
@@ -4174,7 +4066,7 @@ msgid "extra times every"
 msgstr "kohë më tepër çdo"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:20 filter/filter.glade.h:16
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr "orë"
 
@@ -4222,7 +4114,7 @@ msgstr ""
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Përmbledhja:"
 
@@ -4252,7 +4144,6 @@ msgid "hour(s)"
 msgstr "orë"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:21
 msgid "minute(s)"
 msgstr "minutë(a)"
 
@@ -4260,26 +4151,26 @@ msgstr "minutë(a)"
 msgid "start of appointment"
 msgstr "fillimit të takimit"
 
-#: calendar/gui/dialogs/calendar-setup.c:170
+#: calendar/gui/dialogs/calendar-setup.c:172
 msgid "You must specify a location to get the calendar from."
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:178
+#: calendar/gui/dialogs/calendar-setup.c:180
 #, c-format
 msgid "The source location '%s' is not well-formed."
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:193
+#: calendar/gui/dialogs/calendar-setup.c:195
 #, c-format
 msgid "The source location '%s' is not a webcal source."
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:265
+#: calendar/gui/dialogs/calendar-setup.c:275
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:278
+#: calendar/gui/dialogs/calendar-setup.c:288
 #, c-format
 msgid ""
 "The group '%s' is remote. You must specify a location to get the calendar "
@@ -4301,60 +4192,36 @@ msgstr "Lista e aktiviteteve"
 msgid "C_olor:"
 msgstr "N_gjyra"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-#, fuzzy
-msgid "Calendar Properties"
-msgstr "Kalendari"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
 msgid "Pick a color"
 msgstr "Zgjidh një ngjyrë"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:8
-#, fuzzy
-msgid "Remote"
-msgstr "Hiq"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-#, fuzzy
-msgid "Task List Properties"
-msgstr "Lista e aktiviteteve"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
 #, fuzzy
 msgid "_Add Calendar"
 msgstr "New Caledonia"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
 #, fuzzy
 msgid "_Add Group"
 msgstr "_Shto një grup..."
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-msgid "_Refresh Interval:"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
 #, fuzzy
 msgid "_Refresh:"
 msgstr "Rifresko"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-#, fuzzy
-msgid "_Source URL:"
-msgstr "Buruesi"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
 #, fuzzy
 msgid "_Type:"
 msgstr "Lloji:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
 #, fuzzy
 msgid "_URL:"
 msgstr "URL"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
 msgid "weeks"
 msgstr ""
 
@@ -4466,7 +4333,7 @@ msgid "Display"
 msgstr "_Shfaq"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:76
 msgid "E_nable"
 msgstr ""
 
@@ -4477,7 +4344,7 @@ msgstr "URL i lirë/i zënë:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:563
+#: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "E premte"
 
@@ -4491,7 +4358,7 @@ msgstr "Minuta"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:559
+#: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "E hënë"
 
@@ -4501,7 +4368,7 @@ msgstr "D_ie"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:564
+#: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "E shtunë"
 
@@ -4515,7 +4382,7 @@ msgstr "Shfaq _numrat e javëve"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "E djelë"
 
@@ -4529,7 +4396,7 @@ msgstr "E_nj"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:562
+#: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "E enjte"
 
@@ -4543,7 +4410,7 @@ msgstr "Formati i orës:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:560
+#: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "E martë"
 
@@ -4553,7 +4420,7 @@ msgstr "Fillim jav_e:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:561
+#: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "E mërkurë"
 
@@ -4587,7 +4454,7 @@ msgid "_Day begins:"
 msgstr "Fillimi i _ditës:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
-#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:43
@@ -4636,81 +4503,49 @@ msgstr "_Mër"
 msgid "before every appointment"
 msgstr "para çdo takimi"
 
-#: calendar/gui/dialogs/cancel-comp.c:57
-msgid ""
-"The event being deleted is a meeting, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"Ngjarja e fshirë është një mbledhje, dëshiron të dërgosh një njoftim "
-"anullimi?"
-
-#: calendar/gui/dialogs/cancel-comp.c:60
-msgid "Are you sure you want to cancel and delete this meeting?"
-msgstr "Jeni i sigurt që dëshironi të anulloni dhe të fshini këtë mbledhje?"
-
-#: calendar/gui/dialogs/cancel-comp.c:66
-msgid ""
-"The task being deleted is assigned, would you like to send a cancellation "
-"notice?"
-msgstr "Ngjarja e fshirë u caktua, dëshiron të dërgosh një njoftim fshirje?"
-
-#: calendar/gui/dialogs/cancel-comp.c:69
-msgid "Are you sure you want to cancel and delete this task?"
-msgstr "Jeni i sigurt që dëshironi të anulloni dhe të fshini këtë aktivitet?"
-
-#: calendar/gui/dialogs/cancel-comp.c:75
-msgid ""
-"The journal entry being deleted is published, would you like to send a "
-"cancellation notice?"
-msgstr "Zëri i fshirë u publikua, dëshiron të dërgosh një njoftim fshirje?"
-
-#: calendar/gui/dialogs/cancel-comp.c:78
-msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr "Jeni i sigurt që dëshironi të anulloni dhe të fshini këtë zë?"
-
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Kjo ngjarje u eleminua."
 
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "Ky aktivitet u eleminua."
 
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:68
 msgid "This journal entry has been deleted."
 msgstr "Ky zë u eleminua."
 
-#: calendar/gui/dialogs/changed-comp.c:75
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  Keni kryer ndryshime. T'i harrojmë ndryshimet dhe të mbyll editorin?"
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Nuk keni kryer ndryshime, mbyll editorin?"
 
-#: calendar/gui/dialogs/changed-comp.c:82
+#: calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "Kjo ngjarje është ndryshuar."
 
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "Ky aktivitet është ndryshuar."
 
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:92
 msgid "This journal entry has been changed."
 msgstr "Ky zë ditari është ndryshuar."
 
-#: calendar/gui/dialogs/changed-comp.c:99
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Keni kryer ndryshime. T'i harrojmë ndryshimet dhe të rifreskojmë "
 "editorin?"
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Nuk keni kryer ndryshime, rifreskoj editorin?"
@@ -4748,7 +4583,7 @@ msgid "No summary"
 msgstr "Asnjë përmbledhje"
 
 #: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
 #: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Ruaje si..."
@@ -4805,102 +4640,54 @@ msgstr "E pamundur hapja e kartelës tek '%s'"
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:95
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "Jeni i sigurt që dëshironi të eleminoni takimin `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:98
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "Jeni i sigurt që dëshironi të eleminoni këtë takim pa emër?"
-
-#: calendar/gui/dialogs/delete-comp.c:104
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "Jeni i sigurt që dëshironi të eleminoni aktivitetin `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:107
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "Jeni i sigurt që dëshironi të eleminoni aktivitetin pa emër?"
-
-#: calendar/gui/dialogs/delete-comp.c:113
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "Jeni i sigurt që dëshironi të eleminoni zërin e ditarit `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:116
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "Jeni i sigurt që dëshironi të eleminoni këtë zë ditari pa emër? "
-
-#: calendar/gui/dialogs/delete-comp.c:131
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d appointment?"
-msgid_plural "Are you sure you want to delete %d appointments?"
-msgstr[0] "Jeni i sigurt që dëshironi të eleminoni %d takimet?"
-msgstr[1] "Jeni i sigurt që dëshironi të eleminoni %d takimet?"
-
-#: calendar/gui/dialogs/delete-comp.c:138
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d task?"
-msgid_plural "Are you sure you want to delete %d tasks?"
-msgstr[0] "Jeni i sigurt që dëshironi të eleminoni %d aktivitetet?"
-msgstr[1] "Jeni i sigurt që dëshironi të eleminoni %d aktivitetet?"
-
-#: calendar/gui/dialogs/delete-comp.c:145
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d journal entry?"
-msgid_plural "Are you sure you want to delete %d journal entries?"
-msgstr[0] "Jeni i sigurt që dëshironi të eleminoni %d zërat e ditarit?"
-msgstr[1] "Jeni i sigurt që dëshironi të eleminoni %d zërat e ditarit?"
-
-#: calendar/gui/dialogs/delete-error.c:52
+#: calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "Ngjarja nuk mund të anullohet për shkak të një gabimi të corba"
 
-#: calendar/gui/dialogs/delete-error.c:55
+#: calendar/gui/dialogs/delete-error.c:57
 msgid "The task could not be deleted due to a corba error"
 msgstr "Aktiviteti nuk mund të anullohet për shkak të një gabimi të corba"
 
-#: calendar/gui/dialogs/delete-error.c:58
+#: calendar/gui/dialogs/delete-error.c:60
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr "Zëri i ditarit nuk mund të anullohet për shkak të një gabimi të corba"
 
-#: calendar/gui/dialogs/delete-error.c:61
+#: calendar/gui/dialogs/delete-error.c:63
 msgid "The item could not be deleted due to a corba error"
 msgstr "Elementi nuk mund të eleminohet për shkak të një gabimi të corba"
 
-#: calendar/gui/dialogs/delete-error.c:68
+#: calendar/gui/dialogs/delete-error.c:70
 msgid "The event could not be deleted because permission was denied"
 msgstr "Ngjarja nuk do të fshihet pasi mungojnë të drejtat e nevojshme"
 
-#: calendar/gui/dialogs/delete-error.c:71
+#: calendar/gui/dialogs/delete-error.c:73
 msgid "The task could not be deleted because permission was denied"
 msgstr "Aktiviteti nuk do të fshihet pasi mungojnë të drejtat e nevojshme"
 
-#: calendar/gui/dialogs/delete-error.c:74
+#: calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr "Zëri i ditarit nuk do të fshihet pasi mungojnë të drejtat e nevojshme"
 
-#: calendar/gui/dialogs/delete-error.c:77
+#: calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
 msgstr "Elementi nuk do të fshihet pasi mungojnë të drejtat e nevojshme"
 
-#: calendar/gui/dialogs/delete-error.c:84
+#: calendar/gui/dialogs/delete-error.c:86
 #, fuzzy
 msgid "The event could not be deleted due to an error"
 msgstr "Ngjarja nuk mund të anullohet për shkak të një gabimi të corba"
 
-#: calendar/gui/dialogs/delete-error.c:87
+#: calendar/gui/dialogs/delete-error.c:89
 #, fuzzy
 msgid "The task could not be deleted due to an error"
 msgstr "Aktiviteti nuk mund të anullohet për shkak të një gabimi të corba"
 
-#: calendar/gui/dialogs/delete-error.c:90
+#: calendar/gui/dialogs/delete-error.c:92
 #, fuzzy
 msgid "The journal entry could not be deleted due to an error"
 msgstr "Zëri i ditarit nuk mund të anullohet për shkak të një gabimi të corba"
 
-#: calendar/gui/dialogs/delete-error.c:93
+#: calendar/gui/dialogs/delete-error.c:95
 #, fuzzy
 msgid "The item could not be deleted due to an error"
 msgstr "Elementi nuk mund të eleminohet për shkak të një gabimi të corba"
@@ -5037,11 +4824,11 @@ msgstr ""
 
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:3
+#: calendar/gui/dialogs/meeting-page.glade.h:4
 #: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
 #: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1559
-#: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:100
+#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
+#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
@@ -5067,8 +4854,8 @@ msgstr ""
 #. FIXME: need to disable for undeletable folders
 #: calendar/gui/dialogs/meeting-page.c:655
 #: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1310 calendar/gui/e-calendar-view.c:1342
-#: mail/em-folder-tree.c:2557 mail/em-folder-view.c:919
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
+#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -5076,7 +4863,7 @@ msgid "_Delete"
 msgstr "_Fshi"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:240
+#: calendar/gui/e-meeting-list-view.c:218
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr ""
@@ -5112,16 +4899,15 @@ msgid "Member"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
-#: mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-list-view.c:248
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Gjendja"
 
@@ -5129,18 +4915,18 @@ msgstr "Gjendja"
 msgid "Add A_ttendee"
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr ""
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "Add attendees from addressbook."
+msgstr "Rubrika"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "_Change Organizer"
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
 msgstr ""
 
 #: calendar/gui/dialogs/meeting-page.glade.h:6
-#: calendar/gui/e-meeting-time-sel.c:417
-msgid "_Invite Others..."
+msgid "_Change Organizer"
 msgstr ""
 
 #: calendar/gui/dialogs/new-calendar.glade.h:2
@@ -5299,7 +5085,7 @@ msgid "_No recurrence"
 msgstr ""
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:450
+#: composer/e-msg-composer-attachment-bar.c:453
 msgid "_Remove"
 msgstr "_Hiq"
 
@@ -5331,52 +5117,21 @@ msgstr ""
 msgid "year(s)"
 msgstr ""
 
-#: calendar/gui/dialogs/save-comp.c:53
-msgid ""
-"This event has been changed, but has not been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-
-#: calendar/gui/dialogs/save-comp.c:57
-msgid "_Discard Changes"
-msgstr ""
-
-#: calendar/gui/dialogs/save-comp.c:62
-msgid "Save Event"
-msgstr ""
-
-#: calendar/gui/dialogs/select-source-dialog.c:65
+#: calendar/gui/dialogs/select-source-dialog.c:69
 #, fuzzy
 msgid "Select destination"
 msgstr "Zgjidh një veprim"
 
-#: calendar/gui/dialogs/select-source-dialog.c:86
+#: calendar/gui/dialogs/select-source-dialog.c:90
 #, fuzzy
 msgid "_Destination"
 msgstr "Lëvize tek kartela..."
 
-#: calendar/gui/dialogs/select-source-dialog.c:88
+#: calendar/gui/dialogs/select-source-dialog.c:92
 #, fuzzy
 msgid "Task List"
 msgstr "Lista e aktiviteteve"
 
-#: calendar/gui/dialogs/send-comp.c:57
-msgid "The meeting information has been created. Send it?"
-msgstr ""
-
-#: calendar/gui/dialogs/send-comp.c:60
-msgid "The meeting information has changed. Send an updated version?"
-msgstr ""
-
-#: calendar/gui/dialogs/send-comp.c:67
-msgid "The task assignment information has been created. Send it?"
-msgstr ""
-
-#: calendar/gui/dialogs/send-comp.c:71
-msgid "The task information has changed. Send an updated version?"
-msgstr ""
-
 #: calendar/gui/dialogs/task-details-page.c:406
 msgid "Completed date is wrong"
 msgstr ""
@@ -5396,7 +5151,7 @@ msgstr "I përfunduar"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #: calendar/gui/e-cal-component-preview.c:249
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:960
 msgid "High"
 msgstr "E lartë"
 
@@ -5410,14 +5165,14 @@ msgstr "Në zhvillim"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:253
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:958
 msgid "Low"
 msgstr "E ulët"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:251
 #: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:957
+#: mail/message-list.c:959
 msgid "Normal"
 msgstr "Normal"
 
@@ -5477,8 +5232,8 @@ msgstr ""
 
 #: calendar/gui/dialogs/task-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
+#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Përshkrimi:"
 
@@ -5652,7 +5407,7 @@ msgstr "Data:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:950
+#: calendar/gui/e-itip-control.c:943
 msgid "Status:"
 msgstr "Gjëndja:"
 
@@ -5738,12 +5493,12 @@ msgstr "I zënë"
 msgid "Deleting selected objects"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
 msgid "Updating objects"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1370
+#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
 #: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Hap"
@@ -5753,15 +5508,15 @@ msgid "Open _Web Page"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1291 calendar/gui/e-calendar-view.c:1376
-#: mail/em-folder-view.c:896 mail/em-popup.c:690 mail/em-popup.c:806
+#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
+#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr ""
 
 #: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1292
-#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
+#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
@@ -5769,24 +5524,24 @@ msgid "_Print..."
 msgstr "_Printo..."
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "P_rit"
 
 #: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1338
-#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2550
-#: mail/message-list.c:1644 ui/evolution-addressbook.xml.h:31
+#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
+#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
+#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Kopjo"
 
 #: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1273 calendar/gui/e-calendar-view.c:1299
-#: calendar/gui/e-calendar-view.c:1372 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
+#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
@@ -5855,71 +5610,71 @@ msgstr "Përmbledhja"
 msgid "Task sort"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
 msgid "New _Appointment..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
+#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
+#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
 msgid "New Meeting"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
 msgid "New Task"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Zgjidhe _të gjithë"
 
-#: calendar/gui/e-calendar-view.c:1280
+#: calendar/gui/e-calendar-view.c:1283
 #, fuzzy
 msgid "_Select Date..."
 msgstr "I zgjedhur"
 
-#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1303
+#: calendar/gui/e-calendar-view.c:1306
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Kopjoje tek kartela..."
 
-#: calendar/gui/e-calendar-view.c:1304
+#: calendar/gui/e-calendar-view.c:1307
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "Lëvize tek kartela..."
 
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1308
 msgid "_Schedule Meeting..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1309
 msgid "_Forward as iCalendar..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1349
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1351
 msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr ""
 
@@ -5934,9 +5689,9 @@ msgstr ""
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:967 calendar/gui/e-itip-control.c:1169
-#: calendar/gui/e-meeting-list-view.c:144
-#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
 #: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
 #: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
 #: camel/camel-tcp-stream-openssl.c:631
@@ -5962,13 +5717,13 @@ msgid "Assigned"
 msgstr "Caktuar"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr "Po"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "Jo"
 
@@ -5980,7 +5735,7 @@ msgstr "N"
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
 msgid "E"
 msgstr "E"
 
@@ -6049,402 +5804,406 @@ msgstr ""
 msgid "%02i minute divisions"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:592
+#: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:596
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:601
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:603
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:618
+#: calendar/gui/e-itip-control.c:611
 msgid " and "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:618
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:631
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:645
+#: calendar/gui/e-itip-control.c:638
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:642
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:653
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:669
+#: calendar/gui/e-itip-control.c:662
 msgid ", ending on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:686
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:696
 msgid "<b>Ends:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:716
 msgid "<b>Completed:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:733
+#: calendar/gui/e-itip-control.c:726
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:771 calendar/gui/e-itip-control.c:827
+#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
 msgid "iCalendar Information"
 msgstr ""
 
 #. Title
-#: calendar/gui/e-itip-control.c:788
+#: calendar/gui/e-itip-control.c:781
 msgid "iCalendar Error"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:859 calendar/gui/e-itip-control.c:875
-#: calendar/gui/e-itip-control.c:886 calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
 msgid "An unknown person"
 msgstr ""
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:910
+#: calendar/gui/e-itip-control.c:903
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:925
+#: calendar/gui/e-itip-control.c:918
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:929
+msgid "Location:"
+msgstr "Pozicioni:"
+
+#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:959 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:963 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.c:1050
-#: calendar/gui/e-itip-control.c:1076 calendar/gui/e-itip-control.c:1089
-#: calendar/gui/e-itip-control.c:1102 calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
 msgid "Choose an action:"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1023
+#: calendar/gui/e-itip-control.c:1016
 msgid "Update"
 msgstr "Rifresko"
 
-#: calendar/gui/e-itip-control.c:1024 calendar/gui/e-itip-control.c:1055
-#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1091
-#: calendar/gui/e-itip-control.c:1104 calendar/gui/e-itip-control.c:1117
-#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
+#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1044
 msgid "Accept"
 msgstr "Prano"
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1045
 msgid "Tentatively accept"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1046
 msgid "Decline"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1070
 msgid "Send Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1090
+#: calendar/gui/e-itip-control.c:1083
 msgid "Update respondent status"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1103
+#: calendar/gui/e-itip-control.c:1096
 msgid "Send Latest Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1116 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Anullo"
 
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1185
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1193
+#: calendar/gui/e-itip-control.c:1186
 msgid "Meeting Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1191
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1193
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1201
+#: calendar/gui/e-itip-control.c:1194
 msgid "Meeting Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1206
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1203
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1204
 msgid "Meeting Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1218
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1226
+#: calendar/gui/e-itip-control.c:1219
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1227
+#: calendar/gui/e-itip-control.c:1220
 msgid "Meeting Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1234 calendar/gui/e-itip-control.c:1302
-#: calendar/gui/e-itip-control.c:1337
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1330
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1228
 msgid "Bad Meeting Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1253
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1254
 msgid "Task Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1259
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1262
 msgid "Task Proposal"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Update"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1278
+#: calendar/gui/e-itip-control.c:1271
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1272
 msgid "Task Update Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1286
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1294
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1288
 msgid "Task Cancellation"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1303
+#: calendar/gui/e-itip-control.c:1296
 msgid "Bad Task Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1315
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1323
+#: calendar/gui/e-itip-control.c:1316
 msgid "Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1321
 msgid "Free/Busy Request"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1325
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1326
 msgid "Free/Busy Reply"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1331
 msgid "Bad Free/Busy Message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1413
+#: calendar/gui/e-itip-control.c:1406
 msgid "The message does not appear to be properly formed"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1472
+#: calendar/gui/e-itip-control.c:1465
 msgid "The message contains only unsupported requests."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1503
+#: calendar/gui/e-itip-control.c:1496
 msgid "The attachment does not contain a valid calendar message"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1535
+#: calendar/gui/e-itip-control.c:1528
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1769
+#: calendar/gui/e-itip-control.c:1762
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
+#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1825
+#: calendar/gui/e-itip-control.c:1818
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1837
+#: calendar/gui/e-itip-control.c:1830
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1856
+#: calendar/gui/e-itip-control.c:1849
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1852
 msgid "Object could not be found\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1855
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1865
+#: calendar/gui/e-itip-control.c:1858
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1861
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1892
 msgid "Removal Complete"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
 msgid "Item sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
+#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
 msgid "The item could not be sent!\n"
 msgstr ""
 
@@ -6485,74 +6244,74 @@ msgstr ""
 msgid "date-start"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:62
+#: calendar/gui/e-meeting-list-view.c:59
 msgid "Chair Persons"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:479
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
 msgid "Required Participants"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:64
+#: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:65
+#: calendar/gui/e-meeting-list-view.c:62
 msgid "Resources"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:140 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
 #: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "Grupi"
 
-#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:154 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:127
 #: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
 msgid "Required Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:179 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:177
 #: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
 msgid "Needs Action"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:182 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
 #: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr ""
 
-#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr ""
@@ -6569,20 +6328,25 @@ msgstr ""
 msgid "No Information"
 msgstr ""
 
+#: calendar/gui/e-meeting-time-sel.c:417
+#, fuzzy
+msgid "Add attendees from addressbook"
+msgstr "Rubrika"
+
 #: calendar/gui/e-meeting-time-sel.c:440
 msgid "_Options"
 msgstr ""
 
 #: calendar/gui/e-meeting-time-sel.c:457
-msgid "Show _Only Working Hours"
+msgid "Show _only working hours"
 msgstr ""
 
 #: calendar/gui/e-meeting-time-sel.c:467
-msgid "Show _Zoomed Out"
+msgid "Show _zoomed out"
 msgstr ""
 
 #: calendar/gui/e-meeting-time-sel.c:482
-msgid "_Update Free/Busy"
+msgid "_Update free/busy"
 msgstr ""
 
 #: calendar/gui/e-meeting-time-sel.c:497
@@ -6598,19 +6362,19 @@ msgid ">_>"
 msgstr ""
 
 #: calendar/gui/e-meeting-time-sel.c:547
-msgid "_All People and Resources"
+msgid "_All people and resources"
 msgstr ""
 
 #: calendar/gui/e-meeting-time-sel.c:556
-msgid "All _People and One Resource"
+msgid "All _people and one resource"
 msgstr ""
 
 #: calendar/gui/e-meeting-time-sel.c:565
-msgid "_Required People"
+msgid "_Required people"
 msgstr ""
 
 #: calendar/gui/e-meeting-time-sel.c:574
-msgid "Required People and _One Resource"
+msgid "Required people and _one resource"
 msgstr ""
 
 #: calendar/gui/e-meeting-time-sel.c:593
@@ -6648,79 +6412,69 @@ msgstr ""
 msgid "Enter the password for %s"
 msgstr "%sShkruaj password për %s (përdoruesi %s)"
 
-#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
 #, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-
 #. FIXME Loading should be async
 #. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:686
+#: calendar/gui/e-tasks.c:801
 #, c-format
 msgid "Opening tasks at %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:709
+#: calendar/gui/e-tasks.c:824
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
 "%s"
 msgstr "Gabim gjatë ruajtjes së %s: %s"
 
-#: calendar/gui/e-tasks.c:730
+#: calendar/gui/e-tasks.c:845
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Duke ngarkuar..."
 
-#: calendar/gui/e-tasks.c:834
+#: calendar/gui/e-tasks.c:949
 msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:857
+#: calendar/gui/e-tasks.c:972
 msgid "Deleting selected objects..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:884
+#: calendar/gui/e-tasks.c:999
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:960
+#: calendar/gui/e-tasks.c:1075
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
-#: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
+#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
+#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
 #: calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:705
 msgid "Tasks"
 msgstr "Aktivitete"
 
-#: calendar/gui/gnome-cal.c:1876
+#: calendar/gui/gnome-cal.c:1878
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Takimi - %s"
 
-#: calendar/gui/gnome-cal.c:1895
+#: calendar/gui/gnome-cal.c:1897
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Duke ngarkuar..."
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1920
 #, c-format
 msgid "Opening %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2048
-#, c-format
-msgid "The calendar backend for '%s' has crashed."
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:2894
+#: calendar/gui/gnome-cal.c:2906
 #, fuzzy
 msgid "Purging"
 msgstr "Printo"
@@ -6916,7 +6670,7 @@ msgid "On The Web"
 msgstr ""
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 
@@ -6927,7 +6681,7 @@ msgid "Unable to migrate calendar `%s'"
 msgstr "Nuk ke të drejtë të hapësh kalendarin"
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:869
+#: calendar/gui/migration.c:889
 #, fuzzy, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "E pamundur hapja e librit të adresave"
@@ -7163,73 +6917,73 @@ msgstr ""
 msgid "Print Setup"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:303
+#: calendar/gui/tasks-component.c:313
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:371
 #, fuzzy
 msgid "New Task List"
 msgstr "Lista e aktiviteteve"
 
-#: calendar/gui/tasks-component.c:398
+#: calendar/gui/tasks-component.c:408
 #, fuzzy, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "Kontakte"
 msgstr[1] "Kontakte"
 
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] "I zgjedhur"
 msgstr[1] "I zgjedhur"
 
-#: calendar/gui/tasks-component.c:447
+#: calendar/gui/tasks-component.c:457
 #, fuzzy
 msgid "Failed upgrading tasks."
 msgstr "Duke ngarkuar..."
 
-#: calendar/gui/tasks-component.c:526
+#: calendar/gui/tasks-component.c:749
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:538
+#: calendar/gui/tasks-component.c:761
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:576
+#: calendar/gui/tasks-component.c:799
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:804
+#: calendar/gui/tasks-component.c:1040
 msgid "New task"
 msgstr "Aktivitet i ri"
 
-#: calendar/gui/tasks-component.c:805
+#: calendar/gui/tasks-component.c:1041
 msgid "_Task"
 msgstr "_Aktivitet"
 
-#: calendar/gui/tasks-component.c:806
+#: calendar/gui/tasks-component.c:1042
 msgid "Create a new task"
 msgstr "Krijo një aktivitet të ri"
 
-#: calendar/gui/tasks-component.c:812
+#: calendar/gui/tasks-component.c:1048
 #, fuzzy
 msgid "New tasks group"
 msgstr "Aktivitet i ri"
 
-#: calendar/gui/tasks-component.c:813
+#: calendar/gui/tasks-component.c:1049
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Lista e aktiviteteve"
 
-#: calendar/gui/tasks-component.c:814
+#: calendar/gui/tasks-component.c:1050
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Krijo një aktivitet të ri"
@@ -8985,12 +8739,12 @@ msgstr ""
 msgid "Unsupported operation: append message: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1259
+#: camel/camel-folder.c:1262
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr ""
 
-#: camel/camel-folder.c:1299
+#: camel/camel-folder.c:1302
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
@@ -9003,11 +8757,16 @@ msgstr ""
 msgid "Copying messages"
 msgstr ""
 
-#: camel/camel-folder.c:1666
-msgid "Learning junk and/or non junk message(s)"
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Kujdes"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
 msgstr ""
 
-#: camel/camel-folder.c:1695
+#: camel/camel-folder.c:1701
 msgid "Filtering new message(s)"
 msgstr ""
 
@@ -9037,15 +8796,15 @@ msgstr ""
 msgid "(match-threads) requires a match type string"
 msgstr ""
 
-#: camel/camel-folder-search.c:785
+#: camel/camel-folder-search.c:784
 msgid "(match-threads) expects an array result"
 msgstr ""
 
-#: camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:790
 msgid "(match-threads) requires the folder set"
 msgstr ""
 
-#: camel/camel-folder-search.c:880
+#: camel/camel-folder-search.c:879
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr ""
@@ -9075,7 +8834,8 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
 #: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:706
+#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr ""
@@ -9428,7 +9188,7 @@ msgstr ""
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1212
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -9794,40 +9554,40 @@ msgstr ""
 msgid "export keys: unimplemented"
 msgstr ""
 
-#: camel/camel-store.c:214
+#: camel/camel-store.c:213
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-store.c:244
+#: camel/camel-store.c:243
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr "E pamundur hapja e kartelës tek '%s'"
 
-#: camel/camel-store.c:295
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-store.c:323
+#: camel/camel-store.c:325
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "E pamundur hapja e kartelës tek '%s'"
 
-#: camel/camel-store.c:387 camel/camel-vee-store.c:354
+#: camel/camel-store.c:389 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr ""
 
-#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#: camel/camel-store.c:439 camel/camel-vee-store.c:387
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr ""
 
-#: camel/camel-store.c:811
+#: camel/camel-store.c:777
 msgid "Trash"
 msgstr "Koshi"
 
-#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
-#: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/mail-config.glade.h:95
+#: ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
 msgstr "Qershor"
@@ -10035,12 +9795,12 @@ msgstr ""
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:374
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr ""
 
-#: camel/camel-vee-store.c:398
+#: camel/camel-vee-store.c:395
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr ""
@@ -10084,31 +9844,31 @@ msgstr "Rubrika"
 msgid "Post Office Agent SOAP Port:"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:80
+#: camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "Novell GroupWise"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:82
+#: camel/providers/groupwise/camel-groupwise-provider.c:85
 msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: camel/providers/groupwise/camel-groupwise-provider.c:100
 #: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
 msgid "Password"
 msgstr "Password"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:99
+#: camel/providers/groupwise/camel-groupwise-provider.c:102
 #: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/groupwise/camel-gw-listener.c:305
-#: camel/providers/groupwise/camel-gw-listener.c:328
+#: camel/providers/groupwise/camel-gw-listener.c:312
+#: camel/providers/groupwise/camel-gw-listener.c:335
 #, fuzzy
 msgid "Checklist"
 msgstr "lista"
@@ -10236,13 +9996,13 @@ msgid ""
 msgstr ""
 
 #: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:429
+#: camel/providers/imap/camel-imap-store.c:428
 #, c-format
 msgid "IMAP server %s"
 msgstr ""
 
 #: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:431
+#: camel/providers/imap/camel-imap-store.c:430
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr ""
@@ -10252,7 +10012,7 @@ msgstr ""
 #: camel/providers/imap/camel-imap-store.c:551
 #: camel/providers/imap/camel-imap-store.c:571
 #: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
+#: camel/providers/nntp/camel-nntp-store.c:209
 #: camel/providers/pop3/camel-pop3-store.c:175
 #: camel/providers/smtp/camel-smtp-transport.c:269
 #: camel/providers/smtp/camel-smtp-transport.c:285
@@ -10270,10 +10030,10 @@ msgstr "TLS jo në dispozicion"
 
 #: camel/providers/imap4/camel-imap4-store.c:222
 #: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:815
+#: camel/providers/imap/camel-imap-store.c:845
 #: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:137
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
 #: camel/providers/pop3/camel-pop3-store.c:192
 msgid "Connection cancelled"
 msgstr ""
@@ -10286,8 +10046,8 @@ msgid ""
 msgstr ""
 
 #: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:649
-#: camel/providers/imap/camel-imap-store.c:680
+#: camel/providers/imap/camel-imap-store.c:679
+#: camel/providers/imap/camel-imap-store.c:710
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
@@ -10296,7 +10056,7 @@ msgstr ""
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1109
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
 msgid "Unknown error"
 msgstr "Gabim i panjohur"
 
@@ -10322,8 +10082,8 @@ msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr "E pamundur hapja e kartelës tek '%s'"
 
 #: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1857
-#: camel/providers/imap/camel-imap-store.c:2235
+#: camel/providers/imap/camel-imap-store.c:1885
+#: camel/providers/imap/camel-imap-store.c:2263
 #, fuzzy, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -10401,12 +10161,12 @@ msgstr ""
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3168
+#: camel/providers/imap/camel-imap-store.c:3194
 msgid "Operation cancelled"
 msgstr "Operacioni u anullua"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3171
+#: camel/providers/imap/camel-imap-store.c:3197
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr ""
@@ -10468,13 +10228,6 @@ msgid "Unable to retrieve message: %s"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:219
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -10482,15 +10235,15 @@ msgid ""
 msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-mbox-folder.c:418
+#: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-folder.c:2019
-#: camel/providers/imap/camel-imap-folder.c:2621
-#: camel/providers/nntp/camel-nntp-folder.c:238
+#: camel/providers/imap/camel-imap-folder.c:2622
+#: camel/providers/nntp/camel-nntp-folder.c:220
 msgid "This message is not currently available"
 msgstr ""
 
@@ -10499,7 +10252,23 @@ msgstr ""
 msgid "Fetching summary information for new messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2659
+#: camel/providers/imap/camel-imap-folder.c:2463
+#, c-format
+msgid "Incomplete server response: no information provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2471
+#, c-format
+msgid "Incomplete server response: no UID provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2484
+#, c-format
+msgid ""
+"Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2660
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -10560,43 +10329,43 @@ msgstr ""
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/imap/camel-imap-store.c:680
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:711
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:818
+#: camel/providers/imap/camel-imap-store.c:848
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "E pamundur hapja e kartelës tek '%s'"
 
-#: camel/providers/imap/camel-imap-store.c:1242
+#: camel/providers/imap/camel-imap-store.c:1272
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1252
+#: camel/providers/imap/camel-imap-store.c:1282
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1305
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1289
+#: camel/providers/imap/camel-imap-store.c:1319
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1318
+#: camel/providers/imap/camel-imap-store.c:1348
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10604,18 +10373,18 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1839
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:1867
+#: camel/providers/imap/camel-imap-store.c:2057
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1915
-#: camel/providers/imap/camel-imap-store.c:2296
+#: camel/providers/imap/camel-imap-store.c:1943
+#: camel/providers/imap/camel-imap-store.c:2324
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1970
+#: camel/providers/imap/camel-imap-store.c:1998
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10623,7 +10392,7 @@ msgstr ""
 msgid "Cannot create folder `%s': folder exists."
 msgstr "E pamundur hapja e kartelës tek '%s'"
 
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:2274
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr ""
@@ -10656,20 +10425,20 @@ msgid "Index message body data"
 msgstr "Dërgo një mesazh tek kontakti"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:388
 #, c-format
 msgid "~%s (%s)"
 msgstr ""
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:393
-#: camel/providers/local/camel-local-folder.c:396
+#: camel/providers/local/camel-local-folder.c:392
+#: camel/providers/local/camel-local-folder.c:395
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr ""
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:400
+#: camel/providers/local/camel-local-folder.c:399
 #, c-format
 msgid "%s (%s)"
 msgstr ""
@@ -10725,7 +10494,7 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:142
 #: camel/providers/local/camel-local-store.c:253
-#: camel/providers/local/camel-mbox-store.c:356
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10798,8 +10567,23 @@ msgstr ""
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:226
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mbox-folder.c:417
+#: camel/providers/local/camel-mbox-folder.c:436
+#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:475
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-mh-folder.c:221
+#, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-folder.c:236
 msgid "Invalid message contents"
 msgstr ""
 
@@ -10840,9 +10624,9 @@ msgstr ""
 msgid "not a maildir directory"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:341
-#: camel/providers/local/camel-spool-store.c:286
-#: camel/providers/local/camel-spool-store.c:316
+#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-spool-store.c:284
+#: camel/providers/local/camel-spool-store.c:314
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr ""
@@ -10889,25 +10673,18 @@ msgstr ""
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:435
-#: camel/providers/local/camel-mbox-folder.c:466
-#: camel/providers/local/camel-mbox-folder.c:474
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-
-#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:468
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-folder.c:475
-msgid "Message construction failed: Corrupt mailbox?"
-msgstr ""
+#: camel/providers/local/camel-mbox-folder.c:476
+#: camel/providers/local/camel-mh-folder.c:222
+#, fuzzy
+msgid "Message construction failed."
+msgstr "Shkëmbimi dështoi"
 
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:362
+#: camel/providers/local/camel-mbox-store.c:361
 msgid "Cannot create a folder by this name."
 msgstr ""
 
@@ -10935,32 +10712,32 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:375
+#: camel/providers/local/camel-mbox-store.c:374
 #, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr ""
 
-#: camel/providers/local/camel-mbox-store.c:389
+#: camel/providers/local/camel-mbox-store.c:388
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "E pamundur hapja e kartelës tek '%s'"
 
-#: camel/providers/local/camel-mbox-store.c:391
+#: camel/providers/local/camel-mbox-store.c:390
 #, fuzzy
 msgid "Folder already exists"
 msgstr "ID e card ekziston"
 
-#: camel/providers/local/camel-mbox-store.c:473
+#: camel/providers/local/camel-mbox-store.c:472
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "Nuk është specifikuar emri i kartelës."
 
-#: camel/providers/local/camel-mbox-store.c:486
+#: camel/providers/local/camel-mbox-store.c:485
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "E pamundur hapja e kartelës tek '%s'"
 
-#: camel/providers/local/camel-mbox-store.c:561
+#: camel/providers/local/camel-mbox-store.c:560
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "E pamundur hapja e kartelës tek '%s'"
@@ -11145,7 +10922,7 @@ msgid ""
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:997
+#: camel/providers/nntp/camel-nntp-store.c:1126
 #, fuzzy, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "%sShkruaj password për %s (përdoruesi %s)"
@@ -11163,18 +10940,10 @@ msgstr "Lidhja me server-in LDAP dështoi"
 msgid "Server rejected username/password"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:263
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:259
-#: camel/providers/nntp/camel-nntp-folder.c:265
+#: camel/providers/nntp/camel-nntp-folder.c:147
+#: camel/providers/nntp/camel-nntp-folder.c:149
+#: camel/providers/nntp/camel-nntp-folder.c:158
+#: camel/providers/nntp/camel-nntp-folder.c:234
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11183,62 +10952,51 @@ msgstr ""
 msgid "Cannot get message %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:188
-#: camel/providers/nntp/camel-nntp-folder.c:228
-#, c-format
-msgid "Internal error: uid in invalid format: %s"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:201
-#, fuzzy, c-format
-msgid "Could not get article %s from NNTP server"
-msgstr "Nuk arrij të nis server-in wombat"
-
-#: camel/providers/nntp/camel-nntp-folder.c:362
-msgid "Posting not allowed by news server"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:373
-#, c-format
-msgid "Failed to send newsgroups header: %s: message not posted"
+#: camel/providers/nntp/camel-nntp-folder.c:156
+#: camel/providers/nntp/camel-nntp-folder.c:232
+#: camel/providers/nntp/camel-nntp-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+msgid "User cancelled"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:413
-#: camel/providers/nntp/camel-nntp-folder.c:426
+#: camel/providers/nntp/camel-nntp-folder.c:176
+#: camel/providers/nntp/camel-nntp-folder.c:208
 #, c-format
-msgid "Error posting to newsgroup: %s: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:438
-msgid "Error reading response to posted message: message not posted"
+msgid "Internal error: uid in invalid format: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:441
-#, c-format
-msgid "Error posting message: %s: message not posted"
-msgstr ""
+#: camel/providers/nntp/camel-nntp-folder.c:328
+#: camel/providers/nntp/camel-nntp-folder.c:331
+#: camel/providers/nntp/camel-nntp-folder.c:373
+#: camel/providers/nntp/camel-nntp-folder.c:375
+#, fuzzy, c-format
+msgid "Posting failed: %s"
+msgstr "Lëvize tek kartela..."
 
-#: camel/providers/nntp/camel-nntp-folder.c:457
+#: camel/providers/nntp/camel-nntp-folder.c:393
 msgid "You cannot post NNTP messages while working offline!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:468
+#: camel/providers/nntp/camel-nntp-folder.c:404
 #, fuzzy
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "E pamundur hapja e kartelës tek '%s'"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:44
 #, fuzzy
 msgid "Could not get group list from server."
 msgstr "Nuk arrij të nis server-in wombat"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#: camel/providers/nntp/camel-nntp-grouplist.c:97
+#: camel/providers/nntp/camel-nntp-grouplist.c:106
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#: camel/providers/nntp/camel-nntp-grouplist.c:157
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr ""
@@ -11266,27 +11024,29 @@ msgid ""
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:158
+#: camel/providers/nntp/camel-nntp-store.c:118
+#: camel/providers/nntp/camel-nntp-store.c:1233
+#: camel/providers/nntp/camel-nntp-store.c:1331
+#, c-format
+msgid "NNTP Command failed: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:227
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:170
+#: camel/providers/nntp/camel-nntp-store.c:239
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:326
+#: camel/providers/nntp/camel-nntp-store.c:403
 #, c-format
 msgid "USENET News via %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:640
-#, fuzzy
-msgid "Stream error"
-msgstr "Gabim tjetër"
-
-#: camel/providers/nntp/camel-nntp-store.c:643
+#: camel/providers/nntp/camel-nntp-store.c:777
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -11294,73 +11054,72 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:735
+#: camel/providers/nntp/camel-nntp-store.c:872
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
 "No such newsgroup. The selected item is a probably a parent folder."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:767
+#: camel/providers/nntp/camel-nntp-store.c:904
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
 "newsgroup does not exist!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:792
+#: camel/providers/nntp/camel-nntp-store.c:929
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:800
+#: camel/providers/nntp/camel-nntp-store.c:937
 msgid "You cannot rename a folder in a News store."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:808
+#: camel/providers/nntp/camel-nntp-store.c:945
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:253
-#, fuzzy, c-format
-msgid "Connection error: %s"
-msgstr "Hapi 2: lidhja me server-in"
-
-#: camel/providers/nntp/camel-nntp-summary.c:262
-#, c-format
-msgid "No such folder: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1118
+msgid "Authentication requested but not username provided"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:268
-#, c-format
-msgid "Could not get group: %s"
-msgstr ""
+#: camel/providers/nntp/camel-nntp-store.c:1146
+#, fuzzy, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr "Identifikimi me server-in LDAP dështoi"
 
-#: camel/providers/nntp/camel-nntp-summary.c:333
+#: camel/providers/nntp/camel-nntp-store.c:1262
 #, fuzzy
-msgid "Could not get messages: unspecified error"
-msgstr "E pamundur hapja e kartelës tek '%s'"
+msgid "Not connected."
+msgstr "Shfaq kontektet"
 
-#: camel/providers/nntp/camel-nntp-summary.c:378
+#: camel/providers/nntp/camel-nntp-store.c:1311
 #, c-format
-msgid "NNTP Command failed: %s"
+msgid "No such folder: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:438
-#: camel/providers/nntp/camel-nntp-summary.c:543
+#: camel/providers/nntp/camel-nntp-summary.c:218
+#: camel/providers/nntp/camel-nntp-summary.c:314
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:558
+#: camel/providers/nntp/camel-nntp-summary.c:225
+#, c-format
+msgid "Unexpected server response from xover: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-summary.c:328
 #, c-format
-msgid "Unknown server response: %s"
+msgid "Unexpected server response from head: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:605
+#: camel/providers/nntp/camel-nntp-summary.c:368
 msgid "Use cancel"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:607
+#: camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
 msgid "Operation failed: %s"
 msgstr ""
@@ -11408,7 +11167,7 @@ msgstr ""
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107
 msgid "POP"
 msgstr ""
 
@@ -11488,7 +11247,7 @@ msgid "No such folder `%s'."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:132
 msgid "Sendmail"
 msgstr ""
 
@@ -11540,7 +11299,7 @@ msgstr ""
 msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:119
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122
 msgid "SMTP"
 msgstr ""
 
@@ -11821,19 +11580,19 @@ msgstr ""
 msgid "%.0fG"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
+#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:408
 msgid "attachment"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:454
 msgid "Remove selected items from the attachment list"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:491
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Add attachment..."
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:495
 msgid "Attach a file to the message"
 msgstr ""
 
@@ -11894,7 +11653,7 @@ msgstr "Mesazhi"
 msgid "Open file"
 msgstr "Hap file"
 
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
 msgid "Autogenerated"
 msgstr ""
 
@@ -12028,17 +11787,17 @@ msgstr ""
 
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
-msgid "You cannot attach the file `${0}' to this message."
+msgid "You cannot attach the file `{0}' to this message."
 msgstr ""
 
 #. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4
-msgid "${1}"
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
 msgstr ""
 
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
 
 #. mail-composer:attach-directory primary
@@ -12131,7 +11890,7 @@ msgstr "E pamundur hapja e kartelës tek '%s'"
 
 #. mail-composer:no-build-message secondary
 #: composer/mail-composer-errors.xml.h:34
-msgid "Because \"${0}\", you may need to select different mail options."
+msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
@@ -12140,8 +11899,10 @@ msgid "Could not read signature file \"{0}\"."
 msgstr ""
 
 #. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38
-msgid "Because \"${1}\"."
+#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted primary
@@ -12544,11 +12305,11 @@ msgid "<b>Then</b>"
 msgstr "<b>Gjendja:</b>"
 
 #: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1335
+#: mail/mail-account-gui.c:1347
 msgid "Select Folder"
 msgstr ""
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
 #, fuzzy
 msgid "    "
 msgstr "      "
@@ -12601,7 +12362,7 @@ msgstr ""
 msgid "months"
 msgstr ""
 
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
 msgid "seconds"
 msgstr "sekonda"
 
@@ -12633,20 +12394,20 @@ msgstr ""
 msgid "years"
 msgstr ""
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:916
-#: mail/mail-config.c:76 mail/mail-config.glade.h:90
+#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
+#: mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "I rëndësishëm"
 
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:919 mail/mail-config.c:79
-#: mail/mail-config.glade.h:145
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: mail/mail-config.glade.h:148
 msgid "To Do"
 msgstr ""
 
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:920 mail/mail-config.c:80
-#: mail/mail-config.glade.h:94
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: mail/mail-config.glade.h:97
 msgid "Later"
 msgstr ""
 
@@ -12702,257 +12463,6 @@ msgstr ""
 msgid "outgoing"
 msgstr ""
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Adjust Score"
-msgstr ""
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Color"
-msgstr ""
-
-#: filter/libfilter-i18n.h:4
-msgid "Assign Score"
-msgstr ""
-
-#: filter/libfilter-i18n.h:5
-msgid "Attachments"
-msgstr ""
-
-#: filter/libfilter-i18n.h:6
-msgid "Beep"
-msgstr ""
-
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr ""
-
-#: filter/libfilter-i18n.h:8
-msgid "Copy to Folder"
-msgstr ""
-
-#: filter/libfilter-i18n.h:9
-msgid "Date received"
-msgstr ""
-
-#: filter/libfilter-i18n.h:10
-msgid "Date sent"
-msgstr ""
-
-#: filter/libfilter-i18n.h:12
-msgid "Deleted"
-msgstr ""
-
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr ""
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr ""
-
-#: filter/libfilter-i18n.h:16
-msgid "does not return"
-msgstr ""
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr ""
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
-msgstr ""
-
-#: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr "Kopje e keqe"
-
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr ""
-
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr ""
-
-#: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr ""
-
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr ""
-
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr ""
-
-#: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr ""
-
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr ""
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr ""
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr ""
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr ""
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr ""
-
-#: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr ""
-
-#: filter/libfilter-i18n.h:36
-#, fuzzy
-msgid "Junk Test"
-msgstr "Qershor"
-
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
-#: widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Etiketë"
-
-#: filter/libfilter-i18n.h:38
-msgid "Mailing list"
-msgstr ""
-
-#: filter/libfilter-i18n.h:39
-msgid "Message Body"
-msgstr ""
-
-#: filter/libfilter-i18n.h:40
-msgid "Message Header"
-msgstr ""
-
-#: filter/libfilter-i18n.h:41
-#, fuzzy
-msgid "Message is Junk"
-msgstr "Mesazhi"
-
-#: filter/libfilter-i18n.h:42
-#, fuzzy
-msgid "Message is not Junk"
-msgstr "Mesazhi që duhet dërguar"
-
-#: filter/libfilter-i18n.h:43
-msgid "Move to Folder"
-msgstr ""
-
-#: filter/libfilter-i18n.h:44
-#, fuzzy
-msgid "Pipe to Program"
-msgstr "Përfundo programin"
-
-#: filter/libfilter-i18n.h:45
-msgid "Play Sound"
-msgstr ""
-
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
-msgid "Read"
-msgstr ""
-
-#: filter/libfilter-i18n.h:47
-msgid "Recipients"
-msgstr ""
-
-#: filter/libfilter-i18n.h:48
-msgid "Regex Match"
-msgstr ""
-
-#: filter/libfilter-i18n.h:49
-msgid "Replied to"
-msgstr ""
-
-#: filter/libfilter-i18n.h:50
-msgid "returns"
-msgstr ""
-
-#: filter/libfilter-i18n.h:51
-msgid "returns greater than"
-msgstr ""
-
-#: filter/libfilter-i18n.h:52
-msgid "returns less than"
-msgstr ""
-
-#: filter/libfilter-i18n.h:53
-#, fuzzy
-msgid "Run Program"
-msgstr "Ekzekuto programin:"
-
-#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Pikët"
-
-#: filter/libfilter-i18n.h:55
-msgid "Sender"
-msgstr ""
-
-#: filter/libfilter-i18n.h:56
-msgid "Set Status"
-msgstr ""
-
-#: filter/libfilter-i18n.h:57
-msgid "Size (kB)"
-msgstr ""
-
-#: filter/libfilter-i18n.h:58
-msgid "sounds like"
-msgstr ""
-
-#: filter/libfilter-i18n.h:59
-msgid "Source Account"
-msgstr ""
-
-#: filter/libfilter-i18n.h:60
-msgid "Specific header"
-msgstr ""
-
-#: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr ""
-
-#: filter/libfilter-i18n.h:63
-msgid "Stop Processing"
-msgstr ""
-
-#: filter/libfilter-i18n.h:64 mail/em-format.c:755 mail/em-format-html.c:1519
-#: mail/em-format-quote.c:302 mail/em-mailer-prefs.c:87
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
-#: smime/lib/e-cert.c:1079
-msgid "Subject"
-msgstr ""
-
-#: filter/libfilter-i18n.h:65
-msgid "Unset Status"
-msgstr ""
-
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr ""
@@ -12969,6 +12479,11 @@ msgstr ""
 msgid "_Score Rules"
 msgstr ""
 
+#: filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Pikët"
+
 #: filter/searchtypes.xml.h:1
 #, fuzzy
 msgid "Body contains"
@@ -13056,13 +12571,13 @@ msgstr ""
 msgid "-------- Forwarded Message --------"
 msgstr ""
 
-#: mail/em-composer-utils.c:1499
+#: mail/em-composer-utils.c:1495
 msgid "an unknown sender"
 msgstr ""
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1509
+#: mail/em-composer-utils.c:1505
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr ""
 
@@ -13104,8 +12619,8 @@ msgstr ""
 msgid "Create New Folder"
 msgstr ""
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
-#: mail/mail-component.c:701
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
+#: mail/mail-component.c:704
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr ""
@@ -13120,106 +12635,107 @@ msgstr "Lëvize tek kartela..."
 msgid "Folder _name:"
 msgstr ""
 
-#: mail/em-folder-tree.c:839
+#: mail/em-folder-tree.c:833
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Lëvize tek kartela..."
 
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree.c:835
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Kopjoje tek kartela..."
 
-#: mail/em-folder-tree.c:848 mail/message-list.c:1555
+#: mail/em-folder-tree.c:842 mail/message-list.c:1561
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Opcionet e alarmit me mesazh"
 
-#: mail/em-folder-tree.c:850 mail/message-list.c:1557
+#: mail/em-folder-tree.c:844 mail/message-list.c:1563
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "E pamundur hapja e kartelës tek '%s'"
 
-#: mail/em-folder-tree.c:866
+#: mail/em-folder-tree.c:860
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 
-#: mail/em-folder-tree.c:956 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:957 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2069
-#: mail/em-folder-tree.c:2551 mail/em-folder-view.c:798
-#: mail/message-list.c:1645
+#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
+#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
+#: mail/message-list.c:1651
 #, fuzzy
 msgid "_Move"
 msgstr "_Lëviz..."
 
-#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#: mail/em-folder-tree.c:955 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "Anullo"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
 #: mail/em-folder-view.c:798 mail/em-folder-view.c:812
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
 #, fuzzy
 msgid "C_opy"
 msgstr "Kopjo"
 
-#: mail/em-folder-tree.c:2096
+#: mail/em-folder-tree.c:2088
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Lëvize tek kartela..."
 
-#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
+#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
 #, fuzzy
 msgid "Create folder"
 msgstr "Lëvize tek kartela..."
 
-#: mail/em-folder-tree.c:2474
+#: mail/em-folder-tree.c:2463
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr ""
 
-#: mail/em-folder-tree.c:2476
+#: mail/em-folder-tree.c:2465
 msgid "Rename Folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:2545 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Shfaq"
 
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2537
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Hape në një dritare të re"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2555
+#: mail/em-folder-tree.c:2546
 msgid "_New Folder..."
 msgstr ""
 
-#: mail/em-folder-tree.c:2558
+#: mail/em-folder-tree.c:2549
 msgid "_Rename"
 msgstr "_Riemërto"
 
-#: mail/em-folder-tree.c:2561 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Pronësitë...."
 
 #: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:889
+#: mail/mail-vfolder.c:888
 msgid "VFolders"
 msgstr ""
 
@@ -13233,19 +12749,19 @@ msgstr ""
 msgid "Inbox"
 msgstr ""
 
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
 msgid "Loading..."
 msgstr "Duke ngarkuar..."
 
 #: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
 #: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
 #: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:551
+#: mail/mail-component.c:554
 msgid "Mail"
 msgstr "Posta"
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr ""
@@ -13258,17 +12774,17 @@ msgstr "_Printo"
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:810
+#: mail/em-folder-view.c:901 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr ""
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:811
+#: mail/em-folder-view.c:902 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr ""
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: mail/em-folder-view.c:903 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Vazhdo"
@@ -13321,6 +12837,10 @@ msgstr ""
 msgid "_Copy to Folder..."
 msgstr ""
 
+#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Etiketë"
+
 #: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr ""
@@ -13371,12 +12891,12 @@ msgid "Filter on _Mailing List"
 msgstr ""
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
-#: mail/mail-config.glade.h:66
+#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "E prezgjedhur"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1796
 msgid "Print Message"
 msgstr ""
 
@@ -13415,12 +12935,18 @@ msgstr ""
 msgid "Bcc"
 msgstr ""
 
+#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
+#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr ""
+
 #: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
 #: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Data"
 
-#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
+#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
 msgid "Newsgroups"
 msgstr ""
 
@@ -13604,7 +13130,7 @@ msgid ""
 "practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:757
+#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
 msgid "_View Certificate"
 msgstr ""
 
@@ -13659,7 +13185,7 @@ msgstr ""
 msgid "Once per month"
 msgstr ""
 
-#: mail/em-migrate.c:1072
+#: mail/em-migrate.c:1168
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13667,86 +13193,86 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1506
+#: mail/em-migrate.c:1602
 #, fuzzy, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "E pamundur hapja e kartelës tek '%s'"
 
-#: mail/em-migrate.c:1532
+#: mail/em-migrate.c:1628
 #, fuzzy, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "E pamundur hapja e kartelës tek '%s'"
 
-#: mail/em-migrate.c:1715
+#: mail/em-migrate.c:1811
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:1919
+#: mail/em-migrate.c:2015
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:1933
+#: mail/em-migrate.c:2029
 #, fuzzy, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "E pamundur hapja e kartelës tek '%s'"
 
-#: mail/em-migrate.c:1962
+#: mail/em-migrate.c:2058
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#: mail/em-migrate.c:2413 mail/em-migrate.c:2425
 #, fuzzy, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "E pamundur hapja e kartelës tek '%s'"
 
-#: mail/em-migrate.c:2480
+#: mail/em-migrate.c:2576
 #, fuzzy, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "E pamundur hapja e kartelës tek '%s'"
 
-#: mail/em-migrate.c:2498
+#: mail/em-migrate.c:2594
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 msgstr ""
 
-#: mail/em-popup.c:699
+#: mail/em-popup.c:700
 #, fuzzy
 msgid "Save As..."
 msgstr "Ruaje _si..."
 
-#: mail/em-popup.c:717
+#: mail/em-popup.c:718
 #, c-format
 msgid "untitled_image.%s"
 msgstr ""
 
-#: mail/em-popup.c:807
+#: mail/em-popup.c:808
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:809
+#: mail/em-popup.c:810
 msgid "_Reply to sender"
 msgstr ""
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:859
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Hape në një dritare të re"
 
-#: mail/em-popup.c:859
+#: mail/em-popup.c:860
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Dërgo një mesazh tek kontakti"
 
-#: mail/em-popup.c:860
+#: mail/em-popup.c:861
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Rubrika"
 
-#: mail/em-popup.c:966
+#: mail/em-popup.c:967
 #, c-format
 msgid "Open in %s..."
 msgstr ""
@@ -14316,7 +13842,7 @@ msgstr ""
 msgid "Mail Accounts"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
 msgid "Mail Preferences"
 msgstr ""
 
@@ -14330,15 +13856,15 @@ msgid "Evolution is importing your old Elm mail"
 msgstr ""
 
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:226
+#: mail/importers/evolution-mbox-importer.c:221
+#: mail/importers/evolution-outlook-importer.c:255
 #: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr ""
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:222
-#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/evolution-mbox-importer.c:223
+#: mail/importers/evolution-outlook-importer.c:257
 #: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr ""
@@ -14359,23 +13885,25 @@ msgid "Elm"
 msgstr ""
 
 #: mail/importers/evolution-mbox-importer.c:116
+#: mail/importers/evolution-outlook-importer.c:130
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Lëvize tek kartela..."
 
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 #, fuzzy
 msgid "Select folder to import into"
 msgstr "Zgjidh një veprim"
 
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:254
 #: mail/importers/mail-importer.c:226
 #, fuzzy, c-format
 msgid "Importing `%s'"
 msgstr "Importo..."
 
-#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/evolution-outlook-importer.c:301
 #: mail/importers/mail-importer.c:140
 #, fuzzy
 msgid "Importing mailbox"
@@ -14515,15 +14043,15 @@ msgstr ""
 msgid "%s License Agreement"
 msgstr ""
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
 msgid "_Host:"
 msgstr ""
 
-#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
 msgid "User_name:"
 msgstr ""
 
-#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
 msgid "_Path:"
 msgstr ""
 
@@ -14586,33 +14114,33 @@ msgstr "Kontakte"
 msgid ", %d unread"
 msgstr ""
 
-#: mail/mail-component.c:653
+#: mail/mail-component.c:656
 msgid "New Mail Message"
 msgstr ""
 
-#: mail/mail-component.c:654
+#: mail/mail-component.c:657
 msgid "_Mail Message"
 msgstr ""
 
-#: mail/mail-component.c:655
+#: mail/mail-component.c:658
 msgid "Compose a new mail message"
 msgstr ""
 
-#: mail/mail-component.c:661
+#: mail/mail-component.c:664
 msgid "New Mail Folder"
 msgstr ""
 
-#: mail/mail-component.c:662
+#: mail/mail-component.c:665
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "_Kartela:"
 
-#: mail/mail-component.c:663
+#: mail/mail-component.c:666
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Krijo një kontakt të ri"
 
-#: mail/mail-component.c:795
+#: mail/mail-component.c:798
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
@@ -14624,7 +14152,7 @@ msgstr ""
 msgid "Connecting to server..."
 msgstr ""
 
-#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr ""
 
@@ -14636,7 +14164,7 @@ msgid ""
 msgstr ""
 
 #: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid "Receiving Mail"
 msgstr ""
 
@@ -14650,7 +14178,7 @@ msgstr ""
 msgid "Please select among the following options"
 msgstr ""
 
-#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr ""
 
@@ -14660,7 +14188,7 @@ msgid ""
 "sure, ask your system administrator or Internet Service Provider."
 msgstr ""
 
-#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37
 msgid "Account Management"
 msgstr ""
 
@@ -14673,233 +14201,237 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:2
 #, fuzzy
 msgid " Ch_eck for Supported Types "
 msgstr "  S_hfaq bazat e suportuara "
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "<b>Preview</b>"
 msgstr "Pamja e parë"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr ""
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "<b>S_ignatures</b>"
 msgstr "<b>Gjendja:</b>"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "<b>_Languages</b>"
 msgstr "<b>Gjendja:</b>"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
+msgid "<small>This will make the the filter more reliable, but slower</small>"
+msgstr ""
+
+#: mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Checking for New Mail</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">General</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Security</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:34
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:35
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:36
 msgid "Account Editor"
 msgstr ""
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:38
 msgid "Add Ne_w Signature..."
 msgstr ""
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "Add _Script"
 msgstr ""
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:40
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr ""
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:44
 msgid "Always _sign outgoing messages when using this account"
 msgstr ""
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Attach original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Bashkangjitur"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:48
 msgid "Automatically _insert smiley images"
 msgstr ""
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Automatically check for _new mail every"
 msgstr ""
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Beep w_hen new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "C_haracter set:"
 msgstr ""
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Ch_eck for Supported Types "
 msgstr "  S_hfaq bazat e suportuara "
 
-#: mail/mail-config.glade.h:53
-msgid "Check _Incoming Mail"
+#: mail/mail-config.glade.h:55
+msgid "Check _incoming mail for junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 msgid "Color for _misspelled words:"
 msgstr ""
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Colors"
 msgstr "N_gjyra"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 msgid "Confirm _when expunging a folder"
 msgstr ""
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -14909,364 +14441,361 @@ msgid ""
 "Click \"Apply\" to save your settings."
 msgstr ""
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
 msgid "De_fault"
 msgstr ""
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 msgid "Default character e_ncoding:"
 msgstr ""
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 #, fuzzy
 msgid "Defaults"
 msgstr "E prezgjedhur"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 msgid "Do not quote original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "U plotësua"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Drafts _Folder:"
 msgstr "_Kartela:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:77
 msgid "Email Accounts"
 msgstr ""
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Email _Address:"
 msgstr "Adresa Email:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:79
 msgid "Empty trash folders on e_xit"
 msgstr ""
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
 msgid "Encry_ption certificate:"
 msgstr ""
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:81
 msgid "Evolution Account Assistant"
 msgstr ""
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:82
 msgid "Execute Command..."
 msgstr ""
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:83
 msgid "Fi_xed-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 msgid "Font Properties"
 msgstr ""
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 msgid "Format messages in _HTML"
 msgstr ""
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "HTML Mail"
 msgstr "Dërgoj postën në HTML?"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Headers"
 msgstr "Kreu i faqes"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr ""
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 msgid "IMAPv4 "
 msgstr ""
 
 #: mail/mail-config.glade.h:91
+#, fuzzy
+msgid "I_nclude remote tests"
+msgstr "Përfshi:"
+
+#: mail/mail-config.glade.h:94
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Kerberos "
 msgstr ""
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Mail Configuration"
 msgstr "Konfigurimi i Mail"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr ""
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr ""
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Or_ganization:"
 msgstr ""
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "PGP/GPG _Key ID:"
 msgstr ""
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Play sound file when new mail arri_ves"
 msgstr ""
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Qmail maildir "
 msgstr ""
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr ""
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr ""
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Re_member password"
 msgstr "Password"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr ""
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:120
 msgid "Receiving Options"
 msgstr ""
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
 #, fuzzy
 msgid "Remember _password"
 msgstr "Password"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
 msgid "S_tandard Font:"
 msgstr ""
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 msgid "Security"
 msgstr ""
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:126
 msgid "Select HTML fixed width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:127
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:128
 msgid "Select HTML variable width font for printing"
 msgstr ""
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:129
 #, fuzzy
 msgid "Select..."
 msgstr "I zgjedhur"
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr ""
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:133
 msgid "Sent _Messages Folder:"
 msgstr ""
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:134
 msgid "Ser_ver requires authentication"
 msgstr ""
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:135
 msgid "Server _Type: "
 msgstr ""
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:136
 msgid "Si_gning certificate:"
 msgstr ""
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:137
 #, fuzzy
 msgid "Signat_ure:"
 msgstr "Singapor"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "Signatures"
 msgstr "Singapor"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr ""
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:140
 msgid "Spell Checking"
 msgstr ""
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:141
 msgid "Standard Unix mbox"
 msgstr ""
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "T_erminal Font:"
 msgstr "Kontakti origjinal:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "T_ype: "
 msgstr "Lloji:"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:149
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
 
-#: mail/mail-config.glade.h:148
-msgid "Use _Daemon"
-msgstr ""
-
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:152
 msgid "V_ariable-width:"
 msgstr ""
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:153
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Forward\" to begin. "
 msgstr ""
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:158
 msgid "_Add Signature"
 msgstr ""
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:159
 msgid "_Always load images from the Internet"
 msgstr ""
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:160
 msgid "_Digitally sign outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:161
 msgid "_Do not notify me when new mail arrives"
 msgstr ""
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:163
 msgid "_Enable"
 msgstr ""
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:165
 msgid "_Forward style:"
 msgstr ""
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:168
 msgid "_Load images if sender is in address book"
 msgstr ""
 
-#: mail/mail-config.glade.h:167
-msgid "_Local Tests Only"
-msgstr ""
-
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Make this my default account"
 msgstr ""
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_Mark messages as read after"
 msgstr ""
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 msgid "_Never load images from the Internet"
 msgstr ""
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr ""
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:175
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr ""
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:176
 msgid "_Reply style:"
 msgstr ""
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:177
 msgid "_Script:"
 msgstr ""
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:178
 msgid "_Show animated images"
 msgstr ""
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 msgid "_Use Secure Connection (SSL):"
 msgstr ""
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:181
 msgid "color"
 msgstr ""
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "përshkrimi"
 
@@ -15433,7 +14962,7 @@ msgstr ""
 
 #. mail:camel-exception primary
 #: mail/mail-errors.xml.h:57
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgid "Your message with the subject \"{0}\" was not delivered."
 msgstr ""
 
 #. mail:camel-exception secondary
@@ -15490,11 +15019,6 @@ msgstr ""
 msgid "Cannot save to directory \"{0}\"."
 msgstr ""
 
-#. mail:no-save-path secondary
-#: mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail:no-create-path primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
@@ -15513,12 +15037,6 @@ msgstr ""
 msgid "Cannot create temporary save directory."
 msgstr "E pamundur hapja e kartelës tek '%s'"
 
-#. mail:no-create-tmp-path secondary
-#: mail/mail-errors.xml.h:100 mail/mail-errors.xml.h:112
-#: widgets/misc/e-system-errors.xml.h:11 widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail:no-write-path-exists secondary
 #: mail/mail-errors.xml.h:104
 #, fuzzy
@@ -15775,179 +15293,175 @@ msgstr "Mbishkruaj"
 msgid "_Append"
 msgstr "_Mër"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:785
 #, c-format
 msgid "Pinging %s"
 msgstr ""
 
-#: mail/mail-mt.c:897
-msgid "Working"
-msgstr ""
-
-#: mail/mail-ops.c:99
+#: mail/mail-ops.c:98
 msgid "Filtering Folder"
 msgstr ""
 
-#: mail/mail-ops.c:260
+#: mail/mail-ops.c:259
 msgid "Fetching Mail"
 msgstr ""
 
-#: mail/mail-ops.c:543
+#: mail/mail-ops.c:542
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr ""
 
-#: mail/mail-ops.c:568
+#: mail/mail-ops.c:567
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:577
+#: mail/mail-ops.c:576
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr ""
 
-#: mail/mail-ops.c:673
+#: mail/mail-ops.c:672
 #, c-format
 msgid "Sending message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:703
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Lidhja me server-in LDAP dështoi"
 
-#: mail/mail-ops.c:708
+#: mail/mail-ops.c:707
 msgid "Complete."
 msgstr ""
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:804
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:1002
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1116
+#: mail/mail-ops.c:1115
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1159
+#: mail/mail-ops.c:1158
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1230
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1308
 #, c-format
 msgid "Removing folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1403
+#: mail/mail-ops.c:1402
 #, c-format
 msgid "Storing folder '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1468
+#: mail/mail-ops.c:1467
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1469
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1524
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr ""
 
-#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
+#: mail/mail-ops.c:1559 mail/mail-ops.c:1610
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1607
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1609
+#: mail/mail-ops.c:1608
 msgid "Local Folders"
 msgstr ""
 
-#: mail/mail-ops.c:1692
+#: mail/mail-ops.c:1691
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1764
+#: mail/mail-ops.c:1763
 #, fuzzy, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Mesazhi"
 msgstr[1] "Mesazhi"
 
-#: mail/mail-ops.c:1850
+#: mail/mail-ops.c:1849
 #, fuzzy, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Mesazhi"
 msgstr[1] "Mesazhi"
 
-#: mail/mail-ops.c:1900
+#: mail/mail-ops.c:1899
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1928
+#: mail/mail-ops.c:1927
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1999
+#: mail/mail-ops.c:1998
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:2016
+#: mail/mail-ops.c:2015
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2046
+#: mail/mail-ops.c:2045
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Reconnecting to %s"
 msgstr ""
@@ -16012,24 +15526,24 @@ msgstr ""
 msgid "Waiting..."
 msgstr ""
 
-#: mail/mail-session.c:238
+#: mail/mail-session.c:239
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-session.c:271
+#: mail/mail-session.c:272
 #, c-format
 msgid "Enter Password for %s"
 msgstr ""
 
-#: mail/mail-session.c:273
+#: mail/mail-session.c:274
 msgid "Enter Password"
 msgstr ""
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password"
 msgstr ""
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:298
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
@@ -16084,79 +15598,79 @@ msgstr "Lëvize tek kartela..."
 msgid "Updating vFolders for '%s'"
 msgstr "Lëvize tek kartela..."
 
-#: mail/mail-vfolder.c:959
+#: mail/mail-vfolder.c:958
 msgid "vFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:998
+#: mail/mail-vfolder.c:997
 msgid "Edit VFolder"
 msgstr ""
 
-#: mail/mail-vfolder.c:1082
+#: mail/mail-vfolder.c:1081
 msgid "New VFolder"
 msgstr ""
 
-#: mail/message-list.c:946
+#: mail/message-list.c:948
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:947
+#: mail/message-list.c:949
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:948
+#: mail/message-list.c:950
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:949
+#: mail/message-list.c:951
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:950
+#: mail/message-list.c:952
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:954
+#: mail/message-list.c:956
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:955
+#: mail/message-list.c:957
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:959
+#: mail/message-list.c:961
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:960
+#: mail/message-list.c:962
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:1279
+#: mail/message-list.c:1285
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:1286
+#: mail/message-list.c:1292
 msgid "Today %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1295
+#: mail/message-list.c:1301
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1307
+#: mail/message-list.c:1313
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1315
+#: mail/message-list.c:1321
 msgid "%b %d %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1317
+#: mail/message-list.c:1323
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:3300
+#: mail/message-list.c:3321
 msgid "Generating message list"
 msgstr ""
 
@@ -16212,6 +15726,10 @@ msgstr "Vazhdo"
 msgid "No Response Necessary"
 msgstr ""
 
+#: mail/message-tag-followup.c:79
+msgid "Read"
+msgstr ""
+
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr ""
@@ -16312,45 +15830,49 @@ msgid ""
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:10
-msgid "Whether Evolution should start up in offline mode"
+msgid "Toolbar is visible"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:11
-msgid "Whether to skip the development warning dialog"
+msgid "Whether Evolution should start up in offline mode"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Whether the toolbar should be visible."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:14
 #, fuzzy
 msgid "mail"
 msgstr "Email"
 
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
-msgstr ""
-
-#: shell/e-shell.c:545 shell/e-shell.c:546
+#: shell/e-shell.c:588 shell/e-shell.c:589
 #, fuzzy, c-format
 msgid "%ld KB"
 msgstr "%d %B"
 
-#: shell/e-shell.c:744
+#: shell/e-shell.c:786
 #, fuzzy
 msgid "Uknown system error."
 msgstr "Gabim i panjohur"
 
-#: shell/e-shell.c:1101
+#: shell/e-shell.c:1143
 msgid "Invalid arguments"
 msgstr "Argumente të pavlefshme"
 
-#: shell/e-shell.c:1103
+#: shell/e-shell.c:1145
 msgid "Cannot register on OAF"
 msgstr "I pamundur regjistrimi në OAF"
 
-#: shell/e-shell.c:1105
+#: shell/e-shell.c:1147
 msgid "Configuration Database not found"
 msgstr "Nuk u gjet databaza e konfigurimit "
 
-#: shell/e-shell.c:1107
+#: shell/e-shell.c:1149
 msgid "Generic error"
 msgstr "Gabim i përgjithshëm"
 
@@ -16398,7 +15920,7 @@ msgstr ""
 msgid "Select importer"
 msgstr ""
 
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1026
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
 #, c-format
 msgid "File %s does not exist"
 msgstr ""
@@ -16424,58 +15946,58 @@ msgid ""
 "Importing item 1."
 msgstr ""
 
-#: shell/e-shell-importer.c:549
+#: shell/e-shell-importer.c:570
 msgid "Automatic"
 msgstr "Në menyrë automatike"
 
-#: shell/e-shell-importer.c:598
+#: shell/e-shell-importer.c:626
 #, fuzzy
-msgid "_Filename:"
+msgid "F_ilename:"
 msgstr "Emri i file:"
 
-#: shell/e-shell-importer.c:603
+#: shell/e-shell-importer.c:631
 msgid "Select a file"
 msgstr "Zgjidh një file"
 
-#: shell/e-shell-importer.c:613
+#: shell/e-shell-importer.c:642
 #, fuzzy
 msgid "File _type:"
 msgstr "File _si:"
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:681
 msgid "Import data and settings from _older programs"
 msgstr ""
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:684
 msgid "Import a _single file"
 msgstr ""
 
-#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
 msgstr ""
 
-#: shell/e-shell-importer.c:727
+#: shell/e-shell-importer.c:756
 msgid "Starting Intelligent Importers"
 msgstr ""
 
-#: shell/e-shell-importer.c:853 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
 #, c-format
 msgid "From %s:"
 msgstr ""
 
-#: shell/e-shell-importer.c:1044
+#: shell/e-shell-importer.c:1073
 #, c-format
 msgid "No importer available for file %s"
 msgstr ""
 
-#: shell/e-shell-importer.c:1056
+#: shell/e-shell-importer.c:1085
 #, fuzzy
 msgid "Unable to execute importer"
 msgstr "E pamundur marrja e versionit aktual!"
 
-#: shell/e-shell-importer.c:1169
+#: shell/e-shell-importer.c:1199
 #, fuzzy
 msgid "_Import"
 msgstr "Importim"
@@ -16521,61 +16043,61 @@ msgstr "Emri i kartelës nuk mund të përmbajë shenjën \"#\"."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' and '..' janë emra kartelash të rezervuar."
 
-#: shell/e-shell-window.c:336
+#: shell/e-shell-window.c:337
 #, fuzzy
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution aktualisht është online.  Kliko tek ky buton për të punuar "
 "offline."
 
-#: shell/e-shell-window.c:343
+#: shell/e-shell-window.c:344
 #, fuzzy
 msgid "Evolution is in the process of going offline."
 msgstr "Ximian Evolution është në procesin e daljes offline."
 
-#: shell/e-shell-window.c:349
+#: shell/e-shell-window.c:350
 #, fuzzy
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution aktualisht është offline.  Kliko tek ky buton për të punuar "
 "online."
 
-#: shell/e-shell-window.c:621
+#: shell/e-shell-window.c:637
 #, c-format
 msgid "Switch to %s"
 msgstr ""
 
-#: shell/e-shell-window-commands.c:64
+#: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Veglat GNOME Pilot nuk duken të jenë të instaluara në këtë sistem."
 
-#: shell/e-shell-window-commands.c:72
+#: shell/e-shell-window-commands.c:74
 #, c-format
 msgid "Error executing %s."
 msgstr "Gabim gjatë ekzekutimit të %s."
 
-#: shell/e-shell-window-commands.c:121
+#: shell/e-shell-window-commands.c:123
 msgid "Bug buddy is not installed."
 msgstr "Bug buddy nuk është i instaluar."
 
-#: shell/e-shell-window-commands.c:129
+#: shell/e-shell-window-commands.c:131
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy nuk mund të vihet në funksionim."
 
-#: shell/e-shell-window-commands.c:171
+#: shell/e-shell-window-commands.c:323
 #, fuzzy
-msgid "About Evolution"
-msgstr "Informacione mbi Ximian Evolution"
+msgid "Groupware Suite"
+msgstr "Grupi"
 
-#: shell/e-shell-window-commands.c:382
+#: shell/e-shell-window-commands.c:563
 msgid "_Work Online"
 msgstr "_Puno online"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "_Puno offline"
 
-#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Puno online"
 
@@ -16587,32 +16109,6 @@ msgstr ""
 msgid "New"
 msgstr "E re"
 
-#: shell/evolution-shell-component-utils.c:115
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-
-#: shell/evolution-shell-component-utils.c:118
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-
-#: shell/evolution-shell-component-utils.c:125
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-
 #: shell/evolution-test-component.c:140
 #, fuzzy
 msgid "New Test"
@@ -16924,32 +16420,32 @@ msgid ""
 "Click help for details."
 msgstr ""
 
-#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:522
+#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
+#: smime/gui/certificate-manager.c:556
 #, fuzzy
 msgid "Select a cert to import..."
 msgstr "Zgjidh një veprim"
 
-#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:604
+#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
+#: smime/gui/certificate-manager.c:638
 msgid "Certificate Name"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
+#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
 #, fuzzy
 msgid "Purposes"
 msgstr "Progresi"
 
-#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:517
+#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:267
+#: smime/gui/certificate-manager.c:271
 msgid "Expires"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:417
+#: smime/gui/certificate-manager.c:446
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "Bashko adresën E-Mail"
@@ -16990,6 +16486,11 @@ msgid ""
 "  Subject: %s\n"
 msgstr ""
 
+#: smime/gui/e-cert-selector.c:169
+#, fuzzy
+msgid "Select certificate"
+msgstr "Zgjidh një file"
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -17046,7 +16547,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
 msgid "Certificate"
 msgstr ""
 
@@ -17067,20 +16568,23 @@ msgstr ""
 msgid "Contact Certificates"
 msgstr "_Lista e kontakteve"
 
-#: smime/gui/smime-ui.glade.h:21
-#, no-c-format
-msgid "Do you want to trust \"%s\" for the following purposes?"
+#: smime/gui/smime-ui.glade.h:20
+msgid "Do not trust the authenticity of this certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:21
 msgid "Dummy window only"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:22
 #, fuzzy
 msgid "Edit"
 msgstr "_Ndrysho"
 
+#: smime/gui/smime-ui.glade.h:23
+msgid "Email Certificate Trust Settings"
+msgstr ""
+
 #: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr ""
@@ -17115,258 +16619,269 @@ msgstr "Njësia organizative"
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:37
-msgid "Trust this CA to identify email users."
+msgid "Trust the authenticity of this certificate"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:38
-msgid "Trust this CA to identify software developers."
+msgid "Trust this CA to identify email users."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:39
-msgid "Trust this CA to identify web sites."
+msgid "Trust this CA to identify software developers."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:40
+msgid "Trust this CA to identify web sites."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:41
 #, fuzzy
 msgid "View"
 msgstr "_Shfaq"
 
-#: smime/gui/smime-ui.glade.h:41
-msgid "View Certificate"
-msgstr ""
-
 #: smime/gui/smime-ui.glade.h:42
-msgid "You have been asked to trust a new Certificate Authority (CA)."
+msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:43
-msgid "You have certificates from these organizations that identify you:"
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:44
-msgid ""
-"You have certificates on file that identify these certificate authorities:"
+msgid "You have certificates on file that identify these people:"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:45
-msgid "You have certificates on file that identify these people:"
+msgid "Your Certificates"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:46
-msgid "Your Certificates"
+msgid "_Edit CA Trust"
 msgstr ""
 
-#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
+#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 #, fuzzy
 msgid "%d/%m/%Y"
 msgstr "%d %B %Y"
 
-#: smime/lib/e-cert.c:478
+#. x509 certificate usage types
+#: smime/lib/e-cert.c:424
+#, fuzzy
+msgid "Sign"
+msgstr "Spanja"
+
+#: smime/lib/e-cert.c:425
+#, fuzzy
+msgid "Encrypt"
+msgstr "përshkrimi"
+
+#: smime/lib/e-cert.c:530
 #, fuzzy
 msgid "Version"
 msgstr "Pyetje"
 
-#: smime/lib/e-cert.c:493
+#: smime/lib/e-cert.c:545
 msgid "Version 1"
 msgstr ""
 
-#: smime/lib/e-cert.c:496
+#: smime/lib/e-cert.c:548
 msgid "Version 2"
 msgstr ""
 
-#: smime/lib/e-cert.c:499
+#: smime/lib/e-cert.c:551
 msgid "Version 3"
 msgstr ""
 
-#: smime/lib/e-cert.c:581
+#: smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:584
+#: smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:587
+#: smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:590
+#: smime/lib/e-cert.c:642
 msgid "C"
 msgstr ""
 
-#: smime/lib/e-cert.c:593
+#: smime/lib/e-cert.c:645
 #, fuzzy
 msgid "CN"
 msgstr "N"
 
-#: smime/lib/e-cert.c:596
+#: smime/lib/e-cert.c:648
 msgid "OU"
 msgstr ""
 
-#: smime/lib/e-cert.c:599
+#: smime/lib/e-cert.c:651
 #, fuzzy
 msgid "O"
 msgstr "OK"
 
-#: smime/lib/e-cert.c:602
+#: smime/lib/e-cert.c:654
 msgid "L"
 msgstr ""
 
-#: smime/lib/e-cert.c:605
+#: smime/lib/e-cert.c:657
 #, fuzzy
 msgid "DN"
 msgstr "N"
 
-#: smime/lib/e-cert.c:608
+#: smime/lib/e-cert.c:660
 msgid "DC"
 msgstr ""
 
-#: smime/lib/e-cert.c:611
+#: smime/lib/e-cert.c:663
 #, fuzzy
 msgid "ST"
 msgstr "S"
 
-#: smime/lib/e-cert.c:614
+#: smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:617
+#: smime/lib/e-cert.c:669
 msgid "Certificate Key Usage"
 msgstr ""
 
-#: smime/lib/e-cert.c:620
+#: smime/lib/e-cert.c:672
 msgid "Netscape Certificate Type"
 msgstr ""
 
-#: smime/lib/e-cert.c:623
+#: smime/lib/e-cert.c:675
 msgid "Certificate Authority Key Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:626
+#: smime/lib/e-cert.c:678
 #, fuzzy
 msgid "UID"
 msgstr "ID"
 
-#: smime/lib/e-cert.c:635
+#: smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr ""
 
-#: smime/lib/e-cert.c:686
+#: smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:694
+#: smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
 msgstr ""
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:768
 msgid "Subject Public Key Info"
 msgstr ""
 
-#: smime/lib/e-cert.c:721
+#: smime/lib/e-cert.c:773
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:736
+#: smime/lib/e-cert.c:788
 msgid "Subject's Public Key"
 msgstr ""
 
-#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
+#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
 msgid "Error: Unable to process extension"
 msgstr ""
 
-#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
+#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:782
+#: smime/lib/e-cert.c:834
 msgid "SSL Certificate Authority"
 msgstr ""
 
-#: smime/lib/e-cert.c:786
+#: smime/lib/e-cert.c:838
 msgid "Email Certificate Authority"
 msgstr ""
 
-#: smime/lib/e-cert.c:814
+#: smime/lib/e-cert.c:866
 msgid "Signing"
 msgstr ""
 
-#: smime/lib/e-cert.c:818
+#: smime/lib/e-cert.c:870
 msgid "Non-repudiation"
 msgstr ""
 
-#: smime/lib/e-cert.c:822
+#: smime/lib/e-cert.c:874
 msgid "Key Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:826
+#: smime/lib/e-cert.c:878
 msgid "Data Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:830
+#: smime/lib/e-cert.c:882
 msgid "Key Agreement"
 msgstr ""
 
-#: smime/lib/e-cert.c:834
+#: smime/lib/e-cert.c:886
 msgid "Certificate Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:838
+#: smime/lib/e-cert.c:890
 msgid "CRL Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:938
 #, fuzzy
 msgid "Critical"
 msgstr "Kroaci"
 
-#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
+#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
 msgid "Not Critical"
 msgstr ""
 
-#: smime/lib/e-cert.c:912
+#: smime/lib/e-cert.c:964
 #, fuzzy
 msgid "Extensions"
 msgstr "Përmasat:"
 
-#: smime/lib/e-cert.c:983
+#: smime/lib/e-cert.c:1035
 #, fuzzy, c-format
 msgid "%s = %s"
 msgstr "Aktiviteti - %s"
 
-#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
 msgid "Certificate Signature Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:1048
+#: smime/lib/e-cert.c:1100
 #, fuzzy
 msgid "Issuer"
 msgstr "_Shto"
 
-#: smime/lib/e-cert.c:1102
+#: smime/lib/e-cert.c:1154
 msgid "Issuer Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1121
+#: smime/lib/e-cert.c:1173
 msgid "Subject Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1164
+#: smime/lib/e-cert.c:1216
 msgid "Certificate Signature Value"
 msgstr ""
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
+#: smime/lib/e-cert-db.c:608
 #, fuzzy
 msgid "Certificate already exists"
 msgstr "ID e card ekziston"
@@ -17514,7 +17029,7 @@ msgstr ""
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "_Veprimet"
 
@@ -17681,7 +17196,7 @@ msgstr "M_byll"
 #: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:3
+#: ui/evolution.xml.h:4
 msgid "Close"
 msgstr "Mbyll"
 
@@ -17694,7 +17209,7 @@ msgid "Delete this item"
 msgstr ""
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr "Paneli qëndror i instrumentëve"
 
@@ -17737,7 +17252,7 @@ msgstr ""
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:44
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "_File"
 msgstr "_File"
 
@@ -17995,13 +17510,13 @@ msgstr ""
 msgid "_Threaded Message List"
 msgstr ""
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Mbylle këtë dritare"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "_Close"
 msgstr "_Mbylle"
 
@@ -18402,7 +17917,7 @@ msgstr ""
 msgid "_Quoted"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
 msgid "_Tools"
 msgstr "_Instrumentë"
 
@@ -18702,108 +18217,120 @@ msgid "_Open Task"
 msgstr "_Aktivitet"
 
 #: ui/evolution.xml.h:1
-msgid "About Ximian Evolution..."
-msgstr ""
+#, fuzzy
+msgid "About Evolution..."
+msgstr "Informacione mbi Ximian Evolution"
 
 #: ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
 msgstr ""
 
-#: ui/evolution.xml.h:5
+#: ui/evolution.xml.h:3
+msgid "Change the visibility of the toolbar"
+msgstr ""
+
+#: ui/evolution.xml.h:6
 #, fuzzy
 msgid "Create a new window displaying this folder"
 msgstr "Krijo një kontakt të ri"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "D_il"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Alarmi i Evolution"
+
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Përfundo programin"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:10
 msgid "Forget _Passwords"
 msgstr ""
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:11
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr ""
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:12
 msgid "Import data from other programs"
 msgstr ""
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:14
 #, fuzzy
 msgid "New _Window"
 msgstr "Hape në një dritare të re"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Pi_lot Settings..."
 msgstr ""
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Send / Receive"
 msgstr ""
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Send queued items and retrieve new items"
 msgstr ""
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Set up Pilot configuration"
 msgstr ""
 
-#: ui/evolution.xml.h:17
-msgid "Show information about Ximian Evolution"
+#: ui/evolution.xml.h:19
+msgid "Show information about Evolution"
 msgstr ""
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:20
 msgid "Submit Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:21
 msgid "Submit _Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Submit a bug report using Bug Buddy"
 msgstr ""
 
-#: ui/evolution.xml.h:21
-msgid "Toggle whether we are working offline."
-msgstr ""
-
 #: ui/evolution.xml.h:23
-msgid "Ximian Evolution _FAQ"
-msgstr ""
+#, fuzzy
+msgid "T_oolbar"
+msgstr "Paneli qëndror i instrumentëve"
 
 #: ui/evolution.xml.h:24
-msgid "_About Ximian Evolution..."
+msgid "Toggle whether we are working offline."
 msgstr ""
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "_About Evolution..."
+msgstr "Informacione mbi Ximian Evolution"
+
+#: ui/evolution.xml.h:30
 msgid "_Help"
 msgstr "_Ndihmë"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "_Import..."
 msgstr ""
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "_New"
 msgstr "_E re"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "_Quick Reference"
 msgstr ""
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_Send / Receive"
 msgstr ""
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 #, fuzzy
 msgid "_Window"
 msgstr "Hape në një dritare të re"
@@ -18880,7 +18407,7 @@ msgid "With _Status"
 msgstr "Gjendja"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:626
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:635
 msgid "UTC"
 msgstr "UTC"
 
@@ -19034,30 +18561,30 @@ msgstr ""
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
-#: widgets/misc/e-error.c:121
+#: widgets/misc/e-error.c:79 widgets/misc/e-error.c:80
+#: widgets/misc/e-error.c:122
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Alarmi i Evolution"
 
-#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
-#: widgets/misc/e-error.c:119
+#: widgets/misc/e-error.c:81 widgets/misc/e-error.c:82
+#: widgets/misc/e-error.c:120
 #, fuzzy
 msgid "Evolution Warning"
 msgstr "Alarmi i Evolution"
 
-#: widgets/misc/e-error.c:118
+#: widgets/misc/e-error.c:119
 #, fuzzy
 msgid "Evolution Information"
 msgstr "Kontrolli i konfigurimit të kalendarit të Evolution"
 
-#: widgets/misc/e-error.c:120
+#: widgets/misc/e-error.c:121
 #, fuzzy
 msgid "Evolution Query"
 msgstr "Alarmi i Evolution"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:410
+#: widgets/misc/e-error.c:415
 #, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -19204,16 +18731,251 @@ msgstr "Hap file"
 msgid "Cannot open file \"{0}\"."
 msgstr "Hap file"
 
-#: widgets/misc/e-task-widget.c:211
+#: widgets/misc/e-task-widget.c:212
 #, c-format
 msgid "%s (...)"
 msgstr ""
 
-#: widgets/misc/e-task-widget.c:216
+#: widgets/misc/e-task-widget.c:217
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr ""
 
+#~ msgid "Failed to connect to LDAP server"
+#~ msgstr "Lidhja me server-in LDAP dështoi"
+
+#~ msgid "Failed to authenticate with LDAP server"
+#~ msgstr "Identifikimi me server-in LDAP dështoi"
+
+#~ msgid "Could not perform query on Root DSE"
+#~ msgstr "E pamundur kryerja e kërkesave tek DSE Root"
+
+#~ msgid "The server responded with no supported search bases"
+#~ msgstr "Server-i u përgjigj me baza kërkesash të pasuportuara"
+
+#~ msgid "This server does not support LDAPv3 schema information"
+#~ msgstr "Ky server nuk suporton informacionet e skemës LDAPv3"
+
+#~ msgid "Error retrieving schema information"
+#~ msgstr "Gabim gjatë tërheqjes së informacionit të skemës"
+
+#~ msgid "Server did not respond with valid schema information"
+#~ msgstr "Server-i nuk përgjigjet me informacion skeme të vlefshëm"
+
+#~ msgid "  S_how Supported Bases "
+#~ msgstr "  S_hfaq bazat e suportuara "
+
+#~ msgid "1:00"
+#~ msgstr "1:00"
+
+#~ msgid "5:00"
+#~ msgstr "5:00"
+
+#~ msgid "Connecting"
+#~ msgstr "Duke lidhur"
+
+#~ msgid "Distinguished _name:"
+#~ msgstr "_Emri dallues:"
+
+#~ msgid "Email address:"
+#~ msgstr "Adresa Email:"
+
+#~ msgid "Evolution will use this DN to authenticate you with the server"
+#~ msgstr "Evolution do të përdorë këtë DN për t'ju autentifikuar me server-in"
+
+#~ msgid "One"
+#~ msgstr "Një"
+
+#~ msgid "S_earch scope: "
+#~ msgstr "F_usha e kërkimit: "
+
+#~ msgid "Searching"
+#~ msgstr "Duke kërkuar"
+
+#~ msgid "Sub"
+#~ msgstr "Sub"
+
+#~ msgid "This option controls how long a search will be run."
+#~ msgstr "Ky opcion kontrollon kohëzgjatjen e një kërkimi."
+
+#~ msgid "U_se SSL/TLS:"
+#~ msgstr "Pë_rdor SSL/TLS:"
+
+#~ msgid "_Display name:"
+#~ msgstr "Emri i _dukshëm:"
+
+#~ msgid "_Port number:"
+#~ msgstr "Numri i _portës:"
+
+#~ msgid "_Search base:"
+#~ msgstr "Baza e _kërkimit:"
+
+#~ msgid "_Server name:"
+#~ msgstr "Emri i _server-it:"
+
+#~ msgid "_Timeout (minutes):"
+#~ msgstr "_Timeout (në minuta):"
+
+#~ msgid "connecting-tab"
+#~ msgstr "gjuhëza-lidhjes"
+
+#~ msgid "general-tab"
+#~ msgstr "gjuhëza-e përgjithshme"
+
+#~ msgid "searching-tab"
+#~ msgstr "gjuhëza-kërkimit"
+
+#, fuzzy
+#~ msgid "Job title:"
+#~ msgstr "_Titulli:"
+
+#, fuzzy
+#~ msgid "Webcam:"
+#~ msgstr "Faqja"
+
+#~ msgid "Category editor not available."
+#~ msgstr "Editori i kategorive nuk është disponibël."
+
+#~ msgid "Could not find widget for a field: `%s'"
+#~ msgstr "E pamundur gjetja e widget për një fushë: `%s'"
+
+#~ msgid "Do you want to save changes?"
+#~ msgstr "Dëshiron të ruash ndryshimet e kryera?"
+
+#~ msgid "Error saving %s: %s"
+#~ msgstr "Gabim gjatë ruajtjes së %s: %s"
+
+#~ msgid ""
+#~ "The addressbook backend for\n"
+#~ "%s\n"
+#~ "has crashed. You will have to restart Evolution in order to use it again"
+#~ msgstr ""
+#~ "Backend i rubrikës për\n"
+#~ "%s\n"
+#~ "shkoi në krash. Do t'ju duhet të rinisni Evolution që ta përdorni përsëri"
+
+#, fuzzy
+#~ msgid "Can not load URI"
+#~ msgstr "Card nuk u gjet"
+
+#, fuzzy
+#~ msgid "Calendar Properties"
+#~ msgstr "Kalendari"
+
+#, fuzzy
+#~ msgid "Remote"
+#~ msgstr "Hiq"
+
+#, fuzzy
+#~ msgid "Task List Properties"
+#~ msgstr "Lista e aktiviteteve"
+
+#, fuzzy
+#~ msgid "_Source URL:"
+#~ msgstr "Buruesi"
+
+#~ msgid ""
+#~ "The event being deleted is a meeting, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "Ngjarja e fshirë është një mbledhje, dëshiron të dërgosh një njoftim "
+#~ "anullimi?"
+
+#~ msgid "Are you sure you want to cancel and delete this meeting?"
+#~ msgstr "Jeni i sigurt që dëshironi të anulloni dhe të fshini këtë mbledhje?"
+
+#~ msgid ""
+#~ "The task being deleted is assigned, would you like to send a cancellation "
+#~ "notice?"
+#~ msgstr "Ngjarja e fshirë u caktua, dëshiron të dërgosh një njoftim fshirje?"
+
+#~ msgid "Are you sure you want to cancel and delete this task?"
+#~ msgstr ""
+#~ "Jeni i sigurt që dëshironi të anulloni dhe të fshini këtë aktivitet?"
+
+#~ msgid ""
+#~ "The journal entry being deleted is published, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr "Zëri i fshirë u publikua, dëshiron të dërgosh një njoftim fshirje?"
+
+#~ msgid "Are you sure you want to cancel and delete this journal entry?"
+#~ msgstr "Jeni i sigurt që dëshironi të anulloni dhe të fshini këtë zë?"
+
+#~ msgid "Are you sure you want to delete the appointment `%s'?"
+#~ msgstr "Jeni i sigurt që dëshironi të eleminoni takimin `%s'?"
+
+#~ msgid "Are you sure you want to delete this untitled appointment?"
+#~ msgstr "Jeni i sigurt që dëshironi të eleminoni këtë takim pa emër?"
+
+#~ msgid "Are you sure you want to delete the task `%s'?"
+#~ msgstr "Jeni i sigurt që dëshironi të eleminoni aktivitetin `%s'?"
+
+#~ msgid "Are you sure you want to delete this untitled task?"
+#~ msgstr "Jeni i sigurt që dëshironi të eleminoni aktivitetin pa emër?"
+
+#~ msgid "Are you sure you want to delete the journal entry `%s'?"
+#~ msgstr "Jeni i sigurt që dëshironi të eleminoni zërin e ditarit `%s'?"
+
+#~ msgid "Are you sure want to delete this untitled journal entry?"
+#~ msgstr "Jeni i sigurt që dëshironi të eleminoni këtë zë ditari pa emër? "
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d appointment?"
+#~ msgid_plural "Are you sure you want to delete %d appointments?"
+#~ msgstr[0] "Jeni i sigurt që dëshironi të eleminoni %d takimet?"
+#~ msgstr[1] "Jeni i sigurt që dëshironi të eleminoni %d takimet?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d task?"
+#~ msgid_plural "Are you sure you want to delete %d tasks?"
+#~ msgstr[0] "Jeni i sigurt që dëshironi të eleminoni %d aktivitetet?"
+#~ msgstr[1] "Jeni i sigurt që dëshironi të eleminoni %d aktivitetet?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d journal entry?"
+#~ msgid_plural "Are you sure you want to delete %d journal entries?"
+#~ msgstr[0] "Jeni i sigurt që dëshironi të eleminoni %d zërat e ditarit?"
+#~ msgstr[1] "Jeni i sigurt që dëshironi të eleminoni %d zërat e ditarit?"
+
+#, fuzzy
+#~ msgid "Could not get article %s from NNTP server"
+#~ msgstr "Nuk arrij të nis server-in wombat"
+
+#, fuzzy
+#~ msgid "Stream error"
+#~ msgstr "Gabim tjetër"
+
+#, fuzzy
+#~ msgid "Connection error: %s"
+#~ msgstr "Hapi 2: lidhja me server-in"
+
+#, fuzzy
+#~ msgid "Could not get messages: unspecified error"
+#~ msgstr "E pamundur hapja e kartelës tek '%s'"
+
+#~ msgid "Draft"
+#~ msgstr "Kopje e keqe"
+
+#, fuzzy
+#~ msgid "Junk Test"
+#~ msgstr "Qershor"
+
+#, fuzzy
+#~ msgid "Message is Junk"
+#~ msgstr "Mesazhi"
+
+#, fuzzy
+#~ msgid "Message is not Junk"
+#~ msgstr "Mesazhi që duhet dërguar"
+
+#, fuzzy
+#~ msgid "Pipe to Program"
+#~ msgstr "Përfundo programin"
+
+#, fuzzy
+#~ msgid "Run Program"
+#~ msgstr "Ekzekuto programin:"
+
 #~ msgid "Evolution Addressbook folder viewer"
 #~ msgstr "Shikuesi i kartelave të librit të adresave të Evolution"
 
@@ -19449,9 +19211,6 @@ msgstr ""
 #~ msgid "Primary _email:"
 #~ msgstr "Email _kryesor:"
 
-#~ msgid "S_pouse:"
-#~ msgstr "Bashkë_shorti/ja:"
-
 #~ msgid "_Business:"
 #~ msgstr "_Zyra:"
 
@@ -19467,9 +19226,6 @@ msgstr ""
 #~ msgid "_Mobile:"
 #~ msgstr "_Telefonini:"
 
-#~ msgid "_Office:"
-#~ msgstr "_Zyra:"
-
 #~ msgid "_Public Calendar URL:"
 #~ msgstr "URL e kalendarit _publik:"
 
@@ -19650,10 +19406,6 @@ msgstr ""
 #~ msgid "Search"
 #~ msgstr "_Kërko"
 
-#, fuzzy
-#~ msgid "Encryption"
-#~ msgstr "përshkrimi"
-
 #~ msgid "Quit Assistant"
 #~ msgstr "Përfundo asistentin"
 
diff --git a/po/sr.po b/po/sr.po
index dd037b9d95..751104e1e2 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 2.0\n"
-"POT-Creation-Date: 2004-05-19 14:00-0400\n"
+"POT-Creation-Date: 2004-06-03 11:14-0400\n"
 "PO-Revision-Date: 2004-03-26 17:35+0100\n"
 "Last-Translator: Данило Шеган <danilo@prevod.org>\n"
 "Language-Team: Serbian (sr) <serbiangnome-lista@nongnu.org>\n"
@@ -60,13 +60,13 @@ msgstr " карта"
 msgid "Default Sync Address:"
 msgstr "Подразумевана адреса за синхронизовање:"
 
-#: addressbook/conduit/address-conduit.c:1150
 #: addressbook/conduit/address-conduit.c:1151
+#: addressbook/conduit/address-conduit.c:1152
 msgid "Could not load addressbook"
 msgstr "Нисам могао да учитам адресар"
 
-#: addressbook/conduit/address-conduit.c:1219
-#: addressbook/conduit/address-conduit.c:1222
+#: addressbook/conduit/address-conduit.c:1220
+#: addressbook/conduit/address-conduit.c:1223
 msgid "Could not read pilot's Address application block"
 msgstr "Нисам могао да прочитам програмски блок адреса пилота"
 
@@ -74,13 +74,13 @@ msgstr "Нисам могао да прочитам програмски бло�
 msgid "Accessing LDAP Server anonymously"
 msgstr "Анонимно приступам LDAP серверу"
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
 msgid "Failed to authenticate.\n"
 msgstr "Нисам могао да се пријавим.\n"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sУнеси лозинку за %s (корисник %s)"
@@ -124,51 +124,23 @@ msgstr "_Контакти:"
 msgid "Create a new contacts group"
 msgstr "Направи нову групу пречица"
 
-#: addressbook/gui/component/addressbook-component.c:182
+#: addressbook/gui/component/addressbook-component.c:184
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:483
-msgid "Failed to connect to LDAP server"
-msgstr "Неуспешно повезивање са LDAP сервером"
-
-#: addressbook/gui/component/addressbook-config.c:507
-msgid "Failed to authenticate with LDAP server"
-msgstr "Неуспешна пријава на LDAP сервер"
-
-#: addressbook/gui/component/addressbook-config.c:535
-msgid "Could not perform query on Root DSE"
-msgstr "Нисам могао да обавим упит на Root DSE"
-
-#: addressbook/gui/component/addressbook-config.c:840
-msgid "The server responded with no supported search bases"
-msgstr "Сервер је одговорио неподржаним базама за претрагу"
-
-#: addressbook/gui/component/addressbook-config.c:1245
-msgid "This server does not support LDAPv3 schema information"
-msgstr "Овај сервер не подржава податке LDAPv3 шеме"
-
-#: addressbook/gui/component/addressbook-config.c:1266
-msgid "Error retrieving schema information"
-msgstr "Грешка у читању података шеме"
-
-#: addressbook/gui/component/addressbook-config.c:1274
-msgid "Server did not respond with valid schema information"
-msgstr "Сервер није одговорио са исправним подацима шеме"
-
 #: addressbook/gui/component/addressbook-migrate.c:68
-#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1160
 msgid "Migrating..."
 msgstr "Преносим..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1201
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Преносим „%s“:"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:438
+#: addressbook/gui/component/addressbook-migrate.c:464
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
 #: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
@@ -176,28 +148,28 @@ msgid "On This Computer"
 msgstr "На овом рачунару"
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:446
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
-#: mail/mail-config.glade.h:106
+#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
+#: mail/mail-config.glade.h:109
 msgid "Personal"
 msgstr "Лично"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:454
+#: addressbook/gui/component/addressbook-migrate.c:480
 msgid "On LDAP Servers"
 msgstr "На LDAP серверима"
 
-#: addressbook/gui/component/addressbook-migrate.c:582
+#: addressbook/gui/component/addressbook-migrate.c:608
 msgid "LDAP Servers"
 msgstr "LDAP сервери"
 
-#: addressbook/gui/component/addressbook-migrate.c:702
+#: addressbook/gui/component/addressbook-migrate.c:728
 msgid "Autocompletion Settings"
 msgstr "Подешавање самодопуњавања"
 
-#: addressbook/gui/component/addressbook-migrate.c:1076
+#: addressbook/gui/component/addressbook-migrate.c:1104
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -209,7 +181,7 @@ msgstr ""
 "\n"
 "Будите стрпљиви док Еволуција пренесе ваше директоријуме..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1090
+#: addressbook/gui/component/addressbook-migrate.c:1118
 #, fuzzy
 msgid ""
 "The format of mailing list contacts has changed.\n"
@@ -221,7 +193,7 @@ msgstr ""
 "\n"
 "Будите стрпљиви док Еволуција пренесе ваше директоријуме..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1099
+#: addressbook/gui/component/addressbook-migrate.c:1127
 #, fuzzy
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
@@ -233,7 +205,7 @@ msgstr ""
 "\n"
 "Будите стрпљиви док Еволуција пренесе ваше директоријуме..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1109
+#: addressbook/gui/component/addressbook-migrate.c:1137
 #, fuzzy
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
@@ -245,38 +217,33 @@ msgstr ""
 "\n"
 "Будите стрпљиви док Еволуција пренесе ваше директоријуме..."
 
-#: addressbook/gui/component/addressbook-view.c:674
+#: addressbook/gui/component/addressbook-view.c:675
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr "Адресар „%s“ ће бити уклоњен. Сигурно желите да наставите?"
 
-#: addressbook/gui/component/addressbook-view.c:761
+#: addressbook/gui/component/addressbook-view.c:754
 msgid "New Address Book"
 msgstr "Нови адресар"
 
-#: addressbook/gui/component/addressbook-view.c:762
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
+#: addressbook/gui/component/addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Обриши"
 
-#: addressbook/gui/component/addressbook-view.c:763
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-view.c:756
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Особине..."
 
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/addressbook-view.c:1002
+#. Create the contacts group
+#: addressbook/gui/component/addressbook-view.c:995
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
 #: calendar/gui/migration.c:373
 msgid "Contacts"
 msgstr "Контакти"
@@ -357,10 +324,6 @@ msgid "Manage your S/MIME certificates here"
 msgstr "Овде управљајте вашим S/MIME сертификатима"
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-msgid "  S_how Supported Bases "
-msgstr " П_окажи подржане базе "
-
-#: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -375,203 +338,170 @@ msgstr " П_окажи подржане базе "
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1:00"
-msgstr "1:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
-msgstr "5:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "Идентификација"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
 #, fuzzy
 msgid "<b>Display</b>"
 msgstr "<b>Основе</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 #, fuzzy
 msgid "<b>Downloading</b>"
 msgstr "<b>_Место</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:10
 #, fuzzy
 msgid "<b>Searching</b>"
 msgstr "Тражим"
 
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
 msgid "<b>Server Information</b>"
 msgstr "2. корак: подаци сервера"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
 msgid "<b>Type:</b>"
 msgstr "<b>Онда</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:13
 #, fuzzy
 msgid "Add Contacts Group"
 msgstr "_Контакти:"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Address Book Properties"
 msgstr "Особине адресара"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
-#: mail/mail-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
+#: mail/mail-config.glade.h:42
 msgid "Always"
 msgstr "Увек"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr "Анонимно"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:17
 #: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Основно"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
-msgid "Connecting"
-msgstr "Повезујем се"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 #: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Детаљи"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
-msgid "Distinguished _name:"
-msgstr "Посебно _име:"
-
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:19
 #, fuzzy
 msgid "Distinguished name"
 msgstr "Посебно _име:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:20
 #, fuzzy
 msgid "Download limit:"
 msgstr "Лимит за _преузимање:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Email address"
 msgstr "Електронска адреса:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "Email address:"
-msgstr "Електронска адреса:"
-
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "Evolution will use this DN to authenticate you with the server"
-msgstr "Еволуција ће користити овај DN за пријављивање на сервер"
-
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:22
+#, fuzzy
 msgid ""
-"Evolution will use this email address to authenticate you with the server"
+"Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "Еволуција ће користити ову електронску адресу за пријављивање на сервер"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:23
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Подржане базе за претрагу"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:24
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
+#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Опште"
 
-#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
-#: mail/mail-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
+#: mail/mail-config.glade.h:102
 msgid "Never"
 msgstr "Никада"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
-msgid "One"
-msgstr "Један"
-
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:35
-msgid "S_earch scope: "
-msgstr "Опсег п_ретраге:"
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Search _base:"
+msgstr "Претражи базу:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
 msgid "Search base only"
 msgstr "Претражи базу:"
 
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid "Search base:"
 msgstr "Претражи базу:"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Search scope:"
 msgstr "Опсег п_ретраге:"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
-msgid "Searching"
-msgstr "Тражим"
-
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:31
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
-"server if\n"
-"your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL or TLS."
 msgstr ""
 "Избор ове опције значи да ће се Еволуција повезати на ваш LDAP сервер само "
 "акоi\n"
 "он подржава SSL или TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a \n"
-"insecure environment. For example, if you and your LDAP server are behind a "
-"firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection "
-"is already\n"
-"secure."
+"you are in a insecure environment. For example, if you and your LDAP server "
+"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
+"because your connection is already secure."
 msgstr ""
 "Одабирање ове опције значи да ће Еволуција покушати да користи само SSL/TLS "
 "ако окружење \n"
@@ -580,71 +510,65 @@ msgstr ""
 "онда нема потребе да Еволуција користи SSL/TLS јер је ваша веза већ\n"
 "безбедна."
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:33
+#, fuzzy
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
-"TLS.  This \n"
-"means that your connection will be insecure, and that you will be vulnerable "
-"to security\n"
-"exploits. "
+"TLS.  This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits. "
 msgstr ""
 "Одабирање ове опције значи да ваш сервер не подржава ни SSL ни TLS.  То \n"
 "значи да ће ваша беза бити несигурна, и да ћете бити рањиви на сигурносне\n"
 "нападе. "
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Sub"
-msgstr "Под"
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr "Подржане базе за претрагу"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
-"searches will \n"
-"begin. If you leave this blank, the search will begin at the root of the "
-"directory tree."
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
 msgstr ""
 "База за претрагу је посебно име (DN) уноса одакле ће ваша претрага\n"
 "почети. Ако ово оставите празно, претрага ће почети из корена стабла "
 "директоријума."
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:37
+#, fuzzy
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
-"the \n"
-"directory tree. A search scope of \"sub\" will include all entries below "
-"your search base.\n"
-"A search scope of \"one\" will only include the entries one level beneath "
-"your base.\n"
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
 msgstr ""
 "Опсег претраге одређује дубину претраге по стаблу директоријума. Опсег "
 "претраге \n"
 "\"sub\" ће укључити све уносе испод ваше базе за претрагу. Опсег претраге "
 "\"one\" ће укључити само уносе један ниво испод ваше базе.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:58
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "Ово је пуно име вашег ldap сервера. На пример, \"ldap.mojafirma.com\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:39
+#, fuzzy
 msgid ""
-"This is the maximum number of entries to download. Setting this number to "
-"be \n"
+"This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr ""
 "Ово је највећи број уноса за преузимање. Ако унесете сувише велики \n"
 "број, успорићете ваш адресар."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -654,142 +578,121 @@ msgstr ""
 "укључивање овога на \"Email Address\" захтева анонимни приступ на ваш ldap "
 "сервер."
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:41
+#, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
-"list.\n"
-"It is for display purposes only. "
+"list. It is for display purposes only. "
 msgstr ""
 "Ово је име сервера које ће се појавити у листи директоријума Еволуције.\n"
 "То је само за потребе приказивања. "
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:42
+#, fuzzy
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. "
-"A \n"
-"list of standard ports has been provided. Ask your system administrator\n"
-"what port you should specify."
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
 msgstr ""
 "Ово је порт LDAP сервера на који ће се Еволуција покушати да повеже. "
 "Понуђен\n"
 "је списак стандардних портова. Питајте свог систем администратора\n"
 "који порт да одаберете."
 
-#: addressbook/gui/component/ldap-config.glade.h:67
-msgid "This option controls how long a search will be run."
-msgstr "Ова опција контролише колико ће претрага трајати."
-
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:43
 #, fuzzy
 msgid "Timeout:"
 msgstr "Формат за време:"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
-msgid "U_se SSL/TLS:"
-msgstr "К_ористи SSL/TLS:"
-
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr "Користим посебно име (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr "Користим електронску адресу"
 
-#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
-#: mail/mail-config.glade.h:154
+#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
+#: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr "Када је могуће"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:47
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "_Контакти:"
 
-#: addressbook/gui/component/ldap-config.glade.h:74
-#: calendar/gui/dialogs/calendar-setup.glade.h:12
-msgid "_Display name:"
-msgstr "_Име:"
-
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr "Лимит за _преузимање:"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
 msgid "_Email address:"
 msgstr "Електронска адреса:"
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:50
+#, fuzzy
+msgid "_Find Possible Search Bases"
+msgstr "Подржане базе за претрагу"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Log in method:"
 msgstr "Метод _пријаве:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "_Log in:"
+msgstr "Пријава"
+
+#: addressbook/gui/component/ldap-config.glade.h:53
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
 msgid "_Name:"
 msgstr "_Име:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
-msgid "_Port number:"
-msgstr "Број _порта:"
-
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "_Port:"
 msgstr "_Важност:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
-msgid "_Search base:"
-msgstr "База _претраге:"
-
-#: addressbook/gui/component/ldap-config.glade.h:82
-msgid "_Server name:"
-msgstr "Име _сервера:"
+#: addressbook/gui/component/ldap-config.glade.h:55
+#, fuzzy
+msgid "_Search scope:"
+msgstr "Опсег п_ретраге:"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:56
 #, fuzzy
 msgid "_Server:"
 msgstr "С_ервер:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
-msgid "_Timeout (minutes):"
-msgstr "_Одзив (минути):"
+#: addressbook/gui/component/ldap-config.glade.h:57
+#, fuzzy
+msgid "_Timeout:"
+msgstr "Формат за време:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:58
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "_Користи безбедну везу (SSL):"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "карте"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
-msgid "connecting-tab"
-msgstr "језичак за везу"
-
-#: addressbook/gui/component/ldap-config.glade.h:88
-msgid "general-tab"
-msgstr "језичак за опште податке"
-
 # bug: plural-forms
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:60
 #: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
-#: mail/mail-config.glade.h:182
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "минута"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
-msgid "searching-tab"
-msgstr "језичак за претрагу"
-
-#: addressbook/gui/component/select-names/e-select-names.c:497
+#: addressbook/gui/component/select-names/e-select-names.c:503
 #: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid "Select Contacts from Address Book"
 msgstr "Изаберите контакте из адресара"
 
-#: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
@@ -829,7 +732,7 @@ msgstr "Неименовани контакт"
 
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:222
+#: addressbook/gui/widgets/e-addressbook-view.c:224
 msgid "Source"
 msgstr "Извор"
 
@@ -903,9 +806,9 @@ msgid "<b>Work</b>"
 msgstr "<b>Радна недеља</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
-#: addressbook/gui/widgets/eab-contact-display.c:342
-#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/widgets/eab-contact-display.c:334
+#: addressbook/gui/widgets/eab-contact-display.c:353
 msgid "AIM"
 msgstr "АИМ"
 
@@ -945,15 +848,15 @@ msgid "Company:"
 msgstr "Наредба:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:271
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
+#: addressbook/gui/contact-editor/e-contact-editor.c:266
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
 msgstr "Контакт"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1527
+#: addressbook/gui/contact-editor/e-contact-editor.c:520
 msgid "Contact Editor"
 msgstr "Уредник контаката"
 
@@ -977,82 +880,79 @@ msgid "Full _Name..."
 msgstr "Пуно _име..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:202
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-msgid "Home"
-msgstr "Кућа"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #, fuzzy
 msgid "Home Page:"
 msgstr "Лична страница"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-#, fuzzy
-msgid "Job title:"
-msgstr "Назив _посла:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/e-itip-control.c:936
-msgid "Location:"
-msgstr "Место:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "МСН гласник"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 #, fuzzy
 msgid "Mailing Address"
 msgstr "Е-адреса"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 #, fuzzy
 msgid "Manager:"
 msgstr "Управник"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "_Надимак:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Notes:"
 msgstr "Бе_лешке:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr "Новел Групвајз"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
-#: addressbook/gui/contact-editor/e-contact-editor.c:203
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-msgid "Other"
-msgstr "Друго"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#, fuzzy
+msgid "Office:"
+msgstr "_Канцеларија:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "PO Box:"
 msgstr "_Поштански број:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 #, fuzzy
 msgid "Personal Information"
 msgstr "Опционе информације"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 #, fuzzy
 msgid "Profession:"
 msgstr "З_анимање:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#, fuzzy
+msgid "Spouse:"
+msgstr "С_упружник:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "State/Province:"
 msgstr "_Република/Провинција"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#, fuzzy
+msgid "Title:"
+msgstr "_Наслов:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+msgid "Video Chat:"
+msgstr ""
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:41
 #, fuzzy
 msgid "Wants to receive HTML mail"
@@ -1060,15 +960,15 @@ msgstr "Жели да прима _HTML поруке"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:42
 #, fuzzy
-msgid "Webcam:"
-msgstr "Веб страница:"
+msgid "Web Log:"
+msgstr "_Веб страница:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
-#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
-#: mail/mail-config.glade.h:155
+#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
+#: mail/mail-config.glade.h:157
 msgid "Work"
 msgstr "Посао"
 
@@ -1088,19 +988,12 @@ msgid "_File under:"
 msgstr "Назив датотеке:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 #, fuzzy
 msgid "_Where:"
 msgstr "С_ервер:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
-msgid "item7"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
-msgid "item8"
-msgstr ""
-
-#: addressbook/gui/contact-editor/eab-editor.c:316
+#: addressbook/gui/contact-editor/eab-editor.c:315
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -1108,7 +1001,7 @@ msgstr ""
 "Јесте ли сигурни да хоћете\n"
 "да обришете ове контакте?"
 
-#: addressbook/gui/contact-editor/eab-editor.c:319
+#: addressbook/gui/contact-editor/eab-editor.c:318
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -1117,16 +1010,16 @@ msgstr ""
 "да обришете овај контакт?"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:351
-#: addressbook/gui/widgets/eab-contact-display.c:372
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Address"
 msgstr "Адреса"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:292
+#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard.c:174
@@ -2105,86 +1998,109 @@ msgstr "Замбија"
 msgid "Zimbabwe"
 msgstr "Зимбабве"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/contact-editor/e-contact-editor.c:179
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:337
+#: addressbook/gui/widgets/eab-contact-display.c:356
 msgid "Jabber"
 msgstr "Џабер"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:347
-#: addressbook/gui/widgets/eab-contact-display.c:366
+#: addressbook/gui/contact-editor/e-contact-editor.c:180
+#: addressbook/gui/widgets/eab-contact-display.c:339
+#: addressbook/gui/widgets/eab-contact-display.c:358
 msgid "Yahoo"
 msgstr "Јаху"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: addressbook/gui/widgets/eab-contact-display.c:338
+#: addressbook/gui/widgets/eab-contact-display.c:357
 msgid "MSN"
 msgstr "МСН"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:344
-#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#: addressbook/gui/widgets/eab-contact-display.c:355
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/contact-editor/e-contact-editor.c:183
 msgid "GroupWise"
 msgstr "Групвајз"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+msgid "Home"
+msgstr "Кућа"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+msgid "Other"
+msgstr "Друго"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
 msgid "Source Book"
 msgstr "Изворни адресар"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:264
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Target Book"
 msgstr "Одредишни адресар"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:278
+#: addressbook/gui/contact-editor/e-contact-editor.c:273
 msgid "Is New Contact"
 msgstr "Је нови контакт"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:285
+#: addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Writable Fields"
 msgstr "Поља за упис"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:299
+#: addressbook/gui/contact-editor/e-contact-editor.c:294
 msgid "Changed"
 msgstr "Промењен"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
-msgid "Category editor not available."
-msgstr "Уређивач категорија није доступан."
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:2352
 msgid "This contact belongs to these categories:"
 msgstr "Овај контакт припада овим категоријама"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#: addressbook/gui/contact-editor/e-contact-editor.c:2429
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Молим изаберите од следећих опција"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#: addressbook/gui/contact-editor/e-contact-editor.c:2433
 #, fuzzy
 msgid "No image"
 msgstr "Нигер"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#: addressbook/gui/contact-editor/e-contact-editor.c:2636
 #, fuzzy
 msgid ""
-"The following entries are invalid:\n"
+"The contact data is invalid:\n"
 "\n"
-msgstr "Следеће везе су тренутно активне:"
+msgstr "Датум повраћаја није добар"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2738
-#, c-format
-msgid "Could not find widget for a field: `%s'"
-msgstr "Нисам могао да пронађем помоћ ђа поље: `%s'"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#, fuzzy
+msgid "Invalid contact."
+msgstr "Неисправна сврха"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+msgid ""
+"The contact cannot be saved to the selected address book. Do you want to "
+"discard changes?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2727
+#: addressbook/gui/contact-editor/e-contact-editor.c:2751
+msgid "_Discard"
+msgstr "_Одбаци"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+msgid ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
+msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:62
 msgid "AOL Instant Messenger"
@@ -2217,7 +2133,7 @@ msgid "_Edit Full"
 msgstr "_Уреди потпуно"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:166
 msgid "_Full Name:"
 msgstr "_Пуно име:"
 
@@ -2362,30 +2278,30 @@ msgstr "Име _листе:"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Укуцајте електронску адресу или превуците контакт у доњу листу:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "contact-list-editor"
 msgstr "уредник-контакт-листе"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:153
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:215
+#: addressbook/gui/widgets/e-addressbook-view.c:217
 #: addressbook/gui/widgets/e-minicard-view.c:460
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Књига"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
 msgid "Is New List"
 msgstr "Да ли је нова листа"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:215
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
 msgid "Contact List Editor"
 msgstr "Уредник контакт листе"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:438
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
 msgid "Save List as VCard"
 msgstr "Сачувај листу као VCard"
 
@@ -2432,117 +2348,117 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Напредна претрага"
 
-#: addressbook/gui/widgets/eab-contact-display.c:129
-#: addressbook/gui/widgets/eab-contact-display.c:192
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
 msgid "(map)"
 msgstr "(мапа)"
 
-#: addressbook/gui/widgets/eab-contact-display.c:139
-#: addressbook/gui/widgets/eab-contact-display.c:205
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
 msgid "map"
 msgstr "мапа"
 
-#: addressbook/gui/widgets/eab-contact-display.c:257
-#: addressbook/gui/widgets/eab-contact-display.c:533
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:525
 msgid "List Members"
 msgstr "Испиши чланове"
 
-#: addressbook/gui/widgets/eab-contact-display.c:329
-#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/eab-contact-display.c:321
+#: addressbook/gui/widgets/eab-contact-display.c:323
 msgid "E-mail"
 msgstr "Е-пошта"
 
-#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/eab-contact-display.c:332
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Организација"
 
-#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "Position"
 msgstr "Положај"
 
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:354
 msgid "Groupwise"
 msgstr "Групвајз"
 
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:340
 msgid "Video Conferencing"
 msgstr "Видео конференције"
 
-#: addressbook/gui/widgets/eab-contact-display.c:349
-#: addressbook/gui/widgets/eab-contact-display.c:370
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Phone"
 msgstr "Телефон"
 
-#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:342
 msgid "Fax"
 msgstr "Факс"
 
-#: addressbook/gui/widgets/eab-contact-display.c:354
+#: addressbook/gui/widgets/eab-contact-display.c:346
 msgid "work"
 msgstr "посао"
 
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:359
 msgid "WWW"
 msgstr "Беб"
 
-#: addressbook/gui/widgets/eab-contact-display.c:368
-#: addressbook/gui/widgets/eab-contact-display.c:587
+#: addressbook/gui/widgets/eab-contact-display.c:360
+#: addressbook/gui/widgets/eab-contact-display.c:579
 msgid "Blog"
 msgstr "Блогче"
 
-#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/eab-contact-display.c:363
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Мобилни телефон"
 
-#: addressbook/gui/widgets/eab-contact-display.c:375
+#: addressbook/gui/widgets/eab-contact-display.c:367
 msgid "personal"
 msgstr "лично"
 
-#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/eab-contact-display.c:374
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Напомена"
 
-#: addressbook/gui/widgets/eab-contact-display.c:548
+#: addressbook/gui/widgets/eab-contact-display.c:540
 msgid "Job Title"
 msgstr "Улога на послу"
 
-#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/eab-contact-display.c:544
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:774
+#: smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "Е-пошта"
 
-#: addressbook/gui/widgets/eab-contact-display.c:579
+#: addressbook/gui/widgets/eab-contact-display.c:571
 msgid "Home page"
 msgstr "Лична страница"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 msgid "Success"
 msgstr "Успех"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Backend busy"
 msgstr ""
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Repository offline"
 msgstr "Архива није на мрежи"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Address Book does not exist"
 msgstr "Адресар не постоји"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 #, fuzzy
 msgid "No Self Contact defined"
 msgstr "Нова контакт листа"
@@ -2550,27 +2466,27 @@ msgstr "Нова контакт листа"
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Permission denied"
 msgstr "Забрањен приступ"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Contact not found"
 msgstr "Контакт није пронађен"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Contact ID already exists"
 msgstr "ИБ контакта већ постоји"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Protocol not supported"
 msgstr "Протокол није подржан"
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:60
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:233
 #: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
@@ -2583,39 +2499,39 @@ msgid "Cancelled"
 msgstr "Поништено"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:61
 #, fuzzy
 msgid "Could not cancel"
 msgstr "Не могу да отворим извор"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Authentication Failed"
 msgstr "Пријава неуспела"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Authentication Required"
 msgstr "Пријава обавезна"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:66
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "TLS not Available"
 msgstr "TLS није доступан"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#: addressbook/gui/widgets/eab-gui-util.c:66
 #, fuzzy
 msgid "No such source"
 msgstr "Нема такве поруке"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:69
+#: addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Other error"
 msgstr "Друга грешка"
 
-#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:90
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
@@ -2623,7 +2539,7 @@ msgstr ""
 "Нисмо успели да отворимо овај адресар. Проверите да путања постоји и да "
 "имате права приступа."
 
-#: addressbook/gui/widgets/eab-gui-util.c:110
+#: addressbook/gui/widgets/eab-gui-util.c:97
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -2631,17 +2547,18 @@ msgstr ""
 "Нисмо успели да отворимо овај адресар. То значи или да сте унели нетачну "
 "адресу, или је LDAP сервер недоступан."
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:102
+#, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution you must compile the program from the CVS "
-"sources after retrieving OpenLDAP from the link below."
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
 msgstr ""
 "Ова верзија Еволуције нема подршку за LDAP у себи. Уколико желите да "
 "користите LDAP у Еволуцији морате да изградите програм из изворног кода у "
 "СУВ-у (CVS) пошто преузмете OpenLDAP са следеће адресе."
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:109
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -2649,11 +2566,7 @@ msgstr ""
 "Нисмо успели да отворимо овај адресар. То значи или да сте унели нетачну "
 "адресу или је сервер недоступан."
 
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "Unable to open addressbook"
-msgstr "Не могу да отворим адресар"
-
-#: addressbook/gui/widgets/eab-gui-util.c:162
+#: addressbook/gui/widgets/eab-gui-util.c:129
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2665,7 +2578,7 @@ msgstr ""
 "Молим да прецизније формулишете упит или повећате лимит\n"
 "броја резултата у подешавањима адресара за сервер директоријума."
 
-#: addressbook/gui/widgets/eab-gui-util.c:168
+#: addressbook/gui/widgets/eab-gui-util.c:135
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -2677,54 +2590,46 @@ msgstr ""
 "упит или повећате временски лимит у подешавањима адресара\n"
 "за сервер директоријума."
 
-#: addressbook/gui/widgets/eab-gui-util.c:174
+#: addressbook/gui/widgets/eab-gui-util.c:141
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "Основни процес овог адресара није могао да обради упит."
 
-#: addressbook/gui/widgets/eab-gui-util.c:177
+#: addressbook/gui/widgets/eab-gui-util.c:144
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Основни процес овог адресара је одбио да обради овај упит."
 
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:147
 msgid "This query did not complete successfully."
 msgstr "Овај упит није успешно завршен."
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
-msgid "Do you want to save changes?"
-msgstr "Желите ли да сачувате промене?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:208
-msgid "_Discard"
-msgstr "_Одбаци"
-
-#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:169
 msgid "Error adding list"
 msgstr "Грешка код додавања листе"
 
-#: addressbook/gui/widgets/eab-gui-util.c:229
-#: addressbook/gui/widgets/eab-gui-util.c:652
+#: addressbook/gui/widgets/eab-gui-util.c:169
+#: addressbook/gui/widgets/eab-gui-util.c:580
 msgid "Error adding contact"
 msgstr "Грешка код додавања контакта"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying list"
 msgstr "Грешка код измене листе"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying contact"
 msgstr "Грешка при измени контакта"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:192
 msgid "Error removing list"
 msgstr "Грешка код уклањања листе"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
-#: addressbook/gui/widgets/eab-gui-util.c:610
+#: addressbook/gui/widgets/eab-gui-util.c:192
+#: addressbook/gui/widgets/eab-gui-util.c:538
 msgid "Error removing contact"
 msgstr "Грешка код уклањања контакта"
 
 # bug: plural-forms
-#: addressbook/gui/widgets/eab-gui-util.c:334
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2733,7 +2638,7 @@ msgstr ""
 "Отварање %d контаката ће отворити и %d нових прозора.\n"
 "Да ли стварно желите да погледате све ове контакте?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:360
+#: addressbook/gui/widgets/eab-gui-util.c:300
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2742,49 +2647,44 @@ msgstr ""
 "%s већ постоји\n"
 "Желите ли да препишете новим уносом?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:364
+#: addressbook/gui/widgets/eab-gui-util.c:304
 msgid "Overwrite"
 msgstr "Препиши"
 
-#: addressbook/gui/widgets/eab-gui-util.c:400
-#, c-format
-msgid "Error saving %s: %s"
-msgstr "Грешка код чувања %s: %s"
-
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:437
+#: addressbook/gui/widgets/eab-gui-util.c:365
 msgid "card.vcf"
 msgstr "karta.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:571
+#: addressbook/gui/widgets/eab-gui-util.c:499
 msgid "list"
 msgstr "листа"
 
-#: addressbook/gui/widgets/eab-gui-util.c:706
+#: addressbook/gui/widgets/eab-gui-util.c:634
 msgid "Move contact to"
 msgstr "Премести контакт у"
 
-#: addressbook/gui/widgets/eab-gui-util.c:708
+#: addressbook/gui/widgets/eab-gui-util.c:636
 msgid "Copy contact to"
 msgstr "Умножи контакт у"
 
-#: addressbook/gui/widgets/eab-gui-util.c:711
+#: addressbook/gui/widgets/eab-gui-util.c:639
 msgid "Move contacts to"
 msgstr "Премести контакте у"
 
-#: addressbook/gui/widgets/eab-gui-util.c:713
+#: addressbook/gui/widgets/eab-gui-util.c:641
 msgid "Copy contacts to"
 msgstr "Умножи контакте у"
 
-#: addressbook/gui/widgets/eab-gui-util.c:716
+#: addressbook/gui/widgets/eab-gui-util.c:644
 msgid "Select target addressbook."
 msgstr "Изаберите одредишни адресар."
 
-#: addressbook/gui/widgets/eab-gui-util.c:939
+#: addressbook/gui/widgets/eab-gui-util.c:867
 msgid "Multiple VCards"
 msgstr "Вишеструке VCards"
 
-#: addressbook/gui/widgets/eab-gui-util.c:942
+#: addressbook/gui/widgets/eab-gui-util.c:870
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard за %s"
@@ -2873,7 +2773,7 @@ msgstr[2] "%d контаката"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:229
+#: addressbook/gui/widgets/e-addressbook-view.c:231
 #: addressbook/gui/widgets/e-minicard-view.c:467
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
@@ -2891,143 +2791,131 @@ msgstr "Модел"
 msgid "Error modifying card"
 msgstr "Грешка при измени карте"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:163
 msgid "Name begins with"
 msgstr "Име почиње са"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:164
 msgid "Email begins with"
 msgstr "Е-пошта почиње са"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:57
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Категорија је"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-#: calendar/gui/cal-search-bar.c:50
+#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Поље које садржи"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+#: addressbook/gui/widgets/e-addressbook-view.c:172
 msgid "Advanced..."
 msgstr "Напредно..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:236
+#: addressbook/gui/widgets/e-addressbook-view.c:238
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:249
+#: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Тип"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:506
+#: addressbook/gui/widgets/e-addressbook-view.c:508
 msgid "Address Book"
 msgstr "Адресар"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2076
+#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:2080
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
 msgstr "Сачувај као VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 msgid "New Contact..."
 msgstr "Нов контакт..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "New Contact List..."
 msgstr "Нова листа контаката..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Go to Folder..."
 msgstr "Иди у директоријум..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Import..."
 msgstr "Увези..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1066
 msgid "Search for Contacts..."
 msgstr "Тражим контакте..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 msgid "Address Book Sources..."
 msgstr "Извори адресара..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1069
 msgid "Pilot Settings..."
 msgstr "Подешавања пилота"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Проследи контакт"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
 msgid "Send Message to Contact"
 msgstr "Пошаљи контакту поруку"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Штампај"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
+#: addressbook/gui/widgets/e-addressbook-view.c:1077
 msgid "Print Envelope"
 msgstr "Штампај коверат"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
+#: addressbook/gui/widgets/e-addressbook-view.c:1081
 msgid "Copy to Address Book..."
 msgstr "Умножи у адресар..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1080
+#: addressbook/gui/widgets/e-addressbook-view.c:1082
 msgid "Move to Address Book..."
 msgstr "Пребаци у адресар..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Исеци"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Умножи"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1087
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Убаци"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:1092
+#: calendar/gui/e-calendar-view.c:1280
 msgid "Current View"
 msgstr "Тренутан поглед"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1309
-#, c-format
-msgid ""
-"The addressbook backend for\n"
-"%s\n"
-"has crashed. You will have to restart Evolution in order to use it again"
-msgstr ""
-"Основни процес адресара за\n"
-"%s\n"
-"је пао. Мораћете да поново покренете Еволуцију како би наставили\n"
-"да је користите"
-
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1667
-#: calendar/gui/cal-search-bar.c:362
+#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Било која категорија"
 
@@ -3133,7 +3021,7 @@ msgstr "Радио"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-list-view.c:234
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Улога"
@@ -3275,12 +3163,12 @@ msgstr "Еволуција VCard увозник"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: addressbook/printing/e-contact-print.c:998
+#: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr "Штампај контакте"
 
-#: addressbook/printing/e-contact-print.c:1064
-#: addressbook/printing/e-contact-print.c:1091
+#: addressbook/printing/e-contact-print.c:1066
+#: addressbook/printing/e-contact-print.c:1093
 msgid "Print contact"
 msgstr "Штампај контакт"
 
@@ -3531,15 +3419,21 @@ msgstr "У обичном режиму, не сме се дати опција �
 msgid "Impossible internal error."
 msgstr "Немогућа унутрашња грешка."
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:629
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
 msgid "Can not open file"
 msgstr "Не могу да отворим датотеку"
 
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-msgid "Can not load URI"
-msgstr "Не могу да учитам адресу"
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "Нисам могао да учитам адресар"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Не могу да отворим адресар"
 
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
@@ -3557,7 +3451,7 @@ msgstr "Име датотеке није дато."
 msgid "Unnamed List"
 msgstr "Листа без имена"
 
-#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Унесите лозинку"
@@ -3834,10 +3728,10 @@ msgid "Whether to show week numbers in date navigator"
 msgstr "Да ли да приказује бројеве недеља у избирачу датума"
 
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:88
-#: calendar/gui/gnome-cal.c:1703
-#: camel/providers/groupwise/camel-gw-listener.c:304
-#: camel/providers/groupwise/camel-gw-listener.c:327
+#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/gnome-cal.c:1705
+#: camel/providers/groupwise/camel-gw-listener.c:311
+#: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
 msgstr "Календар"
 
@@ -3858,7 +3752,7 @@ msgstr "Обриши догађаје старије од"
 
 #: calendar/gui/calendar-commands.c:363
 #: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:19 filter/filter.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
 msgid "days"
 msgstr "дана"
 
@@ -4003,23 +3897,23 @@ msgstr "Недељни преглед"
 msgid "Month View"
 msgstr "Месечни преглед"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Сажетак садржи"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Опис садржи"
 
-#: calendar/gui/cal-search-bar.c:54
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Коментар садржи"
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:53
 msgid "Location contains"
 msgstr "Путања садржи"
 
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
 msgid "Unmatched"
 msgstr "Нерасподељено"
 
@@ -4040,23 +3934,23 @@ msgstr "Забрањен приступ календару"
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/dialogs/alarm-options.c:466
+#: calendar/gui/dialogs/alarm-options.c:467
 msgid "Audio Alarm Options"
 msgstr "Опције за звучни аларм"
 
-#: calendar/gui/dialogs/alarm-options.c:475
+#: calendar/gui/dialogs/alarm-options.c:476
 msgid "Message Alarm Options"
 msgstr "Опције за текстуални аларм"
 
-#: calendar/gui/dialogs/alarm-options.c:484
+#: calendar/gui/dialogs/alarm-options.c:485
 msgid "Email Alarm Options"
 msgstr "Опције за аларм преко Е-поште"
 
-#: calendar/gui/dialogs/alarm-options.c:493
+#: calendar/gui/dialogs/alarm-options.c:494
 msgid "Program Alarm Options"
 msgstr "Опције за програм аларма"
 
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:510
 msgid "Unknown Alarm Options"
 msgstr "Непознате опције за аларм"
 
@@ -4092,7 +3986,7 @@ msgstr "Пошаљи коме:"
 msgid "With these arguments:"
 msgstr "Са овим аргументима:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
 msgid "dialog1"
 msgstr "прозорче1"
 
@@ -4102,7 +3996,7 @@ msgstr "покажи још на сваких"
 
 # bug: plural-forms
 #: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:20 filter/filter.glade.h:16
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr "сати"
 
@@ -4148,7 +4042,7 @@ msgstr "Пошаљи електронску поруку"
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Закључак:"
 
@@ -4179,7 +4073,6 @@ msgstr "сат(а)"
 
 # bug: plural-forms
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:21
 msgid "minute(s)"
 msgstr "минут(а)"
 
@@ -4187,26 +4080,26 @@ msgstr "минут(а)"
 msgid "start of appointment"
 msgstr "почетак заказаног састанка"
 
-#: calendar/gui/dialogs/calendar-setup.c:170
+#: calendar/gui/dialogs/calendar-setup.c:172
 msgid "You must specify a location to get the calendar from."
 msgstr "Морате навести путању са које да преузмем календар"
 
-#: calendar/gui/dialogs/calendar-setup.c:178
+#: calendar/gui/dialogs/calendar-setup.c:180
 #, c-format
 msgid "The source location '%s' is not well-formed."
 msgstr "Путања извора „%s“ није исправног облика."
 
-#: calendar/gui/dialogs/calendar-setup.c:193
+#: calendar/gui/dialogs/calendar-setup.c:195
 #, c-format
 msgid "The source location '%s' is not a webcal source."
 msgstr "Путања извора „%s“е представља вебкал извор."
 
-#: calendar/gui/dialogs/calendar-setup.c:265
+#: calendar/gui/dialogs/calendar-setup.c:275
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr "Извор имена „%s“ већ постоји у изабраној групи"
 
-#: calendar/gui/dialogs/calendar-setup.c:278
+#: calendar/gui/dialogs/calendar-setup.c:288
 #, c-format
 msgid ""
 "The group '%s' is remote. You must specify a location to get the calendar "
@@ -4229,55 +4122,35 @@ msgstr "Група списка задужења"
 msgid "C_olor:"
 msgstr "Боје"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "Calendar Properties"
-msgstr "Особине календара"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
 msgid "Pick a color"
 msgstr "Изаберите боју"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:8
-msgid "Remote"
-msgstr "Удаљени"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "Task List Properties"
-msgstr "Особине списка задужења"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
 #, fuzzy
 msgid "_Add Calendar"
 msgstr "Додај нови календар"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
 #, fuzzy
 msgid "_Add Group"
 msgstr "_Додај групу..."
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-msgid "_Refresh Interval:"
-msgstr "_Време између освежавања:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
 #, fuzzy
 msgid "_Refresh:"
 msgstr "Освежи"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-msgid "_Source URL:"
-msgstr "_Изворна адреса:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
 #, fuzzy
 msgid "_Type:"
 msgstr "Тип:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
 msgid "_URL:"
 msgstr "_Адреса:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
 msgid "weeks"
 msgstr "недеље"
 
@@ -4384,7 +4257,7 @@ msgid "Display"
 msgstr "_Прикажи"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:76
 msgid "E_nable"
 msgstr "О_могући"
 
@@ -4395,7 +4268,7 @@ msgstr "_Објава стања слободан/заузет"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:563
+#: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Петак"
 
@@ -4409,7 +4282,7 @@ msgstr "Минути"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:559
+#: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Понедељак"
 
@@ -4419,7 +4292,7 @@ msgstr "Н_ед"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:564
+#: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Субота"
 
@@ -4433,7 +4306,7 @@ msgstr "Покажи _бројеве недеља у навигатору за �
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Недеља"
 
@@ -4447,7 +4320,7 @@ msgstr "У_то"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:562
+#: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Четвртак"
 
@@ -4461,7 +4334,7 @@ msgstr "Формат за време:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:560
+#: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Уторак"
 
@@ -4471,7 +4344,7 @@ msgstr "Почетак н_едеље:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:561
+#: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Среда"
 
@@ -4504,7 +4377,7 @@ msgid "_Day begins:"
 msgstr "Почетак _дана:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
-#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:43
@@ -4553,82 +4426,46 @@ msgstr "_Сре"
 msgid "before every appointment"
 msgstr "пре сваког заказаног састанка"
 
-#: calendar/gui/dialogs/cancel-comp.c:57
-msgid ""
-"The event being deleted is a meeting, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"Обрисани догађај је састанак, желите ли да пошаљете поруку за његово "
-"отказивање?"
-
-#: calendar/gui/dialogs/cancel-comp.c:60
-msgid "Are you sure you want to cancel and delete this meeting?"
-msgstr "Сигурно желите да поништите и обришете овај састанак?"
-
-#: calendar/gui/dialogs/cancel-comp.c:66
-msgid ""
-"The task being deleted is assigned, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"Обрисано задужење је расподељено, желите ли да пошаљете поруку за њено "
-"отказивање?"
-
-#: calendar/gui/dialogs/cancel-comp.c:69
-msgid "Are you sure you want to cancel and delete this task?"
-msgstr "Сигурно желите да поништите и обришете ово задужење?"
-
-#: calendar/gui/dialogs/cancel-comp.c:75
-msgid ""
-"The journal entry being deleted is published, would you like to send a "
-"cancellation notice?"
-msgstr ""
-"Обрисани унос у дневник је објављен, желите ли да пошаљете поруку за његово "
-"отказивање?"
-
-#: calendar/gui/dialogs/cancel-comp.c:78
-msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr "Сигурно желите да поништите и обришете овај унос у дневник?"
-
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Овај догађај је обрисан."
 
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "Ово задужење је обрисано."
 
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:68
 msgid "This journal entry has been deleted."
 msgstr "Овај унос у дневник је обрисан."
 
-#: calendar/gui/dialogs/changed-comp.c:75
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s Унели сте измене. Да их заборавим и затворим уредник?"
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s Нисте уносили измене, да затворим уредника?"
 
-#: calendar/gui/dialogs/changed-comp.c:82
+#: calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "Овај догађај је измењен."
 
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "Ово задужење је измењено."
 
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:92
 msgid "This journal entry has been changed."
 msgstr "Овај унос у дневник је измењен."
 
-#: calendar/gui/dialogs/changed-comp.c:99
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s Унели сте измене. Да их заборавим и освежим променама уредник?"
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Нисте унели измене, да освежим променама уредник?"
@@ -4666,7 +4503,7 @@ msgid "No summary"
 msgstr "Нема сажетка"
 
 #: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
 #: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Сачувај као..."
@@ -4720,102 +4557,51 @@ msgstr "Не могу да отворим одредиште"
 msgid "Destination is read only"
 msgstr "Одредиште се може само читати"
 
-#: calendar/gui/dialogs/delete-comp.c:95
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "Сигурно желите да обришете овај заказани састанак `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:98
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "Сигурно желите да обришете овај неименовани заказани састанак"
-
-#: calendar/gui/dialogs/delete-comp.c:104
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "Сигурно желите да обришете задужење `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:107
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "Сигурно желите да обришете ово неименовано задужење?"
-
-#: calendar/gui/dialogs/delete-comp.c:113
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "Сигурно желите да избришете унос у дневник `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:116
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "Сигурно желите да избришете ован неименовани унос у дневник?"
-
-#: calendar/gui/dialogs/delete-comp.c:131
-#, c-format
-msgid "Are you sure you want to delete %d appointment?"
-msgid_plural "Are you sure you want to delete %d appointments?"
-msgstr[0] "Сигурно желите да избришете %d заказани састанак?"
-msgstr[1] "Сигурно желите да избришете %d заказана састанка?"
-msgstr[2] "Сигурно желите да избришете %d заказаних састанака?"
-
-#: calendar/gui/dialogs/delete-comp.c:138
-#, c-format
-msgid "Are you sure you want to delete %d task?"
-msgid_plural "Are you sure you want to delete %d tasks?"
-msgstr[0] "Сигурно желите да избришете %d задужење"
-msgstr[1] "Сигурно желите да избришете %d задужења"
-msgstr[2] "Сигурно желите да избришете %d задужења"
-
-#: calendar/gui/dialogs/delete-comp.c:145
-#, c-format
-msgid "Are you sure you want to delete %d journal entry?"
-msgid_plural "Are you sure you want to delete %d journal entries?"
-msgstr[0] "Сигурно желите да избришете %d унос у дневник?"
-msgstr[1] "Сигурно желите да избришете %d уноса у дневник?"
-msgstr[2] "Сигурно желите да избришете %d уноса у дневник?"
-
-#: calendar/gui/dialogs/delete-error.c:52
+#: calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "Догађај није могао бити обрисан због corba грешке"
 
-#: calendar/gui/dialogs/delete-error.c:55
+#: calendar/gui/dialogs/delete-error.c:57
 msgid "The task could not be deleted due to a corba error"
 msgstr "Задужење није могло бити избрисано због corba грешке"
 
-#: calendar/gui/dialogs/delete-error.c:58
+#: calendar/gui/dialogs/delete-error.c:60
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr "Унос у дневник није могао бити обрисан због corba грешке"
 
-#: calendar/gui/dialogs/delete-error.c:61
+#: calendar/gui/dialogs/delete-error.c:63
 msgid "The item could not be deleted due to a corba error"
 msgstr "Унос није могао бити обрисан због corba грешке"
 
-#: calendar/gui/dialogs/delete-error.c:68
+#: calendar/gui/dialogs/delete-error.c:70
 msgid "The event could not be deleted because permission was denied"
 msgstr "Догађај није могао бити обрисан због немогућности приступа"
 
-#: calendar/gui/dialogs/delete-error.c:71
+#: calendar/gui/dialogs/delete-error.c:73
 msgid "The task could not be deleted because permission was denied"
 msgstr "Задужење није могло бити обрисано због немогућности приступа"
 
-#: calendar/gui/dialogs/delete-error.c:74
+#: calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr "Унос у дневник није могао бити обрисан због немогућности приступа"
 
-#: calendar/gui/dialogs/delete-error.c:77
+#: calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
 msgstr "Унос није могао бити обрисан због немогућности приступа"
 
-#: calendar/gui/dialogs/delete-error.c:84
+#: calendar/gui/dialogs/delete-error.c:86
 msgid "The event could not be deleted due to an error"
 msgstr "Догађај није могао бити обрисан услед грешке"
 
-#: calendar/gui/dialogs/delete-error.c:87
+#: calendar/gui/dialogs/delete-error.c:89
 msgid "The task could not be deleted due to an error"
 msgstr "Задужење није могло бити обрисано услед грешке"
 
-#: calendar/gui/dialogs/delete-error.c:90
+#: calendar/gui/dialogs/delete-error.c:92
 msgid "The journal entry could not be deleted due to an error"
 msgstr "Унос у дневник није могао бити обрисан услед грешке"
 
-#: calendar/gui/dialogs/delete-error.c:93
+#: calendar/gui/dialogs/delete-error.c:95
 msgid "The item could not be deleted due to an error"
 msgstr "Унос није могао бити обрисан услед грешке"
 
@@ -4948,11 +4734,11 @@ msgstr "_Почетно време:"
 
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:3
+#: calendar/gui/dialogs/meeting-page.glade.h:4
 #: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
 #: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1559
-#: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:100
+#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
+#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
@@ -4978,8 +4764,8 @@ msgstr "_Делегирај за..."
 #. FIXME: need to disable for undeletable folders
 #: calendar/gui/dialogs/meeting-page.c:655
 #: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1310 calendar/gui/e-calendar-view.c:1342
-#: mail/em-folder-tree.c:2557 mail/em-folder-view.c:919
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
+#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -4987,7 +4773,7 @@ msgid "_Delete"
 msgstr "_Обриши"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:240
+#: calendar/gui/e-meeting-list-view.c:218
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "_Присутан"
@@ -5023,16 +4809,15 @@ msgid "Member"
 msgstr "Члан"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
-#: mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-list-view.c:248
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Стање"
 
@@ -5040,20 +4825,20 @@ msgstr "Стање"
 msgid "Add A_ttendee"
 msgstr "Додај прису_тног"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "Add attendees from addressbook."
+msgstr "Додај пошиљаоца у адреса_р"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Организатор:"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
+#: calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "_Change Organizer"
 msgstr "_Промени организатора"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-#: calendar/gui/e-meeting-time-sel.c:417
-msgid "_Invite Others..."
-msgstr "_Позови друге..."
-
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
 msgstr "<b>Опције календара</b>"
@@ -5203,7 +4988,7 @@ msgid "_No recurrence"
 msgstr "_Без понављања"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:450
+#: composer/e-msg-composer-attachment-bar.c:453
 msgid "_Remove"
 msgstr "_Уклони"
 
@@ -5235,54 +5020,20 @@ msgstr "недеља(е)"
 msgid "year(s)"
 msgstr "година(е)"
 
-#: calendar/gui/dialogs/save-comp.c:53
-msgid ""
-"This event has been changed, but has not been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Овај догађај је измењен, али није сачуван.\n"
-"\n"
-"Желите ли да сачувате ваше измене?"
-
-#: calendar/gui/dialogs/save-comp.c:57
-msgid "_Discard Changes"
-msgstr "_Занемари промене"
-
-#: calendar/gui/dialogs/save-comp.c:62
-msgid "Save Event"
-msgstr "Сачувај догађај"
-
-#: calendar/gui/dialogs/select-source-dialog.c:65
+#: calendar/gui/dialogs/select-source-dialog.c:69
 #, fuzzy
 msgid "Select destination"
 msgstr "Изаберите одредиште %s"
 
-#: calendar/gui/dialogs/select-source-dialog.c:86
+#: calendar/gui/dialogs/select-source-dialog.c:90
 #, fuzzy
 msgid "_Destination"
 msgstr "Одредишни директоријум:"
 
-#: calendar/gui/dialogs/select-source-dialog.c:88
+#: calendar/gui/dialogs/select-source-dialog.c:92
 msgid "Task List"
 msgstr "Списак задужења"
 
-#: calendar/gui/dialogs/send-comp.c:57
-msgid "The meeting information has been created. Send it?"
-msgstr "Информација о састанку је сачињена. Да је пошаљем?"
-
-#: calendar/gui/dialogs/send-comp.c:60
-msgid "The meeting information has changed. Send an updated version?"
-msgstr "Информација о састанку је измењена. Да пошаљем новију верзију?"
-
-#: calendar/gui/dialogs/send-comp.c:67
-msgid "The task assignment information has been created. Send it?"
-msgstr "Информација о примљеном задужењу је сачињена. Да је пошаљем?"
-
-#: calendar/gui/dialogs/send-comp.c:71
-msgid "The task information has changed. Send an updated version?"
-msgstr "Информација о задужењу је измењена. Да пошаљем новију верзију?"
-
 #: calendar/gui/dialogs/task-details-page.c:406
 msgid "Completed date is wrong"
 msgstr "Датум завршетка је погрешан"
@@ -5302,7 +5053,7 @@ msgstr "Готово"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #: calendar/gui/e-cal-component-preview.c:249
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:960
 msgid "High"
 msgstr "Висок"
 
@@ -5316,14 +5067,14 @@ msgstr "У току"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:253
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:958
 msgid "Low"
 msgstr "Низак"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:251
 #: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:957
+#: mail/message-list.c:959
 msgid "Normal"
 msgstr "Обичан"
 
@@ -5380,8 +5131,8 @@ msgstr "Пов_ерљиво"
 
 #: calendar/gui/dialogs/task-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
+#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Опис:"
 
@@ -5549,7 +5300,7 @@ msgstr "Датум завршетка:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:950
+#: calendar/gui/e-itip-control.c:943
 msgid "Status:"
 msgstr "Стање:"
 
@@ -5634,12 +5385,12 @@ msgstr "Заузет"
 msgid "Deleting selected objects"
 msgstr "Бришем изабране објекте"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
 msgid "Updating objects"
 msgstr "Уносим промене у објекте"
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1370
+#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
 #: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Отвори"
@@ -5649,15 +5400,15 @@ msgid "Open _Web Page"
 msgstr "Отвори _веб страницу"
 
 #: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1291 calendar/gui/e-calendar-view.c:1376
-#: mail/em-folder-view.c:896 mail/em-popup.c:690 mail/em-popup.c:806
+#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
+#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "_Сачувај као..."
 
 #: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1292
-#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
+#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
@@ -5665,24 +5416,24 @@ msgid "_Print..."
 msgstr "Штам_пај..."
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Исеци"
 
 #: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1338
-#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2550
-#: mail/message-list.c:1644 ui/evolution-addressbook.xml.h:31
+#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
+#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
+#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Копирај"
 
 #: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1273 calendar/gui/e-calendar-view.c:1299
-#: calendar/gui/e-calendar-view.c:1372 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
+#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
@@ -5748,69 +5499,69 @@ msgstr "Извештај"
 msgid "Task sort"
 msgstr "Разврстана задужења"
 
-#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
 msgid "New _Appointment..."
 msgstr "Нов заказан _састанак..."
 
-#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
+#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
 msgid "New All Day _Event"
 msgstr "Нов целодневни _догађај"
 
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
+#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
 msgid "New Meeting"
 msgstr "Нови састанак"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
 msgid "New Task"
 msgstr "Ново задужење"
 
-#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Изабери _нит"
 
-#: calendar/gui/e-calendar-view.c:1280
+#: calendar/gui/e-calendar-view.c:1283
 #, fuzzy
 msgid "_Select Date..."
 msgstr "Изабери..."
 
-#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Објави слободан/заузет информацију"
 
-#: calendar/gui/e-calendar-view.c:1303
+#: calendar/gui/e-calendar-view.c:1306
 msgid "Cop_y to Calendar..."
 msgstr "Коп_ирај у календар..."
 
-#: calendar/gui/e-calendar-view.c:1304
+#: calendar/gui/e-calendar-view.c:1307
 msgid "Mo_ve to Calendar..."
 msgstr "Прене_си у календар..."
 
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1308
 msgid "_Schedule Meeting..."
 msgstr "_Закажи састанак..."
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1309
 msgid "_Forward as iCalendar..."
 msgstr "_Проследи као iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
 msgid "Delete this _Occurrence"
 msgstr "Обриши ову _појаву"
 
-#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
 msgid "Delete _All Occurrences"
 msgstr "Обриши _све појаве"
 
-#: calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1349
 msgid "Go to _Today"
 msgstr "Иди на _данас"
 
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1351
 msgid "_Go to Date..."
 msgstr "_Иди на датум..."
 
-#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "_Подешавања..."
 
@@ -5824,9 +5575,9 @@ msgstr "Почетни датум"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:967 calendar/gui/e-itip-control.c:1169
-#: calendar/gui/e-meeting-list-view.c:144
-#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
 #: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
 #: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
 #: camel/camel-tcp-stream-openssl.c:631
@@ -5852,13 +5603,13 @@ msgid "Assigned"
 msgstr "Додељено"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr "Да"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "Не"
 
@@ -5870,7 +5621,7 @@ msgstr "С"
 msgid "S"
 msgstr "Ј"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
 msgid "E"
 msgstr "И"
 
@@ -5942,11 +5693,11 @@ msgstr "%d %b"
 msgid "%02i minute divisions"
 msgstr "%02i минутни размаци"
 
-#: calendar/gui/e-itip-control.c:592
+#: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
 msgstr "Да. (Сложени повраћај)"
 
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:596
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
@@ -5954,7 +5705,7 @@ msgstr[0] "Сваки %d дан"
 msgstr[1] "Свака %d дана"
 msgstr[2] "Сваких %d дана"
 
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:601
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
@@ -5963,7 +5714,7 @@ msgstr[1] "Сваке %d недеље"
 msgstr[2] "Сваких %d недеља"
 
 # ово ће тешко бити 21, 31, 41, ...
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:603
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -5971,22 +5722,22 @@ msgstr[0] "Сваке недеље у "
 msgstr[1] "Сваке %d недеље у "
 msgstr[2] "Сваких %d недеља у "
 
-#: calendar/gui/e-itip-control.c:618
+#: calendar/gui/e-itip-control.c:611
 msgid " and "
 msgstr " и "
 
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:618
 #, c-format
 msgid "The %s day of "
 msgstr "%s дан "
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:631
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s "
 
 # слично као за недеље
-#: calendar/gui/e-itip-control.c:645
+#: calendar/gui/e-itip-control.c:638
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
@@ -5995,7 +5746,7 @@ msgstr[1] "свака %d месеца"
 msgstr[2] "сваких %d месеци"
 
 # слично као за месеце и недеље
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:642
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
@@ -6003,7 +5754,7 @@ msgstr[0] "Сваке године"
 msgstr[1] "Сваке %d године"
 msgstr[2] "Сваких %d година"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:653
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
@@ -6011,42 +5762,42 @@ msgstr[0] "укупно %d пут"
 msgstr[1] "укупно %d пута"
 msgstr[2] "укупно %d пута"
 
-#: calendar/gui/e-itip-control.c:669
+#: calendar/gui/e-itip-control.c:662
 msgid ", ending on "
 msgstr ", завршавајући се "
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:686
 msgid "<b>Starts:</b> "
 msgstr "<b>Почетак:</b> "
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:696
 msgid "<b>Ends:</b> "
 msgstr "<b>Крај:</b> "
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:716
 msgid "<b>Completed:</b> "
 msgstr "<b>Завршетак:</b> "
 
-#: calendar/gui/e-itip-control.c:733
+#: calendar/gui/e-itip-control.c:726
 msgid "<b>Due:</b> "
 msgstr "<b>До:</b> "
 
-#: calendar/gui/e-itip-control.c:771 calendar/gui/e-itip-control.c:827
+#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
 msgid "iCalendar Information"
 msgstr "iCalendar информација"
 
 #. Title
-#: calendar/gui/e-itip-control.c:788
+#: calendar/gui/e-itip-control.c:781
 msgid "iCalendar Error"
 msgstr "iCalendar грешка"
 
-#: calendar/gui/e-itip-control.c:859 calendar/gui/e-itip-control.c:875
-#: calendar/gui/e-itip-control.c:886 calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
 msgid "An unknown person"
 msgstr "Непозната особа"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:910
+#: calendar/gui/e-itip-control.c:903
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -6054,301 +5805,305 @@ msgstr ""
 "<br> Молим проверите следећу информацију, и потом одаберите акцију из доњег "
 "менија."
 
-#: calendar/gui/e-itip-control.c:925
+#: calendar/gui/e-itip-control.c:918
 msgid "<i>None</i>"
 msgstr "<i>Ништа</i>"
 
-#: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:929
+msgid "Location:"
+msgstr "Место:"
+
+#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Прихваћено"
 
-#: calendar/gui/e-itip-control.c:959 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Прихваћено с резервом"
 
-#: calendar/gui/e-itip-control.c:963 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Одбијено"
 
-#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.c:1050
-#: calendar/gui/e-itip-control.c:1076 calendar/gui/e-itip-control.c:1089
-#: calendar/gui/e-itip-control.c:1102 calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
 msgid "Choose an action:"
 msgstr "Изабери акцију:"
 
-#: calendar/gui/e-itip-control.c:1023
+#: calendar/gui/e-itip-control.c:1016
 msgid "Update"
 msgstr "Ажурирај"
 
-#: calendar/gui/e-itip-control.c:1024 calendar/gui/e-itip-control.c:1055
-#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1091
-#: calendar/gui/e-itip-control.c:1104 calendar/gui/e-itip-control.c:1117
-#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
+#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "ОК"
 
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1044
 msgid "Accept"
 msgstr "Прихвати"
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1045
 msgid "Tentatively accept"
 msgstr "Прихвати са резервом"
 
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1046
 msgid "Decline"
 msgstr "Одбиј"
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1070
 msgid "Send Free/Busy Information"
 msgstr "Пошаљи слободан/заузет информацију"
 
-#: calendar/gui/e-itip-control.c:1090
+#: calendar/gui/e-itip-control.c:1083
 msgid "Update respondent status"
 msgstr "Ажурирај стање странке"
 
-#: calendar/gui/e-itip-control.c:1103
+#: calendar/gui/e-itip-control.c:1096
 msgid "Send Latest Information"
 msgstr "Пошаљи најновију информацију"
 
-#: calendar/gui/e-itip-control.c:1116 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Одустани"
 
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1185
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> је објавио информацију о састанку."
 
-#: calendar/gui/e-itip-control.c:1193
+#: calendar/gui/e-itip-control.c:1186
 msgid "Meeting Information"
 msgstr "Информација о састанку"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1191
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> тражи присуство %s на састанку."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1193
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> тражи Ваше присуство на састанку."
 
-#: calendar/gui/e-itip-control.c:1201
+#: calendar/gui/e-itip-control.c:1194
 msgid "Meeting Proposal"
 msgstr "Предлог за састанак"
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> жели да дода постојећем састанку"
 
-#: calendar/gui/e-itip-control.c:1206
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Update"
 msgstr "Промена састанка"
 
-#: calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1203
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> жели да добије најновију информацију о састанку."
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1204
 msgid "Meeting Update Request"
 msgstr "Захтев за новим подацима о састанку"
 
-#: calendar/gui/e-itip-control.c:1218
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> је одговорио на захтев о састанку."
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Reply"
 msgstr "Одговор за састанак"
 
-#: calendar/gui/e-itip-control.c:1226
+#: calendar/gui/e-itip-control.c:1219
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> је отказо састанак."
 
-#: calendar/gui/e-itip-control.c:1227
+#: calendar/gui/e-itip-control.c:1220
 msgid "Meeting Cancellation"
 msgstr "Отказивање састанка"
 
-#: calendar/gui/e-itip-control.c:1234 calendar/gui/e-itip-control.c:1302
-#: calendar/gui/e-itip-control.c:1337
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1330
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> је послао неразумљиву поруку."
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1228
 msgid "Bad Meeting Message"
 msgstr "Лоша порука о састанку"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1253
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> је објавио информацију о задужењу."
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1254
 msgid "Task Information"
 msgstr "Информација о задужењу"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1259
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> тражи %s за обављање задужења."
 
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> тражи да Ви извршите задужење."
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1262
 msgid "Task Proposal"
 msgstr "Предлог за задужење"
 
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b жели да дода на постојеће задужење."
 
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Update"
 msgstr "Ажурирање задужења"
 
-#: calendar/gui/e-itip-control.c:1278
+#: calendar/gui/e-itip-control.c:1271
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> жели да прими најновију информацију о задужењу."
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1272
 msgid "Task Update Request"
 msgstr "Захтев за променама задужења"
 
-#: calendar/gui/e-itip-control.c:1286
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> је одговорио на додељено задужење."
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Reply"
 msgstr "Одговор на задужење"
 
-#: calendar/gui/e-itip-control.c:1294
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> је отказао задужење."
 
-#: calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1288
 msgid "Task Cancellation"
 msgstr "Отказивање задужења"
 
-#: calendar/gui/e-itip-control.c:1303
+#: calendar/gui/e-itip-control.c:1296
 msgid "Bad Task Message"
 msgstr "Лоша порука о задужењу"
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1315
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> је објавио слободан/заузет информацију."
 
-#: calendar/gui/e-itip-control.c:1323
+#: calendar/gui/e-itip-control.c:1316
 msgid "Free/Busy Information"
 msgstr "Слободан/заузет информација"
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> тражи Вашу слободан/заузет информацију."
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1321
 msgid "Free/Busy Request"
 msgstr "Слободан/заузет захтев"
 
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1325
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> је одговорио на слободан/заузет захтев."
 
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1326
 msgid "Free/Busy Reply"
 msgstr "Слободан/заузет одговор"
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1331
 msgid "Bad Free/Busy Message"
 msgstr "Лоша слободан/заузет порука"
 
-#: calendar/gui/e-itip-control.c:1413
+#: calendar/gui/e-itip-control.c:1406
 msgid "The message does not appear to be properly formed"
 msgstr "Порука изгледа да није исправно сачињена"
 
-#: calendar/gui/e-itip-control.c:1472
+#: calendar/gui/e-itip-control.c:1465
 msgid "The message contains only unsupported requests."
 msgstr "Порука садржи само неподржане захтеве."
 
-#: calendar/gui/e-itip-control.c:1503
+#: calendar/gui/e-itip-control.c:1496
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Прилог не садржи исправну поруку за календар"
 
-#: calendar/gui/e-itip-control.c:1535
+#: calendar/gui/e-itip-control.c:1528
 msgid "The attachment has no viewable calendar items"
 msgstr "Прилог нема делове календара који се могу прегледати"
 
-#: calendar/gui/e-itip-control.c:1769
+#: calendar/gui/e-itip-control.c:1762
 msgid "Update complete\n"
 msgstr "Ажурирање завршено\n"
 
-#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
+#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Стање присутног не може бити ажурирано јер унос више не постоји"
 
-#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Објекат је неисправан и не може бити ажуриран\n"
 
-#: calendar/gui/e-itip-control.c:1825
+#: calendar/gui/e-itip-control.c:1818
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Овај одговор није послао тренутно присутан. Да га додам у присутне?"
 
-#: calendar/gui/e-itip-control.c:1837
+#: calendar/gui/e-itip-control.c:1830
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Стање присутног није могло бити ажурирано због неисправног стања!\n"
 
-#: calendar/gui/e-itip-control.c:1856
+#: calendar/gui/e-itip-control.c:1849
 msgid "There was an error on the CORBA system\n"
 msgstr "Настала је грешка у CORBA систему\n"
 
-#: calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1852
 msgid "Object could not be found\n"
 msgstr "Објекат није могао бити пронађен\n"
 
-#: calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1855
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Немате праве дозволе за ажурирање календара\n"
 
-#: calendar/gui/e-itip-control.c:1865
+#: calendar/gui/e-itip-control.c:1858
 msgid "Attendee status updated\n"
 msgstr "Ажурирано стање присутног\n"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1861
 msgid "Attendee status could not be updated!\n"
 msgstr "Стање присутног није могло бити ажурирано!\n"
 
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1892
 msgid "Removal Complete"
 msgstr "Уклањање завршено"
 
-#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
 msgid "Item sent!\n"
 msgstr "Унос послат!\n"
 
-#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
+#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
 msgid "The item could not be sent!\n"
 msgstr "Унос није могао бити послат!\n"
 
@@ -6389,74 +6144,74 @@ msgstr "крајњи-датум"
 msgid "date-start"
 msgstr "почетни-датум"
 
-#: calendar/gui/e-meeting-list-view.c:62
+#: calendar/gui/e-meeting-list-view.c:59
 msgid "Chair Persons"
 msgstr "Председништво"
 
-#: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:479
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
 msgid "Required Participants"
 msgstr "Обавезно присуство"
 
-#: calendar/gui/e-meeting-list-view.c:64
+#: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Слободно присуство"
 
-#: calendar/gui/e-meeting-list-view.c:65
+#: calendar/gui/e-meeting-list-view.c:62
 msgid "Resources"
 msgstr "Извори"
 
-#: calendar/gui/e-meeting-list-view.c:140 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
 #: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr "Појединац"
 
-#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "Група"
 
-#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr "Извор"
 
-#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr "Соба"
 
-#: calendar/gui/e-meeting-list-view.c:154 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr "Место"
 
-#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:127
 #: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
 msgid "Required Participant"
 msgstr "Обавезан учесник"
 
-#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr "Слободан учесник"
 
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr "Не-учесник"
 
-#: calendar/gui/e-meeting-list-view.c:179 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:177
 #: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
 msgid "Needs Action"
 msgstr "Потребна акција"
 
-#: calendar/gui/e-meeting-list-view.c:182 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
 #: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "С резервом"
 
-#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr "Делегирано"
@@ -6473,20 +6228,28 @@ msgstr "Ван канцеларије"
 msgid "No Information"
 msgstr "Без информације"
 
+#: calendar/gui/e-meeting-time-sel.c:417
+#, fuzzy
+msgid "Add attendees from addressbook"
+msgstr "Додај пошиљаоца у адреса_р"
+
 #: calendar/gui/e-meeting-time-sel.c:440
 msgid "_Options"
 msgstr "_Опције"
 
 #: calendar/gui/e-meeting-time-sel.c:457
-msgid "Show _Only Working Hours"
+#, fuzzy
+msgid "Show _only working hours"
 msgstr "Покажи _само радне сате"
 
 #: calendar/gui/e-meeting-time-sel.c:467
-msgid "Show _Zoomed Out"
+#, fuzzy
+msgid "Show _zoomed out"
 msgstr "Покажи _умањено"
 
 #: calendar/gui/e-meeting-time-sel.c:482
-msgid "_Update Free/Busy"
+#, fuzzy
+msgid "_Update free/busy"
 msgstr "Ажурирај слободан/заузет"
 
 #: calendar/gui/e-meeting-time-sel.c:497
@@ -6502,19 +6265,23 @@ msgid ">_>"
 msgstr ">_>"
 
 #: calendar/gui/e-meeting-time-sel.c:547
-msgid "_All People and Resources"
+#, fuzzy
+msgid "_All people and resources"
 msgstr "_Све особе и сви извори"
 
 #: calendar/gui/e-meeting-time-sel.c:556
-msgid "All _People and One Resource"
+#, fuzzy
+msgid "All _people and one resource"
 msgstr "Све особе и један извор"
 
 #: calendar/gui/e-meeting-time-sel.c:565
-msgid "_Required People"
+#, fuzzy
+msgid "_Required people"
 msgstr "_Обавезне особе"
 
 #: calendar/gui/e-meeting-time-sel.c:574
-msgid "Required People and _One Resource"
+#, fuzzy
+msgid "Required people and _one resource"
 msgstr "Обавезне особе и _један извор"
 
 #: calendar/gui/e-meeting-time-sel.c:593
@@ -6552,7 +6319,7 @@ msgstr "%m/%d/%Y"
 msgid "Enter the password for %s"
 msgstr "Унесите лозинку за „%s“"
 
-#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6561,22 +6328,14 @@ msgstr ""
 "Грешка на %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
-#, fuzzy, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-"Машинерија задужења за \n"
-"%s\n"
-" је пукла."
-
 #. FIXME Loading should be async
 #. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:686
+#: calendar/gui/e-tasks.c:801
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Отварам задужења у %s"
 
-#: calendar/gui/e-tasks.c:709
+#: calendar/gui/e-tasks.c:824
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6585,55 +6344,47 @@ msgstr ""
 "Грешка при отварању %s:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:730
+#: calendar/gui/e-tasks.c:845
 msgid "Loading tasks"
 msgstr "Учитавам задужења"
 
-#: calendar/gui/e-tasks.c:834
+#: calendar/gui/e-tasks.c:949
 msgid "Completing tasks..."
 msgstr "Испуњавам задужења..."
 
-#: calendar/gui/e-tasks.c:857
+#: calendar/gui/e-tasks.c:972
 msgid "Deleting selected objects..."
 msgstr "Бришем изабране објекте..."
 
-#: calendar/gui/e-tasks.c:884
+#: calendar/gui/e-tasks.c:999
 msgid "Expunging"
 msgstr "Избацујем"
 
-#: calendar/gui/e-tasks.c:960
+#: calendar/gui/e-tasks.c:1075
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
-#: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
+#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
+#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
 #: calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:705
 msgid "Tasks"
 msgstr "Задужења"
 
-#: calendar/gui/gnome-cal.c:1876
+#: calendar/gui/gnome-cal.c:1878
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Учитавам заказане састанке са %s"
 
-#: calendar/gui/gnome-cal.c:1895
+#: calendar/gui/gnome-cal.c:1897
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Учитавам задужења са %s"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1920
 #, c-format
 msgid "Opening %s"
 msgstr "Отварам %s"
 
-#: calendar/gui/gnome-cal.c:2048
-#, fuzzy, c-format
-msgid "The calendar backend for '%s' has crashed."
-msgstr ""
-"Машинерија календара за\n"
-"%s\n"
-" је пукла"
-
-#: calendar/gui/gnome-cal.c:2894
+#: calendar/gui/gnome-cal.c:2906
 msgid "Purging"
 msgstr "Брише"
 
@@ -6833,7 +6584,7 @@ msgid "On The Web"
 msgstr "На вебу"
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 
@@ -6844,7 +6595,7 @@ msgid "Unable to migrate calendar `%s'"
 msgstr "Не могу да отворим календар „%s“."
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:869
+#: calendar/gui/migration.c:889
 #, fuzzy, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Не могу да отворим задужења у „%s“."
@@ -7080,16 +6831,16 @@ msgstr "Штампај унос"
 msgid "Print Setup"
 msgstr "Подеси штампу"
 
-#: calendar/gui/tasks-component.c:303
+#: calendar/gui/tasks-component.c:313
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr "Списак задужења „%s“ ће бити уклољен. Сигурно желите да наставите?"
 
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:371
 msgid "New Task List"
 msgstr "Нови списак задужења"
 
-#: calendar/gui/tasks-component.c:398
+#: calendar/gui/tasks-component.c:408
 #, fuzzy, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -7097,7 +6848,7 @@ msgstr[0] "%d карата"
 msgstr[1] "%d карата"
 msgstr[2] "%d карата"
 
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -7105,51 +6856,51 @@ msgstr[0] "%d изабраних"
 msgstr[1] "%d изабраних"
 msgstr[2] "%d изабраних"
 
-#: calendar/gui/tasks-component.c:447
+#: calendar/gui/tasks-component.c:457
 #, fuzzy
 msgid "Failed upgrading tasks."
 msgstr "Учитавам задужења"
 
-#: calendar/gui/tasks-component.c:526
+#: calendar/gui/tasks-component.c:749
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 "Не могу да отворим списак задужења „%s“ ради додавања нових догађаја и "
 "састанака"
 
-#: calendar/gui/tasks-component.c:538
+#: calendar/gui/tasks-component.c:761
 msgid "There is no calendar available for creating tasks"
 msgstr "Ниједан календар није доступан за додавање задужења"
 
-#: calendar/gui/tasks-component.c:576
+#: calendar/gui/tasks-component.c:799
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:804
+#: calendar/gui/tasks-component.c:1040
 msgid "New task"
 msgstr "Ново задужење"
 
-#: calendar/gui/tasks-component.c:805
+#: calendar/gui/tasks-component.c:1041
 msgid "_Task"
 msgstr "_Задужење"
 
-#: calendar/gui/tasks-component.c:806
+#: calendar/gui/tasks-component.c:1042
 msgid "Create a new task"
 msgstr "Унеси ново задужење"
 
-#: calendar/gui/tasks-component.c:812
+#: calendar/gui/tasks-component.c:1048
 #, fuzzy
 msgid "New tasks group"
 msgstr "Дискусионе групе"
 
-#: calendar/gui/tasks-component.c:813
+#: calendar/gui/tasks-component.c:1049
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Група списка задужења"
 
-#: calendar/gui/tasks-component.c:814
+#: calendar/gui/tasks-component.c:1050
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Унеси ново задужење"
@@ -8916,12 +8667,12 @@ msgstr "Грешка код примене филтера за претрагу:
 msgid "Unsupported operation: append message: for %s"
 msgstr "Неподржана операција: прикључена порука: за %s"
 
-#: camel/camel-folder.c:1259
+#: camel/camel-folder.c:1262
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Неподржана операција: претрага по изразу: за %s"
 
-#: camel/camel-folder.c:1299
+#: camel/camel-folder.c:1302
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Неподржана операција: претрага по uid-у: за %s"
@@ -8934,11 +8685,16 @@ msgstr "Померам поруке"
 msgid "Copying messages"
 msgstr "Копирам поруке"
 
-#: camel/camel-folder.c:1666
-msgid "Learning junk and/or non junk message(s)"
-msgstr "Учење ђубрета и не-ђубрета од порука"
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Измена стања ђубрета"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr ""
 
-#: camel/camel-folder.c:1695
+#: camel/camel-folder.c:1701
 msgid "Filtering new message(s)"
 msgstr "Филтрирам нове поруке"
 
@@ -8972,17 +8728,17 @@ msgstr ""
 msgid "(match-threads) requires a match type string"
 msgstr ""
 
-#: camel/camel-folder-search.c:785
+#: camel/camel-folder-search.c:784
 #, fuzzy
 msgid "(match-threads) expects an array result"
 msgstr "(одговара-све) захтева само један логички резултат"
 
-#: camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:790
 #, fuzzy
 msgid "(match-threads) requires the folder set"
 msgstr "(одговара-све) захтева само један логички резултат"
 
-#: camel/camel-folder-search.c:880
+#: camel/camel-folder-search.c:879
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Извршавам претрагу на непознато заглавље: %s"
@@ -9017,7 +8773,8 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
 #: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:706
+#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Поништено."
@@ -9395,7 +9152,7 @@ msgstr "Важење тражених уверења је истекло."
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1212
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Лош одговор на пријаву од сервера."
 
@@ -9774,40 +9531,40 @@ msgstr "Команда није подржана"
 msgid "export keys: unimplemented"
 msgstr ""
 
-#: camel/camel-store.c:214
+#: camel/camel-store.c:213
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Не могу да добијем директоријум: неисправна операција"
 
-#: camel/camel-store.c:244
+#: camel/camel-store.c:243
 #, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr "Не могу да направим директоријум „%s“: директоријум постоји"
 
-#: camel/camel-store.c:295
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Не могу да направим директоријум: неисправна операција"
 
-#: camel/camel-store.c:323
+#: camel/camel-store.c:325
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Не могу да направим директоријум „%s“: директоријум постоји"
 
-#: camel/camel-store.c:387 camel/camel-vee-store.c:354
+#: camel/camel-store.c:389 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Не могу да обришем директоријум: %s: неисправна операција"
 
-#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#: camel/camel-store.c:439 camel/camel-vee-store.c:387
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Не могу да променим име  директоријуму: %s: неисправна операција"
 
-#: camel/camel-store.c:811
+#: camel/camel-store.c:777
 msgid "Trash"
 msgstr "Смеће"
 
-#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
-#: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/mail-config.glade.h:95
+#: ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Ђубре"
 
@@ -10038,12 +9795,12 @@ msgstr "Нема такве поруке %s у %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Не могу да копирам или преместим поруке у виртуелни директоријум"
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:374
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Не могу да обришем директоријум: %s: нема таквог директоријума"
 
-#: camel/camel-vee-store.c:398
+#: camel/camel-vee-store.c:395
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Не могу да променим име  директоријуму: %s: нема таквог директоријума"
@@ -10084,32 +9841,32 @@ msgstr "Адресар и календар"
 msgid "Post Office Agent SOAP Port:"
 msgstr "Посредник за СОАП порт за пошту:"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:80
+#: camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "Novell GroupWise"
 msgstr "Новел Групвајз"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:82
+#: camel/providers/groupwise/camel-groupwise-provider.c:85
 msgid "For accessing Novell Groupwise servers"
 msgstr "За приступ Новел Групвајз серверима"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: camel/providers/groupwise/camel-groupwise-provider.c:100
 #: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
 msgid "Password"
 msgstr "Лозинка"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:99
+#: camel/providers/groupwise/camel-groupwise-provider.c:102
 #: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Ова опција ће повезати на IMAP сервер коришћењем лозинке у обичном тексту."
 
-#: camel/providers/groupwise/camel-gw-listener.c:305
-#: camel/providers/groupwise/camel-gw-listener.c:328
+#: camel/providers/groupwise/camel-gw-listener.c:312
+#: camel/providers/groupwise/camel-gw-listener.c:335
 msgid "Checklist"
 msgstr "Попис"
 
@@ -10248,13 +10005,13 @@ msgstr ""
 "Ова опција ће повезати на IMAP сервер коришћењем лозинке у обичном тексту."
 
 #: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:429
+#: camel/providers/imap/camel-imap-store.c:428
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP сервер %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:431
+#: camel/providers/imap/camel-imap-store.c:430
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP сервис за %s на %s"
@@ -10264,7 +10021,7 @@ msgstr "IMAP сервис за %s на %s"
 #: camel/providers/imap/camel-imap-store.c:551
 #: camel/providers/imap/camel-imap-store.c:571
 #: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
+#: camel/providers/nntp/camel-nntp-store.c:209
 #: camel/providers/pop3/camel-pop3-store.c:175
 #: camel/providers/smtp/camel-smtp-transport.c:269
 #: camel/providers/smtp/camel-smtp-transport.c:285
@@ -10281,10 +10038,10 @@ msgstr "SSL није доступан"
 
 #: camel/providers/imap4/camel-imap4-store.c:222
 #: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:815
+#: camel/providers/imap/camel-imap-store.c:845
 #: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:137
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
 #: camel/providers/pop3/camel-pop3-store.c:192
 msgid "Connection cancelled"
 msgstr "Повезивање поништено"
@@ -10299,8 +10056,8 @@ msgstr ""
 "подржава STARTTLS"
 
 #: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:649
-#: camel/providers/imap/camel-imap-store.c:680
+#: camel/providers/imap/camel-imap-store.c:679
+#: camel/providers/imap/camel-imap-store.c:710
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Нисам могао да се повежем на IMAP сервер %s у сигурносном моду: %s"
@@ -10309,7 +10066,7 @@ msgstr "Нисам могао да се повежем на IMAP сервер %s
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1109
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
 msgid "Unknown error"
 msgstr "Непозната грешка"
 
@@ -10336,8 +10093,8 @@ msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr "Не могу да преузмем директоријум „%s“: %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1857
-#: camel/providers/imap/camel-imap-store.c:2235
+#: camel/providers/imap/camel-imap-store.c:1885
+#: camel/providers/imap/camel-imap-store.c:2263
 #, fuzzy, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -10416,12 +10173,12 @@ msgstr "Веза са ИМАП сервером %s је неочекивано �
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3168
+#: camel/providers/imap/camel-imap-store.c:3194
 msgid "Operation cancelled"
 msgstr "Операција обустављена"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3171
+#: camel/providers/imap/camel-imap-store.c:3197
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Веза са сервером је неочекивано искључена: %s"
@@ -10485,13 +10242,6 @@ msgid "Unable to retrieve message: %s"
 msgstr "Не могу да покупим поруку: %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:219
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -10501,15 +10251,15 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-mbox-folder.c:418
+#: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
 msgstr "Нема такве поруке"
 
 #: camel/providers/imap/camel-imap-folder.c:2019
-#: camel/providers/imap/camel-imap-folder.c:2621
-#: camel/providers/nntp/camel-nntp-folder.c:238
+#: camel/providers/imap/camel-imap-folder.c:2622
+#: camel/providers/nntp/camel-nntp-folder.c:220
 msgid "This message is not currently available"
 msgstr "Ова поруке није тренутно доступна"
 
@@ -10518,7 +10268,23 @@ msgstr "Ова поруке није тренутно доступна"
 msgid "Fetching summary information for new messages"
 msgstr "Прикупљам сажету информацију за нове поруке"
 
-#: camel/providers/imap/camel-imap-folder.c:2659
+#: camel/providers/imap/camel-imap-folder.c:2463
+#, c-format
+msgid "Incomplete server response: no information provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2471
+#, c-format
+msgid "Incomplete server response: no UID provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2484
+#, c-format
+msgid ""
+"Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2660
 msgid "Could not find message body in FETCH response."
 msgstr "Нисам могао да пронађем текст поруке у FETCH одговору."
 
@@ -10577,43 +10343,43 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "За читање и смештање поште на IMAP сервере."
 
-#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/imap/camel-imap-store.c:680
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS екстензија није подржана."
 
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:711
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL преговори нису успели"
 
-#: camel/providers/imap/camel-imap-store.c:818
+#: camel/providers/imap/camel-imap-store.c:848
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Нисам могао да се повежем помоћу наредбе %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1242
+#: camel/providers/imap/camel-imap-store.c:1272
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP сервер %s не подржава тражени тип пријаве  %s"
 
-#: camel/providers/imap/camel-imap-store.c:1252
+#: camel/providers/imap/camel-imap-store.c:1282
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Нема подршке за тип пријаве  %s"
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1305
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sМолим унесите IMAP лозинку за %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1289
+#: camel/providers/imap/camel-imap-store.c:1319
 msgid "You didn't enter a password."
 msgstr "Нисте унели лозинку."
 
-#: camel/providers/imap/camel-imap-store.c:1318
+#: camel/providers/imap/camel-imap-store.c:1348
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10624,18 +10390,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1839
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:1867
+#: camel/providers/imap/camel-imap-store.c:2057
 #, c-format
 msgid "No such folder %s"
 msgstr "Нема таквог директоријума %s"
 
-#: camel/providers/imap/camel-imap-store.c:1915
-#: camel/providers/imap/camel-imap-store.c:2296
+#: camel/providers/imap/camel-imap-store.c:1943
+#: camel/providers/imap/camel-imap-store.c:2324
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Главни директоријум не може садржати директоријуме у себи"
 
-#: camel/providers/imap/camel-imap-store.c:1970
+#: camel/providers/imap/camel-imap-store.c:1998
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10643,7 +10409,7 @@ msgstr "Главни директоријум не може садржати д�
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Не могу да направим директоријум „%s“: директоријум постоји."
 
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:2274
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Непознати главни директоријум: %s"
@@ -10680,20 +10446,20 @@ msgid "Index message body data"
 msgstr "Попиши садржаје порука"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:388
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:393
-#: camel/providers/local/camel-local-folder.c:396
+#: camel/providers/local/camel-local-folder.c:392
+#: camel/providers/local/camel-local-folder.c:395
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "mailbox:%s (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:400
+#: camel/providers/local/camel-local-folder.c:399
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -10754,7 +10520,7 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:142
 #: camel/providers/local/camel-local-store.c:253
-#: camel/providers/local/camel-mbox-store.c:356
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10827,8 +10593,25 @@ msgstr "Прододата Maildir порука понишетна"
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Не могу да додам поруку у maildir директоријум: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:226
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mbox-folder.c:417
+#: camel/providers/local/camel-mbox-folder.c:436
+#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:475
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-mh-folder.c:221
+#, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+"Не могу да добијем поруку: %s из директоријума %s\n"
+"  %s"
+
+#: camel/providers/local/camel-maildir-folder.c:236
 msgid "Invalid message contents"
 msgstr "Неисправан садржај поруке"
 
@@ -10869,9 +10652,9 @@ msgstr "Нисам могао да обришем директоријум `%s':
 msgid "not a maildir directory"
 msgstr "није maildir директоријум"
 
-#: camel/providers/local/camel-maildir-store.c:341
-#: camel/providers/local/camel-spool-store.c:286
-#: camel/providers/local/camel-spool-store.c:316
+#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-spool-store.c:284
+#: camel/providers/local/camel-spool-store.c:314
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Нисам могао да скенирам директоријум `%s': %s"
@@ -10918,27 +10701,18 @@ msgstr "Додавање поште отказано"
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Не могу да додам поруку у mbox датотеку: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:435
-#: camel/providers/local/camel-mbox-folder.c:466
-#: camel/providers/local/camel-mbox-folder.c:474
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"Не могу да добијем поруку: %s из директоријума %s\n"
-"  %s"
-
-#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:468
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Директоријум изгледа непоправљиво оштећен."
 
-#: camel/providers/local/camel-mbox-folder.c:475
-msgid "Message construction failed: Corrupt mailbox?"
+#: camel/providers/local/camel-mbox-folder.c:476
+#: camel/providers/local/camel-mh-folder.c:222
+#, fuzzy
+msgid "Message construction failed."
 msgstr "Састављање поруке неуспело: Оштећено сандуче?"
 
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:362
+#: camel/providers/local/camel-mbox-store.c:361
 msgid "Cannot create a folder by this name."
 msgstr "Не могу да направим директоријум са тим именом."
 
@@ -10968,31 +10742,31 @@ msgstr "`%s' није обична датотека."
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Директоријум `%s' није празан. Није обрисан."
 
-#: camel/providers/local/camel-mbox-store.c:375
+#: camel/providers/local/camel-mbox-store.c:374
 #, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Нисам могао да направим директоријум %s: %s."
 
-#: camel/providers/local/camel-mbox-store.c:389
+#: camel/providers/local/camel-mbox-store.c:388
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Не могу да направим директоријум: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:391
+#: camel/providers/local/camel-mbox-store.c:390
 msgid "Folder already exists"
 msgstr "Директоријум већ постоји"
 
-#: camel/providers/local/camel-mbox-store.c:473
+#: camel/providers/local/camel-mbox-store.c:472
 msgid "The new folder name is illegal."
 msgstr "Ново име директоријума је неисправно."
 
-#: camel/providers/local/camel-mbox-store.c:486
+#: camel/providers/local/camel-mbox-store.c:485
 #, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Не могу да преименујем „%s“: „%s“: %s"
 
 # bug: quotes on the other one as well
-#: camel/providers/local/camel-mbox-store.c:561
+#: camel/providers/local/camel-mbox-store.c:560
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Не могу да преименујем „%s“ у „%s“: %s"
@@ -11183,7 +10957,7 @@ msgstr ""
 "Директоријум је можда оштећен, копирајте сачувано у `%s'"
 
 #: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:997
+#: camel/providers/nntp/camel-nntp-store.c:1126
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Унесите ННТП лозинку за %s@%s"
@@ -11200,19 +10974,10 @@ msgstr "Неуспешно слање корисничког имена серв
 msgid "Server rejected username/password"
 msgstr "Сервер је одбио корисника/лозинку"
 
-# Ово је било "корисник поништен", али мислим да је ово ипак исправније
-#: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:263
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr "Корисник поништио"
-
-#: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:259
-#: camel/providers/nntp/camel-nntp-folder.c:265
+#: camel/providers/nntp/camel-nntp-folder.c:147
+#: camel/providers/nntp/camel-nntp-folder.c:149
+#: camel/providers/nntp/camel-nntp-folder.c:158
+#: camel/providers/nntp/camel-nntp-folder.c:234
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11221,60 +10986,50 @@ msgstr "Корисник поништио"
 msgid "Cannot get message %s: %s"
 msgstr "Не могу да добијем поруку %s: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:188
-#: camel/providers/nntp/camel-nntp-folder.c:228
+# Ово је било "корисник поништен", али мислим да је ово ипак исправније
+#: camel/providers/nntp/camel-nntp-folder.c:156
+#: camel/providers/nntp/camel-nntp-folder.c:232
+#: camel/providers/nntp/camel-nntp-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+msgid "User cancelled"
+msgstr "Корисник поништио"
+
+#: camel/providers/nntp/camel-nntp-folder.c:176
+#: camel/providers/nntp/camel-nntp-folder.c:208
 #, c-format
 msgid "Internal error: uid in invalid format: %s"
 msgstr "Унутрашња грешка: КИБ у неисправном облику: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:201
-#, c-format
-msgid "Could not get article %s from NNTP server"
-msgstr "Нисам могао да преузмем чланак %s са NNTP сервера."
-
-#: camel/providers/nntp/camel-nntp-folder.c:362
-msgid "Posting not allowed by news server"
-msgstr "Сервер не дозвољава слање чланака"
-
+#: camel/providers/nntp/camel-nntp-folder.c:328
+#: camel/providers/nntp/camel-nntp-folder.c:331
 #: camel/providers/nntp/camel-nntp-folder.c:373
-#, c-format
-msgid "Failed to send newsgroups header: %s: message not posted"
-msgstr "Неуспешно слање заглавља група: %s: порука није послата"
-
-#: camel/providers/nntp/camel-nntp-folder.c:413
-#: camel/providers/nntp/camel-nntp-folder.c:426
-#, c-format
-msgid "Error posting to newsgroup: %s: message not posted"
-msgstr "Грешка при слања у групу: %s: порука није послата"
-
-#: camel/providers/nntp/camel-nntp-folder.c:438
-msgid "Error reading response to posted message: message not posted"
-msgstr "Грешка при читању одговора на послату поруку: порука није послата"
-
-#: camel/providers/nntp/camel-nntp-folder.c:441
-#, c-format
-msgid "Error posting message: %s: message not posted"
-msgstr "Грешка при слања поруке: %s: порука није послата"
+#: camel/providers/nntp/camel-nntp-folder.c:375
+#, fuzzy, c-format
+msgid "Posting failed: %s"
+msgstr "Неуспела операција: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:457
+#: camel/providers/nntp/camel-nntp-folder.c:393
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "Не можете послати NNTP поруке док нисте повезани!"
 
-#: camel/providers/nntp/camel-nntp-folder.c:468
+#: camel/providers/nntp/camel-nntp-folder.c:404
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Не можете копирати поруке из NNTP директоријума!"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:44
 msgid "Could not get group list from server."
 msgstr "Нисам могао да преузмем списак група са сервера."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#: camel/providers/nntp/camel-nntp-grouplist.c:97
+#: camel/providers/nntp/camel-nntp-grouplist.c:106
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "Не могу да учитам датотеку са списком група за %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#: camel/providers/nntp/camel-nntp-grouplist.c:157
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Не могу да сачувам датотеку са списком група за %s: %s"
@@ -11304,26 +11059,29 @@ msgid ""
 msgstr ""
 "Ова опција ће пријавити на NNTP сервер коришћењем лозинке у обичном тексту."
 
-#: camel/providers/nntp/camel-nntp-store.c:158
+#: camel/providers/nntp/camel-nntp-store.c:118
+#: camel/providers/nntp/camel-nntp-store.c:1233
+#: camel/providers/nntp/camel-nntp-store.c:1331
+#, c-format
+msgid "NNTP Command failed: %s"
+msgstr "NNTP команда неуспела: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:227
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Нисам могао да прочитам поздрав од %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:170
+#: camel/providers/nntp/camel-nntp-store.c:239
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP сервер %s је узвратио кодом о грешци %d: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:326
+#: camel/providers/nntp/camel-nntp-store.c:403
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET вести преко %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:640
-msgid "Stream error"
-msgstr "Грешка тока"
-
-#: camel/providers/nntp/camel-nntp-store.c:643
+#: camel/providers/nntp/camel-nntp-store.c:777
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -11334,7 +11092,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/providers/nntp/camel-nntp-store.c:735
+#: camel/providers/nntp/camel-nntp-store.c:872
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
@@ -11344,7 +11102,7 @@ msgstr ""
 "\n"
 "Нема такве групе. Изабрана ставка је вероватно надређени директоријум."
 
-#: camel/providers/nntp/camel-nntp-store.c:767
+#: camel/providers/nntp/camel-nntp-store.c:904
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
@@ -11354,63 +11112,62 @@ msgstr ""
 "\n"
 "Група не постоји!"
 
-#: camel/providers/nntp/camel-nntp-store.c:792
+#: camel/providers/nntp/camel-nntp-store.c:929
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 "Не можете направити директоријум у смештају вести: претплатите се уместо "
 "тога."
 
-#: camel/providers/nntp/camel-nntp-store.c:800
+#: camel/providers/nntp/camel-nntp-store.c:937
 msgid "You cannot rename a folder in a News store."
 msgstr "Не можете преименовати директоријум у смештају вести."
 
-#: camel/providers/nntp/camel-nntp-store.c:808
+#: camel/providers/nntp/camel-nntp-store.c:945
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 "Не можете уклонити директоријум у смештају вести: одјавите се уместо тога."
 
-#: camel/providers/nntp/camel-nntp-summary.c:253
-#, c-format
-msgid "Connection error: %s"
-msgstr "Грешка при повезивању: %s"
-
-#: camel/providers/nntp/camel-nntp-summary.c:262
-#, c-format
-msgid "No such folder: %s"
-msgstr "Нема таквог директоријума: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1118
+#, fuzzy
+msgid "Authentication requested but not username provided"
+msgstr "Неопходна пријава"
 
-#: camel/providers/nntp/camel-nntp-summary.c:268
-#, c-format
-msgid "Could not get group: %s"
-msgstr "Нисам могао да добијем групу: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1146
+#, fuzzy, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr "Нисам могао да се пријавим на ИМАП сервер %s помоћу %s"
 
-# bug: s/unspecificed/unspecified/
-#: camel/providers/nntp/camel-nntp-summary.c:333
+#: camel/providers/nntp/camel-nntp-store.c:1262
 #, fuzzy
-msgid "Could not get messages: unspecified error"
-msgstr "Нисам могао да преузмем поруке: неназначена грешка"
+msgid "Not connected."
+msgstr "Нема контакта"
 
-#: camel/providers/nntp/camel-nntp-summary.c:378
+#: camel/providers/nntp/camel-nntp-store.c:1311
 #, c-format
-msgid "NNTP Command failed: %s"
-msgstr "NNTP команда неуспела: %s"
+msgid "No such folder: %s"
+msgstr "Нема таквог директоријума: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:438
-#: camel/providers/nntp/camel-nntp-summary.c:543
+#: camel/providers/nntp/camel-nntp-summary.c:218
+#: camel/providers/nntp/camel-nntp-summary.c:314
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Тражим нове поруке"
 
-#: camel/providers/nntp/camel-nntp-summary.c:558
-#, c-format
-msgid "Unknown server response: %s"
-msgstr "Непознат одговор сервера: %s"
+#: camel/providers/nntp/camel-nntp-summary.c:225
+#, fuzzy, c-format
+msgid "Unexpected server response from xover: %s"
+msgstr "Неочекиван одговор од IMAP сервера: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:328
+#, fuzzy, c-format
+msgid "Unexpected server response from head: %s"
+msgstr "Неочекиван одговор од GnuPG: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:605
+#: camel/providers/nntp/camel-nntp-summary.c:368
 msgid "Use cancel"
 msgstr "Користите поништи"
 
-#: camel/providers/nntp/camel-nntp-summary.c:607
+#: camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Неуспела операција: %s"
@@ -11458,7 +11215,7 @@ msgstr "Обриши након %s дана"
 msgid "Disable support for all POP3 extensions"
 msgstr "Онемогући подршку за сва POP3 проширења"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107
 msgid "POP"
 msgstr "POP"
 
@@ -11547,7 +11304,7 @@ msgid "No such folder `%s'."
 msgstr "Нема таквог директоријума `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:132
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -11600,7 +11357,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Достава поште преко програма sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:119
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11885,19 +11642,19 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
+#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:408
 msgid "attachment"
 msgstr "прилог"
 
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:454
 msgid "Remove selected items from the attachment list"
 msgstr "Уклони одабране предмете са листе прилога"
 
-#: composer/e-msg-composer-attachment-bar.c:491
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Add attachment..."
 msgstr "Додај прилог..."
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:495
 msgid "Attach a file to the message"
 msgstr "Додај датотеку поруци"
 
@@ -11964,7 +11721,7 @@ msgstr "Неименована порука"
 msgid "Open file"
 msgstr "Отвори датотеку"
 
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
 msgid "Autogenerated"
 msgstr "Аутогенерисан"
 
@@ -12111,17 +11868,17 @@ msgstr "Приложи датотеке"
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
+msgid "You cannot attach the file `{0}' to this message."
 msgstr "Додај датотеку поруци"
 
 #. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4
-msgid "${1}"
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
 msgstr ""
 
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
 
 #. mail-composer:attach-directory primary
@@ -12216,7 +11973,7 @@ msgstr "Нисам могао да направим везу: %s"
 
 #. mail-composer:no-build-message secondary
 #: composer/mail-composer-errors.xml.h:34
-msgid "Because \"${0}\", you may need to select different mail options."
+msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
@@ -12226,8 +11983,10 @@ msgid "Could not read signature file \"{0}\"."
 msgstr "Нисам могао да сачувам потпис: %s"
 
 #. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38
-msgid "Because \"${1}\"."
+#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted primary
@@ -12654,11 +12413,11 @@ msgid "<b>Then</b>"
 msgstr "<b>Онда</b>"
 
 #: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1335
+#: mail/mail-account-gui.c:1347
 msgid "Select Folder"
 msgstr "Одаберите директоријум"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
 msgid "    "
 msgstr "    "
 
@@ -12715,7 +12474,7 @@ msgid "months"
 msgstr "месеци"
 
 # bug: plural-forms
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
 msgid "seconds"
 msgstr "секунде"
 
@@ -12747,20 +12506,20 @@ msgstr "са свим локалним директоријумима"
 msgid "years"
 msgstr "године"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:916
-#: mail/mail-config.c:76 mail/mail-config.glade.h:90
+#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
+#: mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Важно"
 
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:919 mail/mail-config.c:79
-#: mail/mail-config.glade.h:145
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: mail/mail-config.glade.h:148
 msgid "To Do"
 msgstr "За урадити"
 
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:920 mail/mail-config.c:80
-#: mail/mail-config.glade.h:94
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: mail/mail-config.glade.h:97
 msgid "Later"
 msgstr "Касније"
 
@@ -12816,252 +12575,6 @@ msgstr "долазећи"
 msgid "outgoing"
 msgstr "одлазећи"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Adjust Score"
-msgstr "Прерачунај"
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Color"
-msgstr "Додели боју"
-
-#: filter/libfilter-i18n.h:4
-msgid "Assign Score"
-msgstr "Додели боју"
-
-#: filter/libfilter-i18n.h:5
-msgid "Attachments"
-msgstr "Прилози"
-
-#: filter/libfilter-i18n.h:6
-msgid "Beep"
-msgstr "Звоно"
-
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "садржи"
-
-#: filter/libfilter-i18n.h:8
-msgid "Copy to Folder"
-msgstr "Копирај у директоријум"
-
-#: filter/libfilter-i18n.h:9
-msgid "Date received"
-msgstr "Датум примања"
-
-#: filter/libfilter-i18n.h:10
-msgid "Date sent"
-msgstr "Датум слања"
-
-#: filter/libfilter-i18n.h:12
-msgid "Deleted"
-msgstr "Обрисано"
-
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "не садржи"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "не завршава се са"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "не постоји"
-
-#: filter/libfilter-i18n.h:16
-msgid "does not return"
-msgstr "не враћа"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "не звучи као"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "не почиње са"
-
-#: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
-msgstr "Не постоји"
-
-#: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr "Припрема"
-
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "завршава се са"
-
-#: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr "Постоји"
-
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "постоји"
-
-#: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr "Израз"
-
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr "Следи"
-
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "је"
-
-#: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr "је после"
-
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr "је пре"
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr "је означен"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "је већи од"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "је мањи од"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "није"
-
-#: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr "није означен"
-
-#: filter/libfilter-i18n.h:36
-msgid "Junk Test"
-msgstr "Провера ђубрета"
-
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
-#: widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Етикета"
-
-#: filter/libfilter-i18n.h:38
-msgid "Mailing list"
-msgstr "Дописна листа"
-
-#: filter/libfilter-i18n.h:39
-msgid "Message Body"
-msgstr "Тело поруке"
-
-#: filter/libfilter-i18n.h:40
-msgid "Message Header"
-msgstr "Заглавље поруке"
-
-#: filter/libfilter-i18n.h:41
-msgid "Message is Junk"
-msgstr "Порука је ђубре"
-
-#: filter/libfilter-i18n.h:42
-msgid "Message is not Junk"
-msgstr "Порука није ђубре"
-
-#: filter/libfilter-i18n.h:43
-msgid "Move to Folder"
-msgstr "Премести у директоријум"
-
-#: filter/libfilter-i18n.h:44
-msgid "Pipe to Program"
-msgstr "Кроз цев до програма"
-
-#: filter/libfilter-i18n.h:45
-msgid "Play Sound"
-msgstr "Пусти звук"
-
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Читај"
-
-#: filter/libfilter-i18n.h:47
-msgid "Recipients"
-msgstr "Примаоци"
-
-#: filter/libfilter-i18n.h:48
-msgid "Regex Match"
-msgstr "Рег. израз претрага"
-
-#: filter/libfilter-i18n.h:49
-msgid "Replied to"
-msgstr "Одговорено на"
-
-#: filter/libfilter-i18n.h:50
-msgid "returns"
-msgstr "повраћаји"
-
-#: filter/libfilter-i18n.h:51
-msgid "returns greater than"
-msgstr "више повраћаја од"
-
-#: filter/libfilter-i18n.h:52
-msgid "returns less than"
-msgstr "мање повраћаја од"
-
-#: filter/libfilter-i18n.h:53
-msgid "Run Program"
-msgstr "Покрени програм"
-
-#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Резултат"
-
-#: filter/libfilter-i18n.h:55
-msgid "Sender"
-msgstr "Пошиљалац"
-
-#: filter/libfilter-i18n.h:56
-msgid "Set Status"
-msgstr "Додели статус"
-
-#: filter/libfilter-i18n.h:57
-msgid "Size (kB)"
-msgstr "Величина (kB)"
-
-#: filter/libfilter-i18n.h:58
-msgid "sounds like"
-msgstr "звучи као"
-
-#: filter/libfilter-i18n.h:59
-msgid "Source Account"
-msgstr "Изворни налог"
-
-#: filter/libfilter-i18n.h:60
-msgid "Specific header"
-msgstr "Одређено заглавље"
-
-#: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "почиње са"
-
-#: filter/libfilter-i18n.h:63
-msgid "Stop Processing"
-msgstr "Прекини са обрадом"
-
-#: filter/libfilter-i18n.h:64 mail/em-format.c:755 mail/em-format-html.c:1519
-#: mail/em-format-quote.c:302 mail/em-mailer-prefs.c:87
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
-#: smime/lib/e-cert.c:1079
-msgid "Subject"
-msgstr "Наслов"
-
-#: filter/libfilter-i18n.h:65
-msgid "Unset Status"
-msgstr "Недодељен статус"
-
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Додај правило"
@@ -13079,6 +12592,11 @@ msgstr "Име правила"
 msgid "_Score Rules"
 msgstr "Правила резултата"
 
+#: filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Резултат"
+
 #: filter/searchtypes.xml.h:1
 msgid "Body contains"
 msgstr "Тело садржи"
@@ -13159,13 +12677,13 @@ msgstr "Потпис(и)"
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Прослеђена порука --------"
 
-#: mail/em-composer-utils.c:1499
+#: mail/em-composer-utils.c:1495
 msgid "an unknown sender"
 msgstr "непознати пошиљалац"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1509
+#: mail/em-composer-utils.c:1505
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "У %a, %d. %m. %Y у %H:%M %%+05d, %%s написа:"
 
@@ -13203,8 +12721,8 @@ msgstr "<протисните овде да изаберете директор�
 msgid "Create New Folder"
 msgstr "Направи нови директоријум"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
-#: mail/mail-component.c:701
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
+#: mail/mail-component.c:704
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Наведите где да направим директоријум:"
@@ -13219,103 +12737,104 @@ msgstr "Направи директоријум"
 msgid "Folder _name:"
 msgstr "_Име директоријума:"
 
-#: mail/em-folder-tree.c:839
+#: mail/em-folder-tree.c:833
 #, c-format
 msgid "Moving folder %s"
 msgstr "Премештам директоријум %s"
 
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree.c:835
 #, c-format
 msgid "Copying folder %s"
 msgstr "Умножавам директоријум %s"
 
-#: mail/em-folder-tree.c:848 mail/message-list.c:1555
+#: mail/em-folder-tree.c:842 mail/message-list.c:1561
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Премештам поруке у директоријум %s"
 
-#: mail/em-folder-tree.c:850 mail/message-list.c:1557
+#: mail/em-folder-tree.c:844 mail/message-list.c:1563
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Копирам поруке у директоријум %s"
 
-#: mail/em-folder-tree.c:866
+#: mail/em-folder-tree.c:860
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Не могу да убацим поруке у смештај на највишем нивоу"
 
-#: mail/em-folder-tree.c:956 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Копирај у директоријум"
 
-#: mail/em-folder-tree.c:957 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Премести у директоријум"
 
-#: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2069
-#: mail/em-folder-tree.c:2551 mail/em-folder-view.c:798
-#: mail/message-list.c:1645
+#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
+#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
+#: mail/message-list.c:1651
 msgid "_Move"
 msgstr "Пре_мести"
 
-#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#: mail/em-folder-tree.c:955 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "Откажи задужење"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
 #: mail/em-folder-view.c:798 mail/em-folder-view.c:812
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Одаберите директоријум"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
 #, fuzzy
 msgid "C_opy"
 msgstr "Умножи"
 
-#: mail/em-folder-tree.c:2096
+#: mail/em-folder-tree.c:2088
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Правим директоријум „%s“"
 
-#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
+#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
 msgid "Create folder"
 msgstr "Направи директоријум"
 
-#: mail/em-folder-tree.c:2474
+#: mail/em-folder-tree.c:2463
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Преименуј директоријум „%s“ у:"
 
-#: mail/em-folder-tree.c:2476
+#: mail/em-folder-tree.c:2465
 msgid "Rename Folder"
 msgstr "Преименуј директоријум"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "П_реглед"
 
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2537
 msgid "Open in _New Window"
 msgstr "Отвори у _новом прозору"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2555
+#: mail/em-folder-tree.c:2546
 msgid "_New Folder..."
 msgstr "_Нови директоријум..."
 
-#: mail/em-folder-tree.c:2558
+#: mail/em-folder-tree.c:2549
 msgid "_Rename"
 msgstr "Преимену_ј"
 
-#: mail/em-folder-tree.c:2561 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Особине..."
 
 #: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:889
+#: mail/mail-vfolder.c:888
 msgid "VFolders"
 msgstr "VFolder-и"
 
@@ -13329,7 +12848,7 @@ msgstr "НЕПОКЛОПЉЕН"
 msgid "Inbox"
 msgstr "Сандуче"
 
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
 msgid "Loading..."
 msgstr "Учитавам..."
 
@@ -13337,12 +12856,12 @@ msgstr "Учитавам..."
 #: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
 #: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
 #: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:551
+#: mail/mail-component.c:554
 msgid "Mail"
 msgstr "Пошта"
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Уреди као нову поруку..."
@@ -13355,17 +12874,17 @@ msgstr "_Штампај"
 msgid "_Reply to Sender"
 msgstr "_Одговори пошиљаоцу"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:810
+#: mail/em-folder-view.c:901 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Одговори на _листу"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:811
+#: mail/em-folder-view.c:902 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Одговори _Свима"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: mail/em-folder-view.c:903 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "Просл_еди"
@@ -13418,6 +12937,10 @@ msgstr "Прене_си у директоријум..."
 msgid "_Copy to Folder..."
 msgstr "_Копирај у директоријум..."
 
+#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Етикета"
+
 #: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Додај пошиљаоца у адреса_р"
@@ -13467,12 +12990,12 @@ msgid "Filter on _Mailing List"
 msgstr "Филтрирај према _дописној листи"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
-#: mail/mail-config.glade.h:66
+#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Подразумевани"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1796
 msgid "Print Message"
 msgstr "Штампај поруку"
 
@@ -13511,12 +13034,18 @@ msgstr "Cc (копија)"
 msgid "Bcc"
 msgstr "Bcc (невидљива копија)"
 
+#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
+#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Наслов"
+
 #: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
 #: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Датум"
 
-#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
+#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
 msgid "Newsgroups"
 msgstr "Дискусионе групе"
 
@@ -13713,7 +13242,7 @@ msgstr ""
 "Ова порука је шифрована, и то добрим алгоритмом. Веома тешко је могуће да "
 "неко са стране види садржај ове поруке у догледном времену."
 
-#: mail/em-format-html-display.c:757
+#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
 msgid "_View Certificate"
 msgstr "По_гледај сертификат"
 
@@ -13767,7 +13296,7 @@ msgstr "Једном недељно"
 msgid "Once per month"
 msgstr "Једном месечно"
 
-#: mail/em-migrate.c:1072
+#: mail/em-migrate.c:1168
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13779,86 +13308,86 @@ msgstr ""
 "\n"
 "Будите стрпљиви док Еволуција пренесе ваше директоријуме..."
 
-#: mail/em-migrate.c:1506
+#: mail/em-migrate.c:1602
 #, fuzzy, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Не могу да направим директоријум „%s“: %s"
 
-#: mail/em-migrate.c:1532
+#: mail/em-migrate.c:1628
 #, fuzzy, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr ""
 "Не могу да копирам опис датотеке: %s\n"
 "%s"
 
-#: mail/em-migrate.c:1715
+#: mail/em-migrate.c:1811
 #, fuzzy, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Не могу да сачувам датотеку са списком група за %s: %s"
 
-#: mail/em-migrate.c:1919
+#: mail/em-migrate.c:2015
 #, fuzzy, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Нисам могао да се пријавим на POP сервер %s: %s"
 
-#: mail/em-migrate.c:1933
+#: mail/em-migrate.c:2029
 #, fuzzy, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Неуспешно прављење директоријума „%s“: %s"
 
-#: mail/em-migrate.c:1962
+#: mail/em-migrate.c:2058
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#: mail/em-migrate.c:2413 mail/em-migrate.c:2425
 #, fuzzy, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Неуспешно прављење директоријума „%s“: %s"
 
-#: mail/em-migrate.c:2480
+#: mail/em-migrate.c:2576
 #, fuzzy, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr ""
 "Не могу да направим излазну датотеку: %s\n"
 " %s"
 
-#: mail/em-migrate.c:2498
+#: mail/em-migrate.c:2594
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 msgstr ""
 
-#: mail/em-popup.c:699
+#: mail/em-popup.c:700
 msgid "Save As..."
 msgstr "Сачувај као..."
 
-#: mail/em-popup.c:717
+#: mail/em-popup.c:718
 #, c-format
 msgid "untitled_image.%s"
 msgstr "неименована_слика.%s"
 
-#: mail/em-popup.c:807
+#: mail/em-popup.c:808
 msgid "Set as _Background"
 msgstr "Постави на _позадину"
 
-#: mail/em-popup.c:809
+#: mail/em-popup.c:810
 msgid "_Reply to sender"
 msgstr "_Одговори пошиљаоцу"
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:859
 msgid "_Open Link in Browser"
 msgstr "_Отвори везу у читачу"
 
-#: mail/em-popup.c:859
+#: mail/em-popup.c:860
 msgid "Se_nd message to..."
 msgstr "Пошаљи _поруку..."
 
-#: mail/em-popup.c:860
+#: mail/em-popup.c:861
 msgid "_Add to Addressbook"
 msgstr "Додај у _адресар"
 
-#: mail/em-popup.c:966
+#: mail/em-popup.c:967
 #, c-format
 msgid "Open in %s..."
 msgstr "Отвори у %s..."
@@ -14444,7 +13973,7 @@ msgstr "Контрола особина Еволуција поште"
 msgid "Mail Accounts"
 msgstr "Поштански налози"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
 msgid "Mail Preferences"
 msgstr "Особине поште"
 
@@ -14458,15 +13987,15 @@ msgid "Evolution is importing your old Elm mail"
 msgstr "Еволуција увози вашу стару Elm пошту"
 
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:226
+#: mail/importers/evolution-mbox-importer.c:221
+#: mail/importers/evolution-outlook-importer.c:255
 #: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Увозим..."
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:222
-#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/evolution-mbox-importer.c:223
+#: mail/importers/evolution-outlook-importer.c:257
 #: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Молим сачекајте"
@@ -14488,21 +14017,23 @@ msgid "Elm"
 msgstr "Elm"
 
 #: mail/importers/evolution-mbox-importer.c:116
+#: mail/importers/evolution-outlook-importer.c:130
 msgid "Destination folder:"
 msgstr "Одредишни директоријум:"
 
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder to import into"
 msgstr "Изаберите директоријум у који да увезем"
 
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:254
 #: mail/importers/mail-importer.c:226
 #, c-format
 msgid "Importing `%s'"
 msgstr "Увозим „%s“"
 
-#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/evolution-outlook-importer.c:301
 #: mail/importers/mail-importer.c:140
 msgid "Importing mailbox"
 msgstr "Увозим поштанско сандуче"
@@ -14663,15 +14194,15 @@ msgstr ""
 msgid "%s License Agreement"
 msgstr "Сагласност кључа"
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
 msgid "_Host:"
 msgstr "_Домаћин:"
 
-#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
 msgid "User_name:"
 msgstr "Корисничко_име"
 
-#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
 msgid "_Path:"
 msgstr "_Путања:"
 
@@ -14734,31 +14265,31 @@ msgstr "%d укупно"
 msgid ", %d unread"
 msgstr "%d непослатих"
 
-#: mail/mail-component.c:653
+#: mail/mail-component.c:656
 msgid "New Mail Message"
 msgstr "Нова порука"
 
-#: mail/mail-component.c:654
+#: mail/mail-component.c:657
 msgid "_Mail Message"
 msgstr "_Порука"
 
-#: mail/mail-component.c:655
+#: mail/mail-component.c:658
 msgid "Compose a new mail message"
 msgstr "Састави нову поруку"
 
-#: mail/mail-component.c:661
+#: mail/mail-component.c:664
 msgid "New Mail Folder"
 msgstr "Нови директоријум са поштом"
 
-#: mail/mail-component.c:662
+#: mail/mail-component.c:665
 msgid "Mail _Folder"
 msgstr "_Директоријум са поштом"
 
-#: mail/mail-component.c:663
+#: mail/mail-component.c:666
 msgid "Create a new mail folder"
 msgstr "Направи нови директоријум са поштом"
 
-#: mail/mail-component.c:795
+#: mail/mail-component.c:798
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
@@ -14770,7 +14301,7 @@ msgstr "проверавам сервис"
 msgid "Connecting to server..."
 msgstr "Повезујем се на сервер..."
 
-#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Личност"
 
@@ -14785,7 +14316,7 @@ msgstr ""
 "које шаљете."
 
 #: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid "Receiving Mail"
 msgstr "Примање поште"
 
@@ -14801,7 +14332,7 @@ msgstr ""
 msgid "Please select among the following options"
 msgstr "Молим изаберите од следећих опција"
 
-#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr "Слање поште"
 
@@ -14813,7 +14344,7 @@ msgstr ""
 "Молим унесите податке о начину на који ћете слати пошту. Ако нисте сигурни, "
 "питајте систем администратора или понуђача Интернет сервиса."
 
-#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37
 msgid "Account Management"
 msgstr "Управљање налозима"
 
@@ -14830,227 +14361,232 @@ msgstr ""
 "Еволуција налог за пошту. Молим унесите доле име за овај налог. Ово име ће "
 "бити коришћено само за потребе приказивања на екрану."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:2
 msgid " Ch_eck for Supported Types "
 msgstr "_Провери подржане врсте "
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
 msgid "<b>Preview</b>"
 msgstr "<b>Приказ</b>"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "<b>SSL није подржан у овој верзији еволуције</b>"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "<b>S_ignatures</b>"
 msgstr "<b>По_тписи</b>"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "<b>_Languages</b>"
 msgstr "<b>_Језици</b>"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
+msgid "<small>This will make the the filter more reliable, but slower</small>"
+msgstr ""
+
+#: mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">Подаци о налогу</span>"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">Упозорења</span>"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr "<span weight=\"bold\">Начин пријаве</span>"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">Идентификација</span>"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Checking for New Mail</span>"
 msgstr "<span weight=\"bold\">Провера нове поште</span>"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr "<span weight=\"bold\">Састављање порука</span>"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">Подешавања</span>"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr "<span weight=\"bold\">Уобичајено понашање</span>"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr "<span weight=\"bold\">Брисање поште</span>"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr "<span weight=\"bold\">Приказана _заглавља порука</span>"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr "<span weight=\"bold\">Опције филтера</span>"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">Опште</span>"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr "<span weight=\"bold\">Ознаке и боје</span>"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr "<span weight=\"bold\">Учитавање слика</span>"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "<span weight=\"bold\">Приказ поруке</span>"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr "<span weight=\"bold\">Фонтови поруке</span>"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "<span weight=\"bold\">Обавештавање о новој пошти</span>"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr "<span weight=\"bold\">Необавезни подаци</span>"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<span weight=\"bold\">Опције</span>"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "<span weight=\"bold\">Прилично добра приватност (PGP/GPG)</span>"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">Фонтови за штампу</span>"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">Неопходни подаци</span>"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">Безбедни МИМЕ (S/MIME)</span>"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">Безбедност</span>"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">Послате и недовршене поруке</span>"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:34
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">Подешавање сервера</span>"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:35
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "_Такође шифруј на мене код слања шифроване поште"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:36
 msgid "Account Editor"
 msgstr "Уређивач налога"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:38
 msgid "Add Ne_w Signature..."
 msgstr "Додај но_ви потпис..."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "Add _Script"
 msgstr "Додај ск_рипту"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:40
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "Ув_ек шифрирај на мене код слања шифроване поште"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Увек пошаљи _копију (cc) на:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Увек пошаљи _скривену копију (Bcc) на:"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:44
 msgid "Always _sign outgoing messages when using this account"
 msgstr "_Увек потпиши одлазеће поруке са овог налога"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Увек _веруј кључевима у мојој вези када шифрираш"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Attach original message"
 msgstr "Приложи оригиналну поруку"
 
-#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Прилог"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:48
 msgid "Automatically _insert smiley images"
 msgstr "_Сам убаци слике са осмесима"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Automatically check for _new mail every"
 msgstr "С_ам провери за нову пошту сваких"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "Baltic (ISO-8859-13)"
 msgstr "Балтички (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Baltic (ISO-8859-4)"
 msgstr "Балтички (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Beep w_hen new mail arrives"
 msgstr "С_вирни када стигне нова пошта"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "C_haracter set:"
 msgstr "К_одна страна:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 msgid "Ch_eck for Supported Types "
 msgstr "_Провери подржане типове "
 
-#: mail/mail-config.glade.h:53
-msgid "Check _Incoming Mail"
-msgstr "Провери пристиг_лу пошту"
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Check _incoming mail for junk"
+msgstr "Провери да ли је пристигла пошта ђубре"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Check spelling while I _type"
 msgstr "Провери правопис док _куцам"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Провери да пристигле поруке нису ђубре"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 msgid "Color for _misspelled words:"
 msgstr "Боја за _погрешно написане речи:"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 msgid "Colors"
 msgstr "Боје"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 msgid "Confirm _when expunging a folder"
 msgstr "_Потврди када избацујеш директоријум"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -15066,239 +14602,244 @@ msgstr ""
 "\n"
 "Притисните \"Примени\" да сачувате подешавања."
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
 msgid "De_fault"
 msgstr "Пре_дефинисано"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 msgid "Default character e_ncoding:"
 msgstr "Подразумевано _кодирање знакова:"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 msgid "Defaults"
 msgstr "Подразумевано"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 msgid "Do not quote original message"
 msgstr "Не цитирај оригиналну поруку"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Не потписуј захтеве за с_астанцима (за компатибилност са Outlook-ом)"
 
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Готово"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
 msgid "Drafts _Folder:"
 msgstr "Д_иректоријум Припрема:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:77
 msgid "Email Accounts"
 msgstr "Налози е-поште"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 msgid "Email _Address:"
 msgstr "Електронска _адреса:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:79
 msgid "Empty trash folders on e_xit"
 msgstr "Испразни директоријуме са _смећем на излазу"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
 msgid "Encry_ption certificate:"
 msgstr "Сертификат за ши_фровање:"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:81
 msgid "Evolution Account Assistant"
 msgstr "Помоћник за налоге Еволуције"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:82
 msgid "Execute Command..."
 msgstr "Изврши команду..."
 
 # bug: space too much?
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Fi_xed-width:"
 msgstr "У_тврђене-ширине:"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 msgid "Font Properties"
 msgstr "Особине писма"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 msgid "Format messages in _HTML"
 msgstr "Среди поруке у H_TML"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:87
 msgid "HTML Mail"
 msgstr "HTML пошта"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:88
 msgid "Headers"
 msgstr "Заглавља"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr "Нагласи _цитате са"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
 #: mail/mail-config.glade.h:91
+#, fuzzy
+msgid "I_nclude remote tests"
+msgstr "Укључи:"
+
+#: mail/mail-config.glade.h:94
 msgid "Inline"
 msgstr "Унутар"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Mail Configuration"
 msgstr "Подешавање поште"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "Локација сандучета"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr "Састављач поруке"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "Напомена: бићете упитани за лозинку док се не повежете први пут"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Or_ganization:"
 msgstr "Ор_ганизација:"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG лична карта _кључа:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Play sound file when new mail arri_ves"
 msgstr "_Пусти звучну датотеку када стигне нова пошта"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Упозори када шаљеш поруке само са дефинисаним Bcc примаоцима"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Qmail maildir "
 msgstr "Qmail maildir"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr "Цитирај оригиналну поруку"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr "Цитирано"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 msgid "Re_member password"
 msgstr "З_апамти лозинку"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr "Од_говори-на:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "Примање поште"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:120
 msgid "Receiving Options"
 msgstr "Опције за примање"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
 msgid "Remember _password"
 msgstr "Запа_мти лозинку"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
 msgid "S_tandard Font:"
 msgstr "_Стандардни фонт:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 msgid "Security"
 msgstr "Безбедност"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font"
 msgstr "Одабери HTML писмо фиксиране величине"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:126
 msgid "Select HTML fixed width font for printing"
 msgstr "Одабери HTML писмо фиксиране величине за штампу"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:127
 msgid "Select HTML variable width font"
 msgstr "Одабери HTML писмо варијабилне величине"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:128
 msgid "Select HTML variable width font for printing"
 msgstr "Одабери HTML писмо варијабилне величине за штампу"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:129
 msgid "Select..."
 msgstr "Изабери..."
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "Слање поште"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:133
 msgid "Sent _Messages Folder:"
 msgstr "Директоријум Послатих _порука:"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:134
 msgid "Ser_ver requires authentication"
 msgstr "Сер_вер тражи идентификацију"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:135
 msgid "Server _Type: "
 msgstr "_Тип сервера"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:136
 msgid "Si_gning certificate:"
 msgstr "Сертификат за _потписивање:"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:137
 msgid "Signat_ure:"
 msgstr "Потп_ис:"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:138
 msgid "Signatures"
 msgstr "Потписи"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr "Одреди име _датотеке:"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:140
 msgid "Spell Checking"
 msgstr "Провера правописа"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:141
 msgid "Standard Unix mbox"
 msgstr "Стандардни Unix mbox"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:142
 msgid "T_erminal Font:"
 msgstr "_Фонт за терминал:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:143
 msgid "T_ype: "
 msgstr "_Врста:"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -15308,7 +14849,7 @@ msgstr ""
 "потпис. Име које сте дали ће бити коришћено\n"
 "само за сврху приказивања на екрану."
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
@@ -15317,7 +14858,7 @@ msgstr ""
 "Ова вам страна омогућава да подесите проверу правописа и језик. Листа језика "
 "овде осликава само оне језике за које постоји инсталиран речник."
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:149
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -15325,15 +14866,11 @@ msgstr ""
 "Унесите име по коме желите да назовете овај налог.\n"
 "На пример: \"Пословни\" или \"Лични\""
 
-#: mail/mail-config.glade.h:148
-msgid "Use _Daemon"
-msgstr "Користи _услужни програм"
-
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:152
 msgid "V_ariable-width:"
 msgstr "В_аријабилна ширина:"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:153
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -15343,87 +14880,83 @@ msgstr ""
 "\n"
 "Притисните \"Напред\" за почетак. "
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:158
 msgid "_Add Signature"
 msgstr "_Додај потпис"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:159
 msgid "_Always load images from the Internet"
 msgstr "_Увек учитај слике са Интернета"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:160
 msgid "_Digitally sign outgoing messages (by default)"
 msgstr "_Дигитално потпиши одлазеће поруке (подразумевано)"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:161
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Немој да ме обавештаваш када стигне нова пошта"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:163
 msgid "_Enable"
 msgstr "_Омогући"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 msgid "_Encrypt outgoing messages (by default)"
 msgstr "_Шифруј одлазеће поруке (подразумевано)"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:165
 msgid "_Forward style:"
 msgstr "Стил _прослеђивања"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:168
 msgid "_Load images if sender is in address book"
 msgstr "_Учитај слике ако је пошиљалац у адресару"
 
-#: mail/mail-config.glade.h:167
-msgid "_Local Tests Only"
-msgstr "Само _локалне пробе"
-
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Make this my default account"
 msgstr "_Нека ово буде мој главни налог"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_Mark messages as read after"
 msgstr "_Означи поруке као прочитане после"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 msgid "_Never load images from the Internet"
 msgstr "_Никада не учитавај слике са Интернета"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "_Упозори када шаљеш HTML поруке онима који их не желе"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:175
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Упозори када шаљеш поруке без наслова"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:176
 msgid "_Reply style:"
 msgstr "_Стил одговора:"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:177
 msgid "_Script:"
 msgstr "_Скрипта:"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:178
 msgid "_Show animated images"
 msgstr "_Покажи анимиране слике"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 msgid "_Use Secure Connection (SSL):"
 msgstr "_Користи безбедну везу (SSL):"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "_Use the same fonts as other applications"
 msgstr "_Користи иста писма као други програми"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:181
 msgid "color"
 msgstr "боја"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "опис"
 
@@ -15596,7 +15129,7 @@ msgstr ""
 
 #. mail:camel-exception primary
 #: mail/mail-errors.xml.h:57
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgid "Your message with the subject \"{0}\" was not delivered."
 msgstr ""
 
 #. mail:camel-exception secondary
@@ -15662,11 +15195,6 @@ msgstr ""
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Нисам могао да направим директоријум %s: %s."
 
-#. mail:no-save-path secondary
-#: mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail:no-create-path primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
@@ -15691,12 +15219,6 @@ msgstr ""
 msgid "Cannot create temporary save directory."
 msgstr "Нисам могао да направим привремени директоријум: %s"
 
-#. mail:no-create-tmp-path secondary
-#: mail/mail-errors.xml.h:100 mail/mail-errors.xml.h:112
-#: widgets/misc/e-system-errors.xml.h:11 widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail:no-write-path-exists secondary
 #: mail/mail-errors.xml.h:104
 #, fuzzy
@@ -15976,29 +15498,25 @@ msgstr "Препиши"
 msgid "_Append"
 msgstr "Пошаљи"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:785
 #, c-format
 msgid "Pinging %s"
 msgstr "Пингујем %s"
 
-#: mail/mail-mt.c:897
-msgid "Working"
-msgstr "Радим"
-
-#: mail/mail-ops.c:99
+#: mail/mail-ops.c:98
 msgid "Filtering Folder"
 msgstr "Филтрирам директоријум"
 
-#: mail/mail-ops.c:260
+#: mail/mail-ops.c:259
 msgid "Fetching Mail"
 msgstr "Узимам пошту"
 
-#: mail/mail-ops.c:543
+#: mail/mail-ops.c:542
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Неуспешна примена одлазећих филтера: %s"
 
-#: mail/mail-ops.c:568
+#: mail/mail-ops.c:567
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -16007,102 +15525,102 @@ msgstr ""
 "Неуспешно додавање у %s: %s\n"
 "Додајем у локални директоријум Послато."
 
-#: mail/mail-ops.c:577
+#: mail/mail-ops.c:576
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Неуспешно додавање у локални директоријум Послато: %s"
 
-#: mail/mail-ops.c:673
+#: mail/mail-ops.c:672
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Шаљем поруку %d од %d"
 
 # bug: plural-forms
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:703
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Нисам успео да пошаљем %d од %d порука"
 
-#: mail/mail-ops.c:708
+#: mail/mail-ops.c:707
 msgid "Complete."
 msgstr "Готово."
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:804
 msgid "Saving message to folder"
 msgstr "Чувам поруку у директоријум"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Премештам поруке у %s"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Копирам поруке у %s"
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:1002
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Претражујем директоријуме у \"%s\""
 
-#: mail/mail-ops.c:1116
+#: mail/mail-ops.c:1115
 msgid "Forwarded messages"
 msgstr "Прослеђене поруке"
 
-#: mail/mail-ops.c:1159
+#: mail/mail-ops.c:1158
 #, c-format
 msgid "Opening folder %s"
 msgstr "Отварам директоријум %s"
 
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1230
 #, c-format
 msgid "Opening store %s"
 msgstr "Отварам оставу %s"
 
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1308
 #, c-format
 msgid "Removing folder %s"
 msgstr "Уклањам директоријум %s"
 
-#: mail/mail-ops.c:1403
+#: mail/mail-ops.c:1402
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Смештам директоријум '%s'"
 
-#: mail/mail-ops.c:1468
+#: mail/mail-ops.c:1467
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Чистим и смештам налог „%s“"
 
-#: mail/mail-ops.c:1469
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Смештам налог „%s“"
 
-#: mail/mail-ops.c:1524
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr "Освежавам директоријум"
 
-#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
+#: mail/mail-ops.c:1559 mail/mail-ops.c:1610
 msgid "Expunging folder"
 msgstr "Избацујем директоријум"
 
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1607
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Празним смеће у '%s'"
 
-#: mail/mail-ops.c:1609
+#: mail/mail-ops.c:1608
 msgid "Local Folders"
 msgstr "Локални директоријуми"
 
-#: mail/mail-ops.c:1692
+#: mail/mail-ops.c:1691
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Учитавам поруку %s"
 
-#: mail/mail-ops.c:1764
+#: mail/mail-ops.c:1763
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
@@ -16110,7 +15628,7 @@ msgstr[0] "Учитавам %d поруку"
 msgstr[1] "Учитавам %d поруке"
 msgstr[2] "Учитавам %d порука"
 
-#: mail/mail-ops.c:1850
+#: mail/mail-ops.c:1849
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
@@ -16118,7 +15636,7 @@ msgstr[0] "Чувам %d поруку"
 msgstr[1] "Чувам %d поруке"
 msgstr[2] "Чувам %d порука"
 
-#: mail/mail-ops.c:1900
+#: mail/mail-ops.c:1899
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -16127,7 +15645,7 @@ msgstr ""
 "Не могу да направим излазну датотеку: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1928
+#: mail/mail-ops.c:1927
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -16136,11 +15654,11 @@ msgstr ""
 "Грешка код чувања порука у: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1999
+#: mail/mail-ops.c:1998
 msgid "Saving attachment"
 msgstr "Чувам прилог"
 
-#: mail/mail-ops.c:2016
+#: mail/mail-ops.c:2015
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -16149,17 +15667,17 @@ msgstr ""
 "Не могу да направим излазну датотеку: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2046
+#: mail/mail-ops.c:2045
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Нисам могао да упишем: %s"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Прекидам везу са %s"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Поново се повезујем на %s"
@@ -16223,24 +15741,24 @@ msgstr "Освежавам..."
 msgid "Waiting..."
 msgstr "Чекам..."
 
-#: mail/mail-session.c:238
+#: mail/mail-session.c:239
 msgid "User canceled operation."
 msgstr "Корисник је поништио операцију."
 
-#: mail/mail-session.c:271
+#: mail/mail-session.c:272
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Унесите лозинку за %s"
 
-#: mail/mail-session.c:273
+#: mail/mail-session.c:274
 msgid "Enter Password"
 msgstr "Унесите лозинку"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password"
 msgstr "_Запамти ову лозинку"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:298
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Запамти ову лозинку до краја ове сесије"
 
@@ -16295,79 +15813,79 @@ msgstr "Освежавам вдиректоријуме за адресу: %s"
 msgid "Updating vFolders for '%s'"
 msgstr "Освежавам вдиректоријуме за адресу: %s"
 
-#: mail/mail-vfolder.c:959
+#: mail/mail-vfolder.c:958
 msgid "vFolders"
 msgstr "vFolders-и"
 
-#: mail/mail-vfolder.c:998
+#: mail/mail-vfolder.c:997
 msgid "Edit VFolder"
 msgstr "Измени VFolder-е"
 
-#: mail/mail-vfolder.c:1082
+#: mail/mail-vfolder.c:1081
 msgid "New VFolder"
 msgstr "Нови VFolder"
 
-#: mail/message-list.c:946
+#: mail/message-list.c:948
 msgid "Unseen"
 msgstr "Невиђено"
 
-#: mail/message-list.c:947
+#: mail/message-list.c:949
 msgid "Seen"
 msgstr "Виђено"
 
-#: mail/message-list.c:948
+#: mail/message-list.c:950
 msgid "Answered"
 msgstr "Одговорено"
 
-#: mail/message-list.c:949
+#: mail/message-list.c:951
 msgid "Multiple Unseen Messages"
 msgstr "Вишеструке невиђене поруке"
 
-#: mail/message-list.c:950
+#: mail/message-list.c:952
 msgid "Multiple Messages"
 msgstr "Вишеструке поруке"
 
-#: mail/message-list.c:954
+#: mail/message-list.c:956
 msgid "Lowest"
 msgstr "Најниже"
 
-#: mail/message-list.c:955
+#: mail/message-list.c:957
 msgid "Lower"
 msgstr "Ниже"
 
-#: mail/message-list.c:959
+#: mail/message-list.c:961
 msgid "Higher"
 msgstr "Више"
 
-#: mail/message-list.c:960
+#: mail/message-list.c:962
 msgid "Highest"
 msgstr "Највише"
 
-#: mail/message-list.c:1279
+#: mail/message-list.c:1285
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1286
+#: mail/message-list.c:1292
 msgid "Today %l:%M %p"
 msgstr "Данас %k:%M "
 
-#: mail/message-list.c:1295
+#: mail/message-list.c:1301
 msgid "Yesterday %l:%M %p"
 msgstr "Јуче %k:%M "
 
-#: mail/message-list.c:1307
+#: mail/message-list.c:1313
 msgid "%a %l:%M %p"
 msgstr "%a %k:%M "
 
-#: mail/message-list.c:1315
+#: mail/message-list.c:1321
 msgid "%b %d %l:%M %p"
 msgstr "%d. %b, %k:%M "
 
-#: mail/message-list.c:1317
+#: mail/message-list.c:1323
 msgid "%b %d %Y"
 msgstr "%d. %b %Y"
 
-#: mail/message-list.c:3300
+#: mail/message-list.c:3321
 msgid "Generating message list"
 msgstr "Правим листу порука"
 
@@ -16423,6 +15941,10 @@ msgstr "Проследи"
 msgid "No Response Necessary"
 msgstr "Није неопходан одговор"
 
+#: mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Читај"
+
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Одговори"
@@ -16526,44 +16048,48 @@ msgstr ""
 "Списак путања директоријума који се усклађују надиску за неповезану употребу"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid "Toolbar is visible"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Whether Evolution should start up in offline mode"
 msgstr "Да ли се Еволуција покреће у неповезаном режиму"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Whether the toolbar should be visible."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
 msgid "Whether to skip the development warning dialog"
 msgstr "Да ли да прескочи прозорче са упозорењем о развоју"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
+#: shell/apps_evolution_shell.schemas.in.in.h:14
 msgid "mail"
 msgstr "пошта"
 
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
-msgstr "Омогућили су"
-
-#: shell/e-shell.c:545 shell/e-shell.c:546
+#: shell/e-shell.c:588 shell/e-shell.c:589
 #, fuzzy, c-format
 msgid "%ld KB"
 msgstr "%d %B"
 
-#: shell/e-shell.c:744
+#: shell/e-shell.c:786
 #, fuzzy
 msgid "Uknown system error."
 msgstr "Непозната грешка"
 
-#: shell/e-shell.c:1101
+#: shell/e-shell.c:1143
 msgid "Invalid arguments"
 msgstr "Неисправни аргументи"
 
-#: shell/e-shell.c:1103
+#: shell/e-shell.c:1145
 msgid "Cannot register on OAF"
 msgstr "Не могу да се региструје на OAF"
 
-#: shell/e-shell.c:1105
+#: shell/e-shell.c:1147
 msgid "Configuration Database not found"
 msgstr "База са подешавањима није нађена"
 
-#: shell/e-shell.c:1107
+#: shell/e-shell.c:1149
 msgid "Generic error"
 msgstr "Општа грешка"
 
@@ -16622,7 +16148,7 @@ msgstr ""
 msgid "Select importer"
 msgstr "Изаберите увозника"
 
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1026
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
 #, c-format
 msgid "File %s does not exist"
 msgstr "Датотека %s не постоји"
@@ -16650,31 +16176,32 @@ msgstr ""
 "Увозим %s\n"
 "Увозим 1. ставку."
 
-#: shell/e-shell-importer.c:549
+#: shell/e-shell-importer.c:570
 msgid "Automatic"
 msgstr "Аутоматско"
 
-#: shell/e-shell-importer.c:598
-msgid "_Filename:"
-msgstr "_Име датотеке:"
+#: shell/e-shell-importer.c:626
+#, fuzzy
+msgid "F_ilename:"
+msgstr "Назив датотеке:"
 
-#: shell/e-shell-importer.c:603
+#: shell/e-shell-importer.c:631
 msgid "Select a file"
 msgstr "Одаберите датотеку"
 
-#: shell/e-shell-importer.c:613
+#: shell/e-shell-importer.c:642
 msgid "File _type:"
 msgstr "_Врста датотеке:"
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:681
 msgid "Import data and settings from _older programs"
 msgstr "Увези податке и подешавања из _старијих програма"
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:684
 msgid "Import a _single file"
 msgstr "Увези _једну датотеку"
 
-#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -16682,25 +16209,25 @@ msgstr ""
 "Молим сачекајте...\n"
 "Тражим постојећа подешавања"
 
-#: shell/e-shell-importer.c:727
+#: shell/e-shell-importer.c:756
 msgid "Starting Intelligent Importers"
 msgstr "Покрећем интелигентне увознике"
 
-#: shell/e-shell-importer.c:853 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
 #, c-format
 msgid "From %s:"
 msgstr "Од %s:"
 
-#: shell/e-shell-importer.c:1044
+#: shell/e-shell-importer.c:1073
 #, c-format
 msgid "No importer available for file %s"
 msgstr "Нема доступног увозника за датотеку „%s“"
 
-#: shell/e-shell-importer.c:1056
+#: shell/e-shell-importer.c:1085
 msgid "Unable to execute importer"
 msgstr "Нисам могао да покренем увозника."
 
-#: shell/e-shell-importer.c:1169
+#: shell/e-shell-importer.c:1199
 msgid "_Import"
 msgstr "У_воз"
 
@@ -16750,61 +16277,61 @@ msgstr "Име директоријума не може да садржи зна
 msgid "'.' and '..' are reserved folder names."
 msgstr "„.“ и „..“ су резервисана имена директоријума."
 
-#: shell/e-shell-window.c:336
+#: shell/e-shell-window.c:337
 #, fuzzy
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Еволуција је тренутно на мрежи. Притисните ово дугме да радите без "
 "мреже."
 
-#: shell/e-shell-window.c:343
+#: shell/e-shell-window.c:344
 #, fuzzy
 msgid "Evolution is in the process of going offline."
 msgstr "Ximian Еволуција је у процесу одласка у рад без мреже."
 
-#: shell/e-shell-window.c:349
+#: shell/e-shell-window.c:350
 #, fuzzy
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Еволуција није тренутно на мрежи. Притисните ово дугме да радите на "
 "мрежи."
 
-#: shell/e-shell-window.c:621
+#: shell/e-shell-window.c:637
 #, fuzzy, c-format
 msgid "Switch to %s"
 msgstr "Пошта за %s"
 
-#: shell/e-shell-window-commands.c:64
+#: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Изгледа да GNOME Pilot алати нису инсталирани на овај систем."
 
-#: shell/e-shell-window-commands.c:72
+#: shell/e-shell-window-commands.c:74
 #, c-format
 msgid "Error executing %s."
 msgstr "Грешка код покретања %s."
 
-#: shell/e-shell-window-commands.c:121
+#: shell/e-shell-window-commands.c:123
 msgid "Bug buddy is not installed."
 msgstr "Bug buddy није инсталиран."
 
-#: shell/e-shell-window-commands.c:129
+#: shell/e-shell-window-commands.c:131
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy не може да се покрене."
 
-#: shell/e-shell-window-commands.c:171
+#: shell/e-shell-window-commands.c:323
 #, fuzzy
-msgid "About Evolution"
-msgstr "О Ximian Еволуцији"
+msgid "Groupware Suite"
+msgstr "Групвајз"
 
-#: shell/e-shell-window-commands.c:382
+#: shell/e-shell-window-commands.c:563
 msgid "_Work Online"
 msgstr "_На мрежи"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "_Није на мрежи"
 
-#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Ради без мреже"
 
@@ -16816,43 +16343,6 @@ msgstr "Кућица"
 msgid "New"
 msgstr "Ново"
 
-#: shell/evolution-shell-component-utils.c:115
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Непозната грешка."
-
-#: shell/evolution-shell-component-utils.c:118
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Грешка коју је послао систем делова:\n"
-"%s"
-
-#: shell/evolution-shell-component-utils.c:125
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Грешка коју је послао систем за покретање је:\n"
-"%s"
-
 #: shell/evolution-test-component.c:140
 msgid "New Test"
 msgstr "Нова проба"
@@ -17179,30 +16669,30 @@ msgid ""
 "Click help for details."
 msgstr ""
 
-#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:522
+#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
+#: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
 msgstr "Изаберите сертификат за увоз..."
 
-#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:604
+#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
+#: smime/gui/certificate-manager.c:638
 msgid "Certificate Name"
 msgstr "Име сертификата"
 
-#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
+#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
 msgid "Purposes"
 msgstr "Намене"
 
-#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:517
+#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr "Серијски број"
 
-#: smime/gui/certificate-manager.c:267
+#: smime/gui/certificate-manager.c:271
 msgid "Expires"
 msgstr "Истиче"
 
-#: smime/gui/certificate-manager.c:417
+#: smime/gui/certificate-manager.c:446
 msgid "E-Mail Address"
 msgstr "Е-адреса"
 
@@ -17244,6 +16734,11 @@ msgstr ""
 "Издао ко:\n"
 "  Наслов: %s\n"
 
+#: smime/gui/e-cert-selector.c:169
+#, fuzzy
+msgid "Select certificate"
+msgstr "Сертификат ССЛ клијента"
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr "<не чини део сертификата>"
@@ -17300,7 +16795,7 @@ msgstr ""
 "Пре веровања овом издаваоцу сертификата, треба прво да прегледате његов "
 "сертификат, политику и процедуре (ако су доступни)."
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
 msgid "Certificate"
 msgstr "Сертификат"
 
@@ -17320,19 +16815,23 @@ msgstr "Заједничко име (CN)"
 msgid "Contact Certificates"
 msgstr "Сертификати контакта"
 
-#: smime/gui/smime-ui.glade.h:21
-#, no-c-format
-msgid "Do you want to trust \"%s\" for the following purposes?"
-msgstr "Желите ли да верујете „%s“ за наредне потребе?"
+#: smime/gui/smime-ui.glade.h:20
+msgid "Do not trust the authenticity of this certificate"
+msgstr ""
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:21
 msgid "Dummy window only"
 msgstr "Само глупи прозор"
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:22
 msgid "Edit"
 msgstr "Уреди"
 
+#: smime/gui/smime-ui.glade.h:23
+#, fuzzy
+msgid "Email Certificate Trust Settings"
+msgstr "Издавач сертификата е-поште"
+
 #: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr "Сертификат примаоца е-поруке"
@@ -17365,247 +16864,258 @@ msgstr "Организациона јединица"
 msgid "SHA1 Fingerprint"
 msgstr "СХА1 отисак"
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr "Сертификат ССЛ клијента"
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr "Сертификат ССЛ сервера"
 
 #: smime/gui/smime-ui.glade.h:37
+msgid "Trust the authenticity of this certificate"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
 msgid "Trust this CA to identify email users."
 msgstr "Веруј овом издаваоцу сертификата за препознавање е-адреса."
 
-#: smime/gui/smime-ui.glade.h:38
+#: smime/gui/smime-ui.glade.h:39
 msgid "Trust this CA to identify software developers."
 msgstr "Веруј овом издаваоцу сертификата за препознавање програмера."
 
-#: smime/gui/smime-ui.glade.h:39
+#: smime/gui/smime-ui.glade.h:40
 msgid "Trust this CA to identify web sites."
 msgstr "Веруј овом издаваоцу сертификата за препознавање веб страница."
 
-#: smime/gui/smime-ui.glade.h:40
+#: smime/gui/smime-ui.glade.h:41
 msgid "View"
 msgstr "Погледај"
 
-#: smime/gui/smime-ui.glade.h:41
-msgid "View Certificate"
-msgstr "Погледај сертификат"
-
 #: smime/gui/smime-ui.glade.h:42
-msgid "You have been asked to trust a new Certificate Authority (CA)."
-msgstr "Постављен вам је захтев да верујете новом издаваоцу сертификата (CA)."
-
-#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr "Имате ове сертификате од ових организација који вас одређују:"
 
-#: smime/gui/smime-ui.glade.h:44
+#: smime/gui/smime-ui.glade.h:43
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr "Држите ове сертификате који одређују ове издаваоце сертификата:"
 
-#: smime/gui/smime-ui.glade.h:45
+#: smime/gui/smime-ui.glade.h:44
 msgid "You have certificates on file that identify these people:"
 msgstr "Држите ове сертификате који одређују ове особе:"
 
-#: smime/gui/smime-ui.glade.h:46
+#: smime/gui/smime-ui.glade.h:45
 msgid "Your Certificates"
 msgstr "Ваши сертификати"
 
-#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
+#: smime/gui/smime-ui.glade.h:46
+msgid "_Edit CA Trust"
+msgstr ""
+
+#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d. %m. %Y."
 
-#: smime/lib/e-cert.c:478
+#. x509 certificate usage types
+#: smime/lib/e-cert.c:424
+#, fuzzy
+msgid "Sign"
+msgstr "Потписујем"
+
+#: smime/lib/e-cert.c:425
+#, fuzzy
+msgid "Encrypt"
+msgstr "Шифрована"
+
+#: smime/lib/e-cert.c:530
 msgid "Version"
 msgstr "Верзија"
 
-#: smime/lib/e-cert.c:493
+#: smime/lib/e-cert.c:545
 msgid "Version 1"
 msgstr "Верзија 1"
 
-#: smime/lib/e-cert.c:496
+#: smime/lib/e-cert.c:548
 msgid "Version 2"
 msgstr "Верзија 2"
 
-#: smime/lib/e-cert.c:499
+#: smime/lib/e-cert.c:551
 msgid "Version 3"
 msgstr "Верзија 3"
 
-#: smime/lib/e-cert.c:581
+#: smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 са RSA шифровањем"
 
-#: smime/lib/e-cert.c:584
+#: smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 са RSA шифровањем"
 
-#: smime/lib/e-cert.c:587
+#: smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 са RSA шифровањем"
 
-#: smime/lib/e-cert.c:590
+#: smime/lib/e-cert.c:642
 msgid "C"
 msgstr "C"
 
-#: smime/lib/e-cert.c:593
+#: smime/lib/e-cert.c:645
 msgid "CN"
 msgstr "CN"
 
-#: smime/lib/e-cert.c:596
+#: smime/lib/e-cert.c:648
 msgid "OU"
 msgstr "ОЈ"
 
-#: smime/lib/e-cert.c:599
+#: smime/lib/e-cert.c:651
 msgid "O"
 msgstr "О"
 
-#: smime/lib/e-cert.c:602
+#: smime/lib/e-cert.c:654
 msgid "L"
 msgstr "L"
 
-#: smime/lib/e-cert.c:605
+#: smime/lib/e-cert.c:657
 msgid "DN"
 msgstr "DN"
 
-#: smime/lib/e-cert.c:608
+#: smime/lib/e-cert.c:660
 msgid "DC"
 msgstr "DC"
 
-#: smime/lib/e-cert.c:611
+#: smime/lib/e-cert.c:663
 msgid "ST"
 msgstr "ST"
 
-#: smime/lib/e-cert.c:614
+#: smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA шифровање"
 
-#: smime/lib/e-cert.c:617
+#: smime/lib/e-cert.c:669
 msgid "Certificate Key Usage"
 msgstr "Употреба кључа сертификата"
 
-#: smime/lib/e-cert.c:620
+#: smime/lib/e-cert.c:672
 msgid "Netscape Certificate Type"
 msgstr "Нетскејпова врста сертификата"
 
-#: smime/lib/e-cert.c:623
+#: smime/lib/e-cert.c:675
 msgid "Certificate Authority Key Identifier"
 msgstr "Идентификатор кључа издаваоца сертификата"
 
-#: smime/lib/e-cert.c:626
+#: smime/lib/e-cert.c:678
 msgid "UID"
 msgstr "КИБ"
 
-#: smime/lib/e-cert.c:635
+#: smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Идентификатор предмета (%s)"
 
-#: smime/lib/e-cert.c:686
+#: smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
 msgstr "Идентификатор алгоритма"
 
-#: smime/lib/e-cert.c:694
+#: smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
 msgstr "Параметри алгоритма"
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:768
 msgid "Subject Public Key Info"
 msgstr "Подаци о јавном кључу извршиоца"
 
-#: smime/lib/e-cert.c:721
+#: smime/lib/e-cert.c:773
 msgid "Subject Public Key Algorithm"
 msgstr "Алгоритам јавног кључа извршиоца"
 
-#: smime/lib/e-cert.c:736
+#: smime/lib/e-cert.c:788
 msgid "Subject's Public Key"
 msgstr "Јавни кључ извршиоца"
 
-#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
+#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
 msgid "Error: Unable to process extension"
 msgstr "Грешка: не могу да обрадим проширење"
 
-#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
+#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr "Потписник предмета"
 
-#: smime/lib/e-cert.c:782
+#: smime/lib/e-cert.c:834
 msgid "SSL Certificate Authority"
 msgstr "ССЛ издавач сертификата"
 
-#: smime/lib/e-cert.c:786
+#: smime/lib/e-cert.c:838
 msgid "Email Certificate Authority"
 msgstr "Издавач сертификата е-поште"
 
-#: smime/lib/e-cert.c:814
+#: smime/lib/e-cert.c:866
 msgid "Signing"
 msgstr "Потписујем"
 
-#: smime/lib/e-cert.c:818
+#: smime/lib/e-cert.c:870
 msgid "Non-repudiation"
 msgstr "Без одрицања"
 
-#: smime/lib/e-cert.c:822
+#: smime/lib/e-cert.c:874
 msgid "Key Encipherment"
 msgstr "Замућивање кључа"
 
-#: smime/lib/e-cert.c:826
+#: smime/lib/e-cert.c:878
 msgid "Data Encipherment"
 msgstr "Замућивање података"
 
-#: smime/lib/e-cert.c:830
+#: smime/lib/e-cert.c:882
 msgid "Key Agreement"
 msgstr "Сагласност кључа"
 
-#: smime/lib/e-cert.c:834
+#: smime/lib/e-cert.c:886
 msgid "Certificate Signer"
 msgstr "Потписник сертификата"
 
-#: smime/lib/e-cert.c:838
+#: smime/lib/e-cert.c:890
 msgid "CRL Signer"
 msgstr "CRL потписник"
 
-#: smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:938
 msgid "Critical"
 msgstr "Критично"
 
-#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
+#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
 msgid "Not Critical"
 msgstr "Некритично"
 
-#: smime/lib/e-cert.c:912
+#: smime/lib/e-cert.c:964
 msgid "Extensions"
 msgstr "Проширења"
 
-#: smime/lib/e-cert.c:983
+#: smime/lib/e-cert.c:1035
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
 msgid "Certificate Signature Algorithm"
 msgstr "Алгоритам потписа сертификата"
 
-#: smime/lib/e-cert.c:1048
+#: smime/lib/e-cert.c:1100
 msgid "Issuer"
 msgstr "Издао"
 
-#: smime/lib/e-cert.c:1102
+#: smime/lib/e-cert.c:1154
 msgid "Issuer Unique ID"
 msgstr "Јединствени ИБ издавача"
 
-#: smime/lib/e-cert.c:1121
+#: smime/lib/e-cert.c:1173
 msgid "Subject Unique ID"
 msgstr "Јединствени ИБ субјекта"
 
-#: smime/lib/e-cert.c:1164
+#: smime/lib/e-cert.c:1216
 msgid "Certificate Signature Value"
 msgstr "Вредност потписа сертификата"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
+#: smime/lib/e-cert-db.c:608
 msgid "Certificate already exists"
 msgstr "Сертификат већ постоји"
 
@@ -17752,7 +17262,7 @@ msgstr "Прегледај текући контакт"
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "_Акције"
 
@@ -17915,7 +17425,7 @@ msgstr "З_атвори"
 #: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:3
+#: ui/evolution.xml.h:4
 msgid "Close"
 msgstr "Затвори"
 
@@ -17928,7 +17438,7 @@ msgid "Delete this item"
 msgstr "Обриши ову ставку"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr "Главна линија алата"
 
@@ -17971,7 +17481,7 @@ msgstr "Сачувај ставку на диск"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:44
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "_File"
 msgstr "Дато_тека"
 
@@ -18230,13 +17740,13 @@ msgstr "_Обрни избор"
 msgid "_Threaded Message List"
 msgstr "Листа порука према _нити разговора"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Затвори овај прозор"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "_Close"
 msgstr "_Затвори"
 
@@ -18634,7 +18144,7 @@ msgstr "_Претходна порука"
 msgid "_Quoted"
 msgstr "_Цитирано"
 
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
 msgid "_Tools"
 msgstr "Ала_ти"
 
@@ -18931,107 +18441,121 @@ msgid "_Open Task"
 msgstr "_Отвори задужење"
 
 #: ui/evolution.xml.h:1
-msgid "About Ximian Evolution..."
-msgstr "О Ximian Еволуцији..."
+#, fuzzy
+msgid "About Evolution..."
+msgstr "О Ximian Еволуцији"
 
 #: ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
 msgstr "Измени подешавања Еволуције"
 
-#: ui/evolution.xml.h:5
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the visibility of the toolbar"
+msgstr "Измените особине овог директоријума"
+
+#: ui/evolution.xml.h:6
 msgid "Create a new window displaying this folder"
 msgstr "Отвори нови прозор и у њему прикажи овај директоријум"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "_Излаз"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "_Честа питања у вези Еволуције"
+
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Изађи ис програма"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:10
 msgid "Forget _Passwords"
 msgstr "Заборави _лозинке"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:11
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Заборави запамћене лозинке како би поново били питани за исте"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:12
 msgid "Import data from other programs"
 msgstr "Увези податке из других програма"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:14
 #, fuzzy
 msgid "New _Window"
 msgstr "Про_зор"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Pi_lot Settings..."
 msgstr "Подешавања Пи_лота..."
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Send / Receive"
 msgstr "Слање / примање"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Send queued items and retrieve new items"
 msgstr "Пошаљи заказане и добави нове ставке"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Set up Pilot configuration"
 msgstr "Подеси поставке Пилота"
 
-#: ui/evolution.xml.h:17
-msgid "Show information about Ximian Evolution"
+#: ui/evolution.xml.h:19
+#, fuzzy
+msgid "Show information about Evolution"
 msgstr "Прикажи информацију о Ximian Еволуцији"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:20
 msgid "Submit Bug Report"
 msgstr "Пошаљи извештај о грешци"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:21
 msgid "Submit _Bug Report"
 msgstr "Пошаљи извештај о _грешци"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Пошаљи извештај о грешци помоћу Bug Buddy"
 
-#: ui/evolution.xml.h:21
-msgid "Toggle whether we are working offline."
-msgstr "Бирај да ли ћемо радити без мреже."
-
 #: ui/evolution.xml.h:23
-msgid "Ximian Evolution _FAQ"
-msgstr "_Честа питања у вези Еволуције"
+#, fuzzy
+msgid "T_oolbar"
+msgstr "Главна линија алата"
 
 #: ui/evolution.xml.h:24
-msgid "_About Ximian Evolution..."
-msgstr "_О Ximian Еволуцији..."
+msgid "Toggle whether we are working offline."
+msgstr "Бирај да ли ћемо радити без мреже."
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "_About Evolution..."
+msgstr "О Ximian Еволуцији"
+
+#: ui/evolution.xml.h:30
 msgid "_Help"
 msgstr "Помо_ћ"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "_Import..."
 msgstr "_Увези..."
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "_New"
 msgstr "_Ново"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "_Quick Reference"
 msgstr "_Кратки подсетник"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_Send / Receive"
 msgstr "_Пошаљи / прими"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 #, fuzzy
 msgid "_Window"
 msgstr "Про_зор"
@@ -19105,7 +18629,7 @@ msgstr "Додели статус"
 
 # Универзално време, или УТ
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:626
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:635
 msgid "UTC"
 msgstr "УТ"
 
@@ -19261,29 +18785,29 @@ msgstr "Друго..."
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
-#: widgets/misc/e-error.c:121
+#: widgets/misc/e-error.c:79 widgets/misc/e-error.c:80
+#: widgets/misc/e-error.c:122
 msgid "Evolution Error"
 msgstr "Грешка Еволуције"
 
-#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
-#: widgets/misc/e-error.c:119
+#: widgets/misc/e-error.c:81 widgets/misc/e-error.c:82
+#: widgets/misc/e-error.c:120
 #, fuzzy
 msgid "Evolution Warning"
 msgstr "Еволуција пошта"
 
-#: widgets/misc/e-error.c:118
+#: widgets/misc/e-error.c:119
 #, fuzzy
 msgid "Evolution Information"
 msgstr "Информација о састанку"
 
-#: widgets/misc/e-error.c:120
+#: widgets/misc/e-error.c:121
 #, fuzzy
 msgid "Evolution Query"
 msgstr "Еволуција сажетак"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:410
+#: widgets/misc/e-error.c:415
 #, fuzzy, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -19432,16 +18956,535 @@ msgstr ""
 "Не могу да сачувам у `%s'\n"
 " %s"
 
-#: widgets/misc/e-task-widget.c:211
+#: widgets/misc/e-task-widget.c:212
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: widgets/misc/e-task-widget.c:216
+#: widgets/misc/e-task-widget.c:217
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% завршено)"
 
+#~ msgid "Failed to connect to LDAP server"
+#~ msgstr "Неуспешно повезивање са LDAP сервером"
+
+#~ msgid "Failed to authenticate with LDAP server"
+#~ msgstr "Неуспешна пријава на LDAP сервер"
+
+#~ msgid "Could not perform query on Root DSE"
+#~ msgstr "Нисам могао да обавим упит на Root DSE"
+
+#~ msgid "The server responded with no supported search bases"
+#~ msgstr "Сервер је одговорио неподржаним базама за претрагу"
+
+#~ msgid "This server does not support LDAPv3 schema information"
+#~ msgstr "Овај сервер не подржава податке LDAPv3 шеме"
+
+#~ msgid "Error retrieving schema information"
+#~ msgstr "Грешка у читању података шеме"
+
+#~ msgid "Server did not respond with valid schema information"
+#~ msgstr "Сервер није одговорио са исправним подацима шеме"
+
+#~ msgid "  S_how Supported Bases "
+#~ msgstr " П_окажи подржане базе "
+
+#~ msgid "1:00"
+#~ msgstr "1:00"
+
+#~ msgid "5:00"
+#~ msgstr "5:00"
+
+#~ msgid "Connecting"
+#~ msgstr "Повезујем се"
+
+#~ msgid "Distinguished _name:"
+#~ msgstr "Посебно _име:"
+
+#~ msgid "Email address:"
+#~ msgstr "Електронска адреса:"
+
+#~ msgid "Evolution will use this DN to authenticate you with the server"
+#~ msgstr "Еволуција ће користити овај DN за пријављивање на сервер"
+
+#~ msgid "One"
+#~ msgstr "Један"
+
+#~ msgid "S_earch scope: "
+#~ msgstr "Опсег п_ретраге:"
+
+#~ msgid "Searching"
+#~ msgstr "Тражим"
+
+#~ msgid "Sub"
+#~ msgstr "Под"
+
+#~ msgid "This option controls how long a search will be run."
+#~ msgstr "Ова опција контролише колико ће претрага трајати."
+
+#~ msgid "U_se SSL/TLS:"
+#~ msgstr "К_ористи SSL/TLS:"
+
+#~ msgid "_Display name:"
+#~ msgstr "_Име:"
+
+#~ msgid "_Port number:"
+#~ msgstr "Број _порта:"
+
+#~ msgid "_Search base:"
+#~ msgstr "База _претраге:"
+
+#~ msgid "_Server name:"
+#~ msgstr "Име _сервера:"
+
+#~ msgid "_Timeout (minutes):"
+#~ msgstr "_Одзив (минути):"
+
+#~ msgid "connecting-tab"
+#~ msgstr "језичак за везу"
+
+#~ msgid "general-tab"
+#~ msgstr "језичак за опште податке"
+
+#~ msgid "searching-tab"
+#~ msgstr "језичак за претрагу"
+
+#, fuzzy
+#~ msgid "Job title:"
+#~ msgstr "Назив _посла:"
+
+#, fuzzy
+#~ msgid "Webcam:"
+#~ msgstr "Веб страница:"
+
+#~ msgid "Category editor not available."
+#~ msgstr "Уређивач категорија није доступан."
+
+#, fuzzy
+#~ msgid ""
+#~ "The following entries are invalid:\n"
+#~ "\n"
+#~ msgstr "Следеће везе су тренутно активне:"
+
+#~ msgid "Could not find widget for a field: `%s'"
+#~ msgstr "Нисам могао да пронађем помоћ ђа поље: `%s'"
+
+#~ msgid "Do you want to save changes?"
+#~ msgstr "Желите ли да сачувате промене?"
+
+#~ msgid "Error saving %s: %s"
+#~ msgstr "Грешка код чувања %s: %s"
+
+#~ msgid ""
+#~ "The addressbook backend for\n"
+#~ "%s\n"
+#~ "has crashed. You will have to restart Evolution in order to use it again"
+#~ msgstr ""
+#~ "Основни процес адресара за\n"
+#~ "%s\n"
+#~ "је пао. Мораћете да поново покренете Еволуцију како би наставили\n"
+#~ "да је користите"
+
+#~ msgid "Can not load URI"
+#~ msgstr "Не могу да учитам адресу"
+
+#~ msgid "Calendar Properties"
+#~ msgstr "Особине календара"
+
+#~ msgid "Remote"
+#~ msgstr "Удаљени"
+
+#~ msgid "Task List Properties"
+#~ msgstr "Особине списка задужења"
+
+#~ msgid "_Refresh Interval:"
+#~ msgstr "_Време између освежавања:"
+
+#~ msgid "_Source URL:"
+#~ msgstr "_Изворна адреса:"
+
+#~ msgid ""
+#~ "The event being deleted is a meeting, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "Обрисани догађај је састанак, желите ли да пошаљете поруку за његово "
+#~ "отказивање?"
+
+#~ msgid "Are you sure you want to cancel and delete this meeting?"
+#~ msgstr "Сигурно желите да поништите и обришете овај састанак?"
+
+#~ msgid ""
+#~ "The task being deleted is assigned, would you like to send a cancellation "
+#~ "notice?"
+#~ msgstr ""
+#~ "Обрисано задужење је расподељено, желите ли да пошаљете поруку за њено "
+#~ "отказивање?"
+
+#~ msgid "Are you sure you want to cancel and delete this task?"
+#~ msgstr "Сигурно желите да поништите и обришете ово задужење?"
+
+#~ msgid ""
+#~ "The journal entry being deleted is published, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "Обрисани унос у дневник је објављен, желите ли да пошаљете поруку за "
+#~ "његово отказивање?"
+
+#~ msgid "Are you sure you want to cancel and delete this journal entry?"
+#~ msgstr "Сигурно желите да поништите и обришете овај унос у дневник?"
+
+#~ msgid "Are you sure you want to delete the appointment `%s'?"
+#~ msgstr "Сигурно желите да обришете овај заказани састанак `%s'?"
+
+#~ msgid "Are you sure you want to delete this untitled appointment?"
+#~ msgstr "Сигурно желите да обришете овај неименовани заказани састанак"
+
+#~ msgid "Are you sure you want to delete the task `%s'?"
+#~ msgstr "Сигурно желите да обришете задужење `%s'?"
+
+#~ msgid "Are you sure you want to delete this untitled task?"
+#~ msgstr "Сигурно желите да обришете ово неименовано задужење?"
+
+#~ msgid "Are you sure you want to delete the journal entry `%s'?"
+#~ msgstr "Сигурно желите да избришете унос у дневник `%s'?"
+
+#~ msgid "Are you sure want to delete this untitled journal entry?"
+#~ msgstr "Сигурно желите да избришете ован неименовани унос у дневник?"
+
+#~ msgid "Are you sure you want to delete %d appointment?"
+#~ msgid_plural "Are you sure you want to delete %d appointments?"
+#~ msgstr[0] "Сигурно желите да избришете %d заказани састанак?"
+#~ msgstr[1] "Сигурно желите да избришете %d заказана састанка?"
+#~ msgstr[2] "Сигурно желите да избришете %d заказаних састанака?"
+
+#~ msgid "Are you sure you want to delete %d task?"
+#~ msgid_plural "Are you sure you want to delete %d tasks?"
+#~ msgstr[0] "Сигурно желите да избришете %d задужење"
+#~ msgstr[1] "Сигурно желите да избришете %d задужења"
+#~ msgstr[2] "Сигурно желите да избришете %d задужења"
+
+#~ msgid "Are you sure you want to delete %d journal entry?"
+#~ msgid_plural "Are you sure you want to delete %d journal entries?"
+#~ msgstr[0] "Сигурно желите да избришете %d унос у дневник?"
+#~ msgstr[1] "Сигурно желите да избришете %d уноса у дневник?"
+#~ msgstr[2] "Сигурно желите да избришете %d уноса у дневник?"
+
+#~ msgid "_Invite Others..."
+#~ msgstr "_Позови друге..."
+
+#~ msgid ""
+#~ "This event has been changed, but has not been saved.\n"
+#~ "\n"
+#~ "Do you wish to save your changes?"
+#~ msgstr ""
+#~ "Овај догађај је измењен, али није сачуван.\n"
+#~ "\n"
+#~ "Желите ли да сачувате ваше измене?"
+
+#~ msgid "_Discard Changes"
+#~ msgstr "_Занемари промене"
+
+#~ msgid "Save Event"
+#~ msgstr "Сачувај догађај"
+
+#~ msgid "The meeting information has been created. Send it?"
+#~ msgstr "Информација о састанку је сачињена. Да је пошаљем?"
+
+#~ msgid "The meeting information has changed. Send an updated version?"
+#~ msgstr "Информација о састанку је измењена. Да пошаљем новију верзију?"
+
+#~ msgid "The task assignment information has been created. Send it?"
+#~ msgstr "Информација о примљеном задужењу је сачињена. Да је пошаљем?"
+
+#~ msgid "The task information has changed. Send an updated version?"
+#~ msgstr "Информација о задужењу је измењена. Да пошаљем новију верзију?"
+
+#, fuzzy
+#~ msgid "The task backend for '%s' has crashed."
+#~ msgstr ""
+#~ "Машинерија задужења за \n"
+#~ "%s\n"
+#~ " је пукла."
+
+#, fuzzy
+#~ msgid "The calendar backend for '%s' has crashed."
+#~ msgstr ""
+#~ "Машинерија календара за\n"
+#~ "%s\n"
+#~ " је пукла"
+
+#~ msgid "Learning junk and/or non junk message(s)"
+#~ msgstr "Учење ђубрета и не-ђубрета од порука"
+
+#~ msgid "Could not get article %s from NNTP server"
+#~ msgstr "Нисам могао да преузмем чланак %s са NNTP сервера."
+
+#~ msgid "Posting not allowed by news server"
+#~ msgstr "Сервер не дозвољава слање чланака"
+
+#~ msgid "Failed to send newsgroups header: %s: message not posted"
+#~ msgstr "Неуспешно слање заглавља група: %s: порука није послата"
+
+#~ msgid "Error posting to newsgroup: %s: message not posted"
+#~ msgstr "Грешка при слања у групу: %s: порука није послата"
+
+#~ msgid "Error reading response to posted message: message not posted"
+#~ msgstr "Грешка при читању одговора на послату поруку: порука није послата"
+
+#~ msgid "Error posting message: %s: message not posted"
+#~ msgstr "Грешка при слања поруке: %s: порука није послата"
+
+#~ msgid "Stream error"
+#~ msgstr "Грешка тока"
+
+#~ msgid "Connection error: %s"
+#~ msgstr "Грешка при повезивању: %s"
+
+#~ msgid "Could not get group: %s"
+#~ msgstr "Нисам могао да добијем групу: %s"
+
+# bug: s/unspecificed/unspecified/
+#, fuzzy
+#~ msgid "Could not get messages: unspecified error"
+#~ msgstr "Нисам могао да преузмем поруке: неназначена грешка"
+
+#~ msgid "Unknown server response: %s"
+#~ msgstr "Непознат одговор сервера: %s"
+
+#~ msgid "Adjust Score"
+#~ msgstr "Прерачунај"
+
+#~ msgid "Assign Color"
+#~ msgstr "Додели боју"
+
+#~ msgid "Assign Score"
+#~ msgstr "Додели боју"
+
+#~ msgid "Attachments"
+#~ msgstr "Прилози"
+
+#~ msgid "Beep"
+#~ msgstr "Звоно"
+
+#~ msgid "contains"
+#~ msgstr "садржи"
+
+#~ msgid "Copy to Folder"
+#~ msgstr "Копирај у директоријум"
+
+#~ msgid "Date received"
+#~ msgstr "Датум примања"
+
+#~ msgid "Date sent"
+#~ msgstr "Датум слања"
+
+#~ msgid "Deleted"
+#~ msgstr "Обрисано"
+
+#~ msgid "does not contain"
+#~ msgstr "не садржи"
+
+#~ msgid "does not end with"
+#~ msgstr "не завршава се са"
+
+#~ msgid "does not exist"
+#~ msgstr "не постоји"
+
+#~ msgid "does not return"
+#~ msgstr "не враћа"
+
+#~ msgid "does not sound like"
+#~ msgstr "не звучи као"
+
+#~ msgid "does not start with"
+#~ msgstr "не почиње са"
+
+#~ msgid "Do Not Exist"
+#~ msgstr "Не постоји"
+
+#~ msgid "Draft"
+#~ msgstr "Припрема"
+
+#~ msgid "ends with"
+#~ msgstr "завршава се са"
+
+#~ msgid "Exist"
+#~ msgstr "Постоји"
+
+#~ msgid "exists"
+#~ msgstr "постоји"
+
+#~ msgid "Expression"
+#~ msgstr "Израз"
+
+#~ msgid "Follow Up"
+#~ msgstr "Следи"
+
+#~ msgid "is"
+#~ msgstr "је"
+
+#~ msgid "is after"
+#~ msgstr "је после"
+
+#~ msgid "is before"
+#~ msgstr "је пре"
+
+#~ msgid "is Flagged"
+#~ msgstr "је означен"
+
+#~ msgid "is greater than"
+#~ msgstr "је већи од"
+
+#~ msgid "is less than"
+#~ msgstr "је мањи од"
+
+#~ msgid "is not"
+#~ msgstr "није"
+
+#~ msgid "is not Flagged"
+#~ msgstr "није означен"
+
+#~ msgid "Junk Test"
+#~ msgstr "Провера ђубрета"
+
+#~ msgid "Mailing list"
+#~ msgstr "Дописна листа"
+
+#~ msgid "Message Body"
+#~ msgstr "Тело поруке"
+
+#~ msgid "Message Header"
+#~ msgstr "Заглавље поруке"
+
+#~ msgid "Message is Junk"
+#~ msgstr "Порука је ђубре"
+
+#~ msgid "Message is not Junk"
+#~ msgstr "Порука није ђубре"
+
+#~ msgid "Move to Folder"
+#~ msgstr "Премести у директоријум"
+
+#~ msgid "Pipe to Program"
+#~ msgstr "Кроз цев до програма"
+
+#~ msgid "Play Sound"
+#~ msgstr "Пусти звук"
+
+#~ msgid "Recipients"
+#~ msgstr "Примаоци"
+
+#~ msgid "Regex Match"
+#~ msgstr "Рег. израз претрага"
+
+#~ msgid "Replied to"
+#~ msgstr "Одговорено на"
+
+#~ msgid "returns"
+#~ msgstr "повраћаји"
+
+#~ msgid "returns greater than"
+#~ msgstr "више повраћаја од"
+
+#~ msgid "returns less than"
+#~ msgstr "мање повраћаја од"
+
+#~ msgid "Run Program"
+#~ msgstr "Покрени програм"
+
+#~ msgid "Sender"
+#~ msgstr "Пошиљалац"
+
+#~ msgid "Set Status"
+#~ msgstr "Додели статус"
+
+#~ msgid "Size (kB)"
+#~ msgstr "Величина (kB)"
+
+#~ msgid "sounds like"
+#~ msgstr "звучи као"
+
+#~ msgid "Source Account"
+#~ msgstr "Изворни налог"
+
+#~ msgid "Specific header"
+#~ msgstr "Одређено заглавље"
+
+#~ msgid "starts with"
+#~ msgstr "почиње са"
+
+#~ msgid "Stop Processing"
+#~ msgstr "Прекини са обрадом"
+
+#~ msgid "Unset Status"
+#~ msgstr "Недодељен статус"
+
+#~ msgid "Check _Incoming Mail"
+#~ msgstr "Провери пристиг_лу пошту"
+
+#~ msgid "Use _Daemon"
+#~ msgstr "Користи _услужни програм"
+
+#~ msgid "_Local Tests Only"
+#~ msgstr "Само _локалне пробе"
+
+#~ msgid "Working"
+#~ msgstr "Радим"
+
+#~ msgid "Brought to you by"
+#~ msgstr "Омогућили су"
+
+#~ msgid "_Filename:"
+#~ msgstr "_Име датотеке:"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "Unknown error."
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Непозната грешка."
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the component system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Грешка коју је послао систем делова:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the activation system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Грешка коју је послао систем за покретање је:\n"
+#~ "%s"
+
+#~ msgid "Do you want to trust \"%s\" for the following purposes?"
+#~ msgstr "Желите ли да верујете „%s“ за наредне потребе?"
+
+#~ msgid "View Certificate"
+#~ msgstr "Погледај сертификат"
+
+#~ msgid "You have been asked to trust a new Certificate Authority (CA)."
+#~ msgstr ""
+#~ "Постављен вам је захтев да верујете новом издаваоцу сертификата (CA)."
+
+#~ msgid "About Ximian Evolution..."
+#~ msgstr "О Ximian Еволуцији..."
+
+#~ msgid "_About Ximian Evolution..."
+#~ msgstr "_О Ximian Еволуцији..."
+
 #~ msgid "Evolution Addressbook folder viewer"
 #~ msgstr "Прегледник директоријума Еволуција адресара"
 
@@ -19756,9 +19799,6 @@ msgstr "%s (%d%% завршено)"
 #~ msgid "Primary _email:"
 #~ msgstr "Основна _е-адреса:"
 
-#~ msgid "S_pouse:"
-#~ msgstr "С_упружник:"
-
 #~ msgid "_Business:"
 #~ msgstr "_Посао:"
 
@@ -19774,9 +19814,6 @@ msgstr "%s (%d%% завршено)"
 #~ msgid "_Mobile:"
 #~ msgstr "_Мобилни:"
 
-#~ msgid "_Office:"
-#~ msgstr "_Канцеларија:"
-
 #~ msgid "_Public Calendar URL:"
 #~ msgstr "URL за _јавни календар:"
 
@@ -20398,9 +20435,6 @@ msgstr "%s (%d%% завршено)"
 #~ msgid "Failed on message %d of %d"
 #~ msgstr "Неуспех код поруке %d од %d"
 
-#~ msgid "Changing junk status"
-#~ msgstr "Измена стања ђубрета"
-
 # bug: plural-forms
 #~ msgid "%d weeks ago"
 #~ msgstr "пре %d недеља"
@@ -21222,9 +21256,6 @@ msgstr "%s (%d%% завршено)"
 #~ msgid "Object not found"
 #~ msgstr "Објекат није могао бити пронађен\n"
 
-#~ msgid "Invalid object"
-#~ msgstr "Неисправна сврха"
-
 #~ msgid "URI not loaded"
 #~ msgstr "Екњига није учитана\n"
 
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index 3353b1d7bd..2f7b4820ea 100644
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 2.0\n"
-"POT-Creation-Date: 2004-05-19 14:00-0400\n"
+"POT-Creation-Date: 2004-06-03 11:14-0400\n"
 "PO-Revision-Date: 2004-03-26 17:35+0100\n"
 "Last-Translator: Danilo Šegan <danilo@prevod.org>\n"
 "Language-Team: Serbian (sr) <serbiangnome-lista@nongnu.org>\n"
@@ -60,13 +60,13 @@ msgstr " karta"
 msgid "Default Sync Address:"
 msgstr "Podrazumevana adresa za sinhronizovanje:"
 
-#: addressbook/conduit/address-conduit.c:1150
 #: addressbook/conduit/address-conduit.c:1151
+#: addressbook/conduit/address-conduit.c:1152
 msgid "Could not load addressbook"
 msgstr "Nisam mogao da učitam adresar"
 
-#: addressbook/conduit/address-conduit.c:1219
-#: addressbook/conduit/address-conduit.c:1222
+#: addressbook/conduit/address-conduit.c:1220
+#: addressbook/conduit/address-conduit.c:1223
 msgid "Could not read pilot's Address application block"
 msgstr "Nisam mogao da pročitam programski blok adresa pilota"
 
@@ -74,13 +74,13 @@ msgstr "Nisam mogao da pročitam programski blok adresa pilota"
 msgid "Accessing LDAP Server anonymously"
 msgstr "Anonimno pristupam LDAP serveru"
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
 msgid "Failed to authenticate.\n"
 msgstr "Nisam mogao da se prijavim.\n"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sUnesi lozinku za %s (korisnik %s)"
@@ -124,51 +124,23 @@ msgstr "_Kontakti:"
 msgid "Create a new contacts group"
 msgstr "Napravi novu grupu prečica"
 
-#: addressbook/gui/component/addressbook-component.c:182
+#: addressbook/gui/component/addressbook-component.c:184
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:483
-msgid "Failed to connect to LDAP server"
-msgstr "Neuspešno povezivanje sa LDAP serverom"
-
-#: addressbook/gui/component/addressbook-config.c:507
-msgid "Failed to authenticate with LDAP server"
-msgstr "Neuspešna prijava na LDAP server"
-
-#: addressbook/gui/component/addressbook-config.c:535
-msgid "Could not perform query on Root DSE"
-msgstr "Nisam mogao da obavim upit na Root DSE"
-
-#: addressbook/gui/component/addressbook-config.c:840
-msgid "The server responded with no supported search bases"
-msgstr "Server je odgovorio nepodržanim bazama za pretragu"
-
-#: addressbook/gui/component/addressbook-config.c:1245
-msgid "This server does not support LDAPv3 schema information"
-msgstr "Ovaj server ne podržava podatke LDAPv3 šeme"
-
-#: addressbook/gui/component/addressbook-config.c:1266
-msgid "Error retrieving schema information"
-msgstr "Greška u čitanju podataka šeme"
-
-#: addressbook/gui/component/addressbook-config.c:1274
-msgid "Server did not respond with valid schema information"
-msgstr "Server nije odgovorio sa ispravnim podacima šeme"
-
 #: addressbook/gui/component/addressbook-migrate.c:68
-#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1160
 msgid "Migrating..."
 msgstr "Prenosim..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1201
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Prenosim „%s“:"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:438
+#: addressbook/gui/component/addressbook-migrate.c:464
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
 #: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
@@ -176,28 +148,28 @@ msgid "On This Computer"
 msgstr "Na ovom računaru"
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:446
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
-#: mail/mail-config.glade.h:106
+#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
+#: mail/mail-config.glade.h:109
 msgid "Personal"
 msgstr "Lično"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:454
+#: addressbook/gui/component/addressbook-migrate.c:480
 msgid "On LDAP Servers"
 msgstr "Na LDAP serverima"
 
-#: addressbook/gui/component/addressbook-migrate.c:582
+#: addressbook/gui/component/addressbook-migrate.c:608
 msgid "LDAP Servers"
 msgstr "LDAP serveri"
 
-#: addressbook/gui/component/addressbook-migrate.c:702
+#: addressbook/gui/component/addressbook-migrate.c:728
 msgid "Autocompletion Settings"
 msgstr "Podešavanje samodopunjavanja"
 
-#: addressbook/gui/component/addressbook-migrate.c:1076
+#: addressbook/gui/component/addressbook-migrate.c:1104
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -209,7 +181,7 @@ msgstr ""
 "\n"
 "Budite strpljivi dok Evolucija prenese vaše direktorijume..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1090
+#: addressbook/gui/component/addressbook-migrate.c:1118
 #, fuzzy
 msgid ""
 "The format of mailing list contacts has changed.\n"
@@ -221,7 +193,7 @@ msgstr ""
 "\n"
 "Budite strpljivi dok Evolucija prenese vaše direktorijume..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1099
+#: addressbook/gui/component/addressbook-migrate.c:1127
 #, fuzzy
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
@@ -233,7 +205,7 @@ msgstr ""
 "\n"
 "Budite strpljivi dok Evolucija prenese vaše direktorijume..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1109
+#: addressbook/gui/component/addressbook-migrate.c:1137
 #, fuzzy
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
@@ -245,38 +217,33 @@ msgstr ""
 "\n"
 "Budite strpljivi dok Evolucija prenese vaše direktorijume..."
 
-#: addressbook/gui/component/addressbook-view.c:674
+#: addressbook/gui/component/addressbook-view.c:675
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr "Adresar „%s“ će biti uklonjen. Sigurno želite da nastavite?"
 
-#: addressbook/gui/component/addressbook-view.c:761
+#: addressbook/gui/component/addressbook-view.c:754
 msgid "New Address Book"
 msgstr "Novi adresar"
 
-#: addressbook/gui/component/addressbook-view.c:762
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
+#: addressbook/gui/component/addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Obriši"
 
-#: addressbook/gui/component/addressbook-view.c:763
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-view.c:756
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Osobine..."
 
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/addressbook-view.c:1002
+#. Create the contacts group
+#: addressbook/gui/component/addressbook-view.c:995
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
 #: calendar/gui/migration.c:373
 msgid "Contacts"
 msgstr "Kontakti"
@@ -357,10 +324,6 @@ msgid "Manage your S/MIME certificates here"
 msgstr "Ovde upravljajte vašim S/MIME sertifikatima"
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-msgid "  S_how Supported Bases "
-msgstr " P_okaži podržane baze "
-
-#: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -375,203 +338,170 @@ msgstr " P_okaži podržane baze "
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1:00"
-msgstr "1:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
-msgstr "5:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "Identifikacija"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
 #, fuzzy
 msgid "<b>Display</b>"
 msgstr "<b>Osnove</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 #, fuzzy
 msgid "<b>Downloading</b>"
 msgstr "<b>_Mesto</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:10
 #, fuzzy
 msgid "<b>Searching</b>"
 msgstr "Tražim"
 
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
 msgid "<b>Server Information</b>"
 msgstr "2. korak: podaci servera"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
 msgid "<b>Type:</b>"
 msgstr "<b>Onda</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:13
 #, fuzzy
 msgid "Add Contacts Group"
 msgstr "_Kontakti:"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Address Book Properties"
 msgstr "Osobine adresara"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
-#: mail/mail-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
+#: mail/mail-config.glade.h:42
 msgid "Always"
 msgstr "Uvek"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr "Anonimno"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:17
 #: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Osnovno"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
-msgid "Connecting"
-msgstr "Povezujem se"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 #: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Detalji"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
-msgid "Distinguished _name:"
-msgstr "Posebno _ime:"
-
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:19
 #, fuzzy
 msgid "Distinguished name"
 msgstr "Posebno _ime:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:20
 #, fuzzy
 msgid "Download limit:"
 msgstr "Limit za _preuzimanje:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Email address"
 msgstr "Elektronska adresa:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "Email address:"
-msgstr "Elektronska adresa:"
-
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "Evolution will use this DN to authenticate you with the server"
-msgstr "Evolucija će koristiti ovaj DN za prijavljivanje na server"
-
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:22
+#, fuzzy
 msgid ""
-"Evolution will use this email address to authenticate you with the server"
+"Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "Evolucija će koristiti ovu elektronsku adresu za prijavljivanje na server"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:23
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Podržane baze za pretragu"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:24
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
+#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Opšte"
 
-#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
-#: mail/mail-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
+#: mail/mail-config.glade.h:102
 msgid "Never"
 msgstr "Nikada"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
-msgid "One"
-msgstr "Jedan"
-
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:35
-msgid "S_earch scope: "
-msgstr "Opseg p_retrage:"
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Search _base:"
+msgstr "Pretraži bazu:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
 msgid "Search base only"
 msgstr "Pretraži bazu:"
 
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid "Search base:"
 msgstr "Pretraži bazu:"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Search scope:"
 msgstr "Opseg p_retrage:"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
-msgid "Searching"
-msgstr "Tražim"
-
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:31
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
-"server if\n"
-"your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL or TLS."
 msgstr ""
 "Izbor ove opcije znači da će se Evolucija povezati na vaš LDAP server samo "
 "akoi\n"
 "on podržava SSL ili TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a \n"
-"insecure environment. For example, if you and your LDAP server are behind a "
-"firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection "
-"is already\n"
-"secure."
+"you are in a insecure environment. For example, if you and your LDAP server "
+"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
+"because your connection is already secure."
 msgstr ""
 "Odabiranje ove opcije znači da će Evolucija pokušati da koristi samo SSL/TLS "
 "ako okruženje \n"
@@ -580,71 +510,65 @@ msgstr ""
 "onda nema potrebe da Evolucija koristi SSL/TLS jer je vaša veza već\n"
 "bezbedna."
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:33
+#, fuzzy
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
-"TLS.  This \n"
-"means that your connection will be insecure, and that you will be vulnerable "
-"to security\n"
-"exploits. "
+"TLS.  This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits. "
 msgstr ""
 "Odabiranje ove opcije znači da vaš server ne podržava ni SSL ni TLS.  To \n"
 "znači da će vaša beza biti nesigurna, i da ćete biti ranjivi na sigurnosne\n"
 "napade. "
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Sub"
-msgstr "Pod"
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr "Podržane baze za pretragu"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
-"searches will \n"
-"begin. If you leave this blank, the search will begin at the root of the "
-"directory tree."
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
 msgstr ""
 "Baza za pretragu je posebno ime (DN) unosa odakle će vaša pretraga\n"
 "početi. Ako ovo ostavite prazno, pretraga će početi iz korena stabla "
 "direktorijuma."
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:37
+#, fuzzy
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
-"the \n"
-"directory tree. A search scope of \"sub\" will include all entries below "
-"your search base.\n"
-"A search scope of \"one\" will only include the entries one level beneath "
-"your base.\n"
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
 msgstr ""
 "Opseg pretrage određuje dubinu pretrage po stablu direktorijuma. Opseg "
 "pretrage \n"
 "\"sub\" će uključiti sve unose ispod vaše baze za pretragu. Opseg pretrage "
 "\"one\" će uključiti samo unose jedan nivo ispod vaše baze.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:58
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "Ovo je puno ime vašeg ldap servera. Na primer, \"ldap.mojafirma.com\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:39
+#, fuzzy
 msgid ""
-"This is the maximum number of entries to download. Setting this number to "
-"be \n"
+"This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr ""
 "Ovo je najveći broj unosa za preuzimanje. Ako unesete suviše veliki \n"
 "broj, usporićete vaš adresar."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -654,142 +578,121 @@ msgstr ""
 "uključivanje ovoga na \"Email Address\" zahteva anonimni pristup na vaš ldap "
 "server."
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:41
+#, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
-"list.\n"
-"It is for display purposes only. "
+"list. It is for display purposes only. "
 msgstr ""
 "Ovo je ime servera koje će se pojaviti u listi direktorijuma Evolucije.\n"
 "To je samo za potrebe prikazivanja. "
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:42
+#, fuzzy
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. "
-"A \n"
-"list of standard ports has been provided. Ask your system administrator\n"
-"what port you should specify."
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
 msgstr ""
 "Ovo je port LDAP servera na koji će se Evolucija pokušati da poveže. "
 "Ponuđen\n"
 "je spisak standardnih portova. Pitajte svog sistem administratora\n"
 "koji port da odaberete."
 
-#: addressbook/gui/component/ldap-config.glade.h:67
-msgid "This option controls how long a search will be run."
-msgstr "Ova opcija kontroliše koliko će pretraga trajati."
-
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:43
 #, fuzzy
 msgid "Timeout:"
 msgstr "Format za vreme:"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
-msgid "U_se SSL/TLS:"
-msgstr "K_oristi SSL/TLS:"
-
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr "Koristim posebno ime (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr "Koristim elektronsku adresu"
 
-#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
-#: mail/mail-config.glade.h:154
+#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
+#: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr "Kada je moguće"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:47
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "_Kontakti:"
 
-#: addressbook/gui/component/ldap-config.glade.h:74
-#: calendar/gui/dialogs/calendar-setup.glade.h:12
-msgid "_Display name:"
-msgstr "_Ime:"
-
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr "Limit za _preuzimanje:"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
 msgid "_Email address:"
 msgstr "Elektronska adresa:"
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:50
+#, fuzzy
+msgid "_Find Possible Search Bases"
+msgstr "Podržane baze za pretragu"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Log in method:"
 msgstr "Metod _prijave:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "_Log in:"
+msgstr "Prijava"
+
+#: addressbook/gui/component/ldap-config.glade.h:53
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
 msgid "_Name:"
 msgstr "_Ime:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
-msgid "_Port number:"
-msgstr "Broj _porta:"
-
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "_Port:"
 msgstr "_Važnost:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
-msgid "_Search base:"
-msgstr "Baza _pretrage:"
-
-#: addressbook/gui/component/ldap-config.glade.h:82
-msgid "_Server name:"
-msgstr "Ime _servera:"
+#: addressbook/gui/component/ldap-config.glade.h:55
+#, fuzzy
+msgid "_Search scope:"
+msgstr "Opseg p_retrage:"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:56
 #, fuzzy
 msgid "_Server:"
 msgstr "S_erver:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
-msgid "_Timeout (minutes):"
-msgstr "_Odziv (minuti):"
+#: addressbook/gui/component/ldap-config.glade.h:57
+#, fuzzy
+msgid "_Timeout:"
+msgstr "Format za vreme:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:58
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "_Koristi bezbednu vezu (SSL):"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "karte"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
-msgid "connecting-tab"
-msgstr "jezičak za vezu"
-
-#: addressbook/gui/component/ldap-config.glade.h:88
-msgid "general-tab"
-msgstr "jezičak za opšte podatke"
-
 # bug: plural-forms
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:60
 #: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
-#: mail/mail-config.glade.h:182
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "minuta"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
-msgid "searching-tab"
-msgstr "jezičak za pretragu"
-
-#: addressbook/gui/component/select-names/e-select-names.c:497
+#: addressbook/gui/component/select-names/e-select-names.c:503
 #: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid "Select Contacts from Address Book"
 msgstr "Izaberite kontakte iz adresara"
 
-#: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
@@ -829,7 +732,7 @@ msgstr "Neimenovani kontakt"
 
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:222
+#: addressbook/gui/widgets/e-addressbook-view.c:224
 msgid "Source"
 msgstr "Izvor"
 
@@ -903,9 +806,9 @@ msgid "<b>Work</b>"
 msgstr "<b>Radna nedelja</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
-#: addressbook/gui/widgets/eab-contact-display.c:342
-#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/widgets/eab-contact-display.c:334
+#: addressbook/gui/widgets/eab-contact-display.c:353
 msgid "AIM"
 msgstr "AIM"
 
@@ -945,15 +848,15 @@ msgid "Company:"
 msgstr "Naredba:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:271
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
+#: addressbook/gui/contact-editor/e-contact-editor.c:266
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
 msgstr "Kontakt"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1527
+#: addressbook/gui/contact-editor/e-contact-editor.c:520
 msgid "Contact Editor"
 msgstr "Urednik kontakata"
 
@@ -977,82 +880,79 @@ msgid "Full _Name..."
 msgstr "Puno _ime..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:202
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-msgid "Home"
-msgstr "Kuća"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #, fuzzy
 msgid "Home Page:"
 msgstr "Lična stranica"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-#, fuzzy
-msgid "Job title:"
-msgstr "Naziv _posla:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/e-itip-control.c:936
-msgid "Location:"
-msgstr "Mesto:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN glasnik"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 #, fuzzy
 msgid "Mailing Address"
 msgstr "E-adresa"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 #, fuzzy
 msgid "Manager:"
 msgstr "Upravnik"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "_Nadimak:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Notes:"
 msgstr "Be_leške:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr "Novel Grupvajz"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
-#: addressbook/gui/contact-editor/e-contact-editor.c:203
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-msgid "Other"
-msgstr "Drugo"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#, fuzzy
+msgid "Office:"
+msgstr "_Kancelarija:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "PO Box:"
 msgstr "_Poštanski broj:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 #, fuzzy
 msgid "Personal Information"
 msgstr "Opcione informacije"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 #, fuzzy
 msgid "Profession:"
 msgstr "Z_animanje:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#, fuzzy
+msgid "Spouse:"
+msgstr "S_upružnik:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "State/Province:"
 msgstr "_Republika/Provincija"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#, fuzzy
+msgid "Title:"
+msgstr "_Naslov:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+msgid "Video Chat:"
+msgstr ""
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:41
 #, fuzzy
 msgid "Wants to receive HTML mail"
@@ -1060,15 +960,15 @@ msgstr "Želi da prima _HTML poruke"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:42
 #, fuzzy
-msgid "Webcam:"
-msgstr "Veb stranica:"
+msgid "Web Log:"
+msgstr "_Veb stranica:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
-#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
-#: mail/mail-config.glade.h:155
+#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
+#: mail/mail-config.glade.h:157
 msgid "Work"
 msgstr "Posao"
 
@@ -1088,19 +988,12 @@ msgid "_File under:"
 msgstr "Naziv datoteke:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 #, fuzzy
 msgid "_Where:"
 msgstr "S_erver:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
-msgid "item7"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
-msgid "item8"
-msgstr ""
-
-#: addressbook/gui/contact-editor/eab-editor.c:316
+#: addressbook/gui/contact-editor/eab-editor.c:315
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -1108,7 +1001,7 @@ msgstr ""
 "Jeste li sigurni da hoćete\n"
 "da obrišete ove kontakte?"
 
-#: addressbook/gui/contact-editor/eab-editor.c:319
+#: addressbook/gui/contact-editor/eab-editor.c:318
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -1117,16 +1010,16 @@ msgstr ""
 "da obrišete ovaj kontakt?"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:351
-#: addressbook/gui/widgets/eab-contact-display.c:372
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Address"
 msgstr "Adresa"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:292
+#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard.c:174
@@ -2105,86 +1998,109 @@ msgstr "Zambija"
 msgid "Zimbabwe"
 msgstr "Zimbabve"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/contact-editor/e-contact-editor.c:179
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:337
+#: addressbook/gui/widgets/eab-contact-display.c:356
 msgid "Jabber"
 msgstr "DŽaber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:347
-#: addressbook/gui/widgets/eab-contact-display.c:366
+#: addressbook/gui/contact-editor/e-contact-editor.c:180
+#: addressbook/gui/widgets/eab-contact-display.c:339
+#: addressbook/gui/widgets/eab-contact-display.c:358
 msgid "Yahoo"
 msgstr "Jahu"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: addressbook/gui/widgets/eab-contact-display.c:338
+#: addressbook/gui/widgets/eab-contact-display.c:357
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:344
-#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#: addressbook/gui/widgets/eab-contact-display.c:355
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/contact-editor/e-contact-editor.c:183
 msgid "GroupWise"
 msgstr "Grupvajz"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+msgid "Home"
+msgstr "Kuća"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+msgid "Other"
+msgstr "Drugo"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
 msgid "Source Book"
 msgstr "Izvorni adresar"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:264
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Target Book"
 msgstr "Odredišni adresar"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:278
+#: addressbook/gui/contact-editor/e-contact-editor.c:273
 msgid "Is New Contact"
 msgstr "Je novi kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:285
+#: addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Writable Fields"
 msgstr "Polja za upis"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:299
+#: addressbook/gui/contact-editor/e-contact-editor.c:294
 msgid "Changed"
 msgstr "Promenjen"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
-msgid "Category editor not available."
-msgstr "Uređivač kategorija nije dostupan."
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:2352
 msgid "This contact belongs to these categories:"
 msgstr "Ovaj kontakt pripada ovim kategorijama"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#: addressbook/gui/contact-editor/e-contact-editor.c:2429
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Molim izaberite od sledećih opcija"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#: addressbook/gui/contact-editor/e-contact-editor.c:2433
 #, fuzzy
 msgid "No image"
 msgstr "Niger"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#: addressbook/gui/contact-editor/e-contact-editor.c:2636
 #, fuzzy
 msgid ""
-"The following entries are invalid:\n"
+"The contact data is invalid:\n"
 "\n"
-msgstr "Sledeće veze su trenutno aktivne:"
+msgstr "Datum povraćaja nije dobar"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2738
-#, c-format
-msgid "Could not find widget for a field: `%s'"
-msgstr "Nisam mogao da pronađem pomoć đa polje: `%s'"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#, fuzzy
+msgid "Invalid contact."
+msgstr "Neispravna svrha"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+msgid ""
+"The contact cannot be saved to the selected address book. Do you want to "
+"discard changes?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2727
+#: addressbook/gui/contact-editor/e-contact-editor.c:2751
+msgid "_Discard"
+msgstr "_Odbaci"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+msgid ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
+msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:62
 msgid "AOL Instant Messenger"
@@ -2217,7 +2133,7 @@ msgid "_Edit Full"
 msgstr "_Uredi potpuno"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:166
 msgid "_Full Name:"
 msgstr "_Puno ime:"
 
@@ -2362,30 +2278,30 @@ msgstr "Ime _liste:"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Ukucajte elektronsku adresu ili prevucite kontakt u donju listu:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "contact-list-editor"
 msgstr "urednik-kontakt-liste"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:153
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:215
+#: addressbook/gui/widgets/e-addressbook-view.c:217
 #: addressbook/gui/widgets/e-minicard-view.c:460
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Knjiga"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
 msgid "Is New List"
 msgstr "Da li je nova lista"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:215
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
 msgid "Contact List Editor"
 msgstr "Urednik kontakt liste"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:438
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
 msgid "Save List as VCard"
 msgstr "Sačuvaj listu kao VCard"
 
@@ -2432,117 +2348,117 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Napredna pretraga"
 
-#: addressbook/gui/widgets/eab-contact-display.c:129
-#: addressbook/gui/widgets/eab-contact-display.c:192
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
 msgid "(map)"
 msgstr "(mapa)"
 
-#: addressbook/gui/widgets/eab-contact-display.c:139
-#: addressbook/gui/widgets/eab-contact-display.c:205
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
 msgid "map"
 msgstr "mapa"
 
-#: addressbook/gui/widgets/eab-contact-display.c:257
-#: addressbook/gui/widgets/eab-contact-display.c:533
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:525
 msgid "List Members"
 msgstr "Ispiši članove"
 
-#: addressbook/gui/widgets/eab-contact-display.c:329
-#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/eab-contact-display.c:321
+#: addressbook/gui/widgets/eab-contact-display.c:323
 msgid "E-mail"
 msgstr "E-pošta"
 
-#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/eab-contact-display.c:332
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organizacija"
 
-#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "Position"
 msgstr "Položaj"
 
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:354
 msgid "Groupwise"
 msgstr "Grupvajz"
 
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:340
 msgid "Video Conferencing"
 msgstr "Video konferencije"
 
-#: addressbook/gui/widgets/eab-contact-display.c:349
-#: addressbook/gui/widgets/eab-contact-display.c:370
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Phone"
 msgstr "Telefon"
 
-#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:342
 msgid "Fax"
 msgstr "Faks"
 
-#: addressbook/gui/widgets/eab-contact-display.c:354
+#: addressbook/gui/widgets/eab-contact-display.c:346
 msgid "work"
 msgstr "posao"
 
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:359
 msgid "WWW"
 msgstr "Beb"
 
-#: addressbook/gui/widgets/eab-contact-display.c:368
-#: addressbook/gui/widgets/eab-contact-display.c:587
+#: addressbook/gui/widgets/eab-contact-display.c:360
+#: addressbook/gui/widgets/eab-contact-display.c:579
 msgid "Blog"
 msgstr "Blogče"
 
-#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/eab-contact-display.c:363
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Mobilni telefon"
 
-#: addressbook/gui/widgets/eab-contact-display.c:375
+#: addressbook/gui/widgets/eab-contact-display.c:367
 msgid "personal"
 msgstr "lično"
 
-#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/eab-contact-display.c:374
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Napomena"
 
-#: addressbook/gui/widgets/eab-contact-display.c:548
+#: addressbook/gui/widgets/eab-contact-display.c:540
 msgid "Job Title"
 msgstr "Uloga na poslu"
 
-#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/eab-contact-display.c:544
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:774
+#: smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "E-pošta"
 
-#: addressbook/gui/widgets/eab-contact-display.c:579
+#: addressbook/gui/widgets/eab-contact-display.c:571
 msgid "Home page"
 msgstr "Lična stranica"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 msgid "Success"
 msgstr "Uspeh"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Backend busy"
 msgstr ""
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Repository offline"
 msgstr "Arhiva nije na mreži"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Address Book does not exist"
 msgstr "Adresar ne postoji"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 #, fuzzy
 msgid "No Self Contact defined"
 msgstr "Nova kontakt lista"
@@ -2550,27 +2466,27 @@ msgstr "Nova kontakt lista"
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Permission denied"
 msgstr "Zabranjen pristup"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Contact not found"
 msgstr "Kontakt nije pronađen"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Contact ID already exists"
 msgstr "IB kontakta već postoji"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Protocol not supported"
 msgstr "Protokol nije podržan"
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:60
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:233
 #: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
@@ -2583,39 +2499,39 @@ msgid "Cancelled"
 msgstr "Poništeno"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:61
 #, fuzzy
 msgid "Could not cancel"
 msgstr "Ne mogu da otvorim izvor"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Authentication Failed"
 msgstr "Prijava neuspela"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Authentication Required"
 msgstr "Prijava obavezna"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:66
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "TLS not Available"
 msgstr "TLS nije dostupan"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#: addressbook/gui/widgets/eab-gui-util.c:66
 #, fuzzy
 msgid "No such source"
 msgstr "Nema takve poruke"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:69
+#: addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Other error"
 msgstr "Druga greška"
 
-#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:90
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
@@ -2623,7 +2539,7 @@ msgstr ""
 "Nismo uspeli da otvorimo ovaj adresar. Proverite da putanja postoji i da "
 "imate prava pristupa."
 
-#: addressbook/gui/widgets/eab-gui-util.c:110
+#: addressbook/gui/widgets/eab-gui-util.c:97
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -2631,17 +2547,18 @@ msgstr ""
 "Nismo uspeli da otvorimo ovaj adresar. To znači ili da ste uneli netačnu "
 "adresu, ili je LDAP server nedostupan."
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:102
+#, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution you must compile the program from the CVS "
-"sources after retrieving OpenLDAP from the link below."
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
 msgstr ""
 "Ova verzija Evolucije nema podršku za LDAP u sebi. Ukoliko želite da "
 "koristite LDAP u Evoluciji morate da izgradite program iz izvornog koda u "
 "SUV-u (CVS) pošto preuzmete OpenLDAP sa sledeće adrese."
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:109
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -2649,11 +2566,7 @@ msgstr ""
 "Nismo uspeli da otvorimo ovaj adresar. To znači ili da ste uneli netačnu "
 "adresu ili je server nedostupan."
 
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "Unable to open addressbook"
-msgstr "Ne mogu da otvorim adresar"
-
-#: addressbook/gui/widgets/eab-gui-util.c:162
+#: addressbook/gui/widgets/eab-gui-util.c:129
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2665,7 +2578,7 @@ msgstr ""
 "Molim da preciznije formulišete upit ili povećate limit\n"
 "broja rezultata u podešavanjima adresara za server direktorijuma."
 
-#: addressbook/gui/widgets/eab-gui-util.c:168
+#: addressbook/gui/widgets/eab-gui-util.c:135
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -2677,54 +2590,46 @@ msgstr ""
 "upit ili povećate vremenski limit u podešavanjima adresara\n"
 "za server direktorijuma."
 
-#: addressbook/gui/widgets/eab-gui-util.c:174
+#: addressbook/gui/widgets/eab-gui-util.c:141
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "Osnovni proces ovog adresara nije mogao da obradi upit."
 
-#: addressbook/gui/widgets/eab-gui-util.c:177
+#: addressbook/gui/widgets/eab-gui-util.c:144
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Osnovni proces ovog adresara je odbio da obradi ovaj upit."
 
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:147
 msgid "This query did not complete successfully."
 msgstr "Ovaj upit nije uspešno završen."
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
-msgid "Do you want to save changes?"
-msgstr "Želite li da sačuvate promene?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:208
-msgid "_Discard"
-msgstr "_Odbaci"
-
-#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:169
 msgid "Error adding list"
 msgstr "Greška kod dodavanja liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:229
-#: addressbook/gui/widgets/eab-gui-util.c:652
+#: addressbook/gui/widgets/eab-gui-util.c:169
+#: addressbook/gui/widgets/eab-gui-util.c:580
 msgid "Error adding contact"
 msgstr "Greška kod dodavanja kontakta"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying list"
 msgstr "Greška kod izmene liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying contact"
 msgstr "Greška pri izmeni kontakta"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:192
 msgid "Error removing list"
 msgstr "Greška kod uklanjanja liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
-#: addressbook/gui/widgets/eab-gui-util.c:610
+#: addressbook/gui/widgets/eab-gui-util.c:192
+#: addressbook/gui/widgets/eab-gui-util.c:538
 msgid "Error removing contact"
 msgstr "Greška kod uklanjanja kontakta"
 
 # bug: plural-forms
-#: addressbook/gui/widgets/eab-gui-util.c:334
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2733,7 +2638,7 @@ msgstr ""
 "Otvaranje %d kontakata će otvoriti i %d novih prozora.\n"
 "Da li stvarno želite da pogledate sve ove kontakte?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:360
+#: addressbook/gui/widgets/eab-gui-util.c:300
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2742,49 +2647,44 @@ msgstr ""
 "%s već postoji\n"
 "Želite li da prepišete novim unosom?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:364
+#: addressbook/gui/widgets/eab-gui-util.c:304
 msgid "Overwrite"
 msgstr "Prepiši"
 
-#: addressbook/gui/widgets/eab-gui-util.c:400
-#, c-format
-msgid "Error saving %s: %s"
-msgstr "Greška kod čuvanja %s: %s"
-
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:437
+#: addressbook/gui/widgets/eab-gui-util.c:365
 msgid "card.vcf"
 msgstr "karta.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:571
+#: addressbook/gui/widgets/eab-gui-util.c:499
 msgid "list"
 msgstr "lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:706
+#: addressbook/gui/widgets/eab-gui-util.c:634
 msgid "Move contact to"
 msgstr "Premesti kontakt u"
 
-#: addressbook/gui/widgets/eab-gui-util.c:708
+#: addressbook/gui/widgets/eab-gui-util.c:636
 msgid "Copy contact to"
 msgstr "Umnoži kontakt u"
 
-#: addressbook/gui/widgets/eab-gui-util.c:711
+#: addressbook/gui/widgets/eab-gui-util.c:639
 msgid "Move contacts to"
 msgstr "Premesti kontakte u"
 
-#: addressbook/gui/widgets/eab-gui-util.c:713
+#: addressbook/gui/widgets/eab-gui-util.c:641
 msgid "Copy contacts to"
 msgstr "Umnoži kontakte u"
 
-#: addressbook/gui/widgets/eab-gui-util.c:716
+#: addressbook/gui/widgets/eab-gui-util.c:644
 msgid "Select target addressbook."
 msgstr "Izaberite odredišni adresar."
 
-#: addressbook/gui/widgets/eab-gui-util.c:939
+#: addressbook/gui/widgets/eab-gui-util.c:867
 msgid "Multiple VCards"
 msgstr "Višestruke VCards"
 
-#: addressbook/gui/widgets/eab-gui-util.c:942
+#: addressbook/gui/widgets/eab-gui-util.c:870
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard za %s"
@@ -2873,7 +2773,7 @@ msgstr[2] "%d kontakata"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:229
+#: addressbook/gui/widgets/e-addressbook-view.c:231
 #: addressbook/gui/widgets/e-minicard-view.c:467
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
@@ -2891,143 +2791,131 @@ msgstr "Model"
 msgid "Error modifying card"
 msgstr "Greška pri izmeni karte"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:163
 msgid "Name begins with"
 msgstr "Ime počinje sa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:164
 msgid "Email begins with"
 msgstr "E-pošta počinje sa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:57
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Kategorija je"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-#: calendar/gui/cal-search-bar.c:50
+#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Polje koje sadrži"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+#: addressbook/gui/widgets/e-addressbook-view.c:172
 msgid "Advanced..."
 msgstr "Napredno..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:236
+#: addressbook/gui/widgets/e-addressbook-view.c:238
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:249
+#: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Tip"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:506
+#: addressbook/gui/widgets/e-addressbook-view.c:508
 msgid "Address Book"
 msgstr "Adresar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2076
+#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:2080
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
 msgstr "Sačuvaj kao VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 msgid "New Contact..."
 msgstr "Nov kontakt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "New Contact List..."
 msgstr "Nova lista kontakata..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Go to Folder..."
 msgstr "Idi u direktorijum..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Import..."
 msgstr "Uvezi..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1066
 msgid "Search for Contacts..."
 msgstr "Tražim kontakte..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 msgid "Address Book Sources..."
 msgstr "Izvori adresara..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1069
 msgid "Pilot Settings..."
 msgstr "Podešavanja pilota"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Prosledi kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
 msgid "Send Message to Contact"
 msgstr "Pošalji kontaktu poruku"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Štampaj"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
+#: addressbook/gui/widgets/e-addressbook-view.c:1077
 msgid "Print Envelope"
 msgstr "Štampaj koverat"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
+#: addressbook/gui/widgets/e-addressbook-view.c:1081
 msgid "Copy to Address Book..."
 msgstr "Umnoži u adresar..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1080
+#: addressbook/gui/widgets/e-addressbook-view.c:1082
 msgid "Move to Address Book..."
 msgstr "Prebaci u adresar..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Iseci"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Umnoži"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1087
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Ubaci"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:1092
+#: calendar/gui/e-calendar-view.c:1280
 msgid "Current View"
 msgstr "Trenutan pogled"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1309
-#, c-format
-msgid ""
-"The addressbook backend for\n"
-"%s\n"
-"has crashed. You will have to restart Evolution in order to use it again"
-msgstr ""
-"Osnovni proces adresara za\n"
-"%s\n"
-"je pao. Moraćete da ponovo pokrenete Evoluciju kako bi nastavili\n"
-"da je koristite"
-
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1667
-#: calendar/gui/cal-search-bar.c:362
+#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Bilo koja kategorija"
 
@@ -3133,7 +3021,7 @@ msgstr "Radio"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-list-view.c:234
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Uloga"
@@ -3275,12 +3163,12 @@ msgstr "Evolucija VCard uvoznik"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: addressbook/printing/e-contact-print.c:998
+#: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr "Štampaj kontakte"
 
-#: addressbook/printing/e-contact-print.c:1064
-#: addressbook/printing/e-contact-print.c:1091
+#: addressbook/printing/e-contact-print.c:1066
+#: addressbook/printing/e-contact-print.c:1093
 msgid "Print contact"
 msgstr "Štampaj kontakt"
 
@@ -3531,15 +3419,21 @@ msgstr "U običnom režimu, ne sme se dati opcija za veličinu."
 msgid "Impossible internal error."
 msgstr "Nemoguća unutrašnja greška."
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:629
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
 msgid "Can not open file"
 msgstr "Ne mogu da otvorim datoteku"
 
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-msgid "Can not load URI"
-msgstr "Ne mogu da učitam adresu"
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "Nisam mogao da učitam adresar"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Ne mogu da otvorim adresar"
 
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
@@ -3557,7 +3451,7 @@ msgstr "Ime datoteke nije dato."
 msgid "Unnamed List"
 msgstr "Lista bez imena"
 
-#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Unesite lozinku"
@@ -3834,10 +3728,10 @@ msgid "Whether to show week numbers in date navigator"
 msgstr "Da li da prikazuje brojeve nedelja u izbiraču datuma"
 
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:88
-#: calendar/gui/gnome-cal.c:1703
-#: camel/providers/groupwise/camel-gw-listener.c:304
-#: camel/providers/groupwise/camel-gw-listener.c:327
+#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/gnome-cal.c:1705
+#: camel/providers/groupwise/camel-gw-listener.c:311
+#: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
 msgstr "Kalendar"
 
@@ -3858,7 +3752,7 @@ msgstr "Obriši događaje starije od"
 
 #: calendar/gui/calendar-commands.c:363
 #: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:19 filter/filter.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
 msgid "days"
 msgstr "dana"
 
@@ -4003,23 +3897,23 @@ msgstr "Nedeljni pregled"
 msgid "Month View"
 msgstr "Mesečni pregled"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Sažetak sadrži"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Opis sadrži"
 
-#: calendar/gui/cal-search-bar.c:54
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Komentar sadrži"
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:53
 msgid "Location contains"
 msgstr "Putanja sadrži"
 
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
 msgid "Unmatched"
 msgstr "Neraspodeljeno"
 
@@ -4040,23 +3934,23 @@ msgstr "Zabranjen pristup kalendaru"
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/dialogs/alarm-options.c:466
+#: calendar/gui/dialogs/alarm-options.c:467
 msgid "Audio Alarm Options"
 msgstr "Opcije za zvučni alarm"
 
-#: calendar/gui/dialogs/alarm-options.c:475
+#: calendar/gui/dialogs/alarm-options.c:476
 msgid "Message Alarm Options"
 msgstr "Opcije za tekstualni alarm"
 
-#: calendar/gui/dialogs/alarm-options.c:484
+#: calendar/gui/dialogs/alarm-options.c:485
 msgid "Email Alarm Options"
 msgstr "Opcije za alarm preko E-pošte"
 
-#: calendar/gui/dialogs/alarm-options.c:493
+#: calendar/gui/dialogs/alarm-options.c:494
 msgid "Program Alarm Options"
 msgstr "Opcije za program alarma"
 
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:510
 msgid "Unknown Alarm Options"
 msgstr "Nepoznate opcije za alarm"
 
@@ -4092,7 +3986,7 @@ msgstr "Pošalji kome:"
 msgid "With these arguments:"
 msgstr "Sa ovim argumentima:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
 msgid "dialog1"
 msgstr "prozorče1"
 
@@ -4102,7 +3996,7 @@ msgstr "pokaži još na svakih"
 
 # bug: plural-forms
 #: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:20 filter/filter.glade.h:16
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr "sati"
 
@@ -4148,7 +4042,7 @@ msgstr "Pošalji elektronsku poruku"
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Zaključak:"
 
@@ -4179,7 +4073,6 @@ msgstr "sat(a)"
 
 # bug: plural-forms
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:21
 msgid "minute(s)"
 msgstr "minut(a)"
 
@@ -4187,26 +4080,26 @@ msgstr "minut(a)"
 msgid "start of appointment"
 msgstr "početak zakazanog sastanka"
 
-#: calendar/gui/dialogs/calendar-setup.c:170
+#: calendar/gui/dialogs/calendar-setup.c:172
 msgid "You must specify a location to get the calendar from."
 msgstr "Morate navesti putanju sa koje da preuzmem kalendar"
 
-#: calendar/gui/dialogs/calendar-setup.c:178
+#: calendar/gui/dialogs/calendar-setup.c:180
 #, c-format
 msgid "The source location '%s' is not well-formed."
 msgstr "Putanja izvora „%s“ nije ispravnog oblika."
 
-#: calendar/gui/dialogs/calendar-setup.c:193
+#: calendar/gui/dialogs/calendar-setup.c:195
 #, c-format
 msgid "The source location '%s' is not a webcal source."
 msgstr "Putanja izvora „%s“e predstavlja vebkal izvor."
 
-#: calendar/gui/dialogs/calendar-setup.c:265
+#: calendar/gui/dialogs/calendar-setup.c:275
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr "Izvor imena „%s“ već postoji u izabranoj grupi"
 
-#: calendar/gui/dialogs/calendar-setup.c:278
+#: calendar/gui/dialogs/calendar-setup.c:288
 #, c-format
 msgid ""
 "The group '%s' is remote. You must specify a location to get the calendar "
@@ -4229,55 +4122,35 @@ msgstr "Grupa spiska zaduženja"
 msgid "C_olor:"
 msgstr "Boje"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "Calendar Properties"
-msgstr "Osobine kalendara"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
 msgid "Pick a color"
 msgstr "Izaberite boju"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:8
-msgid "Remote"
-msgstr "Udaljeni"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "Task List Properties"
-msgstr "Osobine spiska zaduženja"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
 #, fuzzy
 msgid "_Add Calendar"
 msgstr "Dodaj novi kalendar"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
 #, fuzzy
 msgid "_Add Group"
 msgstr "_Dodaj grupu..."
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-msgid "_Refresh Interval:"
-msgstr "_Vreme između osvežavanja:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
 #, fuzzy
 msgid "_Refresh:"
 msgstr "Osveži"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-msgid "_Source URL:"
-msgstr "_Izvorna adresa:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
 #, fuzzy
 msgid "_Type:"
 msgstr "Tip:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
 msgid "_URL:"
 msgstr "_Adresa:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
 msgid "weeks"
 msgstr "nedelje"
 
@@ -4384,7 +4257,7 @@ msgid "Display"
 msgstr "_Prikaži"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:76
 msgid "E_nable"
 msgstr "O_mogući"
 
@@ -4395,7 +4268,7 @@ msgstr "_Objava stanja slobodan/zauzet"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:563
+#: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Petak"
 
@@ -4409,7 +4282,7 @@ msgstr "Minuti"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:559
+#: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Ponedeljak"
 
@@ -4419,7 +4292,7 @@ msgstr "N_ed"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:564
+#: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Subota"
 
@@ -4433,7 +4306,7 @@ msgstr "Pokaži _brojeve nedelja u navigatoru za datume"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Nedelja"
 
@@ -4447,7 +4320,7 @@ msgstr "U_to"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:562
+#: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Četvrtak"
 
@@ -4461,7 +4334,7 @@ msgstr "Format za vreme:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:560
+#: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Utorak"
 
@@ -4471,7 +4344,7 @@ msgstr "Početak n_edelje:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:561
+#: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Sreda"
 
@@ -4504,7 +4377,7 @@ msgid "_Day begins:"
 msgstr "Početak _dana:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
-#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:43
@@ -4553,82 +4426,46 @@ msgstr "_Sre"
 msgid "before every appointment"
 msgstr "pre svakog zakazanog sastanka"
 
-#: calendar/gui/dialogs/cancel-comp.c:57
-msgid ""
-"The event being deleted is a meeting, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"Obrisani događaj je sastanak, želite li da pošaljete poruku za njegovo "
-"otkazivanje?"
-
-#: calendar/gui/dialogs/cancel-comp.c:60
-msgid "Are you sure you want to cancel and delete this meeting?"
-msgstr "Sigurno želite da poništite i obrišete ovaj sastanak?"
-
-#: calendar/gui/dialogs/cancel-comp.c:66
-msgid ""
-"The task being deleted is assigned, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"Obrisano zaduženje je raspodeljeno, želite li da pošaljete poruku za njeno "
-"otkazivanje?"
-
-#: calendar/gui/dialogs/cancel-comp.c:69
-msgid "Are you sure you want to cancel and delete this task?"
-msgstr "Sigurno želite da poništite i obrišete ovo zaduženje?"
-
-#: calendar/gui/dialogs/cancel-comp.c:75
-msgid ""
-"The journal entry being deleted is published, would you like to send a "
-"cancellation notice?"
-msgstr ""
-"Obrisani unos u dnevnik je objavljen, želite li da pošaljete poruku za "
-"njegovo otkazivanje?"
-
-#: calendar/gui/dialogs/cancel-comp.c:78
-msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr "Sigurno želite da poništite i obrišete ovaj unos u dnevnik?"
-
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Ovaj događaj je obrisan."
 
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "Ovo zaduženje je obrisano."
 
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:68
 msgid "This journal entry has been deleted."
 msgstr "Ovaj unos u dnevnik je obrisan."
 
-#: calendar/gui/dialogs/changed-comp.c:75
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s Uneli ste izmene. Da ih zaboravim i zatvorim urednik?"
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s Niste unosili izmene, da zatvorim urednika?"
 
-#: calendar/gui/dialogs/changed-comp.c:82
+#: calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "Ovaj događaj je izmenjen."
 
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "Ovo zaduženje je izmenjeno."
 
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:92
 msgid "This journal entry has been changed."
 msgstr "Ovaj unos u dnevnik je izmenjen."
 
-#: calendar/gui/dialogs/changed-comp.c:99
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s Uneli ste izmene. Da ih zaboravim i osvežim promenama urednik?"
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Niste uneli izmene, da osvežim promenama urednik?"
@@ -4666,7 +4503,7 @@ msgid "No summary"
 msgstr "Nema sažetka"
 
 #: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
 #: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Sačuvaj kao..."
@@ -4720,102 +4557,51 @@ msgstr "Ne mogu da otvorim odredište"
 msgid "Destination is read only"
 msgstr "Odredište se može samo čitati"
 
-#: calendar/gui/dialogs/delete-comp.c:95
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "Sigurno želite da obrišete ovaj zakazani sastanak `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:98
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "Sigurno želite da obrišete ovaj neimenovani zakazani sastanak"
-
-#: calendar/gui/dialogs/delete-comp.c:104
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "Sigurno želite da obrišete zaduženje `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:107
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "Sigurno želite da obrišete ovo neimenovano zaduženje?"
-
-#: calendar/gui/dialogs/delete-comp.c:113
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "Sigurno želite da izbrišete unos u dnevnik `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:116
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "Sigurno želite da izbrišete ovan neimenovani unos u dnevnik?"
-
-#: calendar/gui/dialogs/delete-comp.c:131
-#, c-format
-msgid "Are you sure you want to delete %d appointment?"
-msgid_plural "Are you sure you want to delete %d appointments?"
-msgstr[0] "Sigurno želite da izbrišete %d zakazani sastanak?"
-msgstr[1] "Sigurno želite da izbrišete %d zakazana sastanka?"
-msgstr[2] "Sigurno želite da izbrišete %d zakazanih sastanaka?"
-
-#: calendar/gui/dialogs/delete-comp.c:138
-#, c-format
-msgid "Are you sure you want to delete %d task?"
-msgid_plural "Are you sure you want to delete %d tasks?"
-msgstr[0] "Sigurno želite da izbrišete %d zaduženje"
-msgstr[1] "Sigurno želite da izbrišete %d zaduženja"
-msgstr[2] "Sigurno želite da izbrišete %d zaduženja"
-
-#: calendar/gui/dialogs/delete-comp.c:145
-#, c-format
-msgid "Are you sure you want to delete %d journal entry?"
-msgid_plural "Are you sure you want to delete %d journal entries?"
-msgstr[0] "Sigurno želite da izbrišete %d unos u dnevnik?"
-msgstr[1] "Sigurno želite da izbrišete %d unosa u dnevnik?"
-msgstr[2] "Sigurno želite da izbrišete %d unosa u dnevnik?"
-
-#: calendar/gui/dialogs/delete-error.c:52
+#: calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "Događaj nije mogao biti obrisan zbog corba greške"
 
-#: calendar/gui/dialogs/delete-error.c:55
+#: calendar/gui/dialogs/delete-error.c:57
 msgid "The task could not be deleted due to a corba error"
 msgstr "Zaduženje nije moglo biti izbrisano zbog corba greške"
 
-#: calendar/gui/dialogs/delete-error.c:58
+#: calendar/gui/dialogs/delete-error.c:60
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr "Unos u dnevnik nije mogao biti obrisan zbog corba greške"
 
-#: calendar/gui/dialogs/delete-error.c:61
+#: calendar/gui/dialogs/delete-error.c:63
 msgid "The item could not be deleted due to a corba error"
 msgstr "Unos nije mogao biti obrisan zbog corba greške"
 
-#: calendar/gui/dialogs/delete-error.c:68
+#: calendar/gui/dialogs/delete-error.c:70
 msgid "The event could not be deleted because permission was denied"
 msgstr "Događaj nije mogao biti obrisan zbog nemogućnosti pristupa"
 
-#: calendar/gui/dialogs/delete-error.c:71
+#: calendar/gui/dialogs/delete-error.c:73
 msgid "The task could not be deleted because permission was denied"
 msgstr "Zaduženje nije moglo biti obrisano zbog nemogućnosti pristupa"
 
-#: calendar/gui/dialogs/delete-error.c:74
+#: calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr "Unos u dnevnik nije mogao biti obrisan zbog nemogućnosti pristupa"
 
-#: calendar/gui/dialogs/delete-error.c:77
+#: calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
 msgstr "Unos nije mogao biti obrisan zbog nemogućnosti pristupa"
 
-#: calendar/gui/dialogs/delete-error.c:84
+#: calendar/gui/dialogs/delete-error.c:86
 msgid "The event could not be deleted due to an error"
 msgstr "Događaj nije mogao biti obrisan usled greške"
 
-#: calendar/gui/dialogs/delete-error.c:87
+#: calendar/gui/dialogs/delete-error.c:89
 msgid "The task could not be deleted due to an error"
 msgstr "Zaduženje nije moglo biti obrisano usled greške"
 
-#: calendar/gui/dialogs/delete-error.c:90
+#: calendar/gui/dialogs/delete-error.c:92
 msgid "The journal entry could not be deleted due to an error"
 msgstr "Unos u dnevnik nije mogao biti obrisan usled greške"
 
-#: calendar/gui/dialogs/delete-error.c:93
+#: calendar/gui/dialogs/delete-error.c:95
 msgid "The item could not be deleted due to an error"
 msgstr "Unos nije mogao biti obrisan usled greške"
 
@@ -4948,11 +4734,11 @@ msgstr "_Početno vreme:"
 
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:3
+#: calendar/gui/dialogs/meeting-page.glade.h:4
 #: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
 #: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1559
-#: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:100
+#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
+#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
@@ -4978,8 +4764,8 @@ msgstr "_Delegiraj za..."
 #. FIXME: need to disable for undeletable folders
 #: calendar/gui/dialogs/meeting-page.c:655
 #: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1310 calendar/gui/e-calendar-view.c:1342
-#: mail/em-folder-tree.c:2557 mail/em-folder-view.c:919
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
+#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -4987,7 +4773,7 @@ msgid "_Delete"
 msgstr "_Obriši"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:240
+#: calendar/gui/e-meeting-list-view.c:218
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "_Prisutan"
@@ -5023,16 +4809,15 @@ msgid "Member"
 msgstr "Član"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
-#: mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-list-view.c:248
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Stanje"
 
@@ -5040,20 +4825,20 @@ msgstr "Stanje"
 msgid "Add A_ttendee"
 msgstr "Dodaj prisu_tnog"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "Add attendees from addressbook."
+msgstr "Dodaj pošiljaoca u adresa_r"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Organizator:"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
+#: calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "_Change Organizer"
 msgstr "_Promeni organizatora"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-#: calendar/gui/e-meeting-time-sel.c:417
-msgid "_Invite Others..."
-msgstr "_Pozovi druge..."
-
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
 msgstr "<b>Opcije kalendara</b>"
@@ -5203,7 +4988,7 @@ msgid "_No recurrence"
 msgstr "_Bez ponavljanja"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:450
+#: composer/e-msg-composer-attachment-bar.c:453
 msgid "_Remove"
 msgstr "_Ukloni"
 
@@ -5235,54 +5020,20 @@ msgstr "nedelja(e)"
 msgid "year(s)"
 msgstr "godina(e)"
 
-#: calendar/gui/dialogs/save-comp.c:53
-msgid ""
-"This event has been changed, but has not been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Ovaj događaj je izmenjen, ali nije sačuvan.\n"
-"\n"
-"Želite li da sačuvate vaše izmene?"
-
-#: calendar/gui/dialogs/save-comp.c:57
-msgid "_Discard Changes"
-msgstr "_Zanemari promene"
-
-#: calendar/gui/dialogs/save-comp.c:62
-msgid "Save Event"
-msgstr "Sačuvaj događaj"
-
-#: calendar/gui/dialogs/select-source-dialog.c:65
+#: calendar/gui/dialogs/select-source-dialog.c:69
 #, fuzzy
 msgid "Select destination"
 msgstr "Izaberite odredište %s"
 
-#: calendar/gui/dialogs/select-source-dialog.c:86
+#: calendar/gui/dialogs/select-source-dialog.c:90
 #, fuzzy
 msgid "_Destination"
 msgstr "Odredišni direktorijum:"
 
-#: calendar/gui/dialogs/select-source-dialog.c:88
+#: calendar/gui/dialogs/select-source-dialog.c:92
 msgid "Task List"
 msgstr "Spisak zaduženja"
 
-#: calendar/gui/dialogs/send-comp.c:57
-msgid "The meeting information has been created. Send it?"
-msgstr "Informacija o sastanku je sačinjena. Da je pošaljem?"
-
-#: calendar/gui/dialogs/send-comp.c:60
-msgid "The meeting information has changed. Send an updated version?"
-msgstr "Informacija o sastanku je izmenjena. Da pošaljem noviju verziju?"
-
-#: calendar/gui/dialogs/send-comp.c:67
-msgid "The task assignment information has been created. Send it?"
-msgstr "Informacija o primljenom zaduženju je sačinjena. Da je pošaljem?"
-
-#: calendar/gui/dialogs/send-comp.c:71
-msgid "The task information has changed. Send an updated version?"
-msgstr "Informacija o zaduženju je izmenjena. Da pošaljem noviju verziju?"
-
 #: calendar/gui/dialogs/task-details-page.c:406
 msgid "Completed date is wrong"
 msgstr "Datum završetka je pogrešan"
@@ -5302,7 +5053,7 @@ msgstr "Gotovo"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #: calendar/gui/e-cal-component-preview.c:249
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:960
 msgid "High"
 msgstr "Visok"
 
@@ -5316,14 +5067,14 @@ msgstr "U toku"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:253
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:958
 msgid "Low"
 msgstr "Nizak"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:251
 #: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:957
+#: mail/message-list.c:959
 msgid "Normal"
 msgstr "Običan"
 
@@ -5380,8 +5131,8 @@ msgstr "Pov_erljivo"
 
 #: calendar/gui/dialogs/task-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
+#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Opis:"
 
@@ -5549,7 +5300,7 @@ msgstr "Datum završetka:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:950
+#: calendar/gui/e-itip-control.c:943
 msgid "Status:"
 msgstr "Stanje:"
 
@@ -5634,12 +5385,12 @@ msgstr "Zauzet"
 msgid "Deleting selected objects"
 msgstr "Brišem izabrane objekte"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
 msgid "Updating objects"
 msgstr "Unosim promene u objekte"
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1370
+#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
 #: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Otvori"
@@ -5649,15 +5400,15 @@ msgid "Open _Web Page"
 msgstr "Otvori _veb stranicu"
 
 #: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1291 calendar/gui/e-calendar-view.c:1376
-#: mail/em-folder-view.c:896 mail/em-popup.c:690 mail/em-popup.c:806
+#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
+#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "_Sačuvaj kao..."
 
 #: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1292
-#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
+#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
@@ -5665,24 +5416,24 @@ msgid "_Print..."
 msgstr "Štam_paj..."
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Iseci"
 
 #: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1338
-#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2550
-#: mail/message-list.c:1644 ui/evolution-addressbook.xml.h:31
+#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
+#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
+#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Kopiraj"
 
 #: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1273 calendar/gui/e-calendar-view.c:1299
-#: calendar/gui/e-calendar-view.c:1372 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
+#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
@@ -5748,69 +5499,69 @@ msgstr "Izveštaj"
 msgid "Task sort"
 msgstr "Razvrstana zaduženja"
 
-#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
 msgid "New _Appointment..."
 msgstr "Nov zakazan _sastanak..."
 
-#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
+#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
 msgid "New All Day _Event"
 msgstr "Nov celodnevni _događaj"
 
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
+#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
 msgid "New Meeting"
 msgstr "Novi sastanak"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
 msgid "New Task"
 msgstr "Novo zaduženje"
 
-#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Izaberi _nit"
 
-#: calendar/gui/e-calendar-view.c:1280
+#: calendar/gui/e-calendar-view.c:1283
 #, fuzzy
 msgid "_Select Date..."
 msgstr "Izaberi..."
 
-#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Objavi slobodan/zauzet informaciju"
 
-#: calendar/gui/e-calendar-view.c:1303
+#: calendar/gui/e-calendar-view.c:1306
 msgid "Cop_y to Calendar..."
 msgstr "Kop_iraj u kalendar..."
 
-#: calendar/gui/e-calendar-view.c:1304
+#: calendar/gui/e-calendar-view.c:1307
 msgid "Mo_ve to Calendar..."
 msgstr "Prene_si u kalendar..."
 
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1308
 msgid "_Schedule Meeting..."
 msgstr "_Zakaži sastanak..."
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1309
 msgid "_Forward as iCalendar..."
 msgstr "_Prosledi kao iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
 msgid "Delete this _Occurrence"
 msgstr "Obriši ovu _pojavu"
 
-#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
 msgid "Delete _All Occurrences"
 msgstr "Obriši _sve pojave"
 
-#: calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1349
 msgid "Go to _Today"
 msgstr "Idi na _danas"
 
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1351
 msgid "_Go to Date..."
 msgstr "_Idi na datum..."
 
-#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "_Podešavanja..."
 
@@ -5824,9 +5575,9 @@ msgstr "Početni datum"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:967 calendar/gui/e-itip-control.c:1169
-#: calendar/gui/e-meeting-list-view.c:144
-#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
 #: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
 #: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
 #: camel/camel-tcp-stream-openssl.c:631
@@ -5852,13 +5603,13 @@ msgid "Assigned"
 msgstr "Dodeljeno"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr "Da"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "Ne"
 
@@ -5870,7 +5621,7 @@ msgstr "S"
 msgid "S"
 msgstr "J"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
 msgid "E"
 msgstr "I"
 
@@ -5942,11 +5693,11 @@ msgstr "%d %b"
 msgid "%02i minute divisions"
 msgstr "%02i minutni razmaci"
 
-#: calendar/gui/e-itip-control.c:592
+#: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
 msgstr "Da. (Složeni povraćaj)"
 
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:596
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
@@ -5954,7 +5705,7 @@ msgstr[0] "Svaki %d dan"
 msgstr[1] "Svaka %d dana"
 msgstr[2] "Svakih %d dana"
 
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:601
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
@@ -5963,7 +5714,7 @@ msgstr[1] "Svake %d nedelje"
 msgstr[2] "Svakih %d nedelja"
 
 # ovo će teško biti 21, 31, 41, ...
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:603
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -5971,22 +5722,22 @@ msgstr[0] "Svake nedelje u "
 msgstr[1] "Svake %d nedelje u "
 msgstr[2] "Svakih %d nedelja u "
 
-#: calendar/gui/e-itip-control.c:618
+#: calendar/gui/e-itip-control.c:611
 msgid " and "
 msgstr " i "
 
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:618
 #, c-format
 msgid "The %s day of "
 msgstr "%s dan "
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:631
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s "
 
 # slično kao za nedelje
-#: calendar/gui/e-itip-control.c:645
+#: calendar/gui/e-itip-control.c:638
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
@@ -5995,7 +5746,7 @@ msgstr[1] "svaka %d meseca"
 msgstr[2] "svakih %d meseci"
 
 # slično kao za mesece i nedelje
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:642
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
@@ -6003,7 +5754,7 @@ msgstr[0] "Svake godine"
 msgstr[1] "Svake %d godine"
 msgstr[2] "Svakih %d godina"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:653
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
@@ -6011,42 +5762,42 @@ msgstr[0] "ukupno %d put"
 msgstr[1] "ukupno %d puta"
 msgstr[2] "ukupno %d puta"
 
-#: calendar/gui/e-itip-control.c:669
+#: calendar/gui/e-itip-control.c:662
 msgid ", ending on "
 msgstr ", završavajući se "
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:686
 msgid "<b>Starts:</b> "
 msgstr "<b>Početak:</b> "
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:696
 msgid "<b>Ends:</b> "
 msgstr "<b>Kraj:</b> "
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:716
 msgid "<b>Completed:</b> "
 msgstr "<b>Završetak:</b> "
 
-#: calendar/gui/e-itip-control.c:733
+#: calendar/gui/e-itip-control.c:726
 msgid "<b>Due:</b> "
 msgstr "<b>Do:</b> "
 
-#: calendar/gui/e-itip-control.c:771 calendar/gui/e-itip-control.c:827
+#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
 msgid "iCalendar Information"
 msgstr "iCalendar informacija"
 
 #. Title
-#: calendar/gui/e-itip-control.c:788
+#: calendar/gui/e-itip-control.c:781
 msgid "iCalendar Error"
 msgstr "iCalendar greška"
 
-#: calendar/gui/e-itip-control.c:859 calendar/gui/e-itip-control.c:875
-#: calendar/gui/e-itip-control.c:886 calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
 msgid "An unknown person"
 msgstr "Nepoznata osoba"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:910
+#: calendar/gui/e-itip-control.c:903
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -6054,301 +5805,305 @@ msgstr ""
 "<br> Molim proverite sledeću informaciju, i potom odaberite akciju iz donjeg "
 "menija."
 
-#: calendar/gui/e-itip-control.c:925
+#: calendar/gui/e-itip-control.c:918
 msgid "<i>None</i>"
 msgstr "<i>Ništa</i>"
 
-#: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:929
+msgid "Location:"
+msgstr "Mesto:"
+
+#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Prihvaćeno"
 
-#: calendar/gui/e-itip-control.c:959 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Prihvaćeno s rezervom"
 
-#: calendar/gui/e-itip-control.c:963 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Odbijeno"
 
-#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.c:1050
-#: calendar/gui/e-itip-control.c:1076 calendar/gui/e-itip-control.c:1089
-#: calendar/gui/e-itip-control.c:1102 calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
 msgid "Choose an action:"
 msgstr "Izaberi akciju:"
 
-#: calendar/gui/e-itip-control.c:1023
+#: calendar/gui/e-itip-control.c:1016
 msgid "Update"
 msgstr "Ažuriraj"
 
-#: calendar/gui/e-itip-control.c:1024 calendar/gui/e-itip-control.c:1055
-#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1091
-#: calendar/gui/e-itip-control.c:1104 calendar/gui/e-itip-control.c:1117
-#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
+#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1044
 msgid "Accept"
 msgstr "Prihvati"
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1045
 msgid "Tentatively accept"
 msgstr "Prihvati sa rezervom"
 
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1046
 msgid "Decline"
 msgstr "Odbij"
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1070
 msgid "Send Free/Busy Information"
 msgstr "Pošalji slobodan/zauzet informaciju"
 
-#: calendar/gui/e-itip-control.c:1090
+#: calendar/gui/e-itip-control.c:1083
 msgid "Update respondent status"
 msgstr "Ažuriraj stanje stranke"
 
-#: calendar/gui/e-itip-control.c:1103
+#: calendar/gui/e-itip-control.c:1096
 msgid "Send Latest Information"
 msgstr "Pošalji najnoviju informaciju"
 
-#: calendar/gui/e-itip-control.c:1116 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Odustani"
 
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1185
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> je objavio informaciju o sastanku."
 
-#: calendar/gui/e-itip-control.c:1193
+#: calendar/gui/e-itip-control.c:1186
 msgid "Meeting Information"
 msgstr "Informacija o sastanku"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1191
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> traži prisustvo %s na sastanku."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1193
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> traži Vaše prisustvo na sastanku."
 
-#: calendar/gui/e-itip-control.c:1201
+#: calendar/gui/e-itip-control.c:1194
 msgid "Meeting Proposal"
 msgstr "Predlog za sastanak"
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> želi da doda postojećem sastanku"
 
-#: calendar/gui/e-itip-control.c:1206
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Update"
 msgstr "Promena sastanka"
 
-#: calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1203
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> želi da dobije najnoviju informaciju o sastanku."
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1204
 msgid "Meeting Update Request"
 msgstr "Zahtev za novim podacima o sastanku"
 
-#: calendar/gui/e-itip-control.c:1218
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> je odgovorio na zahtev o sastanku."
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Reply"
 msgstr "Odgovor za sastanak"
 
-#: calendar/gui/e-itip-control.c:1226
+#: calendar/gui/e-itip-control.c:1219
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> je otkazo sastanak."
 
-#: calendar/gui/e-itip-control.c:1227
+#: calendar/gui/e-itip-control.c:1220
 msgid "Meeting Cancellation"
 msgstr "Otkazivanje sastanka"
 
-#: calendar/gui/e-itip-control.c:1234 calendar/gui/e-itip-control.c:1302
-#: calendar/gui/e-itip-control.c:1337
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1330
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> je poslao nerazumljivu poruku."
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1228
 msgid "Bad Meeting Message"
 msgstr "Loša poruka o sastanku"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1253
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> je objavio informaciju o zaduženju."
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1254
 msgid "Task Information"
 msgstr "Informacija o zaduženju"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1259
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> traži %s za obavljanje zaduženja."
 
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> traži da Vi izvršite zaduženje."
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1262
 msgid "Task Proposal"
 msgstr "Predlog za zaduženje"
 
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b želi da doda na postojeće zaduženje."
 
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Update"
 msgstr "Ažuriranje zaduženja"
 
-#: calendar/gui/e-itip-control.c:1278
+#: calendar/gui/e-itip-control.c:1271
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> želi da primi najnoviju informaciju o zaduženju."
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1272
 msgid "Task Update Request"
 msgstr "Zahtev za promenama zaduženja"
 
-#: calendar/gui/e-itip-control.c:1286
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> je odgovorio na dodeljeno zaduženje."
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Reply"
 msgstr "Odgovor na zaduženje"
 
-#: calendar/gui/e-itip-control.c:1294
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> je otkazao zaduženje."
 
-#: calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1288
 msgid "Task Cancellation"
 msgstr "Otkazivanje zaduženja"
 
-#: calendar/gui/e-itip-control.c:1303
+#: calendar/gui/e-itip-control.c:1296
 msgid "Bad Task Message"
 msgstr "Loša poruka o zaduženju"
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1315
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> je objavio slobodan/zauzet informaciju."
 
-#: calendar/gui/e-itip-control.c:1323
+#: calendar/gui/e-itip-control.c:1316
 msgid "Free/Busy Information"
 msgstr "Slobodan/zauzet informacija"
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> traži Vašu slobodan/zauzet informaciju."
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1321
 msgid "Free/Busy Request"
 msgstr "Slobodan/zauzet zahtev"
 
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1325
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> je odgovorio na slobodan/zauzet zahtev."
 
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1326
 msgid "Free/Busy Reply"
 msgstr "Slobodan/zauzet odgovor"
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1331
 msgid "Bad Free/Busy Message"
 msgstr "Loša slobodan/zauzet poruka"
 
-#: calendar/gui/e-itip-control.c:1413
+#: calendar/gui/e-itip-control.c:1406
 msgid "The message does not appear to be properly formed"
 msgstr "Poruka izgleda da nije ispravno sačinjena"
 
-#: calendar/gui/e-itip-control.c:1472
+#: calendar/gui/e-itip-control.c:1465
 msgid "The message contains only unsupported requests."
 msgstr "Poruka sadrži samo nepodržane zahteve."
 
-#: calendar/gui/e-itip-control.c:1503
+#: calendar/gui/e-itip-control.c:1496
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Prilog ne sadrži ispravnu poruku za kalendar"
 
-#: calendar/gui/e-itip-control.c:1535
+#: calendar/gui/e-itip-control.c:1528
 msgid "The attachment has no viewable calendar items"
 msgstr "Prilog nema delove kalendara koji se mogu pregledati"
 
-#: calendar/gui/e-itip-control.c:1769
+#: calendar/gui/e-itip-control.c:1762
 msgid "Update complete\n"
 msgstr "Ažuriranje završeno\n"
 
-#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
+#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Stanje prisutnog ne može biti ažurirano jer unos više ne postoji"
 
-#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objekat je neispravan i ne može biti ažuriran\n"
 
-#: calendar/gui/e-itip-control.c:1825
+#: calendar/gui/e-itip-control.c:1818
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Ovaj odgovor nije poslao trenutno prisutan. Da ga dodam u prisutne?"
 
-#: calendar/gui/e-itip-control.c:1837
+#: calendar/gui/e-itip-control.c:1830
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Stanje prisutnog nije moglo biti ažurirano zbog neispravnog stanja!\n"
 
-#: calendar/gui/e-itip-control.c:1856
+#: calendar/gui/e-itip-control.c:1849
 msgid "There was an error on the CORBA system\n"
 msgstr "Nastala je greška u CORBA sistemu\n"
 
-#: calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1852
 msgid "Object could not be found\n"
 msgstr "Objekat nije mogao biti pronađen\n"
 
-#: calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1855
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Nemate prave dozvole za ažuriranje kalendara\n"
 
-#: calendar/gui/e-itip-control.c:1865
+#: calendar/gui/e-itip-control.c:1858
 msgid "Attendee status updated\n"
 msgstr "Ažurirano stanje prisutnog\n"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1861
 msgid "Attendee status could not be updated!\n"
 msgstr "Stanje prisutnog nije moglo biti ažurirano!\n"
 
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1892
 msgid "Removal Complete"
 msgstr "Uklanjanje završeno"
 
-#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
 msgid "Item sent!\n"
 msgstr "Unos poslat!\n"
 
-#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
+#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
 msgid "The item could not be sent!\n"
 msgstr "Unos nije mogao biti poslat!\n"
 
@@ -6389,74 +6144,74 @@ msgstr "krajnji-datum"
 msgid "date-start"
 msgstr "početni-datum"
 
-#: calendar/gui/e-meeting-list-view.c:62
+#: calendar/gui/e-meeting-list-view.c:59
 msgid "Chair Persons"
 msgstr "Predsedništvo"
 
-#: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:479
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
 msgid "Required Participants"
 msgstr "Obavezno prisustvo"
 
-#: calendar/gui/e-meeting-list-view.c:64
+#: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Slobodno prisustvo"
 
-#: calendar/gui/e-meeting-list-view.c:65
+#: calendar/gui/e-meeting-list-view.c:62
 msgid "Resources"
 msgstr "Izvori"
 
-#: calendar/gui/e-meeting-list-view.c:140 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
 #: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr "Pojedinac"
 
-#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "Grupa"
 
-#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr "Izvor"
 
-#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr "Soba"
 
-#: calendar/gui/e-meeting-list-view.c:154 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr "Mesto"
 
-#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:127
 #: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
 msgid "Required Participant"
 msgstr "Obavezan učesnik"
 
-#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr "Slobodan učesnik"
 
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr "Ne-učesnik"
 
-#: calendar/gui/e-meeting-list-view.c:179 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:177
 #: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
 msgid "Needs Action"
 msgstr "Potrebna akcija"
 
-#: calendar/gui/e-meeting-list-view.c:182 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
 #: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "S rezervom"
 
-#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr "Delegirano"
@@ -6473,20 +6228,28 @@ msgstr "Van kancelarije"
 msgid "No Information"
 msgstr "Bez informacije"
 
+#: calendar/gui/e-meeting-time-sel.c:417
+#, fuzzy
+msgid "Add attendees from addressbook"
+msgstr "Dodaj pošiljaoca u adresa_r"
+
 #: calendar/gui/e-meeting-time-sel.c:440
 msgid "_Options"
 msgstr "_Opcije"
 
 #: calendar/gui/e-meeting-time-sel.c:457
-msgid "Show _Only Working Hours"
+#, fuzzy
+msgid "Show _only working hours"
 msgstr "Pokaži _samo radne sate"
 
 #: calendar/gui/e-meeting-time-sel.c:467
-msgid "Show _Zoomed Out"
+#, fuzzy
+msgid "Show _zoomed out"
 msgstr "Pokaži _umanjeno"
 
 #: calendar/gui/e-meeting-time-sel.c:482
-msgid "_Update Free/Busy"
+#, fuzzy
+msgid "_Update free/busy"
 msgstr "Ažuriraj slobodan/zauzet"
 
 #: calendar/gui/e-meeting-time-sel.c:497
@@ -6502,19 +6265,23 @@ msgid ">_>"
 msgstr ">_>"
 
 #: calendar/gui/e-meeting-time-sel.c:547
-msgid "_All People and Resources"
+#, fuzzy
+msgid "_All people and resources"
 msgstr "_Sve osobe i svi izvori"
 
 #: calendar/gui/e-meeting-time-sel.c:556
-msgid "All _People and One Resource"
+#, fuzzy
+msgid "All _people and one resource"
 msgstr "Sve osobe i jedan izvor"
 
 #: calendar/gui/e-meeting-time-sel.c:565
-msgid "_Required People"
+#, fuzzy
+msgid "_Required people"
 msgstr "_Obavezne osobe"
 
 #: calendar/gui/e-meeting-time-sel.c:574
-msgid "Required People and _One Resource"
+#, fuzzy
+msgid "Required people and _one resource"
 msgstr "Obavezne osobe i _jedan izvor"
 
 #: calendar/gui/e-meeting-time-sel.c:593
@@ -6552,7 +6319,7 @@ msgstr "%m/%d/%Y"
 msgid "Enter the password for %s"
 msgstr "Unesite lozinku za „%s“"
 
-#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6561,22 +6328,14 @@ msgstr ""
 "Greška na %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
-#, fuzzy, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-"Mašinerija zaduženja za \n"
-"%s\n"
-" je pukla."
-
 #. FIXME Loading should be async
 #. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:686
+#: calendar/gui/e-tasks.c:801
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Otvaram zaduženja u %s"
 
-#: calendar/gui/e-tasks.c:709
+#: calendar/gui/e-tasks.c:824
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6585,55 +6344,47 @@ msgstr ""
 "Greška pri otvaranju %s:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:730
+#: calendar/gui/e-tasks.c:845
 msgid "Loading tasks"
 msgstr "Učitavam zaduženja"
 
-#: calendar/gui/e-tasks.c:834
+#: calendar/gui/e-tasks.c:949
 msgid "Completing tasks..."
 msgstr "Ispunjavam zaduženja..."
 
-#: calendar/gui/e-tasks.c:857
+#: calendar/gui/e-tasks.c:972
 msgid "Deleting selected objects..."
 msgstr "Brišem izabrane objekte..."
 
-#: calendar/gui/e-tasks.c:884
+#: calendar/gui/e-tasks.c:999
 msgid "Expunging"
 msgstr "Izbacujem"
 
-#: calendar/gui/e-tasks.c:960
+#: calendar/gui/e-tasks.c:1075
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
-#: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
+#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
+#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
 #: calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:705
 msgid "Tasks"
 msgstr "Zaduženja"
 
-#: calendar/gui/gnome-cal.c:1876
+#: calendar/gui/gnome-cal.c:1878
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Učitavam zakazane sastanke sa %s"
 
-#: calendar/gui/gnome-cal.c:1895
+#: calendar/gui/gnome-cal.c:1897
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Učitavam zaduženja sa %s"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1920
 #, c-format
 msgid "Opening %s"
 msgstr "Otvaram %s"
 
-#: calendar/gui/gnome-cal.c:2048
-#, fuzzy, c-format
-msgid "The calendar backend for '%s' has crashed."
-msgstr ""
-"Mašinerija kalendara za\n"
-"%s\n"
-" je pukla"
-
-#: calendar/gui/gnome-cal.c:2894
+#: calendar/gui/gnome-cal.c:2906
 msgid "Purging"
 msgstr "Briše"
 
@@ -6833,7 +6584,7 @@ msgid "On The Web"
 msgstr "Na vebu"
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 
@@ -6844,7 +6595,7 @@ msgid "Unable to migrate calendar `%s'"
 msgstr "Ne mogu da otvorim kalendar „%s“."
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:869
+#: calendar/gui/migration.c:889
 #, fuzzy, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Ne mogu da otvorim zaduženja u „%s“."
@@ -7080,16 +6831,16 @@ msgstr "Štampaj unos"
 msgid "Print Setup"
 msgstr "Podesi štampu"
 
-#: calendar/gui/tasks-component.c:303
+#: calendar/gui/tasks-component.c:313
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr "Spisak zaduženja „%s“ će biti ukloljen. Sigurno želite da nastavite?"
 
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:371
 msgid "New Task List"
 msgstr "Novi spisak zaduženja"
 
-#: calendar/gui/tasks-component.c:398
+#: calendar/gui/tasks-component.c:408
 #, fuzzy, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -7097,7 +6848,7 @@ msgstr[0] "%d karata"
 msgstr[1] "%d karata"
 msgstr[2] "%d karata"
 
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -7105,51 +6856,51 @@ msgstr[0] "%d izabranih"
 msgstr[1] "%d izabranih"
 msgstr[2] "%d izabranih"
 
-#: calendar/gui/tasks-component.c:447
+#: calendar/gui/tasks-component.c:457
 #, fuzzy
 msgid "Failed upgrading tasks."
 msgstr "Učitavam zaduženja"
 
-#: calendar/gui/tasks-component.c:526
+#: calendar/gui/tasks-component.c:749
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 "Ne mogu da otvorim spisak zaduženja „%s“ radi dodavanja novih događaja i "
 "sastanaka"
 
-#: calendar/gui/tasks-component.c:538
+#: calendar/gui/tasks-component.c:761
 msgid "There is no calendar available for creating tasks"
 msgstr "Nijedan kalendar nije dostupan za dodavanje zaduženja"
 
-#: calendar/gui/tasks-component.c:576
+#: calendar/gui/tasks-component.c:799
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:804
+#: calendar/gui/tasks-component.c:1040
 msgid "New task"
 msgstr "Novo zaduženje"
 
-#: calendar/gui/tasks-component.c:805
+#: calendar/gui/tasks-component.c:1041
 msgid "_Task"
 msgstr "_Zaduženje"
 
-#: calendar/gui/tasks-component.c:806
+#: calendar/gui/tasks-component.c:1042
 msgid "Create a new task"
 msgstr "Unesi novo zaduženje"
 
-#: calendar/gui/tasks-component.c:812
+#: calendar/gui/tasks-component.c:1048
 #, fuzzy
 msgid "New tasks group"
 msgstr "Diskusione grupe"
 
-#: calendar/gui/tasks-component.c:813
+#: calendar/gui/tasks-component.c:1049
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Grupa spiska zaduženja"
 
-#: calendar/gui/tasks-component.c:814
+#: calendar/gui/tasks-component.c:1050
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Unesi novo zaduženje"
@@ -8916,12 +8667,12 @@ msgstr "Greška kod primene filtera za pretragu: %s: %s"
 msgid "Unsupported operation: append message: for %s"
 msgstr "Nepodržana operacija: priključena poruka: za %s"
 
-#: camel/camel-folder.c:1259
+#: camel/camel-folder.c:1262
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Nepodržana operacija: pretraga po izrazu: za %s"
 
-#: camel/camel-folder.c:1299
+#: camel/camel-folder.c:1302
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Nepodržana operacija: pretraga po uid-u: za %s"
@@ -8934,11 +8685,16 @@ msgstr "Pomeram poruke"
 msgid "Copying messages"
 msgstr "Kopiram poruke"
 
-#: camel/camel-folder.c:1666
-msgid "Learning junk and/or non junk message(s)"
-msgstr "Učenje đubreta i ne-đubreta od poruka"
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Izmena stanja đubreta"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr ""
 
-#: camel/camel-folder.c:1695
+#: camel/camel-folder.c:1701
 msgid "Filtering new message(s)"
 msgstr "Filtriram nove poruke"
 
@@ -8972,17 +8728,17 @@ msgstr ""
 msgid "(match-threads) requires a match type string"
 msgstr ""
 
-#: camel/camel-folder-search.c:785
+#: camel/camel-folder-search.c:784
 #, fuzzy
 msgid "(match-threads) expects an array result"
 msgstr "(odgovara-sve) zahteva samo jedan logički rezultat"
 
-#: camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:790
 #, fuzzy
 msgid "(match-threads) requires the folder set"
 msgstr "(odgovara-sve) zahteva samo jedan logički rezultat"
 
-#: camel/camel-folder-search.c:880
+#: camel/camel-folder-search.c:879
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Izvršavam pretragu na nepoznato zaglavlje: %s"
@@ -9017,7 +8773,8 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
 #: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:706
+#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Poništeno."
@@ -9395,7 +9152,7 @@ msgstr "Važenje traženih uverenja je isteklo."
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1212
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Loš odgovor na prijavu od servera."
 
@@ -9774,40 +9531,40 @@ msgstr "Komanda nije podržana"
 msgid "export keys: unimplemented"
 msgstr ""
 
-#: camel/camel-store.c:214
+#: camel/camel-store.c:213
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Ne mogu da dobijem direktorijum: neispravna operacija"
 
-#: camel/camel-store.c:244
+#: camel/camel-store.c:243
 #, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr "Ne mogu da napravim direktorijum „%s“: direktorijum postoji"
 
-#: camel/camel-store.c:295
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Ne mogu da napravim direktorijum: neispravna operacija"
 
-#: camel/camel-store.c:323
+#: camel/camel-store.c:325
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Ne mogu da napravim direktorijum „%s“: direktorijum postoji"
 
-#: camel/camel-store.c:387 camel/camel-vee-store.c:354
+#: camel/camel-store.c:389 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Ne mogu da obrišem direktorijum: %s: neispravna operacija"
 
-#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#: camel/camel-store.c:439 camel/camel-vee-store.c:387
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Ne mogu da promenim ime  direktorijumu: %s: neispravna operacija"
 
-#: camel/camel-store.c:811
+#: camel/camel-store.c:777
 msgid "Trash"
 msgstr "Smeće"
 
-#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
-#: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/mail-config.glade.h:95
+#: ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Đubre"
 
@@ -10038,12 +9795,12 @@ msgstr "Nema takve poruke %s u %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Ne mogu da kopiram ili premestim poruke u virtuelni direktorijum"
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:374
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Ne mogu da obrišem direktorijum: %s: nema takvog direktorijuma"
 
-#: camel/camel-vee-store.c:398
+#: camel/camel-vee-store.c:395
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Ne mogu da promenim ime  direktorijumu: %s: nema takvog direktorijuma"
@@ -10084,32 +9841,32 @@ msgstr "Adresar i kalendar"
 msgid "Post Office Agent SOAP Port:"
 msgstr "Posrednik za SOAP port za poštu:"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:80
+#: camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "Novell GroupWise"
 msgstr "Novel Grupvajz"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:82
+#: camel/providers/groupwise/camel-groupwise-provider.c:85
 msgid "For accessing Novell Groupwise servers"
 msgstr "Za pristup Novel Grupvajz serverima"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: camel/providers/groupwise/camel-groupwise-provider.c:100
 #: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
 msgid "Password"
 msgstr "Lozinka"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:99
+#: camel/providers/groupwise/camel-groupwise-provider.c:102
 #: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Ova opcija će povezati na IMAP server korišćenjem lozinke u običnom tekstu."
 
-#: camel/providers/groupwise/camel-gw-listener.c:305
-#: camel/providers/groupwise/camel-gw-listener.c:328
+#: camel/providers/groupwise/camel-gw-listener.c:312
+#: camel/providers/groupwise/camel-gw-listener.c:335
 msgid "Checklist"
 msgstr "Popis"
 
@@ -10248,13 +10005,13 @@ msgstr ""
 "Ova opcija će povezati na IMAP server korišćenjem lozinke u običnom tekstu."
 
 #: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:429
+#: camel/providers/imap/camel-imap-store.c:428
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP server %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:431
+#: camel/providers/imap/camel-imap-store.c:430
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP servis za %s na %s"
@@ -10264,7 +10021,7 @@ msgstr "IMAP servis za %s na %s"
 #: camel/providers/imap/camel-imap-store.c:551
 #: camel/providers/imap/camel-imap-store.c:571
 #: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
+#: camel/providers/nntp/camel-nntp-store.c:209
 #: camel/providers/pop3/camel-pop3-store.c:175
 #: camel/providers/smtp/camel-smtp-transport.c:269
 #: camel/providers/smtp/camel-smtp-transport.c:285
@@ -10281,10 +10038,10 @@ msgstr "SSL nije dostupan"
 
 #: camel/providers/imap4/camel-imap4-store.c:222
 #: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:815
+#: camel/providers/imap/camel-imap-store.c:845
 #: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:137
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
 #: camel/providers/pop3/camel-pop3-store.c:192
 msgid "Connection cancelled"
 msgstr "Povezivanje poništeno"
@@ -10299,8 +10056,8 @@ msgstr ""
 "podržava STARTTLS"
 
 #: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:649
-#: camel/providers/imap/camel-imap-store.c:680
+#: camel/providers/imap/camel-imap-store.c:679
+#: camel/providers/imap/camel-imap-store.c:710
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Nisam mogao da se povežem na IMAP server %s u sigurnosnom modu: %s"
@@ -10309,7 +10066,7 @@ msgstr "Nisam mogao da se povežem na IMAP server %s u sigurnosnom modu: %s"
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1109
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
 msgid "Unknown error"
 msgstr "Nepoznata greška"
 
@@ -10336,8 +10093,8 @@ msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr "Ne mogu da preuzmem direktorijum „%s“: %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1857
-#: camel/providers/imap/camel-imap-store.c:2235
+#: camel/providers/imap/camel-imap-store.c:1885
+#: camel/providers/imap/camel-imap-store.c:2263
 #, fuzzy, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -10416,12 +10173,12 @@ msgstr "Veza sa IMAP serverom %s je neočekivano prekinuta: %s"
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3168
+#: camel/providers/imap/camel-imap-store.c:3194
 msgid "Operation cancelled"
 msgstr "Operacija obustavljena"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3171
+#: camel/providers/imap/camel-imap-store.c:3197
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Veza sa serverom je neočekivano isključena: %s"
@@ -10485,13 +10242,6 @@ msgid "Unable to retrieve message: %s"
 msgstr "Ne mogu da pokupim poruku: %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:219
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -10501,15 +10251,15 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-mbox-folder.c:418
+#: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
 msgstr "Nema takve poruke"
 
 #: camel/providers/imap/camel-imap-folder.c:2019
-#: camel/providers/imap/camel-imap-folder.c:2621
-#: camel/providers/nntp/camel-nntp-folder.c:238
+#: camel/providers/imap/camel-imap-folder.c:2622
+#: camel/providers/nntp/camel-nntp-folder.c:220
 msgid "This message is not currently available"
 msgstr "Ova poruke nije trenutno dostupna"
 
@@ -10518,7 +10268,23 @@ msgstr "Ova poruke nije trenutno dostupna"
 msgid "Fetching summary information for new messages"
 msgstr "Prikupljam sažetu informaciju za nove poruke"
 
-#: camel/providers/imap/camel-imap-folder.c:2659
+#: camel/providers/imap/camel-imap-folder.c:2463
+#, c-format
+msgid "Incomplete server response: no information provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2471
+#, c-format
+msgid "Incomplete server response: no UID provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2484
+#, c-format
+msgid ""
+"Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2660
 msgid "Could not find message body in FETCH response."
 msgstr "Nisam mogao da pronađem tekst poruke u FETCH odgovoru."
 
@@ -10577,43 +10343,43 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Za čitanje i smeštanje pošte na IMAP servere."
 
-#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/imap/camel-imap-store.c:680
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS ekstenzija nije podržana."
 
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:711
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL pregovori nisu uspeli"
 
-#: camel/providers/imap/camel-imap-store.c:818
+#: camel/providers/imap/camel-imap-store.c:848
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Nisam mogao da se povežem pomoću naredbe %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1242
+#: camel/providers/imap/camel-imap-store.c:1272
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP server %s ne podržava traženi tip prijave  %s"
 
-#: camel/providers/imap/camel-imap-store.c:1252
+#: camel/providers/imap/camel-imap-store.c:1282
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Nema podrške za tip prijave  %s"
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1305
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sMolim unesite IMAP lozinku za %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1289
+#: camel/providers/imap/camel-imap-store.c:1319
 msgid "You didn't enter a password."
 msgstr "Niste uneli lozinku."
 
-#: camel/providers/imap/camel-imap-store.c:1318
+#: camel/providers/imap/camel-imap-store.c:1348
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10624,18 +10390,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1839
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:1867
+#: camel/providers/imap/camel-imap-store.c:2057
 #, c-format
 msgid "No such folder %s"
 msgstr "Nema takvog direktorijuma %s"
 
-#: camel/providers/imap/camel-imap-store.c:1915
-#: camel/providers/imap/camel-imap-store.c:2296
+#: camel/providers/imap/camel-imap-store.c:1943
+#: camel/providers/imap/camel-imap-store.c:2324
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Glavni direktorijum ne može sadržati direktorijume u sebi"
 
-#: camel/providers/imap/camel-imap-store.c:1970
+#: camel/providers/imap/camel-imap-store.c:1998
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10643,7 +10409,7 @@ msgstr "Glavni direktorijum ne može sadržati direktorijume u sebi"
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Ne mogu da napravim direktorijum „%s“: direktorijum postoji."
 
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:2274
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Nepoznati glavni direktorijum: %s"
@@ -10680,20 +10446,20 @@ msgid "Index message body data"
 msgstr "Popiši sadržaje poruka"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:388
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:393
-#: camel/providers/local/camel-local-folder.c:396
+#: camel/providers/local/camel-local-folder.c:392
+#: camel/providers/local/camel-local-folder.c:395
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "mailbox:%s (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:400
+#: camel/providers/local/camel-local-folder.c:399
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -10755,7 +10521,7 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:142
 #: camel/providers/local/camel-local-store.c:253
-#: camel/providers/local/camel-mbox-store.c:356
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10828,8 +10594,25 @@ msgstr "Prododata Maildir poruka ponišetna"
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Ne mogu da dodam poruku u maildir direktorijum: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:226
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mbox-folder.c:417
+#: camel/providers/local/camel-mbox-folder.c:436
+#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:475
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-mh-folder.c:221
+#, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+"Ne mogu da dobijem poruku: %s iz direktorijuma %s\n"
+"  %s"
+
+#: camel/providers/local/camel-maildir-folder.c:236
 msgid "Invalid message contents"
 msgstr "Neispravan sadržaj poruke"
 
@@ -10870,9 +10653,9 @@ msgstr "Nisam mogao da obrišem direktorijum `%s': %s"
 msgid "not a maildir directory"
 msgstr "nije maildir direktorijum"
 
-#: camel/providers/local/camel-maildir-store.c:341
-#: camel/providers/local/camel-spool-store.c:286
-#: camel/providers/local/camel-spool-store.c:316
+#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-spool-store.c:284
+#: camel/providers/local/camel-spool-store.c:314
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Nisam mogao da skeniram direktorijum `%s': %s"
@@ -10919,27 +10702,18 @@ msgstr "Dodavanje pošte otkazano"
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Ne mogu da dodam poruku u mbox datoteku: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:435
-#: camel/providers/local/camel-mbox-folder.c:466
-#: camel/providers/local/camel-mbox-folder.c:474
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"Ne mogu da dobijem poruku: %s iz direktorijuma %s\n"
-"  %s"
-
-#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:468
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Direktorijum izgleda nepopravljivo oštećen."
 
-#: camel/providers/local/camel-mbox-folder.c:475
-msgid "Message construction failed: Corrupt mailbox?"
+#: camel/providers/local/camel-mbox-folder.c:476
+#: camel/providers/local/camel-mh-folder.c:222
+#, fuzzy
+msgid "Message construction failed."
 msgstr "Sastavljanje poruke neuspelo: Oštećeno sanduče?"
 
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:362
+#: camel/providers/local/camel-mbox-store.c:361
 msgid "Cannot create a folder by this name."
 msgstr "Ne mogu da napravim direktorijum sa tim imenom."
 
@@ -10969,31 +10743,31 @@ msgstr "`%s' nije obična datoteka."
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Direktorijum `%s' nije prazan. Nije obrisan."
 
-#: camel/providers/local/camel-mbox-store.c:375
+#: camel/providers/local/camel-mbox-store.c:374
 #, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Nisam mogao da napravim direktorijum %s: %s."
 
-#: camel/providers/local/camel-mbox-store.c:389
+#: camel/providers/local/camel-mbox-store.c:388
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Ne mogu da napravim direktorijum: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:391
+#: camel/providers/local/camel-mbox-store.c:390
 msgid "Folder already exists"
 msgstr "Direktorijum već postoji"
 
-#: camel/providers/local/camel-mbox-store.c:473
+#: camel/providers/local/camel-mbox-store.c:472
 msgid "The new folder name is illegal."
 msgstr "Novo ime direktorijuma je neispravno."
 
-#: camel/providers/local/camel-mbox-store.c:486
+#: camel/providers/local/camel-mbox-store.c:485
 #, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Ne mogu da preimenujem „%s“: „%s“: %s"
 
 # bug: quotes on the other one as well
-#: camel/providers/local/camel-mbox-store.c:561
+#: camel/providers/local/camel-mbox-store.c:560
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Ne mogu da preimenujem „%s“ u „%s“: %s"
@@ -11184,7 +10958,7 @@ msgstr ""
 "Direktorijum je možda oštećen, kopirajte sačuvano u `%s'"
 
 #: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:997
+#: camel/providers/nntp/camel-nntp-store.c:1126
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Unesite NNTP lozinku za %s@%s"
@@ -11201,19 +10975,10 @@ msgstr "Neuspešno slanje korisničkog imena serveru"
 msgid "Server rejected username/password"
 msgstr "Server je odbio korisnika/lozinku"
 
-# Ovo je bilo "korisnik poništen", ali mislim da je ovo ipak ispravnije
-#: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:263
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr "Korisnik poništio"
-
-#: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:259
-#: camel/providers/nntp/camel-nntp-folder.c:265
+#: camel/providers/nntp/camel-nntp-folder.c:147
+#: camel/providers/nntp/camel-nntp-folder.c:149
+#: camel/providers/nntp/camel-nntp-folder.c:158
+#: camel/providers/nntp/camel-nntp-folder.c:234
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11222,60 +10987,50 @@ msgstr "Korisnik poništio"
 msgid "Cannot get message %s: %s"
 msgstr "Ne mogu da dobijem poruku %s: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:188
-#: camel/providers/nntp/camel-nntp-folder.c:228
+# Ovo je bilo "korisnik poništen", ali mislim da je ovo ipak ispravnije
+#: camel/providers/nntp/camel-nntp-folder.c:156
+#: camel/providers/nntp/camel-nntp-folder.c:232
+#: camel/providers/nntp/camel-nntp-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+msgid "User cancelled"
+msgstr "Korisnik poništio"
+
+#: camel/providers/nntp/camel-nntp-folder.c:176
+#: camel/providers/nntp/camel-nntp-folder.c:208
 #, c-format
 msgid "Internal error: uid in invalid format: %s"
 msgstr "Unutrašnja greška: KIB u neispravnom obliku: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:201
-#, c-format
-msgid "Could not get article %s from NNTP server"
-msgstr "Nisam mogao da preuzmem članak %s sa NNTP servera."
-
-#: camel/providers/nntp/camel-nntp-folder.c:362
-msgid "Posting not allowed by news server"
-msgstr "Server ne dozvoljava slanje članaka"
-
+#: camel/providers/nntp/camel-nntp-folder.c:328
+#: camel/providers/nntp/camel-nntp-folder.c:331
 #: camel/providers/nntp/camel-nntp-folder.c:373
-#, c-format
-msgid "Failed to send newsgroups header: %s: message not posted"
-msgstr "Neuspešno slanje zaglavlja grupa: %s: poruka nije poslata"
-
-#: camel/providers/nntp/camel-nntp-folder.c:413
-#: camel/providers/nntp/camel-nntp-folder.c:426
-#, c-format
-msgid "Error posting to newsgroup: %s: message not posted"
-msgstr "Greška pri slanja u grupu: %s: poruka nije poslata"
-
-#: camel/providers/nntp/camel-nntp-folder.c:438
-msgid "Error reading response to posted message: message not posted"
-msgstr "Greška pri čitanju odgovora na poslatu poruku: poruka nije poslata"
-
-#: camel/providers/nntp/camel-nntp-folder.c:441
-#, c-format
-msgid "Error posting message: %s: message not posted"
-msgstr "Greška pri slanja poruke: %s: poruka nije poslata"
+#: camel/providers/nntp/camel-nntp-folder.c:375
+#, fuzzy, c-format
+msgid "Posting failed: %s"
+msgstr "Neuspela operacija: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:457
+#: camel/providers/nntp/camel-nntp-folder.c:393
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "Ne možete poslati NNTP poruke dok niste povezani!"
 
-#: camel/providers/nntp/camel-nntp-folder.c:468
+#: camel/providers/nntp/camel-nntp-folder.c:404
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Ne možete kopirati poruke iz NNTP direktorijuma!"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:44
 msgid "Could not get group list from server."
 msgstr "Nisam mogao da preuzmem spisak grupa sa servera."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#: camel/providers/nntp/camel-nntp-grouplist.c:97
+#: camel/providers/nntp/camel-nntp-grouplist.c:106
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "Ne mogu da učitam datoteku sa spiskom grupa za %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#: camel/providers/nntp/camel-nntp-grouplist.c:157
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Ne mogu da sačuvam datoteku sa spiskom grupa za %s: %s"
@@ -11305,26 +11060,29 @@ msgid ""
 msgstr ""
 "Ova opcija će prijaviti na NNTP server korišćenjem lozinke u običnom tekstu."
 
-#: camel/providers/nntp/camel-nntp-store.c:158
+#: camel/providers/nntp/camel-nntp-store.c:118
+#: camel/providers/nntp/camel-nntp-store.c:1233
+#: camel/providers/nntp/camel-nntp-store.c:1331
+#, c-format
+msgid "NNTP Command failed: %s"
+msgstr "NNTP komanda neuspela: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:227
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Nisam mogao da pročitam pozdrav od %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:170
+#: camel/providers/nntp/camel-nntp-store.c:239
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP server %s je uzvratio kodom o grešci %d: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:326
+#: camel/providers/nntp/camel-nntp-store.c:403
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET vesti preko %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:640
-msgid "Stream error"
-msgstr "Greška toka"
-
-#: camel/providers/nntp/camel-nntp-store.c:643
+#: camel/providers/nntp/camel-nntp-store.c:777
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -11335,7 +11093,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/providers/nntp/camel-nntp-store.c:735
+#: camel/providers/nntp/camel-nntp-store.c:872
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
@@ -11345,7 +11103,7 @@ msgstr ""
 "\n"
 "Nema takve grupe. Izabrana stavka je verovatno nadređeni direktorijum."
 
-#: camel/providers/nntp/camel-nntp-store.c:767
+#: camel/providers/nntp/camel-nntp-store.c:904
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
@@ -11355,63 +11113,62 @@ msgstr ""
 "\n"
 "Grupa ne postoji!"
 
-#: camel/providers/nntp/camel-nntp-store.c:792
+#: camel/providers/nntp/camel-nntp-store.c:929
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 "Ne možete napraviti direktorijum u smeštaju vesti: pretplatite se umesto "
 "toga."
 
-#: camel/providers/nntp/camel-nntp-store.c:800
+#: camel/providers/nntp/camel-nntp-store.c:937
 msgid "You cannot rename a folder in a News store."
 msgstr "Ne možete preimenovati direktorijum u smeštaju vesti."
 
-#: camel/providers/nntp/camel-nntp-store.c:808
+#: camel/providers/nntp/camel-nntp-store.c:945
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr ""
 "Ne možete ukloniti direktorijum u smeštaju vesti: odjavite se umesto toga."
 
-#: camel/providers/nntp/camel-nntp-summary.c:253
-#, c-format
-msgid "Connection error: %s"
-msgstr "Greška pri povezivanju: %s"
-
-#: camel/providers/nntp/camel-nntp-summary.c:262
-#, c-format
-msgid "No such folder: %s"
-msgstr "Nema takvog direktorijuma: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1118
+#, fuzzy
+msgid "Authentication requested but not username provided"
+msgstr "Neophodna prijava"
 
-#: camel/providers/nntp/camel-nntp-summary.c:268
-#, c-format
-msgid "Could not get group: %s"
-msgstr "Nisam mogao da dobijem grupu: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1146
+#, fuzzy, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr "Nisam mogao da se prijavim na IMAP server %s pomoću %s"
 
-# bug: s/unspecificed/unspecified/
-#: camel/providers/nntp/camel-nntp-summary.c:333
+#: camel/providers/nntp/camel-nntp-store.c:1262
 #, fuzzy
-msgid "Could not get messages: unspecified error"
-msgstr "Nisam mogao da preuzmem poruke: nenaznačena greška"
+msgid "Not connected."
+msgstr "Nema kontakta"
 
-#: camel/providers/nntp/camel-nntp-summary.c:378
+#: camel/providers/nntp/camel-nntp-store.c:1311
 #, c-format
-msgid "NNTP Command failed: %s"
-msgstr "NNTP komanda neuspela: %s"
+msgid "No such folder: %s"
+msgstr "Nema takvog direktorijuma: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:438
-#: camel/providers/nntp/camel-nntp-summary.c:543
+#: camel/providers/nntp/camel-nntp-summary.c:218
+#: camel/providers/nntp/camel-nntp-summary.c:314
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Tražim nove poruke"
 
-#: camel/providers/nntp/camel-nntp-summary.c:558
-#, c-format
-msgid "Unknown server response: %s"
-msgstr "Nepoznat odgovor servera: %s"
+#: camel/providers/nntp/camel-nntp-summary.c:225
+#, fuzzy, c-format
+msgid "Unexpected server response from xover: %s"
+msgstr "Neočekivan odgovor od IMAP servera: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:328
+#, fuzzy, c-format
+msgid "Unexpected server response from head: %s"
+msgstr "Neočekivan odgovor od GnuPG: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:605
+#: camel/providers/nntp/camel-nntp-summary.c:368
 msgid "Use cancel"
 msgstr "Koristite poništi"
 
-#: camel/providers/nntp/camel-nntp-summary.c:607
+#: camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Neuspela operacija: %s"
@@ -11459,7 +11216,7 @@ msgstr "Obriši nakon %s dana"
 msgid "Disable support for all POP3 extensions"
 msgstr "Onemogući podršku za sva POP3 proširenja"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107
 msgid "POP"
 msgstr "POP"
 
@@ -11548,7 +11305,7 @@ msgid "No such folder `%s'."
 msgstr "Nema takvog direktorijuma `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:132
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -11601,7 +11358,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Dostava pošte preko programa sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:119
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11886,19 +11643,19 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
+#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:408
 msgid "attachment"
 msgstr "prilog"
 
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:454
 msgid "Remove selected items from the attachment list"
 msgstr "Ukloni odabrane predmete sa liste priloga"
 
-#: composer/e-msg-composer-attachment-bar.c:491
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Add attachment..."
 msgstr "Dodaj prilog..."
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:495
 msgid "Attach a file to the message"
 msgstr "Dodaj datoteku poruci"
 
@@ -11965,7 +11722,7 @@ msgstr "Neimenovana poruka"
 msgid "Open file"
 msgstr "Otvori datoteku"
 
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
 msgid "Autogenerated"
 msgstr "Autogenerisan"
 
@@ -12113,17 +11870,17 @@ msgstr "Priloži datoteke"
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
+msgid "You cannot attach the file `{0}' to this message."
 msgstr "Dodaj datoteku poruci"
 
 #. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4
-msgid "${1}"
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
 msgstr ""
 
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
 
 #. mail-composer:attach-directory primary
@@ -12218,7 +11975,7 @@ msgstr "Nisam mogao da napravim vezu: %s"
 
 #. mail-composer:no-build-message secondary
 #: composer/mail-composer-errors.xml.h:34
-msgid "Because \"${0}\", you may need to select different mail options."
+msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
@@ -12228,8 +11985,10 @@ msgid "Could not read signature file \"{0}\"."
 msgstr "Nisam mogao da sačuvam potpis: %s"
 
 #. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38
-msgid "Because \"${1}\"."
+#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted primary
@@ -12656,11 +12415,11 @@ msgid "<b>Then</b>"
 msgstr "<b>Onda</b>"
 
 #: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1335
+#: mail/mail-account-gui.c:1347
 msgid "Select Folder"
 msgstr "Odaberite direktorijum"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
 msgid "    "
 msgstr "    "
 
@@ -12717,7 +12476,7 @@ msgid "months"
 msgstr "meseci"
 
 # bug: plural-forms
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
 msgid "seconds"
 msgstr "sekunde"
 
@@ -12749,20 +12508,20 @@ msgstr "sa svim lokalnim direktorijumima"
 msgid "years"
 msgstr "godine"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:916
-#: mail/mail-config.c:76 mail/mail-config.glade.h:90
+#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
+#: mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Važno"
 
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:919 mail/mail-config.c:79
-#: mail/mail-config.glade.h:145
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: mail/mail-config.glade.h:148
 msgid "To Do"
 msgstr "Za uraditi"
 
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:920 mail/mail-config.c:80
-#: mail/mail-config.glade.h:94
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: mail/mail-config.glade.h:97
 msgid "Later"
 msgstr "Kasnije"
 
@@ -12818,252 +12577,6 @@ msgstr "dolazeći"
 msgid "outgoing"
 msgstr "odlazeći"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Adjust Score"
-msgstr "Preračunaj"
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Color"
-msgstr "Dodeli boju"
-
-#: filter/libfilter-i18n.h:4
-msgid "Assign Score"
-msgstr "Dodeli boju"
-
-#: filter/libfilter-i18n.h:5
-msgid "Attachments"
-msgstr "Prilozi"
-
-#: filter/libfilter-i18n.h:6
-msgid "Beep"
-msgstr "Zvono"
-
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "sadrži"
-
-#: filter/libfilter-i18n.h:8
-msgid "Copy to Folder"
-msgstr "Kopiraj u direktorijum"
-
-#: filter/libfilter-i18n.h:9
-msgid "Date received"
-msgstr "Datum primanja"
-
-#: filter/libfilter-i18n.h:10
-msgid "Date sent"
-msgstr "Datum slanja"
-
-#: filter/libfilter-i18n.h:12
-msgid "Deleted"
-msgstr "Obrisano"
-
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "ne sadrži"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "ne završava se sa"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "ne postoji"
-
-#: filter/libfilter-i18n.h:16
-msgid "does not return"
-msgstr "ne vraća"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "ne zvuči kao"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "ne počinje sa"
-
-#: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
-msgstr "Ne postoji"
-
-#: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr "Priprema"
-
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "završava se sa"
-
-#: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr "Postoji"
-
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "postoji"
-
-#: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr "Izraz"
-
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr "Sledi"
-
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "je"
-
-#: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr "je posle"
-
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr "je pre"
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr "je označen"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "je veći od"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "je manji od"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "nije"
-
-#: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr "nije označen"
-
-#: filter/libfilter-i18n.h:36
-msgid "Junk Test"
-msgstr "Provera đubreta"
-
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
-#: widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Etiketa"
-
-#: filter/libfilter-i18n.h:38
-msgid "Mailing list"
-msgstr "Dopisna lista"
-
-#: filter/libfilter-i18n.h:39
-msgid "Message Body"
-msgstr "Telo poruke"
-
-#: filter/libfilter-i18n.h:40
-msgid "Message Header"
-msgstr "Zaglavlje poruke"
-
-#: filter/libfilter-i18n.h:41
-msgid "Message is Junk"
-msgstr "Poruka je đubre"
-
-#: filter/libfilter-i18n.h:42
-msgid "Message is not Junk"
-msgstr "Poruka nije đubre"
-
-#: filter/libfilter-i18n.h:43
-msgid "Move to Folder"
-msgstr "Premesti u direktorijum"
-
-#: filter/libfilter-i18n.h:44
-msgid "Pipe to Program"
-msgstr "Kroz cev do programa"
-
-#: filter/libfilter-i18n.h:45
-msgid "Play Sound"
-msgstr "Pusti zvuk"
-
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Čitaj"
-
-#: filter/libfilter-i18n.h:47
-msgid "Recipients"
-msgstr "Primaoci"
-
-#: filter/libfilter-i18n.h:48
-msgid "Regex Match"
-msgstr "Reg. izraz pretraga"
-
-#: filter/libfilter-i18n.h:49
-msgid "Replied to"
-msgstr "Odgovoreno na"
-
-#: filter/libfilter-i18n.h:50
-msgid "returns"
-msgstr "povraćaji"
-
-#: filter/libfilter-i18n.h:51
-msgid "returns greater than"
-msgstr "više povraćaja od"
-
-#: filter/libfilter-i18n.h:52
-msgid "returns less than"
-msgstr "manje povraćaja od"
-
-#: filter/libfilter-i18n.h:53
-msgid "Run Program"
-msgstr "Pokreni program"
-
-#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Rezultat"
-
-#: filter/libfilter-i18n.h:55
-msgid "Sender"
-msgstr "Pošiljalac"
-
-#: filter/libfilter-i18n.h:56
-msgid "Set Status"
-msgstr "Dodeli status"
-
-#: filter/libfilter-i18n.h:57
-msgid "Size (kB)"
-msgstr "Veličina (kB)"
-
-#: filter/libfilter-i18n.h:58
-msgid "sounds like"
-msgstr "zvuči kao"
-
-#: filter/libfilter-i18n.h:59
-msgid "Source Account"
-msgstr "Izvorni nalog"
-
-#: filter/libfilter-i18n.h:60
-msgid "Specific header"
-msgstr "Određeno zaglavlje"
-
-#: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "počinje sa"
-
-#: filter/libfilter-i18n.h:63
-msgid "Stop Processing"
-msgstr "Prekini sa obradom"
-
-#: filter/libfilter-i18n.h:64 mail/em-format.c:755 mail/em-format-html.c:1519
-#: mail/em-format-quote.c:302 mail/em-mailer-prefs.c:87
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
-#: smime/lib/e-cert.c:1079
-msgid "Subject"
-msgstr "Naslov"
-
-#: filter/libfilter-i18n.h:65
-msgid "Unset Status"
-msgstr "Nedodeljen status"
-
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Dodaj pravilo"
@@ -13081,6 +12594,11 @@ msgstr "Ime pravila"
 msgid "_Score Rules"
 msgstr "Pravila rezultata"
 
+#: filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Rezultat"
+
 #: filter/searchtypes.xml.h:1
 msgid "Body contains"
 msgstr "Telo sadrži"
@@ -13161,13 +12679,13 @@ msgstr "Potpis(i)"
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Prosleđena poruka --------"
 
-#: mail/em-composer-utils.c:1499
+#: mail/em-composer-utils.c:1495
 msgid "an unknown sender"
 msgstr "nepoznati pošiljalac"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1509
+#: mail/em-composer-utils.c:1505
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "U %a, %d. %m. %Y u %H:%M %%+05d, %%s napisa:"
 
@@ -13205,8 +12723,8 @@ msgstr "<protisnite ovde da izaberete direktorijum>"
 msgid "Create New Folder"
 msgstr "Napravi novi direktorijum"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
-#: mail/mail-component.c:701
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
+#: mail/mail-component.c:704
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Navedite gde da napravim direktorijum:"
@@ -13221,103 +12739,104 @@ msgstr "Napravi direktorijum"
 msgid "Folder _name:"
 msgstr "_Ime direktorijuma:"
 
-#: mail/em-folder-tree.c:839
+#: mail/em-folder-tree.c:833
 #, c-format
 msgid "Moving folder %s"
 msgstr "Premeštam direktorijum %s"
 
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree.c:835
 #, c-format
 msgid "Copying folder %s"
 msgstr "Umnožavam direktorijum %s"
 
-#: mail/em-folder-tree.c:848 mail/message-list.c:1555
+#: mail/em-folder-tree.c:842 mail/message-list.c:1561
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Premeštam poruke u direktorijum %s"
 
-#: mail/em-folder-tree.c:850 mail/message-list.c:1557
+#: mail/em-folder-tree.c:844 mail/message-list.c:1563
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopiram poruke u direktorijum %s"
 
-#: mail/em-folder-tree.c:866
+#: mail/em-folder-tree.c:860
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Ne mogu da ubacim poruke u smeštaj na najvišem nivou"
 
-#: mail/em-folder-tree.c:956 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Kopiraj u direktorijum"
 
-#: mail/em-folder-tree.c:957 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Premesti u direktorijum"
 
-#: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2069
-#: mail/em-folder-tree.c:2551 mail/em-folder-view.c:798
-#: mail/message-list.c:1645
+#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
+#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
+#: mail/message-list.c:1651
 msgid "_Move"
 msgstr "Pre_mesti"
 
-#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#: mail/em-folder-tree.c:955 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "Otkaži zaduženje"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
 #: mail/em-folder-view.c:798 mail/em-folder-view.c:812
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Odaberite direktorijum"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
 #, fuzzy
 msgid "C_opy"
 msgstr "Umnoži"
 
-#: mail/em-folder-tree.c:2096
+#: mail/em-folder-tree.c:2088
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Pravim direktorijum „%s“"
 
-#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
+#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
 msgid "Create folder"
 msgstr "Napravi direktorijum"
 
-#: mail/em-folder-tree.c:2474
+#: mail/em-folder-tree.c:2463
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Preimenuj direktorijum „%s“ u:"
 
-#: mail/em-folder-tree.c:2476
+#: mail/em-folder-tree.c:2465
 msgid "Rename Folder"
 msgstr "Preimenuj direktorijum"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "P_regled"
 
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2537
 msgid "Open in _New Window"
 msgstr "Otvori u _novom prozoru"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2555
+#: mail/em-folder-tree.c:2546
 msgid "_New Folder..."
 msgstr "_Novi direktorijum..."
 
-#: mail/em-folder-tree.c:2558
+#: mail/em-folder-tree.c:2549
 msgid "_Rename"
 msgstr "Preimenu_j"
 
-#: mail/em-folder-tree.c:2561 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Osobine..."
 
 #: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:889
+#: mail/mail-vfolder.c:888
 msgid "VFolders"
 msgstr "VFolder-i"
 
@@ -13331,7 +12850,7 @@ msgstr "NEPOKLOPLjEN"
 msgid "Inbox"
 msgstr "Sanduče"
 
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
 msgid "Loading..."
 msgstr "Učitavam..."
 
@@ -13339,12 +12858,12 @@ msgstr "Učitavam..."
 #: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
 #: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
 #: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:551
+#: mail/mail-component.c:554
 msgid "Mail"
 msgstr "Pošta"
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Uredi kao novu poruku..."
@@ -13357,17 +12876,17 @@ msgstr "_Štampaj"
 msgid "_Reply to Sender"
 msgstr "_Odgovori pošiljaocu"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:810
+#: mail/em-folder-view.c:901 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Odgovori na _listu"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:811
+#: mail/em-folder-view.c:902 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Odgovori _Svima"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: mail/em-folder-view.c:903 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "Prosl_edi"
@@ -13420,6 +12939,10 @@ msgstr "Prene_si u direktorijum..."
 msgid "_Copy to Folder..."
 msgstr "_Kopiraj u direktorijum..."
 
+#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Etiketa"
+
 #: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Dodaj pošiljaoca u adresa_r"
@@ -13469,12 +12992,12 @@ msgid "Filter on _Mailing List"
 msgstr "Filtriraj prema _dopisnoj listi"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
-#: mail/mail-config.glade.h:66
+#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Podrazumevani"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1796
 msgid "Print Message"
 msgstr "Štampaj poruku"
 
@@ -13513,12 +13036,18 @@ msgstr "Cc (kopija)"
 msgid "Bcc"
 msgstr "Bcc (nevidljiva kopija)"
 
+#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
+#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Naslov"
+
 #: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
 #: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Datum"
 
-#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
+#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
 msgid "Newsgroups"
 msgstr "Diskusione grupe"
 
@@ -13715,7 +13244,7 @@ msgstr ""
 "Ova poruka je šifrovana, i to dobrim algoritmom. Veoma teško je moguće da "
 "neko sa strane vidi sadržaj ove poruke u doglednom vremenu."
 
-#: mail/em-format-html-display.c:757
+#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
 msgid "_View Certificate"
 msgstr "Po_gledaj sertifikat"
 
@@ -13769,7 +13298,7 @@ msgstr "Jednom nedeljno"
 msgid "Once per month"
 msgstr "Jednom mesečno"
 
-#: mail/em-migrate.c:1072
+#: mail/em-migrate.c:1168
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13781,86 +13310,86 @@ msgstr ""
 "\n"
 "Budite strpljivi dok Evolucija prenese vaše direktorijume..."
 
-#: mail/em-migrate.c:1506
+#: mail/em-migrate.c:1602
 #, fuzzy, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Ne mogu da napravim direktorijum „%s“: %s"
 
-#: mail/em-migrate.c:1532
+#: mail/em-migrate.c:1628
 #, fuzzy, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr ""
 "Ne mogu da kopiram opis datoteke: %s\n"
 "%s"
 
-#: mail/em-migrate.c:1715
+#: mail/em-migrate.c:1811
 #, fuzzy, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Ne mogu da sačuvam datoteku sa spiskom grupa za %s: %s"
 
-#: mail/em-migrate.c:1919
+#: mail/em-migrate.c:2015
 #, fuzzy, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Nisam mogao da se prijavim na POP server %s: %s"
 
-#: mail/em-migrate.c:1933
+#: mail/em-migrate.c:2029
 #, fuzzy, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Neuspešno pravljenje direktorijuma „%s“: %s"
 
-#: mail/em-migrate.c:1962
+#: mail/em-migrate.c:2058
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#: mail/em-migrate.c:2413 mail/em-migrate.c:2425
 #, fuzzy, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Neuspešno pravljenje direktorijuma „%s“: %s"
 
-#: mail/em-migrate.c:2480
+#: mail/em-migrate.c:2576
 #, fuzzy, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr ""
 "Ne mogu da napravim izlaznu datoteku: %s\n"
 " %s"
 
-#: mail/em-migrate.c:2498
+#: mail/em-migrate.c:2594
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 msgstr ""
 
-#: mail/em-popup.c:699
+#: mail/em-popup.c:700
 msgid "Save As..."
 msgstr "Sačuvaj kao..."
 
-#: mail/em-popup.c:717
+#: mail/em-popup.c:718
 #, c-format
 msgid "untitled_image.%s"
 msgstr "neimenovana_slika.%s"
 
-#: mail/em-popup.c:807
+#: mail/em-popup.c:808
 msgid "Set as _Background"
 msgstr "Postavi na _pozadinu"
 
-#: mail/em-popup.c:809
+#: mail/em-popup.c:810
 msgid "_Reply to sender"
 msgstr "_Odgovori pošiljaocu"
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:859
 msgid "_Open Link in Browser"
 msgstr "_Otvori vezu u čitaču"
 
-#: mail/em-popup.c:859
+#: mail/em-popup.c:860
 msgid "Se_nd message to..."
 msgstr "Pošalji _poruku..."
 
-#: mail/em-popup.c:860
+#: mail/em-popup.c:861
 msgid "_Add to Addressbook"
 msgstr "Dodaj u _adresar"
 
-#: mail/em-popup.c:966
+#: mail/em-popup.c:967
 #, c-format
 msgid "Open in %s..."
 msgstr "Otvori u %s..."
@@ -14446,7 +13975,7 @@ msgstr "Kontrola osobina Evolucija pošte"
 msgid "Mail Accounts"
 msgstr "Poštanski nalozi"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
 msgid "Mail Preferences"
 msgstr "Osobine pošte"
 
@@ -14460,15 +13989,15 @@ msgid "Evolution is importing your old Elm mail"
 msgstr "Evolucija uvozi vašu staru Elm poštu"
 
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:226
+#: mail/importers/evolution-mbox-importer.c:221
+#: mail/importers/evolution-outlook-importer.c:255
 #: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Uvozim..."
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:222
-#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/evolution-mbox-importer.c:223
+#: mail/importers/evolution-outlook-importer.c:257
 #: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Molim sačekajte"
@@ -14490,21 +14019,23 @@ msgid "Elm"
 msgstr "Elm"
 
 #: mail/importers/evolution-mbox-importer.c:116
+#: mail/importers/evolution-outlook-importer.c:130
 msgid "Destination folder:"
 msgstr "Odredišni direktorijum:"
 
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder to import into"
 msgstr "Izaberite direktorijum u koji da uvezem"
 
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:254
 #: mail/importers/mail-importer.c:226
 #, c-format
 msgid "Importing `%s'"
 msgstr "Uvozim „%s“"
 
-#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/evolution-outlook-importer.c:301
 #: mail/importers/mail-importer.c:140
 msgid "Importing mailbox"
 msgstr "Uvozim poštansko sanduče"
@@ -14665,15 +14196,15 @@ msgstr ""
 msgid "%s License Agreement"
 msgstr "Saglasnost ključa"
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
 msgid "_Host:"
 msgstr "_Domaćin:"
 
-#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
 msgid "User_name:"
 msgstr "Korisničko_ime"
 
-#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
 msgid "_Path:"
 msgstr "_Putanja:"
 
@@ -14736,31 +14267,31 @@ msgstr "%d ukupno"
 msgid ", %d unread"
 msgstr "%d neposlatih"
 
-#: mail/mail-component.c:653
+#: mail/mail-component.c:656
 msgid "New Mail Message"
 msgstr "Nova poruka"
 
-#: mail/mail-component.c:654
+#: mail/mail-component.c:657
 msgid "_Mail Message"
 msgstr "_Poruka"
 
-#: mail/mail-component.c:655
+#: mail/mail-component.c:658
 msgid "Compose a new mail message"
 msgstr "Sastavi novu poruku"
 
-#: mail/mail-component.c:661
+#: mail/mail-component.c:664
 msgid "New Mail Folder"
 msgstr "Novi direktorijum sa poštom"
 
-#: mail/mail-component.c:662
+#: mail/mail-component.c:665
 msgid "Mail _Folder"
 msgstr "_Direktorijum sa poštom"
 
-#: mail/mail-component.c:663
+#: mail/mail-component.c:666
 msgid "Create a new mail folder"
 msgstr "Napravi novi direktorijum sa poštom"
 
-#: mail/mail-component.c:795
+#: mail/mail-component.c:798
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
@@ -14772,7 +14303,7 @@ msgstr "proveravam servis"
 msgid "Connecting to server..."
 msgstr "Povezujem se na server..."
 
-#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Ličnost"
 
@@ -14787,7 +14318,7 @@ msgstr ""
 "koje šaljete."
 
 #: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid "Receiving Mail"
 msgstr "Primanje pošte"
 
@@ -14803,7 +14334,7 @@ msgstr ""
 msgid "Please select among the following options"
 msgstr "Molim izaberite od sledećih opcija"
 
-#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr "Slanje pošte"
 
@@ -14815,7 +14346,7 @@ msgstr ""
 "Molim unesite podatke o načinu na koji ćete slati poštu. Ako niste sigurni, "
 "pitajte sistem administratora ili ponuđača Internet servisa."
 
-#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37
 msgid "Account Management"
 msgstr "Upravljanje nalozima"
 
@@ -14832,227 +14363,232 @@ msgstr ""
 "Evolucija nalog za poštu. Molim unesite dole ime za ovaj nalog. Ovo ime će "
 "biti korišćeno samo za potrebe prikazivanja na ekranu."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:2
 msgid " Ch_eck for Supported Types "
 msgstr "_Proveri podržane vrste "
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
 msgid "<b>Preview</b>"
 msgstr "<b>Prikaz</b>"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "<b>SSL nije podržan u ovoj verziji evolucije</b>"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 msgid "<b>S_ignatures</b>"
 msgstr "<b>Po_tpisi</b>"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 msgid "<b>_Languages</b>"
 msgstr "<b>_Jezici</b>"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
+msgid "<small>This will make the the filter more reliable, but slower</small>"
+msgstr ""
+
+#: mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">Podaci o nalogu</span>"
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">Upozorenja</span>"
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr "<span weight=\"bold\">Način prijave</span>"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">Identifikacija</span>"
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Checking for New Mail</span>"
 msgstr "<span weight=\"bold\">Provera nove pošte</span>"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr "<span weight=\"bold\">Sastavljanje poruka</span>"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">Podešavanja</span>"
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr "<span weight=\"bold\">Uobičajeno ponašanje</span>"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr "<span weight=\"bold\">Brisanje pošte</span>"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr "<span weight=\"bold\">Prikazana _zaglavlja poruka</span>"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr "<span weight=\"bold\">Opcije filtera</span>"
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">Opšte</span>"
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr "<span weight=\"bold\">Oznake i boje</span>"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr "<span weight=\"bold\">Učitavanje slika</span>"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "<span weight=\"bold\">Prikaz poruke</span>"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr "<span weight=\"bold\">Fontovi poruke</span>"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "<span weight=\"bold\">Obaveštavanje o novoj pošti</span>"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr "<span weight=\"bold\">Neobavezni podaci</span>"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<span weight=\"bold\">Opcije</span>"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "<span weight=\"bold\">Prilično dobra privatnost (PGP/GPG)</span>"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">Fontovi za štampu</span>"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">Neophodni podaci</span>"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">Bezbedni MIME (S/MIME)</span>"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">Bezbednost</span>"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">Poslate i nedovršene poruke</span>"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:34
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">Podešavanje servera</span>"
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:35
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "_Takođe šifruj na mene kod slanja šifrovane pošte"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:36
 msgid "Account Editor"
 msgstr "Uređivač naloga"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:38
 msgid "Add Ne_w Signature..."
 msgstr "Dodaj no_vi potpis..."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "Add _Script"
 msgstr "Dodaj sk_riptu"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:40
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "Uv_ek šifriraj na mene kod slanja šifrovane pošte"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Uvek pošalji _kopiju (cc) na:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Uvek pošalji _skrivenu kopiju (Bcc) na:"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:44
 msgid "Always _sign outgoing messages when using this account"
 msgstr "_Uvek potpiši odlazeće poruke sa ovog naloga"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Uvek _veruj ključevima u mojoj vezi kada šifriraš"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Attach original message"
 msgstr "Priloži originalnu poruku"
 
-#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Prilog"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:48
 msgid "Automatically _insert smiley images"
 msgstr "_Sam ubaci slike sa osmesima"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Automatically check for _new mail every"
 msgstr "S_am proveri za novu poštu svakih"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltički (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltički (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Beep w_hen new mail arrives"
 msgstr "S_virni kada stigne nova pošta"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "C_haracter set:"
 msgstr "K_odna strana:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 msgid "Ch_eck for Supported Types "
 msgstr "_Proveri podržane tipove "
 
-#: mail/mail-config.glade.h:53
-msgid "Check _Incoming Mail"
-msgstr "Proveri pristig_lu poštu"
+#: mail/mail-config.glade.h:55
+#, fuzzy
+msgid "Check _incoming mail for junk"
+msgstr "Proveri da li je pristigla pošta đubre"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Check spelling while I _type"
 msgstr "Proveri pravopis dok _kucam"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Checks incoming mail messages to be Junk"
 msgstr "Proveri da pristigle poruke nisu đubre"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 msgid "Color for _misspelled words:"
 msgstr "Boja za _pogrešno napisane reči:"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 msgid "Colors"
 msgstr "Boje"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 msgid "Confirm _when expunging a folder"
 msgstr "_Potvrdi kada izbacuješ direktorijum"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -15068,239 +14604,244 @@ msgstr ""
 "\n"
 "Pritisnite \"Primeni\" da sačuvate podešavanja."
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
 msgid "De_fault"
 msgstr "Pre_definisano"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 msgid "Default character e_ncoding:"
 msgstr "Podrazumevano _kodiranje znakova:"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 msgid "Defaults"
 msgstr "Podrazumevano"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 msgid "Do not quote original message"
 msgstr "Ne citiraj originalnu poruku"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Ne potpisuj zahteve za s_astancima (za kompatibilnost sa Outlook-om)"
 
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Gotovo"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
 msgid "Drafts _Folder:"
 msgstr "D_irektorijum Priprema:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:77
 msgid "Email Accounts"
 msgstr "Nalozi e-pošte"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 msgid "Email _Address:"
 msgstr "Elektronska _adresa:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:79
 msgid "Empty trash folders on e_xit"
 msgstr "Isprazni direktorijume sa _smećem na izlazu"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
 msgid "Encry_ption certificate:"
 msgstr "Sertifikat za ši_frovanje:"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:81
 msgid "Evolution Account Assistant"
 msgstr "Pomoćnik za naloge Evolucije"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:82
 msgid "Execute Command..."
 msgstr "Izvrši komandu..."
 
 # bug: space too much?
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Fi_xed-width:"
 msgstr "U_tvrđene-širine:"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 msgid "Font Properties"
 msgstr "Osobine pisma"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 msgid "Format messages in _HTML"
 msgstr "Sredi poruke u H_TML"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:87
 msgid "HTML Mail"
 msgstr "HTML pošta"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:88
 msgid "Headers"
 msgstr "Zaglavlja"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr "Naglasi _citate sa"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
 #: mail/mail-config.glade.h:91
+#, fuzzy
+msgid "I_nclude remote tests"
+msgstr "Uključi:"
+
+#: mail/mail-config.glade.h:94
 msgid "Inline"
 msgstr "Unutar"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Mail Configuration"
 msgstr "Podešavanje pošte"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "Lokacija sandučeta"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr "Sastavljač poruke"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "Napomena: bićete upitani za lozinku dok se ne povežete prvi put"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Or_ganization:"
 msgstr "Or_ganizacija:"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG lična karta _ključa:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 msgid "Play sound file when new mail arri_ves"
 msgstr "_Pusti zvučnu datoteku kada stigne nova pošta"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Upozori kada šalješ poruke samo sa definisanim Bcc primaocima"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Qmail maildir "
 msgstr "Qmail maildir"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr "Citiraj originalnu poruku"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr "Citirano"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 msgid "Re_member password"
 msgstr "Z_apamti lozinku"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr "Od_govori-na:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "Primanje pošte"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:120
 msgid "Receiving Options"
 msgstr "Opcije za primanje"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
 msgid "Remember _password"
 msgstr "Zapa_mti lozinku"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
 msgid "S_tandard Font:"
 msgstr "_Standardni font:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 msgid "Security"
 msgstr "Bezbednost"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font"
 msgstr "Odaberi HTML pismo fiksirane veličine"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:126
 msgid "Select HTML fixed width font for printing"
 msgstr "Odaberi HTML pismo fiksirane veličine za štampu"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:127
 msgid "Select HTML variable width font"
 msgstr "Odaberi HTML pismo varijabilne veličine"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:128
 msgid "Select HTML variable width font for printing"
 msgstr "Odaberi HTML pismo varijabilne veličine za štampu"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:129
 msgid "Select..."
 msgstr "Izaberi..."
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "Slanje pošte"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:133
 msgid "Sent _Messages Folder:"
 msgstr "Direktorijum Poslatih _poruka:"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:134
 msgid "Ser_ver requires authentication"
 msgstr "Ser_ver traži identifikaciju"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:135
 msgid "Server _Type: "
 msgstr "_Tip servera"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:136
 msgid "Si_gning certificate:"
 msgstr "Sertifikat za _potpisivanje:"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:137
 msgid "Signat_ure:"
 msgstr "Potp_is:"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:138
 msgid "Signatures"
 msgstr "Potpisi"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr "Odredi ime _datoteke:"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:140
 msgid "Spell Checking"
 msgstr "Provera pravopisa"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:141
 msgid "Standard Unix mbox"
 msgstr "Standardni Unix mbox"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:142
 msgid "T_erminal Font:"
 msgstr "_Font za terminal:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:143
 msgid "T_ype: "
 msgstr "_Vrsta:"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -15310,7 +14851,7 @@ msgstr ""
 "potpis. Ime koje ste dali će biti korišćeno\n"
 "samo za svrhu prikazivanja na ekranu."
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
@@ -15319,7 +14860,7 @@ msgstr ""
 "Ova vam strana omogućava da podesite proveru pravopisa i jezik. Lista jezika "
 "ovde oslikava samo one jezike za koje postoji instaliran rečnik."
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:149
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -15327,15 +14868,11 @@ msgstr ""
 "Unesite ime po kome želite da nazovete ovaj nalog.\n"
 "Na primer: \"Poslovni\" ili \"Lični\""
 
-#: mail/mail-config.glade.h:148
-msgid "Use _Daemon"
-msgstr "Koristi _uslužni program"
-
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:152
 msgid "V_ariable-width:"
 msgstr "V_arijabilna širina:"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:153
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -15345,87 +14882,83 @@ msgstr ""
 "\n"
 "Pritisnite \"Napred\" za početak. "
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:158
 msgid "_Add Signature"
 msgstr "_Dodaj potpis"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:159
 msgid "_Always load images from the Internet"
 msgstr "_Uvek učitaj slike sa Interneta"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:160
 msgid "_Digitally sign outgoing messages (by default)"
 msgstr "_Digitalno potpiši odlazeće poruke (podrazumevano)"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:161
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Nemoj da me obaveštavaš kada stigne nova pošta"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:163
 msgid "_Enable"
 msgstr "_Omogući"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 msgid "_Encrypt outgoing messages (by default)"
 msgstr "_Šifruj odlazeće poruke (podrazumevano)"
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:165
 msgid "_Forward style:"
 msgstr "Stil _prosleđivanja"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:168
 msgid "_Load images if sender is in address book"
 msgstr "_Učitaj slike ako je pošiljalac u adresaru"
 
-#: mail/mail-config.glade.h:167
-msgid "_Local Tests Only"
-msgstr "Samo _lokalne probe"
-
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Make this my default account"
 msgstr "_Neka ovo bude moj glavni nalog"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_Mark messages as read after"
 msgstr "_Označi poruke kao pročitane posle"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 msgid "_Never load images from the Internet"
 msgstr "_Nikada ne učitavaj slike sa Interneta"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "_Upozori kada šalješ HTML poruke onima koji ih ne žele"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:175
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Upozori kada šalješ poruke bez naslova"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:176
 msgid "_Reply style:"
 msgstr "_Stil odgovora:"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:177
 msgid "_Script:"
 msgstr "_Skripta:"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:178
 msgid "_Show animated images"
 msgstr "_Pokaži animirane slike"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 msgid "_Use Secure Connection (SSL):"
 msgstr "_Koristi bezbednu vezu (SSL):"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "_Use the same fonts as other applications"
 msgstr "_Koristi ista pisma kao drugi programi"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:181
 msgid "color"
 msgstr "boja"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "opis"
 
@@ -15598,7 +15131,7 @@ msgstr ""
 
 #. mail:camel-exception primary
 #: mail/mail-errors.xml.h:57
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgid "Your message with the subject \"{0}\" was not delivered."
 msgstr ""
 
 #. mail:camel-exception secondary
@@ -15664,11 +15197,6 @@ msgstr ""
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Nisam mogao da napravim direktorijum %s: %s."
 
-#. mail:no-save-path secondary
-#: mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail:no-create-path primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
@@ -15693,12 +15221,6 @@ msgstr ""
 msgid "Cannot create temporary save directory."
 msgstr "Nisam mogao da napravim privremeni direktorijum: %s"
 
-#. mail:no-create-tmp-path secondary
-#: mail/mail-errors.xml.h:100 mail/mail-errors.xml.h:112
-#: widgets/misc/e-system-errors.xml.h:11 widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail:no-write-path-exists secondary
 #: mail/mail-errors.xml.h:104
 #, fuzzy
@@ -15978,29 +15500,25 @@ msgstr "Prepiši"
 msgid "_Append"
 msgstr "Pošalji"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:785
 #, c-format
 msgid "Pinging %s"
 msgstr "Pingujem %s"
 
-#: mail/mail-mt.c:897
-msgid "Working"
-msgstr "Radim"
-
-#: mail/mail-ops.c:99
+#: mail/mail-ops.c:98
 msgid "Filtering Folder"
 msgstr "Filtriram direktorijum"
 
-#: mail/mail-ops.c:260
+#: mail/mail-ops.c:259
 msgid "Fetching Mail"
 msgstr "Uzimam poštu"
 
-#: mail/mail-ops.c:543
+#: mail/mail-ops.c:542
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Neuspešna primena odlazećih filtera: %s"
 
-#: mail/mail-ops.c:568
+#: mail/mail-ops.c:567
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -16009,102 +15527,102 @@ msgstr ""
 "Neuspešno dodavanje u %s: %s\n"
 "Dodajem u lokalni direktorijum Poslato."
 
-#: mail/mail-ops.c:577
+#: mail/mail-ops.c:576
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Neuspešno dodavanje u lokalni direktorijum Poslato: %s"
 
-#: mail/mail-ops.c:673
+#: mail/mail-ops.c:672
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Šaljem poruku %d od %d"
 
 # bug: plural-forms
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:703
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Nisam uspeo da pošaljem %d od %d poruka"
 
-#: mail/mail-ops.c:708
+#: mail/mail-ops.c:707
 msgid "Complete."
 msgstr "Gotovo."
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:804
 msgid "Saving message to folder"
 msgstr "Čuvam poruku u direktorijum"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Premeštam poruke u %s"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopiram poruke u %s"
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:1002
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Pretražujem direktorijume u \"%s\""
 
-#: mail/mail-ops.c:1116
+#: mail/mail-ops.c:1115
 msgid "Forwarded messages"
 msgstr "Prosleđene poruke"
 
-#: mail/mail-ops.c:1159
+#: mail/mail-ops.c:1158
 #, c-format
 msgid "Opening folder %s"
 msgstr "Otvaram direktorijum %s"
 
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1230
 #, c-format
 msgid "Opening store %s"
 msgstr "Otvaram ostavu %s"
 
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1308
 #, c-format
 msgid "Removing folder %s"
 msgstr "Uklanjam direktorijum %s"
 
-#: mail/mail-ops.c:1403
+#: mail/mail-ops.c:1402
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Smeštam direktorijum '%s'"
 
-#: mail/mail-ops.c:1468
+#: mail/mail-ops.c:1467
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Čistim i smeštam nalog „%s“"
 
-#: mail/mail-ops.c:1469
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Smeštam nalog „%s“"
 
-#: mail/mail-ops.c:1524
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr "Osvežavam direktorijum"
 
-#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
+#: mail/mail-ops.c:1559 mail/mail-ops.c:1610
 msgid "Expunging folder"
 msgstr "Izbacujem direktorijum"
 
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1607
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Praznim smeće u '%s'"
 
-#: mail/mail-ops.c:1609
+#: mail/mail-ops.c:1608
 msgid "Local Folders"
 msgstr "Lokalni direktorijumi"
 
-#: mail/mail-ops.c:1692
+#: mail/mail-ops.c:1691
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Učitavam poruku %s"
 
-#: mail/mail-ops.c:1764
+#: mail/mail-ops.c:1763
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
@@ -16112,7 +15630,7 @@ msgstr[0] "Učitavam %d poruku"
 msgstr[1] "Učitavam %d poruke"
 msgstr[2] "Učitavam %d poruka"
 
-#: mail/mail-ops.c:1850
+#: mail/mail-ops.c:1849
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
@@ -16120,7 +15638,7 @@ msgstr[0] "Čuvam %d poruku"
 msgstr[1] "Čuvam %d poruke"
 msgstr[2] "Čuvam %d poruka"
 
-#: mail/mail-ops.c:1900
+#: mail/mail-ops.c:1899
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -16129,7 +15647,7 @@ msgstr ""
 "Ne mogu da napravim izlaznu datoteku: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1928
+#: mail/mail-ops.c:1927
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -16138,11 +15656,11 @@ msgstr ""
 "Greška kod čuvanja poruka u: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1999
+#: mail/mail-ops.c:1998
 msgid "Saving attachment"
 msgstr "Čuvam prilog"
 
-#: mail/mail-ops.c:2016
+#: mail/mail-ops.c:2015
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -16151,17 +15669,17 @@ msgstr ""
 "Ne mogu da napravim izlaznu datoteku: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2046
+#: mail/mail-ops.c:2045
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nisam mogao da upišem: %s"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Prekidam vezu sa %s"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Ponovo se povezujem na %s"
@@ -16225,24 +15743,24 @@ msgstr "Osvežavam..."
 msgid "Waiting..."
 msgstr "Čekam..."
 
-#: mail/mail-session.c:238
+#: mail/mail-session.c:239
 msgid "User canceled operation."
 msgstr "Korisnik je poništio operaciju."
 
-#: mail/mail-session.c:271
+#: mail/mail-session.c:272
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Unesite lozinku za %s"
 
-#: mail/mail-session.c:273
+#: mail/mail-session.c:274
 msgid "Enter Password"
 msgstr "Unesite lozinku"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password"
 msgstr "_Zapamti ovu lozinku"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:298
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Zapamti ovu lozinku do kraja ove sesije"
 
@@ -16297,79 +15815,79 @@ msgstr "Osvežavam vdirektorijume za adresu: %s"
 msgid "Updating vFolders for '%s'"
 msgstr "Osvežavam vdirektorijume za adresu: %s"
 
-#: mail/mail-vfolder.c:959
+#: mail/mail-vfolder.c:958
 msgid "vFolders"
 msgstr "vFolders-i"
 
-#: mail/mail-vfolder.c:998
+#: mail/mail-vfolder.c:997
 msgid "Edit VFolder"
 msgstr "Izmeni VFolder-e"
 
-#: mail/mail-vfolder.c:1082
+#: mail/mail-vfolder.c:1081
 msgid "New VFolder"
 msgstr "Novi VFolder"
 
-#: mail/message-list.c:946
+#: mail/message-list.c:948
 msgid "Unseen"
 msgstr "Neviđeno"
 
-#: mail/message-list.c:947
+#: mail/message-list.c:949
 msgid "Seen"
 msgstr "Viđeno"
 
-#: mail/message-list.c:948
+#: mail/message-list.c:950
 msgid "Answered"
 msgstr "Odgovoreno"
 
-#: mail/message-list.c:949
+#: mail/message-list.c:951
 msgid "Multiple Unseen Messages"
 msgstr "Višestruke neviđene poruke"
 
-#: mail/message-list.c:950
+#: mail/message-list.c:952
 msgid "Multiple Messages"
 msgstr "Višestruke poruke"
 
-#: mail/message-list.c:954
+#: mail/message-list.c:956
 msgid "Lowest"
 msgstr "Najniže"
 
-#: mail/message-list.c:955
+#: mail/message-list.c:957
 msgid "Lower"
 msgstr "Niže"
 
-#: mail/message-list.c:959
+#: mail/message-list.c:961
 msgid "Higher"
 msgstr "Više"
 
-#: mail/message-list.c:960
+#: mail/message-list.c:962
 msgid "Highest"
 msgstr "Najviše"
 
-#: mail/message-list.c:1279
+#: mail/message-list.c:1285
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1286
+#: mail/message-list.c:1292
 msgid "Today %l:%M %p"
 msgstr "Danas %k:%M "
 
-#: mail/message-list.c:1295
+#: mail/message-list.c:1301
 msgid "Yesterday %l:%M %p"
 msgstr "Juče %k:%M "
 
-#: mail/message-list.c:1307
+#: mail/message-list.c:1313
 msgid "%a %l:%M %p"
 msgstr "%a %k:%M "
 
-#: mail/message-list.c:1315
+#: mail/message-list.c:1321
 msgid "%b %d %l:%M %p"
 msgstr "%d. %b, %k:%M "
 
-#: mail/message-list.c:1317
+#: mail/message-list.c:1323
 msgid "%b %d %Y"
 msgstr "%d. %b %Y"
 
-#: mail/message-list.c:3300
+#: mail/message-list.c:3321
 msgid "Generating message list"
 msgstr "Pravim listu poruka"
 
@@ -16425,6 +15943,10 @@ msgstr "Prosledi"
 msgid "No Response Necessary"
 msgstr "Nije neophodan odgovor"
 
+#: mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Čitaj"
+
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Odgovori"
@@ -16528,44 +16050,48 @@ msgstr ""
 "Spisak putanja direktorijuma koji se usklađuju nadisku za nepovezanu upotrebu"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid "Toolbar is visible"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Whether Evolution should start up in offline mode"
 msgstr "Da li se Evolucija pokreće u nepovezanom režimu"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Whether the toolbar should be visible."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
 msgid "Whether to skip the development warning dialog"
 msgstr "Da li da preskoči prozorče sa upozorenjem o razvoju"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
+#: shell/apps_evolution_shell.schemas.in.in.h:14
 msgid "mail"
 msgstr "pošta"
 
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
-msgstr "Omogućili su"
-
-#: shell/e-shell.c:545 shell/e-shell.c:546
+#: shell/e-shell.c:588 shell/e-shell.c:589
 #, fuzzy, c-format
 msgid "%ld KB"
 msgstr "%d %B"
 
-#: shell/e-shell.c:744
+#: shell/e-shell.c:786
 #, fuzzy
 msgid "Uknown system error."
 msgstr "Nepoznata greška"
 
-#: shell/e-shell.c:1101
+#: shell/e-shell.c:1143
 msgid "Invalid arguments"
 msgstr "Neispravni argumenti"
 
-#: shell/e-shell.c:1103
+#: shell/e-shell.c:1145
 msgid "Cannot register on OAF"
 msgstr "Ne mogu da se registruje na OAF"
 
-#: shell/e-shell.c:1105
+#: shell/e-shell.c:1147
 msgid "Configuration Database not found"
 msgstr "Baza sa podešavanjima nije nađena"
 
-#: shell/e-shell.c:1107
+#: shell/e-shell.c:1149
 msgid "Generic error"
 msgstr "Opšta greška"
 
@@ -16624,7 +16150,7 @@ msgstr ""
 msgid "Select importer"
 msgstr "Izaberite uvoznika"
 
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1026
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
 #, c-format
 msgid "File %s does not exist"
 msgstr "Datoteka %s ne postoji"
@@ -16652,31 +16178,32 @@ msgstr ""
 "Uvozim %s\n"
 "Uvozim 1. stavku."
 
-#: shell/e-shell-importer.c:549
+#: shell/e-shell-importer.c:570
 msgid "Automatic"
 msgstr "Automatsko"
 
-#: shell/e-shell-importer.c:598
-msgid "_Filename:"
-msgstr "_Ime datoteke:"
+#: shell/e-shell-importer.c:626
+#, fuzzy
+msgid "F_ilename:"
+msgstr "Naziv datoteke:"
 
-#: shell/e-shell-importer.c:603
+#: shell/e-shell-importer.c:631
 msgid "Select a file"
 msgstr "Odaberite datoteku"
 
-#: shell/e-shell-importer.c:613
+#: shell/e-shell-importer.c:642
 msgid "File _type:"
 msgstr "_Vrsta datoteke:"
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:681
 msgid "Import data and settings from _older programs"
 msgstr "Uvezi podatke i podešavanja iz _starijih programa"
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:684
 msgid "Import a _single file"
 msgstr "Uvezi _jednu datoteku"
 
-#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -16684,25 +16211,25 @@ msgstr ""
 "Molim sačekajte...\n"
 "Tražim postojeća podešavanja"
 
-#: shell/e-shell-importer.c:727
+#: shell/e-shell-importer.c:756
 msgid "Starting Intelligent Importers"
 msgstr "Pokrećem inteligentne uvoznike"
 
-#: shell/e-shell-importer.c:853 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
 #, c-format
 msgid "From %s:"
 msgstr "Od %s:"
 
-#: shell/e-shell-importer.c:1044
+#: shell/e-shell-importer.c:1073
 #, c-format
 msgid "No importer available for file %s"
 msgstr "Nema dostupnog uvoznika za datoteku „%s“"
 
-#: shell/e-shell-importer.c:1056
+#: shell/e-shell-importer.c:1085
 msgid "Unable to execute importer"
 msgstr "Nisam mogao da pokrenem uvoznika."
 
-#: shell/e-shell-importer.c:1169
+#: shell/e-shell-importer.c:1199
 msgid "_Import"
 msgstr "U_voz"
 
@@ -16752,61 +16279,61 @@ msgstr "Ime direktorijuma ne može da sadrži znak \"#\"."
 msgid "'.' and '..' are reserved folder names."
 msgstr "„.“ i „..“ su rezervisana imena direktorijuma."
 
-#: shell/e-shell-window.c:336
+#: shell/e-shell-window.c:337
 #, fuzzy
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolucija je trenutno na mreži. Pritisnite ovo dugme da radite bez "
 "mreže."
 
-#: shell/e-shell-window.c:343
+#: shell/e-shell-window.c:344
 #, fuzzy
 msgid "Evolution is in the process of going offline."
 msgstr "Ximian Evolucija je u procesu odlaska u rad bez mreže."
 
-#: shell/e-shell-window.c:349
+#: shell/e-shell-window.c:350
 #, fuzzy
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolucija nije trenutno na mreži. Pritisnite ovo dugme da radite na "
 "mreži."
 
-#: shell/e-shell-window.c:621
+#: shell/e-shell-window.c:637
 #, fuzzy, c-format
 msgid "Switch to %s"
 msgstr "Pošta za %s"
 
-#: shell/e-shell-window-commands.c:64
+#: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Izgleda da GNOME Pilot alati nisu instalirani na ovaj sistem."
 
-#: shell/e-shell-window-commands.c:72
+#: shell/e-shell-window-commands.c:74
 #, c-format
 msgid "Error executing %s."
 msgstr "Greška kod pokretanja %s."
 
-#: shell/e-shell-window-commands.c:121
+#: shell/e-shell-window-commands.c:123
 msgid "Bug buddy is not installed."
 msgstr "Bug buddy nije instaliran."
 
-#: shell/e-shell-window-commands.c:129
+#: shell/e-shell-window-commands.c:131
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy ne može da se pokrene."
 
-#: shell/e-shell-window-commands.c:171
+#: shell/e-shell-window-commands.c:323
 #, fuzzy
-msgid "About Evolution"
-msgstr "O Ximian Evoluciji"
+msgid "Groupware Suite"
+msgstr "Grupvajz"
 
-#: shell/e-shell-window-commands.c:382
+#: shell/e-shell-window-commands.c:563
 msgid "_Work Online"
 msgstr "_Na mreži"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "_Nije na mreži"
 
-#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Radi bez mreže"
 
@@ -16818,43 +16345,6 @@ msgstr "Kućica"
 msgid "New"
 msgstr "Novo"
 
-#: shell/evolution-shell-component-utils.c:115
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Nepoznata greška."
-
-#: shell/evolution-shell-component-utils.c:118
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Greška koju je poslao sistem delova:\n"
-"%s"
-
-#: shell/evolution-shell-component-utils.c:125
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Greška koju je poslao sistem za pokretanje je:\n"
-"%s"
-
 #: shell/evolution-test-component.c:140
 msgid "New Test"
 msgstr "Nova proba"
@@ -17181,30 +16671,30 @@ msgid ""
 "Click help for details."
 msgstr ""
 
-#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:522
+#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
+#: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
 msgstr "Izaberite sertifikat za uvoz..."
 
-#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:604
+#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
+#: smime/gui/certificate-manager.c:638
 msgid "Certificate Name"
 msgstr "Ime sertifikata"
 
-#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
+#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
 msgid "Purposes"
 msgstr "Namene"
 
-#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:517
+#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr "Serijski broj"
 
-#: smime/gui/certificate-manager.c:267
+#: smime/gui/certificate-manager.c:271
 msgid "Expires"
 msgstr "Ističe"
 
-#: smime/gui/certificate-manager.c:417
+#: smime/gui/certificate-manager.c:446
 msgid "E-Mail Address"
 msgstr "E-adresa"
 
@@ -17246,6 +16736,11 @@ msgstr ""
 "Izdao ko:\n"
 "  Naslov: %s\n"
 
+#: smime/gui/e-cert-selector.c:169
+#, fuzzy
+msgid "Select certificate"
+msgstr "Sertifikat SSL klijenta"
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr "<ne čini deo sertifikata>"
@@ -17302,7 +16797,7 @@ msgstr ""
 "Pre verovanja ovom izdavaocu sertifikata, treba prvo da pregledate njegov "
 "sertifikat, politiku i procedure (ako su dostupni)."
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
 msgid "Certificate"
 msgstr "Sertifikat"
 
@@ -17322,19 +16817,23 @@ msgstr "Zajedničko ime (CN)"
 msgid "Contact Certificates"
 msgstr "Sertifikati kontakta"
 
-#: smime/gui/smime-ui.glade.h:21
-#, no-c-format
-msgid "Do you want to trust \"%s\" for the following purposes?"
-msgstr "Želite li da verujete „%s“ za naredne potrebe?"
+#: smime/gui/smime-ui.glade.h:20
+msgid "Do not trust the authenticity of this certificate"
+msgstr ""
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:21
 msgid "Dummy window only"
 msgstr "Samo glupi prozor"
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:22
 msgid "Edit"
 msgstr "Uredi"
 
+#: smime/gui/smime-ui.glade.h:23
+#, fuzzy
+msgid "Email Certificate Trust Settings"
+msgstr "Izdavač sertifikata e-pošte"
+
 #: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr "Sertifikat primaoca e-poruke"
@@ -17367,247 +16866,258 @@ msgstr "Organizaciona jedinica"
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 otisak"
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr "Sertifikat SSL klijenta"
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr "Sertifikat SSL servera"
 
 #: smime/gui/smime-ui.glade.h:37
+msgid "Trust the authenticity of this certificate"
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:38
 msgid "Trust this CA to identify email users."
 msgstr "Veruj ovom izdavaocu sertifikata za prepoznavanje e-adresa."
 
-#: smime/gui/smime-ui.glade.h:38
+#: smime/gui/smime-ui.glade.h:39
 msgid "Trust this CA to identify software developers."
 msgstr "Veruj ovom izdavaocu sertifikata za prepoznavanje programera."
 
-#: smime/gui/smime-ui.glade.h:39
+#: smime/gui/smime-ui.glade.h:40
 msgid "Trust this CA to identify web sites."
 msgstr "Veruj ovom izdavaocu sertifikata za prepoznavanje veb stranica."
 
-#: smime/gui/smime-ui.glade.h:40
+#: smime/gui/smime-ui.glade.h:41
 msgid "View"
 msgstr "Pogledaj"
 
-#: smime/gui/smime-ui.glade.h:41
-msgid "View Certificate"
-msgstr "Pogledaj sertifikat"
-
 #: smime/gui/smime-ui.glade.h:42
-msgid "You have been asked to trust a new Certificate Authority (CA)."
-msgstr "Postavljen vam je zahtev da verujete novom izdavaocu sertifikata (CA)."
-
-#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr "Imate ove sertifikate od ovih organizacija koji vas određuju:"
 
-#: smime/gui/smime-ui.glade.h:44
+#: smime/gui/smime-ui.glade.h:43
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr "Držite ove sertifikate koji određuju ove izdavaoce sertifikata:"
 
-#: smime/gui/smime-ui.glade.h:45
+#: smime/gui/smime-ui.glade.h:44
 msgid "You have certificates on file that identify these people:"
 msgstr "Držite ove sertifikate koji određuju ove osobe:"
 
-#: smime/gui/smime-ui.glade.h:46
+#: smime/gui/smime-ui.glade.h:45
 msgid "Your Certificates"
 msgstr "Vaši sertifikati"
 
-#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
+#: smime/gui/smime-ui.glade.h:46
+msgid "_Edit CA Trust"
+msgstr ""
+
+#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d. %m. %Y."
 
-#: smime/lib/e-cert.c:478
+#. x509 certificate usage types
+#: smime/lib/e-cert.c:424
+#, fuzzy
+msgid "Sign"
+msgstr "Potpisujem"
+
+#: smime/lib/e-cert.c:425
+#, fuzzy
+msgid "Encrypt"
+msgstr "Šifrovana"
+
+#: smime/lib/e-cert.c:530
 msgid "Version"
 msgstr "Verzija"
 
-#: smime/lib/e-cert.c:493
+#: smime/lib/e-cert.c:545
 msgid "Version 1"
 msgstr "Verzija 1"
 
-#: smime/lib/e-cert.c:496
+#: smime/lib/e-cert.c:548
 msgid "Version 2"
 msgstr "Verzija 2"
 
-#: smime/lib/e-cert.c:499
+#: smime/lib/e-cert.c:551
 msgid "Version 3"
 msgstr "Verzija 3"
 
-#: smime/lib/e-cert.c:581
+#: smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 sa RSA šifrovanjem"
 
-#: smime/lib/e-cert.c:584
+#: smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 sa RSA šifrovanjem"
 
-#: smime/lib/e-cert.c:587
+#: smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 sa RSA šifrovanjem"
 
-#: smime/lib/e-cert.c:590
+#: smime/lib/e-cert.c:642
 msgid "C"
 msgstr "C"
 
-#: smime/lib/e-cert.c:593
+#: smime/lib/e-cert.c:645
 msgid "CN"
 msgstr "CN"
 
-#: smime/lib/e-cert.c:596
+#: smime/lib/e-cert.c:648
 msgid "OU"
 msgstr "OJ"
 
-#: smime/lib/e-cert.c:599
+#: smime/lib/e-cert.c:651
 msgid "O"
 msgstr "O"
 
-#: smime/lib/e-cert.c:602
+#: smime/lib/e-cert.c:654
 msgid "L"
 msgstr "L"
 
-#: smime/lib/e-cert.c:605
+#: smime/lib/e-cert.c:657
 msgid "DN"
 msgstr "DN"
 
-#: smime/lib/e-cert.c:608
+#: smime/lib/e-cert.c:660
 msgid "DC"
 msgstr "DC"
 
-#: smime/lib/e-cert.c:611
+#: smime/lib/e-cert.c:663
 msgid "ST"
 msgstr "ST"
 
-#: smime/lib/e-cert.c:614
+#: smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA šifrovanje"
 
-#: smime/lib/e-cert.c:617
+#: smime/lib/e-cert.c:669
 msgid "Certificate Key Usage"
 msgstr "Upotreba ključa sertifikata"
 
-#: smime/lib/e-cert.c:620
+#: smime/lib/e-cert.c:672
 msgid "Netscape Certificate Type"
 msgstr "Netskejpova vrsta sertifikata"
 
-#: smime/lib/e-cert.c:623
+#: smime/lib/e-cert.c:675
 msgid "Certificate Authority Key Identifier"
 msgstr "Identifikator ključa izdavaoca sertifikata"
 
-#: smime/lib/e-cert.c:626
+#: smime/lib/e-cert.c:678
 msgid "UID"
 msgstr "KIB"
 
-#: smime/lib/e-cert.c:635
+#: smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Identifikator predmeta (%s)"
 
-#: smime/lib/e-cert.c:686
+#: smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
 msgstr "Identifikator algoritma"
 
-#: smime/lib/e-cert.c:694
+#: smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
 msgstr "Parametri algoritma"
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:768
 msgid "Subject Public Key Info"
 msgstr "Podaci o javnom ključu izvršioca"
 
-#: smime/lib/e-cert.c:721
+#: smime/lib/e-cert.c:773
 msgid "Subject Public Key Algorithm"
 msgstr "Algoritam javnog ključa izvršioca"
 
-#: smime/lib/e-cert.c:736
+#: smime/lib/e-cert.c:788
 msgid "Subject's Public Key"
 msgstr "Javni ključ izvršioca"
 
-#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
+#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
 msgid "Error: Unable to process extension"
 msgstr "Greška: ne mogu da obradim proširenje"
 
-#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
+#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr "Potpisnik predmeta"
 
-#: smime/lib/e-cert.c:782
+#: smime/lib/e-cert.c:834
 msgid "SSL Certificate Authority"
 msgstr "SSL izdavač sertifikata"
 
-#: smime/lib/e-cert.c:786
+#: smime/lib/e-cert.c:838
 msgid "Email Certificate Authority"
 msgstr "Izdavač sertifikata e-pošte"
 
-#: smime/lib/e-cert.c:814
+#: smime/lib/e-cert.c:866
 msgid "Signing"
 msgstr "Potpisujem"
 
-#: smime/lib/e-cert.c:818
+#: smime/lib/e-cert.c:870
 msgid "Non-repudiation"
 msgstr "Bez odricanja"
 
-#: smime/lib/e-cert.c:822
+#: smime/lib/e-cert.c:874
 msgid "Key Encipherment"
 msgstr "Zamućivanje ključa"
 
-#: smime/lib/e-cert.c:826
+#: smime/lib/e-cert.c:878
 msgid "Data Encipherment"
 msgstr "Zamućivanje podataka"
 
-#: smime/lib/e-cert.c:830
+#: smime/lib/e-cert.c:882
 msgid "Key Agreement"
 msgstr "Saglasnost ključa"
 
-#: smime/lib/e-cert.c:834
+#: smime/lib/e-cert.c:886
 msgid "Certificate Signer"
 msgstr "Potpisnik sertifikata"
 
-#: smime/lib/e-cert.c:838
+#: smime/lib/e-cert.c:890
 msgid "CRL Signer"
 msgstr "CRL potpisnik"
 
-#: smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:938
 msgid "Critical"
 msgstr "Kritično"
 
-#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
+#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
 msgid "Not Critical"
 msgstr "Nekritično"
 
-#: smime/lib/e-cert.c:912
+#: smime/lib/e-cert.c:964
 msgid "Extensions"
 msgstr "Proširenja"
 
-#: smime/lib/e-cert.c:983
+#: smime/lib/e-cert.c:1035
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
 msgid "Certificate Signature Algorithm"
 msgstr "Algoritam potpisa sertifikata"
 
-#: smime/lib/e-cert.c:1048
+#: smime/lib/e-cert.c:1100
 msgid "Issuer"
 msgstr "Izdao"
 
-#: smime/lib/e-cert.c:1102
+#: smime/lib/e-cert.c:1154
 msgid "Issuer Unique ID"
 msgstr "Jedinstveni IB izdavača"
 
-#: smime/lib/e-cert.c:1121
+#: smime/lib/e-cert.c:1173
 msgid "Subject Unique ID"
 msgstr "Jedinstveni IB subjekta"
 
-#: smime/lib/e-cert.c:1164
+#: smime/lib/e-cert.c:1216
 msgid "Certificate Signature Value"
 msgstr "Vrednost potpisa sertifikata"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
+#: smime/lib/e-cert-db.c:608
 msgid "Certificate already exists"
 msgstr "Sertifikat već postoji"
 
@@ -17754,7 +17264,7 @@ msgstr "Pregledaj tekući kontakt"
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "_Akcije"
 
@@ -17917,7 +17427,7 @@ msgstr "Z_atvori"
 #: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:3
+#: ui/evolution.xml.h:4
 msgid "Close"
 msgstr "Zatvori"
 
@@ -17930,7 +17440,7 @@ msgid "Delete this item"
 msgstr "Obriši ovu stavku"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr "Glavna linija alata"
 
@@ -17973,7 +17483,7 @@ msgstr "Sačuvaj stavku na disk"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:44
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "_File"
 msgstr "Dato_teka"
 
@@ -18232,13 +17742,13 @@ msgstr "_Obrni izbor"
 msgid "_Threaded Message List"
 msgstr "Lista poruka prema _niti razgovora"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Zatvori ovaj prozor"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "_Close"
 msgstr "_Zatvori"
 
@@ -18636,7 +18146,7 @@ msgstr "_Prethodna poruka"
 msgid "_Quoted"
 msgstr "_Citirano"
 
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
 msgid "_Tools"
 msgstr "Ala_ti"
 
@@ -18933,107 +18443,121 @@ msgid "_Open Task"
 msgstr "_Otvori zaduženje"
 
 #: ui/evolution.xml.h:1
-msgid "About Ximian Evolution..."
-msgstr "O Ximian Evoluciji..."
+#, fuzzy
+msgid "About Evolution..."
+msgstr "O Ximian Evoluciji"
 
 #: ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
 msgstr "Izmeni podešavanja Evolucije"
 
-#: ui/evolution.xml.h:5
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the visibility of the toolbar"
+msgstr "Izmenite osobine ovog direktorijuma"
+
+#: ui/evolution.xml.h:6
 msgid "Create a new window displaying this folder"
 msgstr "Otvori novi prozor i u njemu prikaži ovaj direktorijum"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "_Izlaz"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "_Česta pitanja u vezi Evolucije"
+
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Izađi is programa"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:10
 msgid "Forget _Passwords"
 msgstr "Zaboravi _lozinke"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:11
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Zaboravi zapamćene lozinke kako bi ponovo bili pitani za iste"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:12
 msgid "Import data from other programs"
 msgstr "Uvezi podatke iz drugih programa"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:14
 #, fuzzy
 msgid "New _Window"
 msgstr "Pro_zor"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Pi_lot Settings..."
 msgstr "Podešavanja Pi_lota..."
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Send / Receive"
 msgstr "Slanje / primanje"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Send queued items and retrieve new items"
 msgstr "Pošalji zakazane i dobavi nove stavke"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Set up Pilot configuration"
 msgstr "Podesi postavke Pilota"
 
-#: ui/evolution.xml.h:17
-msgid "Show information about Ximian Evolution"
+#: ui/evolution.xml.h:19
+#, fuzzy
+msgid "Show information about Evolution"
 msgstr "Prikaži informaciju o Ximian Evoluciji"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:20
 msgid "Submit Bug Report"
 msgstr "Pošalji izveštaj o grešci"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:21
 msgid "Submit _Bug Report"
 msgstr "Pošalji izveštaj o _grešci"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Pošalji izveštaj o grešci pomoću Bug Buddy"
 
-#: ui/evolution.xml.h:21
-msgid "Toggle whether we are working offline."
-msgstr "Biraj da li ćemo raditi bez mreže."
-
 #: ui/evolution.xml.h:23
-msgid "Ximian Evolution _FAQ"
-msgstr "_Česta pitanja u vezi Evolucije"
+#, fuzzy
+msgid "T_oolbar"
+msgstr "Glavna linija alata"
 
 #: ui/evolution.xml.h:24
-msgid "_About Ximian Evolution..."
-msgstr "_O Ximian Evoluciji..."
+msgid "Toggle whether we are working offline."
+msgstr "Biraj da li ćemo raditi bez mreže."
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "_About Evolution..."
+msgstr "O Ximian Evoluciji"
+
+#: ui/evolution.xml.h:30
 msgid "_Help"
 msgstr "Pomo_ć"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "_Import..."
 msgstr "_Uvezi..."
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "_New"
 msgstr "_Novo"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "_Quick Reference"
 msgstr "_Kratki podsetnik"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_Send / Receive"
 msgstr "_Pošalji / primi"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 #, fuzzy
 msgid "_Window"
 msgstr "Pro_zor"
@@ -19107,7 +18631,7 @@ msgstr "Dodeli status"
 
 # Univerzalno vreme, ili UT
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:626
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:635
 msgid "UTC"
 msgstr "UT"
 
@@ -19263,29 +18787,29 @@ msgstr "Drugo..."
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
-#: widgets/misc/e-error.c:121
+#: widgets/misc/e-error.c:79 widgets/misc/e-error.c:80
+#: widgets/misc/e-error.c:122
 msgid "Evolution Error"
 msgstr "Greška Evolucije"
 
-#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
-#: widgets/misc/e-error.c:119
+#: widgets/misc/e-error.c:81 widgets/misc/e-error.c:82
+#: widgets/misc/e-error.c:120
 #, fuzzy
 msgid "Evolution Warning"
 msgstr "Evolucija pošta"
 
-#: widgets/misc/e-error.c:118
+#: widgets/misc/e-error.c:119
 #, fuzzy
 msgid "Evolution Information"
 msgstr "Informacija o sastanku"
 
-#: widgets/misc/e-error.c:120
+#: widgets/misc/e-error.c:121
 #, fuzzy
 msgid "Evolution Query"
 msgstr "Evolucija sažetak"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:410
+#: widgets/misc/e-error.c:415
 #, fuzzy, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -19434,16 +18958,535 @@ msgstr ""
 "Ne mogu da sačuvam u `%s'\n"
 " %s"
 
-#: widgets/misc/e-task-widget.c:211
+#: widgets/misc/e-task-widget.c:212
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: widgets/misc/e-task-widget.c:216
+#: widgets/misc/e-task-widget.c:217
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% završeno)"
 
+#~ msgid "Failed to connect to LDAP server"
+#~ msgstr "Neuspešno povezivanje sa LDAP serverom"
+
+#~ msgid "Failed to authenticate with LDAP server"
+#~ msgstr "Neuspešna prijava na LDAP server"
+
+#~ msgid "Could not perform query on Root DSE"
+#~ msgstr "Nisam mogao da obavim upit na Root DSE"
+
+#~ msgid "The server responded with no supported search bases"
+#~ msgstr "Server je odgovorio nepodržanim bazama za pretragu"
+
+#~ msgid "This server does not support LDAPv3 schema information"
+#~ msgstr "Ovaj server ne podržava podatke LDAPv3 šeme"
+
+#~ msgid "Error retrieving schema information"
+#~ msgstr "Greška u čitanju podataka šeme"
+
+#~ msgid "Server did not respond with valid schema information"
+#~ msgstr "Server nije odgovorio sa ispravnim podacima šeme"
+
+#~ msgid "  S_how Supported Bases "
+#~ msgstr " P_okaži podržane baze "
+
+#~ msgid "1:00"
+#~ msgstr "1:00"
+
+#~ msgid "5:00"
+#~ msgstr "5:00"
+
+#~ msgid "Connecting"
+#~ msgstr "Povezujem se"
+
+#~ msgid "Distinguished _name:"
+#~ msgstr "Posebno _ime:"
+
+#~ msgid "Email address:"
+#~ msgstr "Elektronska adresa:"
+
+#~ msgid "Evolution will use this DN to authenticate you with the server"
+#~ msgstr "Evolucija će koristiti ovaj DN za prijavljivanje na server"
+
+#~ msgid "One"
+#~ msgstr "Jedan"
+
+#~ msgid "S_earch scope: "
+#~ msgstr "Opseg p_retrage:"
+
+#~ msgid "Searching"
+#~ msgstr "Tražim"
+
+#~ msgid "Sub"
+#~ msgstr "Pod"
+
+#~ msgid "This option controls how long a search will be run."
+#~ msgstr "Ova opcija kontroliše koliko će pretraga trajati."
+
+#~ msgid "U_se SSL/TLS:"
+#~ msgstr "K_oristi SSL/TLS:"
+
+#~ msgid "_Display name:"
+#~ msgstr "_Ime:"
+
+#~ msgid "_Port number:"
+#~ msgstr "Broj _porta:"
+
+#~ msgid "_Search base:"
+#~ msgstr "Baza _pretrage:"
+
+#~ msgid "_Server name:"
+#~ msgstr "Ime _servera:"
+
+#~ msgid "_Timeout (minutes):"
+#~ msgstr "_Odziv (minuti):"
+
+#~ msgid "connecting-tab"
+#~ msgstr "jezičak za vezu"
+
+#~ msgid "general-tab"
+#~ msgstr "jezičak za opšte podatke"
+
+#~ msgid "searching-tab"
+#~ msgstr "jezičak za pretragu"
+
+#, fuzzy
+#~ msgid "Job title:"
+#~ msgstr "Naziv _posla:"
+
+#, fuzzy
+#~ msgid "Webcam:"
+#~ msgstr "Veb stranica:"
+
+#~ msgid "Category editor not available."
+#~ msgstr "Uređivač kategorija nije dostupan."
+
+#, fuzzy
+#~ msgid ""
+#~ "The following entries are invalid:\n"
+#~ "\n"
+#~ msgstr "Sledeće veze su trenutno aktivne:"
+
+#~ msgid "Could not find widget for a field: `%s'"
+#~ msgstr "Nisam mogao da pronađem pomoć đa polje: `%s'"
+
+#~ msgid "Do you want to save changes?"
+#~ msgstr "Želite li da sačuvate promene?"
+
+#~ msgid "Error saving %s: %s"
+#~ msgstr "Greška kod čuvanja %s: %s"
+
+#~ msgid ""
+#~ "The addressbook backend for\n"
+#~ "%s\n"
+#~ "has crashed. You will have to restart Evolution in order to use it again"
+#~ msgstr ""
+#~ "Osnovni proces adresara za\n"
+#~ "%s\n"
+#~ "je pao. Moraćete da ponovo pokrenete Evoluciju kako bi nastavili\n"
+#~ "da je koristite"
+
+#~ msgid "Can not load URI"
+#~ msgstr "Ne mogu da učitam adresu"
+
+#~ msgid "Calendar Properties"
+#~ msgstr "Osobine kalendara"
+
+#~ msgid "Remote"
+#~ msgstr "Udaljeni"
+
+#~ msgid "Task List Properties"
+#~ msgstr "Osobine spiska zaduženja"
+
+#~ msgid "_Refresh Interval:"
+#~ msgstr "_Vreme između osvežavanja:"
+
+#~ msgid "_Source URL:"
+#~ msgstr "_Izvorna adresa:"
+
+#~ msgid ""
+#~ "The event being deleted is a meeting, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "Obrisani događaj je sastanak, želite li da pošaljete poruku za njegovo "
+#~ "otkazivanje?"
+
+#~ msgid "Are you sure you want to cancel and delete this meeting?"
+#~ msgstr "Sigurno želite da poništite i obrišete ovaj sastanak?"
+
+#~ msgid ""
+#~ "The task being deleted is assigned, would you like to send a cancellation "
+#~ "notice?"
+#~ msgstr ""
+#~ "Obrisano zaduženje je raspodeljeno, želite li da pošaljete poruku za "
+#~ "njeno otkazivanje?"
+
+#~ msgid "Are you sure you want to cancel and delete this task?"
+#~ msgstr "Sigurno želite da poništite i obrišete ovo zaduženje?"
+
+#~ msgid ""
+#~ "The journal entry being deleted is published, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "Obrisani unos u dnevnik je objavljen, želite li da pošaljete poruku za "
+#~ "njegovo otkazivanje?"
+
+#~ msgid "Are you sure you want to cancel and delete this journal entry?"
+#~ msgstr "Sigurno želite da poništite i obrišete ovaj unos u dnevnik?"
+
+#~ msgid "Are you sure you want to delete the appointment `%s'?"
+#~ msgstr "Sigurno želite da obrišete ovaj zakazani sastanak `%s'?"
+
+#~ msgid "Are you sure you want to delete this untitled appointment?"
+#~ msgstr "Sigurno želite da obrišete ovaj neimenovani zakazani sastanak"
+
+#~ msgid "Are you sure you want to delete the task `%s'?"
+#~ msgstr "Sigurno želite da obrišete zaduženje `%s'?"
+
+#~ msgid "Are you sure you want to delete this untitled task?"
+#~ msgstr "Sigurno želite da obrišete ovo neimenovano zaduženje?"
+
+#~ msgid "Are you sure you want to delete the journal entry `%s'?"
+#~ msgstr "Sigurno želite da izbrišete unos u dnevnik `%s'?"
+
+#~ msgid "Are you sure want to delete this untitled journal entry?"
+#~ msgstr "Sigurno želite da izbrišete ovan neimenovani unos u dnevnik?"
+
+#~ msgid "Are you sure you want to delete %d appointment?"
+#~ msgid_plural "Are you sure you want to delete %d appointments?"
+#~ msgstr[0] "Sigurno želite da izbrišete %d zakazani sastanak?"
+#~ msgstr[1] "Sigurno želite da izbrišete %d zakazana sastanka?"
+#~ msgstr[2] "Sigurno želite da izbrišete %d zakazanih sastanaka?"
+
+#~ msgid "Are you sure you want to delete %d task?"
+#~ msgid_plural "Are you sure you want to delete %d tasks?"
+#~ msgstr[0] "Sigurno želite da izbrišete %d zaduženje"
+#~ msgstr[1] "Sigurno želite da izbrišete %d zaduženja"
+#~ msgstr[2] "Sigurno želite da izbrišete %d zaduženja"
+
+#~ msgid "Are you sure you want to delete %d journal entry?"
+#~ msgid_plural "Are you sure you want to delete %d journal entries?"
+#~ msgstr[0] "Sigurno želite da izbrišete %d unos u dnevnik?"
+#~ msgstr[1] "Sigurno želite da izbrišete %d unosa u dnevnik?"
+#~ msgstr[2] "Sigurno želite da izbrišete %d unosa u dnevnik?"
+
+#~ msgid "_Invite Others..."
+#~ msgstr "_Pozovi druge..."
+
+#~ msgid ""
+#~ "This event has been changed, but has not been saved.\n"
+#~ "\n"
+#~ "Do you wish to save your changes?"
+#~ msgstr ""
+#~ "Ovaj događaj je izmenjen, ali nije sačuvan.\n"
+#~ "\n"
+#~ "Želite li da sačuvate vaše izmene?"
+
+#~ msgid "_Discard Changes"
+#~ msgstr "_Zanemari promene"
+
+#~ msgid "Save Event"
+#~ msgstr "Sačuvaj događaj"
+
+#~ msgid "The meeting information has been created. Send it?"
+#~ msgstr "Informacija o sastanku je sačinjena. Da je pošaljem?"
+
+#~ msgid "The meeting information has changed. Send an updated version?"
+#~ msgstr "Informacija o sastanku je izmenjena. Da pošaljem noviju verziju?"
+
+#~ msgid "The task assignment information has been created. Send it?"
+#~ msgstr "Informacija o primljenom zaduženju je sačinjena. Da je pošaljem?"
+
+#~ msgid "The task information has changed. Send an updated version?"
+#~ msgstr "Informacija o zaduženju je izmenjena. Da pošaljem noviju verziju?"
+
+#, fuzzy
+#~ msgid "The task backend for '%s' has crashed."
+#~ msgstr ""
+#~ "Mašinerija zaduženja za \n"
+#~ "%s\n"
+#~ " je pukla."
+
+#, fuzzy
+#~ msgid "The calendar backend for '%s' has crashed."
+#~ msgstr ""
+#~ "Mašinerija kalendara za\n"
+#~ "%s\n"
+#~ " je pukla"
+
+#~ msgid "Learning junk and/or non junk message(s)"
+#~ msgstr "Učenje đubreta i ne-đubreta od poruka"
+
+#~ msgid "Could not get article %s from NNTP server"
+#~ msgstr "Nisam mogao da preuzmem članak %s sa NNTP servera."
+
+#~ msgid "Posting not allowed by news server"
+#~ msgstr "Server ne dozvoljava slanje članaka"
+
+#~ msgid "Failed to send newsgroups header: %s: message not posted"
+#~ msgstr "Neuspešno slanje zaglavlja grupa: %s: poruka nije poslata"
+
+#~ msgid "Error posting to newsgroup: %s: message not posted"
+#~ msgstr "Greška pri slanja u grupu: %s: poruka nije poslata"
+
+#~ msgid "Error reading response to posted message: message not posted"
+#~ msgstr "Greška pri čitanju odgovora na poslatu poruku: poruka nije poslata"
+
+#~ msgid "Error posting message: %s: message not posted"
+#~ msgstr "Greška pri slanja poruke: %s: poruka nije poslata"
+
+#~ msgid "Stream error"
+#~ msgstr "Greška toka"
+
+#~ msgid "Connection error: %s"
+#~ msgstr "Greška pri povezivanju: %s"
+
+#~ msgid "Could not get group: %s"
+#~ msgstr "Nisam mogao da dobijem grupu: %s"
+
+# bug: s/unspecificed/unspecified/
+#, fuzzy
+#~ msgid "Could not get messages: unspecified error"
+#~ msgstr "Nisam mogao da preuzmem poruke: nenaznačena greška"
+
+#~ msgid "Unknown server response: %s"
+#~ msgstr "Nepoznat odgovor servera: %s"
+
+#~ msgid "Adjust Score"
+#~ msgstr "Preračunaj"
+
+#~ msgid "Assign Color"
+#~ msgstr "Dodeli boju"
+
+#~ msgid "Assign Score"
+#~ msgstr "Dodeli boju"
+
+#~ msgid "Attachments"
+#~ msgstr "Prilozi"
+
+#~ msgid "Beep"
+#~ msgstr "Zvono"
+
+#~ msgid "contains"
+#~ msgstr "sadrži"
+
+#~ msgid "Copy to Folder"
+#~ msgstr "Kopiraj u direktorijum"
+
+#~ msgid "Date received"
+#~ msgstr "Datum primanja"
+
+#~ msgid "Date sent"
+#~ msgstr "Datum slanja"
+
+#~ msgid "Deleted"
+#~ msgstr "Obrisano"
+
+#~ msgid "does not contain"
+#~ msgstr "ne sadrži"
+
+#~ msgid "does not end with"
+#~ msgstr "ne završava se sa"
+
+#~ msgid "does not exist"
+#~ msgstr "ne postoji"
+
+#~ msgid "does not return"
+#~ msgstr "ne vraća"
+
+#~ msgid "does not sound like"
+#~ msgstr "ne zvuči kao"
+
+#~ msgid "does not start with"
+#~ msgstr "ne počinje sa"
+
+#~ msgid "Do Not Exist"
+#~ msgstr "Ne postoji"
+
+#~ msgid "Draft"
+#~ msgstr "Priprema"
+
+#~ msgid "ends with"
+#~ msgstr "završava se sa"
+
+#~ msgid "Exist"
+#~ msgstr "Postoji"
+
+#~ msgid "exists"
+#~ msgstr "postoji"
+
+#~ msgid "Expression"
+#~ msgstr "Izraz"
+
+#~ msgid "Follow Up"
+#~ msgstr "Sledi"
+
+#~ msgid "is"
+#~ msgstr "je"
+
+#~ msgid "is after"
+#~ msgstr "je posle"
+
+#~ msgid "is before"
+#~ msgstr "je pre"
+
+#~ msgid "is Flagged"
+#~ msgstr "je označen"
+
+#~ msgid "is greater than"
+#~ msgstr "je veći od"
+
+#~ msgid "is less than"
+#~ msgstr "je manji od"
+
+#~ msgid "is not"
+#~ msgstr "nije"
+
+#~ msgid "is not Flagged"
+#~ msgstr "nije označen"
+
+#~ msgid "Junk Test"
+#~ msgstr "Provera đubreta"
+
+#~ msgid "Mailing list"
+#~ msgstr "Dopisna lista"
+
+#~ msgid "Message Body"
+#~ msgstr "Telo poruke"
+
+#~ msgid "Message Header"
+#~ msgstr "Zaglavlje poruke"
+
+#~ msgid "Message is Junk"
+#~ msgstr "Poruka je đubre"
+
+#~ msgid "Message is not Junk"
+#~ msgstr "Poruka nije đubre"
+
+#~ msgid "Move to Folder"
+#~ msgstr "Premesti u direktorijum"
+
+#~ msgid "Pipe to Program"
+#~ msgstr "Kroz cev do programa"
+
+#~ msgid "Play Sound"
+#~ msgstr "Pusti zvuk"
+
+#~ msgid "Recipients"
+#~ msgstr "Primaoci"
+
+#~ msgid "Regex Match"
+#~ msgstr "Reg. izraz pretraga"
+
+#~ msgid "Replied to"
+#~ msgstr "Odgovoreno na"
+
+#~ msgid "returns"
+#~ msgstr "povraćaji"
+
+#~ msgid "returns greater than"
+#~ msgstr "više povraćaja od"
+
+#~ msgid "returns less than"
+#~ msgstr "manje povraćaja od"
+
+#~ msgid "Run Program"
+#~ msgstr "Pokreni program"
+
+#~ msgid "Sender"
+#~ msgstr "Pošiljalac"
+
+#~ msgid "Set Status"
+#~ msgstr "Dodeli status"
+
+#~ msgid "Size (kB)"
+#~ msgstr "Veličina (kB)"
+
+#~ msgid "sounds like"
+#~ msgstr "zvuči kao"
+
+#~ msgid "Source Account"
+#~ msgstr "Izvorni nalog"
+
+#~ msgid "Specific header"
+#~ msgstr "Određeno zaglavlje"
+
+#~ msgid "starts with"
+#~ msgstr "počinje sa"
+
+#~ msgid "Stop Processing"
+#~ msgstr "Prekini sa obradom"
+
+#~ msgid "Unset Status"
+#~ msgstr "Nedodeljen status"
+
+#~ msgid "Check _Incoming Mail"
+#~ msgstr "Proveri pristig_lu poštu"
+
+#~ msgid "Use _Daemon"
+#~ msgstr "Koristi _uslužni program"
+
+#~ msgid "_Local Tests Only"
+#~ msgstr "Samo _lokalne probe"
+
+#~ msgid "Working"
+#~ msgstr "Radim"
+
+#~ msgid "Brought to you by"
+#~ msgstr "Omogućili su"
+
+#~ msgid "_Filename:"
+#~ msgstr "_Ime datoteke:"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "Unknown error."
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Nepoznata greška."
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the component system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Greška koju je poslao sistem delova:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the activation system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Greška koju je poslao sistem za pokretanje je:\n"
+#~ "%s"
+
+#~ msgid "Do you want to trust \"%s\" for the following purposes?"
+#~ msgstr "Želite li da verujete „%s“ za naredne potrebe?"
+
+#~ msgid "View Certificate"
+#~ msgstr "Pogledaj sertifikat"
+
+#~ msgid "You have been asked to trust a new Certificate Authority (CA)."
+#~ msgstr ""
+#~ "Postavljen vam je zahtev da verujete novom izdavaocu sertifikata (CA)."
+
+#~ msgid "About Ximian Evolution..."
+#~ msgstr "O Ximian Evoluciji..."
+
+#~ msgid "_About Ximian Evolution..."
+#~ msgstr "_O Ximian Evoluciji..."
+
 #~ msgid "Evolution Addressbook folder viewer"
 #~ msgstr "Preglednik direktorijuma Evolucija adresara"
 
@@ -19759,9 +19802,6 @@ msgstr "%s (%d%% završeno)"
 #~ msgid "Primary _email:"
 #~ msgstr "Osnovna _e-adresa:"
 
-#~ msgid "S_pouse:"
-#~ msgstr "S_upružnik:"
-
 #~ msgid "_Business:"
 #~ msgstr "_Posao:"
 
@@ -19777,9 +19817,6 @@ msgstr "%s (%d%% završeno)"
 #~ msgid "_Mobile:"
 #~ msgstr "_Mobilni:"
 
-#~ msgid "_Office:"
-#~ msgstr "_Kancelarija:"
-
 #~ msgid "_Public Calendar URL:"
 #~ msgstr "URL za _javni kalendar:"
 
@@ -20402,9 +20439,6 @@ msgstr "%s (%d%% završeno)"
 #~ msgid "Failed on message %d of %d"
 #~ msgstr "Neuspeh kod poruke %d od %d"
 
-#~ msgid "Changing junk status"
-#~ msgstr "Izmena stanja đubreta"
-
 # bug: plural-forms
 #~ msgid "%d weeks ago"
 #~ msgstr "pre %d nedelja"
@@ -21226,9 +21260,6 @@ msgstr "%s (%d%% završeno)"
 #~ msgid "Object not found"
 #~ msgstr "Objekat nije mogao biti pronađen\n"
 
-#~ msgid "Invalid object"
-#~ msgstr "Neispravna svrha"
-
 #~ msgid "URI not loaded"
 #~ msgstr "Eknjiga nije učitana\n"
 
diff --git a/po/sv.po b/po/sv.po
index 932fee0c12..d01c79f512 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -6,12 +6,12 @@
 # Martin Norbäck <d95mback@dtek.chalmers.se>, 2001.
 # Johan Dahlin <zilch.am@home.se>, 2001.
 #
-# $Id: sv.po,v 1.196 2004/05/19 18:35:56 jpr Exp $
+# $Id: sv.po,v 1.197 2004/06/03 18:02:51 jpr Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2004-05-19 14:00-0400\n"
+"POT-Creation-Date: 2004-06-03 11:14-0400\n"
 "PO-Revision-Date: 2004-03-25 23:10+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -65,13 +65,13 @@ msgstr "1 kort"
 msgid "Default Sync Address:"
 msgstr "Standardsynkroniseringsadress:"
 
-#: addressbook/conduit/address-conduit.c:1150
 #: addressbook/conduit/address-conduit.c:1151
+#: addressbook/conduit/address-conduit.c:1152
 msgid "Could not load addressbook"
 msgstr "Kunde inte läsa in adressboken"
 
-#: addressbook/conduit/address-conduit.c:1219
-#: addressbook/conduit/address-conduit.c:1222
+#: addressbook/conduit/address-conduit.c:1220
+#: addressbook/conduit/address-conduit.c:1223
 msgid "Could not read pilot's Address application block"
 msgstr "Kunde inte läsa pilotens adressprogramblock"
 
@@ -79,13 +79,13 @@ msgstr "Kunde inte läsa pilotens adressprogramblock"
 msgid "Accessing LDAP Server anonymously"
 msgstr "Ansluter anonymt till LDAP-servern"
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
 msgid "Failed to authenticate.\n"
 msgstr "Misslyckades med autentisering.\n"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sAnge lösenord för %s (användare %s)"
@@ -129,51 +129,23 @@ msgstr "_Kontaktgrupp"
 msgid "Create a new contacts group"
 msgstr "Skapa en ny genvägsgrupp"
 
-#: addressbook/gui/component/addressbook-component.c:182
+#: addressbook/gui/component/addressbook-component.c:184
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:483
-msgid "Failed to connect to LDAP server"
-msgstr "Misslyckades med att ansluta till LDAP-server"
-
-#: addressbook/gui/component/addressbook-config.c:507
-msgid "Failed to authenticate with LDAP server"
-msgstr "Misslyckades med att autentisera till LDAP-server"
-
-#: addressbook/gui/component/addressbook-config.c:535
-msgid "Could not perform query on Root DSE"
-msgstr "Kunde inte utföra fråga på rot-DSE"
-
-#: addressbook/gui/component/addressbook-config.c:840
-msgid "The server responded with no supported search bases"
-msgstr "Servern svarade med inga sökbaser stöds"
-
-#: addressbook/gui/component/addressbook-config.c:1245
-msgid "This server does not support LDAPv3 schema information"
-msgstr "Denna server stöder inte LDAPv3-schemainformation"
-
-#: addressbook/gui/component/addressbook-config.c:1266
-msgid "Error retrieving schema information"
-msgstr "Fel vid hämtande av filterinformation"
-
-#: addressbook/gui/component/addressbook-config.c:1274
-msgid "Server did not respond with valid schema information"
-msgstr "Servern svarade inte med giltig schemainformation"
-
 #: addressbook/gui/component/addressbook-migrate.c:68
-#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1160
 msgid "Migrating..."
 msgstr "Migrerar..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1201
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Migrerar \"%s\""
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:438
+#: addressbook/gui/component/addressbook-migrate.c:464
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
 #: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
@@ -181,28 +153,28 @@ msgid "On This Computer"
 msgstr "På denna dator"
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:446
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
-#: mail/mail-config.glade.h:106
+#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
+#: mail/mail-config.glade.h:109
 msgid "Personal"
 msgstr "Personligt"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:454
+#: addressbook/gui/component/addressbook-migrate.c:480
 msgid "On LDAP Servers"
 msgstr "På LDAP-servrar"
 
-#: addressbook/gui/component/addressbook-migrate.c:582
+#: addressbook/gui/component/addressbook-migrate.c:608
 msgid "LDAP Servers"
 msgstr "LDAP-servrar"
 
-#: addressbook/gui/component/addressbook-migrate.c:702
+#: addressbook/gui/component/addressbook-migrate.c:728
 msgid "Autocompletion Settings"
 msgstr "Inställningar för automatisk ifyllning"
 
-#: addressbook/gui/component/addressbook-migrate.c:1076
+#: addressbook/gui/component/addressbook-migrate.c:1104
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -210,60 +182,55 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1090
+#: addressbook/gui/component/addressbook-migrate.c:1118
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1099
+#: addressbook/gui/component/addressbook-migrate.c:1127
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1109
+#: addressbook/gui/component/addressbook-migrate.c:1137
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:674
+#: addressbook/gui/component/addressbook-view.c:675
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 "Adressboken \"%s\" kommer att tas bort. Är du säker på att du vill fortsätta?"
 
-#: addressbook/gui/component/addressbook-view.c:761
+#: addressbook/gui/component/addressbook-view.c:754
 msgid "New Address Book"
 msgstr "Ny adressbok"
 
-#: addressbook/gui/component/addressbook-view.c:762
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
+#: addressbook/gui/component/addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Ta bort"
 
-#: addressbook/gui/component/addressbook-view.c:763
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-view.c:756
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Egenskaper..."
 
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/addressbook-view.c:1002
+#. Create the contacts group
+#: addressbook/gui/component/addressbook-view.c:995
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
 #: calendar/gui/migration.c:373
 msgid "Contacts"
 msgstr "Kontakter"
@@ -342,10 +309,6 @@ msgid "Manage your S/MIME certificates here"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-msgid "  S_how Supported Bases "
-msgstr "  _Visa de baser som stöds "
-
-#: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -360,207 +323,173 @@ msgstr "  _Visa de baser som stöds "
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1:00"
-msgstr "1.00"
-
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
-msgstr "5.00"
-
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "Autentisering"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
 #, fuzzy
 msgid "<b>Display</b>"
 msgstr "Visa"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 #, fuzzy
 msgid "<b>Downloading</b>"
 msgstr "<b>Fel vid hämtning av Metar</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:10
 #, fuzzy
 msgid "<b>Searching</b>"
 msgstr "Söker"
 
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
 msgid "<b>Server Information</b>"
 msgstr "Steg 1: Serverinformation"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
 msgid "<b>Type:</b>"
 msgstr "<b>Ska utföras:</b> "
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:13
 #, fuzzy
 msgid "Add Contacts Group"
 msgstr "_Kontaktgrupp"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:14
 #, fuzzy
 msgid "Address Book Properties"
 msgstr "Adressbokskällor"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
-#: mail/mail-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
+#: mail/mail-config.glade.h:42
 msgid "Always"
 msgstr "Alltid"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr "Anonymt"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:17
 #: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Grundläggande"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
-msgid "Connecting"
-msgstr "Ansluter"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 #: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Detaljer"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
-msgid "Distinguished _name:"
-msgstr "Distinguished _name:"
-
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:19
 #, fuzzy
 msgid "Distinguished name"
 msgstr "Distinguished _name:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:20
 #, fuzzy
 msgid "Download limit:"
 msgstr "_Hämtningsgräns:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Email address"
 msgstr "E-postadress:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "Email address:"
-msgstr "E-postadress:"
-
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "Evolution will use this DN to authenticate you with the server"
-msgstr ""
-"Evolution kommer att använda detta DN för att autentisera dig till servern"
-
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:22
+#, fuzzy
 msgid ""
-"Evolution will use this email address to authenticate you with the server"
+"Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "Evolution kommer att använda denna e-postadress för att autentisera dig till "
 "servern"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:23
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Sökbaser som stöds"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:24
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
+#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Allmänt"
 
-#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
-#: mail/mail-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
+#: mail/mail-config.glade.h:102
 msgid "Never"
 msgstr "Aldrig"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
-msgid "One"
-msgstr "En"
-
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:35
-msgid "S_earch scope: "
-msgstr "S_ökomfattning: "
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Search _base:"
+msgstr "_Utgångspunkt för sökning:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
 msgid "Search base only"
 msgstr "_Utgångspunkt för sökning:"
 
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:29
 #, fuzzy
 msgid "Search base:"
 msgstr "_Utgångspunkt för sökning:"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Search scope:"
 msgstr "S_ökomfattning: "
 
-#: addressbook/gui/component/ldap-config.glade.h:39
-msgid "Searching"
-msgstr "Söker"
-
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:31
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
-"server if\n"
-"your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL or TLS."
 msgstr ""
 "Att välja detta alternativ innebär att Evolution endast kommer att ansluta "
 "till din\n"
 "LDAP-server om den stöder SSL eller TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a \n"
-"insecure environment. For example, if you and your LDAP server are behind a "
-"firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection "
-"is already\n"
-"secure."
+"you are in a insecure environment. For example, if you and your LDAP server "
+"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
+"because your connection is already secure."
 msgstr ""
 "Att välja detta alternativ betyder att Evolution endast kommer att försöka "
 "använda SSL/TLS\n"
@@ -569,13 +498,12 @@ msgstr ""
 "på jobbet behöver inte Evolution inte använda SSL/TLS eftersom din anlutning "
 "redan är säker."
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:33
+#, fuzzy
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
-"TLS.  This \n"
-"means that your connection will be insecure, and that you will be vulnerable "
-"to security\n"
-"exploits. "
+"TLS.  This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits. "
 msgstr ""
 "Att välja detta alternativ betyder att din server inte stöder varken SSL "
 "eller TLS.\n"
@@ -583,38 +511,33 @@ msgstr ""
 "att vara\n"
 "sårbar för säkerhetsluckor."
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Sub"
-msgstr "Pren"
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr "Sökbaser som stöds"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
-"searches will \n"
-"begin. If you leave this blank, the search will begin at the root of the "
-"directory tree."
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
 msgstr ""
 "Sökbasen är distinguished name (DN) för posten där dina sökningar kommer att "
 "starta.\n"
 "Om du lämnar detta tomt kommer sökningen att börja vid roten av "
 "katalogträdet."
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:37
+#, fuzzy
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
-"the \n"
-"directory tree. A search scope of \"sub\" will include all entries below "
-"your search base.\n"
-"A search scope of \"one\" will only include the entries one level beneath "
-"your base.\n"
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
 msgstr ""
 "Sökomfattningen anger hur djupt du vill att sökningen ska gå ner i "
 "katalogträdet.\n"
@@ -623,7 +546,7 @@ msgstr ""
 "En sökomfattning som är \"one\" kommer endast att inkludera de poster som är "
 "en nivå under din sökbas.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:58
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -631,18 +554,17 @@ msgstr ""
 "Detta är det fullständiga namnet på din ldap-server. Till exempel \"ldap."
 "mittforetag.se\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:39
 #, fuzzy
 msgid ""
-"This is the maximum number of entries to download. Setting this number to "
-"be \n"
+"This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr ""
 "Detta är det största antalet poster att hämta. Att ställa in detta tal för "
 "högt\n"
 "kommer att slöa ned adressboken."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -652,142 +574,121 @@ msgstr ""
 "Observera att ställa in detta till \"E-postadress\" kräver anonym åtkomst "
 "till din ldap-server."
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:41
+#, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
-"list.\n"
-"It is for display purposes only. "
+"list. It is for display purposes only. "
 msgstr ""
 "Det här är namnet på denna server som kommer att visas i din Evolution-"
 "mapplista.\n"
 "Det används endast för visning."
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:42
+#, fuzzy
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. "
-"A \n"
-"list of standard ports has been provided. Ask your system administrator\n"
-"what port you should specify."
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
 msgstr ""
 "Det här är porten på LDAP-servern som Evolution kommer att försöka ansluta "
 "till.\n"
 "En lista med standardportar tillhandahålls. Fråga din systemadministratör "
 "vilken port du ska ange."
 
-#: addressbook/gui/component/ldap-config.glade.h:67
-msgid "This option controls how long a search will be run."
-msgstr "Detta alternativ styr hur lång tid en sökning kommer att köras."
-
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:43
 #, fuzzy
 msgid "Timeout:"
 msgstr "Tidsformat:"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
-msgid "U_se SSL/TLS:"
-msgstr "An_vänd SSL/TLS:"
-
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr "Använder distinguished name (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr "Använder e-postadress"
 
-#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
-#: mail/mail-config.glade.h:154
+#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
+#: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr "Närsomhelst"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:47
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "_Kontaktgrupp"
 
-#: addressbook/gui/component/ldap-config.glade.h:74
-#: calendar/gui/dialogs/calendar-setup.glade.h:12
-msgid "_Display name:"
-msgstr "_Visa namn:"
-
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr "_Hämtningsgräns:"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
 msgid "_Email address:"
 msgstr "E-postadress:"
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:50
+#, fuzzy
+msgid "_Find Possible Search Bases"
+msgstr "Sökbaser som stöds"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Log in method:"
 msgstr "_Inloggningsmetod:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "_Log in:"
+msgstr "Inloggning"
+
+#: addressbook/gui/component/ldap-config.glade.h:53
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
 msgid "_Name:"
 msgstr "_Namn:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
-msgid "_Port number:"
-msgstr "_Portnummer:"
-
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid "_Port:"
 msgstr "_Port:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
-msgid "_Search base:"
-msgstr "_Utgångspunkt för sökning:"
-
-#: addressbook/gui/component/ldap-config.glade.h:82
-msgid "_Server name:"
-msgstr "_Servernamn:"
+#: addressbook/gui/component/ldap-config.glade.h:55
+#, fuzzy
+msgid "_Search scope:"
+msgstr "S_ökomfattning: "
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:56
 #, fuzzy
 msgid "_Server:"
 msgstr "S_erver:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
-msgid "_Timeout (minutes):"
-msgstr "_Timeout (minuter):"
+#: addressbook/gui/component/ldap-config.glade.h:57
+#, fuzzy
+msgid "_Timeout:"
+msgstr "Tidsformat:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:58
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "_Använd säker anslutning (SSL):"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "kort"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
-msgid "connecting-tab"
-msgstr "anslutningsflik"
-
-#: addressbook/gui/component/ldap-config.glade.h:88
-msgid "general-tab"
-msgstr "allmän-flik"
-
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:60
 #: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
-#: mail/mail-config.glade.h:182
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "minut"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
-msgid "searching-tab"
-msgstr "sökflik"
-
-#: addressbook/gui/component/select-names/e-select-names.c:497
+#: addressbook/gui/component/select-names/e-select-names.c:503
 #: addressbook/gui/component/select-names/select-names.glade.h:6
 #, fuzzy
 msgid "Select Contacts from Address Book"
 msgstr "Välj kontakter från adressboken"
 
-#: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
@@ -827,7 +728,7 @@ msgstr "Namnlös kontakt:"
 
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:222
+#: addressbook/gui/widgets/e-addressbook-view.c:224
 msgid "Source"
 msgstr "Källkod"
 
@@ -902,9 +803,9 @@ msgid "<b>Work</b>"
 msgstr "<b>Ska utföras:</b> "
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
-#: addressbook/gui/widgets/eab-contact-display.c:342
-#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/widgets/eab-contact-display.c:334
+#: addressbook/gui/widgets/eab-contact-display.c:353
 msgid "AIM"
 msgstr "AIM"
 
@@ -945,15 +846,15 @@ msgid "Company:"
 msgstr "_Företag:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:271
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
+#: addressbook/gui/contact-editor/e-contact-editor.c:266
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
 msgstr "Kontakt"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1527
+#: addressbook/gui/contact-editor/e-contact-editor.c:520
 msgid "Contact Editor"
 msgstr "Kontaktredigerare"
 
@@ -977,82 +878,79 @@ msgid "Full _Name..."
 msgstr "Fullständigt _namn..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:202
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-msgid "Home"
-msgstr "Hem"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #, fuzzy
 msgid "Home Page:"
 msgstr "Fax hem"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-#, fuzzy
-msgid "Job title:"
-msgstr "_Jobbtitel:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/e-itip-control.c:936
-msgid "Location:"
-msgstr "Plats:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 #, fuzzy
 msgid "Mailing Address"
 msgstr "E-postadress:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 #, fuzzy
 msgid "Manager:"
 msgstr "Manager"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "_Smeknamn:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Notes:"
 msgstr "An_teckningar:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
-#: addressbook/gui/contact-editor/e-contact-editor.c:203
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-msgid "Other"
-msgstr "Annat"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#, fuzzy
+msgid "Office:"
+msgstr "K_ontor:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "PO Box:"
 msgstr "_Box:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 #, fuzzy
 msgid "Personal Information"
 msgstr "Valfri information"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 #, fuzzy
 msgid "Profession:"
 msgstr "_Yrke:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#, fuzzy
+msgid "Spouse:"
+msgstr "_Partner:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "State/Province:"
 msgstr "Del_stat/Provins:"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#, fuzzy
+msgid "Title:"
+msgstr "_Titel:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+msgid "Video Chat:"
+msgstr ""
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:41
 #, fuzzy
 msgid "Wants to receive HTML mail"
@@ -1060,15 +958,15 @@ msgstr "Vill ha _HTML-post"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:42
 #, fuzzy
-msgid "Webcam:"
-msgstr "Sida"
+msgid "Web Log:"
+msgstr "_Webbsideadress:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
-#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
-#: mail/mail-config.glade.h:155
+#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
+#: mail/mail-config.glade.h:157
 msgid "Work"
 msgstr "Jobb"
 
@@ -1089,19 +987,12 @@ msgid "_File under:"
 msgstr "Filnamn:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 #, fuzzy
 msgid "_Where:"
 msgstr "S_erver:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
-msgid "item7"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
-msgid "item8"
-msgstr ""
-
-#: addressbook/gui/contact-editor/eab-editor.c:316
+#: addressbook/gui/contact-editor/eab-editor.c:315
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -1109,7 +1000,7 @@ msgstr ""
 "Är du säker på att du vill\n"
 "ta bort dessa kontakter?"
 
-#: addressbook/gui/contact-editor/eab-editor.c:319
+#: addressbook/gui/contact-editor/eab-editor.c:318
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -1118,16 +1009,16 @@ msgstr ""
 "ta bort denna kontakt?"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:351
-#: addressbook/gui/widgets/eab-contact-display.c:372
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Address"
 msgstr "Adress"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:292
+#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard.c:174
@@ -2108,86 +1999,109 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/contact-editor/e-contact-editor.c:179
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:337
+#: addressbook/gui/widgets/eab-contact-display.c:356
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:347
-#: addressbook/gui/widgets/eab-contact-display.c:366
+#: addressbook/gui/contact-editor/e-contact-editor.c:180
+#: addressbook/gui/widgets/eab-contact-display.c:339
+#: addressbook/gui/widgets/eab-contact-display.c:358
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: addressbook/gui/widgets/eab-contact-display.c:338
+#: addressbook/gui/widgets/eab-contact-display.c:357
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:344
-#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#: addressbook/gui/widgets/eab-contact-display.c:355
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/contact-editor/e-contact-editor.c:183
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+msgid "Home"
+msgstr "Hem"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+msgid "Other"
+msgstr "Annat"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
 msgid "Source Book"
 msgstr "Källbok"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:264
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Target Book"
 msgstr "Målbok"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:278
+#: addressbook/gui/contact-editor/e-contact-editor.c:273
 msgid "Is New Contact"
 msgstr "Är ny kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:285
+#: addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Writable Fields"
 msgstr "Skrivbara fält"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:299
+#: addressbook/gui/contact-editor/e-contact-editor.c:294
 msgid "Changed"
 msgstr "Ändrad"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
-msgid "Category editor not available."
-msgstr "Kategoriredigeraren är inte tillgänglig."
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:2352
 msgid "This contact belongs to these categories:"
 msgstr "Denna kontakt tillhör dessa kategorier:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#: addressbook/gui/contact-editor/e-contact-editor.c:2429
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Välj mellan följande alternativ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#: addressbook/gui/contact-editor/e-contact-editor.c:2433
 #, fuzzy
 msgid "No image"
 msgstr "Nome"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#: addressbook/gui/contact-editor/e-contact-editor.c:2636
 #, fuzzy
 msgid ""
-"The following entries are invalid:\n"
+"The contact data is invalid:\n"
 "\n"
-msgstr "Följande anslutningar är aktiva för tillfället:"
+msgstr "Upprepningsdatumet är ogiltigt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2738
-#, c-format
-msgid "Could not find widget for a field: `%s'"
-msgstr "Kunde inte hitta widget för fältet: \"%s\""
+#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#, fuzzy
+msgid "Invalid contact."
+msgstr "Ny kontakt"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+msgid ""
+"The contact cannot be saved to the selected address book. Do you want to "
+"discard changes?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2727
+#: addressbook/gui/contact-editor/e-contact-editor.c:2751
+msgid "_Discard"
+msgstr "_Förkasta"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+msgid ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
+msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:62
 msgid "AOL Instant Messenger"
@@ -2220,7 +2134,7 @@ msgid "_Edit Full"
 msgstr "_Redigera fullständigt namn"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:166
 msgid "_Full Name:"
 msgstr "_Fullständigt namn:"
 
@@ -2367,30 +2281,30 @@ msgstr "_Listnamn:"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "_Ange en e-postadress eller dra en kontakt till listan nedan:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "contact-list-editor"
 msgstr "kontaktlisteredigerare"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:153
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:215
+#: addressbook/gui/widgets/e-addressbook-view.c:217
 #: addressbook/gui/widgets/e-minicard-view.c:460
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Bok"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
 msgid "Is New List"
 msgstr "Är ny lista"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:215
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
 msgid "Contact List Editor"
 msgstr "Kontaktlisteredigerare"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:438
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
 msgid "Save List as VCard"
 msgstr "Spara lista som VCard"
 
@@ -2437,126 +2351,126 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Avancerad sökning"
 
-#: addressbook/gui/widgets/eab-contact-display.c:129
-#: addressbook/gui/widgets/eab-contact-display.c:192
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:139
-#: addressbook/gui/widgets/eab-contact-display.c:205
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:257
-#: addressbook/gui/widgets/eab-contact-display.c:533
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:525
 #, fuzzy
 msgid "List Members"
 msgstr "Medlemmar"
 
-#: addressbook/gui/widgets/eab-contact-display.c:329
-#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/eab-contact-display.c:321
+#: addressbook/gui/widgets/eab-contact-display.c:323
 msgid "E-mail"
 msgstr "E-post"
 
-#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/eab-contact-display.c:332
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organisation"
 
-#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:333
 #, fuzzy
 msgid "Position"
 msgstr "Boston"
 
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:354
 #, fuzzy
 msgid "Groupwise"
 msgstr "Grupp"
 
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:340
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:349
-#: addressbook/gui/widgets/eab-contact-display.c:370
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Phone"
 msgstr "Telefon"
 
-#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:342
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:354
+#: addressbook/gui/widgets/eab-contact-display.c:346
 #, fuzzy
 msgid "work"
 msgstr "Jobb"
 
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:359
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:368
-#: addressbook/gui/widgets/eab-contact-display.c:587
+#: addressbook/gui/widgets/eab-contact-display.c:360
+#: addressbook/gui/widgets/eab-contact-display.c:579
 #, fuzzy
 msgid "Blog"
 msgstr "Bologna"
 
-#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/eab-contact-display.c:363
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: addressbook/gui/widgets/eab-contact-display.c:375
+#: addressbook/gui/widgets/eab-contact-display.c:367
 #, fuzzy
 msgid "personal"
 msgstr "Personligt"
 
-#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/eab-contact-display.c:374
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Notering"
 
-#: addressbook/gui/widgets/eab-contact-display.c:548
+#: addressbook/gui/widgets/eab-contact-display.c:540
 #, fuzzy
 msgid "Job Title"
 msgstr "_Jobbtitel:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/eab-contact-display.c:544
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:774
+#: smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "E-post"
 
-#: addressbook/gui/widgets/eab-contact-display.c:579
+#: addressbook/gui/widgets/eab-contact-display.c:571
 #, fuzzy
 msgid "Home page"
 msgstr "Fax hem"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 msgid "Success"
 msgstr "Lyckades"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Backend busy"
 msgstr ""
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Repository offline"
 msgstr "Lagret frånkopplat"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 #, fuzzy
 msgid "Address Book does not exist"
 msgstr "Adressboken finns inte"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 #, fuzzy
 msgid "No Self Contact defined"
 msgstr "Ny kontaktlista"
@@ -2564,29 +2478,29 @@ msgstr "Ny kontaktlista"
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Permission denied"
 msgstr "Åtkomst nekas"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:57
 #, fuzzy
 msgid "Contact not found"
 msgstr "Kortet hittades inte"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: addressbook/gui/widgets/eab-gui-util.c:58
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "Kort-ID finns redan"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Protocol not supported"
 msgstr "Protokollet stöds inte"
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:60
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:233
 #: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
@@ -2599,39 +2513,39 @@ msgid "Cancelled"
 msgstr "Avbruten"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:61
 #, fuzzy
 msgid "Could not cancel"
 msgstr "Kunde inte uppdatera objekt"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Authentication Failed"
 msgstr "Autentisering misslyckades"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Authentication Required"
 msgstr "Autentisering krävs"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:66
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "TLS not Available"
 msgstr "TLS är inte tillgänglig"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#: addressbook/gui/widgets/eab-gui-util.c:66
 #, fuzzy
 msgid "No such source"
 msgstr "Det finns inget sådant meddelande"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:69
+#: addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Other error"
 msgstr "Annat fel"
 
-#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:90
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
@@ -2640,7 +2554,7 @@ msgstr ""
 "Vi kunde inte öppna denna adressbok. Kontrollera att sökvägen\n"
 "existerar och att du har rätt att komma åt den."
 
-#: addressbook/gui/widgets/eab-gui-util.c:110
+#: addressbook/gui/widgets/eab-gui-util.c:97
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -2650,19 +2564,19 @@ msgstr ""
 "att du har angett en felaktig URI eller att LDAP-servern är\n"
 "onåbar."
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:102
 #, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution you must compile the program from the CVS "
-"sources after retrieving OpenLDAP from the link below."
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
 msgstr ""
 "Denna version av Evolution har inte LDAP-stöd inkompilerat.\n"
 "Om du vill använda LDAP i Evolution måste du kompilera\n"
 "programmet från CVS-källkod efter det att du har hämtat\n"
 "OpenLDAP från länken nedan.\n"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:109
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -2672,11 +2586,7 @@ msgstr ""
 "att du har angett en felaktig URI eller att LDAP-servern är\n"
 "onåbar."
 
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "Unable to open addressbook"
-msgstr "Kan inte öppna adressboken"
-
-#: addressbook/gui/widgets/eab-gui-util.c:162
+#: addressbook/gui/widgets/eab-gui-util.c:129
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2688,7 +2598,7 @@ msgstr ""
 "Gör din sökning mer specifik eller höj resultatgränsen i\n"
 "katalogserverinställningarna för denna adressbok."
 
-#: addressbook/gui/widgets/eab-gui-util.c:168
+#: addressbook/gui/widgets/eab-gui-util.c:135
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -2700,56 +2610,48 @@ msgstr ""
 "specifik eller höj resultatgränsen i katalogserverinställningarna\n"
 "för denna adressbok."
 
-#: addressbook/gui/widgets/eab-gui-util.c:174
+#: addressbook/gui/widgets/eab-gui-util.c:141
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "Bakänden för denna adressbok kunde inte tolka denna fråga."
 
-#: addressbook/gui/widgets/eab-gui-util.c:177
+#: addressbook/gui/widgets/eab-gui-util.c:144
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Bakänden för denna adressbok vägrade att utföra denna fråga."
 
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:147
 msgid "This query did not complete successfully."
 msgstr "Denna fråga returnerade inte utan problem."
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
-msgid "Do you want to save changes?"
-msgstr "Vill du spara ändringar?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:208
-msgid "_Discard"
-msgstr "_Förkasta"
-
-#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:169
 msgid "Error adding list"
 msgstr "Fel vid tillägg av lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:229
-#: addressbook/gui/widgets/eab-gui-util.c:652
+#: addressbook/gui/widgets/eab-gui-util.c:169
+#: addressbook/gui/widgets/eab-gui-util.c:580
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Fel vid tillägg av kort"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying list"
 msgstr "Fel vid ändring av lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Fel vid ändring av kort"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:192
 msgid "Error removing list"
 msgstr "Fel vid borttagning av lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
-#: addressbook/gui/widgets/eab-gui-util.c:610
+#: addressbook/gui/widgets/eab-gui-util.c:192
+#: addressbook/gui/widgets/eab-gui-util.c:538
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Fel vid borttagning av kort"
 
-#: addressbook/gui/widgets/eab-gui-util.c:334
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, fuzzy, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2758,7 +2660,7 @@ msgstr ""
 "Att öppna %d kort kommer även att öppna %d nya fönster.\n"
 "Vill du verkligen visa alla dessa kort?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:360
+#: addressbook/gui/widgets/eab-gui-util.c:300
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2767,54 +2669,49 @@ msgstr ""
 "%s finns redan\n"
 "Vill du skriva över den?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:364
+#: addressbook/gui/widgets/eab-gui-util.c:304
 msgid "Overwrite"
 msgstr "Skriv över"
 
-#: addressbook/gui/widgets/eab-gui-util.c:400
-#, c-format
-msgid "Error saving %s: %s"
-msgstr "Fel vid sparande av %s: %s"
-
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:437
+#: addressbook/gui/widgets/eab-gui-util.c:365
 msgid "card.vcf"
 msgstr "kort.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:571
+#: addressbook/gui/widgets/eab-gui-util.c:499
 msgid "list"
 msgstr "lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:706
+#: addressbook/gui/widgets/eab-gui-util.c:634
 #, fuzzy
 msgid "Move contact to"
 msgstr "Flytta kort till"
 
-#: addressbook/gui/widgets/eab-gui-util.c:708
+#: addressbook/gui/widgets/eab-gui-util.c:636
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Kopiera kort till"
 
-#: addressbook/gui/widgets/eab-gui-util.c:711
+#: addressbook/gui/widgets/eab-gui-util.c:639
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Flytta kort till"
 
-#: addressbook/gui/widgets/eab-gui-util.c:713
+#: addressbook/gui/widgets/eab-gui-util.c:641
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Kopiera kort till"
 
-#: addressbook/gui/widgets/eab-gui-util.c:716
+#: addressbook/gui/widgets/eab-gui-util.c:644
 #, fuzzy
 msgid "Select target addressbook."
 msgstr "Välj kontakter från adressboken"
 
-#: addressbook/gui/widgets/eab-gui-util.c:939
+#: addressbook/gui/widgets/eab-gui-util.c:867
 msgid "Multiple VCards"
 msgstr "Flera VCard"
 
-#: addressbook/gui/widgets/eab-gui-util.c:942
+#: addressbook/gui/widgets/eab-gui-util.c:870
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard för %s"
@@ -2905,7 +2802,7 @@ msgstr[1] "Ny kontakt"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:229
+#: addressbook/gui/widgets/e-addressbook-view.c:231
 #: addressbook/gui/widgets/e-minicard-view.c:467
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
@@ -2923,147 +2820,135 @@ msgstr "Modell"
 msgid "Error modifying card"
 msgstr "Fel vid ändring av kort"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:163
 msgid "Name begins with"
 msgstr "Namn börjar med"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:164
 msgid "Email begins with"
 msgstr "E-postadress börjar med"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:57
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Kategori är"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-#: calendar/gui/cal-search-bar.c:50
+#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Något fält innehåller"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+#: addressbook/gui/widgets/e-addressbook-view.c:172
 msgid "Advanced..."
 msgstr "Avancerat..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:236
+#: addressbook/gui/widgets/e-addressbook-view.c:238
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:249
+#: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Typ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:506
+#: addressbook/gui/widgets/e-addressbook-view.c:508
 #, fuzzy
 msgid "Address Book"
 msgstr "Adressbok"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2076
+#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:2080
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
 msgstr "Spara som VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 msgid "New Contact..."
 msgstr "Ny kontakt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "New Contact List..."
 msgstr "Ny kontaktlista..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Go to Folder..."
 msgstr "Gå till mapp..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Import..."
 msgstr "Importera..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1066
 msgid "Search for Contacts..."
 msgstr "Sök efter kontakter..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Adressbokskällor..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1069
 msgid "Pilot Settings..."
 msgstr "Pilotinställningar..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Vidarebefordra kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
 msgid "Send Message to Contact"
 msgstr "Skicka meddelande till kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Skriv ut"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
+#: addressbook/gui/widgets/e-addressbook-view.c:1077
 msgid "Print Envelope"
 msgstr "Skriv ut kuvert"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
+#: addressbook/gui/widgets/e-addressbook-view.c:1081
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Adressbok..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1080
+#: addressbook/gui/widgets/e-addressbook-view.c:1082
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Adressbok..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Klipp ut"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopiera"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1087
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Klistra in"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:1092
+#: calendar/gui/e-calendar-view.c:1280
 msgid "Current View"
 msgstr "Aktuell vy"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1309
-#, c-format
-msgid ""
-"The addressbook backend for\n"
-"%s\n"
-"has crashed. You will have to restart Evolution in order to use it again"
-msgstr ""
-"Adressboksbakänden för\n"
-"%s\n"
-"har kraschat. Du kommer att behöva starta om Evolution för att kunna använda "
-"det igen"
-
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1667
-#: calendar/gui/cal-search-bar.c:362
+#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Alla kategorier"
 
@@ -3172,7 +3057,7 @@ msgstr "Radio"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-list-view.c:234
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Roll"
@@ -3317,13 +3202,13 @@ msgstr "Evolutions VCard-importör"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: addressbook/printing/e-contact-print.c:998
+#: addressbook/printing/e-contact-print.c:1000
 #, fuzzy
 msgid "Print contacts"
 msgstr "Skriv _ut kontakter..."
 
-#: addressbook/printing/e-contact-print.c:1064
-#: addressbook/printing/e-contact-print.c:1091
+#: addressbook/printing/e-contact-print.c:1066
+#: addressbook/printing/e-contact-print.c:1093
 #, fuzzy
 msgid "Print contact"
 msgstr "Skriv _ut kontakter..."
@@ -3579,16 +3464,22 @@ msgstr ""
 msgid "Impossible internal error."
 msgstr "Internt fel"
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:629
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
 #, fuzzy
 msgid "Can not open file"
 msgstr "Kan inte öppna meddelande"
 
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-msgid "Can not load URI"
-msgstr ""
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "Kunde inte läsa in adressboken"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Kan inte öppna adressboken"
 
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
@@ -3606,7 +3497,7 @@ msgstr "Inget filnamn är angivet."
 msgid "Unnamed List"
 msgstr "Namnlös lista"
 
-#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 #, fuzzy
 msgid "Enter password"
@@ -3889,10 +3780,10 @@ msgid "Whether to show week numbers in date navigator"
 msgstr "Visa v_eckonummer i datumbläddraren"
 
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:88
-#: calendar/gui/gnome-cal.c:1703
-#: camel/providers/groupwise/camel-gw-listener.c:304
-#: camel/providers/groupwise/camel-gw-listener.c:327
+#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/gnome-cal.c:1705
+#: camel/providers/groupwise/camel-gw-listener.c:311
+#: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
 msgstr "Kalender"
 
@@ -3915,7 +3806,7 @@ msgstr ""
 
 #: calendar/gui/calendar-commands.c:363
 #: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:19 filter/filter.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
 msgid "days"
 msgstr "dag"
 
@@ -4065,24 +3956,24 @@ msgstr "Veckovy"
 msgid "Month View"
 msgstr "Månadsvy"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Sammanfattningen innehåller"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Beskrivningen innehåller"
 
-#: calendar/gui/cal-search-bar.c:54
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Kommentaren innehåller"
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:53
 #, fuzzy
 msgid "Location contains"
 msgstr "Beskrivningen innehåller"
 
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
 msgid "Unmatched"
 msgstr "Omatchade"
 
@@ -4103,23 +3994,23 @@ msgstr "Åtkomst nekas för öppnande av kalendern"
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:466
+#: calendar/gui/dialogs/alarm-options.c:467
 msgid "Audio Alarm Options"
 msgstr "Alternativ för ljudalarm"
 
-#: calendar/gui/dialogs/alarm-options.c:475
+#: calendar/gui/dialogs/alarm-options.c:476
 msgid "Message Alarm Options"
 msgstr "Alternativ för meddelandealarm"
 
-#: calendar/gui/dialogs/alarm-options.c:484
+#: calendar/gui/dialogs/alarm-options.c:485
 msgid "Email Alarm Options"
 msgstr "Alternativ för e-postalarm"
 
-#: calendar/gui/dialogs/alarm-options.c:493
+#: calendar/gui/dialogs/alarm-options.c:494
 msgid "Program Alarm Options"
 msgstr "Alternativ för programalarm"
 
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:510
 msgid "Unknown Alarm Options"
 msgstr "Alternativ för okända alarm"
 
@@ -4155,7 +4046,7 @@ msgstr "Skicka till:"
 msgid "With these arguments:"
 msgstr "Med dessa argument:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
 msgid "dialog1"
 msgstr "dialog1"
 
@@ -4164,7 +4055,7 @@ msgid "extra times every"
 msgstr "extra gånger var"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:20 filter/filter.glade.h:16
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr "timme"
 
@@ -4210,7 +4101,7 @@ msgstr "Skicka ett brev"
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Sammanfattning:"
 
@@ -4240,7 +4131,6 @@ msgid "hour(s)"
 msgstr "timme/timmar"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:21
 msgid "minute(s)"
 msgstr "minut(er)"
 
@@ -4248,27 +4138,27 @@ msgstr "minut(er)"
 msgid "start of appointment"
 msgstr "start på möte"
 
-#: calendar/gui/dialogs/calendar-setup.c:170
+#: calendar/gui/dialogs/calendar-setup.c:172
 #, fuzzy
 msgid "You must specify a location to get the calendar from."
 msgstr "Du måste ange ett filnamn."
 
-#: calendar/gui/dialogs/calendar-setup.c:178
+#: calendar/gui/dialogs/calendar-setup.c:180
 #, fuzzy, c-format
 msgid "The source location '%s' is not well-formed."
 msgstr "Metoden som krävs för att läsa in \"%s\" stöds inte"
 
-#: calendar/gui/dialogs/calendar-setup.c:193
+#: calendar/gui/dialogs/calendar-setup.c:195
 #, c-format
 msgid "The source location '%s' is not a webcal source."
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:265
+#: calendar/gui/dialogs/calendar-setup.c:275
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:278
+#: calendar/gui/dialogs/calendar-setup.c:288
 #, c-format
 msgid ""
 "The group '%s' is remote. You must specify a location to get the calendar "
@@ -4290,60 +4180,35 @@ msgstr "Uppgiftslista"
 msgid "C_olor:"
 msgstr "F_ärger"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-#, fuzzy
-msgid "Calendar Properties"
-msgstr "Inställningar för kalendern..."
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
 msgid "Pick a color"
 msgstr "Välj en färg"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:8
-#, fuzzy
-msgid "Remote"
-msgstr "Ta bort"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-#, fuzzy
-msgid "Task List Properties"
-msgstr "Egenskaper för att-göra-listan"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
 #, fuzzy
 msgid "_Add Calendar"
 msgstr "Lägg till i kalender"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
 #, fuzzy
 msgid "_Add Group"
 msgstr "_Lägg till grupp..."
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-#, fuzzy
-msgid "_Refresh Interval:"
-msgstr " _Uppdatera lista "
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
 #, fuzzy
 msgid "_Refresh:"
 msgstr "Uppdatera"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-#, fuzzy
-msgid "_Source URL:"
-msgstr "_Källkod"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
 #, fuzzy
 msgid "_Type:"
 msgstr "Typ:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
 msgid "_URL:"
 msgstr "_URL:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
 msgid "weeks"
 msgstr "veckor"
 
@@ -4453,7 +4318,7 @@ msgid "Display"
 msgstr "_Visning"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:76
 msgid "E_nable"
 msgstr "A_ktivera"
 
@@ -4464,7 +4329,7 @@ msgstr "Ledig-/Upptagenbegäran"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:563
+#: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "fredag"
 
@@ -4478,7 +4343,7 @@ msgstr "minut"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:559
+#: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "måndag"
 
@@ -4488,7 +4353,7 @@ msgstr "_sön"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:564
+#: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "lördag"
 
@@ -4502,7 +4367,7 @@ msgstr "Visa v_eckonummer i datumbläddraren"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "söndag"
 
@@ -4516,7 +4381,7 @@ msgstr "to_r"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:562
+#: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "torsdag"
 
@@ -4530,7 +4395,7 @@ msgstr "Tidsformat:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:560
+#: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "tisdag"
 
@@ -4540,7 +4405,7 @@ msgstr "V_eckan börjar:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:561
+#: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "onsdag"
 
@@ -4574,7 +4439,7 @@ msgid "_Day begins:"
 msgstr "_Dagen börjar:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
-#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:43
@@ -4623,84 +4488,48 @@ msgstr "_ons"
 msgid "before every appointment"
 msgstr "före varje möte"
 
-#: calendar/gui/dialogs/cancel-comp.c:57
-msgid ""
-"The event being deleted is a meeting, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"Evenemanget som tas bort är ett sammanträde. Vill du skicka ett "
-"avbokningsmeddelande?"
-
-#: calendar/gui/dialogs/cancel-comp.c:60
-msgid "Are you sure you want to cancel and delete this meeting?"
-msgstr "Är du säker på att du vill avboka och ta bort detta sammanträde?"
-
-#: calendar/gui/dialogs/cancel-comp.c:66
-msgid ""
-"The task being deleted is assigned, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"Uppgiften som tas bort är tilldelad. Vill du skicka ett "
-"avbrytningsmeddelande?"
-
-#: calendar/gui/dialogs/cancel-comp.c:69
-msgid "Are you sure you want to cancel and delete this task?"
-msgstr "Är du säker på att du vill avbryta och ta bort denna uppgift?"
-
-#: calendar/gui/dialogs/cancel-comp.c:75
-msgid ""
-"The journal entry being deleted is published, would you like to send a "
-"cancellation notice?"
-msgstr ""
-"Dagboksposten som tas bort är publicerad. Vill du skicka ett meddelande om "
-"att det är inställt?"
-
-#: calendar/gui/dialogs/cancel-comp.c:78
-msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr "Är du säker på att du vill avbryta ta bort denna dagbokspost?"
-
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Detta evenemang har tagits bort."
 
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "Denna uppgift har tagits bort."
 
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:68
 msgid "This journal entry has been deleted."
 msgstr "Denna dagbokspost har tagits bort."
 
-#: calendar/gui/dialogs/changed-comp.c:75
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  Du har gjort ändringar. Glöm dessa ändringar och stäng redigeraren?"
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Du har inte gjort några ändringar, stäng redigeraren?"
 
-#: calendar/gui/dialogs/changed-comp.c:82
+#: calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "Detta evenemang har ändrats."
 
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "Denna uppgift har ändrats."
 
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:92
 msgid "This journal entry has been changed."
 msgstr "Denna dagbokspost har ändrats."
 
-#: calendar/gui/dialogs/changed-comp.c:99
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Du har gjort ändringar. Glöm dessa ändringar och uppdatera redigeraren?"
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Du har inte gjort några ändringar, uppdatera redigeraren?"
@@ -4738,7 +4567,7 @@ msgid "No summary"
 msgstr "Ingen sammanfattning"
 
 #: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
 #: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Spara som..."
@@ -4795,102 +4624,54 @@ msgstr "Postdestination"
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:95
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "Är du säker på att du vill ta bort mötet \"%s\""
-
-#: calendar/gui/dialogs/delete-comp.c:98
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "Är du säker på att du vill ta bort detta namnlösa möte?"
-
-#: calendar/gui/dialogs/delete-comp.c:104
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "Är du säker på att du vill ta bort uppgiften \"%s\"?"
-
-#: calendar/gui/dialogs/delete-comp.c:107
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "Är du säker på att du vill ta bort denna namnlösa uppgift?"
-
-#: calendar/gui/dialogs/delete-comp.c:113
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "Är du säker på att du vill ta bort dagboksposten \"%s\"?"
-
-#: calendar/gui/dialogs/delete-comp.c:116
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "Är du säker på att du vill ta bort denna namnlösa dagbokspost?"
-
-#: calendar/gui/dialogs/delete-comp.c:131
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d appointment?"
-msgid_plural "Are you sure you want to delete %d appointments?"
-msgstr[0] "Är du säker på att du vill ta bort %d möten?"
-msgstr[1] "Är du säker på att du vill ta bort %d möten?"
-
-#: calendar/gui/dialogs/delete-comp.c:138
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d task?"
-msgid_plural "Are you sure you want to delete %d tasks?"
-msgstr[0] "Är du säker på att du vill ta bort %d uppgifter?"
-msgstr[1] "Är du säker på att du vill ta bort %d uppgifter?"
-
-#: calendar/gui/dialogs/delete-comp.c:145
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d journal entry?"
-msgid_plural "Are you sure you want to delete %d journal entries?"
-msgstr[0] "Är du säker på att du vill ta bort %d dagboksposter?"
-msgstr[1] "Är du säker på att du vill ta bort %d dagboksposter?"
-
-#: calendar/gui/dialogs/delete-error.c:52
+#: calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "Evenemanget kunde inte tas bort på grund av ett corba-fel"
 
-#: calendar/gui/dialogs/delete-error.c:55
+#: calendar/gui/dialogs/delete-error.c:57
 msgid "The task could not be deleted due to a corba error"
 msgstr "Uppgiften kunde inte tas bort på grund av ett corba-fel"
 
-#: calendar/gui/dialogs/delete-error.c:58
+#: calendar/gui/dialogs/delete-error.c:60
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr "Dagboksposten kunde inte tas bort på grund av ett corba-fel"
 
-#: calendar/gui/dialogs/delete-error.c:61
+#: calendar/gui/dialogs/delete-error.c:63
 msgid "The item could not be deleted due to a corba error"
 msgstr "Objektet kunde inte tas bort på grund av ett corba-fel"
 
-#: calendar/gui/dialogs/delete-error.c:68
+#: calendar/gui/dialogs/delete-error.c:70
 msgid "The event could not be deleted because permission was denied"
 msgstr "Evenemanget kunde inte tas bort på grund av att åtkomst nekades"
 
-#: calendar/gui/dialogs/delete-error.c:71
+#: calendar/gui/dialogs/delete-error.c:73
 msgid "The task could not be deleted because permission was denied"
 msgstr "Uppgiften kunde inte tas bort på grund av att åtkomst nekades"
 
-#: calendar/gui/dialogs/delete-error.c:74
+#: calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr "Dagboksposten kunde inte tas bort på grund av att åtkomst nekades"
 
-#: calendar/gui/dialogs/delete-error.c:77
+#: calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
 msgstr "Objektet kunde inte tas bort på grund av åtkomst nekades"
 
-#: calendar/gui/dialogs/delete-error.c:84
+#: calendar/gui/dialogs/delete-error.c:86
 #, fuzzy
 msgid "The event could not be deleted due to an error"
 msgstr "Evenemanget kunde inte tas bort på grund av ett corba-fel"
 
-#: calendar/gui/dialogs/delete-error.c:87
+#: calendar/gui/dialogs/delete-error.c:89
 #, fuzzy
 msgid "The task could not be deleted due to an error"
 msgstr "Uppgiften kunde inte tas bort på grund av ett corba-fel"
 
-#: calendar/gui/dialogs/delete-error.c:90
+#: calendar/gui/dialogs/delete-error.c:92
 #, fuzzy
 msgid "The journal entry could not be deleted due to an error"
 msgstr "Dagboksposten kunde inte tas bort på grund av ett corba-fel"
 
-#: calendar/gui/dialogs/delete-error.c:93
+#: calendar/gui/dialogs/delete-error.c:95
 #, fuzzy
 msgid "The item could not be deleted due to an error"
 msgstr "Objektet kunde inte tas bort på grund av ett corba-fel"
@@ -5025,11 +4806,11 @@ msgstr "_Starttid:"
 
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:3
+#: calendar/gui/dialogs/meeting-page.glade.h:4
 #: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
 #: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1559
-#: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:100
+#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
+#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
@@ -5055,8 +4836,8 @@ msgstr "_Delegera till..."
 #. FIXME: need to disable for undeletable folders
 #: calendar/gui/dialogs/meeting-page.c:655
 #: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1310 calendar/gui/e-calendar-view.c:1342
-#: mail/em-folder-tree.c:2557 mail/em-folder-view.c:919
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
+#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -5064,7 +4845,7 @@ msgid "_Delete"
 msgstr "_Ta bort"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:240
+#: calendar/gui/e-meeting-list-view.c:218
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Deltagare"
@@ -5100,16 +4881,15 @@ msgid "Member"
 msgstr "Medlem"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "OSA"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
-#: mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-list-view.c:248
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
 
@@ -5118,20 +4898,20 @@ msgstr "Status"
 msgid "Add A_ttendee"
 msgstr "Alla deltagare"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "Add attendees from addressbook."
+msgstr "Lägg till avsändaren i adress_boken"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Organisatör:"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
+#: calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "_Change Organizer"
 msgstr "_Ändra organisatör"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-#: calendar/gui/e-meeting-time-sel.c:417
-msgid "_Invite Others..."
-msgstr "Bjud _in andra..."
-
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 #, fuzzy
 msgid "<b>Calendar options</b>"
@@ -5288,7 +5068,7 @@ msgid "_No recurrence"
 msgstr "_Ingen upprepning"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:450
+#: composer/e-msg-composer-attachment-bar.c:453
 msgid "_Remove"
 msgstr "_Ta bort"
 
@@ -5320,54 +5100,20 @@ msgstr "veckor"
 msgid "year(s)"
 msgstr "år"
 
-#: calendar/gui/dialogs/save-comp.c:53
-msgid ""
-"This event has been changed, but has not been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Detta evenemang har ändrats, men har inte sparats.\n"
-"\n"
-"Vill du spara dina ändringar?"
-
-#: calendar/gui/dialogs/save-comp.c:57
-msgid "_Discard Changes"
-msgstr "_Förkasta ändringar"
-
-#: calendar/gui/dialogs/save-comp.c:62
-msgid "Save Event"
-msgstr "Spara evenemang"
-
-#: calendar/gui/dialogs/select-source-dialog.c:65
+#: calendar/gui/dialogs/select-source-dialog.c:69
 #, fuzzy
 msgid "Select destination"
 msgstr "Postdestination"
 
-#: calendar/gui/dialogs/select-source-dialog.c:86
+#: calendar/gui/dialogs/select-source-dialog.c:90
 #, fuzzy
 msgid "_Destination"
 msgstr "Ta bort denna mapp"
 
-#: calendar/gui/dialogs/select-source-dialog.c:88
+#: calendar/gui/dialogs/select-source-dialog.c:92
 msgid "Task List"
 msgstr "Uppgiftslista"
 
-#: calendar/gui/dialogs/send-comp.c:57
-msgid "The meeting information has been created. Send it?"
-msgstr "Sammanträdesinformationen har skapats. Skicka den?"
-
-#: calendar/gui/dialogs/send-comp.c:60
-msgid "The meeting information has changed. Send an updated version?"
-msgstr "Sammanträdesinformationen har ändrats. Skicka en uppdaterad version?"
-
-#: calendar/gui/dialogs/send-comp.c:67
-msgid "The task assignment information has been created. Send it?"
-msgstr "Uppgiftstilldelningsinformationen har ändrats. Skicka den?"
-
-#: calendar/gui/dialogs/send-comp.c:71
-msgid "The task information has changed. Send an updated version?"
-msgstr "Uppgiftsinformationen har ändrats. Skicka en uppdaterad version?"
-
 #: calendar/gui/dialogs/task-details-page.c:406
 msgid "Completed date is wrong"
 msgstr "Utförtdatumet är fel"
@@ -5387,7 +5133,7 @@ msgstr "Färdigt"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #: calendar/gui/e-cal-component-preview.c:249
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:960
 msgid "High"
 msgstr "Hög"
 
@@ -5401,14 +5147,14 @@ msgstr "Pågår"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:253
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:958
 msgid "Low"
 msgstr "Låg"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:251
 #: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:957
+#: mail/message-list.c:959
 msgid "Normal"
 msgstr "Normal"
 
@@ -5467,8 +5213,8 @@ msgstr "_Konfidentiellt"
 
 #: calendar/gui/dialogs/task-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
+#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Beskrivning:"
 
@@ -5642,7 +5388,7 @@ msgstr "Förfallodatum:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:950
+#: calendar/gui/e-itip-control.c:943
 msgid "Status:"
 msgstr "Status:"
 
@@ -5728,12 +5474,12 @@ msgstr "Upptagen"
 msgid "Deleting selected objects"
 msgstr "Tar bort markerade objekt"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
 msgid "Updating objects"
 msgstr "Uppdaterar objekt"
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1370
+#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
 #: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Öppna"
@@ -5744,15 +5490,15 @@ msgid "Open _Web Page"
 msgstr "_Öppna meddelande"
 
 #: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1291 calendar/gui/e-calendar-view.c:1376
-#: mail/em-folder-view.c:896 mail/em-popup.c:690 mail/em-popup.c:806
+#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
+#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "_Spara som..."
 
 #: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1292
-#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
+#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
@@ -5760,24 +5506,24 @@ msgid "_Print..."
 msgstr "Skriv _ut..."
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Klipp _ut"
 
 #: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1338
-#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2550
-#: mail/message-list.c:1644 ui/evolution-addressbook.xml.h:31
+#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
+#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
+#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Kopiera"
 
 #: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1273 calendar/gui/e-calendar-view.c:1299
-#: calendar/gui/e-calendar-view.c:1372 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
+#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
@@ -5846,71 +5592,71 @@ msgstr "Sammanfattning"
 msgid "Task sort"
 msgstr "Sortera efter uppgift"
 
-#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
 msgid "New _Appointment..."
 msgstr "Nytt _möte..."
 
-#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
+#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
 msgid "New All Day _Event"
 msgstr "Nytt _heldagsevenemang"
 
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
+#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
 msgid "New Meeting"
 msgstr "Nytt sammanträde"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
 msgid "New Task"
 msgstr "Ny uppgift"
 
-#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Markera trå_d"
 
-#: calendar/gui/e-calendar-view.c:1280
+#: calendar/gui/e-calendar-view.c:1283
 #, fuzzy
 msgid "_Select Date..."
 msgstr "Markera"
 
-#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publicera ledig-/upptageninformation"
 
-#: calendar/gui/e-calendar-view.c:1303
+#: calendar/gui/e-calendar-view.c:1306
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Kopiera till mapp..."
 
-#: calendar/gui/e-calendar-view.c:1304
+#: calendar/gui/e-calendar-view.c:1307
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "Fl_ytta till mapp..."
 
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1308
 msgid "_Schedule Meeting..."
 msgstr "_Boka sammanträde..."
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1309
 msgid "_Forward as iCalendar..."
 msgstr "_Vidarebefordra som iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
 msgid "Delete this _Occurrence"
 msgstr "Ta bort denna f_örekomst"
 
-#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
 msgid "Delete _All Occurrences"
 msgstr "Ta bort _alla förekomster"
 
-#: calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1349
 msgid "Go to _Today"
 msgstr "Gå till _idag"
 
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1351
 msgid "_Go to Date..."
 msgstr "_Gå till datum..."
 
-#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "_Inställningar..."
 
@@ -5924,9 +5670,9 @@ msgstr "Startdatum"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:967 calendar/gui/e-itip-control.c:1169
-#: calendar/gui/e-meeting-list-view.c:144
-#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
 #: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
 #: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
 #: camel/camel-tcp-stream-openssl.c:631
@@ -5952,13 +5698,13 @@ msgid "Assigned"
 msgstr "Tilldelad"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr "Ja"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "Nej"
 
@@ -5970,7 +5716,7 @@ msgstr "N"
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
 msgid "E"
 msgstr "Ö"
 
@@ -6042,406 +5788,410 @@ msgstr "%d %b"
 msgid "%02i minute divisions"
 msgstr "%02i minutdivisioner"
 
-#: calendar/gui/e-itip-control.c:592
+#: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
 msgstr "Ja, (Komplex upprepning)"
 
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:596
 #, fuzzy, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Varje dag"
 msgstr[1] "Varje dag"
 
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:601
 #, fuzzy, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Varje vecka"
 msgstr[1] "Varje vecka"
 
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:603
 #, fuzzy, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "Varje vecka på "
 msgstr[1] "Varje vecka på "
 
-#: calendar/gui/e-itip-control.c:618
+#: calendar/gui/e-itip-control.c:611
 msgid " and "
 msgstr " och "
 
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:618
 #, c-format
 msgid "The %s day of "
 msgstr "Den %s dagen i "
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:631
 #, c-format
 msgid "The %s %s of "
 msgstr "Den %s %s i "
 
-#: calendar/gui/e-itip-control.c:645
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "varje månad"
 msgstr[1] "varje månad"
 
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:642
 #, fuzzy, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Varje år"
 msgstr[1] "Varje år"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:653
 #, fuzzy, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] " totalt %d gånger"
 msgstr[1] " totalt %d gånger"
 
-#: calendar/gui/e-itip-control.c:669
+#: calendar/gui/e-itip-control.c:662
 msgid ", ending on "
 msgstr ", med slut den "
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:686
 msgid "<b>Starts:</b> "
 msgstr "<b>Börjar:</b>"
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:696
 msgid "<b>Ends:</b> "
 msgstr "<b>Slutar:<b>"
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:716
 msgid "<b>Completed:</b> "
 msgstr "<b>Färdigt:</b> "
 
-#: calendar/gui/e-itip-control.c:733
+#: calendar/gui/e-itip-control.c:726
 msgid "<b>Due:</b> "
 msgstr "<b>Ska utföras:</b> "
 
-#: calendar/gui/e-itip-control.c:771 calendar/gui/e-itip-control.c:827
+#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
 msgid "iCalendar Information"
 msgstr "iCalendar-information"
 
 #. Title
-#: calendar/gui/e-itip-control.c:788
+#: calendar/gui/e-itip-control.c:781
 msgid "iCalendar Error"
 msgstr "iCalendar-fel"
 
-#: calendar/gui/e-itip-control.c:859 calendar/gui/e-itip-control.c:875
-#: calendar/gui/e-itip-control.c:886 calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
 msgid "An unknown person"
 msgstr "En okänd person"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:910
+#: calendar/gui/e-itip-control.c:903
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 "<br> Granska följande information, och välj sedan en åtgärd från menyn nedan."
 
-#: calendar/gui/e-itip-control.c:925
+#: calendar/gui/e-itip-control.c:918
 msgid "<i>None</i>"
 msgstr "<i>Ingen</i>"
 
-#: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:929
+msgid "Location:"
+msgstr "Plats:"
+
+#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Godtaget"
 
-#: calendar/gui/e-itip-control.c:959 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Preliminärt godtaget"
 
-#: calendar/gui/e-itip-control.c:963 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Avböjt"
 
-#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.c:1050
-#: calendar/gui/e-itip-control.c:1076 calendar/gui/e-itip-control.c:1089
-#: calendar/gui/e-itip-control.c:1102 calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
 msgid "Choose an action:"
 msgstr "Välj en åtgärd:"
 
-#: calendar/gui/e-itip-control.c:1023
+#: calendar/gui/e-itip-control.c:1016
 msgid "Update"
 msgstr "Uppdatera"
 
-#: calendar/gui/e-itip-control.c:1024 calendar/gui/e-itip-control.c:1055
-#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1091
-#: calendar/gui/e-itip-control.c:1104 calendar/gui/e-itip-control.c:1117
-#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
+#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1044
 msgid "Accept"
 msgstr "Acceptera"
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1045
 msgid "Tentatively accept"
 msgstr "Acceptera preliminärt"
 
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1046
 msgid "Decline"
 msgstr "Neka"
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1070
 msgid "Send Free/Busy Information"
 msgstr "Skicka ledig-/upptageninformation"
 
-#: calendar/gui/e-itip-control.c:1090
+#: calendar/gui/e-itip-control.c:1083
 msgid "Update respondent status"
 msgstr "Uppdatera svarandestatus"
 
-#: calendar/gui/e-itip-control.c:1103
+#: calendar/gui/e-itip-control.c:1096
 msgid "Send Latest Information"
 msgstr "Skicka senaste information"
 
-#: calendar/gui/e-itip-control.c:1116 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1185
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> har publicerat sammanträdesinformation."
 
-#: calendar/gui/e-itip-control.c:1193
+#: calendar/gui/e-itip-control.c:1186
 msgid "Meeting Information"
 msgstr "Sammanträdesinformation"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1191
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> begär att %s närvarar vid ett sammanträde."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1193
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> begär din närvaro vid ett sammanträde."
 
-#: calendar/gui/e-itip-control.c:1201
+#: calendar/gui/e-itip-control.c:1194
 msgid "Meeting Proposal"
 msgstr "Sammanträdesförslag"
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> vill lägga till i ett befintligt sammanträde."
 
-#: calendar/gui/e-itip-control.c:1206
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Update"
 msgstr "Sammanträdesuppdatering"
 
-#: calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1203
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> vill få den senaste sammanträdesinformationen."
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1204
 msgid "Meeting Update Request"
 msgstr "Begäran av sammanträdesuppdatering"
 
-#: calendar/gui/e-itip-control.c:1218
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> har svarat på en sammanträdesbegäran."
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Reply"
 msgstr "Sammanträdessvar"
 
-#: calendar/gui/e-itip-control.c:1226
+#: calendar/gui/e-itip-control.c:1219
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> har avbokat ett sammanträde."
 
-#: calendar/gui/e-itip-control.c:1227
+#: calendar/gui/e-itip-control.c:1220
 msgid "Meeting Cancellation"
 msgstr "Sammanträdesavbokning"
 
-#: calendar/gui/e-itip-control.c:1234 calendar/gui/e-itip-control.c:1302
-#: calendar/gui/e-itip-control.c:1337
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1330
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> har skickat ett obegripligt meddelande."
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1228
 msgid "Bad Meeting Message"
 msgstr "Felaktigt sammanträdesmeddelande"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1253
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> har publicerat uppgiftsinformation."
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1254
 msgid "Task Information"
 msgstr "Uppgiftsinformation"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1259
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> begär att %s utför en uppgift."
 
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> begär att du utför en uppgift."
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1262
 msgid "Task Proposal"
 msgstr "Uppgiftsförslag"
 
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> vill lägga till i en befintlig uppgift."
 
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Update"
 msgstr "Uppgiftsuppdatering"
 
-#: calendar/gui/e-itip-control.c:1278
+#: calendar/gui/e-itip-control.c:1271
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> vill få den senaste uppgiftsinformationen."
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1272
 msgid "Task Update Request"
 msgstr "Begäran om uppgiftsuppdatering"
 
-#: calendar/gui/e-itip-control.c:1286
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> har svarat på en uppgiftstilldelning."
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Reply"
 msgstr "Uppgiftssvar"
 
-#: calendar/gui/e-itip-control.c:1294
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> har avbokat en uppgift."
 
-#: calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1288
 msgid "Task Cancellation"
 msgstr "Uppgiftsavbokning"
 
-#: calendar/gui/e-itip-control.c:1303
+#: calendar/gui/e-itip-control.c:1296
 msgid "Bad Task Message"
 msgstr "Felaktigt uppgiftsmeddelande"
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1315
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> har publicerat ledig-/upptageninformation."
 
-#: calendar/gui/e-itip-control.c:1323
+#: calendar/gui/e-itip-control.c:1316
 msgid "Free/Busy Information"
 msgstr "Ledig-/upptageninformation"
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> begär din ledig-/upptageninformation."
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1321
 msgid "Free/Busy Request"
 msgstr "Ledig-/Upptagenbegäran"
 
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1325
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> har svarat på en ledig-/upptagenbegäran."
 
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1326
 msgid "Free/Busy Reply"
 msgstr "Ledig-/Upptagensvar"
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1331
 msgid "Bad Free/Busy Message"
 msgstr "Felaktigt ledig-/upptagenmeddelande"
 
-#: calendar/gui/e-itip-control.c:1413
+#: calendar/gui/e-itip-control.c:1406
 msgid "The message does not appear to be properly formed"
 msgstr "Meddelandet verkar inte vara korrekt utformat"
 
-#: calendar/gui/e-itip-control.c:1472
+#: calendar/gui/e-itip-control.c:1465
 msgid "The message contains only unsupported requests."
 msgstr "Meddelandet innehåller typer av begäran som inte stöds."
 
-#: calendar/gui/e-itip-control.c:1503
+#: calendar/gui/e-itip-control.c:1496
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Bilagan innehåller inte ett giltigt kalendermeddelande"
 
-#: calendar/gui/e-itip-control.c:1535
+#: calendar/gui/e-itip-control.c:1528
 msgid "The attachment has no viewable calendar items"
 msgstr "Bilagan har inga visningsbara kalenderobjekt"
 
-#: calendar/gui/e-itip-control.c:1769
+#: calendar/gui/e-itip-control.c:1762
 msgid "Update complete\n"
 msgstr "Uppdateringen färdig\n"
 
-#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
+#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Närvarostatusen kan inte uppdateras eftersom objektet inte längre finns"
 
-#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objektet är ogiltigt och kan inte uppdateras\n"
 
-#: calendar/gui/e-itip-control.c:1825
+#: calendar/gui/e-itip-control.c:1818
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Detta svar är inte från en nuvarande deltagare. Lägg till som deltagare?"
 
-#: calendar/gui/e-itip-control.c:1837
+#: calendar/gui/e-itip-control.c:1830
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Närvarostatus kunde inte uppdateras på grund av ogiltig status!\n"
 
 # Detta är inte diskussionsgrupper utan nyheter
-#: calendar/gui/e-itip-control.c:1856
+#: calendar/gui/e-itip-control.c:1849
 msgid "There was an error on the CORBA system\n"
 msgstr "Ett fel uppstod i CORBA-systemet\n"
 
-#: calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1852
 msgid "Object could not be found\n"
 msgstr "Objektet kunde inte hittas\n"
 
-#: calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1855
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Du har inte rätt rättigheter för att uppdatera kalendern\n"
 
-#: calendar/gui/e-itip-control.c:1865
+#: calendar/gui/e-itip-control.c:1858
 msgid "Attendee status updated\n"
 msgstr "Närvarostatus är uppdaterad\n"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1861
 msgid "Attendee status could not be updated!\n"
 msgstr "Närvarostatus kunde inte uppdateras!\n"
 
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1892
 msgid "Removal Complete"
 msgstr "Borttagning färdig"
 
-#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
 msgid "Item sent!\n"
 msgstr "Objektet skickat!\n"
 
-#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
+#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
 msgid "The item could not be sent!\n"
 msgstr "Objektet kunde inte skickas!\n"
 
@@ -6482,74 +6232,74 @@ msgstr "slutdatum"
 msgid "date-start"
 msgstr "startdatum"
 
-#: calendar/gui/e-meeting-list-view.c:62
+#: calendar/gui/e-meeting-list-view.c:59
 msgid "Chair Persons"
 msgstr "Ordförandepersoner"
 
-#: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:479
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
 msgid "Required Participants"
 msgstr "Nödvändiga deltagare"
 
-#: calendar/gui/e-meeting-list-view.c:64
+#: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Valfria deltagare"
 
-#: calendar/gui/e-meeting-list-view.c:65
+#: calendar/gui/e-meeting-list-view.c:62
 msgid "Resources"
 msgstr "Resurser"
 
-#: calendar/gui/e-meeting-list-view.c:140 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
 #: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr "Person"
 
-#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "Grupp"
 
-#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr "Resurs"
 
-#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr "Rum"
 
-#: calendar/gui/e-meeting-list-view.c:154 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr "Mötesordförande"
 
-#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:127
 #: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
 msgid "Required Participant"
 msgstr "Nödvändig deltagare"
 
-#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr "Valfri deltagare"
 
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr "Icke-deltagare"
 
-#: calendar/gui/e-meeting-list-view.c:179 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:177
 #: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
 msgid "Needs Action"
 msgstr "Behöver åtgärd"
 
-#: calendar/gui/e-meeting-list-view.c:182 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
 #: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "Preliminärt"
 
-#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr "Delegerat"
@@ -6566,20 +6316,28 @@ msgstr "Inte inne"
 msgid "No Information"
 msgstr "Ingen information"
 
+#: calendar/gui/e-meeting-time-sel.c:417
+#, fuzzy
+msgid "Add attendees from addressbook"
+msgstr "Lägg till avsändaren i adress_boken"
+
 #: calendar/gui/e-meeting-time-sel.c:440
 msgid "_Options"
 msgstr "_Alternativ"
 
 #: calendar/gui/e-meeting-time-sel.c:457
-msgid "Show _Only Working Hours"
+#, fuzzy
+msgid "Show _only working hours"
 msgstr "Visa _endast arbetstimmar"
 
 #: calendar/gui/e-meeting-time-sel.c:467
-msgid "Show _Zoomed Out"
+#, fuzzy
+msgid "Show _zoomed out"
 msgstr "Visa ut_zoomade"
 
 #: calendar/gui/e-meeting-time-sel.c:482
-msgid "_Update Free/Busy"
+#, fuzzy
+msgid "_Update free/busy"
 msgstr "_Uppdatera ledig/upptagen"
 
 #: calendar/gui/e-meeting-time-sel.c:497
@@ -6595,19 +6353,23 @@ msgid ">_>"
 msgstr ">_>"
 
 #: calendar/gui/e-meeting-time-sel.c:547
-msgid "_All People and Resources"
+#, fuzzy
+msgid "_All people and resources"
 msgstr "_Alla människor och resurser"
 
 #: calendar/gui/e-meeting-time-sel.c:556
-msgid "All _People and One Resource"
+#, fuzzy
+msgid "All _people and one resource"
 msgstr "Alla _människor och en resurs"
 
 #: calendar/gui/e-meeting-time-sel.c:565
-msgid "_Required People"
+#, fuzzy
+msgid "_Required people"
 msgstr "Folk som k_rävs"
 
 #: calendar/gui/e-meeting-time-sel.c:574
-msgid "Required People and _One Resource"
+#, fuzzy
+msgid "Required people and _one resource"
 msgstr "Folk som krävs _och en resurs"
 
 #: calendar/gui/e-meeting-time-sel.c:593
@@ -6645,7 +6407,7 @@ msgstr "%Y-%m-%d"
 msgid "Enter the password for %s"
 msgstr "Ange lösenord för %s"
 
-#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6654,19 +6416,14 @@ msgstr ""
 "Fel vid %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-
 #. FIXME Loading should be async
 #. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:686
+#: calendar/gui/e-tasks.c:801
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Öppnar uppgifter i %s"
 
-#: calendar/gui/e-tasks.c:709
+#: calendar/gui/e-tasks.c:824
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6675,53 +6432,48 @@ msgstr ""
 "Fel vid %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:730
+#: calendar/gui/e-tasks.c:845
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Läser in bilder"
 
-#: calendar/gui/e-tasks.c:834
+#: calendar/gui/e-tasks.c:949
 msgid "Completing tasks..."
 msgstr "Färdigställer uppgifter..."
 
-#: calendar/gui/e-tasks.c:857
+#: calendar/gui/e-tasks.c:972
 msgid "Deleting selected objects..."
 msgstr "Tar bort markerade objekt..."
 
-#: calendar/gui/e-tasks.c:884
+#: calendar/gui/e-tasks.c:999
 msgid "Expunging"
 msgstr "Utplånar"
 
-#: calendar/gui/e-tasks.c:960
+#: calendar/gui/e-tasks.c:1075
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
-#: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
+#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
+#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
 #: calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:705
 msgid "Tasks"
 msgstr "Uppgifter"
 
-#: calendar/gui/gnome-cal.c:1876
+#: calendar/gui/gnome-cal.c:1878
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Inga möten"
 
-#: calendar/gui/gnome-cal.c:1895
+#: calendar/gui/gnome-cal.c:1897
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Öppnar uppgifter i %s"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1920
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Öppna i %s..."
 
-#: calendar/gui/gnome-cal.c:2048
-#, c-format
-msgid "The calendar backend for '%s' has crashed."
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:2894
+#: calendar/gui/gnome-cal.c:2906
 #, fuzzy
 msgid "Purging"
 msgstr "Skriv ut"
@@ -6916,7 +6668,7 @@ msgid "On The Web"
 msgstr ""
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 
@@ -6927,7 +6679,7 @@ msgid "Unable to migrate calendar `%s'"
 msgstr "Åtkomst nekas för öppnande av kalendern"
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:869
+#: calendar/gui/migration.c:889
 #, fuzzy, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Kan inte öppna adressboken"
@@ -7163,73 +6915,73 @@ msgstr "Skriv ut objekt"
 msgid "Print Setup"
 msgstr "Skrivarinställningar"
 
-#: calendar/gui/tasks-component.c:303
+#: calendar/gui/tasks-component.c:313
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:371
 #, fuzzy
 msgid "New Task List"
 msgstr "Uppgiftslista"
 
-#: calendar/gui/tasks-component.c:398
+#: calendar/gui/tasks-component.c:408
 #, fuzzy, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "Inga uppgifter"
 msgstr[1] "Inga uppgifter"
 
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] "%d markerade"
 msgstr[1] "%d markerade"
 
-#: calendar/gui/tasks-component.c:447
+#: calendar/gui/tasks-component.c:457
 #, fuzzy
 msgid "Failed upgrading tasks."
 msgstr "Läser in bilder"
 
-#: calendar/gui/tasks-component.c:526
+#: calendar/gui/tasks-component.c:749
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:538
+#: calendar/gui/tasks-component.c:761
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:576
+#: calendar/gui/tasks-component.c:799
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:804
+#: calendar/gui/tasks-component.c:1040
 msgid "New task"
 msgstr "Ny uppgift"
 
-#: calendar/gui/tasks-component.c:805
+#: calendar/gui/tasks-component.c:1041
 msgid "_Task"
 msgstr "_Uppgift"
 
-#: calendar/gui/tasks-component.c:806
+#: calendar/gui/tasks-component.c:1042
 msgid "Create a new task"
 msgstr "Skapa en ny uppgift"
 
-#: calendar/gui/tasks-component.c:812
+#: calendar/gui/tasks-component.c:1048
 #, fuzzy
 msgid "New tasks group"
 msgstr "Diskussionsgruppskällor"
 
-#: calendar/gui/tasks-component.c:813
+#: calendar/gui/tasks-component.c:1049
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Uppgiftslista"
 
-#: calendar/gui/tasks-component.c:814
+#: calendar/gui/tasks-component.c:1050
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Skapa en ny uppgift"
@@ -8998,12 +8750,12 @@ msgstr "Fel vid körning av filtersökning: %s: %s"
 msgid "Unsupported operation: append message: for %s"
 msgstr "Åtgärden stöds inte: lägg till meddelande: för %s"
 
-#: camel/camel-folder.c:1259
+#: camel/camel-folder.c:1262
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Åtgärden stöds inte: sökning med uttryck: för %s"
 
-#: camel/camel-folder.c:1299
+#: camel/camel-folder.c:1302
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Åtgärden stöds inte: sökning med uid: för %s"
@@ -9016,11 +8768,16 @@ msgstr "Flyttar meddelanden"
 msgid "Copying messages"
 msgstr "Kopierar meddelanden"
 
-#: camel/camel-folder.c:1666
-msgid "Learning junk and/or non junk message(s)"
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Lansing"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
 msgstr ""
 
-#: camel/camel-folder.c:1695
+#: camel/camel-folder.c:1701
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "Hämtar %d meddelande(n)"
@@ -9055,17 +8812,17 @@ msgstr ""
 msgid "(match-threads) requires a match type string"
 msgstr ""
 
-#: camel/camel-folder-search.c:785
+#: camel/camel-folder-search.c:784
 #, fuzzy
 msgid "(match-threads) expects an array result"
 msgstr "(matcha-alla) kräver ett ensamt booleskt resultat"
 
-#: camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:790
 #, fuzzy
 msgid "(match-threads) requires the folder set"
 msgstr "(matcha-alla) kräver ett ensamt booleskt resultat"
 
-#: camel/camel-folder-search.c:880
+#: camel/camel-folder-search.c:879
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Utför fråga på okänt huvud: %s"
@@ -9100,7 +8857,8 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
 #: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:706
+#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Avbruten."
@@ -9487,7 +9245,7 @@ msgstr "De refererade kreditiven har gått ut."
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1212
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Felaktigt autentiseringssvar från servern."
 
@@ -9877,40 +9635,40 @@ msgstr "Kommandot inte implementerat"
 msgid "export keys: unimplemented"
 msgstr ""
 
-#: camel/camel-store.c:214
+#: camel/camel-store.c:213
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Kan inte få tag i mapp: Ogiltig åtgärd på detta lager"
 
-#: camel/camel-store.c:244
+#: camel/camel-store.c:243
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr "Kunde inte byta namn på mappen \"%s\": %s existerar"
 
-#: camel/camel-store.c:295
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Kan inte skapa mapp: Ogiltig åtgärd på detta lager"
 
-#: camel/camel-store.c:323
+#: camel/camel-store.c:325
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Kunde inte byta namn på mappen \"%s\": %s existerar"
 
-#: camel/camel-store.c:387 camel/camel-vee-store.c:354
+#: camel/camel-store.c:389 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kan inte ta bort mapp: %s: Ogiltig åtgärd"
 
-#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#: camel/camel-store.c:439 camel/camel-vee-store.c:387
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kan inte byta namn på mapp: %s: Ogiltig åtgärd"
 
-#: camel/camel-store.c:811
+#: camel/camel-store.c:777
 msgid "Trash"
 msgstr "Papperskorg"
 
-#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
-#: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/mail-config.glade.h:95
+#: ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
 msgstr "juni"
@@ -10144,12 +9902,12 @@ msgstr "Det finns inget sådant meddelande %s i %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Kan inte kopiera eller flytta meddelanden till en virtuell mapp"
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:374
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kan inte ta bort mapp: %s: Det finns ingen sådan mapp"
 
-#: camel/camel-vee-store.c:398
+#: camel/camel-vee-store.c:395
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kan inte byta namn på mapp: %s: Det finns ingen sådan mapp"
@@ -10196,32 +9954,32 @@ msgstr "Lägg till i kalender"
 msgid "Post Office Agent SOAP Port:"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:80
+#: camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "Novell GroupWise"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:82
+#: camel/providers/groupwise/camel-groupwise-provider.c:85
 msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: camel/providers/groupwise/camel-groupwise-provider.c:100
 #: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
 msgid "Password"
 msgstr "Lösenord"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:99
+#: camel/providers/groupwise/camel-groupwise-provider.c:102
 #: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Detta alternativ ansluter till IMAP-servern med ett lösenord i klartext."
 
-#: camel/providers/groupwise/camel-gw-listener.c:305
-#: camel/providers/groupwise/camel-gw-listener.c:328
+#: camel/providers/groupwise/camel-gw-listener.c:312
+#: camel/providers/groupwise/camel-gw-listener.c:335
 #, fuzzy
 msgid "Checklist"
 msgstr "Kraftigt fuktdis"
@@ -10367,13 +10125,13 @@ msgstr ""
 "Detta alternativ ansluter till IMAP-servern med ett lösenord i klartext."
 
 #: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:429
+#: camel/providers/imap/camel-imap-store.c:428
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP-server %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:431
+#: camel/providers/imap/camel-imap-store.c:430
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP-tjänst för %s på %s"
@@ -10383,7 +10141,7 @@ msgstr "IMAP-tjänst för %s på %s"
 #: camel/providers/imap/camel-imap-store.c:551
 #: camel/providers/imap/camel-imap-store.c:571
 #: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
+#: camel/providers/nntp/camel-nntp-store.c:209
 #: camel/providers/pop3/camel-pop3-store.c:175
 #: camel/providers/smtp/camel-smtp-transport.c:269
 #: camel/providers/smtp/camel-smtp-transport.c:285
@@ -10401,10 +10159,10 @@ msgstr "TLS är inte tillgänglig"
 
 #: camel/providers/imap4/camel-imap4-store.c:222
 #: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:815
+#: camel/providers/imap/camel-imap-store.c:845
 #: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:137
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
 #: camel/providers/pop3/camel-pop3-store.c:192
 msgid "Connection cancelled"
 msgstr "Anslutning avbruten"
@@ -10417,8 +10175,8 @@ msgid ""
 msgstr "Misslyckades med att ansluta till IMAP-servern %s i säkert läge: %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:649
-#: camel/providers/imap/camel-imap-store.c:680
+#: camel/providers/imap/camel-imap-store.c:679
+#: camel/providers/imap/camel-imap-store.c:710
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Misslyckades med att ansluta till IMAP-servern %s i säkert läge: %s"
@@ -10427,7 +10185,7 @@ msgstr "Misslyckades med att ansluta till IMAP-servern %s i säkert läge: %s"
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1109
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
 msgid "Unknown error"
 msgstr "Okänt fel"
 
@@ -10455,8 +10213,8 @@ msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr "Kan inte få mapp: %s: %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1857
-#: camel/providers/imap/camel-imap-store.c:2235
+#: camel/providers/imap/camel-imap-store.c:1885
+#: camel/providers/imap/camel-imap-store.c:2263
 #, fuzzy, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -10539,12 +10297,12 @@ msgstr "Servern kopplade ifrån oväntat: %s"
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3168
+#: camel/providers/imap/camel-imap-store.c:3194
 msgid "Operation cancelled"
 msgstr "Åtgärden avbruten"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3171
+#: camel/providers/imap/camel-imap-store.c:3197
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Servern kopplade ifrån oväntat: %s"
@@ -10608,13 +10366,6 @@ msgid "Unable to retrieve message: %s"
 msgstr "Kan inte hämta meddelande: %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:219
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -10624,15 +10375,15 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-mbox-folder.c:418
+#: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
 msgstr "Det finns inget sådant meddelande"
 
 #: camel/providers/imap/camel-imap-folder.c:2019
-#: camel/providers/imap/camel-imap-folder.c:2621
-#: camel/providers/nntp/camel-nntp-folder.c:238
+#: camel/providers/imap/camel-imap-folder.c:2622
+#: camel/providers/nntp/camel-nntp-folder.c:220
 msgid "This message is not currently available"
 msgstr "Detta meddelande är inte tillgängligt för tillfället"
 
@@ -10641,7 +10392,23 @@ msgstr "Detta meddelande är inte tillgängligt för tillfället"
 msgid "Fetching summary information for new messages"
 msgstr "Hämtar meddelandeinformation för nya meddelanden"
 
-#: camel/providers/imap/camel-imap-folder.c:2659
+#: camel/providers/imap/camel-imap-folder.c:2463
+#, c-format
+msgid "Incomplete server response: no information provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2471
+#, c-format
+msgid "Incomplete server response: no UID provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2484
+#, c-format
+msgid ""
+"Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2660
 msgid "Could not find message body in FETCH response."
 msgstr "Kunde inte hitta meddelandetext i FETCH-svaret."
 
@@ -10705,43 +10472,43 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "För läsande och lagrande av e-post på IMAP-servrar."
 
-#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/imap/camel-imap-store.c:680
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS-tillägg stöds inte."
 
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:711
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL-förhandlingar misslyckades"
 
-#: camel/providers/imap/camel-imap-store.c:818
+#: camel/providers/imap/camel-imap-store.c:848
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Kunde inte ansluta till server: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1242
+#: camel/providers/imap/camel-imap-store.c:1272
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP-servern %s stöder inte den begärda autentiseringstypen %s"
 
-#: camel/providers/imap/camel-imap-store.c:1252
+#: camel/providers/imap/camel-imap-store.c:1282
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Inget stöd för autentiseringstypen %s"
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1305
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sAnge IMAP-lösenordet för %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1289
+#: camel/providers/imap/camel-imap-store.c:1319
 msgid "You didn't enter a password."
 msgstr "Du angav inte något lösenord."
 
-#: camel/providers/imap/camel-imap-store.c:1318
+#: camel/providers/imap/camel-imap-store.c:1348
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10752,18 +10519,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1839
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:1867
+#: camel/providers/imap/camel-imap-store.c:2057
 #, c-format
 msgid "No such folder %s"
 msgstr "Det finns ingen mapp %s"
 
-#: camel/providers/imap/camel-imap-store.c:1915
-#: camel/providers/imap/camel-imap-store.c:2296
+#: camel/providers/imap/camel-imap-store.c:1943
+#: camel/providers/imap/camel-imap-store.c:2324
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Föräldermappen får inte innehålla undermappar"
 
-#: camel/providers/imap/camel-imap-store.c:1970
+#: camel/providers/imap/camel-imap-store.c:1998
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10771,7 +10538,7 @@ msgstr "Föräldermappen får inte innehålla undermappar"
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Kunde inte byta namn på mappen \"%s\": %s existerar"
 
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:2274
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Okänd föräldermapp: %s"
@@ -10805,20 +10572,20 @@ msgid "Index message body data"
 msgstr "Skicka meddelande till kontakt"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:388
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:393
-#: camel/providers/local/camel-local-folder.c:396
+#: camel/providers/local/camel-local-folder.c:392
+#: camel/providers/local/camel-local-folder.c:395
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "brevlåda:%s (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:400
+#: camel/providers/local/camel-local-folder.c:399
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -10879,7 +10646,7 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:142
 #: camel/providers/local/camel-local-store.c:253
-#: camel/providers/local/camel-mbox-store.c:356
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10952,8 +10719,25 @@ msgstr "Tillägg av meddelande i brevlådekatalog avbröts"
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Kan inte lägga till meddelande i mapp för brevlådekatalog: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:226
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mbox-folder.c:417
+#: camel/providers/local/camel-mbox-folder.c:436
+#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:475
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-mh-folder.c:221
+#, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+"Kan inte hämta meddelande: %s från mappen %s\n"
+"  %s"
+
+#: camel/providers/local/camel-maildir-folder.c:236
 msgid "Invalid message contents"
 msgstr "Ogiltigt meddelandeinnehåll"
 
@@ -10996,9 +10780,9 @@ msgstr "Kunde inte ta bort mappen \"%s\": %s"
 msgid "not a maildir directory"
 msgstr "är inte en brevlådekatalog"
 
-#: camel/providers/local/camel-maildir-store.c:341
-#: camel/providers/local/camel-spool-store.c:286
-#: camel/providers/local/camel-spool-store.c:316
+#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-spool-store.c:284
+#: camel/providers/local/camel-spool-store.c:314
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Kunde inte genomsöka mappen \"%s\": %s"
@@ -11045,27 +10829,18 @@ msgstr "E-posttillägg avbrutet"
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Kan inte lägga till meddelande till mbox-fil: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:435
-#: camel/providers/local/camel-mbox-folder.c:466
-#: camel/providers/local/camel-mbox-folder.c:474
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"Kan inte hämta meddelande: %s från mappen %s\n"
-"  %s"
-
-#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:468
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Mappen verkar vara obotligt skadad."
 
-#: camel/providers/local/camel-mbox-folder.c:475
-msgid "Message construction failed: Corrupt mailbox?"
+#: camel/providers/local/camel-mbox-folder.c:476
+#: camel/providers/local/camel-mh-folder.c:222
+#, fuzzy
+msgid "Message construction failed."
 msgstr "Meddelandebyggande misslyckades: Trasig brevlåda?"
 
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:362
+#: camel/providers/local/camel-mbox-store.c:361
 #, fuzzy
 msgid "Cannot create a folder by this name."
 msgstr "Kan inte skapa en mapp med det namnet"
@@ -11096,32 +10871,32 @@ msgstr "\"%s\" är ingen vanlig fil."
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Mappen \"%s\" är inte tom. Den togs inte bort."
 
-#: camel/providers/local/camel-mbox-store.c:375
+#: camel/providers/local/camel-mbox-store.c:374
 #, fuzzy, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Kunde inte skapa katalogen %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:389
+#: camel/providers/local/camel-mbox-store.c:388
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Kan inte få mapp: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:391
+#: camel/providers/local/camel-mbox-store.c:390
 #, fuzzy
 msgid "Folder already exists"
 msgstr "Kort-ID finns redan"
 
-#: camel/providers/local/camel-mbox-store.c:473
+#: camel/providers/local/camel-mbox-store.c:472
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "Det angivna mappnamnet är inte giltigt: %s"
 
-#: camel/providers/local/camel-mbox-store.c:486
+#: camel/providers/local/camel-mbox-store.c:485
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Kunde inte byta namn på \"%s\": %s"
 
-#: camel/providers/local/camel-mbox-store.c:561
+#: camel/providers/local/camel-mbox-store.c:560
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Kunde inte byta namn på \"%s\": %s"
@@ -11314,7 +11089,7 @@ msgstr ""
 "Mappen kan vara skadad, kopia sparad i \"%s\""
 
 #: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:997
+#: camel/providers/nntp/camel-nntp-store.c:1126
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Ange NNTP-lösenordet för %s@%s"
@@ -11331,18 +11106,10 @@ msgstr "Misslyckades med att skicka användarnamnet till servern"
 msgid "Server rejected username/password"
 msgstr "Servern avvisade användarnamnet/lösenordet"
 
-#: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:263
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr "Användaren avbröt"
-
-#: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:259
-#: camel/providers/nntp/camel-nntp-folder.c:265
+#: camel/providers/nntp/camel-nntp-folder.c:147
+#: camel/providers/nntp/camel-nntp-folder.c:149
+#: camel/providers/nntp/camel-nntp-folder.c:158
+#: camel/providers/nntp/camel-nntp-folder.c:234
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11351,63 +11118,50 @@ msgstr "Användaren avbröt"
 msgid "Cannot get message %s: %s"
 msgstr "Kan inte hämta meddelande %s: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:188
-#: camel/providers/nntp/camel-nntp-folder.c:228
+#: camel/providers/nntp/camel-nntp-folder.c:156
+#: camel/providers/nntp/camel-nntp-folder.c:232
+#: camel/providers/nntp/camel-nntp-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+msgid "User cancelled"
+msgstr "Användaren avbröt"
+
+#: camel/providers/nntp/camel-nntp-folder.c:176
+#: camel/providers/nntp/camel-nntp-folder.c:208
 #, c-format
 msgid "Internal error: uid in invalid format: %s"
 msgstr "Internt fel: uid är i ogiltigt format: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:201
-#, fuzzy, c-format
-msgid "Could not get article %s from NNTP server"
-msgstr "Kunde inte hämta grupplista från servern."
-
-#: camel/providers/nntp/camel-nntp-folder.c:362
-msgid "Posting not allowed by news server"
-msgstr ""
-
+#: camel/providers/nntp/camel-nntp-folder.c:328
+#: camel/providers/nntp/camel-nntp-folder.c:331
 #: camel/providers/nntp/camel-nntp-folder.c:373
-#, c-format
-msgid "Failed to send newsgroups header: %s: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:413
-#: camel/providers/nntp/camel-nntp-folder.c:426
-#, c-format
-msgid "Error posting to newsgroup: %s: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:438
-msgid "Error reading response to posted message: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:441
+#: camel/providers/nntp/camel-nntp-folder.c:375
 #, fuzzy, c-format
-msgid "Error posting message: %s: message not posted"
-msgstr ""
-"Fel vid automatiskt sparande av meddelande: %s\n"
-" %s"
+msgid "Posting failed: %s"
+msgstr "Åtgärden misslyckades: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:457
+#: camel/providers/nntp/camel-nntp-folder.c:393
 msgid "You cannot post NNTP messages while working offline!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:468
+#: camel/providers/nntp/camel-nntp-folder.c:404
 #, fuzzy
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Du kan inte kopiera meddelanden från denna papperskorgsmapp."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:44
 msgid "Could not get group list from server."
 msgstr "Kunde inte hämta grupplista från servern."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#: camel/providers/nntp/camel-nntp-grouplist.c:97
+#: camel/providers/nntp/camel-nntp-grouplist.c:106
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "Kan inte läsa in grupplistefilen för %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#: camel/providers/nntp/camel-nntp-grouplist.c:157
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Kan inte spara grupplistefilen för %s: %s"
@@ -11439,27 +11193,29 @@ msgstr ""
 "Detta alternativ kommer att autentisera med NNTP-servern genom att använda "
 "ett klartextlösenord."
 
-#: camel/providers/nntp/camel-nntp-store.c:158
+#: camel/providers/nntp/camel-nntp-store.c:118
+#: camel/providers/nntp/camel-nntp-store.c:1233
+#: camel/providers/nntp/camel-nntp-store.c:1331
+#, c-format
+msgid "NNTP Command failed: %s"
+msgstr "NNTP-kommandot misslyckades: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:227
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Kunde inte skapa hälsning från %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:170
+#: camel/providers/nntp/camel-nntp-store.c:239
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP-servern %s returnerade felkoden %d: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:326
+#: camel/providers/nntp/camel-nntp-store.c:403
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET-diskussionsgrupper via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:640
-#, fuzzy
-msgid "Stream error"
-msgstr "Annat fel"
-
-#: camel/providers/nntp/camel-nntp-store.c:643
+#: camel/providers/nntp/camel-nntp-store.c:777
 #, fuzzy, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -11469,75 +11225,75 @@ msgstr ""
 "Fel vid sparande av meddelanden till: %s\n"
 " %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:735
+#: camel/providers/nntp/camel-nntp-store.c:872
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
 "No such newsgroup. The selected item is a probably a parent folder."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:767
+#: camel/providers/nntp/camel-nntp-store.c:904
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
 "newsgroup does not exist!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:792
+#: camel/providers/nntp/camel-nntp-store.c:929
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:800
+#: camel/providers/nntp/camel-nntp-store.c:937
 #, fuzzy
 msgid "You cannot rename a folder in a News store."
 msgstr "Kunde inte byta namn på mappen %s till %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:808
+#: camel/providers/nntp/camel-nntp-store.c:945
 #, fuzzy
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "Kan inte flytta en mapp till en av dess undermappar."
 
-#: camel/providers/nntp/camel-nntp-summary.c:253
-#, fuzzy, c-format
-msgid "Connection error: %s"
-msgstr "Okänt fel: %s"
-
-#: camel/providers/nntp/camel-nntp-summary.c:262
-#, c-format
-msgid "No such folder: %s"
-msgstr "Det finns ingen sådan mapp: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1118
+#, fuzzy
+msgid "Authentication requested but not username provided"
+msgstr "Autentisering krävs"
 
-#: camel/providers/nntp/camel-nntp-summary.c:268
-#, c-format
-msgid "Could not get group: %s"
-msgstr "Kunde inte hämta grupp: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1146
+#, fuzzy, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr "Misslyckades med autentisering för POP-servern %s: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:333
+#: camel/providers/nntp/camel-nntp-store.c:1262
 #, fuzzy
-msgid "Could not get messages: unspecified error"
-msgstr "Kunde inte hämta meddelande: %s"
+msgid "Not connected."
+msgstr "Ny kontakt"
 
-#: camel/providers/nntp/camel-nntp-summary.c:378
+#: camel/providers/nntp/camel-nntp-store.c:1311
 #, c-format
-msgid "NNTP Command failed: %s"
-msgstr "NNTP-kommandot misslyckades: %s"
+msgid "No such folder: %s"
+msgstr "Det finns ingen sådan mapp: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:438
-#: camel/providers/nntp/camel-nntp-summary.c:543
+#: camel/providers/nntp/camel-nntp-summary.c:218
+#: camel/providers/nntp/camel-nntp-summary.c:314
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Letar efter nya meddelanden"
 
-#: camel/providers/nntp/camel-nntp-summary.c:558
-#, c-format
-msgid "Unknown server response: %s"
-msgstr "Okänt serversvar: %s"
+#: camel/providers/nntp/camel-nntp-summary.c:225
+#, fuzzy, c-format
+msgid "Unexpected server response from xover: %s"
+msgstr "Oväntat svar från IMAP-servern: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:328
+#, fuzzy, c-format
+msgid "Unexpected server response from head: %s"
+msgstr "Oväntat svar från GnuPG: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:605
+#: camel/providers/nntp/camel-nntp-summary.c:368
 msgid "Use cancel"
 msgstr "Använd avbryt"
 
-#: camel/providers/nntp/camel-nntp-summary.c:607
+#: camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Åtgärden misslyckades: %s"
@@ -11585,7 +11341,7 @@ msgstr "Ta bort efter %s dag(ar)"
 msgid "Disable support for all POP3 extensions"
 msgstr "Inaktivera stöd för alla POP3-tillägg"
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107
 msgid "POP"
 msgstr "POP"
 
@@ -11675,7 +11431,7 @@ msgid "No such folder `%s'."
 msgstr "Det finns ingen mapp \"%s\"."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:132
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -11729,7 +11485,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "E-postleverans via programmet sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:119
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -12024,19 +11780,19 @@ msgstr "%.0f M"
 msgid "%.0fG"
 msgstr "%.0f G"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
+#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:408
 msgid "attachment"
 msgstr "bilaga"
 
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:454
 msgid "Remove selected items from the attachment list"
 msgstr "Ta bort markerade objekt från bifogningslistan"
 
-#: composer/e-msg-composer-attachment-bar.c:491
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Add attachment..."
 msgstr "Lägg till bilaga..."
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:495
 msgid "Attach a file to the message"
 msgstr "Bifoga en fil till meddelandet"
 
@@ -12100,7 +11856,7 @@ msgstr "Namnlöst meddelande"
 msgid "Open file"
 msgstr "Öppna fil"
 
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
 msgid "Autogenerated"
 msgstr "Automatiskt genererad"
 
@@ -12249,17 +12005,17 @@ msgstr "Bifoga fil(er)"
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
+msgid "You cannot attach the file `{0}' to this message."
 msgstr "Bifoga en fil till meddelandet"
 
 #. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4
-msgid "${1}"
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
 msgstr ""
 
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
 
 #. mail-composer:attach-directory primary
@@ -12354,7 +12110,7 @@ msgstr "Kunde inte skapa sammanfattning"
 
 #. mail-composer:no-build-message secondary
 #: composer/mail-composer-errors.xml.h:34
-msgid "Because \"${0}\", you may need to select different mail options."
+msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
@@ -12364,8 +12120,10 @@ msgid "Could not read signature file \"{0}\"."
 msgstr "Kunde inte spara signaturfilen: %s"
 
 #. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38
-msgid "Because \"${1}\"."
+#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted primary
@@ -12793,11 +12551,11 @@ msgid "<b>Then</b>"
 msgstr "<b>Ska utföras:</b> "
 
 #: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1335
+#: mail/mail-account-gui.c:1347
 msgid "Select Folder"
 msgstr "Välj mapp"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
 #, fuzzy
 msgid "    "
 msgstr "      "
@@ -12857,7 +12615,7 @@ msgstr "sedan"
 msgid "months"
 msgstr "månader"
 
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
 msgid "seconds"
 msgstr "sekunder"
 
@@ -12889,20 +12647,20 @@ msgstr "med alla lokala mappar"
 msgid "years"
 msgstr "år"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:916
-#: mail/mail-config.c:76 mail/mail-config.glade.h:90
+#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
+#: mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "viktigt"
 
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:919 mail/mail-config.c:79
-#: mail/mail-config.glade.h:145
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: mail/mail-config.glade.h:148
 msgid "To Do"
 msgstr "Att-göra"
 
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:920 mail/mail-config.c:80
-#: mail/mail-config.glade.h:94
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: mail/mail-config.glade.h:97
 msgid "Later"
 msgstr "Senare"
 
@@ -12960,258 +12718,6 @@ msgstr "inkommande"
 msgid "outgoing"
 msgstr "utgående"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Adjust Score"
-msgstr "Justera poäng"
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Color"
-msgstr "Tilldela färg"
-
-#: filter/libfilter-i18n.h:4
-msgid "Assign Score"
-msgstr "Tilldela poäng"
-
-#: filter/libfilter-i18n.h:5
-msgid "Attachments"
-msgstr "Bilagor"
-
-#: filter/libfilter-i18n.h:6
-msgid "Beep"
-msgstr "Pip"
-
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "innehåller"
-
-#: filter/libfilter-i18n.h:8
-msgid "Copy to Folder"
-msgstr "Kopiera till mapp"
-
-#: filter/libfilter-i18n.h:9
-msgid "Date received"
-msgstr "Ankomstdatum"
-
-#: filter/libfilter-i18n.h:10
-msgid "Date sent"
-msgstr "Avsändningsdatum"
-
-#: filter/libfilter-i18n.h:12
-msgid "Deleted"
-msgstr "Borttagen"
-
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "innehåller inte"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "slutar inte med"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "finns inte"
-
-#: filter/libfilter-i18n.h:16
-msgid "does not return"
-msgstr "returnerar inte"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "låter inte som"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "börjar inte med"
-
-#: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
-msgstr "finns inte"
-
-#: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr "Utkast"
-
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "slutar med"
-
-#: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr "finns"
-
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "finns"
-
-#: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr "Uttryck"
-
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr "Följ upp"
-
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "är"
-
-#: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr "är efter"
-
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr "är innan"
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr "är flaggad"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "är större än"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "är mindre än"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "är inte"
-
-#: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr "är inte flaggad"
-
-#: filter/libfilter-i18n.h:36
-#, fuzzy
-msgid "Junk Test"
-msgstr "juni"
-
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
-#: widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Etikett"
-
-#: filter/libfilter-i18n.h:38
-msgid "Mailing list"
-msgstr "Sändlista"
-
-#: filter/libfilter-i18n.h:39
-msgid "Message Body"
-msgstr "meddelandetext"
-
-#: filter/libfilter-i18n.h:40
-msgid "Message Header"
-msgstr "meddelandehuvud"
-
-#: filter/libfilter-i18n.h:41
-#, fuzzy
-msgid "Message is Junk"
-msgstr "Meddelandet skickades"
-
-#: filter/libfilter-i18n.h:42
-#, fuzzy
-msgid "Message is not Junk"
-msgstr "Meddelandet %s hittades inte."
-
-#: filter/libfilter-i18n.h:43
-msgid "Move to Folder"
-msgstr "Flytta till mapp"
-
-#: filter/libfilter-i18n.h:44
-#, fuzzy
-msgid "Pipe to Program"
-msgstr "Avsluta programmet"
-
-#: filter/libfilter-i18n.h:45
-msgid "Play Sound"
-msgstr "Spela ljud"
-
-# [Status] [är] [Läst]
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Läst"
-
-#: filter/libfilter-i18n.h:47
-msgid "Recipients"
-msgstr "Mottagare"
-
-#: filter/libfilter-i18n.h:48
-msgid "Regex Match"
-msgstr "Reguljärt uttryck matchar"
-
-#: filter/libfilter-i18n.h:49
-msgid "Replied to"
-msgstr "besvarad"
-
-#: filter/libfilter-i18n.h:50
-msgid "returns"
-msgstr "returnerar"
-
-#: filter/libfilter-i18n.h:51
-msgid "returns greater than"
-msgstr "returnerar större än"
-
-#: filter/libfilter-i18n.h:52
-msgid "returns less than"
-msgstr "returnerar mindre än"
-
-#: filter/libfilter-i18n.h:53
-#, fuzzy
-msgid "Run Program"
-msgstr "Kör program:"
-
-#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Poäng"
-
-#: filter/libfilter-i18n.h:55
-msgid "Sender"
-msgstr "Avsändare"
-
-#: filter/libfilter-i18n.h:56
-msgid "Set Status"
-msgstr "Ställ in status"
-
-#: filter/libfilter-i18n.h:57
-msgid "Size (kB)"
-msgstr "Storlek (kB)"
-
-#: filter/libfilter-i18n.h:58
-msgid "sounds like"
-msgstr "låter som"
-
-#: filter/libfilter-i18n.h:59
-msgid "Source Account"
-msgstr "Källkonto"
-
-#: filter/libfilter-i18n.h:60
-msgid "Specific header"
-msgstr "Specifikt huvud"
-
-#: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "börjar med"
-
-#: filter/libfilter-i18n.h:63
-msgid "Stop Processing"
-msgstr "Stoppa behandling"
-
-#: filter/libfilter-i18n.h:64 mail/em-format.c:755 mail/em-format-html.c:1519
-#: mail/em-format-quote.c:302 mail/em-mailer-prefs.c:87
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
-#: smime/lib/e-cert.c:1079
-msgid "Subject"
-msgstr "Ämne"
-
-#: filter/libfilter-i18n.h:65
-msgid "Unset Status"
-msgstr "Töm status"
-
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Lägg till regel"
@@ -13229,6 +12735,11 @@ msgstr "Regelnamn"
 msgid "_Score Rules"
 msgstr "Poängregler"
 
+#: filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Poäng"
+
 #: filter/searchtypes.xml.h:1
 msgid "Body contains"
 msgstr "Meddelandetexten innehåller"
@@ -13310,13 +12821,13 @@ msgstr "Signatur(er)"
 msgid "-------- Forwarded Message --------"
 msgstr "Vidarebefordrat meddelande"
 
-#: mail/em-composer-utils.c:1499
+#: mail/em-composer-utils.c:1495
 msgid "an unknown sender"
 msgstr "en okänd avsändare"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1509
+#: mail/em-composer-utils.c:1505
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "%a %Y-%m-%d klockan %H.%M skrev %%s:"
@@ -13359,8 +12870,8 @@ msgstr "<klicka här för att välja en mapp>"
 msgid "Create New Folder"
 msgstr "Skapa ny mapp"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
-#: mail/mail-component.c:701
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
+#: mail/mail-component.c:704
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Ange var mappen ska skapas:"
@@ -13375,107 +12886,108 @@ msgstr "Skapa regel"
 msgid "Folder _name:"
 msgstr "Mapp_namn:"
 
-#: mail/em-folder-tree.c:839
+#: mail/em-folder-tree.c:833
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Byter namn på mappen %s"
 
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree.c:835
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Öppnar mappen %s"
 
-#: mail/em-folder-tree.c:848 mail/message-list.c:1555
+#: mail/em-folder-tree.c:842 mail/message-list.c:1561
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Flyttar meddelanden till %s"
 
-#: mail/em-folder-tree.c:850 mail/message-list.c:1557
+#: mail/em-folder-tree.c:844 mail/message-list.c:1563
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopierar meddelanden till %s"
 
-#: mail/em-folder-tree.c:866
+#: mail/em-folder-tree.c:860
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Kan inte kopiera eller flytta meddelanden till en virtuell mapp"
 
-#: mail/em-folder-tree.c:956 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Kopiera till mapp"
 
-#: mail/em-folder-tree.c:957 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Flytta till mapp"
 
-#: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2069
-#: mail/em-folder-tree.c:2551 mail/em-folder-view.c:798
-#: mail/message-list.c:1645
+#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
+#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
+#: mail/message-list.c:1651
 #, fuzzy
 msgid "_Move"
 msgstr "Flytta"
 
-#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#: mail/em-folder-tree.c:955 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "Avboka uppgift"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
 #: mail/em-folder-view.c:798 mail/em-folder-view.c:812
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Välj mapp"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
 #, fuzzy
 msgid "C_opy"
 msgstr "Kopiera"
 
-#: mail/em-folder-tree.c:2096
+#: mail/em-folder-tree.c:2088
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Lagrar mappen \"%s\""
 
-#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
+#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
 #, fuzzy
 msgid "Create folder"
 msgstr "Skapa en ny mapp"
 
-#: mail/em-folder-tree.c:2474
+#: mail/em-folder-tree.c:2463
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Byt namn på mappen \"%s\" till:"
 
-#: mail/em-folder-tree.c:2476
+#: mail/em-folder-tree.c:2465
 msgid "Rename Folder"
 msgstr "Byt namn på mapp"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Visa"
 
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2537
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Öppna i nytt fönster"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2555
+#: mail/em-folder-tree.c:2546
 msgid "_New Folder..."
 msgstr "_Ny mapp..."
 
-#: mail/em-folder-tree.c:2558
+#: mail/em-folder-tree.c:2549
 msgid "_Rename"
 msgstr "_Byt namn"
 
-#: mail/em-folder-tree.c:2561 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Egenskaper..."
 
 #: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:889
+#: mail/mail-vfolder.c:888
 msgid "VFolders"
 msgstr "Virtuella mappar"
 
@@ -13489,19 +13001,19 @@ msgstr ""
 msgid "Inbox"
 msgstr "Inkorg"
 
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
 msgid "Loading..."
 msgstr "Läser in..."
 
 #: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
 #: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
 #: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:551
+#: mail/mail-component.c:554
 msgid "Mail"
 msgstr "E-post"
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Redigera som nytt meddelande..."
@@ -13514,17 +13026,17 @@ msgstr "Skriv _ut"
 msgid "_Reply to Sender"
 msgstr "Sva_ra till avsändaren"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:810
+#: mail/em-folder-view.c:901 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Svara till _lista"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:811
+#: mail/em-folder-view.c:902 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Svara till _alla"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: mail/em-folder-view.c:903 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "Vidare_befordra"
@@ -13579,6 +13091,10 @@ msgstr "Fl_ytta till mapp..."
 msgid "_Copy to Folder..."
 msgstr "_Kopiera till mapp..."
 
+#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Etikett"
+
 #: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Lägg till avsändaren i adress_boken"
@@ -13629,12 +13145,12 @@ msgid "Filter on _Mailing List"
 msgstr "Filtrera på sä_ndlista"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
-#: mail/mail-config.glade.h:66
+#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Standard"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1796
 msgid "Print Message"
 msgstr "Skriv ut meddelande"
 
@@ -13674,12 +13190,18 @@ msgstr "Kopia"
 msgid "Bcc"
 msgstr "Blindkopia"
 
+#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
+#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Ämne"
+
 #: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
 #: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Datum"
 
-#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
+#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
 #, fuzzy
 msgid "Newsgroups"
 msgstr "Diskussionsgruppskällor"
@@ -13873,7 +13395,7 @@ msgid ""
 "practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:757
+#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
 #, fuzzy
 msgid "_View Certificate"
 msgstr "_Certifikat-ID:"
@@ -13935,7 +13457,7 @@ msgstr "En _vecka"
 msgid "Once per month"
 msgstr "En _månad"
 
-#: mail/em-migrate.c:1072
+#: mail/em-migrate.c:1168
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13943,93 +13465,93 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1506
+#: mail/em-migrate.c:1602
 #, fuzzy, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr ""
 "Kunde inte skapa mappen \"%s\":\n"
 "%s"
 
-#: mail/em-migrate.c:1532
+#: mail/em-migrate.c:1628
 #, fuzzy, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr ""
 "Kan inte kopiera filhandtag: %s\n"
 "%s"
 
-#: mail/em-migrate.c:1715
+#: mail/em-migrate.c:1811
 #, fuzzy, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Kan inte spara grupplistefilen för %s: %s"
 
-#: mail/em-migrate.c:1919
+#: mail/em-migrate.c:2015
 #, fuzzy, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Kan inte öppna eller skapa .newsrc-fil för %s: %s"
 
-#: mail/em-migrate.c:1933
+#: mail/em-migrate.c:2029
 #, fuzzy, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Misslyckades med att skapa rör till \"%s\": %s"
 
-#: mail/em-migrate.c:1962
+#: mail/em-migrate.c:2058
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#: mail/em-migrate.c:2413 mail/em-migrate.c:2425
 #, fuzzy, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Misslyckades med att skapa rör till \"%s\": %s"
 
-#: mail/em-migrate.c:2480
+#: mail/em-migrate.c:2576
 #, fuzzy, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr ""
 "Kan inte spara utdatafilen: %s\n"
 " %s"
 
-#: mail/em-migrate.c:2498
+#: mail/em-migrate.c:2594
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 msgstr ""
 
-#: mail/em-popup.c:699
+#: mail/em-popup.c:700
 msgid "Save As..."
 msgstr "Spara som..."
 
-#: mail/em-popup.c:717
+#: mail/em-popup.c:718
 #, fuzzy, c-format
 msgid "untitled_image.%s"
 msgstr "Namnlöst meddelande"
 
-#: mail/em-popup.c:807
+#: mail/em-popup.c:808
 #, fuzzy
 msgid "Set as _Background"
 msgstr "Bakgrund:"
 
-#: mail/em-popup.c:809
+#: mail/em-popup.c:810
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "Svara till avsändaren"
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:859
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Öppna länk i webbläsare"
 
-#: mail/em-popup.c:859
+#: mail/em-popup.c:860
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Skicka _meddelande till lista..."
 
-#: mail/em-popup.c:860
+#: mail/em-popup.c:861
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Lägg till adressbok"
 
-#: mail/em-popup.c:966
+#: mail/em-popup.c:967
 #, c-format
 msgid "Open in %s..."
 msgstr "Öppna i %s..."
@@ -14633,7 +14155,7 @@ msgstr "Evolutions e-postinställningskontroll"
 msgid "Mail Accounts"
 msgstr "E-postkonton"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
 msgid "Mail Preferences"
 msgstr "E-postinställningar"
 
@@ -14646,15 +14168,15 @@ msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importerar din gamla Elm-epost"
 
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:226
+#: mail/importers/evolution-mbox-importer.c:221
+#: mail/importers/evolution-outlook-importer.c:255
 #: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Importerar..."
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:222
-#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/evolution-mbox-importer.c:223
+#: mail/importers/evolution-outlook-importer.c:257
 #: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Var vänlig vänta"
@@ -14677,23 +14199,25 @@ msgid "Elm"
 msgstr "Elm"
 
 #: mail/importers/evolution-mbox-importer.c:116
+#: mail/importers/evolution-outlook-importer.c:130
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Ta bort denna mapp"
 
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 #, fuzzy
 msgid "Select folder to import into"
 msgstr "Välj mapp"
 
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:254
 #: mail/importers/mail-importer.c:226
 #, fuzzy, c-format
 msgid "Importing `%s'"
 msgstr "Importerar"
 
-#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/evolution-outlook-importer.c:301
 #: mail/importers/mail-importer.c:140
 #, fuzzy
 msgid "Importing mailbox"
@@ -14858,15 +14382,15 @@ msgstr ""
 msgid "%s License Agreement"
 msgstr ""
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
 msgid "_Host:"
 msgstr "_Värd:"
 
-#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
 msgid "User_name:"
 msgstr "Användar_namn:"
 
-#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
 msgid "_Path:"
 msgstr "_Sökväg:"
 
@@ -14929,34 +14453,34 @@ msgstr "%d totalt"
 msgid ", %d unread"
 msgstr " (XXX olästa)"
 
-#: mail/mail-component.c:653
+#: mail/mail-component.c:656
 msgid "New Mail Message"
 msgstr "Nytt e-postmeddelande"
 
-#: mail/mail-component.c:654
+#: mail/mail-component.c:657
 msgid "_Mail Message"
 msgstr "_E-postmeddelande"
 
-#: mail/mail-component.c:655
+#: mail/mail-component.c:658
 msgid "Compose a new mail message"
 msgstr "Skriv ett nytt e-postmeddelande"
 
-#: mail/mail-component.c:661
+#: mail/mail-component.c:664
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Ny virtuell mapp"
 
-#: mail/mail-component.c:662
+#: mail/mail-component.c:665
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "E-postfilter"
 
-#: mail/mail-component.c:663
+#: mail/mail-component.c:666
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Skapa en ny mapp"
 
-#: mail/mail-component.c:795
+#: mail/mail-component.c:798
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
@@ -14968,7 +14492,7 @@ msgstr "Kontrollerar tjänst"
 msgid "Connecting to server..."
 msgstr "Ansluter till server..."
 
-#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Identitet"
 
@@ -14983,7 +14507,7 @@ msgstr ""
 "den e-post du skickar."
 
 #: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid "Receiving Mail"
 msgstr "Mottagande av post"
 
@@ -14999,7 +14523,7 @@ msgstr ""
 msgid "Please select among the following options"
 msgstr "Välj mellan följande alternativ"
 
-#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr "Skickande av post"
 
@@ -15011,7 +14535,7 @@ msgstr ""
 "Ange information om hur du vill skicka e-post. Om du inte är säker bör du "
 "fråga din systemadministratör eller Internetleverantör."
 
-#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37
 msgid "Account Management"
 msgstr "Kontohantering"
 
@@ -15028,250 +14552,254 @@ msgstr ""
 "att sammanställas för att skapa ett Evolution-epostkonto. Ange ett namn för "
 "detta konto nedan. Detta namn kommer endast att användas för visning."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:2
 #, fuzzy
 msgid " Ch_eck for Supported Types "
 msgstr " _Kontrollera vilka typer som stöds "
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "<b>Preview</b>"
 msgstr "Förhandsgranska"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "(SSL stöds inte i detta bygge av Evolution)"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "<b>S_ignatures</b>"
 msgstr "<b>Status:</b>"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "<b>_Languages</b>"
 msgstr "Språk"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
+msgid "<small>This will make the the filter more reliable, but slower</small>"
+msgstr ""
+
+#: mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "<span weight=\"bold\">Checking for New Mail</span>"
 msgstr "Kontrollerar ny e-post"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">General</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "Notifiering om ny post"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Security</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "Skickade meddelanden och utkast"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:34
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:35
 #, fuzzy
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "Kryptera a_lltid till mig själv när krypterad post skickas"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:36
 msgid "Account Editor"
 msgstr "Kontoredigerare"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:38
 #, fuzzy
 msgid "Add Ne_w Signature..."
 msgstr "Lägg till ny signatur..."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Add _Script"
 msgstr "Lägg till sk_ript"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:40
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "Kryptera a_lltid till mig själv när krypterad post skickas"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Skicka alltid _kopia (Cc) till:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Skicka alltid _blindkopia (Bcc) till:"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Always _sign outgoing messages when using this account"
 msgstr "S_ignera alltid utgående meddelanden när detta konto används"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "_Lita alltid på nycklar i min nyckelring vid kryptering"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Attach original message"
 msgstr "Bifoga originalmeddelandet"
 
-#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Bilaga"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:48
 #, fuzzy
 msgid "Automatically _insert smiley images"
 msgstr "Infoga _automatiskt smilisbilder"
 
 # Låter konstigt
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Automatically check for _new mail every"
 msgstr "Kontrollera _automatiskt ny e-post var"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltisk (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltisk (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Beep w_hen new mail arrives"
 msgstr "_Pip då ny post anländer"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "C_haracter set:"
 msgstr "Te_ckenkodning:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Ch_eck for Supported Types "
 msgstr " _Kontrollera vilka typer som stöds "
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 #, fuzzy
-msgid "Check _Incoming Mail"
+msgid "Check _incoming mail for junk"
 msgstr "Server för inkommande post"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Check spelling while I _type"
 msgstr "Kontrollera stavning medan jag skri_ver"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 msgid "Color for _misspelled words:"
 msgstr "Färg för _felstavade ord:"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Colors"
 msgstr "F_ärger"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Confirm _when expunging a folder"
 msgstr "_Bekräfta vid tömning av mapp"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -15286,115 +14814,120 @@ msgstr ""
 "\n"
 "Klicka på \"Verkställ\" för att spara dina inställningar."
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
 msgid "De_fault"
 msgstr "_Standard"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Default character e_ncoding:"
 msgstr "Standardtecken_kodning: "
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 #, fuzzy
 msgid "Defaults"
 msgstr "_Standardvärden"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 msgid "Do not quote original message"
 msgstr "Citera inte originalmeddelandet"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Signera inte _sammanträdesbegäran (för kompatibilitet med Outlook)"
 
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Klar"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Drafts _Folder:"
 msgstr "Utkast_mapp:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:77
 msgid "Email Accounts"
 msgstr "E-postkonton"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Email _Address:"
 msgstr "E-postadress:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "Empty trash folders on e_xit"
 msgstr "Töm _papperskorgsmappar vid avslut"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
 msgid "Encry_ption certificate:"
 msgstr ""
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:81
 msgid "Evolution Account Assistant"
 msgstr "Evolutions kontoassistent"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:82
 msgid "Execute Command..."
 msgstr "Kör kommando..."
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Fi_xed-width:"
 msgstr "Fast _breddsteg:"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 msgid "Font Properties"
 msgstr "Typsnittsegenskaper"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 msgid "Format messages in _HTML"
 msgstr "Formatera meddelanden med _HTML"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "HTML Mail"
 msgstr "_HTML-brev"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Headers"
 msgstr "Rubrik"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr "Markera _citat med"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
 #: mail/mail-config.glade.h:91
+#, fuzzy
+msgid "I_nclude remote tests"
+msgstr "Inkludera:"
+
+#: mail/mail-config.glade.h:94
 msgid "Inline"
 msgstr "Inuti"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Mail Configuration"
 msgstr "E-postkonfiguration"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "Brevlådeplats"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr "Meddelanderedigerare"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
@@ -15402,143 +14935,143 @@ msgstr ""
 "Observera: du kommer inte att efterfrågas ett lösenord innan du ansluter för "
 "första gången"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Or_ganization:"
 msgstr "Or_ganisation:"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG-_nyckelid:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "Play sound file when new mail arri_ves"
 msgstr "_Spela ljudfil då ny post anländer"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Fr_åga då meddelanden skickas med endast blindkopiemottagare angivna"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Qmail maildir "
 msgstr "Qmail-epostkatalog "
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr "Citera originalmeddelande"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr "Citerad"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Re_member password"
 msgstr "Kom ihåg mitt lösenord"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr "Sva_ra till:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "Mottagande av e-post"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:120
 #, fuzzy
 msgid "Receiving Options"
 msgstr "_Alternativ för mottagning"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
 #, fuzzy
 msgid "Remember _password"
 msgstr "Kom ihåg mitt lösenord"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
 #, fuzzy
 msgid "S_tandard Font:"
 msgstr "_Standardtypsnitt:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 msgid "Security"
 msgstr "Säkerhet"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font"
 msgstr "Välj HTML-typsnitt med fast breddsteg"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:126
 msgid "Select HTML fixed width font for printing"
 msgstr "Välj HTML-typsnitt med fast breddsteg för utsnitt"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:127
 msgid "Select HTML variable width font"
 msgstr "Välj HTML-typsnitt med variabelt breddsteg"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:128
 msgid "Select HTML variable width font for printing"
 msgstr "Välj HTML-typsnitt med variabelt breddsteg för utskrift"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:129
 #, fuzzy
 msgid "Select..."
 msgstr "Markera"
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "Skickande av e-post"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Sent _Messages Folder:"
 msgstr "Mapp för skickade _meddelanden:"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:134
 msgid "Ser_ver requires authentication"
 msgstr "Ser_vern kräver autentisering"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:135
 msgid "Server _Type: "
 msgstr "Server_typ: "
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "_Certifikat-ID:"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:137
 #, fuzzy
 msgid "Signat_ure:"
 msgstr "Signatur:"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:138
 msgid "Signatures"
 msgstr "Signaturer"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr "Ange _filnamn:"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "Spell Checking"
 msgstr "Stavnings_kontroll"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:141
 msgid "Standard Unix mbox"
 msgstr "Standard Unix-brevlåda"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "T_erminal Font:"
 msgstr "_Terminaltypsnitt:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "T_ype: "
 msgstr "Typ:"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -15548,7 +15081,7 @@ msgstr ""
 "din signatur. Namnet du anger kommer att endast\n"
 "användas för visning."
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
@@ -15557,7 +15090,7 @@ msgstr ""
 "Denna sida låter dig konfigurera stavningskontroll och språk. Listan med "
 "språk här återspeglar endast de språk för vilka en ordbok är installerad."
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:149
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -15565,15 +15098,11 @@ msgstr ""
 "Skriv in namnet som du vill använda för att referera till detta konto.\n"
 "Till exempel: \"Jobb\" eller \"Personligt\"."
 
-#: mail/mail-config.glade.h:148
-msgid "Use _Daemon"
-msgstr ""
-
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:152
 msgid "V_ariable-width:"
 msgstr "V_ariabelt breddsteg:"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:153
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -15583,92 +15112,88 @@ msgstr ""
 "\n"
 "Klicka på \"Framåt\" för att börja. "
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:158
 msgid "_Add Signature"
 msgstr "_Lägg till signatur"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Always load images from the Internet"
 msgstr "Läs alltid in _bilder från nätet"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Digitally sign outgoing messages (by default)"
 msgstr "Signera _alltid utgående meddelanden när detta konto används"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:161
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Notifiera inte mig när ny post anländer"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:163
 msgid "_Enable"
 msgstr "_Aktivera"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:165
 msgid "_Forward style:"
 msgstr "Stil för _vidarebefordran:"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Load images if sender is in address book"
 msgstr "Läs _in bilder om avsändaren finns i adressboken"
 
-#: mail/mail-config.glade.h:167
-msgid "_Local Tests Only"
-msgstr ""
-
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Make this my default account"
 msgstr "_Gör detta till mitt standardkonto"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_Mark messages as read after"
 msgstr "_Markera meddelanden som lästa efter"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Never load images from the Internet"
 msgstr "_Läs aldrig in bilder från nätet"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "_Fråga då HTML-meddelanden skickas till kontakter som inte vill ha dem"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:175
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "_Fråga då meddelanden skickas med en _tom ämnesrad"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:176
 msgid "_Reply style:"
 msgstr "_Svarsstil:"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:177
 msgid "_Script:"
 msgstr "_Skript:"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:178
 msgid "_Show animated images"
 msgstr "_Visa animerade bilder"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "_Use Secure Connection (SSL):"
 msgstr "_Använd säker anslutning (SSL):"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "_Use the same fonts as other applications"
 msgstr "_Använd samma typsnitt som andra program"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:181
 msgid "color"
 msgstr "färg"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "beskrivning"
 
@@ -15841,7 +15366,7 @@ msgstr ""
 
 #. mail:camel-exception primary
 #: mail/mail-errors.xml.h:57
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgid "Your message with the subject \"{0}\" was not delivered."
 msgstr ""
 
 #. mail:camel-exception secondary
@@ -15907,11 +15432,6 @@ msgstr ""
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Kunde inte skapa katalogen %s: %s"
 
-#. mail:no-save-path secondary
-#: mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail:no-create-path primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
@@ -15936,12 +15456,6 @@ msgstr ""
 msgid "Cannot create temporary save directory."
 msgstr "Kunde inte skapa temporär katalog: %s"
 
-#. mail:no-create-tmp-path secondary
-#: mail/mail-errors.xml.h:100 mail/mail-errors.xml.h:112
-#: widgets/misc/e-system-errors.xml.h:11 widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail:no-write-path-exists secondary
 #: mail/mail-errors.xml.h:104
 #, fuzzy
@@ -16222,29 +15736,25 @@ msgstr "Skriv över"
 msgid "_Append"
 msgstr "Aspen"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:785
 #, c-format
 msgid "Pinging %s"
 msgstr "Pingar %s"
 
-#: mail/mail-mt.c:897
-msgid "Working"
-msgstr "Arbetar"
-
-#: mail/mail-ops.c:99
+#: mail/mail-ops.c:98
 msgid "Filtering Folder"
 msgstr "Filtrerar mapp"
 
-#: mail/mail-ops.c:260
+#: mail/mail-ops.c:259
 msgid "Fetching Mail"
 msgstr "Hämtar post"
 
-#: mail/mail-ops.c:543
+#: mail/mail-ops.c:542
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Misslyckades med att tillämpa utgående filter: %s"
 
-#: mail/mail-ops.c:568
+#: mail/mail-ops.c:567
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -16253,115 +15763,115 @@ msgstr ""
 "Misslyckades med att lägga till i %s: %s\n"
 "Lägger till i lokala \"Skickat\"-mappen istället."
 
-#: mail/mail-ops.c:577
+#: mail/mail-ops.c:576
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Misslyckades med att lägga till i lokala \"Skickat\"-mappen: %s"
 
-#: mail/mail-ops.c:673
+#: mail/mail-ops.c:672
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Skickar meddelande %d av %d"
 
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:703
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Misslyckades med att avkoda meddelandet."
 
-#: mail/mail-ops.c:708
+#: mail/mail-ops.c:707
 msgid "Complete."
 msgstr "Färdig."
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:804
 msgid "Saving message to folder"
 msgstr "Sparar meddelande till mappen"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flyttar meddelanden till %s"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopierar meddelanden till %s"
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:1002
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Genomsöker mappar i \"%s\""
 
-#: mail/mail-ops.c:1116
+#: mail/mail-ops.c:1115
 msgid "Forwarded messages"
 msgstr "Vidarebefordrade meddelanden"
 
-#: mail/mail-ops.c:1159
+#: mail/mail-ops.c:1158
 #, c-format
 msgid "Opening folder %s"
 msgstr "Öppnar mappen %s"
 
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1230
 #, c-format
 msgid "Opening store %s"
 msgstr "Öppnar lagret %s"
 
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1308
 #, c-format
 msgid "Removing folder %s"
 msgstr "Byter namn på mappen %s"
 
-#: mail/mail-ops.c:1403
+#: mail/mail-ops.c:1402
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Lagrar mappen \"%s\""
 
-#: mail/mail-ops.c:1468
+#: mail/mail-ops.c:1467
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1469
+#: mail/mail-ops.c:1468
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Lagrar mappen \"%s\""
 
-#: mail/mail-ops.c:1524
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr "Uppdaterar mapp"
 
-#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
+#: mail/mail-ops.c:1559 mail/mail-ops.c:1610
 msgid "Expunging folder"
 msgstr "Tömmer mapp"
 
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1607
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Tömmer papperskorgen i \"%s\""
 
-#: mail/mail-ops.c:1609
+#: mail/mail-ops.c:1608
 msgid "Local Folders"
 msgstr "Lokala mappar"
 
-#: mail/mail-ops.c:1692
+#: mail/mail-ops.c:1691
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Hämtar meddelande %s"
 
-#: mail/mail-ops.c:1764
+#: mail/mail-ops.c:1763
 #, fuzzy, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Hämtar %d meddelande(n)"
 msgstr[1] "Hämtar %d meddelande(n)"
 
-#: mail/mail-ops.c:1850
+#: mail/mail-ops.c:1849
 #, fuzzy, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Sparar %d meddelande(n)"
 msgstr[1] "Sparar %d meddelande(n)"
 
-#: mail/mail-ops.c:1900
+#: mail/mail-ops.c:1899
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -16370,7 +15880,7 @@ msgstr ""
 "Kan inte spara utdatafilen: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1928
+#: mail/mail-ops.c:1927
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -16379,11 +15889,11 @@ msgstr ""
 "Fel vid sparande av meddelanden till: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1999
+#: mail/mail-ops.c:1998
 msgid "Saving attachment"
 msgstr "Sparar bilaga"
 
-#: mail/mail-ops.c:2016
+#: mail/mail-ops.c:2015
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -16392,17 +15902,17 @@ msgstr ""
 "Kan inte skapa utdatafil: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2046
+#: mail/mail-ops.c:2045
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kunde inte skriva data: %s"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Kopplar från %s"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Ansluter igen till %s"
@@ -16467,24 +15977,24 @@ msgstr "Uppdaterar..."
 msgid "Waiting..."
 msgstr "Väntar..."
 
-#: mail/mail-session.c:238
+#: mail/mail-session.c:239
 msgid "User canceled operation."
 msgstr "Användaren avbröt åtgärden."
 
-#: mail/mail-session.c:271
+#: mail/mail-session.c:272
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Ange lösenord för %s"
 
-#: mail/mail-session.c:273
+#: mail/mail-session.c:274
 msgid "Enter Password"
 msgstr "Ange lösenord"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password"
 msgstr "_Kom ihåg detta lösenord"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:298
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Kom ihåg detta lösenord för resten av denna session"
 
@@ -16539,79 +16049,79 @@ msgstr "Uppdaterar virtuella mappar för uri: %s"
 msgid "Updating vFolders for '%s'"
 msgstr "Uppdaterar virtuella mappar för uri: %s"
 
-#: mail/mail-vfolder.c:959
+#: mail/mail-vfolder.c:958
 msgid "vFolders"
 msgstr "Virtuella mappar"
 
-#: mail/mail-vfolder.c:998
+#: mail/mail-vfolder.c:997
 msgid "Edit VFolder"
 msgstr "Redigera virtuell mapp"
 
-#: mail/mail-vfolder.c:1082
+#: mail/mail-vfolder.c:1081
 msgid "New VFolder"
 msgstr "Ny virtuell mapp"
 
-#: mail/message-list.c:946
+#: mail/message-list.c:948
 msgid "Unseen"
 msgstr "Oläst"
 
-#: mail/message-list.c:947
+#: mail/message-list.c:949
 msgid "Seen"
 msgstr "Läst"
 
-#: mail/message-list.c:948
+#: mail/message-list.c:950
 msgid "Answered"
 msgstr "Besvarad"
 
-#: mail/message-list.c:949
+#: mail/message-list.c:951
 msgid "Multiple Unseen Messages"
 msgstr "Flera olästa meddelanden"
 
-#: mail/message-list.c:950
+#: mail/message-list.c:952
 msgid "Multiple Messages"
 msgstr "Flera meddelanden"
 
-#: mail/message-list.c:954
+#: mail/message-list.c:956
 msgid "Lowest"
 msgstr "Lägsta"
 
-#: mail/message-list.c:955
+#: mail/message-list.c:957
 msgid "Lower"
 msgstr "Lägre"
 
-#: mail/message-list.c:959
+#: mail/message-list.c:961
 msgid "Higher"
 msgstr "Högre"
 
-#: mail/message-list.c:960
+#: mail/message-list.c:962
 msgid "Highest"
 msgstr "Högsta"
 
-#: mail/message-list.c:1279
+#: mail/message-list.c:1285
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1286
+#: mail/message-list.c:1292
 msgid "Today %l:%M %p"
 msgstr "Idag %H.%M"
 
-#: mail/message-list.c:1295
+#: mail/message-list.c:1301
 msgid "Yesterday %l:%M %p"
 msgstr "Igår %H.%M"
 
-#: mail/message-list.c:1307
+#: mail/message-list.c:1313
 msgid "%a %l:%M %p"
 msgstr "%a %H.%M"
 
-#: mail/message-list.c:1315
+#: mail/message-list.c:1321
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H.%M"
 
-#: mail/message-list.c:1317
+#: mail/message-list.c:1323
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:3300
+#: mail/message-list.c:3321
 msgid "Generating message list"
 msgstr "Genererar meddelandelista"
 
@@ -16667,6 +16177,11 @@ msgstr "Vidarebefordra"
 msgid "No Response Necessary"
 msgstr "Inget svar krävs"
 
+# [Status] [är] [Läst]
+#: mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Läst"
+
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Svara"
@@ -16771,45 +16286,49 @@ msgid ""
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:10
-msgid "Whether Evolution should start up in offline mode"
+msgid "Toolbar is visible"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:11
-msgid "Whether to skip the development warning dialog"
+msgid "Whether Evolution should start up in offline mode"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Whether the toolbar should be visible."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:14
 #, fuzzy
 msgid "mail"
 msgstr "E-post"
 
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
-msgstr "Presenteras av"
-
-#: shell/e-shell.c:545 shell/e-shell.c:546
+#: shell/e-shell.c:588 shell/e-shell.c:589
 #, fuzzy, c-format
 msgid "%ld KB"
 msgstr "%d %B"
 
-#: shell/e-shell.c:744
+#: shell/e-shell.c:786
 #, fuzzy
 msgid "Uknown system error."
 msgstr "Okänt fel"
 
-#: shell/e-shell.c:1101
+#: shell/e-shell.c:1143
 msgid "Invalid arguments"
 msgstr "Ogiltiga argument"
 
-#: shell/e-shell.c:1103
+#: shell/e-shell.c:1145
 msgid "Cannot register on OAF"
 msgstr "Kan inte registrera på OAF"
 
-#: shell/e-shell.c:1105
+#: shell/e-shell.c:1147
 msgid "Configuration Database not found"
 msgstr "Konfigurationsdatabasen hittades inte"
 
-#: shell/e-shell.c:1107
+#: shell/e-shell.c:1149
 msgid "Generic error"
 msgstr "Allmänt fel"
 
@@ -16869,7 +16388,7 @@ msgstr ""
 msgid "Select importer"
 msgstr "Välj importör"
 
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1026
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
 #, c-format
 msgid "File %s does not exist"
 msgstr "Filen %s finns inte"
@@ -16897,35 +16416,35 @@ msgstr ""
 "Importerar %s\n"
 "Importerar objekt 1."
 
-#: shell/e-shell-importer.c:549
+#: shell/e-shell-importer.c:570
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: shell/e-shell-importer.c:598
+#: shell/e-shell-importer.c:626
 #, fuzzy
-msgid "_Filename:"
+msgid "F_ilename:"
 msgstr "Filnamn:"
 
-#: shell/e-shell-importer.c:603
+#: shell/e-shell-importer.c:631
 msgid "Select a file"
 msgstr "Välj en fil"
 
-#: shell/e-shell-importer.c:613
+#: shell/e-shell-importer.c:642
 #, fuzzy
 msgid "File _type:"
 msgstr "Filtyp:"
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:681
 #, fuzzy
 msgid "Import data and settings from _older programs"
 msgstr "Importera data och inställningar från äldre program"
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:684
 #, fuzzy
 msgid "Import a _single file"
 msgstr "Importera en ensam fil"
 
-#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -16933,26 +16452,26 @@ msgstr ""
 "Var god vänta...\n"
 "Letar efter befintliga konfigurationer"
 
-#: shell/e-shell-importer.c:727
+#: shell/e-shell-importer.c:756
 msgid "Starting Intelligent Importers"
 msgstr "Startar intelligenta importörer"
 
-#: shell/e-shell-importer.c:853 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
 #, c-format
 msgid "From %s:"
 msgstr "Från %s:"
 
-#: shell/e-shell-importer.c:1044
+#: shell/e-shell-importer.c:1073
 #, fuzzy, c-format
 msgid "No importer available for file %s"
 msgstr "Det finns ingen leverantör för protokollet \"%s\""
 
-#: shell/e-shell-importer.c:1056
+#: shell/e-shell-importer.c:1085
 #, fuzzy
 msgid "Unable to execute importer"
 msgstr "Misslyckades med att köra gpg."
 
-#: shell/e-shell-importer.c:1169
+#: shell/e-shell-importer.c:1199
 #, fuzzy
 msgid "_Import"
 msgstr "Importera"
@@ -17003,61 +16522,61 @@ msgstr "Mappnamnet kan inte innehålla tecknet \"#\"."
 msgid "'.' and '..' are reserved folder names."
 msgstr "\".\" och \"..\" är reserverade mappnamn."
 
-#: shell/e-shell-window.c:336
+#: shell/e-shell-window.c:337
 #, fuzzy
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution är just nu ansluten. Klicka på denna knapp för att koppla "
 "från."
 
-#: shell/e-shell-window.c:343
+#: shell/e-shell-window.c:344
 #, fuzzy
 msgid "Evolution is in the process of going offline."
 msgstr "Ximian Evolution håller på att koppla från."
 
-#: shell/e-shell-window.c:349
+#: shell/e-shell-window.c:350
 #, fuzzy
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution är just nu frånkopplad. Klicka på denna knapp för att "
 "ansluta."
 
-#: shell/e-shell-window.c:621
+#: shell/e-shell-window.c:637
 #, fuzzy, c-format
 msgid "Switch to %s"
 msgstr "E-post till %s"
 
-#: shell/e-shell-window-commands.c:64
+#: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "GNOME Pilot-verktygen verkar inte vara installerade på detta system."
 
-#: shell/e-shell-window-commands.c:72
+#: shell/e-shell-window-commands.c:74
 #, c-format
 msgid "Error executing %s."
 msgstr "Fel vid körning av %s."
 
-#: shell/e-shell-window-commands.c:121
+#: shell/e-shell-window-commands.c:123
 msgid "Bug buddy is not installed."
 msgstr "Bug-buddy är inte installerat."
 
-#: shell/e-shell-window-commands.c:129
+#: shell/e-shell-window-commands.c:131
 msgid "Bug buddy could not be run."
 msgstr "Bug-buddy kunde inte köras."
 
-#: shell/e-shell-window-commands.c:171
+#: shell/e-shell-window-commands.c:323
 #, fuzzy
-msgid "About Evolution"
-msgstr "Om Ximian Evolution"
+msgid "Groupware Suite"
+msgstr "Grupp"
 
-#: shell/e-shell-window-commands.c:382
+#: shell/e-shell-window-commands.c:563
 msgid "_Work Online"
 msgstr "A_rbeta ansluten"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "A_rbeta frånkopplad"
 
-#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Arbeta frånkopplad"
 
@@ -17069,43 +16588,6 @@ msgstr "Kryssruta"
 msgid "New"
 msgstr "Ny"
 
-#: shell/evolution-shell-component-utils.c:115
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Okänt fel."
-
-#: shell/evolution-shell-component-utils.c:118
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Felet från komponentsystemet är:\n"
-"%s"
-
-#: shell/evolution-shell-component-utils.c:125
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Felet från aktiveringssystemet är:\n"
-"%s"
-
 #: shell/evolution-test-component.c:140
 #, fuzzy
 msgid "New Test"
@@ -17445,34 +16927,34 @@ msgid ""
 "Click help for details."
 msgstr ""
 
-#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:522
+#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
+#: smime/gui/certificate-manager.c:556
 #, fuzzy
 msgid "Select a cert to import..."
 msgstr "Välj importör"
 
-#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:604
+#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
+#: smime/gui/certificate-manager.c:638
 #, fuzzy
 msgid "Certificate Name"
 msgstr "_Certifikat-ID:"
 
-#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
+#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
 #, fuzzy
 msgid "Purposes"
 msgstr "Förlopp"
 
-#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:517
+#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:267
+#: smime/gui/certificate-manager.c:271
 #, fuzzy
 msgid "Expires"
 msgstr "Uttryck"
 
-#: smime/gui/certificate-manager.c:417
+#: smime/gui/certificate-manager.c:446
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "E-postadress:"
@@ -17519,6 +17001,11 @@ msgstr ""
 "Utställare: %s\n"
 "Ämne: %s"
 
+#: smime/gui/e-cert-selector.c:169
+#, fuzzy
+msgid "Select certificate"
+msgstr "Gå till ett specifikt datum"
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -17581,7 +17068,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
 #, fuzzy
 msgid "Certificate"
 msgstr "_Certifikat-ID:"
@@ -17606,20 +17093,24 @@ msgstr "Vanligt namn"
 msgid "Contact Certificates"
 msgstr "_Certifikat-ID:"
 
-#: smime/gui/smime-ui.glade.h:21
-#, no-c-format
-msgid "Do you want to trust \"%s\" for the following purposes?"
+#: smime/gui/smime-ui.glade.h:20
+msgid "Do not trust the authenticity of this certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:21
 msgid "Dummy window only"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:22
 #, fuzzy
 msgid "Edit"
 msgstr "_Redigera"
 
+#: smime/gui/smime-ui.glade.h:23
+#, fuzzy
+msgid "Email Certificate Trust Settings"
+msgstr "Ogiltig certifikatmyndighet (CA)"
+
 #: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr ""
@@ -17656,281 +17147,291 @@ msgstr "Organisationsenhet"
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:37
-msgid "Trust this CA to identify email users."
+msgid "Trust the authenticity of this certificate"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:38
-msgid "Trust this CA to identify software developers."
+msgid "Trust this CA to identify email users."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:39
-msgid "Trust this CA to identify web sites."
+msgid "Trust this CA to identify software developers."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:40
-#, fuzzy
-msgid "View"
-msgstr "_Visa"
+msgid "Trust this CA to identify web sites."
+msgstr ""
 
 #: smime/gui/smime-ui.glade.h:41
 #, fuzzy
-msgid "View Certificate"
-msgstr "_Certifikat-ID:"
+msgid "View"
+msgstr "_Visa"
 
 #: smime/gui/smime-ui.glade.h:42
-#, fuzzy
-msgid "You have been asked to trust a new Certificate Authority (CA)."
-msgstr "Ogiltig certifikatmyndighet (CA)"
-
-#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:44
+#: smime/gui/smime-ui.glade.h:43
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:45
+#: smime/gui/smime-ui.glade.h:44
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:46
+#: smime/gui/smime-ui.glade.h:45
 #, fuzzy
 msgid "Your Certificates"
 msgstr "_Certifikat-ID:"
 
-#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
+#: smime/gui/smime-ui.glade.h:46
+#, fuzzy
+msgid "_Edit CA Trust"
+msgstr "Redigera uppgift"
+
+#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d-%m-%Y"
 
-#: smime/lib/e-cert.c:478
+#. x509 certificate usage types
+#: smime/lib/e-cert.c:424
+#, fuzzy
+msgid "Sign"
+msgstr "signera"
+
+#: smime/lib/e-cert.c:425
+#, fuzzy
+msgid "Encrypt"
+msgstr "kryptera"
+
+#: smime/lib/e-cert.c:530
 #, fuzzy
 msgid "Version"
 msgstr "Vermont"
 
-#: smime/lib/e-cert.c:493
+#: smime/lib/e-cert.c:545
 #, fuzzy
 msgid "Version 1"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:496
+#: smime/lib/e-cert.c:548
 #, fuzzy
 msgid "Version 2"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:499
+#: smime/lib/e-cert.c:551
 #, fuzzy
 msgid "Version 3"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:581
+#: smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:584
+#: smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:587
+#: smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:590
+#: smime/lib/e-cert.c:642
 #, fuzzy
 msgid "C"
 msgstr "Kopia"
 
-#: smime/lib/e-cert.c:593
+#: smime/lib/e-cert.c:645
 #, fuzzy
 msgid "CN"
 msgstr "N"
 
-#: smime/lib/e-cert.c:596
+#: smime/lib/e-cert.c:648
 msgid "OU"
 msgstr ""
 
-#: smime/lib/e-cert.c:599
+#: smime/lib/e-cert.c:651
 #, fuzzy
 msgid "O"
 msgstr "OK"
 
-#: smime/lib/e-cert.c:602
+#: smime/lib/e-cert.c:654
 msgid "L"
 msgstr ""
 
-#: smime/lib/e-cert.c:605
+#: smime/lib/e-cert.c:657
 #, fuzzy
 msgid "DN"
 msgstr "ISDN"
 
-#: smime/lib/e-cert.c:608
+#: smime/lib/e-cert.c:660
 msgid "DC"
 msgstr ""
 
-#: smime/lib/e-cert.c:611
+#: smime/lib/e-cert.c:663
 #, fuzzy
 msgid "ST"
 msgstr "S"
 
-#: smime/lib/e-cert.c:614
+#: smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:617
+#: smime/lib/e-cert.c:669
 #, fuzzy
 msgid "Certificate Key Usage"
 msgstr "Certifikat återkallat"
 
-#: smime/lib/e-cert.c:620
+#: smime/lib/e-cert.c:672
 msgid "Netscape Certificate Type"
 msgstr ""
 
-#: smime/lib/e-cert.c:623
+#: smime/lib/e-cert.c:675
 #, fuzzy
 msgid "Certificate Authority Key Identifier"
 msgstr "Certifikatet opålitligt"
 
-#: smime/lib/e-cert.c:626
+#: smime/lib/e-cert.c:678
 #, fuzzy
 msgid "UID"
 msgstr "ID"
 
-#: smime/lib/e-cert.c:635
+#: smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr ""
 
-#: smime/lib/e-cert.c:686
+#: smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:694
+#: smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
 msgstr ""
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:768
 #, fuzzy
 msgid "Subject Public Key Info"
 msgstr ""
 "\n"
 "Publik nyckel: "
 
-#: smime/lib/e-cert.c:721
+#: smime/lib/e-cert.c:773
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:736
+#: smime/lib/e-cert.c:788
 #, fuzzy
 msgid "Subject's Public Key"
 msgstr "Ämnet är %s"
 
-#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
+#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
 #, fuzzy
 msgid "Error: Unable to process extension"
 msgstr "Kan inte bearbeta spool-mappen"
 
-#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
+#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:782
+#: smime/lib/e-cert.c:834
 #, fuzzy
 msgid "SSL Certificate Authority"
 msgstr "Ogiltig certifikatmyndighet (CA)"
 
-#: smime/lib/e-cert.c:786
+#: smime/lib/e-cert.c:838
 #, fuzzy
 msgid "Email Certificate Authority"
 msgstr "Ogiltig certifikatmyndighet (CA)"
 
-#: smime/lib/e-cert.c:814
+#: smime/lib/e-cert.c:866
 #, fuzzy
 msgid "Signing"
 msgstr "inkommande"
 
-#: smime/lib/e-cert.c:818
+#: smime/lib/e-cert.c:870
 #, fuzzy
 msgid "Non-repudiation"
 msgstr "Ingen information"
 
-#: smime/lib/e-cert.c:822
+#: smime/lib/e-cert.c:874
 msgid "Key Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:826
+#: smime/lib/e-cert.c:878
 #, fuzzy
 msgid "Data Encipherment"
 msgstr "bilaga"
 
-#: smime/lib/e-cert.c:830
+#: smime/lib/e-cert.c:882
 msgid "Key Agreement"
 msgstr ""
 
-#: smime/lib/e-cert.c:834
+#: smime/lib/e-cert.c:886
 #, fuzzy
 msgid "Certificate Signer"
 msgstr "Certifikatsignaturfel"
 
-#: smime/lib/e-cert.c:838
+#: smime/lib/e-cert.c:890
 msgid "CRL Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:938
 #, fuzzy
 msgid "Critical"
 msgstr "Curitaba"
 
-#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
+#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
 #, fuzzy
 msgid "Not Critical"
 msgstr "North Carolina"
 
-#: smime/lib/e-cert.c:912
+#: smime/lib/e-cert.c:964
 #, fuzzy
 msgid "Extensions"
 msgstr "Undantag"
 
-#: smime/lib/e-cert.c:983
+#: smime/lib/e-cert.c:1035
 #, fuzzy, c-format
 msgid "%s = %s"
 msgstr "%s vid %s"
 
-#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
 #, fuzzy
 msgid "Certificate Signature Algorithm"
 msgstr "Certifikatsignaturfel"
 
-#: smime/lib/e-cert.c:1048
+#: smime/lib/e-cert.c:1100
 #, fuzzy
 msgid "Issuer"
 msgstr "_Infoga"
 
-#: smime/lib/e-cert.c:1102
+#: smime/lib/e-cert.c:1154
 msgid "Issuer Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1121
+#: smime/lib/e-cert.c:1173
 #, fuzzy
 msgid "Subject Unique ID"
 msgstr "Ämnet är %s"
 
-#: smime/lib/e-cert.c:1164
+#: smime/lib/e-cert.c:1216
 #, fuzzy
 msgid "Certificate Signature Value"
 msgstr "Certifikatsignaturfel"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
+#: smime/lib/e-cert-db.c:608
 #, fuzzy
 msgid "Certificate already exists"
 msgstr "Kort-ID finns redan"
@@ -18079,7 +17580,7 @@ msgstr "Visa den aktuella kontakten"
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "_Åtgärder"
 
@@ -18247,7 +17748,7 @@ msgstr "S_täng"
 #: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:3
+#: ui/evolution.xml.h:4
 msgid "Close"
 msgstr "Stäng"
 
@@ -18260,7 +17761,7 @@ msgid "Delete this item"
 msgstr "Ta bort detta objekt"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr "Huvudverktygsrad"
 
@@ -18303,7 +17804,7 @@ msgstr "Spara detta objekt till disk"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:44
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "_File"
 msgstr "_Arkiv"
 
@@ -18564,13 +18065,13 @@ msgstr "_Omvänd markering"
 msgid "_Threaded Message List"
 msgstr "_Trådad meddelandelista"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Stäng detta fönster"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "_Close"
 msgstr "S_täng"
 
@@ -18978,7 +18479,7 @@ msgstr "_Föregående meddelande"
 msgid "_Quoted"
 msgstr "_Citerad"
 
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
 msgid "_Tools"
 msgstr "V_erktyg"
 
@@ -19281,108 +18782,122 @@ msgid "_Open Task"
 msgstr "_Uppgift"
 
 #: ui/evolution.xml.h:1
-msgid "About Ximian Evolution..."
-msgstr "Om Ximian Evolution..."
+#, fuzzy
+msgid "About Evolution..."
+msgstr "Om Ximian Evolution"
 
 #: ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
 msgstr "Ändra Evolutions inställningar"
 
-#: ui/evolution.xml.h:5
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the visibility of the toolbar"
+msgstr "Ändra egenskaperna för denna mapp"
+
+#: ui/evolution.xml.h:6
 msgid "Create a new window displaying this folder"
 msgstr "Skapa ett nytt fönster som visar denna mapp"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "_Avsluta"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Frågor och _svar om Ximian Evolution"
+
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Avsluta programmet"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:10
 msgid "Forget _Passwords"
 msgstr "_Glöm lösenord"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:11
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Glöm ihågkomna lösenord så att du frågas efter dem igen"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:12
 msgid "Import data from other programs"
 msgstr "Importera data från andra program"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:14
 #, fuzzy
 msgid "New _Window"
 msgstr "_Sök nu"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Pi_lot Settings..."
 msgstr "Pi_lotinställningar..."
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Send / Receive"
 msgstr "Skicka / Ta emot"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Send queued items and retrieve new items"
 msgstr "Skicka kölagda objekt och hämta nya objekt"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Set up Pilot configuration"
 msgstr "Konfigurera Pilotkonfiguration"
 
-#: ui/evolution.xml.h:17
-msgid "Show information about Ximian Evolution"
+#: ui/evolution.xml.h:19
+#, fuzzy
+msgid "Show information about Evolution"
 msgstr "Visa information om Ximian Evolution"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:20
 msgid "Submit Bug Report"
 msgstr "Skicka felrapport"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:21
 msgid "Submit _Bug Report"
 msgstr "Skicka _felrapport"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Skicka en felrapport med Bug-Buddy"
 
-#: ui/evolution.xml.h:21
-msgid "Toggle whether we are working offline."
-msgstr "Växla om vi arbetar frånkopplade."
-
 #: ui/evolution.xml.h:23
-msgid "Ximian Evolution _FAQ"
-msgstr "Frågor och _svar om Ximian Evolution"
+#, fuzzy
+msgid "T_oolbar"
+msgstr "_Verktygsrader"
 
 #: ui/evolution.xml.h:24
-msgid "_About Ximian Evolution..."
-msgstr "_Om Ximian Evolution..."
+msgid "Toggle whether we are working offline."
+msgstr "Växla om vi arbetar frånkopplade."
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "_About Evolution..."
+msgstr "Om Ximian Evolution"
+
+#: ui/evolution.xml.h:30
 msgid "_Help"
 msgstr "_Hjälp"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "_Import..."
 msgstr "_Importera..."
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "_New"
 msgstr "_Nytt"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 #, fuzzy
 msgid "_Quick Reference"
 msgstr "Snabbsökning"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_Send / Receive"
 msgstr "_Skicka / Ta emot"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 #, fuzzy
 msgid "_Window"
 msgstr "_Sök nu"
@@ -19461,7 +18976,7 @@ msgid "With _Status"
 msgstr "Ställ in status"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:626
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:635
 msgid "UTC"
 msgstr "UTC"
 
@@ -19618,29 +19133,29 @@ msgstr "Annan..."
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
-#: widgets/misc/e-error.c:121
+#: widgets/misc/e-error.c:79 widgets/misc/e-error.c:80
+#: widgets/misc/e-error.c:122
 msgid "Evolution Error"
 msgstr "Evolution-fel"
 
-#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
-#: widgets/misc/e-error.c:119
+#: widgets/misc/e-error.c:81 widgets/misc/e-error.c:82
+#: widgets/misc/e-error.c:120
 #, fuzzy
 msgid "Evolution Warning"
 msgstr "Evolutions e-post"
 
-#: widgets/misc/e-error.c:118
+#: widgets/misc/e-error.c:119
 #, fuzzy
 msgid "Evolution Information"
 msgstr "Sammanträdesinformation"
 
-#: widgets/misc/e-error.c:120
+#: widgets/misc/e-error.c:121
 #, fuzzy
 msgid "Evolution Query"
 msgstr "Evolution"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:410
+#: widgets/misc/e-error.c:415
 #, fuzzy, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -19792,16 +19307,510 @@ msgstr ""
 "Kan inte spara till \"%s\":\n"
 " %s"
 
-#: widgets/misc/e-task-widget.c:211
+#: widgets/misc/e-task-widget.c:212
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: widgets/misc/e-task-widget.c:216
+#: widgets/misc/e-task-widget.c:217
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% färdigt)"
 
+#~ msgid "Failed to connect to LDAP server"
+#~ msgstr "Misslyckades med att ansluta till LDAP-server"
+
+#~ msgid "Failed to authenticate with LDAP server"
+#~ msgstr "Misslyckades med att autentisera till LDAP-server"
+
+#~ msgid "Could not perform query on Root DSE"
+#~ msgstr "Kunde inte utföra fråga på rot-DSE"
+
+#~ msgid "The server responded with no supported search bases"
+#~ msgstr "Servern svarade med inga sökbaser stöds"
+
+#~ msgid "This server does not support LDAPv3 schema information"
+#~ msgstr "Denna server stöder inte LDAPv3-schemainformation"
+
+#~ msgid "Error retrieving schema information"
+#~ msgstr "Fel vid hämtande av filterinformation"
+
+#~ msgid "Server did not respond with valid schema information"
+#~ msgstr "Servern svarade inte med giltig schemainformation"
+
+#~ msgid "  S_how Supported Bases "
+#~ msgstr "  _Visa de baser som stöds "
+
+#~ msgid "1:00"
+#~ msgstr "1.00"
+
+#~ msgid "5:00"
+#~ msgstr "5.00"
+
+#~ msgid "Connecting"
+#~ msgstr "Ansluter"
+
+#~ msgid "Distinguished _name:"
+#~ msgstr "Distinguished _name:"
+
+#~ msgid "Email address:"
+#~ msgstr "E-postadress:"
+
+#~ msgid "Evolution will use this DN to authenticate you with the server"
+#~ msgstr ""
+#~ "Evolution kommer att använda detta DN för att autentisera dig till servern"
+
+#~ msgid "One"
+#~ msgstr "En"
+
+#~ msgid "S_earch scope: "
+#~ msgstr "S_ökomfattning: "
+
+#~ msgid "Searching"
+#~ msgstr "Söker"
+
+#~ msgid "Sub"
+#~ msgstr "Pren"
+
+#~ msgid "This option controls how long a search will be run."
+#~ msgstr "Detta alternativ styr hur lång tid en sökning kommer att köras."
+
+#~ msgid "U_se SSL/TLS:"
+#~ msgstr "An_vänd SSL/TLS:"
+
+#~ msgid "_Display name:"
+#~ msgstr "_Visa namn:"
+
+#~ msgid "_Port number:"
+#~ msgstr "_Portnummer:"
+
+#~ msgid "_Search base:"
+#~ msgstr "_Utgångspunkt för sökning:"
+
+#~ msgid "_Server name:"
+#~ msgstr "_Servernamn:"
+
+#~ msgid "_Timeout (minutes):"
+#~ msgstr "_Timeout (minuter):"
+
+#~ msgid "connecting-tab"
+#~ msgstr "anslutningsflik"
+
+#~ msgid "general-tab"
+#~ msgstr "allmän-flik"
+
+#~ msgid "searching-tab"
+#~ msgstr "sökflik"
+
+#, fuzzy
+#~ msgid "Job title:"
+#~ msgstr "_Jobbtitel:"
+
+#, fuzzy
+#~ msgid "Webcam:"
+#~ msgstr "Sida"
+
+#~ msgid "Category editor not available."
+#~ msgstr "Kategoriredigeraren är inte tillgänglig."
+
+#, fuzzy
+#~ msgid ""
+#~ "The following entries are invalid:\n"
+#~ "\n"
+#~ msgstr "Följande anslutningar är aktiva för tillfället:"
+
+#~ msgid "Could not find widget for a field: `%s'"
+#~ msgstr "Kunde inte hitta widget för fältet: \"%s\""
+
+#~ msgid "Do you want to save changes?"
+#~ msgstr "Vill du spara ändringar?"
+
+#~ msgid "Error saving %s: %s"
+#~ msgstr "Fel vid sparande av %s: %s"
+
+#~ msgid ""
+#~ "The addressbook backend for\n"
+#~ "%s\n"
+#~ "has crashed. You will have to restart Evolution in order to use it again"
+#~ msgstr ""
+#~ "Adressboksbakänden för\n"
+#~ "%s\n"
+#~ "har kraschat. Du kommer att behöva starta om Evolution för att kunna "
+#~ "använda det igen"
+
+#, fuzzy
+#~ msgid "Calendar Properties"
+#~ msgstr "Inställningar för kalendern..."
+
+#, fuzzy
+#~ msgid "Remote"
+#~ msgstr "Ta bort"
+
+#, fuzzy
+#~ msgid "Task List Properties"
+#~ msgstr "Egenskaper för att-göra-listan"
+
+#, fuzzy
+#~ msgid "_Refresh Interval:"
+#~ msgstr " _Uppdatera lista "
+
+#, fuzzy
+#~ msgid "_Source URL:"
+#~ msgstr "_Källkod"
+
+#~ msgid ""
+#~ "The event being deleted is a meeting, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "Evenemanget som tas bort är ett sammanträde. Vill du skicka ett "
+#~ "avbokningsmeddelande?"
+
+#~ msgid "Are you sure you want to cancel and delete this meeting?"
+#~ msgstr "Är du säker på att du vill avboka och ta bort detta sammanträde?"
+
+#~ msgid ""
+#~ "The task being deleted is assigned, would you like to send a cancellation "
+#~ "notice?"
+#~ msgstr ""
+#~ "Uppgiften som tas bort är tilldelad. Vill du skicka ett "
+#~ "avbrytningsmeddelande?"
+
+#~ msgid "Are you sure you want to cancel and delete this task?"
+#~ msgstr "Är du säker på att du vill avbryta och ta bort denna uppgift?"
+
+#~ msgid ""
+#~ "The journal entry being deleted is published, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "Dagboksposten som tas bort är publicerad. Vill du skicka ett meddelande "
+#~ "om att det är inställt?"
+
+#~ msgid "Are you sure you want to cancel and delete this journal entry?"
+#~ msgstr "Är du säker på att du vill avbryta ta bort denna dagbokspost?"
+
+#~ msgid "Are you sure you want to delete the appointment `%s'?"
+#~ msgstr "Är du säker på att du vill ta bort mötet \"%s\""
+
+#~ msgid "Are you sure you want to delete this untitled appointment?"
+#~ msgstr "Är du säker på att du vill ta bort detta namnlösa möte?"
+
+#~ msgid "Are you sure you want to delete the task `%s'?"
+#~ msgstr "Är du säker på att du vill ta bort uppgiften \"%s\"?"
+
+#~ msgid "Are you sure you want to delete this untitled task?"
+#~ msgstr "Är du säker på att du vill ta bort denna namnlösa uppgift?"
+
+#~ msgid "Are you sure you want to delete the journal entry `%s'?"
+#~ msgstr "Är du säker på att du vill ta bort dagboksposten \"%s\"?"
+
+#~ msgid "Are you sure want to delete this untitled journal entry?"
+#~ msgstr "Är du säker på att du vill ta bort denna namnlösa dagbokspost?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d appointment?"
+#~ msgid_plural "Are you sure you want to delete %d appointments?"
+#~ msgstr[0] "Är du säker på att du vill ta bort %d möten?"
+#~ msgstr[1] "Är du säker på att du vill ta bort %d möten?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d task?"
+#~ msgid_plural "Are you sure you want to delete %d tasks?"
+#~ msgstr[0] "Är du säker på att du vill ta bort %d uppgifter?"
+#~ msgstr[1] "Är du säker på att du vill ta bort %d uppgifter?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d journal entry?"
+#~ msgid_plural "Are you sure you want to delete %d journal entries?"
+#~ msgstr[0] "Är du säker på att du vill ta bort %d dagboksposter?"
+#~ msgstr[1] "Är du säker på att du vill ta bort %d dagboksposter?"
+
+#~ msgid "_Invite Others..."
+#~ msgstr "Bjud _in andra..."
+
+#~ msgid ""
+#~ "This event has been changed, but has not been saved.\n"
+#~ "\n"
+#~ "Do you wish to save your changes?"
+#~ msgstr ""
+#~ "Detta evenemang har ändrats, men har inte sparats.\n"
+#~ "\n"
+#~ "Vill du spara dina ändringar?"
+
+#~ msgid "_Discard Changes"
+#~ msgstr "_Förkasta ändringar"
+
+#~ msgid "Save Event"
+#~ msgstr "Spara evenemang"
+
+#~ msgid "The meeting information has been created. Send it?"
+#~ msgstr "Sammanträdesinformationen har skapats. Skicka den?"
+
+#~ msgid "The meeting information has changed. Send an updated version?"
+#~ msgstr ""
+#~ "Sammanträdesinformationen har ändrats. Skicka en uppdaterad version?"
+
+#~ msgid "The task assignment information has been created. Send it?"
+#~ msgstr "Uppgiftstilldelningsinformationen har ändrats. Skicka den?"
+
+#~ msgid "The task information has changed. Send an updated version?"
+#~ msgstr "Uppgiftsinformationen har ändrats. Skicka en uppdaterad version?"
+
+#, fuzzy
+#~ msgid "Could not get article %s from NNTP server"
+#~ msgstr "Kunde inte hämta grupplista från servern."
+
+#, fuzzy
+#~ msgid "Error posting message: %s: message not posted"
+#~ msgstr ""
+#~ "Fel vid automatiskt sparande av meddelande: %s\n"
+#~ " %s"
+
+#, fuzzy
+#~ msgid "Stream error"
+#~ msgstr "Annat fel"
+
+#, fuzzy
+#~ msgid "Connection error: %s"
+#~ msgstr "Okänt fel: %s"
+
+#~ msgid "Could not get group: %s"
+#~ msgstr "Kunde inte hämta grupp: %s"
+
+#, fuzzy
+#~ msgid "Could not get messages: unspecified error"
+#~ msgstr "Kunde inte hämta meddelande: %s"
+
+#~ msgid "Unknown server response: %s"
+#~ msgstr "Okänt serversvar: %s"
+
+#~ msgid "Adjust Score"
+#~ msgstr "Justera poäng"
+
+#~ msgid "Assign Color"
+#~ msgstr "Tilldela färg"
+
+#~ msgid "Assign Score"
+#~ msgstr "Tilldela poäng"
+
+#~ msgid "Attachments"
+#~ msgstr "Bilagor"
+
+#~ msgid "Beep"
+#~ msgstr "Pip"
+
+#~ msgid "contains"
+#~ msgstr "innehåller"
+
+#~ msgid "Copy to Folder"
+#~ msgstr "Kopiera till mapp"
+
+#~ msgid "Date received"
+#~ msgstr "Ankomstdatum"
+
+#~ msgid "Date sent"
+#~ msgstr "Avsändningsdatum"
+
+#~ msgid "Deleted"
+#~ msgstr "Borttagen"
+
+#~ msgid "does not contain"
+#~ msgstr "innehåller inte"
+
+#~ msgid "does not end with"
+#~ msgstr "slutar inte med"
+
+#~ msgid "does not exist"
+#~ msgstr "finns inte"
+
+#~ msgid "does not return"
+#~ msgstr "returnerar inte"
+
+#~ msgid "does not sound like"
+#~ msgstr "låter inte som"
+
+#~ msgid "does not start with"
+#~ msgstr "börjar inte med"
+
+#~ msgid "Do Not Exist"
+#~ msgstr "finns inte"
+
+#~ msgid "Draft"
+#~ msgstr "Utkast"
+
+#~ msgid "ends with"
+#~ msgstr "slutar med"
+
+#~ msgid "Exist"
+#~ msgstr "finns"
+
+#~ msgid "exists"
+#~ msgstr "finns"
+
+#~ msgid "Expression"
+#~ msgstr "Uttryck"
+
+#~ msgid "Follow Up"
+#~ msgstr "Följ upp"
+
+#~ msgid "is"
+#~ msgstr "är"
+
+#~ msgid "is after"
+#~ msgstr "är efter"
+
+#~ msgid "is before"
+#~ msgstr "är innan"
+
+#~ msgid "is Flagged"
+#~ msgstr "är flaggad"
+
+#~ msgid "is greater than"
+#~ msgstr "är större än"
+
+#~ msgid "is less than"
+#~ msgstr "är mindre än"
+
+#~ msgid "is not"
+#~ msgstr "är inte"
+
+#~ msgid "is not Flagged"
+#~ msgstr "är inte flaggad"
+
+#, fuzzy
+#~ msgid "Junk Test"
+#~ msgstr "juni"
+
+#~ msgid "Mailing list"
+#~ msgstr "Sändlista"
+
+#~ msgid "Message Body"
+#~ msgstr "meddelandetext"
+
+#~ msgid "Message Header"
+#~ msgstr "meddelandehuvud"
+
+#, fuzzy
+#~ msgid "Message is Junk"
+#~ msgstr "Meddelandet skickades"
+
+#, fuzzy
+#~ msgid "Message is not Junk"
+#~ msgstr "Meddelandet %s hittades inte."
+
+#~ msgid "Move to Folder"
+#~ msgstr "Flytta till mapp"
+
+#, fuzzy
+#~ msgid "Pipe to Program"
+#~ msgstr "Avsluta programmet"
+
+#~ msgid "Play Sound"
+#~ msgstr "Spela ljud"
+
+#~ msgid "Recipients"
+#~ msgstr "Mottagare"
+
+#~ msgid "Regex Match"
+#~ msgstr "Reguljärt uttryck matchar"
+
+#~ msgid "Replied to"
+#~ msgstr "besvarad"
+
+#~ msgid "returns"
+#~ msgstr "returnerar"
+
+#~ msgid "returns greater than"
+#~ msgstr "returnerar större än"
+
+#~ msgid "returns less than"
+#~ msgstr "returnerar mindre än"
+
+#, fuzzy
+#~ msgid "Run Program"
+#~ msgstr "Kör program:"
+
+#~ msgid "Sender"
+#~ msgstr "Avsändare"
+
+#~ msgid "Set Status"
+#~ msgstr "Ställ in status"
+
+#~ msgid "Size (kB)"
+#~ msgstr "Storlek (kB)"
+
+#~ msgid "sounds like"
+#~ msgstr "låter som"
+
+#~ msgid "Source Account"
+#~ msgstr "Källkonto"
+
+#~ msgid "Specific header"
+#~ msgstr "Specifikt huvud"
+
+#~ msgid "starts with"
+#~ msgstr "börjar med"
+
+#~ msgid "Stop Processing"
+#~ msgstr "Stoppa behandling"
+
+#~ msgid "Unset Status"
+#~ msgstr "Töm status"
+
+#~ msgid "Working"
+#~ msgstr "Arbetar"
+
+#~ msgid "Brought to you by"
+#~ msgstr "Presenteras av"
+
+#, fuzzy
+#~ msgid "_Filename:"
+#~ msgstr "Filnamn:"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "Unknown error."
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Okänt fel."
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the component system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Felet från komponentsystemet är:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the activation system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Felet från aktiveringssystemet är:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "View Certificate"
+#~ msgstr "_Certifikat-ID:"
+
+#, fuzzy
+#~ msgid "You have been asked to trust a new Certificate Authority (CA)."
+#~ msgstr "Ogiltig certifikatmyndighet (CA)"
+
+#~ msgid "About Ximian Evolution..."
+#~ msgstr "Om Ximian Evolution..."
+
+#~ msgid "_About Ximian Evolution..."
+#~ msgstr "_Om Ximian Evolution..."
+
 #~ msgid "Evolution Addressbook folder viewer"
 #~ msgstr "Mappvisare för Evolutions adressbok"
 
@@ -20109,9 +20118,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "Primary _email:"
 #~ msgstr "Primär _e-post:"
 
-#~ msgid "S_pouse:"
-#~ msgstr "_Partner:"
-
 #~ msgid "_Business:"
 #~ msgstr "_Företag:"
 
@@ -20127,9 +20133,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "_Mobile:"
 #~ msgstr "_Mobil:"
 
-#~ msgid "_Office:"
-#~ msgstr "K_ontor:"
-
 #~ msgid "_Public Calendar URL:"
 #~ msgstr "URL till _publik kalender:"
 
@@ -24939,9 +24942,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "Lannion"
 #~ msgstr "Lannion"
 
-#~ msgid "Lansing"
-#~ msgstr "Lansing"
-
 #~ msgid "Lanzhou"
 #~ msgstr "Lanzhou"
 
@@ -33458,9 +33458,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "Add a new service to the Executive Summary"
 #~ msgstr "Lägg till ny tjänst till sammanfattningen"
 
-#~ msgid "Edit Task"
-#~ msgstr "Redigera uppgift"
-
 #~ msgid "Could not sign: failed to create content info."
 #~ msgstr ""
 #~ "Kunde inte signera: misslyckades med att skapa innehållsinformation."
@@ -33485,9 +33482,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "sign and encrypt"
 #~ msgstr "signera och kryptera"
 
-#~ msgid "sign"
-#~ msgstr "signera"
-
 #~ msgid "PGP"
 #~ msgstr "PGP"
 
@@ -33955,9 +33949,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "_Redo"
 #~ msgstr "_Gör om"
 
-#~ msgid "_Toolbars"
-#~ msgstr "_Verktygsrader"
-
 #~ msgid "_Undo"
 #~ msgstr "_Ångra"
 
diff --git a/po/tr.po b/po/tr.po
index 9bec64d5b2..8db90c00f5 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2004-05-19 14:00-0400\n"
+"POT-Creation-Date: 2004-06-03 11:14-0400\n"
 "PO-Revision-Date: 2004-01-24 00:49-0500\n"
 "Last-Translator: Görkem Çetin <gorkem@kde.org>\n"
 "Language-Team: Turkish <gnome-turk@gnome.org>\n"
@@ -59,13 +59,13 @@ msgstr "1 kart"
 msgid "Default Sync Address:"
 msgstr "Öntanımlı Eşzamanlama Adresi:"
 
-#: addressbook/conduit/address-conduit.c:1150
 #: addressbook/conduit/address-conduit.c:1151
+#: addressbook/conduit/address-conduit.c:1152
 msgid "Could not load addressbook"
 msgstr "Adres defteri yüklenemedi"
 
-#: addressbook/conduit/address-conduit.c:1219
-#: addressbook/conduit/address-conduit.c:1222
+#: addressbook/conduit/address-conduit.c:1220
+#: addressbook/conduit/address-conduit.c:1223
 msgid "Could not read pilot's Address application block"
 msgstr "Pilot adres uygulama defteri okunamadı"
 
@@ -73,13 +73,13 @@ msgstr "Pilot adres uygulama defteri okunamadı"
 msgid "Accessing LDAP Server anonymously"
 msgstr "LDAP sunucuya anonim bağlantı kuruluyor"
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
 msgid "Failed to authenticate.\n"
 msgstr "Kimlik denetimi yapılamadı.\n"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%s%s için parolayı girin (kullanıcı: %s)"
@@ -123,51 +123,23 @@ msgstr "_Bağlantılar:"
 msgid "Create a new contacts group"
 msgstr "Yeni bir kısayol grubu yarat"
 
-#: addressbook/gui/component/addressbook-component.c:182
+#: addressbook/gui/component/addressbook-component.c:184
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:483
-msgid "Failed to connect to LDAP server"
-msgstr "LDAP sunucuyla bağlantı başarısız oldu"
-
-#: addressbook/gui/component/addressbook-config.c:507
-msgid "Failed to authenticate with LDAP server"
-msgstr "LDAP sunucuyla kimlik denetimi başarısız oldu"
-
-#: addressbook/gui/component/addressbook-config.c:535
-msgid "Could not perform query on Root DSE"
-msgstr "Root DSE üzerinde tarama yapılamadı"
-
-#: addressbook/gui/component/addressbook-config.c:840
-msgid "The server responded with no supported search bases"
-msgstr "Sunucunun cevabında desteklenen bir arama tabanı bulunamadı"
-
-#: addressbook/gui/component/addressbook-config.c:1245
-msgid "This server does not support LDAPv3 schema information"
-msgstr "Sunucu LDAPv3 şema bilgisini desteklemiyor"
-
-#: addressbook/gui/component/addressbook-config.c:1266
-msgid "Error retrieving schema information"
-msgstr "Şema bilgisini yüklerken hata oluştu"
-
-#: addressbook/gui/component/addressbook-config.c:1274
-msgid "Server did not respond with valid schema information"
-msgstr "Sunucu geçerli bir şema bilgisi cevabı vermedi"
-
 #: addressbook/gui/component/addressbook-migrate.c:68
-#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1160
 msgid "Migrating..."
 msgstr "Geçiş yapılıyor..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1201
 #, c-format
 msgid "Migrating `%s':"
 msgstr "'%s' geçiş yapılıyor:"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:438
+#: addressbook/gui/component/addressbook-migrate.c:464
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
 #: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
@@ -175,30 +147,30 @@ msgid "On This Computer"
 msgstr "Bu Bilgisayarda"
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:446
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
-#: mail/mail-config.glade.h:106
+#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
+#: mail/mail-config.glade.h:109
 msgid "Personal"
 msgstr "Kişisel"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:454
+#: addressbook/gui/component/addressbook-migrate.c:480
 msgid "On LDAP Servers"
 msgstr "LDAP Sunucuları Üzerinde"
 
-#: addressbook/gui/component/addressbook-migrate.c:582
+#: addressbook/gui/component/addressbook-migrate.c:608
 #, fuzzy
 msgid "LDAP Servers"
 msgstr "LDAP Sunucuları Üzerinde"
 
-#: addressbook/gui/component/addressbook-migrate.c:702
+#: addressbook/gui/component/addressbook-migrate.c:728
 #, fuzzy
 msgid "Autocompletion Settings"
 msgstr "Otomatik Tamamlama"
 
-#: addressbook/gui/component/addressbook-migrate.c:1076
+#: addressbook/gui/component/addressbook-migrate.c:1104
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -206,60 +178,55 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1090
+#: addressbook/gui/component/addressbook-migrate.c:1118
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1099
+#: addressbook/gui/component/addressbook-migrate.c:1127
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1109
+#: addressbook/gui/component/addressbook-migrate.c:1137
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:674
+#: addressbook/gui/component/addressbook-view.c:675
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:761
+#: addressbook/gui/component/addressbook-view.c:754
 #, fuzzy
 msgid "New Address Book"
 msgstr "Yeni Adres Defteri"
 
-#: addressbook/gui/component/addressbook-view.c:762
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
+#: addressbook/gui/component/addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Sil"
 
-#: addressbook/gui/component/addressbook-view.c:763
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-view.c:756
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Özellikler..."
 
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/addressbook-view.c:1002
+#. Create the contacts group
+#: addressbook/gui/component/addressbook-view.c:995
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
 #: calendar/gui/migration.c:373
 msgid "Contacts"
 msgstr "Bağlantılar"
@@ -340,10 +307,6 @@ msgid "Manage your S/MIME certificates here"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-msgid "  S_how Supported Bases "
-msgstr "_Desteklenen Türleri Denetle "
-
-#: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -358,201 +321,166 @@ msgstr "_Desteklenen Türleri Denetle "
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1:00"
-msgstr "1:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
-msgstr "5:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "Kimlik Denetimi"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
 #, fuzzy
 msgid "<b>Display</b>"
 msgstr "<b>Durum:</b> "
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 #, fuzzy
 msgid "<b>Downloading</b>"
 msgstr "_Konum: "
 
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:10
 #, fuzzy
 msgid "<b>Searching</b>"
 msgstr "Arama"
 
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
 msgid "<b>Server Information</b>"
 msgstr "2. Adım: Sunucu Bilgisi"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
 msgid "<b>Type:</b>"
 msgstr "<b>Son tarih:</b> "
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:13
 #, fuzzy
 msgid "Add Contacts Group"
 msgstr "_Bağlantılar:"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:14
 #, fuzzy
 msgid "Address Book Properties"
 msgstr "Adres Defteri Kaynakları"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
-#: mail/mail-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
+#: mail/mail-config.glade.h:42
 msgid "Always"
 msgstr "Her zaman"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr "Anonim"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:17
 #: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Temel"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
-msgid "Connecting"
-msgstr "Bağlantı"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 #: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Ayrıntılar"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
-msgid "Distinguished _name:"
-msgstr "_DN:"
-
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:19
 #, fuzzy
 msgid "Distinguished name"
 msgstr "_DN:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:20
 #, fuzzy
 msgid "Download limit:"
 msgstr "İ_ndirme sınırı:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Email address"
 msgstr "E-posta adresi:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "Email address:"
-msgstr "E-posta adresi:"
-
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "Evolution will use this DN to authenticate you with the server"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:22
 msgid ""
-"Evolution will use this email address to authenticate you with the server"
+"Evolution will use this email address to authenticate you with the server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:23
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Desteklenen Arama Tabanları"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:24
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
+#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Genel"
 
-#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
-#: mail/mail-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
+#: mail/mail-config.glade.h:102
 msgid "Never"
 msgstr "Hiç bir zaman"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
-msgid "One"
-msgstr "Biri"
-
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:35
-msgid "S_earch scope: "
-msgstr ""
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Search _base:"
+msgstr "_Arama tabanı:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
 msgid "Search base only"
 msgstr "_Arama tabanı:"
 
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:29
 #, fuzzy
 msgid "Search base:"
 msgstr "_Arama tabanı:"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Search scope:"
 msgstr "_Arama tabanı:"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
-msgid "Searching"
-msgstr "Arama"
-
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:31
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
-"server if\n"
-"your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL or TLS."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a \n"
-"insecure environment. For example, if you and your LDAP server are behind a "
-"firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection "
-"is already\n"
-"secure."
+"you are in a insecure environment. For example, if you and your LDAP server "
+"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
+"because your connection is already secure."
 msgstr ""
 "Bu seçenek, güvensiz bir ortamda bulunuyorsanız Evolution'un sadece SSL/"
 "TLS \n"
@@ -561,82 +489,73 @@ msgstr ""
 "güvenlik duvarının arkasındaysanız, Evolution SSL/TLS bağlantısına ihtiyaç \n"
 "duymayacaktır, çünkü zaten bağlantınız güvenlidir."
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:33
+#, fuzzy
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
-"TLS.  This \n"
-"means that your connection will be insecure, and that you will be vulnerable "
-"to security\n"
-"exploits. "
+"TLS.  This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits. "
 msgstr ""
 "Bu seçenek, sistemin ne SSL, ne de TSL desteklemediğini gösterir. Bu "
 "durumda \n"
 "bağlantı nispeten güvensiz ve dışarıdan gelecek saldırılarak karşı açık "
 "olacaktır. "
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Sub"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr "Desteklenen Arama Tabanları"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
-"searches will \n"
-"begin. If you leave this blank, the search will begin at the root of the "
-"directory tree."
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
-"the \n"
-"directory tree. A search scope of \"sub\" will include all entries below "
-"your search base.\n"
-"A search scope of \"one\" will only include the entries one level beneath "
-"your base.\n"
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:58
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "Bu, LDAP sunucunuzun tam adıdır. Örnek: \"ldap.firmaadi.com.tr\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid ""
-"This is the maximum number of entries to download. Setting this number to "
-"be \n"
+"This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:41
+#, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
-"list.\n"
-"It is for display purposes only. "
+"list. It is for display purposes only. "
 msgstr "Bu, Evolution dizin listesinde görüntülenecek olan isimdir."
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:42
+#, fuzzy
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. "
-"A \n"
-"list of standard ports has been provided. Ask your system administrator\n"
-"what port you should specify."
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
 msgstr ""
 "Bu, Evolution'un LDAP sunucu üzerinde bağlantı kuracağı portun "
 "numarasıdır. \n"
@@ -644,121 +563,100 @@ msgstr ""
 "kullanılacağını \n"
 "öğrenmek için sistem yöneticinize danışın."
 
-#: addressbook/gui/component/ldap-config.glade.h:67
-msgid "This option controls how long a search will be run."
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:43
 #, fuzzy
 msgid "Timeout:"
 msgstr "Zaman biçimi:"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
-msgid "U_se SSL/TLS:"
-msgstr "_SSL/TLS kullan:"
-
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr "DN kullanarak"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr "E-posta adresi kullanılarak"
 
-#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
-#: mail/mail-config.glade.h:154
+#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
+#: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr "Ne zaman mümkünse"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:47
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "_Bağlantılar:"
 
-#: addressbook/gui/component/ldap-config.glade.h:74
-#: calendar/gui/dialogs/calendar-setup.glade.h:12
-msgid "_Display name:"
-msgstr "_Görüntülenecek isim:"
-
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr "İ_ndirme sınırı:"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
 msgid "_Email address:"
 msgstr "E-posta adresi:"
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:50
+#, fuzzy
+msgid "_Find Possible Search Bases"
+msgstr "Desteklenen Arama Tabanları"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Log in method:"
 msgstr "_Giriş yöntemi:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "_Log in:"
+msgstr "Giriş"
+
+#: addressbook/gui/component/ldap-config.glade.h:53
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
 msgid "_Name:"
 msgstr "İ_sim:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
-msgid "_Port number:"
-msgstr "_Port numarası:"
-
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "_Port:"
 msgstr "Ö_ncelik:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
-msgid "_Search base:"
+#: addressbook/gui/component/ldap-config.glade.h:55
+#, fuzzy
+msgid "_Search scope:"
 msgstr "_Arama tabanı:"
 
-#: addressbook/gui/component/ldap-config.glade.h:82
-msgid "_Server name:"
-msgstr "_Sunucu adı:"
-
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:56
 #, fuzzy
 msgid "_Server:"
 msgstr "S_unucu:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
-msgid "_Timeout (minutes):"
-msgstr "_Zaman aşımı süresi (dakika):"
+#: addressbook/gui/component/ldap-config.glade.h:57
+#, fuzzy
+msgid "_Timeout:"
+msgstr "Zaman biçimi:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:58
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "_Güvenli bağlantı (SSL) kullan:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "kart"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
-msgid "connecting-tab"
-msgstr "bağlantı-sekmesi"
-
-#: addressbook/gui/component/ldap-config.glade.h:88
-msgid "general-tab"
-msgstr "genel-sekme"
-
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:60
 #: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
-#: mail/mail-config.glade.h:182
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "dakika"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
-msgid "searching-tab"
-msgstr "arama sekmesi"
-
-#: addressbook/gui/component/select-names/e-select-names.c:497
+#: addressbook/gui/component/select-names/e-select-names.c:503
 #: addressbook/gui/component/select-names/select-names.glade.h:6
 #, fuzzy
 msgid "Select Contacts from Address Book"
 msgstr "Adres Defterinden Bağlantıları Seç"
 
-#: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
@@ -798,7 +696,7 @@ msgstr "İsimsiz Bağlantı"
 
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:222
+#: addressbook/gui/widgets/e-addressbook-view.c:224
 msgid "Source"
 msgstr "Kaynak"
 
@@ -877,9 +775,9 @@ msgid "<b>Work</b>"
 msgstr "Çalışma Haftası"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
-#: addressbook/gui/widgets/eab-contact-display.c:342
-#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/widgets/eab-contact-display.c:334
+#: addressbook/gui/widgets/eab-contact-display.c:353
 msgid "AIM"
 msgstr ""
 
@@ -920,15 +818,15 @@ msgid "Company:"
 msgstr "Şirket"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:271
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
+#: addressbook/gui/contact-editor/e-contact-editor.c:266
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
 msgstr "Bağlantı"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1527
+#: addressbook/gui/contact-editor/e-contact-editor.c:520
 msgid "Contact Editor"
 msgstr "Bağlantı Düzenleyici"
 
@@ -952,83 +850,80 @@ msgid "Full _Name..."
 msgstr "_Tam İsim..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:202
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-msgid "Home"
-msgstr "Ev"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #, fuzzy
 msgid "Home Page:"
 msgstr "Web sayfası"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-#, fuzzy
-msgid "Job title:"
-msgstr "_Meslek tanımı:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/e-itip-control.c:936
-msgid "Location:"
-msgstr "Konum: "
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 #, fuzzy
 msgid "MSN Messenger"
 msgstr "_İletiyi Gönder"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 #, fuzzy
 msgid "Mailing Address"
 msgstr "E-posta Adresi:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 #, fuzzy
 msgid "Manager:"
 msgstr "Yönetici"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "_Lakap:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Notes:"
 msgstr "_Notlar:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
-#: addressbook/gui/contact-editor/e-contact-editor.c:203
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-msgid "Other"
-msgstr "Diğer"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#, fuzzy
+msgid "Office:"
+msgstr "_Ofis:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "PO Box:"
 msgstr "_Posta Kutusu:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 #, fuzzy
 msgid "Personal Information"
 msgstr "Seçimlik Bilgi"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 #, fuzzy
 msgid "Profession:"
 msgstr "_Uzmanlık alanı:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#, fuzzy
+msgid "Spouse:"
+msgstr "_Eş:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "State/Province:"
 msgstr "_Bölge:"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#, fuzzy
+msgid "Title:"
+msgstr "_Sıfatı:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+msgid "Video Chat:"
+msgstr ""
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:41
 #, fuzzy
 msgid "Wants to receive HTML mail"
@@ -1036,15 +931,15 @@ msgstr "_HTML e-postalarını kabul ediyor"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:42
 #, fuzzy
-msgid "Webcam:"
+msgid "Web Log:"
 msgstr "Web Sayfası:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
-#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
-#: mail/mail-config.glade.h:155
+#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
+#: mail/mail-config.glade.h:157
 msgid "Work"
 msgstr "İş"
 
@@ -1066,19 +961,12 @@ msgid "_File under:"
 msgstr "Dosya adı:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 #, fuzzy
 msgid "_Where:"
 msgstr "S_unucu:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
-msgid "item7"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
-msgid "item8"
-msgstr ""
-
-#: addressbook/gui/contact-editor/eab-editor.c:316
+#: addressbook/gui/contact-editor/eab-editor.c:315
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -1086,7 +974,7 @@ msgstr ""
 "Gerçekten bu bağlantları\n"
 "silmek istiyor musunuz?"
 
-#: addressbook/gui/contact-editor/eab-editor.c:319
+#: addressbook/gui/contact-editor/eab-editor.c:318
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -1095,16 +983,16 @@ msgstr ""
 "silmek istiyor musunuz?"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:351
-#: addressbook/gui/widgets/eab-contact-display.c:372
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Address"
 msgstr "Addres"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:292
+#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard.c:174
@@ -2089,88 +1977,111 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/contact-editor/e-contact-editor.c:179
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:337
+#: addressbook/gui/widgets/eab-contact-display.c:356
 msgid "Jabber"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:347
-#: addressbook/gui/widgets/eab-contact-display.c:366
+#: addressbook/gui/contact-editor/e-contact-editor.c:180
+#: addressbook/gui/widgets/eab-contact-display.c:339
+#: addressbook/gui/widgets/eab-contact-display.c:358
 #, fuzzy
 msgid "Yahoo"
 msgstr "Yoro"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: addressbook/gui/widgets/eab-contact-display.c:338
+#: addressbook/gui/widgets/eab-contact-display.c:357
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:344
-#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#: addressbook/gui/widgets/eab-contact-display.c:355
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/contact-editor/e-contact-editor.c:183
 #, fuzzy
 msgid "GroupWise"
 msgstr "Grup"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+msgid "Home"
+msgstr "Ev"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+msgid "Other"
+msgstr "Diğer"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
 msgid "Source Book"
 msgstr "Kaynak Kitabı"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:264
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:278
+#: addressbook/gui/contact-editor/e-contact-editor.c:273
 msgid "Is New Contact"
 msgstr "Bu Yeni Bir Bağlantı"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:285
+#: addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Writable Fields"
 msgstr "Düzenlenebilir Alanlar"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:299
+#: addressbook/gui/contact-editor/e-contact-editor.c:294
 msgid "Changed"
 msgstr "Değiştirildi"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
-msgid "Category editor not available."
-msgstr "Kategori düzenleyici bulunamadı."
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:2352
 msgid "This contact belongs to these categories:"
 msgstr "Bu bağlantı adı aşağıdaki sınıflandırmalara girer:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#: addressbook/gui/contact-editor/e-contact-editor.c:2429
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Lütfen aşağıdaki seçeneklerden birisini seçiniz"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#: addressbook/gui/contact-editor/e-contact-editor.c:2433
 #, fuzzy
 msgid "No image"
 msgstr "Nome"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#: addressbook/gui/contact-editor/e-contact-editor.c:2636
 #, fuzzy
 msgid ""
-"The following entries are invalid:\n"
+"The contact data is invalid:\n"
 "\n"
-msgstr "Halen aşağıdaki bağlantılar etkin durumda:"
+msgstr "Tekrarlama tarihi geçersiz"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2738
-#, c-format
-msgid "Could not find widget for a field: `%s'"
-msgstr "Bir alan için parçacık bulunamadı: `%s'"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#, fuzzy
+msgid "Invalid contact."
+msgstr "%d bağlantı"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+msgid ""
+"The contact cannot be saved to the selected address book. Do you want to "
+"discard changes?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2727
+#: addressbook/gui/contact-editor/e-contact-editor.c:2751
+msgid "_Discard"
+msgstr "_Sil"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+msgid ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
+msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:62
 #, fuzzy
@@ -2207,7 +2118,7 @@ msgid "_Edit Full"
 msgstr "_Tümünü Düzenle"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:166
 msgid "_Full Name:"
 msgstr "_Tam İsim:"
 
@@ -2356,30 +2267,30 @@ msgstr "_Liste adı:"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr ""
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "contact-list-editor"
 msgstr "bağlantı-listesi-düzenleyici"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:153
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:215
+#: addressbook/gui/widgets/e-addressbook-view.c:217
 #: addressbook/gui/widgets/e-minicard-view.c:460
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Kitap"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
 msgid "Is New List"
 msgstr "Yeni Liste"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:215
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
 msgid "Contact List Editor"
 msgstr "Bağlantı Listesi Düzenleyici"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:438
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
 msgid "Save List as VCard"
 msgstr "Listeyi VCard Olarak Kaydet"
 
@@ -2426,124 +2337,124 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Gelişmiş Arama"
 
-#: addressbook/gui/widgets/eab-contact-display.c:129
-#: addressbook/gui/widgets/eab-contact-display.c:192
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:139
-#: addressbook/gui/widgets/eab-contact-display.c:205
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:257
-#: addressbook/gui/widgets/eab-contact-display.c:533
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:525
 msgid "List Members"
 msgstr "Liste Üyeleri"
 
-#: addressbook/gui/widgets/eab-contact-display.c:329
-#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/eab-contact-display.c:321
+#: addressbook/gui/widgets/eab-contact-display.c:323
 #, fuzzy
 msgid "E-mail"
 msgstr "E-posta"
 
-#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/eab-contact-display.c:332
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Kurum"
 
-#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:333
 #, fuzzy
 msgid "Position"
 msgstr "Boston"
 
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:354
 #, fuzzy
 msgid "Groupwise"
 msgstr "Grup"
 
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:340
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:349
-#: addressbook/gui/widgets/eab-contact-display.c:370
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:362
 #, fuzzy
 msgid "Phone"
 msgstr "Ponce"
 
-#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:342
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:354
+#: addressbook/gui/widgets/eab-contact-display.c:346
 #, fuzzy
 msgid "work"
 msgstr "İş"
 
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:359
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:368
-#: addressbook/gui/widgets/eab-contact-display.c:587
+#: addressbook/gui/widgets/eab-contact-display.c:360
+#: addressbook/gui/widgets/eab-contact-display.c:579
 msgid "Blog"
 msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/eab-contact-display.c:363
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Cep Telefonu"
 
-#: addressbook/gui/widgets/eab-contact-display.c:375
+#: addressbook/gui/widgets/eab-contact-display.c:367
 #, fuzzy
 msgid "personal"
 msgstr "Kişisel"
 
-#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/eab-contact-display.c:374
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Not"
 
-#: addressbook/gui/widgets/eab-contact-display.c:548
+#: addressbook/gui/widgets/eab-contact-display.c:540
 msgid "Job Title"
 msgstr "Meslek Tanımı"
 
-#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/eab-contact-display.c:544
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:774
+#: smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "E-posta"
 
-#: addressbook/gui/widgets/eab-contact-display.c:579
+#: addressbook/gui/widgets/eab-contact-display.c:571
 msgid "Home page"
 msgstr "Web sayfası"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 msgid "Success"
 msgstr "Başarıldı"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Backend busy"
 msgstr ""
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Repository offline"
 msgstr "Depo çevrimdışı"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 #, fuzzy
 msgid "Address Book does not exist"
 msgstr "Adres defteri bulunamadı"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 #, fuzzy
 msgid "No Self Contact defined"
 msgstr "Yeni Bağlantı Listesi"
@@ -2551,28 +2462,28 @@ msgstr "Yeni Bağlantı Listesi"
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Permission denied"
 msgstr "İzin yok"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Contact not found"
 msgstr "Bağlantı bulunamadı"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: addressbook/gui/widgets/eab-gui-util.c:58
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "Bu kart numarası var"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Protocol not supported"
 msgstr "Protokol desteklenmiyor"
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:60
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:233
 #: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
@@ -2585,39 +2496,39 @@ msgid "Cancelled"
 msgstr "İptal Edildi"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:61
 #, fuzzy
 msgid "Could not cancel"
 msgstr "'%s' adı değiştirilemedi: %s"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Authentication Failed"
 msgstr "Kimlik Denetimi Başarısız."
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Authentication Required"
 msgstr "Kimlik Denetimi İsteniyor"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:66
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "TLS not Available"
 msgstr "TLS mevcut değil"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#: addressbook/gui/widgets/eab-gui-util.c:66
 #, fuzzy
 msgid "No such source"
 msgstr "İleti bulunmuyor"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:69
+#: addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Other error"
 msgstr "Diğer hata"
 
-#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:90
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
@@ -2626,7 +2537,7 @@ msgstr ""
 "Bu adres defteri açılamadı. Yeterli izin haklarına sahip olup\n"
 "olmadığınızı ve dosyanın yerini kontrol edin."
 
-#: addressbook/gui/widgets/eab-gui-util.c:110
+#: addressbook/gui/widgets/eab-gui-util.c:97
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -2635,19 +2546,19 @@ msgstr ""
 "Bu adres defteri açılamadı. Hatalı bir adres girilmiş,\n"
 "ya da LDAP sunucusu erişilemiyor olabilir."
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:102
 #, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution you must compile the program from the CVS "
-"sources after retrieving OpenLDAP from the link below."
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
 msgstr ""
 "Evolution'ın bu sürümünde LDAP desteği bulunmuyor. \n"
 "Eğer Evolution'ı LDAP desteği ile kullanmak istiyorsanız,\n"
 "programı CVS kaynaklarından alacağınız openLDAP desteği\n"
 "ile kurmalısınız:\n"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:109
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -2656,11 +2567,7 @@ msgstr ""
 "Bu adres defteri açılamadı. Hatalı bir adres girilmiş,\n"
 "ya da LDAP sunucusu erişilemiyor olabilir."
 
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "Unable to open addressbook"
-msgstr "Adres defterini açamadım"
-
-#: addressbook/gui/widgets/eab-gui-util.c:162
+#: addressbook/gui/widgets/eab-gui-util.c:129
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2668,7 +2575,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:168
+#: addressbook/gui/widgets/eab-gui-util.c:135
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -2679,53 +2586,45 @@ msgstr ""
 "tanımlanmış zaman sınırını aştı. Lütfen aramayı daraltın, ya da bu \n"
 "adres defteri için tanımlanmış süreyi artırın."
 
-#: addressbook/gui/widgets/eab-gui-util.c:174
+#: addressbook/gui/widgets/eab-gui-util.c:141
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:177
+#: addressbook/gui/widgets/eab-gui-util.c:144
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:147
 msgid "This query did not complete successfully."
 msgstr "Bu arama başarısızlıkla sonuçlandı."
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
-msgid "Do you want to save changes?"
-msgstr "Değişiklikleri kaydetmek istiyor musunuz?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:208
-msgid "_Discard"
-msgstr "_Sil"
-
-#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:169
 msgid "Error adding list"
 msgstr "Liste eklenirken hata oluştu"
 
-#: addressbook/gui/widgets/eab-gui-util.c:229
-#: addressbook/gui/widgets/eab-gui-util.c:652
+#: addressbook/gui/widgets/eab-gui-util.c:169
+#: addressbook/gui/widgets/eab-gui-util.c:580
 msgid "Error adding contact"
 msgstr "Bağlantı eklenirken hata oluştu"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying list"
 msgstr "Liste düzenlenirken hata oluştu"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying contact"
 msgstr "Bağlantı düzenlenirken bir hata oluştu"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:192
 msgid "Error removing list"
 msgstr "Listeyi silerken bir hata oluştu"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
-#: addressbook/gui/widgets/eab-gui-util.c:610
+#: addressbook/gui/widgets/eab-gui-util.c:192
+#: addressbook/gui/widgets/eab-gui-util.c:538
 msgid "Error removing contact"
 msgstr "Bağlantıyı silerken bir hata oluştu"
 
-#: addressbook/gui/widgets/eab-gui-util.c:334
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, fuzzy, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2735,7 +2634,7 @@ msgstr ""
 "açılması gerekiyor. Gerçekten tüm bu kartları \n"
 "görmek istiyor musunuz?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:360
+#: addressbook/gui/widgets/eab-gui-util.c:300
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2744,54 +2643,49 @@ msgstr ""
 "%s dosyası mevcut\n"
 "Üzerine yazmak istiyor musunuz?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:364
+#: addressbook/gui/widgets/eab-gui-util.c:304
 msgid "Overwrite"
 msgstr "Üzerine yaz"
 
-#: addressbook/gui/widgets/eab-gui-util.c:400
-#, c-format
-msgid "Error saving %s: %s"
-msgstr "%s kaydedilirken hata: %s"
-
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:437
+#: addressbook/gui/widgets/eab-gui-util.c:365
 msgid "card.vcf"
 msgstr "kart.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:571
+#: addressbook/gui/widgets/eab-gui-util.c:499
 msgid "list"
 msgstr "liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:706
+#: addressbook/gui/widgets/eab-gui-util.c:634
 #, fuzzy
 msgid "Move contact to"
 msgstr "Kartı taşı:"
 
-#: addressbook/gui/widgets/eab-gui-util.c:708
+#: addressbook/gui/widgets/eab-gui-util.c:636
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Kartı kopyala:"
 
-#: addressbook/gui/widgets/eab-gui-util.c:711
+#: addressbook/gui/widgets/eab-gui-util.c:639
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Kartları taşı:"
 
-#: addressbook/gui/widgets/eab-gui-util.c:713
+#: addressbook/gui/widgets/eab-gui-util.c:641
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Kartları kopyala:"
 
-#: addressbook/gui/widgets/eab-gui-util.c:716
+#: addressbook/gui/widgets/eab-gui-util.c:644
 #, fuzzy
 msgid "Select target addressbook."
 msgstr "Adres Defterinden Bağlantıları Seç"
 
-#: addressbook/gui/widgets/eab-gui-util.c:939
+#: addressbook/gui/widgets/eab-gui-util.c:867
 msgid "Multiple VCards"
 msgstr "Çoklu VCard"
 
-#: addressbook/gui/widgets/eab-gui-util.c:942
+#: addressbook/gui/widgets/eab-gui-util.c:870
 #, c-format
 msgid "VCard for %s"
 msgstr "%s için VCard"
@@ -2881,7 +2775,7 @@ msgstr[1] "%d bağlantı"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:229
+#: addressbook/gui/widgets/e-addressbook-view.c:231
 #: addressbook/gui/widgets/e-minicard-view.c:467
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
@@ -2899,143 +2793,135 @@ msgstr "Model"
 msgid "Error modifying card"
 msgstr "Kartlar düzenlenirken bir hata oluştu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:163
 msgid "Name begins with"
 msgstr "İsim başlar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:164
 msgid "Email begins with"
 msgstr "E-posta başlar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:57
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Kategori"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-#: calendar/gui/cal-search-bar.c:50
+#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Herhangi bir alanın içeriği"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+#: addressbook/gui/widgets/e-addressbook-view.c:172
 msgid "Advanced..."
 msgstr "Gelişmiş..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:236
+#: addressbook/gui/widgets/e-addressbook-view.c:238
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:249
+#: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Tür"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:506
+#: addressbook/gui/widgets/e-addressbook-view.c:508
 #, fuzzy
 msgid "Address Book"
 msgstr "Adres Defteri:"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2076
+#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:2080
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
 msgstr "VCard olarak kaydet"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 msgid "New Contact..."
 msgstr "Yeni Bağlantı..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "New Contact List..."
 msgstr "Yeni Bağlantı Listesi..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Go to Folder..."
 msgstr "Dizine Git..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Import..."
 msgstr "Al..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1066
 msgid "Search for Contacts..."
 msgstr "Bağlantıları Ara..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Adres Defteri Kaynakları..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1069
 msgid "Pilot Settings..."
 msgstr "Pilot Ayarları..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Bağlantıyı Gönder"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
 msgid "Send Message to Contact"
 msgstr "Bağlantıya İleti Gönder"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Yazdır"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
+#: addressbook/gui/widgets/e-addressbook-view.c:1077
 msgid "Print Envelope"
 msgstr "Zarfı Yazdır"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
+#: addressbook/gui/widgets/e-addressbook-view.c:1081
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Adres Defteri..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1080
+#: addressbook/gui/widgets/e-addressbook-view.c:1082
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Adres Defteri..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Kes"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopyala"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1087
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Yapıştır"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:1092
+#: calendar/gui/e-calendar-view.c:1280
 msgid "Current View"
 msgstr "Şimdiki Görünüm"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1309
-#, c-format
-msgid ""
-"The addressbook backend for\n"
-"%s\n"
-"has crashed. You will have to restart Evolution in order to use it again"
-msgstr ""
-
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1667
-#: calendar/gui/cal-search-bar.c:362
+#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Herhangi bir Kategori"
 
@@ -3143,7 +3029,7 @@ msgstr "Radyo"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-list-view.c:234
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Görev"
@@ -3286,13 +3172,13 @@ msgstr "Evolution VCard alıcısı"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: addressbook/printing/e-contact-print.c:998
+#: addressbook/printing/e-contact-print.c:1000
 #, fuzzy
 msgid "Print contacts"
 msgstr "Seçili bağlantıları yazdır"
 
-#: addressbook/printing/e-contact-print.c:1064
-#: addressbook/printing/e-contact-print.c:1091
+#: addressbook/printing/e-contact-print.c:1066
+#: addressbook/printing/e-contact-print.c:1093
 #, fuzzy
 msgid "Print contact"
 msgstr "Seçili bağlantıları yazdır"
@@ -3545,17 +3431,22 @@ msgstr ""
 msgid "Impossible internal error."
 msgstr "İç hata"
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:629
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
 #, fuzzy
 msgid "Can not open file"
 msgstr "İleti açılamadı"
 
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "Adres defteri yüklenemedi"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
 #, fuzzy
-msgid "Can not load URI"
-msgstr "Kart bulunamadı"
+msgid "failed to open book"
+msgstr "Adres defterini açamadım"
 
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
@@ -3573,7 +3464,7 @@ msgstr "Dosya adı belirtilmedi."
 msgid "Unnamed List"
 msgstr "İsimsiz Liste"
 
-#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 #, fuzzy
 msgid "Enter password"
@@ -3845,10 +3736,10 @@ msgid "Whether to show week numbers in date navigator"
 msgstr "Gün gezgininde tarih numaralarını göster"
 
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:88
-#: calendar/gui/gnome-cal.c:1703
-#: camel/providers/groupwise/camel-gw-listener.c:304
-#: camel/providers/groupwise/camel-gw-listener.c:327
+#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/gnome-cal.c:1705
+#: camel/providers/groupwise/camel-gw-listener.c:311
+#: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
 msgstr "Takvim"
 
@@ -3871,7 +3762,7 @@ msgstr "küçük"
 
 #: calendar/gui/calendar-commands.c:363
 #: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:19 filter/filter.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
 msgid "days"
 msgstr "gün"
 
@@ -4022,24 +3913,24 @@ msgstr "Hafta Görünümü"
 msgid "Month View"
 msgstr "Ay Görünümü"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Özet içeriği"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Tanım içeriği"
 
-#: calendar/gui/cal-search-bar.c:54
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Açıklama içeriği"
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:53
 #, fuzzy
 msgid "Location contains"
 msgstr "Tanım içeriği"
 
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
 msgid "Unmatched"
 msgstr "Eşleme yok"
 
@@ -4060,23 +3951,23 @@ msgstr ""
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:466
+#: calendar/gui/dialogs/alarm-options.c:467
 msgid "Audio Alarm Options"
 msgstr "Ses Alarm Seçenekleri"
 
-#: calendar/gui/dialogs/alarm-options.c:475
+#: calendar/gui/dialogs/alarm-options.c:476
 msgid "Message Alarm Options"
 msgstr "İleti Alarm Seçenekleri"
 
-#: calendar/gui/dialogs/alarm-options.c:484
+#: calendar/gui/dialogs/alarm-options.c:485
 msgid "Email Alarm Options"
 msgstr "E-posta Alarm Seçenekleri"
 
-#: calendar/gui/dialogs/alarm-options.c:493
+#: calendar/gui/dialogs/alarm-options.c:494
 msgid "Program Alarm Options"
 msgstr "Program Alarm Seçenekleri"
 
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:510
 msgid "Unknown Alarm Options"
 msgstr "Bilinmeyen Alarm Seçenekleri"
 
@@ -4114,7 +4005,7 @@ msgstr "Gönder:"
 msgid "With these arguments:"
 msgstr "Bu argümanlarla:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
 msgid "dialog1"
 msgstr "dialog1"
 
@@ -4123,7 +4014,7 @@ msgid "extra times every"
 msgstr ""
 
 #: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:20 filter/filter.glade.h:16
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr "saat"
 
@@ -4170,7 +4061,7 @@ msgstr "Bir e-posta gönder"
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Özet:"
 
@@ -4200,7 +4091,6 @@ msgid "hour(s)"
 msgstr "saat"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:21
 msgid "minute(s)"
 msgstr "dakika"
 
@@ -4208,27 +4098,27 @@ msgstr "dakika"
 msgid "start of appointment"
 msgstr "randevu başlangıcı"
 
-#: calendar/gui/dialogs/calendar-setup.c:170
+#: calendar/gui/dialogs/calendar-setup.c:172
 #, fuzzy
 msgid "You must specify a location to get the calendar from."
 msgstr "Bir dosya dı vermelisiniz"
 
-#: calendar/gui/dialogs/calendar-setup.c:178
+#: calendar/gui/dialogs/calendar-setup.c:180
 #, fuzzy, c-format
 msgid "The source location '%s' is not well-formed."
 msgstr "`%s' yüklemek için gereken yöntem desteklenmiyor"
 
-#: calendar/gui/dialogs/calendar-setup.c:193
+#: calendar/gui/dialogs/calendar-setup.c:195
 #, c-format
 msgid "The source location '%s' is not a webcal source."
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:265
+#: calendar/gui/dialogs/calendar-setup.c:275
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:278
+#: calendar/gui/dialogs/calendar-setup.c:288
 #, c-format
 msgid ""
 "The group '%s' is remote. You must specify a location to get the calendar "
@@ -4250,61 +4140,36 @@ msgstr "Görev Listesi Grubu"
 msgid "C_olor:"
 msgstr "_Renkler"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-#, fuzzy
-msgid "Calendar Properties"
-msgstr "Takvim Grubu"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
 msgid "Pick a color"
 msgstr "Bir renk seçin"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:8
-#, fuzzy
-msgid "Remote"
-msgstr "Sil"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-#, fuzzy
-msgid "Task List Properties"
-msgstr "Görev Listesi Grubu"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
 #, fuzzy
 msgid "_Add Calendar"
 msgstr "Yeni Takvim Ekle"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
 #, fuzzy
 msgid "_Add Group"
 msgstr "_Grup Ekle..."
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-#, fuzzy
-msgid "_Refresh Interval:"
-msgstr "_Listeyi Tazele "
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
 #, fuzzy
 msgid "_Refresh:"
 msgstr "Tazele"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-#, fuzzy
-msgid "_Source URL:"
-msgstr "POP Kaynak URI adresi"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
 #, fuzzy
 msgid "_Type:"
 msgstr "Tip:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
 #, fuzzy
 msgid "_URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
 msgid "weeks"
 msgstr "hafta"
 
@@ -4414,7 +4279,7 @@ msgid "Display"
 msgstr "_Göster"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:76
 msgid "E_nable"
 msgstr "_Etkinleştir"
 
@@ -4425,7 +4290,7 @@ msgstr "Boş/Meşgul İsteği"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:563
+#: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Cuma"
 
@@ -4439,7 +4304,7 @@ msgstr "Dakika"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:559
+#: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Pazartesi"
 
@@ -4449,7 +4314,7 @@ msgstr "_Paz"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:564
+#: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Cumartesi"
 
@@ -4463,7 +4328,7 @@ msgstr "_Gün gezgininde tarih numaralarını göster"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Pazar"
 
@@ -4477,7 +4342,7 @@ msgstr "P_er"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:562
+#: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Perşembe"
 
@@ -4491,7 +4356,7 @@ msgstr "Zaman biçimi:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:560
+#: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Salı"
 
@@ -4501,7 +4366,7 @@ msgstr "_Hafta başı:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:561
+#: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Çarşamba"
 
@@ -4535,7 +4400,7 @@ msgid "_Day begins:"
 msgstr "_Gün başı:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
-#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:43
@@ -4584,80 +4449,50 @@ msgstr "Ç_ar"
 msgid "before every appointment"
 msgstr "her randevudan önce"
 
-#: calendar/gui/dialogs/cancel-comp.c:57
-msgid ""
-"The event being deleted is a meeting, would you like to send a cancellation "
-"notice?"
-msgstr ""
-
-#: calendar/gui/dialogs/cancel-comp.c:60
-msgid "Are you sure you want to cancel and delete this meeting?"
-msgstr "Gerçekten bu toplantıyı iptal edip silmek istiyor musunuz?"
-
-#: calendar/gui/dialogs/cancel-comp.c:66
-msgid ""
-"The task being deleted is assigned, would you like to send a cancellation "
-"notice?"
-msgstr ""
-
-#: calendar/gui/dialogs/cancel-comp.c:69
-msgid "Are you sure you want to cancel and delete this task?"
-msgstr "Gerçekten bu görevi iptal edip silmek istiyor musunuz?"
-
-#: calendar/gui/dialogs/cancel-comp.c:75
-msgid ""
-"The journal entry being deleted is published, would you like to send a "
-"cancellation notice?"
-msgstr ""
-
-#: calendar/gui/dialogs/cancel-comp.c:78
-msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr ""
-
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Olay silindi."
 
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "Bu görev silindi."
 
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:68
 #, fuzzy
 msgid "This journal entry has been deleted."
 msgstr "Olay silindi."
 
-#: calendar/gui/dialogs/changed-comp.c:75
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  Değişiklikler yaptınız. Bu değişiklikleri unutup, düzenleyiciyi kapatmak "
 "istiyor musunuz?"
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Hiç değişiklik yapılmadı. Düzenleyici kapatılsın mı?"
 
-#: calendar/gui/dialogs/changed-comp.c:82
+#: calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "Bu olay değiştirildi."
 
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "Görev değiştirildi."
 
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:92
 #, fuzzy
 msgid "This journal entry has been changed."
 msgstr "Görev değiştirildi."
 
-#: calendar/gui/dialogs/changed-comp.c:99
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Hiç değişiklik yapılmadı. Düzenleyici güncellensin mi?"
@@ -4695,7 +4530,7 @@ msgid "No summary"
 msgstr "Özet yok"
 
 #: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
 #: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Farklı kaydet..."
@@ -4751,102 +4586,54 @@ msgstr "Açıklama yok"
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:95
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "Gerçekten '%s' randevusunu silmek istiyor musunuz?"
-
-#: calendar/gui/dialogs/delete-comp.c:98
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "Gerçekten bu randevuyu silmek istiyor musunuz?"
-
-#: calendar/gui/dialogs/delete-comp.c:104
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "Gerçekten %s görevini silmek istiyor musunuz?"
-
-#: calendar/gui/dialogs/delete-comp.c:107
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "Gerçekten bu görevi silmek istiyor musunuz?"
-
-#: calendar/gui/dialogs/delete-comp.c:113
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "`%s' başlıksız günlük girdisini silmek istiyor musunuz?"
-
-#: calendar/gui/dialogs/delete-comp.c:116
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "Bu başlıksız günlük girdisini silmek istiyor musunuz?"
-
-#: calendar/gui/dialogs/delete-comp.c:131
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d appointment?"
-msgid_plural "Are you sure you want to delete %d appointments?"
-msgstr[0] "Gerçekten %d randevuyu silmek istiyor musunuz?"
-msgstr[1] "Gerçekten %d randevuyu silmek istiyor musunuz?"
-
-#: calendar/gui/dialogs/delete-comp.c:138
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d task?"
-msgid_plural "Are you sure you want to delete %d tasks?"
-msgstr[0] "Gerçekten %d görevi silmek istiyor musunuz?"
-msgstr[1] "Gerçekten %d görevi silmek istiyor musunuz?"
-
-#: calendar/gui/dialogs/delete-comp.c:145
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d journal entry?"
-msgid_plural "Are you sure you want to delete %d journal entries?"
-msgstr[0] "Gerçekten %d günlük girdisini silmek istiyor musunuz?"
-msgstr[1] "Gerçekten %d günlük girdisini silmek istiyor musunuz?"
-
-#: calendar/gui/dialogs/delete-error.c:52
+#: calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:55
+#: calendar/gui/dialogs/delete-error.c:57
 msgid "The task could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:58
+#: calendar/gui/dialogs/delete-error.c:60
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:61
+#: calendar/gui/dialogs/delete-error.c:63
 msgid "The item could not be deleted due to a corba error"
 msgstr "Corba hatası nedeniyle bu öğe silinemedi"
 
-#: calendar/gui/dialogs/delete-error.c:68
+#: calendar/gui/dialogs/delete-error.c:70
 msgid "The event could not be deleted because permission was denied"
 msgstr "İzin verilmediği için bu olay silinemedi."
 
-#: calendar/gui/dialogs/delete-error.c:71
+#: calendar/gui/dialogs/delete-error.c:73
 msgid "The task could not be deleted because permission was denied"
 msgstr "İzin verilmediği için bu görev silinemedi."
 
-#: calendar/gui/dialogs/delete-error.c:74
+#: calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr "İzin verilmediği için bu günlük bilgisi silinemedi."
 
-#: calendar/gui/dialogs/delete-error.c:77
+#: calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
 msgstr "İzin verilmediği için bu öğe silinemedi."
 
-#: calendar/gui/dialogs/delete-error.c:84
+#: calendar/gui/dialogs/delete-error.c:86
 #, fuzzy
 msgid "The event could not be deleted due to an error"
 msgstr "Corba hatası nedeniyle bu öğe silinemedi"
 
-#: calendar/gui/dialogs/delete-error.c:87
+#: calendar/gui/dialogs/delete-error.c:89
 #, fuzzy
 msgid "The task could not be deleted due to an error"
 msgstr "Corba hatası nedeniyle bu öğe silinemedi"
 
-#: calendar/gui/dialogs/delete-error.c:90
+#: calendar/gui/dialogs/delete-error.c:92
 #, fuzzy
 msgid "The journal entry could not be deleted due to an error"
 msgstr "Katılımcı bilgileri geçersiz bir durum nedeniyle güncellenemedi!\n"
 
-#: calendar/gui/dialogs/delete-error.c:93
+#: calendar/gui/dialogs/delete-error.c:95
 #, fuzzy
 msgid "The item could not be deleted due to an error"
 msgstr "Corba hatası nedeniyle bu öğe silinemedi"
@@ -4983,11 +4770,11 @@ msgstr "B_aşlangıç tarihi:"
 
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:3
+#: calendar/gui/dialogs/meeting-page.glade.h:4
 #: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
 #: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1559
-#: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:100
+#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
+#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
@@ -5013,8 +4800,8 @@ msgstr "_Dağıt..."
 #. FIXME: need to disable for undeletable folders
 #: calendar/gui/dialogs/meeting-page.c:655
 #: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1310 calendar/gui/e-calendar-view.c:1342
-#: mail/em-folder-tree.c:2557 mail/em-folder-view.c:919
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
+#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -5022,7 +4809,7 @@ msgid "_Delete"
 msgstr "_Sil"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:240
+#: calendar/gui/e-meeting-list-view.c:218
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Katılımcı"
@@ -5059,16 +4846,15 @@ msgid "Member"
 msgstr "Üye"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
-#: mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-list-view.c:248
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Durum"
 
@@ -5077,20 +4863,20 @@ msgstr "Durum"
 msgid "Add A_ttendee"
 msgstr "Katılımcı"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "Add attendees from addressbook."
+msgstr "_Göndereni Adres Defterine Ekle"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Organizatör:"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
+#: calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "_Change Organizer"
 msgstr "O_rganizatörü Değiştir"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-#: calendar/gui/e-meeting-time-sel.c:417
-msgid "_Invite Others..."
-msgstr "_Başkalarını Davet Et..."
-
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 #, fuzzy
 msgid "<b>Calendar options</b>"
@@ -5242,7 +5028,7 @@ msgid "_No recurrence"
 msgstr "_Tekrarlama yok"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:450
+#: composer/e-msg-composer-attachment-bar.c:453
 msgid "_Remove"
 msgstr "_Sil"
 
@@ -5274,55 +5060,21 @@ msgstr "hafta"
 msgid "year(s)"
 msgstr "yıl"
 
-#: calendar/gui/dialogs/save-comp.c:53
-msgid ""
-"This event has been changed, but has not been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Bu olay değiştirildi, ancak kaydedilmedi.\n"
-"\n"
-"Değişiklikleri kaydetmek istiyor musunuz?"
-
-#: calendar/gui/dialogs/save-comp.c:57
-msgid "_Discard Changes"
-msgstr "_Değişiklikleri Sil"
-
-#: calendar/gui/dialogs/save-comp.c:62
-msgid "Save Event"
-msgstr "Olayı Kaydet"
-
-#: calendar/gui/dialogs/select-source-dialog.c:65
+#: calendar/gui/dialogs/select-source-dialog.c:69
 #, fuzzy
 msgid "Select destination"
 msgstr "Açıklama yok"
 
-#: calendar/gui/dialogs/select-source-dialog.c:86
+#: calendar/gui/dialogs/select-source-dialog.c:90
 #, fuzzy
 msgid "_Destination"
 msgstr "Bu dizini sil"
 
-#: calendar/gui/dialogs/select-source-dialog.c:88
+#: calendar/gui/dialogs/select-source-dialog.c:92
 #, fuzzy
 msgid "Task List"
 msgstr "_Görev Listesi"
 
-#: calendar/gui/dialogs/send-comp.c:57
-msgid "The meeting information has been created. Send it?"
-msgstr "Toplantı bilgisi oluşturuldu. Gönderilsin mi?"
-
-#: calendar/gui/dialogs/send-comp.c:60
-msgid "The meeting information has changed. Send an updated version?"
-msgstr "Toplantı bilgisi değiştirildi. Güncel bir sürümü gönderilsin mi?"
-
-#: calendar/gui/dialogs/send-comp.c:67
-msgid "The task assignment information has been created. Send it?"
-msgstr "Görev bilgisi oluşturuldu. Gönderilsin mi?"
-
-#: calendar/gui/dialogs/send-comp.c:71
-msgid "The task information has changed. Send an updated version?"
-msgstr "Görev bilgisi değiştirildi. Güncel bir sürümü gönderilsin mi?"
-
 #: calendar/gui/dialogs/task-details-page.c:406
 msgid "Completed date is wrong"
 msgstr "Tamamlanma tarihi yanlış"
@@ -5342,7 +5094,7 @@ msgstr "Tamamlandı"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #: calendar/gui/e-cal-component-preview.c:249
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:960
 msgid "High"
 msgstr "Yüksek"
 
@@ -5356,14 +5108,14 @@ msgstr "İşlemde"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:253
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:958
 msgid "Low"
 msgstr "Düşük"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:251
 #: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:957
+#: mail/message-list.c:959
 msgid "Normal"
 msgstr "Normal"
 
@@ -5423,8 +5175,8 @@ msgstr "_Gizli"
 
 #: calendar/gui/dialogs/task-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
+#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Açıklama:"
 
@@ -5597,7 +5349,7 @@ msgstr "Son tarih:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:950
+#: calendar/gui/e-itip-control.c:943
 msgid "Status:"
 msgstr "Durum:"
 
@@ -5682,12 +5434,12 @@ msgstr "Meşgul"
 msgid "Deleting selected objects"
 msgstr "Seçilen bağlantılar siliniyor"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
 msgid "Updating objects"
 msgstr "Öğeler güncelleniyor"
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1370
+#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
 #: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Aç"
@@ -5697,15 +5449,15 @@ msgid "Open _Web Page"
 msgstr "W_eb Sayfasını Aç"
 
 #: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1291 calendar/gui/e-calendar-view.c:1376
-#: mail/em-folder-view.c:896 mail/em-popup.c:690 mail/em-popup.c:806
+#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
+#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "_Farklı Kaydet..."
 
 #: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1292
-#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
+#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
@@ -5713,24 +5465,24 @@ msgid "_Print..."
 msgstr "_Yazdır..."
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Kes"
 
 #: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1338
-#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2550
-#: mail/message-list.c:1644 ui/evolution-addressbook.xml.h:31
+#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
+#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
+#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Kopyala"
 
 #: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1273 calendar/gui/e-calendar-view.c:1299
-#: calendar/gui/e-calendar-view.c:1372 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
+#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
@@ -5799,71 +5551,71 @@ msgstr "Özet"
 msgid "Task sort"
 msgstr "Görev sıralama"
 
-#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
 msgid "New _Appointment..."
 msgstr "Yeni _Randevu..."
 
-#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
+#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
 msgid "New All Day _Event"
 msgstr "Y_eni Tüm Gün Olayı"
 
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
+#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
 msgid "New Meeting"
 msgstr "Yeni Toplantı"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
 msgid "New Task"
 msgstr "Yeni Görev"
 
-#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Konumu _Seç"
 
-#: calendar/gui/e-calendar-view.c:1280
+#: calendar/gui/e-calendar-view.c:1283
 #, fuzzy
 msgid "_Select Date..."
 msgstr "_Seç..."
 
-#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Boş/Meşgul Bilgisini Yayınla"
 
-#: calendar/gui/e-calendar-view.c:1303
+#: calendar/gui/e-calendar-view.c:1306
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Dizine Kopyala..."
 
-#: calendar/gui/e-calendar-view.c:1304
+#: calendar/gui/e-calendar-view.c:1307
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "_Dizine Taşı..."
 
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1308
 msgid "_Schedule Meeting..."
 msgstr "_Toplantı Tarihi Ayarla..."
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1309
 msgid "_Forward as iCalendar..."
 msgstr "_iCalendar olarak Yönlendir..."
 
-#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
 msgid "Delete this _Occurrence"
 msgstr "_Bu Oluşumu Sil"
 
-#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
 msgid "Delete _All Occurrences"
 msgstr "_Tüm Oluşumları Sil"
 
-#: calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1349
 msgid "Go to _Today"
 msgstr "_Bugüne Git"
 
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1351
 msgid "_Go to Date..."
 msgstr "_Güne Git..."
 
-#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "_Ayarlar..."
 
@@ -5877,9 +5629,9 @@ msgstr "Başlangıç Tarihi"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:967 calendar/gui/e-itip-control.c:1169
-#: calendar/gui/e-meeting-list-view.c:144
-#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
 #: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
 #: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
 #: camel/camel-tcp-stream-openssl.c:631
@@ -5905,13 +5657,13 @@ msgid "Assigned"
 msgstr "Görevlendirildi"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr "Evet"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "Hayır"
 
@@ -5923,7 +5675,7 @@ msgstr "K"
 msgid "S"
 msgstr "G"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
 msgid "E"
 msgstr "D"
 
@@ -5995,102 +5747,102 @@ msgstr "%d %b"
 msgid "%02i minute divisions"
 msgstr "%02i dakika bölmeleri"
 
-#: calendar/gui/e-itip-control.c:592
+#: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:596
 #, fuzzy, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Her gün"
 msgstr[1] "Her gün"
 
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:601
 #, fuzzy, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Her hafta"
 msgstr[1] "Her hafta"
 
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:603
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:618
+#: calendar/gui/e-itip-control.c:611
 msgid " and "
 msgstr " ve "
 
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:618
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:631
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:645
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "her ay"
 msgstr[1] "her ay"
 
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:642
 #, fuzzy, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Her yıl"
 msgstr[1] "Her yıl"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:653
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:669
+#: calendar/gui/e-itip-control.c:662
 msgid ", ending on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:686
 msgid "<b>Starts:</b> "
 msgstr "<b>Başlangıç:</b> "
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:696
 msgid "<b>Ends:</b> "
 msgstr "<b>Bitiş: </b>"
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:716
 msgid "<b>Completed:</b> "
 msgstr "<b>Tamamlanan:</b> "
 
-#: calendar/gui/e-itip-control.c:733
+#: calendar/gui/e-itip-control.c:726
 msgid "<b>Due:</b> "
 msgstr "<b>Son tarih:</b> "
 
-#: calendar/gui/e-itip-control.c:771 calendar/gui/e-itip-control.c:827
+#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
 msgid "iCalendar Information"
 msgstr "iCalendar Bilgisi"
 
 #. Title
-#: calendar/gui/e-itip-control.c:788
+#: calendar/gui/e-itip-control.c:781
 msgid "iCalendar Error"
 msgstr "iCalendar Hatası"
 
-#: calendar/gui/e-itip-control.c:859 calendar/gui/e-itip-control.c:875
-#: calendar/gui/e-itip-control.c:886 calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
 msgid "An unknown person"
 msgstr "Bilinmeyen kişi"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:910
+#: calendar/gui/e-itip-control.c:903
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -6098,301 +5850,305 @@ msgstr ""
 "<br> Lütfen bu bilgilerin doğruluğunu denetledikten sonra, aşağıdaki menüden "
 "bir işlem seçiniz."
 
-#: calendar/gui/e-itip-control.c:925
+#: calendar/gui/e-itip-control.c:918
 msgid "<i>None</i>"
 msgstr "<i>Hiçbiri</i>"
 
-#: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:929
+msgid "Location:"
+msgstr "Konum: "
+
+#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Onaylandı"
 
-#: calendar/gui/e-itip-control.c:959 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Geçici Olarak Kabul Edildi"
 
-#: calendar/gui/e-itip-control.c:963 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Reddedildi"
 
-#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.c:1050
-#: calendar/gui/e-itip-control.c:1076 calendar/gui/e-itip-control.c:1089
-#: calendar/gui/e-itip-control.c:1102 calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
 msgid "Choose an action:"
 msgstr "Bir eylem seçin:"
 
-#: calendar/gui/e-itip-control.c:1023
+#: calendar/gui/e-itip-control.c:1016
 msgid "Update"
 msgstr "Güncelle"
 
-#: calendar/gui/e-itip-control.c:1024 calendar/gui/e-itip-control.c:1055
-#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1091
-#: calendar/gui/e-itip-control.c:1104 calendar/gui/e-itip-control.c:1117
-#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
+#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Tamam"
 
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1044
 msgid "Accept"
 msgstr "Onayla"
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1045
 msgid "Tentatively accept"
 msgstr "Geçici olarak kabul et"
 
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1046
 msgid "Decline"
 msgstr "Reddet"
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1070
 msgid "Send Free/Busy Information"
 msgstr "Boş/Meşgul Bilgisi Gönder"
 
-#: calendar/gui/e-itip-control.c:1090
+#: calendar/gui/e-itip-control.c:1083
 msgid "Update respondent status"
 msgstr "Cevaplayan Bilgisini Güncelle"
 
-#: calendar/gui/e-itip-control.c:1103
+#: calendar/gui/e-itip-control.c:1096
 msgid "Send Latest Information"
 msgstr "Güncel Bilgiyi Gönder"
 
-#: calendar/gui/e-itip-control.c:1116 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "İptal"
 
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1185
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b>, toplantı bilgisi gönderdi."
 
-#: calendar/gui/e-itip-control.c:1193
+#: calendar/gui/e-itip-control.c:1186
 msgid "Meeting Information"
 msgstr "Toplantı Bilgisi"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1191
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1193
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> sizin toplantıda olmanızı istiyor."
 
-#: calendar/gui/e-itip-control.c:1201
+#: calendar/gui/e-itip-control.c:1194
 msgid "Meeting Proposal"
 msgstr "Toplantı Taslağı"
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> mevcut bir toplantıya ekleme yapmak istiyor"
 
-#: calendar/gui/e-itip-control.c:1206
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Update"
 msgstr "Toplantı Güncellemesi"
 
-#: calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1203
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> son toplantı bilgisini almak istiyor."
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1204
 msgid "Meeting Update Request"
 msgstr "Toplantı Güncelleme Bilgisi İsteği"
 
-#: calendar/gui/e-itip-control.c:1218
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> bir toplantı isteğine cevap verdi."
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Reply"
 msgstr "Toplantı Yanıtı"
 
-#: calendar/gui/e-itip-control.c:1226
+#: calendar/gui/e-itip-control.c:1219
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> bir toplantıyı iptal etti."
 
-#: calendar/gui/e-itip-control.c:1227
+#: calendar/gui/e-itip-control.c:1220
 msgid "Meeting Cancellation"
 msgstr "Toplantı İptali"
 
-#: calendar/gui/e-itip-control.c:1234 calendar/gui/e-itip-control.c:1302
-#: calendar/gui/e-itip-control.c:1337
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1330
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> hatalı bir mesaj gönderdi."
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1228
 msgid "Bad Meeting Message"
 msgstr "Hatalı Toplantı İletisi"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1253
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> görev bilgisi yayınladı."
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1254
 msgid "Task Information"
 msgstr "Görev Bilgisi"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1259
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> bir görevi tamamlamanızı istiyor."
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1262
 msgid "Task Proposal"
 msgstr "Görev Taslağı"
 
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> mevcut bir göreve eklenti yapmak istiyor."
 
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Update"
 msgstr "Görev Güncellemesi"
 
-#: calendar/gui/e-itip-control.c:1278
+#: calendar/gui/e-itip-control.c:1271
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> en güncel görev bilgisini almak istiyor."
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1272
 msgid "Task Update Request"
 msgstr "Güncel Görev Bilgisi İsteği"
 
-#: calendar/gui/e-itip-control.c:1286
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> bir görev tanımına cevap verdi."
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Reply"
 msgstr "Görev Yanıtı"
 
-#: calendar/gui/e-itip-control.c:1294
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> bir görevi iptal etti."
 
-#: calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1288
 msgid "Task Cancellation"
 msgstr "Görev İptali"
 
-#: calendar/gui/e-itip-control.c:1303
+#: calendar/gui/e-itip-control.c:1296
 msgid "Bad Task Message"
 msgstr "Hatalı Görev İletisi"
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1315
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> boş/meşgul bilgisi gönderdi."
 
-#: calendar/gui/e-itip-control.c:1323
+#: calendar/gui/e-itip-control.c:1316
 msgid "Free/Busy Information"
 msgstr "Boş/Meşgul Bilgisi"
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> sizden boş/meşgul bilgisini almak istiyor."
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1321
 msgid "Free/Busy Request"
 msgstr "Boş/Meşgul İsteği"
 
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1325
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> bir boş/meşgul isteğine cevap verdi."
 
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1326
 msgid "Free/Busy Reply"
 msgstr "Boş/Meşgul Cevabı"
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1331
 msgid "Bad Free/Busy Message"
 msgstr "Hatalı Boş/Meşgul İletisi"
 
-#: calendar/gui/e-itip-control.c:1413
+#: calendar/gui/e-itip-control.c:1406
 msgid "The message does not appear to be properly formed"
 msgstr "Bu mesaj düzgün değil"
 
-#: calendar/gui/e-itip-control.c:1472
+#: calendar/gui/e-itip-control.c:1465
 msgid "The message contains only unsupported requests."
 msgstr "Bu iletide desteklenmeyen bilgiler var."
 
-#: calendar/gui/e-itip-control.c:1503
+#: calendar/gui/e-itip-control.c:1496
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Bu eklenti geçerli bir takvim mesajını içermiyor."
 
-#: calendar/gui/e-itip-control.c:1535
+#: calendar/gui/e-itip-control.c:1528
 msgid "The attachment has no viewable calendar items"
 msgstr "Bu eklentide görüntülenebilir takvim öğeleri bulunmuyor"
 
-#: calendar/gui/e-itip-control.c:1769
+#: calendar/gui/e-itip-control.c:1762
 msgid "Update complete\n"
 msgstr "Güncelleme tamamlandı\n"
 
-#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
+#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Bu öğe yerinde bulunamadığı için katılımcı bilgileri güncellenemedi"
 
-#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1825
+#: calendar/gui/e-itip-control.c:1818
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1837
+#: calendar/gui/e-itip-control.c:1830
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Katılımcı bilgileri geçersiz bir durum nedeniyle güncellenemedi!\n"
 
-#: calendar/gui/e-itip-control.c:1856
+#: calendar/gui/e-itip-control.c:1849
 msgid "There was an error on the CORBA system\n"
 msgstr "CORBA sisteminde bir hata oluştu\n"
 
-#: calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1852
 msgid "Object could not be found\n"
 msgstr "Öğe bulunamadı\n"
 
-#: calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1855
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1865
+#: calendar/gui/e-itip-control.c:1858
 msgid "Attendee status updated\n"
 msgstr "Katılımcı bilgileri güncellendi\n"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1861
 msgid "Attendee status could not be updated!\n"
 msgstr "Katılımcı bilgileri güncellenemedi!\n"
 
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1892
 msgid "Removal Complete"
 msgstr "Bitiş Tamamlandı"
 
-#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
 msgid "Item sent!\n"
 msgstr "Öğe gönderildi!\n"
 
-#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
+#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
 msgid "The item could not be sent!\n"
 msgstr "Öğe gönderilemedi!\n"
 
@@ -6433,74 +6189,74 @@ msgstr "bitiş-tarihi"
 msgid "date-start"
 msgstr "başlangıç-tarihi"
 
-#: calendar/gui/e-meeting-list-view.c:62
+#: calendar/gui/e-meeting-list-view.c:59
 msgid "Chair Persons"
 msgstr "Toplantıyı Yönetenler"
 
-#: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:479
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
 msgid "Required Participants"
 msgstr "Gerekli Katılımcılar"
 
-#: calendar/gui/e-meeting-list-view.c:64
+#: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Seçimlik Katılımcılar"
 
-#: calendar/gui/e-meeting-list-view.c:65
+#: calendar/gui/e-meeting-list-view.c:62
 msgid "Resources"
 msgstr "Kaynaklar"
 
-#: calendar/gui/e-meeting-list-view.c:140 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
 #: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr "Bireysel"
 
-#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "Grup"
 
-#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr "Kaynak"
 
-#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr "Oda"
 
-#: calendar/gui/e-meeting-list-view.c:154 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr "Sandalye"
 
-#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:127
 #: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
 msgid "Required Participant"
 msgstr "Gerekli Katılımcı"
 
-#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr "Seçimlik Katılımcı"
 
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr "Katılmayan"
 
-#: calendar/gui/e-meeting-list-view.c:179 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:177
 #: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
 msgid "Needs Action"
 msgstr "İşlem Gerektiriyor"
 
-#: calendar/gui/e-meeting-list-view.c:182 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
 #: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "Girişimli"
 
-#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr ""
@@ -6517,20 +6273,28 @@ msgstr "Ofiste Değil"
 msgid "No Information"
 msgstr "Bilgi Yok"
 
+#: calendar/gui/e-meeting-time-sel.c:417
+#, fuzzy
+msgid "Add attendees from addressbook"
+msgstr "_Göndereni Adres Defterine Ekle"
+
 #: calendar/gui/e-meeting-time-sel.c:440
 msgid "_Options"
 msgstr "_Seçenekler"
 
 #: calendar/gui/e-meeting-time-sel.c:457
-msgid "Show _Only Working Hours"
+#, fuzzy
+msgid "Show _only working hours"
 msgstr "_Sadece Çalışma Saatlerini Göster"
 
 #: calendar/gui/e-meeting-time-sel.c:467
-msgid "Show _Zoomed Out"
+#, fuzzy
+msgid "Show _zoomed out"
 msgstr "_Daha Küçük Göster"
 
 #: calendar/gui/e-meeting-time-sel.c:482
-msgid "_Update Free/Busy"
+#, fuzzy
+msgid "_Update free/busy"
 msgstr "_Boş/Meşgul Olanları Güncelle"
 
 #: calendar/gui/e-meeting-time-sel.c:497
@@ -6546,19 +6310,23 @@ msgid ">_>"
 msgstr ">_>"
 
 #: calendar/gui/e-meeting-time-sel.c:547
-msgid "_All People and Resources"
+#, fuzzy
+msgid "_All people and resources"
 msgstr "_Tüm Kişiler ve Kaynaklar"
 
 #: calendar/gui/e-meeting-time-sel.c:556
-msgid "All _People and One Resource"
+#, fuzzy
+msgid "All _people and one resource"
 msgstr "Tüm _Kişiler ve Bir Kaynak"
 
 #: calendar/gui/e-meeting-time-sel.c:565
-msgid "_Required People"
+#, fuzzy
+msgid "_Required people"
 msgstr "_Gerekli Kişiler"
 
 #: calendar/gui/e-meeting-time-sel.c:574
-msgid "Required People and _One Resource"
+#, fuzzy
+msgid "Required people and _one resource"
 msgstr "Gerekli Kişiler ve _Bir Kaynak"
 
 #: calendar/gui/e-meeting-time-sel.c:593
@@ -6596,7 +6364,7 @@ msgstr "%d/%m/%Y"
 msgid "Enter the password for %s"
 msgstr "%s İçin Parolayı Girin"
 
-#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6605,19 +6373,14 @@ msgstr ""
 "'%s' hatası:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-
 #. FIXME Loading should be async
 #. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:686
+#: calendar/gui/e-tasks.c:801
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%s tarihinde görevler açılıyor"
 
-#: calendar/gui/e-tasks.c:709
+#: calendar/gui/e-tasks.c:824
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6626,53 +6389,48 @@ msgstr ""
 "'%s' hatası:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:730
+#: calendar/gui/e-tasks.c:845
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Yüklenen Resimler"
 
-#: calendar/gui/e-tasks.c:834
+#: calendar/gui/e-tasks.c:949
 msgid "Completing tasks..."
 msgstr "Görevler tamamlanıyor..."
 
-#: calendar/gui/e-tasks.c:857
+#: calendar/gui/e-tasks.c:972
 msgid "Deleting selected objects..."
 msgstr "Seçilen öğeler siliniyor..."
 
-#: calendar/gui/e-tasks.c:884
+#: calendar/gui/e-tasks.c:999
 msgid "Expunging"
 msgstr "Siliniyor"
 
-#: calendar/gui/e-tasks.c:960
+#: calendar/gui/e-tasks.c:1075
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
-#: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
+#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
+#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
 #: calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:705
 msgid "Tasks"
 msgstr "Görevler"
 
-#: calendar/gui/gnome-cal.c:1876
+#: calendar/gui/gnome-cal.c:1878
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Randevu yok."
 
-#: calendar/gui/gnome-cal.c:1895
+#: calendar/gui/gnome-cal.c:1897
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Yüklenen Resimler"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1920
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "%s içinde aç..."
 
-#: calendar/gui/gnome-cal.c:2048
-#, c-format
-msgid "The calendar backend for '%s' has crashed."
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:2894
+#: calendar/gui/gnome-cal.c:2906
 #, fuzzy
 msgid "Purging"
 msgstr "Turin"
@@ -6867,7 +6625,7 @@ msgid "On The Web"
 msgstr ""
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 
@@ -6878,7 +6636,7 @@ msgid "Unable to migrate calendar `%s'"
 msgstr "Adres defterini açamadım"
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:869
+#: calendar/gui/migration.c:889
 #, fuzzy, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Adres defterini açamadım"
@@ -7114,73 +6872,73 @@ msgstr "Öğeyi Yazdır"
 msgid "Print Setup"
 msgstr "Yazdırma Ayarları"
 
-#: calendar/gui/tasks-component.c:303
+#: calendar/gui/tasks-component.c:313
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:371
 #, fuzzy
 msgid "New Task List"
 msgstr "Görev Listesi"
 
-#: calendar/gui/tasks-component.c:398
+#: calendar/gui/tasks-component.c:408
 #, fuzzy, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "Görev yok"
 msgstr[1] "Görev yok"
 
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] "%d seçili"
 msgstr[1] "%d seçili"
 
-#: calendar/gui/tasks-component.c:447
+#: calendar/gui/tasks-component.c:457
 #, fuzzy
 msgid "Failed upgrading tasks."
 msgstr "Yüklenen Resimler"
 
-#: calendar/gui/tasks-component.c:526
+#: calendar/gui/tasks-component.c:749
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:538
+#: calendar/gui/tasks-component.c:761
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:576
+#: calendar/gui/tasks-component.c:799
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:804
+#: calendar/gui/tasks-component.c:1040
 msgid "New task"
 msgstr "Yeni görev"
 
-#: calendar/gui/tasks-component.c:805
+#: calendar/gui/tasks-component.c:1041
 msgid "_Task"
 msgstr "_Görev"
 
-#: calendar/gui/tasks-component.c:806
+#: calendar/gui/tasks-component.c:1042
 msgid "Create a new task"
 msgstr "Yeni bir görev oluştur"
 
-#: calendar/gui/tasks-component.c:812
+#: calendar/gui/tasks-component.c:1048
 #, fuzzy
 msgid "New tasks group"
 msgstr "Yeni görev"
 
-#: calendar/gui/tasks-component.c:813
+#: calendar/gui/tasks-component.c:1049
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Görev Listesi Grubu"
 
-#: calendar/gui/tasks-component.c:814
+#: calendar/gui/tasks-component.c:1050
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Yeni bir görev oluştur"
@@ -8948,12 +8706,12 @@ msgstr "%s filtre taramasını çalıştırırken hata oldu: %s"
 msgid "Unsupported operation: append message: for %s"
 msgstr "Desteklenmeyen işlem: mesaja ekle: %s için"
 
-#: camel/camel-folder.c:1259
+#: camel/camel-folder.c:1262
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Desteklenmeyen işlem: ifade ile ara: %s için"
 
-#: camel/camel-folder.c:1299
+#: camel/camel-folder.c:1302
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Desteklenmeyen işlem: uid ile ara: %s için"
@@ -8966,11 +8724,16 @@ msgstr "İletiler taşınıyor"
 msgid "Copying messages"
 msgstr "İletiler kopyalanıyor"
 
-#: camel/camel-folder.c:1666
-msgid "Learning junk and/or non junk message(s)"
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Lansing"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
 msgstr ""
 
-#: camel/camel-folder.c:1695
+#: camel/camel-folder.c:1701
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "%d ileti alınıyor"
@@ -9005,17 +8768,17 @@ msgstr ""
 msgid "(match-threads) requires a match type string"
 msgstr ""
 
-#: camel/camel-folder-search.c:785
+#: camel/camel-folder-search.c:784
 #, fuzzy
 msgid "(match-threads) expects an array result"
 msgstr "(hepsini-eşle) boolean sonuç içermelidir"
 
-#: camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:790
 #, fuzzy
 msgid "(match-threads) requires the folder set"
 msgstr "(hepsini-eşle) boolean sonuç içermelidir"
 
-#: camel/camel-folder-search.c:880
+#: camel/camel-folder-search.c:879
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Bilinmeyen başlık üzerinde arama yapılıyor: %s"
@@ -9048,7 +8811,8 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
 #: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:706
+#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "İptal edildi."
@@ -9416,7 +9180,7 @@ msgstr ""
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1212
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Sunucudan hatalı kimlik sınama yanıtı."
 
@@ -9800,40 +9564,40 @@ msgstr "Komut henüz tanınmıyor"
 msgid "export keys: unimplemented"
 msgstr ""
 
-#: camel/camel-store.c:214
+#: camel/camel-store.c:213
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Dizin alınamadı: Gerçersiz"
 
-#: camel/camel-store.c:244
+#: camel/camel-store.c:243
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr "%s dizini alınamadı: %s"
 
-#: camel/camel-store.c:295
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Dizin oluşturulamadı: Geçersiz işlem"
 
-#: camel/camel-store.c:323
+#: camel/camel-store.c:325
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "%s dizini alınamadı: %s"
 
-#: camel/camel-store.c:387 camel/camel-vee-store.c:354
+#: camel/camel-store.c:389 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "%s dizini silinemedi. Geçersiz işlem"
 
-#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#: camel/camel-store.c:439 camel/camel-vee-store.c:387
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "%s dizininin adı değiştirilemedi: Geçersiz işlem"
 
-#: camel/camel-store.c:811
+#: camel/camel-store.c:777
 msgid "Trash"
 msgstr "Çöp"
 
-#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
-#: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/mail-config.glade.h:95
+#: ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
 msgstr "Haziran"
@@ -10063,12 +9827,12 @@ msgstr "Bu isimle bir ileti yok: %s (%s)"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:374
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "%s dizini silinemedi: Böyle bir dizin yok"
 
-#: camel/camel-vee-store.c:398
+#: camel/camel-vee-store.c:395
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "%s dizininin adı değiştirilemedi: Bu isimde bir dizin yok"
@@ -10114,24 +9878,24 @@ msgstr "Adres Defteri:"
 msgid "Post Office Agent SOAP Port:"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:80
+#: camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "Novell GroupWise"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:82
+#: camel/providers/groupwise/camel-groupwise-provider.c:85
 msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: camel/providers/groupwise/camel-groupwise-provider.c:100
 #: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
 msgid "Password"
 msgstr "Parola"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:99
+#: camel/providers/groupwise/camel-groupwise-provider.c:102
 #: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
@@ -10139,8 +9903,8 @@ msgstr ""
 "Bu seçenek IMAP sunucusuna açık metin parola kullanarak bağlantı kurulmasını "
 "sağlar."
 
-#: camel/providers/groupwise/camel-gw-listener.c:305
-#: camel/providers/groupwise/camel-gw-listener.c:328
+#: camel/providers/groupwise/camel-gw-listener.c:312
+#: camel/providers/groupwise/camel-gw-listener.c:335
 #, fuzzy
 msgid "Checklist"
 msgstr "Kalın sisli"
@@ -10285,13 +10049,13 @@ msgstr ""
 "sağlar."
 
 #: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:429
+#: camel/providers/imap/camel-imap-store.c:428
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP sunucu %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:431
+#: camel/providers/imap/camel-imap-store.c:430
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr ""
@@ -10301,7 +10065,7 @@ msgstr ""
 #: camel/providers/imap/camel-imap-store.c:551
 #: camel/providers/imap/camel-imap-store.c:571
 #: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
+#: camel/providers/nntp/camel-nntp-store.c:209
 #: camel/providers/pop3/camel-pop3-store.c:175
 #: camel/providers/smtp/camel-smtp-transport.c:269
 #: camel/providers/smtp/camel-smtp-transport.c:285
@@ -10319,10 +10083,10 @@ msgstr "TLS mevcut değil"
 
 #: camel/providers/imap4/camel-imap4-store.c:222
 #: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:815
+#: camel/providers/imap/camel-imap-store.c:845
 #: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:137
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
 #: camel/providers/pop3/camel-pop3-store.c:192
 msgid "Connection cancelled"
 msgstr "Bağlantı iptal edildi"
@@ -10337,8 +10101,8 @@ msgstr ""
 "Parola iletiminde hata: %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:649
-#: camel/providers/imap/camel-imap-store.c:680
+#: camel/providers/imap/camel-imap-store.c:679
+#: camel/providers/imap/camel-imap-store.c:710
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
@@ -10349,7 +10113,7 @@ msgstr ""
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1109
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
 msgid "Unknown error"
 msgstr "Bilinmeyen hata"
 
@@ -10377,8 +10141,8 @@ msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr "%s dizini alınamadı: %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1857
-#: camel/providers/imap/camel-imap-store.c:2235
+#: camel/providers/imap/camel-imap-store.c:1885
+#: camel/providers/imap/camel-imap-store.c:2263
 #, fuzzy, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -10459,12 +10223,12 @@ msgstr "Sunucu beklenmedik bir şekilde bağlantıyı kesti: %s"
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3168
+#: camel/providers/imap/camel-imap-store.c:3194
 msgid "Operation cancelled"
 msgstr "İşlem iptal edildi"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3171
+#: camel/providers/imap/camel-imap-store.c:3197
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Sunucu beklenmedik bir şekilde bağlantıyı kesti: %s"
@@ -10528,13 +10292,6 @@ msgid "Unable to retrieve message: %s"
 msgstr "İleti alınamadı: %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:219
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -10544,15 +10301,15 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-mbox-folder.c:418
+#: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
 msgstr "İleti bulunmuyor"
 
 #: camel/providers/imap/camel-imap-folder.c:2019
-#: camel/providers/imap/camel-imap-folder.c:2621
-#: camel/providers/nntp/camel-nntp-folder.c:238
+#: camel/providers/imap/camel-imap-folder.c:2622
+#: camel/providers/nntp/camel-nntp-folder.c:220
 msgid "This message is not currently available"
 msgstr "Bu ileti kullanılabilir değil"
 
@@ -10561,7 +10318,23 @@ msgstr "Bu ileti kullanılabilir değil"
 msgid "Fetching summary information for new messages"
 msgstr "Yeni iletilerdeki özet bilgiler alınıyor"
 
-#: camel/providers/imap/camel-imap-folder.c:2659
+#: camel/providers/imap/camel-imap-folder.c:2463
+#, c-format
+msgid "Incomplete server response: no information provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2471
+#, c-format
+msgid "Incomplete server response: no UID provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2484
+#, c-format
+msgid ""
+"Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2660
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH cevabında ileti gövdesi bulunamadı"
 
@@ -10627,45 +10400,45 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "IMAP sunucuları ileti alma ve göndermede kullanmak için"
 
-#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/imap/camel-imap-store.c:680
 #: camel/providers/pop3/camel-pop3-store.c:228
 #, fuzzy
 msgid "SSL/TLS extension not supported."
 msgstr "İşlem desteklenmiyor"
 
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:711
 #: camel/providers/pop3/camel-pop3-store.c:269
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "Kimlik denetimi başarısız."
 
-#: camel/providers/imap/camel-imap-store.c:818
+#: camel/providers/imap/camel-imap-store.c:848
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "%s sunucusuna bağlantı kurulamadı"
 
-#: camel/providers/imap/camel-imap-store.c:1242
+#: camel/providers/imap/camel-imap-store.c:1272
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "%s IMAP sunucusu %s kimlik sınama yöntemini desteklemiyor"
 
-#: camel/providers/imap/camel-imap-store.c:1252
+#: camel/providers/imap/camel-imap-store.c:1282
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "%s kimlik sınama yöntemi desteklenmiyor"
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1305
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sLütfen %s@%s için IMAP parolasını giriniz."
 
-#: camel/providers/imap/camel-imap-store.c:1289
+#: camel/providers/imap/camel-imap-store.c:1319
 msgid "You didn't enter a password."
 msgstr "Bir parola girmediniz."
 
-#: camel/providers/imap/camel-imap-store.c:1318
+#: camel/providers/imap/camel-imap-store.c:1348
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10676,18 +10449,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1839
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:1867
+#: camel/providers/imap/camel-imap-store.c:2057
 #, c-format
 msgid "No such folder %s"
 msgstr "Bu isimde bir dizin yok: `%s'"
 
-#: camel/providers/imap/camel-imap-store.c:1915
-#: camel/providers/imap/camel-imap-store.c:2296
+#: camel/providers/imap/camel-imap-store.c:1943
+#: camel/providers/imap/camel-imap-store.c:2324
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Ana dizin üzerinde alt dizin açılamaz"
 
-#: camel/providers/imap/camel-imap-store.c:1970
+#: camel/providers/imap/camel-imap-store.c:1998
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10695,7 +10468,7 @@ msgstr "Ana dizin üzerinde alt dizin açılamaz"
 msgid "Cannot create folder `%s': folder exists."
 msgstr "%s dizini alınamadı: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:2274
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Bilinmeyen hata: %s"
@@ -10729,20 +10502,20 @@ msgid "Index message body data"
 msgstr "Bağlantıya ileti gönder"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:388
 #, fuzzy, c-format
 msgid "~%s (%s)"
 msgstr "%s (%d)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:393
-#: camel/providers/local/camel-local-folder.c:396
+#: camel/providers/local/camel-local-folder.c:392
+#: camel/providers/local/camel-local-folder.c:395
 #, fuzzy, c-format
 msgid "mailbox:%s (%s)"
 msgstr "%s posta kutusu açılamadı: %s\n"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:400
+#: camel/providers/local/camel-local-folder.c:399
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -10802,7 +10575,7 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:142
 #: camel/providers/local/camel-local-store.c:253
-#: camel/providers/local/camel-mbox-store.c:356
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10876,8 +10649,25 @@ msgstr "İleti aktarımı iptal edildi"
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "%s dizinine ileti eklenemedi: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:226
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mbox-folder.c:417
+#: camel/providers/local/camel-mbox-folder.c:436
+#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:475
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-mh-folder.c:221
+#, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+"%s iletisi %s dizininden alınamadı\n"
+"  %s"
+
+#: camel/providers/local/camel-maildir-folder.c:236
 msgid "Invalid message contents"
 msgstr "Geçersiz ileti içeriği"
 
@@ -10918,9 +10708,9 @@ msgstr "`%s' dizini silinemedi: %s"
 msgid "not a maildir directory"
 msgstr "maildir dizini değil"
 
-#: camel/providers/local/camel-maildir-store.c:341
-#: camel/providers/local/camel-spool-store.c:286
-#: camel/providers/local/camel-spool-store.c:316
+#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-spool-store.c:284
+#: camel/providers/local/camel-spool-store.c:314
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "'%s dizini taranamadı: %s"
@@ -10969,27 +10759,18 @@ msgstr "İleti aktarımı iptal edildi"
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "İleti mbox dosyasına eklenemedi (%s): %s"
 
-#: camel/providers/local/camel-mbox-folder.c:435
-#: camel/providers/local/camel-mbox-folder.c:466
-#: camel/providers/local/camel-mbox-folder.c:474
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"%s iletisi %s dizininden alınamadı\n"
-"  %s"
-
-#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:468
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Dizin onarılamayacak şekilde bozulmuş."
 
-#: camel/providers/local/camel-mbox-folder.c:475
-msgid "Message construction failed: Corrupt mailbox?"
+#: camel/providers/local/camel-mbox-folder.c:476
+#: camel/providers/local/camel-mh-folder.c:222
+#, fuzzy
+msgid "Message construction failed."
 msgstr "İletiler düzenlenemiyor: İleti kutusu bozulmuş olabilir."
 
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:362
+#: camel/providers/local/camel-mbox-store.c:361
 #, fuzzy
 msgid "Cannot create a folder by this name."
 msgstr "Bu isimde bir dizin yaratılamadı"
@@ -11020,32 +10801,32 @@ msgstr "`%s' normal bir dosya değildir."
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "`%s' dizini boş değil. Silinmedi."
 
-#: camel/providers/local/camel-mbox-store.c:375
+#: camel/providers/local/camel-mbox-store.c:374
 #, fuzzy, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "%s dizini yaratılamadı: %s"
 
-#: camel/providers/local/camel-mbox-store.c:389
+#: camel/providers/local/camel-mbox-store.c:388
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "%s dizini alınamadı: %s"
 
-#: camel/providers/local/camel-mbox-store.c:391
+#: camel/providers/local/camel-mbox-store.c:390
 #, fuzzy
 msgid "Folder already exists"
 msgstr "Bu kart numarası var"
 
-#: camel/providers/local/camel-mbox-store.c:473
+#: camel/providers/local/camel-mbox-store.c:472
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "Bu dizin adı geçersiz: %s"
 
-#: camel/providers/local/camel-mbox-store.c:486
+#: camel/providers/local/camel-mbox-store.c:485
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "'%s' adı değiştirilemedi: %s"
 
-#: camel/providers/local/camel-mbox-store.c:561
+#: camel/providers/local/camel-mbox-store.c:560
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "%s dizininin adı %s olarak değiştirilemedi: %s"
@@ -11237,7 +11018,7 @@ msgid ""
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:997
+#: camel/providers/nntp/camel-nntp-store.c:1126
 #, fuzzy, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "%sLütfen %s@%s için SMTP parolasını giriniz"
@@ -11255,18 +11036,10 @@ msgstr "LDAP sunucuyla bağlantı başarısız oldu"
 msgid "Server rejected username/password"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:263
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr "Kullanıcı işlemi iptal etti"
-
-#: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:259
-#: camel/providers/nntp/camel-nntp-folder.c:265
+#: camel/providers/nntp/camel-nntp-folder.c:147
+#: camel/providers/nntp/camel-nntp-folder.c:149
+#: camel/providers/nntp/camel-nntp-folder.c:158
+#: camel/providers/nntp/camel-nntp-folder.c:234
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11275,65 +11048,52 @@ msgstr "Kullanıcı işlemi iptal etti"
 msgid "Cannot get message %s: %s"
 msgstr "%s. ileti alınamadı: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:188
-#: camel/providers/nntp/camel-nntp-folder.c:228
+#: camel/providers/nntp/camel-nntp-folder.c:156
+#: camel/providers/nntp/camel-nntp-folder.c:232
+#: camel/providers/nntp/camel-nntp-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+msgid "User cancelled"
+msgstr "Kullanıcı işlemi iptal etti"
+
+#: camel/providers/nntp/camel-nntp-folder.c:176
+#: camel/providers/nntp/camel-nntp-folder.c:208
 #, c-format
 msgid "Internal error: uid in invalid format: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:201
-#, fuzzy, c-format
-msgid "Could not get article %s from NNTP server"
-msgstr "Sunucudan grup listesi alınamadı."
-
-#: camel/providers/nntp/camel-nntp-folder.c:362
-msgid "Posting not allowed by news server"
-msgstr ""
-
+#: camel/providers/nntp/camel-nntp-folder.c:328
+#: camel/providers/nntp/camel-nntp-folder.c:331
 #: camel/providers/nntp/camel-nntp-folder.c:373
-#, c-format
-msgid "Failed to send newsgroups header: %s: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:413
-#: camel/providers/nntp/camel-nntp-folder.c:426
-#, c-format
-msgid "Error posting to newsgroup: %s: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:438
-msgid "Error reading response to posted message: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:441
+#: camel/providers/nntp/camel-nntp-folder.c:375
 #, fuzzy, c-format
-msgid "Error posting message: %s: message not posted"
-msgstr ""
-"İletilerin otomatik kaydında hata: %s\n"
-" %s"
+msgid "Posting failed: %s"
+msgstr "İşlem başarısız oldu: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:457
+#: camel/providers/nntp/camel-nntp-folder.c:393
 msgid "You cannot post NNTP messages while working offline!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:468
+#: camel/providers/nntp/camel-nntp-folder.c:404
 #, fuzzy
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "geçici dizin kapatılamadı: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:44
 msgid "Could not get group list from server."
 msgstr "Sunucudan grup listesi alınamadı."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#: camel/providers/nntp/camel-nntp-grouplist.c:97
+#: camel/providers/nntp/camel-nntp-grouplist.c:106
 #, fuzzy, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr ""
 "Çıkış dosyası yaratılamadı: %s\n"
 " %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#: camel/providers/nntp/camel-nntp-grouplist.c:157
 #, fuzzy, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr ""
@@ -11365,27 +11125,29 @@ msgstr ""
 "Bu seçenek NNTP sunucusuna açık metin parola üzerinden kimlik denetimi "
 "yaptırır."
 
-#: camel/providers/nntp/camel-nntp-store.c:158
+#: camel/providers/nntp/camel-nntp-store.c:118
+#: camel/providers/nntp/camel-nntp-store.c:1233
+#: camel/providers/nntp/camel-nntp-store.c:1331
+#, c-format
+msgid "NNTP Command failed: %s"
+msgstr "NNTP komutu başarısız oldu: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:227
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "%s adrsinden karşılama mesajı alınamadı: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:170
+#: camel/providers/nntp/camel-nntp-store.c:239
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:326
+#: camel/providers/nntp/camel-nntp-store.c:403
 #, c-format
 msgid "USENET News via %s"
 msgstr "%s üzerinden USENET"
 
-#: camel/providers/nntp/camel-nntp-store.c:640
-#, fuzzy
-msgid "Stream error"
-msgstr "ayrıştırma hatası"
-
-#: camel/providers/nntp/camel-nntp-store.c:643
+#: camel/providers/nntp/camel-nntp-store.c:777
 #, fuzzy, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -11395,75 +11157,75 @@ msgstr ""
 "İletilerin kaydında hata: %s:\n"
 " %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:735
+#: camel/providers/nntp/camel-nntp-store.c:872
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
 "No such newsgroup. The selected item is a probably a parent folder."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:767
+#: camel/providers/nntp/camel-nntp-store.c:904
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
 "newsgroup does not exist!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:792
+#: camel/providers/nntp/camel-nntp-store.c:929
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:800
+#: camel/providers/nntp/camel-nntp-store.c:937
 #, fuzzy
 msgid "You cannot rename a folder in a News store."
 msgstr "%s dizininin adı %s olarak değiştirilemedi: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:808
+#: camel/providers/nntp/camel-nntp-store.c:945
 #, fuzzy
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "Bir dizin kendi üzerine taşınamaz."
 
-#: camel/providers/nntp/camel-nntp-summary.c:253
-#, fuzzy, c-format
-msgid "Connection error: %s"
-msgstr "Bilinmeyen hata: %s"
-
-#: camel/providers/nntp/camel-nntp-summary.c:262
-#, c-format
-msgid "No such folder: %s"
-msgstr "Bu isimde bir dizin yok: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1118
+#, fuzzy
+msgid "Authentication requested but not username provided"
+msgstr "Kimlik denetimi isteniyor"
 
-#: camel/providers/nntp/camel-nntp-summary.c:268
-#, c-format
-msgid "Could not get group: %s"
-msgstr "Grup alınamadı: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1146
+#, fuzzy, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr "%s POP sunucusuyla kimlik denetimi başarısız oldu: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:333
+#: camel/providers/nntp/camel-nntp-store.c:1262
 #, fuzzy
-msgid "Could not get messages: unspecified error"
-msgstr "İleti alınamadı: %s"
+msgid "Not connected."
+msgstr "Bağlantı yok"
 
-#: camel/providers/nntp/camel-nntp-summary.c:378
+#: camel/providers/nntp/camel-nntp-store.c:1311
 #, c-format
-msgid "NNTP Command failed: %s"
-msgstr "NNTP komutu başarısız oldu: %s"
+msgid "No such folder: %s"
+msgstr "Bu isimde bir dizin yok: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:438
-#: camel/providers/nntp/camel-nntp-summary.c:543
+#: camel/providers/nntp/camel-nntp-summary.c:218
+#: camel/providers/nntp/camel-nntp-summary.c:314
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Yeni iletiler taranıyor"
 
-#: camel/providers/nntp/camel-nntp-summary.c:558
-#, c-format
-msgid "Unknown server response: %s"
-msgstr "Bilinmeyen sunucu cevabı: %s"
+#: camel/providers/nntp/camel-nntp-summary.c:225
+#, fuzzy, c-format
+msgid "Unexpected server response from xover: %s"
+msgstr "IMAP sunucusundan beklenmeyen cevap: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:328
+#, fuzzy, c-format
+msgid "Unexpected server response from head: %s"
+msgstr "POP sunucusundan beklenmeyen cevap: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:605
+#: camel/providers/nntp/camel-nntp-summary.c:368
 msgid "Use cancel"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:607
+#: camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
 msgid "Operation failed: %s"
 msgstr "İşlem başarısız oldu: %s"
@@ -11511,7 +11273,7 @@ msgstr "%s günden sonra sil"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107
 msgid "POP"
 msgstr "POP"
 
@@ -11598,7 +11360,7 @@ msgid "No such folder `%s'."
 msgstr "Bu isimde bir dizin yok: `%s'"
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:132
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -11651,7 +11413,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Sendmail üzerinden ileti gönderimi"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:119
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11945,19 +11707,19 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
+#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:408
 msgid "attachment"
 msgstr "ek"
 
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:454
 msgid "Remove selected items from the attachment list"
 msgstr "Seçili dosyaları ekler listesinden sil"
 
-#: composer/e-msg-composer-attachment-bar.c:491
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Add attachment..."
 msgstr "Dosya ekle..."
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:495
 msgid "Attach a file to the message"
 msgstr "İletiyi bir dosya ekle"
 
@@ -12022,7 +11784,7 @@ msgstr "(Başlıksız İleti)"
 msgid "Open file"
 msgstr "Dosyayı aç"
 
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
 msgid "Autogenerated"
 msgstr "Otomatik"
 
@@ -12171,17 +11933,17 @@ msgstr "Bir dosya ekle"
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
+msgid "You cannot attach the file `{0}' to this message."
 msgstr "İletiyi bir dosya ekle"
 
 #. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4
-msgid "${1}"
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
 msgstr ""
 
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
 
 #. mail-composer:attach-directory primary
@@ -12276,7 +12038,7 @@ msgstr "Boru yaratılamadı: %s"
 
 #. mail-composer:no-build-message secondary
 #: composer/mail-composer-errors.xml.h:34
-msgid "Because \"${0}\", you may need to select different mail options."
+msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
@@ -12286,8 +12048,10 @@ msgid "Could not read signature file \"{0}\"."
 msgstr "İ_mza dosyası kaydedilemedi: %s"
 
 #. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38
-msgid "Because \"${1}\"."
+#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted primary
@@ -12706,11 +12470,11 @@ msgid "<b>Then</b>"
 msgstr "<b>Son tarih:</b> "
 
 #: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1335
+#: mail/mail-account-gui.c:1347
 msgid "Select Folder"
 msgstr "Dizini Seçin"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
 #, fuzzy
 msgid "    "
 msgstr "      "
@@ -12763,7 +12527,7 @@ msgstr "önce"
 msgid "months"
 msgstr "ay"
 
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
 msgid "seconds"
 msgstr "saniye"
 
@@ -12795,20 +12559,20 @@ msgstr "tüm yerel dizinlerle birlikte"
 msgid "years"
 msgstr "yılda bir güncelle"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:916
-#: mail/mail-config.c:76 mail/mail-config.glade.h:90
+#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
+#: mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Önemli"
 
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:919 mail/mail-config.c:79
-#: mail/mail-config.glade.h:145
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: mail/mail-config.glade.h:148
 msgid "To Do"
 msgstr "Yapılacaklar"
 
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:920 mail/mail-config.c:80
-#: mail/mail-config.glade.h:94
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: mail/mail-config.glade.h:97
 msgid "Later"
 msgstr "Sonra"
 
@@ -12865,268 +12629,6 @@ msgstr "gelen"
 msgid "outgoing"
 msgstr "giden"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-#, fuzzy
-msgid "Adjust Score"
-msgstr "Puan Belirt"
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Color"
-msgstr "Renk Belirle"
-
-#: filter/libfilter-i18n.h:4
-msgid "Assign Score"
-msgstr "Puan Belirt"
-
-#: filter/libfilter-i18n.h:5
-msgid "Attachments"
-msgstr "Ekler"
-
-#: filter/libfilter-i18n.h:6
-msgid "Beep"
-msgstr "Biple"
-
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "içerir"
-
-#: filter/libfilter-i18n.h:8
-msgid "Copy to Folder"
-msgstr "Dizine Kopyala"
-
-#: filter/libfilter-i18n.h:9
-msgid "Date received"
-msgstr "Alınma tarihi"
-
-#: filter/libfilter-i18n.h:10
-msgid "Date sent"
-msgstr "Gönderilme tarihi"
-
-#: filter/libfilter-i18n.h:12
-msgid "Deleted"
-msgstr "Silinen"
-
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "içermez"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "sonlanmaz"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "bulunmaz"
-
-#: filter/libfilter-i18n.h:16
-#, fuzzy
-msgid "does not return"
-msgstr "bulunmaz"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "benzemez"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "başlamaz"
-
-#: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
-msgstr "Bulunmaz"
-
-#: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr "Taslak"
-
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "biter"
-
-#: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr "bulunur"
-
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "bulunur"
-
-#: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr "Deyim"
-
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr ""
-
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "eşittir"
-
-#: filter/libfilter-i18n.h:28
-#, fuzzy
-msgid "is after"
-msgstr "sonra"
-
-#: filter/libfilter-i18n.h:29
-#, fuzzy
-msgid "is before"
-msgstr "önce"
-
-#: filter/libfilter-i18n.h:30
-#, fuzzy
-msgid "is Flagged"
-msgstr "İşaretli"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "büyük"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "küçük"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "değil"
-
-#: filter/libfilter-i18n.h:34
-#, fuzzy
-msgid "is not Flagged"
-msgstr "İşaretli"
-
-#: filter/libfilter-i18n.h:36
-#, fuzzy
-msgid "Junk Test"
-msgstr "Haziran"
-
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
-#: widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Etiket"
-
-#: filter/libfilter-i18n.h:38
-msgid "Mailing list"
-msgstr "E-posta listesi"
-
-#: filter/libfilter-i18n.h:39
-msgid "Message Body"
-msgstr "İleti Gövdesi"
-
-#: filter/libfilter-i18n.h:40
-msgid "Message Header"
-msgstr "İleti Başlığı"
-
-#: filter/libfilter-i18n.h:41
-#, fuzzy
-msgid "Message is Junk"
-msgstr "İleti gönderildi"
-
-#: filter/libfilter-i18n.h:42
-#, fuzzy
-msgid "Message is not Junk"
-msgstr "%s numaralı ileti bulunamadı."
-
-#: filter/libfilter-i18n.h:43
-msgid "Move to Folder"
-msgstr "Dizine Taşı"
-
-#: filter/libfilter-i18n.h:44
-#, fuzzy
-msgid "Pipe to Program"
-msgstr "Programdan çık"
-
-#: filter/libfilter-i18n.h:45
-#, fuzzy
-msgid "Play Sound"
-msgstr "Ses çal:"
-
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Oku"
-
-#: filter/libfilter-i18n.h:47
-msgid "Recipients"
-msgstr "Alıcılar"
-
-#: filter/libfilter-i18n.h:48
-msgid "Regex Match"
-msgstr "Düzgün Deyim Eşleşimi"
-
-#: filter/libfilter-i18n.h:49
-msgid "Replied to"
-msgstr "Cevaplanan"
-
-#: filter/libfilter-i18n.h:50
-#, fuzzy
-msgid "returns"
-msgstr "Burns"
-
-#: filter/libfilter-i18n.h:51
-#, fuzzy
-msgid "returns greater than"
-msgstr "büyük"
-
-#: filter/libfilter-i18n.h:52
-#, fuzzy
-msgid "returns less than"
-msgstr "küçük"
-
-#: filter/libfilter-i18n.h:53
-#, fuzzy
-msgid "Run Program"
-msgstr "Program çalıştır:"
-
-#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Puan"
-
-#: filter/libfilter-i18n.h:55
-msgid "Sender"
-msgstr "Gönderen"
-
-#: filter/libfilter-i18n.h:56
-msgid "Set Status"
-msgstr "Durum belirt"
-
-#: filter/libfilter-i18n.h:57
-msgid "Size (kB)"
-msgstr "Boyut (Kb)"
-
-#: filter/libfilter-i18n.h:58
-msgid "sounds like"
-msgstr "benzer"
-
-#: filter/libfilter-i18n.h:59
-msgid "Source Account"
-msgstr "Kaynak Hesap"
-
-#: filter/libfilter-i18n.h:60
-msgid "Specific header"
-msgstr "Özel başlık"
-
-#: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "başlayan"
-
-#: filter/libfilter-i18n.h:63
-msgid "Stop Processing"
-msgstr "İşlemeyi Durdur"
-
-#: filter/libfilter-i18n.h:64 mail/em-format.c:755 mail/em-format-html.c:1519
-#: mail/em-format-quote.c:302 mail/em-mailer-prefs.c:87
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
-#: smime/lib/e-cert.c:1079
-msgid "Subject"
-msgstr "Konu"
-
-#: filter/libfilter-i18n.h:65
-#, fuzzy
-msgid "Unset Status"
-msgstr "Durum belirt"
-
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Görev Ekle"
@@ -13145,6 +12647,11 @@ msgstr "Kural adı:"
 msgid "_Score Rules"
 msgstr "Puan Kuralları"
 
+#: filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Puan"
+
 #: filter/searchtypes.xml.h:1
 msgid "Body contains"
 msgstr "Gövde içerir"
@@ -13227,13 +12734,13 @@ msgstr "İmza(lar)"
 msgid "-------- Forwarded Message --------"
 msgstr "Yönlendirilmiş İleti"
 
-#: mail/em-composer-utils.c:1499
+#: mail/em-composer-utils.c:1495
 msgid "an unknown sender"
 msgstr "bilinmeyen gönderici"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1509
+#: mail/em-composer-utils.c:1505
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "%d-%m-%Y %A günü saat %H:%M sularında, %%s dedi ki:"
@@ -13276,8 +12783,8 @@ msgstr "<bir dizin seçmek için tıklayın>"
 msgid "Create New Folder"
 msgstr "Yeni Bir Dizin Yarat"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
-#: mail/mail-component.c:701
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
+#: mail/mail-component.c:704
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Dizinin nerede yaratılacağını belirtin:"
@@ -13292,107 +12799,108 @@ msgstr "Crestview"
 msgid "Folder _name:"
 msgstr "Dizin _adı:"
 
-#: mail/em-folder-tree.c:839
+#: mail/em-folder-tree.c:833
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "%s dizini siliniyor"
 
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree.c:835
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "%s dizini açılıyor"
 
-#: mail/em-folder-tree.c:848 mail/message-list.c:1555
+#: mail/em-folder-tree.c:842 mail/message-list.c:1561
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "İletiler %s'e taşınıyor"
 
-#: mail/em-folder-tree.c:850 mail/message-list.c:1557
+#: mail/em-folder-tree.c:844 mail/message-list.c:1563
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "İletiler %s'e kopyalanıyor"
 
-#: mail/em-folder-tree.c:866
+#: mail/em-folder-tree.c:860
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 
-#: mail/em-folder-tree.c:956 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "Dizine _Kopyala"
 
-#: mail/em-folder-tree.c:957 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "Dizine _Taşı"
 
-#: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2069
-#: mail/em-folder-tree.c:2551 mail/em-folder-view.c:798
-#: mail/message-list.c:1645
+#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
+#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
+#: mail/message-list.c:1651
 #, fuzzy
 msgid "_Move"
 msgstr "Taşı"
 
-#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#: mail/em-folder-tree.c:955 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "Görevi İptal Et"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
 #: mail/em-folder-view.c:798 mail/em-folder-view.c:812
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Dizini seçin"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
 #, fuzzy
 msgid "C_opy"
 msgstr "Kopyala"
 
-#: mail/em-folder-tree.c:2096
+#: mail/em-folder-tree.c:2088
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "'%s' dizinine kaydediliyor"
 
-#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
+#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
 #, fuzzy
 msgid "Create folder"
 msgstr "Yeni bir dizin yarat"
 
-#: mail/em-folder-tree.c:2474
+#: mail/em-folder-tree.c:2463
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "\"%s\" dizinini yeniden adlandır:"
 
-#: mail/em-folder-tree.c:2476
+#: mail/em-folder-tree.c:2465
 #, fuzzy
 msgid "Rename Folder"
 msgstr "Dizini yeniden adlandır"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Göster"
 
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2537
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Yeni Pencerede Aç"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2555
+#: mail/em-folder-tree.c:2546
 msgid "_New Folder..."
 msgstr "_Yeni Dizin..."
 
-#: mail/em-folder-tree.c:2558
+#: mail/em-folder-tree.c:2549
 msgid "_Rename"
 msgstr "_Yeniden adlandır"
 
-#: mail/em-folder-tree.c:2561 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "Ö_zellikler..."
 
 #: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:889
+#: mail/mail-vfolder.c:888
 msgid "VFolders"
 msgstr "VDizin"
 
@@ -13406,19 +12914,19 @@ msgstr ""
 msgid "Inbox"
 msgstr "Gelen"
 
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
 msgid "Loading..."
 msgstr "Yükleniyor..."
 
 #: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
 #: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
 #: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:551
+#: mail/mail-component.c:554
 msgid "Mail"
 msgstr "İleti"
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "Yeni İleti Olarak _Düzenle..."
@@ -13431,17 +12939,17 @@ msgstr "_Yazdır"
 msgid "_Reply to Sender"
 msgstr "_Gönderene Cevapla"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:810
+#: mail/em-folder-view.c:901 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "_Listeye Cevapla"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:811
+#: mail/em-folder-view.c:902 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "_Herkese Cevapla"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: mail/em-folder-view.c:903 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Yönlendir"
@@ -13497,6 +13005,10 @@ msgstr "_Dizine Taşı..."
 msgid "_Copy to Folder..."
 msgstr "D_izine Kopyala..."
 
+#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Etiket"
+
 #: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "_Göndereni Adres Defterine Ekle"
@@ -13547,12 +13059,12 @@ msgid "Filter on _Mailing List"
 msgstr "_E-posta Listesine Göre Filtrele"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
-#: mail/mail-config.glade.h:66
+#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Öntanımlı"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1796
 msgid "Print Message"
 msgstr "İletiyi Yazdır"
 
@@ -13592,12 +13104,18 @@ msgstr "Bilgi"
 msgid "Bcc"
 msgstr "Gizli"
 
+#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
+#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Konu"
+
 #: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
 #: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Tarih"
 
-#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
+#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
 msgid "Newsgroups"
 msgstr ""
 
@@ -13786,7 +13304,7 @@ msgid ""
 "practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:757
+#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
 msgid "_View Certificate"
 msgstr "_Sertifikayı Görüntüle"
 
@@ -13848,7 +13366,7 @@ msgstr "B_ir hafta"
 msgid "Once per month"
 msgstr "Bi_r ay"
 
-#: mail/em-migrate.c:1072
+#: mail/em-migrate.c:1168
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13856,89 +13374,89 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1506
+#: mail/em-migrate.c:1602
 #, fuzzy, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "%s dizini alınamadı: %s"
 
-#: mail/em-migrate.c:1532
+#: mail/em-migrate.c:1628
 #, fuzzy, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr ""
 "Çıkış dosyası yaratılamadı: %s\n"
 " %s"
 
-#: mail/em-migrate.c:1715
+#: mail/em-migrate.c:1811
 #, fuzzy, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr ""
 "Çıkış dosyası yaratılamadı: %s\n"
 " %s"
 
-#: mail/em-migrate.c:1919
+#: mail/em-migrate.c:2015
 #, fuzzy, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "%s için .newsrc dosyası oluşturulamadı: %s"
 
-#: mail/em-migrate.c:1933
+#: mail/em-migrate.c:2029
 #, fuzzy, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "%s iletisi önbelleğe yazılamadı: %s"
 
-#: mail/em-migrate.c:1962
+#: mail/em-migrate.c:2058
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#: mail/em-migrate.c:2413 mail/em-migrate.c:2425
 #, fuzzy, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "%s iletisi önbelleğe yazılamadı: %s"
 
-#: mail/em-migrate.c:2480
+#: mail/em-migrate.c:2576
 #, fuzzy, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr ""
 "Çıkış dosyası yaratılamadı: %s\n"
 " %s"
 
-#: mail/em-migrate.c:2498
+#: mail/em-migrate.c:2594
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 msgstr ""
 
-#: mail/em-popup.c:699
+#: mail/em-popup.c:700
 msgid "Save As..."
 msgstr "Farklı Kaydet..."
 
-#: mail/em-popup.c:717
+#: mail/em-popup.c:718
 #, fuzzy, c-format
 msgid "untitled_image.%s"
 msgstr "Başlıksız İleti"
 
-#: mail/em-popup.c:807
+#: mail/em-popup.c:808
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:809
+#: mail/em-popup.c:810
 msgid "_Reply to sender"
 msgstr "_Gönderene cevapla"
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:859
 msgid "_Open Link in Browser"
 msgstr "_Bağlantıyı Tarayıcıda Aç"
 
-#: mail/em-popup.c:859
+#: mail/em-popup.c:860
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "İletiyi _listeye gönder..."
 
-#: mail/em-popup.c:860
+#: mail/em-popup.c:861
 msgid "_Add to Addressbook"
 msgstr "Adres Defterine Ek_le"
 
-#: mail/em-popup.c:966
+#: mail/em-popup.c:967
 #, c-format
 msgid "Open in %s..."
 msgstr "%s içinde aç..."
@@ -14544,7 +14062,7 @@ msgstr "Evolution e-posta özet bileşeni."
 msgid "Mail Accounts"
 msgstr "E-posta Hesapları"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
 msgid "Mail Preferences"
 msgstr "E-posta Tercihleri"
 
@@ -14557,15 +14075,15 @@ msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution, eski Elm iletilerinizi alıyor"
 
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:226
+#: mail/importers/evolution-mbox-importer.c:221
+#: mail/importers/evolution-outlook-importer.c:255
 #: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Alınıyor..."
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:222
-#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/evolution-mbox-importer.c:223
+#: mail/importers/evolution-outlook-importer.c:257
 #: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Lütfen bekleyiniz"
@@ -14588,23 +14106,25 @@ msgid "Elm"
 msgstr "Elm"
 
 #: mail/importers/evolution-mbox-importer.c:116
+#: mail/importers/evolution-outlook-importer.c:130
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Bu dizini sil"
 
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 #, fuzzy
 msgid "Select folder to import into"
 msgstr "Aktarıcıyı seçin"
 
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:254
 #: mail/importers/mail-importer.c:226
 #, fuzzy, c-format
 msgid "Importing `%s'"
 msgstr "Alınıyor"
 
-#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/evolution-outlook-importer.c:301
 #: mail/importers/mail-importer.c:140
 #, fuzzy
 msgid "Importing mailbox"
@@ -14753,15 +14273,15 @@ msgstr ""
 msgid "%s License Agreement"
 msgstr ""
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
 msgid "_Host:"
 msgstr "_Makina:"
 
-#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
 msgid "User_name:"
 msgstr "_Kullanıcı adı:"
 
-#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
 msgid "_Path:"
 msgstr "_Yol:"
 
@@ -14824,34 +14344,34 @@ msgstr "toplam %d"
 msgid ", %d unread"
 msgstr "%d gönderilmemiş"
 
-#: mail/mail-component.c:653
+#: mail/mail-component.c:656
 msgid "New Mail Message"
 msgstr "Yeni İleti"
 
-#: mail/mail-component.c:654
+#: mail/mail-component.c:657
 msgid "_Mail Message"
 msgstr "_İletiyi Gönder"
 
-#: mail/mail-component.c:655
+#: mail/mail-component.c:658
 msgid "Compose a new mail message"
 msgstr "Yeni bir e-posta hazırla"
 
-#: mail/mail-component.c:661
+#: mail/mail-component.c:664
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Yeni VDizin"
 
-#: mail/mail-component.c:662
+#: mail/mail-component.c:665
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "E-posta Filtreleri"
 
-#: mail/mail-component.c:663
+#: mail/mail-component.c:666
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Yeni bir dizin yarat"
 
-#: mail/mail-component.c:795
+#: mail/mail-component.c:798
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
@@ -14863,7 +14383,7 @@ msgstr "Servis Denetleniyor"
 msgid "Connecting to server..."
 msgstr "Sunucuya bağlantı kuruluyor..."
 
-#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Kimlik"
 
@@ -14878,7 +14398,7 @@ msgstr ""
 "doldurmanıza gerek yoktur. "
 
 #: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid "Receiving Mail"
 msgstr "Alınan İletiler"
 
@@ -14895,7 +14415,7 @@ msgstr ""
 msgid "Please select among the following options"
 msgstr "Lütfen aşağıdaki seçeneklerden birisini seçiniz"
 
-#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr "Gönderilen İletiler"
 
@@ -14908,7 +14428,7 @@ msgstr ""
 "hangi protokolü kullandığınızı bilmiyorsanız sistem yöneticinize, ya da "
 "İnternet servis sağlayıcınıza başvurun."
 
-#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37
 msgid "Account Management"
 msgstr "Hesap Yöneticisi"
 
@@ -14925,251 +14445,255 @@ msgstr ""
 "olacaktır. Lütfenaşağıdaki boşluğa bu hesap için bir ad veriniz. Bu isim, "
 "sadece görüntüleme amaçlı olarak kullanılacaktır."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:2
 #, fuzzy
 msgid " Ch_eck for Supported Types "
 msgstr "_Desteklenen türleri denetle "
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "<b>Preview</b>"
 msgstr "Önizleme"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "(Evolution'un bu sürümünde SSL desteklenmiyor)"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "<b>S_ignatures</b>"
 msgstr "<b>Durum:</b> "
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "<b>_Languages</b>"
 msgstr "<b>Durum:</b> "
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
+msgid "<small>This will make the the filter more reliable, but slower</small>"
+msgstr ""
+
+#: mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "<span weight=\"bold\">Checking for New Mail</span>"
 msgstr "Yeni iletilerin denetlenmesi"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">General</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
 #, fuzzy
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "Gösterilecek Mesaj:"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "Yeni Posta Bildirimi"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Security</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "Gönderilen ve Taslak İletileri"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:34
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:35
 #, fuzzy
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "Ş_ifreli e-posta gönderirken kendime de şifrele"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:36
 msgid "Account Editor"
 msgstr "Hesap Düzenleyici"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:38
 #, fuzzy
 msgid "Add Ne_w Signature..."
 msgstr "Yeni imza ekle..."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Add _Script"
 msgstr "_Betik Ekle"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:40
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr ""
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "_Her zaman karbon kopyala (Cc):"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "_Her zaman gizli karbon kopyala (Bcc): "
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Always _sign outgoing messages when using this account"
 msgstr "Bu _hesabı kullanırken her zaman giden iletileri imzala"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Şi_frelerken her zaman anahtar listemdeki anahtarlara güven"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 #, fuzzy
 msgid "Attach original message"
 msgstr "İletiyi bir dosya ekle"
 
-#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Ek"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:48
 #, fuzzy
 msgid "Automatically _insert smiley images"
 msgstr "_Gülme simgelerini otomatik ekle"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Automatically check for _new mail every"
 msgstr "_Yeni iletilerin denetlenme aralığı: "
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltık (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltık (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Beep w_hen new mail arrives"
 msgstr "_Yeni ileti geldiği zaman biple"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "C_haracter set:"
 msgstr "_Karakter seti:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Ch_eck for Supported Types "
 msgstr "_Desteklenen türleri denetle "
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 #, fuzzy
-msgid "Check _Incoming Mail"
+msgid "Check _incoming mail for junk"
 msgstr "Yeni iletilerin denetlenmesi"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Check spelling while I _type"
 msgstr "_Yazarken imla denetimi yap"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 msgid "Color for _misspelled words:"
 msgstr "_Hatalı yazılan kelimelerin rengi:"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Colors"
 msgstr "_Renkler"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Confirm _when expunging a folder"
 msgstr "_Bir dizini silmeden önce onayla"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -15185,264 +14709,269 @@ msgstr ""
 "\n"
 "Ayarlarınızı kaydetmek için \"Uygula\" düğmesine tıklayın."
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
 msgid "De_fault"
 msgstr "Ö_ntanımlı"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Default character e_ncoding:"
 msgstr "Ö_ntanımlı karakter kodlaması:"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 #, fuzzy
 msgid "Defaults"
 msgstr "Ön_tanımlılar"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 #, fuzzy
 msgid "Do not quote original message"
 msgstr "İleti açılamadı"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "_Toplantı isteklerini imzalama (Outlook uyumluluğu için)"
 
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Tamamlandı"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Drafts _Folder:"
 msgstr "_Taslaklar dizini:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:77
 msgid "Email Accounts"
 msgstr "E-posta Hesapları"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Email _Address:"
 msgstr "_E-posta adresi:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "Empty trash folders on e_xit"
 msgstr "Programdan çı_karken çöp dizinini sil"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "_Sertifika No:"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:81
 msgid "Evolution Account Assistant"
 msgstr "Evolution Hesap Sihirbazı"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:82
 msgid "Execute Command..."
 msgstr "Komut Çalıştır..."
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Fi_xed-width:"
 msgstr "_Eş aralıklı:"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 msgid "Font Properties"
 msgstr "Yazıtipi Özellikleri"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 msgid "Format messages in _HTML"
 msgstr "İ_letileri HTML biçimle"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "HTML Mail"
 msgstr "_HTML İleti"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Headers"
 msgstr "_Başlıklar"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr "_Cevapları renklendir: "
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
 #: mail/mail-config.glade.h:91
+#, fuzzy
+msgid "I_nclude remote tests"
+msgstr "İçer:"
+
+#: mail/mail-config.glade.h:94
 msgid "Inline"
 msgstr "Bağlantılı"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Mail Configuration"
 msgstr "E-posta Yapılandırması"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "Posta Kutusu konumu"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr "İleti Düzenleyici"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 "Not: İlk defa bağlanıncaya kadar size herhangi bir parola sorulmayacaktır."
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Or_ganization:"
 msgstr "_Kurum:"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG _Anahtar Numarası:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "Play sound file when new mail arri_ves"
 msgstr "Y_eni ileti geldiğinde müzik çal"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "Sadece _Bcc alıcıların tanımlı olduğu iletileri gönderirken beni uyar"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Qmail maildir "
 msgstr "Qmail dizini "
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 #, fuzzy
 msgid "Quote original message"
 msgstr "İleti açılamadı"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 #, fuzzy
 msgid "Quoted"
 msgstr "Not"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Re_member password"
 msgstr "Bu parolayı hatırla"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr "_Cevapla:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "Alınan İletiler"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:120
 #, fuzzy
 msgid "Receiving Options"
 msgstr "_Alma Seçenekleri"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
 #, fuzzy
 msgid "Remember _password"
 msgstr "Bu parolayı hatırla"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
 #, fuzzy
 msgid "S_tandard Font:"
 msgstr "_Standart Yazıtipi:"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 #, fuzzy
 msgid "Security"
 msgstr "_Güvenlik"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font"
 msgstr "HTML eşaralıklı yazıtipini seçin"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:126
 msgid "Select HTML fixed width font for printing"
 msgstr "Yazdırma için HTML eşaralıklı yazıtipini seçin"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:127
 msgid "Select HTML variable width font"
 msgstr "HTML değişken aralıklı yazıtipini seçin"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:128
 msgid "Select HTML variable width font for printing"
 msgstr "Yazdırmak için HTML değişken aralıklı yazıtipini seçin"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:129
 #, fuzzy
 msgid "Select..."
 msgstr "_Seç..."
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "İleti Gönderiliyor"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Sent _Messages Folder:"
 msgstr "_Gönderilen iletiler dizini:"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:134
 msgid "Ser_ver requires authentication"
 msgstr "S_unucu kimlik denetimi istiyor"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:135
 msgid "Server _Type: "
 msgstr "Su_nucu Türü: "
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "_Sertifika No:"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:137
 #, fuzzy
 msgid "Signat_ure:"
 msgstr "İmza:"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "Signatures"
 msgstr "İm_zalar"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr "_Dosya adı belirtin"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "Spell Checking"
 msgstr "İmla _Denetimi"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:141
 msgid "Standard Unix mbox"
 msgstr "Standart UNIX posta kutusu dosyası"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "T_erminal Font:"
 msgstr "_Terminal Yazıtipi:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "T_ype: "
 msgstr "Tip:"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -15452,7 +14981,7 @@ msgstr ""
 "kullanılacaktır. \"İsim\" başlığı altında\n"
 "girilen kısım sadece görünüm amaçlıdır."
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
@@ -15462,7 +14991,7 @@ msgstr ""
 "belirtmenizi sağlar. Buradaki liste, sözlüğü sistem kurulan dillerin "
 "oluşturduğu listedir."
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:149
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -15470,15 +14999,11 @@ msgstr ""
 "Bu hesaba erişebileceğiniz bir isim verin.\n"
 "Örneğin: \"İş hesabım\" ya da \"Kişisel\" gibi."
 
-#: mail/mail-config.glade.h:148
-msgid "Use _Daemon"
-msgstr ""
-
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:152
 msgid "V_ariable-width:"
 msgstr "_Değişken genişlik:"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:153
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -15488,92 +15013,88 @@ msgstr ""
 "\n"
 "Devam etmek için \"İleri\" düğmesine tıklayın."
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:158
 msgid "_Add Signature"
 msgstr "_İmza Ekle"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Always load images from the Internet"
 msgstr "_Resimleri her zaman ağdan indir"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Digitally sign outgoing messages (by default)"
 msgstr "Bu _hesabı kullanırken her zaman giden iletileri imzala"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:161
 msgid "_Do not notify me when new mail arrives"
 msgstr "_Yeni ileti geldiğinde beni uyarma"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:163
 msgid "_Enable"
 msgstr "_Etkinleştir"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:165
 msgid "_Forward style:"
 msgstr "Yö_nlendirme türü:"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Load images if sender is in address book"
 msgstr "_Gönderici adres defterinde ise resimleri yükle"
 
-#: mail/mail-config.glade.h:167
-msgid "_Local Tests Only"
-msgstr ""
-
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Make this my default account"
 msgstr "_Bunu öntanımlı hesabım yap"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_Mark messages as read after"
 msgstr "İ_letileri"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Never load images from the Internet"
 msgstr "R_esimleri hiç bir zaman ağdan indirme"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "HTML iletileri istemeyen bağlantılara ileti gönderirken beni _uyar"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:175
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "İ_letileri konusuz gönderirken beni uyar"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:176
 msgid "_Reply style:"
 msgstr "_Cevaplama yöntemi:"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:177
 msgid "_Script:"
 msgstr "_Betik:"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:178
 msgid "_Show animated images"
 msgstr "_Canlandırmalı resimleri göster"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "_Use Secure Connection (SSL):"
 msgstr "_Güvenli bağlantı (SSL) kullan:"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "_Use the same fonts as other applications"
 msgstr "_Diğer uygulamalarla aynı yazıtipini kullan"
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:181
 msgid "color"
 msgstr "rengi ile tanımla"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "açıklama"
 
@@ -15745,7 +15266,7 @@ msgstr ""
 
 #. mail:camel-exception primary
 #: mail/mail-errors.xml.h:57
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgid "Your message with the subject \"{0}\" was not delivered."
 msgstr ""
 
 #. mail:camel-exception secondary
@@ -15811,11 +15332,6 @@ msgstr ""
 msgid "Cannot save to directory \"{0}\"."
 msgstr "%s dizini yaratılamadı: %s"
 
-#. mail:no-save-path secondary
-#: mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail:no-create-path primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
@@ -15840,12 +15356,6 @@ msgstr ""
 msgid "Cannot create temporary save directory."
 msgstr "Geçici dizin yaratılamadı: %s"
 
-#. mail:no-create-tmp-path secondary
-#: mail/mail-errors.xml.h:100 mail/mail-errors.xml.h:112
-#: widgets/misc/e-system-errors.xml.h:11 widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail:no-write-path-exists secondary
 #: mail/mail-errors.xml.h:104
 #, fuzzy
@@ -16113,144 +15623,140 @@ msgstr "Üzerine yaz"
 msgid "_Append"
 msgstr "Aspen"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:785
 #, c-format
 msgid "Pinging %s"
 msgstr "%s adresine ping gönderiliyor"
 
-#: mail/mail-mt.c:897
-msgid "Working"
-msgstr "Çalışıyor"
-
-#: mail/mail-ops.c:99
+#: mail/mail-ops.c:98
 msgid "Filtering Folder"
 msgstr "Dizin filtreleniyor"
 
-#: mail/mail-ops.c:260
+#: mail/mail-ops.c:259
 msgid "Fetching Mail"
 msgstr "İleti Alınıyor"
 
-#: mail/mail-ops.c:543
+#: mail/mail-ops.c:542
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "%s geçici mektup dosyasını oluştururken hata: %s"
 
-#: mail/mail-ops.c:568
+#: mail/mail-ops.c:567
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:577
+#: mail/mail-ops.c:576
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "%s geçici mektup dosyasını oluştururken hata: %s"
 
-#: mail/mail-ops.c:673
+#: mail/mail-ops.c:672
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%d / %d ileti gönderiliyor"
 
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:703
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "İletinin açılmasında hata."
 
-#: mail/mail-ops.c:708
+#: mail/mail-ops.c:707
 msgid "Complete."
 msgstr "Tamamlandı."
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:804
 msgid "Saving message to folder"
 msgstr "İletiler dizine kaydediliyor"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Moving messages to %s"
 msgstr "İletiler %s'e taşınıyor"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Copying messages to %s"
 msgstr "İletiler %s'e kopyalanıyor"
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:1002
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" içinde dizinler taranıyor"
 
-#: mail/mail-ops.c:1116
+#: mail/mail-ops.c:1115
 msgid "Forwarded messages"
 msgstr "Yönlendirilmiş iletiler"
 
-#: mail/mail-ops.c:1159
+#: mail/mail-ops.c:1158
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s dizini açılıyor"
 
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1230
 #, c-format
 msgid "Opening store %s"
 msgstr "%s deposu açılıyor"
 
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1308
 #, c-format
 msgid "Removing folder %s"
 msgstr "%s dizini siliniyor"
 
-#: mail/mail-ops.c:1403
+#: mail/mail-ops.c:1402
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "'%s' dizinine kaydediliyor"
 
-#: mail/mail-ops.c:1468
+#: mail/mail-ops.c:1467
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1469
+#: mail/mail-ops.c:1468
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "'%s' dizinine kaydediliyor"
 
-#: mail/mail-ops.c:1524
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr "Dizin tazeleniyor"
 
-#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
+#: mail/mail-ops.c:1559 mail/mail-ops.c:1610
 msgid "Expunging folder"
 msgstr "Dizin siliniyor"
 
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1607
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1609
+#: mail/mail-ops.c:1608
 msgid "Local Folders"
 msgstr "Yerel Dizinler"
 
-#: mail/mail-ops.c:1692
+#: mail/mail-ops.c:1691
 #, c-format
 msgid "Retrieving message %s"
 msgstr "%s numaralı ileti alınıyor"
 
-#: mail/mail-ops.c:1764
+#: mail/mail-ops.c:1763
 #, fuzzy, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "%d ileti alınıyor"
 msgstr[1] "%d ileti alınıyor"
 
-#: mail/mail-ops.c:1850
+#: mail/mail-ops.c:1849
 #, fuzzy, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "%d ileti kaydediliyor"
 msgstr[1] "%d ileti kaydediliyor"
 
-#: mail/mail-ops.c:1900
+#: mail/mail-ops.c:1899
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -16259,7 +15765,7 @@ msgstr ""
 "Çıkış dosyası yaratılamadı: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1928
+#: mail/mail-ops.c:1927
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -16268,11 +15774,11 @@ msgstr ""
 "İletilerin kaydında hata: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1999
+#: mail/mail-ops.c:1998
 msgid "Saving attachment"
 msgstr "Ek kaydediliyor"
 
-#: mail/mail-ops.c:2016
+#: mail/mail-ops.c:2015
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -16281,17 +15787,17 @@ msgstr ""
 "Çıkış dosyası yaratılamadı: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2046
+#: mail/mail-ops.c:2045
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Veri yazılamadı: %s."
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s bağlantısı kesiliyor"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s adresine bağlantı kuruluyor"
@@ -16355,24 +15861,24 @@ msgstr "Güncelleniyor..."
 msgid "Waiting..."
 msgstr "Bekleniyor..."
 
-#: mail/mail-session.c:238
+#: mail/mail-session.c:239
 msgid "User canceled operation."
 msgstr "Kullanıcı işlemi iptal etti."
 
-#: mail/mail-session.c:271
+#: mail/mail-session.c:272
 #, c-format
 msgid "Enter Password for %s"
 msgstr "%s İçin Parolayı Girin"
 
-#: mail/mail-session.c:273
+#: mail/mail-session.c:274
 msgid "Enter Password"
 msgstr "Parolayı Girin"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password"
 msgstr "_Bu parolayı hatırla"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:298
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Bu oturumun sonuna kadar girilen parolayı hatırla"
 
@@ -16429,79 +15935,79 @@ msgstr "\"%s\" içinde dizinler taranıyor"
 msgid "Updating vFolders for '%s'"
 msgstr "\"%s\" içinde dizinler taranıyor"
 
-#: mail/mail-vfolder.c:959
+#: mail/mail-vfolder.c:958
 msgid "vFolders"
 msgstr "vDizinler"
 
-#: mail/mail-vfolder.c:998
+#: mail/mail-vfolder.c:997
 msgid "Edit VFolder"
 msgstr "VDizin Düzenle"
 
-#: mail/mail-vfolder.c:1082
+#: mail/mail-vfolder.c:1081
 msgid "New VFolder"
 msgstr "Yeni VDizin"
 
-#: mail/message-list.c:946
+#: mail/message-list.c:948
 msgid "Unseen"
 msgstr "Görünmeyen"
 
-#: mail/message-list.c:947
+#: mail/message-list.c:949
 msgid "Seen"
 msgstr "Görünen"
 
-#: mail/message-list.c:948
+#: mail/message-list.c:950
 msgid "Answered"
 msgstr "Cevaplanan"
 
-#: mail/message-list.c:949
+#: mail/message-list.c:951
 msgid "Multiple Unseen Messages"
 msgstr "Çoklu Görülmeyen İleti"
 
-#: mail/message-list.c:950
+#: mail/message-list.c:952
 msgid "Multiple Messages"
 msgstr "Çoklu İletiler"
 
-#: mail/message-list.c:954
+#: mail/message-list.c:956
 msgid "Lowest"
 msgstr "En Düşük"
 
-#: mail/message-list.c:955
+#: mail/message-list.c:957
 msgid "Lower"
 msgstr "Düşük"
 
-#: mail/message-list.c:959
+#: mail/message-list.c:961
 msgid "Higher"
 msgstr "Yüksek"
 
-#: mail/message-list.c:960
+#: mail/message-list.c:962
 msgid "Highest"
 msgstr "En Yüksek"
 
-#: mail/message-list.c:1279
+#: mail/message-list.c:1285
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1286
+#: mail/message-list.c:1292
 msgid "Today %l:%M %p"
 msgstr "Bugün %l:%M %p"
 
-#: mail/message-list.c:1295
+#: mail/message-list.c:1301
 msgid "Yesterday %l:%M %p"
 msgstr "Dün %l:%M %p"
 
-#: mail/message-list.c:1307
+#: mail/message-list.c:1313
 msgid "%a %l:%M %p"
 msgstr "%a %l %M %p"
 
-#: mail/message-list.c:1315
+#: mail/message-list.c:1321
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: mail/message-list.c:1317
+#: mail/message-list.c:1323
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:3300
+#: mail/message-list.c:3321
 msgid "Generating message list"
 msgstr "İleti listesi oluşturuluyor"
 
@@ -16558,6 +16064,10 @@ msgstr "Yönlendir"
 msgid "No Response Necessary"
 msgstr "Cevaba Gerek Yok"
 
+#: mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Oku"
+
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Cevapla"
@@ -16661,45 +16171,49 @@ msgid ""
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:10
-msgid "Whether Evolution should start up in offline mode"
+msgid "Toolbar is visible"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:11
-msgid "Whether to skip the development warning dialog"
+msgid "Whether Evolution should start up in offline mode"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Whether the toolbar should be visible."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:14
 #, fuzzy
 msgid "mail"
 msgstr "E-posta"
 
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
-msgstr "Yazarlar"
-
-#: shell/e-shell.c:545 shell/e-shell.c:546
+#: shell/e-shell.c:588 shell/e-shell.c:589
 #, fuzzy, c-format
 msgid "%ld KB"
 msgstr "%d %B"
 
-#: shell/e-shell.c:744
+#: shell/e-shell.c:786
 #, fuzzy
 msgid "Uknown system error."
 msgstr "Bilinmeyen hata"
 
-#: shell/e-shell.c:1101
+#: shell/e-shell.c:1143
 msgid "Invalid arguments"
 msgstr "Geçersiz argümanlar"
 
-#: shell/e-shell.c:1103
+#: shell/e-shell.c:1145
 msgid "Cannot register on OAF"
 msgstr "OAF'a kayıt yapılamadı"
 
-#: shell/e-shell.c:1105
+#: shell/e-shell.c:1147
 msgid "Configuration Database not found"
 msgstr "Yapılandırma Veritabanı bulunamadı"
 
-#: shell/e-shell.c:1107
+#: shell/e-shell.c:1149
 msgid "Generic error"
 msgstr "Genel hata"
 
@@ -16755,7 +16269,7 @@ msgstr ""
 msgid "Select importer"
 msgstr "Aktarıcıyı seçin"
 
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1026
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
 #, c-format
 msgid "File %s does not exist"
 msgstr "%s dosyası bulunamadı."
@@ -16783,35 +16297,35 @@ msgstr ""
 "%s alınıyor\n"
 "1. öğe alınıyor."
 
-#: shell/e-shell-importer.c:549
+#: shell/e-shell-importer.c:570
 msgid "Automatic"
 msgstr "Otomatik"
 
-#: shell/e-shell-importer.c:598
+#: shell/e-shell-importer.c:626
 #, fuzzy
-msgid "_Filename:"
+msgid "F_ilename:"
 msgstr "Dosya adı:"
 
-#: shell/e-shell-importer.c:603
+#: shell/e-shell-importer.c:631
 msgid "Select a file"
 msgstr "Bir dosya seçin"
 
-#: shell/e-shell-importer.c:613
+#: shell/e-shell-importer.c:642
 #, fuzzy
 msgid "File _type:"
 msgstr "Dosya türü:"
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:681
 #, fuzzy
 msgid "Import data and settings from _older programs"
 msgstr "Eski programlardan veri ve ayarları aktar"
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:684
 #, fuzzy
 msgid "Import a _single file"
 msgstr "Sadece tek bir dosya aktar"
 
-#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -16819,26 +16333,26 @@ msgstr ""
 "Lütfen bekleyiniz...\n"
 "Mevcut ayarlar aranıyor"
 
-#: shell/e-shell-importer.c:727
+#: shell/e-shell-importer.c:756
 msgid "Starting Intelligent Importers"
 msgstr "Akıllı Aktarımcılar Başlatılıyor"
 
-#: shell/e-shell-importer.c:853 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
 #, c-format
 msgid "From %s:"
 msgstr "%s bilgileri: "
 
-#: shell/e-shell-importer.c:1044
+#: shell/e-shell-importer.c:1073
 #, fuzzy, c-format
 msgid "No importer available for file %s"
 msgstr "`%s' protokolü için alıcı yok"
 
-#: shell/e-shell-importer.c:1056
+#: shell/e-shell-importer.c:1085
 #, fuzzy
 msgid "Unable to execute importer"
 msgstr "gpg çalıştırılamadı."
 
-#: shell/e-shell-importer.c:1169
+#: shell/e-shell-importer.c:1199
 #, fuzzy
 msgid "_Import"
 msgstr "Aktar"
@@ -16884,61 +16398,61 @@ msgstr "Dizin adı içinde \"#\" karakteri bulunamaz."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' ve '..' dizin isimleri için ayrılmıştır."
 
-#: shell/e-shell-window.c:336
+#: shell/e-shell-window.c:337
 #, fuzzy
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution çevrimiçi çlışıyor. Bu düğmeye tıklayarak çevrimdışı "
 "çalışmasını sağlayın."
 
-#: shell/e-shell-window.c:343
+#: shell/e-shell-window.c:344
 #, fuzzy
 msgid "Evolution is in the process of going offline."
 msgstr "Ximian Evolution çevrimdışı çalışmak üzere hazırlanıyor."
 
-#: shell/e-shell-window.c:349
+#: shell/e-shell-window.c:350
 #, fuzzy
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution çevrimdışı çalışıyor. Bu düğmeye tıklayarak çevrimiçi "
 "çalışmasını sağlayın."
 
-#: shell/e-shell-window.c:621
+#: shell/e-shell-window.c:637
 #, fuzzy, c-format
 msgid "Switch to %s"
 msgstr "%s adresine postala"
 
-#: shell/e-shell-window-commands.c:64
+#: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Bu sistemde GNOME Pilot araçları kurulu değil."
 
-#: shell/e-shell-window-commands.c:72
+#: shell/e-shell-window-commands.c:74
 #, c-format
 msgid "Error executing %s."
 msgstr "%s çalıştırırken bir hata oldu."
 
-#: shell/e-shell-window-commands.c:121
+#: shell/e-shell-window-commands.c:123
 msgid "Bug buddy is not installed."
 msgstr "Bug-buddy sistemde kurulu değil."
 
-#: shell/e-shell-window-commands.c:129
+#: shell/e-shell-window-commands.c:131
 msgid "Bug buddy could not be run."
 msgstr "Bug-buddy çalıştırılamadı."
 
-#: shell/e-shell-window-commands.c:171
+#: shell/e-shell-window-commands.c:323
 #, fuzzy
-msgid "About Evolution"
-msgstr "Ximian Evolution Hakkında"
+msgid "Groupware Suite"
+msgstr "Grup"
 
-#: shell/e-shell-window-commands.c:382
+#: shell/e-shell-window-commands.c:563
 msgid "_Work Online"
 msgstr "Ç_evrimiçi Çalış"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "Çe_vrimdışı Çalış"
 
-#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Çevrimdışı Çalış"
 
@@ -16950,43 +16464,6 @@ msgstr "Denetim kutusu"
 msgid "New"
 msgstr "Yeni"
 
-#: shell/evolution-shell-component-utils.c:115
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Bilinmeyen hata."
-
-#: shell/evolution-shell-component-utils.c:118
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Bileşen sisteminden gelen hata:\n"
-"%s"
-
-#: shell/evolution-shell-component-utils.c:125
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Etkinleştirme sisteminden gelen mesaj:\n"
-"%s"
-
 #: shell/evolution-test-component.c:140
 #, fuzzy
 msgid "New Test"
@@ -17304,34 +16781,34 @@ msgid ""
 "Click help for details."
 msgstr ""
 
-#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:522
+#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
+#: smime/gui/certificate-manager.c:556
 #, fuzzy
 msgid "Select a cert to import..."
 msgstr "Aktarıcıyı seçin"
 
-#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:604
+#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
+#: smime/gui/certificate-manager.c:638
 #, fuzzy
 msgid "Certificate Name"
 msgstr "_Sertifika No:"
 
-#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
+#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
 #, fuzzy
 msgid "Purposes"
 msgstr "İşlem"
 
-#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:517
+#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:267
+#: smime/gui/certificate-manager.c:271
 #, fuzzy
 msgid "Expires"
 msgstr "Deyim"
 
-#: smime/gui/certificate-manager.c:417
+#: smime/gui/certificate-manager.c:446
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "E-posta Adresi:"
@@ -17374,6 +16851,11 @@ msgid ""
 "  Subject: %s\n"
 msgstr ""
 
+#: smime/gui/e-cert-selector.c:169
+#, fuzzy
+msgid "Select certificate"
+msgstr "Belirli bir tarihe git"
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -17436,7 +16918,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
 #, fuzzy
 msgid "Certificate"
 msgstr "_Sertifika No:"
@@ -17461,20 +16943,24 @@ msgstr "Ortak İsim"
 msgid "Contact Certificates"
 msgstr "_Sertifika No:"
 
-#: smime/gui/smime-ui.glade.h:21
-#, no-c-format
-msgid "Do you want to trust \"%s\" for the following purposes?"
+#: smime/gui/smime-ui.glade.h:20
+msgid "Do not trust the authenticity of this certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:21
 msgid "Dummy window only"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:22
 #, fuzzy
 msgid "Edit"
 msgstr "_Düzenle"
 
+#: smime/gui/smime-ui.glade.h:23
+#, fuzzy
+msgid "Email Certificate Trust Settings"
+msgstr "Geçersiz Sertifika Otoritesi (CA)"
+
 #: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr ""
@@ -17511,277 +16997,286 @@ msgstr "Bölüm"
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:37
-msgid "Trust this CA to identify email users."
+msgid "Trust the authenticity of this certificate"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:38
-msgid "Trust this CA to identify software developers."
+msgid "Trust this CA to identify email users."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:39
-msgid "Trust this CA to identify web sites."
+msgid "Trust this CA to identify software developers."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:40
-#, fuzzy
-msgid "View"
-msgstr "_Göster"
+msgid "Trust this CA to identify web sites."
+msgstr ""
 
 #: smime/gui/smime-ui.glade.h:41
 #, fuzzy
-msgid "View Certificate"
-msgstr "_Sertifika No:"
+msgid "View"
+msgstr "_Göster"
 
 #: smime/gui/smime-ui.glade.h:42
-#, fuzzy
-msgid "You have been asked to trust a new Certificate Authority (CA)."
-msgstr "Geçersiz Sertifika Otoritesi (CA)"
-
-#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:44
+#: smime/gui/smime-ui.glade.h:43
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:45
+#: smime/gui/smime-ui.glade.h:44
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:46
+#: smime/gui/smime-ui.glade.h:45
 #, fuzzy
 msgid "Your Certificates"
 msgstr "_Sertifika No:"
 
-#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
+#: smime/gui/smime-ui.glade.h:46
+msgid "_Edit CA Trust"
+msgstr ""
+
+#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 #, fuzzy
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
-#: smime/lib/e-cert.c:478
+#. x509 certificate usage types
+#: smime/lib/e-cert.c:424
+#, fuzzy
+msgid "Sign"
+msgstr "Stauning"
+
+#: smime/lib/e-cert.c:425
+#, fuzzy
+msgid "Encrypt"
+msgstr "Şifrelenmiş"
+
+#: smime/lib/e-cert.c:530
 #, fuzzy
 msgid "Version"
 msgstr "Vermont"
 
-#: smime/lib/e-cert.c:493
+#: smime/lib/e-cert.c:545
 #, fuzzy
 msgid "Version 1"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:496
+#: smime/lib/e-cert.c:548
 #, fuzzy
 msgid "Version 2"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:499
+#: smime/lib/e-cert.c:551
 #, fuzzy
 msgid "Version 3"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:581
+#: smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:584
+#: smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:587
+#: smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:590
+#: smime/lib/e-cert.c:642
 msgid "C"
 msgstr "C"
 
-#: smime/lib/e-cert.c:593
+#: smime/lib/e-cert.c:645
 msgid "CN"
 msgstr "CN"
 
-#: smime/lib/e-cert.c:596
+#: smime/lib/e-cert.c:648
 msgid "OU"
 msgstr ""
 
-#: smime/lib/e-cert.c:599
+#: smime/lib/e-cert.c:651
 msgid "O"
 msgstr "O"
 
-#: smime/lib/e-cert.c:602
+#: smime/lib/e-cert.c:654
 msgid "L"
 msgstr ""
 
-#: smime/lib/e-cert.c:605
+#: smime/lib/e-cert.c:657
 msgid "DN"
 msgstr "DN"
 
-#: smime/lib/e-cert.c:608
+#: smime/lib/e-cert.c:660
 msgid "DC"
 msgstr ""
 
-#: smime/lib/e-cert.c:611
+#: smime/lib/e-cert.c:663
 msgid "ST"
 msgstr "ST"
 
-#: smime/lib/e-cert.c:614
+#: smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:617
+#: smime/lib/e-cert.c:669
 #, fuzzy
 msgid "Certificate Key Usage"
 msgstr "Sertifika reddedildi"
 
-#: smime/lib/e-cert.c:620
+#: smime/lib/e-cert.c:672
 msgid "Netscape Certificate Type"
 msgstr ""
 
-#: smime/lib/e-cert.c:623
+#: smime/lib/e-cert.c:675
 #, fuzzy
 msgid "Certificate Authority Key Identifier"
 msgstr "Sertifika Otoritesi Güvenilir Değil"
 
-#: smime/lib/e-cert.c:626
+#: smime/lib/e-cert.c:678
 #, fuzzy
 msgid "UID"
 msgstr "ID"
 
-#: smime/lib/e-cert.c:635
+#: smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr ""
 
-#: smime/lib/e-cert.c:686
+#: smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:694
+#: smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
 msgstr ""
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:768
 #, fuzzy
 msgid "Subject Public Key Info"
 msgstr ""
 "\n"
 "Genel Anahtar: "
 
-#: smime/lib/e-cert.c:721
+#: smime/lib/e-cert.c:773
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:736
+#: smime/lib/e-cert.c:788
 #, fuzzy
 msgid "Subject's Public Key"
 msgstr "Konu: %s"
 
-#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
+#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
 #, fuzzy
 msgid "Error: Unable to process extension"
 msgstr "Spool dizini işlenemedi"
 
-#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
+#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:782
+#: smime/lib/e-cert.c:834
 #, fuzzy
 msgid "SSL Certificate Authority"
 msgstr "Geçersiz Sertifika Otoritesi (CA)"
 
-#: smime/lib/e-cert.c:786
+#: smime/lib/e-cert.c:838
 #, fuzzy
 msgid "Email Certificate Authority"
 msgstr "Geçersiz Sertifika Otoritesi (CA)"
 
-#: smime/lib/e-cert.c:814
+#: smime/lib/e-cert.c:866
 #, fuzzy
 msgid "Signing"
 msgstr "Stauning"
 
-#: smime/lib/e-cert.c:818
+#: smime/lib/e-cert.c:870
 #, fuzzy
 msgid "Non-repudiation"
 msgstr "Bilgi Yok"
 
-#: smime/lib/e-cert.c:822
+#: smime/lib/e-cert.c:874
 msgid "Key Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:826
+#: smime/lib/e-cert.c:878
 #, fuzzy
 msgid "Data Encipherment"
 msgstr "ek"
 
-#: smime/lib/e-cert.c:830
+#: smime/lib/e-cert.c:882
 msgid "Key Agreement"
 msgstr ""
 
-#: smime/lib/e-cert.c:834
+#: smime/lib/e-cert.c:886
 #, fuzzy
 msgid "Certificate Signer"
 msgstr "Sertifika imza hatası"
 
-#: smime/lib/e-cert.c:838
+#: smime/lib/e-cert.c:890
 msgid "CRL Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:938
 #, fuzzy
 msgid "Critical"
 msgstr "Curitiba"
 
-#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
+#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
 #, fuzzy
 msgid "Not Critical"
 msgstr "North Carolina"
 
-#: smime/lib/e-cert.c:912
+#: smime/lib/e-cert.c:964
 #, fuzzy
 msgid "Extensions"
 msgstr "Deyim"
 
-#: smime/lib/e-cert.c:983
+#: smime/lib/e-cert.c:1035
 #, fuzzy, c-format
 msgid "%s = %s"
 msgstr "%s sunucu %s"
 
-#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
 #, fuzzy
 msgid "Certificate Signature Algorithm"
 msgstr "Sertifika imza hatası"
 
-#: smime/lib/e-cert.c:1048
+#: smime/lib/e-cert.c:1100
 #, fuzzy
 msgid "Issuer"
 msgstr "_Ekle"
 
-#: smime/lib/e-cert.c:1102
+#: smime/lib/e-cert.c:1154
 msgid "Issuer Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1121
+#: smime/lib/e-cert.c:1173
 #, fuzzy
 msgid "Subject Unique ID"
 msgstr "Konu: %s"
 
-#: smime/lib/e-cert.c:1164
+#: smime/lib/e-cert.c:1216
 #, fuzzy
 msgid "Certificate Signature Value"
 msgstr "Sertifika imza hatası"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
+#: smime/lib/e-cert-db.c:608
 #, fuzzy
 msgid "Certificate already exists"
 msgstr "Bu kart numarası var"
@@ -17931,7 +17426,7 @@ msgstr ""
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "_Eylemler"
 
@@ -18099,7 +17594,7 @@ msgstr "_Kapat"
 #: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:3
+#: ui/evolution.xml.h:4
 msgid "Close"
 msgstr "Kapat"
 
@@ -18112,7 +17607,7 @@ msgid "Delete this item"
 msgstr "Bu öğeyi sil"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr "Ana araç çubuğu"
 
@@ -18156,7 +17651,7 @@ msgstr "Bu öğeyi diske kaydet"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:44
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "_File"
 msgstr "_Dosya"
 
@@ -18418,13 +17913,13 @@ msgstr "S_eçimi Tersine Çevir"
 msgid "_Threaded Message List"
 msgstr "_Konumlandırılan İleti Listesi"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Bu pencereyi kapat"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "_Close"
 msgstr "_Kapat"
 
@@ -18842,7 +18337,7 @@ msgstr "Ö_nceki İleti"
 msgid "_Quoted"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
 msgid "_Tools"
 msgstr "_Araçlar"
 
@@ -19146,109 +18641,123 @@ msgid "_Open Task"
 msgstr "_Görev"
 
 #: ui/evolution.xml.h:1
-msgid "About Ximian Evolution..."
-msgstr "Ximian Evolution Hakkında..."
+#, fuzzy
+msgid "About Evolution..."
+msgstr "Ximian Evolution Hakkında"
 
 #: ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
 msgstr "Evolution ayarlarını değiştir"
 
-#: ui/evolution.xml.h:5
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the visibility of the toolbar"
+msgstr "Bu dizinin özelliklerini değiştir"
+
+#: ui/evolution.xml.h:6
 msgid "Create a new window displaying this folder"
 msgstr "Bu dizini içeren yeni bir pencere oluştur"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "Çı_k"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Ximian Evolution _SSS"
+
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Programdan çık"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:10
 msgid "Forget _Passwords"
 msgstr "Parolaları _Unut"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:11
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Bilinen parolaları unut (tüm parolaları yeniden girmeniz gerekecektir)"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:12
 msgid "Import data from other programs"
 msgstr "Diğer programlardan veri al"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:14
 #, fuzzy
 msgid "New _Window"
 msgstr "_Pencere"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Pi_lot Settings..."
 msgstr "_Pilot Ayarları..."
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Send / Receive"
 msgstr "Al / Gönder"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 #, fuzzy
 msgid "Send queued items and retrieve new items"
 msgstr "Kuyruktaki iletileri gönder ve yeni iletileri al"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Set up Pilot configuration"
 msgstr "Pilot ayarlarını düzenle"
 
-#: ui/evolution.xml.h:17
-msgid "Show information about Ximian Evolution"
+#: ui/evolution.xml.h:19
+#, fuzzy
+msgid "Show information about Evolution"
 msgstr "Ximian Evolution hakkında bilgi ver"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:20
 msgid "Submit Bug Report"
 msgstr "Hata Raporu Gönder"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:21
 msgid "Submit _Bug Report"
 msgstr "_Hata Raporu Gönder"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Bug Buddy kullanarak bir hata raporu gönderin"
 
-#: ui/evolution.xml.h:21
-msgid "Toggle whether we are working offline."
-msgstr "Çevrimiçi/çevrimdışı çalış."
-
 #: ui/evolution.xml.h:23
-msgid "Ximian Evolution _FAQ"
-msgstr "Ximian Evolution _SSS"
+#, fuzzy
+msgid "T_oolbar"
+msgstr "Ana araç çubuğu"
 
 #: ui/evolution.xml.h:24
-msgid "_About Ximian Evolution..."
-msgstr "Ximian _Evolution Hakkında..."
+msgid "Toggle whether we are working offline."
+msgstr "Çevrimiçi/çevrimdışı çalış."
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "_About Evolution..."
+msgstr "Ximian Evolution Hakkında"
+
+#: ui/evolution.xml.h:30
 msgid "_Help"
 msgstr "_Yardım"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "_Import..."
 msgstr "_Al..."
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "_New"
 msgstr "_Yeni"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 #, fuzzy
 msgid "_Quick Reference"
 msgstr "E-posta Tercihleri"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_Send / Receive"
 msgstr "_Gönder / Al"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 #, fuzzy
 msgid "_Window"
 msgstr "_Pencere"
@@ -19324,7 +18833,7 @@ msgid "With _Status"
 msgstr "Durum belirt"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:626
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:635
 msgid "UTC"
 msgstr "UTC"
 
@@ -19480,29 +18989,29 @@ msgstr "Diğer..."
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
-#: widgets/misc/e-error.c:121
+#: widgets/misc/e-error.c:79 widgets/misc/e-error.c:80
+#: widgets/misc/e-error.c:122
 msgid "Evolution Error"
 msgstr "Evolution Hatası"
 
-#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
-#: widgets/misc/e-error.c:119
+#: widgets/misc/e-error.c:81 widgets/misc/e-error.c:82
+#: widgets/misc/e-error.c:120
 #, fuzzy
 msgid "Evolution Warning"
 msgstr "Evolution"
 
-#: widgets/misc/e-error.c:118
+#: widgets/misc/e-error.c:119
 #, fuzzy
 msgid "Evolution Information"
 msgstr "Toplantı Bilgisi"
 
-#: widgets/misc/e-error.c:120
+#: widgets/misc/e-error.c:121
 #, fuzzy
 msgid "Evolution Query"
 msgstr "Evolution"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:410
+#: widgets/misc/e-error.c:415
 #, fuzzy, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -19655,16 +19164,474 @@ msgstr ""
 "İleti alınamadı: %s\n"
 "  %s"
 
-#: widgets/misc/e-task-widget.c:211
+#: widgets/misc/e-task-widget.c:212
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: widgets/misc/e-task-widget.c:216
+#: widgets/misc/e-task-widget.c:217
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%%%d tamamlandı)"
 
+#~ msgid "Failed to connect to LDAP server"
+#~ msgstr "LDAP sunucuyla bağlantı başarısız oldu"
+
+#~ msgid "Failed to authenticate with LDAP server"
+#~ msgstr "LDAP sunucuyla kimlik denetimi başarısız oldu"
+
+#~ msgid "Could not perform query on Root DSE"
+#~ msgstr "Root DSE üzerinde tarama yapılamadı"
+
+#~ msgid "The server responded with no supported search bases"
+#~ msgstr "Sunucunun cevabında desteklenen bir arama tabanı bulunamadı"
+
+#~ msgid "This server does not support LDAPv3 schema information"
+#~ msgstr "Sunucu LDAPv3 şema bilgisini desteklemiyor"
+
+#~ msgid "Error retrieving schema information"
+#~ msgstr "Şema bilgisini yüklerken hata oluştu"
+
+#~ msgid "Server did not respond with valid schema information"
+#~ msgstr "Sunucu geçerli bir şema bilgisi cevabı vermedi"
+
+#~ msgid "  S_how Supported Bases "
+#~ msgstr "_Desteklenen Türleri Denetle "
+
+#~ msgid "1:00"
+#~ msgstr "1:00"
+
+#~ msgid "5:00"
+#~ msgstr "5:00"
+
+#~ msgid "Connecting"
+#~ msgstr "Bağlantı"
+
+#~ msgid "Distinguished _name:"
+#~ msgstr "_DN:"
+
+#~ msgid "Email address:"
+#~ msgstr "E-posta adresi:"
+
+#~ msgid "One"
+#~ msgstr "Biri"
+
+#~ msgid "Searching"
+#~ msgstr "Arama"
+
+#~ msgid "U_se SSL/TLS:"
+#~ msgstr "_SSL/TLS kullan:"
+
+#~ msgid "_Display name:"
+#~ msgstr "_Görüntülenecek isim:"
+
+#~ msgid "_Port number:"
+#~ msgstr "_Port numarası:"
+
+#~ msgid "_Search base:"
+#~ msgstr "_Arama tabanı:"
+
+#~ msgid "_Server name:"
+#~ msgstr "_Sunucu adı:"
+
+#~ msgid "_Timeout (minutes):"
+#~ msgstr "_Zaman aşımı süresi (dakika):"
+
+#~ msgid "connecting-tab"
+#~ msgstr "bağlantı-sekmesi"
+
+#~ msgid "general-tab"
+#~ msgstr "genel-sekme"
+
+#~ msgid "searching-tab"
+#~ msgstr "arama sekmesi"
+
+#, fuzzy
+#~ msgid "Job title:"
+#~ msgstr "_Meslek tanımı:"
+
+#, fuzzy
+#~ msgid "Webcam:"
+#~ msgstr "Web Sayfası:"
+
+#~ msgid "Category editor not available."
+#~ msgstr "Kategori düzenleyici bulunamadı."
+
+#, fuzzy
+#~ msgid ""
+#~ "The following entries are invalid:\n"
+#~ "\n"
+#~ msgstr "Halen aşağıdaki bağlantılar etkin durumda:"
+
+#~ msgid "Could not find widget for a field: `%s'"
+#~ msgstr "Bir alan için parçacık bulunamadı: `%s'"
+
+#~ msgid "Do you want to save changes?"
+#~ msgstr "Değişiklikleri kaydetmek istiyor musunuz?"
+
+#~ msgid "Error saving %s: %s"
+#~ msgstr "%s kaydedilirken hata: %s"
+
+#, fuzzy
+#~ msgid "Can not load URI"
+#~ msgstr "Kart bulunamadı"
+
+#, fuzzy
+#~ msgid "Calendar Properties"
+#~ msgstr "Takvim Grubu"
+
+#, fuzzy
+#~ msgid "Remote"
+#~ msgstr "Sil"
+
+#, fuzzy
+#~ msgid "Task List Properties"
+#~ msgstr "Görev Listesi Grubu"
+
+#, fuzzy
+#~ msgid "_Refresh Interval:"
+#~ msgstr "_Listeyi Tazele "
+
+#, fuzzy
+#~ msgid "_Source URL:"
+#~ msgstr "POP Kaynak URI adresi"
+
+#~ msgid "Are you sure you want to cancel and delete this meeting?"
+#~ msgstr "Gerçekten bu toplantıyı iptal edip silmek istiyor musunuz?"
+
+#~ msgid "Are you sure you want to cancel and delete this task?"
+#~ msgstr "Gerçekten bu görevi iptal edip silmek istiyor musunuz?"
+
+#~ msgid "Are you sure you want to delete the appointment `%s'?"
+#~ msgstr "Gerçekten '%s' randevusunu silmek istiyor musunuz?"
+
+#~ msgid "Are you sure you want to delete this untitled appointment?"
+#~ msgstr "Gerçekten bu randevuyu silmek istiyor musunuz?"
+
+#~ msgid "Are you sure you want to delete the task `%s'?"
+#~ msgstr "Gerçekten %s görevini silmek istiyor musunuz?"
+
+#~ msgid "Are you sure you want to delete this untitled task?"
+#~ msgstr "Gerçekten bu görevi silmek istiyor musunuz?"
+
+#~ msgid "Are you sure you want to delete the journal entry `%s'?"
+#~ msgstr "`%s' başlıksız günlük girdisini silmek istiyor musunuz?"
+
+#~ msgid "Are you sure want to delete this untitled journal entry?"
+#~ msgstr "Bu başlıksız günlük girdisini silmek istiyor musunuz?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d appointment?"
+#~ msgid_plural "Are you sure you want to delete %d appointments?"
+#~ msgstr[0] "Gerçekten %d randevuyu silmek istiyor musunuz?"
+#~ msgstr[1] "Gerçekten %d randevuyu silmek istiyor musunuz?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d task?"
+#~ msgid_plural "Are you sure you want to delete %d tasks?"
+#~ msgstr[0] "Gerçekten %d görevi silmek istiyor musunuz?"
+#~ msgstr[1] "Gerçekten %d görevi silmek istiyor musunuz?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d journal entry?"
+#~ msgid_plural "Are you sure you want to delete %d journal entries?"
+#~ msgstr[0] "Gerçekten %d günlük girdisini silmek istiyor musunuz?"
+#~ msgstr[1] "Gerçekten %d günlük girdisini silmek istiyor musunuz?"
+
+#~ msgid "_Invite Others..."
+#~ msgstr "_Başkalarını Davet Et..."
+
+#~ msgid ""
+#~ "This event has been changed, but has not been saved.\n"
+#~ "\n"
+#~ "Do you wish to save your changes?"
+#~ msgstr ""
+#~ "Bu olay değiştirildi, ancak kaydedilmedi.\n"
+#~ "\n"
+#~ "Değişiklikleri kaydetmek istiyor musunuz?"
+
+#~ msgid "_Discard Changes"
+#~ msgstr "_Değişiklikleri Sil"
+
+#~ msgid "Save Event"
+#~ msgstr "Olayı Kaydet"
+
+#~ msgid "The meeting information has been created. Send it?"
+#~ msgstr "Toplantı bilgisi oluşturuldu. Gönderilsin mi?"
+
+#~ msgid "The meeting information has changed. Send an updated version?"
+#~ msgstr "Toplantı bilgisi değiştirildi. Güncel bir sürümü gönderilsin mi?"
+
+#~ msgid "The task assignment information has been created. Send it?"
+#~ msgstr "Görev bilgisi oluşturuldu. Gönderilsin mi?"
+
+#~ msgid "The task information has changed. Send an updated version?"
+#~ msgstr "Görev bilgisi değiştirildi. Güncel bir sürümü gönderilsin mi?"
+
+#, fuzzy
+#~ msgid "Could not get article %s from NNTP server"
+#~ msgstr "Sunucudan grup listesi alınamadı."
+
+#, fuzzy
+#~ msgid "Error posting message: %s: message not posted"
+#~ msgstr ""
+#~ "İletilerin otomatik kaydında hata: %s\n"
+#~ " %s"
+
+#, fuzzy
+#~ msgid "Stream error"
+#~ msgstr "ayrıştırma hatası"
+
+#, fuzzy
+#~ msgid "Connection error: %s"
+#~ msgstr "Bilinmeyen hata: %s"
+
+#~ msgid "Could not get group: %s"
+#~ msgstr "Grup alınamadı: %s"
+
+#, fuzzy
+#~ msgid "Could not get messages: unspecified error"
+#~ msgstr "İleti alınamadı: %s"
+
+#~ msgid "Unknown server response: %s"
+#~ msgstr "Bilinmeyen sunucu cevabı: %s"
+
+#, fuzzy
+#~ msgid "Adjust Score"
+#~ msgstr "Puan Belirt"
+
+#~ msgid "Assign Color"
+#~ msgstr "Renk Belirle"
+
+#~ msgid "Assign Score"
+#~ msgstr "Puan Belirt"
+
+#~ msgid "Attachments"
+#~ msgstr "Ekler"
+
+#~ msgid "Beep"
+#~ msgstr "Biple"
+
+#~ msgid "contains"
+#~ msgstr "içerir"
+
+#~ msgid "Copy to Folder"
+#~ msgstr "Dizine Kopyala"
+
+#~ msgid "Date received"
+#~ msgstr "Alınma tarihi"
+
+#~ msgid "Date sent"
+#~ msgstr "Gönderilme tarihi"
+
+#~ msgid "Deleted"
+#~ msgstr "Silinen"
+
+#~ msgid "does not contain"
+#~ msgstr "içermez"
+
+#~ msgid "does not end with"
+#~ msgstr "sonlanmaz"
+
+#~ msgid "does not exist"
+#~ msgstr "bulunmaz"
+
+#, fuzzy
+#~ msgid "does not return"
+#~ msgstr "bulunmaz"
+
+#~ msgid "does not sound like"
+#~ msgstr "benzemez"
+
+#~ msgid "does not start with"
+#~ msgstr "başlamaz"
+
+#~ msgid "Do Not Exist"
+#~ msgstr "Bulunmaz"
+
+#~ msgid "Draft"
+#~ msgstr "Taslak"
+
+#~ msgid "ends with"
+#~ msgstr "biter"
+
+#~ msgid "Exist"
+#~ msgstr "bulunur"
+
+#~ msgid "exists"
+#~ msgstr "bulunur"
+
+#~ msgid "Expression"
+#~ msgstr "Deyim"
+
+#~ msgid "is"
+#~ msgstr "eşittir"
+
+#, fuzzy
+#~ msgid "is after"
+#~ msgstr "sonra"
+
+#, fuzzy
+#~ msgid "is before"
+#~ msgstr "önce"
+
+#, fuzzy
+#~ msgid "is Flagged"
+#~ msgstr "İşaretli"
+
+#~ msgid "is greater than"
+#~ msgstr "büyük"
+
+#~ msgid "is less than"
+#~ msgstr "küçük"
+
+#~ msgid "is not"
+#~ msgstr "değil"
+
+#, fuzzy
+#~ msgid "is not Flagged"
+#~ msgstr "İşaretli"
+
+#, fuzzy
+#~ msgid "Junk Test"
+#~ msgstr "Haziran"
+
+#~ msgid "Mailing list"
+#~ msgstr "E-posta listesi"
+
+#~ msgid "Message Body"
+#~ msgstr "İleti Gövdesi"
+
+#~ msgid "Message Header"
+#~ msgstr "İleti Başlığı"
+
+#, fuzzy
+#~ msgid "Message is Junk"
+#~ msgstr "İleti gönderildi"
+
+#, fuzzy
+#~ msgid "Message is not Junk"
+#~ msgstr "%s numaralı ileti bulunamadı."
+
+#~ msgid "Move to Folder"
+#~ msgstr "Dizine Taşı"
+
+#, fuzzy
+#~ msgid "Pipe to Program"
+#~ msgstr "Programdan çık"
+
+#, fuzzy
+#~ msgid "Play Sound"
+#~ msgstr "Ses çal:"
+
+#~ msgid "Recipients"
+#~ msgstr "Alıcılar"
+
+#~ msgid "Regex Match"
+#~ msgstr "Düzgün Deyim Eşleşimi"
+
+#~ msgid "Replied to"
+#~ msgstr "Cevaplanan"
+
+#, fuzzy
+#~ msgid "returns"
+#~ msgstr "Burns"
+
+#, fuzzy
+#~ msgid "returns greater than"
+#~ msgstr "büyük"
+
+#, fuzzy
+#~ msgid "returns less than"
+#~ msgstr "küçük"
+
+#, fuzzy
+#~ msgid "Run Program"
+#~ msgstr "Program çalıştır:"
+
+#~ msgid "Sender"
+#~ msgstr "Gönderen"
+
+#~ msgid "Set Status"
+#~ msgstr "Durum belirt"
+
+#~ msgid "Size (kB)"
+#~ msgstr "Boyut (Kb)"
+
+#~ msgid "sounds like"
+#~ msgstr "benzer"
+
+#~ msgid "Source Account"
+#~ msgstr "Kaynak Hesap"
+
+#~ msgid "Specific header"
+#~ msgstr "Özel başlık"
+
+#~ msgid "starts with"
+#~ msgstr "başlayan"
+
+#~ msgid "Stop Processing"
+#~ msgstr "İşlemeyi Durdur"
+
+#, fuzzy
+#~ msgid "Unset Status"
+#~ msgstr "Durum belirt"
+
+#~ msgid "Working"
+#~ msgstr "Çalışıyor"
+
+#~ msgid "Brought to you by"
+#~ msgstr "Yazarlar"
+
+#, fuzzy
+#~ msgid "_Filename:"
+#~ msgstr "Dosya adı:"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "Unknown error."
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Bilinmeyen hata."
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the component system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Bileşen sisteminden gelen hata:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the activation system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Etkinleştirme sisteminden gelen mesaj:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "View Certificate"
+#~ msgstr "_Sertifika No:"
+
+#, fuzzy
+#~ msgid "You have been asked to trust a new Certificate Authority (CA)."
+#~ msgstr "Geçersiz Sertifika Otoritesi (CA)"
+
+#~ msgid "About Ximian Evolution..."
+#~ msgstr "Ximian Evolution Hakkında..."
+
+#~ msgid "_About Ximian Evolution..."
+#~ msgstr "Ximian _Evolution Hakkında..."
+
 #~ msgid "Evolution Addressbook folder viewer"
 #~ msgstr "Evolution Adres Defteri dizin görüntüleyici"
 
@@ -19948,9 +19915,6 @@ msgstr "%s (%%%d tamamlandı)"
 #~ msgid "Primary _email:"
 #~ msgstr "_Birincil e-posta adresi:"
 
-#~ msgid "S_pouse:"
-#~ msgstr "_Eş:"
-
 #~ msgid "_Business:"
 #~ msgstr "_İş:"
 
@@ -19966,9 +19930,6 @@ msgstr "%s (%%%d tamamlandı)"
 #~ msgid "_Mobile:"
 #~ msgstr "_Cep:"
 
-#~ msgid "_Office:"
-#~ msgstr "_Ofis:"
-
 #~ msgid "_Public Calendar URL:"
 #~ msgstr "_Genel Takvim URL:"
 
@@ -25040,9 +25001,6 @@ msgstr "%s (%%%d tamamlandı)"
 #~ msgid "Lannion"
 #~ msgstr "Lannion"
 
-#~ msgid "Lansing"
-#~ msgstr "Lansing"
-
 #~ msgid "Lanzhou"
 #~ msgstr "Lanzhou"
 
diff --git a/po/uk.po b/po/uk.po
index b95fc9c062..fe9fb88f04 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.0.5\n"
-"POT-Creation-Date: 2004-05-19 14:00-0400\n"
+"POT-Creation-Date: 2004-06-03 11:14-0400\n"
 "PO-Revision-Date: 2003-04-02 10:54--500\n"
 "Last-Translator: Yuriy Syrota <yuri@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -61,14 +61,14 @@ msgstr "1 картка"
 msgid "Default Sync Address:"
 msgstr "Типова адреса синхронізації:"
 
-#: addressbook/conduit/address-conduit.c:1150
 #: addressbook/conduit/address-conduit.c:1151
+#: addressbook/conduit/address-conduit.c:1152
 #, fuzzy
 msgid "Could not load addressbook"
 msgstr "Не вдалося завантажити %s: %s"
 
-#: addressbook/conduit/address-conduit.c:1219
-#: addressbook/conduit/address-conduit.c:1222
+#: addressbook/conduit/address-conduit.c:1220
+#: addressbook/conduit/address-conduit.c:1223
 msgid "Could not read pilot's Address application block"
 msgstr "Не вдалося зчитати блок адреса програми \"Пілот\""
 
@@ -76,13 +76,13 @@ msgstr "Не вдалося зчитати блок адреса програм�
 msgid "Accessing LDAP Server anonymously"
 msgstr "Анонімний доступ до сервера LDAP"
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
 msgid "Failed to authenticate.\n"
 msgstr "Неможливо автентифікуватися.\n"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sВведіть пароль для %s (користувач %s)"
@@ -128,52 +128,24 @@ msgstr "_Контакти:"
 msgid "Create a new contacts group"
 msgstr "Створити нову групу ярликів"
 
-#: addressbook/gui/component/addressbook-component.c:182
+#: addressbook/gui/component/addressbook-component.c:184
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:483
-msgid "Failed to connect to LDAP server"
-msgstr "Неможливо з'єднатись з сервером LDAP"
-
-#: addressbook/gui/component/addressbook-config.c:507
-msgid "Failed to authenticate with LDAP server"
-msgstr "На вдалося пройти автентифікацію на сервері LDAP"
-
-#: addressbook/gui/component/addressbook-config.c:535
-msgid "Could not perform query on Root DSE"
-msgstr "Неможливо виконати запит на Кореневому DSE"
-
-#: addressbook/gui/component/addressbook-config.c:840
-msgid "The server responded with no supported search bases"
-msgstr "Відповідь сервера не містить підтримуваних баз пошуку"
-
-#: addressbook/gui/component/addressbook-config.c:1245
-msgid "This server does not support LDAPv3 schema information"
-msgstr "Цей сервер не підтримує схему інформації LDAPv3"
-
-#: addressbook/gui/component/addressbook-config.c:1266
-msgid "Error retrieving schema information"
-msgstr "Помилка при отриманні схеми інформації"
-
-#: addressbook/gui/component/addressbook-config.c:1274
-msgid "Server did not respond with valid schema information"
-msgstr "Відповідь сервера не містить підтримуваної схеми інформації"
-
 #: addressbook/gui/component/addressbook-migrate.c:68
-#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1160
 #, fuzzy
 msgid "Migrating..."
 msgstr "Очікування..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1201
 #, fuzzy, c-format
 msgid "Migrating `%s':"
 msgstr "Зондування %s"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:438
+#: addressbook/gui/component/addressbook-migrate.c:464
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
 #: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
@@ -181,31 +153,31 @@ msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:446
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
-#: mail/mail-config.glade.h:106
+#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
+#: mail/mail-config.glade.h:109
 msgid "Personal"
 msgstr "Особисте"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:454
+#: addressbook/gui/component/addressbook-migrate.c:480
 #, fuzzy
 msgid "On LDAP Servers"
 msgstr "Сервер LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:582
+#: addressbook/gui/component/addressbook-migrate.c:608
 #, fuzzy
 msgid "LDAP Servers"
 msgstr "Сервер LDAP"
 
-#: addressbook/gui/component/addressbook-migrate.c:702
+#: addressbook/gui/component/addressbook-migrate.c:728
 #, fuzzy
 msgid "Autocompletion Settings"
 msgstr "Теки автозавершення"
 
-#: addressbook/gui/component/addressbook-migrate.c:1076
+#: addressbook/gui/component/addressbook-migrate.c:1104
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -213,60 +185,55 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1090
+#: addressbook/gui/component/addressbook-migrate.c:1118
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1099
+#: addressbook/gui/component/addressbook-migrate.c:1127
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1109
+#: addressbook/gui/component/addressbook-migrate.c:1137
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:674
+#: addressbook/gui/component/addressbook-view.c:675
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:761
+#: addressbook/gui/component/addressbook-view.c:754
 #, fuzzy
 msgid "New Address Book"
 msgstr "Адресна книга"
 
-#: addressbook/gui/component/addressbook-view.c:762
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
+#: addressbook/gui/component/addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Стерти"
 
-#: addressbook/gui/component/addressbook-view.c:763
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-view.c:756
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Властивості..."
 
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/addressbook-view.c:1002
+#. Create the contacts group
+#: addressbook/gui/component/addressbook-view.c:995
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
 #: calendar/gui/migration.c:373
 msgid "Contacts"
 msgstr "Контакти"
@@ -352,10 +319,6 @@ msgid "Manage your S/MIME certificates here"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-msgid "  S_how Supported Bases "
-msgstr " Показати підтримувані бази "
-
-#: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -370,208 +333,172 @@ msgstr " Показати підтримувані бази "
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1:00"
-msgstr "1:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
-msgstr "5:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "Автентифікація"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
 #, fuzzy
 msgid "<b>Display</b>"
 msgstr "<b>Стан:</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 #, fuzzy
 msgid "<b>Downloading</b>"
 msgstr "_Місце:"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:10
 #, fuzzy
 msgid "<b>Searching</b>"
 msgstr "Пошук"
 
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
 msgid "<b>Server Information</b>"
 msgstr "Крок 1: Інформація про сервер"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
 msgid "<b>Type:</b>"
 msgstr "<b>Обумовлена дата:</b> "
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:13
 #, fuzzy
 msgid "Add Contacts Group"
 msgstr "_Контакти:"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:14
 #, fuzzy
 msgid "Address Book Properties"
 msgstr "Джерело адресної книги"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
-#: mail/mail-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
+#: mail/mail-config.glade.h:42
 msgid "Always"
 msgstr "Завжди"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr "Анонімно"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:17
 #: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Основні"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
-msgid "Connecting"
-msgstr "З'єднання"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 #: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Подробиці"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
-msgid "Distinguished _name:"
-msgstr "Відокремлене _ім'я:"
-
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:19
 #, fuzzy
 msgid "Distinguished name"
 msgstr "Відокремлене _ім'я:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:20
 #, fuzzy
 msgid "Download limit:"
 msgstr "_Межа завантаження:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Email address"
 msgstr "Електронна адреса:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:22
 #, fuzzy
-msgid "Email address:"
-msgstr "Електронна адреса:"
-
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "Evolution will use this DN to authenticate you with the server"
-msgstr ""
-"Для автентифікації на сервері Evolution буде використовувати це відокремлене "
-"ім'я"
-
-#: addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
-"Evolution will use this email address to authenticate you with the server"
+"Evolution will use this email address to authenticate you with the server."
 msgstr ""
 "Для автентифікації на сервері Evolution буде використовувати електрону адресу"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:23
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Підтримувані бази пошуку"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:24
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
+#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Загальне"
 
-#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
-#: mail/mail-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
+#: mail/mail-config.glade.h:102
 msgid "Never"
 msgstr "Ніколи"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
-msgid "One"
-msgstr "Один рівень"
-
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:35
-msgid "S_earch scope: "
-msgstr "Простір по_шуку: "
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Search _base:"
+msgstr "База по_шуку:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
 msgid "Search base only"
 msgstr "База по_шуку:"
 
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:29
 #, fuzzy
 msgid "Search base:"
 msgstr "База по_шуку:"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Search scope:"
 msgstr "Простір по_шуку: "
 
-#: addressbook/gui/component/ldap-config.glade.h:39
-msgid "Searching"
-msgstr "Пошук"
-
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:31
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
-"server if\n"
-"your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL or TLS."
 msgstr ""
 "Вибір цього параметру означатиме, що Evolution з'єднуватиметься з сервером "
 "LDAP лише, якщо\n"
 "він підтримує SSL або TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a \n"
-"insecure environment. For example, if you and your LDAP server are behind a "
-"firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection "
-"is already\n"
-"secure."
+"you are in a insecure environment. For example, if you and your LDAP server "
+"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
+"because your connection is already secure."
 msgstr ""
 "Вибір цього параметру означатиме, що Evolution намагатиметься "
 "використовувати SSL/TLS\n"
@@ -581,51 +508,45 @@ msgstr ""
 "TLS, бо\n"
 "ваше з'єднання вже захищене."
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:33
+#, fuzzy
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
-"TLS.  This \n"
-"means that your connection will be insecure, and that you will be vulnerable "
-"to security\n"
-"exploits. "
+"TLS.  This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits. "
 msgstr ""
 "Вибір цього параметру означатиме, цо ваш сервер не підтримує ані SSL, ані "
 "TLS. Це означає\n"
 "що ваше з'єднання не буде безпечним, та ви будете уразливі до порушення "
 "безпеки."
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Sub"
-msgstr "Всі нижчі рівні"
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr "Підтримувані бази пошуку"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
-"searches will \n"
-"begin. If you leave this blank, the search will begin at the root of the "
-"directory tree."
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
 msgstr ""
 "База пошуку — це відокремлене ім'я (ВІ) елементу, з якого починатиметься "
 "пошук. Якщо ви\n"
 "залишите це поле порожнім - пошук виконуватиметься з кореневого елементу "
 "сервера."
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:37
+#, fuzzy
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
-"the \n"
-"directory tree. A search scope of \"sub\" will include all entries below "
-"your search base.\n"
-"A search scope of \"one\" will only include the entries one level beneath "
-"your base.\n"
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
 msgstr ""
 "Простір пошуку визначає як глибоко ви бажаєте розширити пошук по дереву "
 "каталогів.\n"
@@ -634,24 +555,23 @@ msgstr ""
 "Простір пошуку \"Один рівень\" включає тільки елементи, які знаходяться на "
 "один рівень нижче\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:58
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "Повна назва вашого сервера LDAP. Наприклад, \"ldap.mycompany.com\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:39
 #, fuzzy
 msgid ""
-"This is the maximum number of entries to download. Setting this number to "
-"be \n"
+"This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr ""
 "Максимальна кількість елементів для завантаження. Встановлення занадто "
 "великого\n"
 "значення сповільнить роботу записної книжки."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -661,144 +581,120 @@ msgstr ""
 "оберете тут \"Ел.адреса\" ви мусите мати анонімний доступ до вашого сервера "
 "LDAP"
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:41
+#, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
-"list.\n"
-"It is for display purposes only. "
+"list. It is for display purposes only. "
 msgstr ""
 "Назва цього сервера, що буде показана в вашому списку тек Evolution.\n"
 "Воно використовується тільки для показу."
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:42
+#, fuzzy
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. "
-"A \n"
-"list of standard ports has been provided. Ask your system administrator\n"
-"what port you should specify."
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
 msgstr ""
 "Це порт на сервері LDAP, з яким Evolution буде намагатися з'єднатися.\n"
 "Існує список стандартних портів. Запитайте вашого системного адміністратора\n"
 "який порт слід зазначити."
 
-#: addressbook/gui/component/ldap-config.glade.h:67
-msgid "This option controls how long a search will be run."
-msgstr "Це поле контролює як довго буде тривати пошук."
-
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:43
 #, fuzzy
 msgid "Timeout:"
 msgstr "Формат часу:"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
-msgid "U_se SSL/TLS:"
-msgstr "Використовувати _SSL/TLS:"
-
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr "Використовувати відокремлену назву (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr "Використовувати електронну адресу:"
 
-#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
-#: mail/mail-config.glade.h:154
+#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
+#: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr "Усякий раз коли можливо"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:47
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "_Контакти:"
 
-#: addressbook/gui/component/ldap-config.glade.h:74
-#: calendar/gui/dialogs/calendar-setup.glade.h:12
-msgid "_Display name:"
-msgstr "_Назва для відображення:"
-
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr "_Межа завантаження:"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
 msgid "_Email address:"
 msgstr "Електронна адреса:"
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:50
+#, fuzzy
+msgid "_Find Possible Search Bases"
+msgstr "Підтримувані бази пошуку"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Log in method:"
 msgstr "Сп_осіб реєстрації:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "_Log in:"
+msgstr "Login"
+
+#: addressbook/gui/component/ldap-config.glade.h:53
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
 msgid "_Name:"
 msgstr "Ім'я:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
-msgid "_Port number:"
-msgstr "_Порт:"
-
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "_Port:"
 msgstr "Пріоритет:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
-msgid "_Search base:"
-msgstr "База по_шуку:"
-
-#: addressbook/gui/component/ldap-config.glade.h:82
-msgid "_Server name:"
-msgstr "Назва _сервера:"
+#: addressbook/gui/component/ldap-config.glade.h:55
+#, fuzzy
+msgid "_Search scope:"
+msgstr "Простір по_шуку: "
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:56
 #, fuzzy
 msgid "_Server:"
 msgstr "кожні"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
-msgid "_Timeout (minutes):"
-msgstr "За_тримка (в хвилинах):"
+#: addressbook/gui/component/ldap-config.glade.h:57
+#, fuzzy
+msgid "_Timeout:"
+msgstr "Формат часу:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:58
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "Використовувати безпечне з'єднання (SSL):"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "картки"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
-#, fuzzy
-msgid "connecting-tab"
-msgstr "Повторне встановлення з'єднання з %s"
-
-#: addressbook/gui/component/ldap-config.glade.h:88
-#, fuzzy
-msgid "general-tab"
-msgstr "Загальне"
-
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:60
 #: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
-#: mail/mail-config.glade.h:182
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "хвилини"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
-#, fuzzy
-msgid "searching-tab"
-msgstr "Пошук"
-
-#: addressbook/gui/component/select-names/e-select-names.c:497
+#: addressbook/gui/component/select-names/e-select-names.c:503
 #: addressbook/gui/component/select-names/select-names.glade.h:6
 #, fuzzy
 msgid "Select Contacts from Address Book"
 msgstr "Вибрати контакти з книги адрес"
 
-#: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
@@ -838,7 +734,7 @@ msgstr "Неназваний контакт"
 
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:222
+#: addressbook/gui/widgets/e-addressbook-view.c:224
 msgid "Source"
 msgstr "Джерело"
 
@@ -918,9 +814,9 @@ msgid "<b>Work</b>"
 msgstr "Робочий тиждень"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
-#: addressbook/gui/widgets/eab-contact-display.c:342
-#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/widgets/eab-contact-display.c:334
+#: addressbook/gui/widgets/eab-contact-display.c:353
 msgid "AIM"
 msgstr ""
 
@@ -961,15 +857,15 @@ msgid "Company:"
 msgstr "Компанія"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:271
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
+#: addressbook/gui/contact-editor/e-contact-editor.c:266
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
 msgstr "Контакт"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1527
+#: addressbook/gui/contact-editor/e-contact-editor.c:520
 msgid "Contact Editor"
 msgstr "Редактор контактів"
 
@@ -993,83 +889,80 @@ msgid "Full _Name..."
 msgstr "Повне ім'я..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:202
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-msgid "Home"
-msgstr "Домашня"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #, fuzzy
 msgid "Home Page:"
 msgstr "Домашній факс"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-#, fuzzy
-msgid "Job title:"
-msgstr "Посада:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/e-itip-control.c:936
-msgid "Location:"
-msgstr "Розташування:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 #, fuzzy
 msgid "MSN Messenger"
 msgstr "Поштове повідомлення"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 #, fuzzy
 msgid "Mailing Address"
 msgstr "Електронна адреса:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 #, fuzzy
 msgid "Manager:"
 msgstr "Керівник"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "Прізвисько:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Notes:"
 msgstr "Нотатки:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
-#: addressbook/gui/contact-editor/e-contact-editor.c:203
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-msgid "Other"
-msgstr "Інша"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#, fuzzy
+msgid "Office:"
+msgstr "Офіс:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "PO Box:"
 msgstr "А/С:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 #, fuzzy
 msgid "Personal Information"
 msgstr "Необов'язкова інформація"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 #, fuzzy
 msgid "Profession:"
 msgstr "Професія:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#, fuzzy
+msgid "Spouse:"
+msgstr "_Дружина:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "State/Province:"
 msgstr "Штат/область:"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#, fuzzy
+msgid "Title:"
+msgstr "_Титул:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+msgid "Video Chat:"
+msgstr ""
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:41
 #, fuzzy
 msgid "Wants to receive HTML mail"
@@ -1077,15 +970,15 @@ msgstr "Хоче отримувати листи в HTML"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:42
 #, fuzzy
-msgid "Webcam:"
-msgstr "Сторінка"
+msgid "Web Log:"
+msgstr "Адреса сторінки WWW:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
-#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
-#: mail/mail-config.glade.h:155
+#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
+#: mail/mail-config.glade.h:157
 msgid "Work"
 msgstr "Робота"
 
@@ -1105,19 +998,12 @@ msgid "_File under:"
 msgstr "Назва файлу:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 #, fuzzy
 msgid "_Where:"
 msgstr "кожні"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
-msgid "item7"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
-msgid "item8"
-msgstr ""
-
-#: addressbook/gui/contact-editor/eab-editor.c:316
+#: addressbook/gui/contact-editor/eab-editor.c:315
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -1125,7 +1011,7 @@ msgstr ""
 "Ви впевнені, що хочете\n"
 "стерти ці контакти?"
 
-#: addressbook/gui/contact-editor/eab-editor.c:319
+#: addressbook/gui/contact-editor/eab-editor.c:318
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -1134,16 +1020,16 @@ msgstr ""
 " стерти ці контакти?"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:351
-#: addressbook/gui/widgets/eab-contact-display.c:372
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Address"
 msgstr "Адреса"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:292
+#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard.c:174
@@ -2130,91 +2016,114 @@ msgstr "Замбія"
 msgid "Zimbabwe"
 msgstr "Зімбабве"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/contact-editor/e-contact-editor.c:179
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:337
+#: addressbook/gui/widgets/eab-contact-display.c:356
 #, fuzzy
 msgid "Jabber"
 msgstr "Неназваний список"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:347
-#: addressbook/gui/widgets/eab-contact-display.c:366
+#: addressbook/gui/contact-editor/e-contact-editor.c:180
+#: addressbook/gui/widgets/eab-contact-display.c:339
+#: addressbook/gui/widgets/eab-contact-display.c:358
 #, fuzzy
 msgid "Yahoo"
 msgstr "Порто"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: addressbook/gui/widgets/eab-contact-display.c:338
+#: addressbook/gui/widgets/eab-contact-display.c:357
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:344
-#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#: addressbook/gui/widgets/eab-contact-display.c:355
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/contact-editor/e-contact-editor.c:183
 #, fuzzy
 msgid "GroupWise"
 msgstr "Групове"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+msgid "Home"
+msgstr "Домашня"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+msgid "Other"
+msgstr "Інша"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
 #, fuzzy
 msgid "Source Book"
 msgstr "Джерело"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:264
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:278
+#: addressbook/gui/contact-editor/e-contact-editor.c:273
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Новий контакт"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:285
+#: addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Writable Fields"
 msgstr "Поля для запису"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:299
+#: addressbook/gui/contact-editor/e-contact-editor.c:294
 msgid "Changed"
 msgstr "Змінено"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
-msgid "Category editor not available."
-msgstr "Відсутній редактор категорій."
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:2352
 msgid "This contact belongs to these categories:"
 msgstr "Цей контакт належить до таких категорій:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#: addressbook/gui/contact-editor/e-contact-editor.c:2429
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Оберіть серед наступних параметрів"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#: addressbook/gui/contact-editor/e-contact-editor.c:2433
 #, fuzzy
 msgid "No image"
 msgstr "Нігер"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#: addressbook/gui/contact-editor/e-contact-editor.c:2636
 #, fuzzy
 msgid ""
-"The following entries are invalid:\n"
+"The contact data is invalid:\n"
 "\n"
-msgstr "Зараз активні наступні з'єднання:"
+msgstr "Неправильна дата повторення"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2738
-#, c-format
-msgid "Could not find widget for a field: `%s'"
-msgstr "Не вдалося знайти віджета для поля: \"%s\""
+#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#, fuzzy
+msgid "Invalid contact."
+msgstr "Неправильне призначення"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+msgid ""
+"The contact cannot be saved to the selected address book. Do you want to "
+"discard changes?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2727
+#: addressbook/gui/contact-editor/e-contact-editor.c:2751
+msgid "_Discard"
+msgstr "_Скасувати"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+msgid ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
+msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:62
 #, fuzzy
@@ -2252,7 +2161,7 @@ msgid "_Edit Full"
 msgstr "Виправлення повного імені"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Full Name:"
 msgstr "Повне ім'я:"
@@ -2408,30 +2317,30 @@ msgid "_Type an email address or drag a contact into the list below:"
 msgstr ""
 "Наберіть ел.адресу або перетягніть контактну інформацію у нижчий список:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "contact-list-editor"
 msgstr "Редактор контактів"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:153
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:215
+#: addressbook/gui/widgets/e-addressbook-view.c:217
 #: addressbook/gui/widgets/e-minicard-view.c:460
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Книга"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
 msgid "Is New List"
 msgstr "Новий список"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:215
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
 msgid "Contact List Editor"
 msgstr "Редактор списків контактів"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:438
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
 msgid "Save List as VCard"
 msgstr "Зберегти список як VCard"
 
@@ -2478,128 +2387,128 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Складний пошук"
 
-#: addressbook/gui/widgets/eab-contact-display.c:129
-#: addressbook/gui/widgets/eab-contact-display.c:192
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:139
-#: addressbook/gui/widgets/eab-contact-display.c:205
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:257
-#: addressbook/gui/widgets/eab-contact-display.c:533
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:525
 #, fuzzy
 msgid "List Members"
 msgstr "Члени"
 
-#: addressbook/gui/widgets/eab-contact-display.c:329
-#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/eab-contact-display.c:321
+#: addressbook/gui/widgets/eab-contact-display.c:323
 #, fuzzy
 msgid "E-mail"
 msgstr "Ел.пошта"
 
-#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/eab-contact-display.c:332
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Організація"
 
-#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:333
 #, fuzzy
 msgid "Position"
 msgstr "Бостон"
 
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:354
 #, fuzzy
 msgid "Groupwise"
 msgstr "Групове"
 
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:340
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:349
-#: addressbook/gui/widgets/eab-contact-display.c:370
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:362
 #, fuzzy
 msgid "Phone"
 msgstr "Автомобільний телефон"
 
-#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:342
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:354
+#: addressbook/gui/widgets/eab-contact-display.c:346
 #, fuzzy
 msgid "work"
 msgstr "Робота"
 
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:359
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:368
-#: addressbook/gui/widgets/eab-contact-display.c:587
+#: addressbook/gui/widgets/eab-contact-display.c:360
+#: addressbook/gui/widgets/eab-contact-display.c:579
 #, fuzzy
 msgid "Blog"
 msgstr "Болонья"
 
-#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/eab-contact-display.c:363
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Мобільний телефон"
 
-#: addressbook/gui/widgets/eab-contact-display.c:375
+#: addressbook/gui/widgets/eab-contact-display.c:367
 #, fuzzy
 msgid "personal"
 msgstr "Особисте"
 
-#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/eab-contact-display.c:374
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Примітки"
 
-#: addressbook/gui/widgets/eab-contact-display.c:548
+#: addressbook/gui/widgets/eab-contact-display.c:540
 #, fuzzy
 msgid "Job Title"
 msgstr "Посада:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/eab-contact-display.c:544
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:774
+#: smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "Ел.пошта"
 
-#: addressbook/gui/widgets/eab-contact-display.c:579
+#: addressbook/gui/widgets/eab-contact-display.c:571
 #, fuzzy
 msgid "Home page"
 msgstr "Домашній факс"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 msgid "Success"
 msgstr "Успішно"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Backend busy"
 msgstr ""
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Repository offline"
 msgstr "Репозиторій поза мережею"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 #, fuzzy
 msgid "Address Book does not exist"
 msgstr "Адресна книга не існує"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 #, fuzzy
 msgid "No Self Contact defined"
 msgstr "Новий список контактів"
@@ -2607,29 +2516,29 @@ msgstr "Новий список контактів"
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Permission denied"
 msgstr "Доступ заборонено"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:57
 #, fuzzy
 msgid "Contact not found"
 msgstr "Картки не знайдено"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: addressbook/gui/widgets/eab-gui-util.c:58
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "Ідентифікатор картки вже існує"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Protocol not supported"
 msgstr "Протокол не підтримується"
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:60
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:233
 #: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
@@ -2642,39 +2551,39 @@ msgid "Cancelled"
 msgstr "Скасовано"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:61
 #, fuzzy
 msgid "Could not cancel"
 msgstr "Не вдалося відкрити загальну теку: %s"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Authentication Failed"
 msgstr "Збій автентифікації."
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Authentication Required"
 msgstr "Вимагається автентифікація"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:66
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "TLS not Available"
 msgstr "TLS недоступна"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#: addressbook/gui/widgets/eab-gui-util.c:66
 #, fuzzy
 msgid "No such source"
 msgstr "Неправильне повідомлення"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:69
+#: addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Other error"
 msgstr "Інша помилка"
 
-#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:90
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
@@ -2683,7 +2592,7 @@ msgstr ""
 "Неможливо відкрити книгу адрес. Перевірте чи існує згаданий шлях,\n"
 "та чи ви маєте потрібні права доступу до нього."
 
-#: addressbook/gui/widgets/eab-gui-util.c:110
+#: addressbook/gui/widgets/eab-gui-util.c:97
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -2692,19 +2601,19 @@ msgstr ""
 "Не вдається відкрити книгу адрес. Це означає, що або ви\n"
 "вказали неправильний URI, або не працює сервер LDAP"
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:102
 #, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution you must compile the program from the CVS "
-"sources after retrieving OpenLDAP from the link below."
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
 msgstr ""
 "Ця версія Evolution не має підтримки LDAP. Якщо вам\n"
 "потрібна підтримка LDAP в Evolution, ви повинні\n"
 "встановити LDAP з указаного нижче посилання, а потім\n"
 "скомпілювати версію Evolution з CVS.\n"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:109
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -2713,11 +2622,7 @@ msgstr ""
 "Не вдається відкрити книгу адрес. Це означає, що або ви\n"
 "вказали неправильний URI, або не працює сервер LDAP"
 
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "Unable to open addressbook"
-msgstr "Не вдалося відкрити адресну книгу"
-
-#: addressbook/gui/widgets/eab-gui-util.c:162
+#: addressbook/gui/widgets/eab-gui-util.c:129
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2729,7 +2634,7 @@ msgstr ""
 "відобразити. Зробіть ваш запит більш специфічним або підвищить\n"
 "обмеження у властивостях серверу цієї книги адрес."
 
-#: addressbook/gui/widgets/eab-gui-util.c:168
+#: addressbook/gui/widgets/eab-gui-util.c:135
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -2740,56 +2645,48 @@ msgstr ""
 "встановлене для цієї книги адрес. Зробіть ваш запит більш \n"
 "специфічним або підвищить обмеження у властивостях серверу цієї книги адрес."
 
-#: addressbook/gui/widgets/eab-gui-util.c:174
+#: addressbook/gui/widgets/eab-gui-util.c:141
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "Механізм цієї книги адрес не спроможний проаналізувати цей запит."
 
-#: addressbook/gui/widgets/eab-gui-util.c:177
+#: addressbook/gui/widgets/eab-gui-util.c:144
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Механізм цієї книги адрес відмовився виконати цей запит."
 
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:147
 msgid "This query did not complete successfully."
 msgstr "Цей запит не було завершено відповідним чином."
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
-msgid "Do you want to save changes?"
-msgstr "Ви хочете змінити зміни?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:208
-msgid "_Discard"
-msgstr "_Скасувати"
-
-#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:169
 msgid "Error adding list"
 msgstr "Помилка додавання списку"
 
-#: addressbook/gui/widgets/eab-gui-util.c:229
-#: addressbook/gui/widgets/eab-gui-util.c:652
+#: addressbook/gui/widgets/eab-gui-util.c:169
+#: addressbook/gui/widgets/eab-gui-util.c:580
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Помилка додавання картки"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying list"
 msgstr "Помилка модифікування списку"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Помилка модифікації картки"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:192
 msgid "Error removing list"
 msgstr "Помилка видалення списку"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
-#: addressbook/gui/widgets/eab-gui-util.c:610
+#: addressbook/gui/widgets/eab-gui-util.c:192
+#: addressbook/gui/widgets/eab-gui-util.c:538
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Помилка видалення картки"
 
-#: addressbook/gui/widgets/eab-gui-util.c:334
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, fuzzy, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2798,7 +2695,7 @@ msgstr ""
 "При відкритті картки %d  буде також відкрито нове вікно %d.\n"
 "Ви справді бажаєте відкрити всі ці картки?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:360
+#: addressbook/gui/widgets/eab-gui-util.c:300
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2807,54 +2704,49 @@ msgstr ""
 "%s вже існує\n"
 "Хочете переписати?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:364
+#: addressbook/gui/widgets/eab-gui-util.c:304
 msgid "Overwrite"
 msgstr "Переписати"
 
-#: addressbook/gui/widgets/eab-gui-util.c:400
-#, c-format
-msgid "Error saving %s: %s"
-msgstr "Помилка запису %s: %s"
-
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:437
+#: addressbook/gui/widgets/eab-gui-util.c:365
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:571
+#: addressbook/gui/widgets/eab-gui-util.c:499
 msgid "list"
 msgstr "список"
 
-#: addressbook/gui/widgets/eab-gui-util.c:706
+#: addressbook/gui/widgets/eab-gui-util.c:634
 #, fuzzy
 msgid "Move contact to"
 msgstr "Перенести картку у"
 
-#: addressbook/gui/widgets/eab-gui-util.c:708
+#: addressbook/gui/widgets/eab-gui-util.c:636
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Скопіювати картку у"
 
-#: addressbook/gui/widgets/eab-gui-util.c:711
+#: addressbook/gui/widgets/eab-gui-util.c:639
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Перенести картки у"
 
-#: addressbook/gui/widgets/eab-gui-util.c:713
+#: addressbook/gui/widgets/eab-gui-util.c:641
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Копіювати картки у"
 
-#: addressbook/gui/widgets/eab-gui-util.c:716
+#: addressbook/gui/widgets/eab-gui-util.c:644
 #, fuzzy
 msgid "Select target addressbook."
 msgstr "Вибрати контакти з книги адрес"
 
-#: addressbook/gui/widgets/eab-gui-util.c:939
+#: addressbook/gui/widgets/eab-gui-util.c:867
 msgid "Multiple VCards"
 msgstr "Декілька VCard"
 
-#: addressbook/gui/widgets/eab-gui-util.c:942
+#: addressbook/gui/widgets/eab-gui-util.c:870
 #, c-format
 msgid "VCard for %s"
 msgstr "vCard для %s"
@@ -2945,7 +2837,7 @@ msgstr[1] "Контакти"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:229
+#: addressbook/gui/widgets/e-addressbook-view.c:231
 #: addressbook/gui/widgets/e-minicard-view.c:467
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
@@ -2963,146 +2855,135 @@ msgstr "Модель"
 msgid "Error modifying card"
 msgstr "Помилка модифікації картки"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:163
 msgid "Name begins with"
 msgstr "Ім'я починається з"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:164
 msgid "Email begins with"
 msgstr "Поштова адреса починається з"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:57
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Категорія - "
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-#: calendar/gui/cal-search-bar.c:50
+#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Будь-яке поле містить"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+#: addressbook/gui/widgets/e-addressbook-view.c:172
 msgid "Advanced..."
 msgstr "Додатково..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:236
+#: addressbook/gui/widgets/e-addressbook-view.c:238
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:249
+#: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Тип"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:506
+#: addressbook/gui/widgets/e-addressbook-view.c:508
 #, fuzzy
 msgid "Address Book"
 msgstr "Адресна книга"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2076
+#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:2080
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
 msgstr "Зберегти як VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 msgid "New Contact..."
 msgstr "Новий контакт..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "New Contact List..."
 msgstr "Новий контактний список..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Go to Folder..."
 msgstr "Перейти на теку..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Import..."
 msgstr "Імпорт..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1066
 msgid "Search for Contacts..."
 msgstr "Пошук контактів..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Джерела адресних книг..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1069
 msgid "Pilot Settings..."
 msgstr "Установки \"Пілота\"..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Переслати контакт"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
 msgid "Send Message to Contact"
 msgstr "Відіслати повідомлення за контактом"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "Друкувати"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
+#: addressbook/gui/widgets/e-addressbook-view.c:1077
 msgid "Print Envelope"
 msgstr "Надрукувати конверт"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
+#: addressbook/gui/widgets/e-addressbook-view.c:1081
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Книга адрес..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1080
+#: addressbook/gui/widgets/e-addressbook-view.c:1082
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Книга адрес..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Вирізати"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Скопіювати"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1087
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Вставити"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:1092
+#: calendar/gui/e-calendar-view.c:1280
 msgid "Current View"
 msgstr "Поточний вигляд"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1309
-#, c-format
-msgid ""
-"The addressbook backend for\n"
-"%s\n"
-"has crashed. You will have to restart Evolution in order to use it again"
-msgstr ""
-"Сталася помилка в допоміжному модулі програми записника для\n"
-"%s\n"
-"Щоб використовувати її знову потрібно перезавантажити Evolution"
-
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1667
-#: calendar/gui/cal-search-bar.c:362
+#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Будь-яка категорія"
 
@@ -3211,7 +3092,7 @@ msgstr "Радіо"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-list-view.c:234
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Роль"
@@ -3358,13 +3239,13 @@ msgstr "Редактор пошти Evolutuion."
 msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.c:998
+#: addressbook/printing/e-contact-print.c:1000
 #, fuzzy
 msgid "Print contacts"
 msgstr "Надрукувати вибрані контакти"
 
-#: addressbook/printing/e-contact-print.c:1064
-#: addressbook/printing/e-contact-print.c:1091
+#: addressbook/printing/e-contact-print.c:1066
+#: addressbook/printing/e-contact-print.c:1093
 #, fuzzy
 msgid "Print contact"
 msgstr "Надрукувати вибрані контакти"
@@ -3617,17 +3498,22 @@ msgstr ""
 msgid "Impossible internal error."
 msgstr "Внутрішня помилка"
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:629
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
 #, fuzzy
 msgid "Can not open file"
 msgstr "Неможливо відкрити повідомлення"
 
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
 #, fuzzy
-msgid "Can not load URI"
-msgstr "Картки не знайдено"
+msgid "Couldn't get list of addressbooks"
+msgstr "Не вдалося завантажити %s: %s"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Не вдалося відкрити адресну книгу"
 
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
@@ -3645,7 +3531,7 @@ msgstr "Не вказано назви файлу."
 msgid "Unnamed List"
 msgstr "Неназваний список"
 
-#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 #, fuzzy
 msgid "Enter password"
@@ -3928,10 +3814,10 @@ msgid "Whether to show week numbers in date navigator"
 msgstr "Показати номера тижнів у навігаторі дат"
 
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:88
-#: calendar/gui/gnome-cal.c:1703
-#: camel/providers/groupwise/camel-gw-listener.c:304
-#: camel/providers/groupwise/camel-gw-listener.c:327
+#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/gnome-cal.c:1705
+#: camel/providers/groupwise/camel-gw-listener.c:311
+#: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
 msgstr "Календар"
 
@@ -3954,7 +3840,7 @@ msgstr "повертає менше ніж"
 
 #: calendar/gui/calendar-commands.c:363
 #: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:19 filter/filter.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
 msgid "days"
 msgstr "діб"
 
@@ -4108,24 +3994,24 @@ msgstr "Перегляд тижня"
 msgid "Month View"
 msgstr "Перегляд місяця"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Зведення містить"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Опис містить"
 
-#: calendar/gui/cal-search-bar.c:54
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Коментар містить"
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:53
 #, fuzzy
 msgid "Location contains"
 msgstr "Опис містить"
 
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
 msgid "Unmatched"
 msgstr "Інше"
 
@@ -4146,24 +4032,24 @@ msgstr "Відказано в доступі при відкриття кале�
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:466
+#: calendar/gui/dialogs/alarm-options.c:467
 msgid "Audio Alarm Options"
 msgstr "Параметри звукових сповіщень"
 
-#: calendar/gui/dialogs/alarm-options.c:475
+#: calendar/gui/dialogs/alarm-options.c:476
 msgid "Message Alarm Options"
 msgstr "Параметри сигнальних повідомлень"
 
-#: calendar/gui/dialogs/alarm-options.c:484
+#: calendar/gui/dialogs/alarm-options.c:485
 #, fuzzy
 msgid "Email Alarm Options"
 msgstr "Параметри поштових сповіщень"
 
-#: calendar/gui/dialogs/alarm-options.c:493
+#: calendar/gui/dialogs/alarm-options.c:494
 msgid "Program Alarm Options"
 msgstr "Програмні параметри сповіщення"
 
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:510
 msgid "Unknown Alarm Options"
 msgstr "Невідомі параметри сповіщення"
 
@@ -4203,7 +4089,7 @@ msgstr "Відправити"
 msgid "With these arguments:"
 msgstr "З цими аргументами:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
 msgid "dialog1"
 msgstr ""
 
@@ -4212,7 +4098,7 @@ msgid "extra times every"
 msgstr "додатковий час кожні"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:20 filter/filter.glade.h:16
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr "години"
 
@@ -4259,7 +4145,7 @@ msgstr "Відіслати пошту"
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Зведення:"
 
@@ -4289,7 +4175,6 @@ msgid "hour(s)"
 msgstr "годин(а)"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:21
 msgid "minute(s)"
 msgstr "хвилин"
 
@@ -4297,27 +4182,27 @@ msgstr "хвилин"
 msgid "start of appointment"
 msgstr "початок зустрічі"
 
-#: calendar/gui/dialogs/calendar-setup.c:170
+#: calendar/gui/dialogs/calendar-setup.c:172
 #, fuzzy
 msgid "You must specify a location to get the calendar from."
 msgstr "Необхідно вказати назву файлу."
 
-#: calendar/gui/dialogs/calendar-setup.c:178
+#: calendar/gui/dialogs/calendar-setup.c:180
 #, fuzzy, c-format
 msgid "The source location '%s' is not well-formed."
 msgstr "Метод, необхідний для завантаження \"%s\", не підтримується"
 
-#: calendar/gui/dialogs/calendar-setup.c:193
+#: calendar/gui/dialogs/calendar-setup.c:195
 #, c-format
 msgid "The source location '%s' is not a webcal source."
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:265
+#: calendar/gui/dialogs/calendar-setup.c:275
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:278
+#: calendar/gui/dialogs/calendar-setup.c:288
 #, c-format
 msgid ""
 "The group '%s' is remote. You must specify a location to get the calendar "
@@ -4339,61 +4224,36 @@ msgstr "Список завдань"
 msgid "C_olor:"
 msgstr "_Кольори"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-#, fuzzy
-msgid "Calendar Properties"
-msgstr "Помилка iCalendar"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
 msgid "Pick a color"
 msgstr "Вибір кольору"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:8
-#, fuzzy
-msgid "Remote"
-msgstr "Видалити"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-#, fuzzy
-msgid "Task List Properties"
-msgstr "Список завдань"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
 #, fuzzy
 msgid "_Add Calendar"
 msgstr "Нова Каледонія"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
 #, fuzzy
 msgid "_Add Group"
 msgstr "Нова група..."
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-#, fuzzy
-msgid "_Refresh Interval:"
-msgstr "Оновити список"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
 #, fuzzy
 msgid "_Refresh:"
 msgstr "Оновити"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-#, fuzzy
-msgid "_Source URL:"
-msgstr "URL джерела пошти POP"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
 #, fuzzy
 msgid "_Type:"
 msgstr "Тип:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
 #, fuzzy
 msgid "_URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
 msgid "weeks"
 msgstr "тижнів"
 
@@ -4503,7 +4363,7 @@ msgid "Display"
 msgstr "Відображати"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:76
 msgid "E_nable"
 msgstr "Увімкнути"
 
@@ -4514,7 +4374,7 @@ msgstr "Відповісти про зайнятість"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:563
+#: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "П'ятниця"
 
@@ -4528,7 +4388,7 @@ msgstr "Хвилини"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:559
+#: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Понеділок"
 
@@ -4538,7 +4398,7 @@ msgstr "_Ндл"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:564
+#: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Субота"
 
@@ -4552,7 +4412,7 @@ msgstr "Показати номера тижнів у навігаторі да�
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Неділя"
 
@@ -4566,7 +4426,7 @@ msgstr "Чтв"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:562
+#: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Четвер"
 
@@ -4580,7 +4440,7 @@ msgstr "Формат часу:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:560
+#: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Вівторок"
 
@@ -4590,7 +4450,7 @@ msgstr "_Тиждень починається:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:561
+#: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Середа"
 
@@ -4624,7 +4484,7 @@ msgid "_Day begins:"
 msgstr "_День починається:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
-#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:43
@@ -4673,82 +4533,46 @@ msgstr "Срд"
 msgid "before every appointment"
 msgstr "Перед початком кожної зустрічі"
 
-#: calendar/gui/dialogs/cancel-comp.c:57
-msgid ""
-"The event being deleted is a meeting, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"Ви намагаєтесь видалити засідання, бажаєте відправити повідомлення про "
-"відміну?"
-
-#: calendar/gui/dialogs/cancel-comp.c:60
-msgid "Are you sure you want to cancel and delete this meeting?"
-msgstr "Ви впевнені, що хочете відмінити та видалити це засідання?"
-
-#: calendar/gui/dialogs/cancel-comp.c:66
-msgid ""
-"The task being deleted is assigned, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"Ви намагаєтесь видалити назначене завдання, бажаєте відіслати повідомлення "
-"про відміну?"
-
-#: calendar/gui/dialogs/cancel-comp.c:69
-msgid "Are you sure you want to cancel and delete this task?"
-msgstr "Ви впевнені, що хочете відмінити та видалити це завдання?"
-
-#: calendar/gui/dialogs/cancel-comp.c:75
-msgid ""
-"The journal entry being deleted is published, would you like to send a "
-"cancellation notice?"
-msgstr ""
-"Ви намагаєтесь видалити журнальний запис, який вже опубліковано, бажаєте "
-"відіслати повідомлення про відміну?"
-
-#: calendar/gui/dialogs/cancel-comp.c:78
-msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr "Ви впевнені, що хочете відмінити та видалити цей запис в журналі?"
-
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Цю подію було видалено."
 
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "Це завдання було видалено."
 
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:68
 msgid "This journal entry has been deleted."
 msgstr "Цей журнальний запис було видалено."
 
-#: calendar/gui/dialogs/changed-comp.c:75
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  Ви внесли зміни. Забути ці зміни та закрити вікно редагування?"
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Ви не зробили змін, закрити вікно редагування?"
 
-#: calendar/gui/dialogs/changed-comp.c:82
+#: calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "Цю подію було змінено."
 
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "Це завдання було змінено."
 
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:92
 msgid "This journal entry has been changed."
 msgstr "Цей журнальний запис було змінено."
 
-#: calendar/gui/dialogs/changed-comp.c:99
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  Ви внесли зміни. Забути ці зміни та оновити вікно редагування?"
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Ви не зробили змін, поновити вікно редагування?"
@@ -4786,7 +4610,7 @@ msgid "No summary"
 msgstr "Немає зведення"
 
 #: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
 #: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Зберегти як..."
@@ -4844,104 +4668,56 @@ msgstr "Скасувати операцію"
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:95
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "Ви впевнені, що хочете стерти зустріч \"%s\"?"
-
-#: calendar/gui/dialogs/delete-comp.c:98
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "Ви впевнені, що хочете стерти цю неназвану зустріч?"
-
-#: calendar/gui/dialogs/delete-comp.c:104
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "Ви впевнені, що хочете стерти завдання \"%s\"?"
-
-#: calendar/gui/dialogs/delete-comp.c:107
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "Ви впевнені, що хочете стерти це неназване завдання?"
-
-#: calendar/gui/dialogs/delete-comp.c:113
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "Ви впевнені, що хочете стерти запис в журналі \"%s\"?"
-
-#: calendar/gui/dialogs/delete-comp.c:116
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "Ви впевнені, що хочете стерти цей неназваний запис в журналі?"
-
-#: calendar/gui/dialogs/delete-comp.c:131
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d appointment?"
-msgid_plural "Are you sure you want to delete %d appointments?"
-msgstr[0] "Ви впевнені, що хочете стерти %d зустрічей?"
-msgstr[1] "Ви впевнені, що хочете стерти %d зустрічей?"
-
-#: calendar/gui/dialogs/delete-comp.c:138
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d task?"
-msgid_plural "Are you sure you want to delete %d tasks?"
-msgstr[0] "Ви впевнені, що хочете стерти %d завдань?"
-msgstr[1] "Ви впевнені, що хочете стерти %d завдань?"
-
-#: calendar/gui/dialogs/delete-comp.c:145
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d journal entry?"
-msgid_plural "Are you sure you want to delete %d journal entries?"
-msgstr[0] "Ви впевнені, що хочете стерти %d записів в журналі?"
-msgstr[1] "Ви впевнені, що хочете стерти %d записів в журналі?"
-
-#: calendar/gui/dialogs/delete-error.c:52
+#: calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:55
+#: calendar/gui/dialogs/delete-error.c:57
 msgid "The task could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:58
+#: calendar/gui/dialogs/delete-error.c:60
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:61
+#: calendar/gui/dialogs/delete-error.c:63
 #, fuzzy
 msgid "The item could not be deleted due to a corba error"
 msgstr "Елемент не може бути відіслано!\n"
 
-#: calendar/gui/dialogs/delete-error.c:68
+#: calendar/gui/dialogs/delete-error.c:70
 msgid "The event could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:71
+#: calendar/gui/dialogs/delete-error.c:73
 #, fuzzy
 msgid "The task could not be deleted because permission was denied"
 msgstr "Неможливо оновити стан учасника, бо поточний стан не правильний!\n"
 
-#: calendar/gui/dialogs/delete-error.c:74
+#: calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:77
+#: calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:84
+#: calendar/gui/dialogs/delete-error.c:86
 #, fuzzy
 msgid "The event could not be deleted due to an error"
 msgstr "Елемент не може бути відіслано!\n"
 
-#: calendar/gui/dialogs/delete-error.c:87
+#: calendar/gui/dialogs/delete-error.c:89
 #, fuzzy
 msgid "The task could not be deleted due to an error"
 msgstr "Елемент не може бути відіслано!\n"
 
-#: calendar/gui/dialogs/delete-error.c:90
+#: calendar/gui/dialogs/delete-error.c:92
 #, fuzzy
 msgid "The journal entry could not be deleted due to an error"
 msgstr "Неможливо оновити стан учасника, бо поточний стан не правильний!\n"
 
-#: calendar/gui/dialogs/delete-error.c:93
+#: calendar/gui/dialogs/delete-error.c:95
 #, fuzzy
 msgid "The item could not be deleted due to an error"
 msgstr "Елемент не може бути відіслано!\n"
@@ -5079,11 +4855,11 @@ msgstr "Час _початку:"
 
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:3
+#: calendar/gui/dialogs/meeting-page.glade.h:4
 #: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
 #: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1559
-#: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:100
+#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
+#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
@@ -5109,8 +4885,8 @@ msgstr "Доручити..."
 #. FIXME: need to disable for undeletable folders
 #: calendar/gui/dialogs/meeting-page.c:655
 #: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1310 calendar/gui/e-calendar-view.c:1342
-#: mail/em-folder-tree.c:2557 mail/em-folder-view.c:919
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
+#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -5118,7 +4894,7 @@ msgid "_Delete"
 msgstr "Стерти"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:240
+#: calendar/gui/e-meeting-list-view.c:218
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Відвідування"
@@ -5154,16 +4930,15 @@ msgid "Member"
 msgstr "Член"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "Зацікавлена персона"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
-#: mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-list-view.c:248
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Стан"
 
@@ -5172,20 +4947,20 @@ msgstr "Стан"
 msgid "Add A_ttendee"
 msgstr "Відвідування"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "Add attendees from addressbook."
+msgstr "Додати відправника в адресну книгу"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Організатор:"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
+#: calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "_Change Organizer"
 msgstr "Змінити організатора"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-#: calendar/gui/e-meeting-time-sel.c:417
-msgid "_Invite Others..."
-msgstr "Запросити інших..."
-
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 #, fuzzy
 msgid "<b>Calendar options</b>"
@@ -5346,7 +5121,7 @@ msgid "_No recurrence"
 msgstr "_Без періодичності"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:450
+#: composer/e-msg-composer-attachment-bar.c:453
 msgid "_Remove"
 msgstr "Видалити"
 
@@ -5378,57 +5153,21 @@ msgstr "тижнів"
 msgid "year(s)"
 msgstr "років"
 
-#: calendar/gui/dialogs/save-comp.c:53
-#, fuzzy
-msgid ""
-"This event has been changed, but has not been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Цей підпис змінився, але не був збережений.\n"
-"\n"
-"Бажаєте зберегти зміни?"
-
-#: calendar/gui/dialogs/save-comp.c:57
-msgid "_Discard Changes"
-msgstr "Скасувати зміни"
-
-#: calendar/gui/dialogs/save-comp.c:62
-#, fuzzy
-msgid "Save Event"
-msgstr "Календарні події"
-
-#: calendar/gui/dialogs/select-source-dialog.c:65
+#: calendar/gui/dialogs/select-source-dialog.c:69
 #, fuzzy
 msgid "Select destination"
 msgstr "Вибрати теку призначення для імпорту цих даних"
 
-#: calendar/gui/dialogs/select-source-dialog.c:86
+#: calendar/gui/dialogs/select-source-dialog.c:90
 #, fuzzy
 msgid "_Destination"
 msgstr "Стерти цю теку"
 
-#: calendar/gui/dialogs/select-source-dialog.c:88
+#: calendar/gui/dialogs/select-source-dialog.c:92
 #, fuzzy
 msgid "Task List"
 msgstr "Список завдань"
 
-#: calendar/gui/dialogs/send-comp.c:57
-msgid "The meeting information has been created. Send it?"
-msgstr "Створено інформацію про засідання. Надіслати її?"
-
-#: calendar/gui/dialogs/send-comp.c:60
-msgid "The meeting information has changed. Send an updated version?"
-msgstr "Змінилась інформація про засідання. Надіслати оновлену версію?"
-
-#: calendar/gui/dialogs/send-comp.c:67
-msgid "The task assignment information has been created. Send it?"
-msgstr "Створено інформацію про призначення завдання. Надіслати її?"
-
-#: calendar/gui/dialogs/send-comp.c:71
-msgid "The task information has changed. Send an updated version?"
-msgstr "Змінилась інформація про завдання. Надіслати оновлену версію?"
-
 #: calendar/gui/dialogs/task-details-page.c:406
 msgid "Completed date is wrong"
 msgstr "Неправильна дата виконання"
@@ -5448,7 +5187,7 @@ msgstr "Завершено"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #: calendar/gui/e-cal-component-preview.c:249
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:960
 msgid "High"
 msgstr "Високий"
 
@@ -5462,14 +5201,14 @@ msgstr "Виконується"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:253
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:958
 msgid "Low"
 msgstr "Низький"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:251
 #: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:957
+#: mail/message-list.c:959
 msgid "Normal"
 msgstr "Звичайний"
 
@@ -5529,8 +5268,8 @@ msgstr "Кон_фіденційне"
 
 #: calendar/gui/dialogs/task-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
+#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Опис:"
 
@@ -5706,7 +5445,7 @@ msgstr "Дата ви_конання:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:950
+#: calendar/gui/e-itip-control.c:943
 msgid "Status:"
 msgstr "Стан:"
 
@@ -5792,12 +5531,12 @@ msgstr "Зайнятий"
 msgid "Deleting selected objects"
 msgstr "Стерти вибрані об'єкти"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
 msgid "Updating objects"
 msgstr "Оновити об'єкти"
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1370
+#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
 #: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "Відкрити"
@@ -5808,15 +5547,15 @@ msgid "Open _Web Page"
 msgstr "Відкрити повідомлення"
 
 #: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1291 calendar/gui/e-calendar-view.c:1376
-#: mail/em-folder-view.c:896 mail/em-popup.c:690 mail/em-popup.c:806
+#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
+#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "Зберегти як..."
 
 #: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1292
-#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
+#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
@@ -5824,24 +5563,24 @@ msgid "_Print..."
 msgstr "Друкувати..."
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "Вирізати"
 
 #: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1338
-#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2550
-#: mail/message-list.c:1644 ui/evolution-addressbook.xml.h:31
+#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
+#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
+#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "Скопіювати"
 
 #: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1273 calendar/gui/e-calendar-view.c:1299
-#: calendar/gui/e-calendar-view.c:1372 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
+#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
@@ -5910,71 +5649,71 @@ msgstr "Зведення"
 msgid "Task sort"
 msgstr "Сортування завдання"
 
-#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
 msgid "New _Appointment..."
 msgstr "Нова зустріч..."
 
-#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
+#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
 msgid "New All Day _Event"
 msgstr "Нова щоденна подія"
 
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
+#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
 msgid "New Meeting"
 msgstr "Нове засідання"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
 msgid "New Task"
 msgstr "Нове завдання"
 
-#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Вибрати гілку"
 
-#: calendar/gui/e-calendar-view.c:1280
+#: calendar/gui/e-calendar-view.c:1283
 #, fuzzy
 msgid "_Select Date..."
 msgstr "Стерти..."
 
-#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "Опублікувати інформацію про зайнятість"
 
-#: calendar/gui/e-calendar-view.c:1303
+#: calendar/gui/e-calendar-view.c:1306
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Скопіювати до теки..."
 
-#: calendar/gui/e-calendar-view.c:1304
+#: calendar/gui/e-calendar-view.c:1307
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "Перенести в теку..."
 
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1308
 msgid "_Schedule Meeting..."
 msgstr "За_планувати зустріч..."
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1309
 msgid "_Forward as iCalendar..."
 msgstr "Переслати як i_Calendar"
 
-#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
 msgid "Delete this _Occurrence"
 msgstr "Стерти цей екземпляр"
 
-#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
 msgid "Delete _All Occurrences"
 msgstr "Стерти всі екземпляри"
 
-#: calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1349
 msgid "Go to _Today"
 msgstr "Сьогодні"
 
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1351
 msgid "_Go to Date..."
 msgstr "Перейти на дату..."
 
-#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "_Параметри..."
 
@@ -5988,9 +5727,9 @@ msgstr "Дата початку"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:967 calendar/gui/e-itip-control.c:1169
-#: calendar/gui/e-meeting-list-view.c:144
-#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
 #: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
 #: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
 #: camel/camel-tcp-stream-openssl.c:631
@@ -6016,13 +5755,13 @@ msgid "Assigned"
 msgstr "Прив'язано"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr "Так"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "Ні"
 
@@ -6034,7 +5773,7 @@ msgstr "Пн"
 msgid "S"
 msgstr "Пд"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
 msgid "E"
 msgstr "Сх"
 
@@ -6106,102 +5845,102 @@ msgstr "%d %b"
 msgid "%02i minute divisions"
 msgstr "%02i хвилинне поділення"
 
-#: calendar/gui/e-itip-control.c:592
+#: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
 msgstr "Так. (Складна періодичність)"
 
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:596
 #, fuzzy, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Кожен день"
 msgstr[1] "Кожен день"
 
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:601
 #, fuzzy, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Кожного тижня"
 msgstr[1] "Кожного тижня"
 
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:603
 #, fuzzy, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "Кожного тижня у "
 msgstr[1] "Кожного тижня у "
 
-#: calendar/gui/e-itip-control.c:618
+#: calendar/gui/e-itip-control.c:611
 msgid " and "
 msgstr " та "
 
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:618
 #, c-format
 msgid "The %s day of "
 msgstr "%s днів з "
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:631
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s з "
 
-#: calendar/gui/e-itip-control.c:645
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "кожного місяця"
 msgstr[1] "кожного місяця"
 
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:642
 #, fuzzy, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "Кожен рік"
 msgstr[1] "Кожен рік"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:653
 #, fuzzy, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] " усього з %d разів"
 msgstr[1] " усього з %d разів"
 
-#: calendar/gui/e-itip-control.c:669
+#: calendar/gui/e-itip-control.c:662
 msgid ", ending on "
 msgstr ", закінчуючи "
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:686
 msgid "<b>Starts:</b> "
 msgstr "<b>Починається:</b> "
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:696
 msgid "<b>Ends:</b> "
 msgstr "<b>Закінчується:</b> "
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:716
 msgid "<b>Completed:</b> "
 msgstr "<b>Виконано:</b> "
 
-#: calendar/gui/e-itip-control.c:733
+#: calendar/gui/e-itip-control.c:726
 msgid "<b>Due:</b> "
 msgstr "<b>Обумовлена дата:</b> "
 
-#: calendar/gui/e-itip-control.c:771 calendar/gui/e-itip-control.c:827
+#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
 msgid "iCalendar Information"
 msgstr "Інформація iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:788
+#: calendar/gui/e-itip-control.c:781
 msgid "iCalendar Error"
 msgstr "Помилка iCalendar"
 
-#: calendar/gui/e-itip-control.c:859 calendar/gui/e-itip-control.c:875
-#: calendar/gui/e-itip-control.c:886 calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
 msgid "An unknown person"
 msgstr "Невідома персона"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:910
+#: calendar/gui/e-itip-control.c:903
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -6209,301 +5948,305 @@ msgstr ""
 "<br> Будь ласка перегляньте наступну інформацію, потім оберіть дію з "
 "нижнього меню."
 
-#: calendar/gui/e-itip-control.c:925
+#: calendar/gui/e-itip-control.c:918
 msgid "<i>None</i>"
 msgstr "<i>Немає</i>"
 
-#: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:929
+msgid "Location:"
+msgstr "Розташування:"
+
+#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Прийнято"
 
-#: calendar/gui/e-itip-control.c:959 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Експериментальний"
 
-#: calendar/gui/e-itip-control.c:963 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Відхилено"
 
-#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.c:1050
-#: calendar/gui/e-itip-control.c:1076 calendar/gui/e-itip-control.c:1089
-#: calendar/gui/e-itip-control.c:1102 calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
 msgid "Choose an action:"
 msgstr "Обрати дію:"
 
-#: calendar/gui/e-itip-control.c:1023
+#: calendar/gui/e-itip-control.c:1016
 msgid "Update"
 msgstr "Оновити"
 
-#: calendar/gui/e-itip-control.c:1024 calendar/gui/e-itip-control.c:1055
-#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1091
-#: calendar/gui/e-itip-control.c:1104 calendar/gui/e-itip-control.c:1117
-#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
+#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Гаразд"
 
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1044
 msgid "Accept"
 msgstr "Прийнято"
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1045
 msgid "Tentatively accept"
 msgstr "Прийняти для проби"
 
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1046
 msgid "Decline"
 msgstr "Відхилено"
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1070
 msgid "Send Free/Busy Information"
 msgstr "Опублікувати інформацію про зайнятість"
 
-#: calendar/gui/e-itip-control.c:1090
+#: calendar/gui/e-itip-control.c:1083
 msgid "Update respondent status"
 msgstr "Оновити стан учасників"
 
-#: calendar/gui/e-itip-control.c:1103
+#: calendar/gui/e-itip-control.c:1096
 msgid "Send Latest Information"
 msgstr "Надіслати останню інформацію"
 
-#: calendar/gui/e-itip-control.c:1116 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Скасувати"
 
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1185
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> опублікував відомості про засідання."
 
-#: calendar/gui/e-itip-control.c:1193
+#: calendar/gui/e-itip-control.c:1186
 msgid "Meeting Information"
 msgstr "Інформація про засідання"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1191
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> запитує присутність %s на засіданні."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1193
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> запитує вашу присутність на засіданні."
 
-#: calendar/gui/e-itip-control.c:1201
+#: calendar/gui/e-itip-control.c:1194
 msgid "Meeting Proposal"
 msgstr "План засідання"
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> бажає прийняти участь у засіданні."
 
-#: calendar/gui/e-itip-control.c:1206
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Update"
 msgstr "Оновлення засідання"
 
-#: calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1203
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> бажає отримати останню інформацію про засідання"
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1204
 msgid "Meeting Update Request"
 msgstr "Запит на оновлення засідання"
 
-#: calendar/gui/e-itip-control.c:1218
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> відповів на запит про участь у засіданні."
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Reply"
 msgstr "Відповідь про засідання"
 
-#: calendar/gui/e-itip-control.c:1226
+#: calendar/gui/e-itip-control.c:1219
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> скасував засідання."
 
-#: calendar/gui/e-itip-control.c:1227
+#: calendar/gui/e-itip-control.c:1220
 msgid "Meeting Cancellation"
 msgstr "Скасування засідання"
 
-#: calendar/gui/e-itip-control.c:1234 calendar/gui/e-itip-control.c:1302
-#: calendar/gui/e-itip-control.c:1337
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1330
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> надіслав незрозуміле повідомлення."
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1228
 msgid "Bad Meeting Message"
 msgstr "Неправильне повідомлення про засідання"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1253
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> опублікував відомості про завдання."
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1254
 msgid "Task Information"
 msgstr "Інформація про завдання"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1259
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> пропонує %s виконати завдання."
 
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> пропонує вам виконати завдання."
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1262
 msgid "Task Proposal"
 msgstr "План завдання"
 
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> бажає прийняти участь у виконанні завдання."
 
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Update"
 msgstr "Оновлення завдання"
 
-#: calendar/gui/e-itip-control.c:1278
+#: calendar/gui/e-itip-control.c:1271
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> бажає отримувати останню інформацію про завдання."
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1272
 msgid "Task Update Request"
 msgstr "Запит на оновлення завдання"
 
-#: calendar/gui/e-itip-control.c:1286
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> відповів на призначення завдання."
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Reply"
 msgstr "Відповідь по завданню"
 
-#: calendar/gui/e-itip-control.c:1294
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> скасував завдання."
 
-#: calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1288
 msgid "Task Cancellation"
 msgstr "Скасування завдання"
 
-#: calendar/gui/e-itip-control.c:1303
+#: calendar/gui/e-itip-control.c:1296
 msgid "Bad Task Message"
 msgstr "Неправильне повідомлення про завдання"
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1315
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> опублікував відомості про зайнятість."
 
-#: calendar/gui/e-itip-control.c:1323
+#: calendar/gui/e-itip-control.c:1316
 msgid "Free/Busy Information"
 msgstr "Інформація про зайнятість"
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> запитує відомості про зайнятість."
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1321
 msgid "Free/Busy Request"
 msgstr "Відповісти про зайнятість"
 
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1325
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> відповів про зайнятість."
 
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1326
 msgid "Free/Busy Reply"
 msgstr "Відповісти про зайнятість"
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1331
 msgid "Bad Free/Busy Message"
 msgstr "Неправильне повідомлення про зайнятість"
 
-#: calendar/gui/e-itip-control.c:1413
+#: calendar/gui/e-itip-control.c:1406
 msgid "The message does not appear to be properly formed"
 msgstr "Повідомлення сформовано неправильно"
 
-#: calendar/gui/e-itip-control.c:1472
+#: calendar/gui/e-itip-control.c:1465
 msgid "The message contains only unsupported requests."
 msgstr "Повідомлення містить тільки відповіді, що підтримуються"
 
-#: calendar/gui/e-itip-control.c:1503
+#: calendar/gui/e-itip-control.c:1496
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Долучений файл не містить правильно сформованого повідомлення"
 
-#: calendar/gui/e-itip-control.c:1535
+#: calendar/gui/e-itip-control.c:1528
 msgid "The attachment has no viewable calendar items"
 msgstr "Долучений файл не містить елементів календаря, які можна переглянути"
 
-#: calendar/gui/e-itip-control.c:1769
+#: calendar/gui/e-itip-control.c:1762
 msgid "Update complete\n"
 msgstr "Оновлення виконано\n"
 
-#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
+#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Неможливо оновити стан учасника, бо елемент вже не існує"
 
-#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Об'єкт є неправильним і не може бути оновлений\n"
 
-#: calendar/gui/e-itip-control.c:1825
+#: calendar/gui/e-itip-control.c:1818
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Ця відповідь не від поточного учасника. Додати його як учасника?"
 
-#: calendar/gui/e-itip-control.c:1837
+#: calendar/gui/e-itip-control.c:1830
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Неможливо оновити стан учасника, бо поточний стан не правильний!\n"
 
-#: calendar/gui/e-itip-control.c:1856
+#: calendar/gui/e-itip-control.c:1849
 msgid "There was an error on the CORBA system\n"
 msgstr "Трапилась помилка в системі CORBA\n"
 
-#: calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1852
 msgid "Object could not be found\n"
 msgstr "Неможливо знайти об'єкт\n"
 
-#: calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1855
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Ви не маєте прав для оновлення календарю\n"
 
-#: calendar/gui/e-itip-control.c:1865
+#: calendar/gui/e-itip-control.c:1858
 msgid "Attendee status updated\n"
 msgstr "Стан учасника оновлено!\n"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1861
 msgid "Attendee status could not be updated!\n"
 msgstr "Неможливо оновити стан учасника!\n"
 
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1892
 msgid "Removal Complete"
 msgstr "Видалення завершено"
 
-#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
 msgid "Item sent!\n"
 msgstr "Елемент відіслано!\n"
 
-#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
+#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
 msgid "The item could not be sent!\n"
 msgstr "Елемент не може бути відіслано!\n"
 
@@ -6544,74 +6287,74 @@ msgstr "дата-завершення"
 msgid "date-start"
 msgstr "дата-початку"
 
-#: calendar/gui/e-meeting-list-view.c:62
+#: calendar/gui/e-meeting-list-view.c:59
 msgid "Chair Persons"
 msgstr "Головуючі"
 
-#: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:479
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
 msgid "Required Participants"
 msgstr "Потрібні учасники"
 
-#: calendar/gui/e-meeting-list-view.c:64
+#: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Необов'язкові учасники"
 
-#: calendar/gui/e-meeting-list-view.c:65
+#: calendar/gui/e-meeting-list-view.c:62
 msgid "Resources"
 msgstr "Ресурси"
 
-#: calendar/gui/e-meeting-list-view.c:140 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
 #: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr "Індивідуальне"
 
-#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "Групове"
 
-#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr "Ресурс"
 
-#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr "Кімната"
 
-#: calendar/gui/e-meeting-list-view.c:154 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr "Місце"
 
-#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:127
 #: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
 msgid "Required Participant"
 msgstr "Потрібний учасник"
 
-#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr "Необов'язковий учасник"
 
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr "Не учасник"
 
-#: calendar/gui/e-meeting-list-view.c:179 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:177
 #: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
 msgid "Needs Action"
 msgstr "Необхідна дія"
 
-#: calendar/gui/e-meeting-list-view.c:182 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
 #: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "Експериментальний"
 
-#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr "Доручено"
@@ -6628,20 +6371,28 @@ msgstr "За межами офісу"
 msgid "No Information"
 msgstr "Немає інформації"
 
+#: calendar/gui/e-meeting-time-sel.c:417
+#, fuzzy
+msgid "Add attendees from addressbook"
+msgstr "Додати відправника в адресну книгу"
+
 #: calendar/gui/e-meeting-time-sel.c:440
 msgid "_Options"
 msgstr "Параметри"
 
 #: calendar/gui/e-meeting-time-sel.c:457
-msgid "Show _Only Working Hours"
+#, fuzzy
+msgid "Show _only working hours"
 msgstr "Показувати лише робочі години"
 
 #: calendar/gui/e-meeting-time-sel.c:467
-msgid "Show _Zoomed Out"
+#, fuzzy
+msgid "Show _zoomed out"
 msgstr "Показати зменшене"
 
 #: calendar/gui/e-meeting-time-sel.c:482
-msgid "_Update Free/Busy"
+#, fuzzy
+msgid "_Update free/busy"
 msgstr "Поновити зайнятість"
 
 #: calendar/gui/e-meeting-time-sel.c:497
@@ -6657,19 +6408,23 @@ msgid ">_>"
 msgstr "_>>"
 
 #: calendar/gui/e-meeting-time-sel.c:547
-msgid "_All People and Resources"
+#, fuzzy
+msgid "_All people and resources"
 msgstr "Всі люди і ресурси"
 
 #: calendar/gui/e-meeting-time-sel.c:556
-msgid "All _People and One Resource"
+#, fuzzy
+msgid "All _people and one resource"
 msgstr "Всі люди і один ресурс"
 
 #: calendar/gui/e-meeting-time-sel.c:565
-msgid "_Required People"
+#, fuzzy
+msgid "_Required people"
 msgstr "Потрібні люди"
 
 #: calendar/gui/e-meeting-time-sel.c:574
-msgid "Required People and _One Resource"
+#, fuzzy
+msgid "Required people and _one resource"
 msgstr "Потрібні люди і один ресурс"
 
 #: calendar/gui/e-meeting-time-sel.c:593
@@ -6707,7 +6462,7 @@ msgstr "%d.%m.%Y"
 msgid "Enter the password for %s"
 msgstr "Введіть пароль для %s"
 
-#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6716,19 +6471,14 @@ msgstr ""
 "Помилка на %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-
 #. FIXME Loading should be async
 #. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:686
+#: calendar/gui/e-tasks.c:801
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Відкривання завдань на %s"
 
-#: calendar/gui/e-tasks.c:709
+#: calendar/gui/e-tasks.c:824
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6737,53 +6487,48 @@ msgstr ""
 "Помилка на %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:730
+#: calendar/gui/e-tasks.c:845
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Завантаження зображень"
 
-#: calendar/gui/e-tasks.c:834
+#: calendar/gui/e-tasks.c:949
 msgid "Completing tasks..."
 msgstr "Завершення завдання..."
 
-#: calendar/gui/e-tasks.c:857
+#: calendar/gui/e-tasks.c:972
 msgid "Deleting selected objects..."
 msgstr "Стирання вибраних об'єктів"
 
-#: calendar/gui/e-tasks.c:884
+#: calendar/gui/e-tasks.c:999
 msgid "Expunging"
 msgstr "Викреслення"
 
-#: calendar/gui/e-tasks.c:960
+#: calendar/gui/e-tasks.c:1075
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
-#: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
+#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
+#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
 #: calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:705
 msgid "Tasks"
 msgstr "Завдання"
 
-#: calendar/gui/gnome-cal.c:1876
+#: calendar/gui/gnome-cal.c:1878
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Немає зустрічей."
 
-#: calendar/gui/gnome-cal.c:1895
+#: calendar/gui/gnome-cal.c:1897
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Завантаження зображень"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1920
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Відкрити в %s..."
 
-#: calendar/gui/gnome-cal.c:2048
-#, c-format
-msgid "The calendar backend for '%s' has crashed."
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:2894
+#: calendar/gui/gnome-cal.c:2906
 #, fuzzy
 msgid "Purging"
 msgstr "Турін"
@@ -6981,7 +6726,7 @@ msgid "On The Web"
 msgstr ""
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 
@@ -6992,7 +6737,7 @@ msgid "Unable to migrate calendar `%s'"
 msgstr "Відказано в доступі при відкриття календарю"
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:869
+#: calendar/gui/migration.c:889
 #, fuzzy, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Не вдалося відкрити адресну книгу"
@@ -7228,73 +6973,73 @@ msgstr "Надрукувати елемент"
 msgid "Print Setup"
 msgstr "Параметри друку"
 
-#: calendar/gui/tasks-component.c:303
+#: calendar/gui/tasks-component.c:313
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:371
 #, fuzzy
 msgid "New Task List"
 msgstr "Список завдань"
 
-#: calendar/gui/tasks-component.c:398
+#: calendar/gui/tasks-component.c:408
 #, fuzzy, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "Немає завдань"
 msgstr[1] "Немає завдань"
 
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] "%d вибрано"
 msgstr[1] "%d вибрано"
 
-#: calendar/gui/tasks-component.c:447
+#: calendar/gui/tasks-component.c:457
 #, fuzzy
 msgid "Failed upgrading tasks."
 msgstr "Завантаження зображень"
 
-#: calendar/gui/tasks-component.c:526
+#: calendar/gui/tasks-component.c:749
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:538
+#: calendar/gui/tasks-component.c:761
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:576
+#: calendar/gui/tasks-component.c:799
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:804
+#: calendar/gui/tasks-component.c:1040
 msgid "New task"
 msgstr "Нове завдання"
 
-#: calendar/gui/tasks-component.c:805
+#: calendar/gui/tasks-component.c:1041
 msgid "_Task"
 msgstr "Завдання"
 
-#: calendar/gui/tasks-component.c:806
+#: calendar/gui/tasks-component.c:1042
 msgid "Create a new task"
 msgstr "Створити нову завдання"
 
-#: calendar/gui/tasks-component.c:812
+#: calendar/gui/tasks-component.c:1048
 #, fuzzy
 msgid "New tasks group"
 msgstr "Нове завдання"
 
-#: calendar/gui/tasks-component.c:813
+#: calendar/gui/tasks-component.c:1049
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Список завдань"
 
-#: calendar/gui/tasks-component.c:814
+#: calendar/gui/tasks-component.c:1050
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Створити нову завдання"
@@ -9067,12 +8812,12 @@ msgstr "Помилка виконання фільтрованого пошук�
 msgid "Unsupported operation: append message: for %s"
 msgstr "Операція не підтримується: додавання повідомлення: для %s"
 
-#: camel/camel-folder.c:1259
+#: camel/camel-folder.c:1262
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Операція не підтримується: пошук за виразом: для %s"
 
-#: camel/camel-folder.c:1299
+#: camel/camel-folder.c:1302
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr ""
@@ -9086,11 +8831,16 @@ msgstr "Перенесення повідомлень"
 msgid "Copying messages"
 msgstr "Копіювання повідомлень"
 
-#: camel/camel-folder.c:1666
-msgid "Learning junk and/or non junk message(s)"
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Попередження"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
 msgstr ""
 
-#: camel/camel-folder.c:1695
+#: camel/camel-folder.c:1701
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "Отримання %d повідомлень"
@@ -9125,17 +8875,17 @@ msgstr ""
 msgid "(match-threads) requires a match type string"
 msgstr ""
 
-#: camel/camel-folder-search.c:785
+#: camel/camel-folder-search.c:784
 #, fuzzy
 msgid "(match-threads) expects an array result"
 msgstr "(співпадають всі) потребує єдиного логічного результату"
 
-#: camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:790
 #, fuzzy
 msgid "(match-threads) requires the folder set"
 msgstr "(співпадають всі) потребує єдиного логічного результату"
 
-#: camel/camel-folder-search.c:880
+#: camel/camel-folder-search.c:879
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Виконання запиту на невідомий заголовок: %s"
@@ -9170,7 +8920,8 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
 #: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:706
+#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Відмінено."
@@ -9552,7 +9303,7 @@ msgstr "Строк дії вказаних мандатів вийшов."
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1212
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Неправильна автентифікація від сервера."
 
@@ -9936,40 +9687,40 @@ msgstr "Команди не реалізовано"
 msgid "export keys: unimplemented"
 msgstr ""
 
-#: camel/camel-store.c:214
+#: camel/camel-store.c:213
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Не вдалося отримати теку: неприпустима операція у цьому сховище"
 
-#: camel/camel-store.c:244
+#: camel/camel-store.c:243
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr "Не вдалося отримати теку: %s: %s"
 
-#: camel/camel-store.c:295
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Не вдалося створити теку: неприпустима операція у цьому сховище"
 
-#: camel/camel-store.c:323
+#: camel/camel-store.c:325
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Не вдалося отримати теку: %s: %s"
 
-#: camel/camel-store.c:387 camel/camel-vee-store.c:354
+#: camel/camel-store.c:389 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Неможливо стерти теку: %s: неправильна операція"
 
-#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#: camel/camel-store.c:439 camel/camel-vee-store.c:387
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Неможливо перейменувати теку: %s: неправильна операція"
 
-#: camel/camel-store.c:811
+#: camel/camel-store.c:777
 msgid "Trash"
 msgstr "Смітник"
 
-#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
-#: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/mail-config.glade.h:95
+#: ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
 msgstr "Червень"
@@ -10201,12 +9952,12 @@ msgstr "Неправильне повідомлення %s в %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Неможливо скопіювати або перенести повідомлення до Віртуальної Теки"
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:374
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Неможливо стерти теку: %s: немає такої теки"
 
-#: camel/camel-vee-store.c:398
+#: camel/camel-vee-store.c:395
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Неможливо перейменувати теку: %s: немає такої теки"
@@ -10253,31 +10004,31 @@ msgstr "Адресна книга"
 msgid "Post Office Agent SOAP Port:"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:80
+#: camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "Novell GroupWise"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:82
+#: camel/providers/groupwise/camel-groupwise-provider.c:85
 msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: camel/providers/groupwise/camel-groupwise-provider.c:100
 #: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
 msgid "Password"
 msgstr "Пароль"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:99
+#: camel/providers/groupwise/camel-groupwise-provider.c:102
 #: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Під'єднуватись до IMAP серверу з використанням незашифрованого паролю."
 
-#: camel/providers/groupwise/camel-gw-listener.c:305
-#: camel/providers/groupwise/camel-gw-listener.c:328
+#: camel/providers/groupwise/camel-gw-listener.c:312
+#: camel/providers/groupwise/camel-gw-listener.c:335
 #, fuzzy
 msgid "Checklist"
 msgstr "Сильна мгла"
@@ -10420,13 +10171,13 @@ msgid ""
 msgstr "Під'єднуватись до IMAP серверу з використанням незашифрованого паролю."
 
 #: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:429
+#: camel/providers/imap/camel-imap-store.c:428
 #, c-format
 msgid "IMAP server %s"
 msgstr "Сервер IMAP %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:431
+#: camel/providers/imap/camel-imap-store.c:430
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "IMAP сервіс для %s на %s"
@@ -10436,7 +10187,7 @@ msgstr "IMAP сервіс для %s на %s"
 #: camel/providers/imap/camel-imap-store.c:551
 #: camel/providers/imap/camel-imap-store.c:571
 #: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
+#: camel/providers/nntp/camel-nntp-store.c:209
 #: camel/providers/pop3/camel-pop3-store.c:175
 #: camel/providers/smtp/camel-smtp-transport.c:269
 #: camel/providers/smtp/camel-smtp-transport.c:285
@@ -10454,10 +10205,10 @@ msgstr "TLS недоступна"
 
 #: camel/providers/imap4/camel-imap4-store.c:222
 #: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:815
+#: camel/providers/imap/camel-imap-store.c:845
 #: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:137
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
 #: camel/providers/pop3/camel-pop3-store.c:192
 msgid "Connection cancelled"
 msgstr "З'єднання скасовано"
@@ -10470,8 +10221,8 @@ msgid ""
 msgstr "Неможливо під'єднатисья до IMAP серверу %s в безпечному режимі: %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:649
-#: camel/providers/imap/camel-imap-store.c:680
+#: camel/providers/imap/camel-imap-store.c:679
+#: camel/providers/imap/camel-imap-store.c:710
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Неможливо під'єднатисья до IMAP серверу %s в безпечному режимі: %s"
@@ -10480,7 +10231,7 @@ msgstr "Неможливо під'єднатисья до IMAP серверу %s
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1109
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
 msgid "Unknown error"
 msgstr "Невідома помилка"
 
@@ -10508,8 +10259,8 @@ msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr "Не вдалося отримати теку: %s: %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1857
-#: camel/providers/imap/camel-imap-store.c:2235
+#: camel/providers/imap/camel-imap-store.c:1885
+#: camel/providers/imap/camel-imap-store.c:2263
 #, fuzzy, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -10588,12 +10339,12 @@ msgstr "Сервер несподівано розірвав з'єднання:
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3168
+#: camel/providers/imap/camel-imap-store.c:3194
 msgid "Operation cancelled"
 msgstr "Операцію скасовано"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3171
+#: camel/providers/imap/camel-imap-store.c:3197
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Сервер несподівано розірвав з'єднання: %s"
@@ -10657,13 +10408,6 @@ msgid "Unable to retrieve message: %s"
 msgstr "Неможливо знайти повідомлення: %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:219
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -10673,15 +10417,15 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-mbox-folder.c:418
+#: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
 msgstr "Неправильне повідомлення"
 
 #: camel/providers/imap/camel-imap-folder.c:2019
-#: camel/providers/imap/camel-imap-folder.c:2621
-#: camel/providers/nntp/camel-nntp-folder.c:238
+#: camel/providers/imap/camel-imap-folder.c:2622
+#: camel/providers/nntp/camel-nntp-folder.c:220
 msgid "This message is not currently available"
 msgstr "Цього повідомлення зараз не існує"
 
@@ -10690,7 +10434,23 @@ msgstr "Цього повідомлення зараз не існує"
 msgid "Fetching summary information for new messages"
 msgstr "Отримання інформації про нові повідомлення"
 
-#: camel/providers/imap/camel-imap-folder.c:2659
+#: camel/providers/imap/camel-imap-folder.c:2463
+#, c-format
+msgid "Incomplete server response: no information provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2471
+#, c-format
+msgid "Incomplete server response: no UID provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2484
+#, c-format
+msgid ""
+"Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2660
 msgid "Could not find message body in FETCH response."
 msgstr "Не вдалося знайти тіла повідомлення у відповіді на FETCH."
 
@@ -10755,43 +10515,43 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Для зчитування та збереження пошти на серверах IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/imap/camel-imap-store.c:680
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "Розширення SSL/TLS не підтримується"
 
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:711
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "Збій при встановленні сеансу SSL"
 
-#: camel/providers/imap/camel-imap-store.c:818
+#: camel/providers/imap/camel-imap-store.c:848
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Не вдалося з'єднатись з %s (порт %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:1242
+#: camel/providers/imap/camel-imap-store.c:1272
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "Сервер IMAP %s не підтримує запитаного типу автентифікації %s"
 
-#: camel/providers/imap/camel-imap-store.c:1252
+#: camel/providers/imap/camel-imap-store.c:1282
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Немає підтримки автентифікації типу %s"
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1305
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sБудь ласка, введіть пароль IMAP для %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1289
+#: camel/providers/imap/camel-imap-store.c:1319
 msgid "You didn't enter a password."
 msgstr "Ви не ввели пароль."
 
-#: camel/providers/imap/camel-imap-store.c:1318
+#: camel/providers/imap/camel-imap-store.c:1348
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10802,18 +10562,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1839
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:1867
+#: camel/providers/imap/camel-imap-store.c:2057
 #, c-format
 msgid "No such folder %s"
 msgstr "Теки \"%s\" не існує"
 
-#: camel/providers/imap/camel-imap-store.c:1915
-#: camel/providers/imap/camel-imap-store.c:2296
+#: camel/providers/imap/camel-imap-store.c:1943
+#: camel/providers/imap/camel-imap-store.c:2324
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Батьківська тека не дозволяє розміщувати підтеки"
 
-#: camel/providers/imap/camel-imap-store.c:1970
+#: camel/providers/imap/camel-imap-store.c:1998
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10821,7 +10581,7 @@ msgstr "Батьківська тека не дозволяє розміщува
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Не вдалося отримати теку: %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:2274
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Невідома батьківська тека: %s"
@@ -10855,20 +10615,20 @@ msgid "Index message body data"
 msgstr "Відіслати повідомлення за контактом"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:388
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:393
-#: camel/providers/local/camel-local-folder.c:396
+#: camel/providers/local/camel-local-folder.c:392
+#: camel/providers/local/camel-local-folder.c:395
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "поштова скринька:%s (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:400
+#: camel/providers/local/camel-local-folder.c:399
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -10929,7 +10689,7 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:142
 #: camel/providers/local/camel-local-store.c:253
-#: camel/providers/local/camel-mbox-store.c:356
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -11002,8 +10762,25 @@ msgstr "Відмінено додавання повідомлення у maildi
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Неможливо додати повідомлення у теку maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:226
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mbox-folder.c:417
+#: camel/providers/local/camel-mbox-folder.c:436
+#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:475
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-mh-folder.c:221
+#, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+"Неможливо отримати повідомлення \"%s\" з теки \"%s\"\n"
+"  %s"
+
+#: camel/providers/local/camel-maildir-folder.c:236
 msgid "Invalid message contents"
 msgstr "Неправильний вміст повідомлення"
 
@@ -11044,9 +10821,9 @@ msgstr "Не вдалось стерти теку \"%s\": %s"
 msgid "not a maildir directory"
 msgstr "каталог не Maildir"
 
-#: camel/providers/local/camel-maildir-store.c:341
-#: camel/providers/local/camel-spool-store.c:286
-#: camel/providers/local/camel-spool-store.c:316
+#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-spool-store.c:284
+#: camel/providers/local/camel-spool-store.c:314
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Не вдалось просканувати теку \"%s\": %s"
@@ -11093,27 +10870,18 @@ msgstr "Додавання пошти відмінено"
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Неможливо додати повідомлення до файлу Mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:435
-#: camel/providers/local/camel-mbox-folder.c:466
-#: camel/providers/local/camel-mbox-folder.c:474
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"Неможливо отримати повідомлення \"%s\" з теки \"%s\"\n"
-"  %s"
-
-#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:468
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Схоже тека непоправно зіпсована."
 
-#: camel/providers/local/camel-mbox-folder.c:475
-msgid "Message construction failed: Corrupt mailbox?"
+#: camel/providers/local/camel-mbox-folder.c:476
+#: camel/providers/local/camel-mh-folder.c:222
+#, fuzzy
+msgid "Message construction failed."
 msgstr "Збій побудови повідомлення: зіпсовано поштову скриньку?"
 
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:362
+#: camel/providers/local/camel-mbox-store.c:361
 #, fuzzy
 msgid "Cannot create a folder by this name."
 msgstr "Неможливо створити теку з цією назвою"
@@ -11144,32 +10912,32 @@ msgstr "\"%s\" не є звичайним файлом."
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Тека \"%s\" не порожня. Не стерто."
 
-#: camel/providers/local/camel-mbox-store.c:375
+#: camel/providers/local/camel-mbox-store.c:374
 #, fuzzy, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Не вдалося створити каталог %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:389
+#: camel/providers/local/camel-mbox-store.c:388
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Не вдалося отримати теку: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:391
+#: camel/providers/local/camel-mbox-store.c:390
 #, fuzzy
 msgid "Folder already exists"
 msgstr "Ідентифікатор картки вже існує"
 
-#: camel/providers/local/camel-mbox-store.c:473
+#: camel/providers/local/camel-mbox-store.c:472
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "Вказана назва теки не правильна: %s"
 
-#: camel/providers/local/camel-mbox-store.c:486
+#: camel/providers/local/camel-mbox-store.c:485
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Не вдалося перейменувати теку \"%s\": %s"
 
-#: camel/providers/local/camel-mbox-store.c:561
+#: camel/providers/local/camel-mbox-store.c:560
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Не вдалося перейменувати теку \"%s\" на \"%s\": %s"
@@ -11362,7 +11130,7 @@ msgstr ""
 "Можливо тека пошкоджена, копію збережено у `%s'"
 
 #: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:997
+#: camel/providers/nntp/camel-nntp-store.c:1126
 #, fuzzy, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "%sВведіть SMTP пароль для %s@%s"
@@ -11380,18 +11148,10 @@ msgstr "Неможливо з'єднатись з сервером LDAP"
 msgid "Server rejected username/password"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:263
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr "Скасовано користувачем"
-
-#: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:259
-#: camel/providers/nntp/camel-nntp-folder.c:265
+#: camel/providers/nntp/camel-nntp-folder.c:147
+#: camel/providers/nntp/camel-nntp-folder.c:149
+#: camel/providers/nntp/camel-nntp-folder.c:158
+#: camel/providers/nntp/camel-nntp-folder.c:234
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11400,66 +11160,53 @@ msgstr "Скасовано користувачем"
 msgid "Cannot get message %s: %s"
 msgstr "Неможливо отримати повідомлення %s: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:188
-#: camel/providers/nntp/camel-nntp-folder.c:228
+#: camel/providers/nntp/camel-nntp-folder.c:156
+#: camel/providers/nntp/camel-nntp-folder.c:232
+#: camel/providers/nntp/camel-nntp-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+msgid "User cancelled"
+msgstr "Скасовано користувачем"
+
+#: camel/providers/nntp/camel-nntp-folder.c:176
+#: camel/providers/nntp/camel-nntp-folder.c:208
 #, c-format
 msgid "Internal error: uid in invalid format: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:201
-#, fuzzy, c-format
-msgid "Could not get article %s from NNTP server"
-msgstr "Не вдалося отримати групу: %s"
-
-#: camel/providers/nntp/camel-nntp-folder.c:362
-msgid "Posting not allowed by news server"
-msgstr ""
-
+#: camel/providers/nntp/camel-nntp-folder.c:328
+#: camel/providers/nntp/camel-nntp-folder.c:331
 #: camel/providers/nntp/camel-nntp-folder.c:373
-#, c-format
-msgid "Failed to send newsgroups header: %s: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:413
-#: camel/providers/nntp/camel-nntp-folder.c:426
-#, c-format
-msgid "Error posting to newsgroup: %s: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:438
-msgid "Error reading response to posted message: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:441
+#: camel/providers/nntp/camel-nntp-folder.c:375
 #, fuzzy, c-format
-msgid "Error posting message: %s: message not posted"
-msgstr ""
-"Помилка автозбереження файлу: %s\n"
-" %s"
+msgid "Posting failed: %s"
+msgstr "Збій операції: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:457
+#: camel/providers/nntp/camel-nntp-folder.c:393
 msgid "You cannot post NNTP messages while working offline!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:468
+#: camel/providers/nntp/camel-nntp-folder.c:404
 #, fuzzy
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Не вдалося закрити тимчасову теку: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:44
 #, fuzzy
 msgid "Could not get group list from server."
 msgstr "Не вдалося отримати групу: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#: camel/providers/nntp/camel-nntp-grouplist.c:97
+#: camel/providers/nntp/camel-nntp-grouplist.c:106
 #, fuzzy, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr ""
 "Неможливо створити файл виводу: %s\n"
 " %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#: camel/providers/nntp/camel-nntp-grouplist.c:157
 #, fuzzy, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr ""
@@ -11491,27 +11238,29 @@ msgstr ""
 "Під'єднання до NNTP серверу буде виконуватись з використанням незашифрованих "
 "паролів."
 
-#: camel/providers/nntp/camel-nntp-store.c:158
+#: camel/providers/nntp/camel-nntp-store.c:118
+#: camel/providers/nntp/camel-nntp-store.c:1233
+#: camel/providers/nntp/camel-nntp-store.c:1331
+#, c-format
+msgid "NNTP Command failed: %s"
+msgstr "Збій команди NNTP: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:227
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Не вдалося прочитати вітання %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:170
+#: camel/providers/nntp/camel-nntp-store.c:239
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP сервер %s повернув код помилки %d: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:326
+#: camel/providers/nntp/camel-nntp-store.c:403
 #, c-format
 msgid "USENET News via %s"
 msgstr "Новини USENET через %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:640
-#, fuzzy
-msgid "Stream error"
-msgstr "помилка аналізу"
-
-#: camel/providers/nntp/camel-nntp-store.c:643
+#: camel/providers/nntp/camel-nntp-store.c:777
 #, fuzzy, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -11521,75 +11270,75 @@ msgstr ""
 "Помилка при збереженні до: %s:\n"
 " %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:735
+#: camel/providers/nntp/camel-nntp-store.c:872
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
 "No such newsgroup. The selected item is a probably a parent folder."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:767
+#: camel/providers/nntp/camel-nntp-store.c:904
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
 "newsgroup does not exist!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:792
+#: camel/providers/nntp/camel-nntp-store.c:929
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:800
+#: camel/providers/nntp/camel-nntp-store.c:937
 #, fuzzy
 msgid "You cannot rename a folder in a News store."
 msgstr "Не вдалося перейменувати теку \"%s\" на \"%s\": %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:808
+#: camel/providers/nntp/camel-nntp-store.c:945
 #, fuzzy
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "Неможливо перенести теку у її власну підтеку."
 
-#: camel/providers/nntp/camel-nntp-summary.c:253
-#, fuzzy, c-format
-msgid "Connection error: %s"
-msgstr "Невідома помилка: %s"
-
-#: camel/providers/nntp/camel-nntp-summary.c:262
-#, c-format
-msgid "No such folder: %s"
-msgstr "Теки \"%s\" не існує"
+#: camel/providers/nntp/camel-nntp-store.c:1118
+#, fuzzy
+msgid "Authentication requested but not username provided"
+msgstr "Вимагається автентифікація"
 
-#: camel/providers/nntp/camel-nntp-summary.c:268
-#, c-format
-msgid "Could not get group: %s"
-msgstr "Не вдалося отримати групу: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1146
+#, fuzzy, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr "Не вдалось пройти реєстрацію на POP сервері %s: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:333
+#: camel/providers/nntp/camel-nntp-store.c:1262
 #, fuzzy
-msgid "Could not get messages: unspecified error"
-msgstr "Не вдалося відіслати повідомлення: %s"
+msgid "Not connected."
+msgstr "Показати контакти"
 
-#: camel/providers/nntp/camel-nntp-summary.c:378
+#: camel/providers/nntp/camel-nntp-store.c:1311
 #, c-format
-msgid "NNTP Command failed: %s"
-msgstr "Збій команди NNTP: %s"
+msgid "No such folder: %s"
+msgstr "Теки \"%s\" не існує"
 
-#: camel/providers/nntp/camel-nntp-summary.c:438
-#: camel/providers/nntp/camel-nntp-summary.c:543
+#: camel/providers/nntp/camel-nntp-summary.c:218
+#: camel/providers/nntp/camel-nntp-summary.c:314
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: пошук нових повідомлень"
 
-#: camel/providers/nntp/camel-nntp-summary.c:558
-#, c-format
-msgid "Unknown server response: %s"
-msgstr "Невідома відповідь сервера: %s"
+#: camel/providers/nntp/camel-nntp-summary.c:225
+#, fuzzy, c-format
+msgid "Unexpected server response from xover: %s"
+msgstr "Неочікувана відповідь від сервера IMAP: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:605
+#: camel/providers/nntp/camel-nntp-summary.c:328
+#, fuzzy, c-format
+msgid "Unexpected server response from head: %s"
+msgstr "Неочікувана відповідь від GnuPG: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:368
 msgid "Use cancel"
 msgstr "Використовуйте скасування"
 
-#: camel/providers/nntp/camel-nntp-summary.c:607
+#: camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Збій операції: %s"
@@ -11637,7 +11386,7 @@ msgstr "Стирати по завершенню %s днів"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107
 msgid "POP"
 msgstr "POP"
 
@@ -11726,7 +11475,7 @@ msgid "No such folder `%s'."
 msgstr "Теки \"%s\" не існує."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:132
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -11780,7 +11529,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Відправлення пошти через програму sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:119
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -12075,19 +11824,19 @@ msgstr "%.0fМб"
 msgid "%.0fG"
 msgstr "%.0fГб"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
+#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:408
 msgid "attachment"
 msgstr "долучення"
 
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:454
 msgid "Remove selected items from the attachment list"
 msgstr "Видалити вибрані елементи з списку долучень"
 
-#: composer/e-msg-composer-attachment-bar.c:491
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Add attachment..."
 msgstr "Долучити..."
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:495
 msgid "Attach a file to the message"
 msgstr "Долучити файл до повідомлення"
 
@@ -12153,7 +11902,7 @@ msgstr "(Неназване повідомлення)"
 msgid "Open file"
 msgstr "Відкрити файл"
 
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
 msgid "Autogenerated"
 msgstr "Згенеровано автоматично"
 
@@ -12302,17 +12051,17 @@ msgstr "Долучити файл(и)"
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
+msgid "You cannot attach the file `{0}' to this message."
 msgstr "Долучити файл до повідомлення"
 
 #. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4
-msgid "${1}"
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
 msgstr ""
 
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
 
 #. mail-composer:attach-directory primary
@@ -12407,7 +12156,7 @@ msgstr "Не вдалося створити канал: %s"
 
 #. mail-composer:no-build-message secondary
 #: composer/mail-composer-errors.xml.h:34
-msgid "Because \"${0}\", you may need to select different mail options."
+msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
@@ -12417,8 +12166,10 @@ msgid "Could not read signature file \"{0}\"."
 msgstr "Не вдалося зберегти файл підпису: %s"
 
 #. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38
-msgid "Because \"${1}\"."
+#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted primary
@@ -12846,11 +12597,11 @@ msgid "<b>Then</b>"
 msgstr "<b>Обумовлена дата:</b> "
 
 #: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1335
+#: mail/mail-account-gui.c:1347
 msgid "Select Folder"
 msgstr "Вибір теки"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
 #, fuzzy
 msgid "    "
 msgstr "      "
@@ -12909,7 +12660,7 @@ msgstr "тому"
 msgid "months"
 msgstr "місяців"
 
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
 msgid "seconds"
 msgstr "секунд"
 
@@ -12941,20 +12692,20 @@ msgstr "з усіма локальними теками"
 msgid "years"
 msgstr "років"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:916
-#: mail/mail-config.c:76 mail/mail-config.glade.h:90
+#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
+#: mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Важливо"
 
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:919 mail/mail-config.c:79
-#: mail/mail-config.glade.h:145
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: mail/mail-config.glade.h:148
 msgid "To Do"
 msgstr "Потрібно зробити"
 
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:920 mail/mail-config.c:80
-#: mail/mail-config.glade.h:94
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: mail/mail-config.glade.h:97
 msgid "Later"
 msgstr "Пізніше"
 
@@ -13012,257 +12763,6 @@ msgstr "вхідні"
 msgid "outgoing"
 msgstr "вихідні"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Adjust Score"
-msgstr "Скорегувати вагу"
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Color"
-msgstr "Призначити колір"
-
-#: filter/libfilter-i18n.h:4
-msgid "Assign Score"
-msgstr "Призначити вагу"
-
-#: filter/libfilter-i18n.h:5
-msgid "Attachments"
-msgstr "Долучення"
-
-#: filter/libfilter-i18n.h:6
-msgid "Beep"
-msgstr "Звукове повідомлення"
-
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "містить"
-
-#: filter/libfilter-i18n.h:8
-msgid "Copy to Folder"
-msgstr "Скопіювати у теку"
-
-#: filter/libfilter-i18n.h:9
-msgid "Date received"
-msgstr "Дата отримання"
-
-#: filter/libfilter-i18n.h:10
-msgid "Date sent"
-msgstr "Дата відсилання"
-
-#: filter/libfilter-i18n.h:12
-msgid "Deleted"
-msgstr "Стерто"
-
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "не містить"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "не закінчується на"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "не існує"
-
-#: filter/libfilter-i18n.h:16
-msgid "does not return"
-msgstr "не повертається"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "не схоже на"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "не починається з"
-
-#: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
-msgstr "не існують"
-
-#: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr "Чернетка"
-
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "закінчується на"
-
-#: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr "Існують"
-
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "існує"
-
-#: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr "Вираз"
-
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr ""
-
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "співпадає з"
-
-#: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr "після"
-
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr "перед"
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr "Відмічено"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "більше"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "менше"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "не співпадає з"
-
-#: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr "не відмічено"
-
-#: filter/libfilter-i18n.h:36
-#, fuzzy
-msgid "Junk Test"
-msgstr "Червень"
-
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
-#: widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Позначка"
-
-#: filter/libfilter-i18n.h:38
-msgid "Mailing list"
-msgstr "Список листування"
-
-#: filter/libfilter-i18n.h:39
-msgid "Message Body"
-msgstr "Тіло повідомлення"
-
-#: filter/libfilter-i18n.h:40
-msgid "Message Header"
-msgstr "Заголовок повідомлення"
-
-#: filter/libfilter-i18n.h:41
-#, fuzzy
-msgid "Message is Junk"
-msgstr "Повідомлення"
-
-#: filter/libfilter-i18n.h:42
-#, fuzzy
-msgid "Message is not Junk"
-msgstr "Позначити як важливе"
-
-#: filter/libfilter-i18n.h:43
-msgid "Move to Folder"
-msgstr "Перенести в теку"
-
-#: filter/libfilter-i18n.h:44
-#, fuzzy
-msgid "Pipe to Program"
-msgstr "Вийти з програми"
-
-#: filter/libfilter-i18n.h:45
-msgid "Play Sound"
-msgstr "Відтворити звук"
-
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Прочитано"
-
-#: filter/libfilter-i18n.h:47
-msgid "Recipients"
-msgstr "Адресати"
-
-#: filter/libfilter-i18n.h:48
-msgid "Regex Match"
-msgstr "Відповідність  рег.виразу"
-
-#: filter/libfilter-i18n.h:49
-msgid "Replied to"
-msgstr "Відповісти"
-
-#: filter/libfilter-i18n.h:50
-msgid "returns"
-msgstr "повертає"
-
-#: filter/libfilter-i18n.h:51
-msgid "returns greater than"
-msgstr "повертає більше ніж"
-
-#: filter/libfilter-i18n.h:52
-msgid "returns less than"
-msgstr "повертає менше ніж"
-
-#: filter/libfilter-i18n.h:53
-#, fuzzy
-msgid "Run Program"
-msgstr "Запустити програму:"
-
-#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Підрахунок"
-
-#: filter/libfilter-i18n.h:55
-msgid "Sender"
-msgstr "Відправник"
-
-#: filter/libfilter-i18n.h:56
-msgid "Set Status"
-msgstr "Встановити стан"
-
-#: filter/libfilter-i18n.h:57
-msgid "Size (kB)"
-msgstr "Розмір (КБ)"
-
-#: filter/libfilter-i18n.h:58
-msgid "sounds like"
-msgstr "схоже на"
-
-#: filter/libfilter-i18n.h:59
-msgid "Source Account"
-msgstr "Обліковий рахунок відправника"
-
-#: filter/libfilter-i18n.h:60
-msgid "Specific header"
-msgstr "Особливий заголовок"
-
-#: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "починається на"
-
-#: filter/libfilter-i18n.h:63
-msgid "Stop Processing"
-msgstr "Зупинити обробку"
-
-#: filter/libfilter-i18n.h:64 mail/em-format.c:755 mail/em-format-html.c:1519
-#: mail/em-format-quote.c:302 mail/em-mailer-prefs.c:87
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
-#: smime/lib/e-cert.c:1079
-msgid "Subject"
-msgstr "Тема"
-
-#: filter/libfilter-i18n.h:65
-msgid "Unset Status"
-msgstr "Скинути стан:"
-
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Додати правило"
@@ -13280,6 +12780,11 @@ msgstr "Назва правила"
 msgid "_Score Rules"
 msgstr "Правила підрахунку"
 
+#: filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Підрахунок"
+
 #: filter/searchtypes.xml.h:1
 msgid "Body contains"
 msgstr "Тіло містить"
@@ -13361,13 +12866,13 @@ msgstr "Підписи"
 msgid "-------- Forwarded Message --------"
 msgstr "Переслане повідомлення"
 
-#: mail/em-composer-utils.c:1499
+#: mail/em-composer-utils.c:1495
 msgid "an unknown sender"
 msgstr "невідомий відправник"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1509
+#: mail/em-composer-utils.c:1505
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "%a, %Y-%m-%d у %H:%M, %%s написав:"
@@ -13410,8 +12915,8 @@ msgstr "<клацніть тут для вибору теки>"
 msgid "Create New Folder"
 msgstr "Створити нову теку"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
-#: mail/mail-component.c:701
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
+#: mail/mail-component.c:704
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Вкажіть, де створити теку:"
@@ -13427,109 +12932,110 @@ msgstr "Кортез"
 msgid "Folder _name:"
 msgstr "Назва теки:"
 
-#: mail/em-folder-tree.c:839
+#: mail/em-folder-tree.c:833
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Видалення теки %s"
 
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree.c:835
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Відкривання теки %s"
 
-#: mail/em-folder-tree.c:848 mail/message-list.c:1555
+#: mail/em-folder-tree.c:842 mail/message-list.c:1561
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Перенесення повідомлень у %s"
 
-#: mail/em-folder-tree.c:850 mail/message-list.c:1557
+#: mail/em-folder-tree.c:844 mail/message-list.c:1563
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Копіювання повідомлень у %s"
 
-#: mail/em-folder-tree.c:866
+#: mail/em-folder-tree.c:860
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Неможливо скопіювати або перенести повідомлення до Віртуальної Теки"
 
-#: mail/em-folder-tree.c:956 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "С_копіювати у теку"
 
-#: mail/em-folder-tree.c:957 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "Пере_нести в теку"
 
-#: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2069
-#: mail/em-folder-tree.c:2551 mail/em-folder-view.c:798
-#: mail/message-list.c:1645
+#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
+#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
+#: mail/message-list.c:1651
 #, fuzzy
 msgid "_Move"
 msgstr "Перенести"
 
-#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#: mail/em-folder-tree.c:955 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "Скасувати завдання"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
 #: mail/em-folder-view.c:798 mail/em-folder-view.c:812
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Вибрати теку"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
 #, fuzzy
 msgid "C_opy"
 msgstr "Скопіювати"
 
-#: mail/em-folder-tree.c:2096
+#: mail/em-folder-tree.c:2088
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Збереження теки \"%s\""
 
-#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
+#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
 #, fuzzy
 msgid "Create folder"
 msgstr "Створити нову теку"
 
-#: mail/em-folder-tree.c:2474
+#: mail/em-folder-tree.c:2463
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Перейменувати теку \"%s\" на:"
 
-#: mail/em-folder-tree.c:2476
+#: mail/em-folder-tree.c:2465
 #, fuzzy
 msgid "Rename Folder"
 msgstr "Перейменувати теку"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Вигляд"
 
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2537
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Відкрити у новому вікні"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2555
+#: mail/em-folder-tree.c:2546
 #, fuzzy
 msgid "_New Folder..."
 msgstr "Нова тека"
 
-#: mail/em-folder-tree.c:2558
+#: mail/em-folder-tree.c:2549
 msgid "_Rename"
 msgstr "Перейменувати"
 
-#: mail/em-folder-tree.c:2561 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "Властивості..."
 
 #: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:889
+#: mail/mail-vfolder.c:888
 msgid "VFolders"
 msgstr "Вірт.теки"
 
@@ -13543,19 +13049,19 @@ msgstr ""
 msgid "Inbox"
 msgstr "Вхідні"
 
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
 msgid "Loading..."
 msgstr "Завантаження..."
 
 #: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
 #: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
 #: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:551
+#: mail/mail-component.c:554
 msgid "Mail"
 msgstr "Пошта"
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "Виправити як нове повідомлення..."
@@ -13568,17 +13074,17 @@ msgstr "Друкувати"
 msgid "_Reply to Sender"
 msgstr "Відповісти відправнику"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:810
+#: mail/em-folder-view.c:901 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Відповісти у список"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:811
+#: mail/em-folder-view.c:902 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Відповісти всім"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: mail/em-folder-view.c:903 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "Переслати"
@@ -13635,6 +13141,10 @@ msgstr "Перенести в теку..."
 msgid "_Copy to Folder..."
 msgstr "Скопіювати в теку..."
 
+#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Позначка"
+
 #: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Додати відправника в адресну книгу"
@@ -13685,12 +13195,12 @@ msgid "Filter on _Mailing List"
 msgstr "Фільтр списку розсилки"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
-#: mail/mail-config.glade.h:66
+#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Типово"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1796
 msgid "Print Message"
 msgstr "Надрукувати повідомлення"
 
@@ -13730,12 +13240,18 @@ msgstr "Копія:"
 msgid "Bcc"
 msgstr "Прих.копія:"
 
+#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
+#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Тема"
+
 #: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
 #: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Дата"
 
-#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
+#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
 msgid "Newsgroups"
 msgstr ""
 
@@ -13933,7 +13449,7 @@ msgid ""
 "practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:757
+#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
 #, fuzzy
 msgid "_View Certificate"
 msgstr "Ідентифікатор сертифіката:"
@@ -13996,7 +13512,7 @@ msgstr "Один тиждень"
 msgid "Once per month"
 msgstr "Один місяць"
 
-#: mail/em-migrate.c:1072
+#: mail/em-migrate.c:1168
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -14004,92 +13520,92 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1506
+#: mail/em-migrate.c:1602
 #, fuzzy, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Не вдалося отримати теку: %s: %s"
 
-#: mail/em-migrate.c:1532
+#: mail/em-migrate.c:1628
 #, fuzzy, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr ""
 "Неможливо скопіювати дескриптор файлу: %s\n"
 "%s"
 
-#: mail/em-migrate.c:1715
+#: mail/em-migrate.c:1811
 #, fuzzy, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr ""
 "Неможливо створити файл виводу: %s\n"
 " %s"
 
-#: mail/em-migrate.c:1919
+#: mail/em-migrate.c:2015
 #, fuzzy, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Не вдалось пройти реєстрацію на POP сервері %s: %s"
 
-#: mail/em-migrate.c:1933
+#: mail/em-migrate.c:2029
 #, fuzzy, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Неможливо створити канал до '%s': %s"
 
-#: mail/em-migrate.c:1962
+#: mail/em-migrate.c:2058
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#: mail/em-migrate.c:2413 mail/em-migrate.c:2425
 #, fuzzy, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Неможливо створити канал до '%s': %s"
 
-#: mail/em-migrate.c:2480
+#: mail/em-migrate.c:2576
 #, fuzzy, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr ""
 "Неможливо створити файл виводу: %s\n"
 " %s"
 
-#: mail/em-migrate.c:2498
+#: mail/em-migrate.c:2594
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 msgstr ""
 
-#: mail/em-popup.c:699
+#: mail/em-popup.c:700
 msgid "Save As..."
 msgstr "Зберегти як..."
 
-#: mail/em-popup.c:717
+#: mail/em-popup.c:718
 #, fuzzy, c-format
 msgid "untitled_image.%s"
 msgstr "Неназване повідомлення"
 
-#: mail/em-popup.c:807
+#: mail/em-popup.c:808
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:809
+#: mail/em-popup.c:810
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "Відповісти відправнику"
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:859
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Відкрити посилання у переглядачі веб"
 
-#: mail/em-popup.c:859
+#: mail/em-popup.c:860
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Відіслати повідомлення у список..."
 
-#: mail/em-popup.c:860
+#: mail/em-popup.c:861
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Додати відправника в адресну книгу"
 
-#: mail/em-popup.c:966
+#: mail/em-popup.c:967
 #, c-format
 msgid "Open in %s..."
 msgstr "Відкрити в %s..."
@@ -14695,7 +14211,7 @@ msgstr "Компонент поштового виконавчого зведе�
 msgid "Mail Accounts"
 msgstr "Поштові Рахунки"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
 msgid "Mail Preferences"
 msgstr "Вподобання пошти"
 
@@ -14708,15 +14224,15 @@ msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution імпортує вашу пошту з Elm"
 
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:226
+#: mail/importers/evolution-mbox-importer.c:221
+#: mail/importers/evolution-outlook-importer.c:255
 #: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Імпортування..."
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:222
-#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/evolution-mbox-importer.c:223
+#: mail/importers/evolution-outlook-importer.c:257
 #: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Будь ласка, зачекайте"
@@ -14739,23 +14255,25 @@ msgid "Elm"
 msgstr "Elm"
 
 #: mail/importers/evolution-mbox-importer.c:116
+#: mail/importers/evolution-outlook-importer.c:130
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Стерти цю теку"
 
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 #, fuzzy
 msgid "Select folder to import into"
 msgstr "Виберіть імпортер"
 
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:254
 #: mail/importers/mail-importer.c:226
 #, fuzzy, c-format
 msgid "Importing `%s'"
 msgstr "Імпортування"
 
-#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/evolution-outlook-importer.c:301
 #: mail/importers/mail-importer.c:140
 #, fuzzy
 msgid "Importing mailbox"
@@ -14924,15 +14442,15 @@ msgstr ""
 msgid "%s License Agreement"
 msgstr ""
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
 msgid "_Host:"
 msgstr "Сервер:"
 
-#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
 msgid "User_name:"
 msgstr "Ім'я користувача:"
 
-#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
 msgid "_Path:"
 msgstr "Шлях:"
 
@@ -14995,34 +14513,34 @@ msgstr "%d всього"
 msgid ", %d unread"
 msgstr "%d не відіслано"
 
-#: mail/mail-component.c:653
+#: mail/mail-component.c:656
 msgid "New Mail Message"
 msgstr "Нове поштове повідомлення"
 
-#: mail/mail-component.c:654
+#: mail/mail-component.c:657
 msgid "_Mail Message"
 msgstr "Поштове повідомлення"
 
-#: mail/mail-component.c:655
+#: mail/mail-component.c:658
 msgid "Compose a new mail message"
 msgstr "Створити нове поштове повідомлення"
 
-#: mail/mail-component.c:661
+#: mail/mail-component.c:664
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Нова віртуальна тека"
 
-#: mail/mail-component.c:662
+#: mail/mail-component.c:665
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Поштові фільтри"
 
-#: mail/mail-component.c:663
+#: mail/mail-component.c:666
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Створити нову теку"
 
-#: mail/mail-component.c:795
+#: mail/mail-component.c:798
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
@@ -15034,7 +14552,7 @@ msgstr "Перевірка служби"
 msgid "Connecting to server..."
 msgstr "З'єднання з сервером..."
 
-#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Назва"
 
@@ -15049,7 +14567,7 @@ msgstr ""
 "відсилалась разом з вашими повідомленнями."
 
 #: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 msgid "Receiving Mail"
 msgstr "Отримання пошти"
 
@@ -15065,7 +14583,7 @@ msgstr ""
 msgid "Please select among the following options"
 msgstr "Оберіть серед наступних параметрів"
 
-#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr "Відсилання пошти"
 
@@ -15078,7 +14596,7 @@ msgstr ""
 "впевнені, спитайте вашого системного адміністратора або постачальника "
 "Інтернет."
 
-#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37
 msgid "Account Management"
 msgstr "Керування рахунками"
 
@@ -15095,251 +14613,255 @@ msgstr ""
 "Введіть назву цього рахунку у нижньому полі. Ця назва буде використовуватись "
 "тільки для показу."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:2
 #, fuzzy
 msgid " Ch_eck for Supported Types "
 msgstr "Перевірка типів, що підтримуються"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "<b>Preview</b>"
 msgstr "Перегляд"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "(у цій версії Evolution SSL не підтримується)"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "<b>S_ignatures</b>"
 msgstr "<b>Стан:</b>"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "<b>_Languages</b>"
 msgstr "<b>Стан:</b>"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
+msgid "<small>This will make the the filter more reliable, but slower</small>"
+msgstr ""
+
+#: mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "<span weight=\"bold\">Checking for New Mail</span>"
 msgstr "Перевірка нової пошти"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">General</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
 #, fuzzy
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "Повідомлення"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "Сповіщення про нову пошту"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Security</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "Надіслані повідомлення та чернетки"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:34
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:35
 #, fuzzy
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "Завжди шифрувати моїм ключем при надсиланні повідомлень"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:36
 msgid "Account Editor"
 msgstr "Редактор облікових рахунків"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:38
 #, fuzzy
 msgid "Add Ne_w Signature..."
 msgstr "Додати новий підпис"
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Add _Script"
 msgstr "Додати скрипт"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:40
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "Завжди шифрувати моїм ключем при надсиланні повідомлень"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Завжди надсилати копію (Сс) до:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Завжди надсилати приховану копію (Bcc) до:"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Always _sign outgoing messages when using this account"
 msgstr ""
 "Завжди підписувати повідомлення при використанні цього облікового рахунку"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Завжди довіряти ключам в моєму сховищі ключів при декодуванні"
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Attach original message"
 msgstr "Долучити оригінальне повідомлення"
 
-#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Долучення"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:48
 #, fuzzy
 msgid "Automatically _insert smiley images"
 msgstr "Автоматично вставляти картинки з смайликами"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Automatically check for _new mail every"
 msgstr "Автоматично перевіряти нову пошту"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Baltic (ISO-8859-4)"
 msgstr ""
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Beep w_hen new mail arrives"
 msgstr "Звуковий сигнал для нової пошти"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "C_haracter set:"
 msgstr "Набір символів:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Ch_eck for Supported Types "
 msgstr "Перевірка типів, що підтримуються"
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 #, fuzzy
-msgid "Check _Incoming Mail"
+msgid "Check _incoming mail for junk"
 msgstr "Перевірка нової пошти"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Check spelling while I _type"
 msgstr "Перевіряти правопис під час набору повідомлення"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 msgid "Color for _misspelled words:"
 msgstr "Колір для слів з помилками"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Colors"
 msgstr "_Кольори"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Confirm _when expunging a folder"
 msgstr "Підтвердження при викреслені теки"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -15355,265 +14877,270 @@ msgstr ""
 "\n"
 "Щоб зберегти інформацію натисніть \"Завершити\"."
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
 msgid "De_fault"
 msgstr "Типово"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Default character e_ncoding:"
 msgstr "Типове кодування символів: "
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 #, fuzzy
 msgid "Defaults"
 msgstr "Типово"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 msgid "Do not quote original message"
 msgstr "Не цитувати оригінальне повідомлення"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 "Не підписувати запрошення на засідання (для сумісності з Outlook "
 "compatibility)"
 
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Виконано"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Drafts _Folder:"
 msgstr "Тека _чернеток:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:77
 msgid "Email Accounts"
 msgstr "Поштові Рахунки"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Email _Address:"
 msgstr "Електронна адреса:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "Empty trash folders on e_xit"
 msgstr "Спорожнити теку смітника на виході"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "Ідентифікатор сертифіката:"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:81
 msgid "Evolution Account Assistant"
 msgstr "Асистент з Облікових рахунків Evolution"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:82
 msgid "Execute Command..."
 msgstr "Виконати команду..."
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Fi_xed-width:"
 msgstr "Фіксованої ширини:"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 msgid "Font Properties"
 msgstr "Властивості шрифту"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 msgid "Format messages in _HTML"
 msgstr "Форматувати повідомлення в HTML"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "HTML Mail"
 msgstr "В HTML"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Headers"
 msgstr "Верхній колонтитул"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr "Висвітлювати цитування за допомогою"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
 #: mail/mail-config.glade.h:91
+#, fuzzy
+msgid "I_nclude remote tests"
+msgstr "Включити:"
+
+#: mail/mail-config.glade.h:94
 msgid "Inline"
 msgstr "В тілі"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Mail Configuration"
 msgstr "Конфігурація пошти"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "Розміщення поштової скриньки"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr "Редактор повідомлень"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 "Зауважте: вас не буде запитано про пароль до моменту першого сеансу зв'язку "
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Or_ganization:"
 msgstr "Ор_ганізація:"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "PGP/GPG _Key ID:"
 msgstr "Ідентифікатор ключа PGP/GPG:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "Play sound file when new mail arri_ves"
 msgstr "Відтворити звуковий файл при отриманні нової пошти"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr ""
 "Попереджувати при надсиланні повідомлень, де визначені тільки отримувачі "
 "прихованої копії"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr "Цитувати оригінальне повідомлення"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr "Процитовано"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Re_member password"
 msgstr "Запам'ятати цей пароль"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr "Відповідати до:"
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "Отримання пошти"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:120
 #, fuzzy
 msgid "Receiving Options"
 msgstr "Параметри отримання"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
 #, fuzzy
 msgid "Remember _password"
 msgstr "Запам'ятати цей пароль"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
 #, fuzzy
 msgid "S_tandard Font:"
 msgstr "Стандартний Unix mbox"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 #, fuzzy
 msgid "Security"
 msgstr "Безпека"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font"
 msgstr "Вибрати шрифт HTML фіксованої ширини"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:126
 msgid "Select HTML fixed width font for printing"
 msgstr "Вибрати для друкування шрифт HTML фіксованої ширини"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:127
 msgid "Select HTML variable width font"
 msgstr "Вибрати шрифт HTML змінної ширини"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:128
 msgid "Select HTML variable width font for printing"
 msgstr "Вибрати для друку шрифт HTML змінної ширини"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:129
 #, fuzzy
 msgid "Select..."
 msgstr "Стерти..."
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "Відсилання пошти"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Sent _Messages Folder:"
 msgstr "Тека надісланих повідомлень:"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:134
 msgid "Ser_ver requires authentication"
 msgstr "Сервер вимагає автентифікації"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:135
 msgid "Server _Type: "
 msgstr "Тип сервера: "
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Не знайдено конфігураційної бази даних"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:137
 #, fuzzy
 msgid "Signat_ure:"
 msgstr "Підпис:"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "Signatures"
 msgstr "_Підписи"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr "Зазначте ім'я файлу:"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "Spell Checking"
 msgstr "Перевірка правопису"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:141
 msgid "Standard Unix mbox"
 msgstr "Стандартний Unix mbox"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "T_erminal Font:"
 msgstr "Оригінальний контакт:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "T_ype: "
 msgstr "Тип:"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -15623,7 +15150,7 @@ msgstr ""
 "цифрового підпису. Зазначене вами ім'я буде використане\n"
 "тільки для відображення."
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
@@ -15632,7 +15159,7 @@ msgstr ""
 "Ця сторінка допомагає налаштувати параметри перевірки правопису та мови. "
 "Список мов відображує тільки ті мови, для яких встановлено словники."
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:149
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -15640,15 +15167,11 @@ msgstr ""
 "Введіть ім'я з яким ви бажаєте посилатися на цей рахунок.\n"
 "Наприклад: \"Робота\" або \"Особисте\""
 
-#: mail/mail-config.glade.h:148
-msgid "Use _Daemon"
-msgstr ""
-
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:152
 msgid "V_ariable-width:"
 msgstr "Змінної ширини:"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:153
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -15658,93 +15181,89 @@ msgstr ""
 "\n"
 "Натисніть \"Далі\" для продовження"
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:158
 msgid "_Add Signature"
 msgstr "_Додати підпис"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Always load images from the Internet"
 msgstr "Завжди завантажувати зображення"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Digitally sign outgoing messages (by default)"
 msgstr ""
 "Завжди підписувати повідомлення при використанні цього облікового рахунку"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:161
 msgid "_Do not notify me when new mail arrives"
 msgstr "Не сповіщувати про нову пошту"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:163
 msgid "_Enable"
 msgstr "Увімкнути"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:165
 msgid "_Forward style:"
 msgstr "Стиль пересилання:"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Load images if sender is in address book"
 msgstr "Завантажувати зображення, якщо відправник у адресній книзі"
 
-#: mail/mail-config.glade.h:167
-msgid "_Local Tests Only"
-msgstr ""
-
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Make this my default account"
 msgstr "Зробити це моїм типовим рахунком"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_Mark messages as read after"
 msgstr "Позначати повідомлення як \"Прочитані\" через"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Never load images from the Internet"
 msgstr "Ніколи не завантажувати зображення"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "Попереджувати при надсиланні HTML повідомлень тим, хто їх не бажає"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:175
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Попереджувати при надсиланні повідомлень з порожньою темою"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:176
 msgid "_Reply style:"
 msgstr "Стиль відповіді:"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:177
 msgid "_Script:"
 msgstr "_Скрипт:"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:178
 msgid "_Show animated images"
 msgstr "Показувати анімовані малюнки"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "_Use Secure Connection (SSL):"
 msgstr "Використовувати безпечне з'єднання (SSL):"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:181
 msgid "color"
 msgstr "колір"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "опис"
 
@@ -15916,7 +15435,7 @@ msgstr ""
 
 #. mail:camel-exception primary
 #: mail/mail-errors.xml.h:57
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgid "Your message with the subject \"{0}\" was not delivered."
 msgstr ""
 
 #. mail:camel-exception secondary
@@ -15982,11 +15501,6 @@ msgstr ""
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Не вдалося створити каталог %s: %s"
 
-#. mail:no-save-path secondary
-#: mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail:no-create-path primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
@@ -16011,12 +15525,6 @@ msgstr ""
 msgid "Cannot create temporary save directory."
 msgstr "Неможливо створити тимчасовий каталог: %s"
 
-#. mail:no-create-tmp-path secondary
-#: mail/mail-errors.xml.h:100 mail/mail-errors.xml.h:112
-#: widgets/misc/e-system-errors.xml.h:11 widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail:no-write-path-exists secondary
 #: mail/mail-errors.xml.h:104
 #, fuzzy
@@ -16294,144 +15802,140 @@ msgstr "Переписати"
 msgid "_Append"
 msgstr "Аспен"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:785
 #, c-format
 msgid "Pinging %s"
 msgstr "Зондування %s"
 
-#: mail/mail-mt.c:897
-msgid "Working"
-msgstr "Робота"
-
-#: mail/mail-ops.c:99
+#: mail/mail-ops.c:98
 msgid "Filtering Folder"
 msgstr "Фільтрування теки"
 
-#: mail/mail-ops.c:260
+#: mail/mail-ops.c:259
 msgid "Fetching Mail"
 msgstr "Отримання пошти"
 
-#: mail/mail-ops.c:543
+#: mail/mail-ops.c:542
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Не вдалося зберегти пошту в тимчасовому файлі %s: %s"
 
-#: mail/mail-ops.c:568
+#: mail/mail-ops.c:567
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:577
+#: mail/mail-ops.c:576
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Не вдалося зберегти пошту в тимчасовому файлі %s: %s"
 
-#: mail/mail-ops.c:673
+#: mail/mail-ops.c:672
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Відсилання повідомлення %d з %d"
 
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:703
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Збій декодування повідомлення."
 
-#: mail/mail-ops.c:708
+#: mail/mail-ops.c:707
 msgid "Complete."
 msgstr "Виконано."
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:804
 msgid "Saving message to folder"
 msgstr "Збереження повідомлення у теці"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Перенесення повідомлень у %s"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Копіювання повідомлень у %s"
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:1002
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Сканування тек в \"%s\""
 
-#: mail/mail-ops.c:1116
+#: mail/mail-ops.c:1115
 msgid "Forwarded messages"
 msgstr "Переслані повідомлення"
 
-#: mail/mail-ops.c:1159
+#: mail/mail-ops.c:1158
 #, c-format
 msgid "Opening folder %s"
 msgstr "Відкривання теки %s"
 
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1230
 #, c-format
 msgid "Opening store %s"
 msgstr "Відкриття сховища %s"
 
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1308
 #, c-format
 msgid "Removing folder %s"
 msgstr "Видалення теки %s"
 
-#: mail/mail-ops.c:1403
+#: mail/mail-ops.c:1402
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Збереження теки \"%s\""
 
-#: mail/mail-ops.c:1468
+#: mail/mail-ops.c:1467
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1469
+#: mail/mail-ops.c:1468
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Збереження теки \"%s\""
 
-#: mail/mail-ops.c:1524
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr "Оновлення теки"
 
-#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
+#: mail/mail-ops.c:1559 mail/mail-ops.c:1610
 msgid "Expunging folder"
 msgstr "Викреслення теки"
 
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1607
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Імпортування %s як %s"
 
-#: mail/mail-ops.c:1609
+#: mail/mail-ops.c:1608
 msgid "Local Folders"
 msgstr "Локальні теки"
 
-#: mail/mail-ops.c:1692
+#: mail/mail-ops.c:1691
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Отримання повідомлення %s"
 
-#: mail/mail-ops.c:1764
+#: mail/mail-ops.c:1763
 #, fuzzy, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Отримання %d повідомлень"
 msgstr[1] "Отримання %d повідомлень"
 
-#: mail/mail-ops.c:1850
+#: mail/mail-ops.c:1849
 #, fuzzy, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Збереження %d повідомлень"
 msgstr[1] "Збереження %d повідомлень"
 
-#: mail/mail-ops.c:1900
+#: mail/mail-ops.c:1899
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -16440,7 +15944,7 @@ msgstr ""
 "Неможливо створити файл виводу: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1928
+#: mail/mail-ops.c:1927
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -16449,11 +15953,11 @@ msgstr ""
 "Помилка при збереженні до: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1999
+#: mail/mail-ops.c:1998
 msgid "Saving attachment"
 msgstr "Збереження долучення"
 
-#: mail/mail-ops.c:2016
+#: mail/mail-ops.c:2015
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -16462,17 +15966,17 @@ msgstr ""
 "Неможливо створити файл виводу: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2046
+#: mail/mail-ops.c:2045
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Не вдалось записати дані: %s"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Закриття з'єднання з %s"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Повторне встановлення з'єднання з %s"
@@ -16538,24 +16042,24 @@ msgstr "Оновлення..."
 msgid "Waiting..."
 msgstr "Очікування..."
 
-#: mail/mail-session.c:238
+#: mail/mail-session.c:239
 msgid "User canceled operation."
 msgstr "Користувач скасував операцію."
 
-#: mail/mail-session.c:271
+#: mail/mail-session.c:272
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Введіть пароль для %s"
 
-#: mail/mail-session.c:273
+#: mail/mail-session.c:274
 msgid "Enter Password"
 msgstr "Ввід пароля"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password"
 msgstr "Запам'ятати цей пароль"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:298
 msgid "_Remember this password for the remainder of this session"
 msgstr "Пам'ятати цей пароль до закінчення поточного сеансу"
 
@@ -16612,79 +16116,79 @@ msgstr "Оновлення вірт.тек для uri: %s"
 msgid "Updating vFolders for '%s'"
 msgstr "Оновлення вірт.тек для uri: %s"
 
-#: mail/mail-vfolder.c:959
+#: mail/mail-vfolder.c:958
 msgid "vFolders"
 msgstr "Вірт.теки"
 
-#: mail/mail-vfolder.c:998
+#: mail/mail-vfolder.c:997
 msgid "Edit VFolder"
 msgstr "Виправлення віртуальної теки"
 
-#: mail/mail-vfolder.c:1082
+#: mail/mail-vfolder.c:1081
 msgid "New VFolder"
 msgstr "Нова віртуальна тека"
 
-#: mail/message-list.c:946
+#: mail/message-list.c:948
 msgid "Unseen"
 msgstr "Не прочитано"
 
-#: mail/message-list.c:947
+#: mail/message-list.c:949
 msgid "Seen"
 msgstr "Прочитано"
 
-#: mail/message-list.c:948
+#: mail/message-list.c:950
 msgid "Answered"
 msgstr "Дано відповідь"
 
-#: mail/message-list.c:949
+#: mail/message-list.c:951
 msgid "Multiple Unseen Messages"
 msgstr "Декілька непереглянутих повідомлень"
 
-#: mail/message-list.c:950
+#: mail/message-list.c:952
 msgid "Multiple Messages"
 msgstr "Декілька повідомлень"
 
-#: mail/message-list.c:954
+#: mail/message-list.c:956
 msgid "Lowest"
 msgstr "Найнижче"
 
-#: mail/message-list.c:955
+#: mail/message-list.c:957
 msgid "Lower"
 msgstr "Нижче"
 
-#: mail/message-list.c:959
+#: mail/message-list.c:961
 msgid "Higher"
 msgstr "Вище"
 
-#: mail/message-list.c:960
+#: mail/message-list.c:962
 msgid "Highest"
 msgstr "Найвище"
 
-#: mail/message-list.c:1279
+#: mail/message-list.c:1285
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1286
+#: mail/message-list.c:1292
 msgid "Today %l:%M %p"
 msgstr "Сьогодні %I:%M %p"
 
-#: mail/message-list.c:1295
+#: mail/message-list.c:1301
 msgid "Yesterday %l:%M %p"
 msgstr "Вчора %l:%M %p"
 
-#: mail/message-list.c:1307
+#: mail/message-list.c:1313
 msgid "%a %l:%M %p"
 msgstr "%a %I:%M %p"
 
-#: mail/message-list.c:1315
+#: mail/message-list.c:1321
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1317
+#: mail/message-list.c:1323
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:3300
+#: mail/message-list.c:3321
 msgid "Generating message list"
 msgstr "Створення списку повідомлень"
 
@@ -16741,6 +16245,10 @@ msgstr "Переслати"
 msgid "No Response Necessary"
 msgstr "Відповідь не вимагається"
 
+#: mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Прочитано"
+
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Відповісти"
@@ -16848,45 +16356,49 @@ msgid ""
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:10
-msgid "Whether Evolution should start up in offline mode"
+msgid "Toolbar is visible"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:11
-msgid "Whether to skip the development warning dialog"
+msgid "Whether Evolution should start up in offline mode"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Whether the toolbar should be visible."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:14
 #, fuzzy
 msgid "mail"
 msgstr "Ел.пошта"
 
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
-msgstr "Створено для вас"
-
-#: shell/e-shell.c:545 shell/e-shell.c:546
+#: shell/e-shell.c:588 shell/e-shell.c:589
 #, fuzzy, c-format
 msgid "%ld KB"
 msgstr "%d %B"
 
-#: shell/e-shell.c:744
+#: shell/e-shell.c:786
 #, fuzzy
 msgid "Uknown system error."
 msgstr "Невідома помилка"
 
-#: shell/e-shell.c:1101
+#: shell/e-shell.c:1143
 msgid "Invalid arguments"
 msgstr "Неправильні аргументи"
 
-#: shell/e-shell.c:1103
+#: shell/e-shell.c:1145
 msgid "Cannot register on OAF"
 msgstr "Неможливо зареєструватись на OAF"
 
-#: shell/e-shell.c:1105
+#: shell/e-shell.c:1147
 msgid "Configuration Database not found"
 msgstr "Не знайдено конфігураційної бази даних"
 
-#: shell/e-shell.c:1107
+#: shell/e-shell.c:1149
 msgid "Generic error"
 msgstr "Загальна помилка"
 
@@ -16941,7 +16453,7 @@ msgstr ""
 msgid "Select importer"
 msgstr "Виберіть імпортер"
 
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1026
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
 #, c-format
 msgid "File %s does not exist"
 msgstr "Файлу %s не існує"
@@ -16969,35 +16481,35 @@ msgstr ""
 "Імпортування %s\n"
 "Імпортується елемент 1."
 
-#: shell/e-shell-importer.c:549
+#: shell/e-shell-importer.c:570
 msgid "Automatic"
 msgstr "Автоматично"
 
-#: shell/e-shell-importer.c:598
+#: shell/e-shell-importer.c:626
 #, fuzzy
-msgid "_Filename:"
+msgid "F_ilename:"
 msgstr "Назва файлу:"
 
-#: shell/e-shell-importer.c:603
+#: shell/e-shell-importer.c:631
 msgid "Select a file"
 msgstr "Вибрати файл"
 
-#: shell/e-shell-importer.c:613
+#: shell/e-shell-importer.c:642
 #, fuzzy
 msgid "File _type:"
 msgstr "Тип файлу:"
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:681
 #, fuzzy
 msgid "Import data and settings from _older programs"
 msgstr "Імпортувати дані й параметри з старіших програм"
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:684
 #, fuzzy
 msgid "Import a _single file"
 msgstr "Імпорт одного файлу"
 
-#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -17005,26 +16517,26 @@ msgstr ""
 "Будь ласка зачекайте...\n"
 "Йде сканування наявних установок"
 
-#: shell/e-shell-importer.c:727
+#: shell/e-shell-importer.c:756
 msgid "Starting Intelligent Importers"
 msgstr "Запуск інтелектуального імпортера"
 
-#: shell/e-shell-importer.c:853 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
 #, c-format
 msgid "From %s:"
 msgstr "Від %s:"
 
-#: shell/e-shell-importer.c:1044
+#: shell/e-shell-importer.c:1073
 #, fuzzy, c-format
 msgid "No importer available for file %s"
 msgstr "Постачальника протоколу `%s' не знайдено"
 
-#: shell/e-shell-importer.c:1056
+#: shell/e-shell-importer.c:1085
 #, fuzzy
 msgid "Unable to execute importer"
 msgstr "Неможливо виконати gpg."
 
-#: shell/e-shell-importer.c:1169
+#: shell/e-shell-importer.c:1199
 #, fuzzy
 msgid "_Import"
 msgstr "Імпорт"
@@ -17070,61 +16582,61 @@ msgstr "Назва теки не може містити символ \"#\"."
 msgid "'.' and '..' are reserved folder names."
 msgstr "\".\" і \"..\" є зарезервованими назвами тек."
 
-#: shell/e-shell-window.c:336
+#: shell/e-shell-window.c:337
 #, fuzzy
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution у мережевому режимі. Клацніть на цю кнопку для переходу до "
 "автономної роботи."
 
-#: shell/e-shell-window.c:343
+#: shell/e-shell-window.c:344
 #, fuzzy
 msgid "Evolution is in the process of going offline."
 msgstr "Ximian Evolution у процесі переходу до автономної роботи."
 
-#: shell/e-shell-window.c:349
+#: shell/e-shell-window.c:350
 #, fuzzy
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution зараз у автономному режимі. Клацніть на цю кнопку для "
 "переходу до роботи у мережі."
 
-#: shell/e-shell-window.c:621
+#: shell/e-shell-window.c:637
 #, fuzzy, c-format
 msgid "Switch to %s"
 msgstr "Пошта до %s"
 
-#: shell/e-shell-window-commands.c:64
+#: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Здається, програму GNOME Pilot не встановлено у цій системі"
 
-#: shell/e-shell-window-commands.c:72
+#: shell/e-shell-window-commands.c:74
 #, c-format
 msgid "Error executing %s."
 msgstr "Помилка виконання %s."
 
-#: shell/e-shell-window-commands.c:121
+#: shell/e-shell-window-commands.c:123
 msgid "Bug buddy is not installed."
 msgstr "Програму \"Bug buddy\" не встановлено."
 
-#: shell/e-shell-window-commands.c:129
+#: shell/e-shell-window-commands.c:131
 msgid "Bug buddy could not be run."
 msgstr "Не вдалося запустити Bug buddy"
 
-#: shell/e-shell-window-commands.c:171
+#: shell/e-shell-window-commands.c:323
 #, fuzzy
-msgid "About Evolution"
-msgstr "Про Ximian Evolution"
+msgid "Groupware Suite"
+msgstr "Групове"
 
-#: shell/e-shell-window-commands.c:382
+#: shell/e-shell-window-commands.c:563
 msgid "_Work Online"
 msgstr "Працювати у мережі"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "Працювати автономно"
 
-#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Робота не на лінії"
 
@@ -17136,43 +16648,6 @@ msgstr ""
 msgid "New"
 msgstr "Новий"
 
-#: shell/evolution-shell-component-utils.c:115
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Невідома помилка"
-
-#: shell/evolution-shell-component-utils.c:118
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Помилка від компонентної системи:\n"
-"%s"
-
-#: shell/evolution-shell-component-utils.c:125
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Помилка від системи активації:\n"
-"%s"
-
 #: shell/evolution-test-component.c:140
 #, fuzzy
 msgid "New Test"
@@ -17516,34 +16991,34 @@ msgid ""
 "Click help for details."
 msgstr ""
 
-#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:522
+#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
+#: smime/gui/certificate-manager.c:556
 #, fuzzy
 msgid "Select a cert to import..."
 msgstr "Виберіть імпортер"
 
-#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:604
+#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
+#: smime/gui/certificate-manager.c:638
 #, fuzzy
 msgid "Certificate Name"
 msgstr "Ідентифікатор сертифіката:"
 
-#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
+#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
 #, fuzzy
 msgid "Purposes"
 msgstr "Поступ"
 
-#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:517
+#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:267
+#: smime/gui/certificate-manager.c:271
 #, fuzzy
 msgid "Expires"
 msgstr "Вираз"
 
-#: smime/gui/certificate-manager.c:417
+#: smime/gui/certificate-manager.c:446
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "Електронна адреса:"
@@ -17586,6 +17061,11 @@ msgid ""
 "  Subject: %s\n"
 msgstr ""
 
+#: smime/gui/e-cert-selector.c:169
+#, fuzzy
+msgid "Select certificate"
+msgstr "Перейти до вказаної дати"
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -17648,7 +17128,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
 #, fuzzy
 msgid "Certificate"
 msgstr "Ідентифікатор сертифіката:"
@@ -17673,20 +17153,24 @@ msgstr "Загальна назва"
 msgid "Contact Certificates"
 msgstr "Ідентифікатор сертифіката:"
 
-#: smime/gui/smime-ui.glade.h:21
-#, no-c-format
-msgid "Do you want to trust \"%s\" for the following purposes?"
+#: smime/gui/smime-ui.glade.h:20
+msgid "Do not trust the authenticity of this certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:21
 msgid "Dummy window only"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:22
 #, fuzzy
 msgid "Edit"
 msgstr "_Редагування"
 
+#: smime/gui/smime-ui.glade.h:23
+#, fuzzy
+msgid "Email Certificate Trust Settings"
+msgstr "Неправильне повноваження сертифіката (CA)"
+
 #: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr ""
@@ -17723,277 +17207,286 @@ msgstr "Організаційна одиниця"
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:37
-msgid "Trust this CA to identify email users."
+msgid "Trust the authenticity of this certificate"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:38
-msgid "Trust this CA to identify software developers."
+msgid "Trust this CA to identify email users."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:39
-msgid "Trust this CA to identify web sites."
+msgid "Trust this CA to identify software developers."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:40
-#, fuzzy
-msgid "View"
-msgstr "_Вигляд"
+msgid "Trust this CA to identify web sites."
+msgstr ""
 
 #: smime/gui/smime-ui.glade.h:41
 #, fuzzy
-msgid "View Certificate"
-msgstr "Ідентифікатор сертифіката:"
+msgid "View"
+msgstr "_Вигляд"
 
 #: smime/gui/smime-ui.glade.h:42
-#, fuzzy
-msgid "You have been asked to trust a new Certificate Authority (CA)."
-msgstr "Неправильне повноваження сертифіката (CA)"
-
-#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:44
+#: smime/gui/smime-ui.glade.h:43
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:45
+#: smime/gui/smime-ui.glade.h:44
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:46
+#: smime/gui/smime-ui.glade.h:45
 #, fuzzy
 msgid "Your Certificates"
 msgstr "Ідентифікатор сертифіката:"
 
-#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
+#: smime/gui/smime-ui.glade.h:46
+msgid "_Edit CA Trust"
+msgstr ""
+
+#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 #, fuzzy
 msgid "%d/%m/%Y"
 msgstr "%d.%m.%Y"
 
-#: smime/lib/e-cert.c:478
+#. x509 certificate usage types
+#: smime/lib/e-cert.c:424
+#, fuzzy
+msgid "Sign"
+msgstr "Параметри"
+
+#: smime/lib/e-cert.c:425
+#, fuzzy
+msgid "Encrypt"
+msgstr "Шифрування PGP"
+
+#: smime/lib/e-cert.c:530
 #, fuzzy
 msgid "Version"
 msgstr "Питання"
 
-#: smime/lib/e-cert.c:493
+#: smime/lib/e-cert.c:545
 msgid "Version 1"
 msgstr ""
 
-#: smime/lib/e-cert.c:496
+#: smime/lib/e-cert.c:548
 msgid "Version 2"
 msgstr ""
 
-#: smime/lib/e-cert.c:499
+#: smime/lib/e-cert.c:551
 msgid "Version 3"
 msgstr ""
 
-#: smime/lib/e-cert.c:581
+#: smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:584
+#: smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:587
+#: smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:590
+#: smime/lib/e-cert.c:642
 #, fuzzy
 msgid "C"
 msgstr " C"
 
-#: smime/lib/e-cert.c:593
+#: smime/lib/e-cert.c:645
 #, fuzzy
 msgid "CN"
 msgstr "Пн"
 
-#: smime/lib/e-cert.c:596
+#: smime/lib/e-cert.c:648
 msgid "OU"
 msgstr ""
 
-#: smime/lib/e-cert.c:599
+#: smime/lib/e-cert.c:651
 #, fuzzy
 msgid "O"
 msgstr "Гаразд"
 
-#: smime/lib/e-cert.c:602
+#: smime/lib/e-cert.c:654
 msgid "L"
 msgstr ""
 
-#: smime/lib/e-cert.c:605
+#: smime/lib/e-cert.c:657
 #, fuzzy
 msgid "DN"
 msgstr "Пн"
 
-#: smime/lib/e-cert.c:608
+#: smime/lib/e-cert.c:660
 msgid "DC"
 msgstr ""
 
-#: smime/lib/e-cert.c:611
+#: smime/lib/e-cert.c:663
 #, fuzzy
 msgid "ST"
 msgstr "SMTP"
 
-#: smime/lib/e-cert.c:614
+#: smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:617
+#: smime/lib/e-cert.c:669
 #, fuzzy
 msgid "Certificate Key Usage"
 msgstr "Ідентифікатор сертифіката:"
 
-#: smime/lib/e-cert.c:620
+#: smime/lib/e-cert.c:672
 #, fuzzy
 msgid "Netscape Certificate Type"
 msgstr "Ідентифікатор сертифіката:"
 
-#: smime/lib/e-cert.c:623
+#: smime/lib/e-cert.c:675
 #, fuzzy
 msgid "Certificate Authority Key Identifier"
 msgstr "Сертифікат не має довіри"
 
-#: smime/lib/e-cert.c:626
+#: smime/lib/e-cert.c:678
 #, fuzzy
 msgid "UID"
 msgstr "Iдентиф"
 
-#: smime/lib/e-cert.c:635
+#: smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr ""
 
-#: smime/lib/e-cert.c:686
+#: smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:694
+#: smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
 msgstr ""
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:768
 msgid "Subject Public Key Info"
 msgstr ""
 
-#: smime/lib/e-cert.c:721
+#: smime/lib/e-cert.c:773
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:736
+#: smime/lib/e-cert.c:788
 #, fuzzy
 msgid "Subject's Public Key"
 msgstr "Тема - %s"
 
-#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
+#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
 #, fuzzy
 msgid "Error: Unable to process extension"
 msgstr "Не вдалося обробити буферну теку"
 
-#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
+#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:782
+#: smime/lib/e-cert.c:834
 #, fuzzy
 msgid "SSL Certificate Authority"
 msgstr "Неправильне повноваження сертифіката (CA)"
 
-#: smime/lib/e-cert.c:786
+#: smime/lib/e-cert.c:838
 #, fuzzy
 msgid "Email Certificate Authority"
 msgstr "Неправильне повноваження сертифіката (CA)"
 
-#: smime/lib/e-cert.c:814
+#: smime/lib/e-cert.c:866
 #, fuzzy
 msgid "Signing"
 msgstr "Параметри"
 
-#: smime/lib/e-cert.c:818
+#: smime/lib/e-cert.c:870
 #, fuzzy
 msgid "Non-repudiation"
 msgstr "Немає інформації"
 
-#: smime/lib/e-cert.c:822
+#: smime/lib/e-cert.c:874
 msgid "Key Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:826
+#: smime/lib/e-cert.c:878
 #, fuzzy
 msgid "Data Encipherment"
 msgstr "долучення"
 
-#: smime/lib/e-cert.c:830
+#: smime/lib/e-cert.c:882
 msgid "Key Agreement"
 msgstr ""
 
-#: smime/lib/e-cert.c:834
+#: smime/lib/e-cert.c:886
 #, fuzzy
 msgid "Certificate Signer"
 msgstr "Ідентифікатор сертифіката:"
 
-#: smime/lib/e-cert.c:838
+#: smime/lib/e-cert.c:890
 msgid "CRL Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:938
 #, fuzzy
 msgid "Critical"
 msgstr "Хорватія"
 
-#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
+#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
 #, fuzzy
 msgid "Not Critical"
 msgstr "Півн. Кароліна"
 
-#: smime/lib/e-cert.c:912
+#: smime/lib/e-cert.c:964
 #, fuzzy
 msgid "Extensions"
 msgstr "Вираз"
 
-#: smime/lib/e-cert.c:983
+#: smime/lib/e-cert.c:1035
 #, fuzzy, c-format
 msgid "%s = %s"
 msgstr "%s на %s"
 
-#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
 #, fuzzy
 msgid "Certificate Signature Algorithm"
 msgstr "Помилка підпису сертифікату"
 
-#: smime/lib/e-cert.c:1048
+#: smime/lib/e-cert.c:1100
 #, fuzzy
 msgid "Issuer"
 msgstr "Вставити"
 
-#: smime/lib/e-cert.c:1102
+#: smime/lib/e-cert.c:1154
 msgid "Issuer Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1121
+#: smime/lib/e-cert.c:1173
 #, fuzzy
 msgid "Subject Unique ID"
 msgstr "Тема - %s"
 
-#: smime/lib/e-cert.c:1164
+#: smime/lib/e-cert.c:1216
 #, fuzzy
 msgid "Certificate Signature Value"
 msgstr "Помилка підпису сертифікату"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
+#: smime/lib/e-cert-db.c:608
 #, fuzzy
 msgid "Certificate already exists"
 msgstr "Ідентифікатор картки вже існує"
@@ -18143,7 +17636,7 @@ msgstr "Переглянути поточний контакт."
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "Дії"
 
@@ -18315,7 +17808,7 @@ msgstr "Закрити"
 #: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:3
+#: ui/evolution.xml.h:4
 msgid "Close"
 msgstr "Закрити"
 
@@ -18328,7 +17821,7 @@ msgid "Delete this item"
 msgstr "Стерти цей елемент"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr "Головний пенал"
 
@@ -18372,7 +17865,7 @@ msgstr "Зберегти цей елемент на диску"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:44
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "_File"
 msgstr "Файл"
 
@@ -18638,13 +18131,13 @@ msgstr "Інвертувати вибір"
 msgid "_Threaded Message List"
 msgstr "Розбитий на гілки список повідомлень"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Закрити це вікно"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "_Close"
 msgstr "За_крити"
 
@@ -19056,7 +18549,7 @@ msgstr "_Попереднє повідомлення"
 msgid "_Quoted"
 msgstr "Про_цитовано"
 
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
 msgid "_Tools"
 msgstr "_Інструменти"
 
@@ -19360,108 +18853,122 @@ msgid "_Open Task"
 msgstr "Завдання"
 
 #: ui/evolution.xml.h:1
-msgid "About Ximian Evolution..."
-msgstr "Про Ximian Evolution..."
+#, fuzzy
+msgid "About Evolution..."
+msgstr "Про Ximian Evolution"
 
 #: ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
 msgstr "Змінити налаштовування Evolutuion."
 
-#: ui/evolution.xml.h:5
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the visibility of the toolbar"
+msgstr "Змінити властивості цієї теки"
+
+#: ui/evolution.xml.h:6
 msgid "Create a new window displaying this folder"
 msgstr "Показати теку в новому вікні"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "Вийти"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Часті запитання щодо Ximian Evolution"
+
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Вийти з програми"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:10
 msgid "Forget _Passwords"
 msgstr "Забути паролі"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:11
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Забути усі паролі, надалі вас питатимуть їх знову"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:12
 msgid "Import data from other programs"
 msgstr "Імпорт даних з інших програм"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:14
 #, fuzzy
 msgid "New _Window"
 msgstr "З_найти зараз"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Pi_lot Settings..."
 msgstr "Установки пілота..."
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Send / Receive"
 msgstr "Відіслати / отримати"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Send queued items and retrieve new items"
 msgstr "Відіслати повідомлення з черги та отримати нові"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Set up Pilot configuration"
 msgstr "Налаштувати Пілот"
 
-#: ui/evolution.xml.h:17
-msgid "Show information about Ximian Evolution"
+#: ui/evolution.xml.h:19
+#, fuzzy
+msgid "Show information about Evolution"
 msgstr "Показати інформацію про Ximian Evolution"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:20
 msgid "Submit Bug Report"
 msgstr "Підготувати звіт про помилку"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:21
 msgid "Submit _Bug Report"
 msgstr "Відіслати звіт про помилку"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Відіслати звіт про помилку за допомогою Bug Buddy"
 
-#: ui/evolution.xml.h:21
-msgid "Toggle whether we are working offline."
-msgstr "Перемикнути стан роботи на лінії"
-
 #: ui/evolution.xml.h:23
-msgid "Ximian Evolution _FAQ"
-msgstr "Часті запитання щодо Ximian Evolution"
+#, fuzzy
+msgid "T_oolbar"
+msgstr "Головний пенал"
 
 #: ui/evolution.xml.h:24
-msgid "_About Ximian Evolution..."
-msgstr "Про Ximian Evolution..."
+msgid "Toggle whether we are working offline."
+msgstr "Перемикнути стан роботи на лінії"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "_About Evolution..."
+msgstr "Про Ximian Evolution"
+
+#: ui/evolution.xml.h:30
 msgid "_Help"
 msgstr "Довідка"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "_Import..."
 msgstr "Імпорт..."
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "_New"
 msgstr "Новий"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 #, fuzzy
 msgid "_Quick Reference"
 msgstr "Вподобання пошти"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_Send / Receive"
 msgstr "Відіслати / отримати"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 #, fuzzy
 msgid "_Window"
 msgstr "З_найти зараз"
@@ -19539,7 +19046,7 @@ msgid "With _Status"
 msgstr "Встановити стан"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:626
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:635
 msgid "UTC"
 msgstr "UTC"
 
@@ -19698,29 +19205,29 @@ msgstr "Інший..."
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
-#: widgets/misc/e-error.c:121
+#: widgets/misc/e-error.c:79 widgets/misc/e-error.c:80
+#: widgets/misc/e-error.c:122
 msgid "Evolution Error"
 msgstr "Помилка Evolution"
 
-#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
-#: widgets/misc/e-error.c:119
+#: widgets/misc/e-error.c:81 widgets/misc/e-error.c:82
+#: widgets/misc/e-error.c:120
 #, fuzzy
 msgid "Evolution Warning"
 msgstr "Evolution"
 
-#: widgets/misc/e-error.c:118
+#: widgets/misc/e-error.c:119
 #, fuzzy
 msgid "Evolution Information"
 msgstr "Інформація про засідання"
 
-#: widgets/misc/e-error.c:120
+#: widgets/misc/e-error.c:121
 #, fuzzy
 msgid "Evolution Query"
 msgstr "Компонент Зведення Evolutuion."
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:410
+#: widgets/misc/e-error.c:415
 #, fuzzy, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -19873,16 +19380,516 @@ msgstr ""
 "Неможливо записати в \"%s\"\n"
 " %s"
 
-#: widgets/misc/e-task-widget.c:211
+#: widgets/misc/e-task-widget.c:212
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: widgets/misc/e-task-widget.c:216
+#: widgets/misc/e-task-widget.c:217
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% виконано)"
 
+#~ msgid "Failed to connect to LDAP server"
+#~ msgstr "Неможливо з'єднатись з сервером LDAP"
+
+#~ msgid "Failed to authenticate with LDAP server"
+#~ msgstr "На вдалося пройти автентифікацію на сервері LDAP"
+
+#~ msgid "Could not perform query on Root DSE"
+#~ msgstr "Неможливо виконати запит на Кореневому DSE"
+
+#~ msgid "The server responded with no supported search bases"
+#~ msgstr "Відповідь сервера не містить підтримуваних баз пошуку"
+
+#~ msgid "This server does not support LDAPv3 schema information"
+#~ msgstr "Цей сервер не підтримує схему інформації LDAPv3"
+
+#~ msgid "Error retrieving schema information"
+#~ msgstr "Помилка при отриманні схеми інформації"
+
+#~ msgid "Server did not respond with valid schema information"
+#~ msgstr "Відповідь сервера не містить підтримуваної схеми інформації"
+
+#~ msgid "  S_how Supported Bases "
+#~ msgstr " Показати підтримувані бази "
+
+#~ msgid "1:00"
+#~ msgstr "1:00"
+
+#~ msgid "5:00"
+#~ msgstr "5:00"
+
+#~ msgid "Connecting"
+#~ msgstr "З'єднання"
+
+#~ msgid "Distinguished _name:"
+#~ msgstr "Відокремлене _ім'я:"
+
+#, fuzzy
+#~ msgid "Email address:"
+#~ msgstr "Електронна адреса:"
+
+#~ msgid "Evolution will use this DN to authenticate you with the server"
+#~ msgstr ""
+#~ "Для автентифікації на сервері Evolution буде використовувати це "
+#~ "відокремлене ім'я"
+
+#~ msgid "One"
+#~ msgstr "Один рівень"
+
+#~ msgid "S_earch scope: "
+#~ msgstr "Простір по_шуку: "
+
+#~ msgid "Searching"
+#~ msgstr "Пошук"
+
+#~ msgid "Sub"
+#~ msgstr "Всі нижчі рівні"
+
+#~ msgid "This option controls how long a search will be run."
+#~ msgstr "Це поле контролює як довго буде тривати пошук."
+
+#~ msgid "U_se SSL/TLS:"
+#~ msgstr "Використовувати _SSL/TLS:"
+
+#~ msgid "_Display name:"
+#~ msgstr "_Назва для відображення:"
+
+#~ msgid "_Port number:"
+#~ msgstr "_Порт:"
+
+#~ msgid "_Search base:"
+#~ msgstr "База по_шуку:"
+
+#~ msgid "_Server name:"
+#~ msgstr "Назва _сервера:"
+
+#~ msgid "_Timeout (minutes):"
+#~ msgstr "За_тримка (в хвилинах):"
+
+#, fuzzy
+#~ msgid "connecting-tab"
+#~ msgstr "Повторне встановлення з'єднання з %s"
+
+#, fuzzy
+#~ msgid "general-tab"
+#~ msgstr "Загальне"
+
+#, fuzzy
+#~ msgid "searching-tab"
+#~ msgstr "Пошук"
+
+#, fuzzy
+#~ msgid "Job title:"
+#~ msgstr "Посада:"
+
+#, fuzzy
+#~ msgid "Webcam:"
+#~ msgstr "Сторінка"
+
+#~ msgid "Category editor not available."
+#~ msgstr "Відсутній редактор категорій."
+
+#, fuzzy
+#~ msgid ""
+#~ "The following entries are invalid:\n"
+#~ "\n"
+#~ msgstr "Зараз активні наступні з'єднання:"
+
+#~ msgid "Could not find widget for a field: `%s'"
+#~ msgstr "Не вдалося знайти віджета для поля: \"%s\""
+
+#~ msgid "Do you want to save changes?"
+#~ msgstr "Ви хочете змінити зміни?"
+
+#~ msgid "Error saving %s: %s"
+#~ msgstr "Помилка запису %s: %s"
+
+#~ msgid ""
+#~ "The addressbook backend for\n"
+#~ "%s\n"
+#~ "has crashed. You will have to restart Evolution in order to use it again"
+#~ msgstr ""
+#~ "Сталася помилка в допоміжному модулі програми записника для\n"
+#~ "%s\n"
+#~ "Щоб використовувати її знову потрібно перезавантажити Evolution"
+
+#, fuzzy
+#~ msgid "Can not load URI"
+#~ msgstr "Картки не знайдено"
+
+#, fuzzy
+#~ msgid "Calendar Properties"
+#~ msgstr "Помилка iCalendar"
+
+#, fuzzy
+#~ msgid "Remote"
+#~ msgstr "Видалити"
+
+#, fuzzy
+#~ msgid "Task List Properties"
+#~ msgstr "Список завдань"
+
+#, fuzzy
+#~ msgid "_Refresh Interval:"
+#~ msgstr "Оновити список"
+
+#, fuzzy
+#~ msgid "_Source URL:"
+#~ msgstr "URL джерела пошти POP"
+
+#~ msgid ""
+#~ "The event being deleted is a meeting, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "Ви намагаєтесь видалити засідання, бажаєте відправити повідомлення про "
+#~ "відміну?"
+
+#~ msgid "Are you sure you want to cancel and delete this meeting?"
+#~ msgstr "Ви впевнені, що хочете відмінити та видалити це засідання?"
+
+#~ msgid ""
+#~ "The task being deleted is assigned, would you like to send a cancellation "
+#~ "notice?"
+#~ msgstr ""
+#~ "Ви намагаєтесь видалити назначене завдання, бажаєте відіслати "
+#~ "повідомлення про відміну?"
+
+#~ msgid "Are you sure you want to cancel and delete this task?"
+#~ msgstr "Ви впевнені, що хочете відмінити та видалити це завдання?"
+
+#~ msgid ""
+#~ "The journal entry being deleted is published, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "Ви намагаєтесь видалити журнальний запис, який вже опубліковано, бажаєте "
+#~ "відіслати повідомлення про відміну?"
+
+#~ msgid "Are you sure you want to cancel and delete this journal entry?"
+#~ msgstr "Ви впевнені, що хочете відмінити та видалити цей запис в журналі?"
+
+#~ msgid "Are you sure you want to delete the appointment `%s'?"
+#~ msgstr "Ви впевнені, що хочете стерти зустріч \"%s\"?"
+
+#~ msgid "Are you sure you want to delete this untitled appointment?"
+#~ msgstr "Ви впевнені, що хочете стерти цю неназвану зустріч?"
+
+#~ msgid "Are you sure you want to delete the task `%s'?"
+#~ msgstr "Ви впевнені, що хочете стерти завдання \"%s\"?"
+
+#~ msgid "Are you sure you want to delete this untitled task?"
+#~ msgstr "Ви впевнені, що хочете стерти це неназване завдання?"
+
+#~ msgid "Are you sure you want to delete the journal entry `%s'?"
+#~ msgstr "Ви впевнені, що хочете стерти запис в журналі \"%s\"?"
+
+#~ msgid "Are you sure want to delete this untitled journal entry?"
+#~ msgstr "Ви впевнені, що хочете стерти цей неназваний запис в журналі?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d appointment?"
+#~ msgid_plural "Are you sure you want to delete %d appointments?"
+#~ msgstr[0] "Ви впевнені, що хочете стерти %d зустрічей?"
+#~ msgstr[1] "Ви впевнені, що хочете стерти %d зустрічей?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d task?"
+#~ msgid_plural "Are you sure you want to delete %d tasks?"
+#~ msgstr[0] "Ви впевнені, що хочете стерти %d завдань?"
+#~ msgstr[1] "Ви впевнені, що хочете стерти %d завдань?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d journal entry?"
+#~ msgid_plural "Are you sure you want to delete %d journal entries?"
+#~ msgstr[0] "Ви впевнені, що хочете стерти %d записів в журналі?"
+#~ msgstr[1] "Ви впевнені, що хочете стерти %d записів в журналі?"
+
+#~ msgid "_Invite Others..."
+#~ msgstr "Запросити інших..."
+
+#, fuzzy
+#~ msgid ""
+#~ "This event has been changed, but has not been saved.\n"
+#~ "\n"
+#~ "Do you wish to save your changes?"
+#~ msgstr ""
+#~ "Цей підпис змінився, але не був збережений.\n"
+#~ "\n"
+#~ "Бажаєте зберегти зміни?"
+
+#~ msgid "_Discard Changes"
+#~ msgstr "Скасувати зміни"
+
+#, fuzzy
+#~ msgid "Save Event"
+#~ msgstr "Календарні події"
+
+#~ msgid "The meeting information has been created. Send it?"
+#~ msgstr "Створено інформацію про засідання. Надіслати її?"
+
+#~ msgid "The meeting information has changed. Send an updated version?"
+#~ msgstr "Змінилась інформація про засідання. Надіслати оновлену версію?"
+
+#~ msgid "The task assignment information has been created. Send it?"
+#~ msgstr "Створено інформацію про призначення завдання. Надіслати її?"
+
+#~ msgid "The task information has changed. Send an updated version?"
+#~ msgstr "Змінилась інформація про завдання. Надіслати оновлену версію?"
+
+#, fuzzy
+#~ msgid "Could not get article %s from NNTP server"
+#~ msgstr "Не вдалося отримати групу: %s"
+
+#, fuzzy
+#~ msgid "Error posting message: %s: message not posted"
+#~ msgstr ""
+#~ "Помилка автозбереження файлу: %s\n"
+#~ " %s"
+
+#, fuzzy
+#~ msgid "Stream error"
+#~ msgstr "помилка аналізу"
+
+#, fuzzy
+#~ msgid "Connection error: %s"
+#~ msgstr "Невідома помилка: %s"
+
+#~ msgid "Could not get group: %s"
+#~ msgstr "Не вдалося отримати групу: %s"
+
+#, fuzzy
+#~ msgid "Could not get messages: unspecified error"
+#~ msgstr "Не вдалося відіслати повідомлення: %s"
+
+#~ msgid "Unknown server response: %s"
+#~ msgstr "Невідома відповідь сервера: %s"
+
+#~ msgid "Adjust Score"
+#~ msgstr "Скорегувати вагу"
+
+#~ msgid "Assign Color"
+#~ msgstr "Призначити колір"
+
+#~ msgid "Assign Score"
+#~ msgstr "Призначити вагу"
+
+#~ msgid "Attachments"
+#~ msgstr "Долучення"
+
+#~ msgid "Beep"
+#~ msgstr "Звукове повідомлення"
+
+#~ msgid "contains"
+#~ msgstr "містить"
+
+#~ msgid "Copy to Folder"
+#~ msgstr "Скопіювати у теку"
+
+#~ msgid "Date received"
+#~ msgstr "Дата отримання"
+
+#~ msgid "Date sent"
+#~ msgstr "Дата відсилання"
+
+#~ msgid "Deleted"
+#~ msgstr "Стерто"
+
+#~ msgid "does not contain"
+#~ msgstr "не містить"
+
+#~ msgid "does not end with"
+#~ msgstr "не закінчується на"
+
+#~ msgid "does not exist"
+#~ msgstr "не існує"
+
+#~ msgid "does not return"
+#~ msgstr "не повертається"
+
+#~ msgid "does not sound like"
+#~ msgstr "не схоже на"
+
+#~ msgid "does not start with"
+#~ msgstr "не починається з"
+
+#~ msgid "Do Not Exist"
+#~ msgstr "не існують"
+
+#~ msgid "Draft"
+#~ msgstr "Чернетка"
+
+#~ msgid "ends with"
+#~ msgstr "закінчується на"
+
+#~ msgid "Exist"
+#~ msgstr "Існують"
+
+#~ msgid "exists"
+#~ msgstr "існує"
+
+#~ msgid "Expression"
+#~ msgstr "Вираз"
+
+#~ msgid "is"
+#~ msgstr "співпадає з"
+
+#~ msgid "is after"
+#~ msgstr "після"
+
+#~ msgid "is before"
+#~ msgstr "перед"
+
+#~ msgid "is Flagged"
+#~ msgstr "Відмічено"
+
+#~ msgid "is greater than"
+#~ msgstr "більше"
+
+#~ msgid "is less than"
+#~ msgstr "менше"
+
+#~ msgid "is not"
+#~ msgstr "не співпадає з"
+
+#~ msgid "is not Flagged"
+#~ msgstr "не відмічено"
+
+#, fuzzy
+#~ msgid "Junk Test"
+#~ msgstr "Червень"
+
+#~ msgid "Mailing list"
+#~ msgstr "Список листування"
+
+#~ msgid "Message Body"
+#~ msgstr "Тіло повідомлення"
+
+#~ msgid "Message Header"
+#~ msgstr "Заголовок повідомлення"
+
+#, fuzzy
+#~ msgid "Message is Junk"
+#~ msgstr "Повідомлення"
+
+#, fuzzy
+#~ msgid "Message is not Junk"
+#~ msgstr "Позначити як важливе"
+
+#~ msgid "Move to Folder"
+#~ msgstr "Перенести в теку"
+
+#, fuzzy
+#~ msgid "Pipe to Program"
+#~ msgstr "Вийти з програми"
+
+#~ msgid "Play Sound"
+#~ msgstr "Відтворити звук"
+
+#~ msgid "Recipients"
+#~ msgstr "Адресати"
+
+#~ msgid "Regex Match"
+#~ msgstr "Відповідність  рег.виразу"
+
+#~ msgid "Replied to"
+#~ msgstr "Відповісти"
+
+#~ msgid "returns"
+#~ msgstr "повертає"
+
+#~ msgid "returns greater than"
+#~ msgstr "повертає більше ніж"
+
+#~ msgid "returns less than"
+#~ msgstr "повертає менше ніж"
+
+#, fuzzy
+#~ msgid "Run Program"
+#~ msgstr "Запустити програму:"
+
+#~ msgid "Sender"
+#~ msgstr "Відправник"
+
+#~ msgid "Set Status"
+#~ msgstr "Встановити стан"
+
+#~ msgid "Size (kB)"
+#~ msgstr "Розмір (КБ)"
+
+#~ msgid "sounds like"
+#~ msgstr "схоже на"
+
+#~ msgid "Source Account"
+#~ msgstr "Обліковий рахунок відправника"
+
+#~ msgid "Specific header"
+#~ msgstr "Особливий заголовок"
+
+#~ msgid "starts with"
+#~ msgstr "починається на"
+
+#~ msgid "Stop Processing"
+#~ msgstr "Зупинити обробку"
+
+#~ msgid "Unset Status"
+#~ msgstr "Скинути стан:"
+
+#~ msgid "Working"
+#~ msgstr "Робота"
+
+#~ msgid "Brought to you by"
+#~ msgstr "Створено для вас"
+
+#, fuzzy
+#~ msgid "_Filename:"
+#~ msgstr "Назва файлу:"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "Unknown error."
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Невідома помилка"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the component system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Помилка від компонентної системи:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the activation system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Помилка від системи активації:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "View Certificate"
+#~ msgstr "Ідентифікатор сертифіката:"
+
+#, fuzzy
+#~ msgid "You have been asked to trust a new Certificate Authority (CA)."
+#~ msgstr "Неправильне повноваження сертифіката (CA)"
+
+#~ msgid "About Ximian Evolution..."
+#~ msgstr "Про Ximian Evolution..."
+
+#~ msgid "_About Ximian Evolution..."
+#~ msgstr "Про Ximian Evolution..."
+
 #, fuzzy
 #~ msgid "Evolution Addressbook folder viewer"
 #~ msgstr "Переглядач мінікартки адресної книги Evolution"
@@ -20192,9 +20199,6 @@ msgstr "%s (%d%% виконано)"
 #~ msgid "Primary _email:"
 #~ msgstr "Головна ел. пошта"
 
-#~ msgid "S_pouse:"
-#~ msgstr "_Дружина:"
-
 #, fuzzy
 #~ msgid "_Business:"
 #~ msgstr "Робоча"
@@ -20215,9 +20219,6 @@ msgstr "%s (%d%% виконано)"
 #~ msgid "_Mobile:"
 #~ msgstr "Мобільний"
 
-#~ msgid "_Office:"
-#~ msgstr "Офіс:"
-
 #~ msgid "_Public Calendar URL:"
 #~ msgstr "URL _публічного календаря:"
 
@@ -21673,10 +21674,6 @@ msgstr "%s (%d%% виконано)"
 #~ msgstr "Неможливо знайти об'єкт\n"
 
 #, fuzzy
-#~ msgid "Invalid object"
-#~ msgstr "Неправильне призначення"
-
-#, fuzzy
 #~ msgid "URI not loaded"
 #~ msgstr "Неможливо завантажити EBook\n"
 
diff --git a/po/vi.po b/po/vi.po
index b1c38c16c5..43ad8c57cb 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution VERSION\n"
-"POT-Creation-Date: 2004-05-19 14:00-0400\n"
+"POT-Creation-Date: 2004-06-03 11:14-0400\n"
 "PO-Revision-Date: 2003-02-23 08:29+0700\n"
 "Last-Translator: pclouds <pclouds@gmx.net>\n"
 "Language-Team: GnomeVI <gnomevi-list@lists.sourceforge.net>\n"
@@ -59,14 +59,14 @@ msgstr "1 card"
 msgid "Default Sync Address:"
 msgstr "Địa chỉ đồng bộ mặc định:"
 
-#: addressbook/conduit/address-conduit.c:1150
 #: addressbook/conduit/address-conduit.c:1151
+#: addressbook/conduit/address-conduit.c:1152
 #, fuzzy
 msgid "Could not load addressbook"
 msgstr "Không thể nạp %s: %s"
 
-#: addressbook/conduit/address-conduit.c:1219
-#: addressbook/conduit/address-conduit.c:1222
+#: addressbook/conduit/address-conduit.c:1220
+#: addressbook/conduit/address-conduit.c:1223
 msgid "Could not read pilot's Address application block"
 msgstr "Không thể đọc khối ứng dụng địa chỉ của pilot"
 
@@ -74,13 +74,13 @@ msgstr "Không thể đọc khối ứng dụng địa chỉ của pilot"
 msgid "Accessing LDAP Server anonymously"
 msgstr "Truy cập vô danh tới LDAP server"
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
 msgid "Failed to authenticate.\n"
 msgstr "Lỗi xác thực.\n"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sNhập mật khẩu cho %s (người dùng %s)"
@@ -126,52 +126,24 @@ msgstr "_Liên lạc:"
 msgid "Create a new contacts group"
 msgstr "Tạo nhóm lối tắt mới"
 
-#: addressbook/gui/component/addressbook-component.c:182
+#: addressbook/gui/component/addressbook-component.c:184
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:483
-msgid "Failed to connect to LDAP server"
-msgstr "Lỗi kết nối tới LDAP server."
-
-#: addressbook/gui/component/addressbook-config.c:507
-msgid "Failed to authenticate with LDAP server"
-msgstr "Lỗi xác thực với LDAP server"
-
-#: addressbook/gui/component/addressbook-config.c:535
-msgid "Could not perform query on Root DSE"
-msgstr "Không thể thực hiện truy vấn tại Root DSE"
-
-#: addressbook/gui/component/addressbook-config.c:840
-msgid "The server responded with no supported search bases"
-msgstr "Server trả lời không hỗ trợ cơ sở tìm kiếm"
-
-#: addressbook/gui/component/addressbook-config.c:1245
-msgid "This server does not support LDAPv3 schema information"
-msgstr "Server này không hỗ trợ thông tin schema LDAPv3"
-
-#: addressbook/gui/component/addressbook-config.c:1266
-msgid "Error retrieving schema information"
-msgstr "Lỗi nhận thông tin schema"
-
-#: addressbook/gui/component/addressbook-config.c:1274
-msgid "Server did not respond with valid schema information"
-msgstr "Server không trả lời bằng schema hợp lệ"
-
 #: addressbook/gui/component/addressbook-migrate.c:68
-#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1160
 #, fuzzy
 msgid "Migrating..."
 msgstr "Đang chờ..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1201
 #, fuzzy, c-format
 msgid "Migrating `%s':"
 msgstr "Đang \"ping\" %s"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:438
+#: addressbook/gui/component/addressbook-migrate.c:464
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
 #: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
@@ -179,31 +151,31 @@ msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:446
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
-#: mail/mail-config.glade.h:106
+#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
+#: mail/mail-config.glade.h:109
 msgid "Personal"
 msgstr "Cá nhân"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:454
+#: addressbook/gui/component/addressbook-migrate.c:480
 #, fuzzy
 msgid "On LDAP Servers"
 msgstr "LDAP Server"
 
-#: addressbook/gui/component/addressbook-migrate.c:582
+#: addressbook/gui/component/addressbook-migrate.c:608
 #, fuzzy
 msgid "LDAP Servers"
 msgstr "LDAP Server"
 
-#: addressbook/gui/component/addressbook-migrate.c:702
+#: addressbook/gui/component/addressbook-migrate.c:728
 #, fuzzy
 msgid "Autocompletion Settings"
 msgstr "Thư mục tự động hoàn chỉnh"
 
-#: addressbook/gui/component/addressbook-migrate.c:1076
+#: addressbook/gui/component/addressbook-migrate.c:1104
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -211,60 +183,55 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1090
+#: addressbook/gui/component/addressbook-migrate.c:1118
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1099
+#: addressbook/gui/component/addressbook-migrate.c:1127
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1109
+#: addressbook/gui/component/addressbook-migrate.c:1137
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:674
+#: addressbook/gui/component/addressbook-view.c:675
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:761
+#: addressbook/gui/component/addressbook-view.c:754
 #, fuzzy
 msgid "New Address Book"
 msgstr "Sổ địa chỉ"
 
-#: addressbook/gui/component/addressbook-view.c:762
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
+#: addressbook/gui/component/addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Xoá"
 
-#: addressbook/gui/component/addressbook-view.c:763
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-view.c:756
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Thuộc tính..."
 
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/addressbook-view.c:1002
+#. Create the contacts group
+#: addressbook/gui/component/addressbook-view.c:995
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
 #: calendar/gui/migration.c:373
 msgid "Contacts"
 msgstr "Liên lạc"
@@ -351,10 +318,6 @@ msgid "Manage your S/MIME certificates here"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-msgid "  S_how Supported Bases "
-msgstr "  _Hiện cơ sở được hỗ trợ "
-
-#: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -369,251 +332,211 @@ msgstr "  _Hiện cơ sở được hỗ trợ "
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1:00"
-msgstr "1:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
-msgstr "5:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "xác thực"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
 #, fuzzy
 msgid "<b>Display</b>"
 msgstr "<b>Trạng thái:</b> "
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 #, fuzzy
 msgid "<b>Downloading</b>"
 msgstr "Đị_a điểm"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:10
 #, fuzzy
 msgid "<b>Searching</b>"
 msgstr "Đang tìm"
 
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
 msgid "<b>Server Information</b>"
 msgstr "Bước 1: Thông tin server"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
 msgid "<b>Type:</b>"
 msgstr "<b>Tới hạn:</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:13
 #, fuzzy
 msgid "Add Contacts Group"
 msgstr "_Liên lạc:"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:14
 #, fuzzy
 msgid "Address Book Properties"
 msgstr "Nguồn sổ địa chỉ"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
-#: mail/mail-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
+#: mail/mail-config.glade.h:42
 msgid "Always"
 msgstr "Luôn luôn"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr "Vô danh"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:17
 #: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Cơ bản"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
-msgid "Connecting"
-msgstr "Đang kết nối"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 #: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Chi tiết"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
-msgid "Distinguished _name:"
-msgstr "Tên _phân biệt:"
-
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:19
 #, fuzzy
 msgid "Distinguished name"
 msgstr "Tên _phân biệt:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:20
 #, fuzzy
 msgid "Download limit:"
 msgstr "_Ngưỡng tải về:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Email address"
 msgstr "Địa chỉ _email:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:22
 #, fuzzy
-msgid "Email address:"
-msgstr "Địa chỉ _email:"
-
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "Evolution will use this DN to authenticate you with the server"
-msgstr "Evolution sẽ dùng DN này để xác thực bạn với server"
-
-#: addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
-"Evolution will use this email address to authenticate you with the server"
+"Evolution will use this email address to authenticate you with the server."
 msgstr "Evolution dùng địa chỉ email này để xác thực bạn với server"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:23
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Cơ sở tìm được hỗ trợ"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:24
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
+#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Chung"
 
-#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
-#: mail/mail-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
+#: mail/mail-config.glade.h:102
 msgid "Never"
 msgstr "Không bao giờ"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
-msgid "One"
-msgstr "Một"
-
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:35
-msgid "S_earch scope: "
-msgstr "_Phạm vị tìm: "
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Search _base:"
+msgstr "_Cơ sở tìm:"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
 msgid "Search base only"
 msgstr "_Cơ sở tìm:"
 
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:29
 #, fuzzy
 msgid "Search base:"
 msgstr "_Cơ sở tìm:"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Search scope:"
 msgstr "_Phạm vị tìm: "
 
-#: addressbook/gui/component/ldap-config.glade.h:39
-msgid "Searching"
-msgstr "Đang tìm"
-
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:31
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
-"server if\n"
-"your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL or TLS."
 msgstr ""
 "Chọn tùy chọn này nghĩa là Evolution sẽ chỉ kết nối tới LDAP server của\n"
 "bạn nếu LDAP server của bạn hỗ trợ SSL hoặc TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a \n"
-"insecure environment. For example, if you and your LDAP server are behind a "
-"firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection "
-"is already\n"
-"secure."
+"you are in a insecure environment. For example, if you and your LDAP server "
+"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
+"because your connection is already secure."
 msgstr ""
 "Chọn tùy chọn này có nghĩa là Evolution sẽ chỉ thử dùng SSL/TLS nếu bạn\n"
 "trong môi trường không an toàn. Ví dụ, nếu bạn và LDAP server của bạn nằm\n"
 "sau tường lửa đang hoạt động, thì Evolution sẽ không cần dùng SSL/TLS vì\n"
 "kết nối đã đủ an toàn rồi."
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:33
+#, fuzzy
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
-"TLS.  This \n"
-"means that your connection will be insecure, and that you will be vulnerable "
-"to security\n"
-"exploits. "
+"TLS.  This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits. "
 msgstr ""
 "Chọn tùy chọn này nghĩa là server của bạn không hỗ trợ cả SSL lẫn TLS. Điều\n"
 "này nghĩa là kết nối của bạn không an toàn, không bảo mật."
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Sub"
-msgstr "Con"
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr "Cơ sở tìm được hỗ trợ"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
-"searches will \n"
-"begin. If you leave this blank, the search will begin at the root of the "
-"directory tree."
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
 msgstr ""
 "Cơ sở tìm là tên phân biệt (DN) của mục, chỗ bắt đầu tìm kiếm. Nếu bạn bỏ\n"
 "trống chỗ này, tìm kiếm sẽ được bắt đầu từ gốc cây thư mục."
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:37
+#, fuzzy
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
-"the \n"
-"directory tree. A search scope of \"sub\" will include all entries below "
-"your search base.\n"
-"A search scope of \"one\" will only include the entries one level beneath "
-"your base.\n"
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
 msgstr ""
 "Phạm vi tìm cho biết mức tìm kiếm trong cây thư mục. Phạm vi tìm kiếm \"con"
 "\" sẽ\n"
@@ -621,21 +544,20 @@ msgstr ""
 "mục\n"
 "nằm trong cơ sở tìm.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:58
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "Đây là tên đầy đủ của LDAP server. Ví dụ, \"ldap.mycompany.com\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:39
 #, fuzzy
 msgid ""
-"This is the maximum number of entries to download. Setting this number to "
-"be \n"
+"This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr "Đây là số mục tải về tối đa. Dùng số quá lớn sẽ làm chậm sổ địa chỉ."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -644,142 +566,121 @@ msgstr ""
 "Đây là cách Evolution dùng để xác thực bạn. Chú ý rằng đặt cái này là\n"
 "\"Địa chỉ thư\" yêu cầu truy cập vô danh tới LDAP server. "
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:41
+#, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
-"list.\n"
-"It is for display purposes only. "
+"list. It is for display purposes only. "
 msgstr ""
 "Đây là tên, cho server này, sẽ được hiển thị trong danh sách thư mục "
 "Evolution.\n"
 "Chỉ được dùng với mục đích hiển thị thôi."
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:42
+#, fuzzy
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. "
-"A \n"
-"list of standard ports has been provided. Ask your system administrator\n"
-"what port you should specify."
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
 msgstr ""
 "Đây là số hiệu cổng của LDAP server mà Evolution sẽ kết nối. Một danh sách\n"
 "các cổng chuẩn sẽ được cung cấp. Hãy hỏi quản trị hệ thống của bạn để biết\n"
 "dùng cổng nào."
 
-#: addressbook/gui/component/ldap-config.glade.h:67
-msgid "This option controls how long a search will be run."
-msgstr "Tùy chọn này điểu khiển tìm kiếm sẽ chạy trong bao lâu."
-
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:43
 #, fuzzy
 msgid "Timeout:"
 msgstr "Dạng thức thời gian:"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
-msgid "U_se SSL/TLS:"
-msgstr "_Dùng SSL/TLS:"
-
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr "Dùng tên phân biệt (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr "Dùng địa chỉ email"
 
-#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
-#: mail/mail-config.glade.h:154
+#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
+#: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr "Bất cứ khi nào có thể"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:47
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "_Liên lạc:"
 
-#: addressbook/gui/component/ldap-config.glade.h:74
-#: calendar/gui/dialogs/calendar-setup.glade.h:12
-msgid "_Display name:"
-msgstr "Tên _hiển thị:"
-
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr "_Ngưỡng tải về:"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
 msgid "_Email address:"
 msgstr "Địa chỉ _email:"
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:50
+#, fuzzy
+msgid "_Find Possible Search Bases"
+msgstr "Cơ sở tìm được hỗ trợ"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Log in method:"
 msgstr "Cách đăng _nhập:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "_Log in:"
+msgstr "Đăng nhập"
+
+#: addressbook/gui/component/ldap-config.glade.h:53
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
 msgid "_Name:"
 msgstr "_Tên:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
-msgid "_Port number:"
-msgstr "_Số hiệu cổng:"
-
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "_Port:"
 msgstr "Độ ư_u tiên:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
-msgid "_Search base:"
-msgstr "_Cơ sở tìm:"
-
-#: addressbook/gui/component/ldap-config.glade.h:82
-msgid "_Server name:"
-msgstr "Tên Ser_ver:"
+#: addressbook/gui/component/ldap-config.glade.h:55
+#, fuzzy
+msgid "_Search scope:"
+msgstr "_Phạm vị tìm: "
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:56
 #, fuzzy
 msgid "_Server:"
 msgstr "_mỗi"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
-msgid "_Timeout (minutes):"
-msgstr "Thời _hạn (phút):"
+#: addressbook/gui/component/ldap-config.glade.h:57
+#, fuzzy
+msgid "_Timeout:"
+msgstr "Dạng thức thời gian:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:58
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "Dùng kết nối _an toàn (SSL):"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "card"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
-msgid "connecting-tab"
-msgstr "connecting-tab"
-
-#: addressbook/gui/component/ldap-config.glade.h:88
-msgid "general-tab"
-msgstr "general-tab"
-
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:60
 #: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
-#: mail/mail-config.glade.h:182
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "phút"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
-msgid "searching-tab"
-msgstr "searching-tab"
-
-#: addressbook/gui/component/select-names/e-select-names.c:497
+#: addressbook/gui/component/select-names/e-select-names.c:503
 #: addressbook/gui/component/select-names/select-names.glade.h:6
 #, fuzzy
 msgid "Select Contacts from Address Book"
 msgstr "Chọn liên lạc từ sổ địa chỉ"
 
-#: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
@@ -821,7 +722,7 @@ msgstr "Liên lạc vô danh"
 
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:222
+#: addressbook/gui/widgets/e-addressbook-view.c:224
 msgid "Source"
 msgstr "Nguồn"
 
@@ -901,9 +802,9 @@ msgid "<b>Work</b>"
 msgstr "Tuần làm việc"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
-#: addressbook/gui/widgets/eab-contact-display.c:342
-#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/widgets/eab-contact-display.c:334
+#: addressbook/gui/widgets/eab-contact-display.c:353
 msgid "AIM"
 msgstr ""
 
@@ -944,15 +845,15 @@ msgid "Company:"
 msgstr "Công ty"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:271
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
+#: addressbook/gui/contact-editor/e-contact-editor.c:266
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
 msgstr "Liên lạc"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1527
+#: addressbook/gui/contact-editor/e-contact-editor.c:520
 msgid "Contact Editor"
 msgstr "Bộ hiệu chỉnh liên lạc"
 
@@ -976,83 +877,80 @@ msgid "Full _Name..."
 msgstr "Tên đầ_y đủ..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:202
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-msgid "Home"
-msgstr "Nhà"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #, fuzzy
 msgid "Home Page:"
 msgstr "Fax ở Nhà"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-#, fuzzy
-msgid "Job title:"
-msgstr "Tên n_ghề:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/e-itip-control.c:936
-msgid "Location:"
-msgstr "Địa điểm:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 #, fuzzy
 msgid "MSN Messenger"
 msgstr "Thông điệp thư"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 #, fuzzy
 msgid "Mailing Address"
 msgstr "Địa chỉ _email:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 #, fuzzy
 msgid "Manager:"
 msgstr "Quản lý"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "Tên _hiệu:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Notes:"
 msgstr "_Ghi chú:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
-#: addressbook/gui/contact-editor/e-contact-editor.c:203
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-msgid "Other"
-msgstr "Khác"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#, fuzzy
+msgid "Office:"
+msgstr "_Văn phòng:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "PO Box:"
 msgstr "Hộp thư _bưu điện:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 #, fuzzy
 msgid "Personal Information"
 msgstr "Thông tin tùy chọn"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 #, fuzzy
 msgid "Profession:"
 msgstr "_Nghề nghiệp:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#, fuzzy
+msgid "Spouse:"
+msgstr "_Vợ/Chồng:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "State/Province:"
 msgstr "_Tỉnh/Bang:"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#, fuzzy
+msgid "Title:"
+msgstr "_Tựa đề"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+msgid "Video Chat:"
+msgstr ""
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:41
 #, fuzzy
 msgid "Wants to receive HTML mail"
@@ -1060,15 +958,15 @@ msgstr "Muốn nhậm _HTML mail"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:42
 #, fuzzy
-msgid "Webcam:"
-msgstr "Trang"
+msgid "Web Log:"
+msgstr "Địa chỉ _Web:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
-#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
-#: mail/mail-config.glade.h:155
+#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
+#: mail/mail-config.glade.h:157
 msgid "Work"
 msgstr "Công việc"
 
@@ -1090,41 +988,34 @@ msgid "_File under:"
 msgstr "Tên tập tin:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 #, fuzzy
 msgid "_Where:"
 msgstr "_mỗi"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
-msgid "item7"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
-msgid "item8"
-msgstr ""
-
-#: addressbook/gui/contact-editor/eab-editor.c:316
+#: addressbook/gui/contact-editor/eab-editor.c:315
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
 msgstr "Bạn có chắc muốn xoá những liên lạc này không?"
 
-#: addressbook/gui/contact-editor/eab-editor.c:319
+#: addressbook/gui/contact-editor/eab-editor.c:318
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
 msgstr "Bạn có chắc muốn xoá liên lạc này?"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:351
-#: addressbook/gui/widgets/eab-contact-display.c:372
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Address"
 msgstr "Địa chỉ"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:292
+#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard.c:174
@@ -2109,91 +2000,114 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/contact-editor/e-contact-editor.c:179
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:337
+#: addressbook/gui/widgets/eab-contact-display.c:356
 #, fuzzy
 msgid "Jabber"
 msgstr "Danh sách vô danh"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:347
-#: addressbook/gui/widgets/eab-contact-display.c:366
+#: addressbook/gui/contact-editor/e-contact-editor.c:180
+#: addressbook/gui/widgets/eab-contact-display.c:339
+#: addressbook/gui/widgets/eab-contact-display.c:358
 #, fuzzy
 msgid "Yahoo"
 msgstr "Yoro"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: addressbook/gui/widgets/eab-contact-display.c:338
+#: addressbook/gui/widgets/eab-contact-display.c:357
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:344
-#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#: addressbook/gui/widgets/eab-contact-display.c:355
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/contact-editor/e-contact-editor.c:183
 #, fuzzy
 msgid "GroupWise"
 msgstr "Nhóm"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+msgid "Home"
+msgstr "Nhà"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+msgid "Other"
+msgstr "Khác"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
 #, fuzzy
 msgid "Source Book"
 msgstr "Nguồn"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:264
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:278
+#: addressbook/gui/contact-editor/e-contact-editor.c:273
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Liên lạc mới"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:285
+#: addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Writable Fields"
 msgstr "Trường có thể ghi"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:299
+#: addressbook/gui/contact-editor/e-contact-editor.c:294
 msgid "Changed"
 msgstr "Đã thay đổi"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
-msgid "Category editor not available."
-msgstr "Bộ biên soạn phân loại không tồn tại."
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:2352
 msgid "This contact belongs to these categories:"
 msgstr "Liên lạc này thuộc các phân loại này:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#: addressbook/gui/contact-editor/e-contact-editor.c:2429
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Vui lòng chọn từ các tuỳ chọn sau"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#: addressbook/gui/contact-editor/e-contact-editor.c:2433
 #, fuzzy
 msgid "No image"
 msgstr "Nome"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#: addressbook/gui/contact-editor/e-contact-editor.c:2636
 #, fuzzy
 msgid ""
-"The following entries are invalid:\n"
+"The contact data is invalid:\n"
 "\n"
 msgstr "Những kết nối sau đang hoạt động:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2738
-#, c-format
-msgid "Could not find widget for a field: `%s'"
-msgstr "Không thể tìm thấy widget cho trường: `%s'"
+#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#, fuzzy
+msgid "Invalid contact."
+msgstr "Mục đích không hợp lệ"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+msgid ""
+"The contact cannot be saved to the selected address book. Do you want to "
+"discard changes?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2727
+#: addressbook/gui/contact-editor/e-contact-editor.c:2751
+msgid "_Discard"
+msgstr "_Hủy"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+msgid ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
+msgstr ""
 
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:62
 #, fuzzy
@@ -2231,7 +2145,7 @@ msgid "_Edit Full"
 msgstr "Sửa toàn bộ"
 
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Full Name:"
 msgstr "_Họ và tên:"
@@ -2388,30 +2302,30 @@ msgstr "Tên _danh sách:"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "Nhập địa chỉ thư hoặc kéo liên lạc vào danh sách dưới đây:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "contact-list-editor"
 msgstr "contact-list-editor"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:153
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:215
+#: addressbook/gui/widgets/e-addressbook-view.c:217
 #: addressbook/gui/widgets/e-minicard-view.c:460
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Sách"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
 msgid "Is New List"
 msgstr "Là danh sách mới"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:215
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
 msgid "Contact List Editor"
 msgstr "Bộ hiệu chỉnh danh sách liên lạc"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:438
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
 msgid "Save List as VCard"
 msgstr "Lưu danh sách bằng VCard"
 
@@ -2458,127 +2372,127 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Tìm kiếm nâng cao"
 
-#: addressbook/gui/widgets/eab-contact-display.c:129
-#: addressbook/gui/widgets/eab-contact-display.c:192
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:139
-#: addressbook/gui/widgets/eab-contact-display.c:205
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
 msgid "map"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:257
-#: addressbook/gui/widgets/eab-contact-display.c:533
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:525
 #, fuzzy
 msgid "List Members"
 msgstr "Thành viên"
 
-#: addressbook/gui/widgets/eab-contact-display.c:329
-#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/eab-contact-display.c:321
+#: addressbook/gui/widgets/eab-contact-display.c:323
 msgid "E-mail"
 msgstr "E-mail"
 
-#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/eab-contact-display.c:332
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Tổ chức"
 
-#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:333
 #, fuzzy
 msgid "Position"
 msgstr "Boston"
 
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:354
 #, fuzzy
 msgid "Groupwise"
 msgstr "Nhóm"
 
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:340
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:349
-#: addressbook/gui/widgets/eab-contact-display.c:370
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:362
 #, fuzzy
 msgid "Phone"
 msgstr "Ponce"
 
-#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:342
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:354
+#: addressbook/gui/widgets/eab-contact-display.c:346
 #, fuzzy
 msgid "work"
 msgstr "Công việc"
 
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:359
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:368
-#: addressbook/gui/widgets/eab-contact-display.c:587
+#: addressbook/gui/widgets/eab-contact-display.c:360
+#: addressbook/gui/widgets/eab-contact-display.c:579
 #, fuzzy
 msgid "Blog"
 msgstr "Bologna"
 
-#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/eab-contact-display.c:363
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Điện thoại di động"
 
-#: addressbook/gui/widgets/eab-contact-display.c:375
+#: addressbook/gui/widgets/eab-contact-display.c:367
 #, fuzzy
 msgid "personal"
 msgstr "Cá nhân"
 
-#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/eab-contact-display.c:374
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Ghi chú"
 
-#: addressbook/gui/widgets/eab-contact-display.c:548
+#: addressbook/gui/widgets/eab-contact-display.c:540
 #, fuzzy
 msgid "Job Title"
 msgstr "Tên n_ghề:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/eab-contact-display.c:544
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:774
+#: smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "Email"
 
-#: addressbook/gui/widgets/eab-contact-display.c:579
+#: addressbook/gui/widgets/eab-contact-display.c:571
 #, fuzzy
 msgid "Home page"
 msgstr "Fax ở Nhà"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 msgid "Success"
 msgstr "Thành công"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Backend busy"
 msgstr ""
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Repository offline"
 msgstr "Kho ngoại tuyến"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 #, fuzzy
 msgid "Address Book does not exist"
 msgstr "Sổ địa chỉ không tồn tại"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 #, fuzzy
 msgid "No Self Contact defined"
 msgstr "Danh sách liên lạc mới"
@@ -2586,29 +2500,29 @@ msgstr "Danh sách liên lạc mới"
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Permission denied"
 msgstr "Không đủ quyền truy cập"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:57
 #, fuzzy
 msgid "Contact not found"
 msgstr "Không có card"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: addressbook/gui/widgets/eab-gui-util.c:58
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "Card ID đã tồn tại"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Protocol not supported"
 msgstr "Chưa hỗ trợ giao thức này"
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:60
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:233
 #: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
@@ -2621,39 +2535,39 @@ msgid "Cancelled"
 msgstr "Bị hủy bỏ"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:61
 #, fuzzy
 msgid "Could not cancel"
 msgstr "Không thể mở thư mục chia sẽ: %s."
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Authentication Failed"
 msgstr "Xác thực thất bại"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Authentication Required"
 msgstr "Yêu cầu xác thực"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:66
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "TLS not Available"
 msgstr "Không có TLS"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#: addressbook/gui/widgets/eab-gui-util.c:66
 #, fuzzy
 msgid "No such source"
 msgstr "Không có thông điệp như vậy"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:69
+#: addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Other error"
 msgstr "Lỗi khác"
 
-#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:90
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
@@ -2662,7 +2576,7 @@ msgstr ""
 "Không thể mở sổ địa chỉ này. Vui lòng kiểm tra lại đường dẫn có tồn tại\n"
 "hay không và bạn có quyền truy cập vào đường dẫn đó hay không."
 
-#: addressbook/gui/widgets/eab-gui-util.c:110
+#: addressbook/gui/widgets/eab-gui-util.c:97
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -2672,19 +2586,19 @@ msgstr ""
 "do bạn đã nhập sai URI, hoặc là do LDAP server \n"
 "không hoạt động."
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:102
 #, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution you must compile the program from the CVS "
-"sources after retrieving OpenLDAP from the link below."
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
 msgstr ""
 "Phiên bản Evolution này không được biên dịch để hỗ trợ LDAP.\n"
 "Nếu bạn muốn dùng LDAP trong Evolution, bạn phải biên dịch\n"
 "lại chương trình từ mã nguồn sau khi nhận OpenLDAP từ địa chỉ\n"
 "dưới đây.\n"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:109
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -2694,11 +2608,7 @@ msgstr ""
 "do bạn đã nhập sai URI, hoặc là do server không\n"
 "hoạt động."
 
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "Unable to open addressbook"
-msgstr "Không thể mở sổ địa chỉ"
-
-#: addressbook/gui/widgets/eab-gui-util.c:162
+#: addressbook/gui/widgets/eab-gui-util.c:129
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2710,7 +2620,7 @@ msgstr ""
 "xác hơn hoặc tăng giới hạn kết quả trong Thông số server thư\n"
 "mục cho sổ địa chỉ này."
 
-#: addressbook/gui/widgets/eab-gui-util.c:168
+#: addressbook/gui/widgets/eab-gui-util.c:135
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -2721,56 +2631,48 @@ msgstr ""
 "do bạn cấu hình cho sổ địa chỉ này. Vui lòng tìm kiếm chính xác hơn hoặc\n"
 "tăng giới hạn thời gian trong thông số server thư mục cho sổ địa chỉ này."
 
-#: addressbook/gui/widgets/eab-gui-util.c:174
+#: addressbook/gui/widgets/eab-gui-util.c:141
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "Backend cho sổ địa chỉ này không thể phân tích truy vấn này."
 
-#: addressbook/gui/widgets/eab-gui-util.c:177
+#: addressbook/gui/widgets/eab-gui-util.c:144
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Backend cho sổ địa chỉ này không thể thực hiện truy vấn này."
 
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:147
 msgid "This query did not complete successfully."
 msgstr "Truy vấn không hoàn tất."
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
-msgid "Do you want to save changes?"
-msgstr "Bạn có muốn lưu các thay đổi không?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:208
-msgid "_Discard"
-msgstr "_Hủy"
-
-#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:169
 msgid "Error adding list"
 msgstr "Lỗi khi thêm danh sách"
 
-#: addressbook/gui/widgets/eab-gui-util.c:229
-#: addressbook/gui/widgets/eab-gui-util.c:652
+#: addressbook/gui/widgets/eab-gui-util.c:169
+#: addressbook/gui/widgets/eab-gui-util.c:580
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Lỗi khi thêm card"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying list"
 msgstr "Lỗi khi sửa đổi danh sách"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Lỗi khi sửa đổi card"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:192
 msgid "Error removing list"
 msgstr "Lỗi khi loại bỏ danh sách"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
-#: addressbook/gui/widgets/eab-gui-util.c:610
+#: addressbook/gui/widgets/eab-gui-util.c:192
+#: addressbook/gui/widgets/eab-gui-util.c:538
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Lỗi khi loại bỏ card"
 
-#: addressbook/gui/widgets/eab-gui-util.c:334
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, fuzzy, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2779,7 +2681,7 @@ msgstr ""
 "Việc mở %d card sẽ mở %d cửa sổ mới cùng lúc.\n"
 "Bạn có thật sự muốn hiển thị mọi tấm card này không?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:360
+#: addressbook/gui/widgets/eab-gui-util.c:300
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2788,54 +2690,49 @@ msgstr ""
 "%s đã tồn tại.\n"
 "Bạn có muốn ghi đè lên nó?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:364
+#: addressbook/gui/widgets/eab-gui-util.c:304
 msgid "Overwrite"
 msgstr "Ghi đè"
 
-#: addressbook/gui/widgets/eab-gui-util.c:400
-#, c-format
-msgid "Error saving %s: %s"
-msgstr "Lỗi lưu %s: %s"
-
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:437
+#: addressbook/gui/widgets/eab-gui-util.c:365
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:571
+#: addressbook/gui/widgets/eab-gui-util.c:499
 msgid "list"
 msgstr "danh sách"
 
-#: addressbook/gui/widgets/eab-gui-util.c:706
+#: addressbook/gui/widgets/eab-gui-util.c:634
 #, fuzzy
 msgid "Move contact to"
 msgstr "Chuyển Card tới"
 
-#: addressbook/gui/widgets/eab-gui-util.c:708
+#: addressbook/gui/widgets/eab-gui-util.c:636
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Chép Card tới"
 
-#: addressbook/gui/widgets/eab-gui-util.c:711
+#: addressbook/gui/widgets/eab-gui-util.c:639
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Chuyển các Card tới"
 
-#: addressbook/gui/widgets/eab-gui-util.c:713
+#: addressbook/gui/widgets/eab-gui-util.c:641
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Chép các Card tới"
 
-#: addressbook/gui/widgets/eab-gui-util.c:716
+#: addressbook/gui/widgets/eab-gui-util.c:644
 #, fuzzy
 msgid "Select target addressbook."
 msgstr "Chọn liên lạc từ sổ địa chỉ"
 
-#: addressbook/gui/widgets/eab-gui-util.c:939
+#: addressbook/gui/widgets/eab-gui-util.c:867
 msgid "Multiple VCards"
 msgstr "Nhiều VCard"
 
-#: addressbook/gui/widgets/eab-gui-util.c:942
+#: addressbook/gui/widgets/eab-gui-util.c:870
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard cho %s"
@@ -2926,7 +2823,7 @@ msgstr[1] "Liên lạc"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:229
+#: addressbook/gui/widgets/e-addressbook-view.c:231
 #: addressbook/gui/widgets/e-minicard-view.c:467
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
@@ -2944,146 +2841,135 @@ msgstr "Kiểu"
 msgid "Error modifying card"
 msgstr "Lỗi khi sửa đổi card"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:163
 msgid "Name begins with"
 msgstr "Tên bắt đầu bằng"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:164
 msgid "Email begins with"
 msgstr "Thư bắt đầu bằng"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:57
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "Phân loại "
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-#: calendar/gui/cal-search-bar.c:50
+#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Bất kỳ trường nào chứa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+#: addressbook/gui/widgets/e-addressbook-view.c:172
 msgid "Advanced..."
 msgstr "Nâng cao..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:236
+#: addressbook/gui/widgets/e-addressbook-view.c:238
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:249
+#: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Kiểu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:506
+#: addressbook/gui/widgets/e-addressbook-view.c:508
 #, fuzzy
 msgid "Address Book"
 msgstr "Sổ địa chỉ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2076
+#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:2080
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
 msgstr "Lưu là VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 msgid "New Contact..."
 msgstr "Liên lạc mới..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "New Contact List..."
 msgstr "Danh sách liên lạc mới..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Go to Folder..."
 msgstr "Đi tới thư mục..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Import..."
 msgstr "Nhập..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1066
 msgid "Search for Contacts..."
 msgstr "Tìm liên lạc..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "Nguồn sổ địa chỉ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1069
 msgid "Pilot Settings..."
 msgstr "Thiết lập pilot..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Chuyển tiếp liên lạc"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
 msgid "Send Message to Contact"
 msgstr "Gửi thông điệp cho liên lạc"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "In"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
+#: addressbook/gui/widgets/e-addressbook-view.c:1077
 msgid "Print Envelope"
 msgstr "In phong bì"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
+#: addressbook/gui/widgets/e-addressbook-view.c:1081
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "Sổ địa chỉ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1080
+#: addressbook/gui/widgets/e-addressbook-view.c:1082
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "Sổ địa chỉ..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Cắt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Sao chép"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1087
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "Dán"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:1092
+#: calendar/gui/e-calendar-view.c:1280
 msgid "Current View"
 msgstr "Khung xem hiện thời"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1309
-#, c-format
-msgid ""
-"The addressbook backend for\n"
-"%s\n"
-"has crashed. You will have to restart Evolution in order to use it again"
-msgstr ""
-"Backend sổ địa chỉ cho\n"
-"%s\n"
-"đã hỏng. Bạn phải khởi động lại Evolution để dùng lại."
-
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1667
-#: calendar/gui/cal-search-bar.c:362
+#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "Bất kỳ phân loại nào"
 
@@ -3192,7 +3078,7 @@ msgstr "Rađiô"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-list-view.c:234
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "Vai trò"
@@ -3340,13 +3226,13 @@ msgstr "Bộ soạn thư của Evolution."
 msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.c:998
+#: addressbook/printing/e-contact-print.c:1000
 #, fuzzy
 msgid "Print contacts"
 msgstr "In liên lạc được chọn"
 
-#: addressbook/printing/e-contact-print.c:1064
-#: addressbook/printing/e-contact-print.c:1091
+#: addressbook/printing/e-contact-print.c:1066
+#: addressbook/printing/e-contact-print.c:1093
 #, fuzzy
 msgid "Print contact"
 msgstr "In liên lạc được chọn"
@@ -3599,17 +3485,22 @@ msgstr ""
 msgid "Impossible internal error."
 msgstr "Lỗi nội tại"
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:629
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
 #, fuzzy
 msgid "Can not open file"
 msgstr "Không thể mở thông điệp"
 
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
 #, fuzzy
-msgid "Can not load URI"
-msgstr "Không có card"
+msgid "Couldn't get list of addressbooks"
+msgstr "Không thể nạp %s: %s"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Không thể mở sổ địa chỉ"
 
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
@@ -3627,7 +3518,7 @@ msgstr "Chưa có tên tập tin."
 msgid "Unnamed List"
 msgstr "Danh sách vô danh"
 
-#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 #, fuzzy
 msgid "Enter password"
@@ -3911,10 +3802,10 @@ msgid "Whether to show week numbers in date navigator"
 msgstr "Hiện số tuần trong bộ duyệt ngày"
 
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:88
-#: calendar/gui/gnome-cal.c:1703
-#: camel/providers/groupwise/camel-gw-listener.c:304
-#: camel/providers/groupwise/camel-gw-listener.c:327
+#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/gnome-cal.c:1705
+#: camel/providers/groupwise/camel-gw-listener.c:311
+#: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
 msgstr "Lịch"
 
@@ -3937,7 +3828,7 @@ msgstr "trả về nhỏ hơn"
 
 #: calendar/gui/calendar-commands.c:363
 #: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:19 filter/filter.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
 msgid "days"
 msgstr "ngày"
 
@@ -4091,24 +3982,24 @@ msgstr "Khung tuần"
 msgid "Month View"
 msgstr "Khung tháng"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "Tóm tắt chứa"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "Mô tả chứa"
 
-#: calendar/gui/cal-search-bar.c:54
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "Ghi chú chứa"
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:53
 #, fuzzy
 msgid "Location contains"
 msgstr "Mô tả chứa"
 
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
 msgid "Unmatched"
 msgstr "Không khớp"
 
@@ -4129,24 +4020,24 @@ msgstr "Không đủ quyền truy cập để mở lịch"
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:466
+#: calendar/gui/dialogs/alarm-options.c:467
 msgid "Audio Alarm Options"
 msgstr "Tùy chọn báo động âm thanh"
 
-#: calendar/gui/dialogs/alarm-options.c:475
+#: calendar/gui/dialogs/alarm-options.c:476
 msgid "Message Alarm Options"
 msgstr "Tùy chọn báo động thông điệp"
 
-#: calendar/gui/dialogs/alarm-options.c:484
+#: calendar/gui/dialogs/alarm-options.c:485
 #, fuzzy
 msgid "Email Alarm Options"
 msgstr "Tùy chọn báo động thư"
 
-#: calendar/gui/dialogs/alarm-options.c:493
+#: calendar/gui/dialogs/alarm-options.c:494
 msgid "Program Alarm Options"
 msgstr "Tùy chọn báo động chương trình"
 
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:510
 msgid "Unknown Alarm Options"
 msgstr "Tùy chọn báo động lạ"
 
@@ -4186,7 +4077,7 @@ msgstr "Gửi"
 msgid "With these arguments:"
 msgstr "Với tham số này:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
 msgid "dialog1"
 msgstr ""
 
@@ -4195,7 +4086,7 @@ msgid "extra times every"
 msgstr ""
 
 #: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:20 filter/filter.glade.h:16
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr "giờ"
 
@@ -4242,7 +4133,7 @@ msgstr "Gửi thư"
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Tóm tắt:"
 
@@ -4272,7 +4163,6 @@ msgid "hour(s)"
 msgstr "giờ"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:21
 msgid "minute(s)"
 msgstr "phút"
 
@@ -4280,27 +4170,27 @@ msgstr "phút"
 msgid "start of appointment"
 msgstr "bắt đầu cuộc hẹn"
 
-#: calendar/gui/dialogs/calendar-setup.c:170
+#: calendar/gui/dialogs/calendar-setup.c:172
 #, fuzzy
 msgid "You must specify a location to get the calendar from."
 msgstr "Bạn phải xác định tên tập tin."
 
-#: calendar/gui/dialogs/calendar-setup.c:178
+#: calendar/gui/dialogs/calendar-setup.c:180
 #, fuzzy, c-format
 msgid "The source location '%s' is not well-formed."
 msgstr "Chưa hỗ trợ phương thức yêu cầu để nạp `%s'"
 
-#: calendar/gui/dialogs/calendar-setup.c:193
+#: calendar/gui/dialogs/calendar-setup.c:195
 #, c-format
 msgid "The source location '%s' is not a webcal source."
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:265
+#: calendar/gui/dialogs/calendar-setup.c:275
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:278
+#: calendar/gui/dialogs/calendar-setup.c:288
 #, c-format
 msgid ""
 "The group '%s' is remote. You must specify a location to get the calendar "
@@ -4322,61 +4212,36 @@ msgstr "Danh sách công việc"
 msgid "C_olor:"
 msgstr "_Màu sắc"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-#, fuzzy
-msgid "Calendar Properties"
-msgstr "Lỗi iCalendar"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
 msgid "Pick a color"
 msgstr "Chọn màu"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:8
-#, fuzzy
-msgid "Remote"
-msgstr "Loại bỏ"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-#, fuzzy
-msgid "Task List Properties"
-msgstr "Danh sách công việc"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
 #, fuzzy
 msgid "_Add Calendar"
 msgstr "New Caledonia"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
 #, fuzzy
 msgid "_Add Group"
 msgstr "_Nhóm mới..."
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-#, fuzzy
-msgid "_Refresh Interval:"
-msgstr "_Danh sách cập nhật"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
 #, fuzzy
 msgid "_Refresh:"
 msgstr "Cập nhật"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-#, fuzzy
-msgid "_Source URL:"
-msgstr "URI của POP"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
 #, fuzzy
 msgid "_Type:"
 msgstr "Kiểu:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
 #, fuzzy
 msgid "_URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
 msgid "weeks"
 msgstr "tuần"
 
@@ -4486,7 +4351,7 @@ msgid "Display"
 msgstr "_Hiển thị"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:76
 msgid "E_nable"
 msgstr "_Bật"
 
@@ -4497,7 +4362,7 @@ msgstr "Yêu cầu thông tin bận/rảnh"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:563
+#: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Thứ Sáu"
 
@@ -4511,7 +4376,7 @@ msgstr "Phút"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:559
+#: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Thứ Hai"
 
@@ -4521,7 +4386,7 @@ msgstr "_CN"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:564
+#: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Thứ Bảy"
 
@@ -4535,7 +4400,7 @@ msgstr "Hiện số tuần trong bộ duyệt ngày"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Chủ nhật"
 
@@ -4549,7 +4414,7 @@ msgstr "_Năm"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:562
+#: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Thứ Năm"
 
@@ -4563,7 +4428,7 @@ msgstr "Dạng thức thời gian:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:560
+#: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Thứ Ba"
 
@@ -4573,7 +4438,7 @@ msgstr "Tuần _bắt đầu:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:561
+#: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Thứ Tư"
 
@@ -4607,7 +4472,7 @@ msgid "_Day begins:"
 msgstr "_Ngày bắt đầu:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
-#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:43
@@ -4656,84 +4521,50 @@ msgstr "_Tư"
 msgid "before every appointment"
 msgstr "trước khi mỗi cuộc hẹn"
 
-#: calendar/gui/dialogs/cancel-comp.c:57
-msgid ""
-"The event being deleted is a meeting, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"Sự kiện này sẽ bị xóa khỏi cuộc họp, bạn có muốn gửi thông báo hủy sự kiện "
-"này không?"
-
-#: calendar/gui/dialogs/cancel-comp.c:60
-msgid "Are you sure you want to cancel and delete this meeting?"
-msgstr "Bạn có chắc muốn hủy bỏ và xoá cuộc họp này?"
-
-#: calendar/gui/dialogs/cancel-comp.c:66
-msgid ""
-"The task being deleted is assigned, would you like to send a cancellation "
-"notice?"
-msgstr ""
-"Công việc sẽ bị xóa này đã được phân công, bạn có muốn gửi thông báo hủy "
-"công việc này không?"
-
-#: calendar/gui/dialogs/cancel-comp.c:69
-msgid "Are you sure you want to cancel and delete this task?"
-msgstr "Bạn có chắc muốn hủy bỏ và xóa công việc này?"
-
-#: calendar/gui/dialogs/cancel-comp.c:75
-msgid ""
-"The journal entry being deleted is published, would you like to send a "
-"cancellation notice?"
-msgstr ""
-
-#: calendar/gui/dialogs/cancel-comp.c:78
-msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr "Bạn có chắc muốn hủy bỏ và xóa mục nhật ký này?"
-
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Sự kiện đã bị xóa."
 
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "Công việc đã bị xóa."
 
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:68
 msgid "This journal entry has been deleted."
 msgstr "Mục nhật ký đã bị xóa"
 
-#: calendar/gui/dialogs/changed-comp.c:75
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  Bạn đã tạo ra một vài thay đổi. Bỏ qua những thay đổi này và đóng bộ "
 "biên soạn?"
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Bạn chưa thay đổi gì, đóng bộ biên soạn?"
 
-#: calendar/gui/dialogs/changed-comp.c:82
+#: calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "Sự kiện này đã thay đổi."
 
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "Công việc này đã thay đổi."
 
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:92
 msgid "This journal entry has been changed."
 msgstr "Mục nhật ký này đã thay đổi."
 
-#: calendar/gui/dialogs/changed-comp.c:99
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr ""
 "%s  Bạn đã tạo ra vài thay đổi. Bỏ qua những thay đổi này và cập nhật bộ "
 "biên soạn?"
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Bạn chưa thay đổi gì, cập nhật bộ biên soạn?"
@@ -4771,7 +4602,7 @@ msgid "No summary"
 msgstr "Không có tóm tắt"
 
 #: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
 #: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Lưu là..."
@@ -4828,106 +4659,58 @@ msgstr "Hủy tác vụ"
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:95
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "Bạn có chắc muốn xóa cuộc hẹn `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:98
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "Bạn có chắc muốn xóa cuộc hẹn vô danh này?"
-
-#: calendar/gui/dialogs/delete-comp.c:104
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "Bạn có chắc muốn xóa công việc `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:107
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "Bạn có chắc muốn xóa công việc vô danh này?"
-
-#: calendar/gui/dialogs/delete-comp.c:113
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "Bạn có chắc muốn xóa mục nhật ky1 `%s'?"
-
-#: calendar/gui/dialogs/delete-comp.c:116
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "Bạn có chắc muốn xóa mục nhật ký này?"
-
-#: calendar/gui/dialogs/delete-comp.c:131
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d appointment?"
-msgid_plural "Are you sure you want to delete %d appointments?"
-msgstr[0] "Bạn có chắc muốn xóa %d cuộc hẹn?"
-msgstr[1] "Bạn có chắc muốn xóa %d cuộc hẹn?"
-
-#: calendar/gui/dialogs/delete-comp.c:138
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d task?"
-msgid_plural "Are you sure you want to delete %d tasks?"
-msgstr[0] "Bạn có chắc muốn xóa %d công việc?"
-msgstr[1] "Bạn có chắc muốn xóa %d công việc?"
-
-#: calendar/gui/dialogs/delete-comp.c:145
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d journal entry?"
-msgid_plural "Are you sure you want to delete %d journal entries?"
-msgstr[0] "Bạn có chắc muốn xóa %d mục nhật ký?"
-msgstr[1] "Bạn có chắc muốn xóa %d mục nhật ký?"
-
-#: calendar/gui/dialogs/delete-error.c:52
+#: calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:55
+#: calendar/gui/dialogs/delete-error.c:57
 msgid "The task could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:58
+#: calendar/gui/dialogs/delete-error.c:60
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:61
+#: calendar/gui/dialogs/delete-error.c:63
 #, fuzzy
 msgid "The item could not be deleted due to a corba error"
 msgstr "Không thể gửi!\n"
 
-#: calendar/gui/dialogs/delete-error.c:68
+#: calendar/gui/dialogs/delete-error.c:70
 msgid "The event could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:71
+#: calendar/gui/dialogs/delete-error.c:73
 #, fuzzy
 msgid "The task could not be deleted because permission was denied"
 msgstr ""
 "Không thể cập nhật trạng thái người tham dự vì trạng thái không hợp lệ!\n"
 
-#: calendar/gui/dialogs/delete-error.c:74
+#: calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:77
+#: calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:84
+#: calendar/gui/dialogs/delete-error.c:86
 #, fuzzy
 msgid "The event could not be deleted due to an error"
 msgstr "Không thể gửi!\n"
 
-#: calendar/gui/dialogs/delete-error.c:87
+#: calendar/gui/dialogs/delete-error.c:89
 #, fuzzy
 msgid "The task could not be deleted due to an error"
 msgstr "Không thể gửi!\n"
 
-#: calendar/gui/dialogs/delete-error.c:90
+#: calendar/gui/dialogs/delete-error.c:92
 #, fuzzy
 msgid "The journal entry could not be deleted due to an error"
 msgstr ""
 "Không thể cập nhật trạng thái người tham dự vì trạng thái không hợp lệ!\n"
 
-#: calendar/gui/dialogs/delete-error.c:93
+#: calendar/gui/dialogs/delete-error.c:95
 #, fuzzy
 msgid "The item could not be deleted due to an error"
 msgstr "Không thể gửi!\n"
@@ -5065,11 +4848,11 @@ msgstr "Thời điểm đầ_u:"
 
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:3
+#: calendar/gui/dialogs/meeting-page.glade.h:4
 #: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
 #: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1559
-#: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:100
+#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
+#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
@@ -5095,8 +4878,8 @@ msgstr "Ủ_y nhiệm cho..."
 #. FIXME: need to disable for undeletable folders
 #: calendar/gui/dialogs/meeting-page.c:655
 #: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1310 calendar/gui/e-calendar-view.c:1342
-#: mail/em-folder-tree.c:2557 mail/em-folder-view.c:919
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
+#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -5104,7 +4887,7 @@ msgid "_Delete"
 msgstr "_Xóa"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:240
+#: calendar/gui/e-meeting-list-view.c:218
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "Người tham dự"
@@ -5140,16 +4923,15 @@ msgid "Member"
 msgstr "Thành viên"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
-#: mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-list-view.c:248
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Trạng thái"
 
@@ -5158,20 +4940,20 @@ msgstr "Trạng thái"
 msgid "Add A_ttendee"
 msgstr "Người tham dự"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "Add attendees from addressbook."
+msgstr "Thêm người _gửi vào sổ địa chỉ"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "Tổ chức:"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
+#: calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "_Change Organizer"
 msgstr "Đổ_i tổ chức"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-#: calendar/gui/e-meeting-time-sel.c:417
-msgid "_Invite Others..."
-msgstr "_Mời người khác..."
-
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 #, fuzzy
 msgid "<b>Calendar options</b>"
@@ -5334,7 +5116,7 @@ msgid "_No recurrence"
 msgstr "_Không truy hồi"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:450
+#: composer/e-msg-composer-attachment-bar.c:453
 msgid "_Remove"
 msgstr "_Loại bỏ"
 
@@ -5366,57 +5148,21 @@ msgstr "tuần"
 msgid "year(s)"
 msgstr "năm"
 
-#: calendar/gui/dialogs/save-comp.c:53
-#, fuzzy
-msgid ""
-"This event has been changed, but has not been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"Chữ ký này đã thay đổi, nhưng vẫn chưa được lưu.\n"
-"\n"
-"Bạn có muốn lưu các thay đổi không?"
-
-#: calendar/gui/dialogs/save-comp.c:57
-msgid "_Discard Changes"
-msgstr "_Hủy thay đổi"
-
-#: calendar/gui/dialogs/save-comp.c:62
-#, fuzzy
-msgid "Save Event"
-msgstr "Sự kiện lịch"
-
-#: calendar/gui/dialogs/select-source-dialog.c:65
+#: calendar/gui/dialogs/select-source-dialog.c:69
 #, fuzzy
 msgid "Select destination"
 msgstr "Chọn một thư mục đích để nhập dữ liệu này"
 
-#: calendar/gui/dialogs/select-source-dialog.c:86
+#: calendar/gui/dialogs/select-source-dialog.c:90
 #, fuzzy
 msgid "_Destination"
 msgstr "Xoá thư mục này"
 
-#: calendar/gui/dialogs/select-source-dialog.c:88
+#: calendar/gui/dialogs/select-source-dialog.c:92
 #, fuzzy
 msgid "Task List"
 msgstr "Danh sách công việc"
 
-#: calendar/gui/dialogs/send-comp.c:57
-msgid "The meeting information has been created. Send it?"
-msgstr "Thông tin cuộc họp đã được tại. Gửi nó đi chứ?"
-
-#: calendar/gui/dialogs/send-comp.c:60
-msgid "The meeting information has changed. Send an updated version?"
-msgstr "Thông tin cuộc họp đã thay đổi. Gửi bản cập nhật?"
-
-#: calendar/gui/dialogs/send-comp.c:67
-msgid "The task assignment information has been created. Send it?"
-msgstr "Thông tin công việc đã được tạo. Gửi nó đi chứ?"
-
-#: calendar/gui/dialogs/send-comp.c:71
-msgid "The task information has changed. Send an updated version?"
-msgstr "Thông tin công việc đã thay đổi. Gửi bản cập nhật?"
-
 #: calendar/gui/dialogs/task-details-page.c:406
 msgid "Completed date is wrong"
 msgstr "Ngày hoàn thành sai"
@@ -5436,7 +5182,7 @@ msgstr "Hoàn thành"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #: calendar/gui/e-cal-component-preview.c:249
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:960
 msgid "High"
 msgstr "Cao"
 
@@ -5450,14 +5196,14 @@ msgstr "Đang làm"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:253
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:958
 msgid "Low"
 msgstr "Thấp"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:251
 #: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:957
+#: mail/message-list.c:959
 msgid "Normal"
 msgstr "Bình thường"
 
@@ -5517,8 +5263,8 @@ msgstr "Tin tưởn_g"
 
 #: calendar/gui/dialogs/task-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
+#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Mô tả"
 
@@ -5694,7 +5440,7 @@ msgstr "N_gày đến hạn:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:950
+#: calendar/gui/e-itip-control.c:943
 msgid "Status:"
 msgstr "Trạng thái:"
 
@@ -5780,12 +5526,12 @@ msgstr "Bận"
 msgid "Deleting selected objects"
 msgstr "Đang xóa đối tượng được chọn"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
 msgid "Updating objects"
 msgstr "Đang cập nhật đối tượng"
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1370
+#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
 #: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Mở"
@@ -5796,15 +5542,15 @@ msgid "Open _Web Page"
 msgstr "_Mở thông điệp"
 
 #: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1291 calendar/gui/e-calendar-view.c:1376
-#: mail/em-folder-view.c:896 mail/em-popup.c:690 mail/em-popup.c:806
+#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
+#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "Lư_u là..."
 
 #: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1292
-#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
+#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
@@ -5812,24 +5558,24 @@ msgid "_Print..."
 msgstr "_In..."
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Cắt"
 
 #: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1338
-#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2550
-#: mail/message-list.c:1644 ui/evolution-addressbook.xml.h:31
+#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
+#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
+#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "_Sao chép"
 
 #: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1273 calendar/gui/e-calendar-view.c:1299
-#: calendar/gui/e-calendar-view.c:1372 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
+#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
@@ -5898,71 +5644,71 @@ msgstr "Tóm tắt"
 msgid "Task sort"
 msgstr "Loại công việc"
 
-#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
 msgid "New _Appointment..."
 msgstr "Cuộc hẹn mớ_i..."
 
-#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
+#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
 msgid "New All Day _Event"
 msgstr "Sự _kiện mọi ngày mới"
 
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
+#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
 msgid "New Meeting"
 msgstr "Cuộc họp mới"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
 msgid "New Task"
 msgstr "Công việc mới"
 
-#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Chọn nhánh"
 
-#: calendar/gui/e-calendar-view.c:1280
+#: calendar/gui/e-calendar-view.c:1283
 #, fuzzy
 msgid "_Select Date..."
 msgstr "Xóa..."
 
-#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Công bố thông tin bận/rảnh"
 
-#: calendar/gui/e-calendar-view.c:1303
+#: calendar/gui/e-calendar-view.c:1306
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Chép vào thư mục..."
 
-#: calendar/gui/e-calendar-view.c:1304
+#: calendar/gui/e-calendar-view.c:1307
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "_Chuyển tới thư mục..."
 
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1308
 msgid "_Schedule Meeting..."
 msgstr "Lập lịch _cuộc họp..."
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1309
 msgid "_Forward as iCalendar..."
 msgstr "_Chuyển như iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
 msgid "Delete this _Occurrence"
 msgstr "_Xóa lần này"
 
-#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
 msgid "Delete _All Occurrences"
 msgstr "Xóa _mọi lần"
 
-#: calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1349
 msgid "Go to _Today"
 msgstr "Đi tới ngày _hôm nay"
 
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1351
 msgid "_Go to Date..."
 msgstr "Đi tới _ngày..."
 
-#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "T_hiết lập..."
 
@@ -5976,9 +5722,9 @@ msgstr "Ngày bắt đầu"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:967 calendar/gui/e-itip-control.c:1169
-#: calendar/gui/e-meeting-list-view.c:144
-#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
 #: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
 #: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
 #: camel/camel-tcp-stream-openssl.c:631
@@ -6004,13 +5750,13 @@ msgid "Assigned"
 msgstr "Đã gán"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr "Có"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "Không"
 
@@ -6022,7 +5768,7 @@ msgstr "B"
 msgid "S"
 msgstr "N"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
 msgid "E"
 msgstr "Đ"
 
@@ -6094,407 +5840,411 @@ msgstr "%d %b"
 msgid "%02i minute divisions"
 msgstr "lệch %02i phút"
 
-#: calendar/gui/e-itip-control.c:592
+#: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
 msgstr "Có. (Truy hồi phức)"
 
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:596
 #, fuzzy, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "Mỗi ngày"
 msgstr[1] "Mỗi ngày"
 
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:601
 #, fuzzy, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "Mỗi tuần"
 msgstr[1] "Mỗi tuần"
 
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:603
 #, fuzzy, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "Mỗi tuần lúc "
 msgstr[1] "Mỗi tuần lúc "
 
-#: calendar/gui/e-itip-control.c:618
+#: calendar/gui/e-itip-control.c:611
 msgid " and "
 msgstr " và "
 
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:618
 #, c-format
 msgid "The %s day of "
 msgstr "%s ngày của "
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:631
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s của "
 
-#: calendar/gui/e-itip-control.c:645
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "mỗi tháng"
 msgstr[1] "mỗi tháng"
 
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:642
 #, fuzzy, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "mỗi năm"
 msgstr[1] "mỗi năm"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:653
 #, fuzzy, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] " tổng cộng %d lần"
 msgstr[1] " tổng cộng %d lần"
 
-#: calendar/gui/e-itip-control.c:669
+#: calendar/gui/e-itip-control.c:662
 msgid ", ending on "
 msgstr ", kết thúc lúc "
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:686
 msgid "<b>Starts:</b> "
 msgstr "<b>Bắt đầu:</b> "
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:696
 msgid "<b>Ends:</b> "
 msgstr "<b>Kết thúc:</b>"
 
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:716
 msgid "<b>Completed:</b> "
 msgstr "<b>Hoàn tất:</b>"
 
-#: calendar/gui/e-itip-control.c:733
+#: calendar/gui/e-itip-control.c:726
 msgid "<b>Due:</b> "
 msgstr "<b>Tới hạn:</b>"
 
-#: calendar/gui/e-itip-control.c:771 calendar/gui/e-itip-control.c:827
+#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
 msgid "iCalendar Information"
 msgstr "Thông tin iCalendar"
 
 #. Title
-#: calendar/gui/e-itip-control.c:788
+#: calendar/gui/e-itip-control.c:781
 msgid "iCalendar Error"
 msgstr "Lỗi iCalendar"
 
-#: calendar/gui/e-itip-control.c:859 calendar/gui/e-itip-control.c:875
-#: calendar/gui/e-itip-control.c:886 calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
 msgid "An unknown person"
 msgstr "Người lạ"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:910
+#: calendar/gui/e-itip-control.c:903
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 "<br> Vui lòng xem lại các chỉ dẫn sau và chọn một hành động từ menu bên dưới."
 
-#: calendar/gui/e-itip-control.c:925
+#: calendar/gui/e-itip-control.c:918
 msgid "<i>None</i>"
 msgstr "<i>Không</i>"
 
-#: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
+#: calendar/gui/e-itip-control.c:929
+msgid "Location:"
+msgstr "Địa điểm:"
+
+#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Chấp nhận"
 
-#: calendar/gui/e-itip-control.c:959 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Tạm chấp nhận"
 
-#: calendar/gui/e-itip-control.c:963 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Từ chối"
 
-#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.c:1050
-#: calendar/gui/e-itip-control.c:1076 calendar/gui/e-itip-control.c:1089
-#: calendar/gui/e-itip-control.c:1102 calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
 msgid "Choose an action:"
 msgstr "Chọn hành động:"
 
-#: calendar/gui/e-itip-control.c:1023
+#: calendar/gui/e-itip-control.c:1016
 msgid "Update"
 msgstr "Cập nhật"
 
-#: calendar/gui/e-itip-control.c:1024 calendar/gui/e-itip-control.c:1055
-#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1091
-#: calendar/gui/e-itip-control.c:1104 calendar/gui/e-itip-control.c:1117
-#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
+#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Đồng ý"
 
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1044
 msgid "Accept"
 msgstr "Chấp nhận"
 
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1045
 msgid "Tentatively accept"
 msgstr "Tạm chấp nhận"
 
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1046
 msgid "Decline"
 msgstr "Từ chối"
 
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1070
 msgid "Send Free/Busy Information"
 msgstr "Gửi thông tin Rảnh/Bận"
 
-#: calendar/gui/e-itip-control.c:1090
+#: calendar/gui/e-itip-control.c:1083
 msgid "Update respondent status"
 msgstr "Cập nhật trạng thái trả lời"
 
-#: calendar/gui/e-itip-control.c:1103
+#: calendar/gui/e-itip-control.c:1096
 msgid "Send Latest Information"
 msgstr "Gửi thông tin mới nhất"
 
-#: calendar/gui/e-itip-control.c:1116 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Bỏ"
 
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1185
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> đã công bố thông tin cuộc họp."
 
-#: calendar/gui/e-itip-control.c:1193
+#: calendar/gui/e-itip-control.c:1186
 msgid "Meeting Information"
 msgstr "Thông tin cuộc họp"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1191
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> yêu cầu sự hiện diện của %s tại cuộc họp."
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1193
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> yêu cầu sự hiện diện của bạn tại cuộc họp."
 
-#: calendar/gui/e-itip-control.c:1201
+#: calendar/gui/e-itip-control.c:1194
 msgid "Meeting Proposal"
 msgstr "Đề nghị cuộc họp"
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b? muốn được dự cuộc họp đã có."
 
-#: calendar/gui/e-itip-control.c:1206
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Update"
 msgstr "Cập nhật cuộc họp"
 
-#: calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1203
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> muốn nhận thông tin mới nhất về cuộc họp"
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1204
 msgid "Meeting Update Request"
 msgstr "Yêu cầu cập nhật cuộc họp"
 
-#: calendar/gui/e-itip-control.c:1218
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> đã trả lời yêu cầu họp."
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Reply"
 msgstr "Trả lời họp"
 
-#: calendar/gui/e-itip-control.c:1226
+#: calendar/gui/e-itip-control.c:1219
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> đã hủy bỏ cuộc họp."
 
-#: calendar/gui/e-itip-control.c:1227
+#: calendar/gui/e-itip-control.c:1220
 msgid "Meeting Cancellation"
 msgstr "Hủy bỏ cuộc họp"
 
-#: calendar/gui/e-itip-control.c:1234 calendar/gui/e-itip-control.c:1302
-#: calendar/gui/e-itip-control.c:1337
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1330
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> đã gửi một thông điệp khó hiểu."
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1228
 msgid "Bad Meeting Message"
 msgstr "Thông điệp lạ về cuộc họp"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1253
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> đã công bố thông tin công việc."
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1254
 msgid "Task Information"
 msgstr "Thông tin công việc"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1259
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> yêu cầu %s để thực hiện công việc."
 
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> yêu cầu thực hiện công việc."
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1262
 msgid "Task Proposal"
 msgstr "Đề nghị công việc"
 
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> muốn thêm vào công việc đã có."
 
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Update"
 msgstr "Cập nhật công việc"
 
-#: calendar/gui/e-itip-control.c:1278
+#: calendar/gui/e-itip-control.c:1271
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> muốn nhận thông tin mới nhất về công việc."
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1272
 msgid "Task Update Request"
 msgstr "Yêu cầu cập nhật công việc"
 
-#: calendar/gui/e-itip-control.c:1286
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> đã trả lời việc gán công việc."
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Reply"
 msgstr "Trả lời công việc"
 
-#: calendar/gui/e-itip-control.c:1294
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> đã hủy bỏ công việc."
 
-#: calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1288
 msgid "Task Cancellation"
 msgstr "Hủy bỏ công việc"
 
-#: calendar/gui/e-itip-control.c:1303
+#: calendar/gui/e-itip-control.c:1296
 msgid "Bad Task Message"
 msgstr "Thông điệp lạ về công việc"
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1315
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> đã công bố thông tin bận/rảnh."
 
-#: calendar/gui/e-itip-control.c:1323
+#: calendar/gui/e-itip-control.c:1316
 msgid "Free/Busy Information"
 msgstr "Thông tin bận/rảnh"
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> yêu cầu thông tin bận/rảnh của bạn."
 
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1321
 msgid "Free/Busy Request"
 msgstr "Yêu cầu thông tin bận/rảnh"
 
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1325
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> đã trả lời yêu cầu thông tin bận/rảnh."
 
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1326
 msgid "Free/Busy Reply"
 msgstr "Trả lời thông tin bận/rảnh"
 
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1331
 msgid "Bad Free/Busy Message"
 msgstr "Thông điệp bận/rảnh sai"
 
-#: calendar/gui/e-itip-control.c:1413
+#: calendar/gui/e-itip-control.c:1406
 msgid "The message does not appear to be properly formed"
 msgstr "Thông điệp có lẽ không đúng hình thức"
 
-#: calendar/gui/e-itip-control.c:1472
+#: calendar/gui/e-itip-control.c:1465
 msgid "The message contains only unsupported requests."
 msgstr "Thông điệp chỉ chứa yêu cầu chưa được hỗ trợ."
 
-#: calendar/gui/e-itip-control.c:1503
+#: calendar/gui/e-itip-control.c:1496
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Đồ đính kèm không chứa thông điệp lịch hợp lệ"
 
-#: calendar/gui/e-itip-control.c:1535
+#: calendar/gui/e-itip-control.c:1528
 msgid "The attachment has no viewable calendar items"
 msgstr "Đồ đính kèm không chứa mục lịch nào có thể xem được"
 
-#: calendar/gui/e-itip-control.c:1769
+#: calendar/gui/e-itip-control.c:1762
 msgid "Update complete\n"
 msgstr "Hoàn tất cập nhật\n"
 
-#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
+#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Không thể cập nhật trạng thái người tham dự vì chưa có người nào tham dự"
 
-#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Đối tượng không hợp lệ và không thể được cập nhật\n"
 
-#: calendar/gui/e-itip-control.c:1825
+#: calendar/gui/e-itip-control.c:1818
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Hồi đáp này đến từ một người dự hiện thời. Thêm người này như là người tham "
 "dự nhé?"
 
-#: calendar/gui/e-itip-control.c:1837
+#: calendar/gui/e-itip-control.c:1830
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Không thể cập nhật trạng thái người tham dự vì trạng thái không hợp lệ!\n"
 
-#: calendar/gui/e-itip-control.c:1856
+#: calendar/gui/e-itip-control.c:1849
 msgid "There was an error on the CORBA system\n"
 msgstr "Lỗi trong hệ thống CORBA\n"
 
-#: calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1852
 msgid "Object could not be found\n"
 msgstr "Không thể tìm thấy đối tượng\n"
 
-#: calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1855
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Bạn không có đủ quyền để cập nhật lịch\n"
 
-#: calendar/gui/e-itip-control.c:1865
+#: calendar/gui/e-itip-control.c:1858
 msgid "Attendee status updated\n"
 msgstr "Đã cập nhật trạng thái người tham dự\n"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1861
 msgid "Attendee status could not be updated!\n"
 msgstr "Không thể cập nhật trạng thái người tham dự!\n"
 
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1892
 msgid "Removal Complete"
 msgstr "Hoàn tất loại bỏ"
 
-#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
 msgid "Item sent!\n"
 msgstr "Đã gửi!\n"
 
-#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
+#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
 msgid "The item could not be sent!\n"
 msgstr "Không thể gửi!\n"
 
@@ -6535,74 +6285,74 @@ msgstr "ngày kết thúc"
 msgid "date-start"
 msgstr "ngày bắt đầu"
 
-#: calendar/gui/e-meeting-list-view.c:62
+#: calendar/gui/e-meeting-list-view.c:59
 msgid "Chair Persons"
 msgstr "Người chủ trì"
 
-#: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:479
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
 msgid "Required Participants"
 msgstr "Người tham dự yêu cầu"
 
-#: calendar/gui/e-meeting-list-view.c:64
+#: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Người tham dự không yêu cầu"
 
-#: calendar/gui/e-meeting-list-view.c:65
+#: calendar/gui/e-meeting-list-view.c:62
 msgid "Resources"
 msgstr "Tài nguyên"
 
-#: calendar/gui/e-meeting-list-view.c:140 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
 #: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr "Cá nhân"
 
-#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "Nhóm"
 
-#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr "Tài nguyên"
 
-#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr "Phòng"
 
-#: calendar/gui/e-meeting-list-view.c:154 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr "Ghế"
 
-#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:127
 #: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
 msgid "Required Participant"
 msgstr "Người tham dự yêu cầu"
 
-#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr "Người tham dự không yêu cầu"
 
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr "Người không tham dự"
 
-#: calendar/gui/e-meeting-list-view.c:179 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:177
 #: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
 msgid "Needs Action"
 msgstr "Cần hành động"
 
-#: calendar/gui/e-meeting-list-view.c:182 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
 #: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "Có thể làm"
 
-#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr "Ủy nhiệm"
@@ -6619,20 +6369,28 @@ msgstr "Không chính thức"
 msgid "No Information"
 msgstr "Không có thông tin"
 
+#: calendar/gui/e-meeting-time-sel.c:417
+#, fuzzy
+msgid "Add attendees from addressbook"
+msgstr "Thêm người _gửi vào sổ địa chỉ"
+
 #: calendar/gui/e-meeting-time-sel.c:440
 msgid "_Options"
 msgstr "_Tùy chọn"
 
 #: calendar/gui/e-meeting-time-sel.c:457
-msgid "Show _Only Working Hours"
+#, fuzzy
+msgid "Show _only working hours"
 msgstr "Chỉ hiện giờ làm _việc"
 
 #: calendar/gui/e-meeting-time-sel.c:467
-msgid "Show _Zoomed Out"
+#, fuzzy
+msgid "Show _zoomed out"
 msgstr "Hiện Thu _nhỏ"
 
 #: calendar/gui/e-meeting-time-sel.c:482
-msgid "_Update Free/Busy"
+#, fuzzy
+msgid "_Update free/busy"
 msgstr "_Cập nhật Rảnh/Bận"
 
 #: calendar/gui/e-meeting-time-sel.c:497
@@ -6648,19 +6406,23 @@ msgid ">_>"
 msgstr ">_>"
 
 #: calendar/gui/e-meeting-time-sel.c:547
-msgid "_All People and Resources"
+#, fuzzy
+msgid "_All people and resources"
 msgstr "_Mọi người và tài nguyên"
 
 #: calendar/gui/e-meeting-time-sel.c:556
-msgid "All _People and One Resource"
+#, fuzzy
+msgid "All _people and one resource"
 msgstr "Mọi người và mộ_t tài nguyên"
 
 #: calendar/gui/e-meeting-time-sel.c:565
-msgid "_Required People"
+#, fuzzy
+msgid "_Required people"
 msgstr "Người _yêu cầu"
 
 #: calendar/gui/e-meeting-time-sel.c:574
-msgid "Required People and _One Resource"
+#, fuzzy
+msgid "Required people and _one resource"
 msgstr "Người yêu cầu _và một tài nguyên"
 
 #: calendar/gui/e-meeting-time-sel.c:593
@@ -6698,7 +6460,7 @@ msgstr "%d/%m/%Y"
 msgid "Enter the password for %s"
 msgstr "Nhập mật khẩu cho %s"
 
-#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6707,19 +6469,14 @@ msgstr ""
 "Lỗi tại %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-
 #. FIXME Loading should be async
 #. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:686
+#: calendar/gui/e-tasks.c:801
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Đang mở công việc tại %s"
 
-#: calendar/gui/e-tasks.c:709
+#: calendar/gui/e-tasks.c:824
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6728,53 +6485,48 @@ msgstr ""
 "Lỗi tại %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:730
+#: calendar/gui/e-tasks.c:845
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Đang nạp ảnh"
 
-#: calendar/gui/e-tasks.c:834
+#: calendar/gui/e-tasks.c:949
 msgid "Completing tasks..."
 msgstr "Đang hoàn tất công việc..."
 
-#: calendar/gui/e-tasks.c:857
+#: calendar/gui/e-tasks.c:972
 msgid "Deleting selected objects..."
 msgstr "Đang xóa đối tượng được chọn..."
 
-#: calendar/gui/e-tasks.c:884
+#: calendar/gui/e-tasks.c:999
 msgid "Expunging"
 msgstr "Đang xóa"
 
-#: calendar/gui/e-tasks.c:960
+#: calendar/gui/e-tasks.c:1075
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
-#: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
+#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
+#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
 #: calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:705
 msgid "Tasks"
 msgstr "Công việc"
 
-#: calendar/gui/gnome-cal.c:1876
+#: calendar/gui/gnome-cal.c:1878
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Không có cuộc hẹn"
 
-#: calendar/gui/gnome-cal.c:1895
+#: calendar/gui/gnome-cal.c:1897
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Đang nạp ảnh"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1920
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Mở bằng %s..."
 
-#: calendar/gui/gnome-cal.c:2048
-#, c-format
-msgid "The calendar backend for '%s' has crashed."
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:2894
+#: calendar/gui/gnome-cal.c:2906
 #, fuzzy
 msgid "Purging"
 msgstr "Turin"
@@ -6973,7 +6725,7 @@ msgid "On The Web"
 msgstr ""
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 
@@ -6984,7 +6736,7 @@ msgid "Unable to migrate calendar `%s'"
 msgstr "Không đủ quyền truy cập để mở lịch"
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:869
+#: calendar/gui/migration.c:889
 #, fuzzy, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "Không thể mở sổ địa chỉ"
@@ -7220,73 +6972,73 @@ msgstr "In một mục"
 msgid "Print Setup"
 msgstr "Thiết lập in"
 
-#: calendar/gui/tasks-component.c:303
+#: calendar/gui/tasks-component.c:313
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:371
 #, fuzzy
 msgid "New Task List"
 msgstr "Danh sách công việc"
 
-#: calendar/gui/tasks-component.c:398
+#: calendar/gui/tasks-component.c:408
 #, fuzzy, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "Không có công việc"
 msgstr[1] "Không có công việc"
 
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] "được chọn %d"
 msgstr[1] "được chọn %d"
 
-#: calendar/gui/tasks-component.c:447
+#: calendar/gui/tasks-component.c:457
 #, fuzzy
 msgid "Failed upgrading tasks."
 msgstr "Đang nạp ảnh"
 
-#: calendar/gui/tasks-component.c:526
+#: calendar/gui/tasks-component.c:749
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:538
+#: calendar/gui/tasks-component.c:761
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:576
+#: calendar/gui/tasks-component.c:799
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:804
+#: calendar/gui/tasks-component.c:1040
 msgid "New task"
 msgstr "Công việc mới"
 
-#: calendar/gui/tasks-component.c:805
+#: calendar/gui/tasks-component.c:1041
 msgid "_Task"
 msgstr "Nhiệm _vụ"
 
-#: calendar/gui/tasks-component.c:806
+#: calendar/gui/tasks-component.c:1042
 msgid "Create a new task"
 msgstr "Tạo công việc mới"
 
-#: calendar/gui/tasks-component.c:812
+#: calendar/gui/tasks-component.c:1048
 #, fuzzy
 msgid "New tasks group"
 msgstr "Công việc mới"
 
-#: calendar/gui/tasks-component.c:813
+#: calendar/gui/tasks-component.c:1049
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Danh sách công việc"
 
-#: calendar/gui/tasks-component.c:814
+#: calendar/gui/tasks-component.c:1050
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Tạo công việc mới"
@@ -9058,12 +8810,12 @@ msgstr "Lỗi thực hiện tìm kiếm bộ lọc: %s: %s"
 msgid "Unsupported operation: append message: for %s"
 msgstr "Tháo tác chưa hỗ trợ: nối dài thông điệp: cho %s"
 
-#: camel/camel-folder.c:1259
+#: camel/camel-folder.c:1262
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Thao tác chưa hỗ trợ: tìm theo biểu thức: cho %s"
 
-#: camel/camel-folder.c:1299
+#: camel/camel-folder.c:1302
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "Thao tác chưa hỗ trợ: tìm bằng UID: cho %s"
@@ -9076,11 +8828,16 @@ msgstr "Đang di chuyển thông điệp"
 msgid "Copying messages"
 msgstr "Đang chép thông điệp"
 
-#: camel/camel-folder.c:1666
-msgid "Learning junk and/or non junk message(s)"
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Lansing"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
 msgstr ""
 
-#: camel/camel-folder.c:1695
+#: camel/camel-folder.c:1701
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "Đang nhận %d thông điệp"
@@ -9115,17 +8872,17 @@ msgstr ""
 msgid "(match-threads) requires a match type string"
 msgstr ""
 
-#: camel/camel-folder-search.c:785
+#: camel/camel-folder-search.c:784
 #, fuzzy
 msgid "(match-threads) expects an array result"
 msgstr "(khớp tất cả) yêu cầu một kết quả đơn"
 
-#: camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:790
 #, fuzzy
 msgid "(match-threads) requires the folder set"
 msgstr "(khớp tất cả) yêu cầu một kết quả đơn"
 
-#: camel/camel-folder-search.c:880
+#: camel/camel-folder-search.c:879
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Đang thực hiện truy vấn trên header lạ: %s"
@@ -9160,7 +8917,8 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
 #: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:706
+#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Đã hủy"
@@ -9538,7 +9296,7 @@ msgstr ""
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1212
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "Trả lời xác thực từ server sai."
 
@@ -9919,40 +9677,40 @@ msgstr "Lệnh chưa được thi công"
 msgid "export keys: unimplemented"
 msgstr ""
 
-#: camel/camel-store.c:214
+#: camel/camel-store.c:213
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Không thể lấy thư mục: thao tác không hợp lệ trên thiết bị lưu trữ"
 
-#: camel/camel-store.c:244
+#: camel/camel-store.c:243
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr "Không thể lấy thư mục: %s: %s"
 
-#: camel/camel-store.c:295
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Không thể tạo thư mục: Thao tác không hợp lệ trên thiết bị lưu trữ"
 
-#: camel/camel-store.c:323
+#: camel/camel-store.c:325
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Không thể lấy thư mục: %s: %s"
 
-#: camel/camel-store.c:387 camel/camel-vee-store.c:354
+#: camel/camel-store.c:389 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Không thể xoá thư mục: %s: Thao tác không hợp lệ"
 
-#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#: camel/camel-store.c:439 camel/camel-vee-store.c:387
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Không thể đổi tên thư mục: %s: Thao tác không hợp lệ"
 
-#: camel/camel-store.c:811
+#: camel/camel-store.c:777
 msgid "Trash"
 msgstr "Rác"
 
-#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
-#: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/mail-config.glade.h:95
+#: ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
 msgstr "Tháng Sáu"
@@ -10178,12 +9936,12 @@ msgstr "Không có thông điệp %s trong %s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Không thể sao chép hoặc di chuyển thông điệp vào Thư mục Ảo"
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:374
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Không thể xóa thư mục: %s: Không có thư mục như vậy"
 
-#: camel/camel-vee-store.c:398
+#: camel/camel-vee-store.c:395
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Không thể đổi tên thư mục: %s: Không có thư mục này"
@@ -10231,32 +9989,32 @@ msgstr "Sổ địa chỉ"
 msgid "Post Office Agent SOAP Port:"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:80
+#: camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "Novell GroupWise"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:82
+#: camel/providers/groupwise/camel-groupwise-provider.c:85
 msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: camel/providers/groupwise/camel-groupwise-provider.c:100
 #: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
 msgid "Password"
 msgstr "Mật khẩu"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:99
+#: camel/providers/groupwise/camel-groupwise-provider.c:102
 #: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Tùy chọn này sẽ kết nối tới IMAP server bằng mật khẩu thô (không mã hóa)."
 
-#: camel/providers/groupwise/camel-gw-listener.c:305
-#: camel/providers/groupwise/camel-gw-listener.c:328
+#: camel/providers/groupwise/camel-gw-listener.c:312
+#: camel/providers/groupwise/camel-gw-listener.c:335
 #, fuzzy
 msgid "Checklist"
 msgstr "Sương mù dày đặc"
@@ -10400,13 +10158,13 @@ msgstr ""
 "Tùy chọn này sẽ kết nối tới IMAP server bằng mật khẩu thô (không mã hóa)."
 
 #: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:429
+#: camel/providers/imap/camel-imap-store.c:428
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP server %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:431
+#: camel/providers/imap/camel-imap-store.c:430
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "dịch vụ IMAP cho %s trên %s"
@@ -10416,7 +10174,7 @@ msgstr "dịch vụ IMAP cho %s trên %s"
 #: camel/providers/imap/camel-imap-store.c:551
 #: camel/providers/imap/camel-imap-store.c:571
 #: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
+#: camel/providers/nntp/camel-nntp-store.c:209
 #: camel/providers/pop3/camel-pop3-store.c:175
 #: camel/providers/smtp/camel-smtp-transport.c:269
 #: camel/providers/smtp/camel-smtp-transport.c:285
@@ -10434,10 +10192,10 @@ msgstr "Không có TLS"
 
 #: camel/providers/imap4/camel-imap4-store.c:222
 #: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:815
+#: camel/providers/imap/camel-imap-store.c:845
 #: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:137
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
 #: camel/providers/pop3/camel-pop3-store.c:192
 msgid "Connection cancelled"
 msgstr "Kết nối bị hủy bỏ"
@@ -10450,8 +10208,8 @@ msgid ""
 msgstr "Lỗi kết nối tới IMAP server %s trong chế độ an toàn: %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:649
-#: camel/providers/imap/camel-imap-store.c:680
+#: camel/providers/imap/camel-imap-store.c:679
+#: camel/providers/imap/camel-imap-store.c:710
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Lỗi kết nối tới IMAP server %s trong chế độ an toàn: %s"
@@ -10460,7 +10218,7 @@ msgstr "Lỗi kết nối tới IMAP server %s trong chế độ an toàn: %s"
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1109
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
 msgid "Unknown error"
 msgstr "Lỗi lại"
 
@@ -10487,8 +10245,8 @@ msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr "Không thể lấy thư mục: %s: %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1857
-#: camel/providers/imap/camel-imap-store.c:2235
+#: camel/providers/imap/camel-imap-store.c:1885
+#: camel/providers/imap/camel-imap-store.c:2263
 #, fuzzy, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -10569,12 +10327,12 @@ msgstr "Server đã ngắt kết nối bất ngờ: %s"
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3168
+#: camel/providers/imap/camel-imap-store.c:3194
 msgid "Operation cancelled"
 msgstr "Thao tác bị hủy bỏ"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3171
+#: camel/providers/imap/camel-imap-store.c:3197
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server đã ngắt kết nối bất ngờ: %s"
@@ -10638,13 +10396,6 @@ msgid "Unable to retrieve message: %s"
 msgstr "Không thể nhận thông điệp: %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:219
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -10654,15 +10405,15 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-mbox-folder.c:418
+#: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
 msgstr "Không có thông điệp như vậy"
 
 #: camel/providers/imap/camel-imap-folder.c:2019
-#: camel/providers/imap/camel-imap-folder.c:2621
-#: camel/providers/nntp/camel-nntp-folder.c:238
+#: camel/providers/imap/camel-imap-folder.c:2622
+#: camel/providers/nntp/camel-nntp-folder.c:220
 msgid "This message is not currently available"
 msgstr "Thông điệp này hiện thời chưa sẵn sàng"
 
@@ -10671,7 +10422,23 @@ msgstr "Thông điệp này hiện thời chưa sẵn sàng"
 msgid "Fetching summary information for new messages"
 msgstr "Đang lấy thông tin tóm tắt của các thông điệp mới"
 
-#: camel/providers/imap/camel-imap-folder.c:2659
+#: camel/providers/imap/camel-imap-folder.c:2463
+#, c-format
+msgid "Incomplete server response: no information provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2471
+#, c-format
+msgid "Incomplete server response: no UID provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2484
+#, c-format
+msgid ""
+"Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2660
 msgid "Could not find message body in FETCH response."
 msgstr "Không thể tìm thấy phần thân thông điệp trong tín hiệu trả lời FETCH"
 
@@ -10739,43 +10506,43 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Để đọc và lưu thư trên IMAP server."
 
-#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/imap/camel-imap-store.c:680
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "Chưa hỗ trợ phần mở rộng SSL/TLS."
 
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:711
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "Thương lượng SSL thất bại"
 
-#: camel/providers/imap/camel-imap-store.c:818
+#: camel/providers/imap/camel-imap-store.c:848
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Không thể kết nối tới server: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1242
+#: camel/providers/imap/camel-imap-store.c:1272
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP server %s không hỗ trợ loại xác thực được yêu cầu %s"
 
-#: camel/providers/imap/camel-imap-store.c:1252
+#: camel/providers/imap/camel-imap-store.c:1282
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Không hỗ trợ loại xác thực %s"
 
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1305
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sVui lòng nhập mật khẩu IMAP cho %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1289
+#: camel/providers/imap/camel-imap-store.c:1319
 msgid "You didn't enter a password."
 msgstr "Bạn chưa nhập mật khẩu"
 
-#: camel/providers/imap/camel-imap-store.c:1318
+#: camel/providers/imap/camel-imap-store.c:1348
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10786,18 +10553,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1839
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:1867
+#: camel/providers/imap/camel-imap-store.c:2057
 #, c-format
 msgid "No such folder %s"
 msgstr "Không có thư mục %s"
 
-#: camel/providers/imap/camel-imap-store.c:1915
-#: camel/providers/imap/camel-imap-store.c:2296
+#: camel/providers/imap/camel-imap-store.c:1943
+#: camel/providers/imap/camel-imap-store.c:2324
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Thư mục cha không được phép có các thư mục con"
 
-#: camel/providers/imap/camel-imap-store.c:1970
+#: camel/providers/imap/camel-imap-store.c:1998
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10805,7 +10572,7 @@ msgstr "Thư mục cha không được phép có các thư mục con"
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Không thể lấy thư mục: %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:2274
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Thư mục cha lạ: %s"
@@ -10839,20 +10606,20 @@ msgid "Index message body data"
 msgstr "Gửi thông điệp cho liên lạc"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:388
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:393
-#: camel/providers/local/camel-local-folder.c:396
+#: camel/providers/local/camel-local-folder.c:392
+#: camel/providers/local/camel-local-folder.c:395
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "Hộp thư: %s (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:400
+#: camel/providers/local/camel-local-folder.c:399
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -10912,7 +10679,7 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:142
 #: camel/providers/local/camel-local-store.c:253
-#: camel/providers/local/camel-mbox-store.c:356
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10985,8 +10752,25 @@ msgstr "Thông điệp nối thêm dạng Maildir đã bị hủy"
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Không thể nối thêm thông điệp vào thư mục Maildir: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:226
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mbox-folder.c:417
+#: camel/providers/local/camel-mbox-folder.c:436
+#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:475
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-mh-folder.c:221
+#, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+"Không thể lấy thông điệp: %s từ thư mục%s\n"
+"  %s"
+
+#: camel/providers/local/camel-maildir-folder.c:236
 msgid "Invalid message contents"
 msgstr "Nội dung thông điệp không hợp lệ"
 
@@ -11027,9 +10811,9 @@ msgstr "Không thể xóa thư mục `%s': %s"
 msgid "not a maildir directory"
 msgstr "không phải là thư mục dạng Maildir"
 
-#: camel/providers/local/camel-maildir-store.c:341
-#: camel/providers/local/camel-spool-store.c:286
-#: camel/providers/local/camel-spool-store.c:316
+#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-spool-store.c:284
+#: camel/providers/local/camel-spool-store.c:314
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Không thể quét thư mục `%s': %s"
@@ -11076,27 +10860,18 @@ msgstr "Quá trình nối thêm mail đã bị hủy"
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Không thể nối thêm thông điệp vào tập tin mbox: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:435
-#: camel/providers/local/camel-mbox-folder.c:466
-#: camel/providers/local/camel-mbox-folder.c:474
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"Không thể lấy thông điệp: %s từ thư mục%s\n"
-"  %s"
-
-#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:468
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Thư mục này có vẽ đã bị hư và không thể được phục hồi."
 
-#: camel/providers/local/camel-mbox-folder.c:475
-msgid "Message construction failed: Corrupt mailbox?"
+#: camel/providers/local/camel-mbox-folder.c:476
+#: camel/providers/local/camel-mh-folder.c:222
+#, fuzzy
+msgid "Message construction failed."
 msgstr "Lỗi khởi tạo thông điệp: Hộp thư đã bị hỏng?"
 
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:362
+#: camel/providers/local/camel-mbox-store.c:361
 #, fuzzy
 msgid "Cannot create a folder by this name."
 msgstr "Không thể tạo thư mục với tên đó"
@@ -11127,32 +10902,32 @@ msgstr "`%s' không phải là tập tin bình thường."
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Thư mục `%s' không rỗng. Chưa xóa."
 
-#: camel/providers/local/camel-mbox-store.c:375
+#: camel/providers/local/camel-mbox-store.c:374
 #, fuzzy, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "Không thể tạo thư mục %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:389
+#: camel/providers/local/camel-mbox-store.c:388
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "Không thể lấy thư mục: %s: %s"
 
-#: camel/providers/local/camel-mbox-store.c:391
+#: camel/providers/local/camel-mbox-store.c:390
 #, fuzzy
 msgid "Folder already exists"
 msgstr "Card ID đã tồn tại"
 
-#: camel/providers/local/camel-mbox-store.c:473
+#: camel/providers/local/camel-mbox-store.c:472
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "Tên thư mục xác định không hợp lệ: %s"
 
-#: camel/providers/local/camel-mbox-store.c:486
+#: camel/providers/local/camel-mbox-store.c:485
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "Không thể đổi tên '%s': %s"
 
-#: camel/providers/local/camel-mbox-store.c:561
+#: camel/providers/local/camel-mbox-store.c:560
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Không thể đổi tên thư mục %s thành %s: %s"
@@ -11345,7 +11120,7 @@ msgstr ""
 "Có lẽ thư mục bị hư, bản sao được lưu trong `%s'"
 
 #: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:997
+#: camel/providers/nntp/camel-nntp-store.c:1126
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Vui lòng nhập mật khẩu NNTP cho %s@%s"
@@ -11362,18 +11137,10 @@ msgstr "Lỗi gửi tên người dùng cho server"
 msgid "Server rejected username/password"
 msgstr "Server từ chối tên người dùng/mật khẩu"
 
-#: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:263
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr "Người dùng đã hủy bỏ"
-
-#: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:259
-#: camel/providers/nntp/camel-nntp-folder.c:265
+#: camel/providers/nntp/camel-nntp-folder.c:147
+#: camel/providers/nntp/camel-nntp-folder.c:149
+#: camel/providers/nntp/camel-nntp-folder.c:158
+#: camel/providers/nntp/camel-nntp-folder.c:234
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11382,64 +11149,51 @@ msgstr "Người dùng đã hủy bỏ"
 msgid "Cannot get message %s: %s"
 msgstr "Không thể lấy thông điệp %s: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:188
-#: camel/providers/nntp/camel-nntp-folder.c:228
+#: camel/providers/nntp/camel-nntp-folder.c:156
+#: camel/providers/nntp/camel-nntp-folder.c:232
+#: camel/providers/nntp/camel-nntp-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+msgid "User cancelled"
+msgstr "Người dùng đã hủy bỏ"
+
+#: camel/providers/nntp/camel-nntp-folder.c:176
+#: camel/providers/nntp/camel-nntp-folder.c:208
 #, c-format
 msgid "Internal error: uid in invalid format: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:201
-#, fuzzy, c-format
-msgid "Could not get article %s from NNTP server"
-msgstr "Không thể lấy danh sách nhóm từ server."
-
-#: camel/providers/nntp/camel-nntp-folder.c:362
-msgid "Posting not allowed by news server"
-msgstr ""
-
+#: camel/providers/nntp/camel-nntp-folder.c:328
+#: camel/providers/nntp/camel-nntp-folder.c:331
 #: camel/providers/nntp/camel-nntp-folder.c:373
-#, c-format
-msgid "Failed to send newsgroups header: %s: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:413
-#: camel/providers/nntp/camel-nntp-folder.c:426
-#, c-format
-msgid "Error posting to newsgroup: %s: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:438
-msgid "Error reading response to posted message: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:441
+#: camel/providers/nntp/camel-nntp-folder.c:375
 #, fuzzy, c-format
-msgid "Error posting message: %s: message not posted"
-msgstr ""
-"Lỗi tự động lưu thông điệp: %s\n"
-" %s"
+msgid "Posting failed: %s"
+msgstr "Thao tác thất bại: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:457
+#: camel/providers/nntp/camel-nntp-folder.c:393
 #, fuzzy
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "Bạn không thể sao chép các thông điệp từ thư mục Thùng rác."
 
-#: camel/providers/nntp/camel-nntp-folder.c:468
+#: camel/providers/nntp/camel-nntp-folder.c:404
 #, fuzzy
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Bạn không thể sao chép các thông điệp từ thư mục Thùng rác."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:44
 msgid "Could not get group list from server."
 msgstr "Không thể lấy danh sách nhóm từ server."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#: camel/providers/nntp/camel-nntp-grouplist.c:97
+#: camel/providers/nntp/camel-nntp-grouplist.c:106
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "Không thể nạp tập tin danh sách nhóm cho %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#: camel/providers/nntp/camel-nntp-grouplist.c:157
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Không thể lưu tập tin danh sách nhóm cho %s: %s"
@@ -11468,27 +11222,29 @@ msgid ""
 msgstr ""
 "Tùy chọn này sẽ xác thực với NNTP server bằng mật khẩu thô (không mã hóa)"
 
-#: camel/providers/nntp/camel-nntp-store.c:158
+#: camel/providers/nntp/camel-nntp-store.c:118
+#: camel/providers/nntp/camel-nntp-store.c:1233
+#: camel/providers/nntp/camel-nntp-store.c:1331
+#, c-format
+msgid "NNTP Command failed: %s"
+msgstr "Lỗi lệnh IMAP: %s"
+
+#: camel/providers/nntp/camel-nntp-store.c:227
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Không thể đọc lời chào mừng từ %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:170
+#: camel/providers/nntp/camel-nntp-store.c:239
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP server %s trả về mã lỗi %d: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:326
+#: camel/providers/nntp/camel-nntp-store.c:403
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET News thông qua %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:640
-#, fuzzy
-msgid "Stream error"
-msgstr "lỗi phân tích"
-
-#: camel/providers/nntp/camel-nntp-store.c:643
+#: camel/providers/nntp/camel-nntp-store.c:777
 #, fuzzy, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -11498,75 +11254,75 @@ msgstr ""
 "Lỗi khi lưu thông điệp vào: %s:\n"
 " %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:735
+#: camel/providers/nntp/camel-nntp-store.c:872
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
 "No such newsgroup. The selected item is a probably a parent folder."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:767
+#: camel/providers/nntp/camel-nntp-store.c:904
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
 "newsgroup does not exist!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:792
+#: camel/providers/nntp/camel-nntp-store.c:929
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:800
+#: camel/providers/nntp/camel-nntp-store.c:937
 #, fuzzy
 msgid "You cannot rename a folder in a News store."
 msgstr "Không thể đổi tên thư mục %s thành %s: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:808
+#: camel/providers/nntp/camel-nntp-store.c:945
 #, fuzzy
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "Không thể chuyển thư mục vào một trong những con cháu của nó."
 
-#: camel/providers/nntp/camel-nntp-summary.c:253
-#, fuzzy, c-format
-msgid "Connection error: %s"
-msgstr "Lỗi lạ: %s"
-
-#: camel/providers/nntp/camel-nntp-summary.c:262
-#, c-format
-msgid "No such folder: %s"
-msgstr "Không có thư mục %s"
+#: camel/providers/nntp/camel-nntp-store.c:1118
+#, fuzzy
+msgid "Authentication requested but not username provided"
+msgstr "Yêu cầu xác thực"
 
-#: camel/providers/nntp/camel-nntp-summary.c:268
-#, c-format
-msgid "Could not get group: %s"
-msgstr "Không thể lấy nhóm: %s"
+#: camel/providers/nntp/camel-nntp-store.c:1146
+#, fuzzy, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr "Không thể xác thực tại POP server: %s: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:333
+#: camel/providers/nntp/camel-nntp-store.c:1262
 #, fuzzy
-msgid "Could not get messages: unspecified error"
-msgstr "Không thể lấy thông điệp: %s"
+msgid "Not connected."
+msgstr "Hiện liên lạc"
 
-#: camel/providers/nntp/camel-nntp-summary.c:378
+#: camel/providers/nntp/camel-nntp-store.c:1311
 #, c-format
-msgid "NNTP Command failed: %s"
-msgstr "Lỗi lệnh IMAP: %s"
+msgid "No such folder: %s"
+msgstr "Không có thư mục %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:438
-#: camel/providers/nntp/camel-nntp-summary.c:543
+#: camel/providers/nntp/camel-nntp-summary.c:218
+#: camel/providers/nntp/camel-nntp-summary.c:314
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Đang quét tìm thông điệp mới"
 
-#: camel/providers/nntp/camel-nntp-summary.c:558
-#, c-format
-msgid "Unknown server response: %s"
-msgstr "Hồi đáp lại từ server: %s"
+#: camel/providers/nntp/camel-nntp-summary.c:225
+#, fuzzy, c-format
+msgid "Unexpected server response from xover: %s"
+msgstr "Tính hiệu trả lời không mong đợi từ IMAP server: %s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:328
+#, fuzzy, c-format
+msgid "Unexpected server response from head: %s"
+msgstr "Tín hiệu trả lời không mong đợi từ GnuPG: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:605
+#: camel/providers/nntp/camel-nntp-summary.c:368
 msgid "Use cancel"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-summary.c:607
+#: camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Thao tác thất bại: %s"
@@ -11614,7 +11370,7 @@ msgstr "Xoá sau %s ngày"
 msgid "Disable support for all POP3 extensions"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107
 msgid "POP"
 msgstr "POP"
 
@@ -11702,7 +11458,7 @@ msgid "No such folder `%s'."
 msgstr "Không có thư mục `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:132
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -11755,7 +11511,7 @@ msgstr "sendmail"
 msgid "Mail delivery via the sendmail program"
 msgstr "Gửi thư thông qua chương trình sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:119
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -12048,19 +11804,19 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
+#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:408
 msgid "attachment"
 msgstr "đồ đính kèm"
 
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:454
 msgid "Remove selected items from the attachment list"
 msgstr "Loại bỏ những mục được chọn từ danh sách đồ đính kèm"
 
-#: composer/e-msg-composer-attachment-bar.c:491
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Add attachment..."
 msgstr "Thêm đồ đính kèm..."
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:495
 msgid "Attach a file to the message"
 msgstr "Đính kèm tập tin vào thông điệp"
 
@@ -12124,7 +11880,7 @@ msgstr "(Thông điệp không tựa)"
 msgid "Open file"
 msgstr "Mở tập tin"
 
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
 msgid "Autogenerated"
 msgstr "Tự phát sinh"
 
@@ -12273,17 +12029,17 @@ msgstr "Đính kèm tập tin"
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
+msgid "You cannot attach the file `{0}' to this message."
 msgstr "Đính kèm tập tin vào thông điệp"
 
 #. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4
-msgid "${1}"
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
 msgstr ""
 
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
 
 #. mail-composer:attach-directory primary
@@ -12378,7 +12134,7 @@ msgstr "Không thể tạo ống dẫn: %s"
 
 #. mail-composer:no-build-message secondary
 #: composer/mail-composer-errors.xml.h:34
-msgid "Because \"${0}\", you may need to select different mail options."
+msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
@@ -12388,8 +12144,10 @@ msgid "Could not read signature file \"{0}\"."
 msgstr "Không thể lưu tập tin chữ ký: %s"
 
 #. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38
-msgid "Because \"${1}\"."
+#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted primary
@@ -12810,11 +12568,11 @@ msgid "<b>Then</b>"
 msgstr "<b>Tới hạn:</b>"
 
 #: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1335
+#: mail/mail-account-gui.c:1347
 msgid "Select Folder"
 msgstr "Chọn thư mục"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
 #, fuzzy
 msgid "    "
 msgstr "      "
@@ -12873,7 +12631,7 @@ msgstr "trước"
 msgid "months"
 msgstr "tháng"
 
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
 msgid "seconds"
 msgstr "giây"
 
@@ -12905,20 +12663,20 @@ msgstr "với mọi thư mục cục bộ"
 msgid "years"
 msgstr "năm"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:916
-#: mail/mail-config.c:76 mail/mail-config.glade.h:90
+#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
+#: mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Quan trọng"
 
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:919 mail/mail-config.c:79
-#: mail/mail-config.glade.h:145
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: mail/mail-config.glade.h:148
 msgid "To Do"
 msgstr "Cần làm"
 
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:920 mail/mail-config.c:80
-#: mail/mail-config.glade.h:94
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: mail/mail-config.glade.h:97
 msgid "Later"
 msgstr "Sau đó"
 
@@ -12976,257 +12734,6 @@ msgstr "vào"
 msgid "outgoing"
 msgstr "ra"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Adjust Score"
-msgstr "Chỉnh điểm"
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Color"
-msgstr "Gán màu"
-
-#: filter/libfilter-i18n.h:4
-msgid "Assign Score"
-msgstr "Gán điểm"
-
-#: filter/libfilter-i18n.h:5
-msgid "Attachments"
-msgstr "Đồ đính kèm"
-
-#: filter/libfilter-i18n.h:6
-msgid "Beep"
-msgstr "Bíp"
-
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "chứa"
-
-#: filter/libfilter-i18n.h:8
-msgid "Copy to Folder"
-msgstr "Chép vào thư mục"
-
-#: filter/libfilter-i18n.h:9
-msgid "Date received"
-msgstr "Ngày nhận"
-
-#: filter/libfilter-i18n.h:10
-msgid "Date sent"
-msgstr "Ngày gửi"
-
-#: filter/libfilter-i18n.h:12
-msgid "Deleted"
-msgstr "Đã xóa"
-
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "không chứa"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "không kết thúc bằng"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "không tồn tại"
-
-#: filter/libfilter-i18n.h:16
-msgid "does not return"
-msgstr "không trả về"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "không giống với"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "không bắt đầu bằng"
-
-#: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
-msgstr "Không tồn tại"
-
-#: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr "Nháp"
-
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "kết thúc bằng"
-
-#: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr "Tồn tại"
-
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "tồn tại"
-
-#: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr "Biểu thức"
-
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr ""
-
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "bằng"
-
-#: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr "sau"
-
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr "trước"
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr "được đặt cờ"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "lớn hơn"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "nhỏ hơn"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "không phải"
-
-#: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr "không được đặt cờ"
-
-#: filter/libfilter-i18n.h:36
-#, fuzzy
-msgid "Junk Test"
-msgstr "Tháng Sáu"
-
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
-#: widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Nhãn"
-
-#: filter/libfilter-i18n.h:38
-msgid "Mailing list"
-msgstr "Mailing list"
-
-#: filter/libfilter-i18n.h:39
-msgid "Message Body"
-msgstr "Thân thông điệp"
-
-#: filter/libfilter-i18n.h:40
-msgid "Message Header"
-msgstr "Đầu thông điệp"
-
-#: filter/libfilter-i18n.h:41
-#, fuzzy
-msgid "Message is Junk"
-msgstr "Đã gửi thông điệp"
-
-#: filter/libfilter-i18n.h:42
-#, fuzzy
-msgid "Message is not Junk"
-msgstr "Không tìm thấy thông điệp %s."
-
-#: filter/libfilter-i18n.h:43
-msgid "Move to Folder"
-msgstr "Chuyển vào thư mục"
-
-#: filter/libfilter-i18n.h:44
-#, fuzzy
-msgid "Pipe to Program"
-msgstr "Thoát chương trình"
-
-#: filter/libfilter-i18n.h:45
-msgid "Play Sound"
-msgstr "Phát âm thanh"
-
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Đọc"
-
-#: filter/libfilter-i18n.h:47
-msgid "Recipients"
-msgstr "Người nhận"
-
-#: filter/libfilter-i18n.h:48
-msgid "Regex Match"
-msgstr "Khớp Regex"
-
-#: filter/libfilter-i18n.h:49
-msgid "Replied to"
-msgstr "Trả lời cho"
-
-#: filter/libfilter-i18n.h:50
-msgid "returns"
-msgstr "trả về"
-
-#: filter/libfilter-i18n.h:51
-msgid "returns greater than"
-msgstr "trả về lớn hơn"
-
-#: filter/libfilter-i18n.h:52
-msgid "returns less than"
-msgstr "trả về nhỏ hơn"
-
-#: filter/libfilter-i18n.h:53
-#, fuzzy
-msgid "Run Program"
-msgstr "Chạy chương trình:"
-
-#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Điểm"
-
-#: filter/libfilter-i18n.h:55
-msgid "Sender"
-msgstr "Người gửi"
-
-#: filter/libfilter-i18n.h:56
-msgid "Set Status"
-msgstr "Đặt trạng thái"
-
-#: filter/libfilter-i18n.h:57
-msgid "Size (kB)"
-msgstr "Kích thước (kB)"
-
-#: filter/libfilter-i18n.h:58
-msgid "sounds like"
-msgstr "giống như"
-
-#: filter/libfilter-i18n.h:59
-msgid "Source Account"
-msgstr "Tài khoản nguồn"
-
-#: filter/libfilter-i18n.h:60
-msgid "Specific header"
-msgstr "Header xác định"
-
-#: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "bắt đầu bằng"
-
-#: filter/libfilter-i18n.h:63
-msgid "Stop Processing"
-msgstr "Dừng tiến trình"
-
-#: filter/libfilter-i18n.h:64 mail/em-format.c:755 mail/em-format-html.c:1519
-#: mail/em-format-quote.c:302 mail/em-mailer-prefs.c:87
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
-#: smime/lib/e-cert.c:1079
-msgid "Subject"
-msgstr "Chủ đề"
-
-#: filter/libfilter-i18n.h:65
-msgid "Unset Status"
-msgstr "Bỏ đặt trạng thái"
-
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Thêm quy tắc"
@@ -13244,6 +12751,11 @@ msgstr "Tên quy tắt"
 msgid "_Score Rules"
 msgstr "Tính điểm quy tắc"
 
+#: filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Điểm"
+
 #: filter/searchtypes.xml.h:1
 msgid "Body contains"
 msgstr "Phần thân chứa"
@@ -13325,13 +12837,13 @@ msgstr "Chữ ký"
 msgid "-------- Forwarded Message --------"
 msgstr "Thông điệp chuyển tiếp"
 
-#: mail/em-composer-utils.c:1499
+#: mail/em-composer-utils.c:1495
 msgid "an unknown sender"
 msgstr "người gửi lạ"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1509
+#: mail/em-composer-utils.c:1505
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "Vào ngày %a, %d/%m/%Y lúc %H:%M, %s viết rằng:"
@@ -13374,8 +12886,8 @@ msgstr "<nhấn đây để chọn thư mục>"
 msgid "Create New Folder"
 msgstr "Tạo thư mục mới"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
-#: mail/mail-component.c:701
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
+#: mail/mail-component.c:704
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Xác định nơi tạo thư mục:"
@@ -13391,109 +12903,110 @@ msgstr "Crestview"
 msgid "Folder _name:"
 msgstr "Tên thư mục:"
 
-#: mail/em-folder-tree.c:839
+#: mail/em-folder-tree.c:833
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Đang gở bỏ thư mục %s"
 
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree.c:835
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Đang mở thư mục %s"
 
-#: mail/em-folder-tree.c:848 mail/message-list.c:1555
+#: mail/em-folder-tree.c:842 mail/message-list.c:1561
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Đang chuyển thông điệp tới %s"
 
-#: mail/em-folder-tree.c:850 mail/message-list.c:1557
+#: mail/em-folder-tree.c:844 mail/message-list.c:1563
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Đang chép thông điệp vào %s"
 
-#: mail/em-folder-tree.c:866
+#: mail/em-folder-tree.c:860
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Không thể sao chép hoặc di chuyển thông điệp vào Thư mục Ảo"
 
-#: mail/em-folder-tree.c:956 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Sao chép vào thư mục"
 
-#: mail/em-folder-tree.c:957 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Chuyển vào thư mục"
 
-#: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2069
-#: mail/em-folder-tree.c:2551 mail/em-folder-view.c:798
-#: mail/message-list.c:1645
+#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
+#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
+#: mail/message-list.c:1651
 #, fuzzy
 msgid "_Move"
 msgstr "Di chuyển"
 
-#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#: mail/em-folder-tree.c:955 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "Hủy bỏ công việc"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
 #: mail/em-folder-view.c:798 mail/em-folder-view.c:812
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Chọn thư mục"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
 #, fuzzy
 msgid "C_opy"
 msgstr "Sao chép"
 
-#: mail/em-folder-tree.c:2096
+#: mail/em-folder-tree.c:2088
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Đang lưu thư mục %s"
 
-#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
+#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
 #, fuzzy
 msgid "Create folder"
 msgstr "Tạo thư mục mới"
 
-#: mail/em-folder-tree.c:2474
+#: mail/em-folder-tree.c:2463
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Đổi tên thư mục \"%s\" thành:"
 
-#: mail/em-folder-tree.c:2476
+#: mail/em-folder-tree.c:2465
 #, fuzzy
 msgid "Rename Folder"
 msgstr "Đổi tên thư mục"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Xem"
 
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2537
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Mở trong cửa sổ mới"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2555
+#: mail/em-folder-tree.c:2546
 #, fuzzy
 msgid "_New Folder..."
 msgstr "Thư mục mớ_i"
 
-#: mail/em-folder-tree.c:2558
+#: mail/em-folder-tree.c:2549
 msgid "_Rename"
 msgstr "Đổi tên"
 
-#: mail/em-folder-tree.c:2561 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "Thuộc tính..."
 
 #: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:889
+#: mail/mail-vfolder.c:888
 msgid "VFolders"
 msgstr "VFolders"
 
@@ -13507,19 +13020,19 @@ msgstr ""
 msgid "Inbox"
 msgstr "Thư mục nhận"
 
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
 msgid "Loading..."
 msgstr "Đang nạp..."
 
 #: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
 #: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
 #: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:551
+#: mail/mail-component.c:554
 msgid "Mail"
 msgstr "Thư"
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Hiệu chỉnh như thông điệp mới..."
@@ -13532,17 +13045,17 @@ msgstr "_In"
 msgid "_Reply to Sender"
 msgstr "T_rả lời người gửi"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:810
+#: mail/em-folder-view.c:901 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Trả lời _danh sách"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:811
+#: mail/em-folder-view.c:902 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Trả lời _mọi người"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: mail/em-folder-view.c:903 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Chuyển tiếp"
@@ -13597,6 +13110,10 @@ msgstr "_Chuyển tới thư mục..."
 msgid "_Copy to Folder..."
 msgstr "C_hép vào thư mục..."
 
+#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Nhãn"
+
 #: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Thêm người _gửi vào sổ địa chỉ"
@@ -13647,12 +13164,12 @@ msgid "Filter on _Mailing List"
 msgstr "Lọc _Mailing list"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
-#: mail/mail-config.glade.h:66
+#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Mặc định"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1796
 msgid "Print Message"
 msgstr "In thông điệp"
 
@@ -13692,12 +13209,18 @@ msgstr "Cc"
 msgid "Bcc"
 msgstr "Bcc"
 
+#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
+#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Chủ đề"
+
 #: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
 #: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Ngày"
 
-#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
+#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
 msgid "Newsgroups"
 msgstr ""
 
@@ -13891,7 +13414,7 @@ msgid ""
 "practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:757
+#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
 #, fuzzy
 msgid "_View Certificate"
 msgstr "_ID Chứng nhận:"
@@ -13954,7 +13477,7 @@ msgstr "Một _tuần"
 msgid "Once per month"
 msgstr "_Một tháng"
 
-#: mail/em-migrate.c:1072
+#: mail/em-migrate.c:1168
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13962,90 +13485,90 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1506
+#: mail/em-migrate.c:1602
 #, fuzzy, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "Không thể lấy thư mục: %s: %s"
 
-#: mail/em-migrate.c:1532
+#: mail/em-migrate.c:1628
 #, fuzzy, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr ""
 "Không thể chép bộ mô tả tập tin: %s\n"
 "%s"
 
-#: mail/em-migrate.c:1715
+#: mail/em-migrate.c:1811
 #, fuzzy, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "Không thể lưu tập tin danh sách nhóm cho %s: %s"
 
-#: mail/em-migrate.c:1919
+#: mail/em-migrate.c:2015
 #, fuzzy, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Không thể mở hoặc tạo tập tin .newsrc cho %s: %s"
 
-#: mail/em-migrate.c:1933
+#: mail/em-migrate.c:2029
 #, fuzzy, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Lỗi tạo ống dẫn tới '%s': %s"
 
-#: mail/em-migrate.c:1962
+#: mail/em-migrate.c:2058
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#: mail/em-migrate.c:2413 mail/em-migrate.c:2425
 #, fuzzy, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "Lỗi tạo ống dẫn tới '%s': %s"
 
-#: mail/em-migrate.c:2480
+#: mail/em-migrate.c:2576
 #, fuzzy, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr ""
 "Không thể tạo tập tin output: %s\n"
 " %s"
 
-#: mail/em-migrate.c:2498
+#: mail/em-migrate.c:2594
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 msgstr ""
 
-#: mail/em-popup.c:699
+#: mail/em-popup.c:700
 msgid "Save As..."
 msgstr "Lưu là..."
 
-#: mail/em-popup.c:717
+#: mail/em-popup.c:718
 #, fuzzy, c-format
 msgid "untitled_image.%s"
 msgstr "Thông điệp không tựa"
 
-#: mail/em-popup.c:807
+#: mail/em-popup.c:808
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:809
+#: mail/em-popup.c:810
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "T_rả lời người gửi"
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:859
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Mở liên kết bằng trình duyệt"
 
-#: mail/em-popup.c:859
+#: mail/em-popup.c:860
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Gửi _thông điệp cho danh sách..."
 
-#: mail/em-popup.c:860
+#: mail/em-popup.c:861
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Têm sổ địa chỉ"
 
-#: mail/em-popup.c:966
+#: mail/em-popup.c:967
 #, c-format
 msgid "Open in %s..."
 msgstr "Mở bằng %s..."
@@ -14649,7 +14172,7 @@ msgstr "Thành phần tóm tắt thư của Evolution."
 msgid "Mail Accounts"
 msgstr "Tài khoản thư"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
 msgid "Mail Preferences"
 msgstr "Thông số thư"
 
@@ -14662,15 +14185,15 @@ msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution đang nhập các thư cũ (dạng Elm)"
 
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:226
+#: mail/importers/evolution-mbox-importer.c:221
+#: mail/importers/evolution-outlook-importer.c:255
 #: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Đang nhập..."
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:222
-#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/evolution-mbox-importer.c:223
+#: mail/importers/evolution-outlook-importer.c:257
 #: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Vui lòng chờ"
@@ -14693,23 +14216,25 @@ msgid "Elm"
 msgstr "Elm"
 
 #: mail/importers/evolution-mbox-importer.c:116
+#: mail/importers/evolution-outlook-importer.c:130
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Xoá thư mục này"
 
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 #, fuzzy
 msgid "Select folder to import into"
 msgstr "Chọn bộ nhập"
 
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:254
 #: mail/importers/mail-importer.c:226
 #, fuzzy, c-format
 msgid "Importing `%s'"
 msgstr "Đang nhập"
 
-#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/evolution-outlook-importer.c:301
 #: mail/importers/mail-importer.c:140
 #, fuzzy
 msgid "Importing mailbox"
@@ -14858,15 +14383,15 @@ msgstr ""
 msgid "%s License Agreement"
 msgstr ""
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
 msgid "_Host:"
 msgstr "_Máy chủ:"
 
-#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
 msgid "User_name:"
 msgstr "_Tên người dùng:"
 
-#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
 msgid "_Path:"
 msgstr "Đường _dẫn:"
 
@@ -14929,34 +14454,34 @@ msgstr "tổng cộng %d"
 msgid ", %d unread"
 msgstr "chưa gửi %d"
 
-#: mail/mail-component.c:653
+#: mail/mail-component.c:656
 msgid "New Mail Message"
 msgstr "Thông điệp thư mới"
 
-#: mail/mail-component.c:654
+#: mail/mail-component.c:657
 msgid "_Mail Message"
 msgstr "Thông điệp thư"
 
-#: mail/mail-component.c:655
+#: mail/mail-component.c:658
 msgid "Compose a new mail message"
 msgstr "Biên soạn thông điệp mới"
 
-#: mail/mail-component.c:661
+#: mail/mail-component.c:664
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "VFolder mới"
 
-#: mail/mail-component.c:662
+#: mail/mail-component.c:665
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Bộ lọc thư"
 
-#: mail/mail-component.c:663
+#: mail/mail-component.c:666
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Tạo thư mục mới"
 
-#: mail/mail-component.c:795
+#: mail/mail-component.c:798
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
@@ -14968,7 +14493,7 @@ msgstr "Đang kiểm tra dịch vụ"
 msgid "Connecting to server..."
 msgstr "Đang kết nối tới server..."
 
-#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Thực thể"
 
@@ -14983,7 +14508,7 @@ msgstr ""
 "cần gửi."
 
 #: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 #, fuzzy
 msgid "Receiving Mail"
 msgstr "_Nhận thư"
@@ -15000,7 +14525,7 @@ msgstr ""
 msgid "Please select among the following options"
 msgstr "Vui lòng chọn từ các tuỳ chọn sau"
 
-#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131
 #, fuzzy
 msgid "Sending Mail"
 msgstr "Đan_g gửi thư"
@@ -15013,7 +14538,7 @@ msgstr ""
 "Vui lòng nhập thông tin về cách bạn gửi thư. Nếu bạn không chắc, hãy hỏi "
 "quản trị hệ thống hoặc ISP của bạn."
 
-#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37
 msgid "Account Management"
 msgstr "Bộ quản lý tài khoản"
 
@@ -15030,249 +14555,253 @@ msgstr ""
 "tạo nên một tài khoản thư tín Evolution. Vui lòng nhập tên tài khoản này vào "
 "khoảng trắng dưới đây. Tên này sẽ chỉ được dùng để hiển thị thôi."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:2
 #, fuzzy
 msgid " Ch_eck for Supported Types "
 msgstr "  _Hiện cơ sở được hỗ trợ "
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "<b>Preview</b>"
 msgstr "Xem thử"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "(Phiên bản Evolution đang dùng không hỗ trợ SSL)"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "<b>S_ignatures</b>"
 msgstr "<b>Trạng thái:</b> "
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "<b>_Languages</b>"
 msgstr "<b>Trạng thái:</b> "
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
+msgid "<small>This will make the the filter more reliable, but slower</small>"
+msgstr ""
+
+#: mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "<span weight=\"bold\">Checking for New Mail</span>"
 msgstr "Kiểm tra thư mới"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">General</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
 #, fuzzy
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "Thông điệp hiển thị"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Security</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "Thông điệp đã gửi và thông điệp nháp"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:34
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:35
 #, fuzzy
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "_Luôn tự mã hoá khi gửi thư được mã hóa"
 
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:36
 msgid "Account Editor"
 msgstr "Bộ hiệu chỉnh tài khoản"
 
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:38
 #, fuzzy
 msgid "Add Ne_w Signature..."
 msgstr "Lưu chữ ký mới..."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Add _Script"
 msgstr "Thêm _script"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:40
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "_Luôn tự mã hoá khi gửi thư được mã hóa"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Luôn gửi (_Cc) tới:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Luôn gửi (_Bcc) tới:"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Always _sign outgoing messages when using this account"
 msgstr "_Luôn ký tên lên các thư cần gửi khi dùng tài khoản này"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr ""
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Attach original message"
 msgstr "Đính kèm thông điệp gốc"
 
-#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Đồ đính kèm"
 
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:48
 #, fuzzy
 msgid "Automatically _insert smiley images"
 msgstr "_Tự động chèn ảnh smiley"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Automatically check for _new mail every"
 msgstr "_Tự động kiểm tra có thư mới"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltic (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltic (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Beep w_hen new mail arrives"
 msgstr "_Kêu bíp khi có thư mới"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "C_haracter set:"
 msgstr "Bảng mã:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Ch_eck for Supported Types "
 msgstr "  _Hiện cơ sở được hỗ trợ "
 
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 #, fuzzy
-msgid "Check _Incoming Mail"
+msgid "Check _incoming mail for junk"
 msgstr "Kiểm tra thư mới"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Check spelling while I _type"
 msgstr "Kiểm tra chính tả khi đang _gõ"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 msgid "Color for _misspelled words:"
 msgstr "Màu từ gõ _sai:"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Colors"
 msgstr "_Màu sắc"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Confirm _when expunging a folder"
 msgstr "_Xác nhận khi xóa thư mục"
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -15287,260 +14816,265 @@ msgstr ""
 "\n"
 "Hãu nhấn \"Áp dụng\" để lưu các thiết lập."
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
 msgid "De_fault"
 msgstr "_Mặc định"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Default character e_ncoding:"
 msgstr "_Bảng mã mặc định:"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 #, fuzzy
 msgid "Defaults"
 msgstr "_Mặc định"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 msgid "Do not quote original message"
 msgstr "Không trích dẫn thông điệp gốc"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr ""
 
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Xong"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Drafts _Folder:"
 msgstr "Thư mục _nháp:"
 
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:77
 msgid "Email Accounts"
 msgstr "Tài khoản email"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Email _Address:"
 msgstr "Địa chỉ _email:"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "Empty trash folders on e_xit"
 msgstr "_Xóa thư mục Rác khi thoát"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "_ID Chứng nhận:"
 
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:81
 msgid "Evolution Account Assistant"
 msgstr "Phụ tá tài khoản Evolution"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:82
 msgid "Execute Command..."
 msgstr "Thực hiện lệnh..."
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Fi_xed-width:"
 msgstr "Độ rộng _cứng:"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 msgid "Font Properties"
 msgstr "Thuộc tính font"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 msgid "Format messages in _HTML"
 msgstr "Định dạng thông điệp bằng _HTML"
 
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "HTML Mail"
 msgstr "Thư _HTML"
 
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Headers"
 msgstr "Header"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr "Điểm sang _trích dẫn bằng"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
 #: mail/mail-config.glade.h:91
+#, fuzzy
+msgid "I_nclude remote tests"
+msgstr "Bao gồm:"
+
+#: mail/mail-config.glade.h:94
 msgid "Inline"
 msgstr ""
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Mail Configuration"
 msgstr "Cấu hình thư"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "Địa điểm hộp thư"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr "Bộ soạn thảo thông điệp"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr ""
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Or_ganization:"
 msgstr "Tổ _chức:"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "PGP/GPG _Key ID:"
 msgstr "_Khóa ID PGP/GPG:"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "Play sound file when new mail arri_ves"
 msgstr "_Chơi nhạc khi có thư mới"
 
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "_Nhắc khi gửi thư mà chỉ có người nhận _Bcc"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr "Trích dẫn thông điệp gốc"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr ""
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Re_member password"
 msgstr "Nhớ mật khẩu này"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr ""
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "Đang nhận email"
 
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:120
 #, fuzzy
 msgid "Receiving Options"
 msgstr "Tùy chọn _nhận"
 
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
 #, fuzzy
 msgid "Remember _password"
 msgstr "Nhớ mật khẩu này"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
 #, fuzzy
 msgid "S_tandard Font:"
 msgstr "Sand Point"
 
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 #, fuzzy
 msgid "Security"
 msgstr "_Bảo mật"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font"
 msgstr "Chọn font HTML độ rộng cứng"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:126
 msgid "Select HTML fixed width font for printing"
 msgstr "Chọn font html độ rộng cứng để in"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:127
 msgid "Select HTML variable width font"
 msgstr "Chọn font HTML độ rộng thay đổi"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:128
 msgid "Select HTML variable width font for printing"
 msgstr "Chọn font HTML độ rộng thay đổi để in"
 
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:129
 #, fuzzy
 msgid "Select..."
 msgstr "Xóa..."
 
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "Đang gửi email"
 
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Sent _Messages Folder:"
 msgstr "Thư mục thông điệp đã gửi:"
 
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:134
 msgid "Ser_ver requires authentication"
 msgstr "Ser_ver yêu cầu xác thực"
 
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:135
 msgid "Server _Type: "
 msgstr "_Kiểu server:"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "Chứng nhận tự ký trong chuỗi"
 
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:137
 #, fuzzy
 msgid "Signat_ure:"
 msgstr "Chữ ký:"
 
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "Signatures"
 msgstr "_Chữ ký"
 
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr "Xác định _tên tập tin:"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "Spell Checking"
 msgstr "_Kiểm tra chính tả"
 
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:141
 msgid "Standard Unix mbox"
 msgstr "Dạng thức Unix mbox chuẩn"
 
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "T_erminal Font:"
 msgstr "Liên lạc gốc:"
 
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "T_ype: "
 msgstr "Kiểu:"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -15550,7 +15084,7 @@ msgstr ""
 "Tên bạn xác định sẽ chỉ được dùng cho mục đích\n"
 "hiển thị."
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
@@ -15559,7 +15093,7 @@ msgstr ""
 "Trang này cho phép bạn cấu hình hành vi kiểm tra chính tả và ngôn ngữ để "
 "kiểm tra. Danh sách ngôn ngữ phản ánh chỉ những ngôn ngữ bạn có cài đặt."
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:149
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -15567,15 +15101,11 @@ msgstr ""
 "Gõ tên mà bạn muốn dùng cho tài khoản này.\n"
 "Ví dụ: \"Work\" hoặc \"Personal\""
 
-#: mail/mail-config.glade.h:148
-msgid "Use _Daemon"
-msgstr ""
-
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:152
 msgid "V_ariable-width:"
 msgstr "Độ rộng _thay đổi:"
 
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:153
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -15585,92 +15115,88 @@ msgstr ""
 "\n"
 "Hãy nhấn \"Kế tiếp\" để bắt đầu."
 
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:158
 msgid "_Add Signature"
 msgstr "Thêm chữ _ký"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Always load images from the Internet"
 msgstr "_Luôn nạp ảnh từ mạng"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Digitally sign outgoing messages (by default)"
 msgstr "_Luôn ký tên lên các thư cần gửi khi dùng tài khoản này"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:161
 msgid "_Do not notify me when new mail arrives"
 msgstr "Đừn_g thông báo khi có thư mới"
 
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:163
 msgid "_Enable"
 msgstr "_Bật"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:165
 msgid "_Forward style:"
 msgstr "Phong cách _chuyển tiếp:"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Load images if sender is in address book"
 msgstr "_Nạp ảnh nếu người gửi có trong sổ địa chỉ"
 
-#: mail/mail-config.glade.h:167
-msgid "_Local Tests Only"
-msgstr ""
-
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Make this my default account"
 msgstr "Chọn làm tài khoản _mặc định"
 
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_Mark messages as read after"
 msgstr "Đánh dấu sẽ đọ_c sau"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Never load images from the Internet"
 msgstr "_Không bao giờ nạp ảnh từ mạng"
 
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "_Nhắc khi gửi thư HTML cho các liên lạc không muốn nhận HTML"
 
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:175
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "Nhắc khi gửi thư không có chủ đề"
 
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:176
 msgid "_Reply style:"
 msgstr "_Phong cách trả lời:"
 
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:177
 msgid "_Script:"
 msgstr "_Script:"
 
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:178
 msgid "_Show animated images"
 msgstr "_Hiện hoạt cảnh"
 
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "_Use Secure Connection (SSL):"
 msgstr "Dùng kết nối _an toàn (SSL):"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:181
 msgid "color"
 msgstr "màu"
 
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "mô tả"
 
@@ -15843,7 +15369,7 @@ msgstr ""
 
 #. mail:camel-exception primary
 #: mail/mail-errors.xml.h:57
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgid "Your message with the subject \"{0}\" was not delivered."
 msgstr ""
 
 #. mail:camel-exception secondary
@@ -15909,11 +15435,6 @@ msgstr ""
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Không thể tạo thư mục %s: %s"
 
-#. mail:no-save-path secondary
-#: mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail:no-create-path primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
@@ -15938,12 +15459,6 @@ msgstr ""
 msgid "Cannot create temporary save directory."
 msgstr "Không thể tạo thư mục tạm: %s"
 
-#. mail:no-create-tmp-path secondary
-#: mail/mail-errors.xml.h:100 mail/mail-errors.xml.h:112
-#: widgets/misc/e-system-errors.xml.h:11 widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail:no-write-path-exists secondary
 #: mail/mail-errors.xml.h:104
 #, fuzzy
@@ -16211,144 +15726,140 @@ msgstr "Ghi đè"
 msgid "_Append"
 msgstr "Aspen"
 
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:785
 #, c-format
 msgid "Pinging %s"
 msgstr "Đang \"ping\" %s"
 
-#: mail/mail-mt.c:897
-msgid "Working"
-msgstr "Đang làm việc"
-
-#: mail/mail-ops.c:99
+#: mail/mail-ops.c:98
 msgid "Filtering Folder"
 msgstr "Đang lọc thư mục"
 
-#: mail/mail-ops.c:260
+#: mail/mail-ops.c:259
 msgid "Fetching Mail"
 msgstr "Đang lấy thư"
 
-#: mail/mail-ops.c:543
+#: mail/mail-ops.c:542
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Lỗi lưu mail vào tập tin tạm %s: %s"
 
-#: mail/mail-ops.c:568
+#: mail/mail-ops.c:567
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:577
+#: mail/mail-ops.c:576
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Lỗi lưu mail vào tập tin tạm %s: %s"
 
-#: mail/mail-ops.c:673
+#: mail/mail-ops.c:672
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Đang gửi thông điệp %d trên %d"
 
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:703
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Lỗi giải mã thông điệp."
 
-#: mail/mail-ops.c:708
+#: mail/mail-ops.c:707
 msgid "Complete."
 msgstr "Hoàn tất."
 
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:804
 msgid "Saving message to folder"
 msgstr "Đang lưu thông điệp vào thư mục"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Đang chuyển thông điệp tới %s"
 
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Đang chép thông điệp vào %s"
 
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:1002
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Đang quét thư mục trong \"%s\""
 
-#: mail/mail-ops.c:1116
+#: mail/mail-ops.c:1115
 msgid "Forwarded messages"
 msgstr "Thông điệp chuyển tiếp"
 
-#: mail/mail-ops.c:1159
+#: mail/mail-ops.c:1158
 #, c-format
 msgid "Opening folder %s"
 msgstr "Đang mở thư mục %s"
 
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1230
 #, c-format
 msgid "Opening store %s"
 msgstr "Đang mở kho %s"
 
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1308
 #, c-format
 msgid "Removing folder %s"
 msgstr "Đang gở bỏ thư mục %s"
 
-#: mail/mail-ops.c:1403
+#: mail/mail-ops.c:1402
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Đang lưu thư mục %s"
 
-#: mail/mail-ops.c:1468
+#: mail/mail-ops.c:1467
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1469
+#: mail/mail-ops.c:1468
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Đang lưu thư mục %s"
 
-#: mail/mail-ops.c:1524
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr "Đang cập nhật thư mục"
 
-#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
+#: mail/mail-ops.c:1559 mail/mail-ops.c:1610
 msgid "Expunging folder"
 msgstr "Đang bỏ thư mục"
 
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1607
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Đang nhập %s như là %s"
 
-#: mail/mail-ops.c:1609
+#: mail/mail-ops.c:1608
 msgid "Local Folders"
 msgstr "Thư mục cục bộ"
 
-#: mail/mail-ops.c:1692
+#: mail/mail-ops.c:1691
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Đang nhận thông điệp %s"
 
-#: mail/mail-ops.c:1764
+#: mail/mail-ops.c:1763
 #, fuzzy, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Đang nhận %d thông điệp"
 msgstr[1] "Đang nhận %d thông điệp"
 
-#: mail/mail-ops.c:1850
+#: mail/mail-ops.c:1849
 #, fuzzy, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Đang lưu %d thông điệp"
 msgstr[1] "Đang lưu %d thông điệp"
 
-#: mail/mail-ops.c:1900
+#: mail/mail-ops.c:1899
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -16357,7 +15868,7 @@ msgstr ""
 "Không thể tạo tập tin output: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1928
+#: mail/mail-ops.c:1927
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -16366,11 +15877,11 @@ msgstr ""
 "Lỗi khi lưu thông điệp vào: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1999
+#: mail/mail-ops.c:1998
 msgid "Saving attachment"
 msgstr "Đang lưu đồ đính kèm"
 
-#: mail/mail-ops.c:2016
+#: mail/mail-ops.c:2015
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -16379,17 +15890,17 @@ msgstr ""
 "Không thể tạo tập tin output: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2046
+#: mail/mail-ops.c:2045
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Không thể ghi dữ liệu: %s"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Đang ngắt kết nối từ %s"
 
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Đang tái kết nối tới %s"
@@ -16455,24 +15966,24 @@ msgstr "Đang cập nhập..."
 msgid "Waiting..."
 msgstr "Đang chờ..."
 
-#: mail/mail-session.c:238
+#: mail/mail-session.c:239
 msgid "User canceled operation."
 msgstr "Người dùng đã hủy bỏ tác vụ."
 
-#: mail/mail-session.c:271
+#: mail/mail-session.c:272
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Nhập mật khẩu cho %s"
 
-#: mail/mail-session.c:273
+#: mail/mail-session.c:274
 msgid "Enter Password"
 msgstr "Nhập mật khẩu"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password"
 msgstr "_Nhớ mật khẩu này"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:298
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Nhớ mật khẩu này để nhắc nhở cho những lần sử dụng sau"
 
@@ -16529,79 +16040,79 @@ msgstr "Đang cập nhật vfolder cho URI: %s"
 msgid "Updating vFolders for '%s'"
 msgstr "Đang cập nhật vfolder cho URI: %s"
 
-#: mail/mail-vfolder.c:959
+#: mail/mail-vfolder.c:958
 msgid "vFolders"
 msgstr "vFolders"
 
-#: mail/mail-vfolder.c:998
+#: mail/mail-vfolder.c:997
 msgid "Edit VFolder"
 msgstr "Sửa VFolder"
 
-#: mail/mail-vfolder.c:1082
+#: mail/mail-vfolder.c:1081
 msgid "New VFolder"
 msgstr "VFolder mới"
 
-#: mail/message-list.c:946
+#: mail/message-list.c:948
 msgid "Unseen"
 msgstr "Chưa xem"
 
-#: mail/message-list.c:947
+#: mail/message-list.c:949
 msgid "Seen"
 msgstr "Đã xem"
 
-#: mail/message-list.c:948
+#: mail/message-list.c:950
 msgid "Answered"
 msgstr "Đã trả lời"
 
-#: mail/message-list.c:949
+#: mail/message-list.c:951
 msgid "Multiple Unseen Messages"
 msgstr "Nhiều thông điệp chưa xem"
 
-#: mail/message-list.c:950
+#: mail/message-list.c:952
 msgid "Multiple Messages"
 msgstr "Nhiều thông điệp"
 
-#: mail/message-list.c:954
+#: mail/message-list.c:956
 msgid "Lowest"
 msgstr "Thấp nhất"
 
-#: mail/message-list.c:955
+#: mail/message-list.c:957
 msgid "Lower"
 msgstr "Thấp"
 
-#: mail/message-list.c:959
+#: mail/message-list.c:961
 msgid "Higher"
 msgstr "Cao hơn"
 
-#: mail/message-list.c:960
+#: mail/message-list.c:962
 msgid "Highest"
 msgstr "Cao nhất"
 
-#: mail/message-list.c:1279
+#: mail/message-list.c:1285
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1286
+#: mail/message-list.c:1292
 msgid "Today %l:%M %p"
 msgstr "Hôm nay %l:%M %p"
 
-#: mail/message-list.c:1295
+#: mail/message-list.c:1301
 msgid "Yesterday %l:%M %p"
 msgstr "Hôm qua %l:%M %p"
 
-#: mail/message-list.c:1307
+#: mail/message-list.c:1313
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1315
+#: mail/message-list.c:1321
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: mail/message-list.c:1317
+#: mail/message-list.c:1323
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:3300
+#: mail/message-list.c:3321
 msgid "Generating message list"
 msgstr "Đang tạo danh sách thông điệp"
 
@@ -16657,6 +16168,10 @@ msgstr "Chuyển tiếp"
 msgid "No Response Necessary"
 msgstr "Không cần thiết trả lời"
 
+#: mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Đọc"
+
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Trả lời"
@@ -16762,45 +16277,49 @@ msgid ""
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:10
-msgid "Whether Evolution should start up in offline mode"
+msgid "Toolbar is visible"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:11
-msgid "Whether to skip the development warning dialog"
+msgid "Whether Evolution should start up in offline mode"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Whether the toolbar should be visible."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
+msgid "Whether to skip the development warning dialog"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:14
 #, fuzzy
 msgid "mail"
 msgstr "Email"
 
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
-msgstr "Được mang lại bởi"
-
-#: shell/e-shell.c:545 shell/e-shell.c:546
+#: shell/e-shell.c:588 shell/e-shell.c:589
 #, fuzzy, c-format
 msgid "%ld KB"
 msgstr "%d %B"
 
-#: shell/e-shell.c:744
+#: shell/e-shell.c:786
 #, fuzzy
 msgid "Uknown system error."
 msgstr "Lỗi lại"
 
-#: shell/e-shell.c:1101
+#: shell/e-shell.c:1143
 msgid "Invalid arguments"
 msgstr "Đối số không hợp lệ"
 
-#: shell/e-shell.c:1103
+#: shell/e-shell.c:1145
 msgid "Cannot register on OAF"
 msgstr "Không thể đăng ký với OAF"
 
-#: shell/e-shell.c:1105
+#: shell/e-shell.c:1147
 msgid "Configuration Database not found"
 msgstr "Không tìm thấy cơ sở dữ liệu cấu hình"
 
-#: shell/e-shell.c:1107
+#: shell/e-shell.c:1149
 msgid "Generic error"
 msgstr "Lỗi chung chung"
 
@@ -16856,7 +16375,7 @@ msgstr ""
 msgid "Select importer"
 msgstr "Chọn bộ nhập"
 
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1026
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
 #, c-format
 msgid "File %s does not exist"
 msgstr "Tập tin %s không tồn tại"
@@ -16884,35 +16403,35 @@ msgstr ""
 "Đang nhập %s\n"
 "Đang nhập mục 1."
 
-#: shell/e-shell-importer.c:549
+#: shell/e-shell-importer.c:570
 msgid "Automatic"
 msgstr "Tự động"
 
-#: shell/e-shell-importer.c:598
+#: shell/e-shell-importer.c:626
 #, fuzzy
-msgid "_Filename:"
+msgid "F_ilename:"
 msgstr "Tên tập tin:"
 
-#: shell/e-shell-importer.c:603
+#: shell/e-shell-importer.c:631
 msgid "Select a file"
 msgstr "Chọn tập tin"
 
-#: shell/e-shell-importer.c:613
+#: shell/e-shell-importer.c:642
 #, fuzzy
 msgid "File _type:"
 msgstr "Kiểu tập tin:"
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:681
 #, fuzzy
 msgid "Import data and settings from _older programs"
 msgstr "Nhập dữ liệu và thiết lập từ chương trình cũ"
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:684
 #, fuzzy
 msgid "Import a _single file"
 msgstr "Nhập tập tin đơn"
 
-#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -16920,26 +16439,26 @@ msgstr ""
 "Vui lòng chờ...\n"
 "Đang quét tìm thiết lập hiện có"
 
-#: shell/e-shell-importer.c:727
+#: shell/e-shell-importer.c:756
 msgid "Starting Intelligent Importers"
 msgstr "Đang khởi động bộ nhập thông minh"
 
-#: shell/e-shell-importer.c:853 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
 #, c-format
 msgid "From %s:"
 msgstr "Từ %s:"
 
-#: shell/e-shell-importer.c:1044
+#: shell/e-shell-importer.c:1073
 #, fuzzy, c-format
 msgid "No importer available for file %s"
 msgstr "Không có bên nào cung cấp giao thức `%s'"
 
-#: shell/e-shell-importer.c:1056
+#: shell/e-shell-importer.c:1085
 #, fuzzy
 msgid "Unable to execute importer"
 msgstr "Lỗi thực hiện GPG."
 
-#: shell/e-shell-importer.c:1169
+#: shell/e-shell-importer.c:1199
 #, fuzzy
 msgid "_Import"
 msgstr "Nhập"
@@ -16987,60 +16506,60 @@ msgstr "Tên thư mục không thể chứa ký tự Enter"
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' và '..' là hai tên thư mục đặc biệt, được dành riêng."
 
-#: shell/e-shell-window.c:336
+#: shell/e-shell-window.c:337
 #, fuzzy
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution hiện thời đang trực tuyến. Nhấn nút này để chuyển sang "
 "ngoại tuyến."
 
-#: shell/e-shell-window.c:343
+#: shell/e-shell-window.c:344
 #, fuzzy
 msgid "Evolution is in the process of going offline."
 msgstr "Ximian Volution đang trong tiến trình chuyển sang ngoại tuyến."
 
-#: shell/e-shell-window.c:349
+#: shell/e-shell-window.c:350
 #, fuzzy
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution đang ngoại tuyến. Nhấn nút này để chuyển sang trực tuyến."
 
-#: shell/e-shell-window.c:621
+#: shell/e-shell-window.c:637
 #, fuzzy, c-format
 msgid "Switch to %s"
 msgstr "Gửi thư tới %s"
 
-#: shell/e-shell-window-commands.c:64
+#: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Công cụ GNOME Pilot có lẽ chưa được cài đặt trên hệ thống này."
 
-#: shell/e-shell-window-commands.c:72
+#: shell/e-shell-window-commands.c:74
 #, c-format
 msgid "Error executing %s."
 msgstr "Lỗi thực hiện %s."
 
-#: shell/e-shell-window-commands.c:121
+#: shell/e-shell-window-commands.c:123
 msgid "Bug buddy is not installed."
 msgstr "Bug Buddy chưa được cài đặt."
 
-#: shell/e-shell-window-commands.c:129
+#: shell/e-shell-window-commands.c:131
 msgid "Bug buddy could not be run."
 msgstr "Không thể chạy Bug buddy"
 
-#: shell/e-shell-window-commands.c:171
+#: shell/e-shell-window-commands.c:323
 #, fuzzy
-msgid "About Evolution"
-msgstr "Về Ximian Evolution"
+msgid "Groupware Suite"
+msgstr "Nhóm"
 
-#: shell/e-shell-window-commands.c:382
+#: shell/e-shell-window-commands.c:563
 msgid "_Work Online"
 msgstr "_Trực tuyến"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "_Ngoại tuyến"
 
-#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Ngoại tuyến"
 
@@ -17052,43 +16571,6 @@ msgstr "Ô kiểm"
 msgid "New"
 msgstr "Mới"
 
-#: shell/evolution-shell-component-utils.c:115
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Lỗi lạ."
-
-#: shell/evolution-shell-component-utils.c:118
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Lỗi từ hệ thống thành phần:\n"
-"%s"
-
-#: shell/evolution-shell-component-utils.c:125
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Lỗi từ hệ thống kích hoạt:\n"
-"%s"
-
 #: shell/evolution-test-component.c:140
 #, fuzzy
 msgid "New Test"
@@ -17427,34 +16909,34 @@ msgid ""
 "Click help for details."
 msgstr ""
 
-#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:522
+#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
+#: smime/gui/certificate-manager.c:556
 #, fuzzy
 msgid "Select a cert to import..."
 msgstr "Chọn bộ nhập"
 
-#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:604
+#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
+#: smime/gui/certificate-manager.c:638
 #, fuzzy
 msgid "Certificate Name"
 msgstr "_ID Chứng nhận:"
 
-#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
+#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
 #, fuzzy
 msgid "Purposes"
 msgstr "Tiến trình"
 
-#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:517
+#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:267
+#: smime/gui/certificate-manager.c:271
 #, fuzzy
 msgid "Expires"
 msgstr "Biểu thức"
 
-#: smime/gui/certificate-manager.c:417
+#: smime/gui/certificate-manager.c:446
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "Địa chỉ _email:"
@@ -17497,6 +16979,11 @@ msgid ""
 "  Subject: %s\n"
 msgstr ""
 
+#: smime/gui/e-cert-selector.c:169
+#, fuzzy
+msgid "Select certificate"
+msgstr "Đi tới ngày xác định"
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -17559,7 +17046,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
 #, fuzzy
 msgid "Certificate"
 msgstr "_ID Chứng nhận:"
@@ -17584,20 +17071,24 @@ msgstr "Tên chung"
 msgid "Contact Certificates"
 msgstr "_ID Chứng nhận:"
 
-#: smime/gui/smime-ui.glade.h:21
-#, no-c-format
-msgid "Do you want to trust \"%s\" for the following purposes?"
+#: smime/gui/smime-ui.glade.h:20
+msgid "Do not trust the authenticity of this certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:21
 msgid "Dummy window only"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:22
 #, fuzzy
 msgid "Edit"
 msgstr "_Sửa"
 
+#: smime/gui/smime-ui.glade.h:23
+#, fuzzy
+msgid "Email Certificate Trust Settings"
+msgstr "Lỗi xác minh chứng nhận."
+
 #: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr ""
@@ -17634,282 +17125,292 @@ msgstr "Đơn vị tổ chức"
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:37
-msgid "Trust this CA to identify email users."
+msgid "Trust the authenticity of this certificate"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:38
-msgid "Trust this CA to identify software developers."
+msgid "Trust this CA to identify email users."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:39
-msgid "Trust this CA to identify web sites."
+msgid "Trust this CA to identify software developers."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:40
-#, fuzzy
-msgid "View"
-msgstr "_Xem"
+msgid "Trust this CA to identify web sites."
+msgstr ""
 
 #: smime/gui/smime-ui.glade.h:41
 #, fuzzy
-msgid "View Certificate"
-msgstr "_ID Chứng nhận:"
+msgid "View"
+msgstr "_Xem"
 
 #: smime/gui/smime-ui.glade.h:42
-msgid "You have been asked to trust a new Certificate Authority (CA)."
-msgstr ""
-
-#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:44
+#: smime/gui/smime-ui.glade.h:43
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:45
+#: smime/gui/smime-ui.glade.h:44
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:46
+#: smime/gui/smime-ui.glade.h:45
 #, fuzzy
 msgid "Your Certificates"
 msgstr "_ID Chứng nhận:"
 
-#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
+#: smime/gui/smime-ui.glade.h:46
+msgid "_Edit CA Trust"
+msgstr ""
+
+#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 #, fuzzy
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
-#: smime/lib/e-cert.c:478
+#. x509 certificate usage types
+#: smime/lib/e-cert.c:424
+#, fuzzy
+msgid "Sign"
+msgstr "Stauning"
+
+#: smime/lib/e-cert.c:425
+#, fuzzy
+msgid "Encrypt"
+msgstr "Mã hóa PGP"
+
+#: smime/lib/e-cert.c:530
 #, fuzzy
 msgid "Version"
 msgstr "Vermont"
 
-#: smime/lib/e-cert.c:493
+#: smime/lib/e-cert.c:545
 #, fuzzy
 msgid "Version 1"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:496
+#: smime/lib/e-cert.c:548
 #, fuzzy
 msgid "Version 2"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:499
+#: smime/lib/e-cert.c:551
 #, fuzzy
 msgid "Version 3"
 msgstr "Vermillion"
 
-#: smime/lib/e-cert.c:581
+#: smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:584
+#: smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:587
+#: smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:590
+#: smime/lib/e-cert.c:642
 #, fuzzy
 msgid "C"
 msgstr " C"
 
-#: smime/lib/e-cert.c:593
+#: smime/lib/e-cert.c:645
 #, fuzzy
 msgid "CN"
 msgstr "B"
 
-#: smime/lib/e-cert.c:596
+#: smime/lib/e-cert.c:648
 msgid "OU"
 msgstr ""
 
-#: smime/lib/e-cert.c:599
+#: smime/lib/e-cert.c:651
 #, fuzzy
 msgid "O"
 msgstr "Đồng ý"
 
-#: smime/lib/e-cert.c:602
+#: smime/lib/e-cert.c:654
 msgid "L"
 msgstr ""
 
-#: smime/lib/e-cert.c:605
+#: smime/lib/e-cert.c:657
 #, fuzzy
 msgid "DN"
 msgstr "B"
 
-#: smime/lib/e-cert.c:608
+#: smime/lib/e-cert.c:660
 msgid "DC"
 msgstr ""
 
-#: smime/lib/e-cert.c:611
+#: smime/lib/e-cert.c:663
 #, fuzzy
 msgid "ST"
 msgstr "SMTP"
 
-#: smime/lib/e-cert.c:614
+#: smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:617
+#: smime/lib/e-cert.c:669
 #, fuzzy
 msgid "Certificate Key Usage"
 msgstr "_ID Chứng nhận:"
 
-#: smime/lib/e-cert.c:620
+#: smime/lib/e-cert.c:672
 #, fuzzy
 msgid "Netscape Certificate Type"
 msgstr "_ID Chứng nhận:"
 
-#: smime/lib/e-cert.c:623
+#: smime/lib/e-cert.c:675
 #, fuzzy
 msgid "Certificate Authority Key Identifier"
 msgstr "Chứng nhận không đáng tin"
 
-#: smime/lib/e-cert.c:626
+#: smime/lib/e-cert.c:678
 #, fuzzy
 msgid "UID"
 msgstr "ID"
 
-#: smime/lib/e-cert.c:635
+#: smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr ""
 
-#: smime/lib/e-cert.c:686
+#: smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:694
+#: smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
 msgstr ""
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:768
 #, fuzzy
 msgid "Subject Public Key Info"
 msgstr ""
 "\n"
 "Khoá chung: "
 
-#: smime/lib/e-cert.c:721
+#: smime/lib/e-cert.c:773
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:736
+#: smime/lib/e-cert.c:788
 #, fuzzy
 msgid "Subject's Public Key"
 msgstr "Chủ để là %s"
 
-#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
+#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
 #, fuzzy
 msgid "Error: Unable to process extension"
 msgstr "Không thể xử lý thư mục spool"
 
-#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
+#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:782
+#: smime/lib/e-cert.c:834
 #, fuzzy
 msgid "SSL Certificate Authority"
 msgstr "Chứng nhận không đáng tin"
 
-#: smime/lib/e-cert.c:786
+#: smime/lib/e-cert.c:838
 #, fuzzy
 msgid "Email Certificate Authority"
 msgstr "Lỗi xác minh chứng nhận."
 
-#: smime/lib/e-cert.c:814
+#: smime/lib/e-cert.c:866
 #, fuzzy
 msgid "Signing"
 msgstr "Stauning"
 
-#: smime/lib/e-cert.c:818
+#: smime/lib/e-cert.c:870
 #, fuzzy
 msgid "Non-repudiation"
 msgstr "Không có thông tin"
 
-#: smime/lib/e-cert.c:822
+#: smime/lib/e-cert.c:874
 msgid "Key Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:826
+#: smime/lib/e-cert.c:878
 #, fuzzy
 msgid "Data Encipherment"
 msgstr "đồ đính kèm"
 
-#: smime/lib/e-cert.c:830
+#: smime/lib/e-cert.c:882
 msgid "Key Agreement"
 msgstr ""
 
-#: smime/lib/e-cert.c:834
+#: smime/lib/e-cert.c:886
 #, fuzzy
 msgid "Certificate Signer"
 msgstr "_ID Chứng nhận:"
 
-#: smime/lib/e-cert.c:838
+#: smime/lib/e-cert.c:890
 msgid "CRL Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:938
 #, fuzzy
 msgid "Critical"
 msgstr "Curitiba"
 
-#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
+#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
 #, fuzzy
 msgid "Not Critical"
 msgstr "North Carolina"
 
-#: smime/lib/e-cert.c:912
+#: smime/lib/e-cert.c:964
 #, fuzzy
 msgid "Extensions"
 msgstr "Biểu thức"
 
-#: smime/lib/e-cert.c:983
+#: smime/lib/e-cert.c:1035
 #, fuzzy, c-format
 msgid "%s = %s"
 msgstr "%s tại %s"
 
-#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
 #, fuzzy
 msgid "Certificate Signature Algorithm"
 msgstr "Lỗi chữ ký chứng nhận"
 
-#: smime/lib/e-cert.c:1048
+#: smime/lib/e-cert.c:1100
 #, fuzzy
 msgid "Issuer"
 msgstr "_Chèn"
 
-#: smime/lib/e-cert.c:1102
+#: smime/lib/e-cert.c:1154
 msgid "Issuer Unique ID"
 msgstr ""
 
-#: smime/lib/e-cert.c:1121
+#: smime/lib/e-cert.c:1173
 #, fuzzy
 msgid "Subject Unique ID"
 msgstr "Chủ để là %s"
 
-#: smime/lib/e-cert.c:1164
+#: smime/lib/e-cert.c:1216
 #, fuzzy
 msgid "Certificate Signature Value"
 msgstr "Lỗi chữ ký chứng nhận"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
+#: smime/lib/e-cert-db.c:608
 #, fuzzy
 msgid "Certificate already exists"
 msgstr "Card ID đã tồn tại"
@@ -18062,7 +17563,7 @@ msgstr "Xem liên lạc hiện thời"
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "_Hành động"
 
@@ -18233,7 +17734,7 @@ msgstr "Đón_g"
 #: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:3
+#: ui/evolution.xml.h:4
 msgid "Close"
 msgstr "Đóng"
 
@@ -18246,7 +17747,7 @@ msgid "Delete this item"
 msgstr "Xóa mục này"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr "Thanh công cụ chính"
 
@@ -18290,7 +17791,7 @@ msgstr "Lưu mục này vào đĩa"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:44
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "_File"
 msgstr "_Tập tin"
 
@@ -18556,13 +18057,13 @@ msgstr "Đảo vùng chọn"
 msgid "_Threaded Message List"
 msgstr "Danh sách thông điệp nhánh"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "Đóng cửa sổ này"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "_Close"
 msgstr "Đón_g"
 
@@ -18971,7 +18472,7 @@ msgstr "Thông điệp t_rước"
 msgid "_Quoted"
 msgstr "_Quoted"
 
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
 msgid "_Tools"
 msgstr "_Công cụ"
 
@@ -19275,108 +18776,122 @@ msgid "_Open Task"
 msgstr "Nhiệm _vụ"
 
 #: ui/evolution.xml.h:1
-msgid "About Ximian Evolution..."
-msgstr "Giới thiệu Ximian Evolution..."
+#, fuzzy
+msgid "About Evolution..."
+msgstr "Về Ximian Evolution"
 
 #: ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
 msgstr "Đổi thiết lập Evolution"
 
-#: ui/evolution.xml.h:5
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the visibility of the toolbar"
+msgstr "Đổi thuộc tính thư mục này"
+
+#: ui/evolution.xml.h:6
 msgid "Create a new window displaying this folder"
 msgstr "Tạo cửa sổ mới hiển thị thư mục này"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "T_hoát"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Ximian Evolution _FAQ"
+
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Thoát chương trình"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:10
 msgid "Forget _Passwords"
 msgstr "Quên mật khẩu"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:11
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "Quên đi mật khẩu đã nhớ, như vậy bạn sẽ lại được nhắc nhập mật khẩu"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:12
 msgid "Import data from other programs"
 msgstr "Nhập dữ liệu từ chương trình khác"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:14
 #, fuzzy
 msgid "New _Window"
 msgstr "Tìm n_gay"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Pi_lot Settings..."
 msgstr "Thiết lập Pi_lot..."
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Send / Receive"
 msgstr "Gửi / Nhận"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Send queued items and retrieve new items"
 msgstr "Gửi các mục đang đợi gửi và nhận các mục mới"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Set up Pilot configuration"
 msgstr "Thiết lập cấu hình Pilot"
 
-#: ui/evolution.xml.h:17
-msgid "Show information about Ximian Evolution"
+#: ui/evolution.xml.h:19
+#, fuzzy
+msgid "Show information about Evolution"
 msgstr "Hiện thông tin về Ximian Evolution"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:20
 msgid "Submit Bug Report"
 msgstr "Gửi báo cáo lỗi"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:21
 msgid "Submit _Bug Report"
 msgstr "_Gửi báo cáo lỗi"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Báo cáo lỗi, dùng Bug Buddy"
 
-#: ui/evolution.xml.h:21
-msgid "Toggle whether we are working offline."
-msgstr "Bật tắt hoạt động ngoại tuyến"
-
 #: ui/evolution.xml.h:23
-msgid "Ximian Evolution _FAQ"
-msgstr "Ximian Evolution _FAQ"
+#, fuzzy
+msgid "T_oolbar"
+msgstr "Thanh công cụ chính"
 
 #: ui/evolution.xml.h:24
-msgid "_About Ximian Evolution..."
-msgstr "_Giới thiệu Ximian Evolution..."
+msgid "Toggle whether we are working offline."
+msgstr "Bật tắt hoạt động ngoại tuyến"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "_About Evolution..."
+msgstr "Về Ximian Evolution"
+
+#: ui/evolution.xml.h:30
 msgid "_Help"
 msgstr "Trợ _giúp"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "_Import..."
 msgstr "_Nhập..."
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "_New"
 msgstr "Mớ_i"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 #, fuzzy
 msgid "_Quick Reference"
 msgstr "Thông số thư"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_Send / Receive"
 msgstr "_Gửi / Nhận"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 #, fuzzy
 msgid "_Window"
 msgstr "Tìm n_gay"
@@ -19454,7 +18969,7 @@ msgid "With _Status"
 msgstr "Đặt trạng thái"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:626
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:635
 msgid "UTC"
 msgstr "UTC"
 
@@ -19613,29 +19128,29 @@ msgstr "Khác..."
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
-#: widgets/misc/e-error.c:121
+#: widgets/misc/e-error.c:79 widgets/misc/e-error.c:80
+#: widgets/misc/e-error.c:122
 msgid "Evolution Error"
 msgstr "Lỗi Evolution"
 
-#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
-#: widgets/misc/e-error.c:119
+#: widgets/misc/e-error.c:81 widgets/misc/e-error.c:82
+#: widgets/misc/e-error.c:120
 #, fuzzy
 msgid "Evolution Warning"
 msgstr "Evolution"
 
-#: widgets/misc/e-error.c:118
+#: widgets/misc/e-error.c:119
 #, fuzzy
 msgid "Evolution Information"
 msgstr "Thông tin cuộc họp"
 
-#: widgets/misc/e-error.c:120
+#: widgets/misc/e-error.c:121
 #, fuzzy
 msgid "Evolution Query"
 msgstr "Thành phần tóm tắt Evolution."
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:410
+#: widgets/misc/e-error.c:415
 #, fuzzy, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -19789,16 +19304,494 @@ msgstr ""
 "Không thể lưu vào `%s'\n"
 "  %s"
 
-#: widgets/misc/e-task-widget.c:211
+#: widgets/misc/e-task-widget.c:212
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: widgets/misc/e-task-widget.c:216
+#: widgets/misc/e-task-widget.c:217
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% hoàn tất)"
 
+#~ msgid "Failed to connect to LDAP server"
+#~ msgstr "Lỗi kết nối tới LDAP server."
+
+#~ msgid "Failed to authenticate with LDAP server"
+#~ msgstr "Lỗi xác thực với LDAP server"
+
+#~ msgid "Could not perform query on Root DSE"
+#~ msgstr "Không thể thực hiện truy vấn tại Root DSE"
+
+#~ msgid "The server responded with no supported search bases"
+#~ msgstr "Server trả lời không hỗ trợ cơ sở tìm kiếm"
+
+#~ msgid "This server does not support LDAPv3 schema information"
+#~ msgstr "Server này không hỗ trợ thông tin schema LDAPv3"
+
+#~ msgid "Error retrieving schema information"
+#~ msgstr "Lỗi nhận thông tin schema"
+
+#~ msgid "Server did not respond with valid schema information"
+#~ msgstr "Server không trả lời bằng schema hợp lệ"
+
+#~ msgid "  S_how Supported Bases "
+#~ msgstr "  _Hiện cơ sở được hỗ trợ "
+
+#~ msgid "1:00"
+#~ msgstr "1:00"
+
+#~ msgid "5:00"
+#~ msgstr "5:00"
+
+#~ msgid "Connecting"
+#~ msgstr "Đang kết nối"
+
+#~ msgid "Distinguished _name:"
+#~ msgstr "Tên _phân biệt:"
+
+#, fuzzy
+#~ msgid "Email address:"
+#~ msgstr "Địa chỉ _email:"
+
+#~ msgid "Evolution will use this DN to authenticate you with the server"
+#~ msgstr "Evolution sẽ dùng DN này để xác thực bạn với server"
+
+#~ msgid "One"
+#~ msgstr "Một"
+
+#~ msgid "S_earch scope: "
+#~ msgstr "_Phạm vị tìm: "
+
+#~ msgid "Searching"
+#~ msgstr "Đang tìm"
+
+#~ msgid "Sub"
+#~ msgstr "Con"
+
+#~ msgid "This option controls how long a search will be run."
+#~ msgstr "Tùy chọn này điểu khiển tìm kiếm sẽ chạy trong bao lâu."
+
+#~ msgid "U_se SSL/TLS:"
+#~ msgstr "_Dùng SSL/TLS:"
+
+#~ msgid "_Display name:"
+#~ msgstr "Tên _hiển thị:"
+
+#~ msgid "_Port number:"
+#~ msgstr "_Số hiệu cổng:"
+
+#~ msgid "_Search base:"
+#~ msgstr "_Cơ sở tìm:"
+
+#~ msgid "_Server name:"
+#~ msgstr "Tên Ser_ver:"
+
+#~ msgid "_Timeout (minutes):"
+#~ msgstr "Thời _hạn (phút):"
+
+#~ msgid "connecting-tab"
+#~ msgstr "connecting-tab"
+
+#~ msgid "general-tab"
+#~ msgstr "general-tab"
+
+#~ msgid "searching-tab"
+#~ msgstr "searching-tab"
+
+#, fuzzy
+#~ msgid "Job title:"
+#~ msgstr "Tên n_ghề:"
+
+#, fuzzy
+#~ msgid "Webcam:"
+#~ msgstr "Trang"
+
+#~ msgid "Category editor not available."
+#~ msgstr "Bộ biên soạn phân loại không tồn tại."
+
+#~ msgid "Could not find widget for a field: `%s'"
+#~ msgstr "Không thể tìm thấy widget cho trường: `%s'"
+
+#~ msgid "Do you want to save changes?"
+#~ msgstr "Bạn có muốn lưu các thay đổi không?"
+
+#~ msgid "Error saving %s: %s"
+#~ msgstr "Lỗi lưu %s: %s"
+
+#~ msgid ""
+#~ "The addressbook backend for\n"
+#~ "%s\n"
+#~ "has crashed. You will have to restart Evolution in order to use it again"
+#~ msgstr ""
+#~ "Backend sổ địa chỉ cho\n"
+#~ "%s\n"
+#~ "đã hỏng. Bạn phải khởi động lại Evolution để dùng lại."
+
+#, fuzzy
+#~ msgid "Can not load URI"
+#~ msgstr "Không có card"
+
+#, fuzzy
+#~ msgid "Calendar Properties"
+#~ msgstr "Lỗi iCalendar"
+
+#, fuzzy
+#~ msgid "Remote"
+#~ msgstr "Loại bỏ"
+
+#, fuzzy
+#~ msgid "Task List Properties"
+#~ msgstr "Danh sách công việc"
+
+#, fuzzy
+#~ msgid "_Refresh Interval:"
+#~ msgstr "_Danh sách cập nhật"
+
+#, fuzzy
+#~ msgid "_Source URL:"
+#~ msgstr "URI của POP"
+
+#~ msgid ""
+#~ "The event being deleted is a meeting, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr ""
+#~ "Sự kiện này sẽ bị xóa khỏi cuộc họp, bạn có muốn gửi thông báo hủy sự "
+#~ "kiện này không?"
+
+#~ msgid "Are you sure you want to cancel and delete this meeting?"
+#~ msgstr "Bạn có chắc muốn hủy bỏ và xoá cuộc họp này?"
+
+#~ msgid ""
+#~ "The task being deleted is assigned, would you like to send a cancellation "
+#~ "notice?"
+#~ msgstr ""
+#~ "Công việc sẽ bị xóa này đã được phân công, bạn có muốn gửi thông báo hủy "
+#~ "công việc này không?"
+
+#~ msgid "Are you sure you want to cancel and delete this task?"
+#~ msgstr "Bạn có chắc muốn hủy bỏ và xóa công việc này?"
+
+#~ msgid "Are you sure you want to cancel and delete this journal entry?"
+#~ msgstr "Bạn có chắc muốn hủy bỏ và xóa mục nhật ký này?"
+
+#~ msgid "Are you sure you want to delete the appointment `%s'?"
+#~ msgstr "Bạn có chắc muốn xóa cuộc hẹn `%s'?"
+
+#~ msgid "Are you sure you want to delete this untitled appointment?"
+#~ msgstr "Bạn có chắc muốn xóa cuộc hẹn vô danh này?"
+
+#~ msgid "Are you sure you want to delete the task `%s'?"
+#~ msgstr "Bạn có chắc muốn xóa công việc `%s'?"
+
+#~ msgid "Are you sure you want to delete this untitled task?"
+#~ msgstr "Bạn có chắc muốn xóa công việc vô danh này?"
+
+#~ msgid "Are you sure you want to delete the journal entry `%s'?"
+#~ msgstr "Bạn có chắc muốn xóa mục nhật ky1 `%s'?"
+
+#~ msgid "Are you sure want to delete this untitled journal entry?"
+#~ msgstr "Bạn có chắc muốn xóa mục nhật ký này?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d appointment?"
+#~ msgid_plural "Are you sure you want to delete %d appointments?"
+#~ msgstr[0] "Bạn có chắc muốn xóa %d cuộc hẹn?"
+#~ msgstr[1] "Bạn có chắc muốn xóa %d cuộc hẹn?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d task?"
+#~ msgid_plural "Are you sure you want to delete %d tasks?"
+#~ msgstr[0] "Bạn có chắc muốn xóa %d công việc?"
+#~ msgstr[1] "Bạn có chắc muốn xóa %d công việc?"
+
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d journal entry?"
+#~ msgid_plural "Are you sure you want to delete %d journal entries?"
+#~ msgstr[0] "Bạn có chắc muốn xóa %d mục nhật ký?"
+#~ msgstr[1] "Bạn có chắc muốn xóa %d mục nhật ký?"
+
+#~ msgid "_Invite Others..."
+#~ msgstr "_Mời người khác..."
+
+#, fuzzy
+#~ msgid ""
+#~ "This event has been changed, but has not been saved.\n"
+#~ "\n"
+#~ "Do you wish to save your changes?"
+#~ msgstr ""
+#~ "Chữ ký này đã thay đổi, nhưng vẫn chưa được lưu.\n"
+#~ "\n"
+#~ "Bạn có muốn lưu các thay đổi không?"
+
+#~ msgid "_Discard Changes"
+#~ msgstr "_Hủy thay đổi"
+
+#, fuzzy
+#~ msgid "Save Event"
+#~ msgstr "Sự kiện lịch"
+
+#~ msgid "The meeting information has been created. Send it?"
+#~ msgstr "Thông tin cuộc họp đã được tại. Gửi nó đi chứ?"
+
+#~ msgid "The meeting information has changed. Send an updated version?"
+#~ msgstr "Thông tin cuộc họp đã thay đổi. Gửi bản cập nhật?"
+
+#~ msgid "The task assignment information has been created. Send it?"
+#~ msgstr "Thông tin công việc đã được tạo. Gửi nó đi chứ?"
+
+#~ msgid "The task information has changed. Send an updated version?"
+#~ msgstr "Thông tin công việc đã thay đổi. Gửi bản cập nhật?"
+
+#, fuzzy
+#~ msgid "Could not get article %s from NNTP server"
+#~ msgstr "Không thể lấy danh sách nhóm từ server."
+
+#, fuzzy
+#~ msgid "Error posting message: %s: message not posted"
+#~ msgstr ""
+#~ "Lỗi tự động lưu thông điệp: %s\n"
+#~ " %s"
+
+#, fuzzy
+#~ msgid "Stream error"
+#~ msgstr "lỗi phân tích"
+
+#, fuzzy
+#~ msgid "Connection error: %s"
+#~ msgstr "Lỗi lạ: %s"
+
+#~ msgid "Could not get group: %s"
+#~ msgstr "Không thể lấy nhóm: %s"
+
+#, fuzzy
+#~ msgid "Could not get messages: unspecified error"
+#~ msgstr "Không thể lấy thông điệp: %s"
+
+#~ msgid "Unknown server response: %s"
+#~ msgstr "Hồi đáp lại từ server: %s"
+
+#~ msgid "Adjust Score"
+#~ msgstr "Chỉnh điểm"
+
+#~ msgid "Assign Color"
+#~ msgstr "Gán màu"
+
+#~ msgid "Assign Score"
+#~ msgstr "Gán điểm"
+
+#~ msgid "Attachments"
+#~ msgstr "Đồ đính kèm"
+
+#~ msgid "Beep"
+#~ msgstr "Bíp"
+
+#~ msgid "contains"
+#~ msgstr "chứa"
+
+#~ msgid "Copy to Folder"
+#~ msgstr "Chép vào thư mục"
+
+#~ msgid "Date received"
+#~ msgstr "Ngày nhận"
+
+#~ msgid "Date sent"
+#~ msgstr "Ngày gửi"
+
+#~ msgid "Deleted"
+#~ msgstr "Đã xóa"
+
+#~ msgid "does not contain"
+#~ msgstr "không chứa"
+
+#~ msgid "does not end with"
+#~ msgstr "không kết thúc bằng"
+
+#~ msgid "does not exist"
+#~ msgstr "không tồn tại"
+
+#~ msgid "does not return"
+#~ msgstr "không trả về"
+
+#~ msgid "does not sound like"
+#~ msgstr "không giống với"
+
+#~ msgid "does not start with"
+#~ msgstr "không bắt đầu bằng"
+
+#~ msgid "Do Not Exist"
+#~ msgstr "Không tồn tại"
+
+#~ msgid "Draft"
+#~ msgstr "Nháp"
+
+#~ msgid "ends with"
+#~ msgstr "kết thúc bằng"
+
+#~ msgid "Exist"
+#~ msgstr "Tồn tại"
+
+#~ msgid "exists"
+#~ msgstr "tồn tại"
+
+#~ msgid "Expression"
+#~ msgstr "Biểu thức"
+
+#~ msgid "is"
+#~ msgstr "bằng"
+
+#~ msgid "is after"
+#~ msgstr "sau"
+
+#~ msgid "is before"
+#~ msgstr "trước"
+
+#~ msgid "is Flagged"
+#~ msgstr "được đặt cờ"
+
+#~ msgid "is greater than"
+#~ msgstr "lớn hơn"
+
+#~ msgid "is less than"
+#~ msgstr "nhỏ hơn"
+
+#~ msgid "is not"
+#~ msgstr "không phải"
+
+#~ msgid "is not Flagged"
+#~ msgstr "không được đặt cờ"
+
+#, fuzzy
+#~ msgid "Junk Test"
+#~ msgstr "Tháng Sáu"
+
+#~ msgid "Mailing list"
+#~ msgstr "Mailing list"
+
+#~ msgid "Message Body"
+#~ msgstr "Thân thông điệp"
+
+#~ msgid "Message Header"
+#~ msgstr "Đầu thông điệp"
+
+#, fuzzy
+#~ msgid "Message is Junk"
+#~ msgstr "Đã gửi thông điệp"
+
+#, fuzzy
+#~ msgid "Message is not Junk"
+#~ msgstr "Không tìm thấy thông điệp %s."
+
+#~ msgid "Move to Folder"
+#~ msgstr "Chuyển vào thư mục"
+
+#, fuzzy
+#~ msgid "Pipe to Program"
+#~ msgstr "Thoát chương trình"
+
+#~ msgid "Play Sound"
+#~ msgstr "Phát âm thanh"
+
+#~ msgid "Recipients"
+#~ msgstr "Người nhận"
+
+#~ msgid "Regex Match"
+#~ msgstr "Khớp Regex"
+
+#~ msgid "Replied to"
+#~ msgstr "Trả lời cho"
+
+#~ msgid "returns"
+#~ msgstr "trả về"
+
+#~ msgid "returns greater than"
+#~ msgstr "trả về lớn hơn"
+
+#~ msgid "returns less than"
+#~ msgstr "trả về nhỏ hơn"
+
+#, fuzzy
+#~ msgid "Run Program"
+#~ msgstr "Chạy chương trình:"
+
+#~ msgid "Sender"
+#~ msgstr "Người gửi"
+
+#~ msgid "Set Status"
+#~ msgstr "Đặt trạng thái"
+
+#~ msgid "Size (kB)"
+#~ msgstr "Kích thước (kB)"
+
+#~ msgid "sounds like"
+#~ msgstr "giống như"
+
+#~ msgid "Source Account"
+#~ msgstr "Tài khoản nguồn"
+
+#~ msgid "Specific header"
+#~ msgstr "Header xác định"
+
+#~ msgid "starts with"
+#~ msgstr "bắt đầu bằng"
+
+#~ msgid "Stop Processing"
+#~ msgstr "Dừng tiến trình"
+
+#~ msgid "Unset Status"
+#~ msgstr "Bỏ đặt trạng thái"
+
+#~ msgid "Working"
+#~ msgstr "Đang làm việc"
+
+#~ msgid "Brought to you by"
+#~ msgstr "Được mang lại bởi"
+
+#, fuzzy
+#~ msgid "_Filename:"
+#~ msgstr "Tên tập tin:"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "Unknown error."
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Lỗi lạ."
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the component system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Lỗi từ hệ thống thành phần:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the activation system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "Lỗi từ hệ thống kích hoạt:\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "View Certificate"
+#~ msgstr "_ID Chứng nhận:"
+
+#~ msgid "About Ximian Evolution..."
+#~ msgstr "Giới thiệu Ximian Evolution..."
+
+#~ msgid "_About Ximian Evolution..."
+#~ msgstr "_Giới thiệu Ximian Evolution..."
+
 #, fuzzy
 #~ msgid "Evolution Addressbook folder viewer"
 #~ msgstr "Bộ xem Minicard sổ địa chỉ evolution"
@@ -20109,9 +20102,6 @@ msgstr "%s (%d%% hoàn tất)"
 #~ msgid "Primary _email:"
 #~ msgstr "Email chính"
 
-#~ msgid "S_pouse:"
-#~ msgstr "_Vợ/Chồng:"
-
 #, fuzzy
 #~ msgid "_Business:"
 #~ msgstr "Kinh doanh"
@@ -20132,9 +20122,6 @@ msgstr "%s (%d%% hoàn tất)"
 #~ msgid "_Mobile:"
 #~ msgstr "Di động"
 
-#~ msgid "_Office:"
-#~ msgstr "_Văn phòng:"
-
 #~ msgid "_Public Calendar URL:"
 #~ msgstr "URL Lịch _công cộng:"
 
@@ -21584,10 +21571,6 @@ msgstr "%s (%d%% hoàn tất)"
 #~ msgstr "Không thể tìm thấy đối tượng\n"
 
 #, fuzzy
-#~ msgid "Invalid object"
-#~ msgstr "Mục đích không hợp lệ"
-
-#, fuzzy
 #~ msgid "URI not loaded"
 #~ msgstr "Không nạp được EBook\n"
 
@@ -25531,9 +25514,6 @@ msgstr "%s (%d%% hoàn tất)"
 #~ msgid "Lannion"
 #~ msgstr "Lannion"
 
-#~ msgid "Lansing"
-#~ msgstr "Lansing"
-
 #~ msgid "Lanzhou"
 #~ msgstr "Lanzhou"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0693034dcf..27771289ca 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,14 +8,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-22 19:19+0200\n"
+"POT-Creation-Date: 2004-06-03 11:14-0400\n"
 "PO-Revision-Date: 2004-05-23 04:53+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: a11y/addressbook/ea-addressbook-view.c:94
@@ -70,13 +70,13 @@ msgstr "无法读入 Pilot 的地址应用程序块"
 msgid "Accessing LDAP Server anonymously"
 msgstr "匿名访问 LDAP 服务器"
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
 msgid "Failed to authenticate.\n"
 msgstr "认证失败。\n"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%s为 %s 输入口令 (用户 %s)"
@@ -121,34 +121,6 @@ msgstr "创建新联系人组"
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:483
-msgid "Failed to connect to LDAP server"
-msgstr "连接 LDAP 服务器失败"
-
-#: addressbook/gui/component/addressbook-config.c:507
-msgid "Failed to authenticate with LDAP server"
-msgstr "LDAP 服务器认证失败"
-
-#: addressbook/gui/component/addressbook-config.c:535
-msgid "Could not perform query on Root DSE"
-msgstr "无法在根 DSE 上执行查询"
-
-#: addressbook/gui/component/addressbook-config.c:840
-msgid "The server responded with no supported search bases"
-msgstr "服务器响应为没有支持的搜索起点"
-
-#: addressbook/gui/component/addressbook-config.c:1245
-msgid "This server does not support LDAPv3 schema information"
-msgstr "此服务器不支持 LDAPv3 schema 信息"
-
-#: addressbook/gui/component/addressbook-config.c:1266
-msgid "Error retrieving schema information"
-msgstr "检索 schema 信息错误"
-
-#: addressbook/gui/component/addressbook-config.c:1274
-msgid "Server did not respond with valid schema information"
-msgstr "服务器没有响应有效的 schema 信息"
-
 #: addressbook/gui/component/addressbook-migrate.c:68
 #: calendar/gui/migration.c:137 mail/em-migrate.c:1160
 msgid "Migrating..."
@@ -161,20 +133,16 @@ msgid "Migrating `%s':"
 msgstr "升迁“%s”："
 
 #. create the local source group
-#. On This Computer is always first and VFolders is always last
-#: addressbook/gui/component/addressbook-migrate.c:508
+#: addressbook/gui/component/addressbook-migrate.c:464
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
 #: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
-#: mail/mail-component.c:247 mail/mail-vfolder.c:218
+#: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr "在此计算机中"
 
 #. Create the default Person addressbook
-#. Create the default Person calendar
-#. Create the default Person task list
-#. orange
-#: addressbook/gui/component/addressbook-migrate.c:516
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
 #: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
 #: mail/mail-config.glade.h:109
@@ -182,19 +150,19 @@ msgid "Personal"
 msgstr "个人"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:524
+#: addressbook/gui/component/addressbook-migrate.c:480
 msgid "On LDAP Servers"
 msgstr "在 LDAP 服务器上"
 
-#: addressbook/gui/component/addressbook-migrate.c:652
+#: addressbook/gui/component/addressbook-migrate.c:608
 msgid "LDAP Servers"
 msgstr "LDAP 服务器"
 
-#: addressbook/gui/component/addressbook-migrate.c:772
+#: addressbook/gui/component/addressbook-migrate.c:728
 msgid "Autocompletion Settings"
 msgstr "自动完成设置"
 
-#: addressbook/gui/component/addressbook-migrate.c:1148
+#: addressbook/gui/component/addressbook-migrate.c:1104
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -205,7 +173,7 @@ msgstr ""
 "\n"
 "请稍候，Evolution 正在升迁您的文件夹..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1162
+#: addressbook/gui/component/addressbook-migrate.c:1118
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -215,7 +183,7 @@ msgstr ""
 "\n"
 "请稍候，Evolution 正在升迁您的文件夹..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1171
+#: addressbook/gui/component/addressbook-migrate.c:1127
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -225,7 +193,7 @@ msgstr ""
 "\n"
 "请稍候，Evolution 正在升迁您的文件夹..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1181
+#: addressbook/gui/component/addressbook-migrate.c:1137
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -235,45 +203,33 @@ msgstr ""
 "\n"
 "请稍候，Evolution 正在升迁您的 Pilot 同步数据..."
 
-#: addressbook/gui/component/addressbook-migrate.c:1194
-msgid ""
-"Some fields are no longer representable in the contact editor. Please wait "
-"while Evolution copies those fields to the 'Notes' field..."
-msgstr ""
-
-#: addressbook/gui/component/addressbook-view.c:674
+#: addressbook/gui/component/addressbook-view.c:675
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr "即将删除日历“%s”。您确定想要继续吗？"
 
-#: addressbook/gui/component/addressbook-view.c:761
+#: addressbook/gui/component/addressbook-view.c:754
 msgid "New Address Book"
 msgstr "新地址簿"
 
-#: addressbook/gui/component/addressbook-view.c:762
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
+#: addressbook/gui/component/addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "删除"
 
-#: addressbook/gui/component/addressbook-view.c:763
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-view.c:756
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "属性..."
 
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
 #. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:1002
+#: addressbook/gui/component/addressbook-view.c:995
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
 #: calendar/gui/migration.c:373
 msgid "Contacts"
 msgstr "联系人"
@@ -349,10 +305,6 @@ msgid "Manage your S/MIME certificates here"
 msgstr "在此管理您的 S/MIME 证书"
 
 #: addressbook/gui/component/ldap-config.glade.h:1
-msgid "  S_how Supported Bases "
-msgstr " 显示支持的基础(_H) "
-
-#: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -374,249 +326,209 @@ msgstr " 显示支持的基础(_H) "
 msgid "*"
 msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr "1"
 
-#: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1:00"
-msgstr "1:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr "5"
 
-#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
-msgstr "5:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "<b>Authentication</b>"
 msgstr "<b>身份验证</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Display</b>"
 msgstr "<b>显示</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "<b>Downloading</b>"
 msgstr "<b>下载</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "<b>Searching</b>"
 msgstr "<b>搜索</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:11
 msgid "<b>Server Information</b>"
 msgstr "<b>服务器信息</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:12
 msgid "<b>Type:</b>"
 msgstr "<b>类型：</b>"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:13
 msgid "Add Contacts Group"
 msgstr "添加联系人组"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Address Book Properties"
 msgstr "地址簿属性"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:42
 msgid "Always"
 msgstr "总是"
 
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr "匿名"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:17
 #: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "基本"
 
-#: addressbook/gui/component/ldap-config.glade.h:21
-msgid "Connecting"
-msgstr "连接"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 #: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "细节"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
-msgid "Distinguished _name:"
-msgstr "识别性名称(_N)："
-
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Distinguished name"
 msgstr "识别性名称"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid "Download limit:"
 msgstr "下载上限："
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:21
 msgid "Email address"
 msgstr "电子邮件地址"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
-msgid "Email address:"
-msgstr "电子邮件地址："
-
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "Evolution will use this DN to authenticate you with the server"
-msgstr "Evolution 将使用此已识别的名字在服务器上对您进行认证"
-
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:22
+#, fuzzy
 msgid ""
-"Evolution will use this email address to authenticate you with the server"
+"Evolution will use this email address to authenticate you with the server."
 msgstr "Evolution 将使用此电子邮件地址在服务器上对您进行认证"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Find Possible Search Bases"
 msgstr "查找可能的搜索基础"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:24
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "常规"
 
-#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
+#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:102
 msgid "Never"
 msgstr "从不"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
-msgid "One"
-msgstr "一级"
-
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:35
-msgid "S_earch scope: "
-msgstr "搜索范围(_E)："
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Search _base:"
+msgstr "搜索基础："
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:28
 msgid "Search base only"
 msgstr "只搜索基础"
 
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid "Search base:"
 msgstr "搜索基础："
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid "Search scope:"
 msgstr "搜索范围："
 
-#: addressbook/gui/component/ldap-config.glade.h:39
-msgid "Searching"
-msgstr "搜索"
-
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:31
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
-"server if\n"
-"your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL or TLS."
 msgstr ""
 "选中此选项意味着 Evolution 只在您的 LDAP 服务器支持\n"
 "SSL 或 TLS 时才连接到您的 LDAP 服务器。"
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a \n"
-"insecure environment. For example, if you and your LDAP server are behind a "
-"firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection "
-"is already\n"
-"secure."
+"you are in a insecure environment. For example, if you and your LDAP server "
+"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
+"because your connection is already secure."
 msgstr ""
 "选择此选项意味着 Evolution 将只会试图在非安全的环境中使用 SSL/TLS。\n"
 "例如，如果您和您的 LDAP 服务器工作时位于防火墙后，Evolution 就没有必\n"
 "要使用 SSL/TLS，因为您的连接已经相当安全了。"
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:33
+#, fuzzy
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
-"TLS.  This \n"
-"means that your connection will be insecure, and that you will be vulnerable "
-"to security\n"
-"exploits. "
+"TLS.  This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits. "
 msgstr ""
 "选择此选项意味着您的服务器既不支持 SSL 也不支持 TLS。可能导致的结果将是\n"
 "您的连接不太安全，您也易于受到安全漏洞的攻击。"
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Sub"
-msgstr "子级"
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr "支持的搜索起点"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
-"searches will \n"
-"begin. If you leave this blank, the search will begin at the root of the "
-"directory tree."
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
 msgstr ""
 "搜索基础是您搜索开始项的可识别名称(DN)。如果您将此处留空，搜索将从目\n"
 "录树的根开始。"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:37
+#, fuzzy
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
-"the \n"
-"directory tree. A search scope of \"sub\" will include all entries below "
-"your search base.\n"
-"A search scope of \"one\" will only include the entries one level beneath "
-"your base.\n"
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
 msgstr ""
 "搜索范围定义了您想要在目录树中搜索多深。搜索范围若为“子级”，则将包含您\n"
 "指定的搜索基础下所属的全部项。搜索范围若为“一级”，则只会包含您指定的搜\n"
 "索基础之下一级的项目。\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:58
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "这是您的 LDAP 服务器的完整名字。例如，“ldap.mycompany.com”。"
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:39
 #, fuzzy
 msgid ""
-"This is the maximum number of entries to download. Setting this number to "
-"be \n"
+"This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr ""
 "这是可下载条目的最大数量。将此数值设定\n"
 "得太大将导致地址簿变慢。"
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -625,133 +537,112 @@ msgstr ""
 "这是 evolution 用来认证您的方法。请注意若在此设定为“电子邮件地址”则需要您具有"
 "对 ldap 服务器的匿名访问权限。"
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:41
+#, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
-"list.\n"
-"It is for display purposes only. "
+"list. It is for display purposes only. "
 msgstr ""
 "这是此服务器在 Evolution 文件夹列表中显示的名称。\n"
 "它只用于显示。"
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:42
+#, fuzzy
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. "
-"A \n"
-"list of standard ports has been provided. Ask your system administrator\n"
-"what port you should specify."
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
 msgstr ""
 "这是 LDAP 服务器上的端口，Evolution 将试图连接到您所给出的标准端口列表。\n"
 "如果您不清楚要指定端口，请询问您的系统管理员。"
 
-#: addressbook/gui/component/ldap-config.glade.h:67
-msgid "This option controls how long a search will be run."
-msgstr "此选项控制搜索将运行多长时间。"
-
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid "Timeout:"
 msgstr "超时："
 
-#: addressbook/gui/component/ldap-config.glade.h:69
-msgid "U_se SSL/TLS:"
-msgstr "使用 _SSL/TLS："
-
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr "使用已识别的姓名 (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr "使用电子邮件地址"
 
-#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
+#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr "可能时"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:47
 msgid "_Add Contacts Group"
 msgstr "添加联系人组(_A)"
 
-#: addressbook/gui/component/ldap-config.glade.h:74
-#: calendar/gui/dialogs/calendar-setup.glade.h:12
-msgid "_Display name:"
-msgstr "显示名称(_D)："
-
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr "下载上限(_D)："
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Email address:"
 msgstr "电子邮件地址(_E)："
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:50
+#, fuzzy
+msgid "_Find Possible Search Bases"
+msgstr "查找可能的搜索基础"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Log in method:"
 msgstr "登录方式(_L)："
 
-#: addressbook/gui/component/ldap-config.glade.h:78
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:171
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "_Log in:"
+msgstr "登录"
+
+#: addressbook/gui/component/ldap-config.glade.h:53
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
 msgid "_Name:"
 msgstr "名称(_N)："
 
-#: addressbook/gui/component/ldap-config.glade.h:79
-msgid "_Port number:"
-msgstr "端口号(_P)："
-
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid "_Port:"
 msgstr "端口(_P)："
 
-#: addressbook/gui/component/ldap-config.glade.h:81
-msgid "_Search base:"
-msgstr "搜索起点(_S)："
-
-#: addressbook/gui/component/ldap-config.glade.h:82
-msgid "_Server name:"
-msgstr "服务器名(_S)："
+#: addressbook/gui/component/ldap-config.glade.h:55
+#, fuzzy
+msgid "_Search scope:"
+msgstr "搜索范围："
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:56
 msgid "_Server:"
 msgstr "服务器(_S)："
 
-#: addressbook/gui/component/ldap-config.glade.h:84
-msgid "_Timeout (minutes):"
-msgstr "超时(分钟)(_T)："
+#: addressbook/gui/component/ldap-config.glade.h:57
+#, fuzzy
+msgid "_Timeout:"
+msgstr "超时："
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:58
 msgid "_Use secure connection:"
 msgstr "使用安全连接(_U)："
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "卡片"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
-msgid "connecting-tab"
-msgstr "连接页"
-
-#: addressbook/gui/component/ldap-config.glade.h:88
-msgid "general-tab"
-msgstr "常规页"
-
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:60
 #: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
 #: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "分钟"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
-msgid "searching-tab"
-msgstr "搜索页"
-
-#: addressbook/gui/component/select-names/e-select-names.c:497
+#: addressbook/gui/component/select-names/e-select-names.c:503
 #: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid "Select Contacts from Address Book"
 msgstr "从地址簿中选择联系人"
 
-#: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
@@ -791,7 +682,7 @@ msgstr "未命名的联系人"
 
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:222
+#: addressbook/gui/widgets/e-addressbook-view.c:224
 msgid "Source"
 msgstr "来源"
 
@@ -856,9 +747,9 @@ msgid "<b>Work</b>"
 msgstr "<b>工作</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:177
-#: addressbook/gui/widgets/eab-contact-display.c:342
-#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/widgets/eab-contact-display.c:334
+#: addressbook/gui/widgets/eab-contact-display.c:353
 msgid "AIM"
 msgstr "AIM"
 
@@ -892,15 +783,15 @@ msgid "Company:"
 msgstr "公司："
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:265
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
+#: addressbook/gui/contact-editor/e-contact-editor.c:266
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
 msgstr "联系人"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:519
+#: addressbook/gui/contact-editor/e-contact-editor.c:520
 msgid "Contact Editor"
 msgstr "联系人编辑器"
 
@@ -921,83 +812,81 @@ msgid "Full _Name..."
 msgstr "全名(_N)..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-msgid "Home"
-msgstr "家庭"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "Home Page:"
 msgstr "主页："
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-#: calendar/gui/e-itip-control.c:930
-msgid "Location:"
-msgstr "位置："
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "Mailing Address"
 msgstr "邮政地址"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "Manager:"
 msgstr "经理："
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "Ni_ckname:"
 msgstr "昵称(_C)："
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "Notes:"
 msgstr "注释："
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-msgid "Other"
-msgstr "其它"
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#, fuzzy
+msgid "Office:"
+msgstr "办公室"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "PO Box:"
 msgstr "邮政邮箱："
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "Personal Information"
 msgstr "个人信息"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "Profession:"
 msgstr "职业："
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#, fuzzy
+msgid "Spouse:"
+msgstr "配偶"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "State/Province:"
 msgstr "州/省："
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "Title:"
 msgstr "头衔:"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+msgid "Video Chat:"
+msgstr ""
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "Wants to receive HTML mail"
 msgstr "愿意接收 HTML 邮件"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:42
-msgid "Webcam:"
-msgstr "摄像头："
+#, fuzzy
+msgid "Web Log:"
+msgstr "网页："
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
+#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
 #: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
 #: mail/mail-config.glade.h:157
@@ -1017,17 +906,10 @@ msgid "_File under:"
 msgstr "存档于(_F)："
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "_Where:"
 msgstr "何处(_W)："
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
-msgid "item7"
-msgstr "项目 7"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
-msgid "item8"
-msgstr "项目 8"
-
 #: addressbook/gui/contact-editor/eab-editor.c:315
 msgid ""
 "Are you sure you want\n"
@@ -1041,16 +923,16 @@ msgid ""
 msgstr "您确定要删除此联系人吗？"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:351
-#: addressbook/gui/widgets/eab-contact-display.c:372
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Address"
 msgstr "地址"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:286
+#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard.c:174
@@ -2028,98 +1910,109 @@ msgstr "赞比亚"
 msgid "Zimbabwe"
 msgstr "津巴布韦"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/contact-editor/e-contact-editor.c:179
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:337
+#: addressbook/gui/widgets/eab-contact-display.c:356
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
-#: addressbook/gui/widgets/eab-contact-display.c:347
-#: addressbook/gui/widgets/eab-contact-display.c:366
+#: addressbook/gui/contact-editor/e-contact-editor.c:180
+#: addressbook/gui/widgets/eab-contact-display.c:339
+#: addressbook/gui/widgets/eab-contact-display.c:358
 msgid "Yahoo"
 msgstr "雅虎"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: addressbook/gui/widgets/eab-contact-display.c:338
+#: addressbook/gui/widgets/eab-contact-display.c:357
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:344
-#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#: addressbook/gui/widgets/eab-contact-display.c:355
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
+#: addressbook/gui/contact-editor/e-contact-editor.c:183
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:251
+#: addressbook/gui/contact-editor/e-contact-editor.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+msgid "Home"
+msgstr "家庭"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+msgid "Other"
+msgstr "其它"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
 msgid "Source Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:258
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:272
+#: addressbook/gui/contact-editor/e-contact-editor.c:273
 msgid "Is New Contact"
 msgstr "为新联系人"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:279
+#: addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Writable Fields"
 msgstr "可写域"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:293
+#: addressbook/gui/contact-editor/e-contact-editor.c:294
 msgid "Changed"
 msgstr "已更改"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2294
-msgid "Category editor not available."
-msgstr "类别编辑器不可用。"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2302
+#: addressbook/gui/contact-editor/e-contact-editor.c:2352
 msgid "This contact belongs to these categories:"
 msgstr "此联系人属于这些类别："
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2379
+#: addressbook/gui/contact-editor/e-contact-editor.c:2429
 msgid "Please select an image for this contact"
 msgstr "请选择此联系人的图像"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2383
+#: addressbook/gui/contact-editor/e-contact-editor.c:2433
 msgid "No image"
 msgstr "无图像"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2560
-#: addressbook/gui/contact-editor/e-contact-editor.c:2723
-msgid ""
-"You are moving the contact from one address book to another, but it cannot "
-"be removed from the source. Do you want to save a copy instead?"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2607
+#: addressbook/gui/contact-editor/e-contact-editor.c:2636
 msgid ""
 "The contact data is invalid:\n"
 "\n"
-msgstr "联系人数据无效：\n\n"
+msgstr ""
+"联系人数据无效：\n"
+"\n"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#, fuzzy
+msgid "Invalid contact."
+msgstr "%d 个联系人"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2700
+#: addressbook/gui/contact-editor/e-contact-editor.c:2723
 msgid ""
 "The contact cannot be saved to the selected address book. Do you want to "
 "discard changes?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2704
-#: addressbook/gui/contact-editor/e-contact-editor.c:2728
-#: addressbook/gui/widgets/eab-gui-util.c:208
+#: addressbook/gui/contact-editor/e-contact-editor.c:2727
+#: addressbook/gui/contact-editor/e-contact-editor.c:2751
 msgid "_Discard"
 msgstr "丢弃(_D)"
 
+#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+msgid ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:62
 msgid "AOL Instant Messenger"
 msgstr "AOL 即时通讯程序"
@@ -2296,30 +2189,30 @@ msgstr "列出姓名(_L)："
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "输入电子邮件地址或者把联系人拖放到下面的列表(_T)："
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "contact-list-editor"
 msgstr "联系人列表编辑器"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:153
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:215
+#: addressbook/gui/widgets/e-addressbook-view.c:217
 #: addressbook/gui/widgets/e-minicard-view.c:460
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "名簿"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
 msgid "Is New List"
 msgstr "为新列表"
 
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:215
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
 msgid "Contact List Editor"
 msgstr "联系人列表编辑器"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:438
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
 msgid "Save List as VCard"
 msgstr "将列表保存为 VCard"
 
@@ -2366,144 +2259,144 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "高级搜索"
 
-#: addressbook/gui/widgets/eab-contact-display.c:129
-#: addressbook/gui/widgets/eab-contact-display.c:192
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
 msgid "(map)"
 msgstr "(地图)"
 
-#: addressbook/gui/widgets/eab-contact-display.c:139
-#: addressbook/gui/widgets/eab-contact-display.c:205
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
 msgid "map"
 msgstr "地图"
 
-#: addressbook/gui/widgets/eab-contact-display.c:257
-#: addressbook/gui/widgets/eab-contact-display.c:533
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:525
 msgid "List Members"
 msgstr "列出成员"
 
-#: addressbook/gui/widgets/eab-contact-display.c:329
-#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/eab-contact-display.c:321
+#: addressbook/gui/widgets/eab-contact-display.c:323
 msgid "E-mail"
 msgstr "电子邮件"
 
-#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/eab-contact-display.c:332
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "组织"
 
-#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "Position"
 msgstr "位置"
 
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:354
 msgid "Groupwise"
 msgstr "Groupwise"
 
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:340
 msgid "Video Conferencing"
 msgstr "视频会议"
 
-#: addressbook/gui/widgets/eab-contact-display.c:349
-#: addressbook/gui/widgets/eab-contact-display.c:370
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Phone"
 msgstr "电话"
 
-#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:342
 msgid "Fax"
 msgstr "传真"
 
-#: addressbook/gui/widgets/eab-contact-display.c:354
+#: addressbook/gui/widgets/eab-contact-display.c:346
 msgid "work"
 msgstr "工作"
 
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:359
 msgid "WWW"
 msgstr "WWW"
 
-#: addressbook/gui/widgets/eab-contact-display.c:368
-#: addressbook/gui/widgets/eab-contact-display.c:587
+#: addressbook/gui/widgets/eab-contact-display.c:360
+#: addressbook/gui/widgets/eab-contact-display.c:579
 msgid "Blog"
 msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/eab-contact-display.c:363
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "移动电话"
 
-#: addressbook/gui/widgets/eab-contact-display.c:375
+#: addressbook/gui/widgets/eab-contact-display.c:367
 msgid "personal"
 msgstr "个人"
 
-#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/eab-contact-display.c:374
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "注释"
 
-#: addressbook/gui/widgets/eab-contact-display.c:548
+#: addressbook/gui/widgets/eab-contact-display.c:540
 msgid "Job Title"
 msgstr "职称"
 
-#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/eab-contact-display.c:544
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:774
+#: smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "电子邮件"
 
-#: addressbook/gui/widgets/eab-contact-display.c:579
+#: addressbook/gui/widgets/eab-contact-display.c:571
 msgid "Home page"
 msgstr "主页"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 msgid "Success"
 msgstr "成功"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Backend busy"
 msgstr "后台忙"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Repository offline"
 msgstr "仓库脱机"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Address Book does not exist"
 msgstr "地址簿不存在"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "No Self Contact defined"
 msgstr "未定义自身联系人"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Permission denied"
 msgstr "没有权限"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Contact not found"
 msgstr "找不到联系人"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Contact ID already exists"
 msgstr "联系人 ID 已经存在"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Protocol not supported"
 msgstr "不支持的协议"
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:60
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:233
 #: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
@@ -2516,43 +2409,43 @@ msgid "Cancelled"
 msgstr "已经取消"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Could not cancel"
 msgstr "无法取消"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Authentication Failed"
 msgstr "认证失败"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Authentication Required"
 msgstr "必须认证"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:66
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "TLS not Available"
 msgstr "TLS 不可用"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#: addressbook/gui/widgets/eab-gui-util.c:66
 msgid "No such source"
 msgstr "没有来源"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:69
+#: addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Other error"
 msgstr "其它错误"
 
-#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:90
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
 msgstr "我们无法打开此地址簿。请检查路径是否存在以及您是否有足够的权限访问它。"
 
-#: addressbook/gui/widgets/eab-gui-util.c:110
+#: addressbook/gui/widgets/eab-gui-util.c:97
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -2560,16 +2453,17 @@ msgstr ""
 "我们无法打开此地址簿。这可能是由于您输入了错误的 URI，也可能是因为LDAP 服务器"
 "已经关闭。"
 
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:102
+#, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution you must compile the program from the CVS "
-"sources after retrieving OpenLDAP from the link below."
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
 msgstr ""
 "本版本的 Evolution 并没有把 LDAP 支持编译进去。如果您希望在 Evolution 中使用 "
 "LDAP，就必须先从以下链接获取 OpenLDAP，然后从程序的 CVS 源代码重新编译程序。"
 
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:109
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -2577,11 +2471,7 @@ msgstr ""
 "我们无法打开此地址簿。这可能是由于您输入了错误的 URI，也可能是因为服务器已经"
 "关闭。"
 
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "Unable to open addressbook"
-msgstr "无法打开地址簿"
-
-#: addressbook/gui/widgets/eab-gui-util.c:162
+#: addressbook/gui/widgets/eab-gui-util.c:129
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2592,7 +2482,7 @@ msgstr ""
 "Evolution 配置要显示的数目。请在搜索的时候指定更加严格的\n"
 "搜索条件，或者在此地址簿的目录服务器参数中将结果限制调高。"
 
-#: addressbook/gui/widgets/eab-gui-util.c:168
+#: addressbook/gui/widgets/eab-gui-util.c:135
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -2603,49 +2493,45 @@ msgstr ""
 "请在搜索的时候指定更加严格的搜索条件，或者在此地址簿的目录服务器参数\n"
 "中将时间限制调高。"
 
-#: addressbook/gui/widgets/eab-gui-util.c:174
+#: addressbook/gui/widgets/eab-gui-util.c:141
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "此地址簿的后端无法解析此查询。"
 
-#: addressbook/gui/widgets/eab-gui-util.c:177
+#: addressbook/gui/widgets/eab-gui-util.c:144
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "此地址簿的后端拒绝执行此查询。"
 
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:147
 msgid "This query did not complete successfully."
 msgstr "此查询未成功完成。"
 
-#: addressbook/gui/widgets/eab-gui-util.c:206
-msgid "Do you want to save changes?"
-msgstr "您希望保存修改吗？"
-
-#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:169
 msgid "Error adding list"
 msgstr "添加列表出错"
 
-#: addressbook/gui/widgets/eab-gui-util.c:229
-#: addressbook/gui/widgets/eab-gui-util.c:652
+#: addressbook/gui/widgets/eab-gui-util.c:169
+#: addressbook/gui/widgets/eab-gui-util.c:580
 msgid "Error adding contact"
 msgstr "添加联系人出错"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying list"
 msgstr "修改列表出错"
 
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying contact"
 msgstr "修改联系人出错"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:192
 msgid "Error removing list"
 msgstr "删除列表出错"
 
-#: addressbook/gui/widgets/eab-gui-util.c:252
-#: addressbook/gui/widgets/eab-gui-util.c:610
+#: addressbook/gui/widgets/eab-gui-util.c:192
+#: addressbook/gui/widgets/eab-gui-util.c:538
 msgid "Error removing contact"
 msgstr "删除联系人出错"
 
-#: addressbook/gui/widgets/eab-gui-util.c:334
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2654,7 +2540,7 @@ msgstr ""
 "打开 %d 个联系人将同时打开 %d 个新窗口。\n"
 "您真的想要显示所有联系人吗？"
 
-#: addressbook/gui/widgets/eab-gui-util.c:360
+#: addressbook/gui/widgets/eab-gui-util.c:300
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2663,49 +2549,44 @@ msgstr ""
 "%s 已经存在\n"
 "您打算覆盖它吗？"
 
-#: addressbook/gui/widgets/eab-gui-util.c:364
+#: addressbook/gui/widgets/eab-gui-util.c:304
 msgid "Overwrite"
 msgstr "覆盖"
 
-#: addressbook/gui/widgets/eab-gui-util.c:400
-#, c-format
-msgid "Error saving %s: %s"
-msgstr "保存 %s 出错：%s"
-
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:437
+#: addressbook/gui/widgets/eab-gui-util.c:365
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:571
+#: addressbook/gui/widgets/eab-gui-util.c:499
 msgid "list"
 msgstr "列表"
 
-#: addressbook/gui/widgets/eab-gui-util.c:706
+#: addressbook/gui/widgets/eab-gui-util.c:634
 msgid "Move contact to"
 msgstr "将联系人移动到"
 
-#: addressbook/gui/widgets/eab-gui-util.c:708
+#: addressbook/gui/widgets/eab-gui-util.c:636
 msgid "Copy contact to"
 msgstr "将联系人复制到"
 
-#: addressbook/gui/widgets/eab-gui-util.c:711
+#: addressbook/gui/widgets/eab-gui-util.c:639
 msgid "Move contacts to"
 msgstr "将联系人移动到"
 
-#: addressbook/gui/widgets/eab-gui-util.c:713
+#: addressbook/gui/widgets/eab-gui-util.c:641
 msgid "Copy contacts to"
 msgstr "将联系人复制到"
 
-#: addressbook/gui/widgets/eab-gui-util.c:716
+#: addressbook/gui/widgets/eab-gui-util.c:644
 msgid "Select target addressbook."
 msgstr "从地址簿中选择目标联系人。"
 
-#: addressbook/gui/widgets/eab-gui-util.c:939
+#: addressbook/gui/widgets/eab-gui-util.c:867
 msgid "Multiple VCards"
 msgstr "多个 VCard"
 
-#: addressbook/gui/widgets/eab-gui-util.c:942
+#: addressbook/gui/widgets/eab-gui-util.c:870
 #, c-format
 msgid "VCard for %s"
 msgstr "%s 的 VCard"
@@ -2790,7 +2671,7 @@ msgstr[0] "%d 个联系人"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:229
+#: addressbook/gui/widgets/e-addressbook-view.c:231
 #: addressbook/gui/widgets/e-minicard-view.c:467
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
@@ -2808,140 +2689,130 @@ msgstr "模型"
 msgid "Error modifying card"
 msgstr "修改卡片错误"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:163
 msgid "Name begins with"
 msgstr "姓名以此开头"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:164
 msgid "Email begins with"
 msgstr "邮件以此开头"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:57
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "类别为"
 
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-#: calendar/gui/cal-search-bar.c:50
+#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "任何域含有"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+#: addressbook/gui/widgets/e-addressbook-view.c:172
 msgid "Advanced..."
 msgstr "高级..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:236
+#: addressbook/gui/widgets/e-addressbook-view.c:238
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:250
+#: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "类型"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:506
+#: addressbook/gui/widgets/e-addressbook-view.c:508
 msgid "Address Book"
 msgstr "地址簿"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
+#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
 #: addressbook/gui/widgets/e-addressbook-view.c:2080
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard..."
 msgstr "另存为 VCard..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 msgid "New Contact..."
 msgstr "新建联系人..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "New Contact List..."
 msgstr "新建联系人列表..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Go to Folder..."
 msgstr "转到文件夹..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Import..."
 msgstr "导入..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1066
 msgid "Search for Contacts..."
 msgstr "搜索联系人..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 msgid "Address Book Sources..."
 msgstr "地址簿来源..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1069
 msgid "Pilot Settings..."
 msgstr "Pilot 设置..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "转发联系人"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
 msgid "Send Message to Contact"
 msgstr "给联系人发邮件"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "打印"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
+#: addressbook/gui/widgets/e-addressbook-view.c:1077
 msgid "Print Envelope"
 msgstr "打印信封"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
+#: addressbook/gui/widgets/e-addressbook-view.c:1081
 msgid "Copy to Address Book..."
 msgstr "复制到地址簿..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1080
+#: addressbook/gui/widgets/e-addressbook-view.c:1082
 msgid "Move to Address Book..."
 msgstr "移动到地址簿..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "剪切"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "复制"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1087
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "粘贴"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:1092
+#: calendar/gui/e-calendar-view.c:1280
 msgid "Current View"
 msgstr "当前视图"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1309
-#, c-format
-msgid ""
-"The addressbook backend for\n"
-"%s\n"
-"has crashed. You will have to restart Evolution in order to use it again"
-msgstr ""
-"%s\n"
-"的地址簿后端已经崩溃。您需要重新启动 Evolution 才能再次使用该后端"
-
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1667
-#: calendar/gui/cal-search-bar.c:362
+#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "任何类别"
 
@@ -3047,7 +2918,7 @@ msgstr "收音机"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:257
+#: calendar/gui/e-meeting-list-view.c:234
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "角色"
@@ -3155,17 +3026,17 @@ msgstr "卡片视图"
 msgid "GTK Tree View"
 msgstr "GTK 树视图"
 
-#: addressbook/gui/widgets/test-reflow.c:119
+#: addressbook/gui/widgets/test-reflow.c:106
 msgid "Reflow Test"
 msgstr ""
 
-#: addressbook/gui/widgets/test-reflow.c:120
+#: addressbook/gui/widgets/test-reflow.c:107
 #: addressbook/printing/test-contact-print-style-editor.c:54
 #: addressbook/printing/test-print.c:53
 msgid "Copyright (C) 2000, Ximian, Inc."
 msgstr "版权 (C) 2000, Ximian, Inc."
 
-#: addressbook/gui/widgets/test-reflow.c:122
+#: addressbook/gui/widgets/test-reflow.c:109
 msgid "This should test the reflow canvas item"
 msgstr ""
 
@@ -3441,15 +3312,21 @@ msgstr ""
 msgid "Impossible internal error."
 msgstr "不可能的内部错误。"
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:629
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
 msgid "Can not open file"
 msgstr "无法打开文件"
 
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-msgid "Can not load URI"
-msgstr "无法装入 URI"
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "无法装入地址簿"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "无法打开地址簿"
 
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
@@ -3467,7 +3344,7 @@ msgstr "没有提供文件名。"
 msgid "Unnamed List"
 msgstr "未命名的列表"
 
-#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "输入密码"
@@ -3741,10 +3618,10 @@ msgid "Whether to show week numbers in date navigator"
 msgstr "在日期浏览器中显示周数(_N)"
 
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:88
-#: calendar/gui/gnome-cal.c:1703
-#: camel/providers/groupwise/camel-gw-listener.c:304
-#: camel/providers/groupwise/camel-gw-listener.c:327
+#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/gnome-cal.c:1705
+#: camel/providers/groupwise/camel-gw-listener.c:311
+#: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
 msgstr "日历"
 
@@ -3766,7 +3643,7 @@ msgstr "返回小于"
 
 #: calendar/gui/calendar-commands.c:363
 #: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:19 filter/filter.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
 msgid "days"
 msgstr "天数"
 
@@ -3776,10 +3653,6 @@ msgstr "%Y年%m月%d日%A"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. %d = day of month, %b = abbreviated month name.
-#. You can change the order but don't change the
-#. specifiers or add anything.
 #: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
 #: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
 #: calendar/gui/e-week-view-main-item.c:329
@@ -3914,23 +3787,23 @@ msgstr "周视图"
 msgid "Month View"
 msgstr "月视图"
 
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "概要含有"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "描述含有"
 
-#: calendar/gui/cal-search-bar.c:54
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "注释含有"
 
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:53
 msgid "Location contains"
 msgstr "位置含有"
 
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
 msgid "Unmatched"
 msgstr "无匹配"
 
@@ -3951,23 +3824,23 @@ msgstr "没有权限打开日历"
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/dialogs/alarm-options.c:466
+#: calendar/gui/dialogs/alarm-options.c:467
 msgid "Audio Alarm Options"
 msgstr "音频提醒选项"
 
-#: calendar/gui/dialogs/alarm-options.c:475
+#: calendar/gui/dialogs/alarm-options.c:476
 msgid "Message Alarm Options"
 msgstr "消息提醒选项"
 
-#: calendar/gui/dialogs/alarm-options.c:484
+#: calendar/gui/dialogs/alarm-options.c:485
 msgid "Email Alarm Options"
 msgstr "邮件提醒选项"
 
-#: calendar/gui/dialogs/alarm-options.c:493
+#: calendar/gui/dialogs/alarm-options.c:494
 msgid "Program Alarm Options"
 msgstr "程序提醒选项"
 
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:510
 msgid "Unknown Alarm Options"
 msgstr "未知提醒选项"
 
@@ -4003,7 +3876,7 @@ msgstr "发送给："
 msgid "With these arguments:"
 msgstr "使用这些参数："
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
 msgid "dialog1"
 msgstr "dialog1"
 
@@ -4012,7 +3885,7 @@ msgid "extra times every"
 msgstr "每个额外时间"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:20 filter/filter.glade.h:16
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr "小时"
 
@@ -4058,7 +3931,7 @@ msgstr "发送电子邮件"
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:921 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "概要："
 
@@ -4088,7 +3961,6 @@ msgid "hour(s)"
 msgstr "小时"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:21
 msgid "minute(s)"
 msgstr "分钟"
 
@@ -4096,26 +3968,26 @@ msgstr "分钟"
 msgid "start of appointment"
 msgstr "约会开始"
 
-#: calendar/gui/dialogs/calendar-setup.c:170
+#: calendar/gui/dialogs/calendar-setup.c:172
 msgid "You must specify a location to get the calendar from."
 msgstr "您必须获取日历的位置。"
 
-#: calendar/gui/dialogs/calendar-setup.c:178
+#: calendar/gui/dialogs/calendar-setup.c:180
 #, c-format
 msgid "The source location '%s' is not well-formed."
 msgstr "源位置“%s”不是规格的。"
 
-#: calendar/gui/dialogs/calendar-setup.c:193
+#: calendar/gui/dialogs/calendar-setup.c:195
 #, c-format
 msgid "The source location '%s' is not a webcal source."
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:265
+#: calendar/gui/dialogs/calendar-setup.c:275
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:278
+#: calendar/gui/dialogs/calendar-setup.c:288
 #, c-format
 msgid ""
 "The group '%s' is remote. You must specify a location to get the calendar "
@@ -4134,51 +4006,31 @@ msgstr "添加任务组"
 msgid "C_olor:"
 msgstr "颜色(_O)："
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "Calendar Properties"
-msgstr "日历属性"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:110
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
 msgid "Pick a color"
 msgstr "选取一种颜色"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:8
-msgid "Remote"
-msgstr "远程"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "Task List Properties"
-msgstr "任务列表属性"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
 msgid "_Add Calendar"
 msgstr "添加日历(_A)"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
 msgid "_Add Group"
 msgstr "添加组(_A)"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-msgid "_Refresh Interval:"
-msgstr "刷新间隔(_R)："
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
 msgid "_Refresh:"
 msgstr "刷新(_R)："
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-msgid "_Source URL:"
-msgstr "源 URI(_S)："
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
 msgid "_Type:"
 msgstr "类型(_T)："
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
 msgid "_URL:"
 msgstr "_URL："
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
 msgid "weeks"
 msgstr "周"
 
@@ -4290,7 +4142,7 @@ msgstr "忙/闲发布"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:557
+#: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "星期五"
 
@@ -4304,7 +4156,7 @@ msgstr "分钟"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:553
+#: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "星期一"
 
@@ -4314,7 +4166,7 @@ msgstr "周日(_U)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "星期六"
 
@@ -4328,7 +4180,7 @@ msgstr "在日期浏览器中显示周数(_N)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:552
+#: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "星期日"
 
@@ -4342,7 +4194,7 @@ msgstr "周四(_H)"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:556
+#: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "星期四"
 
@@ -4356,7 +4208,7 @@ msgstr "时间格式："
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:554
+#: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "星期二"
 
@@ -4366,7 +4218,7 @@ msgstr "一周开始(_E)："
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:555
+#: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "星期三"
 
@@ -4448,76 +4300,46 @@ msgstr "周三(_W)"
 msgid "before every appointment"
 msgstr "在每次约会前"
 
-#: calendar/gui/dialogs/cancel-comp.c:57
-msgid ""
-"The event being deleted is a meeting, would you like to send a cancellation "
-"notice?"
-msgstr "即将删除的事件是一个会议，您是否想要发送一条取消通告？"
-
-#: calendar/gui/dialogs/cancel-comp.c:60
-msgid "Are you sure you want to cancel and delete this meeting?"
-msgstr "您真的要取消并删除此会议吗？"
-
-#: calendar/gui/dialogs/cancel-comp.c:66
-msgid ""
-"The task being deleted is assigned, would you like to send a cancellation "
-"notice?"
-msgstr "即将删除的任务已被指派，您是否想要要发送一条取消通告？"
-
-#: calendar/gui/dialogs/cancel-comp.c:69
-msgid "Are you sure you want to cancel and delete this task?"
-msgstr "您真的要取消并删除此任务吗？"
-
-#: calendar/gui/dialogs/cancel-comp.c:75
-msgid ""
-"The journal entry being deleted is published, would you like to send a "
-"cancellation notice?"
-msgstr "即将删除的日历项已公布，您是否想要发送一条取消通告？"
-
-#: calendar/gui/dialogs/cancel-comp.c:78
-msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr "您真的想要取消并删除该日志条目吗？"
-
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "该事件已经被删除。"
 
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "该任务已经被删除。"
 
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:68
 msgid "This journal entry has been deleted."
 msgstr "该日志条目已经被删除。"
 
-#: calendar/gui/dialogs/changed-comp.c:75
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  您已经做了修改。放弃这些修改并关闭编辑器吗？"
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  您还没有进行修改，关闭编辑器吗？"
 
-#: calendar/gui/dialogs/changed-comp.c:82
+#: calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "该事件已经被更改。"
 
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "该任务已经被更改。"
 
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:92
 msgid "This journal entry has been changed."
 msgstr "该日志条目已经被更改。"
 
-#: calendar/gui/dialogs/changed-comp.c:99
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  您已经做出了修改。放弃这些修改并更新编辑器吗？"
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  您还没有进行修改，更新编辑器吗？"
@@ -4555,7 +4377,7 @@ msgid "No summary"
 msgstr "没有概要"
 
 #: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
 #: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "另存为..."
@@ -4607,96 +4429,51 @@ msgstr "无法打开目的"
 msgid "Destination is read only"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-comp.c:95
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "您真的想要删除约会“%s”吗？"
-
-#: calendar/gui/dialogs/delete-comp.c:98
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "您真的想要删除此无标题约会吗？"
-
-#: calendar/gui/dialogs/delete-comp.c:104
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "您真的想要删除任务“%s”吗？"
-
-#: calendar/gui/dialogs/delete-comp.c:107
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "您真的想要删除此无标题任务吗？"
-
-#: calendar/gui/dialogs/delete-comp.c:113
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "您真的想要删除日志条目“%s”吗？"
-
-#: calendar/gui/dialogs/delete-comp.c:116
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "您真的想要删除此无标题日志条目吗？"
-
-#: calendar/gui/dialogs/delete-comp.c:131
-#, c-format
-msgid "Are you sure you want to delete %d appointment?"
-msgid_plural "Are you sure you want to delete %d appointments?"
-msgstr[0] "您真的想要删除 %d 个约会吗？"
-
-#: calendar/gui/dialogs/delete-comp.c:138
-#, c-format
-msgid "Are you sure you want to delete %d task?"
-msgid_plural "Are you sure you want to delete %d tasks?"
-msgstr[0] "您真的想要删除 %d 个任务吗？"
-
-#: calendar/gui/dialogs/delete-comp.c:145
-#, c-format
-msgid "Are you sure you want to delete %d journal entry?"
-msgid_plural "Are you sure you want to delete %d journal entries?"
-msgstr[0] "您真的想要删除 %d 个日志条目吗？"
-
-#: calendar/gui/dialogs/delete-error.c:52
+#: calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr "无法删除事件，原因是 corbat 错误"
 
-#: calendar/gui/dialogs/delete-error.c:55
+#: calendar/gui/dialogs/delete-error.c:57
 msgid "The task could not be deleted due to a corba error"
 msgstr "无法删除任务，原因是 corbat 错误"
 
-#: calendar/gui/dialogs/delete-error.c:58
+#: calendar/gui/dialogs/delete-error.c:60
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr "无法删除日记条目，原因是 corbat 错误"
 
-#: calendar/gui/dialogs/delete-error.c:61
+#: calendar/gui/dialogs/delete-error.c:63
 msgid "The item could not be deleted due to a corba error"
 msgstr "无法删除项目，原因是 corbat 错误"
 
-#: calendar/gui/dialogs/delete-error.c:68
+#: calendar/gui/dialogs/delete-error.c:70
 msgid "The event could not be deleted because permission was denied"
 msgstr "无法删除事件，原因是权限被禁止"
 
-#: calendar/gui/dialogs/delete-error.c:71
+#: calendar/gui/dialogs/delete-error.c:73
 msgid "The task could not be deleted because permission was denied"
 msgstr "无法删除任务，原因是权限被禁止"
 
-#: calendar/gui/dialogs/delete-error.c:74
+#: calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr "无法删除日记条目，原因是权限被禁止"
 
-#: calendar/gui/dialogs/delete-error.c:77
+#: calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
 msgstr "无法删除项目，原因是权限被禁止"
 
-#: calendar/gui/dialogs/delete-error.c:84
+#: calendar/gui/dialogs/delete-error.c:86
 msgid "The event could not be deleted due to an error"
 msgstr "由于错误，无法删除事件"
 
-#: calendar/gui/dialogs/delete-error.c:87
+#: calendar/gui/dialogs/delete-error.c:89
 msgid "The task could not be deleted due to an error"
 msgstr "由于错误，无法删除任务"
 
-#: calendar/gui/dialogs/delete-error.c:90
+#: calendar/gui/dialogs/delete-error.c:92
 msgid "The journal entry could not be deleted due to an error"
 msgstr "由于错误，无法删除日记条目"
 
-#: calendar/gui/dialogs/delete-error.c:93
+#: calendar/gui/dialogs/delete-error.c:95
 msgid "The item could not be deleted due to an error"
 msgstr "由于错误，无法删除项目"
 
@@ -4828,17 +4605,12 @@ msgid "_Start time:"
 msgstr "开始时间(_S)："
 
 #. an empty string is the same as 'None'
-#. add a "None" option to the stores menu
-#. Put the "None" and "UTC" entries at the top of the combo's list.
-#. When "None" is selected we want the field to be cleared.
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
 #: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:3
+#: calendar/gui/dialogs/meeting-page.glade.h:4
 #: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
 #: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1559
-#: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:103
+#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
+#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
@@ -4864,8 +4636,8 @@ msgstr "授权于(_D)..."
 #. FIXME: need to disable for undeletable folders
 #: calendar/gui/dialogs/meeting-page.c:655
 #: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1310 calendar/gui/e-calendar-view.c:1342
-#: mail/em-folder-tree.c:2562 mail/em-folder-view.c:919
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
+#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -4873,7 +4645,7 @@ msgid "_Delete"
 msgstr "删除(_D)"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:241
+#: calendar/gui/e-meeting-list-view.c:218
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "出席者"
@@ -4909,16 +4681,15 @@ msgid "Member"
 msgstr "成员"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1048 calendar/gui/e-meeting-list-view.c:264
+#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:271
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
-#: mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-list-view.c:248
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "状态"
 
@@ -4926,20 +4697,20 @@ msgstr "状态"
 msgid "Add A_ttendee"
 msgstr "添加出席者(_T)"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "Add attendees from addressbook."
+msgstr "将发件人添加到地址簿(_B)"
+
+#: calendar/gui/dialogs/meeting-page.glade.h:5
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "组织者："
 
-#: calendar/gui/dialogs/meeting-page.glade.h:5
+#: calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "_Change Organizer"
 msgstr "改变组织者(_C)"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-#: calendar/gui/e-meeting-time-sel.c:417
-msgid "_Invite Others..."
-msgstr "邀请其他人(_I)..."
-
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
 msgstr "<b>日历选项</b>"
@@ -5086,7 +4857,7 @@ msgid "_No recurrence"
 msgstr "不再现(_N)"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:450
+#: composer/e-msg-composer-attachment-bar.c:453
 msgid "_Remove"
 msgstr "删除(_R)"
 
@@ -5118,52 +4889,18 @@ msgstr "周"
 msgid "year(s)"
 msgstr "年"
 
-#: calendar/gui/dialogs/save-comp.c:53
-msgid ""
-"This event has been changed, but has not been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"该事件已经被改变，但还没有保存。\n"
-"\n"
-"您希望保存改动吗？"
-
-#: calendar/gui/dialogs/save-comp.c:57
-msgid "_Discard Changes"
-msgstr "丢弃修改(_D)"
-
-#: calendar/gui/dialogs/save-comp.c:62
-msgid "Save Event"
-msgstr "保存事件"
-
-#: calendar/gui/dialogs/select-source-dialog.c:65
+#: calendar/gui/dialogs/select-source-dialog.c:69
 msgid "Select destination"
 msgstr "选择目的"
 
-#: calendar/gui/dialogs/select-source-dialog.c:86
+#: calendar/gui/dialogs/select-source-dialog.c:90
 msgid "_Destination"
 msgstr "目的(_D)"
 
-#: calendar/gui/dialogs/select-source-dialog.c:88
+#: calendar/gui/dialogs/select-source-dialog.c:92
 msgid "Task List"
 msgstr "任务列表"
 
-#: calendar/gui/dialogs/send-comp.c:57
-msgid "The meeting information has been created. Send it?"
-msgstr "会议信息已创建。发送此信息吗？"
-
-#: calendar/gui/dialogs/send-comp.c:60
-msgid "The meeting information has changed. Send an updated version?"
-msgstr "会议信息已经改变。发送更新版本吗？"
-
-#: calendar/gui/dialogs/send-comp.c:67
-msgid "The task assignment information has been created. Send it?"
-msgstr "任务分配信息已创建。发送此信息吗？"
-
-#: calendar/gui/dialogs/send-comp.c:71
-msgid "The task information has changed. Send an updated version?"
-msgstr "任务信息已经改变。发送更新版本？"
-
 #: calendar/gui/dialogs/task-details-page.c:406
 msgid "Completed date is wrong"
 msgstr "完成日期有错"
@@ -5261,7 +4998,7 @@ msgstr "机密(_F)"
 
 #: calendar/gui/dialogs/task-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:976 calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "描述："
@@ -5420,7 +5157,7 @@ msgstr "到期日期："
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:944
+#: calendar/gui/e-itip-control.c:943
 msgid "Status:"
 msgstr "状态："
 
@@ -5504,12 +5241,12 @@ msgstr "繁忙"
 msgid "Deleting selected objects"
 msgstr "删除选中的对象"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
 msgid "Updating objects"
 msgstr "更新对象"
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1370
+#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
 #: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "打开(_O)"
@@ -5519,15 +5256,15 @@ msgid "Open _Web Page"
 msgstr "打开网页(_W)"
 
 #: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1291 calendar/gui/e-calendar-view.c:1376
-#: mail/em-folder-view.c:896 mail/em-popup.c:690 mail/em-popup.c:806
+#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
+#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "另存为(_S)..."
 
 #: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1292
-#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
+#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
@@ -5535,15 +5272,15 @@ msgid "_Print..."
 msgstr "打印(_P)..."
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "剪切(_U)"
 
 #: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1338
-#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2555
+#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
+#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
 #: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
@@ -5551,8 +5288,8 @@ msgid "_Copy"
 msgstr "复制(_C)"
 
 #: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1273 calendar/gui/e-calendar-view.c:1299
-#: calendar/gui/e-calendar-view.c:1372 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
+#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
@@ -5618,67 +5355,67 @@ msgstr "概要"
 msgid "Task sort"
 msgstr "任务排序"
 
-#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
 msgid "New _Appointment..."
 msgstr "新建约会(_A)..."
 
-#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
+#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
 msgid "New All Day _Event"
 msgstr "新建全天事件(_E)"
 
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
+#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
 msgid "New Meeting"
 msgstr "新会议"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
 msgid "New Task"
 msgstr "新建任务"
 
-#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "选择今天(_T)"
 
-#: calendar/gui/e-calendar-view.c:1280
+#: calendar/gui/e-calendar-view.c:1283
 msgid "_Select Date..."
 msgstr "选择日期(_S)..."
 
-#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "发布忙闲信息(_P)"
 
-#: calendar/gui/e-calendar-view.c:1303
+#: calendar/gui/e-calendar-view.c:1306
 msgid "Cop_y to Calendar..."
 msgstr "复制到日历(_Y)..."
 
-#: calendar/gui/e-calendar-view.c:1304
+#: calendar/gui/e-calendar-view.c:1307
 msgid "Mo_ve to Calendar..."
 msgstr "移动到日历(_V)..."
 
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1308
 msgid "_Schedule Meeting..."
 msgstr "调度会议(_S)..."
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1309
 msgid "_Forward as iCalendar..."
 msgstr "作为 iCalendar 转发(_F)..."
 
-#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
 msgid "Delete this _Occurrence"
 msgstr "删除此次出现(_O)"
 
-#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
 msgid "Delete _All Occurrences"
 msgstr "删除所有出现(_A)"
 
-#: calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1349
 msgid "Go to _Today"
 msgstr "转到今天(_T)"
 
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1351
 msgid "_Go to Date..."
 msgstr "转到日期(_G)..."
 
-#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "设置(_S)..."
 
@@ -5692,9 +5429,9 @@ msgstr "开始日期"
 
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:961 calendar/gui/e-itip-control.c:1163
-#: calendar/gui/e-meeting-list-view.c:145
-#: calendar/gui/e-meeting-list-view.c:159 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
 #: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
 #: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
 #: camel/camel-tcp-stream-openssl.c:631
@@ -5720,13 +5457,13 @@ msgid "Assigned"
 msgstr "已委派"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr "是"
 
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:170 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "否"
 
@@ -5738,7 +5475,7 @@ msgstr "北"
 msgid "S"
 msgstr "南"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
 msgid "E"
 msgstr "东"
 
@@ -5757,20 +5494,12 @@ msgstr ""
 "45.436845,125.862501"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 24-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%Y年%m月%d日%A%H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#. strptime format of a weekday, a date and a time,
-#. in 12-hour format.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format.
 #: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
@@ -5801,10 +5530,6 @@ msgstr "下午"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#. strftime format %A = full weekday name, %d = day of
-#. month, %B = full month name. You can change the
-#. order but don't change the specifiers or add
-#. anything.
 #: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
@@ -5812,9 +5537,6 @@ msgstr "%B%d日%A"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#. strftime format %d = day of month, %b = abbreviated
-#. month name. You can change the order but don't
-#. change the specifiers or add anything.
 #: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
@@ -5825,396 +5547,400 @@ msgstr "%B%d日"
 msgid "%02i minute divisions"
 msgstr "%02i 分钟分割"
 
-#: calendar/gui/e-itip-control.c:586
+#: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
 msgstr "是(复杂重现)"
 
-#: calendar/gui/e-itip-control.c:597
+#: calendar/gui/e-itip-control.c:596
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "每 %d 天"
 
-#: calendar/gui/e-itip-control.c:602
+#: calendar/gui/e-itip-control.c:601
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "每 %d 周"
 
-#: calendar/gui/e-itip-control.c:604
+#: calendar/gui/e-itip-control.c:603
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "每 %d 周的"
 
-#: calendar/gui/e-itip-control.c:612
+#: calendar/gui/e-itip-control.c:611
 msgid " and "
 msgstr " 和 "
 
-#: calendar/gui/e-itip-control.c:619
+#: calendar/gui/e-itip-control.c:618
 #, c-format
 msgid "The %s day of "
 msgstr "第 %s 天属于"
 
-#: calendar/gui/e-itip-control.c:632
+#: calendar/gui/e-itip-control.c:631
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s 属于"
 
-#: calendar/gui/e-itip-control.c:639
+#: calendar/gui/e-itip-control.c:638
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "每 %d 月"
 
-#: calendar/gui/e-itip-control.c:643
+#: calendar/gui/e-itip-control.c:642
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "每 %d 年"
 
-#: calendar/gui/e-itip-control.c:654
+#: calendar/gui/e-itip-control.c:653
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] " 总计 %d 次"
 
-#: calendar/gui/e-itip-control.c:663
+#: calendar/gui/e-itip-control.c:662
 msgid ", ending on "
 msgstr "，结束于 "
 
-#: calendar/gui/e-itip-control.c:687
+#: calendar/gui/e-itip-control.c:686
 msgid "<b>Starts:</b> "
 msgstr "<b>开始：</b>"
 
-#: calendar/gui/e-itip-control.c:697
+#: calendar/gui/e-itip-control.c:696
 msgid "<b>Ends:</b> "
 msgstr "<b>结束：</b>"
 
-#: calendar/gui/e-itip-control.c:717
+#: calendar/gui/e-itip-control.c:716
 msgid "<b>Completed:</b> "
 msgstr "<b>已完成：</b> "
 
-#: calendar/gui/e-itip-control.c:727
+#: calendar/gui/e-itip-control.c:726
 msgid "<b>Due:</b> "
 msgstr "<b>到期：</b>"
 
-#: calendar/gui/e-itip-control.c:765 calendar/gui/e-itip-control.c:821
+#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
 msgid "iCalendar Information"
 msgstr "iCalendar 信息"
 
 #. Title
-#: calendar/gui/e-itip-control.c:782
+#: calendar/gui/e-itip-control.c:781
 msgid "iCalendar Error"
 msgstr "iCalendar 错误"
 
-#: calendar/gui/e-itip-control.c:853 calendar/gui/e-itip-control.c:869
-#: calendar/gui/e-itip-control.c:880 calendar/gui/e-itip-control.c:897
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
 msgid "An unknown person"
 msgstr "未知的人"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:904
+#: calendar/gui/e-itip-control.c:903
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr "<br> 请查看下列信息，并从下面的菜单中选择一个动作。"
 
-#: calendar/gui/e-itip-control.c:919
+#: calendar/gui/e-itip-control.c:918
 msgid "<i>None</i>"
 msgstr "<i>无</i>"
 
-#: calendar/gui/e-itip-control.c:949 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:929
+msgid "Location:"
+msgstr "位置："
+
+#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "接受"
 
-#: calendar/gui/e-itip-control.c:953 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "暂时接受"
 
-#: calendar/gui/e-itip-control.c:957 calendar/gui/e-meeting-list-view.c:182
+#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "拒绝"
 
-#: calendar/gui/e-itip-control.c:1016 calendar/gui/e-itip-control.c:1044
-#: calendar/gui/e-itip-control.c:1070 calendar/gui/e-itip-control.c:1083
-#: calendar/gui/e-itip-control.c:1096 calendar/gui/e-itip-control.c:1109
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
 msgid "Choose an action:"
 msgstr "选择一项活动："
 
-#: calendar/gui/e-itip-control.c:1017
+#: calendar/gui/e-itip-control.c:1016
 msgid "Update"
 msgstr "更新"
 
-#: calendar/gui/e-itip-control.c:1018 calendar/gui/e-itip-control.c:1049
-#: calendar/gui/e-itip-control.c:1072 calendar/gui/e-itip-control.c:1085
-#: calendar/gui/e-itip-control.c:1098 calendar/gui/e-itip-control.c:1111
-#: shell/e-shell.c:1098 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
+#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "确定"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1044
 msgid "Accept"
 msgstr "接受"
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1045
 msgid "Tentatively accept"
 msgstr "暂时接受"
 
-#: calendar/gui/e-itip-control.c:1047
+#: calendar/gui/e-itip-control.c:1046
 msgid "Decline"
 msgstr "拒绝"
 
-#: calendar/gui/e-itip-control.c:1071
+#: calendar/gui/e-itip-control.c:1070
 msgid "Send Free/Busy Information"
 msgstr "发送忙闲信息"
 
-#: calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1083
 msgid "Update respondent status"
 msgstr "更新应答者状态"
 
-#: calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1096
 msgid "Send Latest Information"
 msgstr "发送最新的信息"
 
-#: calendar/gui/e-itip-control.c:1110 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "取消"
 
-#: calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1185
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> 发布了会议信息。"
 
-#: calendar/gui/e-itip-control.c:1187
+#: calendar/gui/e-itip-control.c:1186
 msgid "Meeting Information"
 msgstr "会议信息"
 
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1191
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> 请求 %s 参加一个会议。"
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1193
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> 请求您参加一个会议。"
 
-#: calendar/gui/e-itip-control.c:1195
+#: calendar/gui/e-itip-control.c:1194
 msgid "Meeting Proposal"
 msgstr "会议建议"
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> 希望加入到已存的会议。"
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Update"
 msgstr "会议更新"
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1203
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> 想收到最新的会议信息。"
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1204
 msgid "Meeting Update Request"
 msgstr "会议更新请求"
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> 已回复一个会议请求。"
 
-#: calendar/gui/e-itip-control.c:1213
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Reply"
 msgstr "会议答复"
 
-#: calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1219
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> 取消了一个会议。"
 
-#: calendar/gui/e-itip-control.c:1221
+#: calendar/gui/e-itip-control.c:1220
 msgid "Meeting Cancellation"
 msgstr "会议取消"
 
-#: calendar/gui/e-itip-control.c:1228 calendar/gui/e-itip-control.c:1296
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1330
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> 发送了一个无法理解的信息。"
 
-#: calendar/gui/e-itip-control.c:1229
+#: calendar/gui/e-itip-control.c:1228
 msgid "Bad Meeting Message"
 msgstr "错误的会议信息"
 
-#: calendar/gui/e-itip-control.c:1254
+#: calendar/gui/e-itip-control.c:1253
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> 发布了任务信息。"
 
-#: calendar/gui/e-itip-control.c:1255
+#: calendar/gui/e-itip-control.c:1254
 msgid "Task Information"
 msgstr "任务信息"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1259
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> 请求 %s 完成一个任务。"
 
-#: calendar/gui/e-itip-control.c:1262
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> 请求您完成一个任务。"
 
-#: calendar/gui/e-itip-control.c:1263
+#: calendar/gui/e-itip-control.c:1262
 msgid "Task Proposal"
 msgstr "任务建议"
 
-#: calendar/gui/e-itip-control.c:1267
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s<b> 希望加入到已存在的任务。"
 
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Update"
 msgstr "任务更新"
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1271
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> 希望获取最新的任务信息。"
 
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1272
 msgid "Task Update Request"
 msgstr "任务更新请求"
 
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> 已经回复了任务委派。"
 
-#: calendar/gui/e-itip-control.c:1281
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Reply"
 msgstr "任务回复"
 
-#: calendar/gui/e-itip-control.c:1288
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> 取消了任务。"
 
-#: calendar/gui/e-itip-control.c:1289
+#: calendar/gui/e-itip-control.c:1288
 msgid "Task Cancellation"
 msgstr "任务取消"
 
-#: calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-itip-control.c:1296
 msgid "Bad Task Message"
 msgstr "错误的任务邮件"
 
-#: calendar/gui/e-itip-control.c:1316
+#: calendar/gui/e-itip-control.c:1315
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> 发布了忙闲信息。"
 
-#: calendar/gui/e-itip-control.c:1317
+#: calendar/gui/e-itip-control.c:1316
 msgid "Free/Busy Information"
 msgstr "忙闲信息"
 
-#: calendar/gui/e-itip-control.c:1321
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> 请求您的忙闲信息。"
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1321
 msgid "Free/Busy Request"
 msgstr "忙/闲请求"
 
-#: calendar/gui/e-itip-control.c:1326
+#: calendar/gui/e-itip-control.c:1325
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> 应答了忙闲请求。"
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1326
 msgid "Free/Busy Reply"
 msgstr "忙闲应答"
 
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1331
 msgid "Bad Free/Busy Message"
 msgstr "错误的忙闲信息"
 
-#: calendar/gui/e-itip-control.c:1407
+#: calendar/gui/e-itip-control.c:1406
 msgid "The message does not appear to be properly formed"
 msgstr "邮件的格式可能不正确"
 
-#: calendar/gui/e-itip-control.c:1466
+#: calendar/gui/e-itip-control.c:1465
 msgid "The message contains only unsupported requests."
 msgstr "邮件只含有不支持的请求。"
 
-#: calendar/gui/e-itip-control.c:1497
+#: calendar/gui/e-itip-control.c:1496
 msgid "The attachment does not contain a valid calendar message"
 msgstr "附件中没有有效的日历信息"
 
-#: calendar/gui/e-itip-control.c:1529
+#: calendar/gui/e-itip-control.c:1528
 msgid "The attachment has no viewable calendar items"
 msgstr "附件中没有可查看的日历项目"
 
-#: calendar/gui/e-itip-control.c:1763
+#: calendar/gui/e-itip-control.c:1762
 msgid "Update complete\n"
 msgstr "更新完成\n"
 
-#: calendar/gui/e-itip-control.c:1793 calendar/gui/e-itip-control.c:1865
+#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "由于条目不再存在而无法更新参与者状态"
 
-#: calendar/gui/e-itip-control.c:1809 calendar/gui/e-itip-control.c:1847
+#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
 msgid "Object is invalid and cannot be updated\n"
 msgstr "对象无效，无法更新\n"
 
-#: calendar/gui/e-itip-control.c:1819
+#: calendar/gui/e-itip-control.c:1818
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "此响应并非来自当前参与者。将响应者加为参与者吗？"
 
-#: calendar/gui/e-itip-control.c:1831
+#: calendar/gui/e-itip-control.c:1830
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "因为无效状态而无法更新参与者状态！\n"
 
-#: calendar/gui/e-itip-control.c:1850
+#: calendar/gui/e-itip-control.c:1849
 msgid "There was an error on the CORBA system\n"
 msgstr "CORBA 系统出错\n"
 
-#: calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1852
 msgid "Object could not be found\n"
 msgstr "找不到对象\n"
 
-#: calendar/gui/e-itip-control.c:1856
+#: calendar/gui/e-itip-control.c:1855
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "您没有适当的权限打开日历\n"
 
-#: calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1858
 msgid "Attendee status updated\n"
 msgstr "更新参与者状态\n"
 
-#: calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1861
 msgid "Attendee status could not be updated!\n"
 msgstr "无法更新参与者状态！\n"
 
-#: calendar/gui/e-itip-control.c:1893
+#: calendar/gui/e-itip-control.c:1892
 msgid "Removal Complete"
 msgstr "删除完成"
 
-#: calendar/gui/e-itip-control.c:1916 calendar/gui/e-itip-control.c:1964
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
 msgid "Item sent!\n"
 msgstr "项目已发送！\n"
 
-#: calendar/gui/e-itip-control.c:1918 calendar/gui/e-itip-control.c:1968
+#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
 msgid "The item could not be sent!\n"
 msgstr "无法发送项目！\n"
 
@@ -6255,74 +5981,74 @@ msgstr "日期-结束"
 msgid "date-start"
 msgstr "日期-开始"
 
-#: calendar/gui/e-meeting-list-view.c:62
+#: calendar/gui/e-meeting-list-view.c:59
 msgid "Chair Persons"
 msgstr "主席人员"
 
-#: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:480
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
 msgid "Required Participants"
 msgstr "必需的参与者"
 
-#: calendar/gui/e-meeting-list-view.c:64
+#: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "可选的参与者"
 
-#: calendar/gui/e-meeting-list-view.c:65
+#: calendar/gui/e-meeting-list-view.c:62
 msgid "Resources"
 msgstr "资源"
 
-#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
 #: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr "个人"
 
-#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "组"
 
-#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr "资源"
 
-#: calendar/gui/e-meeting-list-view.c:144 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr "房间"
 
-#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr "主席"
 
-#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:127
 #: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
 msgid "Required Participant"
 msgstr "必需的参与者"
 
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr "可选的参与者"
 
-#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr "不参加"
 
-#: calendar/gui/e-meeting-list-view.c:180 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:177
 #: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
 msgid "Needs Action"
 msgstr "需要动作"
 
-#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
 #: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "暂时的"
 
-#: calendar/gui/e-meeting-list-view.c:184 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr "被委任的"
@@ -6339,20 +6065,28 @@ msgstr "办公室以外"
 msgid "No Information"
 msgstr "没有信息"
 
+#: calendar/gui/e-meeting-time-sel.c:417
+#, fuzzy
+msgid "Add attendees from addressbook"
+msgstr "将发件人添加到地址簿(_B)"
+
 #: calendar/gui/e-meeting-time-sel.c:440
 msgid "_Options"
 msgstr "选项(_O)"
 
 #: calendar/gui/e-meeting-time-sel.c:457
-msgid "Show _Only Working Hours"
+#, fuzzy
+msgid "Show _only working hours"
 msgstr "只显示工作小时(_O)"
 
 #: calendar/gui/e-meeting-time-sel.c:467
-msgid "Show _Zoomed Out"
+#, fuzzy
+msgid "Show _zoomed out"
 msgstr "显示缩放的输出(_Z)"
 
 #: calendar/gui/e-meeting-time-sel.c:482
-msgid "_Update Free/Busy"
+#, fuzzy
+msgid "_Update free/busy"
 msgstr "更新忙闲(_U)"
 
 #: calendar/gui/e-meeting-time-sel.c:497
@@ -6368,19 +6102,23 @@ msgid ">_>"
 msgstr ">_>"
 
 #: calendar/gui/e-meeting-time-sel.c:547
-msgid "_All People and Resources"
+#, fuzzy
+msgid "_All people and resources"
 msgstr "所有人和资源(_A)"
 
 #: calendar/gui/e-meeting-time-sel.c:556
-msgid "All _People and One Resource"
+#, fuzzy
+msgid "All _people and one resource"
 msgstr "所有人和一个资源(_P)"
 
 #: calendar/gui/e-meeting-time-sel.c:565
-msgid "_Required People"
+#, fuzzy
+msgid "_Required people"
 msgstr "必需的人(_R)"
 
 #: calendar/gui/e-meeting-time-sel.c:574
-msgid "Required People and _One Resource"
+#, fuzzy
+msgid "Required people and _one resource"
 msgstr "必需的人和一个资源(_O)"
 
 #: calendar/gui/e-meeting-time-sel.c:593
@@ -6400,10 +6138,6 @@ msgstr "%Y年%m月%d日%A"
 
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
-#. This is a strftime() format string %a = abbreviated weekday
-#. name, %m = month number, %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. strftime format of a weekday and a date.
 #: calendar/gui/e-meeting-time-sel.c:2093
 #: calendar/gui/e-meeting-time-sel-item.c:456 e-util/e-time-utils.c:203
 #: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
@@ -6412,10 +6146,6 @@ msgstr "%Y年%m月%d日%A"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#. strptime format of a weekday and a date.
-#. This is the preferred date format for the locale.
-#. This is a strftime() format for a short date. %m = month,
-#. %d = day of month, %Y = year (all digits).
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
 #: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
 msgid "%m/%d/%Y"
@@ -6426,7 +6156,7 @@ msgstr "%Y-%m-%d"
 msgid "Enter the password for %s"
 msgstr "为 %s 输入密码"
 
-#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6435,19 +6165,14 @@ msgstr ""
 "%s 错误：\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-
 #. FIXME Loading should be async
 #. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:686
+#: calendar/gui/e-tasks.c:801
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "在 %s 打开任务"
 
-#: calendar/gui/e-tasks.c:709
+#: calendar/gui/e-tasks.c:824
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6456,52 +6181,47 @@ msgstr ""
 "打开 %s 出错：\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:730
+#: calendar/gui/e-tasks.c:845
 msgid "Loading tasks"
 msgstr "装入任务"
 
-#: calendar/gui/e-tasks.c:834
+#: calendar/gui/e-tasks.c:949
 msgid "Completing tasks..."
 msgstr "正在完成的日期..."
 
-#: calendar/gui/e-tasks.c:857
+#: calendar/gui/e-tasks.c:972
 msgid "Deleting selected objects..."
 msgstr "正在删除选中的对象..."
 
-#: calendar/gui/e-tasks.c:884
+#: calendar/gui/e-tasks.c:999
 msgid "Expunging"
 msgstr "销毁"
 
-#: calendar/gui/e-tasks.c:960
+#: calendar/gui/e-tasks.c:1075
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
-#: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
+#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
+#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
 #: calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:705
 msgid "Tasks"
 msgstr "任务"
 
-#: calendar/gui/gnome-cal.c:1876
+#: calendar/gui/gnome-cal.c:1878
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "装入位于 %s 的约会"
 
-#: calendar/gui/gnome-cal.c:1895
+#: calendar/gui/gnome-cal.c:1897
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "装入位于 %s 的任务"
 
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1920
 #, c-format
 msgid "Opening %s"
 msgstr "打开 %s"
 
-#: calendar/gui/gnome-cal.c:2048
-#, c-format
-msgid "The calendar backend for '%s' has crashed."
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:2894
+#: calendar/gui/gnome-cal.c:2906
 msgid "Purging"
 msgstr ""
 
@@ -6696,7 +6416,7 @@ msgid "On The Web"
 msgstr "网上"
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "无法从 evolution/config.xmldb 中升迁旧设置"
 
@@ -6707,7 +6427,7 @@ msgid "Unable to migrate calendar `%s'"
 msgstr "无法升迁日历“%s”"
 
 #. FIXME: domain/code
-#: calendar/gui/migration.c:869
+#: calendar/gui/migration.c:889
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "无法升迁任务“%s”"
@@ -6943,67 +6663,67 @@ msgstr "打印项"
 msgid "Print Setup"
 msgstr "打印设置"
 
-#: calendar/gui/tasks-component.c:303
+#: calendar/gui/tasks-component.c:313
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr "即将删除任务列表“%s”。您确定想要继续吗？"
 
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:371
 msgid "New Task List"
 msgstr "新建任务列表"
 
-#: calendar/gui/tasks-component.c:398
+#: calendar/gui/tasks-component.c:408
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d 个任务"
 
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:502
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] "，已选中 %d 个"
 
-#: calendar/gui/tasks-component.c:447
+#: calendar/gui/tasks-component.c:457
 msgid "Failed upgrading tasks."
 msgstr "升级任务失败。"
 
-#: calendar/gui/tasks-component.c:526
+#: calendar/gui/tasks-component.c:749
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:538
+#: calendar/gui/tasks-component.c:761
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:576
+#: calendar/gui/tasks-component.c:799
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:804
+#: calendar/gui/tasks-component.c:1040
 msgid "New task"
 msgstr "新建任务"
 
-#: calendar/gui/tasks-component.c:805
+#: calendar/gui/tasks-component.c:1041
 msgid "_Task"
 msgstr "任务(_T)"
 
-#: calendar/gui/tasks-component.c:806
+#: calendar/gui/tasks-component.c:1042
 msgid "Create a new task"
 msgstr "创建新任务"
 
-#: calendar/gui/tasks-component.c:812
+#: calendar/gui/tasks-component.c:1048
 msgid "New tasks group"
 msgstr "新建任务组"
 
-#: calendar/gui/tasks-component.c:813
+#: calendar/gui/tasks-component.c:1049
 msgid "_Tasks Group"
 msgstr "任务组(_T)"
 
-#: calendar/gui/tasks-component.c:814
+#: calendar/gui/tasks-component.c:1050
 msgid "Create a new tasks group"
 msgstr "创建新任务组"
 
@@ -8829,17 +8549,17 @@ msgstr ""
 msgid "(match-threads) requires a match type string"
 msgstr ""
 
-#: camel/camel-folder-search.c:785
+#: camel/camel-folder-search.c:784
 #, fuzzy
 msgid "(match-threads) expects an array result"
 msgstr "(match-all) 需要一个布尔结果"
 
-#: camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:790
 #, fuzzy
 msgid "(match-threads) requires the folder set"
 msgstr "(match-all) 需要一个布尔结果"
 
-#: camel/camel-folder-search.c:880
+#: camel/camel-folder-search.c:879
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "正在对未知的头进行查询：%s"
@@ -8874,7 +8594,8 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
 #: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:705
+#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "已取消。"
@@ -9238,7 +8959,7 @@ msgstr "引用的证书已过期。"
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1243
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "来自服务器的无效认证应答。"
 
@@ -9619,40 +9340,40 @@ msgstr "命令尚未实现"
 msgid "export keys: unimplemented"
 msgstr ""
 
-#: camel/camel-store.c:215
+#: camel/camel-store.c:213
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "无法获取文件夹：对该存储的无效操作"
 
-#: camel/camel-store.c:245
+#: camel/camel-store.c:243
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr "无法创建文件夹：%s：%s"
 
-#: camel/camel-store.c:299
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "无法创建文件夹：对该存储的无效操作"
 
-#: camel/camel-store.c:327
+#: camel/camel-store.c:325
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "无法创建文件夹：%s：%s"
 
-#: camel/camel-store.c:391 camel/camel-vee-store.c:354
+#: camel/camel-store.c:389 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "无法删除文件夹：%s：无效操作"
 
-#: camel/camel-store.c:441 camel/camel-vee-store.c:390
+#: camel/camel-store.c:439 camel/camel-vee-store.c:387
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "无法重命名文件夹：%s：无效操作"
 
-#: camel/camel-store.c:813
+#: camel/camel-store.c:777
 msgid "Trash"
 msgstr "回收站"
 
-#: camel/camel-store.c:815 filter/libfilter-i18n.h:35
-#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/mail-config.glade.h:95
+#: ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "垃圾"
 
@@ -9883,12 +9604,12 @@ msgstr "在 %2$s 中没有消息 %1$s"
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "无法将消息移动或复制到虚拟文件夹中"
 
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:374
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "无法删除文件夹：%s：没有该文件夹"
 
-#: camel/camel-vee-store.c:398
+#: camel/camel-vee-store.c:395
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "无法重命名文件夹：%s：没有该文件夹"
@@ -9932,16 +9653,16 @@ msgstr "地址簿"
 msgid "Post Office Agent SOAP Port:"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:80
+#: camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "Novell GroupWise"
 msgstr "Novell GroupWise"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:82
+#: camel/providers/groupwise/camel-groupwise-provider.c:85
 #, fuzzy
 msgid "For accessing Novell Groupwise servers"
 msgstr "访问 Novell GroupWise 服务器"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: camel/providers/groupwise/camel-groupwise-provider.c:100
 #: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
@@ -9950,14 +9671,14 @@ msgstr "访问 Novell GroupWise 服务器"
 msgid "Password"
 msgstr "密码"
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:99
+#: camel/providers/groupwise/camel-groupwise-provider.c:102
 #: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "该选项将使用普通文本密码连接到 IMAP 服务器。"
 
-#: camel/providers/groupwise/camel-gw-listener.c:305
-#: camel/providers/groupwise/camel-gw-listener.c:328
+#: camel/providers/groupwise/camel-gw-listener.c:312
+#: camel/providers/groupwise/camel-gw-listener.c:335
 #, fuzzy
 msgid "Checklist"
 msgstr "列表"
@@ -10100,23 +9821,23 @@ msgid ""
 msgstr "该选项将使用普通文本密码连接到 IMAP 服务器。"
 
 #: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:429
+#: camel/providers/imap/camel-imap-store.c:428
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP 服务器 %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:431
+#: camel/providers/imap/camel-imap-store.c:430
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%2$s 为 %1$s 提供的 IMAP 服务"
 
 #: camel/providers/imap4/camel-imap4-store.c:208
 #: camel/providers/imap4/camel-imap4-store.c:225
-#: camel/providers/imap/camel-imap-store.c:552
-#: camel/providers/imap/camel-imap-store.c:572
+#: camel/providers/imap/camel-imap-store.c:551
+#: camel/providers/imap/camel-imap-store.c:571
 #: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
+#: camel/providers/nntp/camel-nntp-store.c:209
 #: camel/providers/pop3/camel-pop3-store.c:175
 #: camel/providers/smtp/camel-smtp-transport.c:269
 #: camel/providers/smtp/camel-smtp-transport.c:285
@@ -10125,18 +9846,18 @@ msgid "Could not connect to %s (port %d): %s"
 msgstr "无法连接到 %s (端口 %d)：%s"
 
 #: camel/providers/imap4/camel-imap4-store.c:210
-#: camel/providers/imap/camel-imap-store.c:554
+#: camel/providers/imap/camel-imap-store.c:553
 #: camel/providers/pop3/camel-pop3-store.c:177
 #: camel/providers/smtp/camel-smtp-transport.c:271
 msgid "SSL unavailable"
 msgstr "SSL 不可用"
 
 #: camel/providers/imap4/camel-imap4-store.c:222
-#: camel/providers/imap/camel-imap-store.c:569
-#: camel/providers/imap/camel-imap-store.c:846
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/imap/camel-imap-store.c:845
 #: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:137
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
 #: camel/providers/pop3/camel-pop3-store.c:192
 msgid "Connection cancelled"
 msgstr "连接已取消"
@@ -10149,8 +9870,8 @@ msgid ""
 msgstr "以安全模式连接到 IMAP 服务器 %s 失败：%s"
 
 #: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:680
-#: camel/providers/imap/camel-imap-store.c:711
+#: camel/providers/imap/camel-imap-store.c:679
+#: camel/providers/imap/camel-imap-store.c:710
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "以安全模式连接到 IMAP 服务器 %s 失败：%s"
@@ -10159,7 +9880,7 @@ msgstr "以安全模式连接到 IMAP 服务器 %s 失败：%s"
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1108
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
 msgid "Unknown error"
 msgstr "未知的错误"
 
@@ -10185,8 +9906,8 @@ msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr "无法获取文件夹：%s：%s"
 
 #: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1888
-#: camel/providers/imap/camel-imap-store.c:2266
+#: camel/providers/imap/camel-imap-store.c:1885
+#: camel/providers/imap/camel-imap-store.c:2263
 #, fuzzy, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -10264,12 +9985,12 @@ msgstr "服务器意外地中止了连接：%s"
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3199
+#: camel/providers/imap/camel-imap-store.c:3194
 msgid "Operation cancelled"
 msgstr "操作已取消"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3202
+#: camel/providers/imap/camel-imap-store.c:3197
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "服务器意外地中止了连接：%s"
@@ -10350,7 +10071,7 @@ msgstr "没有该邮件"
 
 #: camel/providers/imap/camel-imap-folder.c:2019
 #: camel/providers/imap/camel-imap-folder.c:2622
-#: camel/providers/nntp/camel-nntp-folder.c:238
+#: camel/providers/nntp/camel-nntp-folder.c:220
 msgid "This message is not currently available"
 msgstr "该邮件目前不可用"
 
@@ -10436,43 +10157,43 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "IMAP 服务器上的邮件的读写。"
 
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:680
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "不支持 SSL/TLS 扩展。"
 
-#: camel/providers/imap/camel-imap-store.c:712
+#: camel/providers/imap/camel-imap-store.c:711
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL 协商失败"
 
-#: camel/providers/imap/camel-imap-store.c:849
+#: camel/providers/imap/camel-imap-store.c:848
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "无法使用命令“%s”连接：%s"
 
-#: camel/providers/imap/camel-imap-store.c:1273
+#: camel/providers/imap/camel-imap-store.c:1272
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP 服务器 %s 不支持要求的验证类型 %s"
 
-#: camel/providers/imap/camel-imap-store.c:1283
+#: camel/providers/imap/camel-imap-store.c:1282
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "不支持验证类型 %s"
 
-#: camel/providers/imap/camel-imap-store.c:1306
+#: camel/providers/imap/camel-imap-store.c:1305
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%s请为 %s@%s 输入 IMAP 密码"
 
-#: camel/providers/imap/camel-imap-store.c:1320
+#: camel/providers/imap/camel-imap-store.c:1319
 msgid "You didn't enter a password."
 msgstr "您没有输入密码。"
 
-#: camel/providers/imap/camel-imap-store.c:1349
+#: camel/providers/imap/camel-imap-store.c:1348
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10483,18 +10204,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1870
-#: camel/providers/imap/camel-imap-store.c:2060
+#: camel/providers/imap/camel-imap-store.c:1867
+#: camel/providers/imap/camel-imap-store.c:2057
 #, c-format
 msgid "No such folder %s"
 msgstr "没有文件夹 %s"
 
-#: camel/providers/imap/camel-imap-store.c:1946
-#: camel/providers/imap/camel-imap-store.c:2327
+#: camel/providers/imap/camel-imap-store.c:1943
+#: camel/providers/imap/camel-imap-store.c:2324
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "父文件夹不允许含有子文件夹"
 
-#: camel/providers/imap/camel-imap-store.c:2001
+#: camel/providers/imap/camel-imap-store.c:1998
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10502,7 +10223,7 @@ msgstr "父文件夹不允许含有子文件夹"
 msgid "Cannot create folder `%s': folder exists."
 msgstr "无法创建文件夹：%s：%s"
 
-#: camel/providers/imap/camel-imap-store.c:2277
+#: camel/providers/imap/camel-imap-store.c:2274
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "未知的父文件夹：%s"
@@ -10535,20 +10256,20 @@ msgid "Index message body data"
 msgstr "给联系人发邮件"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:388
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:393
-#: camel/providers/local/camel-local-folder.c:396
+#: camel/providers/local/camel-local-folder.c:392
+#: camel/providers/local/camel-local-folder.c:395
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "邮件箱：%s (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:400
+#: camel/providers/local/camel-local-folder.c:399
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -10608,7 +10329,7 @@ msgstr ""
 
 #: camel/providers/local/camel-local-store.c:142
 #: camel/providers/local/camel-local-store.c:253
-#: camel/providers/local/camel-mbox-store.c:356
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -10740,9 +10461,9 @@ msgstr "无法删除文件夹“%s”：%s"
 msgid "not a maildir directory"
 msgstr "不是邮件目录"
 
-#: camel/providers/local/camel-maildir-store.c:341
-#: camel/providers/local/camel-spool-store.c:286
-#: camel/providers/local/camel-spool-store.c:316
+#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-spool-store.c:284
+#: camel/providers/local/camel-spool-store.c:314
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "无法扫描文件夹“%s”：%s"
@@ -10800,7 +10521,7 @@ msgid "Message construction failed."
 msgstr "邮件构造失败：邮件箱已损坏？"
 
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:362
+#: camel/providers/local/camel-mbox-store.c:361
 msgid "Cannot create a folder by this name."
 msgstr "无法以此名称创建文件夹。"
 
@@ -10830,30 +10551,30 @@ msgstr "“%s”并不是普通文件。"
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "文件夹“%s”非空。没有删除。"
 
-#: camel/providers/local/camel-mbox-store.c:375
+#: camel/providers/local/camel-mbox-store.c:374
 #, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "无法创建目录“%s”：%s"
 
-#: camel/providers/local/camel-mbox-store.c:389
+#: camel/providers/local/camel-mbox-store.c:388
 #, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "无法创建文件夹：%s：%s"
 
-#: camel/providers/local/camel-mbox-store.c:391
+#: camel/providers/local/camel-mbox-store.c:390
 msgid "Folder already exists"
 msgstr "文件夹已经存在"
 
-#: camel/providers/local/camel-mbox-store.c:473
+#: camel/providers/local/camel-mbox-store.c:472
 msgid "The new folder name is illegal."
 msgstr "指定的文件夹名称不合法。"
 
-#: camel/providers/local/camel-mbox-store.c:486
+#: camel/providers/local/camel-mbox-store.c:485
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "无法重命名“%s”：%s"
 
-#: camel/providers/local/camel-mbox-store.c:561
+#: camel/providers/local/camel-mbox-store.c:560
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "无法将 %s 改名为 %s：%s"
@@ -11046,7 +10767,7 @@ msgstr ""
 "文件夹可能已损坏，副本保存在“%s”"
 
 #: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:997
+#: camel/providers/nntp/camel-nntp-store.c:1126
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "请输入 %s@%s 的 NNTP 密码"
@@ -11063,18 +10784,10 @@ msgstr "向服务器发送用户名失败"
 msgid "Server rejected username/password"
 msgstr "服务器拒绝了用户名/密码"
 
-#: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:263
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr "用户已取消"
-
-#: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:259
-#: camel/providers/nntp/camel-nntp-folder.c:265
+#: camel/providers/nntp/camel-nntp-folder.c:147
+#: camel/providers/nntp/camel-nntp-folder.c:149
+#: camel/providers/nntp/camel-nntp-folder.c:158
+#: camel/providers/nntp/camel-nntp-folder.c:234
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11083,66 +10796,53 @@ msgstr "用户已取消"
 msgid "Cannot get message %s: %s"
 msgstr "无法获取消息 %s：%s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:188
-#: camel/providers/nntp/camel-nntp-folder.c:228
+#: camel/providers/nntp/camel-nntp-folder.c:156
+#: camel/providers/nntp/camel-nntp-folder.c:232
+#: camel/providers/nntp/camel-nntp-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+msgid "User cancelled"
+msgstr "用户已取消"
+
+#: camel/providers/nntp/camel-nntp-folder.c:176
+#: camel/providers/nntp/camel-nntp-folder.c:208
 #, c-format
 msgid "Internal error: uid in invalid format: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:201
-#, fuzzy, c-format
-msgid "Could not get article %s from NNTP server"
-msgstr "无法获取组：%s"
-
-#: camel/providers/nntp/camel-nntp-folder.c:362
-msgid "Posting not allowed by news server"
-msgstr ""
-
+#: camel/providers/nntp/camel-nntp-folder.c:328
+#: camel/providers/nntp/camel-nntp-folder.c:331
 #: camel/providers/nntp/camel-nntp-folder.c:373
-#, c-format
-msgid "Failed to send newsgroups header: %s: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:413
-#: camel/providers/nntp/camel-nntp-folder.c:426
-#, c-format
-msgid "Error posting to newsgroup: %s: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:438
-msgid "Error reading response to posted message: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:441
+#: camel/providers/nntp/camel-nntp-folder.c:375
 #, fuzzy, c-format
-msgid "Error posting message: %s: message not posted"
-msgstr ""
-"自动存储邮件错误：%s\n"
-" %s"
+msgid "Posting failed: %s"
+msgstr "操作失败：%s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:457
+#: camel/providers/nntp/camel-nntp-folder.c:393
 msgid "You cannot post NNTP messages while working offline!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:468
+#: camel/providers/nntp/camel-nntp-folder.c:404
 #, fuzzy
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "无法关闭临时文件夹：%s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:44
 #, fuzzy
 msgid "Could not get group list from server."
 msgstr "无法获取组：%s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#: camel/providers/nntp/camel-nntp-grouplist.c:97
+#: camel/providers/nntp/camel-nntp-grouplist.c:106
 #, fuzzy, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr ""
 "无法创建输出文件：%s\n"
 " %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#: camel/providers/nntp/camel-nntp-grouplist.c:157
 #, fuzzy, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr ""
@@ -11172,27 +10872,29 @@ msgid ""
 "password."
 msgstr "该选项将以明文密码向进行 NNTP 服务器进行认证。"
 
-#: camel/providers/nntp/camel-nntp-store.c:158
+#: camel/providers/nntp/camel-nntp-store.c:118
+#: camel/providers/nntp/camel-nntp-store.c:1233
+#: camel/providers/nntp/camel-nntp-store.c:1331
+#, c-format
+msgid "NNTP Command failed: %s"
+msgstr "NNTP 命令失败：%s"
+
+#: camel/providers/nntp/camel-nntp-store.c:227
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "无法阅读来自 %s 的欢迎信息：%s"
 
-#: camel/providers/nntp/camel-nntp-store.c:170
+#: camel/providers/nntp/camel-nntp-store.c:239
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP 服务器 %s 返回错误码 %d：%s"
 
-#: camel/providers/nntp/camel-nntp-store.c:326
+#: camel/providers/nntp/camel-nntp-store.c:403
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET 新闻 %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:640
-#, fuzzy
-msgid "Stream error"
-msgstr "解析错误"
-
-#: camel/providers/nntp/camel-nntp-store.c:643
+#: camel/providers/nntp/camel-nntp-store.c:777
 #, fuzzy, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -11202,75 +10904,75 @@ msgstr ""
 "在将邮件保存到 %s 时发生错误：\n"
 " %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:735
+#: camel/providers/nntp/camel-nntp-store.c:872
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
 "No such newsgroup. The selected item is a probably a parent folder."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:767
+#: camel/providers/nntp/camel-nntp-store.c:904
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
 "newsgroup does not exist!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:792
+#: camel/providers/nntp/camel-nntp-store.c:929
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:800
+#: camel/providers/nntp/camel-nntp-store.c:937
 #, fuzzy
 msgid "You cannot rename a folder in a News store."
 msgstr "无法将文件夹 %s 改名为 %s：%s"
 
-#: camel/providers/nntp/camel-nntp-store.c:808
+#: camel/providers/nntp/camel-nntp-store.c:945
 #, fuzzy
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "无法把文件夹移动到其子目录。"
 
-#: camel/providers/nntp/camel-nntp-summary.c:253
-#, fuzzy, c-format
-msgid "Connection error: %s"
-msgstr "未知的错误：%s"
-
-#: camel/providers/nntp/camel-nntp-summary.c:262
-#, c-format
-msgid "No such folder: %s"
-msgstr "没有文件夹：%s"
+#: camel/providers/nntp/camel-nntp-store.c:1118
+#, fuzzy
+msgid "Authentication requested but not username provided"
+msgstr "必须认证"
 
-#: camel/providers/nntp/camel-nntp-summary.c:268
-#, c-format
-msgid "Could not get group: %s"
-msgstr "无法获取组：%s"
+#: camel/providers/nntp/camel-nntp-store.c:1146
+#, fuzzy, c-format
+msgid "Cannot authenticate to server: %s"
+msgstr "认证到 POP 服务器 %s 失败：%s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:333
+#: camel/providers/nntp/camel-nntp-store.c:1262
 #, fuzzy
-msgid "Could not get messages: unspecified error"
-msgstr "无法发送邮件：%s"
+msgid "Not connected."
+msgstr "无联系人"
 
-#: camel/providers/nntp/camel-nntp-summary.c:378
+#: camel/providers/nntp/camel-nntp-store.c:1311
 #, c-format
-msgid "NNTP Command failed: %s"
-msgstr "NNTP 命令失败：%s"
+msgid "No such folder: %s"
+msgstr "没有文件夹：%s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:438
-#: camel/providers/nntp/camel-nntp-summary.c:543
+#: camel/providers/nntp/camel-nntp-summary.c:218
+#: camel/providers/nntp/camel-nntp-summary.c:314
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s：正在扫描新消息"
 
-#: camel/providers/nntp/camel-nntp-summary.c:558
-#, c-format
-msgid "Unknown server response: %s"
-msgstr "未知的服务器应答：%s"
+#: camel/providers/nntp/camel-nntp-summary.c:225
+#, fuzzy, c-format
+msgid "Unexpected server response from xover: %s"
+msgstr "来自 IMAP 服务器的意外应答：%s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:605
+#: camel/providers/nntp/camel-nntp-summary.c:328
+#, fuzzy, c-format
+msgid "Unexpected server response from head: %s"
+msgstr "来自 GnuPG 的意外应答：%s"
+
+#: camel/providers/nntp/camel-nntp-summary.c:368
 msgid "Use cancel"
 msgstr "使用取消"
 
-#: camel/providers/nntp/camel-nntp-summary.c:607
+#: camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
 msgid "Operation failed: %s"
 msgstr "操作失败：%s"
@@ -11749,19 +11451,19 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
+#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:408
 msgid "attachment"
 msgstr "附件"
 
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:454
 msgid "Remove selected items from the attachment list"
 msgstr "从附件列表中删除选定的条目"
 
-#: composer/e-msg-composer-attachment-bar.c:491
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Add attachment..."
 msgstr "添加附件..."
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:495
 msgid "Attach a file to the message"
 msgstr "把文件附件到邮件"
 
@@ -11824,7 +11526,7 @@ msgstr "多封邮件"
 msgid "Open file"
 msgstr "打开文件"
 
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
 msgid "Autogenerated"
 msgstr "自动生成的"
 
@@ -11968,17 +11670,17 @@ msgstr "添加附件"
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
+msgid "You cannot attach the file `{0}' to this message."
 msgstr "把文件附件到邮件"
 
 #. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4
-msgid "${1}"
-msgstr ""
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr "{1}"
 
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
 
 #. mail-composer:attach-directory primary
@@ -12073,7 +11775,7 @@ msgstr "无法创建管道：%s"
 
 #. mail-composer:no-build-message secondary
 #: composer/mail-composer-errors.xml.h:34
-msgid "Because \"${0}\", you may need to select different mail options."
+msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
@@ -12083,9 +11785,11 @@ msgid "Could not read signature file \"{0}\"."
 msgstr "无法保存签名文件：%s"
 
 #. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38
-msgid "Because \"${1}\"."
-msgstr ""
+#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr "原因是“{1}”。"
 
 #. mail-composer:all-accounts-deleted primary
 #: composer/mail-composer-errors.xml.h:40
@@ -12243,16 +11947,12 @@ msgstr "同步类别："
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 12-hour format, without seconds.
 #: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%Y-%m-%d %A %p %I:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#. strftime format of a weekday, a date and a
-#. time, in 24-hour format, without seconds.
 #: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%Y-%m-%d %A %H:%M"
@@ -12304,31 +12004,23 @@ msgid "%m/%d/%Y %H"
 msgstr "%Y-%m-%d %H点"
 
 #. strptime format for a time of day, in 12-hour format.
-#. strftime format of a time in 12-hour format.
 #: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
 msgstr "%p %I:%M:%S"
 
 #. strptime format for a time of day, in 24-hour format.
-#. strftime format of a time in 24-hour format.
 #: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#. strftime format of a time in 12-hour format,
-#. without seconds.
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
 #: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%I:%M %p"
 msgstr "%p %I:%M"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#. strftime format of a time in 24-hour format,
-#. without seconds.
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
 #: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
 msgid "%H:%M"
@@ -12418,7 +12110,6 @@ msgid "Missing file name."
 msgstr "缺少文件名。"
 
 #. filter:no-file secondary
-#. filter:bad-file secondary
 #: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
 msgid "You must specify a file name."
 msgstr "您必须指定文件名。"
@@ -12450,7 +12141,6 @@ msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
 #. filter:no-name primary
-#. filter:no-name-vfolder primary
 #: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
 msgid "Missing name."
 msgstr "缺少名称。"
@@ -12498,7 +12188,7 @@ msgid "<b>Then</b>"
 msgstr "<b>则</b>"
 
 #: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1335
+#: mail/mail-account-gui.c:1347
 msgid "Select Folder"
 msgstr "选择文件夹"
 
@@ -12584,8 +12274,8 @@ msgstr "以所有本地文件夹"
 msgid "years"
 msgstr "年"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:1011
-#: mail/mail-config.c:76 mail/mail-config.glade.h:93
+#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
+#: mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "重要"
 
@@ -12653,252 +12343,6 @@ msgstr "接收"
 msgid "outgoing"
 msgstr "发送"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Adjust Score"
-msgstr "调整评分"
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Color"
-msgstr "指定颜色"
-
-#: filter/libfilter-i18n.h:4
-msgid "Assign Score"
-msgstr "指定分数"
-
-#: filter/libfilter-i18n.h:5
-msgid "Attachments"
-msgstr "附件"
-
-#: filter/libfilter-i18n.h:6
-msgid "Beep"
-msgstr "响铃"
-
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "含有"
-
-#: filter/libfilter-i18n.h:8
-msgid "Copy to Folder"
-msgstr "复制到文件夹"
-
-#: filter/libfilter-i18n.h:9
-msgid "Date received"
-msgstr "接收日期"
-
-#: filter/libfilter-i18n.h:10
-msgid "Date sent"
-msgstr "发送日期"
-
-#: filter/libfilter-i18n.h:12
-msgid "Deleted"
-msgstr "已删除"
-
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "不含有"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "不以之结尾"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "不存在"
-
-#: filter/libfilter-i18n.h:16
-msgid "does not return"
-msgstr "不返回"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "听起来不像"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "不以之开始"
-
-#: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
-msgstr "不存在"
-
-#: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr "草稿"
-
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "以之结束"
-
-#: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr "存在"
-
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "存在"
-
-#: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr "表达式"
-
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr "跟随"
-
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "是"
-
-#: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr "以后"
-
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr "以前"
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr "有标志"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "大于"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "小于"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "不是"
-
-#: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr "未标志"
-
-#: filter/libfilter-i18n.h:36
-msgid "Junk Test"
-msgstr "垃圾测试"
-
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
-#: widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "标签"
-
-#: filter/libfilter-i18n.h:38
-msgid "Mailing list"
-msgstr "邮件列表"
-
-#: filter/libfilter-i18n.h:39
-msgid "Message Body"
-msgstr "邮件体"
-
-#: filter/libfilter-i18n.h:40
-msgid "Message Header"
-msgstr "邮件头"
-
-#: filter/libfilter-i18n.h:41
-msgid "Message is Junk"
-msgstr "邮件是垃圾"
-
-#: filter/libfilter-i18n.h:42
-msgid "Message is not Junk"
-msgstr "邮件不是垃圾"
-
-#: filter/libfilter-i18n.h:43
-msgid "Move to Folder"
-msgstr "移动到文件夹"
-
-#: filter/libfilter-i18n.h:44
-msgid "Pipe to Program"
-msgstr "管道到程序"
-
-#: filter/libfilter-i18n.h:45
-msgid "Play Sound"
-msgstr "播放声音"
-
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "已读"
-
-#: filter/libfilter-i18n.h:47
-msgid "Recipients"
-msgstr "收件人"
-
-#: filter/libfilter-i18n.h:48
-msgid "Regex Match"
-msgstr "常规表达式匹配"
-
-#: filter/libfilter-i18n.h:49
-msgid "Replied to"
-msgstr "已回复"
-
-#: filter/libfilter-i18n.h:50
-msgid "returns"
-msgstr "返回"
-
-#: filter/libfilter-i18n.h:51
-msgid "returns greater than"
-msgstr "返回大于"
-
-#: filter/libfilter-i18n.h:52
-msgid "returns less than"
-msgstr "返回小于"
-
-#: filter/libfilter-i18n.h:53
-msgid "Run Program"
-msgstr "运行程序"
-
-#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "分数"
-
-#: filter/libfilter-i18n.h:55
-msgid "Sender"
-msgstr "发件人"
-
-#: filter/libfilter-i18n.h:56
-msgid "Set Status"
-msgstr "设置状态"
-
-#: filter/libfilter-i18n.h:57
-msgid "Size (kB)"
-msgstr "大小 (kB)"
-
-#: filter/libfilter-i18n.h:58
-msgid "sounds like"
-msgstr "听起来象"
-
-#: filter/libfilter-i18n.h:59
-msgid "Source Account"
-msgstr "来源账户"
-
-#: filter/libfilter-i18n.h:60
-msgid "Specific header"
-msgstr "指定邮件头"
-
-#: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "以之开始"
-
-#: filter/libfilter-i18n.h:63
-msgid "Stop Processing"
-msgstr "停止处理"
-
-#: filter/libfilter-i18n.h:64 mail/em-format.c:755 mail/em-format-html.c:1519
-#: mail/em-format-quote.c:302 mail/em-mailer-prefs.c:87
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
-#: smime/lib/e-cert.c:1079
-msgid "Subject"
-msgstr "主题"
-
-#: filter/libfilter-i18n.h:65
-msgid "Unset Status"
-msgstr "未设置状态"
-
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "添加规则"
@@ -12915,6 +12359,11 @@ msgstr "规则名"
 msgid "_Score Rules"
 msgstr "计分规则(_S)"
 
+#: filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "分数"
+
 #: filter/searchtypes.xml.h:1
 msgid "Body contains"
 msgstr "邮件体含有"
@@ -12994,13 +12443,13 @@ msgstr "签名"
 msgid "-------- Forwarded Message --------"
 msgstr "-------- 转发的邮件 --------"
 
-#: mail/em-composer-utils.c:1499
+#: mail/em-composer-utils.c:1495
 msgid "an unknown sender"
 msgstr "未知的发件人"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1509
+#: mail/em-composer-utils.c:1505
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "在%Y年%m月%d日的%H:%M，%%s写道："
 
@@ -13038,8 +12487,8 @@ msgstr "<点击这里以便选择文件夹>"
 msgid "Create New Folder"
 msgstr "创建新文件夹"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
-#: mail/mail-component.c:706
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
+#: mail/mail-component.c:704
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "指定在哪里创建文件夹："
@@ -13054,98 +12503,99 @@ msgstr "创建文件夹"
 msgid "Folder _name:"
 msgstr "文件夹名称(_N)："
 
-#: mail/em-folder-tree.c:839
+#: mail/em-folder-tree.c:833
 #, c-format
 msgid "Moving folder %s"
 msgstr "正在移动文件夹“%s”"
 
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree.c:835
 #, c-format
 msgid "Copying folder %s"
 msgstr "正在复制文件夹 %s"
 
-#: mail/em-folder-tree.c:848 mail/message-list.c:1561
+#: mail/em-folder-tree.c:842 mail/message-list.c:1561
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "正在把邮件移动到文件夹 %s"
 
-#: mail/em-folder-tree.c:850 mail/message-list.c:1563
+#: mail/em-folder-tree.c:844 mail/message-list.c:1563
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "把邮件复制到文件夹 %s"
 
-#: mail/em-folder-tree.c:866
+#: mail/em-folder-tree.c:860
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "无法将消息放到顶级文件夹存储"
 
-#: mail/em-folder-tree.c:956 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "复制到文件夹(_C)"
 
-#: mail/em-folder-tree.c:957 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "移动到文件夹(_M)"
 
-#: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2069
-#: mail/em-folder-tree.c:2556 mail/em-folder-view.c:798
+#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
+#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
 #: mail/message-list.c:1651
 msgid "_Move"
 msgstr "移动(_M)"
 
-#: mail/em-folder-tree.c:961 mail/message-list.c:1653
+#: mail/em-folder-tree.c:955 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "取消任务"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
 #: mail/em-folder-view.c:798 mail/em-folder-view.c:812
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "选择文件夹"
 
-#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
 #, fuzzy
 msgid "C_opy"
 msgstr "复制"
 
-#: mail/em-folder-tree.c:2096
+#: mail/em-folder-tree.c:2088
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "正在存储文件夹“%s”"
 
-#: mail/em-folder-tree.c:2282 mail/mail-component.c:706
+#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
 msgid "Create folder"
 msgstr "创建文件夹"
 
-#: mail/em-folder-tree.c:2477
+#: mail/em-folder-tree.c:2463
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "把文件夹“%s”重命名为："
 
-#: mail/em-folder-tree.c:2479
+#: mail/em-folder-tree.c:2465
 msgid "Rename Folder"
 msgstr "重命名文件夹"
 
-#: mail/em-folder-tree.c:2550 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "查看(_V)"
 
-#: mail/em-folder-tree.c:2551
+#: mail/em-folder-tree.c:2537
 msgid "Open in _New Window"
 msgstr "在新窗口中打开(_N)"
 
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2560
+#: mail/em-folder-tree.c:2546
 msgid "_New Folder..."
 msgstr "新建文件夹(_N)..."
 
-#: mail/em-folder-tree.c:2563
+#: mail/em-folder-tree.c:2549
 msgid "_Rename"
 msgstr "重命名(_R)"
 
-#: mail/em-folder-tree.c:2566 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "属性(_P)..."
 
@@ -13164,19 +12614,19 @@ msgstr ""
 msgid "Inbox"
 msgstr "收件箱"
 
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
 msgid "Loading..."
 msgstr "正在装入..."
 
 #: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
 #: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:510
-#: mail/mail-component.c:556
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
+#: mail/mail-component.c:554
 msgid "Mail"
 msgstr "邮件"
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "作为新邮件进行编辑(_E)..."
@@ -13189,17 +12639,17 @@ msgstr "打印(_P)"
 msgid "_Reply to Sender"
 msgstr "回复发件人(_R)"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:810
+#: mail/em-folder-view.c:901 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "回复邮件列表(_L)"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:811
+#: mail/em-folder-view.c:902 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "回复所有人(_A)"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: mail/em-folder-view.c:903 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "转发(_F)"
@@ -13252,6 +12702,10 @@ msgstr "移动到文件夹(_V)..."
 msgid "_Copy to Folder..."
 msgstr "复制到文件夹(_C)..."
 
+#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "标签"
+
 #: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "将发件人添加到地址簿(_B)"
@@ -13301,12 +12755,12 @@ msgid "Filter on _Mailing List"
 msgstr "基于邮件列表过滤(_M)"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
+#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
 #: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "默认"
 
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1796
 msgid "Print Message"
 msgstr "打印消息"
 
@@ -13345,12 +12799,18 @@ msgstr "抄送"
 msgid "Bcc"
 msgstr "密件抄送"
 
+#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
+#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "主题"
+
 #: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
 #: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "日期"
 
-#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
+#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
 msgid "Newsgroups"
 msgstr ""
 
@@ -13541,7 +13001,7 @@ msgid ""
 "practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:757
+#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
 #, fuzzy
 msgid "_View Certificate"
 msgstr "证书 ID(_C)："
@@ -13658,36 +13118,36 @@ msgid ""
 "xmldb' does not exist or is corrupt."
 msgstr ""
 
-#: mail/em-popup.c:699
+#: mail/em-popup.c:700
 msgid "Save As..."
 msgstr "另存为..."
 
-#: mail/em-popup.c:717
+#: mail/em-popup.c:718
 #, c-format
 msgid "untitled_image.%s"
 msgstr "无标题图像.%s"
 
-#: mail/em-popup.c:807
+#: mail/em-popup.c:808
 msgid "Set as _Background"
 msgstr "设为背景(_B)"
 
-#: mail/em-popup.c:809
+#: mail/em-popup.c:810
 msgid "_Reply to sender"
 msgstr "回复发件人(_R)"
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:859
 msgid "_Open Link in Browser"
 msgstr "在浏览器中打开链接(_O)"
 
-#: mail/em-popup.c:859
+#: mail/em-popup.c:860
 msgid "Se_nd message to..."
 msgstr "把邮件发送到列表(_N)..."
 
-#: mail/em-popup.c:860
+#: mail/em-popup.c:861
 msgid "_Add to Addressbook"
 msgstr "添加到地址簿(_A)"
 
-#: mail/em-popup.c:966
+#: mail/em-popup.c:967
 #, c-format
 msgid "Open in %s..."
 msgstr "在 %s 中打开..."
@@ -14290,15 +13750,15 @@ msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution 正在导入您原来的电子邮件"
 
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:226
+#: mail/importers/evolution-mbox-importer.c:221
+#: mail/importers/evolution-outlook-importer.c:255
 #: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "正在导入..."
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:222
-#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/evolution-mbox-importer.c:223
+#: mail/importers/evolution-outlook-importer.c:257
 #: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "请稍候"
@@ -14320,21 +13780,23 @@ msgid "Elm"
 msgstr "Elm"
 
 #: mail/importers/evolution-mbox-importer.c:116
+#: mail/importers/evolution-outlook-importer.c:130
 msgid "Destination folder:"
 msgstr "目的文件夹："
 
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder to import into"
 msgstr "选择要导入到哪个文件夹"
 
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:254
 #: mail/importers/mail-importer.c:226
 #, c-format
 msgid "Importing `%s'"
 msgstr "导入“%s”"
 
-#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/evolution-outlook-importer.c:301
 #: mail/importers/mail-importer.c:140
 msgid "Importing mailbox"
 msgstr "导入邮箱"
@@ -14492,15 +13954,15 @@ msgstr ""
 msgid "%s License Agreement"
 msgstr "%s 许可协议"
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:167
+#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
 msgid "_Host:"
 msgstr "主机(_H)："
 
-#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:151
+#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
 msgid "User_name:"
 msgstr "用户名(_N)："
 
-#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:173
+#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
 msgid "_Path:"
 msgstr "路径(_P)："
 
@@ -14528,66 +13990,66 @@ msgstr "%s 邮件列表"
 msgid "Add Filter Rule"
 msgstr "添加过滤规则"
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:461
 #, c-format
 msgid "%d deleted"
 msgstr "%d 封已删除"
 
-#: mail/mail-component.c:465
+#: mail/mail-component.c:463
 #, c-format
 msgid "%d junk"
 msgstr "%d 封垃圾"
 
-#: mail/mail-component.c:488
+#: mail/mail-component.c:486
 #, c-format
 msgid "%d drafts"
 msgstr "%d 封草稿"
 
-#: mail/mail-component.c:490
+#: mail/mail-component.c:488
 #, c-format
 msgid "%d sent"
 msgstr "%d 已发"
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:490
 #, c-format
 msgid "%d unsent"
 msgstr "%d 封未发"
 
-#: mail/mail-component.c:496
+#: mail/mail-component.c:494
 #, c-format
 msgid "%d total"
 msgstr "总共 %d 封"
 
-#: mail/mail-component.c:498
+#: mail/mail-component.c:496
 #, c-format
 msgid ", %d unread"
 msgstr "，%d 封未读"
 
-#: mail/mail-component.c:658
+#: mail/mail-component.c:656
 msgid "New Mail Message"
 msgstr "新建邮件"
 
-#: mail/mail-component.c:659
+#: mail/mail-component.c:657
 msgid "_Mail Message"
 msgstr "邮件(_M)"
 
-#: mail/mail-component.c:660
+#: mail/mail-component.c:658
 msgid "Compose a new mail message"
 msgstr "撰写一封新邮件"
 
-#: mail/mail-component.c:666
+#: mail/mail-component.c:664
 msgid "New Mail Folder"
 msgstr "新建邮件文件夹"
 
-#: mail/mail-component.c:667
+#: mail/mail-component.c:665
 msgid "Mail _Folder"
 msgstr "邮件文件夹(_F)"
 
-#: mail/mail-component.c:668
+#: mail/mail-component.c:666
 msgid "Create a new mail folder"
 msgstr "创建新邮件文件夹"
 
-#: mail/mail-component.c:800
+#: mail/mail-component.c:798
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
@@ -15317,7 +14779,6 @@ msgid ""
 msgstr ""
 
 #. mail:ask-send-only-bcc-contact primary
-#. mail:ask-send-only-bcc primary
 #: mail/mail-errors.xml.h:22 mail/mail-errors.xml.h:29
 #, fuzzy
 msgid "Are you sure you want to send a message with only BCC recipients?"
@@ -15385,7 +14846,6 @@ msgid ""
 msgstr "从该文件夹永久删除所有已删除的邮件"
 
 #. mail:ask-expunge secondary
-#. mail:ask-empty-trash secondary
 #: mail/mail-errors.xml.h:45 mail/mail-errors.xml.h:50
 msgid "If you continue, you will not be able to recover these messages."
 msgstr ""
@@ -15420,7 +14880,7 @@ msgstr ""
 
 #. mail:camel-exception primary
 #: mail/mail-errors.xml.h:57
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgid "Your message with the subject \"{0}\" was not delivered."
 msgstr ""
 
 #. mail:camel-exception secondary
@@ -15459,13 +14919,6 @@ msgid "{0}."
 msgstr "{0}。"
 
 #. mail:session-message-info secondary
-#. mail:session-message-info-cancel secondary
-#. mail:session-message-warning secondary
-#. mail:session-message-warning-cancel secondary
-#. mail:session-message-error secondary
-#. mail:session-message-error-cancel secondary
-#. mail:ask-session-password secondary
-#. mail:filter-load-error secondary
 #: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
 #: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
 #: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
@@ -15481,8 +14934,7 @@ msgstr "输入密码。"
 #. mail:filter-load-error primary
 #: mail/mail-errors.xml.h:86
 msgid "Error loading filter definitions."
-msgstr ""
-"装入过滤规则信息错误。"
+msgstr "装入过滤规则信息错误。"
 
 #. mail:no-save-path primary
 #: mail/mail-errors.xml.h:90
@@ -15490,19 +14942,11 @@ msgstr ""
 msgid "Cannot save to directory \"{0}\"."
 msgstr "无法创建目录“%s”：%s"
 
-#. mail:no-save-path secondary
-#: mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr "{1}"
-
 #. mail:no-create-path primary
-#. mail:no-write-path-exists primary
-#. mail:no-write-path-notfile primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
 msgid "Cannot save to file \"{0}\"."
-msgstr ""
-"无法保存到文件“{0}”。"
+msgstr "无法保存到文件“{0}”。"
 
 #. mail:no-create-path secondary
 #: mail/mail-errors.xml.h:96
@@ -15516,15 +14960,6 @@ msgstr "无法创建目录“%s”：%s"
 msgid "Cannot create temporary save directory."
 msgstr "无法创建临时目录：%s"
 
-#. mail:no-create-tmp-path secondary
-#. mail:no-delete-folder secondary
-#. system:no-save-file secondary
-#. system:no-load-file secondary
-#: mail/mail-errors.xml.h:100 mail/mail-errors.xml.h:112
-#: widgets/misc/e-system-errors.xml.h:11 widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr "原因是“{1}”。"
-
 #. mail:no-write-path-exists secondary
 #: mail/mail-errors.xml.h:104
 #, fuzzy
@@ -15552,7 +14987,6 @@ msgid "Cannot delete system folder \"{0}\"."
 msgstr "无法删除文件夹：%s：没有该文件夹"
 
 #. mail:no-delete-spethal-folder secondary
-#. mail:no-rename-spethal-folder secondary
 #: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
@@ -15584,13 +15018,11 @@ msgid ""
 msgstr ""
 
 #. mail:no-rename-folder-exists primary
-#. mail:no-rename-folder primary
 #: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr ""
 
 #. mail:no-rename-folder-exists secondary
-#. mail:vfolder-notunique secondary
 #: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
 #, fuzzy
 msgid "A folder named \"{1}\" already exists. Please use a different name."
@@ -15602,28 +15034,24 @@ msgid "Because \"{2}\"."
 msgstr "原因是“{2}”。"
 
 #. mail:no-move-folder-nostore primary
-#. mail:no-move-folder-to-nostore primary
 #: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
 #, fuzzy
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "无法移动文件夹：%s"
 
 #. mail:no-move-folder-nostore secondary
-#. mail:no-copy-folder-nostore secondary
 #: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
 #, fuzzy
 msgid "Cannot open source \"{2}\"."
 msgstr "无法打开“%s”：%s"
 
 #. mail:no-move-folder-to-nostore secondary
-#. mail:no-copy-folder-to-nostore secondary
 #: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
 #, fuzzy
 msgid "Cannot open target \"{2}\"."
 msgstr "无法打开消息"
 
 #. mail:no-copy-folder-nostore primary
-#. mail:no-copy-folder-to-nostore primary
 #: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
 #, fuzzy
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
@@ -15642,7 +15070,6 @@ msgid "Cannot open source \"{1}\""
 msgstr "无法打开“%s”：%s"
 
 #. mail:account-incomplete primary
-#. mail:account-notunique primary
 #: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
 msgid "Cannot save changes to account."
 msgstr ""
@@ -15805,7 +15232,7 @@ msgstr "覆盖(_O)"
 msgid "_Append"
 msgstr "追加(_A)"
 
-#: mail/mail-folder-cache.c:791
+#: mail/mail-folder-cache.c:785
 #, c-format
 msgid "Pinging %s"
 msgstr "正在查验 %s"
@@ -16245,6 +15672,10 @@ msgstr "转发"
 msgid "No Response Necessary"
 msgstr "不必回复"
 
+#: mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "已读"
+
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "回复"
@@ -16345,44 +15776,48 @@ msgid ""
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:10
-msgid "Whether Evolution should start up in offline mode"
+msgid "Toolbar is visible"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid "Whether Evolution should start up in offline mode"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Whether the toolbar should be visible."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
 msgid "Whether to skip the development warning dialog"
 msgstr "是否跳过开发警告对话框"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
+#: shell/apps_evolution_shell.schemas.in.in.h:14
 msgid "mail"
 msgstr "邮件"
 
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
-msgstr "制作团队"
-
-#: shell/e-shell.c:545 shell/e-shell.c:546
+#: shell/e-shell.c:588 shell/e-shell.c:589
 #, fuzzy, c-format
 msgid "%ld KB"
 msgstr "%m月%d日"
 
-#: shell/e-shell.c:743
+#: shell/e-shell.c:786
 #, fuzzy
 msgid "Uknown system error."
 msgstr "未知的错误"
 
-#: shell/e-shell.c:1100
+#: shell/e-shell.c:1143
 msgid "Invalid arguments"
 msgstr "无效参数"
 
-#: shell/e-shell.c:1102
+#: shell/e-shell.c:1145
 msgid "Cannot register on OAF"
 msgstr "无法注册到 OAF"
 
-#: shell/e-shell.c:1104
+#: shell/e-shell.c:1147
 msgid "Configuration Database not found"
 msgstr "找不到配置数据库"
 
-#: shell/e-shell.c:1106
+#: shell/e-shell.c:1149
 msgid "Generic error"
 msgstr "通用错误"
 
@@ -16439,7 +15874,7 @@ msgstr ""
 msgid "Select importer"
 msgstr "选择导入器"
 
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1026
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
 #, c-format
 msgid "File %s does not exist"
 msgstr "文件 %s 不存在"
@@ -16467,31 +15902,32 @@ msgstr ""
 "正在导入 %s\n"
 "正在导入项目 1。"
 
-#: shell/e-shell-importer.c:549
+#: shell/e-shell-importer.c:570
 msgid "Automatic"
 msgstr "自动"
 
-#: shell/e-shell-importer.c:598
-msgid "_Filename:"
-msgstr "文件名(_F)："
+#: shell/e-shell-importer.c:626
+#, fuzzy
+msgid "F_ilename:"
+msgstr "文件名："
 
-#: shell/e-shell-importer.c:603
+#: shell/e-shell-importer.c:631
 msgid "Select a file"
 msgstr "选择一个文件"
 
-#: shell/e-shell-importer.c:613
+#: shell/e-shell-importer.c:642
 msgid "File _type:"
 msgstr "文件类型(_T)："
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:681
 msgid "Import data and settings from _older programs"
 msgstr "从老版程序中导入数据和设置(_O)"
 
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:684
 msgid "Import a _single file"
 msgstr "导入单个文件(_S)"
 
-#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -16499,26 +15935,26 @@ msgstr ""
 "请稍候...\n"
 "正在扫描现有设置"
 
-#: shell/e-shell-importer.c:727
+#: shell/e-shell-importer.c:756
 msgid "Starting Intelligent Importers"
 msgstr "启动智能导入器"
 
-#: shell/e-shell-importer.c:853 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
 #, c-format
 msgid "From %s:"
 msgstr "从 %s："
 
-#: shell/e-shell-importer.c:1044
+#: shell/e-shell-importer.c:1073
 #, fuzzy, c-format
 msgid "No importer available for file %s"
 msgstr "协议“%s”没有可用的提供者"
 
-#: shell/e-shell-importer.c:1056
+#: shell/e-shell-importer.c:1085
 #, fuzzy
 msgid "Unable to execute importer"
 msgstr "执行 gpg 失败。"
 
-#: shell/e-shell-importer.c:1169
+#: shell/e-shell-importer.c:1199
 msgid "_Import"
 msgstr "导入(_I)"
 
@@ -16563,57 +15999,57 @@ msgstr "文件夹名不能含有字符“#”。"
 msgid "'.' and '..' are reserved folder names."
 msgstr "“.”和“..”是保留文件夹名。"
 
-#: shell/e-shell-window.c:336
+#: shell/e-shell-window.c:337
 #, fuzzy
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr "Ximian Evolution 目前在线。点击该按钮则脱机工作。"
 
-#: shell/e-shell-window.c:343
+#: shell/e-shell-window.c:344
 #, fuzzy
 msgid "Evolution is in the process of going offline."
 msgstr "Ximian Evolution 正在脱机过程中。"
 
-#: shell/e-shell-window.c:349
+#: shell/e-shell-window.c:350
 #, fuzzy
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr "Ximian Evolution 目前脱机。点击该按钮则在线工作。"
 
-#: shell/e-shell-window.c:621
+#: shell/e-shell-window.c:637
 #, fuzzy, c-format
 msgid "Switch to %s"
 msgstr "邮寄给 %s"
 
-#: shell/e-shell-window-commands.c:64
+#: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "GNOME Pilot 工具好像并未安装到系统中。"
 
-#: shell/e-shell-window-commands.c:72
+#: shell/e-shell-window-commands.c:74
 #, c-format
 msgid "Error executing %s."
 msgstr "执行 %s 错误。"
 
-#: shell/e-shell-window-commands.c:121
+#: shell/e-shell-window-commands.c:123
 msgid "Bug buddy is not installed."
 msgstr "未安装 Bug buddy。"
 
-#: shell/e-shell-window-commands.c:129
+#: shell/e-shell-window-commands.c:131
 msgid "Bug buddy could not be run."
 msgstr "无法运行 Bug buddy。"
 
-#: shell/e-shell-window-commands.c:171
+#: shell/e-shell-window-commands.c:323
 #, fuzzy
-msgid "About Evolution"
-msgstr "关于 Ximian Evolution"
+msgid "Groupware Suite"
+msgstr "Groupwise"
 
-#: shell/e-shell-window-commands.c:382
+#: shell/e-shell-window-commands.c:563
 msgid "_Work Online"
 msgstr "在线工作(_W)"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "脱机工作(_W)"
 
-#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "脱机工作"
 
@@ -16928,13 +16364,11 @@ msgid "Continue"
 msgstr "继续"
 
 #. shell:noshell title
-#. shell:noshell-reason title
 #: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
 msgid "Cannot start Evolution"
 msgstr "无法启动 Evolution"
 
 #. shell:noshell primary
-#. shell:noshell-reason primary
 #: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
 msgid "Evolution can not start."
 msgstr "Evolution 无法启动。"
@@ -16945,7 +16379,10 @@ msgid ""
 "Your system configuration does not match your Evolution configuration.\n"
 "\n"
 "Click help for details"
-msgstr "您的系统配置与您的 Evolution 配置不相符。\n\n请单击帮助以查看细节"
+msgstr ""
+"您的系统配置与您的 Evolution 配置不相符。\n"
+"\n"
+"请单击帮助以查看细节"
 
 #. shell:noshell-reason secondary
 #: shell/shell-errors.xml.h:29
@@ -16957,30 +16394,30 @@ msgid ""
 "Click help for details."
 msgstr ""
 
-#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:522
+#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
+#: smime/gui/certificate-manager.c:556
 msgid "Select a cert to import..."
 msgstr "选择要导入的证书..."
 
-#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:604
+#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
+#: smime/gui/certificate-manager.c:638
 msgid "Certificate Name"
 msgstr "证书名称"
 
-#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
+#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
 msgid "Purposes"
 msgstr "用途"
 
-#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:517
+#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr "序列号"
 
-#: smime/gui/certificate-manager.c:267
+#: smime/gui/certificate-manager.c:271
 msgid "Expires"
 msgstr "到期"
 
-#: smime/gui/certificate-manager.c:417
+#: smime/gui/certificate-manager.c:446
 msgid "E-Mail Address"
 msgstr "电子邮件地址"
 
@@ -17077,7 +16514,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
 msgid "Certificate"
 msgstr "证书"
 
@@ -17098,19 +16535,23 @@ msgstr "通用名(CN)"
 msgid "Contact Certificates"
 msgstr "联系人证书"
 
-#: smime/gui/smime-ui.glade.h:21
-#, no-c-format
-msgid "Do you want to trust \"%s\" for the following purposes?"
+#: smime/gui/smime-ui.glade.h:20
+msgid "Do not trust the authenticity of this certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:21
 msgid "Dummy window only"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:22
 msgid "Edit"
 msgstr "编辑"
 
+#: smime/gui/smime-ui.glade.h:23
+#, fuzzy
+msgid "Email Certificate Trust Settings"
+msgstr "无效的证书颁发机构(CA)"
+
 #: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr ""
@@ -17145,253 +16586,263 @@ msgstr "组织单元(OU)"
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:37
-msgid "Trust this CA to identify email users."
+msgid "Trust the authenticity of this certificate"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:38
-msgid "Trust this CA to identify software developers."
+msgid "Trust this CA to identify email users."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:39
-msgid "Trust this CA to identify web sites."
+msgid "Trust this CA to identify software developers."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:40
-msgid "View"
-msgstr "查看"
+msgid "Trust this CA to identify web sites."
+msgstr ""
 
 #: smime/gui/smime-ui.glade.h:41
-msgid "View Certificate"
-msgstr "查看证书"
+msgid "View"
+msgstr "查看"
 
 #: smime/gui/smime-ui.glade.h:42
-#, fuzzy
-msgid "You have been asked to trust a new Certificate Authority (CA)."
-msgstr "无效的证书颁发机构(CA)"
-
-#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:44
+#: smime/gui/smime-ui.glade.h:43
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:45
+#: smime/gui/smime-ui.glade.h:44
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:46
+#: smime/gui/smime-ui.glade.h:45
 msgid "Your Certificates"
 msgstr "您的证书"
 
-#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
+#: smime/gui/smime-ui.glade.h:46
+msgid "_Edit CA Trust"
+msgstr ""
+
+#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%Y-%m-%d"
 
-#: smime/lib/e-cert.c:478
+#. x509 certificate usage types
+#: smime/lib/e-cert.c:424
+#, fuzzy
+msgid "Sign"
+msgstr "Stauning"
+
+#: smime/lib/e-cert.c:425
+#, fuzzy
+msgid "Encrypt"
+msgstr "PGP 加密"
+
+#: smime/lib/e-cert.c:530
 msgid "Version"
 msgstr "版本"
 
-#: smime/lib/e-cert.c:493
+#: smime/lib/e-cert.c:545
 msgid "Version 1"
 msgstr "版本 1"
 
-#: smime/lib/e-cert.c:496
+#: smime/lib/e-cert.c:548
 msgid "Version 2"
 msgstr "版本 2"
 
-#: smime/lib/e-cert.c:499
+#: smime/lib/e-cert.c:551
 msgid "Version 3"
 msgstr "版本 3"
 
-#: smime/lib/e-cert.c:581
+#: smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:584
+#: smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:587
+#: smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:590
+#: smime/lib/e-cert.c:642
 msgid "C"
 msgstr "C"
 
-#: smime/lib/e-cert.c:593
+#: smime/lib/e-cert.c:645
 msgid "CN"
 msgstr "CN"
 
-#: smime/lib/e-cert.c:596
+#: smime/lib/e-cert.c:648
 msgid "OU"
 msgstr "OU"
 
-#: smime/lib/e-cert.c:599
+#: smime/lib/e-cert.c:651
 msgid "O"
 msgstr "O"
 
-#: smime/lib/e-cert.c:602
+#: smime/lib/e-cert.c:654
 msgid "L"
 msgstr "L"
 
-#: smime/lib/e-cert.c:605
+#: smime/lib/e-cert.c:657
 msgid "DN"
 msgstr "DN"
 
-#: smime/lib/e-cert.c:608
+#: smime/lib/e-cert.c:660
 msgid "DC"
 msgstr "DC"
 
-#: smime/lib/e-cert.c:611
+#: smime/lib/e-cert.c:663
 msgid "ST"
 msgstr "ST"
 
-#: smime/lib/e-cert.c:614
+#: smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:617
+#: smime/lib/e-cert.c:669
 #, fuzzy
 msgid "Certificate Key Usage"
 msgstr "证书 ID(_C)："
 
-#: smime/lib/e-cert.c:620
+#: smime/lib/e-cert.c:672
 #, fuzzy
 msgid "Netscape Certificate Type"
 msgstr "证书 ID(_C)："
 
-#: smime/lib/e-cert.c:623
+#: smime/lib/e-cert.c:675
 #, fuzzy
 msgid "Certificate Authority Key Identifier"
 msgstr "不信任的证书"
 
-#: smime/lib/e-cert.c:626
+#: smime/lib/e-cert.c:678
 msgid "UID"
 msgstr "UID"
 
-#: smime/lib/e-cert.c:635
+#: smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr ""
 
-#: smime/lib/e-cert.c:686
+#: smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:694
+#: smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
 msgstr ""
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:768
 msgid "Subject Public Key Info"
 msgstr ""
 
-#: smime/lib/e-cert.c:721
+#: smime/lib/e-cert.c:773
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
-#: smime/lib/e-cert.c:736
+#: smime/lib/e-cert.c:788
 #, fuzzy
 msgid "Subject's Public Key"
 msgstr "主题是 %s"
 
-#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
+#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
 #, fuzzy
 msgid "Error: Unable to process extension"
 msgstr "无法处理脱机文件夹"
 
-#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
+#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:782
+#: smime/lib/e-cert.c:834
 #, fuzzy
 msgid "SSL Certificate Authority"
 msgstr "无效的证书颁发机构(CA)"
 
-#: smime/lib/e-cert.c:786
+#: smime/lib/e-cert.c:838
 #, fuzzy
 msgid "Email Certificate Authority"
 msgstr "无效的证书颁发机构(CA)"
 
-#: smime/lib/e-cert.c:814
+#: smime/lib/e-cert.c:866
 #, fuzzy
 msgid "Signing"
 msgstr "Stauning"
 
-#: smime/lib/e-cert.c:818
+#: smime/lib/e-cert.c:870
 #, fuzzy
 msgid "Non-repudiation"
 msgstr "没有信息"
 
-#: smime/lib/e-cert.c:822
+#: smime/lib/e-cert.c:874
 msgid "Key Encipherment"
 msgstr ""
 
-#: smime/lib/e-cert.c:826
+#: smime/lib/e-cert.c:878
 #, fuzzy
 msgid "Data Encipherment"
 msgstr "附件"
 
-#: smime/lib/e-cert.c:830
+#: smime/lib/e-cert.c:882
 msgid "Key Agreement"
 msgstr "密钥协议"
 
-#: smime/lib/e-cert.c:834
+#: smime/lib/e-cert.c:886
 msgid "Certificate Signer"
 msgstr "证书签名者"
 
-#: smime/lib/e-cert.c:838
+#: smime/lib/e-cert.c:890
 msgid "CRL Signer"
 msgstr "CRL 签名者"
 
-#: smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:938
 msgid "Critical"
 msgstr "关键"
 
-#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
+#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
 msgid "Not Critical"
 msgstr "非关键"
 
-#: smime/lib/e-cert.c:912
+#: smime/lib/e-cert.c:964
 msgid "Extensions"
 msgstr "扩展"
 
-#: smime/lib/e-cert.c:983
+#: smime/lib/e-cert.c:1035
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
 msgid "Certificate Signature Algorithm"
 msgstr "证书签名算法"
 
-#: smime/lib/e-cert.c:1048
+#: smime/lib/e-cert.c:1100
 msgid "Issuer"
 msgstr "发行者"
 
-#: smime/lib/e-cert.c:1102
+#: smime/lib/e-cert.c:1154
 msgid "Issuer Unique ID"
 msgstr "发行者唯一 ID"
 
-#: smime/lib/e-cert.c:1121
+#: smime/lib/e-cert.c:1173
 msgid "Subject Unique ID"
 msgstr "主题唯一 ID"
 
-#: smime/lib/e-cert.c:1164
+#: smime/lib/e-cert.c:1216
 msgid "Certificate Signature Value"
 msgstr "证书签名值"
 
@@ -17541,7 +16992,7 @@ msgstr "查看当前联系人"
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "操作(_A)"
 
@@ -17700,7 +17151,7 @@ msgstr "关闭(_L)"
 #: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:3
+#: ui/evolution.xml.h:4
 msgid "Close"
 msgstr "关闭"
 
@@ -17713,7 +17164,7 @@ msgid "Delete this item"
 msgstr "删除此项"
 
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr "主工具栏"
 
@@ -17756,7 +17207,7 @@ msgstr "把此项保存到磁盘"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:44
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "_File"
 msgstr "文件(_F)"
 
@@ -18013,13 +17464,13 @@ msgstr "反转选择(_I)"
 msgid "_Threaded Message List"
 msgstr "按线索编排的邮件列表(_T)"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "关闭此窗口"
 
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "_Close"
 msgstr "关闭(_C)"
 
@@ -18415,7 +17866,7 @@ msgstr "上一封邮件(_P)"
 msgid "_Quoted"
 msgstr "引用(_Q)"
 
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
 msgid "_Tools"
 msgstr "工具(_T)"
 
@@ -18712,106 +18163,120 @@ msgid "_Open Task"
 msgstr "打开任务(_O)"
 
 #: ui/evolution.xml.h:1
-msgid "About Ximian Evolution..."
-msgstr "关于 Ximian Evolution..."
+#, fuzzy
+msgid "About Evolution..."
+msgstr "关于 Ximian Evolution"
 
 #: ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
 msgstr "更改 Evolution 的设置"
 
-#: ui/evolution.xml.h:5
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the visibility of the toolbar"
+msgstr "改变此文件夹的属性"
+
+#: ui/evolution.xml.h:6
 msgid "Create a new window displaying this folder"
 msgstr "创建显示此文件加的新窗口"
 
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "退出(_X)"
 
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Ximian Evolution 常见问题(_F)"
+
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "退出程序"
 
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:10
 msgid "Forget _Passwords"
 msgstr "丢弃密码(_P)"
 
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:11
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "保存的密码被丢弃，所以将再次提示您输入密码"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:12
 msgid "Import data from other programs"
 msgstr "从其它程序导入数据"
 
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:14
 msgid "New _Window"
 msgstr "新建窗口(_W)"
 
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Pi_lot Settings..."
 msgstr "Pilot 设置(_L)..."
 
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Send / Receive"
 msgstr "发送/接收"
 
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Send queued items and retrieve new items"
 msgstr "发送队列中的的邮件并收取新邮件"
 
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Set up Pilot configuration"
 msgstr "配置 Pilot"
 
-#: ui/evolution.xml.h:17
-msgid "Show information about Ximian Evolution"
+#: ui/evolution.xml.h:19
+#, fuzzy
+msgid "Show information about Evolution"
 msgstr "显示关于 Ximian Evolution 的信息"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:20
 msgid "Submit Bug Report"
 msgstr "提交错误报告"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:21
 msgid "Submit _Bug Report"
 msgstr "提交错误报告(_B)"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Submit a bug report using Bug Buddy"
 msgstr "用 Bug Buddy 提交错误报告"
 
-#: ui/evolution.xml.h:21
-msgid "Toggle whether we are working offline."
-msgstr "切换是否脱机工作。"
-
 #: ui/evolution.xml.h:23
-msgid "Ximian Evolution _FAQ"
-msgstr "Ximian Evolution 常见问题(_F)"
+#, fuzzy
+msgid "T_oolbar"
+msgstr "主工具栏"
 
 #: ui/evolution.xml.h:24
-msgid "_About Ximian Evolution..."
-msgstr "关于 Ximian Evolution(_A)..."
+msgid "Toggle whether we are working offline."
+msgstr "切换是否脱机工作。"
 
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "_About Evolution..."
+msgstr "关于 Ximian Evolution"
+
+#: ui/evolution.xml.h:30
 msgid "_Help"
 msgstr "帮助(_H)"
 
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "_Import..."
 msgstr "导入(_I)..."
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "_New"
 msgstr "新建(_N)"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "_Quick Reference"
 msgstr "快速首选项(_Q)"
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_Send / Receive"
 msgstr "发送/接收(_S)"
 
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 msgid "_Window"
 msgstr "窗口(_W)"
 
@@ -19182,14 +18647,12 @@ msgstr "您打算覆盖它吗？"
 #. system:no-save-file primary
 #: widgets/misc/e-system-errors.xml.h:9
 msgid "Cannot save file \"{0}\"."
-msgstr ""
-"无法保存文件“{0}”。"
+msgstr "无法保存文件“{0}”。"
 
 #. system:no-load-file primary
 #: widgets/misc/e-system-errors.xml.h:13
 msgid "Cannot open file \"{0}\"."
-msgstr ""
-"无法打开文件“{0}”。"
+msgstr "无法打开文件“{0}”。"
 
 #: widgets/misc/e-task-widget.c:212
 #, c-format
@@ -19201,3 +18664,429 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% 完成)"
 
+#~ msgid "Failed to connect to LDAP server"
+#~ msgstr "连接 LDAP 服务器失败"
+
+#~ msgid "Failed to authenticate with LDAP server"
+#~ msgstr "LDAP 服务器认证失败"
+
+#~ msgid "Could not perform query on Root DSE"
+#~ msgstr "无法在根 DSE 上执行查询"
+
+#~ msgid "The server responded with no supported search bases"
+#~ msgstr "服务器响应为没有支持的搜索起点"
+
+#~ msgid "This server does not support LDAPv3 schema information"
+#~ msgstr "此服务器不支持 LDAPv3 schema 信息"
+
+#~ msgid "Error retrieving schema information"
+#~ msgstr "检索 schema 信息错误"
+
+#~ msgid "Server did not respond with valid schema information"
+#~ msgstr "服务器没有响应有效的 schema 信息"
+
+#~ msgid "  S_how Supported Bases "
+#~ msgstr " 显示支持的基础(_H) "
+
+#~ msgid "1:00"
+#~ msgstr "1:00"
+
+#~ msgid "5:00"
+#~ msgstr "5:00"
+
+#~ msgid "Connecting"
+#~ msgstr "连接"
+
+#~ msgid "Distinguished _name:"
+#~ msgstr "识别性名称(_N)："
+
+#~ msgid "Email address:"
+#~ msgstr "电子邮件地址："
+
+#~ msgid "Evolution will use this DN to authenticate you with the server"
+#~ msgstr "Evolution 将使用此已识别的名字在服务器上对您进行认证"
+
+#~ msgid "One"
+#~ msgstr "一级"
+
+#~ msgid "S_earch scope: "
+#~ msgstr "搜索范围(_E)："
+
+#~ msgid "Searching"
+#~ msgstr "搜索"
+
+#~ msgid "Sub"
+#~ msgstr "子级"
+
+#~ msgid "This option controls how long a search will be run."
+#~ msgstr "此选项控制搜索将运行多长时间。"
+
+#~ msgid "U_se SSL/TLS:"
+#~ msgstr "使用 _SSL/TLS："
+
+#~ msgid "_Display name:"
+#~ msgstr "显示名称(_D)："
+
+#~ msgid "_Port number:"
+#~ msgstr "端口号(_P)："
+
+#~ msgid "_Search base:"
+#~ msgstr "搜索起点(_S)："
+
+#~ msgid "_Server name:"
+#~ msgstr "服务器名(_S)："
+
+#~ msgid "_Timeout (minutes):"
+#~ msgstr "超时(分钟)(_T)："
+
+#~ msgid "connecting-tab"
+#~ msgstr "连接页"
+
+#~ msgid "general-tab"
+#~ msgstr "常规页"
+
+#~ msgid "searching-tab"
+#~ msgstr "搜索页"
+
+#~ msgid "Webcam:"
+#~ msgstr "摄像头："
+
+#~ msgid "item7"
+#~ msgstr "项目 7"
+
+#~ msgid "item8"
+#~ msgstr "项目 8"
+
+#~ msgid "Category editor not available."
+#~ msgstr "类别编辑器不可用。"
+
+#~ msgid "Do you want to save changes?"
+#~ msgstr "您希望保存修改吗？"
+
+#~ msgid "Error saving %s: %s"
+#~ msgstr "保存 %s 出错：%s"
+
+#~ msgid ""
+#~ "The addressbook backend for\n"
+#~ "%s\n"
+#~ "has crashed. You will have to restart Evolution in order to use it again"
+#~ msgstr ""
+#~ "%s\n"
+#~ "的地址簿后端已经崩溃。您需要重新启动 Evolution 才能再次使用该后端"
+
+#~ msgid "Can not load URI"
+#~ msgstr "无法装入 URI"
+
+#~ msgid "Calendar Properties"
+#~ msgstr "日历属性"
+
+#~ msgid "Remote"
+#~ msgstr "远程"
+
+#~ msgid "Task List Properties"
+#~ msgstr "任务列表属性"
+
+#~ msgid "_Refresh Interval:"
+#~ msgstr "刷新间隔(_R)："
+
+#~ msgid "_Source URL:"
+#~ msgstr "源 URI(_S)："
+
+#~ msgid ""
+#~ "The event being deleted is a meeting, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr "即将删除的事件是一个会议，您是否想要发送一条取消通告？"
+
+#~ msgid "Are you sure you want to cancel and delete this meeting?"
+#~ msgstr "您真的要取消并删除此会议吗？"
+
+#~ msgid ""
+#~ "The task being deleted is assigned, would you like to send a cancellation "
+#~ "notice?"
+#~ msgstr "即将删除的任务已被指派，您是否想要要发送一条取消通告？"
+
+#~ msgid "Are you sure you want to cancel and delete this task?"
+#~ msgstr "您真的要取消并删除此任务吗？"
+
+#~ msgid ""
+#~ "The journal entry being deleted is published, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr "即将删除的日历项已公布，您是否想要发送一条取消通告？"
+
+#~ msgid "Are you sure you want to cancel and delete this journal entry?"
+#~ msgstr "您真的想要取消并删除该日志条目吗？"
+
+#~ msgid "Are you sure you want to delete the appointment `%s'?"
+#~ msgstr "您真的想要删除约会“%s”吗？"
+
+#~ msgid "Are you sure you want to delete this untitled appointment?"
+#~ msgstr "您真的想要删除此无标题约会吗？"
+
+#~ msgid "Are you sure you want to delete the task `%s'?"
+#~ msgstr "您真的想要删除任务“%s”吗？"
+
+#~ msgid "Are you sure you want to delete this untitled task?"
+#~ msgstr "您真的想要删除此无标题任务吗？"
+
+#~ msgid "Are you sure you want to delete the journal entry `%s'?"
+#~ msgstr "您真的想要删除日志条目“%s”吗？"
+
+#~ msgid "Are you sure want to delete this untitled journal entry?"
+#~ msgstr "您真的想要删除此无标题日志条目吗？"
+
+#~ msgid "Are you sure you want to delete %d appointment?"
+#~ msgid_plural "Are you sure you want to delete %d appointments?"
+#~ msgstr[0] "您真的想要删除 %d 个约会吗？"
+
+#~ msgid "Are you sure you want to delete %d task?"
+#~ msgid_plural "Are you sure you want to delete %d tasks?"
+#~ msgstr[0] "您真的想要删除 %d 个任务吗？"
+
+#~ msgid "Are you sure you want to delete %d journal entry?"
+#~ msgid_plural "Are you sure you want to delete %d journal entries?"
+#~ msgstr[0] "您真的想要删除 %d 个日志条目吗？"
+
+#~ msgid "_Invite Others..."
+#~ msgstr "邀请其他人(_I)..."
+
+#~ msgid ""
+#~ "This event has been changed, but has not been saved.\n"
+#~ "\n"
+#~ "Do you wish to save your changes?"
+#~ msgstr ""
+#~ "该事件已经被改变，但还没有保存。\n"
+#~ "\n"
+#~ "您希望保存改动吗？"
+
+#~ msgid "_Discard Changes"
+#~ msgstr "丢弃修改(_D)"
+
+#~ msgid "Save Event"
+#~ msgstr "保存事件"
+
+#~ msgid "The meeting information has been created. Send it?"
+#~ msgstr "会议信息已创建。发送此信息吗？"
+
+#~ msgid "The meeting information has changed. Send an updated version?"
+#~ msgstr "会议信息已经改变。发送更新版本吗？"
+
+#~ msgid "The task assignment information has been created. Send it?"
+#~ msgstr "任务分配信息已创建。发送此信息吗？"
+
+#~ msgid "The task information has changed. Send an updated version?"
+#~ msgstr "任务信息已经改变。发送更新版本？"
+
+#, fuzzy
+#~ msgid "Could not get article %s from NNTP server"
+#~ msgstr "无法获取组：%s"
+
+#, fuzzy
+#~ msgid "Error posting message: %s: message not posted"
+#~ msgstr ""
+#~ "自动存储邮件错误：%s\n"
+#~ " %s"
+
+#, fuzzy
+#~ msgid "Stream error"
+#~ msgstr "解析错误"
+
+#, fuzzy
+#~ msgid "Connection error: %s"
+#~ msgstr "未知的错误：%s"
+
+#~ msgid "Could not get group: %s"
+#~ msgstr "无法获取组：%s"
+
+#, fuzzy
+#~ msgid "Could not get messages: unspecified error"
+#~ msgstr "无法发送邮件：%s"
+
+#~ msgid "Unknown server response: %s"
+#~ msgstr "未知的服务器应答：%s"
+
+#~ msgid "Adjust Score"
+#~ msgstr "调整评分"
+
+#~ msgid "Assign Color"
+#~ msgstr "指定颜色"
+
+#~ msgid "Assign Score"
+#~ msgstr "指定分数"
+
+#~ msgid "Attachments"
+#~ msgstr "附件"
+
+#~ msgid "Beep"
+#~ msgstr "响铃"
+
+#~ msgid "contains"
+#~ msgstr "含有"
+
+#~ msgid "Copy to Folder"
+#~ msgstr "复制到文件夹"
+
+#~ msgid "Date received"
+#~ msgstr "接收日期"
+
+#~ msgid "Date sent"
+#~ msgstr "发送日期"
+
+#~ msgid "Deleted"
+#~ msgstr "已删除"
+
+#~ msgid "does not contain"
+#~ msgstr "不含有"
+
+#~ msgid "does not end with"
+#~ msgstr "不以之结尾"
+
+#~ msgid "does not exist"
+#~ msgstr "不存在"
+
+#~ msgid "does not return"
+#~ msgstr "不返回"
+
+#~ msgid "does not sound like"
+#~ msgstr "听起来不像"
+
+#~ msgid "does not start with"
+#~ msgstr "不以之开始"
+
+#~ msgid "Do Not Exist"
+#~ msgstr "不存在"
+
+#~ msgid "Draft"
+#~ msgstr "草稿"
+
+#~ msgid "ends with"
+#~ msgstr "以之结束"
+
+#~ msgid "Exist"
+#~ msgstr "存在"
+
+#~ msgid "exists"
+#~ msgstr "存在"
+
+#~ msgid "Expression"
+#~ msgstr "表达式"
+
+#~ msgid "Follow Up"
+#~ msgstr "跟随"
+
+#~ msgid "is"
+#~ msgstr "是"
+
+#~ msgid "is after"
+#~ msgstr "以后"
+
+#~ msgid "is before"
+#~ msgstr "以前"
+
+#~ msgid "is Flagged"
+#~ msgstr "有标志"
+
+#~ msgid "is greater than"
+#~ msgstr "大于"
+
+#~ msgid "is less than"
+#~ msgstr "小于"
+
+#~ msgid "is not"
+#~ msgstr "不是"
+
+#~ msgid "is not Flagged"
+#~ msgstr "未标志"
+
+#~ msgid "Junk Test"
+#~ msgstr "垃圾测试"
+
+#~ msgid "Mailing list"
+#~ msgstr "邮件列表"
+
+#~ msgid "Message Body"
+#~ msgstr "邮件体"
+
+#~ msgid "Message Header"
+#~ msgstr "邮件头"
+
+#~ msgid "Message is Junk"
+#~ msgstr "邮件是垃圾"
+
+#~ msgid "Message is not Junk"
+#~ msgstr "邮件不是垃圾"
+
+#~ msgid "Move to Folder"
+#~ msgstr "移动到文件夹"
+
+#~ msgid "Pipe to Program"
+#~ msgstr "管道到程序"
+
+#~ msgid "Play Sound"
+#~ msgstr "播放声音"
+
+#~ msgid "Recipients"
+#~ msgstr "收件人"
+
+#~ msgid "Regex Match"
+#~ msgstr "常规表达式匹配"
+
+#~ msgid "Replied to"
+#~ msgstr "已回复"
+
+#~ msgid "returns"
+#~ msgstr "返回"
+
+#~ msgid "returns greater than"
+#~ msgstr "返回大于"
+
+#~ msgid "returns less than"
+#~ msgstr "返回小于"
+
+#~ msgid "Run Program"
+#~ msgstr "运行程序"
+
+#~ msgid "Sender"
+#~ msgstr "发件人"
+
+#~ msgid "Set Status"
+#~ msgstr "设置状态"
+
+#~ msgid "Size (kB)"
+#~ msgstr "大小 (kB)"
+
+#~ msgid "sounds like"
+#~ msgstr "听起来象"
+
+#~ msgid "Source Account"
+#~ msgstr "来源账户"
+
+#~ msgid "Specific header"
+#~ msgstr "指定邮件头"
+
+#~ msgid "starts with"
+#~ msgstr "以之开始"
+
+#~ msgid "Stop Processing"
+#~ msgstr "停止处理"
+
+#~ msgid "Unset Status"
+#~ msgstr "未设置状态"
+
+#~ msgid "Brought to you by"
+#~ msgstr "制作团队"
+
+#~ msgid "_Filename:"
+#~ msgstr "文件名(_F)："
+
+#~ msgid "View Certificate"
+#~ msgstr "查看证书"
+
+#, fuzzy
+#~ msgid "You have been asked to trust a new Certificate Authority (CA)."
+#~ msgstr "无效的证书颁发机构(CA)"
+
+#~ msgid "About Ximian Evolution..."
+#~ msgstr "关于 Ximian Evolution..."
+
+#~ msgid "_About Ximian Evolution..."
+#~ msgstr "关于 Ximian Evolution(_A)..."
diff --git a/po/zh_TW.po b/po/zh_TW.po
index a0296bdd4e..2350622072 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.3.1.99\n"
-"POT-Creation-Date: 2004-05-19 14:00-0400\n"
+"POT-Creation-Date: 2004-06-03 11:14-0400\n"
 "PO-Revision-Date: 2003-03-23 11:33+0800\n"
 "Last-Translator: Chao-Hsiung Liao <pesder.liao@msa.hinet.net>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -76,16 +76,16 @@ msgid "Default Sync Address:"
 msgstr "預設的同步地址:"
 
 # camel/camel-provider.c:140
-#: addressbook/conduit/address-conduit.c:1150
 #: addressbook/conduit/address-conduit.c:1151
+#: addressbook/conduit/address-conduit.c:1152
 #, fuzzy
 msgid "Could not load addressbook"
 msgstr "無法載入 %s：%s"
 
 # addressbook/conduit/address-conduit.c:687
 # addressbook/conduit/address-conduit.c:690
-#: addressbook/conduit/address-conduit.c:1219
-#: addressbook/conduit/address-conduit.c:1222
+#: addressbook/conduit/address-conduit.c:1220
+#: addressbook/conduit/address-conduit.c:1223
 msgid "Could not read pilot's Address application block"
 msgstr "無法讀取 pilot 通訊錄程式區塊"
 
@@ -93,14 +93,14 @@ msgstr "無法讀取 pilot 通訊錄程式區塊"
 msgid "Accessing LDAP Server anonymously"
 msgstr "正以匿名方式存取 LDAP 伺服器"
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
 msgid "Failed to authenticate.\n"
 msgstr "驗證憑證失敗。\n"
 
 # camel/camel-smime-context.c:194
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%s請輸入 %s 所需的密碼(使用者 %s)"
@@ -155,59 +155,27 @@ msgstr "連絡人(_C):"
 msgid "Create a new contacts group"
 msgstr "新增功能群組"
 
-#: addressbook/gui/component/addressbook-component.c:182
+#: addressbook/gui/component/addressbook-component.c:184
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr ""
 
-# camel/providers/imap/camel-imap-store.c:531
-#: addressbook/gui/component/addressbook-config.c:483
-msgid "Failed to connect to LDAP server"
-msgstr "無法連線至 LDAP 伺服器"
-
-# camel/providers/imap/camel-imap-store.c:531
-#: addressbook/gui/component/addressbook-config.c:507
-msgid "Failed to authenticate with LDAP server"
-msgstr "無法驗證進入 LDAP 伺服器"
-
-#: addressbook/gui/component/addressbook-config.c:535
-msgid "Could not perform query on Root DSE"
-msgstr "無法在 Root DSE 上執行查詢"
-
-#: addressbook/gui/component/addressbook-config.c:840
-msgid "The server responded with no supported search bases"
-msgstr "伺服器回報了不支援的搜尋起點"
-
-#: addressbook/gui/component/addressbook-config.c:1245
-msgid "This server does not support LDAPv3 schema information"
-msgstr "這個伺服器不支援 LDAPv3 模式的資訊"
-
-# mail/mail-callbacks.c:1349
-#: addressbook/gui/component/addressbook-config.c:1266
-msgid "Error retrieving schema information"
-msgstr "接收模式資訊時發生錯誤"
-
-# camel/providers/imap/camel-imap-command.c:487
-#: addressbook/gui/component/addressbook-config.c:1274
-msgid "Server did not respond with valid schema information"
-msgstr "伺服器沒有回應有效的模式資訊"
-
 # mail/mail-send-recv.c:287
 # mail/mail-send-recv.c:333
 #: addressbook/gui/component/addressbook-migrate.c:68
-#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1160
 #, fuzzy
 msgid "Migrating..."
 msgstr "正在等待..."
 
 # mail/mail-ops.c:599
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1201
 #, fuzzy, c-format
 msgid "Migrating `%s':"
 msgstr "Pinging %s"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:438
+#: addressbook/gui/component/addressbook-migrate.c:464
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
 #: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
@@ -215,34 +183,34 @@ msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:446
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
-#: mail/mail-config.glade.h:106
+#: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
+#: mail/mail-config.glade.h:109
 msgid "Personal"
 msgstr "個人"
 
 # addressbook/gui/component/addressbook-config.c:148
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:454
+#: addressbook/gui/component/addressbook-migrate.c:480
 #, fuzzy
 msgid "On LDAP Servers"
 msgstr "LDAP 伺服器"
 
 # addressbook/gui/component/addressbook-config.c:148
-#: addressbook/gui/component/addressbook-migrate.c:582
+#: addressbook/gui/component/addressbook-migrate.c:608
 #, fuzzy
 msgid "LDAP Servers"
 msgstr "LDAP 伺服器"
 
 # mail/mail-config.glade.h:76
-#: addressbook/gui/component/addressbook-migrate.c:702
+#: addressbook/gui/component/addressbook-migrate.c:728
 #, fuzzy
 msgid "Autocompletion Settings"
 msgstr "自動補齊資料夾"
 
-#: addressbook/gui/component/addressbook-migrate.c:1076
+#: addressbook/gui/component/addressbook-migrate.c:1104
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -250,34 +218,34 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1090
+#: addressbook/gui/component/addressbook-migrate.c:1118
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1099
+#: addressbook/gui/component/addressbook-migrate.c:1127
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1109
+#: addressbook/gui/component/addressbook-migrate.c:1137
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:674
+#: addressbook/gui/component/addressbook-view.c:675
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
 # importers/pine-importer.c:661
-#: addressbook/gui/component/addressbook-view.c:761
+#: addressbook/gui/component/addressbook-view.c:754
 #, fuzzy
 msgid "New Address Book"
 msgstr "目錄服務"
@@ -293,12 +261,11 @@ msgstr "目錄服務"
 # ui/evolution-event-editor.xml.h:17
 # ui/evolution-mail.xml.h:22
 # ui/evolution-task-editor-dialog.xml.h:18
-#: addressbook/gui/component/addressbook-view.c:762
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:365
-#: filter/libfilter-i18n.h:11 ui/evolution-addressbook.xml.h:8
-#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:3
+#: addressbook/gui/component/addressbook-view.c:755
+#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
+#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
@@ -308,19 +275,15 @@ msgstr "刪除"
 # ui/evolution-mail.xml.h:115
 # ui/evolution-task-editor-dialog.xml.h:83
 # ui/evolution.xml.h:60
-#: addressbook/gui/component/addressbook-view.c:763
-#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-view.c:756
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "屬性..."
 
 # ui/evolution-addressbook.xml.h:17
-#. Fix me *
-#. can not get name, should be a bug of e-book.Anyway, should set a default name.
-#.
-#. name = e_book_get_name (book);
-#: addressbook/gui/component/addressbook-view.c:1002
+#. Create the contacts group
+#: addressbook/gui/component/addressbook-view.c:995
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
 #: calendar/gui/migration.c:373
 msgid "Contacts"
 msgstr "連絡人"
@@ -414,12 +377,7 @@ msgstr ""
 msgid "Manage your S/MIME certificates here"
 msgstr ""
 
-# mail/mail-config.glade.h:1
 #: addressbook/gui/component/ldap-config.glade.h:1
-msgid "  S_how Supported Bases "
-msgstr " 顯示支援的起點(_S) "
-
-#: addressbook/gui/component/ldap-config.glade.h:2
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:1
@@ -434,228 +392,188 @@ msgstr " 顯示支援的起點(_S) "
 #: calendar/gui/dialogs/new-task-list.glade.h:1
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
+#: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
 #: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:2
 msgid "1"
 msgstr ""
 
-# calendar/gui/e-calendar-table.c:377
-#: addressbook/gui/component/ldap-config.glade.h:4
-msgid "1:00"
-msgstr "1:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:4
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "5"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:8
-msgid "5:00"
-msgstr "5:00"
-
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "636"
 msgstr "636"
 
 # mail/mail-config.glade.h:10
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:7
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "驗證"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:8
 #, fuzzy
 msgid "<b>Display</b>"
 msgstr "<b>開始:</b>"
 
 # addressbook/backend/ebook/e-card.c:3442
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:9
 #, fuzzy
 msgid "<b>Downloading</b>"
 msgstr "位置(_O):"
 
 # addressbook/gui/search/e-addressbook-search-dialog.c:158
 # mail/mail-search.c:242
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:10
 #, fuzzy
 msgid "<b>Searching</b>"
 msgstr "搜尋中"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:395
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:11
 #, fuzzy
 msgid "<b>Server Information</b>"
 msgstr "步驟一：伺服器資訊"
 
-#: addressbook/gui/component/ldap-config.glade.h:15
+#: addressbook/gui/component/ldap-config.glade.h:12
 #, fuzzy
 msgid "<b>Type:</b>"
 msgstr "<b>逾期:</b>"
 
 # ui/evolution-addressbook.xml.h:17
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:13
 #, fuzzy
 msgid "Add Contacts Group"
 msgstr "連絡人(_C):"
 
 # addressbook/gui/component/addressbook-config.glade.h:2
-#: addressbook/gui/component/ldap-config.glade.h:17
+#: addressbook/gui/component/ldap-config.glade.h:14
 #, fuzzy
 msgid "Address Book Properties"
 msgstr "目錄服務來源"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
-#: mail/mail-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:79
+#: mail/mail-config.glade.h:42
 msgid "Always"
 msgstr "永遠"
 
 # camel/camel-sasl-anonymous.c:33
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Anonymously"
 msgstr "匿名"
 
-#: addressbook/gui/component/ldap-config.glade.h:20
+#: addressbook/gui/component/ldap-config.glade.h:17
 #: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "基本"
 
-# ui/evolution-addressbook.xml.h:17
-#: addressbook/gui/component/ldap-config.glade.h:21
-msgid "Connecting"
-msgstr "連線中"
-
 # addressbook/contact-editor/contact-editor.glade.h:8
 # calendar/gui/dialogs/task-editor-dialog.glade.h:9
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: addressbook/gui/component/ldap-config.glade.h:18
 #: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
 #: smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "詳細資料"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
-msgid "Distinguished _name:"
-msgstr "'辨別的名稱(_N):"
-
-#: addressbook/gui/component/ldap-config.glade.h:24
+#: addressbook/gui/component/ldap-config.glade.h:19
 #, fuzzy
 msgid "Distinguished name"
 msgstr "'辨別的名稱(_N):"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:20
 #, fuzzy
 msgid "Download limit:"
 msgstr "下載限制(_D):"
 
 # mail/mail-config.glade.h:29
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:21
 #, fuzzy
 msgid "Email address"
 msgstr "電子郵件位址(_A):"
 
-# mail/mail-config.glade.h:29
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:22
 #, fuzzy
-msgid "Email address:"
-msgstr "電子郵件位址(_A):"
-
-#: addressbook/gui/component/ldap-config.glade.h:28
-msgid "Evolution will use this DN to authenticate you with the server"
-msgstr "Evolution 會使用這個 DN 透過伺服器來驗證您"
-
-#: addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
-"Evolution will use this email address to authenticate you with the server"
+"Evolution will use this email address to authenticate you with the server."
 msgstr "Evolution 會使用電子郵件位址透過伺服器來驗證您"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:23
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "支援的搜尋起點"
 
 # addressbook/contact-editor/contact-editor.glade.h:10
 # executive-summary/component/executive-summary-config.glade.h:3
-#: addressbook/gui/component/ldap-config.glade.h:31
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:24
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
+#: mail/mail-config.glade.h:86 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "一般"
 
 # calendar/gui/event-editor-dialog.glade.h:10
-#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
-#: mail/mail-config.glade.h:99
+#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:81
+#: mail/mail-config.glade.h:102
 msgid "Never"
 msgstr "永不"
 
-# addressbook/gui/component/addressbook-config.c:179
-#: addressbook/gui/component/ldap-config.glade.h:33
-msgid "One"
-msgstr "一層"
-
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Only locations within starting point"
 msgstr ""
 
 # addressbook/gui/component/addressbook-config.c:430
-#: addressbook/gui/component/ldap-config.glade.h:35
-msgid "S_earch scope: "
-msgstr "搜尋範圍(_E):"
+#: addressbook/gui/component/ldap-config.glade.h:27
+#, fuzzy
+msgid "Search _base:"
+msgstr "搜尋起點(_S):"
 
 # addressbook/gui/component/addressbook-config.c:430
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
 msgid "Search base only"
 msgstr "搜尋起點(_S):"
 
 # addressbook/gui/component/addressbook-config.c:430
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:29
 #, fuzzy
 msgid "Search base:"
 msgstr "搜尋起點(_S):"
 
 # addressbook/gui/component/addressbook-config.c:430
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Search scope:"
 msgstr "搜尋範圍(_E):"
 
-# addressbook/gui/search/e-addressbook-search-dialog.c:158
-# mail/mail-search.c:242
-#: addressbook/gui/component/ldap-config.glade.h:39
-msgid "Searching"
-msgstr "搜尋中"
-
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:31
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
-"server if\n"
-"your LDAP server supports SSL or TLS."
+"server if your LDAP server supports SSL or TLS."
 msgstr ""
 "選擇這個選項代表 Evolution 只有在您的 LDAP 伺服器支援 SSL 或 TLS 時\n"
 "才會連線到您的 LDAP 伺服器。"
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:32
+#, fuzzy
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
-"you are in a \n"
-"insecure environment. For example, if you and your LDAP server are behind a "
-"firewall\n"
-"at work, then Evolution doesn't need to use SSL/TLS because your connection "
-"is already\n"
-"secure."
+"you are in a insecure environment. For example, if you and your LDAP server "
+"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
+"because your connection is already secure."
 msgstr ""
 "選擇這個選項代表 Evolution 只有在您處於不安全的環境下才會嘗試使用 SSL/"
 "TLS 。\n"
@@ -663,71 +581,63 @@ msgstr ""
 "那麼 Evolution 就不需要使用 SSL/TLS，因為您的連線已經\n"
 "很安全了。"
 
-#: addressbook/gui/component/ldap-config.glade.h:46
+#: addressbook/gui/component/ldap-config.glade.h:33
+#, fuzzy
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
-"TLS.  This \n"
-"means that your connection will be insecure, and that you will be vulnerable "
-"to security\n"
-"exploits. "
+"TLS.  This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits. "
 msgstr ""
 "選擇這個選項代表您的伺服器不支援 SSL 或 TLS。這\n"
 "表示您的連線將是不安全的，同時您在安全性上是有\n"
 "弱點的。"
 
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Starting point and locations within it"
 msgstr ""
 
-# calendar/gui/print.c:362
-#: addressbook/gui/component/ldap-config.glade.h:50
-msgid "Sub"
-msgstr "子目錄"
-
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "Supported Search Bases"
 msgstr "支援的搜尋起點"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:36
+#, fuzzy
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
-"searches will \n"
-"begin. If you leave this blank, the search will begin at the root of the "
-"directory tree."
+"searches will begin. If you leave this blank, the search will begin at the "
+"root of the directory tree."
 msgstr ""
 "搜尋起點是您的搜尋起始處的辨認的名稱 (DN)。\n"
 "如果您讓它保持空白，搜尋會從樹狀目錄的根目錄開始。"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:37
+#, fuzzy
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
-"the \n"
-"directory tree. A search scope of \"sub\" will include all entries below "
-"your search base.\n"
-"A search scope of \"one\" will only include the entries one level beneath "
-"your base.\n"
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
 msgstr ""
 "搜尋範圍定義了您想要往下搜尋樹狀目錄到多深的程度。\n"
 "“子目錄”的搜尋範圍會包括在您的搜尋起點之下的所有項目。\n"
 "“一層”的搜尋範圍只會包括在您的起點下一層的項目。\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:58
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr "這是您的 ldap 伺服器的完整名稱。例如：“ldap.mycompany.com”。"
 
-#: addressbook/gui/component/ldap-config.glade.h:59
+#: addressbook/gui/component/ldap-config.glade.h:39
 #, fuzzy
 msgid ""
-"This is the maximum number of entries to download. Setting this number to "
-"be \n"
+"This is the maximum number of entries to download. Setting this number to be "
 "too large will slow down your address book."
 msgstr ""
 "這是要下載的項目的最大數量。把這個數量設得\n"
 "太大會減慢您的目錄服務的速度。"
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -736,122 +646,110 @@ msgstr ""
 "這是 Evolution 將要用驗證您的方法。注意要設定此項至“電子郵件位址”需要您的 "
 "LDAP 伺服器的匿名存取。"
 
-#: addressbook/gui/component/ldap-config.glade.h:62
+#: addressbook/gui/component/ldap-config.glade.h:41
+#, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
-"list.\n"
-"It is for display purposes only. "
+"list. It is for display purposes only. "
 msgstr ""
 "這是此伺服器出現於您的 Evolution 資料夾清單中的名稱。\n"
 "它僅做為顯示之用。"
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:42
+#, fuzzy
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. "
-"A \n"
-"list of standard ports has been provided. Ask your system administrator\n"
-"what port you should specify."
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
 msgstr ""
 "這是 Evolution 會試著連線的 LDAP 伺服器連接埠。\n"
 "這裡提供了標準連接埠的清單。請詢問您的系統管理者\n"
 "您應該指定哪個連接埠。"
 
-#: addressbook/gui/component/ldap-config.glade.h:67
-msgid "This option controls how long a search will be run."
-msgstr "這個選項控制搜尋會執行多久的時間。"
-
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:43
 #, fuzzy
 msgid "Timeout:"
 msgstr "時間格式:"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
-msgid "U_se SSL/TLS:"
-msgstr "使用 SSL/TLS(_S):"
-
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:44
 msgid "Using distinguished name (DN)"
 msgstr "使用辨認的名稱 (DN)"
 
 # mail/mail-config.glade.h:29
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:45
 msgid "Using email address"
 msgstr "使用電子郵件位址"
 
-#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
-#: mail/mail-config.glade.h:154
+#: addressbook/gui/component/ldap-config.glade.h:46 mail/mail-account-gui.c:80
+#: mail/mail-config.glade.h:156
 msgid "Whenever Possible"
 msgstr "每次可能的時候"
 
 # ui/evolution-addressbook.xml.h:17
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:47
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "連絡人(_C):"
 
-# calendar/gui/calendar-summary.c:622
-# mail/mail-config.glade.h:24
-#: addressbook/gui/component/ldap-config.glade.h:74
-#: calendar/gui/dialogs/calendar-setup.glade.h:12
-msgid "_Display name:"
-msgstr "顯示名稱(_D):"
-
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:48
 msgid "_Download limit:"
 msgstr "下載限制(_D):"
 
 # mail/mail-config.glade.h:29
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:49
 #, fuzzy
 msgid "_Email address:"
 msgstr "電子郵件位址(_A):"
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:50
+#, fuzzy
+msgid "_Find Possible Search Bases"
+msgstr "支援的搜尋起點"
+
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "_Log in method:"
 msgstr "登入方法(_L):"
 
+# camel/camel-sasl-login.c:32
+#: addressbook/gui/component/ldap-config.glade.h:52
+#, fuzzy
+msgid "_Log in:"
+msgstr "登入"
+
 # addressbook/gui/component/addressbook-config.c:686
 # mail/mail-config.glade.h:43
-#: addressbook/gui/component/ldap-config.glade.h:78
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
+#: addressbook/gui/component/ldap-config.glade.h:53
+#: calendar/gui/dialogs/calendar-setup.glade.h:8 mail/mail-config.glade.h:171
 msgid "_Name:"
 msgstr "名稱(_N):"
 
-# addressbook/gui/component/addressbook-config.c:409
-#: addressbook/gui/component/ldap-config.glade.h:79
-msgid "_Port number:"
-msgstr "連接埠號碼(_P):"
-
 # calendar/gui/dialogs/task-editor-dialog.glade.h:26
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:54
 #, fuzzy
 msgid "_Port:"
 msgstr "優先順序(_P):"
 
 # addressbook/gui/component/addressbook-config.c:430
-#: addressbook/gui/component/ldap-config.glade.h:81
-msgid "_Search base:"
-msgstr "搜尋起點(_S):"
-
-# calendar/gui/e-itip-control.glade.h:10
-#: addressbook/gui/component/ldap-config.glade.h:82
-msgid "_Server name:"
-msgstr "伺服器名稱(_S):"
+#: addressbook/gui/component/ldap-config.glade.h:55
+#, fuzzy
+msgid "_Search scope:"
+msgstr "搜尋範圍(_E):"
 
 # calendar/gui/event-editor-dialog.glade.h:10
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:56
 #, fuzzy
 msgid "_Server:"
 msgstr "每(_E)"
 
-# calendar/gui/dialogs/alarm-notify.glade.h:4
-#: addressbook/gui/component/ldap-config.glade.h:84
-msgid "_Timeout (minutes):"
-msgstr "逾時時間（分鐘）(_T):"
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:57
+#, fuzzy
+msgid "_Timeout:"
+msgstr "時間格式:"
 
 # mail/mail-config.glade.h:79
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:58
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "使用安全連線 (SSL)(_U):"
@@ -860,36 +758,19 @@ msgstr "使用安全連線 (SSL)(_U):"
 # calendar/gui/calendar-model.c:1176
 # calendar/gui/dialogs/task-editor-dialog.glade.h:14
 # calendar/gui/e-calendar-table.c:419
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "名片"
 
-# mail/mail-ops.c:1939
-#: addressbook/gui/component/ldap-config.glade.h:87
-msgid "connecting-tab"
-msgstr "connecting-tab"
-
-# addressbook/contact-editor/contact-editor.glade.h:10
-# executive-summary/component/executive-summary-config.glade.h:3
-#: addressbook/gui/component/ldap-config.glade.h:88
-msgid "general-tab"
-msgstr "general-tab"
-
 # executive-summary/test-service/rdf-summary.c:806
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:60
 #: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:22 filter/filter.glade.h:17
-#: mail/mail-config.glade.h:182
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "分"
 
-# addressbook/gui/search/e-addressbook-search-dialog.c:158
-# mail/mail-search.c:242
-#: addressbook/gui/component/ldap-config.glade.h:90
-msgid "searching-tab"
-msgstr "searching-tab"
-
-#: addressbook/gui/component/select-names/e-select-names.c:497
+#: addressbook/gui/component/select-names/e-select-names.c:503
 #: addressbook/gui/component/select-names/select-names.glade.h:6
 #, fuzzy
 msgid "Select Contacts from Address Book"
@@ -899,7 +780,7 @@ msgstr "從目錄服務選擇連絡人"
 # composer/e-msg-composer-attachment-bar.c:468
 # shell/e-shortcuts-view.c:265
 # shell/e-shortcuts-view.c:388
-#: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
@@ -951,7 +832,7 @@ msgstr "未命名的連絡人"
 # addressbook/gui/widgets/e-addressbook-view.c:735
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:222
+#: addressbook/gui/widgets/e-addressbook-view.c:224
 msgid "Source"
 msgstr "來源"
 
@@ -1041,9 +922,9 @@ msgid "<b>Work</b>"
 msgstr "工作週"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
-#: addressbook/gui/widgets/eab-contact-display.c:342
-#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/contact-editor/e-contact-editor.c:178
+#: addressbook/gui/widgets/eab-contact-display.c:334
+#: addressbook/gui/widgets/eab-contact-display.c:353
 msgid "AIM"
 msgstr ""
 
@@ -1094,8 +975,8 @@ msgstr "公司電話"
 
 # ui/evolution-addressbook.xml.h:17
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:271
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
+#: addressbook/gui/contact-editor/e-contact-editor.c:266
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
@@ -1103,7 +984,7 @@ msgstr "連絡人"
 
 # addressbook/contact-editor/contact-editor.glade.h:7
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1527
+#: addressbook/gui/contact-editor/e-contact-editor.c:520
 msgid "Contact Editor"
 msgstr "連絡人編輯器"
 
@@ -1130,119 +1011,113 @@ msgstr "空閒/忙碌 URL(_R):"
 msgid "Full _Name..."
 msgstr "全名(_N)..."
 
-# addressbook/contact-editor/e-contact-editor.c:1249
-# addressbook/contact-editor/e-contact-editor.c:1311
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:202
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
-msgid "Home"
-msgstr "住家電話"
-
 # addressbook/contact-editor/e-contact-editor.c:1251
 # addressbook/gui/widgets/e-addressbook-view.c:714
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
 #, fuzzy
 msgid "Home Page:"
 msgstr "住家傳真"
 
-# addressbook/contact-editor/contact-editor.glade.h:27
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-#, fuzzy
-msgid "Job title:"
-msgstr "職稱(_J):"
-
-# addressbook/backend/ebook/e-card.c:3442
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/e-itip-control.c:936
-msgid "Location:"
-msgstr "位置:"
-
 # ui/evolution-mail.xml.h:109
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 #, fuzzy
 msgid "MSN Messenger"
 msgstr "郵件訊息(_M)"
 
 # mail/mail-config.glade.h:29
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 #, fuzzy
 msgid "Mailing Address"
 msgstr "電子郵件地址:"
 
 # addressbook/gui/widgets/e-addressbook-view.c:732
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 #, fuzzy
 msgid "Manager:"
 msgstr "主管"
 
 # addressbook/contact-editor/contact-editor.glade.h:30
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "暱稱(_N):"
 
 # addressbook/contact-editor/contact-editor.glade.h:12
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Notes:"
 msgstr "備註(_T):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr ""
 
-# addressbook/contact-editor/e-contact-editor.c:1254
-# addressbook/contact-editor/e-contact-editor.c:1312
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
-#: addressbook/gui/contact-editor/e-contact-editor.c:203
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
-msgid "Other"
-msgstr "其它"
+# addressbook/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#, fuzzy
+msgid "Office:"
+msgstr "辦公室(_O):"
 
 # addressbook/contact-editor/fulladdr.glade.h:9
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "PO Box:"
 msgstr "郵箱(_P):"
 
 # mail/mail-config.glade.h:47
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 #, fuzzy
 msgid "Personal Information"
 msgstr "選用的資訊"
 
 # addressbook/contact-editor/contact-editor.glade.h:32
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 #, fuzzy
 msgid "Profession:"
 msgstr "專業(_P):"
 
+# addressbook/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#, fuzzy
+msgid "Spouse:"
+msgstr "配偶(_S):"
+
 # addressbook/contact-editor/fulladdr.glade.h:10
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "State/Province:"
 msgstr "州/省(_S):"
 
+# addressbook/contact-editor/fullname.glade.h:17
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#, fuzzy
+msgid "Title:"
+msgstr "頭銜(_T):"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+msgid "Video Chat:"
+msgstr ""
+
 # addressbook/contact-editor/contact-editor.glade.h:15
 #: addressbook/gui/contact-editor/contact-editor.glade.h:41
 #, fuzzy
 msgid "Wants to receive HTML mail"
 msgstr "允許接收 _HTML 格式的電子郵件"
 
-# addressbook/printing/e-contact-print.glade.h:25
+# addressbook/contact-editor/contact-editor.glade.h:16
 #: addressbook/gui/contact-editor/contact-editor.glade.h:42
 #, fuzzy
-msgid "Webcam:"
-msgstr "頁"
+msgid "Web Log:"
+msgstr "Web 網址(_W):"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
-#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
-#: mail/mail-config.glade.h:155
+#: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
+#: mail/mail-config.glade.h:157
 msgid "Work"
 msgstr "工作"
 
@@ -1266,21 +1141,14 @@ msgstr "檔案名稱:"
 
 # calendar/gui/event-editor-dialog.glade.h:10
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 #, fuzzy
 msgid "_Where:"
 msgstr "每(_E)"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
-msgid "item7"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:49
-msgid "item8"
-msgstr ""
-
 # mail/mail-accounts.c:280
 # mail/mail-accounts.c:284
-#: addressbook/gui/contact-editor/eab-editor.c:316
+#: addressbook/gui/contact-editor/eab-editor.c:315
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -1290,7 +1158,7 @@ msgstr ""
 
 # mail/mail-accounts.c:280
 # mail/mail-accounts.c:284
-#: addressbook/gui/contact-editor/eab-editor.c:319
+#: addressbook/gui/contact-editor/eab-editor.c:318
 msgid ""
 "Are you sure you want\n"
 "to delete this contact?"
@@ -1300,18 +1168,18 @@ msgstr ""
 
 # addressbook/backend/ebook/e-card.c:3346
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:351
-#: addressbook/gui/widgets/eab-contact-display.c:372
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Address"
 msgstr "地址"
 
 # mail/mail-accounts.c:199
 # mail/mail-config.glade.h:30
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:292
+#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
 #: addressbook/gui/widgets/e-minicard.c:174
@@ -2397,100 +2265,128 @@ msgid "Zimbabwe"
 msgstr "辛巴威"
 
 # addressbook/gui/component/addressbook-storage.c:99
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/contact-editor/e-contact-editor.c:179
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:345
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:337
+#: addressbook/gui/widgets/eab-contact-display.c:356
 #, fuzzy
 msgid "Jabber"
 msgstr "未命名的清單"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:347
-#: addressbook/gui/widgets/eab-contact-display.c:366
+#: addressbook/gui/contact-editor/e-contact-editor.c:180
+#: addressbook/gui/widgets/eab-contact-display.c:339
+#: addressbook/gui/widgets/eab-contact-display.c:358
 #, fuzzy
 msgid "Yahoo"
 msgstr "約羅"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
-#: addressbook/gui/widgets/eab-contact-display.c:346
-#: addressbook/gui/widgets/eab-contact-display.c:365
+#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: addressbook/gui/widgets/eab-contact-display.c:338
+#: addressbook/gui/widgets/eab-contact-display.c:357
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:344
-#: addressbook/gui/widgets/eab-contact-display.c:363
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#: addressbook/gui/widgets/eab-contact-display.c:355
 msgid "ICQ"
 msgstr ""
 
 # shell/e-shortcuts-view.c:137
-#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/contact-editor/e-contact-editor.c:183
 #, fuzzy
 msgid "GroupWise"
 msgstr "組別"
 
+# addressbook/contact-editor/e-contact-editor.c:1249
+# addressbook/contact-editor/e-contact-editor.c:1311
+#: addressbook/gui/contact-editor/e-contact-editor.c:196
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+msgid "Home"
+msgstr "住家電話"
+
+# addressbook/contact-editor/e-contact-editor.c:1254
+# addressbook/contact-editor/e-contact-editor.c:1312
+#: addressbook/gui/contact-editor/e-contact-editor.c:197
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+msgid "Other"
+msgstr "其它"
+
 # addressbook/gui/widgets/e-addressbook-view.c:735
-#: addressbook/gui/contact-editor/e-contact-editor.c:257
+#: addressbook/gui/contact-editor/e-contact-editor.c:252
 #, fuzzy
 msgid "Source Book"
 msgstr "來源"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:264
+#: addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Target Book"
 msgstr ""
 
 # ui/evolution-addressbook.xml.h:7
-#: addressbook/gui/contact-editor/e-contact-editor.c:278
+#: addressbook/gui/contact-editor/e-contact-editor.c:273
 #, fuzzy
 msgid "Is New Contact"
 msgstr "新增連絡人"
 
 # ui/evolution-message-composer.xml.h:47
-#: addressbook/gui/contact-editor/e-contact-editor.c:285
+#: addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Writable Fields"
 msgstr "可寫的欄位"
 
 # addressbook/contact-editor/e-contact-editor.c:1247
-#: addressbook/gui/contact-editor/e-contact-editor.c:299
+#: addressbook/gui/contact-editor/e-contact-editor.c:294
 msgid "Changed"
 msgstr "已變更"
 
-# calendar/gui/dialogs/alarm-notify-dialog.c:207
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
-msgid "Category editor not available."
-msgstr "類別編輯器無法使用。"
-
 # addressbook/contact-editor/e-contact-editor.c:603
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:2352
 msgid "This contact belongs to these categories:"
 msgstr "此連絡人屬於這些類別:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#: addressbook/gui/contact-editor/e-contact-editor.c:2429
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "請在下列選項中選擇"
 
 # addressbook/gui/component/addressbook-config.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#: addressbook/gui/contact-editor/e-contact-editor.c:2433
 #, fuzzy
 msgid "No image"
 msgstr "諾姆"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#: addressbook/gui/contact-editor/e-contact-editor.c:2636
 #, fuzzy
 msgid ""
-"The following entries are invalid:\n"
+"The contact data is invalid:\n"
 "\n"
-msgstr "以下是目前接通的連線："
+msgstr "循環的日期錯誤"
 
-# camel/providers/local/camel-local-store.c:279
-#: addressbook/gui/contact-editor/e-contact-editor.c:2738
-#, c-format
-msgid "Could not find widget for a field: `%s'"
-msgstr "無法找到此欄位之界面工具：“%s”"
+# camel/providers/local/camel-maildir-folder.c:218
+# camel/providers/local/camel-mh-folder.c:203
+#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#, fuzzy
+msgid "Invalid contact."
+msgstr "無效的目的"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+msgid ""
+"The contact cannot be saved to the selected address book. Do you want to "
+"discard changes?"
+msgstr ""
+
+# ui/evolution-calendar.xml.h:25
+#: addressbook/gui/contact-editor/e-contact-editor.c:2727
+#: addressbook/gui/contact-editor/e-contact-editor.c:2751
+msgid "_Discard"
+msgstr "放棄(_D)"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+msgid ""
+"You are moving the contact from one address book to another, but it cannot "
+"be removed from the source. Do you want to save a copy instead?"
+msgstr ""
 
 # mail/mail-callbacks.c:1407
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:62
@@ -2535,7 +2431,7 @@ msgstr "編輯全部"
 
 # mail/mail-config.glade.h:31
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:301
-#: mail/mail-config.glade.h:164
+#: mail/mail-config.glade.h:166
 #, fuzzy
 msgid "_Full Name:"
 msgstr "全名(_F):"
@@ -2724,29 +2620,29 @@ msgid "_Type an email address or drag a contact into the list below:"
 msgstr "輸入電子郵件地址或拖放連絡人到以下清單:"
 
 # addressbook/contact-editor/contact-editor.glade.h:7
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "contact-list-editor"
 msgstr "連絡人清單編輯器"
 
 # addressbook/printing/e-contact-print.glade.h:4
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:153
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:215
+#: addressbook/gui/widgets/e-addressbook-view.c:217
 #: addressbook/gui/widgets/e-minicard-view.c:460
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "書本"
 
 # mail/mail-config.glade.h:45
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
 msgid "Is New List"
 msgstr "是新的清單"
 
 # addressbook/contact-editor/contact-editor.glade.h:7
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:215
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
 msgid "Contact List Editor"
 msgstr "連絡人清單編輯器"
 
@@ -2754,7 +2650,7 @@ msgstr "連絡人清單編輯器"
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
 # addressbook/gui/widgets/e-addressbook-view.c:551
 # addressbook/gui/widgets/e-addressbook-view.c:611
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:438
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
 msgid "Save List as VCard"
 msgstr "儲存清單為 VCard 檔案格式"
 
@@ -2805,130 +2701,130 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "進階搜尋"
 
-#: addressbook/gui/widgets/eab-contact-display.c:129
-#: addressbook/gui/widgets/eab-contact-display.c:192
+#: addressbook/gui/widgets/eab-contact-display.c:131
+#: addressbook/gui/widgets/eab-contact-display.c:194
 msgid "(map)"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:139
-#: addressbook/gui/widgets/eab-contact-display.c:205
+#: addressbook/gui/widgets/eab-contact-display.c:141
+#: addressbook/gui/widgets/eab-contact-display.c:207
 msgid "map"
 msgstr ""
 
 # calendar/gui/goto-dialog.glade.h:12
-#: addressbook/gui/widgets/eab-contact-display.c:257
-#: addressbook/gui/widgets/eab-contact-display.c:533
+#: addressbook/gui/widgets/eab-contact-display.c:259
+#: addressbook/gui/widgets/eab-contact-display.c:525
 #, fuzzy
 msgid "List Members"
 msgstr "會員"
 
 # addressbook/gui/widgets/e-addressbook-view.c:701
-#: addressbook/gui/widgets/eab-contact-display.c:329
-#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/eab-contact-display.c:321
+#: addressbook/gui/widgets/eab-contact-display.c:323
 #, fuzzy
 msgid "E-mail"
 msgstr "電子郵件"
 
 # addressbook/gui/widgets/e-addressbook-view.c:708
-#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/eab-contact-display.c:332
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "團體"
 
-#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:333
 #, fuzzy
 msgid "Position"
 msgstr "波士頓"
 
 # shell/e-shortcuts-view.c:137
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:354
 #, fuzzy
 msgid "Groupwise"
 msgstr "組別"
 
-#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:340
 msgid "Video Conferencing"
 msgstr ""
 
 # mail/mail-config.glade.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:349
-#: addressbook/gui/widgets/eab-contact-display.c:370
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#: addressbook/gui/widgets/eab-contact-display.c:362
 #, fuzzy
 msgid "Phone"
 msgstr "朋榭"
 
-#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:342
 msgid "Fax"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:354
+#: addressbook/gui/widgets/eab-contact-display.c:346
 #, fuzzy
 msgid "work"
 msgstr "工作"
 
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:359
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:368
-#: addressbook/gui/widgets/eab-contact-display.c:587
+#: addressbook/gui/widgets/eab-contact-display.c:360
+#: addressbook/gui/widgets/eab-contact-display.c:579
 #, fuzzy
 msgid "Blog"
 msgstr "波隆納"
 
 # addressbook/gui/widgets/e-addressbook-view.c:711
-#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/eab-contact-display.c:363
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "行動電話"
 
-#: addressbook/gui/widgets/eab-contact-display.c:375
+#: addressbook/gui/widgets/eab-contact-display.c:367
 #, fuzzy
 msgid "personal"
 msgstr "個人"
 
 # addressbook/gui/widgets/e-addressbook-view.c:736
-#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/eab-contact-display.c:374
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "備註"
 
 # addressbook/contact-editor/contact-editor.glade.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:548
+#: addressbook/gui/widgets/eab-contact-display.c:540
 #, fuzzy
 msgid "Job Title"
 msgstr "職稱(_J):"
 
 # addressbook/gui/widgets/e-addressbook-view.c:701
-#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/eab-contact-display.c:544
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:774
+#: smime/lib/e-cert.c:826
 msgid "Email"
 msgstr "電子郵件"
 
 # addressbook/contact-editor/e-contact-editor.c:1251
 # addressbook/gui/widgets/e-addressbook-view.c:714
-#: addressbook/gui/widgets/eab-contact-display.c:579
+#: addressbook/gui/widgets/eab-contact-display.c:571
 #, fuzzy
 msgid "Home page"
 msgstr "住家傳真"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:48
 msgid "Success"
 msgstr "成功"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Backend busy"
 msgstr ""
 
 # shell/e-shell-view-menu.c:602
 # shell/e-shell-view-menu.c:614
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Repository offline"
 msgstr "資料庫離線"
 
@@ -2936,14 +2832,14 @@ msgstr "資料庫離線"
 # camel/providers/local/camel-mbox-store.c:101
 # camel/providers/local/camel-mh-store.c:97
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:52
 #, fuzzy
 msgid "Address Book does not exist"
 msgstr "目錄服務不存在"
 
 # ui/evolution-addressbook.xml.h:17
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:55
+#: addressbook/gui/widgets/eab-gui-util.c:53
 #, fuzzy
 msgid "No Self Contact defined"
 msgstr "新增連絡人清單"
@@ -2952,26 +2848,26 @@ msgstr "新增連絡人清單"
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Permission denied"
 msgstr "權限不足"
 
 # calendar/gui/calendar-commands.c:266
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:57
 #, fuzzy
 msgid "Contact not found"
 msgstr "找不到名片"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: addressbook/gui/widgets/eab-gui-util.c:58
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "名片 ID 已經存在"
 
 # shell/e-storage.c:477
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Protocol not supported"
 msgstr "通訊協定不支援"
 
@@ -2982,7 +2878,7 @@ msgstr "通訊協定不支援"
 # camel/camel-service.c:544
 # camel/camel-service.c:580
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:60
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:233
 #: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
@@ -2996,7 +2892,7 @@ msgstr "已取消"
 
 # camel/providers/local/camel-mbox-summary.c:655
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:61
 #, fuzzy
 msgid "Could not cancel"
 msgstr "無法開啟共用的資料夾：%s。"
@@ -3004,18 +2900,18 @@ msgstr "無法開啟共用的資料夾：%s。"
 # camel/camel-sasl-anonymous.c:110
 # camel/camel-sasl-plain.c:87
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Authentication Failed"
 msgstr "驗証失敗"
 
 # camel/providers/smtp/camel-smtp-transport.c:218
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Authentication Required"
 msgstr "要求驗證"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:66
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "TLS not Available"
 msgstr "TLS 無法使用"
 
@@ -3024,19 +2920,19 @@ msgstr "TLS 無法使用"
 # camel/providers/local/camel-mh-folder.c:185
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#: addressbook/gui/widgets/eab-gui-util.c:66
 #, fuzzy
 msgid "No such source"
 msgstr "沒有這封郵件"
 
 # shell/e-storage.c:467
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:69
+#: addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Other error"
 msgstr "其他錯誤"
 
 # addressbook/gui/component/addressbook.c:458
-#: addressbook/gui/widgets/eab-gui-util.c:103
+#: addressbook/gui/widgets/eab-gui-util.c:90
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
@@ -3046,7 +2942,7 @@ msgstr ""
 "您是否擁有存取權限。"
 
 # addressbook/gui/component/addressbook.c:445
-#: addressbook/gui/widgets/eab-gui-util.c:110
+#: addressbook/gui/widgets/eab-gui-util.c:97
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -3057,19 +2953,19 @@ msgstr ""
 "或者 LDAP 伺服器沒有啟動。"
 
 # addressbook/gui/component/addressbook.c:450
-#: addressbook/gui/widgets/eab-gui-util.c:115
+#: addressbook/gui/widgets/eab-gui-util.c:102
 #, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
-"you want to use LDAP in Evolution you must compile the program from the CVS "
-"sources after retrieving OpenLDAP from the link below."
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
 msgstr ""
 "這個版本的 Evolution 沒有內建支援 LDAP 目錄服務。\n"
 "如果您想使用 LDAP 目錄服務， 請到以下超連結下載\n"
 "及安裝 OpenLDAP，然後再重新編譯 Evolution。\n"
 
 # addressbook/gui/component/addressbook.c:445
-#: addressbook/gui/widgets/eab-gui-util.c:124
+#: addressbook/gui/widgets/eab-gui-util.c:109
 #, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -3079,12 +2975,7 @@ msgstr ""
 "這表示您輸入了一個錯誤的 URI，\n"
 "或者伺服器沒有啟動。"
 
-# addressbook/gui/component/addressbook.c:438
-#: addressbook/gui/widgets/eab-gui-util.c:141
-msgid "Unable to open addressbook"
-msgstr "無法開啟目錄服務"
-
-#: addressbook/gui/widgets/eab-gui-util.c:162
+#: addressbook/gui/widgets/eab-gui-util.c:129
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3096,7 +2987,7 @@ msgstr ""
 "請使用更加明確的查詢或是提高此目錄服務的目錄\n"
 "伺服器偏好設定中的結果上限。"
 
-#: addressbook/gui/widgets/eab-gui-util.c:168
+#: addressbook/gui/widgets/eab-gui-util.c:135
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -3108,64 +2999,54 @@ msgstr ""
 "或是提高此目錄服務的目錄伺服器偏好設定中的\n"
 "結果上限。"
 
-#: addressbook/gui/widgets/eab-gui-util.c:174
+#: addressbook/gui/widgets/eab-gui-util.c:141
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "此目錄服務的後端程式無法解析這次的查詢。"
 
-#: addressbook/gui/widgets/eab-gui-util.c:177
+#: addressbook/gui/widgets/eab-gui-util.c:144
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "此目錄服務的後端程式拒絕執行這次的查詢。"
 
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:147
 msgid "This query did not complete successfully."
 msgstr "這次的查詢並未完全成功。"
 
-# calendar/gui/dialogs/save-comp.c:51
-#: addressbook/gui/widgets/eab-gui-util.c:206
-msgid "Do you want to save changes?"
-msgstr "您是否須要儲存變更？"
-
-# ui/evolution-calendar.xml.h:25
-#: addressbook/gui/widgets/eab-gui-util.c:208
-msgid "_Discard"
-msgstr "放棄(_D)"
-
 # shell/e-shell-importer.c:404
-#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:169
 msgid "Error adding list"
 msgstr "新增清單時發生錯誤"
 
 # shell/e-shell-importer.c:404
-#: addressbook/gui/widgets/eab-gui-util.c:229
-#: addressbook/gui/widgets/eab-gui-util.c:652
+#: addressbook/gui/widgets/eab-gui-util.c:169
+#: addressbook/gui/widgets/eab-gui-util.c:580
 #, fuzzy
 msgid "Error adding contact"
 msgstr "新增名片時發生錯誤"
 
 # shell/e-shell-importer.c:404
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "Error modifying list"
 msgstr "編輯清單時發生錯誤"
 
 # shell/e-shell-importer.c:404
-#: addressbook/gui/widgets/eab-gui-util.c:240
+#: addressbook/gui/widgets/eab-gui-util.c:180
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "編輯名片時發生錯誤"
 
 # executive-summary/component/e-summary.c:940
-#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:192
 msgid "Error removing list"
 msgstr "移除清單時發生錯誤"
 
 # executive-summary/component/e-summary.c:940
-#: addressbook/gui/widgets/eab-gui-util.c:252
-#: addressbook/gui/widgets/eab-gui-util.c:610
+#: addressbook/gui/widgets/eab-gui-util.c:192
+#: addressbook/gui/widgets/eab-gui-util.c:538
 #, fuzzy
 msgid "Error removing contact"
 msgstr "移除名片時發生錯誤"
 
-#: addressbook/gui/widgets/eab-gui-util.c:334
+#: addressbook/gui/widgets/eab-gui-util.c:274
 #, fuzzy, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -3174,7 +3055,7 @@ msgstr ""
 "開啟 %d 張名片也會同時開啟 %d 個新視窗。\n"
 "您真的要顯示所有這些名片嗎？"
 
-#: addressbook/gui/widgets/eab-gui-util.c:360
+#: addressbook/gui/widgets/eab-gui-util.c:300
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3185,33 +3066,27 @@ msgstr ""
 
 # mail/mail-callbacks.c:1140
 # mail/mail-display.c:92
-#: addressbook/gui/widgets/eab-gui-util.c:364
+#: addressbook/gui/widgets/eab-gui-util.c:304
 msgid "Overwrite"
 msgstr "覆寫"
 
-# composer/e-msg-composer.c:785
-#: addressbook/gui/widgets/eab-gui-util.c:400
-#, c-format
-msgid "Error saving %s: %s"
-msgstr "儲存 %s 時發生錯誤：%s"
-
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:437
+#: addressbook/gui/widgets/eab-gui-util.c:365
 msgid "card.vcf"
 msgstr "card.vcf"
 
 # addressbook/contact-editor/fullname.glade.h:8
-#: addressbook/gui/widgets/eab-gui-util.c:571
+#: addressbook/gui/widgets/eab-gui-util.c:499
 msgid "list"
 msgstr "清單"
 
-#: addressbook/gui/widgets/eab-gui-util.c:706
+#: addressbook/gui/widgets/eab-gui-util.c:634
 #, fuzzy
 msgid "Move contact to"
 msgstr "移動名片到"
 
 # calendar/gui/e-calendar-table.c:714
-#: addressbook/gui/widgets/eab-gui-util.c:708
+#: addressbook/gui/widgets/eab-gui-util.c:636
 #, fuzzy
 msgid "Copy contact to"
 msgstr "複製名片到"
@@ -3220,7 +3095,7 @@ msgstr "複製名片到"
 # calendar/gui/calendar-model.c:1176
 # calendar/gui/dialogs/task-editor-dialog.glade.h:14
 # calendar/gui/e-calendar-table.c:419
-#: addressbook/gui/widgets/eab-gui-util.c:711
+#: addressbook/gui/widgets/eab-gui-util.c:639
 #, fuzzy
 msgid "Move contacts to"
 msgstr "移動名片到"
@@ -3229,23 +3104,23 @@ msgstr "移動名片到"
 # calendar/gui/calendar-model.c:1176
 # calendar/gui/dialogs/task-editor-dialog.glade.h:14
 # calendar/gui/e-calendar-table.c:419
-#: addressbook/gui/widgets/eab-gui-util.c:713
+#: addressbook/gui/widgets/eab-gui-util.c:641
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "複製名片到"
 
-#: addressbook/gui/widgets/eab-gui-util.c:716
+#: addressbook/gui/widgets/eab-gui-util.c:644
 #, fuzzy
 msgid "Select target addressbook."
 msgstr "從目錄服務選擇連絡人"
 
 # addressbook/backend/ebook/e-card.c:3745
-#: addressbook/gui/widgets/eab-gui-util.c:939
+#: addressbook/gui/widgets/eab-gui-util.c:867
 msgid "Multiple VCards"
 msgstr "多重 VCard"
 
 # addressbook/backend/ebook/e-card.c:3753
-#: addressbook/gui/widgets/eab-gui-util.c:942
+#: addressbook/gui/widgets/eab-gui-util.c:870
 #, c-format
 msgid "VCard for %s"
 msgstr "給 %s 的 VCard"
@@ -3358,7 +3233,7 @@ msgstr[1] "連絡人"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:302
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:229
+#: addressbook/gui/widgets/e-addressbook-view.c:231
 #: addressbook/gui/widgets/e-minicard-view.c:467
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
@@ -3379,46 +3254,46 @@ msgstr "模型"
 msgid "Error modifying card"
 msgstr "編輯名片時發生錯誤"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:161
+#: addressbook/gui/widgets/e-addressbook-view.c:163
 msgid "Name begins with"
 msgstr "名稱開始於"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:162
+#: addressbook/gui/widgets/e-addressbook-view.c:164
 msgid "Email begins with"
 msgstr "電子郵件開始於"
 
 # calendar/gui/e-calendar-table.c:150
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:57
+#: addressbook/gui/widgets/e-addressbook-view.c:165
+#: calendar/gui/cal-search-bar.c:54
 msgid "Category is"
 msgstr "類別為"
 
 # addressbook/gui/component/addressbook.c:618
 # calendar/gui/gnome-cal.c:233
 #. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-#: calendar/gui/cal-search-bar.c:50
+#: addressbook/gui/widgets/e-addressbook-view.c:166
+#: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "任何欄位包含"
 
 # widgets/misc/e-filter-bar.h:97
 # widgets/misc/e-filter-bar.h:104
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+#: addressbook/gui/widgets/e-addressbook-view.c:172
 msgid "Advanced..."
 msgstr "進階..."
 
 # mail/mail-config.glade.h:78
-#: addressbook/gui/widgets/e-addressbook-view.c:236
+#: addressbook/gui/widgets/e-addressbook-view.c:238
 #: calendar/gui/dialogs/meeting-page.etspec.h:11
 #: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:249
+#: calendar/gui/e-meeting-list-view.c:227
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "類型"
 
 # importers/pine-importer.c:661
-#: addressbook/gui/widgets/e-addressbook-view.c:506
+#: addressbook/gui/widgets/e-addressbook-view.c:508
 #, fuzzy
 msgid "Address Book"
 msgstr "目錄服務"
@@ -3427,59 +3302,59 @@ msgstr "目錄服務"
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
 # addressbook/gui/widgets/e-addressbook-view.c:551
 # addressbook/gui/widgets/e-addressbook-view.c:611
-#: addressbook/gui/widgets/e-addressbook-view.c:850
-#: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2076
+#: addressbook/gui/widgets/e-addressbook-view.c:852
+#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:2080
 #: ui/evolution-addressbook.xml.h:19
 #, fuzzy
 msgid "Save as VCard..."
 msgstr "儲存成 VCard 檔案格式"
 
 # ui/evolution-addressbook.xml.h:7
-#: addressbook/gui/widgets/e-addressbook-view.c:1057
+#: addressbook/gui/widgets/e-addressbook-view.c:1059
 msgid "New Contact..."
 msgstr "新增連絡人..."
 
 # ui/evolution-addressbook.xml.h:17
-#: addressbook/gui/widgets/e-addressbook-view.c:1058
+#: addressbook/gui/widgets/e-addressbook-view.c:1060
 msgid "New Contact List..."
 msgstr "新增連絡人清單..."
 
 # ui/evolution.xml.h:52
-#: addressbook/gui/widgets/e-addressbook-view.c:1061
+#: addressbook/gui/widgets/e-addressbook-view.c:1063
 msgid "Go to Folder..."
 msgstr "移至資料夾..."
 
 # shell/e-shell-importer.c:363
-#: addressbook/gui/widgets/e-addressbook-view.c:1062
+#: addressbook/gui/widgets/e-addressbook-view.c:1064
 msgid "Import..."
 msgstr "匯入..."
 
 # ui/evolution-addressbook.xml.h:19
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
+#: addressbook/gui/widgets/e-addressbook-view.c:1066
 msgid "Search for Contacts..."
 msgstr "尋找連絡人..."
 
 # ui/evolution-addressbook.xml.h:16
-#: addressbook/gui/widgets/e-addressbook-view.c:1065
+#: addressbook/gui/widgets/e-addressbook-view.c:1067
 #, fuzzy
 msgid "Address Book Sources..."
 msgstr "目錄服務來源..."
 
 # ui/evolution-mail.xml.h:110
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
+#: addressbook/gui/widgets/e-addressbook-view.c:1069
 msgid "Pilot Settings..."
 msgstr "Pilot 設定..."
 
 # ui/evolution-mail.xml.h:35
-#: addressbook/gui/widgets/e-addressbook-view.c:1071
+#: addressbook/gui/widgets/e-addressbook-view.c:1073
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "轉寄連絡人"
 
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
 # addressbook/gui/widgets/e-addressbook-view.c:613
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
+#: addressbook/gui/widgets/e-addressbook-view.c:1074
 msgid "Send Message to Contact"
 msgstr "傳送郵件給連絡人"
 
@@ -3490,7 +3365,7 @@ msgstr "傳送郵件給連絡人"
 # ui/evolution-calendar.xml.h:23
 # ui/evolution-mail.xml.h:65
 # ui/evolution-tasks.xml.h:4
-#: addressbook/gui/widgets/e-addressbook-view.c:1073 calendar/gui/print.c:2480
+#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
 #: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
 #: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
@@ -3499,25 +3374,25 @@ msgstr "列印"
 
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
 # addressbook/gui/widgets/e-addressbook-view.c:615
-#: addressbook/gui/widgets/e-addressbook-view.c:1075
+#: addressbook/gui/widgets/e-addressbook-view.c:1077
 msgid "Print Envelope"
 msgstr "列印信封"
 
 # addressbook/contact-editor/contact-editor.glade.h:18
-#: addressbook/gui/widgets/e-addressbook-view.c:1079
+#: addressbook/gui/widgets/e-addressbook-view.c:1081
 #, fuzzy
 msgid "Copy to Address Book..."
 msgstr "目錄服務..."
 
 # addressbook/contact-editor/contact-editor.glade.h:18
-#: addressbook/gui/widgets/e-addressbook-view.c:1080
+#: addressbook/gui/widgets/e-addressbook-view.c:1082
 #, fuzzy
 msgid "Move to Address Book..."
 msgstr "目錄服務..."
 
 # ui/evolution-event-editor.xml.h:15
 # ui/evolution-task-editor-dialog.xml.h:16
-#: addressbook/gui/widgets/e-addressbook-view.c:1083
+#: addressbook/gui/widgets/e-addressbook-view.c:1085
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "剪下"
@@ -3525,8 +3400,8 @@ msgstr "剪下"
 # ui/evolution-event-editor.xml.h:13
 # ui/evolution-mail.xml.h:8
 # ui/evolution-task-editor-dialog.xml.h:14
-#: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
+#: addressbook/gui/widgets/e-addressbook-view.c:1086
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
@@ -3534,32 +3409,21 @@ msgstr "複製"
 
 # ui/evolution-event-editor.xml.h:30
 # ui/evolution-task-editor-dialog.xml.h:33
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
+#: addressbook/gui/widgets/e-addressbook-view.c:1087
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "貼上"
 
 # widgets/menus/gal-view-menus.c:176
-#: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:1092
+#: calendar/gui/e-calendar-view.c:1280
 msgid "Current View"
 msgstr "目前檢視"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1309
-#, c-format
-msgid ""
-"The addressbook backend for\n"
-"%s\n"
-"has crashed. You will have to restart Evolution in order to use it again"
-msgstr ""
-"%s\n"
-"的目錄服務後端程式\n"
-"已經當機。您將需要重新啟動 Evolution 才能再度使用它"
-
 # calendar/gui/e-tasks.c:155
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1667
-#: calendar/gui/cal-search-bar.c:362
+#: addressbook/gui/widgets/e-addressbook-view.c:1665
+#: calendar/gui/cal-search-bar.c:358
 msgid "Any Category"
 msgstr "任何類別"
 
@@ -3700,7 +3564,7 @@ msgstr "無線電電話"
 
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
 #: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:256
+#: calendar/gui/e-meeting-list-view.c:234
 #: calendar/gui/e-meeting-time-sel.etspec.h:9
 msgid "Role"
 msgstr "角色"
@@ -3871,14 +3735,14 @@ msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
 # ui/evolution-addressbook.xml.h:11
-#: addressbook/printing/e-contact-print.c:998
+#: addressbook/printing/e-contact-print.c:1000
 #, fuzzy
 msgid "Print contacts"
 msgstr "列印選定的連絡人"
 
 # ui/evolution-addressbook.xml.h:11
-#: addressbook/printing/e-contact-print.c:1064
-#: addressbook/printing/e-contact-print.c:1091
+#: addressbook/printing/e-contact-print.c:1066
+#: addressbook/printing/e-contact-print.c:1093
 #, fuzzy
 msgid "Print contact"
 msgstr "列印選定的連絡人"
@@ -4184,18 +4048,24 @@ msgid "Impossible internal error."
 msgstr "內部錯誤"
 
 # camel/camel-filter-driver.c:671
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:629
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:58
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
 #, fuzzy
 msgid "Can not open file"
 msgstr "不能開啟郵件"
 
-# calendar/gui/calendar-commands.c:266
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
+# camel/camel-provider.c:140
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
 #, fuzzy
-msgid "Can not load URI"
-msgstr "找不到名片"
+msgid "Couldn't get list of addressbooks"
+msgstr "無法載入 %s：%s"
+
+# addressbook/gui/component/addressbook.c:438
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "無法開啟目錄服務"
 
 # composer/e-msg-composer.c:805
 #: addressbook/tools/evolution-addressbook-import.c:46
@@ -4223,7 +4093,7 @@ msgstr "未命名的清單"
 # camel/providers/nntp/camel-nntp-store.c:291
 # camel/providers/pop3/camel-pop3-provider.c:67
 # mail/mail-config.glade.h:52
-#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 #, fuzzy
 msgid "Enter password"
@@ -4556,10 +4426,10 @@ msgstr "在日期導覽顯示週數(_N)"
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:88
-#: calendar/gui/gnome-cal.c:1703
-#: camel/providers/groupwise/camel-gw-listener.c:304
-#: camel/providers/groupwise/camel-gw-listener.c:327
+#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/gnome-cal.c:1705
+#: camel/providers/groupwise/camel-gw-listener.c:311
+#: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
 msgstr "行事曆"
 
@@ -4582,7 +4452,7 @@ msgstr "傳回小於"
 
 #: calendar/gui/calendar-commands.c:363
 #: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:19 filter/filter.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
 msgid "days"
 msgstr "天"
 
@@ -4774,27 +4644,27 @@ msgid "Month View"
 msgstr "月檢視"
 
 # calendar/gui/gnome-cal.c:234
-#: calendar/gui/cal-search-bar.c:51
+#: calendar/gui/cal-search-bar.c:50
 msgid "Summary contains"
 msgstr "主旨包含"
 
 # calendar/gui/gnome-cal.c:235
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Description contains"
 msgstr "描述包含"
 
 # calendar/gui/gnome-cal.c:236
-#: calendar/gui/cal-search-bar.c:54
+#: calendar/gui/cal-search-bar.c:52
 msgid "Comment contains"
 msgstr "備註包含"
 
 # calendar/gui/gnome-cal.c:235
-#: calendar/gui/cal-search-bar.c:56
+#: calendar/gui/cal-search-bar.c:53
 #, fuzzy
 msgid "Location contains"
 msgstr "描述包含"
 
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
 msgid "Unmatched"
 msgstr "沒有相符資料"
 
@@ -4821,27 +4691,27 @@ msgid "open_client(): %s"
 msgstr ""
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#: calendar/gui/dialogs/alarm-options.c:466
+#: calendar/gui/dialogs/alarm-options.c:467
 msgid "Audio Alarm Options"
 msgstr "音效提醒選項"
 
 # addressbook/gui/component/select-names/select-names.glade.h:2
-#: calendar/gui/dialogs/alarm-options.c:475
+#: calendar/gui/dialogs/alarm-options.c:476
 msgid "Message Alarm Options"
 msgstr "訊息提醒選項"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/alarm-options.c:484
+#: calendar/gui/dialogs/alarm-options.c:485
 #, fuzzy
 msgid "Email Alarm Options"
 msgstr "郵件提醒選項"
 
-#: calendar/gui/dialogs/alarm-options.c:493
+#: calendar/gui/dialogs/alarm-options.c:494
 msgid "Program Alarm Options"
 msgstr "程式提醒選項"
 
 # camel/camel-sasl-login.c:127
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:510
 msgid "Unknown Alarm Options"
 msgstr "不明的提醒選項"
 
@@ -4887,7 +4757,7 @@ msgstr "傳送"
 msgid "With these arguments:"
 msgstr "具有這些參數:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:47
+#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
 msgid "dialog1"
 msgstr ""
 
@@ -4896,7 +4766,7 @@ msgid "extra times every"
 msgstr "提醒間隔每"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:20 filter/filter.glade.h:16
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
 msgid "hours"
 msgstr "時"
 
@@ -4958,7 +4828,7 @@ msgstr "傳送電子郵件"
 #: calendar/gui/dialogs/alarm-page.glade.h:9
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "摘要:"
 
@@ -4996,7 +4866,6 @@ msgstr "時"
 # calendar/gui/event-editor-dialog.glade.h:42
 # mail/mail-config.glade.h:87
 #: calendar/gui/dialogs/alarm-page.glade.h:16
-#: calendar/gui/dialogs/calendar-setup.glade.h:21
 msgid "minute(s)"
 msgstr "分"
 
@@ -5006,28 +4875,28 @@ msgid "start of appointment"
 msgstr "約會開始"
 
 # ui/evolution.xml.h:3
-#: calendar/gui/dialogs/calendar-setup.c:170
+#: calendar/gui/dialogs/calendar-setup.c:172
 #, fuzzy
 msgid "You must specify a location to get the calendar from."
 msgstr "您必須指定一個檔案名稱。"
 
 # calendar/gui/e-tasks.c:310
-#: calendar/gui/dialogs/calendar-setup.c:178
+#: calendar/gui/dialogs/calendar-setup.c:180
 #, fuzzy, c-format
 msgid "The source location '%s' is not well-formed."
 msgstr "不支援載入“%s”必須的方法"
 
-#: calendar/gui/dialogs/calendar-setup.c:193
+#: calendar/gui/dialogs/calendar-setup.c:195
 #, c-format
 msgid "The source location '%s' is not a webcal source."
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:265
+#: calendar/gui/dialogs/calendar-setup.c:275
 #, c-format
 msgid "Source with name '%s' already exists in the selected group"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:278
+#: calendar/gui/dialogs/calendar-setup.c:288
 #, c-format
 msgid ""
 "The group '%s' is remote. You must specify a location to get the calendar "
@@ -5060,79 +4929,43 @@ msgstr "工作清單"
 msgid "C_olor:"
 msgstr "顏色(_O)"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-# ui/evolution-calendar.xml.h:3
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-#, fuzzy
-msgid "Calendar Properties"
-msgstr "iCalendar 錯誤"
-
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 # mail/mail-config.glade.h:54
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
 msgid "Pick a color"
 msgstr "選取顏色"
 
-# addressbook/gui/component/select-names/e-select-names-popup.c:161
-# composer/e-msg-composer-attachment-bar.c:468
-# shell/e-shortcuts-view.c:265
-# shell/e-shortcuts-view.c:388
-#: calendar/gui/dialogs/calendar-setup.glade.h:8
-#, fuzzy
-msgid "Remote"
-msgstr "移除"
-
-# calendar/gui/calendar-summary.c:275
-# calendar/gui/print.c:948
-# views/tasks/galview.xml.h:1
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-#, fuzzy
-msgid "Task List Properties"
-msgstr "工作清單"
-
 # ui/evolution-addressbook.xml.h:7
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
 #, fuzzy
 msgid "_Add Calendar"
 msgstr "新喀里多尼亞島"
 
 # shell/e-shortcuts-view.c:291
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
 #, fuzzy
 msgid "_Add Group"
 msgstr "新增群組(_N)..."
 
 # ui/evolution-subscribe.xml.h:4
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-#, fuzzy
-msgid "_Refresh Interval:"
-msgstr "重整清單"
-
-# ui/evolution-subscribe.xml.h:4
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
 #, fuzzy
 msgid "_Refresh:"
 msgstr "重整清單"
 
-# addressbook/gui/widgets/e-addressbook-view.c:735
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-#, fuzzy
-msgid "_Source URL:"
-msgstr "POP 來源 URI"
-
 # addressbook/printing/e-contact-print.glade.h:40
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
 #, fuzzy
 msgid "_Type:"
 msgstr "類型:"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
 #, fuzzy
 msgid "_URL:"
 msgstr "網址:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
 msgid "weeks"
 msgstr "週"
 
@@ -5265,7 +5098,7 @@ msgstr "顯示(_D)"
 # mail/mail-accounts.c:199
 # mail/mail-config.glade.h:30
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: mail/mail-config.glade.h:74
+#: mail/mail-config.glade.h:76
 msgid "E_nable"
 msgstr "啟用(_E)"
 
@@ -5279,7 +5112,7 @@ msgstr "空閒/忙碌請求"
 # calendar/gui/event-editor.c:479
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: calendar/gui/dialogs/recurrence-page.c:1048
-#: calendar/gui/e-itip-control.c:563
+#: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "星期五"
 
@@ -5296,7 +5129,7 @@ msgstr "分"
 # calendar/gui/event-editor.c:475
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
-#: calendar/gui/e-itip-control.c:559
+#: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "星期一"
 
@@ -5309,7 +5142,7 @@ msgstr "週日(_U)"
 # calendar/gui/event-editor.c:480
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
-#: calendar/gui/e-itip-control.c:564
+#: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "星期六"
 
@@ -5326,7 +5159,7 @@ msgstr "在日期導覽顯示週數(_N)"
 # calendar/gui/event-editor.c:481
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
-#: calendar/gui/e-itip-control.c:558
+#: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "星期日"
 
@@ -5344,7 +5177,7 @@ msgstr "週四(_H)"
 # calendar/gui/event-editor.c:478
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
-#: calendar/gui/e-itip-control.c:562
+#: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "星期四"
 
@@ -5362,7 +5195,7 @@ msgstr "時間格式:"
 # calendar/gui/event-editor.c:476
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
-#: calendar/gui/e-itip-control.c:560
+#: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "星期二"
 
@@ -5374,7 +5207,7 @@ msgstr "一週開始於(_E):"
 # calendar/gui/event-editor.c:477
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
-#: calendar/gui/e-itip-control.c:561
+#: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "星期三"
 
@@ -5419,7 +5252,7 @@ msgstr "開始日(_D):"
 # ui/evolution-task-editor-dialog.xml.h:70
 # ui/evolution.xml.h:48
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
-#: mail/mail-config.glade.h:160 ui/evolution-addressbook.xml.h:34
+#: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:43
@@ -5478,81 +5311,47 @@ msgstr "週三(_W)"
 msgid "before every appointment"
 msgstr "在每個約會前"
 
-#: calendar/gui/dialogs/cancel-comp.c:57
-msgid ""
-"The event being deleted is a meeting, would you like to send a cancellation "
-"notice?"
-msgstr "要刪除的事件是一個會議，您想要送出取消通知嗎？"
-
-# mail/mail-accounts.c:280
-# mail/mail-accounts.c:284
-#: calendar/gui/dialogs/cancel-comp.c:60
-msgid "Are you sure you want to cancel and delete this meeting?"
-msgstr "您確定要取消並刪除這個會議？"
-
-#: calendar/gui/dialogs/cancel-comp.c:66
-msgid ""
-"The task being deleted is assigned, would you like to send a cancellation "
-"notice?"
-msgstr "要刪除的工作已經被指派了，您想要送出取消通知嗎？"
-
-# calendar/gui/dialogs/delete-comp.c:125
-#: calendar/gui/dialogs/cancel-comp.c:69
-msgid "Are you sure you want to cancel and delete this task?"
-msgstr "您確定要取消並刪除這個工作？"
-
-#: calendar/gui/dialogs/cancel-comp.c:75
-msgid ""
-"The journal entry being deleted is published, would you like to send a "
-"cancellation notice?"
-msgstr "要刪除的日誌項目已經公佈了，您想要送出取消通知嗎？"
-
-# calendar/gui/dialogs/delete-comp.c:102
-#: calendar/gui/dialogs/cancel-comp.c:78
-msgid "Are you sure you want to cancel and delete this journal entry?"
-msgstr "您確定要取消並刪除這個日誌項目？"
-
-#: calendar/gui/dialogs/changed-comp.c:58
+#: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "這個事件已刪除。"
 
 # addressbook/contact-editor/contact-editor.glade.h:34
-#: calendar/gui/dialogs/changed-comp.c:62
+#: calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
 msgstr "這個工作已刪除。"
 
-#: calendar/gui/dialogs/changed-comp.c:66
+#: calendar/gui/dialogs/changed-comp.c:68
 msgid "This journal entry has been deleted."
 msgstr "這個日誌項目已刪除。"
 
-#: calendar/gui/dialogs/changed-comp.c:75
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  您已經做了些變更。放棄這些變更並且關閉這個編輯器？"
 
-#: calendar/gui/dialogs/changed-comp.c:77
+#: calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  您沒有做任何變更，關閉這個編輯器？"
 
-#: calendar/gui/dialogs/changed-comp.c:82
+#: calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "這個事件已變更。"
 
-#: calendar/gui/dialogs/changed-comp.c:86
+#: calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "這個工作已變更。"
 
-#: calendar/gui/dialogs/changed-comp.c:90
+#: calendar/gui/dialogs/changed-comp.c:92
 msgid "This journal entry has been changed."
 msgstr "這個日誌項目已變更。"
 
-#: calendar/gui/dialogs/changed-comp.c:99
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  您已經做了些變更。放棄這些變更並且更新這個編輯器？"
 
-#: calendar/gui/dialogs/changed-comp.c:101
+#: calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  您沒有做任何變更，更新這個編輯器？"
@@ -5598,7 +5397,7 @@ msgstr "沒有摘要"
 
 # composer/e-msg-composer.c:774
 #: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
 #: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "另存新檔..."
@@ -5667,113 +5466,56 @@ msgstr "取消作業"
 msgid "Destination is read only"
 msgstr ""
 
-# calendar/gui/dialogs/delete-comp.c:84
-#: calendar/gui/dialogs/delete-comp.c:95
-#, c-format
-msgid "Are you sure you want to delete the appointment `%s'?"
-msgstr "您確定要刪除約會 “%s”？"
-
-# calendar/gui/dialogs/delete-comp.c:87
-#: calendar/gui/dialogs/delete-comp.c:98
-msgid "Are you sure you want to delete this untitled appointment?"
-msgstr "您確定要刪除這個未命名的約會？"
-
-# calendar/gui/dialogs/delete-comp.c:93
-#: calendar/gui/dialogs/delete-comp.c:104
-#, c-format
-msgid "Are you sure you want to delete the task `%s'?"
-msgstr "您確定要刪除工作“%s”？"
-
-# calendar/gui/dialogs/delete-comp.c:96
-#: calendar/gui/dialogs/delete-comp.c:107
-msgid "Are you sure you want to delete this untitled task?"
-msgstr "您確定要刪除這個未命名的工作？"
-
-# calendar/gui/dialogs/delete-comp.c:102
-#: calendar/gui/dialogs/delete-comp.c:113
-#, c-format
-msgid "Are you sure you want to delete the journal entry `%s'?"
-msgstr "您確定要刪除日誌項目 “%s”？"
-
-# calendar/gui/dialogs/delete-comp.c:105
-#: calendar/gui/dialogs/delete-comp.c:116
-msgid "Are you sure want to delete this untitled journal entry?"
-msgstr "您確定要刪除這個未命名的日誌？"
-
-# calendar/gui/dialogs/delete-comp.c:120
-#: calendar/gui/dialogs/delete-comp.c:131
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d appointment?"
-msgid_plural "Are you sure you want to delete %d appointments?"
-msgstr[0] "您確定要刪除 %d 個約會？"
-msgstr[1] "您確定要刪除 %d 個約會？"
-
-# calendar/gui/dialogs/delete-comp.c:125
-#: calendar/gui/dialogs/delete-comp.c:138
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d task?"
-msgid_plural "Are you sure you want to delete %d tasks?"
-msgstr[0] "您確定要刪除 %d 個工作？"
-msgstr[1] "您確定要刪除 %d 個工作？"
-
-# calendar/gui/dialogs/delete-comp.c:130
-#: calendar/gui/dialogs/delete-comp.c:145
-#, fuzzy, c-format
-msgid "Are you sure you want to delete %d journal entry?"
-msgid_plural "Are you sure you want to delete %d journal entries?"
-msgstr[0] "您確定要刪除 %d 個日誌項目？"
-msgstr[1] "您確定要刪除 %d 個日誌項目？"
-
-#: calendar/gui/dialogs/delete-error.c:52
+#: calendar/gui/dialogs/delete-error.c:54
 msgid "The event could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:55
+#: calendar/gui/dialogs/delete-error.c:57
 msgid "The task could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:58
+#: calendar/gui/dialogs/delete-error.c:60
 msgid "The journal entry could not be deleted due to a corba error"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:61
+#: calendar/gui/dialogs/delete-error.c:63
 #, fuzzy
 msgid "The item could not be deleted due to a corba error"
 msgstr "無法傳送這個項目！\n"
 
-#: calendar/gui/dialogs/delete-error.c:68
+#: calendar/gui/dialogs/delete-error.c:70
 msgid "The event could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:71
+#: calendar/gui/dialogs/delete-error.c:73
 #, fuzzy
 msgid "The task could not be deleted because permission was denied"
 msgstr "由於不合法的狀態使得到會者狀態無法更新！\n"
 
-#: calendar/gui/dialogs/delete-error.c:74
+#: calendar/gui/dialogs/delete-error.c:76
 msgid "The journal entry could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:77
+#: calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
 msgstr ""
 
-#: calendar/gui/dialogs/delete-error.c:84
+#: calendar/gui/dialogs/delete-error.c:86
 #, fuzzy
 msgid "The event could not be deleted due to an error"
 msgstr "無法傳送這個項目！\n"
 
-#: calendar/gui/dialogs/delete-error.c:87
+#: calendar/gui/dialogs/delete-error.c:89
 #, fuzzy
 msgid "The task could not be deleted due to an error"
 msgstr "無法傳送這個項目！\n"
 
-#: calendar/gui/dialogs/delete-error.c:90
+#: calendar/gui/dialogs/delete-error.c:92
 #, fuzzy
 msgid "The journal entry could not be deleted due to an error"
 msgstr "由於不合法的狀態使得到會者狀態無法更新！\n"
 
-#: calendar/gui/dialogs/delete-error.c:93
+#: calendar/gui/dialogs/delete-error.c:95
 #, fuzzy
 msgid "The item could not be deleted due to an error"
 msgstr "無法傳送這個項目！\n"
@@ -5961,11 +5703,11 @@ msgstr "開始時間(_S):"
 # widgets/misc/e-dateedit.c:1456
 #. an empty string is the same as 'None'
 #: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:3
+#: calendar/gui/dialogs/meeting-page.glade.h:4
 #: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
 #: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1559
-#: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:100
+#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
+#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
@@ -6000,8 +5742,8 @@ msgstr "委派給(_D)..."
 #. FIXME: need to disable for undeletable folders
 #: calendar/gui/dialogs/meeting-page.c:655
 #: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1310 calendar/gui/e-calendar-view.c:1342
-#: mail/em-folder-tree.c:2557 mail/em-folder-view.c:919
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
+#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
 #: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
@@ -6010,7 +5752,7 @@ msgstr "刪除(_D)"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:744
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
-#: calendar/gui/e-meeting-list-view.c:240
+#: calendar/gui/e-meeting-list-view.c:218
 #: calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "到會者"
@@ -6054,7 +5796,7 @@ msgid "Member"
 msgstr "會員"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/e-meeting-list-view.c:263
+#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -6063,9 +5805,8 @@ msgstr "RSVP"
 # mail/message-list.c:1081
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:270
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
-#: mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-list-view.c:248
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "狀況"
 
@@ -6075,23 +5816,23 @@ msgstr "狀況"
 msgid "Add A_ttendee"
 msgstr "到會者"
 
+# addressbook/gui/component/addressbook-config.c:662
+#: calendar/gui/dialogs/meeting-page.glade.h:3
+#, fuzzy
+msgid "Add attendees from addressbook."
+msgstr "新增寄件者到目錄服務(_B)"
+
 # calendar/gui/e-itip-control.glade.h:9
-#: calendar/gui/dialogs/meeting-page.glade.h:4
+#: calendar/gui/dialogs/meeting-page.glade.h:5
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
 msgstr "會議召集人:"
 
 # calendar/gui/e-itip-control.glade.h:9
-#: calendar/gui/dialogs/meeting-page.glade.h:5
+#: calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "_Change Organizer"
 msgstr "變更會議召集人(_C)"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:411
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-#: calendar/gui/e-meeting-time-sel.c:417
-msgid "_Invite Others..."
-msgstr "邀請其他人(_I)..."
-
 # data/evolution.keys.in.h:2
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 #, fuzzy
@@ -6299,7 +6040,7 @@ msgstr "非週期性約會(_N)"
 # shell/e-shortcuts-view.c:265
 # shell/e-shortcuts-view.c:388
 #: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:450
+#: composer/e-msg-composer-attachment-bar.c:453
 msgid "_Remove"
 msgstr "移除(_R)"
 
@@ -6338,36 +6079,14 @@ msgstr "週"
 msgid "year(s)"
 msgstr "年"
 
-# composer/e-msg-composer.c:941
-#: calendar/gui/dialogs/save-comp.c:53
-#, fuzzy
-msgid ""
-"This event has been changed, but has not been saved.\n"
-"\n"
-"Do you wish to save your changes?"
-msgstr ""
-"這個簽名檔已變更但仍未儲存。\n"
-"\n"
-"您是否要儲存變更？"
-
-#: calendar/gui/dialogs/save-comp.c:57
-msgid "_Discard Changes"
-msgstr "放棄變更(_D)"
-
-# calendar/gui/e-itip-control.glade.h:4
-#: calendar/gui/dialogs/save-comp.c:62
-#, fuzzy
-msgid "Save Event"
-msgstr "行事曆事件"
-
 # shell/e-shell-importer.c:602
-#: calendar/gui/dialogs/select-source-dialog.c:65
+#: calendar/gui/dialogs/select-source-dialog.c:69
 #, fuzzy
 msgid "Select destination"
 msgstr "選擇用來匯入這些資料的目的資料夾"
 
 # ui/evolution.xml.h:47
-#: calendar/gui/dialogs/select-source-dialog.c:86
+#: calendar/gui/dialogs/select-source-dialog.c:90
 #, fuzzy
 msgid "_Destination"
 msgstr "刪除這個資料夾"
@@ -6375,27 +6094,11 @@ msgstr "刪除這個資料夾"
 # calendar/gui/calendar-summary.c:275
 # calendar/gui/print.c:948
 # views/tasks/galview.xml.h:1
-#: calendar/gui/dialogs/select-source-dialog.c:88
+#: calendar/gui/dialogs/select-source-dialog.c:92
 #, fuzzy
 msgid "Task List"
 msgstr "工作清單"
 
-#: calendar/gui/dialogs/send-comp.c:57
-msgid "The meeting information has been created. Send it?"
-msgstr "會議資訊已建立。是否傳送它？"
-
-#: calendar/gui/dialogs/send-comp.c:60
-msgid "The meeting information has changed. Send an updated version?"
-msgstr "會議資訊已變更。是否傳送更新後的資訊？"
-
-#: calendar/gui/dialogs/send-comp.c:67
-msgid "The task assignment information has been created. Send it?"
-msgstr "工作指派資訊已建立。是否傳送它？"
-
-#: calendar/gui/dialogs/send-comp.c:71
-msgid "The task information has changed. Send an updated version?"
-msgstr "工作資訊已變更。是否傳送更新後的資訊？"
-
 # calendar/gui/calendar-model.c:644
 # calendar/gui/calendar-model.c:1180
 # calendar/gui/dialogs/task-editor-dialog.glade.h:6
@@ -6429,7 +6132,7 @@ msgstr "已完成"
 # mail/message-list.c:689
 #: calendar/gui/dialogs/task-details-page.glade.h:5
 #: calendar/gui/e-cal-component-preview.c:249
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:960
 msgid "High"
 msgstr "高"
 
@@ -6452,7 +6155,7 @@ msgstr "進行中"
 # mail/message-list.c:687
 #: calendar/gui/dialogs/task-details-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:253
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:958
 msgid "Low"
 msgstr "低"
 
@@ -6465,7 +6168,7 @@ msgstr "低"
 #: calendar/gui/dialogs/task-details-page.glade.h:8
 #: calendar/gui/e-cal-component-preview.c:251
 #: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:957
+#: mail/message-list.c:959
 msgid "Normal"
 msgstr "普通"
 
@@ -6548,8 +6251,8 @@ msgstr "機密(_F)"
 # composer/e-msg-composer-attachment.glade.h:3
 #: calendar/gui/dialogs/task-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
+#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "描述:"
 
@@ -6760,7 +6463,7 @@ msgstr "到期日(_D):"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:27
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:950
+#: calendar/gui/e-itip-control.c:943
 msgid "Status:"
 msgstr "狀態:"
 
@@ -6871,13 +6574,13 @@ msgstr "忙碌"
 msgid "Deleting selected objects"
 msgstr "刪除選定的物件"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
 msgid "Updating objects"
 msgstr "更新物件"
 
 # mail/folder-browser.c:686
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1290 calendar/gui/e-calendar-view.c:1370
+#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
 #: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "開啟(_O)"
@@ -6893,8 +6596,8 @@ msgstr "開啟郵件(_O)"
 # ui/evolution-mail.xml.h:118
 # ui/evolution-tasks.xml.h:8
 #: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1291 calendar/gui/e-calendar-view.c:1376
-#: mail/em-folder-view.c:896 mail/em-popup.c:690 mail/em-popup.c:806
+#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
+#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "另存新檔(_S)..."
@@ -6903,8 +6606,8 @@ msgstr "另存新檔(_S)..."
 # ui/evolution-calendar.xml.h:42
 # ui/evolution-contact-editor.xml.h:15
 #: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1269 calendar/gui/e-calendar-view.c:1292
-#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
+#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
@@ -6914,7 +6617,7 @@ msgstr "列印(_P)..."
 # ui/evolution-event-editor.xml.h:6
 # ui/evolution-task-editor-dialog.xml.h:7
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
@@ -6923,9 +6626,9 @@ msgstr "剪下(_U)"
 # ui/evolution-event-editor.xml.h:55
 # ui/evolution-task-editor-dialog.xml.h:67
 #: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1298 calendar/gui/e-calendar-view.c:1338
-#: mail/em-folder-tree.c:958 mail/em-folder-tree.c:2550
-#: mail/message-list.c:1644 ui/evolution-addressbook.xml.h:31
+#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
+#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
+#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
 #: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
 #: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
 msgid "_Copy"
@@ -6934,8 +6637,8 @@ msgstr "複製(_C)"
 # ui/evolution-event-editor.xml.h:68
 # ui/evolution-task-editor-dialog.xml.h:81
 #: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1273 calendar/gui/e-calendar-view.c:1299
-#: calendar/gui/e-calendar-view.c:1372 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
+#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
@@ -7026,91 +6729,91 @@ msgstr "工作排序"
 
 # calendar/gui/e-week-view.c:3277
 # calendar/gui/e-week-view.c:3300
-#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
 msgid "New _Appointment..."
 msgstr "新增約會(_A)..."
 
 # calendar/gui/e-day-view.c:3148
 # calendar/gui/e-week-view.c:3279
-#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
+#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
 msgid "New All Day _Event"
 msgstr "新增全天事件(_E)"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
+#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
 msgid "New Meeting"
 msgstr "新增會議"
 
 # ui/evolution-tasks.xml.h:3
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
+#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
 msgid "New Task"
 msgstr "新增工作"
 
 # ui/evolution-mail.xml.h:77
-#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "選擇相關郵件(_T)"
 
 # ui/evolution-contact-editor.xml.h:3
-#: calendar/gui/e-calendar-view.c:1280
+#: calendar/gui/e-calendar-view.c:1283
 #, fuzzy
 msgid "_Select Date..."
 msgstr "刪除..."
 
 # mail/mail-config.glade.h:61
-#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "發佈空閒/忙碌資訊(_P)"
 
 # mail/folder-browser.c:713
-#: calendar/gui/e-calendar-view.c:1303
+#: calendar/gui/e-calendar-view.c:1306
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "複製至資料夾..."
 
 # mail/folder-browser.c:711
-#: calendar/gui/e-calendar-view.c:1304
+#: calendar/gui/e-calendar-view.c:1307
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "移至資料夾(_V)..."
 
 # ui/evolution-event-editor.xml.h:46
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1308
 msgid "_Schedule Meeting..."
 msgstr "會議排程(_S)..."
 
 # calendar/gui/calendar-summary.c:721
 # calendar/gui/e-itip-control.glade.h:7
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1309
 msgid "_Forward as iCalendar..."
 msgstr "以 iCalendar 轉寄(_F)..."
 
 # calendar/gui/e-day-view.c:3177
 # calendar/gui/e-week-view.c:3311
-#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
 msgid "Delete this _Occurrence"
 msgstr "刪除這個事件(_O)"
 
 # calendar/gui/e-week-view.c:3313
-#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
 msgid "Delete _All Occurrences"
 msgstr "刪除全部事件(_A)"
 
 # ui/evolution-calendar.xml.h:12
-#: calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1349
 msgid "Go to _Today"
 msgstr "移至今日(_T)"
 
 # calendar/gui/e-day-view.c:3155
 # calendar/gui/e-week-view.c:3286
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1351
 msgid "_Go to Date..."
 msgstr "到指定日期(_G)..."
 
 # ui/evolution-mail.xml.h:110
-#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "設定值(_S)..."
 
@@ -7130,9 +6833,9 @@ msgstr "開始日期"
 # camel/providers/smtp/camel-smtp-transport.c:221
 #. This is the default filename used for temporary file creation
 #: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:967 calendar/gui/e-itip-control.c:1169
-#: calendar/gui/e-meeting-list-view.c:144
-#: calendar/gui/e-meeting-list-view.c:158 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
 #: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
 #: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
 #: camel/camel-tcp-stream-openssl.c:631
@@ -7161,14 +6864,14 @@ msgstr "已指定"
 
 # calendar/gui/calendar-model.c:1584
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
 #: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr "是"
 
 # calendar/gui/calendar-model.c:1584
 #: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "否"
 
@@ -7183,7 +6886,7 @@ msgid "S"
 msgstr "S"
 
 # calendar/gui/calendar-model.c:459
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
 msgid "E"
 msgstr "E"
 
@@ -7276,13 +6979,13 @@ msgid "%02i minute divisions"
 msgstr "間隔 %02i 分鐘"
 
 # calendar/gui/event-editor-dialog.glade.h:26
-#: calendar/gui/e-itip-control.c:592
+#: calendar/gui/e-itip-control.c:585
 #, fuzzy
 msgid "Yes. (Complex Recurrence)"
 msgstr "簡單循環(_S)"
 
 # calendar/gui/event-editor-dialog.glade.h:10
-#: calendar/gui/e-itip-control.c:603
+#: calendar/gui/e-itip-control.c:596
 #, fuzzy, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
@@ -7290,14 +6993,14 @@ msgstr[0] "每"
 msgstr[1] "每"
 
 # calendar/gui/event-editor-dialog.glade.h:10
-#: calendar/gui/e-itip-control.c:608
+#: calendar/gui/e-itip-control.c:601
 #, fuzzy, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "每"
 msgstr[1] "每"
 
-#: calendar/gui/e-itip-control.c:610
+#: calendar/gui/e-itip-control.c:603
 #, fuzzy, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -7305,22 +7008,22 @@ msgstr[0] "艾弗格林"
 msgstr[1] "艾弗格林"
 
 # ui/evolution-message-composer.xml.h:26
-#: calendar/gui/e-itip-control.c:618
+#: calendar/gui/e-itip-control.c:611
 #, fuzzy
 msgid " and "
 msgstr "沙塵"
 
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:618
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:631
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:645
+#: calendar/gui/e-itip-control.c:638
 #, fuzzy, c-format
 msgid "every month"
 msgid_plural "every %d months"
@@ -7328,29 +7031,29 @@ msgstr[0] "一個月(_H)"
 msgstr[1] "一個月(_H)"
 
 # calendar/gui/event-editor-dialog.glade.h:10
-#: calendar/gui/e-itip-control.c:649
+#: calendar/gui/e-itip-control.c:642
 #, fuzzy, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "每"
 msgstr[1] "每"
 
-#: calendar/gui/e-itip-control.c:660
+#: calendar/gui/e-itip-control.c:653
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
 msgstr[0] ""
 msgstr[1] ""
 
-#: calendar/gui/e-itip-control.c:669
+#: calendar/gui/e-itip-control.c:662
 msgid ", ending on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:693
+#: calendar/gui/e-itip-control.c:686
 msgid "<b>Starts:</b> "
 msgstr "<b>開始:</b>"
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:696
 msgid "<b>Ends:</b> "
 msgstr "<b>結束:</b>"
 
@@ -7358,56 +7061,61 @@ msgstr "<b>結束:</b>"
 # calendar/gui/calendar-model.c:1180
 # calendar/gui/dialogs/task-editor-dialog.glade.h:6
 # calendar/gui/e-calendar-table.c:421
-#: calendar/gui/e-itip-control.c:723
+#: calendar/gui/e-itip-control.c:716
 msgid "<b>Completed:</b> "
 msgstr "<b>已完成:</b>"
 
-#: calendar/gui/e-itip-control.c:733
+#: calendar/gui/e-itip-control.c:726
 msgid "<b>Due:</b> "
 msgstr "<b>逾期:</b>"
 
 # data/evolution.keys.in.h:2
-#: calendar/gui/e-itip-control.c:771 calendar/gui/e-itip-control.c:827
+#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
 msgid "iCalendar Information"
 msgstr "iCalendar 資訊"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
 #. Title
-#: calendar/gui/e-itip-control.c:788
+#: calendar/gui/e-itip-control.c:781
 msgid "iCalendar Error"
 msgstr "iCalendar 錯誤"
 
 # camel/providers/imap/camel-imap-command.c:241
 # shell/e-storage.c:481
-#: calendar/gui/e-itip-control.c:859 calendar/gui/e-itip-control.c:875
-#: calendar/gui/e-itip-control.c:886 calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
+#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
 msgid "An unknown person"
 msgstr "不明人士"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:910
+#: calendar/gui/e-itip-control.c:903
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr "<br> 請查閱下列資訊，然後在下面的選單中選擇一個動作。"
 
-#: calendar/gui/e-itip-control.c:925
+#: calendar/gui/e-itip-control.c:918
 msgid "<i>None</i>"
 msgstr "<i>無</i>"
 
-#: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
+# addressbook/backend/ebook/e-card.c:3442
+#: calendar/gui/e-itip-control.c:929
+msgid "Location:"
+msgstr "位置:"
+
+#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "接受"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:392
-#: calendar/gui/e-itip-control.c:959 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "暫時接受"
 
-#: calendar/gui/e-itip-control.c:963 calendar/gui/e-meeting-list-view.c:181
+#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
@@ -7415,306 +7123,306 @@ msgstr "婉拒"
 
 # shell/e-shell-importer.c:545
 # shell/importer/import.glade.h:5
-#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.c:1050
-#: calendar/gui/e-itip-control.c:1076 calendar/gui/e-itip-control.c:1089
-#: calendar/gui/e-itip-control.c:1102 calendar/gui/e-itip-control.c:1115
+#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
+#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
+#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
 msgid "Choose an action:"
 msgstr "選擇一個動作:"
 
-#: calendar/gui/e-itip-control.c:1023
+#: calendar/gui/e-itip-control.c:1016
 msgid "Update"
 msgstr "更新"
 
 # widgets/misc/e-cell-date-edit.c:245
-#: calendar/gui/e-itip-control.c:1024 calendar/gui/e-itip-control.c:1055
-#: calendar/gui/e-itip-control.c:1078 calendar/gui/e-itip-control.c:1091
-#: calendar/gui/e-itip-control.c:1104 calendar/gui/e-itip-control.c:1117
-#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
+#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
+#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
+#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "確認"
 
-#: calendar/gui/e-itip-control.c:1051
+#: calendar/gui/e-itip-control.c:1044
 msgid "Accept"
 msgstr "接受"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:392
-#: calendar/gui/e-itip-control.c:1052
+#: calendar/gui/e-itip-control.c:1045
 msgid "Tentatively accept"
 msgstr "暫時接受"
 
-#: calendar/gui/e-itip-control.c:1053
+#: calendar/gui/e-itip-control.c:1046
 msgid "Decline"
 msgstr "婉拒"
 
 # mail/mail-config.glade.h:61
-#: calendar/gui/e-itip-control.c:1077
+#: calendar/gui/e-itip-control.c:1070
 msgid "Send Free/Busy Information"
 msgstr "送出空閒/忙碌資訊"
 
-#: calendar/gui/e-itip-control.c:1090
+#: calendar/gui/e-itip-control.c:1083
 msgid "Update respondent status"
 msgstr "更新回應狀態"
 
 # widgets/misc/e-messagebox.c:152
-#: calendar/gui/e-itip-control.c:1103
+#: calendar/gui/e-itip-control.c:1096
 msgid "Send Latest Information"
 msgstr "送出最新資訊"
 
 # ui/evolution-mail.xml.h:2
-#: calendar/gui/e-itip-control.c:1116 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "取消"
 
-#: calendar/gui/e-itip-control.c:1192
+#: calendar/gui/e-itip-control.c:1185
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> 已經發佈會議資訊。"
 
 # data/evolution.keys.in.h:2
-#: calendar/gui/e-itip-control.c:1193
+#: calendar/gui/e-itip-control.c:1186
 msgid "Meeting Information"
 msgstr "會議資訊"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1191
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> 邀請 %s 出席此次會議。"
 
-#: calendar/gui/e-itip-control.c:1200
+#: calendar/gui/e-itip-control.c:1193
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> 邀請您出席此次會議。"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: calendar/gui/e-itip-control.c:1201
+#: calendar/gui/e-itip-control.c:1194
 msgid "Meeting Proposal"
 msgstr "會議提案"
 
-#: calendar/gui/e-itip-control.c:1205
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> 希望加入一個既存的會議。"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:631
-#: calendar/gui/e-itip-control.c:1206
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Update"
 msgstr "會議更新"
 
-#: calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1203
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> 希望收到最新的會議資訊。"
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1204
 msgid "Meeting Update Request"
 msgstr "會議更新請求"
 
-#: calendar/gui/e-itip-control.c:1218
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> 已經答覆了會議請求。"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Reply"
 msgstr "會議答覆"
 
-#: calendar/gui/e-itip-control.c:1226
+#: calendar/gui/e-itip-control.c:1219
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b> 已經消取會議。"
 
 # shell/e-shell-importer.c:545
 # shell/importer/import.glade.h:5
-#: calendar/gui/e-itip-control.c:1227
+#: calendar/gui/e-itip-control.c:1220
 msgid "Meeting Cancellation"
 msgstr "會議取消"
 
-#: calendar/gui/e-itip-control.c:1234 calendar/gui/e-itip-control.c:1302
-#: calendar/gui/e-itip-control.c:1337
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1330
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> 傳送了一個難以理解的訊息。"
 
 # mail/mail-search.c:268
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1228
 msgid "Bad Meeting Message"
 msgstr "不正確的會議訊息"
 
-#: calendar/gui/e-itip-control.c:1260
+#: calendar/gui/e-itip-control.c:1253
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> 已經發佈了工作資訊。"
 
 # widgets/misc/e-messagebox.c:152
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1254
 msgid "Task Information"
 msgstr "工作資訊"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1259
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> 要求 %s 進行工作。"
 
-#: calendar/gui/e-itip-control.c:1268
+#: calendar/gui/e-itip-control.c:1261
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> 要求您進行工作。"
 
-#: calendar/gui/e-itip-control.c:1269
+#: calendar/gui/e-itip-control.c:1262
 msgid "Task Proposal"
 msgstr "工作計畫"
 
-#: calendar/gui/e-itip-control.c:1273
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b> 希望加入一項既存的工作。"
 
-#: calendar/gui/e-itip-control.c:1274
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Update"
 msgstr "工作更新"
 
-#: calendar/gui/e-itip-control.c:1278
+#: calendar/gui/e-itip-control.c:1271
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> 希望收到最新的工作資訊。"
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1272
 msgid "Task Update Request"
 msgstr "工作更新請求"
 
-#: calendar/gui/e-itip-control.c:1286
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> 已經回覆指派的工作。"
 
 # mail/message-browser.c:188
 # ui/evolution-mail.xml.h:70
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Reply"
 msgstr "工作回覆"
 
-#: calendar/gui/e-itip-control.c:1294
+#: calendar/gui/e-itip-control.c:1287
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> 已經取消工作。"
 
-#: calendar/gui/e-itip-control.c:1295
+#: calendar/gui/e-itip-control.c:1288
 msgid "Task Cancellation"
 msgstr "工作取消"
 
 # calendar/gui/e-itip-control.glade.h:4
-#: calendar/gui/e-itip-control.c:1303
+#: calendar/gui/e-itip-control.c:1296
 msgid "Bad Task Message"
 msgstr "不正確的工作訊息"
 
-#: calendar/gui/e-itip-control.c:1322
+#: calendar/gui/e-itip-control.c:1315
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> 已經發佈空閒/忙碌資訊。"
 
 # mail/mail-config.glade.h:61
-#: calendar/gui/e-itip-control.c:1323
+#: calendar/gui/e-itip-control.c:1316
 msgid "Free/Busy Information"
 msgstr "空閒/忙碌資訊"
 
-#: calendar/gui/e-itip-control.c:1327
+#: calendar/gui/e-itip-control.c:1320
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> 請求您的空閒/忙碌資訊。"
 
 # addressbook/gui/widgets/e-addressbook-view.c:737
-#: calendar/gui/e-itip-control.c:1328
+#: calendar/gui/e-itip-control.c:1321
 msgid "Free/Busy Request"
 msgstr "空閒/忙碌請求"
 
-#: calendar/gui/e-itip-control.c:1332
+#: calendar/gui/e-itip-control.c:1325
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> 已經答覆空閒/忙碌請求。"
 
 # addressbook/gui/widgets/e-addressbook-view.c:737
-#: calendar/gui/e-itip-control.c:1333
+#: calendar/gui/e-itip-control.c:1326
 msgid "Free/Busy Reply"
 msgstr "空閒/忙碌回覆"
 
 # mail/mail-callbacks.c:1407
-#: calendar/gui/e-itip-control.c:1338
+#: calendar/gui/e-itip-control.c:1331
 msgid "Bad Free/Busy Message"
 msgstr "不正確的空閒/忙碌訊息"
 
 # camel/providers/local/camel-mbox-folder.c:368
-#: calendar/gui/e-itip-control.c:1413
+#: calendar/gui/e-itip-control.c:1406
 msgid "The message does not appear to be properly formed"
 msgstr "訊息似乎沒有被適當地組成"
 
-#: calendar/gui/e-itip-control.c:1472
+#: calendar/gui/e-itip-control.c:1465
 msgid "The message contains only unsupported requests."
 msgstr "這個郵件只包含不支援的請求。"
 
-#: calendar/gui/e-itip-control.c:1503
+#: calendar/gui/e-itip-control.c:1496
 msgid "The attachment does not contain a valid calendar message"
 msgstr "附件並未包含合法的行事曆訊息"
 
-#: calendar/gui/e-itip-control.c:1535
+#: calendar/gui/e-itip-control.c:1528
 msgid "The attachment has no viewable calendar items"
 msgstr "附件沒有可檢視的行事曆項目"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:8
-#: calendar/gui/e-itip-control.c:1769
+#: calendar/gui/e-itip-control.c:1762
 msgid "Update complete\n"
 msgstr "更新完成\n"
 
-#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
+#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "到會者狀態不能更新，因為項目已經不存在"
 
-#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
+#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
 msgid "Object is invalid and cannot be updated\n"
 msgstr "物件是無效的而且不能更新\n"
 
-#: calendar/gui/e-itip-control.c:1825
+#: calendar/gui/e-itip-control.c:1818
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "這個回覆並非來自目前的到會者。將他加入為到會者？"
 
-#: calendar/gui/e-itip-control.c:1837
+#: calendar/gui/e-itip-control.c:1830
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "由於不合法的狀態使得到會者狀態無法更新！\n"
 
-#: calendar/gui/e-itip-control.c:1856
+#: calendar/gui/e-itip-control.c:1849
 msgid "There was an error on the CORBA system\n"
 msgstr "CORBA 系統發生錯誤\n"
 
-#: calendar/gui/e-itip-control.c:1859
+#: calendar/gui/e-itip-control.c:1852
 msgid "Object could not be found\n"
 msgstr "找不到物件\n"
 
-#: calendar/gui/e-itip-control.c:1862
+#: calendar/gui/e-itip-control.c:1855
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "您沒有正確的權限可以更新行事曆\n"
 
-#: calendar/gui/e-itip-control.c:1865
+#: calendar/gui/e-itip-control.c:1858
 msgid "Attendee status updated\n"
 msgstr "到會者狀態已更新\n"
 
-#: calendar/gui/e-itip-control.c:1868
+#: calendar/gui/e-itip-control.c:1861
 msgid "Attendee status could not be updated!\n"
 msgstr "無法更新到會者狀態！\n"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:2
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1892
 msgid "Removal Complete"
 msgstr "移除完成"
 
-#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
 msgid "Item sent!\n"
 msgstr "項目傳送！\n"
 
-#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
+#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
 msgid "The item could not be sent!\n"
 msgstr "無法傳送這個項目！\n"
 
@@ -7766,83 +7474,83 @@ msgid "date-start"
 msgstr "日期開始"
 
 # addressbook/gui/widgets/e-addressbook-view.c:712
-#: calendar/gui/e-meeting-list-view.c:62
+#: calendar/gui/e-meeting-list-view.c:59
 msgid "Chair Persons"
 msgstr "主席"
 
 # mail/mail-config.glade.h:61
-#: calendar/gui/e-meeting-list-view.c:63
-#: calendar/gui/e-meeting-list-view.c:479
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
 msgid "Required Participants"
 msgstr "出席者"
 
-#: calendar/gui/e-meeting-list-view.c:64
+#: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "列席者"
 
 # addressbook/gui/widgets/e-addressbook-view.c:735
-#: calendar/gui/e-meeting-list-view.c:65
+#: calendar/gui/e-meeting-list-view.c:62
 msgid "Resources"
 msgstr "資源"
 
-#: calendar/gui/e-meeting-list-view.c:140 calendar/gui/e-meeting-store.c:90
+#: calendar/gui/e-meeting-list-view.c:118 calendar/gui/e-meeting-store.c:90
 #: calendar/gui/e-meeting-store.c:107 calendar/gui/e-meeting-store.c:759
 msgid "Individual"
 msgstr "個別"
 
 # shell/e-shortcuts-view.c:137
-#: calendar/gui/e-meeting-list-view.c:141 calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:119 calendar/gui/e-meeting-store.c:92
 #: calendar/gui/e-meeting-store.c:109
 msgid "Group"
 msgstr "組別"
 
 # addressbook/gui/widgets/e-addressbook-view.c:735
-#: calendar/gui/e-meeting-list-view.c:142 calendar/gui/e-meeting-store.c:94
+#: calendar/gui/e-meeting-list-view.c:120 calendar/gui/e-meeting-store.c:94
 #: calendar/gui/e-meeting-store.c:111
 msgid "Resource"
 msgstr "資源"
 
-#: calendar/gui/e-meeting-list-view.c:143 calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:121 calendar/gui/e-meeting-store.c:96
 #: calendar/gui/e-meeting-store.c:113
 msgid "Room"
 msgstr "會議室"
 
 # addressbook/contact-editor/e-contact-editor.c:1247
-#: calendar/gui/e-meeting-list-view.c:154 calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:132 calendar/gui/e-meeting-store.c:125
 #: calendar/gui/e-meeting-store.c:142
 msgid "Chair"
 msgstr "主席"
 
 # mail/mail-config.glade.h:61
-#: calendar/gui/e-meeting-list-view.c:155 calendar/gui/e-meeting-store.c:127
+#: calendar/gui/e-meeting-list-view.c:133 calendar/gui/e-meeting-store.c:127
 #: calendar/gui/e-meeting-store.c:144 calendar/gui/e-meeting-store.c:762
 msgid "Required Participant"
 msgstr "出席者"
 
-#: calendar/gui/e-meeting-list-view.c:156 calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:134 calendar/gui/e-meeting-store.c:129
 #: calendar/gui/e-meeting-store.c:146
 msgid "Optional Participant"
 msgstr "列席者"
 
-#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:135 calendar/gui/e-meeting-store.c:131
 #: calendar/gui/e-meeting-store.c:148
 msgid "Non-Participant"
 msgstr "缺席者"
 
 # shell/e-shell-importer.c:545
 # shell/importer/import.glade.h:5
-#: calendar/gui/e-meeting-list-view.c:179 calendar/gui/e-meeting-store.c:177
+#: calendar/gui/e-meeting-list-view.c:157 calendar/gui/e-meeting-store.c:177
 #: calendar/gui/e-meeting-store.c:200 calendar/gui/e-meeting-store.c:772
 msgid "Needs Action"
 msgstr "需要動作"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:392
-#: calendar/gui/e-meeting-list-view.c:182 calendar/gui/e-meeting-store.c:183
+#: calendar/gui/e-meeting-list-view.c:160 calendar/gui/e-meeting-store.c:183
 #: calendar/gui/e-meeting-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "暫訂"
 
-#: calendar/gui/e-meeting-list-view.c:183 calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:161 calendar/gui/e-meeting-store.c:185
 #: calendar/gui/e-meeting-store.c:208
 msgid "Delegated"
 msgstr "已委派"
@@ -7865,6 +7573,12 @@ msgstr "不在辦公室"
 msgid "No Information"
 msgstr "沒有資訊"
 
+# addressbook/gui/component/addressbook-config.c:662
+#: calendar/gui/e-meeting-time-sel.c:417
+#, fuzzy
+msgid "Add attendees from addressbook"
+msgstr "新增寄件者到目錄服務(_B)"
+
 # widgets/meeting-time-sel/e-meeting-time-sel.c:431
 #: calendar/gui/e-meeting-time-sel.c:440
 msgid "_Options"
@@ -7872,17 +7586,20 @@ msgstr "選項(_O)"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:448
 #: calendar/gui/e-meeting-time-sel.c:457
-msgid "Show _Only Working Hours"
+#, fuzzy
+msgid "Show _only working hours"
 msgstr "只顯示工作時間(_O)"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:461
 #: calendar/gui/e-meeting-time-sel.c:467
-msgid "Show _Zoomed Out"
+#, fuzzy
+msgid "Show _zoomed out"
 msgstr "顯示縮小(_Z)"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:479
 #: calendar/gui/e-meeting-time-sel.c:482
-msgid "_Update Free/Busy"
+#, fuzzy
+msgid "_Update free/busy"
 msgstr "更新空閒/忙碌(_U)"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:497
@@ -7902,22 +7619,26 @@ msgstr ">_>"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:545
 #: calendar/gui/e-meeting-time-sel.c:547
-msgid "_All People and Resources"
+#, fuzzy
+msgid "_All people and resources"
 msgstr "所有人員與資源(_A)"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:558
 #: calendar/gui/e-meeting-time-sel.c:556
-msgid "All _People and One Resource"
+#, fuzzy
+msgid "All _people and one resource"
 msgstr "所有與會者與一項資源(_P)"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:571
 #: calendar/gui/e-meeting-time-sel.c:565
-msgid "_Required People"
+#, fuzzy
+msgid "_Required people"
 msgstr "需要與會者(_R)"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:584
 #: calendar/gui/e-meeting-time-sel.c:574
-msgid "Required People and _One Resource"
+#, fuzzy
+msgid "Required people and _one resource"
 msgstr "需要與會者與一項資源(_O)"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:607
@@ -7969,7 +7690,7 @@ msgid "Enter the password for %s"
 msgstr "請輸入 %s 所需的密碼"
 
 # mail/mail-mt.c:190
-#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
+#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7978,21 +7699,16 @@ msgstr ""
 "發生於 %s 的錯誤：\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-
 # mail/mail-ops.c:1262
 #. FIXME Loading should be async
 #. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:686
+#: calendar/gui/e-tasks.c:801
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "開啟在 %s 的工作"
 
 # mail/mail-mt.c:190
-#: calendar/gui/e-tasks.c:709
+#: calendar/gui/e-tasks.c:824
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
@@ -8002,33 +7718,33 @@ msgstr ""
 " %s"
 
 # ui/evolution-mail.xml.h:46
-#: calendar/gui/e-tasks.c:730
+#: calendar/gui/e-tasks.c:845
 #, fuzzy
 msgid "Loading tasks"
 msgstr "載入影像"
 
 # calendar/gui/e-calendar-table.c:152
-#: calendar/gui/e-tasks.c:834
+#: calendar/gui/e-tasks.c:949
 msgid "Completing tasks..."
 msgstr "正在完成工作..."
 
 # calendar/gui/e-calendar-table.c:714
-#: calendar/gui/e-tasks.c:857
+#: calendar/gui/e-tasks.c:972
 msgid "Deleting selected objects..."
 msgstr "正在刪除選定的物件..."
 
 # mail/mail-ops.c:1449
-#: calendar/gui/e-tasks.c:884
+#: calendar/gui/e-tasks.c:999
 msgid "Expunging"
 msgstr "除去中"
 
 # calendar/gui/calendar-summary.c:275
 # calendar/gui/print.c:948
 # views/tasks/galview.xml.h:1
-#: calendar/gui/e-tasks.c:960
+#: calendar/gui/e-tasks.c:1075
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
-#: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
+#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
+#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
 #: calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:705
 msgid "Tasks"
@@ -8036,34 +7752,29 @@ msgstr "工作"
 
 # calendar/gui/e-day-view.c:3146
 # ui/evolution-calendar.xml.h:16
-#: calendar/gui/gnome-cal.c:1876
+#: calendar/gui/gnome-cal.c:1878
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "無約會"
 
 # ui/evolution-mail.xml.h:46
-#: calendar/gui/gnome-cal.c:1895
+#: calendar/gui/gnome-cal.c:1897
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "載入影像"
 
 # mail/mail-display.c:299
-#: calendar/gui/gnome-cal.c:1918
+#: calendar/gui/gnome-cal.c:1920
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "在 %s 內開啟..."
 
-#: calendar/gui/gnome-cal.c:2048
-#, c-format
-msgid "The calendar backend for '%s' has crashed."
-msgstr ""
-
 # camel/camel-store.c:378
 # mail/mail-ops.c:1007
 # mail/mail-ops.c:1014
 # mail/mail-ops.c:1032
 # mail/mail-ops.c:1033
-#: calendar/gui/gnome-cal.c:2894
+#: calendar/gui/gnome-cal.c:2906
 #, fuzzy
 msgid "Purging"
 msgstr "杜林"
@@ -8294,7 +8005,7 @@ msgid "On The Web"
 msgstr ""
 
 #. FIXME: set proper domain/code
-#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:860
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr ""
 
@@ -8307,7 +8018,7 @@ msgstr "權限不足"
 
 # addressbook/gui/component/addressbook.c:438
 #. FIXME: domain/code
-#: calendar/gui/migration.c:869
+#: calendar/gui/migration.c:889
 #, fuzzy, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "無法開啟目錄服務"
@@ -8610,7 +8321,7 @@ msgstr "列印項目"
 msgid "Print Setup"
 msgstr "列印設定"
 
-#: calendar/gui/tasks-component.c:303
+#: calendar/gui/tasks-component.c:313
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
@@ -8618,20 +8329,20 @@ msgstr ""
 # calendar/gui/calendar-summary.c:275
 # calendar/gui/print.c:948
 # views/tasks/galview.xml.h:1
-#: calendar/gui/tasks-component.c:361
+#: calendar/gui/tasks-component.c:371
 #, fuzzy
 msgid "New Task List"
 msgstr "工作清單"
 
 # ui/evolution-tasks.xml.h:3
-#: calendar/gui/tasks-component.c:398
+#: calendar/gui/tasks-component.c:408
 #, fuzzy, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "無工作"
 msgstr[1] "無工作"
 
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -8639,43 +8350,43 @@ msgstr[0] "%d 已選擇"
 msgstr[1] "%d 已選擇"
 
 # ui/evolution-mail.xml.h:46
-#: calendar/gui/tasks-component.c:447
+#: calendar/gui/tasks-component.c:457
 #, fuzzy
 msgid "Failed upgrading tasks."
 msgstr "載入影像"
 
-#: calendar/gui/tasks-component.c:526
+#: calendar/gui/tasks-component.c:749
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:538
+#: calendar/gui/tasks-component.c:761
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:576
+#: calendar/gui/tasks-component.c:799
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
 # ui/evolution-tasks.xml.h:3
-#: calendar/gui/tasks-component.c:804
+#: calendar/gui/tasks-component.c:1040
 msgid "New task"
 msgstr "新增工作"
 
 # ui/evolution-tasks.xml.h:9
-#: calendar/gui/tasks-component.c:805
+#: calendar/gui/tasks-component.c:1041
 msgid "_Task"
 msgstr "工作(_T)"
 
 # ui/evolution-tasks.xml.h:2
-#: calendar/gui/tasks-component.c:806
+#: calendar/gui/tasks-component.c:1042
 msgid "Create a new task"
 msgstr "建立一個新的工作"
 
 # ui/evolution-tasks.xml.h:3
-#: calendar/gui/tasks-component.c:812
+#: calendar/gui/tasks-component.c:1048
 #, fuzzy
 msgid "New tasks group"
 msgstr "新增工作"
@@ -8683,13 +8394,13 @@ msgstr "新增工作"
 # calendar/gui/calendar-summary.c:275
 # calendar/gui/print.c:948
 # views/tasks/galview.xml.h:1
-#: calendar/gui/tasks-component.c:813
+#: calendar/gui/tasks-component.c:1049
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "工作清單"
 
 # ui/evolution-tasks.xml.h:2
-#: calendar/gui/tasks-component.c:814
+#: calendar/gui/tasks-component.c:1050
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "建立一個新的工作"
@@ -10548,12 +10259,12 @@ msgid "Unsupported operation: append message: for %s"
 msgstr "不支援的操作：添加郵件： %s"
 
 # camel/camel-folder-search.c:338
-#: camel/camel-folder.c:1259
+#: camel/camel-folder.c:1262
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "不支援的操作：以詞句搜尋： %s"
 
-#: camel/camel-folder.c:1299
+#: camel/camel-folder.c:1302
 #, c-format
 msgid "Unsupported operation: search by uids: for %s"
 msgstr "不支援的操作：以 uids 搜尋： %s"
@@ -10568,12 +10279,18 @@ msgstr "移動郵件"
 msgid "Copying messages"
 msgstr "複製郵件"
 
-#: camel/camel-folder.c:1666
-msgid "Learning junk and/or non junk message(s)"
+# widgets/misc/e-messagebox.c:159
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "蘭辛"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
 msgstr ""
 
 # mail/mail-ops.c:1565
-#: camel/camel-folder.c:1695
+#: camel/camel-folder.c:1701
 #, fuzzy
 msgid "Filtering new message(s)"
 msgstr "取回 %d 封郵件"
@@ -10614,20 +10331,20 @@ msgstr ""
 
 # camel/camel-folder-search.c:485
 # camel/camel-folder-search.c:513
-#: camel/camel-folder-search.c:785
+#: camel/camel-folder-search.c:784
 #, fuzzy
 msgid "(match-threads) expects an array result"
 msgstr "(符合-全部) 需要單一布林值結果"
 
 # camel/camel-folder-search.c:485
 # camel/camel-folder-search.c:513
-#: camel/camel-folder-search.c:791
+#: camel/camel-folder-search.c:790
 #, fuzzy
 msgid "(match-threads) requires the folder set"
 msgstr "(符合-全部) 需要單一布林值結果"
 
 # camel/camel-folder-search.c:559
-#: camel/camel-folder-search.c:880
+#: camel/camel-folder-search.c:879
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "在不明的檔頭內執行查詢：%s"
@@ -10663,7 +10380,8 @@ msgstr ""
 # mail/mail-send-recv.c:471
 #: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
 #: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 mail/mail-ops.c:706
+#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "已取消。"
@@ -11098,7 +10816,7 @@ msgstr ""
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1212
+#: camel/providers/imap/camel-imap-store.c:1240
 msgid "Bad authentication response from server."
 msgstr "來自伺服器的不良許可回應。"
 
@@ -11542,38 +11260,38 @@ msgid "export keys: unimplemented"
 msgstr ""
 
 # camel/providers/local/camel-mbox-folder.c:152
-#: camel/camel-store.c:214
+#: camel/camel-store.c:213
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "不能取得資料夾：在此儲存空間上無效的操作"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: camel/camel-store.c:244
+#: camel/camel-store.c:243
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists"
 msgstr "不能取得資料夾：%s：%s"
 
 # camel/providers/local/camel-mbox-folder.c:152
-#: camel/camel-store.c:295
+#: camel/camel-store.c:297
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "不能建立資料夾：在此儲存空間上無效的操作"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: camel/camel-store.c:323
+#: camel/camel-store.c:325
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "不能取得資料夾：%s：%s"
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-#: camel/camel-store.c:387 camel/camel-vee-store.c:354
+#: camel/camel-store.c:389 camel/camel-vee-store.c:351
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "不能刪除資料夾： %s ：無效的操作"
 
 # camel/providers/local/camel-mbox-summary.c:655
-#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#: camel/camel-store.c:439 camel/camel-vee-store.c:387
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "不能重新命名資料夾： %s ：無效的操作"
@@ -11583,13 +11301,13 @@ msgstr "不能重新命名資料夾： %s ：無效的操作"
 # mail/mail-ops.c:1014
 # mail/mail-ops.c:1032
 # mail/mail-ops.c:1033
-#: camel/camel-store.c:811
+#: camel/camel-store.c:777
 msgid "Trash"
 msgstr "垃圾桶"
 
 # calendar/gui/goto-dialog.glade.h:9
-#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
-#: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/mail-config.glade.h:95
+#: ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
 msgstr "6月"
@@ -11834,13 +11552,13 @@ msgstr "不能複製或移動郵件到虛擬資料夾中"
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
-#: camel/camel-vee-store.c:377
+#: camel/camel-vee-store.c:374
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "不能刪除資料夾： %s ：沒有這個資料夾"
 
 # camel/providers/local/camel-local-store.c:237
-#: camel/camel-vee-store.c:398
+#: camel/camel-vee-store.c:395
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "不能重新命名資料夾： %s ：沒有這個資料夾"
@@ -11894,11 +11612,11 @@ msgstr "目錄服務"
 msgid "Post Office Agent SOAP Port:"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:80
+#: camel/providers/groupwise/camel-groupwise-provider.c:83
 msgid "Novell GroupWise"
 msgstr ""
 
-#: camel/providers/groupwise/camel-groupwise-provider.c:82
+#: camel/providers/groupwise/camel-groupwise-provider.c:85
 msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
@@ -11908,24 +11626,24 @@ msgstr ""
 # camel/providers/nntp/camel-nntp-store.c:291
 # camel/providers/pop3/camel-pop3-provider.c:67
 # mail/mail-config.glade.h:52
-#: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: camel/providers/groupwise/camel-groupwise-provider.c:100
 #: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
-#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:105
+#: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
 msgid "Password"
 msgstr "密碼"
 
 # camel/providers/imap/camel-imap-provider.c:82
-#: camel/providers/groupwise/camel-groupwise-provider.c:99
+#: camel/providers/groupwise/camel-groupwise-provider.c:102
 #: camel/providers/imap/camel-imap-provider.c:95
 #: camel/providers/imapp/camel-imapp-provider.c:67
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "這個選項將會使用簡易的密碼連線至 IMAP 伺服器。"
 
-#: camel/providers/groupwise/camel-gw-listener.c:305
-#: camel/providers/groupwise/camel-gw-listener.c:328
+#: camel/providers/groupwise/camel-gw-listener.c:312
+#: camel/providers/groupwise/camel-gw-listener.c:335
 #, fuzzy
 msgid "Checklist"
 msgstr "濃靄"
@@ -12113,14 +11831,14 @@ msgstr "這個選項將會使用簡易的密碼連線至 IMAP 伺服器。"
 
 # camel/providers/smtp/camel-smtp-transport.c:534
 #: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:429
+#: camel/providers/imap/camel-imap-store.c:428
 #, c-format
 msgid "IMAP server %s"
 msgstr "IMAP 伺服器 %s"
 
 # camel/camel-remote-store.c:195
 #: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:431
+#: camel/providers/imap/camel-imap-store.c:430
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s 的 IMAP 服務於 %s"
@@ -12132,7 +11850,7 @@ msgstr "%s 的 IMAP 服務於 %s"
 #: camel/providers/imap/camel-imap-store.c:551
 #: camel/providers/imap/camel-imap-store.c:571
 #: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
+#: camel/providers/nntp/camel-nntp-store.c:209
 #: camel/providers/pop3/camel-pop3-store.c:175
 #: camel/providers/smtp/camel-smtp-transport.c:269
 #: camel/providers/smtp/camel-smtp-transport.c:285
@@ -12151,10 +11869,10 @@ msgstr "TLS 無法使用"
 # camel/camel-remote-store.c:252
 #: camel/providers/imap4/camel-imap4-store.c:222
 #: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:815
+#: camel/providers/imap/camel-imap-store.c:845
 #: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:137
-#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
 #: camel/providers/pop3/camel-pop3-store.c:192
 msgid "Connection cancelled"
 msgstr "連線已取消"
@@ -12169,8 +11887,8 @@ msgstr "以安全模式連線到 IMAP 伺服器 %s 時失敗了： %s"
 
 # camel/providers/pop3/camel-pop3-store.c:379
 #: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:649
-#: camel/providers/imap/camel-imap-store.c:680
+#: camel/providers/imap/camel-imap-store.c:679
+#: camel/providers/imap/camel-imap-store.c:710
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "以安全模式連線到 IMAP 伺服器 %s 時失敗了： %s"
@@ -12181,7 +11899,7 @@ msgstr "以安全模式連線到 IMAP 伺服器 %s 時失敗了： %s"
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
 #: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1109
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
 msgid "Unknown error"
 msgstr "不明的錯誤"
 
@@ -12212,8 +11930,8 @@ msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr "不能取得資料夾：%s：%s"
 
 #: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1857
-#: camel/providers/imap/camel-imap-store.c:2235
+#: camel/providers/imap/camel-imap-store.c:1885
+#: camel/providers/imap/camel-imap-store.c:2263
 #, fuzzy, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -12316,13 +12034,13 @@ msgstr "伺服器突然中斷連線： %s"
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3168
+#: camel/providers/imap/camel-imap-store.c:3194
 msgid "Operation cancelled"
 msgstr "作業已取消"
 
 # camel/camel-remote-store.c:476
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3171
+#: camel/providers/imap/camel-imap-store.c:3197
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "伺服器突然中斷連線： %s"
@@ -12403,13 +12121,6 @@ msgstr "無法從取回郵件： %s"
 # camel/providers/local/camel-mh-folder.c:194
 # camel/providers/local/camel-mh-folder.c:202
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:219
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -12422,17 +12133,17 @@ msgstr ""
 # camel/providers/local/camel-mbox-folder.c:319
 # camel/providers/local/camel-mh-folder.c:185
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:417
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-mbox-folder.c:418
+#: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
 msgstr "沒有這封郵件"
 
 # camel/providers/imap/camel-imap-folder.c:1047
 # camel/providers/imap/camel-imap-folder.c:1281
 #: camel/providers/imap/camel-imap-folder.c:2019
-#: camel/providers/imap/camel-imap-folder.c:2621
-#: camel/providers/nntp/camel-nntp-folder.c:238
+#: camel/providers/imap/camel-imap-folder.c:2622
+#: camel/providers/nntp/camel-nntp-folder.c:220
 msgid "This message is not currently available"
 msgstr "這封郵件目前仍未可用"
 
@@ -12441,9 +12152,25 @@ msgstr "這封郵件目前仍未可用"
 msgid "Fetching summary information for new messages"
 msgstr "正取得新郵件的摘要資訊"
 
+#: camel/providers/imap/camel-imap-folder.c:2463
+#, c-format
+msgid "Incomplete server response: no information provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2471
+#, c-format
+msgid "Incomplete server response: no UID provided for message %d"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:2484
+#, c-format
+msgid ""
+"Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgstr ""
+
 # camel/providers/imap/camel-imap-folder.c:1075
 # camel/providers/imap/camel-imap-folder.c:1314
-#: camel/providers/imap/camel-imap-folder.c:2659
+#: camel/providers/imap/camel-imap-folder.c:2660
 msgid "Could not find message body in FETCH response."
 msgstr "在 FETCH 的回應內找不到郵件的內文。"
 
@@ -12524,41 +12251,41 @@ msgid "For reading and storing mail on IMAP servers."
 msgstr "用作讀取及儲存郵件於 IMAP 伺服器。"
 
 # shell/e-storage.c:477
-#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/imap/camel-imap-store.c:680
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "不支援 SSL/TLS 擴充機能。"
 
 # camel/camel-sasl-anonymous.c:110
 # camel/camel-sasl-plain.c:87
-#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/imap/camel-imap-store.c:711
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL 協商失敗"
 
 # camel/camel-remote-store.c:255
 # camel/providers/smtp/camel-smtp-transport.c:269
-#: camel/providers/imap/camel-imap-store.c:818
+#: camel/providers/imap/camel-imap-store.c:848
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "無法連線至 %s (埠號 %d)： %s"
 
 # camel/providers/imap/camel-imap-store.c:456
-#: camel/providers/imap/camel-imap-store.c:1242
+#: camel/providers/imap/camel-imap-store.c:1272
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP 伺服器 %s 不支援所要求的驗證類別 %s"
 
 # camel/providers/imap/camel-imap-store.c:466
 # camel/providers/smtp/camel-smtp-transport.c:366
-#: camel/providers/imap/camel-imap-store.c:1252
+#: camel/providers/imap/camel-imap-store.c:1282
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "不支援驗證類別 %s"
 
 # camel/providers/imap/camel-imap-store.c:490
-#: camel/providers/imap/camel-imap-store.c:1275
+#: camel/providers/imap/camel-imap-store.c:1305
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
@@ -12566,12 +12293,12 @@ msgstr "%s 請輸入 %s@%s 的 IMAP 密碼"
 
 # camel/providers/imap/camel-imap-store.c:505
 # camel/providers/smtp/camel-smtp-transport.c:410
-#: camel/providers/imap/camel-imap-store.c:1289
+#: camel/providers/imap/camel-imap-store.c:1319
 msgid "You didn't enter a password."
 msgstr "您沒有輸入密碼。"
 
 # camel/providers/imap/camel-imap-store.c:531
-#: camel/providers/imap/camel-imap-store.c:1318
+#: camel/providers/imap/camel-imap-store.c:1348
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -12584,20 +12311,20 @@ msgstr ""
 
 # camel/providers/imap/camel-imap-store.c:803
 # mail/mail-local.c:334
-#: camel/providers/imap/camel-imap-store.c:1839
-#: camel/providers/imap/camel-imap-store.c:2029
+#: camel/providers/imap/camel-imap-store.c:1867
+#: camel/providers/imap/camel-imap-store.c:2057
 #, c-format
 msgid "No such folder %s"
 msgstr "沒有這個資料夾 %s"
 
-#: camel/providers/imap/camel-imap-store.c:1915
-#: camel/providers/imap/camel-imap-store.c:2296
+#: camel/providers/imap/camel-imap-store.c:1943
+#: camel/providers/imap/camel-imap-store.c:2324
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "母資料夾並不允許包含子資料夾"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: camel/providers/imap/camel-imap-store.c:1970
+#: camel/providers/imap/camel-imap-store.c:1998
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -12606,7 +12333,7 @@ msgid "Cannot create folder `%s': folder exists."
 msgstr "不能取得資料夾：%s：%s"
 
 # camel/providers/local/camel-mbox-summary.c:879
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:2274
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "不明的母資料夾： %s"
@@ -12645,21 +12372,21 @@ msgid "Index message body data"
 msgstr "傳送郵件給連絡人"
 
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:389
+#: camel/providers/local/camel-local-folder.c:388
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
 # camel/providers/local/camel-mbox-folder.c:203
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:393
-#: camel/providers/local/camel-local-folder.c:396
+#: camel/providers/local/camel-local-folder.c:392
+#: camel/providers/local/camel-local-folder.c:395
 #, c-format
 msgid "mailbox:%s (%s)"
 msgstr "mailbox：%s (%s)"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:400
+#: camel/providers/local/camel-local-folder.c:399
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -12725,7 +12452,7 @@ msgstr ""
 # camel/providers/local/camel-local-store.c:127
 #: camel/providers/local/camel-local-store.c:142
 #: camel/providers/local/camel-local-store.c:253
-#: camel/providers/local/camel-mbox-store.c:356
+#: camel/providers/local/camel-mbox-store.c:355
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
@@ -12815,10 +12542,30 @@ msgstr "Maildir 增添郵件已取消"
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "無法將郵件儲存到 maildir 資料夾： %s： %s"
 
+# camel/providers/local/camel-mbox-folder.c:335
+# camel/providers/local/camel-mbox-folder.c:367
+# camel/providers/local/camel-mbox-folder.c:380
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:226
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mbox-folder.c:417
+#: camel/providers/local/camel-mbox-folder.c:436
+#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:475
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:212
+#: camel/providers/local/camel-mh-folder.c:221
+#, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+"不能取得郵件：%s 從資料夾 %s\n"
+"  %s"
+
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/local/camel-maildir-folder.c:236
 msgid "Invalid message contents"
 msgstr "無效的郵件內文"
 
@@ -12873,9 +12620,9 @@ msgstr "不是一個 maildir 目錄"
 
 # camel/providers/local/camel-maildir-store.c:107
 # camel/providers/local/camel-mh-store.c:103
-#: camel/providers/local/camel-maildir-store.c:341
-#: camel/providers/local/camel-spool-store.c:286
-#: camel/providers/local/camel-spool-store.c:316
+#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-spool-store.c:284
+#: camel/providers/local/camel-spool-store.c:314
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "無法掃描資料夾“%s”： %s"
@@ -12936,33 +12683,21 @@ msgstr "郵件增添已取消"
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "不能將郵件儲存到 mbox 檔案： %s： %s"
 
-# camel/providers/local/camel-mbox-folder.c:335
-# camel/providers/local/camel-mbox-folder.c:367
-# camel/providers/local/camel-mbox-folder.c:380
-#: camel/providers/local/camel-mbox-folder.c:435
-#: camel/providers/local/camel-mbox-folder.c:466
-#: camel/providers/local/camel-mbox-folder.c:474
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"不能取得郵件：%s 從資料夾 %s\n"
-"  %s"
-
 # camel/providers/local/camel-mbox-folder.c:368
-#: camel/providers/local/camel-mbox-folder.c:467
+#: camel/providers/local/camel-mbox-folder.c:468
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "資料夾好像已經損毀並且不能復原。"
 
 # camel/providers/local/camel-mbox-folder.c:381
-#: camel/providers/local/camel-mbox-folder.c:475
-msgid "Message construction failed: Corrupt mailbox?"
+#: camel/providers/local/camel-mbox-folder.c:476
+#: camel/providers/local/camel-mh-folder.c:222
+#, fuzzy
+msgid "Message construction failed."
 msgstr "郵件結構錯誤：損毀的 mailbox ？"
 
 # camel/providers/local/camel-mbox-folder.c:152
 #: camel/providers/local/camel-mbox-store.c:176
-#: camel/providers/local/camel-mbox-store.c:362
+#: camel/providers/local/camel-mbox-store.c:361
 #, fuzzy
 msgid "Cannot create a folder by this name."
 msgstr "無法建立以此為名的資料夾"
@@ -13001,37 +12736,37 @@ msgid "Folder `%s' is not empty. Not deleted."
 msgstr "資料夾“%s”內仍有檔案。所以不刪除。"
 
 # camel/providers/imap/camel-imap-folder.c:172
-#: camel/providers/local/camel-mbox-store.c:375
+#: camel/providers/local/camel-mbox-store.c:374
 #, fuzzy, c-format
 msgid "Cannot create directory `%s': %s."
 msgstr "無法建立目錄 %s： %s"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: camel/providers/local/camel-mbox-store.c:389
+#: camel/providers/local/camel-mbox-store.c:388
 #, fuzzy, c-format
 msgid "Cannot create folder: %s: %s"
 msgstr "不能取得資料夾：%s：%s"
 
-#: camel/providers/local/camel-mbox-store.c:391
+#: camel/providers/local/camel-mbox-store.c:390
 #, fuzzy
 msgid "Folder already exists"
 msgstr "名片 ID 已經存在"
 
 # shell/e-shell-folder-creation-dialog.c:156
-#: camel/providers/local/camel-mbox-store.c:473
+#: camel/providers/local/camel-mbox-store.c:472
 #, fuzzy
 msgid "The new folder name is illegal."
 msgstr "指定的資料夾名稱不合法： %s"
 
 # camel/providers/local/camel-mbox-summary.c:655
-#: camel/providers/local/camel-mbox-store.c:486
+#: camel/providers/local/camel-mbox-store.c:485
 #, fuzzy, c-format
 msgid "Could not rename `%s': `%s': %s"
 msgstr "無法重新命名“%s”：%s "
 
 # camel/providers/local/camel-local-store.c:237
-#: camel/providers/local/camel-mbox-store.c:561
+#: camel/providers/local/camel-mbox-store.c:560
 #, fuzzy, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "無法將資料夾 %s 重新命名為 %s： %s"
@@ -13268,7 +13003,7 @@ msgstr ""
 
 # camel/providers/smtp/camel-smtp-transport.c:395
 #: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:997
+#: camel/providers/nntp/camel-nntp-store.c:1126
 #, fuzzy, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "%s 請輸入 %s@%s 的 SMTP 密碼"
@@ -13287,19 +13022,6 @@ msgstr "無法連線至 LDAP 伺服器"
 msgid "Server rejected username/password"
 msgstr ""
 
-# camel/camel-remote-store.c:337
-# camel/camel-remote-store.c:399
-# camel/camel-remote-store.c:470
-# camel/providers/imap/camel-imap-command.c:287
-#: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:263
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr "使用者已取消"
-
 # camel/providers/local/camel-maildir-folder.c:197
 # camel/providers/local/camel-maildir-folder.c:209
 # camel/providers/local/camel-maildir-folder.c:217
@@ -13307,9 +13029,10 @@ msgstr "使用者已取消"
 # camel/providers/local/camel-mh-folder.c:185
 # camel/providers/local/camel-mh-folder.c:194
 # camel/providers/local/camel-mh-folder.c:202
-#: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:259
-#: camel/providers/nntp/camel-nntp-folder.c:265
+#: camel/providers/nntp/camel-nntp-folder.c:147
+#: camel/providers/nntp/camel-nntp-folder.c:149
+#: camel/providers/nntp/camel-nntp-folder.c:158
+#: camel/providers/nntp/camel-nntp-folder.c:234
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -13318,64 +13041,57 @@ msgstr "使用者已取消"
 msgid "Cannot get message %s: %s"
 msgstr "無法取得郵件 %s： %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:188
-#: camel/providers/nntp/camel-nntp-folder.c:228
+# camel/camel-remote-store.c:337
+# camel/camel-remote-store.c:399
+# camel/camel-remote-store.c:470
+# camel/providers/imap/camel-imap-command.c:287
+#: camel/providers/nntp/camel-nntp-folder.c:156
+#: camel/providers/nntp/camel-nntp-folder.c:232
+#: camel/providers/nntp/camel-nntp-folder.c:371
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:430
+#: camel/providers/pop3/camel-pop3-folder.c:491
+#: camel/providers/pop3/camel-pop3-folder.c:509
+msgid "User cancelled"
+msgstr "使用者已取消"
+
+#: camel/providers/nntp/camel-nntp-folder.c:176
+#: camel/providers/nntp/camel-nntp-folder.c:208
 #, c-format
 msgid "Internal error: uid in invalid format: %s"
 msgstr ""
 
-# camel/camel-movemail.c:306
-#: camel/providers/nntp/camel-nntp-folder.c:201
-#, fuzzy, c-format
-msgid "Could not get article %s from NNTP server"
-msgstr "無法取得群組：%s"
-
-#: camel/providers/nntp/camel-nntp-folder.c:362
-msgid "Posting not allowed by news server"
-msgstr ""
-
+# camel/camel-remote-store.c:337
+# camel/camel-remote-store.c:399
+# camel/camel-remote-store.c:470
+# camel/providers/imap/camel-imap-command.c:287
+#: camel/providers/nntp/camel-nntp-folder.c:328
+#: camel/providers/nntp/camel-nntp-folder.c:331
 #: camel/providers/nntp/camel-nntp-folder.c:373
-#, c-format
-msgid "Failed to send newsgroups header: %s: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:413
-#: camel/providers/nntp/camel-nntp-folder.c:426
-#, c-format
-msgid "Error posting to newsgroup: %s: message not posted"
-msgstr ""
-
-#: camel/providers/nntp/camel-nntp-folder.c:438
-msgid "Error reading response to posted message: message not posted"
-msgstr ""
-
-# mail/mail-ops.c:1755
-#: camel/providers/nntp/camel-nntp-folder.c:441
+#: camel/providers/nntp/camel-nntp-folder.c:375
 #, fuzzy, c-format
-msgid "Error posting message: %s: message not posted"
-msgstr ""
-"自動儲存郵件時發生錯誤： %s\n"
-" %s"
+msgid "Posting failed: %s"
+msgstr "作業失敗： %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:457
+#: camel/providers/nntp/camel-nntp-folder.c:393
 msgid "You cannot post NNTP messages while working offline!"
 msgstr ""
 
 # camel/providers/local/camel-mbox-summary.c:644
-#: camel/providers/nntp/camel-nntp-folder.c:468
+#: camel/providers/nntp/camel-nntp-folder.c:404
 #, fuzzy
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "無法關閉暫存資料夾： %s"
 
 # camel/camel-movemail.c:306
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
+#: camel/providers/nntp/camel-nntp-grouplist.c:44
 #, fuzzy
 msgid "Could not get group list from server."
 msgstr "無法取得群組：%s"
 
 # mail/mail-ops.c:1728
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
+#: camel/providers/nntp/camel-nntp-grouplist.c:97
+#: camel/providers/nntp/camel-nntp-grouplist.c:106
 #, fuzzy, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr ""
@@ -13383,7 +13099,7 @@ msgstr ""
 " %s"
 
 # mail/mail-ops.c:1728
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
+#: camel/providers/nntp/camel-nntp-grouplist.c:157
 #, fuzzy, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr ""
@@ -13416,31 +13132,33 @@ msgid ""
 "password."
 msgstr "這個選項將會使用純文字的密碼驗證 NNTP 伺服器。"
 
+# camel/providers/imap/camel-imap-command.c:240
+#: camel/providers/nntp/camel-nntp-store.c:118
+#: camel/providers/nntp/camel-nntp-store.c:1233
+#: camel/providers/nntp/camel-nntp-store.c:1331
+#, c-format
+msgid "NNTP Command failed: %s"
+msgstr "NNTP 指令失敗： %s"
+
 # camel/providers/imap/camel-imap-folder.c:172
-#: camel/providers/nntp/camel-nntp-store.c:158
+#: camel/providers/nntp/camel-nntp-store.c:227
 #, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "無法讀取 %s 的歡迎辭： %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:170
+#: camel/providers/nntp/camel-nntp-store.c:239
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr "NNTP 伺服器 %s 傳回錯誤代碼 %d ： %s"
 
 # camel/providers/nntp/camel-nntp-store.c:286
-#: camel/providers/nntp/camel-nntp-store.c:326
+#: camel/providers/nntp/camel-nntp-store.c:403
 #, c-format
 msgid "USENET News via %s"
 msgstr "經由 %s 的 USENET 新聞"
 
-# shell/e-storage.c:467
-#: camel/providers/nntp/camel-nntp-store.c:640
-#, fuzzy
-msgid "Stream error"
-msgstr "解析錯誤"
-
 # mail/mail-ops.c:1755
-#: camel/providers/nntp/camel-nntp-store.c:643
+#: camel/providers/nntp/camel-nntp-store.c:777
 #, fuzzy, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -13450,81 +13168,81 @@ msgstr ""
 "儲存郵件到：%s 時發生錯誤：\n"
 " %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:735
+#: camel/providers/nntp/camel-nntp-store.c:872
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
 "No such newsgroup. The selected item is a probably a parent folder."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:767
+#: camel/providers/nntp/camel-nntp-store.c:904
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
 "newsgroup does not exist!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:792
+#: camel/providers/nntp/camel-nntp-store.c:929
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr ""
 
 # camel/providers/local/camel-local-store.c:237
-#: camel/providers/nntp/camel-nntp-store.c:800
+#: camel/providers/nntp/camel-nntp-store.c:937
 #, fuzzy
 msgid "You cannot rename a folder in a News store."
 msgstr "無法將資料夾 %s 重新命名為 %s： %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:808
+#: camel/providers/nntp/camel-nntp-store.c:945
 #, fuzzy
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "不能將資料夾移至其子資料夾之中。"
 
-# camel/providers/local/camel-mbox-summary.c:879
-#: camel/providers/nntp/camel-nntp-summary.c:253
+# camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/nntp/camel-nntp-store.c:1118
+#, fuzzy
+msgid "Authentication requested but not username provided"
+msgstr "要求驗證"
+
+# camel/providers/pop3/camel-pop3-store.c:199
+#: camel/providers/nntp/camel-nntp-store.c:1146
 #, fuzzy, c-format
-msgid "Connection error: %s"
-msgstr "不明的錯誤： %s"
+msgid "Cannot authenticate to server: %s"
+msgstr "無法驗證 POP 伺服器 %s：%s"
+
+# ui/evolution-addressbook.xml.h:17
+#: camel/providers/nntp/camel-nntp-store.c:1262
+#, fuzzy
+msgid "Not connected."
+msgstr "顯示連絡人"
 
 # camel/providers/imap/camel-imap-store.c:803
 # mail/mail-local.c:334
-#: camel/providers/nntp/camel-nntp-summary.c:262
+#: camel/providers/nntp/camel-nntp-store.c:1311
 #, c-format
 msgid "No such folder: %s"
 msgstr "沒有這個資料夾： %s"
 
-# camel/camel-movemail.c:306
-#: camel/providers/nntp/camel-nntp-summary.c:268
-#, c-format
-msgid "Could not get group: %s"
-msgstr "無法取得群組：%s"
-
-# camel/providers/sendmail/camel-sendmail-transport.c:150
-#: camel/providers/nntp/camel-nntp-summary.c:333
-#, fuzzy
-msgid "Could not get messages: unspecified error"
-msgstr "郵件無法傳送： %s"
-
-# camel/providers/imap/camel-imap-command.c:240
-#: camel/providers/nntp/camel-nntp-summary.c:378
-#, c-format
-msgid "NNTP Command failed: %s"
-msgstr "NNTP 指令失敗： %s"
-
 # mail/mail-ops.c:992
-#: camel/providers/nntp/camel-nntp-summary.c:438
-#: camel/providers/nntp/camel-nntp-summary.c:543
+#: camel/providers/nntp/camel-nntp-summary.c:218
+#: camel/providers/nntp/camel-nntp-summary.c:314
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s：掃描新郵件"
 
-# camel/providers/local/camel-mbox-summary.c:879
-#: camel/providers/nntp/camel-nntp-summary.c:558
-#, c-format
-msgid "Unknown server response: %s"
-msgstr "不明的伺服器回應： %s"
+# camel/providers/imap/camel-imap-command.c:232
+#: camel/providers/nntp/camel-nntp-summary.c:225
+#, fuzzy, c-format
+msgid "Unexpected server response from xover: %s"
+msgstr "從 IMAP 伺服器傳回不當的回應： %s"
+
+# camel/providers/imap/camel-imap-command.c:232
+#: camel/providers/nntp/camel-nntp-summary.c:328
+#, fuzzy, c-format
+msgid "Unexpected server response from head: %s"
+msgstr "從 GnuPG 傳回意外的回應： %s"
 
 # ui/evolution-mail.xml.h:2
-#: camel/providers/nntp/camel-nntp-summary.c:605
+#: camel/providers/nntp/camel-nntp-summary.c:368
 msgid "Use cancel"
 msgstr "使用取消"
 
@@ -13532,7 +13250,7 @@ msgstr "使用取消"
 # camel/camel-remote-store.c:399
 # camel/camel-remote-store.c:470
 # camel/providers/imap/camel-imap-command.c:287
-#: camel/providers/nntp/camel-nntp-summary.c:607
+#: camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
 msgid "Operation failed: %s"
 msgstr "作業失敗： %s"
@@ -13591,7 +13309,7 @@ msgstr ""
 
 # camel/providers/pop3/camel-pop3-provider.c:48
 # mail/mail-config.glade.h:51
-#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:107
 msgid "POP"
 msgstr "POP"
 
@@ -13691,7 +13409,7 @@ msgstr "沒有這個資料夾“%s”。"
 # camel/providers/sendmail/camel-sendmail-provider.c:37
 # mail/mail-config.glade.h:67
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:129
+#: mail/mail-config.glade.h:132
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -13755,7 +13473,7 @@ msgstr "經由 sendmail 程式傳送郵件"
 
 # camel/providers/smtp/camel-smtp-provider.c:38
 # mail/mail-config.glade.h:62
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:119
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:122
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -14112,22 +13830,22 @@ msgstr "%.0fG"
 
 # composer/e-msg-composer-attachment-bar.c:332
 # mail/mail-display.c:122
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
+#: composer/e-msg-composer-attachment-bar.c:298 mail/em-utils.c:408
 msgid "attachment"
 msgstr "附件"
 
 # composer/e-msg-composer-attachment-bar.c:469
-#: composer/e-msg-composer-attachment-bar.c:451
+#: composer/e-msg-composer-attachment-bar.c:454
 msgid "Remove selected items from the attachment list"
 msgstr "自附件清單移除已選擇的項目"
 
 # composer/e-msg-composer-attachment-bar.c:500
-#: composer/e-msg-composer-attachment-bar.c:491
+#: composer/e-msg-composer-attachment-bar.c:494
 msgid "Add attachment..."
 msgstr "新增附件..."
 
 # composer/e-msg-composer-attachment-bar.c:501
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:495
 msgid "Attach a file to the message"
 msgstr "附加檔案至郵件"
 
@@ -14202,7 +13920,7 @@ msgstr "(未命名的郵件)"
 msgid "Open file"
 msgstr "開啟檔案"
 
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
 msgid "Autogenerated"
 msgstr "自動產生的"
 
@@ -14370,17 +14088,17 @@ msgstr "附加檔案"
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
+msgid "You cannot attach the file `{0}' to this message."
 msgstr "附加檔案至郵件"
 
 #. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4
-msgid "${1}"
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
 msgstr ""
 
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr ""
 
 #. mail-composer:attach-directory primary
@@ -14488,7 +14206,7 @@ msgstr "無法建立導管：%s"
 
 #. mail-composer:no-build-message secondary
 #: composer/mail-composer-errors.xml.h:34
-msgid "Because \"${0}\", you may need to select different mail options."
+msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 # mail/mail-crypto.c:59
@@ -14499,8 +14217,10 @@ msgid "Could not read signature file \"{0}\"."
 msgstr "無法儲存簽名檔： %s"
 
 #. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38
-msgid "Because \"${1}\"."
+#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted primary
@@ -14991,11 +14711,11 @@ msgstr "<b>逾期:</b>"
 
 # mail/mail-account-gui.c:682
 #: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1335
+#: mail/mail-account-gui.c:1347
 msgid "Select Folder"
 msgstr "選擇資料夾"
 
-#: filter/filter.glade.h:1
+#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
 msgid "    "
 msgstr ""
 
@@ -15053,7 +14773,7 @@ msgstr "前"
 msgid "months"
 msgstr "月"
 
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
 msgid "seconds"
 msgstr "秒"
 
@@ -15085,23 +14805,23 @@ msgstr "包括全部本地端的資料夾"
 msgid "years"
 msgstr "年"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:916
-#: mail/mail-config.c:76 mail/mail-config.glade.h:90
+#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
+#: mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "重要"
 
 # mail/mail-format.c:762
 # mail/message-list.c:1083
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:919 mail/mail-config.c:79
-#: mail/mail-config.glade.h:145
+#: filter/filter-label.c:124 mail/em-migrate.c:1014 mail/mail-config.c:79
+#: mail/mail-config.glade.h:148
 msgid "To Do"
 msgstr "待辦"
 
 # calendar/gui/event-editor-dialog.glade.h:33
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:920 mail/mail-config.c:80
-#: mail/mail-config.glade.h:94
+#: filter/filter-label.c:125 mail/em-migrate.c:1015 mail/mail-config.c:80
+#: mail/mail-config.glade.h:97
 msgid "Later"
 msgstr "稍後"
 
@@ -15160,273 +14880,6 @@ msgstr "內送"
 msgid "outgoing"
 msgstr "外寄"
 
-#. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2
-msgid "Adjust Score"
-msgstr "調整目標"
-
-#: filter/libfilter-i18n.h:3
-msgid "Assign Color"
-msgstr "指定色彩"
-
-#: filter/libfilter-i18n.h:4
-msgid "Assign Score"
-msgstr "指定目標"
-
-#: filter/libfilter-i18n.h:5
-msgid "Attachments"
-msgstr "附加檔案"
-
-# addressbook/printing/e-contact-print.glade.h:36
-#: filter/libfilter-i18n.h:6
-msgid "Beep"
-msgstr "嗶聲"
-
-#: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "包含"
-
-#: filter/libfilter-i18n.h:8
-msgid "Copy to Folder"
-msgstr "複製至資料夾"
-
-#: filter/libfilter-i18n.h:9
-msgid "Date received"
-msgstr "收件日期"
-
-#: filter/libfilter-i18n.h:10
-msgid "Date sent"
-msgstr "送件日期"
-
-#: filter/libfilter-i18n.h:12
-msgid "Deleted"
-msgstr "已刪除"
-
-#: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "不包含"
-
-#: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "不是以此結束"
-
-#: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "不存在"
-
-#: filter/libfilter-i18n.h:16
-msgid "does not return"
-msgstr "沒有傳回"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "不類似"
-
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "不是以此開始"
-
-#: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
-msgstr "不存在"
-
-#: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr "草稿"
-
-#: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "以此終結"
-
-#: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr "存在"
-
-#: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "存在"
-
-#: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr "詞句"
-
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr "跟隨"
-
-#: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "是"
-
-#: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr "是之後的"
-
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr "是之前的"
-
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr "有標幟的"
-
-#: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "大於"
-
-#: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "小於"
-
-#: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "不是"
-
-#: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr "沒有標幟的"
-
-# calendar/gui/goto-dialog.glade.h:9
-#: filter/libfilter-i18n.h:36
-#, fuzzy
-msgid "Junk Test"
-msgstr "6月"
-
-# addressbook/contact-editor/e-contact-editor.c:1256
-# addressbook/gui/widgets/e-addressbook-view.c:720
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
-#: widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "標籤"
-
-#: filter/libfilter-i18n.h:38
-msgid "Mailing list"
-msgstr "郵件列表"
-
-#: filter/libfilter-i18n.h:39
-msgid "Message Body"
-msgstr "郵件內容"
-
-#: filter/libfilter-i18n.h:40
-msgid "Message Header"
-msgstr "郵件檔頭"
-
-# views/mail/galview.xml.h:4
-#: filter/libfilter-i18n.h:41
-#, fuzzy
-msgid "Message is Junk"
-msgstr "郵件"
-
-# mail/folder-browser.c:706
-#: filter/libfilter-i18n.h:42
-#, fuzzy
-msgid "Message is not Junk"
-msgstr "標示成重要(_I)"
-
-#: filter/libfilter-i18n.h:43
-msgid "Move to Folder"
-msgstr "移至資料夾"
-
-# ui/evolution.xml.h:19
-#: filter/libfilter-i18n.h:44
-#, fuzzy
-msgid "Pipe to Program"
-msgstr "離開這個程式"
-
-# calendar/gui/event-editor-dialog.glade.h:14
-# calendar/gui/event-editor.c:1588
-#: filter/libfilter-i18n.h:45
-msgid "Play Sound"
-msgstr "播放音效"
-
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "閱讀"
-
-#: filter/libfilter-i18n.h:47
-msgid "Recipients"
-msgstr "收件者"
-
-#: filter/libfilter-i18n.h:48
-msgid "Regex Match"
-msgstr "正規表示式相配"
-
-#: filter/libfilter-i18n.h:49
-msgid "Replied to"
-msgstr "回覆"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:393
-#: filter/libfilter-i18n.h:50
-msgid "returns"
-msgstr "傳回"
-
-#: filter/libfilter-i18n.h:51
-msgid "returns greater than"
-msgstr "傳回大於"
-
-#: filter/libfilter-i18n.h:52
-msgid "returns less than"
-msgstr "傳回小於"
-
-# calendar/gui/event-editor-dialog.glade.h:22
-# calendar/gui/event-editor.c:1597
-#: filter/libfilter-i18n.h:53
-#, fuzzy
-msgid "Run Program"
-msgstr "執行程式:"
-
-# mail/message-list.c:1081
-#: filter/libfilter-i18n.h:54 filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "目標"
-
-#: filter/libfilter-i18n.h:55
-msgid "Sender"
-msgstr "寄件者"
-
-#: filter/libfilter-i18n.h:56
-msgid "Set Status"
-msgstr "設定狀態"
-
-# addressbook/printing/e-contact-print.glade.h:36
-#: filter/libfilter-i18n.h:57
-msgid "Size (kB)"
-msgstr "大小 (kB)"
-
-#: filter/libfilter-i18n.h:58
-msgid "sounds like"
-msgstr "類似"
-
-#: filter/libfilter-i18n.h:59
-msgid "Source Account"
-msgstr "來源帳號"
-
-#: filter/libfilter-i18n.h:60
-msgid "Specific header"
-msgstr "指定檔頭"
-
-#: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "以此開始"
-
-#: filter/libfilter-i18n.h:63
-msgid "Stop Processing"
-msgstr "停止處理"
-
-# mail/mail-format.c:767
-# mail/message-list.c:1082
-#: filter/libfilter-i18n.h:64 mail/em-format.c:755 mail/em-format-html.c:1519
-#: mail/em-format-quote.c:302 mail/em-mailer-prefs.c:87
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
-#: smime/lib/e-cert.c:1079
-msgid "Subject"
-msgstr "主旨"
-
-#: filter/libfilter-i18n.h:65
-msgid "Unset Status"
-msgstr "取消設定狀態"
-
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "新增規則"
@@ -15444,6 +14897,12 @@ msgstr "規則名稱"
 msgid "_Score Rules"
 msgstr "目標規則"
 
+# mail/message-list.c:1081
+#: filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "目標"
+
 #: filter/searchtypes.xml.h:1
 msgid "Body contains"
 msgstr "內文包含"
@@ -15540,13 +14999,13 @@ msgstr "轉寄的郵件"
 
 # camel/providers/imap/camel-imap-command.c:241
 # shell/e-storage.c:481
-#: mail/em-composer-utils.c:1499
+#: mail/em-composer-utils.c:1495
 msgid "an unknown sender"
 msgstr "不明的寄件者"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1509
+#: mail/em-composer-utils.c:1505
 #, fuzzy
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "在 %a, %Y-%m-%d %H:%M, %%s 寫道："
@@ -15601,8 +15060,8 @@ msgid "Create New Folder"
 msgstr "建立新資料夾"
 
 # shell/glade/e-shell-folder-creation-dialog.glade.h:3
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
-#: mail/mail-component.c:701
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
+#: mail/mail-component.c:704
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "指定建立資料夾的位置："
@@ -15622,98 +15081,99 @@ msgstr "資料夾名稱:"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: mail/em-folder-tree.c:839
+#: mail/em-folder-tree.c:833
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "移除資料夾 %s"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: mail/em-folder-tree.c:841
+#: mail/em-folder-tree.c:835
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "開啟資料夾 %s"
 
 # mail/mail-ops.c:898
-#: mail/em-folder-tree.c:848 mail/message-list.c:1555
+#: mail/em-folder-tree.c:842 mail/message-list.c:1561
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "將郵件移到 %s"
 
 # mail/mail-ops.c:898
-#: mail/em-folder-tree.c:850 mail/message-list.c:1557
+#: mail/em-folder-tree.c:844 mail/message-list.c:1563
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "將郵件複製到 %s"
 
 # camel/providers/imap/camel-imap-provider.c:45
-#: mail/em-folder-tree.c:866
+#: mail/em-folder-tree.c:860
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "不能複製或移動郵件到虛擬資料夾中"
 
 # ui/evolution-mail.xml.h:101
-#: mail/em-folder-tree.c:956 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "複製至資料夾(_C)"
 
 # ui/evolution-mail.xml.h:112
-#: mail/em-folder-tree.c:957 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "移至資料夾(_M)"
 
 # ui/evolution-mail.xml.h:55
-#: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2069
-#: mail/em-folder-tree.c:2551 mail/em-folder-view.c:798
-#: mail/message-list.c:1645
+#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
+#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
+#: mail/message-list.c:1651
 #, fuzzy
 msgid "_Move"
 msgstr "移動"
 
 # ui/evolution-mail.xml.h:2
-#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#: mail/em-folder-tree.c:955 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "取消工作"
 
 # shell/e-shell-importer.c:601
-#: mail/em-folder-tree.c:2056 mail/em-folder-tree.c:2069
+#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
 #: mail/em-folder-view.c:798 mail/em-folder-view.c:812
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "選擇資料夾"
 
 # ui/evolution-event-editor.xml.h:13
 # ui/evolution-mail.xml.h:8
 # ui/evolution-task-editor-dialog.xml.h:14
-#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
 #, fuzzy
 msgid "C_opy"
 msgstr "複製"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: mail/em-folder-tree.c:2096
+#: mail/em-folder-tree.c:2088
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "貯藏資料夾“%s”"
 
 # ui/evolution.xml.h:10
-#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
+#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
 #, fuzzy
 msgid "Create folder"
 msgstr "新增一個資料夾"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: mail/em-folder-tree.c:2474
+#: mail/em-folder-tree.c:2463
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "重新命名資料夾“%s”為："
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: mail/em-folder-tree.c:2476
+#: mail/em-folder-tree.c:2465
 #, fuzzy
 msgid "Rename Folder"
 msgstr "重新命名資料夾"
@@ -15722,27 +15182,27 @@ msgstr "重新命名資料夾"
 # ui/evolution-message-composer.xml.h:55
 # ui/evolution-task-editor-dialog.xml.h:90
 # ui/evolution.xml.h:65
-#: mail/em-folder-tree.c:2545 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:35
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "檢視(_V)"
 
 # ui/evolution.xml.h:24
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2537
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "在新視窗開啟"
 
 # ui/evolution.xml.h:59
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2555
+#: mail/em-folder-tree.c:2546
 #, fuzzy
 msgid "_New Folder..."
 msgstr "新增資料夾(_N)"
 
 # ui/evolution.xml.h:61
-#: mail/em-folder-tree.c:2558
+#: mail/em-folder-tree.c:2549
 msgid "_Rename"
 msgstr "重新命名(_R)"
 
@@ -15750,14 +15210,14 @@ msgstr "重新命名(_R)"
 # ui/evolution-mail.xml.h:115
 # ui/evolution-task-editor-dialog.xml.h:83
 # ui/evolution.xml.h:60
-#: mail/em-folder-tree.c:2561 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "屬性(_P)..."
 
 # camel/providers/imap/camel-imap-provider.c:48
 # shell/e-shell-view.c:552
 #: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:889
+#: mail/mail-vfolder.c:888
 msgid "VFolders"
 msgstr "虛擬資料夾"
 
@@ -15774,7 +15234,7 @@ msgstr "收件匣"
 
 # mail/mail-send-recv.c:287
 # mail/mail-send-recv.c:333
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
 msgid "Loading..."
 msgstr "載入中..."
 
@@ -15784,13 +15244,13 @@ msgstr "載入中..."
 #: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
 #: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
 #: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:551
+#: mail/mail-component.c:554
 msgid "Mail"
 msgstr "郵件"
 
 # ui/evolution-mail.xml.h:66
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "編輯為新郵件(_E)..."
@@ -15811,20 +15271,20 @@ msgstr "回覆寄件者(_R)"
 
 # mail/folder-browser.c:699
 # ui/evolution-mail.xml.h:72
-#: mail/em-folder-view.c:901 mail/em-popup.c:810
+#: mail/em-folder-view.c:901 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "回覆至清單(_L)"
 
 # mail/folder-browser.c:699
 # ui/evolution-mail.xml.h:72
-#: mail/em-folder-view.c:902 mail/em-popup.c:811
+#: mail/em-folder-view.c:902 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "回覆所有人(_A)"
 
 # mail/folder-browser.c:701
-#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: mail/em-folder-view.c:903 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "轉寄(_F)"
@@ -15895,6 +15355,12 @@ msgstr "移至資料夾(_V)..."
 msgid "_Copy to Folder..."
 msgstr "複製至資料夾(_C)..."
 
+# addressbook/contact-editor/e-contact-editor.c:1256
+# addressbook/gui/widgets/e-addressbook-view.c:720
+#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "標籤"
+
 # addressbook/gui/component/addressbook-config.c:662
 #: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
@@ -15957,13 +15423,13 @@ msgstr "從郵件清單建立過濾器(_M)"
 
 # mail/mail-config.glade.h:21
 #. default charset used in mail view
-#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
-#: mail/mail-config.glade.h:66
+#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "預設值"
 
 # mail/mail-callbacks.c:1407
-#: mail/em-folder-view.c:1800
+#: mail/em-folder-view.c:1796
 msgid "Print Message"
 msgstr "列印郵件"
 
@@ -16013,6 +15479,14 @@ msgstr "副本"
 msgid "Bcc"
 msgstr "密件副本"
 
+# mail/mail-format.c:767
+# mail/message-list.c:1082
+#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
+#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
+#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "主旨"
+
 # mail/mail-format.c:640
 # mail/message-list.c:1082
 #: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
@@ -16020,7 +15494,7 @@ msgstr "密件副本"
 msgid "Date"
 msgstr "日期"
 
-#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
+#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
 msgid "Newsgroups"
 msgstr ""
 
@@ -16229,7 +15703,7 @@ msgid ""
 "practical amount of time."
 msgstr ""
 
-#: mail/em-format-html-display.c:757
+#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
 #, fuzzy
 msgid "_View Certificate"
 msgstr "憑證 ID(_C):"
@@ -16301,7 +15775,7 @@ msgstr "一週(_E)"
 msgid "Once per month"
 msgstr "一個月(_H)"
 
-#: mail/em-migrate.c:1072
+#: mail/em-migrate.c:1168
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -16311,13 +15785,13 @@ msgstr ""
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: mail/em-migrate.c:1506
+#: mail/em-migrate.c:1602
 #, fuzzy, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "不能取得資料夾：%s：%s"
 
 # mail/mail-ops.c:1728
-#: mail/em-migrate.c:1532
+#: mail/em-migrate.c:1628
 #, fuzzy, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr ""
@@ -16325,7 +15799,7 @@ msgstr ""
 "%s"
 
 # mail/mail-ops.c:1728
-#: mail/em-migrate.c:1715
+#: mail/em-migrate.c:1811
 #, fuzzy, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr ""
@@ -16333,39 +15807,39 @@ msgstr ""
 " %s"
 
 # camel/providers/pop3/camel-pop3-store.c:199
-#: mail/em-migrate.c:1919
+#: mail/em-migrate.c:2015
 #, fuzzy, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "無法驗證 POP 伺服器 %s：%s"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: mail/em-migrate.c:1933
+#: mail/em-migrate.c:2029
 #, fuzzy, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "建立到“%s”的導管失敗： %s"
 
-#: mail/em-migrate.c:1962
+#: mail/em-migrate.c:2058
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#: mail/em-migrate.c:2413 mail/em-migrate.c:2425
 #, fuzzy, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "建立到“%s”的導管失敗： %s"
 
 # mail/mail-ops.c:1728
-#: mail/em-migrate.c:2480
+#: mail/em-migrate.c:2576
 #, fuzzy, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr ""
 "無法建立輸出檔案：%s\n"
 " %s"
 
-#: mail/em-migrate.c:2498
+#: mail/em-migrate.c:2594
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
@@ -16373,47 +15847,47 @@ msgstr ""
 
 # widgets/misc/e-filter-bar.h:94
 # widgets/misc/e-filter-bar.h:101
-#: mail/em-popup.c:699
+#: mail/em-popup.c:700
 msgid "Save As..."
 msgstr "另存新檔..."
 
 # mail/mail-search.c:138
-#: mail/em-popup.c:717
+#: mail/em-popup.c:718
 #, fuzzy, c-format
 msgid "untitled_image.%s"
 msgstr "未命名的郵件"
 
-#: mail/em-popup.c:807
+#: mail/em-popup.c:808
 msgid "Set as _Background"
 msgstr ""
 
 # mail/folder-browser.c:697
 # ui/evolution-mail.xml.h:117
-#: mail/em-popup.c:809
+#: mail/em-popup.c:810
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "回覆寄件者(_R)"
 
 # mail/mail-display.c:1256
-#: mail/em-popup.c:858
+#: mail/em-popup.c:859
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "在瀏覽器內開啟連結"
 
 # ui/evolution-contact-editor.xml.h:13
-#: mail/em-popup.c:859
+#: mail/em-popup.c:860
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "傳送郵件給清單(_M)..."
 
 # addressbook/gui/component/addressbook-config.c:662
-#: mail/em-popup.c:860
+#: mail/em-popup.c:861
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "新增寄件者到目錄服務"
 
 # mail/mail-display.c:299
-#: mail/em-popup.c:966
+#: mail/em-popup.c:967
 #, c-format
 msgid "Open in %s..."
 msgstr "在 %s 內開啟..."
@@ -17071,7 +16545,7 @@ msgstr "Evolution 郵件執行摘要元件。"
 msgid "Mail Accounts"
 msgstr "郵件帳號"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
 msgid "Mail Preferences"
 msgstr "郵件偏好設定"
 
@@ -17089,15 +16563,15 @@ msgstr "Evolution 正在匯入您舊有的 Elm 郵件"
 
 # shell/e-shell-importer.c:363
 #: mail/importers/elm-importer.c:89
-#: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:226
+#: mail/importers/evolution-mbox-importer.c:221
+#: mail/importers/evolution-outlook-importer.c:255
 #: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "匯入..."
 
 #: mail/importers/elm-importer.c:91
-#: mail/importers/evolution-mbox-importer.c:222
-#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/evolution-mbox-importer.c:223
+#: mail/importers/evolution-outlook-importer.c:257
 #: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "請稍候"
@@ -17123,26 +16597,28 @@ msgstr "Elm"
 
 # ui/evolution.xml.h:47
 #: mail/importers/evolution-mbox-importer.c:116
+#: mail/importers/evolution-outlook-importer.c:130
 #, fuzzy
 msgid "Destination folder:"
 msgstr "刪除這個資料夾"
 
 # mail/mail-account-gui.c:682
 #: mail/importers/evolution-mbox-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:133
 #, fuzzy
 msgid "Select folder to import into"
 msgstr "選擇匯入服務"
 
 # shell/e-shell-importer.c:363
-#: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/evolution-mbox-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:254
 #: mail/importers/mail-importer.c:226
 #, fuzzy, c-format
 msgid "Importing `%s'"
 msgstr "匯入中"
 
 # shell/e-shell-importer.c:363
-#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/evolution-outlook-importer.c:301
 #: mail/importers/mail-importer.c:140
 #, fuzzy
 msgid "Importing mailbox"
@@ -17333,18 +16809,18 @@ msgstr ""
 
 # addressbook/gui/component/addressbook-config.c:401
 # mail/mail-config.glade.h:33
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:167
 msgid "_Host:"
 msgstr "主機(_H):"
 
 # mail/mail-config.glade.h:80
-#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:151
 msgid "User_name:"
 msgstr "使用者名稱(_N):"
 
 # addressbook/gui/component/addressbook-config.c:520
 # mail/mail-config.glade.h:53
-#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:173
 msgid "_Path:"
 msgstr "路徑(_P):"
 
@@ -17419,39 +16895,39 @@ msgid ", %d unread"
 msgstr "%d 未傳送"
 
 # ui/evolution-mail.xml.h:109
-#: mail/mail-component.c:653
+#: mail/mail-component.c:656
 msgid "New Mail Message"
 msgstr "新增郵件"
 
 # ui/evolution-mail.xml.h:109
-#: mail/mail-component.c:654
+#: mail/mail-component.c:657
 msgid "_Mail Message"
 msgstr "郵件訊息(_M)"
 
 # composer/e-msg-composer.c:1526
 # composer/e-msg-composer.c:1871
-#: mail/mail-component.c:655
+#: mail/mail-component.c:658
 msgid "Compose a new mail message"
 msgstr "編輯新的郵件訊息"
 
 # mail/mail-vfolder.c:438
-#: mail/mail-component.c:661
+#: mail/mail-component.c:664
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "新增虛擬資料夾"
 
-#: mail/mail-component.c:662
+#: mail/mail-component.c:665
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "郵件規則"
 
 # ui/evolution.xml.h:10
-#: mail/mail-component.c:663
+#: mail/mail-component.c:666
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "新增一個資料夾"
 
-#: mail/mail-component.c:795
+#: mail/mail-component.c:798
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
@@ -17466,7 +16942,7 @@ msgid "Connecting to server..."
 msgstr "正在連線至伺服器..."
 
 # mail/mail-config.glade.h:35
-#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "身分"
 
@@ -17482,7 +16958,7 @@ msgstr ""
 
 # mail/mail-config.glade.h:58
 #: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:119
 #, fuzzy
 msgid "Receiving Mail"
 msgstr "接收郵件(_R)"
@@ -17501,7 +16977,7 @@ msgid "Please select among the following options"
 msgstr "請在下列選項中選擇"
 
 # mail/mail-config.glade.h:66
-#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:131
 #, fuzzy
 msgid "Sending Mail"
 msgstr "傳送郵件(_S)"
@@ -17516,7 +16992,7 @@ msgstr ""
 "服務供應商。"
 
 # mail/mail-config.glade.h:5
-#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:37
 msgid "Account Management"
 msgstr "帳號總管"
 
@@ -17534,254 +17010,258 @@ msgstr ""
 "稱僅用作顯示用途。"
 
 # mail/mail-config.glade.h:1
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:2
 #, fuzzy
 msgid " Ch_eck for Supported Types "
 msgstr " 檢查可支援的類別(_C) "
 
 # calendar/gui/event-editor-dialog.glade.h:15
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:4
 #, fuzzy
 msgid "<b>Preview</b>"
 msgstr "預覽"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "<b>SSL is not supported in this build of evolution</b>"
 msgstr "(此一版本的 evolution 並不支援 SSL)"
 
-#: mail/mail-config.glade.h:5
+#: mail/mail-config.glade.h:6
 #, fuzzy
 msgid "<b>S_ignatures</b>"
 msgstr "<b>開始:</b>"
 
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:7
 #, fuzzy
 msgid "<b>_Languages</b>"
 msgstr "<b>開始:</b>"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:8
+msgid "<small>This will make the the filter more reliable, but slower</small>"
+msgstr ""
+
+#: mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:8
+#: mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication Type</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr ""
 
 # camel/providers/imap/camel-imap-provider.c:43
 # mail/mail-config.glade.h:13
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 #, fuzzy
 msgid "<span weight=\"bold\">Checking for New Mail</span>"
 msgstr "檢查新郵件"
 
-#: mail/mail-config.glade.h:12
+#: mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:14
+#: mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
 msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Filter Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:18
+#: mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">General</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Labels and Colors</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr ""
 
 # views/mail/galview.xml.h:4
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
 #, fuzzy
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "顯示郵件"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Message Fonts</span>"
 msgstr ""
 
 # mail/mail-config.glade.h:40
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
 #, fuzzy
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "新郵件通知"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Options</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
 #, fuzzy
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "相當高的隱私 (PGP/GPG)"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Security</span>"
 msgstr ""
 
 # mail/mail-config.glade.h:69
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 #, fuzzy
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "傳送與草稿郵件"
 
-#: mail/mail-config.glade.h:32
+#: mail/mail-config.glade.h:34
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr ""
 
-#: mail/mail-config.glade.h:33
+#: mail/mail-config.glade.h:35
 #, fuzzy
 msgid "A_lso encrypt to self when sending encrypted mail"
 msgstr "當傳送加密郵件時永遠自我加密(_L)"
 
 # mail/mail-config.glade.h:3
-#: mail/mail-config.glade.h:34
+#: mail/mail-config.glade.h:36
 msgid "Account Editor"
 msgstr "帳號編輯器"
 
 # mail/mail-config.glade.h:74
-#: mail/mail-config.glade.h:36
+#: mail/mail-config.glade.h:38
 #, fuzzy
 msgid "Add Ne_w Signature..."
 msgstr "加入新的簽名檔..."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 #, fuzzy
 msgid "Add _Script"
 msgstr "新增命令稿(_R)"
 
-#: mail/mail-config.glade.h:38
+#: mail/mail-config.glade.h:40
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "當傳送加密郵件時永遠自我加密(_W)"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 #, fuzzy
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "永遠寄送副本(Cc)給(_C):"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 #, fuzzy
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "永遠寄送密件副本(Bcc)給(_B):"
 
-#: mail/mail-config.glade.h:42
+#: mail/mail-config.glade.h:44
 #, fuzzy
 msgid "Always _sign outgoing messages when using this account"
 msgstr "當使用這個帳號時永遠在寄送的郵件上加簽(_A)"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "加密時永遠信任在我的鑰匙圈裡的金鑰"
 
 # composer/e-msg-composer-attachment-bar.c:501
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Attach original message"
 msgstr "附加原始訊息"
 
 # composer/e-msg-composer-attachment.glade.h:1
 # mail/mail-config.glade.h:9
 # mail/message-list.c:1081
-#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:47 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "附件"
 
 # mail/mail-config.glade.h:12
-#: mail/mail-config.glade.h:46
+#: mail/mail-config.glade.h:48
 #, fuzzy
 msgid "Automatically _insert smiley images"
 msgstr "自動插入笑臉影像(_A)"
 
 # mail/mail-config.glade.h:12
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 #, fuzzy
 msgid "Automatically check for _new mail every"
 msgstr "自動檢查新郵件(_A)"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "Baltic (ISO-8859-13)"
 msgstr "波羅的海語系 (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Baltic (ISO-8859-4)"
 msgstr "波羅的海語系 (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 #, fuzzy
 msgid "Beep w_hen new mail arrives"
 msgstr "當新郵件到達時發出嗶聲(_B)"
 
 # mail/mail-config.glade.h:22
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "C_haracter set:"
 msgstr "字集(_H):"
 
 # mail/mail-config.glade.h:1
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 #, fuzzy
 msgid "Ch_eck for Supported Types "
 msgstr " 檢查可支援的類別(_C) "
 
 # camel/providers/imap/camel-imap-provider.c:43
 # mail/mail-config.glade.h:13
-#: mail/mail-config.glade.h:53
+#: mail/mail-config.glade.h:55
 #, fuzzy
-msgid "Check _Incoming Mail"
+msgid "Check _incoming mail for junk"
 msgstr "檢查新郵件"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:56
 msgid "Check spelling while I _type"
 msgstr "當我輸入時檢查拼字"
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Checks incoming mail messages to be Junk"
 msgstr ""
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 msgid "Color for _misspelled words:"
 msgstr "拼錯字的顏色(_M):"
 
@@ -17792,19 +17272,19 @@ msgstr "拼錯字的顏色(_M):"
 # ui/evolution-subscribe.xml.h:2
 # ui/evolution-task-editor-dialog.xml.h:11
 # ui/evolution.xml.h:5
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 #, fuzzy
 msgid "Colors"
 msgstr "顏色(_O)"
 
 # mail/mail-ops.c:1449
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 #, fuzzy
 msgid "Confirm _when expunging a folder"
 msgstr "刪除資料夾時確認(_C)"
 
 # mail/mail-config.glade.h:15
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 #, fuzzy
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
@@ -17822,73 +17302,73 @@ msgstr ""
 "請按“完成”來儲存您的設定。"
 
 # mail/mail-config.glade.h:21
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
 msgid "De_fault"
 msgstr "預設值(_F)"
 
 # mail/mail-config.glade.h:22
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 #, fuzzy
 msgid "Default character e_ncoding:"
 msgstr "預設字元編碼(_E):"
 
 # mail/mail-config.glade.h:21
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 #, fuzzy
 msgid "Defaults"
 msgstr "預設值(_D)"
 
 # camel/camel-filter-driver.c:671
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 msgid "Do not quote original message"
 msgstr "不要引用原始訊息"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "不要加簽會議邀請(為了相容 Outlook)(_M)"
 
 # mail/mail-config.glade.h:25
-#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "完成"
 
 # mail/mail-config.glade.h:27
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
 #, fuzzy
 msgid "Drafts _Folder:"
 msgstr "草稿匣(_F):"
 
 # mail/mail-config.glade.h:6
-#: mail/mail-config.glade.h:75
+#: mail/mail-config.glade.h:77
 msgid "Email Accounts"
 msgstr "電子郵件帳號"
 
 # mail/mail-config.glade.h:29
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:78
 #, fuzzy
 msgid "Email _Address:"
 msgstr "電子郵件位址(_A):"
 
-#: mail/mail-config.glade.h:77
+#: mail/mail-config.glade.h:79
 #, fuzzy
 msgid "Empty trash folders on e_xit"
 msgstr "離開時清空垃圾桶資料夾(_T)"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:80
 #, fuzzy
 msgid "Encry_ption certificate:"
 msgstr "憑證 ID(_C):"
 
 # mail/mail-config-druid.c:445
-#: mail/mail-config.glade.h:79
+#: mail/mail-config.glade.h:81
 msgid "Evolution Account Assistant"
 msgstr "Evolution 帳號助理"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:82
 msgid "Execute Command..."
 msgstr "執行指令..."
 
-#: mail/mail-config.glade.h:81
+#: mail/mail-config.glade.h:83
 #, fuzzy
 msgid "Fi_xed-width:"
 msgstr "固定寬度(_X):"
@@ -17896,230 +17376,236 @@ msgstr "固定寬度(_X):"
 # mail/folder-browser-factory.c:198
 # ui/evolution-event-editor.xml.h:39
 # ui/evolution-task-editor-dialog.xml.h:42
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:84
 msgid "Font Properties"
 msgstr "字型內容"
 
 # mail/mail-ops.c:1154
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:85
 msgid "Format messages in _HTML"
 msgstr "將郵件格式化為 _HTML"
 
 # mail/mail-config.glade.h:36
-#: mail/mail-config.glade.h:85
+#: mail/mail-config.glade.h:87
 #, fuzzy
 msgid "HTML Mail"
 msgstr "_HTML 格式郵件"
 
 # addressbook/printing/e-contact-print.glade.h:11
-#: mail/mail-config.glade.h:86
+#: mail/mail-config.glade.h:88
 #, fuzzy
 msgid "Headers"
 msgstr "頁首"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr "強調引文為(_Q)"
 
 # mail/mail-config.glade.h:34
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:90
 msgid "IMAPv4 "
 msgstr "IMAPv4 "
 
-# mail/mail-config.glade.h:37
+# addressbook/printing/e-contact-print.glade.h:17
 #: mail/mail-config.glade.h:91
+#, fuzzy
+msgid "I_nclude remote tests"
+msgstr "包含:"
+
+# mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:94
 msgid "Inline"
 msgstr "行內"
 
 # mail/mail-config.glade.h:38
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:96
 msgid "Kerberos "
 msgstr "Kerberos "
 
 # mail/mail-config.glade.h:40
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:98
 msgid "Mail Configuration"
 msgstr "郵件組態"
 
 # mail/local-config.glade.h:2
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "信箱位置"
 
 # views/mail/galview.xml.h:4
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr "郵件編輯器"
 
-#: mail/mail-config.glade.h:101
+#: mail/mail-config.glade.h:104
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "注意：在您首次連線之前將不會提示您輸入密碼"
 
 # addressbook/gui/widgets/e-addressbook-view.c:708
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:105
 msgid "Or_ganization:"
 msgstr "團體(_G):"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:106
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG 鑰匙 ID(_K):"
 
-#: mail/mail-config.glade.h:108
+#: mail/mail-config.glade.h:111
 #, fuzzy
 msgid "Play sound file when new mail arri_ves"
 msgstr "當新郵件到達時播放聲音檔案(_P)"
 
 # ui/evolution-mail.xml.h:14
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:112
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "當傳送的郵件只有指定密件副本收件者時顯示提示(_O)"
 
 # mail/mail-config.glade.h:55
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:113
 msgid "Qmail maildir "
 msgstr "Qmail maildir "
 
 # camel/camel-filter-driver.c:671
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr "引用原始訊息"
 
 # mail/mail-config.glade.h:56
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr "引用"
 
 # addressbook/gui/component/addressbook-config.c:352
 # mail/mail-config.glade.h:60
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Re_member password"
 msgstr "記住這個密碼"
 
 # composer/e-msg-composer-hdrs.c:361
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr "回覆地址(_P):"
 
 # mail/mail-config.glade.h:57
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "接收電子郵件"
 
 # mail/mail-config.glade.h:59
-#: mail/mail-config.glade.h:117
+#: mail/mail-config.glade.h:120
 #, fuzzy
 msgid "Receiving Options"
 msgstr "接收郵件選項(_O)"
 
 # addressbook/gui/component/addressbook-config.c:352
 # mail/mail-config.glade.h:60
-#: mail/mail-config.glade.h:118
+#: mail/mail-config.glade.h:121
 #, fuzzy
 msgid "Remember _password"
 msgstr "記住這個密碼"
 
-#: mail/mail-config.glade.h:120
+#: mail/mail-config.glade.h:123
 #, fuzzy
 msgid "S_tandard Font:"
 msgstr "桑波恩"
 
 # ui/evolution-message-composer.xml.h:54
-#: mail/mail-config.glade.h:121
+#: mail/mail-config.glade.h:124
 #, fuzzy
 msgid "Security"
 msgstr "安全(_S)"
 
-#: mail/mail-config.glade.h:122
+#: mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font"
 msgstr "選擇 HTML 固定寬度字型"
 
-#: mail/mail-config.glade.h:123
+#: mail/mail-config.glade.h:126
 msgid "Select HTML fixed width font for printing"
 msgstr "選擇用於列印的 HTML 固定寬度字型"
 
-#: mail/mail-config.glade.h:124
+#: mail/mail-config.glade.h:127
 msgid "Select HTML variable width font"
 msgstr "選擇 HTML 可變寬度字型"
 
-#: mail/mail-config.glade.h:125
+#: mail/mail-config.glade.h:128
 msgid "Select HTML variable width font for printing"
 msgstr "選擇用於列印的 HTML 可變寬度字型"
 
 # ui/evolution-contact-editor.xml.h:3
-#: mail/mail-config.glade.h:126
+#: mail/mail-config.glade.h:129
 #, fuzzy
 msgid "Select..."
 msgstr "刪除..."
 
 # mail/mail-config.glade.h:65
-#: mail/mail-config.glade.h:127
+#: mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "傳送電子郵件"
 
 # mail/mail-config.glade.h:70
-#: mail/mail-config.glade.h:130
+#: mail/mail-config.glade.h:133
 #, fuzzy
 msgid "Sent _Messages Folder:"
 msgstr "傳送郵件資料夾(_M)"
 
 # mail/mail-config.glade.h:73
-#: mail/mail-config.glade.h:131
+#: mail/mail-config.glade.h:134
 msgid "Ser_ver requires authentication"
 msgstr "伺服器要求驗證(_V)"
 
 # mail/mail-config.glade.h:72
-#: mail/mail-config.glade.h:132
+#: mail/mail-config.glade.h:135
 msgid "Server _Type: "
 msgstr "伺服器類型(_T):"
 
-#: mail/mail-config.glade.h:133
+#: mail/mail-config.glade.h:136
 #, fuzzy
 msgid "Si_gning certificate:"
 msgstr "在憑證鏈中的自我加簽憑證"
 
 # mail/mail-config.glade.h:74
-#: mail/mail-config.glade.h:134
+#: mail/mail-config.glade.h:137
 #, fuzzy
 msgid "Signat_ure:"
 msgstr "簽名檔:"
 
 # mail/mail-config.glade.h:74
-#: mail/mail-config.glade.h:135
+#: mail/mail-config.glade.h:138
 #, fuzzy
 msgid "Signatures"
 msgstr "簽名檔(_S)"
 
 # addressbook/printing/e-contact-print.glade.h:38
-#: mail/mail-config.glade.h:136
+#: mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr "指定檔案名稱(_F):"
 
-#: mail/mail-config.glade.h:137
+#: mail/mail-config.glade.h:140
 #, fuzzy
 msgid "Spell Checking"
 msgstr "拼字檢查(_C)"
 
 # mail/mail-config.glade.h:77
-#: mail/mail-config.glade.h:138
+#: mail/mail-config.glade.h:141
 msgid "Standard Unix mbox"
 msgstr "標準 Unix mbox"
 
 # addressbook/gui/component/addressbook-storage.c:99
-#: mail/mail-config.glade.h:139
+#: mail/mail-config.glade.h:142
 #, fuzzy
 msgid "T_erminal Font:"
 msgstr "原本的連絡人:"
 
 # addressbook/printing/e-contact-print.glade.h:40
-#: mail/mail-config.glade.h:140
+#: mail/mail-config.glade.h:143
 #, fuzzy
 msgid "T_ype: "
 msgstr "類型:"
 
-#: mail/mail-config.glade.h:141
+#: mail/mail-config.glade.h:144
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -18129,7 +17615,7 @@ msgstr ""
 "簽名檔。您所指定的名稱將只做為\n"
 "顯示之用。"
 
-#: mail/mail-config.glade.h:144
+#: mail/mail-config.glade.h:147
 msgid ""
 "This page allows you to configure spell checking behavior and language. The "
 "list of languages here reflects only the languages for which you have a "
@@ -18138,7 +17624,7 @@ msgstr ""
 "這一頁允許您設定拼字檢查的行為和語言。這裡的語言清單只反映出您已經安裝字典的"
 "語言。"
 
-#: mail/mail-config.glade.h:146
+#: mail/mail-config.glade.h:149
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -18146,17 +17632,13 @@ msgstr ""
 "輸入您想要用來代表這個帳號的名稱。\n"
 "例如：“工作”或“個人”"
 
-#: mail/mail-config.glade.h:148
-msgid "Use _Daemon"
-msgstr ""
-
 # mail/mail-accounts.c:197
-#: mail/mail-config.glade.h:150
+#: mail/mail-config.glade.h:152
 msgid "V_ariable-width:"
 msgstr "可變寬度(_A):"
 
 # mail/mail-config.glade.h:81
-#: mail/mail-config.glade.h:151
+#: mail/mail-config.glade.h:153
 #, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
@@ -18168,108 +17650,104 @@ msgstr ""
 "按“下一步”開始。"
 
 # mail/mail-config.glade.h:74
-#: mail/mail-config.glade.h:156
+#: mail/mail-config.glade.h:158
 msgid "_Add Signature"
 msgstr "加入簽名檔(_A)"
 
-#: mail/mail-config.glade.h:157
+#: mail/mail-config.glade.h:159
 #, fuzzy
 msgid "_Always load images from the Internet"
 msgstr "永遠自網路下載影像(_A)"
 
-#: mail/mail-config.glade.h:158
+#: mail/mail-config.glade.h:160
 #, fuzzy
 msgid "_Digitally sign outgoing messages (by default)"
 msgstr "當使用這個帳號時永遠在寄送的郵件上加簽(_A)"
 
-#: mail/mail-config.glade.h:159
+#: mail/mail-config.glade.h:161
 msgid "_Do not notify me when new mail arrives"
 msgstr "當新郵件到達時不要通知我(_D)"
 
 # mail/mail-accounts.c:199
 # mail/mail-config.glade.h:30
-#: mail/mail-config.glade.h:161
+#: mail/mail-config.glade.h:163
 msgid "_Enable"
 msgstr "啟用(_E)"
 
-#: mail/mail-config.glade.h:162
+#: mail/mail-config.glade.h:164
 msgid "_Encrypt outgoing messages (by default)"
 msgstr ""
 
 # ui/evolution-mail.xml.h:34
-#: mail/mail-config.glade.h:163
+#: mail/mail-config.glade.h:165
 msgid "_Forward style:"
 msgstr "轉寄方式(_F):"
 
-#: mail/mail-config.glade.h:166
+#: mail/mail-config.glade.h:168
 #, fuzzy
 msgid "_Load images if sender is in address book"
 msgstr "如果寄件者在目錄服務中就載入影像(_L)"
 
-#: mail/mail-config.glade.h:167
-msgid "_Local Tests Only"
-msgstr ""
-
 # mail/mail-config.glade.h:41
-#: mail/mail-config.glade.h:168
+#: mail/mail-config.glade.h:169
 msgid "_Make this my default account"
 msgstr "設為我的預設帳號(_M)"
 
 # ui/evolution-mail.xml.h:51
-#: mail/mail-config.glade.h:169
+#: mail/mail-config.glade.h:170
 msgid "_Mark messages as read after"
 msgstr "標示郵件為稍後閱讀(_M)"
 
-#: mail/mail-config.glade.h:171
+#: mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Never load images from the Internet"
 msgstr "永遠不自網路下載影像(_N)"
 
 # ui/evolution-mail.xml.h:14
-#: mail/mail-config.glade.h:173
+#: mail/mail-config.glade.h:174
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "當傳送 HTML 郵件給不想收到 HTML 郵件的連絡人時顯示提示(_P)"
 
 # ui/evolution-mail.xml.h:14
-#: mail/mail-config.glade.h:174
+#: mail/mail-config.glade.h:175
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "當傳送沒有主旨的郵件時顯示提示(_P)"
 
 # mail/message-browser.c:191
 # ui/evolution-mail.xml.h:71
-#: mail/mail-config.glade.h:175
+#: mail/mail-config.glade.h:176
 msgid "_Reply style:"
 msgstr "回覆方式(_R):"
 
 # ui/evolution-message-composer.xml.h:54
-#: mail/mail-config.glade.h:176
+#: mail/mail-config.glade.h:177
 msgid "_Script:"
 msgstr "命令稿(_S):"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: mail/mail-config.glade.h:177
+#: mail/mail-config.glade.h:178
 msgid "_Show animated images"
 msgstr "顯示動畫影像(_S)"
 
 # mail/mail-config.glade.h:79
-#: mail/mail-config.glade.h:178
+#: mail/mail-config.glade.h:179
 #, fuzzy
 msgid "_Use Secure Connection (SSL):"
 msgstr "使用安全連線 (SSL)(_U):"
 
-#: mail/mail-config.glade.h:179
+#: mail/mail-config.glade.h:180
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
 # mail/mail-config.glade.h:2
-#: mail/mail-config.glade.h:180
+#: mail/mail-config.glade.h:181
 msgid "color"
 msgstr "顏色"
 
 # addressbook/gui/component/addressbook-config.c:689
 # calendar/gui/e-itip-control.glade.h:6
 # composer/e-msg-composer-attachment.glade.h:3
-#: mail/mail-config.glade.h:181
+#: mail/mail-config.glade.h:182
 msgid "description"
 msgstr "描述"
 
@@ -18455,7 +17933,7 @@ msgstr ""
 
 #. mail:camel-exception primary
 #: mail/mail-errors.xml.h:57
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgid "Your message with the subject \"{0}\" was not delivered."
 msgstr ""
 
 #. mail:camel-exception secondary
@@ -18531,11 +18009,6 @@ msgstr ""
 msgid "Cannot save to directory \"{0}\"."
 msgstr "無法建立目錄 %s： %s"
 
-#. mail:no-save-path secondary
-#: mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 # camel/providers/local/camel-maildir-folder.c:197
 # camel/providers/local/camel-maildir-folder.c:209
 # camel/providers/local/camel-maildir-folder.c:217
@@ -18569,12 +18042,6 @@ msgstr ""
 msgid "Cannot create temporary save directory."
 msgstr "無法建立暫存目錄： %s"
 
-#. mail:no-create-tmp-path secondary
-#: mail/mail-errors.xml.h:100 mail/mail-errors.xml.h:112
-#: widgets/misc/e-system-errors.xml.h:11 widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail:no-write-path-exists secondary
 #: mail/mail-errors.xml.h:104
 #, fuzzy
@@ -18900,35 +18367,28 @@ msgid "_Append"
 msgstr "阿斯本"
 
 # mail/mail-ops.c:599
-#: mail/mail-folder-cache.c:787
+#: mail/mail-folder-cache.c:785
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinging %s"
 
-# mail/mail-mt.c:516
-# mail/mail-mt.c:545
-# mail/mail-mt.c:880
-#: mail/mail-mt.c:897
-msgid "Working"
-msgstr "正在工作"
-
 # mail/mail-local.c:812
-#: mail/mail-ops.c:99
+#: mail/mail-ops.c:98
 msgid "Filtering Folder"
 msgstr "過濾資料夾"
 
 # mail/mail-config.glade.h:58
-#: mail/mail-ops.c:260
+#: mail/mail-ops.c:259
 msgid "Fetching Mail"
 msgstr "接收郵件"
 
 # camel/camel-movemail.c:274
-#: mail/mail-ops.c:543
+#: mail/mail-ops.c:542
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "儲存郵件至暫存檔案時失敗 %s：%s"
 
-#: mail/mail-ops.c:568
+#: mail/mail-ops.c:567
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -18936,126 +18396,126 @@ msgid ""
 msgstr ""
 
 # camel/camel-movemail.c:274
-#: mail/mail-ops.c:577
+#: mail/mail-ops.c:576
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "儲存郵件至暫存檔案時失敗 %s：%s"
 
 # mail/mail-ops.c:718
-#: mail/mail-ops.c:673
+#: mail/mail-ops.c:672
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "正在傳送郵件 %d / %d"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: mail/mail-ops.c:704
+#: mail/mail-ops.c:703
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "解密郵件失敗。"
 
 # mail/mail-ops.c:739
 # mail/mail-send-recv.c:475
-#: mail/mail-ops.c:708
+#: mail/mail-ops.c:707
 msgid "Complete."
 msgstr "完成。"
 
 # mail/mail-ops.c:825
-#: mail/mail-ops.c:805
+#: mail/mail-ops.c:804
 msgid "Saving message to folder"
 msgstr "儲存郵件到資料夾"
 
 # mail/mail-ops.c:898
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Moving messages to %s"
 msgstr "將郵件移到 %s"
 
 # mail/mail-ops.c:898
-#: mail/mail-ops.c:890
+#: mail/mail-ops.c:889
 #, c-format
 msgid "Copying messages to %s"
 msgstr "將郵件複製到 %s"
 
 # mail/mail-ops.c:992
-#: mail/mail-ops.c:1003
+#: mail/mail-ops.c:1002
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "掃描“%s”內的資料夾"
 
 # mail/mail-ops.c:1154
-#: mail/mail-ops.c:1116
+#: mail/mail-ops.c:1115
 msgid "Forwarded messages"
 msgstr "已轉寄的郵件"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: mail/mail-ops.c:1159
+#: mail/mail-ops.c:1158
 #, c-format
 msgid "Opening folder %s"
 msgstr "開啟資料夾 %s"
 
 # mail/mail-ops.c:1262
-#: mail/mail-ops.c:1231
+#: mail/mail-ops.c:1230
 #, c-format
 msgid "Opening store %s"
 msgstr "開啟貯藏 %s"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: mail/mail-ops.c:1309
+#: mail/mail-ops.c:1308
 #, c-format
 msgid "Removing folder %s"
 msgstr "移除資料夾 %s"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: mail/mail-ops.c:1403
+#: mail/mail-ops.c:1402
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "貯藏資料夾“%s”"
 
-#: mail/mail-ops.c:1468
+#: mail/mail-ops.c:1467
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: mail/mail-ops.c:1469
+#: mail/mail-ops.c:1468
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "貯藏資料夾“%s”"
 
 # mail/mail-local.c:812
-#: mail/mail-ops.c:1524
+#: mail/mail-ops.c:1523
 msgid "Refreshing folder"
 msgstr "重新載入資料夾"
 
 # mail/mail-ops.c:1449
-#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
+#: mail/mail-ops.c:1559 mail/mail-ops.c:1610
 msgid "Expunging folder"
 msgstr "刪除資料夾"
 
 # shell/e-shell-importer.c:371
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1607
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "匯入 %s 為 %s"
 
 # mail/mail-config.glade.h:76
-#: mail/mail-ops.c:1609
+#: mail/mail-ops.c:1608
 msgid "Local Folders"
 msgstr "本機資料夾"
 
 # mail/mail-ops.c:1498
-#: mail/mail-ops.c:1692
+#: mail/mail-ops.c:1691
 #, c-format
 msgid "Retrieving message %s"
 msgstr "取回郵件 %s"
 
 # mail/mail-ops.c:1565
-#: mail/mail-ops.c:1764
+#: mail/mail-ops.c:1763
 #, fuzzy, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
@@ -19063,7 +18523,7 @@ msgstr[0] "取回 %d 封郵件"
 msgstr[1] "取回 %d 封郵件"
 
 # mail/mail-ops.c:1649
-#: mail/mail-ops.c:1850
+#: mail/mail-ops.c:1849
 #, fuzzy, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
@@ -19071,7 +18531,7 @@ msgstr[0] "儲存 %d 封郵件"
 msgstr[1] "儲存 %d 封郵件"
 
 # mail/mail-ops.c:1728
-#: mail/mail-ops.c:1900
+#: mail/mail-ops.c:1899
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -19081,7 +18541,7 @@ msgstr ""
 " %s"
 
 # mail/mail-ops.c:1755
-#: mail/mail-ops.c:1928
+#: mail/mail-ops.c:1927
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -19091,12 +18551,12 @@ msgstr ""
 " %s"
 
 # mail/mail-ops.c:1829
-#: mail/mail-ops.c:1999
+#: mail/mail-ops.c:1998
 msgid "Saving attachment"
 msgstr "儲存附件"
 
 # mail/mail-ops.c:1844
-#: mail/mail-ops.c:2016
+#: mail/mail-ops.c:2015
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -19106,19 +18566,19 @@ msgstr ""
 " %s"
 
 # mail/mail-ops.c:1872
-#: mail/mail-ops.c:2046
+#: mail/mail-ops.c:2045
 #, c-format
 msgid "Could not write data: %s"
 msgstr "無法寫入資料：%s"
 
 # mail/mail-ops.c:1939
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "中斷與 %s 的連線"
 
 # mail/mail-ops.c:1939
-#: mail/mail-ops.c:2194
+#: mail/mail-ops.c:2193
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "重新連線到 %s"
@@ -19197,12 +18657,12 @@ msgid "Waiting..."
 msgstr "正在等待..."
 
 # mail/mail-session.c:161
-#: mail/mail-session.c:238
+#: mail/mail-session.c:239
 msgid "User canceled operation."
 msgstr "使用者取消動作。"
 
 # camel/camel-smime-context.c:194
-#: mail/mail-session.c:271
+#: mail/mail-session.c:272
 #, c-format
 msgid "Enter Password for %s"
 msgstr "請輸入 %s 所需的密碼"
@@ -19213,17 +18673,17 @@ msgstr "請輸入 %s 所需的密碼"
 # camel/providers/nntp/camel-nntp-store.c:291
 # camel/providers/pop3/camel-pop3-provider.c:67
 # mail/mail-config.glade.h:52
-#: mail/mail-session.c:273
+#: mail/mail-session.c:274
 msgid "Enter Password"
 msgstr "輸入密碼"
 
 # addressbook/gui/component/addressbook-config.c:352
 # mail/mail-config.glade.h:60
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password"
 msgstr "記住這個密碼(_R)"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:298
 msgid "_Remember this password for the remainder of this session"
 msgstr "記住這個用於剩餘的工作階段的密碼(_R)"
 
@@ -19294,96 +18754,96 @@ msgstr "更新用於 URI： %s 的虛擬資料夾"
 
 # camel/providers/imap/camel-imap-provider.c:48
 # shell/e-shell-view.c:552
-#: mail/mail-vfolder.c:959
+#: mail/mail-vfolder.c:958
 msgid "vFolders"
 msgstr "虛擬資料夾"
 
-#: mail/mail-vfolder.c:998
+#: mail/mail-vfolder.c:997
 msgid "Edit VFolder"
 msgstr "編輯虛擬資料夾"
 
 # mail/mail-vfolder.c:438
-#: mail/mail-vfolder.c:1082
+#: mail/mail-vfolder.c:1081
 msgid "New VFolder"
 msgstr "新增虛擬資料夾"
 
 # mail/message-list.c:677
-#: mail/message-list.c:946
+#: mail/message-list.c:948
 msgid "Unseen"
 msgstr "未閱讀"
 
 # mail/message-list.c:678
-#: mail/message-list.c:947
+#: mail/message-list.c:949
 msgid "Seen"
 msgstr "已閱讀"
 
 # mail/message-list.c:679
-#: mail/message-list.c:948
+#: mail/message-list.c:950
 msgid "Answered"
 msgstr "已回覆"
 
 # mail/message-list.c:680
-#: mail/message-list.c:949
+#: mail/message-list.c:951
 msgid "Multiple Unseen Messages"
 msgstr "多個未閱讀的郵件"
 
 # mail/message-list.c:681
-#: mail/message-list.c:950
+#: mail/message-list.c:952
 msgid "Multiple Messages"
 msgstr "多個郵件"
 
 # mail/message-list.c:685
-#: mail/message-list.c:954
+#: mail/message-list.c:956
 msgid "Lowest"
 msgstr "最低"
 
 # mail/message-list.c:686
-#: mail/message-list.c:955
+#: mail/message-list.c:957
 msgid "Lower"
 msgstr "低"
 
 # mail/message-list.c:690
-#: mail/message-list.c:959
+#: mail/message-list.c:961
 msgid "Higher"
 msgstr "高"
 
 # mail/message-list.c:691
-#: mail/message-list.c:960
+#: mail/message-list.c:962
 msgid "Highest"
 msgstr "最高"
 
 # mail/message-list.c:941
-#: mail/message-list.c:1279
+#: mail/message-list.c:1285
 msgid "?"
 msgstr "？"
 
 # mail/message-list.c:948
-#: mail/message-list.c:1286
+#: mail/message-list.c:1292
 msgid "Today %l:%M %p"
 msgstr "今天 %l:%M %p"
 
 # mail/message-list.c:957
-#: mail/message-list.c:1295
+#: mail/message-list.c:1301
 msgid "Yesterday %l:%M %p"
 msgstr "昨天 %l:%M %p"
 
 # mail/message-list.c:969
-#: mail/message-list.c:1307
+#: mail/message-list.c:1313
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
 # mail/message-list.c:977
-#: mail/message-list.c:1315
+#: mail/message-list.c:1321
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
 # mail/message-list.c:979
-#: mail/message-list.c:1317
+#: mail/message-list.c:1323
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
 # mail/mail-local.c:905
-#: mail/message-list.c:3300
+#: mail/message-list.c:3321
 msgid "Generating message list"
 msgstr "產生郵件清單"
 
@@ -19454,6 +18914,10 @@ msgstr "轉寄"
 msgid "No Response Necessary"
 msgstr "不需要回應"
 
+#: mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "閱讀"
+
 # mail/message-browser.c:188
 # ui/evolution-mail.xml.h:70
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
@@ -19580,52 +19044,56 @@ msgid ""
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:10
-msgid "Whether Evolution should start up in offline mode"
+msgid "Toolbar is visible"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid "Whether Evolution should start up in offline mode"
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "Whether the toolbar should be visible."
+msgstr ""
+
+#: shell/apps_evolution_shell.schemas.in.in.h:13
 msgid "Whether to skip the development warning dialog"
 msgstr ""
 
 # addressbook/gui/widgets/e-addressbook-view.c:701
-#: shell/apps_evolution_shell.schemas.in.in.h:12
+#: shell/apps_evolution_shell.schemas.in.in.h:14
 #, fuzzy
 msgid "mail"
 msgstr "電子郵件"
 
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
-msgstr "為您呈獻"
-
 # calendar/gui/e-week-view-main-item.c:342
-#: shell/e-shell.c:545 shell/e-shell.c:546
+#: shell/e-shell.c:588 shell/e-shell.c:589
 #, fuzzy, c-format
 msgid "%ld KB"
 msgstr "%d %B"
 
 # camel/providers/imap/camel-imap-command.c:241
 # shell/e-storage.c:481
-#: shell/e-shell.c:744
+#: shell/e-shell.c:786
 #, fuzzy
 msgid "Uknown system error."
 msgstr "不明的錯誤"
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: shell/e-shell.c:1101
+#: shell/e-shell.c:1143
 msgid "Invalid arguments"
 msgstr "無效的參數"
 
-#: shell/e-shell.c:1103
+#: shell/e-shell.c:1145
 msgid "Cannot register on OAF"
 msgstr "不能於 OAF 註冊"
 
-#: shell/e-shell.c:1105
+#: shell/e-shell.c:1147
 msgid "Configuration Database not found"
 msgstr "找不到組態資料庫"
 
 # shell/e-storage.c:461
-#: shell/e-shell.c:1107
+#: shell/e-shell.c:1149
 msgid "Generic error"
 msgstr "一般錯誤"
 
@@ -19689,7 +19157,7 @@ msgstr "選擇匯入服務"
 # camel/providers/local/camel-maildir-store.c:100
 # camel/providers/local/camel-mbox-store.c:101
 # camel/providers/local/camel-mh-store.c:97
-#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1026
+#: shell/e-shell-importer.c:451 shell/e-shell-importer.c:1055
 #, c-format
 msgid "File %s does not exist"
 msgstr "檔案 %s 不存在"
@@ -19722,40 +19190,40 @@ msgstr ""
 "正在匯入項目 1。"
 
 # shell/e-shell-importer.c:490
-#: shell/e-shell-importer.c:549
+#: shell/e-shell-importer.c:570
 msgid "Automatic"
 msgstr "自動"
 
-# shell/e-shell-importer.c:540
-#: shell/e-shell-importer.c:598
+# composer/e-msg-composer-attachment.glade.h:4
+#: shell/e-shell-importer.c:626
 #, fuzzy
-msgid "_Filename:"
+msgid "F_ilename:"
 msgstr "檔案名稱:"
 
 # shell/e-shell-importer.c:545
 # shell/importer/import.glade.h:5
-#: shell/e-shell-importer.c:603
+#: shell/e-shell-importer.c:631
 msgid "Select a file"
 msgstr "選擇一個檔案"
 
 # shell/e-shell-importer.c:555
-#: shell/e-shell-importer.c:613
+#: shell/e-shell-importer.c:642
 #, fuzzy
 msgid "File _type:"
 msgstr "檔案類型:"
 
-#: shell/e-shell-importer.c:652
+#: shell/e-shell-importer.c:681
 #, fuzzy
 msgid "Import data and settings from _older programs"
 msgstr "從舊程式匯入資料與設定"
 
 # ui/evolution.xml.h:21
-#: shell/e-shell-importer.c:655
+#: shell/e-shell-importer.c:684
 #, fuzzy
 msgid "Import a _single file"
 msgstr "匯入單一檔案"
 
-#: shell/e-shell-importer.c:723 shell/e-shell-startup-wizard.c:571
+#: shell/e-shell-importer.c:752 shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -19763,26 +19231,26 @@ msgstr ""
 "請稍候...\n"
 "正在掃描現存的設定"
 
-#: shell/e-shell-importer.c:727
+#: shell/e-shell-importer.c:756
 msgid "Starting Intelligent Importers"
 msgstr "啟動智慧型匯入服務"
 
 # composer/e-msg-composer-hdrs.c:355
-#: shell/e-shell-importer.c:853 shell/e-shell-startup-wizard.c:698
+#: shell/e-shell-importer.c:882 shell/e-shell-startup-wizard.c:698
 #, c-format
 msgid "From %s:"
 msgstr "來自 %s："
 
 # camel/camel-session.c:295
 # camel/camel-session.c:364
-#: shell/e-shell-importer.c:1044
+#: shell/e-shell-importer.c:1073
 #, fuzzy, c-format
 msgid "No importer available for file %s"
 msgstr "沒有通訊協定“%s”的提供者"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: shell/e-shell-importer.c:1056
+#: shell/e-shell-importer.c:1085
 #, fuzzy
 msgid "Unable to execute importer"
 msgstr "執行 gpg 失敗。"
@@ -19792,7 +19260,7 @@ msgstr "執行 gpg 失敗。"
 # importers/pine-importer.c:646
 # shell/e-shell-importer.c:653
 # shell/importer/import.glade.h:4
-#: shell/e-shell-importer.c:1169
+#: shell/e-shell-importer.c:1199
 #, fuzzy
 msgid "_Import"
 msgstr "匯入"
@@ -19845,66 +19313,66 @@ msgstr "資料夾名稱不能包含換行字元。"
 msgid "'.' and '..' are reserved folder names."
 msgstr "“.”和“..”是資料夾保留名稱。"
 
-#: shell/e-shell-window.c:336
+#: shell/e-shell-window.c:337
 #, fuzzy
 msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr "Ximian Evolution 目前為線上工作。按這裡改為離線工作。"
 
-#: shell/e-shell-window.c:343
+#: shell/e-shell-window.c:344
 #, fuzzy
 msgid "Evolution is in the process of going offline."
 msgstr "Ximian Evolution 現正離線中。"
 
-#: shell/e-shell-window.c:349
+#: shell/e-shell-window.c:350
 #, fuzzy
 msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr "Ximian Evolution 目前是離線工作。按這裡改為線上工作。"
 
 # mail/mail-autofilter.c:70
-#: shell/e-shell-window.c:621
+#: shell/e-shell-window.c:637
 #, fuzzy, c-format
 msgid "Switch to %s"
 msgstr "郵件送到 %s"
 
-#: shell/e-shell-window-commands.c:64
+#: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "GNOME Pilot 工具似乎沒有安裝在系統上。"
 
 # camel/camel-filter-driver.c:871
-#: shell/e-shell-window-commands.c:72
+#: shell/e-shell-window-commands.c:74
 #, c-format
 msgid "Error executing %s."
 msgstr "執行 %s 發生錯誤。"
 
 # shell/e-shell-view-menu.c:185
-#: shell/e-shell-window-commands.c:121
+#: shell/e-shell-window-commands.c:123
 #, fuzzy
 msgid "Bug buddy is not installed."
 msgstr "無法執行 Bug buddy。"
 
 # shell/e-shell-view-menu.c:185
-#: shell/e-shell-window-commands.c:129
+#: shell/e-shell-window-commands.c:131
 msgid "Bug buddy could not be run."
 msgstr "無法執行 Bug buddy。"
 
-# ui/evolution.xml.h:1
-#: shell/e-shell-window-commands.c:171
+# shell/e-shortcuts-view.c:137
+#: shell/e-shell-window-commands.c:323
 #, fuzzy
-msgid "About Evolution"
-msgstr "關於 Ximian Evolution"
+msgid "Groupware Suite"
+msgstr "組別"
 
 # shell/e-shell-view-menu.c:590
-#: shell/e-shell-window-commands.c:382
+#: shell/e-shell-window-commands.c:563
 msgid "_Work Online"
 msgstr "線上工作(_W)"
 
 # ui/evolution.xml.h:66
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
+#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "離線工作(_W)"
 
 # ui/evolution.xml.h:39
-#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "離線工作"
 
@@ -19921,45 +19389,6 @@ msgstr "核取方塊"
 msgid "New"
 msgstr "新增"
 
-# camel/providers/imap/camel-imap-command.c:241
-# shell/e-storage.c:481
-#: shell/evolution-shell-component-utils.c:115
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"不明的錯誤。"
-
-#: shell/evolution-shell-component-utils.c:118
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"來自元件系統的錯誤為：\n"
-"%s"
-
-#: shell/evolution-shell-component-utils.c:125
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"來自活化系統的錯誤為：\n"
-"%s"
-
 # ui/evolution-tasks.xml.h:3
 #: shell/evolution-test-component.c:140
 #, fuzzy
@@ -20359,36 +19788,36 @@ msgid ""
 msgstr ""
 
 # mail/mail-account-gui.c:682
-#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:522
+#: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
+#: smime/gui/certificate-manager.c:556
 #, fuzzy
 msgid "Select a cert to import..."
 msgstr "選擇匯入服務"
 
-#: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:604
+#: smime/gui/certificate-manager.c:245 smime/gui/certificate-manager.c:437
+#: smime/gui/certificate-manager.c:638
 #, fuzzy
 msgid "Certificate Name"
 msgstr "憑證 ID(_C):"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:16
-#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
+#: smime/gui/certificate-manager.c:254 smime/gui/certificate-manager.c:455
 #, fuzzy
 msgid "Purposes"
 msgstr "進度"
 
-#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
-#: smime/lib/e-cert.c:517
+#: smime/gui/certificate-manager.c:263 smime/gui/smime-ui.glade.h:36
+#: smime/lib/e-cert.c:569
 msgid "Serial Number"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:267
+#: smime/gui/certificate-manager.c:271
 #, fuzzy
 msgid "Expires"
 msgstr "詞句"
 
 # mail/mail-config.glade.h:29
-#: smime/gui/certificate-manager.c:417
+#: smime/gui/certificate-manager.c:446
 #, fuzzy
 msgid "E-Mail Address"
 msgstr "電子郵件地址:"
@@ -20439,6 +19868,12 @@ msgid ""
 "  Subject: %s\n"
 msgstr ""
 
+# ui/evolution-calendar.xml.h:13
+#: smime/gui/e-cert-selector.c:169
+#, fuzzy
+msgid "Select certificate"
+msgstr "移至指定日期"
+
 #: smime/gui/smime-ui.glade.h:1
 msgid "<Not Part of Certificate>"
 msgstr ""
@@ -20504,7 +19939,7 @@ msgid ""
 "and its policy and procedures (if available)."
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1024
+#: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
 #, fuzzy
 msgid "Certificate"
 msgstr "憑證 ID(_C):"
@@ -20530,12 +19965,11 @@ msgstr "普通名稱"
 msgid "Contact Certificates"
 msgstr "憑證 ID(_C):"
 
-#: smime/gui/smime-ui.glade.h:21
-#, no-c-format
-msgid "Do you want to trust \"%s\" for the following purposes?"
+#: smime/gui/smime-ui.glade.h:20
+msgid "Do not trust the authenticity of this certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:22
+#: smime/gui/smime-ui.glade.h:21
 msgid "Dummy window only"
 msgstr ""
 
@@ -20545,11 +19979,16 @@ msgstr ""
 # ui/evolution-subscribe.xml.h:10
 # ui/evolution-task-editor-dialog.xml.h:70
 # ui/evolution.xml.h:48
-#: smime/gui/smime-ui.glade.h:23
+#: smime/gui/smime-ui.glade.h:22
 #, fuzzy
 msgid "Edit"
 msgstr "編輯 (_E)"
 
+#: smime/gui/smime-ui.glade.h:23
+#, fuzzy
+msgid "Email Certificate Trust Settings"
+msgstr "無效的憑證機構 (CA)"
+
 #: smime/gui/smime-ui.glade.h:24
 msgid "Email Recipient Certificate"
 msgstr ""
@@ -20588,23 +20027,27 @@ msgstr "團體單位"
 msgid "SHA1 Fingerprint"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:766
+#: smime/gui/smime-ui.glade.h:34 smime/lib/e-cert.c:818
 msgid "SSL Client Certificate"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:770
+#: smime/gui/smime-ui.glade.h:35 smime/lib/e-cert.c:822
 msgid "SSL Server Certificate"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:37
-msgid "Trust this CA to identify email users."
+msgid "Trust the authenticity of this certificate"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:38
-msgid "Trust this CA to identify software developers."
+msgid "Trust this CA to identify email users."
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:39
+msgid "Trust this CA to identify software developers."
+msgstr ""
+
+#: smime/gui/smime-ui.glade.h:40
 msgid "Trust this CA to identify web sites."
 msgstr ""
 
@@ -20612,282 +20055,290 @@ msgstr ""
 # ui/evolution-message-composer.xml.h:55
 # ui/evolution-task-editor-dialog.xml.h:90
 # ui/evolution.xml.h:65
-#: smime/gui/smime-ui.glade.h:40
+#: smime/gui/smime-ui.glade.h:41
 #, fuzzy
 msgid "View"
 msgstr "檢視(_V)"
 
-#: smime/gui/smime-ui.glade.h:41
-#, fuzzy
-msgid "View Certificate"
-msgstr "憑證 ID(_C):"
-
 #: smime/gui/smime-ui.glade.h:42
-#, fuzzy
-msgid "You have been asked to trust a new Certificate Authority (CA)."
-msgstr "無效的憑證機構 (CA)"
-
-#: smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:44
+#: smime/gui/smime-ui.glade.h:43
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:45
+#: smime/gui/smime-ui.glade.h:44
 msgid "You have certificates on file that identify these people:"
 msgstr ""
 
-#: smime/gui/smime-ui.glade.h:46
+#: smime/gui/smime-ui.glade.h:45
 #, fuzzy
 msgid "Your Certificates"
 msgstr "憑證 ID(_C):"
 
+#: smime/gui/smime-ui.glade.h:46
+msgid "_Edit CA Trust"
+msgstr ""
+
 # e-util/e-time-utils.c:69
 # e-util/e-time-utils.c:117
 # widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
 # widgets/misc/e-dateedit.c:1284
 # widgets/misc/e-dateedit.c:1465
-#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
+#: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 #, fuzzy
 msgid "%d/%m/%Y"
 msgstr "%m/%d/%Y"
 
-#: smime/lib/e-cert.c:478
+# importers/netscape-importer.c:790
+# importers/pine-importer.c:656
+#. x509 certificate usage types
+#: smime/lib/e-cert.c:424
+#, fuzzy
+msgid "Sign"
+msgstr "Stauning"
+
+# ui/evolution-message-composer.xml.h:13
+#: smime/lib/e-cert.c:425
+#, fuzzy
+msgid "Encrypt"
+msgstr "PGP 加密"
+
+#: smime/lib/e-cert.c:530
 #, fuzzy
 msgid "Version"
 msgstr "佛蒙特"
 
-#: smime/lib/e-cert.c:493
+#: smime/lib/e-cert.c:545
 #, fuzzy
 msgid "Version 1"
 msgstr "佛密良"
 
-#: smime/lib/e-cert.c:496
+#: smime/lib/e-cert.c:548
 #, fuzzy
 msgid "Version 2"
 msgstr "佛密良"
 
-#: smime/lib/e-cert.c:499
+#: smime/lib/e-cert.c:551
 #, fuzzy
 msgid "Version 3"
 msgstr "佛密良"
 
-#: smime/lib/e-cert.c:581
+#: smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:584
+#: smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:587
+#: smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:590
+#: smime/lib/e-cert.c:642
 #, fuzzy
 msgid "C"
 msgstr " C"
 
 # calendar/gui/calendar-model.c:457
-#: smime/lib/e-cert.c:593
+#: smime/lib/e-cert.c:645
 #, fuzzy
 msgid "CN"
 msgstr "N"
 
-#: smime/lib/e-cert.c:596
+#: smime/lib/e-cert.c:648
 msgid "OU"
 msgstr ""
 
 # widgets/misc/e-cell-date-edit.c:245
-#: smime/lib/e-cert.c:599
+#: smime/lib/e-cert.c:651
 #, fuzzy
 msgid "O"
 msgstr "確認"
 
-#: smime/lib/e-cert.c:602
+#: smime/lib/e-cert.c:654
 msgid "L"
 msgstr ""
 
 # calendar/gui/calendar-model.c:457
-#: smime/lib/e-cert.c:605
+#: smime/lib/e-cert.c:657
 #, fuzzy
 msgid "DN"
 msgstr "N"
 
-#: smime/lib/e-cert.c:608
+#: smime/lib/e-cert.c:660
 msgid "DC"
 msgstr ""
 
 # camel/providers/smtp/camel-smtp-provider.c:38
 # mail/mail-config.glade.h:62
-#: smime/lib/e-cert.c:611
+#: smime/lib/e-cert.c:663
 #, fuzzy
 msgid "ST"
 msgstr "SMTP"
 
-#: smime/lib/e-cert.c:614
+#: smime/lib/e-cert.c:666
 msgid "PKCS #1 RSA Encryption"
 msgstr ""
 
-#: smime/lib/e-cert.c:617
+#: smime/lib/e-cert.c:669
 #, fuzzy
 msgid "Certificate Key Usage"
 msgstr "憑證 ID(_C):"
 
-#: smime/lib/e-cert.c:620
+#: smime/lib/e-cert.c:672
 #, fuzzy
 msgid "Netscape Certificate Type"
 msgstr "憑證 ID(_C):"
 
-#: smime/lib/e-cert.c:623
+#: smime/lib/e-cert.c:675
 #, fuzzy
 msgid "Certificate Authority Key Identifier"
 msgstr "憑證不被信任"
 
 # addressbook/contact-editor/fullname.glade.h:4
-#: smime/lib/e-cert.c:626
+#: smime/lib/e-cert.c:678
 #, fuzzy
 msgid "UID"
 msgstr "ID"
 
-#: smime/lib/e-cert.c:635
+#: smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr ""
 
-#: smime/lib/e-cert.c:686
+#: smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
 msgstr ""
 
-#: smime/lib/e-cert.c:694
+#: smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
 msgstr ""
 
-#: smime/lib/e-cert.c:716
+#: smime/lib/e-cert.c:768
 msgid "Subject Public Key Info"
 msgstr ""
 
-#: smime/lib/e-cert.c:721
+#: smime/lib/e-cert.c:773
 msgid "Subject Public Key Algorithm"
 msgstr ""
 
 # mail/mail-autofilter.c:213
-#: smime/lib/e-cert.c:736
+#: smime/lib/e-cert.c:788
 #, fuzzy
 msgid "Subject's Public Key"
 msgstr "主旨是 %s"
 
 # camel/camel-filter-driver.c:652
-#: smime/lib/e-cert.c:757 smime/lib/e-cert.c:806
+#: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
 #, fuzzy
 msgid "Error: Unable to process extension"
 msgstr "無法處理 spool 資料夾"
 
-#: smime/lib/e-cert.c:778 smime/lib/e-cert.c:790
+#: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
 msgid "Object Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:782
+#: smime/lib/e-cert.c:834
 #, fuzzy
 msgid "SSL Certificate Authority"
 msgstr "無效的憑證機構 (CA)"
 
-#: smime/lib/e-cert.c:786
+#: smime/lib/e-cert.c:838
 #, fuzzy
 msgid "Email Certificate Authority"
 msgstr "無效的憑證機構 (CA)"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: smime/lib/e-cert.c:814
+#: smime/lib/e-cert.c:866
 #, fuzzy
 msgid "Signing"
 msgstr "Stauning"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:395
-#: smime/lib/e-cert.c:818
+#: smime/lib/e-cert.c:870
 #, fuzzy
 msgid "Non-repudiation"
 msgstr "沒有資訊"
 
-#: smime/lib/e-cert.c:822
+#: smime/lib/e-cert.c:874
 msgid "Key Encipherment"
 msgstr ""
 
 # composer/e-msg-composer-attachment-bar.c:332
 # mail/mail-display.c:122
-#: smime/lib/e-cert.c:826
+#: smime/lib/e-cert.c:878
 #, fuzzy
 msgid "Data Encipherment"
 msgstr "附件"
 
-#: smime/lib/e-cert.c:830
+#: smime/lib/e-cert.c:882
 msgid "Key Agreement"
 msgstr ""
 
-#: smime/lib/e-cert.c:834
+#: smime/lib/e-cert.c:886
 #, fuzzy
 msgid "Certificate Signer"
 msgstr "憑證 ID(_C):"
 
-#: smime/lib/e-cert.c:838
+#: smime/lib/e-cert.c:890
 msgid "CRL Signer"
 msgstr ""
 
-#: smime/lib/e-cert.c:886
+#: smime/lib/e-cert.c:938
 #, fuzzy
 msgid "Critical"
 msgstr "古里提巴"
 
-#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
+#: smime/lib/e-cert.c:940 smime/lib/e-cert.c:943
 #, fuzzy
 msgid "Not Critical"
 msgstr "北卡羅來納"
 
-#: smime/lib/e-cert.c:912
+#: smime/lib/e-cert.c:964
 #, fuzzy
 msgid "Extensions"
 msgstr "詞句"
 
-#: smime/lib/e-cert.c:983
+#: smime/lib/e-cert.c:1035
 #, fuzzy, c-format
 msgid "%s = %s"
 msgstr "%s 在 %s"
 
 # mail/mail-crypto.c:59
-#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1091 smime/lib/e-cert.c:1211
 #, fuzzy
 msgid "Certificate Signature Algorithm"
 msgstr "憑證簽章失敗"
 
 # ui/evolution-message-composer.xml.h:49
-#: smime/lib/e-cert.c:1048
+#: smime/lib/e-cert.c:1100
 #, fuzzy
 msgid "Issuer"
 msgstr "插入(_I)"
 
-#: smime/lib/e-cert.c:1102
+#: smime/lib/e-cert.c:1154
 msgid "Issuer Unique ID"
 msgstr ""
 
 # mail/mail-autofilter.c:213
-#: smime/lib/e-cert.c:1121
+#: smime/lib/e-cert.c:1173
 #, fuzzy
 msgid "Subject Unique ID"
 msgstr "主旨是 %s"
 
 # mail/mail-crypto.c:59
-#: smime/lib/e-cert.c:1164
+#: smime/lib/e-cert.c:1216
 #, fuzzy
 msgid "Certificate Signature Value"
 msgstr "憑證簽章失敗"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
+#: smime/lib/e-cert-db.c:608
 #, fuzzy
 msgid "Certificate already exists"
 msgstr "名片 ID 已經存在"
@@ -21071,7 +20522,7 @@ msgstr "檢視目前的連絡人"
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
 #: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
 #: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:25
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "執行(_A)"
 
@@ -21306,7 +20757,7 @@ msgstr "關閉(_L)"
 #: ui/evolution-contact-list-editor.xml.h:2
 #: ui/evolution-mail-messagedisplay.xml.h:1
 #: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
-#: ui/evolution.xml.h:3
+#: ui/evolution.xml.h:4
 msgid "Close"
 msgstr "關閉"
 
@@ -21322,7 +20773,7 @@ msgstr "刪除這個項目"
 
 # ui/evolution.xml.h:22
 #: ui/evolution-comp-editor.xml.h:6 ui/evolution-event-editor.xml.h:5
-#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:11
+#: ui/evolution-mail-messagedisplay.xml.h:3 ui/evolution.xml.h:13
 msgid "Main toolbar"
 msgstr "主工具列"
 
@@ -21388,7 +20839,7 @@ msgstr "儲存這個項目到磁碟"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:44
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:27
+#: ui/evolution.xml.h:29
 msgid "_File"
 msgstr "檔案(_F)"
 
@@ -21730,7 +21181,7 @@ msgid "_Threaded Message List"
 msgstr "相關郵件清單(_T)"
 
 # ui/evolution.xml.h:6
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
 msgid "Close this window"
 msgstr "關閉這個視窗"
 
@@ -21740,7 +21191,7 @@ msgstr "關閉這個視窗"
 # ui/evolution.xml.h:43
 #: ui/evolution-mail-messagedisplay.xml.h:5
 #: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:28
 msgid "_Close"
 msgstr "關閉(_C)"
 
@@ -22252,7 +21703,7 @@ msgstr "引用(_Q)"
 # ui/evolution-event-editor.xml.h:74
 # ui/evolution-task-editor-dialog.xml.h:88
 # ui/evolution.xml.h:64
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
 msgid "_Tools"
 msgstr "工具(_T)"
 
@@ -22645,114 +22096,130 @@ msgstr "工作(_T)"
 
 # ui/evolution.xml.h:1
 #: ui/evolution.xml.h:1
-msgid "About Ximian Evolution..."
-msgstr "關於 Ximian Evolution..."
+#, fuzzy
+msgid "About Evolution..."
+msgstr "關於 Ximian Evolution"
 
 # shell/GNOME_Evolution_Shell.oaf.in.h:1
 #: ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
 msgstr "改變 Evolution 的設定值"
 
+# ui/evolution-mail.xml.h:4
+#: ui/evolution.xml.h:3
+#, fuzzy
+msgid "Change the visibility of the toolbar"
+msgstr "變更這個資料夾的屬性"
+
 # ui/evolution.xml.h:10
-#: ui/evolution.xml.h:5
+#: ui/evolution.xml.h:6
 msgid "Create a new window displaying this folder"
 msgstr "建立一個新的視窗來顯示這個資料夾"
 
 # ui/evolution.xml.h:15
-#: ui/evolution.xml.h:6
+#: ui/evolution.xml.h:7
 msgid "E_xit"
 msgstr "離開(_X)"
 
+# ui/evolution.xml.h:16
+#: ui/evolution.xml.h:8
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Ximian Evolution _FAQ"
+
 # ui/evolution.xml.h:19
-#: ui/evolution.xml.h:7
+#: ui/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "離開這個程式"
 
 # ui/evolution-mail.xml.h:31
-#: ui/evolution.xml.h:8
+#: ui/evolution.xml.h:10
 msgid "Forget _Passwords"
 msgstr "遺忘密碼(_P)"
 
 # ui/evolution-mail.xml.h:32
-#: ui/evolution.xml.h:9
+#: ui/evolution.xml.h:11
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "刪除已記錄的密碼以便可再重新輸入"
 
-#: ui/evolution.xml.h:10
+#: ui/evolution.xml.h:12
 msgid "Import data from other programs"
 msgstr "匯入其他程式的資料"
 
 # addressbook/gui/component/addressbook-config.c:349
-#: ui/evolution.xml.h:12
+#: ui/evolution.xml.h:14
 #, fuzzy
 msgid "New _Window"
 msgstr "立即搜尋(_F)"
 
 # ui/evolution-mail.xml.h:110
-#: ui/evolution.xml.h:13
+#: ui/evolution.xml.h:15
 msgid "Pi_lot Settings..."
 msgstr "P_ilot 設定..."
 
 # ui/evolution-mail.xml.h:81
-#: ui/evolution.xml.h:14
+#: ui/evolution.xml.h:16
 msgid "Send / Receive"
 msgstr "傳送/接收"
 
 # ui/evolution-mail.xml.h:82
-#: ui/evolution.xml.h:15
+#: ui/evolution.xml.h:17
 msgid "Send queued items and retrieve new items"
 msgstr "傳送待送的項目並接收新的項目"
 
 # mail/mail-config.glade.h:40
-#: ui/evolution.xml.h:16
+#: ui/evolution.xml.h:18
 msgid "Set up Pilot configuration"
 msgstr "設定 Pilot 組態"
 
 # ui/evolution.xml.h:27
-#: ui/evolution.xml.h:17
-msgid "Show information about Ximian Evolution"
+#: ui/evolution.xml.h:19
+#, fuzzy
+msgid "Show information about Evolution"
 msgstr "顯示關於 Ximian Evolution 的資訊"
 
 # ui/evolution.xml.h:28
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:20
 msgid "Submit Bug Report"
 msgstr "傳送錯誤報告"
 
 # ui/evolution.xml.h:29
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:21
 msgid "Submit _Bug Report"
 msgstr "傳送錯誤報告(_B)"
 
 # ui/evolution.xml.h:30
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:22
 msgid "Submit a bug report using Bug Buddy"
 msgstr "使用 Bug Buddy 送出錯誤報告。"
 
+# ui/evolution.xml.h:22
+#: ui/evolution.xml.h:23
+#, fuzzy
+msgid "T_oolbar"
+msgstr "主工具列"
+
 # ui/evolution.xml.h:34
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:24
 msgid "Toggle whether we are working offline."
 msgstr "切換離線/在線工作的狀態。"
 
-# ui/evolution.xml.h:16
-#: ui/evolution.xml.h:23
-msgid "Ximian Evolution _FAQ"
-msgstr "Ximian Evolution _FAQ"
-
-# ui/evolution.xml.h:40
-#: ui/evolution.xml.h:24
-msgid "_About Ximian Evolution..."
-msgstr "關於 Ximian Evolution(_A)..."
+# ui/evolution.xml.h:1
+#: ui/evolution.xml.h:26
+#, fuzzy
+msgid "_About Evolution..."
+msgstr "關於 Ximian Evolution"
 
 # ui/evolution-event-editor.xml.h:60
 # ui/evolution-message-composer.xml.h:48
 # ui/evolution-task-editor-dialog.xml.h:72
 # ui/evolution.xml.h:53
-#: ui/evolution.xml.h:28
+#: ui/evolution.xml.h:30
 msgid "_Help"
 msgstr "說明(_H)"
 
 # shell/e-shell-importer.c:363
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "_Import..."
 msgstr "匯入(_I)..."
 
@@ -22760,22 +22227,22 @@ msgstr "匯入(_I)..."
 # ui/evolution-event-editor.xml.h:66
 # ui/evolution-task-editor-dialog.xml.h:79
 # ui/evolution.xml.h:58
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "_New"
 msgstr "新增(_N)"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 #, fuzzy
 msgid "_Quick Reference"
 msgstr "郵件偏好設定"
 
 # ui/evolution-mail.xml.h:119
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_Send / Receive"
 msgstr "傳送/接收 (_S)"
 
 # addressbook/gui/component/addressbook-config.c:349
-#: ui/evolution.xml.h:36
+#: ui/evolution.xml.h:38
 #, fuzzy
 msgid "_Window"
 msgstr "立即搜尋(_F)"
@@ -22868,7 +22335,7 @@ msgid "With _Status"
 msgstr "設定狀態"
 
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:626
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:635
 msgid "UTC"
 msgstr "UTC"
 
@@ -23056,35 +22523,35 @@ msgstr "..."
 # composer/e-msg-composer.c:935
 # data/evolution.desktop.in.h:1
 # shell/e-shell-view-menu.c:228
-#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
-#: widgets/misc/e-error.c:121
+#: widgets/misc/e-error.c:79 widgets/misc/e-error.c:80
+#: widgets/misc/e-error.c:122
 msgid "Evolution Error"
 msgstr "Evolution 錯誤"
 
 # composer/e-msg-composer.c:935
 # data/evolution.desktop.in.h:1
 # shell/e-shell-view-menu.c:228
-#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
-#: widgets/misc/e-error.c:119
+#: widgets/misc/e-error.c:81 widgets/misc/e-error.c:82
+#: widgets/misc/e-error.c:120
 #, fuzzy
 msgid "Evolution Warning"
 msgstr "Evolution"
 
 # data/evolution.keys.in.h:2
-#: widgets/misc/e-error.c:118
+#: widgets/misc/e-error.c:119
 #, fuzzy
 msgid "Evolution Information"
 msgstr "會議資訊"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: widgets/misc/e-error.c:120
+#: widgets/misc/e-error.c:121
 #, fuzzy
 msgid "Evolution Query"
 msgstr "Evolution 摘要元件。"
 
 # mail/mail-config.glade.h:69
 #. setup a dummy error
-#: widgets/misc/e-error.c:410
+#: widgets/misc/e-error.c:415
 #, fuzzy, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -23270,7 +22737,7 @@ msgstr ""
 "無法儲存到“%s”\n"
 " %s"
 
-#: widgets/misc/e-task-widget.c:211
+#: widgets/misc/e-task-widget.c:212
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
@@ -23279,11 +22746,587 @@ msgstr "%s (...)"
 # calendar/gui/calendar-model.c:1180
 # calendar/gui/dialogs/task-editor-dialog.glade.h:6
 # calendar/gui/e-calendar-table.c:421
-#: widgets/misc/e-task-widget.c:216
+#: widgets/misc/e-task-widget.c:217
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% 完成)"
 
+# camel/providers/imap/camel-imap-store.c:531
+#~ msgid "Failed to connect to LDAP server"
+#~ msgstr "無法連線至 LDAP 伺服器"
+
+# camel/providers/imap/camel-imap-store.c:531
+#~ msgid "Failed to authenticate with LDAP server"
+#~ msgstr "無法驗證進入 LDAP 伺服器"
+
+#~ msgid "Could not perform query on Root DSE"
+#~ msgstr "無法在 Root DSE 上執行查詢"
+
+#~ msgid "The server responded with no supported search bases"
+#~ msgstr "伺服器回報了不支援的搜尋起點"
+
+#~ msgid "This server does not support LDAPv3 schema information"
+#~ msgstr "這個伺服器不支援 LDAPv3 模式的資訊"
+
+# mail/mail-callbacks.c:1349
+#~ msgid "Error retrieving schema information"
+#~ msgstr "接收模式資訊時發生錯誤"
+
+# camel/providers/imap/camel-imap-command.c:487
+#~ msgid "Server did not respond with valid schema information"
+#~ msgstr "伺服器沒有回應有效的模式資訊"
+
+# mail/mail-config.glade.h:1
+#~ msgid "  S_how Supported Bases "
+#~ msgstr " 顯示支援的起點(_S) "
+
+# calendar/gui/e-calendar-table.c:377
+#~ msgid "1:00"
+#~ msgstr "1:00"
+
+#~ msgid "5:00"
+#~ msgstr "5:00"
+
+# ui/evolution-addressbook.xml.h:17
+#~ msgid "Connecting"
+#~ msgstr "連線中"
+
+#~ msgid "Distinguished _name:"
+#~ msgstr "'辨別的名稱(_N):"
+
+# mail/mail-config.glade.h:29
+#, fuzzy
+#~ msgid "Email address:"
+#~ msgstr "電子郵件位址(_A):"
+
+#~ msgid "Evolution will use this DN to authenticate you with the server"
+#~ msgstr "Evolution 會使用這個 DN 透過伺服器來驗證您"
+
+# addressbook/gui/component/addressbook-config.c:179
+#~ msgid "One"
+#~ msgstr "一層"
+
+# addressbook/gui/component/addressbook-config.c:430
+#~ msgid "S_earch scope: "
+#~ msgstr "搜尋範圍(_E):"
+
+# addressbook/gui/search/e-addressbook-search-dialog.c:158
+# mail/mail-search.c:242
+#~ msgid "Searching"
+#~ msgstr "搜尋中"
+
+# calendar/gui/print.c:362
+#~ msgid "Sub"
+#~ msgstr "子目錄"
+
+#~ msgid "This option controls how long a search will be run."
+#~ msgstr "這個選項控制搜尋會執行多久的時間。"
+
+#~ msgid "U_se SSL/TLS:"
+#~ msgstr "使用 SSL/TLS(_S):"
+
+# calendar/gui/calendar-summary.c:622
+# mail/mail-config.glade.h:24
+#~ msgid "_Display name:"
+#~ msgstr "顯示名稱(_D):"
+
+# addressbook/gui/component/addressbook-config.c:409
+#~ msgid "_Port number:"
+#~ msgstr "連接埠號碼(_P):"
+
+# addressbook/gui/component/addressbook-config.c:430
+#~ msgid "_Search base:"
+#~ msgstr "搜尋起點(_S):"
+
+# calendar/gui/e-itip-control.glade.h:10
+#~ msgid "_Server name:"
+#~ msgstr "伺服器名稱(_S):"
+
+# calendar/gui/dialogs/alarm-notify.glade.h:4
+#~ msgid "_Timeout (minutes):"
+#~ msgstr "逾時時間（分鐘）(_T):"
+
+# mail/mail-ops.c:1939
+#~ msgid "connecting-tab"
+#~ msgstr "connecting-tab"
+
+# addressbook/contact-editor/contact-editor.glade.h:10
+# executive-summary/component/executive-summary-config.glade.h:3
+#~ msgid "general-tab"
+#~ msgstr "general-tab"
+
+# addressbook/gui/search/e-addressbook-search-dialog.c:158
+# mail/mail-search.c:242
+#~ msgid "searching-tab"
+#~ msgstr "searching-tab"
+
+# addressbook/contact-editor/contact-editor.glade.h:27
+#, fuzzy
+#~ msgid "Job title:"
+#~ msgstr "職稱(_J):"
+
+# addressbook/printing/e-contact-print.glade.h:25
+#, fuzzy
+#~ msgid "Webcam:"
+#~ msgstr "頁"
+
+# calendar/gui/dialogs/alarm-notify-dialog.c:207
+#~ msgid "Category editor not available."
+#~ msgstr "類別編輯器無法使用。"
+
+#, fuzzy
+#~ msgid ""
+#~ "The following entries are invalid:\n"
+#~ "\n"
+#~ msgstr "以下是目前接通的連線："
+
+# camel/providers/local/camel-local-store.c:279
+#~ msgid "Could not find widget for a field: `%s'"
+#~ msgstr "無法找到此欄位之界面工具：“%s”"
+
+# calendar/gui/dialogs/save-comp.c:51
+#~ msgid "Do you want to save changes?"
+#~ msgstr "您是否須要儲存變更？"
+
+# composer/e-msg-composer.c:785
+#~ msgid "Error saving %s: %s"
+#~ msgstr "儲存 %s 時發生錯誤：%s"
+
+#~ msgid ""
+#~ "The addressbook backend for\n"
+#~ "%s\n"
+#~ "has crashed. You will have to restart Evolution in order to use it again"
+#~ msgstr ""
+#~ "%s\n"
+#~ "的目錄服務後端程式\n"
+#~ "已經當機。您將需要重新啟動 Evolution 才能再度使用它"
+
+# calendar/gui/calendar-commands.c:266
+#, fuzzy
+#~ msgid "Can not load URI"
+#~ msgstr "找不到名片"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+# ui/evolution-calendar.xml.h:3
+#, fuzzy
+#~ msgid "Calendar Properties"
+#~ msgstr "iCalendar 錯誤"
+
+# addressbook/gui/component/select-names/e-select-names-popup.c:161
+# composer/e-msg-composer-attachment-bar.c:468
+# shell/e-shortcuts-view.c:265
+# shell/e-shortcuts-view.c:388
+#, fuzzy
+#~ msgid "Remote"
+#~ msgstr "移除"
+
+# calendar/gui/calendar-summary.c:275
+# calendar/gui/print.c:948
+# views/tasks/galview.xml.h:1
+#, fuzzy
+#~ msgid "Task List Properties"
+#~ msgstr "工作清單"
+
+# ui/evolution-subscribe.xml.h:4
+#, fuzzy
+#~ msgid "_Refresh Interval:"
+#~ msgstr "重整清單"
+
+# addressbook/gui/widgets/e-addressbook-view.c:735
+#, fuzzy
+#~ msgid "_Source URL:"
+#~ msgstr "POP 來源 URI"
+
+#~ msgid ""
+#~ "The event being deleted is a meeting, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr "要刪除的事件是一個會議，您想要送出取消通知嗎？"
+
+# mail/mail-accounts.c:280
+# mail/mail-accounts.c:284
+#~ msgid "Are you sure you want to cancel and delete this meeting?"
+#~ msgstr "您確定要取消並刪除這個會議？"
+
+#~ msgid ""
+#~ "The task being deleted is assigned, would you like to send a cancellation "
+#~ "notice?"
+#~ msgstr "要刪除的工作已經被指派了，您想要送出取消通知嗎？"
+
+# calendar/gui/dialogs/delete-comp.c:125
+#~ msgid "Are you sure you want to cancel and delete this task?"
+#~ msgstr "您確定要取消並刪除這個工作？"
+
+#~ msgid ""
+#~ "The journal entry being deleted is published, would you like to send a "
+#~ "cancellation notice?"
+#~ msgstr "要刪除的日誌項目已經公佈了，您想要送出取消通知嗎？"
+
+# calendar/gui/dialogs/delete-comp.c:102
+#~ msgid "Are you sure you want to cancel and delete this journal entry?"
+#~ msgstr "您確定要取消並刪除這個日誌項目？"
+
+# calendar/gui/dialogs/delete-comp.c:84
+#~ msgid "Are you sure you want to delete the appointment `%s'?"
+#~ msgstr "您確定要刪除約會 “%s”？"
+
+# calendar/gui/dialogs/delete-comp.c:87
+#~ msgid "Are you sure you want to delete this untitled appointment?"
+#~ msgstr "您確定要刪除這個未命名的約會？"
+
+# calendar/gui/dialogs/delete-comp.c:93
+#~ msgid "Are you sure you want to delete the task `%s'?"
+#~ msgstr "您確定要刪除工作“%s”？"
+
+# calendar/gui/dialogs/delete-comp.c:96
+#~ msgid "Are you sure you want to delete this untitled task?"
+#~ msgstr "您確定要刪除這個未命名的工作？"
+
+# calendar/gui/dialogs/delete-comp.c:102
+#~ msgid "Are you sure you want to delete the journal entry `%s'?"
+#~ msgstr "您確定要刪除日誌項目 “%s”？"
+
+# calendar/gui/dialogs/delete-comp.c:105
+#~ msgid "Are you sure want to delete this untitled journal entry?"
+#~ msgstr "您確定要刪除這個未命名的日誌？"
+
+# calendar/gui/dialogs/delete-comp.c:120
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d appointment?"
+#~ msgid_plural "Are you sure you want to delete %d appointments?"
+#~ msgstr[0] "您確定要刪除 %d 個約會？"
+#~ msgstr[1] "您確定要刪除 %d 個約會？"
+
+# calendar/gui/dialogs/delete-comp.c:125
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d task?"
+#~ msgid_plural "Are you sure you want to delete %d tasks?"
+#~ msgstr[0] "您確定要刪除 %d 個工作？"
+#~ msgstr[1] "您確定要刪除 %d 個工作？"
+
+# calendar/gui/dialogs/delete-comp.c:130
+#, fuzzy
+#~ msgid "Are you sure you want to delete %d journal entry?"
+#~ msgid_plural "Are you sure you want to delete %d journal entries?"
+#~ msgstr[0] "您確定要刪除 %d 個日誌項目？"
+#~ msgstr[1] "您確定要刪除 %d 個日誌項目？"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:411
+#~ msgid "_Invite Others..."
+#~ msgstr "邀請其他人(_I)..."
+
+# composer/e-msg-composer.c:941
+#, fuzzy
+#~ msgid ""
+#~ "This event has been changed, but has not been saved.\n"
+#~ "\n"
+#~ "Do you wish to save your changes?"
+#~ msgstr ""
+#~ "這個簽名檔已變更但仍未儲存。\n"
+#~ "\n"
+#~ "您是否要儲存變更？"
+
+#~ msgid "_Discard Changes"
+#~ msgstr "放棄變更(_D)"
+
+# calendar/gui/e-itip-control.glade.h:4
+#, fuzzy
+#~ msgid "Save Event"
+#~ msgstr "行事曆事件"
+
+#~ msgid "The meeting information has been created. Send it?"
+#~ msgstr "會議資訊已建立。是否傳送它？"
+
+#~ msgid "The meeting information has changed. Send an updated version?"
+#~ msgstr "會議資訊已變更。是否傳送更新後的資訊？"
+
+#~ msgid "The task assignment information has been created. Send it?"
+#~ msgstr "工作指派資訊已建立。是否傳送它？"
+
+#~ msgid "The task information has changed. Send an updated version?"
+#~ msgstr "工作資訊已變更。是否傳送更新後的資訊？"
+
+# camel/camel-movemail.c:306
+#, fuzzy
+#~ msgid "Could not get article %s from NNTP server"
+#~ msgstr "無法取得群組：%s"
+
+# mail/mail-ops.c:1755
+#, fuzzy
+#~ msgid "Error posting message: %s: message not posted"
+#~ msgstr ""
+#~ "自動儲存郵件時發生錯誤： %s\n"
+#~ " %s"
+
+# shell/e-storage.c:467
+#, fuzzy
+#~ msgid "Stream error"
+#~ msgstr "解析錯誤"
+
+# camel/providers/local/camel-mbox-summary.c:879
+#, fuzzy
+#~ msgid "Connection error: %s"
+#~ msgstr "不明的錯誤： %s"
+
+# camel/camel-movemail.c:306
+#~ msgid "Could not get group: %s"
+#~ msgstr "無法取得群組：%s"
+
+# camel/providers/sendmail/camel-sendmail-transport.c:150
+#, fuzzy
+#~ msgid "Could not get messages: unspecified error"
+#~ msgstr "郵件無法傳送： %s"
+
+# camel/providers/local/camel-mbox-summary.c:879
+#~ msgid "Unknown server response: %s"
+#~ msgstr "不明的伺服器回應： %s"
+
+#~ msgid "Adjust Score"
+#~ msgstr "調整目標"
+
+#~ msgid "Assign Color"
+#~ msgstr "指定色彩"
+
+#~ msgid "Assign Score"
+#~ msgstr "指定目標"
+
+#~ msgid "Attachments"
+#~ msgstr "附加檔案"
+
+# addressbook/printing/e-contact-print.glade.h:36
+#~ msgid "Beep"
+#~ msgstr "嗶聲"
+
+#~ msgid "contains"
+#~ msgstr "包含"
+
+#~ msgid "Copy to Folder"
+#~ msgstr "複製至資料夾"
+
+#~ msgid "Date received"
+#~ msgstr "收件日期"
+
+#~ msgid "Date sent"
+#~ msgstr "送件日期"
+
+#~ msgid "Deleted"
+#~ msgstr "已刪除"
+
+#~ msgid "does not contain"
+#~ msgstr "不包含"
+
+#~ msgid "does not end with"
+#~ msgstr "不是以此結束"
+
+#~ msgid "does not exist"
+#~ msgstr "不存在"
+
+#~ msgid "does not return"
+#~ msgstr "沒有傳回"
+
+#~ msgid "does not sound like"
+#~ msgstr "不類似"
+
+#~ msgid "does not start with"
+#~ msgstr "不是以此開始"
+
+#~ msgid "Do Not Exist"
+#~ msgstr "不存在"
+
+#~ msgid "Draft"
+#~ msgstr "草稿"
+
+#~ msgid "ends with"
+#~ msgstr "以此終結"
+
+#~ msgid "Exist"
+#~ msgstr "存在"
+
+#~ msgid "exists"
+#~ msgstr "存在"
+
+#~ msgid "Expression"
+#~ msgstr "詞句"
+
+#~ msgid "Follow Up"
+#~ msgstr "跟隨"
+
+#~ msgid "is"
+#~ msgstr "是"
+
+#~ msgid "is after"
+#~ msgstr "是之後的"
+
+#~ msgid "is before"
+#~ msgstr "是之前的"
+
+#~ msgid "is Flagged"
+#~ msgstr "有標幟的"
+
+#~ msgid "is greater than"
+#~ msgstr "大於"
+
+#~ msgid "is less than"
+#~ msgstr "小於"
+
+#~ msgid "is not"
+#~ msgstr "不是"
+
+#~ msgid "is not Flagged"
+#~ msgstr "沒有標幟的"
+
+# calendar/gui/goto-dialog.glade.h:9
+#, fuzzy
+#~ msgid "Junk Test"
+#~ msgstr "6月"
+
+#~ msgid "Mailing list"
+#~ msgstr "郵件列表"
+
+#~ msgid "Message Body"
+#~ msgstr "郵件內容"
+
+#~ msgid "Message Header"
+#~ msgstr "郵件檔頭"
+
+# views/mail/galview.xml.h:4
+#, fuzzy
+#~ msgid "Message is Junk"
+#~ msgstr "郵件"
+
+# mail/folder-browser.c:706
+#, fuzzy
+#~ msgid "Message is not Junk"
+#~ msgstr "標示成重要(_I)"
+
+#~ msgid "Move to Folder"
+#~ msgstr "移至資料夾"
+
+# ui/evolution.xml.h:19
+#, fuzzy
+#~ msgid "Pipe to Program"
+#~ msgstr "離開這個程式"
+
+# calendar/gui/event-editor-dialog.glade.h:14
+# calendar/gui/event-editor.c:1588
+#~ msgid "Play Sound"
+#~ msgstr "播放音效"
+
+#~ msgid "Recipients"
+#~ msgstr "收件者"
+
+#~ msgid "Regex Match"
+#~ msgstr "正規表示式相配"
+
+#~ msgid "Replied to"
+#~ msgstr "回覆"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:393
+#~ msgid "returns"
+#~ msgstr "傳回"
+
+#~ msgid "returns greater than"
+#~ msgstr "傳回大於"
+
+#~ msgid "returns less than"
+#~ msgstr "傳回小於"
+
+# calendar/gui/event-editor-dialog.glade.h:22
+# calendar/gui/event-editor.c:1597
+#, fuzzy
+#~ msgid "Run Program"
+#~ msgstr "執行程式:"
+
+#~ msgid "Sender"
+#~ msgstr "寄件者"
+
+#~ msgid "Set Status"
+#~ msgstr "設定狀態"
+
+# addressbook/printing/e-contact-print.glade.h:36
+#~ msgid "Size (kB)"
+#~ msgstr "大小 (kB)"
+
+#~ msgid "sounds like"
+#~ msgstr "類似"
+
+#~ msgid "Source Account"
+#~ msgstr "來源帳號"
+
+#~ msgid "Specific header"
+#~ msgstr "指定檔頭"
+
+#~ msgid "starts with"
+#~ msgstr "以此開始"
+
+#~ msgid "Stop Processing"
+#~ msgstr "停止處理"
+
+#~ msgid "Unset Status"
+#~ msgstr "取消設定狀態"
+
+# mail/mail-mt.c:516
+# mail/mail-mt.c:545
+# mail/mail-mt.c:880
+#~ msgid "Working"
+#~ msgstr "正在工作"
+
+#~ msgid "Brought to you by"
+#~ msgstr "為您呈獻"
+
+# shell/e-shell-importer.c:540
+#, fuzzy
+#~ msgid "_Filename:"
+#~ msgstr "檔案名稱:"
+
+# camel/providers/imap/camel-imap-command.c:241
+# shell/e-storage.c:481
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "Unknown error."
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "不明的錯誤。"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the component system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "來自元件系統的錯誤為：\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "The error from the activation system is:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "來自活化系統的錯誤為：\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "View Certificate"
+#~ msgstr "憑證 ID(_C):"
+
+#, fuzzy
+#~ msgid "You have been asked to trust a new Certificate Authority (CA)."
+#~ msgstr "無效的憑證機構 (CA)"
+
+# ui/evolution.xml.h:1
+#~ msgid "About Ximian Evolution..."
+#~ msgstr "關於 Ximian Evolution..."
+
+# ui/evolution.xml.h:40
+#~ msgid "_About Ximian Evolution..."
+#~ msgstr "關於 Ximian Evolution(_A)..."
+
 # addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 #, fuzzy
 #~ msgid "Evolution Addressbook folder viewer"
@@ -23657,10 +23700,6 @@ msgstr "%s (%d%% 完成)"
 #~ msgid "Primary _email:"
 #~ msgstr "主要電子郵件"
 
-# addressbook/contact-editor/contact-editor.glade.h:33
-#~ msgid "S_pouse:"
-#~ msgstr "配偶(_S):"
-
 # addressbook/contact-editor/e-contact-editor.c:1243
 # addressbook/contact-editor/e-contact-editor.c:1310
 #, fuzzy
@@ -23690,10 +23729,6 @@ msgstr "%s (%d%% 完成)"
 #~ msgid "_Mobile:"
 #~ msgstr "行動電話"
 
-# addressbook/contact-editor/contact-editor.glade.h:31
-#~ msgid "_Office:"
-#~ msgstr "辦公室(_O):"
-
 # calendar/gui/print.c:1156
 #~ msgid "_Public Calendar URL:"
 #~ msgstr "公開行事曆 URL(_P):"
@@ -25548,12 +25583,6 @@ msgstr "%s (%d%% 完成)"
 #~ msgid "Object not found"
 #~ msgstr "找不到物件\n"
 
-# camel/providers/local/camel-maildir-folder.c:218
-# camel/providers/local/camel-mh-folder.c:203
-#, fuzzy
-#~ msgid "Invalid object"
-#~ msgstr "無效的目的"
-
 # addressbook/conduit/address-conduit.c:214
 #, fuzzy
 #~ msgid "URI not loaded"
@@ -30057,10 +30086,6 @@ msgstr "%s (%d%% 完成)"
 #~ msgid "Lannion"
 #~ msgstr "Lannion"
 
-# widgets/misc/e-messagebox.c:159
-#~ msgid "Lansing"
-#~ msgstr "蘭辛"
-
 #~ msgid "Lanzhou"
 #~ msgstr "Lanzhou"
 
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 11f5f37da6..03c0f9df39 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -41,7 +41,7 @@
 
 2004-05-28  JP Rosevear  <jpr@novell.com>
 
-	* e-shell-window-commands.c: remove bogus include	
+	* e-shell-window-commands.c: remove bogus include
 
 2004-05-28  William Jon McCann  <mccann@jhu.edu>